From ea495d958f976a659adbb5a83e24997093eebcf8 Mon Sep 17 00:00:00 2001
From: Greg Magolan <gmagolan@gmail.com>
Date: Wed, 20 Feb 2019 09:54:42 -0800
Subject: [PATCH] build: rules_nodejs 0.26.0 & use @npm instead of @ngdeps now
 that downstream angular build uses angular bundles (#29063)

* removed /tools/http_server and uses http_server from rules_nodejs
* updated bazel schematics to use angular bundles

PR Close #29063
---
 BUILD.bazel                                   |  44 +--
 WORKSPACE                                     |  51 +--
 index.bzl                                     |  28 --
 .../bazel-schematics/package.json.replace     |  53 ----
 .../bazel-schematics/replace_angular_repo.js  |  46 ---
 integration/bazel-schematics/test.sh          |  25 +-
 integration/bazel-schematics/yarn.lock        | 298 +++++++++---------
 integration/bazel/WORKSPACE                   |  14 +-
 integration/bazel/src/BUILD.bazel             |   2 +-
 integration/bazel/src/hello-world/BUILD.bazel |   4 +-
 integration/bazel/src/package.json            |   4 +-
 integration/bazel/src/yarn.lock               |  51 +--
 integration/bazel/test/e2e/BUILD.bazel        |   2 +-
 karma-js.conf.js                              |   2 +-
 modules/benchmarks/benchmark_test.bzl         |   4 +-
 modules/benchmarks/src/largeform/BUILD.bazel  |   4 +-
 .../benchmarks/src/largeform/ng2/BUILD.bazel  |   8 +-
 modules/benchmarks/src/largetable/BUILD.bazel |   2 +-
 .../src/largetable/baseline/BUILD.bazel       |   2 +-
 .../largetable/incremental_dom/BUILD.bazel    |   4 +-
 .../benchmarks/src/largetable/iv/BUILD.bazel  |   2 +-
 .../benchmarks/src/largetable/ng2/BUILD.bazel |   8 +-
 .../src/largetable/ng2_switch/BUILD.bazel     |   8 +-
 .../src/largetable/render3/BUILD.bazel        |   6 +-
 modules/benchmarks/src/tree/BUILD.bazel       |   6 +-
 .../benchmarks/src/tree/baseline/BUILD.bazel  |   2 +-
 .../src/tree/incremental_dom/BUILD.bazel      |   6 +-
 modules/benchmarks/src/tree/iv/BUILD.bazel    |   2 +-
 modules/benchmarks/src/tree/ng1/BUILD.bazel   |   4 +-
 modules/benchmarks/src/tree/ng2/BUILD.bazel   |   8 +-
 .../benchmarks/src/tree/ng2_next/BUILD.bazel  |   4 +-
 .../src/tree/ng2_static/BUILD.bazel           |   8 +-
 .../src/tree/ng2_switch/BUILD.bazel           |   8 +-
 .../benchmarks/src/tree/render3/BUILD.bazel   |   6 +-
 .../src/tree/render3_function/BUILD.bazel     |   4 +-
 modules/e2e_util/BUILD.bazel                  |  12 +-
 modules/playground/e2e_test/example_test.bzl  |  14 +-
 modules/playground/src/animate/BUILD.bazel    |   8 +-
 modules/playground/src/async/BUILD.bazel      |   8 +-
 modules/playground/src/benchpress/BUILD.bazel |   2 +-
 modules/playground/src/gestures/BUILD.bazel   |  12 +-
 .../playground/src/hello_world/BUILD.bazel    |   8 +-
 modules/playground/src/http/BUILD.bazel       |  10 +-
 modules/playground/src/jsonp/BUILD.bazel      |   8 +-
 modules/playground/src/key_events/BUILD.bazel |   8 +-
 .../src/model_driven_forms/BUILD.bazel        |   8 +-
 .../src/order_management/BUILD.bazel          |   8 +-
 .../src/person_management/BUILD.bazel         |   8 +-
 .../src/relative_assets/BUILD.bazel           |  10 +-
 modules/playground/src/routing/BUILD.bazel    |  14 +-
 modules/playground/src/routing/index.html     |   6 +-
 modules/playground/src/sourcemap/BUILD.bazel  |   8 +-
 modules/playground/src/svg/BUILD.bazel        |   8 +-
 .../src/template_driven_forms/BUILD.bazel     |   8 +-
 modules/playground/src/todo/BUILD.bazel       |   8 +-
 modules/playground/src/upgrade/BUILD.bazel    |  10 +-
 .../playground/src/web_workers/BUILD.bazel    |   6 +-
 .../src/web_workers/animations/BUILD.bazel    |  10 +-
 .../src/web_workers/images/BUILD.bazel        |  20 +-
 .../src/web_workers/images/loader.js          |   2 +-
 .../src/web_workers/input/BUILD.bazel         |  10 +-
 .../src/web_workers/kitchen_sink/BUILD.bazel  |  10 +-
 .../web_workers/message_broker/BUILD.bazel    |  10 +-
 .../src/web_workers/router/BUILD.bazel        |  12 +-
 .../src/web_workers/todo/BUILD.bazel          |  10 +-
 .../src/web_workers/worker-configure.js       |   8 +-
 .../src/zippy_component/BUILD.bazel           |   8 +-
 modules/playground/systemjs-config.js         |   4 +-
 package.json                                  |   6 +-
 packages/BUILD.bazel                          |   6 +-
 packages/bazel/BUILD.bazel                    |   2 -
 packages/bazel/docs/BUILD.bazel               |   1 -
 packages/bazel/index.bzl                      |   9 +-
 packages/bazel/package.json                   |   2 +-
 packages/bazel/src/BUILD.bazel                |  12 +-
 packages/bazel/src/builders/BUILD.bazel       |   8 +-
 packages/bazel/src/external.bzl               |   2 +-
 packages/bazel/src/ng_package/BUILD.bazel     |  10 +-
 packages/bazel/src/ng_rollup_bundle.bzl       |   2 +-
 packages/bazel/src/ng_setup_workspace.bzl     |  13 -
 packages/bazel/src/ngc-wrapped/BUILD.bazel    |  18 +-
 .../bazel/src/protractor/utils/BUILD.bazel    |   6 +-
 packages/bazel/src/schematics/BUILD.bazel     |   1 +
 .../schematics/bazel-workspace/BUILD.bazel    |   8 +-
 .../bazel-workspace/files/WORKSPACE.template  |  17 +-
 .../files/__dot__bazelrc.template             |  10 +
 .../angular-metadata.tsconfig.json.template   |  21 ++
 .../files/e2e/BUILD.bazel.template            |   8 +-
 .../files/src/BUILD.bazel.template            |  73 +++--
 .../bazel-workspace/files/yarn.lock           |   0
 .../src/schematics/bazel-workspace/index.ts   |  47 +--
 .../schematics/bazel-workspace/index_spec.ts  |  30 +-
 .../bazel/src/schematics/ng-new/BUILD.bazel   |  11 +-
 packages/bazel/src/schematics/ng-new/index.ts |  98 +++++-
 .../bazel/src/schematics/utility/BUILD.bazel  |  30 ++
 .../src/schematics/utility/json-utils.ts      |  65 ++++
 .../src/schematics/utility/json-utils_spec.ts | 109 +++++++
 packages/bazel/test/ng_package/BUILD.bazel    |  16 +-
 .../bazel/test/ng_package/example/BUILD.bazel |   2 +-
 .../ng_package/example/secondary/BUILD.bazel  |   2 +-
 packages/bazel/test/ngc-wrapped/BUILD.bazel   |   2 +-
 .../bazel/test/ngc-wrapped/empty/BUILD.bazel  |   2 +-
 .../test/ngc-wrapped/tsconfig_template.ts     |   2 +-
 packages/bazel/test/protractor-2/BUILD.bazel  |  13 +-
 .../bazel/test/protractor-utils/BUILD.bazel   |   2 +-
 packages/bazel/test/protractor/BUILD.bazel    |   8 +-
 packages/benchpress/BUILD.bazel               |   4 +-
 packages/benchpress/test/BUILD.bazel          |   4 +-
 packages/common/BUILD.bazel                   |   2 +-
 packages/common/http/BUILD.bazel              |   2 +-
 packages/common/http/test/BUILD.bazel         |   2 +-
 packages/common/http/testing/BUILD.bazel      |   2 +-
 packages/common/http/testing/test/BUILD.bazel |   2 +-
 packages/common/testing/BUILD.bazel           |   2 +-
 packages/compiler-cli/BUILD.bazel             |  10 +-
 .../compiler-cli/integrationtest/BUILD.bazel  |  34 +-
 .../bazel/injectable_def/app/BUILD.bazel      |   4 +-
 .../bazel/injectable_def/lib1/BUILD.bazel     |   2 +-
 .../bazel/injectable_def/lib2/BUILD.bazel     |   2 +-
 .../injector_def/ivy_build/app/BUILD.bazel    |   2 +-
 .../bazel/ng_module/BUILD.bazel               |   4 +-
 packages/compiler-cli/integrationtest/test.js |   2 +-
 .../integrationtest/test_helpers.js           |  20 +-
 packages/compiler-cli/src/ngcc/BUILD.bazel    |  20 +-
 .../compiler-cli/src/ngcc/test/BUILD.bazel    |  14 +-
 .../src/ngtsc/annotations/BUILD.bazel         |   4 +-
 .../src/ngtsc/annotations/test/BUILD.bazel    |   2 +-
 .../src/ngtsc/diagnostics/BUILD.bazel         |   2 +-
 .../compiler-cli/src/ngtsc/host/BUILD.bazel   |   2 +-
 .../src/ngtsc/metadata/BUILD.bazel            |   4 +-
 .../src/ngtsc/metadata/test/BUILD.bazel       |   2 +-
 .../compiler-cli/src/ngtsc/shims/BUILD.bazel  |   4 +-
 .../compiler-cli/src/ngtsc/switch/BUILD.bazel |   2 +-
 .../src/ngtsc/testing/BUILD.bazel             |   2 +-
 .../src/ngtsc/transform/BUILD.bazel           |   2 +-
 .../src/ngtsc/translator/BUILD.bazel          |   2 +-
 .../src/ngtsc/typecheck/BUILD.bazel           |   2 +-
 .../src/ngtsc/typecheck/test/BUILD.bazel      |   2 +-
 .../compiler-cli/src/ngtsc/util/BUILD.bazel   |   4 +-
 .../src/ngtsc/util/test/BUILD.bazel           |   2 +-
 packages/compiler-cli/test/BUILD.bazel        |  18 +-
 .../compiler-cli/test/compliance/BUILD.bazel  |   2 +-
 .../compiler-cli/test/diagnostics/BUILD.bazel |   8 +-
 .../compiler-cli/test/metadata/BUILD.bazel    |   2 +-
 packages/compiler-cli/test/ngcc/BUILD.bazel   |  12 +-
 packages/compiler-cli/test/ngtsc/BUILD.bazel  |   4 +-
 packages/compiler-cli/test/test_support.ts    |   2 +-
 .../test/transformers/BUILD.bazel             |   4 +-
 packages/compiler/test/BUILD.bazel            |   8 +-
 packages/compiler/testing/BUILD.bazel         |   2 +-
 packages/core/BUILD.bazel                     |   4 +-
 packages/core/test/BUILD.bazel                |  10 +-
 .../test/bundling/animation_world/BUILD.bazel |   4 +-
 .../test/bundling/hello_world/BUILD.bazel     |   4 +-
 .../bundling/hello_world_i18n/BUILD.bazel     |   4 +-
 .../test/bundling/hello_world_r2/BUILD.bazel  |   4 +-
 .../core/test/bundling/injection/BUILD.bazel  |   2 +-
 packages/core/test/bundling/todo/BUILD.bazel  |   8 +-
 .../core/test/bundling/todo_i18n/BUILD.bazel  |   8 +-
 .../core/test/bundling/todo_r2/BUILD.bazel    |   8 +-
 packages/core/test/bundling/util/BUILD.bazel  |   2 +-
 packages/core/test/render3/BUILD.bazel        |   6 +-
 packages/core/testing/BUILD.bazel             |   4 +-
 packages/elements/BUILD.bazel                 |   2 +-
 .../elements/schematics/ng-add/BUILD.bazel    |  10 +-
 packages/elements/test/BUILD.bazel            |  10 +-
 packages/examples/common/BUILD.bazel          |  18 +-
 packages/examples/core/BUILD.bazel            |  18 +-
 packages/examples/core/testing/ts/BUILD.bazel |   4 +-
 packages/examples/forms/BUILD.bazel           |  16 +-
 packages/examples/test-utils/BUILD.bazel      |   2 +-
 packages/examples/testing/BUILD.bazel         |   4 +-
 packages/examples/upgrade/upgrade_example.bzl |  20 +-
 packages/forms/BUILD.bazel                    |   2 +-
 packages/forms/test/BUILD.bazel               |   2 +-
 packages/http/BUILD.bazel                     |   2 +-
 packages/http/test/BUILD.bazel                |   4 +-
 packages/http/testing/BUILD.bazel             |   2 +-
 packages/language-service/BUILD.bazel         |   4 +-
 packages/language-service/bundles/BUILD.bazel |   4 +-
 packages/language-service/test/BUILD.bazel    |   2 +-
 packages/platform-browser/BUILD.bazel         |   4 +-
 .../animations/test/BUILD.bazel               |   2 +-
 packages/platform-browser/test/BUILD.bazel    |   2 +-
 packages/platform-browser/testing/BUILD.bazel |   4 +-
 packages/platform-server/BUILD.bazel          |   6 +-
 packages/platform-server/test/BUILD.bazel     |   2 +-
 packages/platform-webworker/BUILD.bazel       |   2 +-
 packages/router/BUILD.bazel                   |   2 +-
 packages/router/test/BUILD.bazel              |   2 +-
 .../test/aot_ngsummary_test/BUILD.bazel       |   2 +-
 packages/router/testing/BUILD.bazel           |   2 +-
 packages/service-worker/BUILD.bazel           |   2 +-
 packages/service-worker/cli/BUILD.bazel       |   2 +-
 packages/service-worker/test/BUILD.bazel      |   2 +-
 packages/service-worker/testing/BUILD.bazel   |   2 +-
 packages/service-worker/worker/BUILD.bazel    |   2 +-
 .../service-worker/worker/testing/BUILD.bazel |   2 +-
 packages/upgrade/BUILD.bazel                  |   2 +-
 packages/upgrade/test/BUILD.bazel             |   2 +-
 packages/upgrade/test/common/test_helpers.ts  |   2 +-
 tools/BUILD.bazel                             |   2 +-
 tools/defaults.bzl                            |  52 ++-
 tools/http-server/BUILD.bazel                 |   1 -
 tools/http-server/README.md                   |  11 -
 tools/http-server/http_server.bzl             |  20 --
 tools/http-server/package.json                |   9 -
 tools/http-server/yarn.lock                   | 125 --------
 tools/ng_setup_workspace.bzl                  |  46 ---
 tools/npm/@angular_bazel/index.js             |  14 +
 tools/npm/@angular_bazel/package.json         |   6 +
 .../npm_workspace/@angular/bazel/BUILD.bazel  |   8 -
 .../@bazel/typescript/BUILD.bazel             |   8 -
 .../@bazel/typescript/bin/BUILD.bazel         |   7 -
 tools/npm_workspace/BUILD.bazel               |   1 -
 tools/npm_workspace/WORKSPACE                 |   1 -
 tools/rxjs/BUILD.bazel                        |   2 +-
 tools/symbol-extractor/BUILD.bazel            |   4 +-
 tools/symbol-extractor/index.bzl              |   2 +-
 tools/testing/BUILD.bazel                     |   2 +-
 tools/ts-api-guardian/BUILD.bazel             |   2 +-
 yarn.lock                                     |  39 ++-
 222 files changed, 1238 insertions(+), 1300 deletions(-)
 delete mode 100644 index.bzl
 delete mode 100644 integration/bazel-schematics/package.json.replace
 delete mode 100644 integration/bazel-schematics/replace_angular_repo.js
 delete mode 100644 packages/bazel/src/ng_setup_workspace.bzl
 create mode 100644 packages/bazel/src/schematics/bazel-workspace/files/angular-metadata.tsconfig.json.template
 delete mode 100644 packages/bazel/src/schematics/bazel-workspace/files/yarn.lock
 create mode 100644 packages/bazel/src/schematics/utility/BUILD.bazel
 create mode 100644 packages/bazel/src/schematics/utility/json-utils.ts
 create mode 100644 packages/bazel/src/schematics/utility/json-utils_spec.ts
 delete mode 100644 tools/http-server/BUILD.bazel
 delete mode 100644 tools/http-server/README.md
 delete mode 100644 tools/http-server/http_server.bzl
 delete mode 100644 tools/http-server/package.json
 delete mode 100644 tools/http-server/yarn.lock
 delete mode 100644 tools/ng_setup_workspace.bzl
 create mode 100755 tools/npm/@angular_bazel/index.js
 create mode 100644 tools/npm/@angular_bazel/package.json
 delete mode 100644 tools/npm_workspace/@angular/bazel/BUILD.bazel
 delete mode 100644 tools/npm_workspace/@bazel/typescript/BUILD.bazel
 delete mode 100644 tools/npm_workspace/@bazel/typescript/bin/BUILD.bazel
 delete mode 100644 tools/npm_workspace/BUILD.bazel
 delete mode 100644 tools/npm_workspace/WORKSPACE

diff --git a/BUILD.bazel b/BUILD.bazel
index bdd447f8dc..55c4299cdb 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -10,10 +10,10 @@ filegroup(
     name = "web_test_bootstrap_scripts",
     # do not sort
     srcs = [
-        "@ngdeps//node_modules/reflect-metadata:Reflect.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/reflect-metadata:Reflect.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",
     ],
 )
@@ -23,32 +23,14 @@ 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",
     ],
 )
-
-load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary")
-
-# 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"],
-)
diff --git a/WORKSPACE b/WORKSPACE
index 81fe6b5dfa..22f3ee5d41 100644
--- a/WORKSPACE
+++ b/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 = "1416d03823fed624b49a0abbd9979f7c63bbedfd37890ddecedd2fe25cccebc6",
-    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.18.6/rules_nodejs-0.18.6.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,13 @@ 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
+#   - 0.26.0 Fix for data files in yarn_install and npm_install
+check_rules_nodejs_version("0.26.0")
+
 # Setup the Node.js toolchain
 node_repositories(
     node_version = "10.9.0",
@@ -54,13 +52,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 +99,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()
 
diff --git a/index.bzl b/index.bzl
deleted file mode 100644
index f5d5e80371..0000000000
--- a/index.bzl
+++ /dev/null
@@ -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
diff --git a/integration/bazel-schematics/package.json.replace b/integration/bazel-schematics/package.json.replace
deleted file mode 100644
index b892e84f1d..0000000000
--- a/integration/bazel-schematics/package.json.replace
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "name": "demo",
-  "version": "0.0.0",
-  "scripts": {
-    "ng": "ng",
-    "start": "ng serve",
-    "build": "ng build",
-    "test": "ng test",
-    "lint": "ng lint",
-    "e2e": "ng e2e"
-  },
-  "private": true,
-  "dependencies": {
-    "@angular/animations": "file:../angular/dist/packages-dist/animations",
-    "@angular/common": "file:../angular/dist/packages-dist/common",
-    "@angular/compiler": "file:../angular/dist/packages-dist/compiler",
-    "@angular/core": "file:../angular/dist/packages-dist/core",
-    "@angular/forms": "file:../angular/dist/packages-dist/forms",
-    "@angular/platform-browser": "file:../angular/dist/packages-dist/platform-browser",
-    "@angular/platform-browser-dynamic": "file:../angular/dist/packages-dist/platform-browser-dynamic",
-    "@angular/router": "file:../angular/dist/packages-dist/router",
-    "core-js": "^2.5.4",
-    "rxjs": "~6.4.0",
-    "tslib": "^1.9.0",
-    "zone.js": "~0.8.26"
-  },
-  "devDependencies": {
-    "@angular-devkit/build-angular": "~0.12.0",
-    "@angular/bazel": "file:../angular/dist/packages-dist/bazel",
-    "@angular/cli": "~7.2.1",
-    "@angular/compiler-cli": "file:../angular/dist/packages-dist/compiler-cli",
-    "@angular/language-service": "file:../angular/dist/packages-dist/language-service",
-    "@bazel/bazel": "^0.23.0",
-    "@bazel/ibazel": "^0.9.0",
-    "@bazel/karma": "^0.25.1",
-    "@bazel/typescript": "^0.25.1",
-    "@types/node": "~8.9.4",
-    "@types/jasmine": "~2.8.8",
-    "@types/jasminewd2": "~2.0.3",
-    "codelyzer": "~4.5.0",
-    "jasmine-core": "~2.99.1",
-    "jasmine-spec-reporter": "~4.2.1",
-    "karma": "~3.1.1",
-    "karma-chrome-launcher": "~2.2.0",
-    "karma-coverage-istanbul-reporter": "~2.0.1",
-    "karma-jasmine": "~1.1.2",
-    "karma-jasmine-html-reporter": "^0.2.2",
-    "protractor": "~5.4.0",
-    "ts-node": "~7.0.0",
-    "tslint": "~5.11.0",
-    "typescript": "~3.2.2"
-  }
-}
diff --git a/integration/bazel-schematics/replace_angular_repo.js b/integration/bazel-schematics/replace_angular_repo.js
deleted file mode 100644
index 1b5babb0f4..0000000000
--- a/integration/bazel-schematics/replace_angular_repo.js
+++ /dev/null
@@ -1,46 +0,0 @@
-// TODO(kyliau): This file should be removed when we use Angular npm distro from
-// Bazel projects.
-
-const fs = require('fs');
-
-function replaceAngular(content) {
-  const regex = /ANGULAR_VERSION.*\nhttp_archive\((.*\n){4}\)/;
-  if (!regex.test(content)) {
-    throw new Error("Failed to find http_archive rule for Angular in WORKSPACE");
-  }
-  return content.replace(regex, `
-local_repository(
-    name = "angular",
-    path = "../../..",
-)`);
-}
-
-function replaceNpm(content) {
-  const regex = /yarn_install\((.*\n){4}\)/;
-  if (!regex.test(content)) {
-    throw new Error("Failed to find yarn_install rule for Angular in WORKSPACE");
-  }
-  return content.replace(regex, `
-yarn_install(
-    name = "npm",
-    # Need a reference to @angular here so that Bazel sets up the
-    # external repository before calling yarn_install
-    data = ["@angular//:LICENSE"],
-    package_json = "//:package.json",
-    yarn_lock = "//:yarn.lock",
-)`);
-}
-
-function main(argv) {
-  argv = argv.slice(2);
-  if (argv.length !== 1) {
-    throw new Error('Expect WORKSPACE to be first parameter');
-  }
-  const workspace = argv[0];
-  let content = fs.readFileSync(workspace, 'utf-8');
-  content = replaceAngular(content);
-  content = replaceNpm(content);
-  fs.writeFileSync(workspace, content);
-}
-
-main(process.argv)
diff --git a/integration/bazel-schematics/test.sh b/integration/bazel-schematics/test.sh
index de1ebbefdb..b3e4c081b4 100755
--- a/integration/bazel-schematics/test.sh
+++ b/integration/bazel-schematics/test.sh
@@ -2,17 +2,32 @@
 
 set -eux -o pipefail
 
