angular · gregmagolan · Feb 8, 2019
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -6,8 +6,6 @@ exports_files([
     "tsconfig.json",
     "LICENSE",
     "protractor-perf.conf.js",
-    # Copied into the @angular/bazel package
-    "browser_repositories.bzl",
 ])
 
 filegroup(

diff --git a/WORKSPACE b/WORKSPACE
@@ -8,7 +8,7 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 #    path = "../rules_nodejs",
 #)
 #local_repository(
-#    name = "build_bazel_rules_typescript",
+#    name = "npm_bazel_typescript",
 #    path = "../rules_typescript",
 #)
 
@@ -67,7 +67,7 @@ load("//packages/bazel:package.bzl", "rules_angular_dev_dependencies")
 rules_angular_dev_dependencies()
 
 # Load karma dependencies
-load("@build_bazel_rules_karma//:package.bzl", "rules_karma_dependencies")
+load("@npm_bazel_karma//:package.bzl", "rules_karma_dependencies")
 
 rules_karma_dependencies()
 
@@ -78,12 +78,12 @@ web_test_repositories()
 
 # Temporary work-around for https://github.com/angular/angular/issues/28681
 # TODO(gregmagolan): go back to @io_bazel_rules_webtesting browser_repositories
-load("@angular//:browser_repositories.bzl", "browser_repositories")
+load("@npm_bazel_karma//:browser_repositories.bzl", "browser_repositories")
 
 browser_repositories()
 
 # Setup the rules_typescript tooolchain
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace")
+load("@npm_bazel_typescript//:defs.bzl", "ts_setup_workspace")
 
 ts_setup_workspace()
 

diff --git a/browser_repositories.bzl b/browser_repositories.bzl
diff --git a/docs/BAZEL.md b/docs/BAZEL.md
@@ -22,7 +22,7 @@ You can access Bazel with the `yarn bazel` command
 
 The `WORKSPACE` file indicates that our root directory is a
 Bazel project. It contains the version of the Bazel rules we
-use to execute build steps, from `build_bazel_rules_typescript`.
+use to execute build steps, from `npm_bazel_typescript`.
 The sources on [GitHub] are published from Google's internal
 repository (google3).
 

diff --git a/integration/bazel/WORKSPACE b/integration/bazel/WORKSPACE
@@ -54,7 +54,7 @@ load("@npm//:install_bazel_dependencies.bzl", "install_bazel_dependencies")
 install_bazel_dependencies()
 
 # Load karma dependencies
-load("@build_bazel_rules_karma//:package.bzl", "rules_karma_dependencies")
+load("@npm_bazel_karma//:package.bzl", "rules_karma_dependencies")
 
 rules_karma_dependencies()
 
@@ -65,12 +65,12 @@ web_test_repositories()
 
 # Temporary work-around for https://github.com/angular/angular/issues/28681
 # TODO(gregmagolan): go back to @io_bazel_rules_webtesting browser_repositories
-load("@npm_angular_bazel//:browser_repositories.bzl", "browser_repositories")
+load("@npm_bazel_karma//:browser_repositories.bzl", "browser_repositories")
 
 browser_repositories()
 
 # Setup the rules_typescript tooolchain
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace")
+load("@npm_bazel_typescript//:defs.bzl", "ts_setup_workspace")
 
 ts_setup_workspace()
 

diff --git a/integration/bazel/src/BUILD.bazel b/integration/bazel/src/BUILD.bazel
@@ -3,7 +3,7 @@ package(default_visibility = ["//visibility:public"])
 load("@npm_angular_bazel//:index.bzl", "ng_module")
 load("@build_bazel_rules_nodejs//:defs.bzl", "http_server", "nodejs_binary", "rollup_bundle")
 load("@build_bazel_rules_nodejs//internal/web_package:web_package.bzl", "web_package")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 
 # Allow targets under sub-packages to reference the tsconfig.json file
 exports_files(["tsconfig.json"])

diff --git a/integration/bazel/src/hello-world/BUILD.bazel b/integration/bazel/src/hello-world/BUILD.bazel
@@ -1,7 +1,7 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@build_bazel_rules_karma//:defs.bzl", "ts_web_test_suite")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("@npm_bazel_karma//:defs.bzl", "ts_web_test_suite")
+load("@npm_bazel_typescript//:defs.bzl", "ts_library")
 load("@io_bazel_rules_sass//sass:sass.bzl", "sass_binary")
 load("@npm_angular_bazel//:index.bzl", "ng_module", "ng_package")
 

diff --git a/integration/bazel/src/package.json b/integration/bazel/src/package.json
@@ -18,8 +18,8 @@
     "@angular/bazel": "packages-dist:bazel",
     "@angular/compiler": "packages-dist:compiler",
     "@angular/compiler-cli": "packages-dist:compiler-cli",
-    "@bazel/karma": "0.23.2",
-    "@bazel/typescript": "0.23.2",
+    "@bazel/karma": "0.25.1",
+    "@bazel/typescript": "0.25.1",
     "@types/jasmine": "2.8.8",
     "@types/source-map": "0.5.1",
     "protractor": "5.1.2",
@@ -29,4 +29,4 @@
     "postinstall": "ngc -p ./angular-metadata.tsconfig.json",
     "//": "TODO(gregmagolan): figure out how to keep dependencies here up to date with the root package.json"
   }
