build: reference zone.js from source directly instead of npm. (#33046)

Close #32482

PR Close #33046

.circleci/config.yml

@@ -667,6 +667,7 @@ jobs:
           background: true
       - run: yarn tsc -p packages
       - run: yarn tsc -p modules
+      - run: yarn bazel build //packages/zone.js:npm_package
         # Waits for the Saucelabs tunnel to be ready. This ensures that we don't run tests
         # too early without Saucelabs not being ready.
       - run: ./scripts/saucelabs/wait-for-tunnel.sh

BUILD.bazel

@@ -19,9 +19,9 @@ filegroup(
     # do not sort
     srcs = [
         "@npm//:node_modules/core-js/client/core.js",
-        "@npm//:node_modules/zone.js/dist/zone.js",
+        "//packages/zone.js/dist:zone.js",
-        "@npm//:node_modules/zone.js/dist/zone-testing.js",
+        "//packages/zone.js/dist:zone-testing.js",
-        "@npm//:node_modules/zone.js/dist/task-tracking.js",
+        "//packages/zone.js/dist:task-tracking.js",
         "//:test-events.js",
         "//:shims_for_IE.js",
         # Including systemjs because it defines `__eval`, which produces correct stack traces.

integration/cli-hello-world-ivy-compat/package.json

@@ -25,7 +25,7 @@
     "@angular/router": "file:../../dist/packages-dist/router",
     "rxjs": "file:../../node_modules/rxjs",
     "tslib": "file:../../node_modules/tslib",
-    "zone.js": "file:../../node_modules/zone.js"
+    "zone.js": "file:../../dist/bin/packages/zone.js/npm_package"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "^0.900.0-rc.0",

integration/cli-hello-world-ivy-i18n/package.json

@@ -31,7 +31,7 @@
     "rxjs": "file:../../node_modules/rxjs",
     "serve": "^11.2.0",
     "tslib": "file:../../node_modules/tslib",
-    "zone.js": "file:../../node_modules/zone.js"
+    "zone.js": "file:../../dist/bin/packages/zone.js/npm_package"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "^0.900.0-rc.0",

integration/cli-hello-world-ivy-minimal/package.json

@@ -25,7 +25,7 @@
     "@angular/router": "file:../../dist/packages-dist/router",
     "rxjs": "file:../../node_modules/rxjs",
     "tslib": "file:../../node_modules/tslib",
-    "zone.js": "file:../../node_modules/zone.js"
+    "zone.js": "file:../../dist/bin/packages/zone.js/npm_package"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "^0.900.0-rc.0",

integration/cli-hello-world-lazy-rollup/package.json

@@ -20,7 +20,7 @@
     "@angular/router": "file:../../dist/packages-dist/router",
     "rxjs": "file:../../node_modules/rxjs",
     "tslib": "^1.10.0",
-    "zone.js": "file:../../node_modules/zone.js"
+    "zone.js": "file:../../dist/bin/packages/zone.js/npm_package"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "^0.900.0-rc.0",

integration/cli-hello-world-lazy/package.json

@@ -20,7 +20,7 @@
     "@angular/router": "file:../../dist/packages-dist/router",
     "rxjs": "file:../../node_modules/rxjs",
     "tslib": "^1.10.0",
-    "zone.js": "file:../../node_modules/zone.js"
+    "zone.js": "file:../../dist/bin/packages/zone.js/npm_package"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "^0.900.0-rc.0",

integration/cli-hello-world/package.json

@@ -23,7 +23,7 @@
     "@angular/router": "file:../../dist/packages-dist/router",
     "rxjs": "file:../../node_modules/rxjs",
     "tslib": "file:../../node_modules/tslib",
-    "zone.js": "file:../../node_modules/zone.js"
+    "zone.js": "file:../../dist/bin/packages/zone.js/npm_package"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "^0.900.0-rc.0",

integration/dynamic-compiler/package.json

@@ -41,6 +41,6 @@
     "core-js": "file:../../node_modules/core-js",
     "rxjs": "file:../../node_modules/rxjs",
     "systemjs": "file:../../node_modules/systemjs",
-    "zone.js": "file:../../node_modules/zone.js"
+    "zone.js": "file:../../dist/bin/packages/zone.js/npm_package"
   }
 }

integration/hello_world__closure/package.json

@@ -13,7 +13,7 @@
     "google-closure-compiler": "20180716.0.0",
     "rxjs": "file:../../node_modules/rxjs",
     "typescript": "file:../../node_modules/typescript",
-    "zone.js": "file:../../node_modules/zone.js"
+    "zone.js": "file:../../dist/bin/packages/zone.js/npm_package"
   },
   "devDependencies": {
     "@types/jasmine": "2.5.41",

integration/hello_world__systemjs_umd/package.json

@@ -21,7 +21,7 @@
     "rxjs": "file:../../node_modules/rxjs",
     "systemjs": "0.20.2",
     "typescript": "file:../../node_modules/typescript",
-    "zone.js": "file:../../node_modules/zone.js"
+    "zone.js": "file:../../dist/bin/packages/zone.js/npm_package"
   },
   "devDependencies": {
     "@types/jasmine": "2.5.41",

integration/i18n/package.json

@@ -14,7 +14,7 @@
     "google-closure-compiler": "git+https://github.com/alexeagle/closure-compiler.git#packagejson.dist",
     "rxjs": "file:../../node_modules/rxjs",
     "typescript": "file:../../node_modules/typescript",
-    "zone.js": "file:../../node_modules/zone.js"
+    "zone.js": "file:../../dist/bin/packages/zone.js/npm_package"
   },
   "devDependencies": {
     "@types/jasmine": "2.5.41",

integration/injectable-def/package.json

@@ -14,7 +14,7 @@
     "@types/node": "file:../../node_modules/@types/node",
     "rxjs": "file:../../node_modules/rxjs",
     "typescript": "file:../../node_modules/typescript",
-    "zone.js": "file:../../node_modules/zone.js"
+    "zone.js": "file:../../dist/bin/packages/zone.js/npm_package"
   },
   "devDependencies": {
     "@types/jasmine": "2.5.41",

integration/ivy-i18n/package.json

@@ -24,7 +24,6 @@
     "translated:legacy:serve": "serve ../tmp/translations/legacy --listen 4200",
     "translated:legacy:e2e": "npm-run-all -p -r translated:legacy:serve \"ng e2e --configuration=translated-legacy\"",
     "translated:legacy:translate": "localize-translate -r \"dist/\" -s \"**/*\" -o \"../tmp/translations/{{LOCALE}}\"",
-
     "translated:legacy-xlf:test": "yarn ng xi18n && yarn translated:legacy-xlf:update-translations && yarn ng build --configuration=translated-legacy && yarn translated:legacy:translate -t \"../tmp/legacy-locales/messages.legacy.xlf\" && yarn translated:legacy:e2e",
     "translated:legacy-xlf:update-translations": "sed -i.bak -e 's/source>/target>'/ -e 's/Hello/Bonjour/' -e 's/source-language=\"en-US\"/source-language=\"en-US\" target-language=\"legacy\"/' ../tmp/legacy-locales/messages.legacy.xlf",
     "translated:legacy-xmb:test": "yarn ng xi18n --format=xmb --outFile=messages.legacy.xmb && yarn translated:legacy-xmb:update-translations && yarn ng build --configuration=translated-legacy-xmb && yarn translated:legacy:translate -t \"../tmp/legacy-locales/messages.legacy.xtb\" && yarn translated:legacy:e2e",
@@ -46,7 +45,7 @@
     "rxjs": "file:../../node_modules/rxjs",
     "serve": "^11.2.0",
     "tslib": "file:../../node_modules/tslib",
-    "zone.js": "file:../../node_modules/zone.js"
+    "zone.js": "file:../../dist/bin/packages/zone.js/npm_package"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "^0.900.0-rc.0",

integration/ng_elements/package.json

@@ -14,7 +14,7 @@
     "google-closure-compiler": "20180319.0.0",
     "rxjs": "file:../../node_modules/rxjs",
     "typescript": "file:../../node_modules/typescript",
-    "zone.js": "file:../../node_modules/zone.js"
+    "zone.js": "file:../../dist/bin/packages/zone.js/npm_package"
   },
   "devDependencies": {
     "@types/jasmine": "2.5.41",

integration/ng_update/package.json

@@ -24,6 +24,6 @@
     "@angular/upgrade": "file:../../dist/packages-dist/upgrade",
     "rxjs": "file:../../node_modules/rxjs",
     "typescript": "file:../../node_modules/typescript",
-    "zone.js": "file:../../node_modules/zone.js"
+    "zone.js": "file:../../dist/bin/packages/zone.js/npm_package"
   }
 }