+function installLocalPackages() {
+  # Install Angular packages that are built locally from HEAD.
+  # This also gets around the bug whereby yarn caches local `file://` urls.
+  # See https://github.com/yarnpkg/yarn/issues/2165
+  readonly pwd=$(pwd)
+  readonly packages=(
+    animations common compiler core forms platform-browser
+    platform-browser-dynamic router bazel compiler-cli language-service upgrade
+  )
+  local local_packages=()
+  for package in "${packages[@]}"; do
+    local_packages+=("@angular/${package}@file:${pwd}/../../../dist/packages-dist/${package}")
+  done
+  yarn add "${local_packages[@]}"
+}
+
 function testBazel() {
   # Set up
   bazel version
+  ng version
   rm -rf demo
   # Create project
-  ng new demo --collection=@angular/bazel --defaults --skip-git --style=scss
-  node replace_angular_repo.js "./demo/WORKSPACE"
+  ng new demo --collection=@angular/bazel --defaults --skip-git --skip-install --style=scss
   cd demo
-  yarn add @angular/bazel@file:../../../dist/packages-dist/bazel
-  yarn webdriver-manager update --gecko=false --standalone=false $CI_CHROMEDRIVER_VERSION_ARG
-  cp ../package.json.replace ./package.json
+  installLocalPackages
+  yarn webdriver-manager update --gecko=false --standalone=false ${CI_CHROMEDRIVER_VERSION_ARG:---versions.chrome 2.45}
   ng generate component widget --style=css
   ng build
   ng test
diff --git a/integration/bazel-schematics/yarn.lock b/integration/bazel-schematics/yarn.lock
index 385508f2f2..7d089b6adf 100644
--- a/integration/bazel-schematics/yarn.lock
+++ b/integration/bazel-schematics/yarn.lock
@@ -68,12 +68,12 @@
     rxjs "6.3.3"
 
 "@angular/bazel@file:../../dist/packages-dist/bazel":
-  version "0.0.0"
+  version "7.2.7"
   dependencies:
     "@angular-devkit/architect" "^0.10.6"
     "@angular-devkit/core" "^7.0.4"
     "@angular-devkit/schematics" "^7.3.0-rc.0"
-    "@microsoft/api-extractor" "^7.0.17"
+    "@bazel/typescript" "^0.26.0"
     "@schematics/angular" "^7.0.4"
     "@types/node" "6.0.84"
     semver "^5.6.0"
@@ -119,50 +119,16 @@
     "@bazel/bazel-linux_x64" "0.23.0"
     "@bazel/bazel-win32_x64" "0.23.0"
 
-"@microsoft/api-extractor@^7.0.17":
-  version "7.0.21"
-  resolved "https://registry.yarnpkg.com/@microsoft/api-extractor/-/api-extractor-7.0.21.tgz#d5ff9bba4ff7283503aac83ad489b16cad293fc7"
-  integrity sha512-7lFcHNykVz0tvgOz9juXqP+a1j0EmnJ9J080CBE/171IxL4fBrpslPhqN86dNuavuPragRpBLc8Okv/bV7FJPQ==
+"@bazel/typescript@^0.26.0":
+  version "0.26.0"
+  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.26.0.tgz#c06139d76c8b9d3a3ed98a721b776fedb4b11c82"
+  integrity sha512-dh/Y/SZzmeChsLap8FVHYl0FuaeLh/6t9WBVhm5nOgyVrqfEyVpNzy4W20E4NqnmJY2/PqmD5qncf+Oo1q9h1A==
   dependencies:
-    "@microsoft/node-core-library" "3.12.0"
-    "@microsoft/ts-command-line" "4.2.3"
-    "@microsoft/tsdoc" "0.12.5"
-    "@types/node" "8.5.8"
-    "@types/z-schema" "3.16.31"
-    colors "~1.2.1"
-    lodash "~4.17.5"
-    resolve "1.8.1"
-    typescript "~3.1.6"
-    z-schema "~3.18.3"
-
-"@microsoft/node-core-library@3.12.0":
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/@microsoft/node-core-library/-/node-core-library-3.12.0.tgz#f9c27b8bb6b55d60b91d4e1962f42b03b9f8f47f"
-  integrity sha512-9T2dEXmmxZqnqcpHuIB8mTAOM/DNSi/QcAwKYDjvZvkd+PGT5lCUXjM9GL7SaR2NPa3UrWDGgFhNoqLqLfEPbw==
-  dependencies:
-    "@types/fs-extra" "5.0.4"
-    "@types/jju" "~1.4.0"
-    "@types/node" "8.5.8"
-    "@types/z-schema" "3.16.31"
-    colors "~1.2.1"
-    fs-extra "~7.0.1"
-    jju "~1.4.0"
-    z-schema "~3.18.3"
-
-"@microsoft/ts-command-line@4.2.3":
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/@microsoft/ts-command-line/-/ts-command-line-4.2.3.tgz#20d6a1684148b9fc0df25ee7335c3bb227d47d4f"
-  integrity sha512-SIs4q7RcG7efBbh5Ffrf6V4jVLxWihD4NDRY3+gPiOG8CYawBzE22tTEloZ1yj/FBvBZQkQ0GYwXoPhn6ElYXA==
-  dependencies:
-    "@types/argparse" "1.0.33"
-    "@types/node" "8.5.8"
-    argparse "~1.0.9"
-    colors "~1.2.1"
-
-"@microsoft/tsdoc@0.12.5":
-  version "0.12.5"
-  resolved "https://registry.yarnpkg.com/@microsoft/tsdoc/-/tsdoc-0.12.5.tgz#c448a38902ccb5601c1b2ef3b1a105012ef7712c"
-  integrity sha512-xEAyvLXo4Cter/b0EMCWUZTgXOfLOPJ/Xr52WdjVclPx9eDmNTGFtZl8Pn/nqSnZsQBNcHL0eHk/YyRyyXXpiQ==
+    jasmine-core "2.8.0"
+    protobufjs "5.0.3"
+    semver "5.6.0"
+    source-map-support "0.5.9"
+    tsutils "2.27.2"
 
 "@schematics/angular@7.3.0-rc.0":
   version "7.3.0-rc.0"
@@ -196,43 +162,11 @@
     semver "5.6.0"
     semver-intersect "1.4.0"
 
-"@types/argparse@1.0.33":
-  version "1.0.33"
-  resolved "https://registry.yarnpkg.com/@types/argparse/-/argparse-1.0.33.tgz#2728669427cdd74a99e53c9f457ca2866a37c52d"
-  integrity sha512-VQgHxyPMTj3hIlq9SY1mctqx+Jj8kpQfoLvDlVSDNOyuYs8JYfkuY3OW/4+dO657yPmNhHpePRx0/Tje5ImNVQ==
-
-"@types/fs-extra@5.0.4":
-  version "5.0.4"
-  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-5.0.4.tgz#b971134d162cc0497d221adde3dbb67502225599"
-  integrity sha512-DsknoBvD8s+RFfSGjmERJ7ZOP1HI0UZRA3FSI+Zakhrc/Gy26YQsLI+m5V5DHxroHRJqCDLKJp7Hixn8zyaF7g==
-  dependencies:
-    "@types/node" "*"
-
-"@types/jju@~1.4.0":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@types/jju/-/jju-1.4.1.tgz#0a39f5f8e84fec46150a7b9ca985c3f89ad98e9f"
-  integrity sha512-LFt+YA7Lv2IZROMwokZKiPNORAV5N3huMs3IKnzlE430HWhWYZ8b+78HiwJXJJP1V2IEjinyJURuRJfGoaFSIA==
-
-"@types/node@*":
-  version "11.10.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-11.10.0.tgz#08eeb736ae678ccf9ca0922063f3a08795894ede"
-  integrity sha512-6Mb9+PPq9UzRpQrlPzZAbhEvodWDTnsIakddUAtSDpKYF6eu5zAdW31n8x7UZStvqGnDC7dCJnvU188ylv/Ytw==
-
 "@types/node@6.0.84":
   version "6.0.84"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.84.tgz#193ffe5a9f42864d425ffd9739d95b753c6a1eab"
   integrity sha512-1SvEazClhUBRNroJM3oB3xf3u2r6xGmHDGbdigqNPHvNKLl8/BtATgO9eC04ZLuovpSh0B20BF1QJxdi+qmTlg==
 
-"@types/node@8.5.8":
-  version "8.5.8"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.5.8.tgz#92509422653f10e9c0ac18d87e0610b39f9821c7"
-  integrity sha512-8KmlRxwbKZfjUHFIt3q8TF5S2B+/E5BaAoo/3mgc5h6FJzqxXkCK/VMetO+IRDtwtU6HUvovHMBn+XRj7SV9Qg==
-
-"@types/z-schema@3.16.31":
-  version "3.16.31"
-  resolved "https://registry.yarnpkg.com/@types/z-schema/-/z-schema-3.16.31.tgz#2eb1d00a5e4ec3fa58c76afde12e182b66dc5c1c"
-  integrity sha1-LrHQCl5Ow/pYx2r94S4YK2bcXBw=
-
 "@yarnpkg/lockfile@1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
@@ -333,13 +267,6 @@ are-we-there-yet@~1.1.2:
     delegates "^1.0.0"
     readable-stream "^2.0.6"
 
-argparse@~1.0.9:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
-  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
-  dependencies:
-    sprintf-js "~1.0.2"
-
 arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
@@ -360,6 +287,14 @@ array-unique@^0.3.2:
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
   integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
+ascli@~1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/ascli/-/ascli-1.0.1.tgz#bcfa5974a62f18e81cabaeb49732ab4a88f906bc"
+  integrity sha1-vPpZdKYvGOgcq660lzKrSoj5Brw=
+  dependencies:
+    colour "~0.7.1"
+    optjs "~3.2.2"
+
 assign-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
@@ -442,6 +377,13 @@ builtins@^1.0.3:
   resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
   integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og=
 
+bytebuffer@~5:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/bytebuffer/-/bytebuffer-5.0.1.tgz#582eea4b1a873b6d020a48d58df85f0bba6cfddd"
+  integrity sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0=
+  dependencies:
+    long "~3"
+
 cacache@^11.0.1:
   version "11.3.1"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.1.tgz#d09d25f6c4aca7a6d305d141ae332613aa1d515f"
@@ -497,6 +439,11 @@ cache-base@^1.0.1:
     union-value "^1.0.0"
     unset-value "^1.0.0"
 
+camelcase@^2.0.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
+  integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=
+
 chalk@^2.0.0:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
@@ -558,6 +505,15 @@ cli-width@^2.0.0:
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
   integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
 
+cliui@^3.0.3:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
+  integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=
+  dependencies:
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wrap-ansi "^2.0.0"
+
 code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
@@ -583,15 +539,10 @@ color-name@1.1.3:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
-colors@~1.2.1:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.2.5.tgz#89c7ad9a374bc030df8013241f68136ed8835afc"
-  integrity sha512-erNRLao/Y3Fv54qUa0LBB+//Uf3YwMUmdJinN20yMXm9zdKKqH9wt7R9IIVZ+K7ShzfpLV/Zg8+VyrBJYB4lpg==
-
-commander@^2.7.1:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
-  integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
+colour@~0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/colour/-/colour-0.7.1.tgz#9cb169917ec5d12c0736d3e8685746df1cadf778"
+  integrity sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g=
 
 component-emitter@^1.2.1:
   version "1.2.1"
@@ -666,6 +617,11 @@ debug@^3.1.0:
   dependencies:
     ms "^2.1.1"
 
+decamelize@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
+
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
@@ -865,15 +821,6 @@ from2@^2.1.0:
     inherits "^2.0.1"
     readable-stream "^2.0.0"
 
-fs-extra@~7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
-  integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
-
 fs-minipass@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
@@ -955,7 +902,7 @@ glob@^7.0.0, glob@^7.0.5, glob@^7.1.2, glob@^7.1.3:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2:
   version "4.1.15"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
   integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
@@ -1100,6 +1047,11 @@ interpret@^1.0.0:
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
   integrity sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=
 
+invert-kv@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
+  integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY=
+
 ip@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
@@ -1264,10 +1216,10 @@ isobject@^3.0.0, isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
-jju@~1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/jju/-/jju-1.4.0.tgz#a3abe2718af241a2b2904f84a625970f389ae32a"
-  integrity sha1-o6vicYryQaKykE+EpiWXDzia4yo=
+jasmine-core@2.8.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e"
+  integrity sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=
 
 json-parse-better-errors@^1.0.0:
   version "1.0.2"
@@ -1279,13 +1231,6 @@ json-schema-traverse@^0.4.1:
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
   integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
 
-jsonfile@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
-  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
 jsonparse@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
@@ -1315,26 +1260,28 @@ kind-of@^6.0.0, kind-of@^6.0.2:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
   integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
 
+lcid@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
+  integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=
+  dependencies:
+    invert-kv "^1.0.0"
+
 lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
   integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
 
-lodash.get@^4.0.0:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
-  integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
-
-lodash.isequal@^4.0.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
-  integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
-
-lodash@^4.17.10, lodash@~4.17.5:
+lodash@^4.17.10:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
   integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
 
+long@~3:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b"
+  integrity sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=
+
 lru-cache@^4.1.2, lru-cache@^4.1.3:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
@@ -1682,11 +1629,23 @@ opn@5.4.0:
   dependencies:
     is-wsl "^1.1.0"
 
+optjs@~3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/optjs/-/optjs-3.2.2.tgz#69a6ce89c442a44403141ad2f9b370bd5bb6f4ee"
+  integrity sha1-aabOicRCpEQDFBrS+bNwvVu29O4=
+
 os-homedir@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
   integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
 
+os-locale@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
+  integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=
+  dependencies:
+    lcid "^1.0.0"
+
 os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
@@ -1785,6 +1744,16 @@ promise-retry@^1.1.1:
     err-code "^1.0.0"
     retry "^0.10.0"
 
+protobufjs@5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-5.0.3.tgz#e4dfe9fb67c90b2630d15868249bcc4961467a17"
+  integrity sha512-55Kcx1MhPZX0zTbVosMQEO5R6/rikNXd9b6RQK4KSPcrSIIwoXTtebIczUrXlwaSrbz4x8XUVThGPob1n8I4QA==
+  dependencies:
+    ascli "~1"
+    bytebuffer "~5"
+    glob "^7.0.5"
+    yargs "^3.10.0"
+
 protoduck@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/protoduck/-/protoduck-5.0.1.tgz#03c3659ca18007b69a50fd82a7ebcc516261151f"
@@ -1894,7 +1863,7 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@1.8.1, resolve@^1.1.6:
+resolve@^1.1.6:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
   integrity sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==
@@ -2082,6 +2051,14 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
+source-map-support@0.5.9:
+  version "0.5.9"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f"
+  integrity sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
 source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
@@ -2097,6 +2074,11 @@ source-map@^0.5.6:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
+source-map@^0.6.0:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
+
 spdx-correct@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4"
@@ -2130,11 +2112,6 @@ split-string@^3.0.1, split-string@^3.0.2:
   dependencies:
     extend-shallow "^3.0.0"
 
-sprintf-js@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
-
 ssri@^6.0.0, ssri@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
@@ -2292,17 +2269,24 @@ tsickle@0.34.0:
     mkdirp "^0.5.1"
     source-map "^0.7.3"
 
-tslib@^1.9.0:
+tslib@^1.8.1, tslib@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
   integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
 
+tsutils@2.27.2:
+  version "2.27.2"
+  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.27.2.tgz#60ba88a23d6f785ec4b89c6e8179cac9b431f1c7"
+  integrity sha512-qf6rmT84TFMuxAKez2pIfR8UCai49iQsfB7YWVjV1bKpy/d0PWT5rEOSM6La9PiHZ0k1RRZQiwVdVJfQ3BPHgg==
+  dependencies:
+    tslib "^1.8.1"
+
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@3.1.6, typescript@~3.1.6:
+typescript@3.1.6:
   version "3.1.6"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.6.tgz#b6543a83cfc8c2befb3f4c8fba6896f5b0c9be68"
   integrity sha512-tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA==
@@ -2336,11 +2320,6 @@ unique-slug@^2.0.0:
   dependencies:
     imurmurhash "^0.1.4"
 
-universalify@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
-  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
-
 unset-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
@@ -2391,11 +2370,6 @@ validate-npm-package-name@^3.0.0:
   dependencies:
     builtins "^1.0.3"
 
-validator@^8.0.0:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/validator/-/validator-8.2.0.tgz#3c1237290e37092355344fef78c231249dab77b9"
-  integrity sha512-Yw5wW34fSv5spzTXNkokD6S6/Oq92d8q/t14TqsS3fAiA1RYnxSFSIZ+CY3n6PGGRCq5HhJTSepQvFUS2QUDxA==
-
 which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
@@ -2410,6 +2384,19 @@ wide-align@^1.1.0:
   dependencies:
     string-width "^1.0.2 || 2"
 
+window-size@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"
+  integrity sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY=
+
+wrap-ansi@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
+  dependencies:
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -2420,6 +2407,11 @@ xtend@~4.0.1:
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
   integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
 
+y18n@^3.2.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
+  integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
+
 y18n@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
@@ -2435,13 +2427,15 @@ yallist@^3.0.0, yallist@^3.0.2:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
   integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==
 
-z-schema@~3.18.3:
-  version "3.18.4"
-  resolved "https://registry.yarnpkg.com/z-schema/-/z-schema-3.18.4.tgz#ea8132b279533ee60be2485a02f7e3e42541a9a2"
-  integrity sha512-DUOKC/IhbkdLKKiV89gw9DUauTV8U/8yJl1sjf6MtDmzevLKOF2duNJ495S3MFVjqZarr+qNGCPbkg4mu4PpLw==
+yargs@^3.10.0:
+  version "3.32.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995"
+  integrity sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=
   dependencies:
-    lodash.get "^4.0.0"
-    lodash.isequal "^4.0.0"
-    validator "^8.0.0"
-  optionalDependencies:
-    commander "^2.7.1"
+    camelcase "^2.0.1"
+    cliui "^3.0.3"
+    decamelize "^1.1.1"
+    os-locale "^1.4.0"
+    string-width "^1.0.1"
+    window-size "^0.1.4"
+    y18n "^3.2.0"
diff --git a/integration/bazel/WORKSPACE b/integration/bazel/WORKSPACE
index 962093c4fa..f718d38b04 100644
--- a/integration/bazel/WORKSPACE
+++ b/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 = "1416d03823fed624b49a0abbd9979f7c63bbedfd37890ddecedd2fe25cccebc6",
-    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.18.6/rules_nodejs-0.18.6.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()
diff --git a/integration/bazel/src/BUILD.bazel b/integration/bazel/src/BUILD.bazel
index e04abde8c5..db57258012 100644
--- 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", "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"])
diff --git a/integration/bazel/src/hello-world/BUILD.bazel b/integration/bazel/src/hello-world/BUILD.bazel
index 11f39a8c74..e7c506b07e 100644
--- a/integration/bazel/src/hello-world/BUILD.bazel
+++ b/integration/bazel/src/hello-world/BUILD.bazel
@@ -2,8 +2,8 @@ package(default_visibility = ["//visibility:public"])
 
 load("@io_bazel_rules_sass//sass:sass.bzl", "sass_binary")
 load("@npm_angular_bazel//:index.bzl", "ng_module", "ng_package")
-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")
 
 sass_binary(
     name = "hello-world-styles",
diff --git a/integration/bazel/src/package.json b/integration/bazel/src/package.json
index 3832e5784b..d429b14700 100644
--- 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.25.1",
-    "@bazel/typescript": "0.25.1",
+    "@bazel/karma": "0.26.0",
+    "@bazel/typescript": "0.26.0",
     "@types/jasmine": "2.8.8",
     "@types/source-map": "0.5.1",
     "protractor": "5.1.2",
diff --git a/integration/bazel/src/yarn.lock b/integration/bazel/src/yarn.lock
index d551f752b2..e2185d68ed 100644
--- a/integration/bazel/src/yarn.lock
+++ b/integration/bazel/src/yarn.lock
@@ -59,31 +59,32 @@
     "@angular-devkit/core" "7.3.3"
     rxjs "6.3.3"
 
-"@angular/animations@file:../angular/dist/packages-dist/animations":
-  version "7.2.6"
+"@angular/animations@file:../../../../../../../Users/greg/google/gregmagolan/angular-2/dist/packages-dist/animations":
+  version "8.0.0-beta.6"
   dependencies:
     tslib "^1.9.0"
 
-"@angular/bazel@file:../angular/dist/packages-dist/bazel":
-  version "7.2.6"
+"@angular/bazel@file:../../../../../../../Users/greg/google/gregmagolan/angular-2/dist/packages-dist/bazel":
+  version "8.0.0-beta.6"
   dependencies:
     "@angular-devkit/architect" "^0.10.6"
     "@angular-devkit/core" "^7.0.4"
     "@angular-devkit/schematics" "^7.3.0-rc.0"
-    "@bazel/typescript" "^0.25.1"
+    "@bazel/typescript" "^0.26.0"
+    "@microsoft/api-extractor" "^7.0.17"
     "@schematics/angular" "^7.0.4"
     "@types/node" "6.0.84"
     semver "^5.6.0"
     shelljs "0.8.2"
     tsickle "0.34.0"
 
-"@angular/common@file:../angular/dist/packages-dist/common":
-  version "7.2.6"
+"@angular/common@file:../../../../../../../Users/greg/google/gregmagolan/angular-2/dist/packages-dist/common":
+  version "8.0.0-beta.6"
   dependencies:
     tslib "^1.9.0"
 
-"@angular/compiler-cli@file:../angular/dist/packages-dist/compiler-cli":
-  version "7.2.6"
+"@angular/compiler-cli@file:../../../../../../../Users/greg/google/gregmagolan/angular-2/dist/packages-dist/compiler-cli":
+  version "8.0.0-beta.6"
   dependencies:
     canonical-path "1.0.0"
     chokidar "^2.1.1"
@@ -97,30 +98,30 @@
     tslib "^1.9.0"
     yargs "9.0.1"
 
-"@angular/compiler@file:../angular/dist/packages-dist/compiler":
-  version "7.2.6"
+"@angular/compiler@file:../../../../../../../Users/greg/google/gregmagolan/angular-2/dist/packages-dist/compiler":
+  version "8.0.0-beta.6"
   dependencies:
     tslib "^1.9.0"
 
-"@angular/core@file:../angular/dist/packages-dist/core":
-  version "7.2.6"
+"@angular/core@file:../../../../../../../Users/greg/google/gregmagolan/angular-2/dist/packages-dist/core":
+  version "8.0.0-beta.6"
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-browser-dynamic@file:../angular/dist/packages-dist/platform-browser-dynamic":
-  version "7.2.6"
+"@angular/platform-browser-dynamic@file:../../../../../../../Users/greg/google/gregmagolan/angular-2/dist/packages-dist/platform-browser-dynamic":
+  version "8.0.0-beta.6"
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-browser@file:../angular/dist/packages-dist/platform-browser":
-  version "7.2.6"
+"@angular/platform-browser@file:../../../../../../../Users/greg/google/gregmagolan/angular-2/dist/packages-dist/platform-browser":
+  version "8.0.0-beta.6"
   dependencies:
     tslib "^1.9.0"
 
-"@bazel/karma@0.25.1":
-  version "0.25.1"
-  resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.25.1.tgz#246286299b6e96fa4a91d240d3c3d7386164adaf"
-  integrity sha512-e5qyZkeHdxEYTIcHg04pmPF1SR8jy8I1mQLgDxX6NJDVx3JT7iIFeISqlS8hjBiykyX/XZ0CsVzkKYU/sG3ilg==
+"@bazel/karma@0.26.0":
+  version "0.26.0"
+  resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.26.0.tgz#6ad796686f5775df33a96fa5ef3df76a66aed3b2"
+  integrity sha512-yZv0fgAjVrfrM0ld8e+wNaPIpYCpwBzVQi2GUErsKStUZXPUUofpBwBjlYsdY1Osn5/FmAF9e6xDkk1JWn/wSg==
   dependencies:
     jasmine-core "2.8.0"
     karma "^4.0.0"
@@ -134,10 +135,10 @@
     semver "5.6.0"
     tmp "0.0.33"
 
-"@bazel/typescript@0.25.1", "@bazel/typescript@^0.25.1":
-  version "0.25.1"
-  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.25.1.tgz#71564de50ff6976fb37d90f2f7a479e87b158943"
-  integrity sha512-QFitUUXIWQMfVk5EwI9J9d5iNPfT+kUjPbahiJbJVZz1Fz9zNZ8+CR6FESfnxuUKlZK3Oy0VWFcz7mlHaceL/Q==
+"@bazel/typescript@^0.26.0":
+  version "0.26.0"
+  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.26.0.tgz#c06139d76c8b9d3a3ed98a721b776fedb4b11c82"
+  integrity sha512-dh/Y/SZzmeChsLap8FVHYl0FuaeLh/6t9WBVhm5nOgyVrqfEyVpNzy4W20E4NqnmJY2/PqmD5qncf+Oo1q9h1A==
   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
index 18ae55ced8..0e6dfc33ec 100644
--- a/integration/bazel/test/e2e/BUILD.bazel
+++ b/integration/bazel/test/e2e/BUILD.bazel
@@ -1,5 +1,5 @@
 load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite")
-load("@npm_bazel_typescript//:defs.bzl", "ts_library")
+load("@npm_bazel_typescript//:index.bzl", "ts_library")
 
 ts_library(
     name = "e2e",
diff --git a/karma-js.conf.js b/karma-js.conf.js
index e1575ed0ad..cfb171df03 100644
--- a/karma-js.conf.js
+++ b/karma-js.conf.js
@@ -112,7 +112,7 @@ module.exports = function(config) {
     // don't need this entire config file.
     proxies: {
       '/base/angular/': '/base/',
-      '/base/ngdeps/': '/base/',
+      '/base/npm/': '/base/',
     },
 
     reporters: ['dots'],
diff --git a/modules/benchmarks/benchmark_test.bzl b/modules/benchmarks/benchmark_test.bzl
index 2f068d8f2a..0948985cdc 100644
--- a/modules/benchmarks/benchmark_test.bzl
+++ b/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,
     )
diff --git a/modules/benchmarks/src/largeform/BUILD.bazel b/modules/benchmarks/src/largeform/BUILD.bazel
index 0bfbe75e36..37cf09c97d 100644
--- a/modules/benchmarks/src/largeform/BUILD.bazel
+++ b/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",
     ],
 )
diff --git a/modules/benchmarks/src/largeform/ng2/BUILD.bazel b/modules/benchmarks/src/largeform/ng2/BUILD.bazel
index f1558418fa..289b6d54b5 100644
--- 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("@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"],
diff --git a/modules/benchmarks/src/largetable/BUILD.bazel b/modules/benchmarks/src/largetable/BUILD.bazel
index 85706c9c97..6de905d56c 100644
--- a/modules/benchmarks/src/largetable/BUILD.bazel
+++ b/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",
     ],
 )
diff --git a/modules/benchmarks/src/largetable/baseline/BUILD.bazel b/modules/benchmarks/src/largetable/baseline/BUILD.bazel
index 55519ed578..8fda5883d9 100644
--- 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("@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__"])
diff --git a/modules/benchmarks/src/largetable/incremental_dom/BUILD.bazel b/modules/benchmarks/src/largetable/incremental_dom/BUILD.bazel
index 429b80b64e..f3459d5b44 100644
--- 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("@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"],
 )
diff --git a/modules/benchmarks/src/largetable/iv/BUILD.bazel b/modules/benchmarks/src/largetable/iv/BUILD.bazel
index 2c87ddba91..841de7c483 100644
--- a/modules/benchmarks/src/largetable/iv/BUILD.bazel
+++ b/modules/benchmarks/src/largetable/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__"])
diff --git a/modules/benchmarks/src/largetable/ng2/BUILD.bazel b/modules/benchmarks/src/largetable/ng2/BUILD.bazel
index 15b9c0ad66..bcebc73065 100644
--- 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("@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"],
 )
diff --git a/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel b/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel
index b96d1444c2..07039cd3fd 100644
--- 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("@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"],
 )
diff --git a/modules/benchmarks/src/largetable/render3/BUILD.bazel b/modules/benchmarks/src/largetable/render3/BUILD.bazel
index a4ae3675cb..45fabba43a 100644
--- 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("@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",
     ],
 )
 
diff --git a/modules/benchmarks/src/tree/BUILD.bazel b/modules/benchmarks/src/tree/BUILD.bazel
index 05d485954b..3638570f61 100644
--- a/modules/benchmarks/src/tree/BUILD.bazel
+++ b/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",
     ],
 )
diff --git a/modules/benchmarks/src/tree/baseline/BUILD.bazel b/modules/benchmarks/src/tree/baseline/BUILD.bazel
index 6712588295..328724542e 100644
--- 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("@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__"])
diff --git a/modules/benchmarks/src/tree/incremental_dom/BUILD.bazel b/modules/benchmarks/src/tree/incremental_dom/BUILD.bazel
index d0a5c5d47b..67ed3eb167 100644
--- 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("@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"],
 )
diff --git a/modules/benchmarks/src/tree/iv/BUILD.bazel b/modules/benchmarks/src/tree/iv/BUILD.bazel
index 7585cfc884..9452166c28 100644
--- a/modules/benchmarks/src/tree/iv/BUILD.bazel
+++ b/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__"])
diff --git a/modules/benchmarks/src/tree/ng1/BUILD.bazel b/modules/benchmarks/src/tree/ng1/BUILD.bazel
index d1dc388f6d..6caac7ab98 100644
--- 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("@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"],
 )
diff --git a/modules/benchmarks/src/tree/ng2/BUILD.bazel b/modules/benchmarks/src/tree/ng2/BUILD.bazel
index e7d0059f99..290f02465e 100644
--- 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("@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"],
 )
diff --git a/modules/benchmarks/src/tree/ng2_next/BUILD.bazel b/modules/benchmarks/src/tree/ng2_next/BUILD.bazel
index 8136fb9361..628fd51a64 100644
--- a/modules/benchmarks/src/tree/ng2_next/BUILD.bazel
+++ b/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"],
diff --git a/modules/benchmarks/src/tree/ng2_static/BUILD.bazel b/modules/benchmarks/src/tree/ng2_static/BUILD.bazel
index 7cc98422d2..9fdb2c364d 100644
--- a/modules/benchmarks/src/tree/ng2_static/BUILD.bazel
+++ b/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"],
 )
diff --git a/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel b/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel
index 03f31005a0..8c1d09fe20 100644
--- a/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel
+++ b/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"],
 )
diff --git a/modules/benchmarks/src/tree/render3/BUILD.bazel b/modules/benchmarks/src/tree/render3/BUILD.bazel
index 705018b0eb..b44eeeaa49 100644
--- a/modules/benchmarks/src/tree/render3/BUILD.bazel
+++ b/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",
     ],
 )
 
diff --git a/modules/benchmarks/src/tree/render3_function/BUILD.bazel b/modules/benchmarks/src/tree/render3_function/BUILD.bazel
index 2d7a924ebb..d4225ec2e4 100644
--- a/modules/benchmarks/src/tree/render3_function/BUILD.bazel
+++ b/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"],
diff --git a/modules/e2e_util/BUILD.bazel b/modules/e2e_util/BUILD.bazel
index 647b53205e..4f455e9c60 100644
--- a/modules/e2e_util/BUILD.bazel
+++ b/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",
     ],
 )
diff --git a/modules/playground/e2e_test/example_test.bzl b/modules/playground/e2e_test/example_test.bzl
index b9f1b018e0..70eaa43388 100644
--- a/modules/playground/e2e_test/example_test.bzl
+++ b/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
     )
diff --git a/modules/playground/src/animate/BUILD.bazel b/modules/playground/src/animate/BUILD.bazel
index 49855b059f..48ac5c29bb 100644
--- a/modules/playground/src/animate/BUILD.bazel
+++ b/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"],
 )
diff --git a/modules/playground/src/async/BUILD.bazel b/modules/playground/src/async/BUILD.bazel
index fe301f8268..4e1d13130d 100644
--- a/modules/playground/src/async/BUILD.bazel
+++ b/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"],
 )
diff --git a/modules/playground/src/benchpress/BUILD.bazel b/modules/playground/src/benchpress/BUILD.bazel
index 8b4b173938..5c51cf1ce6 100644
--- a/modules/playground/src/benchpress/BUILD.bazel
+++ b/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__"])
 
diff --git a/modules/playground/src/gestures/BUILD.bazel b/modules/playground/src/gestures/BUILD.bazel
index 1188d330d6..872534abf4 100644
--- a/modules/playground/src/gestures/BUILD.bazel
+++ b/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"],
 )
diff --git a/modules/playground/src/hello_world/BUILD.bazel b/modules/playground/src/hello_world/BUILD.bazel
index d90d3efb57..0f802e1b3d 100644
--- a/modules/playground/src/hello_world/BUILD.bazel
+++ b/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"],
 )
diff --git a/modules/playground/src/http/BUILD.bazel b/modules/playground/src/http/BUILD.bazel
index 6ba83ed650..1457d17c7f 100644
--- a/modules/playground/src/http/BUILD.bazel
+++ b/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"],
 )
diff --git a/modules/playground/src/jsonp/BUILD.bazel b/modules/playground/src/jsonp/BUILD.bazel
index 5bc0b47f24..ec9d0f059d 100644
--- a/modules/playground/src/jsonp/BUILD.bazel
+++ b/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"],
 )
diff --git a/modules/playground/src/key_events/BUILD.bazel b/modules/playground/src/key_events/BUILD.bazel
index 1ce543a100..2cfec987fb 100644
--- a/modules/playground/src/key_events/BUILD.bazel
+++ b/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"],
 )
diff --git a/modules/playground/src/model_driven_forms/BUILD.bazel b/modules/playground/src/model_driven_forms/BUILD.bazel
index 87af847a9b..271d04298b 100644
--- a/modules/playground/src/model_driven_forms/BUILD.bazel
+++ b/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"],
 )
diff --git a/modules/playground/src/order_management/BUILD.bazel b/modules/playground/src/order_management/BUILD.bazel
index ef3c9781e4..c31b1fc06a 100644
--- a/modules/playground/src/order_management/BUILD.bazel
+++ b/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"],
 )
diff --git a/modules/playground/src/person_management/BUILD.bazel b/modules/playground/src/person_management/BUILD.bazel
index d5a8a50c10..71c2c84c5e 100644
--- a/modules/playground/src/person_management/BUILD.bazel
+++ b/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"],
 )
diff --git a/modules/playground/src/relative_assets/BUILD.bazel b/modules/playground/src/relative_assets/BUILD.bazel
index 64ac75e630..539c9a6363 100644
--- a/modules/playground/src/relative_assets/BUILD.bazel
+++ b/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"],
 )
diff --git a/modules/playground/src/routing/BUILD.bazel b/modules/playground/src/routing/BUILD.bazel
index 692c7f9309..ab431b9fbf 100644
--- a/modules/playground/src/routing/BUILD.bazel
+++ b/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",
     ],
diff --git a/modules/playground/src/routing/index.html b/modules/playground/src/routing/index.html
index 414edae61c..49e677877a 100644
--- a/modules/playground/src/routing/index.html
+++ b/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>
diff --git a/modules/playground/src/sourcemap/BUILD.bazel b/modules/playground/src/sourcemap/BUILD.bazel
index 2a672d201d..0860b5bb54 100644
--- a/modules/playground/src/sourcemap/BUILD.bazel
+++ b/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"],
 )
diff --git a/modules/playground/src/svg/BUILD.bazel b/modules/playground/src/svg/BUILD.bazel
index 670a6a15a5..f2e06c727f 100644
--- a/modules/playground/src/svg/BUILD.bazel
+++ b/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"],
 )
diff --git a/modules/playground/src/template_driven_forms/BUILD.bazel b/modules/playground/src/template_driven_forms/BUILD.bazel
index 3e7d25d50e..46b877a07a 100644
--- a/modules/playground/src/template_driven_forms/BUILD.bazel
+++ b/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"],
 )
diff --git a/modules/playground/src/todo/BUILD.bazel b/modules/playground/src/todo/BUILD.bazel
index 8cafae5bd9..401d06405f 100644
--- a/modules/playground/src/todo/BUILD.bazel
+++ b/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"],
 )
diff --git a/modules/playground/src/upgrade/BUILD.bazel b/modules/playground/src/upgrade/BUILD.bazel
index bbd0c31cc3..0bc6e6603d 100644
--- a/modules/playground/src/upgrade/BUILD.bazel
+++ b/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"],
 )
diff --git a/modules/playground/src/web_workers/BUILD.bazel b/modules/playground/src/web_workers/BUILD.bazel
index 03a0fd21d9..adce10e034 100644
--- a/modules/playground/src/web_workers/BUILD.bazel
+++ b/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",
     ],
 )
diff --git a/modules/playground/src/web_workers/animations/BUILD.bazel b/modules/playground/src/web_workers/animations/BUILD.bazel
index f2cbd59c76..3e9a474b60 100644
--- a/modules/playground/src/web_workers/animations/BUILD.bazel
+++ b/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"],
 )
diff --git a/modules/playground/src/web_workers/images/BUILD.bazel b/modules/playground/src/web_workers/images/BUILD.bazel
index b794c2e24c..83347441da 100644
--- a/modules/playground/src/web_workers/images/BUILD.bazel
+++ b/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"],
diff --git a/modules/playground/src/web_workers/images/loader.js b/modules/playground/src/web_workers/images/loader.js
index 3612f5426f..c6ea58279a 100644
--- a/modules/playground/src/web_workers/images/loader.js
+++ b/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'}}
 });
diff --git a/modules/playground/src/web_workers/input/BUILD.bazel b/modules/playground/src/web_workers/input/BUILD.bazel
index 20fdd641ca..484ecd337c 100644
--- a/modules/playground/src/web_workers/input/BUILD.bazel
+++ b/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"],
 )
diff --git a/modules/playground/src/web_workers/kitchen_sink/BUILD.bazel b/modules/playground/src/web_workers/kitchen_sink/BUILD.bazel
index dfc299b6cf..034e2cb206 100644
--- a/modules/playground/src/web_workers/kitchen_sink/BUILD.bazel
+++ b/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"],
 )
diff --git a/modules/playground/src/web_workers/message_broker/BUILD.bazel b/modules/playground/src/web_workers/message_broker/BUILD.bazel
index 8c032975ca..78354b7e4e 100644
--- a/modules/playground/src/web_workers/message_broker/BUILD.bazel
+++ b/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"],
 )
diff --git a/modules/playground/src/web_workers/router/BUILD.bazel b/modules/playground/src/web_workers/router/BUILD.bazel
index 62bd1ed1c5..c1ad9fedf7 100644
--- a/modules/playground/src/web_workers/router/BUILD.bazel
+++ b/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"],
 )
diff --git a/modules/playground/src/web_workers/todo/BUILD.bazel b/modules/playground/src/web_workers/todo/BUILD.bazel
index a6c873df0f..d8e2b35ebb 100644
--- a/modules/playground/src/web_workers/todo/BUILD.bazel
+++ b/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"],
 )
diff --git a/modules/playground/src/web_workers/worker-configure.js b/modules/playground/src/web_workers/worker-configure.js
index 96041039ec..0f7906b156 100644
--- a/modules/playground/src/web_workers/worker-configure.js
+++ b/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');
diff --git a/modules/playground/src/zippy_component/BUILD.bazel b/modules/playground/src/zippy_component/BUILD.bazel
index c4779d184d..964af8ade7 100644
--- a/modules/playground/src/zippy_component/BUILD.bazel
+++ b/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"],
 )
diff --git a/modules/playground/systemjs-config.js b/modules/playground/systemjs-config.js
index a9f4c0b75d..8e3fbe8f2a 100644
--- a/modules/playground/systemjs-config.js
+++ b/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',
 };
 
diff --git a/package.json b/package.json
index 47744d6698..5f12ab4155 100644
--- a/package.json
+++ b/package.json
@@ -31,12 +31,14 @@
   },
   "// 1": "dependencies are used locally and by bazel",
   "dependencies": {
+    "@angular/bazel": "file:./tools/npm/@angular_bazel",
     "@angular-devkit/architect": "^0.10.6",
     "@angular-devkit/build-optimizer": "^0.12.2",
     "@angular-devkit/core": "^7.0.4",
     "@angular-devkit/schematics": "^7.3.0-rc.0",
-    "@bazel/karma": "0.25.1",
-    "@bazel/typescript": "0.25.1",
+    "@bazel/jasmine": "0.26.0",
+    "@bazel/karma": "0.26.0",
+    "@bazel/typescript": "0.26.0",
     "@schematics/angular": "^7.0.4",
     "@types/angular": "^1.6.47",
     "@types/base64-js": "1.2.5",
diff --git a/packages/BUILD.bazel b/packages/BUILD.bazel
index 65ff743075..b3202fba0d 100644
--- a/packages/BUILD.bazel
+++ b/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",
     ],
 )
 
diff --git a/packages/bazel/BUILD.bazel b/packages/bazel/BUILD.bazel
index db374e32cb..ba4190eb79 100644
--- a/packages/bazel/BUILD.bazel
+++ b/packages/bazel/BUILD.bazel
@@ -20,8 +20,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"],
diff --git a/packages/bazel/docs/BUILD.bazel b/packages/bazel/docs/BUILD.bazel
index 234fb875da..b7d4094d0f 100644
--- a/packages/bazel/docs/BUILD.bazel
+++ b/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",
     ],
diff --git a/packages/bazel/index.bzl b/packages/bazel/index.bzl
index 2daee51d54..061df9f424 100644
--- a/packages/bazel/index.bzl
+++ b/packages/bazel/index.bzl
@@ -8,7 +8,6 @@ Users should not load files under "/src"
 """
 
 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")
 load("//packages/bazel/src/ng_package:ng_package.bzl", _ng_package = "ng_package")
 load(
     "//packages/bazel/src/protractor:protractor_web_test.bzl",
@@ -20,6 +19,12 @@ 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.
+    """)
diff --git a/packages/bazel/package.json b/packages/bazel/package.json
index 6a518f1b55..e55cda8aa7 100644
--- a/packages/bazel/package.json
+++ b/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.25.1",
+    "@bazel/typescript": "^0.26.0",
     "@schematics/angular": "^7.0.4",
     "@types/node": "6.0.84",
     "semver": "^5.6.0",
diff --git a/packages/bazel/src/BUILD.bazel b/packages/bazel/src/BUILD.bazel
index 6f806fbfec..c7cd30b973 100644
--- a/packages/bazel/src/BUILD.bazel
+++ b/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"],
 )
diff --git a/packages/bazel/src/builders/BUILD.bazel b/packages/bazel/src/builders/BUILD.bazel
index 93134df6e1..e5fd75d044 100644
--- a/packages/bazel/src/builders/BUILD.bazel
+++ b/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",
     ],
 )
diff --git a/packages/bazel/src/external.bzl b/packages/bazel/src/external.bzl
index 4922e2bc2f..eac93903f9 100644
--- a/packages/bazel/src/external.bzl
+++ b/packages/bazel/src/external.bzl
@@ -28,5 +28,5 @@ 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"
diff --git a/packages/bazel/src/ng_package/BUILD.bazel b/packages/bazel/src/ng_package/BUILD.bazel
index 8cfc2cfab3..c9a0318cc8 100644
--- a/packages/bazel/src/ng_package/BUILD.bazel
+++ b/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,
diff --git a/packages/bazel/src/ng_rollup_bundle.bzl b/packages/bazel/src/ng_rollup_bundle.bzl
index 8e69008fb2..19c06b7e10 100644
--- a/packages/bazel/src/ng_rollup_bundle.bzl
+++ b/packages/bazel/src/ng_rollup_bundle.bzl
@@ -31,7 +31,7 @@ PACKAGES = ["packages/core/src", "packages/common/src", "packages/compiler/src",
 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):
diff --git a/packages/bazel/src/ng_setup_workspace.bzl b/packages/bazel/src/ng_setup_workspace.bzl
deleted file mode 100644
index 4845f7b701..0000000000
--- a/packages/bazel/src/ng_setup_workspace.bzl
+++ /dev/null
@@ -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.
-    """
diff --git a/packages/bazel/src/ngc-wrapped/BUILD.bazel b/packages/bazel/src/ngc-wrapped/BUILD.bazel
index 81572daef1..6d1643b1f4 100644
--- a/packages/bazel/src/ngc-wrapped/BUILD.bazel
+++ b/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",
     ],
 )
 
@@ -32,8 +32,8 @@ nodejs_binary(
     configuration_env_vars = ["compile"],
     data = [
         ":ngc_lib",
-        "@ngdeps//source-map-support",
-        "@ngdeps//tslib",
+        "@npm//source-map-support",
+        "@npm//tslib",
         "@npm_bazel_typescript//third_party/github.com/bazelbuild/bazel/src/main/protobuf:worker_protocol.proto",
     ],
     entry_point = "angular/packages/bazel/src/ngc-wrapped/index.js",
@@ -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"],
diff --git a/packages/bazel/src/protractor/utils/BUILD.bazel b/packages/bazel/src/protractor/utils/BUILD.bazel
index fd461d9610..fcfe0ecec8 100644
--- a/packages/bazel/src/protractor/utils/BUILD.bazel
+++ b/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"],
 )
diff --git a/packages/bazel/src/schematics/BUILD.bazel b/packages/bazel/src/schematics/BUILD.bazel
index d069a018df..aa346b019b 100644
--- a/packages/bazel/src/schematics/BUILD.bazel
+++ b/packages/bazel/src/schematics/BUILD.bazel
@@ -16,6 +16,7 @@ jasmine_node_test(
     deps = [
         "//packages/bazel/src/schematics/bazel-workspace:test",
         "//packages/bazel/src/schematics/ng-new:test",
+        "//packages/bazel/src/schematics/utility:test",
         "//tools/testing:node",
     ],
 )
diff --git a/packages/bazel/src/schematics/bazel-workspace/BUILD.bazel b/packages/bazel/src/schematics/bazel-workspace/BUILD.bazel
index 26f75310f5..468f98feb0 100644
--- a/packages/bazel/src/schematics/bazel-workspace/BUILD.bazel
+++ b/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",
     ],
 )
diff --git a/packages/bazel/src/schematics/bazel-workspace/files/WORKSPACE.template b/packages/bazel/src/schematics/bazel-workspace/files/WORKSPACE.template
index 8f74948059..5b4d987081 100644
--- a/packages/bazel/src/schematics/bazel-workspace/files/WORKSPACE.template
+++ b/packages/bazel/src/schematics/bazel-workspace/files/WORKSPACE.template
@@ -13,26 +13,18 @@ workspace(name = "<%= utils.underscore(name) %>")
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 RULES_NODEJS_VERSION = "<%= RULES_NODEJS_VERSION %>"
-RULES_NODEJS_SHA256 = "<%= RULES_NODEJS_SHA256 %>"
 http_archive(
     name = "build_bazel_rules_nodejs",
-    sha256 = "%s" % RULES_NODEJS_SHA256,
+    sha256 = "<%= RULES_NODEJS_SHA256 %>",
     url = "https://github.com/bazelbuild/rules_nodejs/releases/download/%s/rules_nodejs-%s.tar.gz" % (RULES_NODEJS_VERSION, RULES_NODEJS_VERSION),
 )
 
-# The @angular repo contains rule for building Angular applications
-ANGULAR_VERSION = "<%= ANGULAR_VERSION %>"
-http_archive(
-    name = "angular",
-    url = "https://github.com/angular/angular/archive/%s.zip" % ANGULAR_VERSION,
-    strip_prefix = "angular-%s" % ANGULAR_VERSION,
-)
-
 <% if (sass) { %>
 # Rules for compiling sass
 RULES_SASS_VERSION = "<%= RULES_SASS_VERSION %>"
 http_archive(
     name = "io_bazel_rules_sass",
+    sha256 = "<%= RULES_SASS_SHA256 %>",
     url = "https://github.com/bazelbuild/rules_sass/archive/%s.zip" % RULES_SASS_VERSION,
     strip_prefix = "rules_sass-%s" % RULES_SASS_VERSION,
 )
@@ -46,6 +38,7 @@ check_bazel_version("0.18.0")
 node_repositories()
 yarn_install(
     name = "npm",
+    data = ["//:angular-metadata.tsconfig.json"],
     package_json = "//:package.json",
     yarn_lock = "//:yarn.lock",
 )
@@ -62,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("@angular//:index.bzl", "ng_setup_workspace")
-ng_setup_workspace()
diff --git a/packages/bazel/src/schematics/bazel-workspace/files/__dot__bazelrc.template b/packages/bazel/src/schematics/bazel-workspace/files/__dot__bazelrc.template
index a40483eeac..1b544399da 100644
--- a/packages/bazel/src/schematics/bazel-workspace/files/__dot__bazelrc.template
+++ b/packages/bazel/src/schematics/bazel-workspace/files/__dot__bazelrc.template
@@ -13,6 +13,16 @@ build --strategy=AngularTemplateCompile=worker
 # `bazel-out` directory that is created in the workspace root.
 build --symlink_prefix=dist/
 
+# Turn on --incompatible_strict_action_env which was on by default
+# in Bazel 0.21.0 but turned off again in 0.22.0. Follow
+# https://github.com/bazelbuild/bazel/issues/7026 for more details.
+# This flag is needed to so that the bazel cache is not invalidated
+# when running bazel via `yarn bazel`.
+# See https://github.com/angular/angular/issues/27514.
+build --incompatible_strict_action_env
+run --incompatible_strict_action_env
+test --incompatible_strict_action_env
+
 test --test_output=errors
 
 # Use the Angular 6 compiler
diff --git a/packages/bazel/src/schematics/bazel-workspace/files/angular-metadata.tsconfig.json.template b/packages/bazel/src/schematics/bazel-workspace/files/angular-metadata.tsconfig.json.template
new file mode 100644
index 0000000000..de2189f735
--- /dev/null
+++ b/packages/bazel/src/schematics/bazel-workspace/files/angular-metadata.tsconfig.json.template
@@ -0,0 +1,21 @@
+// Workaround for https://github.com/angular/angular/issues/18810
+// This file is required because when using the Angular NPM packages and building
+// with AOT compilation, NGC needs the "ngsummary.json" files.
+{
+  "compilerOptions": {
+    "lib": [
+      "dom",
+      "es2015"
+    ],
+    "experimentalDecorators": true,
+    "types": []
+  },
+  "include": [
+    "node_modules/@angular/**/*"
+  ],
+  "exclude": [
+    "node_modules/@angular/bazel/**",
+    "node_modules/@angular/compiler-cli/**",
+    "node_modules/@angular/**/testing/**"
+  ]
+}
diff --git a/packages/bazel/src/schematics/bazel-workspace/files/e2e/BUILD.bazel.template b/packages/bazel/src/schematics/bazel-workspace/files/e2e/BUILD.bazel.template
index 0779f6d3f6..b38c34575f 100644
--- a/packages/bazel/src/schematics/bazel-workspace/files/e2e/BUILD.bazel.template
+++ b/packages/bazel/src/schematics/bazel-workspace/files/e2e/BUILD.bazel.template
@@ -1,5 +1,5 @@
-load("@npm_bazel_typescript//:defs.bzl", "ts_library")
-load("@angular//:index.bzl", "protractor_web_test_suite")
+load("@npm_bazel_typescript//:index.bzl", "ts_library")
+load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite")
 
 ts_library(
     name = "e2e_lib",
@@ -22,7 +22,7 @@ ts_library(
 protractor_web_test_suite(
     name = "prodserver_test",
     data = [
-      "@angular//" + "packages/bazel/src/protractor/utils",
+      "@npm//@angular/bazel",
       "@npm//protractor",
     ],
     on_prepare = ":protractor.on-prepare.js",
@@ -33,7 +33,7 @@ protractor_web_test_suite(
 protractor_web_test_suite(
     name = "devserver_test",
     data = [
-      "@angular//" + "packages/bazel/src/protractor/utils",
+      "@npm//@angular/bazel",
       "@npm//protractor",
     ],
     on_prepare = ":protractor.on-prepare.js",
diff --git a/packages/bazel/src/schematics/bazel-workspace/files/src/BUILD.bazel.template b/packages/bazel/src/schematics/bazel-workspace/files/src/BUILD.bazel.template
index d07ff93f26..237f039881 100644
--- a/packages/bazel/src/schematics/bazel-workspace/files/src/BUILD.bazel.template
+++ b/packages/bazel/src/schematics/bazel-workspace/files/src/BUILD.bazel.template
@@ -1,31 +1,17 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@angular//:index.bzl", "ng_module")
-load("@npm_bazel_karma//:defs.bzl", "ts_web_test_suite")
+load("@npm_angular_bazel//:index.bzl", "ng_module")
+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")
-<% if (sass) { %>load("@io_bazel_rules_sass//:defs.bzl", "sass_binary")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver", "ts_library")
+<% if (sass) { %>load("@io_bazel_rules_sass//:defs.bzl", "multi_sass_binary")
 
-[
-sass_binary(
-    name = "style_" + x,
-    src = x,
-    deps = [],
+multi_sass_binary(
+    name = "styles",
+    srcs = glob(["**/*.scss"]),
 )
-for x in glob(["**/*.scss"])
-]
 <% } %>
-
-filegroup(
-    name = "rxjs_umd_modules",
-    srcs = [
-        # do not sort
-        "@npm//node_modules/rxjs:bundles/rxjs.umd.js",
-        ":rxjs_shims.js",
-    ],
-)
-
 ng_module(
     name = "src",
     srcs = glob(
@@ -40,11 +26,11 @@ ng_module(
     assets = glob([
       "**/*.css",
       "**/*.html",
-    ])<% if (sass) { %> + [":style_" + x for x in glob(["**/*.scss"])]<% } %>,
+    ])<% if (sass) { %> + [":styles"]<% } %>,
     deps = [
-        "@angular//packages/core",
-        "@angular//packages/platform-browser",<% if (routing) { %>
-        "@angular//packages/router",<% } %>
+        "@npm//@angular/core",
+        "@npm//@angular/platform-browser",<% if (routing) { %>
+        "@npm//@angular/router",<% } %>
         "@npm//@types",
         "@npm//rxjs",
     ],
@@ -67,7 +53,7 @@ web_package(
         ":bundle.min.js",
     ],
     data = [
-        ":bundle",
+        "favicon.ico",
     ],
     index_html = "index.html",
 )
@@ -78,18 +64,34 @@ history_server(
     templated_args = ["src/prodapp"],
 )
 
+filegroup(
+    name = "rxjs_umd_modules",
+    srcs = [
+        # do not sort
+        "@npm//node_modules/rxjs:bundles/rxjs.umd.js",
+        ":rxjs_shims.js",
+    ],
+)
+
 ts_devserver(
     name = "devserver",
     port = 4200,
     entry_module = "<%= utils.underscore(name) %>/src/main.dev",
     serving_path = "/bundle.min.js",
     scripts = [
+        "@npm//node_modules/@angular/common:bundles/common.umd.js",
+        "@npm//node_modules/@angular/common:bundles/common-http.umd.js",
+        "@npm//node_modules/@angular/core:bundles/core.umd.js",
+        "@npm//node_modules/@angular/platform-browser:bundles/platform-browser.umd.js",
         "@npm//node_modules/tslib:tslib.js",
         ":rxjs_umd_modules",
     ],
     static_files = [
         "@npm//node_modules/zone.js:dist/zone.min.js",
     ],
+    data = [
+        "favicon.ico",
+    ],
     index_html = "index.html",
     deps = [":src"],
 )
@@ -100,7 +102,7 @@ ts_library(
     srcs = glob(["**/*.spec.ts"]),
     deps = [
         ":src",
-        "@angular//packages/core/testing",
+        "@npm//@angular/core",
         "@npm//@types",
     ],
 )
@@ -112,15 +114,26 @@ ts_library(
         "initialize_testbed.ts",
     ],
     deps = [
-        "@angular//packages/core/testing",
-        "@angular//packages/platform-browser-dynamic/testing",
+        "@npm//@angular/core",
+        "@npm//@angular/platform-browser-dynamic",
         "@npm//@types",
     ],
 )
 
 ts_web_test_suite(
     name = "test",
-    srcs = ["@npm//node_modules/tslib:tslib.js"],
+    srcs = [
+        "@npm//node_modules/@angular/common:bundles/common.umd.js",
+        "@npm//node_modules/@angular/compiler:bundles/compiler.umd.js",
+        "@npm//node_modules/@angular/compiler:bundles/compiler-testing.umd.js",
+        "@npm//node_modules/@angular/core:bundles/core.umd.js",
+        "@npm//node_modules/@angular/core:bundles/core-testing.umd.js",
+        "@npm//node_modules/@angular/platform-browser:bundles/platform-browser.umd.js",
+        "@npm//node_modules/@angular/platform-browser:bundles/platform-browser-testing.umd.js",
+        "@npm//node_modules/@angular/platform-browser-dynamic:bundles/platform-browser-dynamic.umd.js",
+        "@npm//node_modules/@angular/platform-browser-dynamic:bundles/platform-browser-dynamic-testing.umd.js",
+        "@npm//node_modules/tslib:tslib.js",
+    ],
     runtime_deps = [
         ":initialize_testbed",
     ],
diff --git a/packages/bazel/src/schematics/bazel-workspace/files/yarn.lock b/packages/bazel/src/schematics/bazel-workspace/files/yarn.lock
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/bazel/src/schematics/bazel-workspace/index.ts b/packages/bazel/src/schematics/bazel-workspace/index.ts
index 75f8357b4d..0fbdf9beb6 100644
--- a/packages/bazel/src/schematics/bazel-workspace/index.ts
+++ b/packages/bazel/src/schematics/bazel-workspace/index.ts
@@ -9,32 +9,12 @@
  */
 
 import {strings} from '@angular-devkit/core';
-import {Rule, SchematicContext, SchematicsException, Tree, apply, applyTemplates, mergeWith, move, url} from '@angular-devkit/schematics';
+import {Rule, SchematicContext, Tree, apply, applyTemplates, mergeWith, url} from '@angular-devkit/schematics';
 import {getWorkspace} from '@schematics/angular/utility/config';
-import {latestVersions} from '@schematics/angular/utility/latest-versions';
 import {validateProjectName} from '@schematics/angular/utility/validation';
 
 import {Schema as BazelWorkspaceOptions} from './schema';
 
-
-/**
- * Look for package.json file for package with `packageName` in node_modules and
- * extract its version.
- */
-function findVersion(packageName: string, host: Tree): string|null {
-  const candidate = `node_modules/${packageName}/package.json`;
-  if (host.exists(candidate)) {
-    try {
-      const packageJson = JSON.parse(host.read(candidate).toString());
-      if (packageJson.name === packageName && packageJson.version) {
-        return packageJson.version;
-      }
-    } catch {
-    }
-  }
-  return null;
-}
-
 /**
  * Clean the version string and return version in the form "1.2.3". Return
  * null if version string is invalid. This is similar to semver.clean() but
@@ -72,26 +52,15 @@ export default function(options: BazelWorkspaceOptions): Rule {
     }
     validateProjectName(name);
 
-    // If the project already has some deps installed, Bazel should use existing
-    // versions.
-    const existingVersions = {
-      Angular: findVersion('@angular/core', host),
-      RxJs: findVersion('rxjs', host),
-    };
-
-    Object.keys(existingVersions).forEach((name: 'Angular' | 'RxJs') => {
-      const version = existingVersions[name] as string;
-      if (version) {
-        context.logger.info(`Bazel will reuse existing version for ${name}: ${version}`);
-      }
-    });
+    if (!host.exists('yarn.lock')) {
+      host.create('yarn.lock', '');
+    }
 
     const workspaceVersions = {
-      'RULES_NODEJS_VERSION': '0.18.6',
-      'RULES_NODEJS_SHA256': '1416d03823fed624b49a0abbd9979f7c63bbedfd37890ddecedd2fe25cccebc6',
-      'ANGULAR_VERSION': existingVersions.Angular || clean(latestVersions.Angular),
-      // TODO(kyliau): Consider moving this to latest-versions.ts
-      'RULES_SASS_VERSION': '1.15.1',
+      'RULES_NODEJS_VERSION': '0.26.0',
+      'RULES_NODEJS_SHA256': '5c86b055c57e15bf32d9009a15bcd6d8e190c41b1ff2fb18037b75e0012e4e7c',
+      'RULES_SASS_VERSION': '1.17.2',
+      'RULES_SASS_SHA256': 'e5316ee8a09d1cbb732d3938b400836bf94dba91a27476e9e27706c4c0edae1f',
     };
 
     return mergeWith(apply(url('./files'), [
diff --git a/packages/bazel/src/schematics/bazel-workspace/index_spec.ts b/packages/bazel/src/schematics/bazel-workspace/index_spec.ts
index 77b9fc6062..af39661f61 100644
--- a/packages/bazel/src/schematics/bazel-workspace/index_spec.ts
+++ b/packages/bazel/src/schematics/bazel-workspace/index_spec.ts
@@ -29,17 +29,19 @@ describe('Bazel-workspace Schematic', () => {
     expect(files).toContain('/yarn.lock');
   });
 
-  it('should find existing Angular version', () => {
-    let host = new UnitTestTree(new HostTree);
-    host.create('/node_modules/@angular/core/package.json', JSON.stringify({
-      name: '@angular/core',
-      version: '6.6.6',
-    }));
-    const options = {...defaultOptions};
-    host = schematicRunner.runSchematic('bazel-workspace', options, host);
-    expect(host.files).toContain('/WORKSPACE');
-    const workspace = host.readContent('/WORKSPACE');
-    expect(workspace).toMatch('ANGULAR_VERSION = "6.6.6"');
+  it('should generate empty yarn.lock file', () => {
+    const host = schematicRunner.runSchematic('bazel-workspace', defaultOptions);
+    expect(host.files).toContain('/yarn.lock');
+    expect(host.readContent('/yarn.lock')).toBe('');
+  });
+
+  it('should not replace yarn.lock if it exists', () => {
+    let host = new UnitTestTree(new HostTree());
+    host.create('yarn.lock', 'some content');
+    expect(host.files).toContain('/yarn.lock');
+    host = schematicRunner.runSchematic('bazel-workspace', defaultOptions, host);
+    expect(host.files).toContain('/yarn.lock');
+    expect(host.readContent('/yarn.lock')).toBe('some content');
   });
 
   it('should have the correct entry_module for devserver', () => {
@@ -59,7 +61,7 @@ describe('Bazel-workspace Schematic', () => {
     host = schematicRunner.runSchematic('bazel-workspace', options, host);
     expect(host.files).toContain('/src/BUILD.bazel');
     const content = host.readContent('/src/BUILD.bazel');
-    expect(content).toContain('@angular//packages/router');
+    expect(content).toContain('@npm//@angular/router');
   });
 
   describe('WORKSPACE', () => {
@@ -98,9 +100,9 @@ describe('Bazel-workspace Schematic', () => {
           'load("@io_bazel_rules_sass//sass:sass_repositories.bzl", "sass_repositories")');
     });
 
-    it('should add sass_binary rules in src/BUILD', () => {
+    it('should add multi_sass_binary rule in src/BUILD', () => {
       const content = host.readContent('/src/BUILD.bazel');
-      expect(content).toContain('load("@io_bazel_rules_sass//:defs.bzl", "sass_binary")');
+      expect(content).toContain('load("@io_bazel_rules_sass//:defs.bzl", "multi_sass_binary")');
       expect(content).toContain('glob(["**/*.scss"])');
     });
   });
diff --git a/packages/bazel/src/schematics/ng-new/BUILD.bazel b/packages/bazel/src/schematics/ng-new/BUILD.bazel
index d70cab250f..3ce9114d7c 100644
--- a/packages/bazel/src/schematics/ng-new/BUILD.bazel
+++ b/packages/bazel/src/schematics/ng-new/BUILD.bazel
@@ -13,10 +13,11 @@ ts_library(
     ],
     deps = [
         "//packages/bazel/src/schematics/bazel-workspace",
-        "@ngdeps//@angular-devkit/core",
-        "@ngdeps//@angular-devkit/schematics",
-        "@ngdeps//@schematics/angular",
-        "@ngdeps//typescript",
+        "//packages/bazel/src/schematics/utility",
+        "@npm//@angular-devkit/core",
+        "@npm//@angular-devkit/schematics",
+        "@npm//@schematics/angular",
+        "@npm//typescript",
     ],
 )
 
@@ -31,6 +32,6 @@ ts_library(
     ],
     deps = [
         ":ng-new",
-        "@ngdeps//@angular-devkit/schematics",
+        "@npm//@angular-devkit/schematics",
     ],
 )
diff --git a/packages/bazel/src/schematics/ng-new/index.ts b/packages/bazel/src/schematics/ng-new/index.ts
index 3f05835614..0ee341dc07 100755
--- a/packages/bazel/src/schematics/ng-new/index.ts
+++ b/packages/bazel/src/schematics/ng-new/index.ts
@@ -11,6 +11,7 @@
 import {SchematicContext, apply, applyTemplates, chain, externalSchematic, MergeStrategy, mergeWith, move, Rule, schematic, Tree, url, SchematicsException, UpdateRecorder,} from '@angular-devkit/schematics';
 import {parseJsonAst, JsonAstObject, strings, JsonValue} from '@angular-devkit/core';
 import {findPropertyInAstObject, insertPropertyInAstObjectInOrder} from '@schematics/angular/utility/json-utils';
+import {isJsonAstObject, replacePropertyInAstObject} from '../utility/json-utils';
 import {validateProjectName} from '@schematics/angular/utility/validation';
 import {getWorkspace} from '@schematics/angular/utility/config';
 import {Schema} from './schema';
@@ -43,8 +44,9 @@ function addDevDependenciesToPackageJson(options: Schema) {
       // TODO(kyliau): Consider moving this to latest-versions.ts
       '@bazel/bazel': '^0.23.0',
       '@bazel/ibazel': '^0.9.0',
-      '@bazel/karma': '^0.25.1',
-      '@bazel/typescript': '^0.25.1',
+      '@bazel/jasmine': '^0.26.0',
+      '@bazel/karma': '^0.26.0',
+      '@bazel/typescript': '^0.26.0',
     };
 
     const recorder = host.beginUpdate(packageJson);
@@ -109,21 +111,6 @@ function overwriteGitignore(options: Schema) {
   };
 }
 
-function replacePropertyInAstObject(
-    recorder: UpdateRecorder, node: JsonAstObject, propertyName: string, value: JsonValue,
-    indent: number) {
-  const property = findPropertyInAstObject(node, propertyName);
-  if (property === null) {
-    throw new Error(`Property ${propertyName} does not exist in JSON object`);
-  }
-  const {start, text} = property;
-  recorder.remove(start.offset, text.length);
-  const indentStr = '\n' +
-      ' '.repeat(indent);
-  const content = JSON.stringify(value, null, '  ').replace(/\n/g, indentStr);
-  recorder.insertLeft(start.offset, content);
-}
-
 function updateWorkspaceFileToUseBazelBuilder(options: Schema): Rule {
   return (host: Tree, context: SchematicContext) => {
     const {name} = options;
@@ -196,6 +183,81 @@ function updateWorkspaceFileToUseBazelBuilder(options: Schema): Rule {
   };
 }
 
+/**
+ * @angular/bazel requires minimum version of rxjs to be 6.4.0. This function
+ * upgrades the version of rxjs in package.json if necessary.
+ */
+function upgradeRxjs(options: Schema) {
+  return (host: Tree, context: SchematicContext) => {
+    const packageJson = `${options.name}/package.json`;
+    if (!host.exists(packageJson)) {
+      throw new Error(`Could not find ${packageJson}`);
+    }
+    const content = host.read(packageJson).toString();
+    const jsonAst = parseJsonAst(content);
+    if (!isJsonAstObject(jsonAst)) {
+      throw new Error(`Failed to parse JSON for ${packageJson}`);
+    }
+    const deps = findPropertyInAstObject(jsonAst, 'dependencies');
+    if (!isJsonAstObject(deps)) {
+      throw new Error(`Failed to find dependencies in ${packageJson}`);
+    }
+    const rxjs = findPropertyInAstObject(deps, 'rxjs');
+    if (!rxjs) {
+      throw new Error(`Failed to find rxjs in dependencies of ${packageJson}`);
+    }
+    const value = rxjs.value as string;  // value can be version or range
+    const match = value.match(/(\d)+\.(\d)+.(\d)+$/);
+    if (match) {
+      const [_, major, minor] = match;
+      if (major < '6' || (major === '6' && minor < '4')) {
+        const recorder = host.beginUpdate(packageJson);
+        replacePropertyInAstObject(recorder, deps, 'rxjs', '~6.4.0');
+        host.commitUpdate(recorder);
+      }
+    } else {
+      context.logger.info(
+          'Could not determine version of rxjs. \n' +
+          'Please make sure that version is at least 6.4.0.');
+    }
+    return host;
+  };
+}
+
+/**
+ * When using Angular NPM packages and building with AOT compilation, ngc
+ * requires ngsumamry files but they are not shipped. This function adds a
+ * postinstall step to generate these files.
+ */
+function addPostinstallToGenerateNgSummaries(options: Schema) {
+  return (host: Tree, context: SchematicContext) => {
+    const angularMetadataTsConfig = `${options.name}/angular-metadata.tsconfig.json`;
+    if (!host.exists(angularMetadataTsConfig)) {
+      return;
+    }
+    const packageJson = `${options.name}/package.json`;
+    if (!host.exists(packageJson)) {
+      throw new Error(`Could not find ${packageJson}`);
+    }
+    const content = host.read(packageJson).toString();
+    const jsonAst = parseJsonAst(content) as JsonAstObject;
+    const scripts = findPropertyInAstObject(jsonAst, 'scripts') as JsonAstObject;
+    const recorder = host.beginUpdate(packageJson);
+    if (scripts) {
+      insertPropertyInAstObjectInOrder(
+          recorder, scripts, 'postinstall', 'ngc -p ./angular-metadata.tsconfig.json', 4);
+    } else {
+      insertPropertyInAstObjectInOrder(
+          recorder, jsonAst, 'scripts', {
+            postinstall: 'ngc -p ./angular-metadata.tsconfig.json',
+          },
+          2);
+    }
+    host.commitUpdate(recorder);
+    return host;
+  };
+}
+
 export default function(options: Schema): Rule {
   return (host: Tree) => {
     validateProjectName(options.name);
@@ -207,11 +269,13 @@ export default function(options: Schema): Rule {
               ...options,
           }),
       addDevDependenciesToPackageJson(options),
+      upgradeRxjs(options),
       addDevAndProdMainForAot(options),
       schematic('bazel-workspace', options, {
         scope: options.name,
       }),
       overwriteGitignore(options),
+      addPostinstallToGenerateNgSummaries(options),
       updateWorkspaceFileToUseBazelBuilder(options),
     ]);
   };
diff --git a/packages/bazel/src/schematics/utility/BUILD.bazel b/packages/bazel/src/schematics/utility/BUILD.bazel
new file mode 100644
index 0000000000..9420f1a17a
--- /dev/null
+++ b/packages/bazel/src/schematics/utility/BUILD.bazel
@@ -0,0 +1,30 @@
+package(default_visibility = ["//visibility:public"])
+
+load("//tools:defaults.bzl", "ts_library")
+
+ts_library(
+    name = "utility",
+    srcs = [
+        "json-utils.ts",
+    ],
+    module_name = "@angular/bazel/src/schematics/utility",
+    deps = [
+        "@npm//@angular-devkit/core",
+        "@npm//@angular-devkit/schematics",
+        "@npm//@schematics/angular",
+        "@npm//typescript",
+    ],
+)
+
+ts_library(
+    name = "test",
+    testonly = True,
+    srcs = [
+        "json-utils_spec.ts",
+    ],
+    deps = [
+        ":utility",
+        "@npm//@angular-devkit/core",
+        "@npm//@angular-devkit/schematics",
+    ],
+)
diff --git a/packages/bazel/src/schematics/utility/json-utils.ts b/packages/bazel/src/schematics/utility/json-utils.ts
new file mode 100644
index 0000000000..37526b5f6e
--- /dev/null
+++ b/packages/bazel/src/schematics/utility/json-utils.ts
@@ -0,0 +1,65 @@
+/**
+ * @license
+ * 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
+ */
+
+import {JsonAstNode, JsonAstObject, JsonValue} from '@angular-devkit/core';
+import {UpdateRecorder} from '@angular-devkit/schematics';
+import {findPropertyInAstObject} from '@schematics/angular/utility/json-utils';
+
+/**
+ * Replace the value of the key-value pair in the 'node' object with a different
+ * 'value' and record the update using the specified 'recorder'.
+ */
+export function replacePropertyInAstObject(
+    recorder: UpdateRecorder, node: JsonAstObject, propertyName: string, value: JsonValue,
+    indent: number = 0) {
+  const property = findPropertyInAstObject(node, propertyName);
+  if (property === null) {
+    throw new Error(`Property '${propertyName}' does not exist in JSON object`);
+  }
+  const {start, text} = property;
+  recorder.remove(start.offset, text.length);
+  const indentStr = '\n' +
+      ' '.repeat(indent);
+  const content = JSON.stringify(value, null, '  ').replace(/\n/g, indentStr);
+  recorder.insertLeft(start.offset, content);
+}
+
+/**
+ * Remove the key-value pair with the specified 'key' in the specified 'node'
+ * object and record the update using the specified 'recorder'.
+ */
+export function removeKeyValueInAstObject(
+    recorder: UpdateRecorder, content: string, node: JsonAstObject, key: string) {
+  for (const [i, prop] of node.properties.entries()) {
+    if (prop.key.value === key) {
+      const start = prop.start.offset;
+      const end = prop.end.offset;
+      let length = end - start;
+      const match = content.slice(end).match(/[,\s]+/);
+      if (match) {
+        length += match.pop() !.length;
+      }
+      recorder.remove(start, length);
+      if (i === node.properties.length - 1) {  // last property
+        let offset = 0;
+        while (/(,|\s)/.test(content.charAt(start - offset - 1))) {
+          offset++;
+        }
+        recorder.remove(start - offset, offset);
+      }
+      return;
+    }
+  }
+}
+
+/**
+ * Returns true if the specified 'node' is a JsonAstObject, false otherwise.
+ */
+export function isJsonAstObject(node: JsonAstNode | null): node is JsonAstObject {
+  return !!node && node.kind === 'object';
+}
diff --git a/packages/bazel/src/schematics/utility/json-utils_spec.ts b/packages/bazel/src/schematics/utility/json-utils_spec.ts
new file mode 100644
index 0000000000..0f7e2d24aa
--- /dev/null
+++ b/packages/bazel/src/schematics/utility/json-utils_spec.ts
@@ -0,0 +1,109 @@
+/**
+ * @license
+ * 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
+ */
+
+import {JsonAstObject, parseJsonAst} from '@angular-devkit/core';
+import {HostTree} from '@angular-devkit/schematics';
+import {UnitTestTree} from '@angular-devkit/schematics/testing';
+import {isJsonAstObject, removeKeyValueInAstObject, replacePropertyInAstObject} from './json-utils';
+
+describe('JsonUtils', () => {
+
+  let tree: UnitTestTree;
+  beforeEach(() => { tree = new UnitTestTree(new HostTree()); });
+
+  describe('replacePropertyInAstObject', () => {
+    it('should replace property', () => {
+      const content = JSON.stringify({foo: {bar: 'baz'}});
+      tree.create('tmp', content);
+      const ast = parseJsonAst(content) as JsonAstObject;
+      const recorder = tree.beginUpdate('tmp');
+      replacePropertyInAstObject(recorder, ast, 'foo', [1, 2, 3]);
+      tree.commitUpdate(recorder);
+      const value = tree.readContent('tmp');
+      expect(JSON.parse(value)).toEqual({
+        foo: [1, 2, 3],
+      });
+      expect(value).toBe(`{"foo":[
+  1,
+  2,
+  3
+]}`);
+    });
+
+    it('should respect the indent parameter', () => {
+      const content = JSON.stringify({hello: 'world'}, null, 2);
+      tree.create('tmp', content);
+      const ast = parseJsonAst(content) as JsonAstObject;
+      const recorder = tree.beginUpdate('tmp');
+      replacePropertyInAstObject(recorder, ast, 'hello', 'world!', 2);
+      tree.commitUpdate(recorder);
+      const value = tree.readContent('tmp');
+      expect(JSON.parse(value)).toEqual({
+        hello: 'world!',
+      });
+      expect(value).toBe(`{
+  "hello": "world!"
+}`);
+    });
+
+    it('should throw error if property is not found', () => {
+      const content = JSON.stringify({});
+      tree.create('tmp', content);
+      const ast = parseJsonAst(content) as JsonAstObject;
+      const recorder = tree.beginUpdate('tmp');
+      expect(() => replacePropertyInAstObject(recorder, ast, 'foo', 'bar'))
+          .toThrowError(`Property 'foo' does not exist in JSON object`);
+    });
+  });
+
+  describe('removeKeyValueInAstObject', () => {
+    it('should remove key-value pair', () => {
+      const content = JSON.stringify({hello: 'world', foo: 'bar'});
+      tree.create('tmp', content);
+      const ast = parseJsonAst(content) as JsonAstObject;
+      let recorder = tree.beginUpdate('tmp');
+      removeKeyValueInAstObject(recorder, content, ast, 'foo');
+      tree.commitUpdate(recorder);
+      const tmp = tree.readContent('tmp');
+      expect(JSON.parse(tmp)).toEqual({
+        hello: 'world',
+      });
+      expect(tmp).toBe('{"hello":"world"}');
+      recorder = tree.beginUpdate('tmp');
+      const newContent = tree.readContent('tmp');
+      removeKeyValueInAstObject(recorder, newContent, ast, 'hello');
+      tree.commitUpdate(recorder);
+      const value = tree.readContent('tmp');
+      expect(JSON.parse(value)).toEqual({});
+      expect(value).toBe('{}');
+    });
+
+    it('should be a noop if key is not found', () => {
+      const content = JSON.stringify({foo: 'bar'});
+      tree.create('tmp', content);
+      const ast = parseJsonAst(content) as JsonAstObject;
+      let recorder = tree.beginUpdate('tmp');
+      expect(() => removeKeyValueInAstObject(recorder, content, ast, 'hello')).not.toThrow();
+      tree.commitUpdate(recorder);
+      const value = tree.readContent('tmp');
+      expect(JSON.parse(value)).toEqual({foo: 'bar'});
+      expect(value).toBe('{"foo":"bar"}');
+    });
+  });
+
+  describe('isJsonAstObject', () => {
+    it('should return true for an object', () => {
+      const ast = parseJsonAst(JSON.stringify({}));
+      expect(isJsonAstObject(ast)).toBe(true);
+    });
+    it('should return false for a non-object', () => {
+      const ast = parseJsonAst(JSON.stringify([]));
+      expect(isJsonAstObject(ast)).toBe(false);
+    });
+  });
+});
diff --git a/packages/bazel/test/ng_package/BUILD.bazel b/packages/bazel/test/ng_package/BUILD.bazel
index 0925aa37f6..9c4884b8be 100644
--- a/packages/bazel/test/ng_package/BUILD.bazel
+++ b/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"],
diff --git a/packages/bazel/test/ng_package/example/BUILD.bazel b/packages/bazel/test/ng_package/example/BUILD.bazel
index 11797674c5..172bf90c8b 100644
--- a/packages/bazel/test/ng_package/example/BUILD.bazel
+++ b/packages/bazel/test/ng_package/example/BUILD.bazel
@@ -8,7 +8,7 @@ ng_module(
     module_name = "example",
     deps = [
         "//packages/bazel/test/ng_package/example/secondary",
-        "@ngdeps//@types",
+        "@npm//@types",
     ],
 )
 
diff --git a/packages/bazel/test/ng_package/example/secondary/BUILD.bazel b/packages/bazel/test/ng_package/example/secondary/BUILD.bazel
index 6fdcbc67b1..ce88af79e1 100644
--- a/packages/bazel/test/ng_package/example/secondary/BUILD.bazel
+++ b/packages/bazel/test/ng_package/example/secondary/BUILD.bazel
@@ -8,6 +8,6 @@ ng_module(
     module_name = "example/secondary",
     deps = [
         "//packages/core",
-        "@ngdeps//@types",
+        "@npm//@types",
     ],
 )
diff --git a/packages/bazel/test/ngc-wrapped/BUILD.bazel b/packages/bazel/test/ngc-wrapped/BUILD.bazel
index 902a5a6fe8..f8f7907701 100644
--- a/packages/bazel/test/ngc-wrapped/BUILD.bazel
+++ b/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",
     ],
 )
 
diff --git a/packages/bazel/test/ngc-wrapped/empty/BUILD.bazel b/packages/bazel/test/ngc-wrapped/empty/BUILD.bazel
index 68e33b75fa..f9809da07b 100644
--- a/packages/bazel/test/ngc-wrapped/empty/BUILD.bazel
+++ b/packages/bazel/test/ngc-wrapped/empty/BUILD.bazel
@@ -8,6 +8,6 @@ ng_module(
     tsconfig = ":tsconfig.json",
     deps = [
         "//packages/core",
-        "@ngdeps//@types",
+        "@npm//@types",
     ],
 )
diff --git a/packages/bazel/test/ngc-wrapped/tsconfig_template.ts b/packages/bazel/test/ngc-wrapped/tsconfig_template.ts
index 5459a6e62f..7f52d2b503 100644
--- a/packages/bazel/test/ngc-wrapped/tsconfig_template.ts
+++ b/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': {
diff --git a/packages/bazel/test/protractor-2/BUILD.bazel b/packages/bazel/test/protractor-2/BUILD.bazel
index a9c99f87e1..bf3dae8778 100644
--- a/packages/bazel/test/protractor-2/BUILD.bazel
+++ b/packages/bazel/test/protractor-2/BUILD.bazel
@@ -1,8 +1,7 @@
 load("//packages/bazel:index.bzl", "protractor_web_test_suite")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
-load("@build_bazel_rules_nodejs//:defs.bzl", "rollup_bundle")
+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")
-load("//tools/http-server:http_server.bzl", "http_server")
 
 ts_library(
     name = "app",
@@ -37,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",
     ],
 )
 
@@ -50,7 +49,7 @@ protractor_web_test_suite(
     server = ":prodserver",
     deps = [
         ":ts_spec",
-        "@ngdeps//protractor",
+        "@npm//protractor",
     ],
 )
 
@@ -62,6 +61,6 @@ protractor_web_test_suite(
     server = ":devserver",
     deps = [
         ":ts_spec",
-        "@ngdeps//protractor",
+        "@npm//protractor",
     ],
 )
diff --git a/packages/bazel/test/protractor-utils/BUILD.bazel b/packages/bazel/test/protractor-utils/BUILD.bazel
index 33c2d77f4f..e2ddbf2008 100644
--- a/packages/bazel/test/protractor-utils/BUILD.bazel
+++ b/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",
 )
diff --git a/packages/bazel/test/protractor/BUILD.bazel b/packages/bazel/test/protractor/BUILD.bazel
index 1f600e0d17..6301ba8b8f 100644
--- a/packages/bazel/test/protractor/BUILD.bazel
+++ b/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",
     ],
 )
diff --git a/packages/benchpress/BUILD.bazel b/packages/benchpress/BUILD.bazel
index 188f8910de..6920068d48 100644
--- a/packages/benchpress/BUILD.bazel
+++ b/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",
     ],
 )
 
diff --git a/packages/benchpress/test/BUILD.bazel b/packages/benchpress/test/BUILD.bazel
index 9e6d8e46a1..ea75062fab 100644
--- a/packages/benchpress/test/BUILD.bazel
+++ b/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",
     ],
 )
diff --git a/packages/common/BUILD.bazel b/packages/common/BUILD.bazel
index ebdd72f73c..1665ae89d2 100644
--- a/packages/common/BUILD.bazel
+++ b/packages/common/BUILD.bazel
@@ -12,7 +12,7 @@ ng_module(
     ),
     deps = [
         "//packages/core",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
 
diff --git a/packages/common/http/BUILD.bazel b/packages/common/http/BUILD.bazel
index 7fb75cfbd8..9c82bc1e1c 100644
--- a/packages/common/http/BUILD.bazel
+++ b/packages/common/http/BUILD.bazel
@@ -15,6 +15,6 @@ ng_module(
     deps = [
         "//packages/common",
         "//packages/core",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
diff --git a/packages/common/http/test/BUILD.bazel b/packages/common/http/test/BUILD.bazel
index e3c6f91998..5c5aa9cad8 100644
--- a/packages/common/http/test/BUILD.bazel
+++ b/packages/common/http/test/BUILD.bazel
@@ -11,7 +11,7 @@ ts_library(
         "//packages/common/http/testing",
         "//packages/core",
         "//packages/core/testing",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
 
diff --git a/packages/common/http/testing/BUILD.bazel b/packages/common/http/testing/BUILD.bazel
index 2679e45ed3..f8f4ea3331 100644
--- a/packages/common/http/testing/BUILD.bazel
+++ b/packages/common/http/testing/BUILD.bazel
@@ -15,6 +15,6 @@ ng_module(
     deps = [
         "//packages/common/http",
         "//packages/core",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
diff --git a/packages/common/http/testing/test/BUILD.bazel b/packages/common/http/testing/test/BUILD.bazel
index 95d1c3eeb9..53c360efc4 100644
--- a/packages/common/http/testing/test/BUILD.bazel
+++ b/packages/common/http/testing/test/BUILD.bazel
@@ -9,7 +9,7 @@ ts_library(
     deps = [
         "//packages/common/http",
         "//packages/common/http/testing",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
 
diff --git a/packages/common/testing/BUILD.bazel b/packages/common/testing/BUILD.bazel
index c5028e1b31..085617071c 100644
--- a/packages/common/testing/BUILD.bazel
+++ b/packages/common/testing/BUILD.bazel
@@ -10,6 +10,6 @@ ng_module(
     deps = [
         "//packages/common",
         "//packages/core",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
diff --git a/packages/compiler-cli/BUILD.bazel b/packages/compiler-cli/BUILD.bazel
index 6edfb274ef..8cf989d76f 100644
--- a/packages/compiler-cli/BUILD.bazel
+++ b/packages/compiler-cli/BUILD.bazel
@@ -1,7 +1,7 @@
 package(default_visibility = ["//visibility:public"])
 
 load("//tools:defaults.bzl", "npm_package", "ts_library")
-load("@npm_bazel_typescript//:defs.bzl", "ts_config")
+load("@npm_bazel_typescript//:index.bzl", "ts_config")
 
 ts_config(
     name = "tsconfig",
@@ -30,10 +30,10 @@ ts_library(
         "//packages/compiler-cli/src/ngtsc/switch",
         "//packages/compiler-cli/src/ngtsc/transform",
         "//packages/compiler-cli/src/ngtsc/typecheck",
-        "@ngdeps//@bazel/typescript",
-        "@ngdeps//@types",
-        "@ngdeps//tsickle",
-        "@ngdeps//typescript",
+        "@npm//@bazel/typescript",
+        "@npm//@types",
+        "@npm//tsickle",
+        "@npm//typescript",
     ],
 )
 
diff --git a/packages/compiler-cli/integrationtest/BUILD.bazel b/packages/compiler-cli/integrationtest/BUILD.bazel
index 985fdbe756..be32c13964 100644
--- a/packages/compiler-cli/integrationtest/BUILD.bazel
+++ b/packages/compiler-cli/integrationtest/BUILD.bazel
@@ -7,8 +7,8 @@ nodejs_binary(
     name = "ngc_bin",
     data = [
         "//packages/compiler-cli",
-        "@ngdeps//chokidar",
-        "@ngdeps//reflect-metadata",
+        "@npm//chokidar",
+        "@npm//reflect-metadata",
     ],
     entry_point = "angular/packages/compiler-cli/src/main.js",
 )
@@ -17,8 +17,8 @@ nodejs_binary(
     name = "ng_xi18n",
     data = [
         "//packages/compiler-cli",
-        "@ngdeps//chokidar",
-        "@ngdeps//reflect-metadata",
+        "@npm//chokidar",
+        "@npm//reflect-metadata",
     ],
     entry_point = "angular/packages/compiler-cli/src/extract_i18n.js",
 )
@@ -29,19 +29,19 @@ nodejs_test(
         ":ngc_bin",
         ":ng_xi18n",
         "@nodejs//:node",
-        "@ngdeps//domino",
-        "@ngdeps//chokidar",
-        "@ngdeps//source-map-support",
-        "@ngdeps//shelljs",
-        "@ngdeps//typescript",
-        "@ngdeps//reflect-metadata",
-        "@ngdeps//rxjs",
-        "@ngdeps//tslib",
-        "@ngdeps//jasmine/bin:jasmine",
-        "@ngdeps//zone.js",
-        "@ngdeps//xhr2",
-        "@ngdeps//@types/node",
-        "@ngdeps//@types/jasmine",
+        "@npm//domino",
+        "@npm//chokidar",
+        "@npm//source-map-support",
+        "@npm//shelljs",
+        "@npm//typescript",
+        "@npm//reflect-metadata",
+        "@npm//rxjs",
+        "@npm//tslib",
+        "@npm//jasmine/bin:jasmine",
+        "@npm//zone.js",
+        "@npm//xhr2",
+        "@npm//@types/node",
+        "@npm//@types/jasmine",
         "//packages/animations:npm_package",
         "//packages/common:npm_package",
         "//packages/compiler:npm_package",
diff --git a/packages/compiler-cli/integrationtest/bazel/injectable_def/app/BUILD.bazel b/packages/compiler-cli/integrationtest/bazel/injectable_def/app/BUILD.bazel
index 0d9ce2b0cd..e49b570869 100644
--- a/packages/compiler-cli/integrationtest/bazel/injectable_def/app/BUILD.bazel
+++ b/packages/compiler-cli/integrationtest/bazel/injectable_def/app/BUILD.bazel
@@ -17,7 +17,7 @@ ng_module(
         "//packages/platform-browser",
         "//packages/platform-server",
         "//packages/router",
-        "@ngdeps//reflect-metadata",
-        "@ngdeps//rxjs",
+        "@npm//reflect-metadata",
+        "@npm//rxjs",
     ],
 )
diff --git a/packages/compiler-cli/integrationtest/bazel/injectable_def/lib1/BUILD.bazel b/packages/compiler-cli/integrationtest/bazel/injectable_def/lib1/BUILD.bazel
index 1541ba9e83..ba78227df1 100644
--- a/packages/compiler-cli/integrationtest/bazel/injectable_def/lib1/BUILD.bazel
+++ b/packages/compiler-cli/integrationtest/bazel/injectable_def/lib1/BUILD.bazel
@@ -12,6 +12,6 @@ ng_module(
     module_name = "lib1_built",
     deps = [
         "//packages/core",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
diff --git a/packages/compiler-cli/integrationtest/bazel/injectable_def/lib2/BUILD.bazel b/packages/compiler-cli/integrationtest/bazel/injectable_def/lib2/BUILD.bazel
index aee1ff6d32..78160255b8 100644
--- a/packages/compiler-cli/integrationtest/bazel/injectable_def/lib2/BUILD.bazel
+++ b/packages/compiler-cli/integrationtest/bazel/injectable_def/lib2/BUILD.bazel
@@ -13,6 +13,6 @@ ng_module(
     deps = [
         "//packages/compiler-cli/integrationtest/bazel/injectable_def/lib1",
         "//packages/core",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
diff --git a/packages/compiler-cli/integrationtest/bazel/injector_def/ivy_build/app/BUILD.bazel b/packages/compiler-cli/integrationtest/bazel/injector_def/ivy_build/app/BUILD.bazel
index 99e2f11d1f..722afd8874 100644
--- a/packages/compiler-cli/integrationtest/bazel/injector_def/ivy_build/app/BUILD.bazel
+++ b/packages/compiler-cli/integrationtest/bazel/injector_def/ivy_build/app/BUILD.bazel
@@ -13,6 +13,6 @@ ng_module(
     tags = ["ivy-only"],
     deps = [
         "//packages/core",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
diff --git a/packages/compiler-cli/integrationtest/bazel/ng_module/BUILD.bazel b/packages/compiler-cli/integrationtest/bazel/ng_module/BUILD.bazel
index b65c58d7ce..ddc14f1042 100644
--- a/packages/compiler-cli/integrationtest/bazel/ng_module/BUILD.bazel
+++ b/packages/compiler-cli/integrationtest/bazel/ng_module/BUILD.bazel
@@ -9,7 +9,7 @@ ng_module(
     flat_module_out_file = "flat_module_filename",
     module_name = "some_npm_module",
     ng_xi18n = "//packages/bazel/src/ngc-wrapped:xi18n",
-    node_modules = "@ngdeps//typescript:typescript__typings",
+    node_modules = "@npm//typescript:typescript__typings",
     tags = [
         # Disabled as this test is specific to the flat module indexing of metadata.json files that
         # the old ngc compiler does. Ivy has no metadata.json files so this test does not apply.
@@ -17,7 +17,7 @@ ng_module(
     ],
     deps = [
         "//packages/core",
-        "@ngdeps//@types",
+        "@npm//@types",
     ],
 )
 
diff --git a/packages/compiler-cli/integrationtest/test.js b/packages/compiler-cli/integrationtest/test.js
index 2b62fd7f0c..67d93e3beb 100644
--- a/packages/compiler-cli/integrationtest/test.js
+++ b/packages/compiler-cli/integrationtest/test.js
@@ -14,7 +14,7 @@ const {runCommand, setupTestDirectory} = require('./test_helpers');
 const ngcBin = require.resolve('./ngc_bin');
 const xi18nBin = require.resolve('./ng_xi18n');
 const nodeBin = require.resolve(`nodejs/bin/node${(os.platform() === 'win32' ? '.cmd' : '')}`);
-const jasmineBin = require.resolve('ngdeps/node_modules/jasmine/bin/jasmine.js');
+const jasmineBin = require.resolve('npm/node_modules/jasmine/bin/jasmine.js');
 
 // Prepare the test directory before building the integration test output. This ensures that
 // the test runs in an hermetic way and works on Windows.
diff --git a/packages/compiler-cli/integrationtest/test_helpers.js b/packages/compiler-cli/integrationtest/test_helpers.js
index c638b63c01..60be02993f 100644
--- a/packages/compiler-cli/integrationtest/test_helpers.js
+++ b/packages/compiler-cli/integrationtest/test_helpers.js
@@ -36,23 +36,23 @@ const requiredNodeModules = {
   '@angular/platform-server':
       resolveNpmTreeArtifact('angular/packages/platform-server/npm_package'),
   '@angular/router': resolveNpmTreeArtifact('angular/packages/router/npm_package'),
-  '@types/jasmine': resolveNpmTreeArtifact('ngdeps/node_modules/@types/jasmine'),
-  '@types/node': resolveNpmTreeArtifact('ngdeps/node_modules/@types/node'),
+  '@types/jasmine': resolveNpmTreeArtifact('npm/node_modules/@types/jasmine'),
+  '@types/node': resolveNpmTreeArtifact('npm/node_modules/@types/node'),
 
   // Transitive dependencies which need to be specified because the Angular NPM packages
   // depend on these without the Angular NPM packages being part of the Bazel managed deps.
   // This means that transitive dependencies need to be manually declared as required.
-  'tslib': resolveNpmTreeArtifact('ngdeps/node_modules/tslib'),
-  'domino': resolveNpmTreeArtifact('ngdeps/node_modules/domino'),
-  'xhr2': resolveNpmTreeArtifact('ngdeps/node_modules/xhr2'),
+  'tslib': resolveNpmTreeArtifact('npm/node_modules/tslib'),
+  'domino': resolveNpmTreeArtifact('npm/node_modules/domino'),
+  'xhr2': resolveNpmTreeArtifact('npm/node_modules/xhr2'),
 
   // Fine grained dependencies which are used by the integration test Angular modules, and
   // need to be symlinked so that they can be resolved by NodeJS or NGC.
-  'reflect-metadata': resolveNpmTreeArtifact('ngdeps/node_modules/reflect-metadata'),
-  'rxjs': resolveNpmTreeArtifact('ngdeps/node_modules/rxjs'),
-  'source-map-support': resolveNpmTreeArtifact('ngdeps/node_modules/source-map-support'),
-  'typescript': resolveNpmTreeArtifact('ngdeps/node_modules/typescript'),
-  'zone.js': resolveNpmTreeArtifact('ngdeps/node_modules/zone.js'),
+  'reflect-metadata': resolveNpmTreeArtifact('npm/node_modules/reflect-metadata'),
+  'rxjs': resolveNpmTreeArtifact('npm/node_modules/rxjs'),
+  'source-map-support': resolveNpmTreeArtifact('npm/node_modules/source-map-support'),
+  'typescript': resolveNpmTreeArtifact('npm/node_modules/typescript'),
+  'zone.js': resolveNpmTreeArtifact('npm/node_modules/zone.js'),
 };
 
 /** Sets up the temporary test directory and returns the path to the directory. */
diff --git a/packages/compiler-cli/src/ngcc/BUILD.bazel b/packages/compiler-cli/src/ngcc/BUILD.bazel
index cc4f7facb8..93a21801e9 100644
--- a/packages/compiler-cli/src/ngcc/BUILD.bazel
+++ b/packages/compiler-cli/src/ngcc/BUILD.bazel
@@ -16,15 +16,15 @@ ts_library(
         "//packages/compiler-cli/src/ngtsc/metadata",
         "//packages/compiler-cli/src/ngtsc/transform",
         "//packages/compiler-cli/src/ngtsc/translator",
-        "@ngdeps//@types/convert-source-map",
-        "@ngdeps//@types/node",
-        "@ngdeps//@types/shelljs",
-        "@ngdeps//@types/source-map",
-        "@ngdeps//@types/yargs",
-        "@ngdeps//canonical-path",
-        "@ngdeps//dependency-graph",
-        "@ngdeps//magic-string",
-        "@ngdeps//source-map",
-        "@ngdeps//typescript",
+        "@npm//@types/convert-source-map",
+        "@npm//@types/node",
+        "@npm//@types/shelljs",
+        "@npm//@types/source-map",
+        "@npm//@types/yargs",
+        "@npm//canonical-path",
+        "@npm//dependency-graph",
+        "@npm//magic-string",
+        "@npm//source-map",
+        "@npm//typescript",
     ],
 )
diff --git a/packages/compiler-cli/src/ngcc/test/BUILD.bazel b/packages/compiler-cli/src/ngcc/test/BUILD.bazel
index 826a437aed..07b5dd269f 100644
--- a/packages/compiler-cli/src/ngcc/test/BUILD.bazel
+++ b/packages/compiler-cli/src/ngcc/test/BUILD.bazel
@@ -14,11 +14,11 @@ ts_library(
         "//packages/compiler-cli/src/ngtsc/metadata",
         "//packages/compiler-cli/src/ngtsc/testing",
         "//packages/compiler-cli/src/ngtsc/transform",
-        "@ngdeps//@types/convert-source-map",
-        "@ngdeps//@types/mock-fs",
-        "@ngdeps//canonical-path",
-        "@ngdeps//magic-string",
-        "@ngdeps//typescript",
+        "@npm//@types/convert-source-map",
+        "@npm//@types/mock-fs",
+        "@npm//canonical-path",
+        "@npm//magic-string",
+        "@npm//typescript",
     ],
 )
 
@@ -28,7 +28,7 @@ jasmine_node_test(
     deps = [
         ":test_lib",
         "//tools/testing:node_no_angular",
-        "@ngdeps//canonical-path",
-        "@ngdeps//convert-source-map",
+        "@npm//canonical-path",
+        "@npm//convert-source-map",
     ],
 )
diff --git a/packages/compiler-cli/src/ngtsc/annotations/BUILD.bazel b/packages/compiler-cli/src/ngtsc/annotations/BUILD.bazel
index 622809dfec..46932edd2c 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/annotations/BUILD.bazel
@@ -14,7 +14,7 @@ ts_library(
         "//packages/compiler-cli/src/ngtsc/metadata",
         "//packages/compiler-cli/src/ngtsc/transform",
         "//packages/compiler-cli/src/ngtsc/typecheck",
-        "@ngdeps//@types/node",
-        "@ngdeps//typescript",
+        "@npm//@types/node",
+        "@npm//typescript",
     ],
 )
diff --git a/packages/compiler-cli/src/ngtsc/annotations/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/annotations/test/BUILD.bazel
index fc283563c0..7e650f4b59 100644
--- a/packages/compiler-cli/src/ngtsc/annotations/test/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/annotations/test/BUILD.bazel
@@ -16,7 +16,7 @@ ts_library(
         "//packages/compiler-cli/src/ngtsc/metadata",
         "//packages/compiler-cli/src/ngtsc/testing",
         "//packages/compiler-cli/src/ngtsc/translator",
-        "@ngdeps//typescript",
+        "@npm//typescript",
     ],
 )
 
diff --git a/packages/compiler-cli/src/ngtsc/diagnostics/BUILD.bazel b/packages/compiler-cli/src/ngtsc/diagnostics/BUILD.bazel
index 774d74285b..01a8f272e7 100644
--- a/packages/compiler-cli/src/ngtsc/diagnostics/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/diagnostics/BUILD.bazel
@@ -9,6 +9,6 @@ ts_library(
     ]),
     deps = [
         "//packages/compiler",
-        "@ngdeps//typescript",
+        "@npm//typescript",
     ],
 )
diff --git a/packages/compiler-cli/src/ngtsc/host/BUILD.bazel b/packages/compiler-cli/src/ngtsc/host/BUILD.bazel
index f88965ad12..53046a8cc7 100644
--- a/packages/compiler-cli/src/ngtsc/host/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/host/BUILD.bazel
@@ -7,5 +7,5 @@ ts_library(
     srcs = ["index.ts"] + glob([
         "src/**/*.ts",
     ]),
-    deps = ["@ngdeps//typescript"],
+    deps = ["@npm//typescript"],
 )
diff --git a/packages/compiler-cli/src/ngtsc/metadata/BUILD.bazel b/packages/compiler-cli/src/ngtsc/metadata/BUILD.bazel
index a2af33791e..d337eddabd 100644
--- a/packages/compiler-cli/src/ngtsc/metadata/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/metadata/BUILD.bazel
@@ -12,7 +12,7 @@ ts_library(
         "//packages/compiler",
         "//packages/compiler-cli/src/ngtsc/host",
         "//packages/compiler-cli/src/ngtsc/util",
-        "@ngdeps//@types/node",
-        "@ngdeps//typescript",
+        "@npm//@types/node",
+        "@npm//typescript",
     ],
 )
diff --git a/packages/compiler-cli/src/ngtsc/metadata/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/metadata/test/BUILD.bazel
index 7fd3b12092..ce149fbc93 100644
--- a/packages/compiler-cli/src/ngtsc/metadata/test/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/metadata/test/BUILD.bazel
@@ -14,7 +14,7 @@ ts_library(
         "//packages/compiler-cli/src/ngtsc/host",
         "//packages/compiler-cli/src/ngtsc/metadata",
         "//packages/compiler-cli/src/ngtsc/testing",
-        "@ngdeps//typescript",
+        "@npm//typescript",
     ],
 )
 
diff --git a/packages/compiler-cli/src/ngtsc/shims/BUILD.bazel b/packages/compiler-cli/src/ngtsc/shims/BUILD.bazel
index 23b5a6f8f9..7f3cc19f76 100644
--- a/packages/compiler-cli/src/ngtsc/shims/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/shims/BUILD.bazel
@@ -12,7 +12,7 @@ ts_library(
         "//packages/compiler-cli/src/ngtsc/host",
         "//packages/compiler-cli/src/ngtsc/metadata",
         "//packages/compiler-cli/src/ngtsc/util",
-        "@ngdeps//@types/node",
-        "@ngdeps//typescript",
+        "@npm//@types/node",
+        "@npm//typescript",
     ],
 )
diff --git a/packages/compiler-cli/src/ngtsc/switch/BUILD.bazel b/packages/compiler-cli/src/ngtsc/switch/BUILD.bazel
index 3b50279889..b2ae1f7c6a 100644
--- a/packages/compiler-cli/src/ngtsc/switch/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/switch/BUILD.bazel
@@ -12,6 +12,6 @@ ts_library(
         "//packages/compiler-cli/src/ngtsc/host",
         "//packages/compiler-cli/src/ngtsc/metadata",
         "//packages/compiler-cli/src/ngtsc/util",
-        "@ngdeps//typescript",
+        "@npm//typescript",
     ],
 )
diff --git a/packages/compiler-cli/src/ngtsc/testing/BUILD.bazel b/packages/compiler-cli/src/ngtsc/testing/BUILD.bazel
index db42c39981..f011ff9ad0 100644
--- a/packages/compiler-cli/src/ngtsc/testing/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/testing/BUILD.bazel
@@ -10,6 +10,6 @@ ts_library(
     ]),
     deps = [
         "//packages:types",
-        "@ngdeps//typescript",
+        "@npm//typescript",
     ],
 )
diff --git a/packages/compiler-cli/src/ngtsc/transform/BUILD.bazel b/packages/compiler-cli/src/ngtsc/transform/BUILD.bazel
index 9e854413df..01b2f49d2d 100644
--- a/packages/compiler-cli/src/ngtsc/transform/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/transform/BUILD.bazel
@@ -15,6 +15,6 @@ ts_library(
         "//packages/compiler-cli/src/ngtsc/translator",
         "//packages/compiler-cli/src/ngtsc/typecheck",
         "//packages/compiler-cli/src/ngtsc/util",
-        "@ngdeps//typescript",
+        "@npm//typescript",
     ],
 )
diff --git a/packages/compiler-cli/src/ngtsc/translator/BUILD.bazel b/packages/compiler-cli/src/ngtsc/translator/BUILD.bazel
index 9f6f565eea..d538e87418 100644
--- a/packages/compiler-cli/src/ngtsc/translator/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/translator/BUILD.bazel
@@ -9,6 +9,6 @@ ts_library(
         "//packages:types",
         "//packages/compiler",
         "//packages/compiler-cli/src/ngtsc/util",
-        "@ngdeps//typescript",
+        "@npm//typescript",
     ],
 )
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/BUILD.bazel b/packages/compiler-cli/src/ngtsc/typecheck/BUILD.bazel
index 1299135066..26cab376d9 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/typecheck/BUILD.bazel
@@ -11,6 +11,6 @@ ts_library(
         "//packages/compiler-cli/src/ngtsc/metadata",
         "//packages/compiler-cli/src/ngtsc/translator",
         "//packages/compiler-cli/src/ngtsc/util",
-        "@ngdeps//typescript",
+        "@npm//typescript",
     ],
 )
diff --git a/packages/compiler-cli/src/ngtsc/typecheck/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/typecheck/test/BUILD.bazel
index 6de544a767..88ab8f0a17 100644
--- a/packages/compiler-cli/src/ngtsc/typecheck/test/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/typecheck/test/BUILD.bazel
@@ -14,7 +14,7 @@ ts_library(
         "//packages/compiler-cli/src/ngtsc/host",
         "//packages/compiler-cli/src/ngtsc/testing",
         "//packages/compiler-cli/src/ngtsc/typecheck",
-        "@ngdeps//typescript",
+        "@npm//typescript",
     ],
 )
 
diff --git a/packages/compiler-cli/src/ngtsc/util/BUILD.bazel b/packages/compiler-cli/src/ngtsc/util/BUILD.bazel
index e880c86fb0..618b8cefa6 100644
--- a/packages/compiler-cli/src/ngtsc/util/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/util/BUILD.bazel
@@ -9,7 +9,7 @@ ts_library(
     ]),
     deps = [
         "//packages:types",
-        "@ngdeps//@types/node",
-        "@ngdeps//typescript",
+        "@npm//@types/node",
+        "@npm//typescript",
     ],
 )
diff --git a/packages/compiler-cli/src/ngtsc/util/test/BUILD.bazel b/packages/compiler-cli/src/ngtsc/util/test/BUILD.bazel
index 88ddde2ad7..281b487fb7 100644
--- a/packages/compiler-cli/src/ngtsc/util/test/BUILD.bazel
+++ b/packages/compiler-cli/src/ngtsc/util/test/BUILD.bazel
@@ -12,7 +12,7 @@ ts_library(
         "//packages:types",
         "//packages/compiler-cli/src/ngtsc/testing",
         "//packages/compiler-cli/src/ngtsc/util",
-        "@ngdeps//typescript",
+        "@npm//typescript",
     ],
 )
 
diff --git a/packages/compiler-cli/test/BUILD.bazel b/packages/compiler-cli/test/BUILD.bazel
index ede4cd1c4c..9f8a8cee66 100644
--- a/packages/compiler-cli/test/BUILD.bazel
+++ b/packages/compiler-cli/test/BUILD.bazel
@@ -18,7 +18,7 @@ ts_library(
         "//packages:types",
         "//packages/compiler",
         "//packages/compiler-cli",
-        "@ngdeps//typescript",
+        "@npm//typescript",
     ],
 )
 
@@ -33,7 +33,7 @@ ts_library(
         ":test_utils",
         "//packages/compiler",
         "//packages/compiler-cli",
-        "@ngdeps//typescript",
+        "@npm//typescript",
     ],
 )
 
@@ -53,7 +53,7 @@ jasmine_node_test(
         "//packages/common:npm_package",
         "//packages/core",
         "//tools/testing:node",
-        "@ngdeps//minimist",
+        "@npm//minimist",
     ],
 )
 
@@ -68,7 +68,7 @@ ts_library(
         ":test_utils",
         "//packages/compiler",
         "//packages/compiler-cli",
-        "@ngdeps//typescript",
+        "@npm//typescript",
     ],
 )
 
@@ -91,9 +91,9 @@ jasmine_node_test(
         ":ngc_lib",
         "//packages/core",
         "//tools/testing:node",
-        "@ngdeps//minimist",
-        "@ngdeps//rxjs",
-        "@ngdeps//tsickle",
+        "@npm//minimist",
+        "@npm//rxjs",
+        "@npm//tsickle",
     ],
 )
 
@@ -109,7 +109,7 @@ ts_library(
         "//packages/compiler",
         "//packages/compiler-cli",
         "//packages/private/testing",
-        "@ngdeps//typescript",
+        "@npm//typescript",
     ],
 )
 
@@ -138,7 +138,7 @@ ts_library(
         ":test_utils",
         "//packages/compiler",
         "//packages/compiler-cli",
-        "@ngdeps//typescript",
+        "@npm//typescript",
     ],
 )
 
diff --git a/packages/compiler-cli/test/compliance/BUILD.bazel b/packages/compiler-cli/test/compliance/BUILD.bazel
index 66ec58e13c..56cc452d63 100644
--- a/packages/compiler-cli/test/compliance/BUILD.bazel
+++ b/packages/compiler-cli/test/compliance/BUILD.bazel
@@ -11,7 +11,7 @@ ts_library(
         "//packages/compiler",
         "//packages/compiler-cli",
         "//packages/compiler/test:test_utils",
-        "@ngdeps//typescript",
+        "@npm//typescript",
     ],
 )
 
diff --git a/packages/compiler-cli/test/diagnostics/BUILD.bazel b/packages/compiler-cli/test/diagnostics/BUILD.bazel
index 19eb83b305..65fab5a496 100644
--- a/packages/compiler-cli/test/diagnostics/BUILD.bazel
+++ b/packages/compiler-cli/test/diagnostics/BUILD.bazel
@@ -12,7 +12,7 @@ ts_library(
         "//packages/compiler-cli",
         "//packages/compiler-cli/test:test_utils",
         "//packages/core",
-        "@ngdeps//typescript",
+        "@npm//typescript",
     ],
 )
 
@@ -25,7 +25,7 @@ ts_library(
         ":mocks",
         "//packages/compiler-cli",
         "//packages/compiler-cli/test:test_utils",
-        "@ngdeps//typescript",
+        "@npm//typescript",
     ],
 )
 
@@ -60,7 +60,7 @@ ts_library(
         "//packages/compiler-cli",
         "//packages/compiler-cli/test:test_utils",
         "//packages/language-service",
-        "@ngdeps//typescript",
+        "@npm//typescript",
     ],
 )
 
@@ -96,7 +96,7 @@ ts_library(
         "//packages/compiler-cli/test:test_utils",
         "//packages/compiler/test:test_utils",
         "//packages/language-service",
-        "@ngdeps//typescript",
+        "@npm//typescript",
     ],
 )
 
diff --git a/packages/compiler-cli/test/metadata/BUILD.bazel b/packages/compiler-cli/test/metadata/BUILD.bazel
index ea274a7571..8fe58d3d1e 100644
--- a/packages/compiler-cli/test/metadata/BUILD.bazel
+++ b/packages/compiler-cli/test/metadata/BUILD.bazel
@@ -10,7 +10,7 @@ ts_library(
         "//packages/compiler-cli",
         "//packages/compiler-cli/test:test_utils",
         "//packages/core",
-        "@ngdeps//typescript",
+        "@npm//typescript",
     ],
 )
 
diff --git a/packages/compiler-cli/test/ngcc/BUILD.bazel b/packages/compiler-cli/test/ngcc/BUILD.bazel
index c18e086dae..6409276bc9 100644
--- a/packages/compiler-cli/test/ngcc/BUILD.bazel
+++ b/packages/compiler-cli/test/ngcc/BUILD.bazel
@@ -10,7 +10,7 @@ ts_library(
     deps = [
         "//packages/compiler-cli/src/ngcc",
         "//packages/compiler-cli/test:test_utils",
-        "@ngdeps//@types/mock-fs",
+        "@npm//@types/mock-fs",
     ],
 )
 
@@ -24,10 +24,10 @@ jasmine_node_test(
     deps = [
         ":ngcc_lib",
         "//tools/testing:node_no_angular",
-        "@ngdeps//@types/mock-fs",
-        "@ngdeps//canonical-path",
-        "@ngdeps//convert-source-map",
-        "@ngdeps//shelljs",
-        "@ngdeps//yargs",
+        "@npm//@types/mock-fs",
+        "@npm//canonical-path",
+        "@npm//convert-source-map",
+        "@npm//shelljs",
+        "@npm//yargs",
     ],
 )
diff --git a/packages/compiler-cli/test/ngtsc/BUILD.bazel b/packages/compiler-cli/test/ngtsc/BUILD.bazel
index 0019ee03e5..234d986b3e 100644
--- a/packages/compiler-cli/test/ngtsc/BUILD.bazel
+++ b/packages/compiler-cli/test/ngtsc/BUILD.bazel
@@ -8,7 +8,7 @@ ts_library(
         "//packages/compiler",
         "//packages/compiler-cli",
         "//packages/compiler-cli/test:test_utils",
-        "@ngdeps//typescript",
+        "@npm//typescript",
     ],
 )
 
@@ -21,6 +21,6 @@ jasmine_node_test(
     deps = [
         ":ngtsc_lib",
         "//tools/testing:node_no_angular",
-        "@ngdeps//minimist",
+        "@npm//minimist",
     ],
 )
diff --git a/packages/compiler-cli/test/test_support.ts b/packages/compiler-cli/test/test_support.ts
index 23f071132f..b99fceaedd 100644
--- a/packages/compiler-cli/test/test_support.ts
+++ b/packages/compiler-cli/test/test_support.ts
@@ -117,7 +117,7 @@ export function setupBazelTo(tmpDirPath: string) {
       ({pkgPath, name}) => { fs.symlinkSync(pkgPath, path.join(angularDirectory, name), 'dir'); });
 
   // Link typescript
-  const typeScriptSource = resolveNpmTreeArtifact('ngdeps/node_modules/typescript');
+  const typeScriptSource = resolveNpmTreeArtifact('npm/node_modules/typescript');
   const typescriptDest = path.join(nodeModulesPath, 'typescript');
   fs.symlinkSync(typeScriptSource, typescriptDest, 'dir');
 
diff --git a/packages/compiler-cli/test/transformers/BUILD.bazel b/packages/compiler-cli/test/transformers/BUILD.bazel
index b4435f7c59..8c9b603f4f 100644
--- a/packages/compiler-cli/test/transformers/BUILD.bazel
+++ b/packages/compiler-cli/test/transformers/BUILD.bazel
@@ -12,7 +12,7 @@ ts_library(
         "//packages/compiler/test:test_utils",
         "//packages/core",
         "//packages/platform-browser",
-        "@ngdeps//typescript",
+        "@npm//typescript",
     ],
 )
 
@@ -34,6 +34,6 @@ jasmine_node_test(
         ":test_lib",
         "//packages/core",
         "//tools/testing:node",
-        "@ngdeps//source-map",
+        "@npm//source-map",
     ],
 )
diff --git a/packages/compiler/test/BUILD.bazel b/packages/compiler/test/BUILD.bazel
index 9a90d09782..91a6e3373c 100644
--- a/packages/compiler/test/BUILD.bazel
+++ b/packages/compiler/test/BUILD.bazel
@@ -22,7 +22,7 @@ ts_library(
         "//packages:types",
         "//packages/compiler",
         "//packages/compiler-cli",
-        "@ngdeps//typescript",
+        "@npm//typescript",
     ],
 )
 
@@ -63,7 +63,7 @@ ts_library(
         "//packages/compiler/test/expression_parser/utils",
         "//packages/compiler/testing",
         "//packages/core",
-        "@ngdeps//typescript",
+        "@npm//typescript",
     ],
 )
 
@@ -84,8 +84,8 @@ jasmine_node_test(
         ":test_node_only_lib",
         "//packages/core",
         "//tools/testing:node",
-        "@ngdeps//base64-js",
-        "@ngdeps//source-map",
+        "@npm//base64-js",
+        "@npm//source-map",
     ],
 )
 
diff --git a/packages/compiler/testing/BUILD.bazel b/packages/compiler/testing/BUILD.bazel
index f47ee11d51..918762f062 100644
--- a/packages/compiler/testing/BUILD.bazel
+++ b/packages/compiler/testing/BUILD.bazel
@@ -14,6 +14,6 @@ ng_module(
         "//packages:types",
         "//packages/compiler",
         "//packages/core",
-        "@ngdeps//@types/node",
+        "@npm//@types/node",
     ],
 )
diff --git a/packages/core/BUILD.bazel b/packages/core/BUILD.bazel
index 0eed009947..696b9d76e4 100644
--- a/packages/core/BUILD.bazel
+++ b/packages/core/BUILD.bazel
@@ -12,8 +12,8 @@ ng_module(
     ),
     deps = [
         "//packages:types",
-        "@ngdeps//rxjs",
-        "@ngdeps//zone.js",
+        "@npm//rxjs",
+        "@npm//zone.js",
     ],
 )
 
diff --git a/packages/core/test/BUILD.bazel b/packages/core/test/BUILD.bazel
index b1b7990209..123ac52884 100644
--- a/packages/core/test/BUILD.bazel
+++ b/packages/core/test/BUILD.bazel
@@ -27,8 +27,8 @@ ts_library(
         "//packages/private/testing",
         "//packages/router",
         "//packages/router/testing",
-        "@ngdeps//rxjs",
-        "@ngdeps//zone.js",
+        "@npm//rxjs",
+        "@npm//zone.js",
     ],
 )
 
@@ -57,9 +57,9 @@ jasmine_node_test(
         "//packages/platform-server",
         "//packages/platform-server/testing",
         "//tools/testing:node",
-        "@ngdeps//base64-js",
-        "@ngdeps//source-map",
-        "@ngdeps//zone.js",
+        "@npm//base64-js",
+        "@npm//source-map",
+        "@npm//zone.js",
     ],
 )
 
diff --git a/packages/core/test/bundling/animation_world/BUILD.bazel b/packages/core/test/bundling/animation_world/BUILD.bazel
index 878e670120..cb29e0f7a9 100644
--- a/packages/core/test/bundling/animation_world/BUILD.bazel
+++ b/packages/core/test/bundling/animation_world/BUILD.bazel
@@ -1,7 +1,7 @@
 package(default_visibility = ["//visibility:public"])
 
 load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle")
-load("//tools/http-server:http_server.bzl", "http_server")
+load("@build_bazel_rules_nodejs//:defs.bzl", "http_server")
 
 ng_module(
     name = "animation_world",
@@ -32,7 +32,7 @@ ng_rollup_bundle(
     deps = [
         ":animation_world",
         "//packages/core",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
 
diff --git a/packages/core/test/bundling/hello_world/BUILD.bazel b/packages/core/test/bundling/hello_world/BUILD.bazel
index 242db560bc..7e103895a0 100644
--- a/packages/core/test/bundling/hello_world/BUILD.bazel
+++ b/packages/core/test/bundling/hello_world/BUILD.bazel
@@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"])
 
 load("//tools:defaults.bzl", "jasmine_node_test", "ng_module", "ng_rollup_bundle", "ts_library")
 load("//tools/symbol-extractor:index.bzl", "js_expected_symbol_test")
-load("//tools/http-server:http_server.bzl", "http_server")
+load("@build_bazel_rules_nodejs//:defs.bzl", "http_server")
 
 ng_module(
     name = "hello_world",
@@ -30,7 +30,7 @@ ng_rollup_bundle(
     deps = [
         ":hello_world",
         "//packages/core",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
 
diff --git a/packages/core/test/bundling/hello_world_i18n/BUILD.bazel b/packages/core/test/bundling/hello_world_i18n/BUILD.bazel
index 33d467a5bb..0624700f3e 100644
--- a/packages/core/test/bundling/hello_world_i18n/BUILD.bazel
+++ b/packages/core/test/bundling/hello_world_i18n/BUILD.bazel
@@ -1,7 +1,7 @@
 package(default_visibility = ["//visibility:public"])
 
 load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle")
-load("//tools/http-server:http_server.bzl", "http_server")
+load("@build_bazel_rules_nodejs//:defs.bzl", "http_server")
 
 ng_module(
     name = "hello_world_i18n",
@@ -24,7 +24,7 @@ ng_rollup_bundle(
     deps = [
         ":hello_world_i18n",
         "//packages/core",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
 
diff --git a/packages/core/test/bundling/hello_world_r2/BUILD.bazel b/packages/core/test/bundling/hello_world_r2/BUILD.bazel
index 563b48f338..d539b93269 100644
--- a/packages/core/test/bundling/hello_world_r2/BUILD.bazel
+++ b/packages/core/test/bundling/hello_world_r2/BUILD.bazel
@@ -1,7 +1,7 @@
 package(default_visibility = ["//visibility:public"])
 
 load("//tools:defaults.bzl", "jasmine_node_test", "ng_module", "ng_rollup_bundle", "ts_library")
-load("//tools/http-server:http_server.bzl", "http_server")
+load("@build_bazel_rules_nodejs//:defs.bzl", "http_server")
 
 ng_module(
     name = "hello_world",
@@ -31,7 +31,7 @@ ng_rollup_bundle(
         ":hello_world",
         "//packages/core",
         "//packages/platform-browser",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
 
diff --git a/packages/core/test/bundling/injection/BUILD.bazel b/packages/core/test/bundling/injection/BUILD.bazel
index 170bf48536..abde901a3a 100644
--- a/packages/core/test/bundling/injection/BUILD.bazel
+++ b/packages/core/test/bundling/injection/BUILD.bazel
@@ -32,7 +32,7 @@ ng_rollup_bundle(
     deps = [
         ":injection",
         "//packages/core",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
 
diff --git a/packages/core/test/bundling/todo/BUILD.bazel b/packages/core/test/bundling/todo/BUILD.bazel
index 4da7b5d454..b4450dfdc9 100644
--- a/packages/core/test/bundling/todo/BUILD.bazel
+++ b/packages/core/test/bundling/todo/BUILD.bazel
@@ -1,9 +1,9 @@
 package(default_visibility = ["//visibility:public"])
 
 load("//tools:defaults.bzl", "jasmine_node_test", "ng_module", "ng_rollup_bundle", "ts_library")
-load("//tools/http-server:http_server.bzl", "http_server")
 load("//tools/symbol-extractor:index.bzl", "js_expected_symbol_test")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@build_bazel_rules_nodejs//:defs.bzl", "http_server")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 
 ng_module(
     name = "todo",
@@ -35,7 +35,7 @@ ng_rollup_bundle(
         "//packages/common",
         "//packages/core",
         "//packages/core/test/bundling/util:reflect_metadata",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
 
@@ -82,7 +82,7 @@ js_expected_symbol_test(
 genrule(
     name = "tslib",
     srcs = [
-        "@ngdeps//node_modules/tslib:tslib.js",
+        "@npm//node_modules/tslib:tslib.js",
     ],
     outs = [
         "tslib.js",
diff --git a/packages/core/test/bundling/todo_i18n/BUILD.bazel b/packages/core/test/bundling/todo_i18n/BUILD.bazel
index 807f517c38..0d04699423 100644
--- a/packages/core/test/bundling/todo_i18n/BUILD.bazel
+++ b/packages/core/test/bundling/todo_i18n/BUILD.bazel
@@ -1,8 +1,8 @@
 package(default_visibility = ["//visibility:public"])
 
 load("//tools:defaults.bzl", "jasmine_node_test", "ng_module", "ng_rollup_bundle", "ts_library")
-load("//tools/http-server:http_server.bzl", "http_server")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@build_bazel_rules_nodejs//:defs.bzl", "http_server")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 
 ng_module(
     name = "todo_i18n",
@@ -37,7 +37,7 @@ ng_rollup_bundle(
         "//packages/common",
         "//packages/core",
         "//packages/core/test/bundling/util:reflect_metadata",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
 
@@ -74,7 +74,7 @@ jasmine_node_test(
 genrule(
     name = "tslib",
     srcs = [
-        "@ngdeps//node_modules/tslib:tslib.js",
+        "@npm//node_modules/tslib:tslib.js",
     ],
     outs = [
         "tslib.js",
diff --git a/packages/core/test/bundling/todo_r2/BUILD.bazel b/packages/core/test/bundling/todo_r2/BUILD.bazel
index ac3123483b..cecb46625f 100644
--- a/packages/core/test/bundling/todo_r2/BUILD.bazel
+++ b/packages/core/test/bundling/todo_r2/BUILD.bazel
@@ -1,8 +1,8 @@
 package(default_visibility = ["//visibility:public"])
 
 load("//tools:defaults.bzl", "jasmine_node_test", "ng_module", "ng_rollup_bundle", "ts_library")
-load("//tools/http-server:http_server.bzl", "http_server")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@build_bazel_rules_nodejs//:defs.bzl", "http_server")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 
 ng_module(
     name = "todo",
@@ -38,7 +38,7 @@ ng_rollup_bundle(
         "//packages/core/test/bundling/util:reflect_metadata",
         "//packages/platform-browser",
         "//packages/platform-browser-dynamic",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
 
@@ -77,7 +77,7 @@ jasmine_node_test(
 genrule(
     name = "tslib",
     srcs = [
-        "@ngdeps//node_modules/tslib:tslib.js",
+        "@npm//node_modules/tslib:tslib.js",
     ],
     outs = [
         "tslib.js",
diff --git a/packages/core/test/bundling/util/BUILD.bazel b/packages/core/test/bundling/util/BUILD.bazel
index 185c23677b..b37faebb04 100644
--- a/packages/core/test/bundling/util/BUILD.bazel
+++ b/packages/core/test/bundling/util/BUILD.bazel
@@ -12,7 +12,7 @@ ts_library(
         ":metadata_switch",
     ],
     module_name = "@angular/core/test/bundling/util/src/reflect_metadata",
-    deps = ["@ngdeps//reflect-metadata"],
+    deps = ["@npm//reflect-metadata"],
 )
 
 # See packages/core/BUILD.bazel.
diff --git a/packages/core/test/render3/BUILD.bazel b/packages/core/test/render3/BUILD.bazel
index bc8a0a8592..7c248df111 100644
--- a/packages/core/test/render3/BUILD.bazel
+++ b/packages/core/test/render3/BUILD.bazel
@@ -27,7 +27,7 @@ ts_library(
         "//packages/platform-browser/animations",
         "//packages/platform-browser/testing",
         "//packages/private/testing",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
 
@@ -42,7 +42,7 @@ ts_library(
         "//packages/compiler",
         "//packages/platform-browser",
         "//packages/platform-server",
-        "@ngdeps//zone.js",
+        "@npm//zone.js",
     ],
 )
 
@@ -63,7 +63,7 @@ jasmine_node_test(
     ],
     deps = [
         ":render3_node_lib",
-        "@ngdeps//zone.js",
+        "@npm//zone.js",
     ],
 )
 
diff --git a/packages/core/testing/BUILD.bazel b/packages/core/testing/BUILD.bazel
index 22960f195c..cbcb2f5634 100644
--- a/packages/core/testing/BUILD.bazel
+++ b/packages/core/testing/BUILD.bazel
@@ -12,7 +12,7 @@ ng_module(
     deps = [
         "//packages:types",
         "//packages/core",
-        "@ngdeps//@types/jasmine",
-        "@ngdeps//zone.js",
+        "@npm//@types/jasmine",
+        "@npm//zone.js",
     ],
 )
diff --git a/packages/elements/BUILD.bazel b/packages/elements/BUILD.bazel
index 5df813eb72..e97ec155ce 100644
--- a/packages/elements/BUILD.bazel
+++ b/packages/elements/BUILD.bazel
@@ -13,7 +13,7 @@ ng_module(
     deps = [
         "//packages/core",
         "//packages/platform-browser",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
 
diff --git a/packages/elements/schematics/ng-add/BUILD.bazel b/packages/elements/schematics/ng-add/BUILD.bazel
index 7fae43766a..1cb600e75d 100644
--- a/packages/elements/schematics/ng-add/BUILD.bazel
+++ b/packages/elements/schematics/ng-add/BUILD.bazel
@@ -11,8 +11,8 @@ ts_library(
     deps = [
         "//packages/common",
         "//packages/core",
-        "@ngdeps//@angular-devkit/schematics",
-        "@ngdeps//rxjs",
+        "@npm//@angular-devkit/schematics",
+        "@npm//rxjs",
     ],
 )
 
@@ -26,8 +26,8 @@ ts_library(
         ":ng-add",
         "//packages/common",
         "//packages/core",
-        "@ngdeps//@angular-devkit/schematics",
-        "@ngdeps//rxjs",
+        "@npm//@angular-devkit/schematics",
+        "@npm//rxjs",
     ],
 )
 
@@ -36,6 +36,6 @@ jasmine_node_test(
     deps = [
         ":test_lib",
         "//packages/elements/schematics:collection",
-        "@ngdeps//@schematics/angular",
+        "@npm//@schematics/angular",
     ],
 )
diff --git a/packages/elements/test/BUILD.bazel b/packages/elements/test/BUILD.bazel
index 71bea73873..0749710747 100644
--- a/packages/elements/test/BUILD.bazel
+++ b/packages/elements/test/BUILD.bazel
@@ -14,7 +14,7 @@ ts_library(
         "//packages/platform-browser-dynamic",
         "//packages/platform-browser-dynamic/testing",
         "//packages/platform-browser/testing",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
 
@@ -23,10 +23,10 @@ filegroup(
     testonly = True,
     # do not sort
     srcs = [
-        "@ngdeps//node_modules/@webcomponents/custom-elements:src/native-shim.js",
-        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
-        "@ngdeps//node_modules/zone.js:dist/zone.js",
-        "@ngdeps//node_modules/zone.js:dist/zone-testing.js",
+        "@npm//node_modules/@webcomponents/custom-elements:src/native-shim.js",
+        "@npm//node_modules/reflect-metadata:Reflect.js",
+        "@npm//node_modules/zone.js:dist/zone.js",
+        "@npm//node_modules/zone.js:dist/zone-testing.js",
     ],
 )
 
diff --git a/packages/examples/common/BUILD.bazel b/packages/examples/common/BUILD.bazel
index b75c10dec1..84455738a3 100644
--- a/packages/examples/common/BUILD.bazel
+++ b/packages/examples/common/BUILD.bazel
@@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"])
 
 load("//packages/bazel:index.bzl", "protractor_web_test_suite")
 load("//tools:defaults.bzl", "ng_module", "ts_library")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 
 ng_module(
     name = "common_examples",
@@ -21,7 +21,7 @@ ng_module(
         "//packages/platform-browser",
         "//packages/platform-browser-dynamic",
         "//packages/router",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
 
@@ -33,8 +33,8 @@ ts_library(
     deps = [
         "//packages/examples/test-utils",
         "//packages/private/testing",
-        "@ngdeps//@types/jasminewd2",
-        "@ngdeps//protractor",
+        "@npm//@types/jasminewd2",
+        "@npm//protractor",
     ],
 )
 
@@ -44,14 +44,14 @@ ts_devserver(
     index_html = "//packages/examples: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",
+        "@npm//node_modules/zone.js:dist/zone.js",
         # This is needed because the "ngComponentOutlet" test uses the JIT compiler
         # and needs to be able to read metadata at runtime.
-        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
+        "@npm//node_modules/reflect-metadata:Reflect.js",
     ],
     tags = ["fixme-ivy-aot"],
     deps = [":common_examples"],
@@ -65,7 +65,7 @@ protractor_web_test_suite(
     tags = ["fixme-ivy-aot"],
     deps = [
         ":common_tests_lib",
-        "@ngdeps//protractor",
-        "@ngdeps//selenium-webdriver",
+        "@npm//protractor",
+        "@npm//selenium-webdriver",
     ],
 )
diff --git a/packages/examples/core/BUILD.bazel b/packages/examples/core/BUILD.bazel
index 29868486cb..bf46f967bb 100644
--- a/packages/examples/core/BUILD.bazel
+++ b/packages/examples/core/BUILD.bazel
@@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"])
 
 load("//packages/bazel:index.bzl", "protractor_web_test_suite")
 load("//tools:defaults.bzl", "jasmine_node_test", "ng_module", "ts_library")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 
 ng_module(
     name = "core_examples",
@@ -25,7 +25,7 @@ ng_module(
         "//packages/platform-browser-dynamic",
         "//packages/platform-browser/animations",
         "//packages/router",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
 
@@ -49,8 +49,8 @@ ts_library(
     tsconfig = "//packages/examples:tsconfig-e2e.json",
     deps = [
         "//packages/examples/test-utils",
-        "@ngdeps//@types/jasminewd2",
-        "@ngdeps//protractor",
+        "@npm//@types/jasminewd2",
+        "@npm//protractor",
     ],
 )
 
@@ -60,12 +60,12 @@ ts_devserver(
     index_html = "//packages/examples: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/zone.js:dist/task-tracking.js",
+        "@npm//node_modules/zone.js:dist/zone.js",
+        "@npm//node_modules/zone.js:dist/task-tracking.js",
     ],
     tags = ["fixme-ivy-aot"],
     deps = [":core_examples"],
@@ -79,8 +79,8 @@ protractor_web_test_suite(
     tags = ["fixme-ivy-aot"],
     deps = [
         ":core_e2e_tests_lib",
-        "@ngdeps//protractor",
-        "@ngdeps//selenium-webdriver",
+        "@npm//protractor",
+        "@npm//selenium-webdriver",
     ],
 )
 
diff --git a/packages/examples/core/testing/ts/BUILD.bazel b/packages/examples/core/testing/ts/BUILD.bazel
index 2fe7a63b68..cbfb89fcca 100644
--- a/packages/examples/core/testing/ts/BUILD.bazel
+++ b/packages/examples/core/testing/ts/BUILD.bazel
@@ -8,8 +8,8 @@ ts_library(
     ],
     deps = [
         "//packages/core/testing",
-        "@ngdeps//@types/jasmine",
-        "@ngdeps//@types/node",
+        "@npm//@types/jasmine",
+        "@npm//@types/node",
     ],
 )
 
diff --git a/packages/examples/forms/BUILD.bazel b/packages/examples/forms/BUILD.bazel
index 81c35ccd09..55fe7f817d 100644
--- a/packages/examples/forms/BUILD.bazel
+++ b/packages/examples/forms/BUILD.bazel
@@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"])
 
 load("//packages/bazel:index.bzl", "protractor_web_test_suite")
 load("//tools:defaults.bzl", "ng_module", "ts_library")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 
 ng_module(
     name = "forms_examples",
@@ -21,7 +21,7 @@ ng_module(
         "//packages/platform-browser",
         "//packages/platform-browser-dynamic",
         "//packages/router",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
 
@@ -33,8 +33,8 @@ ts_library(
     deps = [
         "//packages/examples/test-utils",
         "//packages/private/testing",
-        "@ngdeps//@types/jasminewd2",
-        "@ngdeps//protractor",
+        "@npm//@types/jasminewd2",
+        "@npm//protractor",
     ],
 )
 
@@ -44,11 +44,11 @@ ts_devserver(
     index_html = "//packages/examples: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",
+        "@npm//node_modules/zone.js:dist/zone.js",
     ],
     tags = ["fixme-ivy-aot"],
     deps = [":forms_examples"],
@@ -62,7 +62,7 @@ protractor_web_test_suite(
     tags = ["fixme-ivy-aot"],
     deps = [
         ":forms_e2e_tests_lib",
-        "@ngdeps//protractor",
-        "@ngdeps//selenium-webdriver",
+        "@npm//protractor",
+        "@npm//selenium-webdriver",
     ],
 )
diff --git a/packages/examples/test-utils/BUILD.bazel b/packages/examples/test-utils/BUILD.bazel
index be2496ecae..87dae5608e 100644
--- a/packages/examples/test-utils/BUILD.bazel
+++ b/packages/examples/test-utils/BUILD.bazel
@@ -6,6 +6,6 @@ ts_library(
     name = "test-utils",
     srcs = ["index.ts"],
     deps = [
-        "@ngdeps//@types/selenium-webdriver",
+        "@npm//@types/selenium-webdriver",
     ],
 )
diff --git a/packages/examples/testing/BUILD.bazel b/packages/examples/testing/BUILD.bazel
index 00d2cae68d..887da4b1bb 100644
--- a/packages/examples/testing/BUILD.bazel
+++ b/packages/examples/testing/BUILD.bazel
@@ -7,7 +7,7 @@ ts_library(
     srcs = glob(["**/*.ts"]),
     tsconfig = "//packages:tsconfig-test",
     deps = [
-        "@ngdeps//@types/jasmine",
-        "@ngdeps//@types/node",
+        "@npm//@types/jasmine",
+        "@npm//@types/node",
     ],
 )
diff --git a/packages/examples/upgrade/upgrade_example.bzl b/packages/examples/upgrade/upgrade_example.bzl
index 471ef32bdd..ad1b2c2151 100644
--- a/packages/examples/upgrade/upgrade_example.bzl
+++ b/packages/examples/upgrade/upgrade_example.bzl
@@ -1,6 +1,6 @@
 load("//packages/bazel:index.bzl", "protractor_web_test_suite")
 load("//tools:defaults.bzl", "ng_module", "ts_library")
-load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 
 """
   Macro that can be used to create the Bazel targets for an "upgrade" example. Since the