-}
+}
diff --git a/integration/bazel/src/yarn.lock b/integration/bazel/src/yarn.lock
@@ -65,12 +65,21 @@
     tslib "^1.9.0"
 
 "@angular/bazel@file:../angular/dist/packages-dist/bazel":
+<<<<<<< HEAD
   version "0.0.0"
   dependencies:
     "@angular-devkit/architect" "^0.10.6"
     "@angular-devkit/core" "^7.0.4"
     "@angular-devkit/schematics" "^7.0.4"
     "@bazel/typescript" "^0.21.0"
+=======
+  version "8.0.0-beta.3"
+  dependencies:
+    "@angular-devkit/architect" "^0.10.6"
+    "@angular-devkit/core" "^7.0.4"
+    "@angular-devkit/schematics" "^7.3.0-rc.0"
+    "@bazel/typescript" "^0.24.1"
+>>>>>>> b052dfada9... build: update to rules_typescript 0.24.1
     "@schematics/angular" "^7.0.4"
     "@types/node" "6.0.84"
     semver "^5.6.0"
@@ -83,7 +92,11 @@
     tslib "^1.9.0"
 
 "@angular/compiler-cli@file:../angular/dist/packages-dist/compiler-cli":
+<<<<<<< HEAD
   version "0.0.0"
+=======
+  version "8.0.0-beta.3"
+>>>>>>> b052dfada9... build: update to rules_typescript 0.24.1
   dependencies:
     canonical-path "1.0.0"
     chokidar "^1.4.2"
@@ -98,6 +111,7 @@
     yargs "9.0.1"
 
 "@angular/compiler@file:../angular/dist/packages-dist/compiler":
+<<<<<<< HEAD
   version "0.0.0"
   dependencies:
     tslib "^1.9.0"
@@ -114,13 +128,16 @@
 
 "@angular/platform-browser@file:../angular/dist/packages-dist/platform-browser":
   version "0.0.0"
+=======
+  version "8.0.0-beta.3"
+>>>>>>> b052dfada9... build: update to rules_typescript 0.24.1
   dependencies:
     tslib "^1.9.0"
 