integration/ng_update_migrations/package.json

@@ -21,7 +21,7 @@
     "@angular/router": "file:../../dist/packages-dist/router",
     "rxjs": "file:../../node_modules/rxjs",
     "tslib": "file:../../node_modules/tslib",
-    "zone.js": "file:../../node_modules/zone.js"
+    "zone.js": "file:../../dist/bin/packages/zone.js/npm_package"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "^0.900.0-rc.0",

integration/ngcc/package.json

@@ -17,7 +17,7 @@
     "@types/node": "file:../../node_modules/@types/node",
     "rxjs": "file:../../node_modules/rxjs",
     "typescript": "file:../../node_modules/typescript",
-    "zone.js": "file:../../node_modules/zone.js"
+    "zone.js": "file:../../dist/bin/packages/zone.js/npm_package"
   },
   "devDependencies": {
     "@types/jasmine": "2.5.41",

integration/platform-server/package.json

@@ -19,7 +19,7 @@
     "express": "^4.14.1",
     "rxjs": "file:../../node_modules/rxjs",
     "typescript": "file:../../node_modules/typescript",
-    "zone.js": "file:../../node_modules/zone.js"
+    "zone.js": "file:../../dist/bin/packages/zone.js/npm_package"
   },
   "devDependencies": {
     "@types/jasmine": "2.5.41",

integration/run_tests.sh

@@ -9,6 +9,7 @@ cd "$(dirname "$0")"
 
 # basedir is the workspace root
 readonly basedir=$(pwd)/..
+readonly bazel_bin=$(yarn bin)/bazel
 
 # When running on the CI, we track the payload size of various integration output files. Also
 # we shard tests across multiple CI job instances. The script needs to be run with a shard index
@@ -35,6 +36,9 @@ else
   TEST_DIRS=$(ls | grep -v node_modules)
 fi
 
+# We need to build zone.js npm package because it is not built in build-packages-dist.sh
+${bazel_bin} build //packages/zone.js:npm_package
+
 # Workaround https://github.com/yarnpkg/yarn/issues/2165
 # Yarn will cache file://dist URIs and not update Angular code
 readonly cache=.yarn_local_cache

integration/service-worker-schema/package.json

@@ -11,6 +11,6 @@
     "@angular/core": "file:../../dist/packages-dist/core",
     "@angular/service-worker": "file:../../dist/packages-dist/service-worker",
     "rxjs": "file:../../node_modules/rxjs",
-    "zone.js": "file:../../node_modules/zone.js"
+    "zone.js": "file:../../dist/bin/packages/zone.js/npm_package"
   }
 }

integration/terser/package.json

@@ -11,6 +11,6 @@
     "@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
     "rxjs": "file:../../node_modules/rxjs",
     "terser": "3.17.0",
-    "zone.js": "file:../../node_modules/zone.js"
+    "zone.js": "file:../../dist/bin/packages/zone.js/npm_package"
   }
 }

integration/typings_test_ts36/package.json

@@ -22,7 +22,7 @@
     "@types/jasmine": "2.5.41",
     "rxjs": "file:../../node_modules/rxjs",
     "typescript": "3.6.4",