@@ -16,7 +16,7 @@ def create_upgrade_example_targets(name, srcs, e2e_srcs, entry_module, assets =
         # TODO: FW-1004 Type checking is currently not complete.
         type_check = False,
         deps = [
-            "@ngdeps//@types/angular",
+            "@npm//@types/angular",
             "//packages/core",
             "//packages/platform-browser",
             "//packages/platform-browser-dynamic",
@@ -30,8 +30,8 @@ def create_upgrade_example_targets(name, srcs, e2e_srcs, entry_module, assets =
         srcs = e2e_srcs,
         testonly = True,
         deps = [
-            "@ngdeps//@types/jasminewd2",
-            "@ngdeps//protractor",
+            "@npm//@types/jasminewd2",
+            "@npm//protractor",
             "//packages/examples/test-utils",
             "//packages/private/testing",
         ],
@@ -43,13 +43,13 @@ def create_upgrade_example_targets(name, srcs, e2e_srcs, entry_module, assets =
         port = 4200,
         entry_module = entry_module,
         static_files = [
-            "@ngdeps//node_modules/zone.js:dist/zone.js",
-            "@ngdeps//node_modules/angular:angular.js",
-            "@ngdeps//node_modules/reflect-metadata:Reflect.js",
+            "@npm//node_modules/zone.js:dist/zone.js",
+            "@npm//node_modules/angular:angular.js",
+            "@npm//node_modules/reflect-metadata:Reflect.js",
         ],
         index_html = "//packages/examples:index.html",
         scripts = [
-            "@ngdeps//node_modules/tslib:tslib.js",
+            "@npm//node_modules/tslib:tslib.js",
             "//tools/rxjs:rxjs_umd_modules",
         ],
         deps = [":%s_sources" % name],
@@ -63,7 +63,7 @@ def create_upgrade_example_targets(name, srcs, e2e_srcs, entry_module, assets =
         server = ":devserver",
         deps = [
             ":%s_e2e_lib" % name,
-            "@ngdeps//protractor",
-            "@ngdeps//selenium-webdriver",
+            "@npm//protractor",
+            "@npm//selenium-webdriver",
         ],
     )
diff --git a/packages/forms/BUILD.bazel b/packages/forms/BUILD.bazel
index f5f87572fe..ed860911e4 100644
--- a/packages/forms/BUILD.bazel
+++ b/packages/forms/BUILD.bazel
@@ -13,7 +13,7 @@ ng_module(
     deps = [
         "//packages/core",
         "//packages/platform-browser",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
 
diff --git a/packages/forms/test/BUILD.bazel b/packages/forms/test/BUILD.bazel
index 7a0b8b5d57..d560e765b1 100644
--- a/packages/forms/test/BUILD.bazel
+++ b/packages/forms/test/BUILD.bazel
@@ -11,7 +11,7 @@ ts_library(
         "//packages/platform-browser",
         "//packages/platform-browser/testing",
         "//packages/private/testing",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
 
diff --git a/packages/http/BUILD.bazel b/packages/http/BUILD.bazel
index 63b3f20cb2..9b41697f5d 100644
--- a/packages/http/BUILD.bazel
+++ b/packages/http/BUILD.bazel
@@ -13,7 +13,7 @@ ng_module(
     deps = [
         "//packages/core",
         "//packages/platform-browser",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
 
diff --git a/packages/http/test/BUILD.bazel b/packages/http/test/BUILD.bazel
index 5581b37e00..ad563ef37e 100644
--- a/packages/http/test/BUILD.bazel
+++ b/packages/http/test/BUILD.bazel
@@ -11,7 +11,7 @@ ts_library(
         "//packages/http/testing",
         "//packages/platform-browser",
         "//packages/platform-browser/testing",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
 
@@ -28,6 +28,6 @@ ts_web_test_suite(
     name = "test_web",
     deps = [
         ":test_lib",
-        "@ngdeps//karma",
+        "@npm//karma",
     ],
 )
diff --git a/packages/http/testing/BUILD.bazel b/packages/http/testing/BUILD.bazel
index 7c8a96ccdd..1ec7eb97a4 100644
--- a/packages/http/testing/BUILD.bazel
+++ b/packages/http/testing/BUILD.bazel
@@ -10,6 +10,6 @@ ng_module(
     deps = [
         "//packages/core",
         "//packages/http",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
diff --git a/packages/language-service/BUILD.bazel b/packages/language-service/BUILD.bazel
index 4454b2a11c..0a116e8c31 100644
--- a/packages/language-service/BUILD.bazel
+++ b/packages/language-service/BUILD.bazel
@@ -15,8 +15,8 @@ ts_library(
         "//packages/compiler",
         "//packages/compiler-cli",
         "//packages/core",
-        "@ngdeps//@types/node",
-        "@ngdeps//typescript",
+        "@npm//@types/node",
+        "@npm//typescript",
     ],
 )
 
diff --git a/packages/language-service/bundles/BUILD.bazel b/packages/language-service/bundles/BUILD.bazel
index edc67cde63..6b177b70a1 100644
--- a/packages/language-service/bundles/BUILD.bazel
+++ b/packages/language-service/bundles/BUILD.bazel
@@ -12,7 +12,7 @@ ls_rollup_bundle(
     visibility = ["//packages/language-service:__pkg__"],
     deps = [
         "//packages/language-service",
-        "@ngdeps//rxjs",
-        "@ngdeps//tslib",
+        "@npm//rxjs",
+        "@npm//tslib",
     ],
 )
diff --git a/packages/language-service/test/BUILD.bazel b/packages/language-service/test/BUILD.bazel
index 7fbf945576..52501d9b0d 100644
--- a/packages/language-service/test/BUILD.bazel
+++ b/packages/language-service/test/BUILD.bazel
@@ -9,7 +9,7 @@ ts_library(
         "//packages/compiler",
         "//packages/compiler-cli/test:test_utils",
         "//packages/language-service",
-        "@ngdeps//typescript",
+        "@npm//typescript",
     ],
 )
 
diff --git a/packages/platform-browser/BUILD.bazel b/packages/platform-browser/BUILD.bazel
index 4205044eed..1e49a59ee8 100644
--- a/packages/platform-browser/BUILD.bazel
+++ b/packages/platform-browser/BUILD.bazel
@@ -14,8 +14,8 @@ ng_module(
         "//packages:types",
         "//packages/common",
         "//packages/core",
-        "@ngdeps//@types/hammerjs",
-        "@ngdeps//zone.js",
+        "@npm//@types/hammerjs",
+        "@npm//zone.js",
     ],
 )
 
diff --git a/packages/platform-browser/animations/test/BUILD.bazel b/packages/platform-browser/animations/test/BUILD.bazel
index 16f6b1ce91..384641faf2 100644
--- a/packages/platform-browser/animations/test/BUILD.bazel
+++ b/packages/platform-browser/animations/test/BUILD.bazel
@@ -18,7 +18,7 @@ ts_library(
         "//packages/platform-browser/animations",
         "//packages/platform-browser/testing",
         "//packages/private/testing",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
 
diff --git a/packages/platform-browser/test/BUILD.bazel b/packages/platform-browser/test/BUILD.bazel
index ea5827ec4a..8d4a83d79a 100644
--- a/packages/platform-browser/test/BUILD.bazel
+++ b/packages/platform-browser/test/BUILD.bazel
@@ -23,7 +23,7 @@ ts_library(
         "//packages/platform-browser/animations",
         "//packages/platform-browser/testing",
         "//packages/private/testing",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
 
diff --git a/packages/platform-browser/testing/BUILD.bazel b/packages/platform-browser/testing/BUILD.bazel
index ab4dcd6d76..7623380a2c 100644
--- a/packages/platform-browser/testing/BUILD.bazel
+++ b/packages/platform-browser/testing/BUILD.bazel
@@ -11,7 +11,7 @@ ng_module(
         "//packages/core",
         "//packages/core/testing",
         "//packages/platform-browser",
-        "@ngdeps//@types/jasmine",
-        "@ngdeps//rxjs",
+        "@npm//@types/jasmine",
+        "@npm//rxjs",
     ],
 )
diff --git a/packages/platform-server/BUILD.bazel b/packages/platform-server/BUILD.bazel
index 63b4aa0fec..e2e37cb1bd 100644
--- a/packages/platform-server/BUILD.bazel
+++ b/packages/platform-server/BUILD.bazel
@@ -20,9 +20,9 @@ ng_module(
         "//packages/platform-browser",
         "//packages/platform-browser-dynamic",
         "//packages/platform-browser/animations",
-        "@ngdeps//@types/node",
-        "@ngdeps//rxjs",
-        "@ngdeps//zone.js",
+        "@npm//@types/node",
+        "@npm//rxjs",
+        "@npm//zone.js",
     ],
 )
 
diff --git a/packages/platform-server/test/BUILD.bazel b/packages/platform-server/test/BUILD.bazel
index 263a5d47ee..c71f1377cd 100644
--- a/packages/platform-server/test/BUILD.bazel
+++ b/packages/platform-server/test/BUILD.bazel
@@ -18,7 +18,7 @@ ts_library(
         "//packages/platform-browser",
         "//packages/platform-server",
         "//packages/private/testing",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
 
diff --git a/packages/platform-webworker/BUILD.bazel b/packages/platform-webworker/BUILD.bazel
index 32fc5fc828..5f32862be4 100644
--- a/packages/platform-webworker/BUILD.bazel
+++ b/packages/platform-webworker/BUILD.bazel
@@ -16,7 +16,7 @@ ng_module(
         "//packages/compiler",
         "//packages/core",
         "//packages/platform-browser",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
 
diff --git a/packages/router/BUILD.bazel b/packages/router/BUILD.bazel
index d6c244852f..e90a037c4f 100644
--- a/packages/router/BUILD.bazel
+++ b/packages/router/BUILD.bazel
@@ -14,7 +14,7 @@ ng_module(
         "//packages/common",
         "//packages/core",
         "//packages/platform-browser",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
 
diff --git a/packages/router/test/BUILD.bazel b/packages/router/test/BUILD.bazel
index 55496311d1..6f165d65c3 100644
--- a/packages/router/test/BUILD.bazel
+++ b/packages/router/test/BUILD.bazel
@@ -15,7 +15,7 @@ ts_library(
         "//packages/private/testing",
         "//packages/router",
         "//packages/router/testing",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
 
diff --git a/packages/router/test/aot_ngsummary_test/BUILD.bazel b/packages/router/test/aot_ngsummary_test/BUILD.bazel
index 5a4b60bf49..7f8646ada7 100644
--- a/packages/router/test/aot_ngsummary_test/BUILD.bazel
+++ b/packages/router/test/aot_ngsummary_test/BUILD.bazel
@@ -7,7 +7,7 @@ ng_module(
     deps = [
         "//packages/core",
         "//packages/router",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
 
diff --git a/packages/router/testing/BUILD.bazel b/packages/router/testing/BUILD.bazel
index cc75d95dcb..cc91736ecd 100644
--- a/packages/router/testing/BUILD.bazel
+++ b/packages/router/testing/BUILD.bazel
@@ -12,6 +12,6 @@ ng_module(
         "//packages/common/testing",
         "//packages/core",
         "//packages/router",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
diff --git a/packages/service-worker/BUILD.bazel b/packages/service-worker/BUILD.bazel
index d974d83a4f..87c95f0a67 100644
--- a/packages/service-worker/BUILD.bazel
+++ b/packages/service-worker/BUILD.bazel
@@ -13,7 +13,7 @@ ng_module(
     deps = [
         "//packages/common",
         "//packages/core",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
 
diff --git a/packages/service-worker/cli/BUILD.bazel b/packages/service-worker/cli/BUILD.bazel
index 97d0adb3d0..fb261ad852 100644
--- a/packages/service-worker/cli/BUILD.bazel
+++ b/packages/service-worker/cli/BUILD.bazel
@@ -10,7 +10,7 @@ ts_library(
     tsconfig = ":tsconfig.json",
     deps = [
         "//packages/service-worker/config",
-        "@ngdeps//@types/node",
+        "@npm//@types/node",
     ],
 )
 
diff --git a/packages/service-worker/test/BUILD.bazel b/packages/service-worker/test/BUILD.bazel
index 42831ca6be..05ee1eb951 100644
--- a/packages/service-worker/test/BUILD.bazel
+++ b/packages/service-worker/test/BUILD.bazel
@@ -12,7 +12,7 @@ ts_library(
         "//packages/service-worker/testing",
         "//packages/service-worker/worker",
         "//packages/service-worker/worker/testing",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
 
diff --git a/packages/service-worker/testing/BUILD.bazel b/packages/service-worker/testing/BUILD.bazel
index 3878b16b95..614c6715e1 100644
--- a/packages/service-worker/testing/BUILD.bazel
+++ b/packages/service-worker/testing/BUILD.bazel
@@ -8,6 +8,6 @@ ng_module(
     srcs = glob(["**/*.ts"]),
     deps = [
         "//packages/core",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
diff --git a/packages/service-worker/worker/BUILD.bazel b/packages/service-worker/worker/BUILD.bazel
index 84fe858dca..f10656bf71 100644
--- a/packages/service-worker/worker/BUILD.bazel
+++ b/packages/service-worker/worker/BUILD.bazel
@@ -12,7 +12,7 @@ ts_library(
         exclude = ["main.ts"],
     ),
     tsconfig = ":tsconfig.json",
-    deps = ["@ngdeps//@types/node"],
+    deps = ["@npm//@types/node"],
 )
 
 ts_library(
diff --git a/packages/service-worker/worker/testing/BUILD.bazel b/packages/service-worker/worker/testing/BUILD.bazel
index a593be6cb1..e7af2fcac4 100644
--- a/packages/service-worker/worker/testing/BUILD.bazel
+++ b/packages/service-worker/worker/testing/BUILD.bazel
@@ -10,6 +10,6 @@ ts_library(
         "//packages:types",
         "//packages/core",
         "//packages/service-worker/worker",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
diff --git a/packages/upgrade/BUILD.bazel b/packages/upgrade/BUILD.bazel
index 256aa43c4f..e34ab01d65 100644
--- a/packages/upgrade/BUILD.bazel
+++ b/packages/upgrade/BUILD.bazel
@@ -15,7 +15,7 @@ ng_module(
         "//packages/core",
         "//packages/platform-browser",
         "//packages/platform-browser-dynamic",
-        "@ngdeps//zone.js",
+        "@npm//zone.js",
     ],
 )
 
diff --git a/packages/upgrade/test/BUILD.bazel b/packages/upgrade/test/BUILD.bazel
index 901457b952..fd9fa5f5b4 100644
--- a/packages/upgrade/test/BUILD.bazel
+++ b/packages/upgrade/test/BUILD.bazel
@@ -14,7 +14,7 @@ ts_library(
         "//packages/private/testing",
         "//packages/upgrade",
         "//packages/upgrade/static",
-        "@ngdeps//rxjs",
+        "@npm//rxjs",
     ],
 )
 
diff --git a/packages/upgrade/test/common/test_helpers.ts b/packages/upgrade/test/common/test_helpers.ts
index 8ee147d91d..2880e6f9b6 100644
--- a/packages/upgrade/test/common/test_helpers.ts
+++ b/packages/upgrade/test/common/test_helpers.ts
@@ -89,7 +89,7 @@ export function createWithEachNg1VersionFn(setNg1: typeof setAngularJSGlobal) {
                                               document.body.removeChild(script);
                                               resolve();
                                             };
-                                            script.src = `base/ngdeps/node_modules/${file}`;
+                                            script.src = `base/npm/node_modules/${file}`;
                                             document.body.appendChild(script);
                                           })),
                 Promise.resolve())
diff --git a/tools/BUILD.bazel b/tools/BUILD.bazel
index 905df3c90b..22f745ba36 100644
--- a/tools/BUILD.bazel
+++ b/tools/BUILD.bazel
@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@npm_bazel_typescript//:defs.bzl", "ts_config")
+load("@npm_bazel_typescript//:index.bzl", "ts_config")
 
 exports_files(["tsconfig.json"])
 
diff --git a/tools/defaults.bzl b/tools/defaults.bzl
index b6e270e683..64451d839c 100644
--- a/tools/defaults.bzl
+++ b/tools/defaults.bzl
@@ -1,15 +1,14 @@
 """Re-export of some bazel rules with repository-wide defaults."""
 
-load("@npm_bazel_karma//:defs.bzl", _ts_web_test_suite = "ts_web_test_suite")
-load("@build_bazel_rules_nodejs//:defs.bzl", _jasmine_node_test = "jasmine_node_test", _nodejs_binary = "nodejs_binary", _npm_package = "npm_package")
-load("@npm_bazel_typescript//:defs.bzl", _ts_library = "ts_library")
+load("@npm_bazel_karma//:index.bzl", _ts_web_test_suite = "ts_web_test_suite")
+load("@npm_bazel_jasmine//:index.bzl", _jasmine_node_test = "jasmine_node_test")
+load("@build_bazel_rules_nodejs//:defs.bzl", _nodejs_binary = "nodejs_binary", _npm_package = "npm_package")
+load("@npm_bazel_typescript//:index.bzl", _ts_library = "ts_library")
 load("//packages/bazel:index.bzl", _ng_module = "ng_module", _ng_package = "ng_package")
 load("//packages/bazel/src:ng_rollup_bundle.bzl", _ng_rollup_bundle = "ng_rollup_bundle")
 
 _DEFAULT_TSCONFIG_BUILD = "//packages:tsconfig-build.json"
 _DEFAULT_TSCONFIG_TEST = "//packages:tsconfig-test"
-_DEFAULT_TS_TYPINGS = "@ngdeps//typescript:typescript__typings"
-_DEFAULT_KARMA_BIN = "@ngdeps//@bazel/karma/bin:karma"
 _INTERNAL_NG_MODULE_COMPILER = "//packages/bazel/src/ngc-wrapped"
 _INTERNAL_NG_MODULE_XI18N = "//packages/bazel/src/ngc-wrapped:xi18n"
 _INTERNAL_NG_PACKAGER_PACKAGER = "//packages/bazel/src/ng_package:packager"
@@ -78,11 +77,11 @@ def _default_module_name(testonly):
 
 def ts_library(tsconfig = None, testonly = False, deps = [], module_name = None, **kwargs):
     """Default values for ts_library"""
-    deps = deps + ["@ngdeps//tslib"]
+    deps = deps + ["@npm//tslib"]
     if testonly:
         # Match the types[] in //packages:tsconfig-test.json
-        deps.append("@ngdeps//@types/jasmine")
-        deps.append("@ngdeps//@types/node")
+        deps.append("@npm//@types/jasmine")
+        deps.append("@npm//@types/node")
     if not tsconfig:
         if testonly:
             tsconfig = _DEFAULT_TSCONFIG_TEST
@@ -96,18 +95,17 @@ def ts_library(tsconfig = None, testonly = False, deps = [], module_name = None,
         tsconfig = tsconfig,
         testonly = testonly,
         deps = deps,
-        node_modules = _DEFAULT_TS_TYPINGS,
         module_name = module_name,
         **kwargs
     )
 
 def ng_module(name, tsconfig = None, entry_point = None, testonly = False, deps = [], module_name = None, **kwargs):
     """Default values for ng_module"""
-    deps = deps + ["@ngdeps//tslib"]
+    deps = deps + ["@npm//tslib"]
     if testonly:
         # Match the types[] in //packages:tsconfig-test.json
-        deps.append("@ngdeps//@types/jasmine")
-        deps.append("@ngdeps//@types/node")
+        deps.append("@npm//@types/jasmine")
+        deps.append("@npm//@types/node")
     if not tsconfig:
         if testonly:
             tsconfig = _DEFAULT_TSCONFIG_TEST
@@ -126,7 +124,6 @@ def ng_module(name, tsconfig = None, entry_point = None, testonly = False, deps
         deps = deps,
         compiler = _INTERNAL_NG_MODULE_COMPILER,
         ng_xi18n = _INTERNAL_NG_MODULE_XI18N,
-        node_modules = _DEFAULT_TS_TYPINGS,
         module_name = module_name,
         **kwargs
     )
@@ -138,7 +135,7 @@ def ng_package(name, readme_md = None, license_banner = None, deps = [], **kwarg
     if not license_banner:
         license_banner = "//packages:license-banner.txt"
     deps = deps + [
-        "@ngdeps//tslib",
+        "@npm//tslib",
     ]
 
     _ng_package(
@@ -164,7 +161,7 @@ def ts_web_test_suite(bootstrap = [], deps = [], **kwargs):
     if not bootstrap:
         bootstrap = ["//:web_test_bootstrap_scripts"]
     local_deps = [
-        "@ngdeps//node_modules/tslib:tslib.js",
+        "@npm//node_modules/tslib:tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
         "//tools/testing:browser",
     ] + deps
@@ -172,7 +169,6 @@ def ts_web_test_suite(bootstrap = [], deps = [], **kwargs):
     _ts_web_test_suite(
         bootstrap = bootstrap,
         deps = local_deps,
-        karma = _DEFAULT_KARMA_BIN,
         # Run unit tests on local Chromium by default.
         # You can exclude tests based on tags, e.g. to skip Firefox testing,
         #   `yarn bazel test --test_tag_filters=-browser:firefox-local [targets]`
@@ -192,7 +188,7 @@ def nodejs_binary(data = [], **kwargs):
     _nodejs_binary(
         # Pass-thru --define=compile=foo as an environment variable
         configuration_env_vars = ["compile"],
-        data = data + ["@ngdeps//source-map-support"],
+        data = data + ["@npm//source-map-support"],
         **kwargs
     )
 
@@ -200,28 +196,28 @@ def jasmine_node_test(deps = [], **kwargs):
     """Default values for jasmine_node_test"""
     deps = deps + [
         # Very common dependencies for tests
-        "@ngdeps//chokidar",
-        "@ngdeps//domino",
-        "@ngdeps//jasmine",
-        "@ngdeps//jasmine-core",
-        "@ngdeps//mock-fs",
-        "@ngdeps//reflect-metadata",
-        "@ngdeps//source-map-support",
-        "@ngdeps//tslib",
-        "@ngdeps//xhr2",
+        "@npm//chokidar",
+        "@npm//domino",
+        "@npm//jasmine-core",
+        "@npm//mock-fs",
+        "@npm//reflect-metadata",
+        "@npm//source-map-support",
+        "@npm//tslib",
+        "@npm//xhr2",
     ]
     _jasmine_node_test(
         deps = deps,
         # Pass-thru --define=compile=foo as an environment variable
         configuration_env_vars = ["compile"],
+        jasmine = "@npm//jasmine",
         **kwargs
     )
 
 def ng_rollup_bundle(deps = [], **kwargs):
     """Default values for ng_rollup_bundle"""
     deps = deps + [
-        "@ngdeps//tslib",
-        "@ngdeps//reflect-metadata",
+        "@npm//tslib",
+        "@npm//reflect-metadata",
     ]
     _ng_rollup_bundle(
         deps = deps,
diff --git a/tools/http-server/BUILD.bazel b/tools/http-server/BUILD.bazel
deleted file mode 100644
index cea2580869..0000000000
--- a/tools/http-server/BUILD.bazel
+++ /dev/null
@@ -1 +0,0 @@
-# Marker this directory is a Bazel package.
diff --git a/tools/http-server/README.md b/tools/http-server/README.md
deleted file mode 100644
index f85aa7735a..0000000000
--- a/tools/http-server/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# http-server
-
-This is a simple Bazel wrapper around the http-server npm package.
-
-A typical frontend project is served by a specific server.
-For Angular's example applications, our needs are simple so we can just use http-server.
-Real projects might need history-server (for router support) or even better a full-featured production server like express.
-
-We modify http-server to support serving Brotli-compressed files, which end with a `.br` extension.
-This is equivalent to gzip-compression support.
-See https://github.com/alexeagle/http-server/commits/master which points to a modified ecstatic library.
diff --git a/tools/http-server/http_server.bzl b/tools/http-server/http_server.bzl
deleted file mode 100644
index 7181f6b2c7..0000000000
--- a/tools/http-server/http_server.bzl
+++ /dev/null
@@ -1,20 +0,0 @@
-"""Simple Bazel wrapper around npm http-server package.
-
-See https://www.npmjs.com/package/http-server
-"""
-
-load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary")
-
-def http_server(templated_args = [], **kwargs):
-    # By default, we pass an argument pointing the http server to the
-    # package of the caller.
-    # This assumes there is an index.html in the package directory.
-    if not templated_args:
-        templated_args = [native.package_name()]
-
-    nodejs_binary(
-        node_modules = "@http-server_runtime_deps//:node_modules",
-        entry_point = "http-server/bin/http-server",
-        templated_args = templated_args,
-        **kwargs
-    )
diff --git a/tools/http-server/package.json b/tools/http-server/package.json
deleted file mode 100644
index 43be8ec75b..0000000000
--- a/tools/http-server/package.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "http_server",
-  "version": "1.0.0",
-  "main": "index.js",
-  "license": "MIT",
-  "devDependencies": {
-    "http-server": "github:alexeagle/http-server#97205e945b69091606ed83aa0c8489e9ce65d282"
-  }
-}
diff --git a/tools/http-server/yarn.lock b/tools/http-server/yarn.lock
deleted file mode 100644
index 2a3bed8292..0000000000
--- a/tools/http-server/yarn.lock
+++ /dev/null
@@ -1,125 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-async@^1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
-
-colors@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
-
-corser@~2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/corser/-/corser-2.0.1.tgz#8eda252ecaab5840dcd975ceb90d9370c819ff87"
-
-debug@^2.2.0:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  dependencies:
-    ms "2.0.0"
-
-"ecstatic@github:alexeagle/node-ecstatic#833f734497f72f8cf396f162f46ad48c56ddc4ca":
-  version "3.2.0"
-  resolved "https://codeload.github.com/alexeagle/node-ecstatic/tar.gz/833f734497f72f8cf396f162f46ad48c56ddc4ca"
-  dependencies:
-    he "^1.1.1"
-    mime "^1.4.1"
-    minimist "^1.1.0"
-    url-join "^2.0.2"
-
-eventemitter3@1.x.x:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz#1c86991d816ad1e504750e73874224ecf3bec508"
-
-he@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
-
-http-proxy@^1.8.1:
-  version "1.16.2"
-  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.16.2.tgz#06dff292952bf64dbe8471fa9df73066d4f37742"
-  dependencies:
-    eventemitter3 "1.x.x"
-    requires-port "1.x.x"
-
-"http-server@github:alexeagle/http-server#97205e945b69091606ed83aa0c8489e9ce65d282":
-  version "0.11.1"
-  resolved "https://codeload.github.com/alexeagle/http-server/tar.gz/97205e945b69091606ed83aa0c8489e9ce65d282"
-  dependencies:
-    colors "1.0.3"
-    corser "~2.0.0"
-    ecstatic "github:alexeagle/node-ecstatic#833f734497f72f8cf396f162f46ad48c56ddc4ca"
-    http-proxy "^1.8.1"
-    opener "~1.4.0"
-    optimist "0.6.x"
-    portfinder "^1.0.13"
-    union "~0.4.3"
-
-mime@^1.4.1:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
-
-minimist@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
-
-minimist@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-
-minimist@~0.0.1:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
-
-mkdirp@0.5.x:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
-  dependencies:
-    minimist "0.0.8"
-
-ms@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-
-opener@~1.4.0:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/opener/-/opener-1.4.3.tgz#5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"
-
-optimist@0.6.x:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
-  dependencies:
-    minimist "~0.0.1"
-    wordwrap "~0.0.2"
-
-portfinder@^1.0.13:
-  version "1.0.13"
-  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.13.tgz#bb32ecd87c27104ae6ee44b5a3ccbf0ebb1aede9"
-  dependencies:
-    async "^1.5.2"
-    debug "^2.2.0"
-    mkdirp "0.5.x"
-
-qs@~2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-2.3.3.tgz#e9e85adbe75da0bbe4c8e0476a086290f863b404"
-
-requires-port@1.x.x:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
-
-union@~0.4.3:
-  version "0.4.6"
-  resolved "https://registry.yarnpkg.com/union/-/union-0.4.6.tgz#198fbdaeba254e788b0efcb630bc11f24a2959e0"
-  dependencies:
-    qs "~2.3.3"
-
-url-join@^2.0.2:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/url-join/-/url-join-2.0.5.tgz#5af22f18c052a000a48d7b82c5e9c2e2feeda728"
-
-wordwrap@~0.0.2:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
diff --git a/tools/ng_setup_workspace.bzl b/tools/ng_setup_workspace.bzl
deleted file mode 100644
index a705f91e37..0000000000
--- a/tools/ng_setup_workspace.bzl
+++ /dev/null
@@ -1,46 +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 angular source dependencies"
-
-load("@build_bazel_rules_nodejs//:package.bzl", "check_rules_nodejs_version")
-load("@build_bazel_rules_nodejs//:defs.bzl", "yarn_install")
-load("@angular//packages/bazel/src:ng_setup_workspace.bzl", _ng_setup_workspace = "ng_setup_workspace")
-
-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
-    to build angular
-    """
-
-    # 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")
-
-    yarn_install(
-        name = "ngdeps",
-        package_json = "@angular//:package.json",
-        yarn_lock = "@angular//:yarn.lock",
-        data = ["@angular//:tools/yarn/check-yarn.js", "@angular//:tools/postinstall-patches.js"],
-        # Don't install devDependencies, they are large and not used under Bazel
-        prod_only = True,
-    )
-
-    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",
-    )
-
-    yarn_install(
-        name = "http-server_runtime_deps",
-        package_json = "@angular//tools/http-server:package.json",
-        yarn_lock = "@angular//tools/http-server:yarn.lock",
-    )
-
-    _ng_setup_workspace()
diff --git a/tools/npm/@angular_bazel/index.js b/tools/npm/@angular_bazel/index.js
new file mode 100755
index 0000000000..f06914f2b7
--- /dev/null
+++ b/tools/npm/@angular_bazel/index.js
@@ -0,0 +1,14 @@
+/**
+ * @license
+ * 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
+ */
+/**
+ * @fileoverview This files is only here so that @npm//@angular/bazel/bin:ngc-wrapped
+ * is a valid target as it is part of `esm5_outputs_aspect` in /packages/bazel/src/esm5.bzl
+ * TODO(gregmagolan): fix esm5_outputs_aspect so that this is not required
+ */
+
+throw new Error('should never be run');
diff --git a/tools/npm/@angular_bazel/package.json b/tools/npm/@angular_bazel/package.json
new file mode 100644
index 0000000000..99c97e797b
--- /dev/null
+++ b/tools/npm/@angular_bazel/package.json
@@ -0,0 +1,6 @@
+{
+  "version": "0.0.0",
+  "bin": {
+    "ngc-wrapped": "./index.js"
+  }
+}
diff --git a/tools/npm_workspace/@angular/bazel/BUILD.bazel b/tools/npm_workspace/@angular/bazel/BUILD.bazel
deleted file mode 100644
index c7f3bdf55b..0000000000
--- a/tools/npm_workspace/@angular/bazel/BUILD.bazel
+++ /dev/null
@@ -1,8 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-# Empty filegroup here so that @npm//@angular/bazel is a valid Bazel target
-# for the @angular//:@angular/bazel/ngc-wrapped target
-filegroup(
-    name = "bazel",
-    srcs = [],
-)
diff --git a/tools/npm_workspace/@bazel/typescript/BUILD.bazel b/tools/npm_workspace/@bazel/typescript/BUILD.bazel
deleted file mode 100644
index 0f51acdf28..0000000000
--- a/tools/npm_workspace/@bazel/typescript/BUILD.bazel
+++ /dev/null
@@ -1,8 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-# Alias here so that @npm//@bazel/typescript is a valid Bazel target
-# which is reference in npm_bazel_typescript/BUILD.bazel
-alias(
-    name = "typescript",
-    actual = "@ngdeps//@bazel/typescript",
-)
diff --git a/tools/npm_workspace/@bazel/typescript/bin/BUILD.bazel b/tools/npm_workspace/@bazel/typescript/bin/BUILD.bazel
deleted file mode 100644
index a37485571a..0000000000
--- a/tools/npm_workspace/@bazel/typescript/bin/BUILD.bazel
+++ /dev/null
@@ -1,7 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-# Alias here so that references actual in @ngdeps
-alias(
-    name = "tsc_wrapped",
-    actual = "@ngdeps//@bazel/typescript/bin:tsc_wrapped",
-)
diff --git a/tools/npm_workspace/BUILD.bazel b/tools/npm_workspace/BUILD.bazel
deleted file mode 100644
index f8b3c38bd8..0000000000
--- a/tools/npm_workspace/BUILD.bazel
+++ /dev/null
@@ -1 +0,0 @@
-# Marker file that this directory is a bazel package
diff --git a/tools/npm_workspace/WORKSPACE b/tools/npm_workspace/WORKSPACE
deleted file mode 100644
index d1060be5c5..0000000000
--- a/tools/npm_workspace/WORKSPACE
+++ /dev/null
@@ -1 +0,0 @@
-workspace(name = "npm")
diff --git a/tools/rxjs/BUILD.bazel b/tools/rxjs/BUILD.bazel
index 4e99bafd17..ea1510c40e 100644
--- a/tools/rxjs/BUILD.bazel
+++ b/tools/rxjs/BUILD.bazel
@@ -4,6 +4,6 @@ filegroup(
     name = "rxjs_umd_modules",
     srcs = [
         ":rxjs_shims.js",
-        "@ngdeps//node_modules/rxjs:bundles/rxjs.umd.js",
+        "@npm//node_modules/rxjs:bundles/rxjs.umd.js",
     ],
 )
diff --git a/tools/symbol-extractor/BUILD.bazel b/tools/symbol-extractor/BUILD.bazel
index d3f8cfb55b..784fe9f491 100644
--- a/tools/symbol-extractor/BUILD.bazel
+++ b/tools/symbol-extractor/BUILD.bazel
@@ -14,7 +14,7 @@ ts_library(
     ),
     deps = [
         "//packages:types",
-        "@ngdeps//typescript",
+        "@npm//typescript",
     ],
 )
 
@@ -28,7 +28,7 @@ ts_library(
     deps = [
         ":lib",
         "//packages:types",
-        "@ngdeps//typescript",
+        "@npm//typescript",
     ],
 )
 
diff --git a/tools/symbol-extractor/index.bzl b/tools/symbol-extractor/index.bzl
index 07e6247d96..3a59ce2a21 100644
--- a/tools/symbol-extractor/index.bzl
+++ b/tools/symbol-extractor/index.bzl
@@ -18,7 +18,7 @@ def js_expected_symbol_test(name, src, golden, data = [], **kwargs):
         golden,
         Label("//tools/symbol-extractor:lib"),
         Label("@bazel_tools//tools/bash/runfiles"),
-        Label("@ngdeps//typescript"),
+        Label("@npm//typescript"),
     ]
     entry_point = "angular/tools/symbol-extractor/cli.js"
 
diff --git a/tools/testing/BUILD.bazel b/tools/testing/BUILD.bazel
index 0af43b2a7a..55ae30e038 100644
--- a/tools/testing/BUILD.bazel
+++ b/tools/testing/BUILD.bazel
@@ -23,7 +23,7 @@ ts_library(
         "//packages/core/testing",
         "//packages/platform-server",
         "//packages/platform-server/testing",
-        "@ngdeps//domino",
+        "@npm//domino",
     ],
 )
 
diff --git a/tools/ts-api-guardian/BUILD.bazel b/tools/ts-api-guardian/BUILD.bazel
index eb6c2f2f07..80e976a93e 100644
--- a/tools/ts-api-guardian/BUILD.bazel
+++ b/tools/ts-api-guardian/BUILD.bazel
@@ -3,7 +3,7 @@ load(
     "jasmine_node_test",
     "npm_package",
 )
-load("@npm_bazel_typescript//:defs.bzl", "ts_library")
+load("@npm_bazel_typescript//:index.bzl", "ts_library")
 
 exports_files(["bin/ts-api-guardian"])
 
diff --git a/yarn.lock b/yarn.lock
index 73ce8ae136..f1876245c5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -77,6 +77,9 @@
     "@angular-devkit/core" "7.3.0-rc.0"
     rxjs "6.3.3"
 
+"@angular/bazel@file:./tools/npm/@angular_bazel":
+  version "0.0.0"
+
 "@angular/cli@^7.3.0-rc.0":
   version "7.3.0-rc.0"
   resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-7.3.0-rc.0.tgz#972be96b9d67ff2714155f5fbffa2c20a1e3daf1"
@@ -143,10 +146,17 @@
   resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.9.0.tgz#fd60023acd36313d304cc2f8c2e181b88b5445cd"
   integrity sha512-E31cefDcdJsx/oii6p/gqKZXSVw0kEg1O73DD2McFcSvnf/p1GYWcQtVgdRQmlviBEytJkJgdX8rtThitRvcow==
 
-"@bazel/karma@0.25.1":
-  version "0.25.1"
-  resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.25.1.tgz#246286299b6e96fa4a91d240d3c3d7386164adaf"
-  integrity sha512-e5qyZkeHdxEYTIcHg04pmPF1SR8jy8I1mQLgDxX6NJDVx3JT7iIFeISqlS8hjBiykyX/XZ0CsVzkKYU/sG3ilg==
+"@bazel/jasmine@0.26.0":
+  version "0.26.0"
+  resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-0.26.0.tgz#f7aed169b057b5af547d2573657b394ecbda0b5d"
+  integrity sha512-lkvzPHdbSEe1zitnV1hIBwodriXqp/ClHSZQJ5Y486UaLQ6Sm7k7gV2phOwtg7LqLVZnElZDmFLSI0/O1UYYyQ==
+  dependencies:
+    jasmine "~3.3.1"
+
+"@bazel/karma@0.26.0":
+  version "0.26.0"
+  resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.26.0.tgz#6ad796686f5775df33a96fa5ef3df76a66aed3b2"
+  integrity sha512-yZv0fgAjVrfrM0ld8e+wNaPIpYCpwBzVQi2GUErsKStUZXPUUofpBwBjlYsdY1Osn5/FmAF9e6xDkk1JWn/wSg==
   dependencies:
     jasmine-core "2.8.0"
     karma "^4.0.0"
@@ -160,10 +170,10 @@
     semver "5.6.0"
     tmp "0.0.33"
 
-"@bazel/typescript@0.25.1":
-  version "0.25.1"
-  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.25.1.tgz#71564de50ff6976fb37d90f2f7a479e87b158943"
-  integrity sha512-QFitUUXIWQMfVk5EwI9J9d5iNPfT+kUjPbahiJbJVZz1Fz9zNZ8+CR6FESfnxuUKlZK3Oy0VWFcz7mlHaceL/Q==
+"@bazel/typescript@0.26.0":
+  version "0.26.0"
+  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.26.0.tgz#c06139d76c8b9d3a3ed98a721b776fedb4b11c82"
+  integrity sha512-dh/Y/SZzmeChsLap8FVHYl0FuaeLh/6t9WBVhm5nOgyVrqfEyVpNzy4W20E4NqnmJY2/PqmD5qncf+Oo1q9h1A==
   dependencies:
     jasmine-core "2.8.0"
     protobufjs "5.0.3"
@@ -5594,6 +5604,11 @@ jasmine-core@^3.1.0, jasmine-core@~3.1.0:
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.1.0.tgz#a4785e135d5df65024dfc9224953df585bd2766c"
   integrity sha1-pHheE11d9lAk38kiSVPfWFvSdmw=
 
+jasmine-core@~3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.3.0.tgz#dea1cdc634bc93c7e0d4ad27185df30fa971b10e"
+  integrity sha512-3/xSmG/d35hf80BEN66Y6g9Ca5l/Isdeg/j6zvbTYlTzeKinzmaTM4p9am5kYqOmE05D7s1t8FGjzdSnbUbceA==
+
 jasmine@2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.8.0.tgz#6b089c0a11576b1f16df11b80146d91d4e8b8a3e"
@@ -5611,6 +5626,14 @@ jasmine@^3.1.0:
     glob "^7.0.6"
     jasmine-core "~3.1.0"
 
+jasmine@~3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-3.3.1.tgz#d61bb1dd8888859bd11ea83074a78ee13d949905"
+  integrity sha512-/vU3/H7U56XsxIXHwgEuWpCgQ0bRi2iiZeUpx7Nqo8n1TpoDHfZhkPIc7CO8I4pnMzYsi3XaSZEiy8cnTfujng==
+  dependencies:
+    glob "^7.0.6"
+    jasmine-core "~3.3.0"
+
 jasminewd2@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/jasminewd2/-/jasminewd2-2.2.0.tgz#e37cf0b17f199cce23bea71b2039395246b4ec4e"