-"@bazel/karma@0.23.2":
-  version "0.23.2"
-  resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.23.2.tgz#17421a61cbcc6c917902beaaef88d61f22471f11"
-  integrity sha512-aNujXKusUjJIkc6CF03LS8AS7ULwNE0MKEL2TlYvnGCZviQ3nKrpRiEtWFmZlT+GrTOeu7AM4t3l4pSdQx/jnw==
+"@bazel/karma@0.24.1":
+  version "0.24.1"
+  resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.24.1.tgz#eeeec30e0f16cc70283f1b818c80fd8d473066de"
+  integrity sha512-nBTLTUtRKoV1zM8TeJXHyRthC93Ug+iWc3VAI67WKzJaTzH2NmgTaGBesEPvPd/HJTZi1Zi6tKPIVpu0hOaZVA==
   dependencies:
     jasmine-core "2.8.0"
     karma "^4.0.0"
@@ -134,10 +151,17 @@
     semver "5.6.0"
     tmp "0.0.33"
 
+<<<<<<< HEAD
 "@bazel/typescript@0.23.2":
   version "0.23.2"
   resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.23.2.tgz#a3ff199880855259d84216cb41644c1d9a0fad14"
   integrity sha512-GrTyDW6Fvp/rgnxZGYampB5/QmDWvxtLEtUyMCPa/QXFR1OVxaMWeHxxuFEcES2UKJegqBDKAA8IzX21x4UbEw==
+=======
+"@bazel/typescript@0.24.1", "@bazel/typescript@^0.24.1":
+  version "0.24.1"
+  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.24.1.tgz#3efdc085c122939b2dd161b7ff589454c50edffc"
+  integrity sha512-tvdgUlqA5EkSQmQ656G/Dc3LX4ZvqPucOGfQ/ls9fYnG4ZWIh1KgwZq99NbjMS5MAJ+47hQBH+gL6dcRfHOGUg==
+>>>>>>> b052dfada9... build: update to rules_typescript 0.24.1
   dependencies:
     jasmine-core "2.8.0"
     protobufjs "5.0.3"

diff --git a/integration/bazel/test/e2e/BUILD.bazel b/integration/bazel/test/e2e/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("@npm_bazel_typescript//:defs.bzl", "ts_library")
 load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite")
 
 ts_library(

diff --git a/modules/benchmarks/src/largeform/ng2/BUILD.bazel b/modules/benchmarks/src/largeform/ng2/BUILD.bazel
@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])

diff --git a/modules/benchmarks/src/largetable/baseline/BUILD.bazel b/modules/benchmarks/src/largetable/baseline/BUILD.bazel
@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ts_library")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])

diff --git a/modules/benchmarks/src/largetable/incremental_dom/BUILD.bazel b/modules/benchmarks/src/largetable/incremental_dom/BUILD.bazel
@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ts_library")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])

diff --git a/modules/benchmarks/src/largetable/iv/BUILD.bazel b/modules/benchmarks/src/largetable/iv/BUILD.bazel
@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ts_library")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])

diff --git a/modules/benchmarks/src/largetable/ng2/BUILD.bazel b/modules/benchmarks/src/largetable/ng2/BUILD.bazel
@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])

diff --git a/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel b/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel
@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])

diff --git a/modules/benchmarks/src/largetable/render3/BUILD.bazel b/modules/benchmarks/src/largetable/render3/BUILD.bazel
@@ -1,7 +1,7 @@
 package(default_visibility = ["//visibility:public"])
 
 load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
 ng_module(

diff --git a/modules/benchmarks/src/tree/baseline/BUILD.bazel b/modules/benchmarks/src/tree/baseline/BUILD.bazel
@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ts_library")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])

diff --git a/modules/benchmarks/src/tree/incremental_dom/BUILD.bazel b/modules/benchmarks/src/tree/incremental_dom/BUILD.bazel
@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ts_library")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])

diff --git a/modules/benchmarks/src/tree/iv/BUILD.bazel b/modules/benchmarks/src/tree/iv/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])

diff --git a/modules/benchmarks/src/tree/ng1/BUILD.bazel b/modules/benchmarks/src/tree/ng1/BUILD.bazel
@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ts_library")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])

diff --git a/modules/benchmarks/src/tree/ng2/BUILD.bazel b/modules/benchmarks/src/tree/ng2/BUILD.bazel
@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])