-    "zone.js": "file:../../node_modules/zone.js"
+    "zone.js": "file:../../dist/bin/packages/zone.js/npm_package"
   },
   "scripts": {
     "test": "tsc"

karma-js.conf.js

@@ -36,9 +36,9 @@ module.exports = function(config) {
       {pattern: 'node_modules/angular-mocks/angular-mocks.js', included: false, watched: false},
 
       'node_modules/core-js/client/core.js',
-      'node_modules/zone.js/dist/zone.js',
+      'dist/bin/packages/zone.js/npm_package/dist/zone.js',
-      'node_modules/zone.js/dist/zone-testing.js',
+      'dist/bin/packages/zone.js/npm_package/dist/zone-testing.js',
-      'node_modules/zone.js/dist/task-tracking.js',
+      'dist/bin/packages/zone.js/npm_package/dist/task-tracking.js',
 
       // Including systemjs because it defines `__eval`, which produces correct stack traces.
       'test-events.js',

modules/benchmarks/src/class_bindings/BUILD.bazel

@@ -44,7 +44,7 @@ ts_devserver(
     port = 4200,
     static_files = [
         ":bundle.min_debug.es2015.js",
-        "@npm//:node_modules/zone.js/dist/zone.js",
+        "//packages/zone.js/dist:zone.js",
     ],
 )
 

modules/benchmarks/src/expanding_rows/BUILD.bazel

@@ -44,7 +44,7 @@ ts_devserver(
     index_html = "index.html",
     port = 4200,
     static_files = [
-        "@npm//:node_modules/zone.js/dist/zone.js",
+        "//packages/zone.js/dist:zone.js",
     ],
     deps = [
         ":bundle.min_debug.es2015.js",
@@ -64,7 +64,7 @@ ts_devserver(
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@npm//:node_modules/zone.js/dist/zone.js",
+        "//packages/zone.js/dist:zone.js",
     ],
     deps = [":application_lib"],
 )

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

@@ -33,8 +33,8 @@ ts_devserver(
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@npm//:node_modules/zone.js/dist/zone.js",
         "@npm//:node_modules/reflect-metadata/Reflect.js",
+        "//packages/zone.js/dist:zone.js",
     ],
     tags = ["fixme-ivy-aot"],
     deps = [":ng2"],

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

@@ -37,7 +37,7 @@ ts_devserver(
     port = 4200,
     static_files = [
         ":bundle.min_debug.es2015.js",
-        "@npm//:node_modules/zone.js/dist/zone.js",
+        "//packages/zone.js/dist:zone.js",
     ],
 )
 

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

@@ -29,8 +29,8 @@ ts_devserver(
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@npm//:node_modules/zone.js/dist/zone.js",
         "@npm//:node_modules/reflect-metadata/Reflect.js",
+        "//packages/zone.js/dist:zone.js",
     ],
     deps = [":ng2_switch"],
 )

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

@@ -37,7 +37,7 @@ ts_devserver(
     port = 4200,
     static_files = [
         ":bundle.min_debug.es2015.js",
-        "@npm//:node_modules/zone.js/dist/zone.js",
+        "//packages/zone.js/dist:zone.js",
     ],
 )
 

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

@@ -27,8 +27,8 @@ ts_devserver(
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@npm//:node_modules/zone.js/dist/zone.js",
         "@npm//:node_modules/reflect-metadata/Reflect.js",
+        "//packages/zone.js/dist:zone.js",
     ],
     deps = [":ng2_static"],
 )

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

@@ -29,8 +29,8 @@ ts_devserver(
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@npm//:node_modules/zone.js/dist/zone.js",
         "@npm//:node_modules/reflect-metadata/Reflect.js",
+        "//packages/zone.js/dist:zone.js",
     ],
     deps = [":ng2_switch"],
 )

modules/benchmarks/src/views/BUILD.bazel

