build: rules_nodejs 0.26.0 & use @npm instead of @ngdeps now that downstream angular build uses angular bundles (#28871)

PR Close #28871

BUILD.bazel

@@ -16,15 +16,15 @@ filegroup(
     name = "web_test_bootstrap_scripts",
     # do not sort
     srcs = [
-        "@ngdeps//node_modules/core-js:client/core.js",
-        "@ngdeps//node_modules/zone.js:dist/zone.js",
-        "@ngdeps//node_modules/zone.js:dist/zone-testing.js",
-        "@ngdeps//node_modules/zone.js:dist/task-tracking.js",
+        "@npm//node_modules/core-js:client/core.js",
+        "@npm//node_modules/zone.js:dist/zone.js",
+        "@npm//node_modules/zone.js:dist/zone-testing.js",
+        "@npm//node_modules/zone.js:dist/task-tracking.js",
         "//:test-events.js",
         "//:shims_for_IE.js",
         # Including systemjs because it defines `__eval`, which produces correct stack traces.
-        "@ngdeps//node_modules/systemjs:dist/system.src.js",
-        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
+        "@npm//node_modules/systemjs:dist/system.src.js",
+        "@npm//node_modules/reflect-metadata:Reflect.js",
     ],
 )
 
@@ -33,34 +33,18 @@ filegroup(
     srcs = [
         # We also declare the unminfied AngularJS files since these can be used for
         # local debugging (e.g. see: packages/upgrade/test/common/test_helpers.ts)
-        "@ngdeps//node_modules/angular:angular.js",
-        "@ngdeps//node_modules/angular:angular.min.js",
-        "@ngdeps//node_modules/angular-1.5:angular.js",
-        "@ngdeps//node_modules/angular-1.5:angular.min.js",
-        "@ngdeps//node_modules/angular-1.6:angular.js",
-        "@ngdeps//node_modules/angular-1.6:angular.min.js",
-        "@ngdeps//node_modules/angular-mocks:angular-mocks.js",
-        "@ngdeps//node_modules/angular-mocks-1.5:angular-mocks.js",
-        "@ngdeps//node_modules/angular-mocks-1.6:angular-mocks.js",
+        "@npm//node_modules/angular:angular.js",
+        "@npm//node_modules/angular:angular.min.js",
+        "@npm//node_modules/angular-1.5:angular.js",
+        "@npm//node_modules/angular-1.5:angular.min.js",
+        "@npm//node_modules/angular-1.6:angular.js",
+        "@npm//node_modules/angular-1.6:angular.min.js",
+        "@npm//node_modules/angular-mocks:angular-mocks.js",
+        "@npm//node_modules/angular-mocks-1.5:angular-mocks.js",
+        "@npm//node_modules/angular-mocks-1.6:angular-mocks.js",
     ],
 )
 
-# A nodejs_binary for @angular/bazel/ngc-wrapped to use by default in
-# ng_module that depends on @npm//@angular/bazel instead of the
-# output of the //packages/bazel/src/ngc-wrapped ts_library rule. This
-# default is for downstream users that depend on the @angular/bazel npm
-# package. The generated @npm//@angular/bazel/ngc-wrapped target
-# does not work because it does not have the node `--expose-gc` flag
-# set which is required to support the call to `global.gc()`.
-nodejs_binary(
-    name = "@angular/bazel/ngc-wrapped",
-    configuration_env_vars = ["compile"],
-    data = ["@npm//@angular/bazel"],
-    entry_point = "@angular/bazel/src/ngc-wrapped/index.js",
-    install_source_map_support = False,
-    templated_args = ["--node_options=--expose-gc"],
-)
-
 # To run a karma_web_test target locally on SauceLabs:
 # 1) have SAUCE_USERNAME, SAUCE_ACCESS_KEY (and optionally a SAUCE_TUNNEL_IDENTIFIER) set in your environment
 # 2) open a sauce connection with `./scripts/saucelabs/start-tunnel.sh`

WORKSPACE

@@ -15,22 +15,13 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 # Fetch rules_nodejs so we can install our npm dependencies
 http_archive(
     name = "build_bazel_rules_nodejs",
-    sha256 = "86ea92217dfd4a84e1e335cc07dfd942b12899796b080492546b947f12c5ab77",
-    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.26.0-beta.0/rules_nodejs-0.26.0-beta.0.tar.gz"],
-)
-
-# Use a mock @npm repository while we are building angular from source
-# downstream. Angular will get its npm dependencies with in @ngdeps which
-# is setup in ng_setup_workspace().
-# TODO(gregmagolan): remove @ngdeps once angular is no longer build from source
-#   downstream and have build use @npm for npm dependencies
-local_repository(
-    name = "npm",
-    path = "tools/npm_workspace",
+    sha256 = "5c86b055c57e15bf32d9009a15bcd6d8e190c41b1ff2fb18037b75e0012e4e7c",
+    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.26.0/rules_nodejs-0.26.0.tar.gz"],
 )
 
 # Check the bazel version and download npm dependencies
-load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories")
+load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories", "yarn_install")
+load("@build_bazel_rules_nodejs//:package.bzl", "check_rules_nodejs_version")
 
 # Bazel version must be at least v0.21.0 because:
 #   - 0.21.0 Using --incompatible_strict_action_env flag fixes cache when running `yarn bazel`
@@ -46,6 +37,12 @@ Try running `yarn bazel` instead.
     minimum_bazel_version = "0.21.0",
 )
 
