build: reference zone.js from source directly instead of npm. (angula…

…r#33046) Close angular#32482 PR Close angular#33046
gregmagolan · Nov 6, 2019 · 8c6fb17 · 8c6fb17
1 parent 3de72e4
commit 8c6fb17
Show file tree

Hide file tree

Showing 100 changed files with 180 additions and 158 deletions.
diff --git a/.circleci/config.yml b/.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

diff --git a/BUILD.bazel b/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",
-        "@npm//:node_modules/zone.js/dist/zone-testing.js",
-        "@npm//:node_modules/zone.js/dist/task-tracking.js",
+        "//packages/zone.js/dist:zone.js",
+        "//packages/zone.js/dist:zone-testing.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.

diff --git a/integration/cli-hello-world-ivy-compat/package.json b/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",

diff --git a/integration/cli-hello-world-ivy-i18n/package.json b/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",

diff --git a/integration/cli-hello-world-ivy-minimal/package.json b/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",

diff --git a/integration/cli-hello-world-lazy-rollup/package.json b/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",

diff --git a/integration/cli-hello-world-lazy/package.json b/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",

diff --git a/integration/cli-hello-world/package.json b/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",

diff --git a/integration/dynamic-compiler/package.json b/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"
   }
 }
diff --git a/integration/hello_world__closure/package.json b/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",

diff --git a/integration/hello_world__systemjs_umd/package.json b/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",

diff --git a/integration/i18n/package.json b/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",

diff --git a/integration/injectable-def/package.json b/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",

diff --git a/integration/ivy-i18n/package.json b/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",

diff --git a/integration/ng_elements/package.json b/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",

diff --git a/integration/ng_update/package.json b/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"
   }
 }
diff --git a/integration/ng_update_migrations/package.json b/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",

diff --git a/integration/ngcc/package.json b/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",

diff --git a/integration/platform-server/package.json b/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",

diff --git a/integration/platform-server/src/server.ts b/integration/platform-server/src/server.ts
@@ -41,4 +41,4 @@ app.get('/favicon.ico', (req, res) => { res.send(''); });
 app.get('/helloworld', render(HelloWorldServerModuleNgFactory, helloworld));
 app.get('/transferstate', render(TransferStateServerModuleNgFactory, transferstate));
 
-app.listen(9876, function() { console.log('Server listening on port 9876!'); });
+app.listen(9876, function() { console.log('Server listening on port 9876!'); });
diff --git a/integration/run_tests.sh b/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

diff --git a/integration/service-worker-schema/package.json b/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"
   }
 }
diff --git a/integration/terser/package.json b/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"
   }
 }
diff --git a/integration/typings_test_ts36/package.json b/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"

diff --git a/karma-js.conf.js b/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',
-      'node_modules/zone.js/dist/zone-testing.js',
-      'node_modules/zone.js/dist/task-tracking.js',
+      'dist/bin/packages/zone.js/npm_package/dist/zone.js',
+      'dist/bin/packages/zone.js/npm_package/dist/zone-testing.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',

diff --git a/modules/benchmarks/src/class_bindings/BUILD.bazel b/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",
     ],
 )
 

diff --git a/modules/benchmarks/src/expanding_rows/BUILD.bazel b/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"],
 )

diff --git a/modules/benchmarks/src/largeform/ng2/BUILD.bazel b/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"],

diff --git a/modules/benchmarks/src/largetable/ng2/BUILD.bazel b/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",
     ],
 )
 

diff --git a/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel b/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"],
 )

diff --git a/modules/benchmarks/src/tree/ng2/BUILD.bazel b/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",
     ],
 )
 

diff --git a/modules/benchmarks/src/tree/ng2_static/BUILD.bazel b/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"],
 )

diff --git a/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel b/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"],
 )

diff --git a/modules/benchmarks/src/views/BUILD.bazel b/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"],

diff --git a/modules/benchmarks/src/views/index.html b/modules/benchmarks/src/views/index.html
@@ -35,4 +35,4 @@ <h1>Views traversal benchmark</h1>
   </script>
 </body>
 
-</html>
+</html>
diff --git a/modules/playground/src/animate/BUILD.bazel b/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"],

diff --git a/modules/playground/src/async/BUILD.bazel b/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"],

diff --git a/modules/playground/src/gestures/BUILD.bazel b/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"],

diff --git a/modules/playground/src/hello_world/BUILD.bazel b/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"],