@@ -30,13 +30,16 @@ ts_devserver(
     static_files = [
         ":bundle.min_debug.es2015.js",
         ":bundle.min.es2015.js",
-        "@npm//:node_modules/zone.js/dist/zone.js",
+        "//packages/zone.js/dist:zone.js",
         "index.html",
     ],
 )
 
 ts_devserver(
     name = "devserver",
+    data = [
+        "//packages/zone.js/dist:zone.js",
+    ],
     entry_module = "angular/modules/benchmarks/src/views/index",
     index_html = "index.html",
     scripts = [
@@ -45,7 +48,6 @@ ts_devserver(
     ],
     serving_path = "/index.js",
     static_files = [
-        "@npm//:node_modules/zone.js/dist/zone.js",
         "index.html",
     ],
     deps = [":application_lib"],

modules/playground/src/animate/BUILD.bazel

@@ -25,7 +25,7 @@ ts_devserver(
     port = 4200,
     scripts = ["@npm//:node_modules/tslib/tslib.js"],
     static_files = [
-        "@npm//:node_modules/zone.js/dist/zone.js",
+        "//packages/zone.js/dist:zone.js",
         "@npm//:node_modules/reflect-metadata/Reflect.js",
     ],
     deps = [":animate"],

modules/playground/src/async/BUILD.bazel

@@ -26,7 +26,7 @@ ts_devserver(
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@npm//:node_modules/zone.js/dist/zone.js",
+        "//packages/zone.js/dist:zone.js",
         "@npm//:node_modules/reflect-metadata/Reflect.js",
     ],
     deps = [":async"],

modules/playground/src/gestures/BUILD.bazel

@@ -26,7 +26,7 @@ ts_devserver(
     scripts = ["@npm//:node_modules/tslib/tslib.js"],
     static_files = [
         "@npm//:node_modules/hammerjs/hammer.js",
-        "@npm//:node_modules/zone.js/dist/zone.js",
+        "//packages/zone.js/dist:zone.js",
         "@npm//:node_modules/reflect-metadata/Reflect.js",
     ],
     deps = [":gestures"],

modules/playground/src/hello_world/BUILD.bazel

@@ -26,7 +26,7 @@ ts_devserver(
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@npm//:node_modules/zone.js/dist/zone.js",
+        "//packages/zone.js/dist:zone.js",
         "@npm//:node_modules/reflect-metadata/Reflect.js",
     ],
     deps = [":hello_world"],

modules/playground/src/http/BUILD.bazel

@@ -29,7 +29,7 @@ ts_devserver(
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@npm//:node_modules/zone.js/dist/zone.js",
+        "//packages/zone.js/dist:zone.js",
         "@npm//:node_modules/reflect-metadata/Reflect.js",
     ],
     deps = [":http"],

modules/playground/src/jsonp/BUILD.bazel

@@ -28,7 +28,7 @@ ts_devserver(
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@npm//:node_modules/zone.js/dist/zone.js",
+        "//packages/zone.js/dist:zone.js",
         "@npm//:node_modules/reflect-metadata/Reflect.js",
     ],
     deps = [":jsonp"],

modules/playground/src/key_events/BUILD.bazel

@@ -26,7 +26,7 @@ ts_devserver(
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@npm//:node_modules/zone.js/dist/zone.js",
+        "//packages/zone.js/dist:zone.js",
         "@npm//:node_modules/reflect-metadata/Reflect.js",
     ],
     deps = [":key_events"],

modules/playground/src/model_driven_forms/BUILD.bazel

@@ -27,7 +27,7 @@ ts_devserver(
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@npm//:node_modules/zone.js/dist/zone.js",
+        "//packages/zone.js/dist:zone.js",
         "@npm//:node_modules/reflect-metadata/Reflect.js",
     ],
     deps = [":model_driven_forms"],

modules/playground/src/order_management/BUILD.bazel

@@ -27,7 +27,7 @@ ts_devserver(
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@npm//:node_modules/zone.js/dist/zone.js",
+        "//packages/zone.js/dist:zone.js",
         "@npm//:node_modules/reflect-metadata/Reflect.js",
     ],
     deps = [":order_management"],

modules/playground/src/person_management/BUILD.bazel

@@ -27,7 +27,7 @@ ts_devserver(
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@npm//:node_modules/zone.js/dist/zone.js",
+        "//packages/zone.js/dist:zone.js",
         "@npm//:node_modules/reflect-metadata/Reflect.js",
     ],
     deps = [":person_management"],

modules/playground/src/relative_assets/BUILD.bazel

@@ -39,7 +39,7 @@ ts_devserver(
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@npm//:node_modules/zone.js/dist/zone.js",
+        "//packages/zone.js/dist:zone.js",
         "@npm//:node_modules/reflect-metadata/Reflect.js",
     ],
     deps = [":relative_assets"],

modules/playground/src/routing/BUILD.bazel

@@ -28,15 +28,18 @@ ts_devserver(
         "//third_party/fonts.google.com/open-sans",
         "@npm//:node_modules/rxjs/bundles/rxjs.umd.js",
         "@npm//:node_modules/tslib/tslib.js",
+        "//packages/zone.js/dist:zone.js",
     ] + glob(["**/*.css"]),
     port = 4200,
     static_files = [
         "index.html",
-        "@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",
     ],
-    deps = [":routing"],
+    deps = [
+        ":routing",
+        "//packages/zone.js/lib",
+    ],
 )

modules/playground/src/routing/index.html

@@ -1,9 +1,10 @@
 <!doctype html>
 <html>
-  <title>Routing Example</title>
+<title>Routing Example</title>
-  <link rel="stylesheet" type="text/css" href="./css/gumby.css">
+<link rel="stylesheet" type="text/css" href="./css/gumby.css">
-  <link rel="stylesheet" type="text/css" href="./css/app.css">
+<link rel="stylesheet" type="text/css" href="./css/app.css">
-  <base href="/">
+<base href="/">
+
 <body>
   <inbox-app>
     Loading...
@@ -14,9 +15,10 @@
   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="npm/node_modules/zone.js/dist/zone.js"></script>
+<script src="angular/packages/zone.js/dist/zone.js"></script>
 <script src="npm/node_modules/reflect-metadata/Reflect.js"></script>
 <script src="npm/node_modules/systemjs/dist/system.js"></script>
 <script src="angular/modules/playground/systemjs-config.js"></script>
 <script src="load-app.js"></script>
+
 </html>

modules/playground/src/sourcemap/BUILD.bazel

@@ -30,7 +30,7 @@ ts_devserver(
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@npm//:node_modules/zone.js/dist/zone.js",
+        "//packages/zone.js/dist:zone.js",
         "@npm//:node_modules/reflect-metadata/Reflect.js",
     ],
     deps = [":sourcemap"],

modules/playground/src/svg/BUILD.bazel

@@ -26,7 +26,7 @@ ts_devserver(
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@npm//:node_modules/zone.js/dist/zone.js",
+        "//packages/zone.js/dist:zone.js",
         "@npm//:node_modules/reflect-metadata/Reflect.js",
     ],
     deps = [":svg"],

modules/playground/src/template_driven_forms/BUILD.bazel

@@ -27,7 +27,7 @@ ts_devserver(
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@npm//:node_modules/zone.js/dist/zone.js",
+        "//packages/zone.js/dist:zone.js",
         "@npm//:node_modules/reflect-metadata/Reflect.js",
     ],
     deps = [":template_driven_forms"],

modules/playground/src/todo/BUILD.bazel

@@ -28,7 +28,7 @@ ts_devserver(
     port = 4200,
     scripts = ["@npm//:node_modules/tslib/tslib.js"],
     static_files = [
-        "@npm//:node_modules/zone.js/dist/zone.js",
+        "//packages/zone.js/dist:zone.js",
         "@npm//:node_modules/reflect-metadata/Reflect.js",
     ],
     deps = [":todo"],

modules/playground/src/upgrade/BUILD.bazel

@@ -26,7 +26,7 @@ ts_devserver(
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@npm//:node_modules/zone.js/dist/zone.js",
+        "//packages/zone.js/dist:zone.js",
         "@npm//:node_modules/reflect-metadata/Reflect.js",
         "@npm//:node_modules/angular/angular.js",
     ],

modules/playground/src/web_workers/BUILD.bazel

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

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

@@ -29,6 +29,6 @@ ts_devserver(
     index_html = "index.html",
     port = 4200,
     scripts = ["@npm//:node_modules/tslib/tslib.js"],
-    static_files = ["@npm//:node_modules/zone.js/dist/zone.js"],
+    static_files = ["//packages/zone.js/dist:zone.js"],
     deps = [":animations"],
 )

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

@@ -34,7 +34,7 @@ ts_devserver(
     port = 4200,
     scripts = ["@npm//:node_modules/tslib/tslib.js"],
     static_files = [
-        "@npm//:node_modules/zone.js/dist/zone.js",
+        "//packages/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",

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

@@ -33,8 +33,8 @@ ts_devserver(
     ],
     static_files = [
         "@npm//:node_modules/systemjs/dist/system.js",
-        "@npm//:node_modules/zone.js/dist/zone.js",
+        "//packages/zone.js/dist:zone.js",
-        "@npm//:node_modules/zone.js/dist/long-stack-trace-zone.js",
+        "//packages/zone.js/dist:long-stack-trace-zone.js",
         "@npm//:node_modules/reflect-metadata/Reflect.js",
     ],
     deps = [":input"],

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

@@ -33,8 +33,8 @@ ts_devserver(
     ],
     static_files = [
         "@npm//:node_modules/systemjs/dist/system.js",
-        "@npm//:node_modules/zone.js/dist/zone.js",
+        "//packages/zone.js/dist:zone.js",
-        "@npm//:node_modules/zone.js/dist/long-stack-trace-zone.js",
+        "//packages/zone.js/dist:long-stack-trace-zone.js",
         "@npm//:node_modules/reflect-metadata/Reflect.js",
     ],
     deps = [":kitchen_sink"],

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

@@ -33,8 +33,8 @@ ts_devserver(
     ],
     static_files = [
         "@npm//:node_modules/systemjs/dist/system.js",
-        "@npm//:node_modules/zone.js/dist/zone.js",
+        "//packages/zone.js/dist:zone.js",
-        "@npm//:node_modules/zone.js/dist/long-stack-trace-zone.js",
+        "//packages/zone.js/dist:long-stack-trace-zone.js",
         "@npm//:node_modules/reflect-metadata/Reflect.js",
     ],
     deps = [":message_broker"],

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

@@ -36,8 +36,8 @@ ts_devserver(
     ],
     static_files = [
         "@npm//:node_modules/systemjs/dist/system.js",
-        "@npm//:node_modules/zone.js/dist/zone.js",
+        "//packages/zone.js/dist:zone.js",
-        "@npm//:node_modules/zone.js/dist/long-stack-trace-zone.js",
+        "//packages/zone.js/dist:long-stack-trace-zone.js",
         "@npm//:node_modules/reflect-metadata/Reflect.js",
     ],
     deps = [":router"],

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

@@ -36,8 +36,8 @@ ts_devserver(
     ],
     static_files = [
         "@npm//:node_modules/systemjs/dist/system.js",
-        "@npm//:node_modules/zone.js/dist/zone.js",
+        "//packages/zone.js/dist:zone.js",
-        "@npm//:node_modules/zone.js/dist/long-stack-trace-zone.js",
+        "//packages/zone.js/dist:long-stack-trace-zone.js",
         "@npm//:node_modules/reflect-metadata/Reflect.js",
     ],
     deps = [":todo"],

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

@@ -7,8 +7,8 @@
  */
 
 importScripts('npm/node_modules/reflect-metadata/Reflect.js');
-importScripts('npm/node_modules/zone.js/dist/zone.js');
+importScripts('angular/packages/zone.js/dist/zone.js');
-importScripts('npm/node_modules/zone.js/dist/long-stack-trace-zone.js');
+importScripts('angular/packages/zone.js/dist/long-stack-trace-zone.js');
 importScripts('npm/node_modules/systemjs/dist/system.js');
 
 importScripts('angular/modules/playground/systemjs-config.js');

modules/playground/src/zippy_component/BUILD.bazel

@@ -27,7 +27,7 @@ ts_devserver(
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@npm//:node_modules/zone.js/dist/zone.js",
+        "//packages/zone.js/dist:zone.js",
         "@npm//:node_modules/reflect-metadata/Reflect.js",
     ],
     deps = [":zippy_component"],

package.json

@@ -119,8 +119,7 @@
     "tslint": "5.7.0",
     "typescript": "~3.6.4",
     "xhr2": "0.1.4",
-    "yargs": "13.1.0",
+    "yargs": "13.1.0"
-    "zone.js": "^0.10.2"
   },
   "optionalDependencies": {
     "fsevents": "2.0.1"

packages/BUILD.bazel

@@ -12,8 +12,8 @@ ts_library(
     name = "types",
     srcs = glob(["*.ts"]),
     deps = [
+        "//packages/zone.js/lib:zone_d_ts",
         "@npm//@types/hammerjs",
-        "@npm//zone.js",
     ],
 )
 

packages/compiler-cli/integrationtest/BUILD.bazel

@@ -38,10 +38,17 @@ nodejs_test(
         "@npm//rxjs",
         "@npm//tslib",
         "@npm//jasmine/bin:jasmine",
-        "@npm//zone.js",
         "@npm//xhr2",
         "@npm//@types/node",
         "@npm//@types/jasmine",
+        # we need to reference zone.d.ts typing file from zone.js build target
+        # instead of npm because angular repo will not depends on npm zone.js
+        # any longer.
+        "//packages/zone.js/lib:zone_d_ts",
+        # we need to reference zone.js npm_package build target
+        # instead of npm because angular repo will not depends on npm zone.js
+        # any longer, so we need to build a zone.js npm release first.
+        "//packages/zone.js:npm_package",
         "//packages/animations:npm_package",
         "//packages/common:npm_package",
         "//packages/compiler:npm_package",

packages/compiler-cli/integrationtest/test/init.ts

@@ -6,12 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+// import zone.js from npm here because integration test will load zone.js
+// from built npm_package instead of source
+import 'zone.js/dist/zone-node';
+import 'zone.js/dist/zone-testing';
 // Only needed to satisfy the check in core/src/util/decorators.ts
 // TODO(alexeagle): maybe remove that check?
 require('reflect-metadata');
-
-require('zone.js/dist/zone-node.js');
-require('zone.js/dist/long-stack-trace-zone.js');
-require('zone.js/dist/sync-test.js');
-require('zone.js/dist/proxy.js');
-require('zone.js/dist/jasmine-patch.js');

packages/compiler-cli/integrationtest/test_helpers.js

@@ -56,7 +56,7 @@ const requiredNodeModules = {
   'source-map': resolveNpmTreeArtifact('npm/node_modules/source-map'),
   'source-map-support': resolveNpmTreeArtifact('npm/node_modules/source-map-support'),
   'typescript': resolveNpmTreeArtifact('npm/node_modules/typescript'),
-  'zone.js': resolveNpmTreeArtifact('npm/node_modules/zone.js'),
+  'zone.js': resolveNpmTreeArtifact('angular/packages/zone.js/npm_package'),
 };
 
 /** Sets up the temporary test directory and returns the path to the directory. */

packages/compiler-cli/tsconfig-build.json

@@ -34,7 +34,6 @@
     "src/extract_i18n.ts",
     "src/language_services.ts",
     "../../node_modules/@types/node/index.d.ts",
-    "../../node_modules/@types/jasmine/index.d.ts",
+    "../../node_modules/@types/jasmine/index.d.ts"
-    "../../node_modules/zone.js/dist/zone.js.d.ts"
   ]
 }

packages/core/BUILD.bazel

@@ -18,8 +18,8 @@ ng_module(
         "//packages/core/src/reflection",
         "//packages/core/src/util",
         "//packages/localize",
+        "//packages/zone.js/lib:zone_d_ts",
         "@npm//rxjs",
-        "@npm//zone.js",
     ],
 )
 

packages/core/test/BUILD.bazel

@@ -35,8 +35,8 @@ ts_library(
         "//packages/private/testing",
         "//packages/router",
         "//packages/router/testing",
+        "//packages/zone.js/lib:zone_d_ts",
         "@npm//rxjs",
-        "@npm//zone.js",
     ],
 )
 
@@ -66,10 +66,10 @@ jasmine_node_test(
         ":test_node_only_lib",
         "//packages/platform-server",
         "//packages/platform-server/testing",
+        "//packages/zone.js/lib:zone_d_ts",
         "//tools/testing:node",
         "@npm//base64-js",
         "@npm//source-map",
-        "@npm//zone.js",
     ],
 )
 

packages/core/test/acceptance/BUILD.bazel

@@ -28,8 +28,8 @@ ts_library(
         "//packages/platform-server",
         "//packages/private/testing",
         "//packages/router",
+        "//packages/zone.js/lib:zone_d_ts",
         "@npm//rxjs",
-        "@npm//zone.js",
     ],
 )
 
@@ -38,10 +38,10 @@ jasmine_node_test(
     bootstrap = ["angular/tools/testing/init_node_spec.js"],
     deps = [
         ":acceptance_lib",
+        "//packages/zone.js/lib:zone_d_ts",
         "//tools/testing:node",
         "@npm//base64-js",
         "@npm//source-map",
-        "@npm//zone.js",
     ],
 )
 

packages/core/test/render3/BUILD.bazel

@@ -45,7 +45,7 @@ ts_library(
         "//packages/common",
         "//packages/compiler",
         "//packages/platform-server",
-        "@npm//zone.js",
+        "//packages/zone.js/lib:zone_d_ts",
     ],
 )
 
@@ -66,7 +66,7 @@ jasmine_node_test(
     ],
     deps = [
         ":render3_node_lib",
-        "@npm//zone.js",
+        "//packages/zone.js/lib",
     ],
 )
 

packages/core/test/render3/ivy/BUILD.bazel

@@ -25,5 +25,6 @@ jasmine_node_test(
     deps = [
         ":ivy_lib",
         "//packages/core/test/render3:domino",
+        "//packages/zone.js/lib",
     ],
 )

packages/core/test/render3/load_domino.ts

@@ -7,11 +7,10 @@
  */
 
 // Needed to run animation tests
-require('zone.js/dist/zone-node.js');
+import 'zone.js/lib/node/rollup-main';
-
 import '@angular/compiler'; // For JIT mode. Must be in front of any other @angular/* imports.
-import {DominoAdapter} from '@angular/platform-server/src/domino_adapter';
 import {ɵgetDOM as getDOM} from '@angular/common';
+import {DominoAdapter} from '@angular/platform-server/src/domino_adapter';
 
 if (typeof window == 'undefined') {
   const domino = require('domino');

packages/core/testing/BUILD.bazel

@@ -14,7 +14,7 @@ ng_module(
         "//packages/compiler",
         "//packages/core",
         "//packages/localize",
+        "//packages/zone.js/lib:zone_d_ts",
         "@npm//@types/jasmine",
-        "@npm//zone.js",
     ],
 )

packages/elements/test/BUILD.bazel

@@ -25,8 +25,8 @@ filegroup(
     srcs = [
         "@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",
+        "//packages/zone.js/dist:zone.js",
-        "@npm//:node_modules/zone.js/dist/zone-testing.js",
+        "//packages/zone.js/dist:zone-testing.js",
     ],
 )
 

packages/examples/common/BUILD.bazel

@@ -45,7 +45,7 @@ ts_devserver(
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@npm//:node_modules/zone.js/dist/zone.js",
+        "//packages/zone.js/dist:zone.js",
     ],
     deps = [":common_examples"],
 )

packages/examples/core/BUILD.bazel

@@ -61,8 +61,8 @@ ts_devserver(
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@npm//:node_modules/zone.js/dist/zone.js",
+        "//packages/zone.js/dist:zone.js",
-        "@npm//:node_modules/zone.js/dist/task-tracking.js",
+        "//packages/zone.js/dist:task-tracking.js",
     ],
     deps = [":core_examples"],
 )

packages/examples/forms/BUILD.bazel

@@ -45,7 +45,7 @@ ts_devserver(
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@npm//:node_modules/zone.js/dist/zone.js",
+        "//packages/zone.js/dist:zone.js",
     ],
     deps = [":forms_examples"],
 )

packages/examples/router/activated-route/BUILD.bazel

@@ -29,7 +29,7 @@ ts_devserver(
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@npm//:node_modules/zone.js/dist/zone.js",
+        "//packages/zone.js/dist:zone.js",
     ],
     deps = [":router_activated_route_examples"],
 )

packages/examples/service-worker/push/BUILD.bazel

@@ -44,7 +44,7 @@ ts_devserver(
     ],
     static_files = [
         "ngsw-worker.js",
-        "@npm//:node_modules/zone.js/dist/zone.js",
+        "//packages/zone.js/dist:zone.js",
     ],
     deps = [":sw_push_examples"],
 )