+# The NodeJS rules version must be at least v0.15.3 because:
+#   - 0.15.2 Re-introduced the prod_only attribute on yarn_install
+#   - 0.15.3 Includes a fix for the `jasmine_node_test` rule ignoring target tags
+#   - 0.16.8 Supports npm installed bazel workspaces
+check_rules_nodejs_version("0.16.8")
+
 # Setup the Node.js toolchain
 node_repositories(
     node_version = "10.9.0",
@@ -54,13 +51,28 @@ node_repositories(
     yarn_version = "1.12.1",
 )
 
-# Setup the angular toolchain which installs npm dependencies into @ngdeps
-load("//tools:ng_setup_workspace.bzl", "ng_setup_workspace")
+yarn_install(
+    name = "npm",
+    data = [
+        "//:tools/npm/@angular_bazel/index.js",
+        "//:tools/npm/@angular_bazel/package.json",
+        "//:tools/postinstall-patches.js",
+        "//:tools/yarn/check-yarn.js",
+    ],
+    package_json = "//:package.json",
+    # Don't install devDependencies, they are large and not used under Bazel
+    prod_only = True,
+    yarn_lock = "//:yarn.lock",
+)
 
-ng_setup_workspace()
+yarn_install(
+    name = "ts-api-guardian_deps",
+    package_json = "@angular//tools/ts-api-guardian:package.json",
+    yarn_lock = "@angular//tools/ts-api-guardian:yarn.lock",
+)
 
-# Install all bazel dependencies of the @ngdeps npm packages
-load("@ngdeps//:install_bazel_dependencies.bzl", "install_bazel_dependencies")
+# Install all bazel dependencies of the @npm npm packages
+load("@npm//:install_bazel_dependencies.bzl", "install_bazel_dependencies")
 
 install_bazel_dependencies()
 
@@ -86,7 +98,7 @@ load("@npm_bazel_karma//:browser_repositories.bzl", "browser_repositories")
 browser_repositories()
 
 # Setup the rules_typescript tooolchain
-load("@npm_bazel_typescript//:defs.bzl", "ts_setup_workspace")
+load("@npm_bazel_typescript//:index.bzl", "ts_setup_workspace")
 
 ts_setup_workspace()
 

index.bzl

@@ -1,28 +0,0 @@
-# Copyright Google Inc. All Rights Reserved.
-#
-# Use of this source code is governed by an MIT-style license that can be
-# found in the LICENSE file at https://angular.io/license
-""" Public API surface is re-exported here.
-
-This API is exported for users building angular from source in downstream
-projects. The rules from packages/bazel are re-exported here as well
-as the ng_setup_workspace repository rule needed when building angular
-from source downstream. Alternately, this API is available from the
-@angular/bazel npm package if the npm distribution of angular is
-used in a downstream project.
-"""
-
-load(
-    "//packages/bazel:index.bzl",
-    _ng_module = "ng_module",
-    _ng_package = "ng_package",
-    _protractor_web_test = "protractor_web_test",
-    _protractor_web_test_suite = "protractor_web_test_suite",
-)
-load("//tools:ng_setup_workspace.bzl", _ng_setup_workspace = "ng_setup_workspace")
-
-ng_module = _ng_module
-ng_package = _ng_package
-protractor_web_test = _protractor_web_test
-protractor_web_test_suite = _protractor_web_test_suite
-ng_setup_workspace = _ng_setup_workspace

integration/bazel/WORKSPACE

@@ -5,8 +5,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 # Fetch rules_nodejs so we can install our npm dependencies
 http_archive(
     name = "build_bazel_rules_nodejs",
-    sha256 = "86ea92217dfd4a84e1e335cc07dfd942b12899796b080492546b947f12c5ab77",
-    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.26.0-beta.0/rules_nodejs-0.26.0-beta.0.tar.gz"],
+    sha256 = "5c86b055c57e15bf32d9009a15bcd6d8e190c41b1ff2fb18037b75e0012e4e7c",
+    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.26.0/rules_nodejs-0.26.0.tar.gz"],
 )
 
 # Fetch sass rules for compiling sass files
@@ -73,7 +73,7 @@ load("@npm_bazel_karma//:browser_repositories.bzl", "browser_repositories")
 browser_repositories()
 
 # Setup the rules_typescript tooolchain
-load("@npm_bazel_typescript//:defs.bzl", "ts_setup_workspace")
+load("@npm_bazel_typescript//:index.bzl", "ts_setup_workspace")
 
 ts_setup_workspace()
 
@@ -81,11 +81,3 @@ ts_setup_workspace()
 load("@io_bazel_rules_sass//sass:sass_repositories.bzl", "sass_repositories")
 
 sass_repositories()
-
-# Setup the angular toolchain. This integration test no longer builds Angular from source,
-# but we still need to set up the "angular" workspace since some Bazel rules depend on
-# the "ngdeps" repository. This can be fixed if we switched the Angular repository to the
-# "npm" repository for the bazel managed dependencies.
-load("@npm_angular_bazel//:index.bzl", "ng_setup_workspace")
-
-ng_setup_workspace()

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", "rollup_bundle")
 load("@build_bazel_rules_nodejs//internal/web_package:web_package.bzl", "web_package")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 
 # Allow targets under sub-packages to reference the tsconfig.json file
 exports_files(["tsconfig.json"])

integration/bazel/src/hello-world/BUILD.bazel

@@ -1,7 +1,7 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@npm_bazel_karma//:defs.bzl", "ts_web_test_suite")
-load("@npm_bazel_typescript//:defs.bzl", "ts_library")
+load("@npm_bazel_karma//:index.bzl", "ts_web_test_suite")
+load("@npm_bazel_typescript//:index.bzl", "ts_library")
 load("@io_bazel_rules_sass//sass:sass.bzl", "sass_binary")
 load("@npm_angular_bazel//:index.bzl", "ng_module", "ng_package")
 

integration/bazel/src/package.json

@@ -18,7 +18,7 @@
     "@angular/bazel": "packages-dist:bazel",
     "@angular/compiler": "packages-dist:compiler",
     "@angular/compiler-cli": "packages-dist:compiler-cli",
-    "@bazel/karma": "0.26.0-beta.0",
+    "@bazel/karma": "0.26.0",
     "@types/jasmine": "2.8.8",
     "@types/source-map": "0.5.1",
     "protractor": "5.1.2",

integration/bazel/test/e2e/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm_bazel_typescript//:defs.bzl", "ts_library")
+load("@npm_bazel_typescript//:index.bzl", "ts_library")
 load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite")
 
 ts_library(

karma-js.conf.js

@@ -111,7 +111,7 @@ module.exports = function(config) {
     // don't need this entire config file.
     proxies: {
       '/base/angular/': '/base/',
-      '/base/ngdeps/': '/base/',
+      '/base/npm/': '/base/',
     },
 
     reporters: ['dots'],

modules/benchmarks/benchmark_test.bzl

@@ -18,7 +18,7 @@ def benchmark_test(name, server, deps, tags = []):
         server = server,
         tags = tags,
         deps = [
-            "@ngdeps//protractor",
-            "@ngdeps//yargs",
+            "@npm//protractor",
+            "@npm//yargs",
         ] + deps,
     )

modules/benchmarks/src/largeform/BUILD.bazel

@@ -9,7 +9,7 @@ ts_library(
     tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
     deps = [
         "//modules/e2e_util",
-        "@ngdeps//@types/jasminewd2",
-        "@ngdeps//protractor",
+        "@npm//@types/jasminewd2",
+        "@npm//protractor",
     ],
 )

modules/benchmarks/src/largeform/ng2/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])
@@ -29,12 +29,12 @@ ts_devserver(
     index_html = "index.html",
     port = 4200,
     scripts = [
-        "@ngdeps//node_modules/tslib:tslib.js",
+        "@npm//node_modules/tslib:tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@ngdeps//node_modules/zone.js:dist/zone.js",
-        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
+        "@npm//node_modules/zone.js:dist/zone.js",
+        "@npm//node_modules/reflect-metadata:Reflect.js",
     ],
     tags = ["fixme-ivy-aot"],
     deps = [":ng2"],

modules/benchmarks/src/largetable/BUILD.bazel

@@ -14,6 +14,6 @@ ts_library(
     srcs = ["largetable_perf.spec.ts"],
     deps = [
         "//modules/e2e_util",
-        "@ngdeps//protractor",
+        "@npm//protractor",
     ],
 )

modules/benchmarks/src/largetable/baseline/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ts_library")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])

modules/benchmarks/src/largetable/incremental_dom/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ts_library")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])
@@ -20,7 +20,7 @@ ts_devserver(
     index_html = "index.html",
     port = 4200,
     static_files = [
-        "@ngdeps//node_modules/incremental-dom:dist/incremental-dom.js",
+        "@npm//node_modules/incremental-dom:dist/incremental-dom.js",
     ],
     deps = [":incremental_dom"],
 )

modules/benchmarks/src/largetable/ng2/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])
@@ -28,12 +28,12 @@ ts_devserver(
     index_html = "index.html",
     port = 4200,
     scripts = [
-        "@ngdeps//node_modules/tslib:tslib.js",
+        "@npm//node_modules/tslib:tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@ngdeps//node_modules/zone.js:dist/zone.js",
-        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
+        "@npm//node_modules/zone.js:dist/zone.js",
+        "@npm//node_modules/reflect-metadata:Reflect.js",
     ],
     deps = [":ng2"],
 )

modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])
@@ -25,12 +25,12 @@ ts_devserver(
     index_html = "index.html",
     port = 4200,
     scripts = [
-        "@ngdeps//node_modules/tslib:tslib.js",
+        "@npm//node_modules/tslib:tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@ngdeps//node_modules/zone.js:dist/zone.js",
-        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
+        "@npm//node_modules/zone.js:dist/zone.js",
+        "@npm//node_modules/reflect-metadata:Reflect.js",
     ],
     deps = [":ng2_switch"],
 )

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("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
 ng_module(
@@ -14,7 +14,7 @@ ng_module(
         "//packages:types",
         "//packages/common",
         "//packages/core",
-        "@ngdeps//reflect-metadata",
+        "@npm//reflect-metadata",
     ],
 )
 
@@ -24,7 +24,7 @@ ng_rollup_bundle(
     tags = ["ivy-only"],
     deps = [
         ":largetable_lib",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
 

modules/benchmarks/src/tree/BUILD.bazel

@@ -14,7 +14,7 @@ ts_library(
     srcs = ["tree_perf_test_utils.ts"],
     deps = [
         "//modules/e2e_util",
-        "@ngdeps//protractor",
+        "@npm//protractor",
     ],
 )
 
@@ -24,7 +24,7 @@ ts_library(
     srcs = ["tree_perf.spec.ts"],
     deps = [
         ":test_utils_lib",
-        "@ngdeps//protractor",
+        "@npm//protractor",
     ],
 )
 
@@ -34,6 +34,6 @@ ts_library(
     srcs = ["tree_perf_detect_changes.spec.ts"],
     deps = [
         ":test_utils_lib",
-        "@ngdeps//protractor",
+        "@npm//protractor",
     ],
 )

modules/benchmarks/src/tree/baseline/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ts_library")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])

modules/benchmarks/src/tree/incremental_dom/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ts_library")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])
@@ -11,7 +11,7 @@ ts_library(
     deps = [
         "//modules/benchmarks/src:util_lib",
         "//modules/benchmarks/src/tree:util_lib",
-        "@ngdeps//@types/node",
+        "@npm//@types/node",
     ],
 )
 
@@ -21,7 +21,7 @@ ts_devserver(
     index_html = "index.html",
     port = 4200,
     static_files = [
-        "@ngdeps//node_modules/incremental-dom:dist/incremental-dom.js",
+        "@npm//node_modules/incremental-dom:dist/incremental-dom.js",
     ],
     deps = [":incremental_dom"],
 )

modules/benchmarks/src/tree/iv/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])

modules/benchmarks/src/tree/ng1/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ts_library")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])
@@ -20,7 +20,7 @@ ts_devserver(
     index_html = "index.html",
     port = 4200,
     static_files = [
-        "@ngdeps//node_modules/angular:angular.js",
+        "@npm//node_modules/angular:angular.js",
     ],
     deps = [":ng1"],
 )

modules/benchmarks/src/tree/ng2/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])
@@ -28,12 +28,12 @@ ts_devserver(
     index_html = "index.html",
     port = 4200,
     scripts = [
-        "@ngdeps//node_modules/tslib:tslib.js",
+        "@npm//node_modules/tslib:tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@ngdeps//node_modules/zone.js:dist/zone.js",
-        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
+        "@npm//node_modules/zone.js:dist/zone.js",
+        "@npm//node_modules/reflect-metadata:Reflect.js",
     ],
     deps = [":ng2"],
 )