packages/examples/service-worker/registration-options/BUILD.bazel

@@ -44,7 +44,7 @@ ts_devserver(
     ],
     static_files = [
         "ngsw-worker.js",
-        "@npm//:node_modules/zone.js/dist/zone.js",
+        "//packages/zone.js/dist:zone.js",
     ],
     deps = [":sw_registration_options_examples"],
 )

packages/examples/upgrade/upgrade_example.bzl

@@ -46,7 +46,7 @@ def create_upgrade_example_targets(name, srcs, e2e_srcs, entry_module, assets =
         port = 4200,
         entry_module = entry_module,
         static_files = [
-            "@npm//:node_modules/zone.js/dist/zone.js",
+            "//packages/zone.js/dist:zone.js",
             "@npm//:node_modules/angular/angular.js",
             "@npm//:node_modules/reflect-metadata/Reflect.js",
         ],

packages/platform-browser/BUILD.bazel

@@ -14,8 +14,8 @@ ng_module(
         "//packages:types",
         "//packages/common",
         "//packages/core",
+        "//packages/zone.js/lib:zone_d_ts",
         "@npm//@types/hammerjs",
-        "@npm//zone.js",
     ],
 )
 

packages/platform-server/BUILD.bazel

@@ -19,9 +19,9 @@ ng_module(
         "//packages/platform-browser",
         "//packages/platform-browser-dynamic",
         "//packages/platform-browser/animations",
+        "//packages/zone.js/lib:zone_d_ts",
         "@npm//@types/node",
         "@npm//rxjs",
-        "@npm//zone.js",
     ],
 )
 

packages/router/karma.conf.js

@@ -35,8 +35,8 @@ module.exports = function(config) {
       'node_modules/systemjs/dist/system.src.js',
 
       // Zone.js dependencies
-      'node_modules/zone.js/dist/zone.js',
+      'dist/bin/packages/zone.js/npm_package/dist/zone.js',
-      'node_modules/zone.js/dist/zone-testing.js',
+      'dist/bin/packages/zone.js/npm_package/dist/zone-testing.js',
 
       {pattern: 'node_modules/rxjs/**/*', included: false, watched: false},
 

packages/tsconfig.json

@@ -19,6 +19,7 @@
       "selenium-webdriver": ["./node_modules/@types/selenium-webdriver/index.d.ts"],
       "rxjs/*": ["./node_modules/rxjs/*"],
       "@angular/*": ["./packages/*"],
+      "zone.js/*": ["./packages/zone.js/*"],
       "e2e_util/*": ["./modules/e2e_util/*"]
     },
     "rootDir": ".",
@@ -50,7 +51,6 @@
     // strict flag. Until these packages are removed, we exclude them here.
     "platform-webworker/**",
     "platform-webworker-dynamic/**",
-    "router/test/aot_ngsummary_test",
+    "router/test/aot_ngsummary_test"
-    "zone.js"
   ]
 }

packages/types.d.ts

@@ -9,7 +9,6 @@
 // This file contains all ambient imports needed to compile the packages/ source code
 
 /// <reference types="hammerjs" />
-/// <reference types="zone.js" />
 /// <reference lib="es2015" />
 /// <reference path="./goog.d.ts" />
 /// <reference path="./system.d.ts" />

packages/upgrade/BUILD.bazel

@@ -14,7 +14,7 @@ ng_module(
         "//packages/core",
         "//packages/platform-browser-dynamic",
         "//packages/upgrade/src/common",
-        "@npm//zone.js",
+        "//packages/zone.js/lib:zone_d_ts",
     ],
 )
 

packages/zone.js/BUILD.bazel

@@ -26,7 +26,7 @@ npm_package(
         "README.md",
         "package.json",
     ],
-    visibility = ["//packages/zone.js/test:__pkg__"],
+    visibility = ["//visibility:public"],
     deps = [
         ":LICENSE.wrapped",
         ":LICENSE_copy",

packages/zone.js/dist/BUILD.bazel

@@ -1,7 +1,7 @@
 load("//tools:defaults.bzl", "rollup_bundle")
 load("//packages/zone.js:bundles.bzl", "ES2015_BUNDLES", "ES5_BUNDLES", "ES5_GLOBAL_BUNDLES")
 
-package(default_visibility = ["//packages/zone.js:__subpackages__"])
+package(default_visibility = ["//visibility:public"])
 
 # copy this file from //lib to //dist
 genrule(
@@ -13,9 +13,9 @@ genrule(
 
 genrule(
     name = "zone_d_ts",
-    srcs = ["//packages/zone.js/lib"],
+    srcs = ["//packages/zone.js/lib:zone_d_ts"],
     outs = ["zone.js.d.ts"],
-    cmd = "find $(SRCS) -name \"zone.d.ts\" -exec cp {} $(@D)/zone.js.d.ts \;",
+    cmd = "cp $< $@",
 )
 
 [

packages/zone.js/lib/BUILD.bazel

@@ -1,16 +1,28 @@
 load("@npm_bazel_typescript//:index.bzl", "ts_library")
 
-package(default_visibility = ["//packages/zone.js:__pkg__"])
+package(default_visibility = ["//visibility:public"])
 
 exports_files(glob([
     "**/*",
 ]))
 
 ts_library(
-    name = "lib",
+    name = "zone_d_ts",
-    srcs = glob(["**/*.ts"]),
+    srcs = [":zone.ts"],
-    visibility = ["//packages/zone.js:__subpackages__"],
     deps = [
+        "@npm//@types/node",
+    ],
+)
+
+ts_library(
+    name = "lib",
+    srcs = glob(
+        ["**/*.ts"],
+        exclude = ["zone.ts"],
+    ),
+    module_name = "zone.js/lib",
+    deps = [
+        ":zone_d_ts",
         "@npm//@types/jasmine",
         "@npm//@types/node",
         "@npm//rxjs",

packages/zone.js/lib/common/promise.ts

@@ -222,7 +222,7 @@ Zone.__load_patch('ZoneAwarePromise', (global: any, Zone: ZoneType, api: _ZonePr
   }
 
   function scheduleResolveOrReject<R, U1, U2>(
-      promise: ZoneAwarePromise<any>, zone: AmbientZone, chainPromise: ZoneAwarePromise<any>,
+      promise: ZoneAwarePromise<any>, zone: Zone, chainPromise: ZoneAwarePromise<any>,
       onFulfilled?: ((value: R) => U1) | null | undefined,
       onRejected?: ((error: any) => U2) | null | undefined): void {
     clearRejectedNoCatch(promise);

tools/cjs-jasmine/index-tools.ts

@@ -9,15 +9,15 @@
 'use strict';
 
 const glob = require('glob');
-require('zone.js/dist/zone-node.js');
+import 'zone.js/lib/node/rollup-main';
 const JasmineRunner = require('jasmine');
 const path = require('path');
-require('zone.js/dist/long-stack-trace-zone.js');
+import 'zone.js/lib/zone-spec/long-stack-trace';
-require('zone.js/dist/task-tracking.js');
+import 'zone.js/lib/zone-spec/task-tracing';
-require('zone.js/dist/proxy.js');
+import 'zone.js/lib/zone-spec/proxy';
-require('zone.js/dist/sync-test.js');
+import 'zone.js/lib/zone-spec/sync-test';
-require('zone.js/dist/async-test.js');
+import 'zone.js/lib/zone-spec/async-test';
-require('zone.js/dist/fake-async-test.js');
+import 'zone.js/lib/zone-spec/fake-async-test';
 const {generateSeed} = require('../../../tools/jasmine-seed-generator');
 
 // Let TypeScript know this is a module
@@ -25,7 +25,7 @@ export {};
 
 const jrunner = new JasmineRunner({projectBaseDir: path.resolve(__dirname, '../../')});
 (global as any)['jasmine'] = jrunner.jasmine;
-require('zone.js/dist/jasmine-patch.js');
+import 'zone.js/lib/jasmine/jasmine';
 
 // Turn on full stack traces in errors to help debugging
 (<any>Error)['stackTraceLimit'] = Infinity;

tools/cjs-jasmine/index.ts

@@ -9,16 +9,16 @@
 'use strict';
 
 const glob = require('glob');
-require('zone.js/dist/zone-node.js');
+require('zone.js/lib/node/rollup-main.js');
 const JasmineRunner = require('jasmine');
 const path = require('path');
 require('source-map-support').install();
-require('zone.js/dist/long-stack-trace-zone.js');
+require('zone.js/lib/zone-spec/long-stack-trace.js');
-require('zone.js/dist/task-tracking.js');
+require('zone.js/lib/zone-spec/task-tracking.js');
-require('zone.js/dist/proxy.js');
+require('zone.js/lib/zone-spec/proxy.js');
-require('zone.js/dist/sync-test.js');
+require('zone.js/lib/zone-spec/sync-test.js');
-require('zone.js/dist/async-test.js');
+require('zone.js/lib/zone-spec/async-test.js');
-require('zone.js/dist/fake-async-test.js');
+require('zone.js/lib/zone-spec/fake-async-test.js');
 require('reflect-metadata/Reflect');
 const {generateSeed} = require('../../../tools/jasmine-seed-generator');
 
@@ -27,7 +27,7 @@ export {};
 
 const jrunner = new JasmineRunner({projectBaseDir: path.resolve(__dirname, '../../')});
 (global as any)['jasmine'] = jrunner.jasmine;
-require('zone.js/dist/jasmine-patch.js');
+require('zone.js/lib/jasmine/jasmine.js');
 
 (global as any).isBrowser = false;
 (global as any).isNode = true;

tools/defaults.bzl

@@ -221,6 +221,7 @@ def karma_web_test(bootstrap = [], deps = [], data = [], runtime_deps = [], **kw
         "@npm//karma-browserstack-launcher",
         "@npm//:node_modules/tslib/tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
+        "//packages/zone.js:npm_package",
     ] + deps
     local_runtime_deps = [
         "//tools/testing:browser",

tools/testing/BUILD.bazel

@@ -23,6 +23,7 @@ ts_library(
         "//packages/core/testing",
         "//packages/platform-server",
         "//packages/platform-server/testing",
+        "//packages/zone.js/lib",
         "@npm//domino",
     ],
 )

tools/testing/init_node_spec.ts

@@ -6,19 +6,19 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import 'zone.js/dist/zone-node.js';
+import 'zone.js/lib/node/rollup-main';
-import 'zone.js/dist/long-stack-trace-zone.js';
+import 'zone.js/lib/zone-spec/long-stack-trace';
-import 'zone.js/dist/proxy.js';
+import 'zone.js/lib/zone-spec/task-tracking';
-import 'zone.js/dist/sync-test.js';
+import 'zone.js/lib/zone-spec/proxy';
-import 'zone.js/dist/async-test.js';
+import 'zone.js/lib/zone-spec/sync-test';
-import 'zone.js/dist/fake-async-test.js';
+import 'zone.js/lib/zone-spec/async-test';
-import 'zone.js/dist/task-tracking.js';
+import 'zone.js/lib/zone-spec/fake-async-test';
 import 'reflect-metadata/Reflect';
 
 // Initialize jasmine with @bazel/jasmine boot() function. This will initialize
 // global.jasmine so that it can be patched by zone.js jasmine-patch.js.
 require('@bazel/jasmine').boot();
-import 'zone.js/dist/jasmine-patch.js';
+import 'zone.js/lib/jasmine/jasmine';
 
 (global as any).isNode = true;
 (global as any).isBrowser = false;

yarn.lock

@@ -12704,8 +12704,3 @@ zip-stream@^1.0.0, zip-stream@^1.1.0, zip-stream@^1.2.0:
     compress-commons "^1.2.0"
     lodash "^4.8.0"
     readable-stream "^2.0.0"
-
-zone.js@^0.10.2:
-  version "0.10.2"
-  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.10.2.tgz#67ca084b3116fc33fc40435e0d5ea40a207e392e"
-  integrity sha512-UAYfiuvxLN4oyuqhJwd21Uxb4CNawrq6fPS/05Su5L4G+1TN+HVDJMUHNMobVQDFJRir2cLAODXwluaOKB7HFg==