modules/benchmarks/src/tree/ng2_next/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ts_library")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])
@@ -23,7 +23,7 @@ ts_devserver(
     index_html = "index.html",
     port = 4200,
     scripts = [
-        "@ngdeps//node_modules/tslib:tslib.js",
+        "@npm//node_modules/tslib:tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
     deps = [":ng2_next"],

modules/benchmarks/src/tree/ng2_static/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ts_library")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])
@@ -23,12 +23,12 @@ ts_devserver(
     index_html = "index.html",
     port = 4200,
     scripts = [
-        "@ngdeps//node_modules/tslib:tslib.js",
+        "@npm//node_modules/tslib:tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@ngdeps//node_modules/zone.js:dist/zone.js",
-        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
+        "@npm//node_modules/zone.js:dist/zone.js",
+        "@npm//node_modules/reflect-metadata:Reflect.js",
     ],
     deps = [":ng2_static"],
 )

modules/benchmarks/src/tree/ng2_switch/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])
@@ -25,12 +25,12 @@ ts_devserver(
     index_html = "index.html",
     port = 4200,
     scripts = [
-        "@ngdeps//node_modules/tslib:tslib.js",
+        "@npm//node_modules/tslib:tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@ngdeps//node_modules/zone.js:dist/zone.js",
-        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
+        "@npm//node_modules/zone.js:dist/zone.js",
+        "@npm//node_modules/reflect-metadata:Reflect.js",
     ],
     deps = [":ng2_switch"],
 )

modules/benchmarks/src/tree/render3/BUILD.bazel

@@ -1,7 +1,7 @@
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])
 
 load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
 ng_module(
@@ -13,7 +13,7 @@ ng_module(
         "//packages:types",
         "//packages/common",
         "//packages/core",
-        "@ngdeps//reflect-metadata",
+        "@npm//reflect-metadata",
     ],
 )
 
@@ -23,7 +23,7 @@ ng_rollup_bundle(
     tags = ["ivy-only"],
     deps = [
         ":tree_lib",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
 

modules/benchmarks/src/tree/render3_function/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 load("//tools:defaults.bzl", "ts_library")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
@@ -21,7 +21,7 @@ ts_devserver(
     index_html = "index.html",
     port = 4200,
     scripts = [
-        "@ngdeps//node_modules/tslib:tslib.js",
+        "@npm//node_modules/tslib:tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
     deps = [":render3_function_lib"],

modules/e2e_util/BUILD.bazel

@@ -9,11 +9,11 @@ ts_library(
     deps = [
         "//packages:types",
         "//packages/benchpress",
-        "@ngdeps//@types/fs-extra",
-        "@ngdeps//@types/selenium-webdriver",
-        "@ngdeps//fs-extra",
-        "@ngdeps//node-uuid",
-        "@ngdeps//protractor",
-        "@ngdeps//selenium-webdriver",
+        "@npm//@types/fs-extra",
+        "@npm//@types/selenium-webdriver",
+        "@npm//fs-extra",
+        "@npm//node-uuid",
+        "@npm//protractor",
+        "@npm//selenium-webdriver",
     ],
 )

modules/playground/e2e_test/example_test.bzl

@@ -10,9 +10,9 @@ def example_test(name, srcs, server, data = [], **kwargs):
         deps = [
             "//modules/e2e_util",
             "//packages/private/testing",
-            "@ngdeps//@types/jasminewd2",
-            "@ngdeps//@types/selenium-webdriver",
-            "@ngdeps//protractor",
+            "@npm//@types/jasminewd2",
+            "@npm//@types/selenium-webdriver",
+            "@npm//protractor",
         ],
     )
 
@@ -23,10 +23,10 @@ def example_test(name, srcs, server, data = [], **kwargs):
         server = server,
         deps = [
             ":%s_lib" % name,
-            "@ngdeps//protractor",
-            "@ngdeps//selenium-webdriver",
-            "@ngdeps//yargs",
-            "@ngdeps//source-map",
+            "@npm//protractor",
+            "@npm//selenium-webdriver",
+            "@npm//yargs",
+            "@npm//source-map",
         ],
         **kwargs
     )

modules/playground/src/animate/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 
 package(default_visibility = ["//modules/playground:__subpackages__"])
 
@@ -23,10 +23,10 @@ ts_devserver(
     entry_module = "angular/modules/playground/src/animate/index",
     index_html = "index.html",
     port = 4200,
-    scripts = ["@ngdeps//node_modules/tslib:tslib.js"],
+    scripts = ["@npm//node_modules/tslib:tslib.js"],
     static_files = [
-        "@ngdeps//node_modules/zone.js:dist/zone.js",
-        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
+        "@npm//node_modules/zone.js:dist/zone.js",
+        "@npm//node_modules/reflect-metadata:Reflect.js",
     ],
     deps = [":animate"],
 )

modules/playground/src/async/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 
 package(default_visibility = ["//modules/playground:__subpackages__"])
 
@@ -22,12 +22,12 @@ ts_devserver(
     index_html = "index.html",
     port = 4200,
     scripts = [
-        "@ngdeps//node_modules/tslib:tslib.js",
+        "@npm//node_modules/tslib:tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@ngdeps//node_modules/zone.js:dist/zone.js",
-        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
+        "@npm//node_modules/zone.js:dist/zone.js",
+        "@npm//node_modules/reflect-metadata:Reflect.js",
     ],
     deps = [":async"],
 )

modules/playground/src/benchpress/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 
 package(default_visibility = ["//modules/playground:__subpackages__"])
 

modules/playground/src/gestures/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 
 package(default_visibility = ["//modules/playground:__subpackages__"])
 
@@ -14,7 +14,7 @@ ng_module(
         "//packages/core",
         "//packages/platform-browser",
         "//packages/platform-browser-dynamic",
-        "@ngdeps//@types/hammerjs",
+        "@npm//@types/hammerjs",
     ],
 )
 
@@ -23,11 +23,11 @@ ts_devserver(
     entry_module = "angular/modules/playground/src/gestures/index",
     index_html = "index.html",
     port = 4200,
-    scripts = ["@ngdeps//node_modules/tslib:tslib.js"],
+    scripts = ["@npm//node_modules/tslib:tslib.js"],
     static_files = [
-        "@ngdeps//node_modules/hammerjs:hammer.js",
-        "@ngdeps//node_modules/zone.js:dist/zone.js",
-        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
+        "@npm//node_modules/hammerjs:hammer.js",
+        "@npm//node_modules/zone.js:dist/zone.js",
+        "@npm//node_modules/reflect-metadata:Reflect.js",
     ],
     deps = [":gestures"],
 )

modules/playground/src/hello_world/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 
 package(default_visibility = ["//modules/playground:__subpackages__"])
 
@@ -22,12 +22,12 @@ ts_devserver(
     index_html = "index.html",
     port = 4200,
     scripts = [
-        "@ngdeps//node_modules/tslib:tslib.js",
+        "@npm//node_modules/tslib:tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@ngdeps//node_modules/zone.js:dist/zone.js",
-        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
+        "@npm//node_modules/zone.js:dist/zone.js",
+        "@npm//node_modules/reflect-metadata:Reflect.js",
     ],
     deps = [":hello_world"],
 )

modules/playground/src/http/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 
 package(default_visibility = ["//modules/playground:__subpackages__"])
 
@@ -14,7 +14,7 @@ ng_module(
         "//packages/http",
         "//packages/platform-browser",
         "//packages/platform-browser-dynamic",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
 
@@ -25,12 +25,12 @@ ts_devserver(
     index_html = "index.html",
     port = 4200,
     scripts = [
-        "@ngdeps//node_modules/tslib:tslib.js",
+        "@npm//node_modules/tslib:tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@ngdeps//node_modules/zone.js:dist/zone.js",
-        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
+        "@npm//node_modules/zone.js:dist/zone.js",
+        "@npm//node_modules/reflect-metadata:Reflect.js",
     ],
     deps = [":http"],
 )

modules/playground/src/jsonp/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 
 package(default_visibility = ["//modules/playground:__subpackages__"])
 
@@ -24,12 +24,12 @@ ts_devserver(
     index_html = "index.html",
     port = 4200,
     scripts = [
-        "@ngdeps//node_modules/tslib:tslib.js",
+        "@npm//node_modules/tslib:tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@ngdeps//node_modules/zone.js:dist/zone.js",
-        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
+        "@npm//node_modules/zone.js:dist/zone.js",
+        "@npm//node_modules/reflect-metadata:Reflect.js",
     ],
     deps = [":jsonp"],
 )

modules/playground/src/key_events/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 
 package(default_visibility = ["//modules/playground:__subpackages__"])
 
@@ -22,12 +22,12 @@ ts_devserver(
     index_html = "index.html",
     port = 4200,
     scripts = [
-        "@ngdeps//node_modules/tslib:tslib.js",
+        "@npm//node_modules/tslib:tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@ngdeps//node_modules/zone.js:dist/zone.js",
-        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
+        "@npm//node_modules/zone.js:dist/zone.js",
+        "@npm//node_modules/reflect-metadata:Reflect.js",
     ],
     deps = [":key_events"],
 )

modules/playground/src/model_driven_forms/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 
 package(default_visibility = ["//modules/playground:__subpackages__"])
 
@@ -23,12 +23,12 @@ ts_devserver(
     index_html = "index.html",
     port = 4200,
     scripts = [
-        "@ngdeps//node_modules/tslib:tslib.js",
+        "@npm//node_modules/tslib:tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@ngdeps//node_modules/zone.js:dist/zone.js",
-        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
+        "@npm//node_modules/zone.js:dist/zone.js",
+        "@npm//node_modules/reflect-metadata:Reflect.js",
     ],
     deps = [":model_driven_forms"],
 )

modules/playground/src/order_management/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 
 package(default_visibility = ["//modules/playground:__subpackages__"])
 
@@ -23,12 +23,12 @@ ts_devserver(
     index_html = "index.html",
     port = 4200,
     scripts = [
-        "@ngdeps//node_modules/tslib:tslib.js",
+        "@npm//node_modules/tslib:tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@ngdeps//node_modules/zone.js:dist/zone.js",
-        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
+        "@npm//node_modules/zone.js:dist/zone.js",
+        "@npm//node_modules/reflect-metadata:Reflect.js",
     ],
     deps = [":order_management"],
 )

modules/playground/src/person_management/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 
 package(default_visibility = ["//modules/playground:__subpackages__"])
 
@@ -23,12 +23,12 @@ ts_devserver(
     index_html = "index.html",
     port = 4200,
     scripts = [
-        "@ngdeps//node_modules/tslib:tslib.js",
+        "@npm//node_modules/tslib:tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@ngdeps//node_modules/zone.js:dist/zone.js",
-        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
+        "@npm//node_modules/zone.js:dist/zone.js",
+        "@npm//node_modules/reflect-metadata:Reflect.js",
     ],
     deps = [":person_management"],
 )

modules/playground/src/relative_assets/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 
 package(default_visibility = ["//modules/playground:__subpackages__"])
 
@@ -17,7 +17,7 @@ ng_module(
         "//packages/platform-browser",
         "//packages/platform-browser-dynamic",
         # Needed because the example uses "module.id" in order to load assets relatively.
-        "@ngdeps//@types/node",
+        "@npm//@types/node",
     ],
 )
 
@@ -31,12 +31,12 @@ ts_devserver(
     index_html = "index.html",
     port = 4200,
     scripts = [
-        "@ngdeps//node_modules/tslib:tslib.js",
+        "@npm//node_modules/tslib:tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@ngdeps//node_modules/zone.js:dist/zone.js",
-        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
+        "@npm//node_modules/zone.js:dist/zone.js",
+        "@npm//node_modules/reflect-metadata:Reflect.js",
     ],
     deps = [":relative_assets"],
 )

modules/playground/src/routing/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 
 package(default_visibility = ["//modules/playground:__subpackages__"])
 
@@ -15,7 +15,7 @@ ng_module(
         "//packages/platform-browser",
         "//packages/platform-browser-dynamic",
         "//packages/router",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
 
@@ -26,15 +26,15 @@ ts_devserver(
         # there is only one RxJS UMD bundle that re-exports everything at the root.
         "//modules/playground:systemjs-rxjs-operators.js",
         "//third_party/fonts.google.com/open-sans",
-        "@ngdeps//node_modules/rxjs:bundles/rxjs.umd.js",
-        "@ngdeps//node_modules/tslib:tslib.js",
+        "@npm//node_modules/rxjs:bundles/rxjs.umd.js",
+        "@npm//node_modules/tslib:tslib.js",
     ] + glob(["**/*.css"]),
     port = 4200,
     static_files = [
         "index.html",
-        "@ngdeps//node_modules/zone.js:dist/zone.js",
-        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
-        "@ngdeps//node_modules/systemjs:dist/system.js",
+        "@npm//node_modules/zone.js:dist/zone.js",
+        "@npm//node_modules/reflect-metadata:Reflect.js",
+        "@npm//node_modules/systemjs:dist/system.js",
         "//modules/playground:systemjs-config.js",
         "load-app.js",
     ],

modules/playground/src/routing/index.html

@@ -14,9 +14,9 @@
   This is because we want to use SystemJS instead of RequireJS and want to support
   lazy loading of routes. Read more in the "load-app.js" file.
 -->
-<script src="ngdeps/node_modules/zone.js/dist/zone.js"></script>
-<script src="ngdeps/node_modules/reflect-metadata/Reflect.js"></script>
-<script src="ngdeps/node_modules/systemjs/dist/system.js"></script>
+<script src="npm/node_modules/zone.js/dist/zone.js"></script>
+<script src="npm/node_modules/reflect-metadata/Reflect.js"></script>
+<script src="npm/node_modules/systemjs/dist/system.js"></script>
 <script src="angular/modules/playground/systemjs-config.js"></script>
 <script src="load-app.js"></script>
 </html>

modules/playground/src/sourcemap/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 
 package(default_visibility = ["//modules/playground:__subpackages__"])
 
@@ -26,12 +26,12 @@ ts_devserver(
     index_html = "index.html",
     port = 4200,
     scripts = [
-        "@ngdeps//node_modules/tslib:tslib.js",
+        "@npm//node_modules/tslib:tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@ngdeps//node_modules/zone.js:dist/zone.js",
-        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
+        "@npm//node_modules/zone.js:dist/zone.js",
+        "@npm//node_modules/reflect-metadata:Reflect.js",
     ],
     deps = [":sourcemap"],
 )

modules/playground/src/svg/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 
 package(default_visibility = ["//modules/playground:__subpackages__"])
 
@@ -22,12 +22,12 @@ ts_devserver(
     index_html = "index.html",
     port = 4200,
     scripts = [
-        "@ngdeps//node_modules/tslib:tslib.js",
+        "@npm//node_modules/tslib:tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@ngdeps//node_modules/zone.js:dist/zone.js",
-        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
+        "@npm//node_modules/zone.js:dist/zone.js",
+        "@npm//node_modules/reflect-metadata:Reflect.js",
     ],
     deps = [":svg"],
 )

modules/playground/src/template_driven_forms/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 
 package(default_visibility = ["//modules/playground:__subpackages__"])
 
@@ -23,12 +23,12 @@ ts_devserver(
     index_html = "index.html",
     port = 4200,
     scripts = [
-        "@ngdeps//node_modules/tslib:tslib.js",
+        "@npm//node_modules/tslib:tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@ngdeps//node_modules/zone.js:dist/zone.js",
-        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
+        "@npm//node_modules/zone.js:dist/zone.js",
+        "@npm//node_modules/reflect-metadata:Reflect.js",
     ],
     deps = [":template_driven_forms"],
 )

modules/playground/src/todo/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 
 package(default_visibility = ["//modules/playground:__subpackages__"])
 
@@ -23,10 +23,10 @@ ts_devserver(
     entry_module = "angular/modules/playground/src/todo/index",
     index_html = "index.html",
     port = 4200,
-    scripts = ["@ngdeps//node_modules/tslib:tslib.js"],
+    scripts = ["@npm//node_modules/tslib:tslib.js"],
     static_files = [
-        "@ngdeps//node_modules/zone.js:dist/zone.js",
-        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
+        "@npm//node_modules/zone.js:dist/zone.js",
+        "@npm//node_modules/reflect-metadata:Reflect.js",
     ],
     deps = [":todo"],
 )

modules/playground/src/upgrade/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ts_library")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 
 package(default_visibility = ["//modules/playground:__subpackages__"])
 
@@ -22,13 +22,13 @@ ts_devserver(
     index_html = "index.html",
     port = 4200,
     scripts = [
-        "@ngdeps//node_modules/tslib:tslib.js",
+        "@npm//node_modules/tslib:tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@ngdeps//node_modules/zone.js:dist/zone.js",
-        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
-        "@ngdeps//node_modules/angular:angular.js",
+        "@npm//node_modules/zone.js:dist/zone.js",
+        "@npm//node_modules/reflect-metadata:Reflect.js",
+        "@npm//node_modules/angular:angular.js",
     ],
     deps = [":upgrade"],
 )

modules/playground/src/web_workers/BUILD.bazel

@@ -6,8 +6,8 @@ filegroup(
     data = [
         "//modules/playground:systemjs-config.js",
         "//modules/playground:systemjs-rxjs-operators.js",
-        "@ngdeps//reflect-metadata",
-        "@ngdeps//systemjs",
-        "@ngdeps//zone.js",
+        "@npm//reflect-metadata",
+        "@npm//systemjs",
+        "@npm//zone.js",
     ],
 )

modules/playground/src/web_workers/animations/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 
 package(default_visibility = ["//modules/playground:__subpackages__"])
 
@@ -22,13 +22,13 @@ ts_devserver(
     data = [
         "loader.js",
         "//modules/playground/src/web_workers:worker-config",
-        "@ngdeps//node_modules/rxjs:bundles/rxjs.umd.js",
-        "@ngdeps//node_modules/tslib:tslib.js",
+        "@npm//node_modules/rxjs:bundles/rxjs.umd.js",
+        "@npm//node_modules/tslib:tslib.js",
     ],
     entry_module = "angular/modules/playground/src/web_workers/animations/index",
     index_html = "index.html",
     port = 4200,
-    scripts = ["@ngdeps//node_modules/tslib:tslib.js"],
-    static_files = ["@ngdeps//node_modules/zone.js:dist/zone.js"],
+    scripts = ["@npm//node_modules/tslib:tslib.js"],
+    static_files = ["@npm//node_modules/zone.js:dist/zone.js"],
     deps = [":animations"],
 )

modules/playground/src/web_workers/images/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 
 package(default_visibility = ["//modules/playground:__subpackages__"])
 
@@ -14,7 +14,7 @@ ng_module(
         "//packages/core",
         "//packages/platform-webworker",
         "//packages/platform-webworker-dynamic",
-        "@ngdeps//@types/base64-js",
+        "@npm//@types/base64-js",
     ],
 )
 
@@ -24,20 +24,20 @@ ts_devserver(
     additional_root_paths = ["angular"],
     data = [
         "//modules/playground/src/web_workers:worker-config",
-        "@ngdeps//node_modules/base64-js:base64js.min.js",
-        "@ngdeps//node_modules/rxjs:bundles/rxjs.umd.js",
-        "@ngdeps//node_modules/tslib:tslib.js",
+        "@npm//node_modules/base64-js:base64js.min.js",
+        "@npm//node_modules/rxjs:bundles/rxjs.umd.js",
+        "@npm//node_modules/tslib:tslib.js",
         "loader.js",
     ] + glob(["**/*.css"]),
     entry_module = "angular/modules/playground/src/web_workers/images/index",
     index_html = "index.html",
     port = 4200,
-    scripts = ["@ngdeps//node_modules/tslib:tslib.js"],
+    scripts = ["@npm//node_modules/tslib:tslib.js"],
     static_files = [
-        "@ngdeps//node_modules/zone.js:dist/zone.js",
-        "@ngdeps//node_modules/materialize-css:dist/js/materialize.min.js",
-        "@ngdeps//node_modules/materialize-css:dist/css/materialize.min.css",
-        "@ngdeps//node_modules/jquery:dist/jquery.min.js",
+        "@npm//node_modules/zone.js:dist/zone.js",
+        "@npm//node_modules/materialize-css:dist/js/materialize.min.js",
+        "@npm//node_modules/materialize-css:dist/css/materialize.min.css",
+        "@npm//node_modules/jquery:dist/jquery.min.js",
         "//third_party/github.com/google/material-design-icons",
     ],
     deps = [":images"],

modules/playground/src/web_workers/images/loader.js

@@ -10,7 +10,7 @@ importScripts('angular/modules/playground/src/web_workers/worker-configure.js');
 
 System.config({
   map: {
-    'base64-js': 'ngdeps/node_modules/base64-js/base64js.min.js',
+    'base64-js': 'npm/node_modules/base64-js/base64js.min.js',
   },
   packages: {'angular/modules/playground/src/web_workers': {defaultExtension: 'js'}}
 });

modules/playground/src/web_workers/input/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 
 package(default_visibility = ["//modules/playground:__subpackages__"])
 
@@ -21,16 +21,16 @@ ts_devserver(
     data = [
         "loader.js",
         "//modules/playground/src/web_workers:worker-config",
-        "@ngdeps//node_modules/rxjs:bundles/rxjs.umd.js",
-        "@ngdeps//node_modules/tslib:tslib.js",
+        "@npm//node_modules/rxjs:bundles/rxjs.umd.js",
+        "@npm//node_modules/tslib:tslib.js",
     ],
     entry_module = "angular/modules/playground/src/web_workers/input/index",
     index_html = "index.html",
     port = 4200,
     scripts = [
-        "@ngdeps//node_modules/tslib:tslib.js",
+        "@npm//node_modules/tslib:tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
-    static_files = ["@ngdeps//node_modules/zone.js:dist/zone.js"],
+    static_files = ["@npm//node_modules/zone.js:dist/zone.js"],
     deps = [":input"],
 )

modules/playground/src/web_workers/kitchen_sink/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 
 package(default_visibility = ["//modules/playground:__subpackages__"])
 
@@ -21,16 +21,16 @@ ts_devserver(
     data = [
         "loader.js",
         "//modules/playground/src/web_workers:worker-config",
-        "@ngdeps//node_modules/rxjs:bundles/rxjs.umd.js",
-        "@ngdeps//node_modules/tslib:tslib.js",
+        "@npm//node_modules/rxjs:bundles/rxjs.umd.js",
+        "@npm//node_modules/tslib:tslib.js",
     ],
     entry_module = "angular/modules/playground/src/web_workers/kitchen_sink/index",
     index_html = "index.html",
     port = 4200,
     scripts = [
-        "@ngdeps//node_modules/tslib:tslib.js",
+        "@npm//node_modules/tslib:tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
-    static_files = ["@ngdeps//node_modules/zone.js:dist/zone.js"],
+    static_files = ["@npm//node_modules/zone.js:dist/zone.js"],
     deps = [":kitchen_sink"],
 )

modules/playground/src/web_workers/message_broker/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 
 package(default_visibility = ["//modules/playground:__subpackages__"])
 
@@ -21,16 +21,16 @@ ts_devserver(
     data = [
         "loader.js",
         "//modules/playground/src/web_workers:worker-config",
-        "@ngdeps//node_modules/rxjs:bundles/rxjs.umd.js",
-        "@ngdeps//node_modules/tslib:tslib.js",
+        "@npm//node_modules/rxjs:bundles/rxjs.umd.js",
+        "@npm//node_modules/tslib:tslib.js",
     ],
     entry_module = "angular/modules/playground/src/web_workers/message_broker/index",
     index_html = "index.html",
     port = 4200,
     scripts = [
-        "@ngdeps//node_modules/tslib:tslib.js",
+        "@npm//node_modules/tslib:tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
-    static_files = ["@ngdeps//node_modules/zone.js:dist/zone.js"],
+    static_files = ["@npm//node_modules/zone.js:dist/zone.js"],
     deps = [":message_broker"],
 )

modules/playground/src/web_workers/router/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 
 package(default_visibility = ["//modules/playground:__subpackages__"])
 
@@ -15,7 +15,7 @@ ng_module(
         "//packages/platform-webworker",
         "//packages/platform-webworker-dynamic",
         "//packages/router",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
 
@@ -24,16 +24,16 @@ ts_devserver(
     data = [
         "loader.js",
         "//modules/playground/src/web_workers:worker-config",
-        "@ngdeps//node_modules/rxjs:bundles/rxjs.umd.js",
-        "@ngdeps//node_modules/tslib:tslib.js",
+        "@npm//node_modules/rxjs:bundles/rxjs.umd.js",
+        "@npm//node_modules/tslib:tslib.js",
     ],
     entry_module = "angular/modules/playground/src/web_workers/router/index",
     index_html = "index.html",
     port = 4200,
     scripts = [
-        "@ngdeps//node_modules/tslib:tslib.js",
+        "@npm//node_modules/tslib:tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
-    static_files = ["@ngdeps//node_modules/zone.js:dist/zone.js"],
+    static_files = ["@npm//node_modules/zone.js:dist/zone.js"],
     deps = [":router"],
 )

modules/playground/src/web_workers/todo/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 
 package(default_visibility = ["//modules/playground:__subpackages__"])
 
@@ -24,16 +24,16 @@ ts_devserver(
         "css/main.css",
         "loader.js",
         "//modules/playground/src/web_workers:worker-config",
-        "@ngdeps//node_modules/rxjs:bundles/rxjs.umd.js",
-        "@ngdeps//node_modules/tslib:tslib.js",
+        "@npm//node_modules/rxjs:bundles/rxjs.umd.js",
+        "@npm//node_modules/tslib:tslib.js",
     ],
     entry_module = "angular/modules/playground/src/web_workers/todo/index",
     index_html = "index.html",
     port = 4200,
     scripts = [
-        "@ngdeps//node_modules/tslib:tslib.js",
+        "@npm//node_modules/tslib:tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
-    static_files = ["@ngdeps//node_modules/zone.js:dist/zone.js"],
+    static_files = ["@npm//node_modules/zone.js:dist/zone.js"],
     deps = [":todo"],
 )

modules/playground/src/web_workers/worker-configure.js

@@ -6,9 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-importScripts('ngdeps/node_modules/reflect-metadata/Reflect.js');
-importScripts('ngdeps/node_modules/zone.js/dist/zone.js');
-importScripts('ngdeps/node_modules/zone.js/dist/long-stack-trace-zone.js');
-importScripts('ngdeps/node_modules/systemjs/dist/system.js');
+importScripts('npm/node_modules/reflect-metadata/Reflect.js');
+importScripts('npm/node_modules/zone.js/dist/zone.js');
+importScripts('npm/node_modules/zone.js/dist/long-stack-trace-zone.js');
+importScripts('npm/node_modules/systemjs/dist/system.js');
 
 importScripts('angular/modules/playground/systemjs-config.js');

modules/playground/src/zippy_component/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 
 package(default_visibility = ["//modules/playground:__subpackages__"])
 
@@ -23,12 +23,12 @@ ts_devserver(
     index_html = "index.html",
     port = 4200,
     scripts = [
-        "@ngdeps//node_modules/tslib:tslib.js",
+        "@npm//node_modules/tslib:tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@ngdeps//node_modules/zone.js:dist/zone.js",
-        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
+        "@npm//node_modules/zone.js:dist/zone.js",
+        "@npm//node_modules/reflect-metadata:Reflect.js",
     ],
     deps = [":zippy_component"],
 )

modules/playground/systemjs-config.js

@@ -30,8 +30,8 @@ const angularPackages = [
 
 const packagesConfig = {};
 const mapConfig = {
-  'tslib': 'ngdeps/node_modules/tslib/tslib.js',
-  'rxjs': 'ngdeps/node_modules/rxjs/bundles/rxjs.umd.js',
+  'tslib': 'npm/node_modules/tslib/tslib.js',
+  'rxjs': 'npm/node_modules/rxjs/bundles/rxjs.umd.js',
   'rxjs/operators': 'angular/modules/playground/systemjs-rxjs-operators.js',
 };
 

package.json

@@ -31,13 +31,14 @@
   },
   "// 1": "dependencies are used locally and by bazel",
   "dependencies": {
+    "@angular/bazel": "file:./tools/npm/@angular_bazel",
     "@angular-devkit/architect": "^0.13.2",
     "@angular-devkit/build-optimizer": "^0.13.2",
     "@angular-devkit/core": "^7.3.2",
     "@angular-devkit/schematics": "^7.3.2",
-    "@bazel/jasmine": "0.26.0-beta.0",
-    "@bazel/karma": "0.26.0-beta.0",
-    "@bazel/typescript": "0.26.0-beta.0",
+    "@bazel/jasmine": "0.26.0",
+    "@bazel/karma": "0.26.0",
+    "@bazel/typescript": "0.26.0",
     "@microsoft/api-extractor": "^7.0.17",
     "@schematics/angular": "^7.3.2",
     "@types/angular": "^1.6.47",

packages/BUILD.bazel

@@ -5,15 +5,15 @@ exports_files([
     "tsconfig.json",
 ])
 
-load("@npm_bazel_typescript//:defs.bzl", "ts_config")
+load("@npm_bazel_typescript//:index.bzl", "ts_config")
 load("//tools:defaults.bzl", "ts_library")
 
 ts_library(
     name = "types",
     srcs = glob(["*.ts"]),
     deps = [
-        "@ngdeps//@types/hammerjs",
-        "@ngdeps//zone.js",
+        "@npm//@types/hammerjs",
+        "@npm//zone.js",
     ],
 )
 

packages/bazel/BUILD.bazel

@@ -21,8 +21,6 @@ npm_package(
     replacements = {
         "(#|\/\/)\\s+BEGIN-DEV-ONLY[\\w\W]+?(#|\/\/)\\s+END-DEV-ONLY": "",
         "//packages/bazel/": "//",
-        "@ngdeps//": "@npm//",
-        "@angular//:@angular/bazel/ngc-wrapped": "@npm//@angular/bazel/bin:ngc-wrapped",
         "angular/packages/bazel/": "npm_angular_bazel/",
     },
     tags = ["release-with-framework"],

packages/bazel/docs/BUILD.bazel

@@ -5,7 +5,6 @@ skylark_doc(
     srcs = [
         "//packages/bazel/src:ng_module.bzl",
         "//packages/bazel/src:ng_rollup_bundle.bzl",
-        "//packages/bazel/src:ng_setup_workspace.bzl",
         "//packages/bazel/src/ng_package:ng_package.bzl",
         "//packages/bazel/src/protractor:protractor_web_test.bzl",
     ],

packages/bazel/index.bzl

@@ -14,12 +14,17 @@ load(
     _protractor_web_test_suite = "protractor_web_test_suite",
 )
 load("//packages/bazel/src:ng_module.bzl", _ng_module = "ng_module")
-load("//packages/bazel/src:ng_setup_workspace.bzl", _ng_setup_workspace = "ng_setup_workspace")
 
 ng_module = _ng_module
 ng_package = _ng_package
 protractor_web_test = _protractor_web_test
 protractor_web_test_suite = _protractor_web_test_suite
-ng_setup_workspace = _ng_setup_workspace
 # DO NOT ADD PUBLIC API without including in the documentation generation
 # Run `yarn bazel build //packages/bazel/docs` to verify
+
+def ng_setup_workspace():
+    print("""DEPRECATION WARNING:
+    ng_setup_workspace is no longer needed, and will be removed in a future release.
+    We assume you will fetch rules_nodejs in your WORKSPACE file, and no other dependencies remain here.
+    Simply remove any calls to this function and the corresponding load statement.
+    """)

packages/bazel/package.json

@@ -21,7 +21,7 @@
     "@angular-devkit/architect": "^0.10.6",
     "@angular-devkit/core": "^7.0.4",
     "@angular-devkit/schematics": "^7.3.0-rc.0",
-    "@bazel/typescript": "^0.26.0-beta.0",
+    "@bazel/typescript": "^0.26.0",
     "@microsoft/api-extractor": "^7.0.17",
     "@schematics/angular": "^7.0.4",
     "@types/node": "6.0.84",

packages/bazel/src/BUILD.bazel

@@ -13,13 +13,13 @@ load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary")
 nodejs_binary(
     name = "rollup_with_build_optimizer",
     data = [
-        "@ngdeps//@angular-devkit/build-optimizer",
-        "@ngdeps//is-builtin-module",
-        "@ngdeps//rollup",
-        "@ngdeps//rollup-plugin-node-resolve",
-        "@ngdeps//rollup-plugin-sourcemaps",
+        "@npm//@angular-devkit/build-optimizer",
+        "@npm//is-builtin-module",
+        "@npm//rollup",
+        "@npm//rollup-plugin-node-resolve",
+        "@npm//rollup-plugin-sourcemaps",
     ],
-    entry_point = "ngdeps/node_modules/rollup/bin/rollup",
+    entry_point = "npm/node_modules/rollup/bin/rollup",
     install_source_map_support = False,
     visibility = ["//visibility:public"],
 )

packages/bazel/src/api-extractor/BUILD.bazel

@@ -11,9 +11,9 @@ ts_library(
         "index.ts",
     ],
     deps = [
-        "@ngdeps//@bazel/typescript",
-        "@ngdeps//@microsoft/api-extractor",
-        "@ngdeps//@types/node",
+        "@npm//@bazel/typescript",
+        "@npm//@microsoft/api-extractor",
+        "@npm//@types/node",
     ],
 )
 
@@ -22,8 +22,8 @@ nodejs_binary(
     name = "api_extractor",
     data = [
         ":lib",
-        "@ngdeps//@bazel/typescript",
-        "@ngdeps//@microsoft/api-extractor",
+        "@npm//@bazel/typescript",
+        "@npm//@microsoft/api-extractor",
     ],
     entry_point = "angular/packages/bazel/src/api-extractor/index.js",
     visibility = ["//visibility:public"],

packages/bazel/src/builders/BUILD.bazel

@@ -22,9 +22,9 @@ ts_library(
     ],
     module_name = "@angular/bazel/src/builders",
     deps = [
-        "@ngdeps//@angular-devkit/architect",
-        "@ngdeps//@angular-devkit/core",
-        "@ngdeps//@types/node",
-        "@ngdeps//rxjs",
+        "@npm//@angular-devkit/architect",
+        "@npm//@angular-devkit/core",
+        "@npm//@types/node",
+        "@npm//rxjs",
     ],
 )

packages/bazel/src/external.bzl

@@ -33,7 +33,7 @@ compile_ts = _compile_ts
 DEPS_ASPECTS = _DEPS_ASPECTS
 ts_providers_dict_to_struct = _ts_providers_dict_to_struct
 
-DEFAULT_NG_COMPILER = "@angular//:@angular/bazel/ngc-wrapped"
+DEFAULT_NG_COMPILER = "@npm//@angular/bazel/bin:ngc-wrapped"
 DEFAULT_NG_XI18N = "@npm//@angular/bazel/bin:xi18n"
 FLAT_DTS_FILE_SUFFIX = ".bundle.d.ts"
 TsConfigInfo = _TsConfigInfo

packages/bazel/src/ng_package/BUILD.bazel

@@ -3,16 +3,16 @@ package(default_visibility = ["//visibility:public"])
 load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary")
 
 # BEGIN-DEV-ONLY
-load("@npm_bazel_typescript//:defs.bzl", "ts_library")
+load("@npm_bazel_typescript//:index.bzl", "ts_library")
 
 ts_library(
     name = "lib",
     srcs = glob(["*.ts"]),
-    node_modules = "@ngdeps//typescript:typescript__typings",
+    node_modules = "@npm//typescript:typescript__typings",
     tsconfig = ":tsconfig.json",
     deps = [
-        "@ngdeps//@types/node",
-        "@ngdeps//@types/shelljs",
+        "@npm//@types/node",
+        "@npm//@types/shelljs",
     ],
 )
 
@@ -21,7 +21,7 @@ nodejs_binary(
     name = "packager",
     data = [
         "lib",
-        "@ngdeps//shelljs",
+        "@npm//shelljs",
     ],
     entry_point = "angular/packages/bazel/src/ng_package/packager.js",
     install_source_map_support = False,

packages/bazel/src/ng_rollup_bundle.bzl

@@ -43,7 +43,7 @@ PACKAGES = [
 PLUGIN_CONFIG = "{sideEffectFreeModules: [\n%s]}" % ",\n".join(
     ["        '.esm5/{0}'".format(p) for p in PACKAGES],
 )
-BO_ROLLUP = "ngdeps/node_modules/@angular-devkit/build-optimizer/src/build-optimizer/rollup-plugin.js"
+BO_ROLLUP = "npm/node_modules/@angular-devkit/build-optimizer/src/build-optimizer/rollup-plugin.js"
 BO_PLUGIN = "require('%s').default(%s)" % (BO_ROLLUP, PLUGIN_CONFIG)
 
 def _use_plain_rollup(ctx):

packages/bazel/src/ng_setup_workspace.bzl

@@ -1,13 +0,0 @@
-# Copyright Google Inc. All Rights Reserved.
-#
-# Use of this source code is governed by an MIT-style license that can be
-# found in the LICENSE file at https://angular.io/license
-
-"Install toolchain dependencies"
-
-def ng_setup_workspace():
-    """This repository rule should be called from your WORKSPACE file.
-
-    It creates some additional Bazel external repositories that are used internally
-    by the Angular rules.
-    """

packages/bazel/src/ngc-wrapped/BUILD.bazel

@@ -1,5 +1,5 @@
 load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary")
-load("@npm_bazel_typescript//:defs.bzl", "ts_library")
+load("@npm_bazel_typescript//:index.bzl", "ts_library")
 
 ts_library(
     name = "ngc_lib",
@@ -8,7 +8,7 @@ ts_library(
         "index.ts",
     ],
     module_name = "@angular/bazel",
-    node_modules = "@ngdeps//typescript:typescript__typings",
+    node_modules = "@npm//typescript:typescript__typings",
     tsconfig = ":tsconfig.json",
     visibility = [
         "//packages/bazel:__pkg__",
@@ -20,10 +20,10 @@ ts_library(
         # Users will get this dependency from node_modules.
         "//packages/compiler-cli",
         # END-INTERNAL
-        "@ngdeps//@bazel/typescript",
-        "@ngdeps//@types/node",
-        "@ngdeps//tsickle",
-        "@ngdeps//typescript",
+        "@npm//@bazel/typescript",
+        "@npm//@types/node",
+        "@npm//tsickle",
+        "@npm//typescript",
     ],
 )
 
@@ -33,8 +33,8 @@ nodejs_binary(
     data = [
         ":ngc_lib",
         "//packages/bazel/third_party/github.com/bazelbuild/bazel/src/main/protobuf:worker_protocol.proto",
-        "@ngdeps//source-map-support",
-        "@ngdeps//tslib",
+        "@npm//source-map-support",
+        "@npm//tslib",
     ],
     entry_point = "angular/packages/bazel/src/ngc-wrapped/index.js",
     visibility = ["//visibility:public"],
@@ -44,7 +44,7 @@ nodejs_binary(
     name = "xi18n",
     data = [
         ":ngc_lib",
-        "@ngdeps//source-map-support",
+        "@npm//source-map-support",
     ],
     entry_point = "angular/packages/bazel/src/ngc-wrapped/extract_i18n.js",
     visibility = ["//visibility:public"],

packages/bazel/src/protractor/utils/BUILD.bazel

@@ -1,12 +1,12 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@npm_bazel_typescript//:defs.bzl", "ts_library")
+load("@npm_bazel_typescript//:index.bzl", "ts_library")
 
 ts_library(
     name = "utils",
     srcs = ["index.ts"],
     module_name = "@angular/bazel/protractor-utils",
-    node_modules = "@ngdeps//typescript:typescript__typings",
+    node_modules = "@npm//typescript:typescript__typings",
     tsconfig = ":tsconfig.json",
-    deps = ["@ngdeps//@types/node"],
+    deps = ["@npm//@types/node"],
 )

packages/bazel/src/schematics/bazel-workspace/BUILD.bazel

@@ -12,9 +12,9 @@ ts_library(
         "schema.json",
     ],
     deps = [
-        "@ngdeps//@angular-devkit/core",
-        "@ngdeps//@angular-devkit/schematics",
-        "@ngdeps//@schematics/angular",
+        "@npm//@angular-devkit/core",
+        "@npm//@angular-devkit/schematics",
+        "@npm//@schematics/angular",
     ],
 )
 
@@ -29,6 +29,6 @@ ts_library(
     ],
     deps = [
         ":bazel-workspace",
-        "@ngdeps//@angular-devkit/schematics",
+        "@npm//@angular-devkit/schematics",
     ],
 )

packages/bazel/src/schematics/bazel-workspace/files/WORKSPACE.template

@@ -55,11 +55,9 @@ web_test_repositories()
 load("@npm_bazel_karma//:browser_repositories.bzl", "browser_repositories")
 browser_repositories()
 
-load("@npm_bazel_typescript//:defs.bzl", "ts_setup_workspace")
+load("@npm_bazel_typescript//:index.bzl", "ts_setup_workspace")
 ts_setup_workspace()
 <% if (sass) { %>
 load("@io_bazel_rules_sass//sass:sass_repositories.bzl", "sass_repositories")
 sass_repositories()
 <% } %>
-load("@npm_angular_bazel//:index.bzl", "ng_setup_workspace")
-ng_setup_workspace()

packages/bazel/src/schematics/bazel-workspace/files/e2e/BUILD.bazel.template

@@ -1,4 +1,4 @@
-load("@npm_bazel_typescript//:defs.bzl", "ts_library")
+load("@npm_bazel_typescript//:index.bzl", "ts_library")
 load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite")
 
 ts_library(

packages/bazel/src/schematics/bazel-workspace/files/src/BUILD.bazel.template

@@ -1,10 +1,10 @@
 package(default_visibility = ["//visibility:public"])
 
 load("@npm_angular_bazel//:index.bzl", "ng_module")
-load("@npm_bazel_karma//:defs.bzl", "ts_web_test_suite")
+load("@npm_bazel_karma//:index.bzl", "ts_web_test_suite")
 load("@build_bazel_rules_nodejs//:defs.bzl", "rollup_bundle", "history_server")
 load("@build_bazel_rules_nodejs//internal/web_package:web_package.bzl", "web_package")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver", "ts_library")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver", "ts_library")
 <% if (sass) { %>load("@io_bazel_rules_sass//:defs.bzl", "multi_sass_binary")
 
 multi_sass_binary(

packages/bazel/src/schematics/bazel-workspace/index.ts

@@ -57,8 +57,8 @@ export default function(options: BazelWorkspaceOptions): Rule {
     }
 
     const workspaceVersions = {
-      'RULES_NODEJS_VERSION': '0.18.6',
-      'RULES_NODEJS_SHA256': '1416d03823fed624b49a0abbd9979f7c63bbedfd37890ddecedd2fe25cccebc6',
+      'RULES_NODEJS_VERSION': '0.26.0',
+      'RULES_NODEJS_SHA256': '5c86b055c57e15bf32d9009a15bcd6d8e190c41b1ff2fb18037b75e0012e4e7c',
       'RULES_SASS_VERSION': '1.17.2',
       'RULES_SASS_SHA256': 'e5316ee8a09d1cbb732d3938b400836bf94dba91a27476e9e27706c4c0edae1f',
     };

packages/bazel/src/schematics/ng-add/BUILD.bazel

@@ -14,10 +14,10 @@ ts_library(
     deps = [
         "//packages/bazel/src/schematics/bazel-workspace",
         "//packages/bazel/src/schematics/utility",
-        "@ngdeps//@angular-devkit/core",
-        "@ngdeps//@angular-devkit/schematics",
-        "@ngdeps//@schematics/angular",
-        "@ngdeps//typescript",
+        "@npm//@angular-devkit/core",
+        "@npm//@angular-devkit/schematics",
+        "@npm//@schematics/angular",
+        "@npm//typescript",
     ],
 )
 
@@ -32,6 +32,6 @@ ts_library(
     ],
     deps = [
         ":ng-add",
-        "@ngdeps//@angular-devkit/schematics",
+        "@npm//@angular-devkit/schematics",
     ],
 )

packages/bazel/src/schematics/ng-add/index.ts

@@ -46,7 +46,7 @@ function addDevDependenciesToPackageJson(options: Schema) {
       '@angular/upgrade': angularCoreVersion,
       '@bazel/bazel': '^0.22.1',
       '@bazel/ibazel': '^0.9.0',
-      '@bazel/karma': '^0.25.1',
+      '@bazel/karma': '^0.26.0',
     };
 
     const recorder = host.beginUpdate(packageJson);

packages/bazel/src/schematics/ng-new/BUILD.bazel

@@ -13,8 +13,8 @@ ts_library(
     ],
     deps = [
         "//packages/bazel/src/schematics/ng-add",
-        "@ngdeps//@angular-devkit/schematics",
-        "@ngdeps//@schematics/angular",
+        "@npm//@angular-devkit/schematics",
+        "@npm//@schematics/angular",
     ],
 )
 
@@ -29,6 +29,6 @@ ts_library(
     ],
     deps = [
         ":ng-new",
-        "@ngdeps//@angular-devkit/schematics",
+        "@npm//@angular-devkit/schematics",
     ],
 )

packages/bazel/src/schematics/utility/BUILD.bazel

@@ -9,10 +9,10 @@ ts_library(
     ],
     module_name = "@angular/bazel/src/schematics/utility",
     deps = [
-        "@ngdeps//@angular-devkit/core",
-        "@ngdeps//@angular-devkit/schematics",
-        "@ngdeps//@schematics/angular",
-        "@ngdeps//typescript",
+        "@npm//@angular-devkit/core",
+        "@npm//@angular-devkit/schematics",
+        "@npm//@schematics/angular",
+        "@npm//typescript",
     ],
 )
 
@@ -24,7 +24,7 @@ ts_library(
     ],
     deps = [
         ":utility",
-        "@ngdeps//@angular-devkit/core",
-        "@ngdeps//@angular-devkit/schematics",
+        "@npm//@angular-devkit/core",
+        "@npm//@angular-devkit/schematics",
     ],
 )

packages/bazel/test/ng_package/BUILD.bazel

@@ -13,7 +13,7 @@ ts_library(
     deps = [
         "//packages:types",
         "//packages/private/testing",
-        "@ngdeps//@types/shelljs",
+        "@npm//@types/shelljs",
     ],
 )
 
@@ -22,8 +22,8 @@ jasmine_node_test(
     srcs = [":core_spec_lib"],
     data = [
         "//packages/core:npm_package",
-        "@ngdeps//@types/shelljs",
-        "@ngdeps//shelljs",
+        "@npm//@types/shelljs",
+        "@npm//shelljs",
     ],
 )
 
@@ -34,7 +34,7 @@ ts_library(
     deps = [
         "//packages:types",
         "//packages/private/testing",
-        "@ngdeps//@types/shelljs",
+        "@npm//@types/shelljs",
     ],
 )
 
@@ -43,7 +43,7 @@ jasmine_node_test(
     srcs = [":common_spec_lib"],
     data = [
         "//packages/common:npm_package",
-        "@ngdeps//shelljs",
+        "@npm//shelljs",
     ],
 )
 
@@ -53,7 +53,7 @@ ts_library(
     srcs = ["example_package.spec.ts"],
     deps = [
         "//packages:types",
-        "@ngdeps//@types/diff",
+        "@npm//@types/diff",
     ],
 )
 
@@ -68,7 +68,7 @@ jasmine_node_test(
     # file is based on non-ivy output and therefore won't work for ngc and Ivy at the same time.
     # TODO: We should be able to have another golden for ivy-aot as well.
     tags = ["no-ivy-aot"],
-    deps = ["@ngdeps//diff"],
+    deps = ["@npm//diff"],
 )
 
 nodejs_binary(
@@ -78,7 +78,7 @@ nodejs_binary(
         "example_package.golden",
         ":example_spec_lib",
         "//packages/bazel/test/ng_package/example:npm_package",
-        "@ngdeps//diff",
+        "@npm//diff",
     ],
     entry_point = "angular/packages/bazel/test/ng_package/example_package.spec.js",
     templated_args = ["--accept"],

packages/bazel/test/ng_package/example/BUILD.bazel

@@ -9,7 +9,7 @@ ng_module(
     module_name = "example",
     deps = [
         "//packages/bazel/test/ng_package/example/secondary",
-        "@ngdeps//@types",
+        "@npm//@types",
     ],
 )
 

packages/bazel/test/ng_package/example/secondary/BUILD.bazel

@@ -9,6 +9,6 @@ ng_module(
     module_name = "example/secondary",
     deps = [
         "//packages/core",
-        "@ngdeps//@types",
+        "@npm//@types",
     ],
 )

packages/bazel/test/ngc-wrapped/BUILD.bazel

@@ -12,7 +12,7 @@ ts_library(
     deps = [
         "//packages/bazel/src/ngc-wrapped:ngc_lib",
         "//packages/compiler-cli",
-        "@ngdeps//typescript",
+        "@npm//typescript",
     ],
 )
 

packages/bazel/test/ngc-wrapped/empty/BUILD.bazel

@@ -8,6 +8,6 @@ ng_module(
     tsconfig = ":tsconfig.json",
     deps = [
         "//packages/core",
-        "@ngdeps//@types",
+        "@npm//@types",
     ],
 )

packages/bazel/test/ngc-wrapped/tsconfig_template.ts

@@ -71,7 +71,7 @@ export function createTsConfig(options: TsConfigOptions) {
       'tsickleExternsPath': '',
       // we don't copy the node_modules into our tmp dir, so we should look in
       // the original workspace directory for it
-      'nodeModulesPrefix': '../ngdeps/node_modules',
+      'nodeModulesPrefix': '../npm/node_modules',
     },
     'files': options.files,
     'angularCompilerOptions': {

packages/bazel/test/protractor-2/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//packages/bazel:index.bzl", "protractor_web_test_suite")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 load("@build_bazel_rules_nodejs//:defs.bzl", "http_server", "rollup_bundle")
 load("//tools:defaults.bzl", "ts_library")
 
@@ -36,8 +36,8 @@ ts_library(
     srcs = ["test.spec.ts"],
     tsconfig = ":tsconfig.test.json",
     deps = [
-        "@ngdeps//@types/selenium-webdriver",
-        "@ngdeps//protractor",
+        "@npm//@types/selenium-webdriver",
+        "@npm//protractor",
     ],
 )
 
@@ -49,7 +49,7 @@ protractor_web_test_suite(
     server = ":prodserver",
     deps = [
         ":ts_spec",
-        "@ngdeps//protractor",
+        "@npm//protractor",
     ],
 )
 
@@ -61,6 +61,6 @@ protractor_web_test_suite(
     server = ":devserver",
     deps = [
         ":ts_spec",
-        "@ngdeps//protractor",
+        "@npm//protractor",
     ],
 )

packages/bazel/test/protractor-utils/BUILD.bazel

@@ -14,7 +14,7 @@ nodejs_binary(
     testonly = True,
     data = [
         "fake-devserver.js",
-        "@ngdeps//minimist",
+        "@npm//minimist",
     ],
     entry_point = "angular/packages/bazel/test/protractor-utils/fake-devserver.js",
 )

packages/bazel/test/protractor/BUILD.bazel

@@ -7,8 +7,8 @@ ts_library(
     srcs = ["test.spec.ts"],
     tsconfig = ":tsconfig.json",
     deps = [
-        "@ngdeps//@types/selenium-webdriver",
-        "@ngdeps//protractor",
+        "@npm//@types/selenium-webdriver",
+        "@npm//protractor",
     ],
 )
 
@@ -19,7 +19,7 @@ ts_library(
     tsconfig = ":tsconfig.json",
     deps = [
         "//packages/bazel/src/protractor/utils",
-        "@ngdeps//protractor",
+        "@npm//protractor",
     ],
 )
 
@@ -29,6 +29,6 @@ protractor_web_test_suite(
     data = ["//packages/bazel/src/protractor/utils"],
     deps = [
         ":ts_spec",
-        "@ngdeps//protractor",
+        "@npm//protractor",
     ],
 )

packages/benchpress/BUILD.bazel

@@ -13,8 +13,8 @@ ts_library(
     deps = [
         "//packages:types",
         "//packages/core",
-        "@ngdeps//@types/node",
-        "@ngdeps//reflect-metadata",
+        "@npm//@types/node",
+        "@npm//reflect-metadata",
     ],
 )
 

packages/benchpress/test/BUILD.bazel

@@ -9,7 +9,7 @@ ts_library(
         "//packages/benchpress",
         "//packages/core",
         "//packages/core/testing",
-        "@ngdeps//protractor",
+        "@npm//protractor",
     ],
 )
 
@@ -21,6 +21,6 @@ jasmine_node_test(
         "//packages/benchpress",
         "//packages/core/testing",
         "//tools/testing:node",
-        "@ngdeps//protractor",
+        "@npm//protractor",
     ],
 )

packages/common/BUILD.bazel

@@ -12,7 +12,7 @@ ng_module(
     ),
     deps = [
         "//packages/core",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
 

packages/common/http/BUILD.bazel

@@ -15,6 +15,6 @@ ng_module(
     deps = [
         "//packages/common",
         "//packages/core",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )

packages/common/http/test/BUILD.bazel

@@ -13,7 +13,7 @@ ts_library(
         "//packages/common/http/testing",
         "//packages/core",
         "//packages/core/testing",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )