diff --git a/.circleci/config.yml b/.circleci/config.yml index 0972b9e280..e4bfcde10f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -509,6 +509,7 @@ jobs: root: *workspace_location paths: - ng/dist/packages-dist + - ng/dist/zone.js-dist # Save dependencies and bazel repository cache to use on subsequent runs. - save_cache: diff --git a/integration/cli-hello-world-ivy-compat/package.json b/integration/cli-hello-world-ivy-compat/package.json index 732599460c..592dc2b6f6 100644 --- 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:../../dist/bin/packages/zone.js/npm_package" + "zone.js": "file:../../dist/zone.js-dist/zone.js" }, "devDependencies": { "@angular-devkit/build-angular": "^0.900.0-rc.0", diff --git a/integration/cli-hello-world-ivy-compat/yarn.lock b/integration/cli-hello-world-ivy-compat/yarn.lock index 08532374e8..cd64d4534b 100644 --- a/integration/cli-hello-world-ivy-compat/yarn.lock +++ b/integration/cli-hello-world-ivy-compat/yarn.lock @@ -8435,5 +8435,5 @@ yn@^2.0.0: resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a" integrity sha1-5a2ryKz0CPY4X8dklWhMiOavaJo= -"zone.js@file:../../node_modules/zone.js": +"zone.js@file:../../dist/zone.js-dist/zone.js": version "0.10.2" diff --git a/integration/cli-hello-world-ivy-i18n/package.json b/integration/cli-hello-world-ivy-i18n/package.json index dd806dadd1..53df079e5c 100644 --- 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:../../dist/bin/packages/zone.js/npm_package" + "zone.js": "file:../../dist/zone.js-dist/zone.js" }, "devDependencies": { "@angular-devkit/build-angular": "^0.900.0-rc.0", diff --git a/integration/cli-hello-world-ivy-i18n/yarn.lock b/integration/cli-hello-world-ivy-i18n/yarn.lock index 02773a19b7..bc6f952b28 100644 --- a/integration/cli-hello-world-ivy-i18n/yarn.lock +++ b/integration/cli-hello-world-ivy-i18n/yarn.lock @@ -8427,5 +8427,5 @@ yn@^3.0.0: resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q== -"zone.js@file:../../node_modules/zone.js": +"zone.js@file:../../dist/zone.js-dist/zone.js": version "0.10.2" diff --git a/integration/cli-hello-world-ivy-minimal/package.json b/integration/cli-hello-world-ivy-minimal/package.json index 3e7991f1fb..9178096659 100644 --- 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:../../dist/bin/packages/zone.js/npm_package" + "zone.js": "file:../../dist/zone.js-dist/zone.js" }, "devDependencies": { "@angular-devkit/build-angular": "^0.900.0-rc.0", diff --git a/integration/cli-hello-world-ivy-minimal/yarn.lock b/integration/cli-hello-world-ivy-minimal/yarn.lock index 08532374e8..cd64d4534b 100644 --- a/integration/cli-hello-world-ivy-minimal/yarn.lock +++ b/integration/cli-hello-world-ivy-minimal/yarn.lock @@ -8435,5 +8435,5 @@ yn@^2.0.0: resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a" integrity sha1-5a2ryKz0CPY4X8dklWhMiOavaJo= -"zone.js@file:../../node_modules/zone.js": +"zone.js@file:../../dist/zone.js-dist/zone.js": version "0.10.2" diff --git a/integration/cli-hello-world-lazy-rollup/package.json b/integration/cli-hello-world-lazy-rollup/package.json index 538c14d775..07ad09e778 100644 --- 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:../../dist/bin/packages/zone.js/npm_package" + "zone.js": "file:../../dist/zone.js-dist/zone.js" }, "devDependencies": { "@angular-devkit/build-angular": "^0.900.0-rc.0", diff --git a/integration/cli-hello-world-lazy-rollup/yarn.lock b/integration/cli-hello-world-lazy-rollup/yarn.lock index e25f324768..654ce2c657 100644 --- a/integration/cli-hello-world-lazy-rollup/yarn.lock +++ b/integration/cli-hello-world-lazy-rollup/yarn.lock @@ -7910,5 +7910,5 @@ yn@^3.0.0: resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q== -"zone.js@file:../../node_modules/zone.js": +"zone.js@file:../../dist/zone.js-dist/zone.js": version "0.10.2" diff --git a/integration/cli-hello-world-lazy/package.json b/integration/cli-hello-world-lazy/package.json index 1cea88ce27..48fcac4b5f 100644 --- 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:../../dist/bin/packages/zone.js/npm_package" + "zone.js": "file:../../dist/zone.js-dist/zone.js" }, "devDependencies": { "@angular-devkit/build-angular": "^0.900.0-rc.0", diff --git a/integration/cli-hello-world-lazy/yarn.lock b/integration/cli-hello-world-lazy/yarn.lock index e25f324768..654ce2c657 100644 --- a/integration/cli-hello-world-lazy/yarn.lock +++ b/integration/cli-hello-world-lazy/yarn.lock @@ -7910,5 +7910,5 @@ yn@^3.0.0: resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q== -"zone.js@file:../../node_modules/zone.js": +"zone.js@file:../../dist/zone.js-dist/zone.js": version "0.10.2" diff --git a/integration/cli-hello-world/package.json b/integration/cli-hello-world/package.json index beebc163a4..85edad140c 100644 --- 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:../../dist/bin/packages/zone.js/npm_package" + "zone.js": "file:../../dist/zone.js-dist/zone.js" }, "devDependencies": { "@angular-devkit/build-angular": "^0.900.0-rc.0", diff --git a/integration/cli-hello-world/yarn.lock b/integration/cli-hello-world/yarn.lock index ca9a632c25..49647fab38 100644 --- a/integration/cli-hello-world/yarn.lock +++ b/integration/cli-hello-world/yarn.lock @@ -10348,5 +10348,5 @@ yn@^2.0.0: resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a" integrity sha1-5a2ryKz0CPY4X8dklWhMiOavaJo= -"zone.js@file:../../node_modules/zone.js": +"zone.js@file:../../dist/zone.js-dist/zone.js": version "0.10.2" diff --git a/integration/dynamic-compiler/package.json b/integration/dynamic-compiler/package.json index c901814840..e827563788 100644 --- 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:../../dist/bin/packages/zone.js/npm_package" + "zone.js": "file:../../dist/zone.js-dist/zone.js" } } diff --git a/integration/dynamic-compiler/yarn.lock b/integration/dynamic-compiler/yarn.lock index bf68b6544f..4294feceae 100644 --- a/integration/dynamic-compiler/yarn.lock +++ b/integration/dynamic-compiler/yarn.lock @@ -3648,5 +3648,5 @@ yeast@0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419" -"zone.js@file:../../node_modules/zone.js": +"zone.js@file:../../dist/zone.js-dist/zone.js": version "0.10.2" diff --git a/integration/hello_world__closure/package.json b/integration/hello_world__closure/package.json index 2b84f4edb4..6d6fea7d8a 100644 --- 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:../../dist/bin/packages/zone.js/npm_package" + "zone.js": "file:../../dist/zone.js-dist/zone.js" }, "devDependencies": { "@types/jasmine": "2.5.41", diff --git a/integration/hello_world__closure/yarn.lock b/integration/hello_world__closure/yarn.lock index b87953167b..0882dc3f02 100644 --- a/integration/hello_world__closure/yarn.lock +++ b/integration/hello_world__closure/yarn.lock @@ -4183,5 +4183,5 @@ yeast@0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419" -"zone.js@file:../../node_modules/zone.js": +"zone.js@file:../../dist/zone.js-dist/zone.js": version "0.10.2" diff --git a/integration/hello_world__systemjs_umd/package.json b/integration/hello_world__systemjs_umd/package.json index 5b571e5c10..fc3eef7065 100644 --- 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:../../dist/bin/packages/zone.js/npm_package" + "zone.js": "file:../../dist/zone.js-dist/zone.js" }, "devDependencies": { "@types/jasmine": "2.5.41", diff --git a/integration/hello_world__systemjs_umd/yarn.lock b/integration/hello_world__systemjs_umd/yarn.lock index b44aa81edc..52e241a803 100644 --- a/integration/hello_world__systemjs_umd/yarn.lock +++ b/integration/hello_world__systemjs_umd/yarn.lock @@ -2404,5 +2404,5 @@ yeast@0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419" -"zone.js@file:../../node_modules/zone.js": +"zone.js@file:../../dist/zone.js-dist/zone.js": version "0.10.2" diff --git a/integration/i18n/package.json b/integration/i18n/package.json index 126eda3b7c..a518fef505 100644 --- 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:../../dist/bin/packages/zone.js/npm_package" + "zone.js": "file:../../dist/zone.js-dist/zone.js" }, "devDependencies": { "@types/jasmine": "2.5.41", diff --git a/integration/i18n/yarn.lock b/integration/i18n/yarn.lock index f15fab4a3d..84d3b2605d 100644 --- a/integration/i18n/yarn.lock +++ b/integration/i18n/yarn.lock @@ -3595,5 +3595,5 @@ yeast@0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419" -"zone.js@file:../../node_modules/zone.js": +"zone.js@file:../../dist/zone.js-dist/zone.js": version "0.10.2" diff --git a/integration/injectable-def/package.json b/integration/injectable-def/package.json index 7697c005ec..c3f1aab1b7 100644 --- 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:../../dist/bin/packages/zone.js/npm_package" + "zone.js": "file:../../dist/zone.js-dist/zone.js" }, "devDependencies": { "@types/jasmine": "2.5.41", diff --git a/integration/injectable-def/yarn.lock b/integration/injectable-def/yarn.lock index da4a543625..725b7cbab7 100644 --- a/integration/injectable-def/yarn.lock +++ b/integration/injectable-def/yarn.lock @@ -3506,5 +3506,5 @@ yeast@0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419" -"zone.js@file:../../node_modules/zone.js": +"zone.js@file:../../dist/zone.js-dist/zone.js": version "0.10.2" diff --git a/integration/ivy-i18n/package.json b/integration/ivy-i18n/package.json index 6ec78ea07b..e3da7d6d9f 100644 --- a/integration/ivy-i18n/package.json +++ b/integration/ivy-i18n/package.json @@ -45,7 +45,7 @@ "rxjs": "file:../../node_modules/rxjs", "serve": "^11.2.0", "tslib": "file:../../node_modules/tslib", - "zone.js": "file:../../dist/bin/packages/zone.js/npm_package" + "zone.js": "file:../../dist/zone.js-dist/zone.js" }, "devDependencies": { "@angular-devkit/build-angular": "^0.900.0-rc.0", diff --git a/integration/ivy-i18n/yarn.lock b/integration/ivy-i18n/yarn.lock index 02773a19b7..bc6f952b28 100644 --- a/integration/ivy-i18n/yarn.lock +++ b/integration/ivy-i18n/yarn.lock @@ -8427,5 +8427,5 @@ yn@^3.0.0: resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q== -"zone.js@file:../../node_modules/zone.js": +"zone.js@file:../../dist/zone.js-dist/zone.js": version "0.10.2" diff --git a/integration/ng_elements/package.json b/integration/ng_elements/package.json index c9b28c5feb..1ab0ade5f4 100644 --- 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:../../dist/bin/packages/zone.js/npm_package" + "zone.js": "file:../../dist/zone.js-dist/zone.js" }, "devDependencies": { "@types/jasmine": "2.5.41", diff --git a/integration/ng_elements/yarn.lock b/integration/ng_elements/yarn.lock index bf6694bb3d..77a2a3ceed 100644 --- a/integration/ng_elements/yarn.lock +++ b/integration/ng_elements/yarn.lock @@ -3595,5 +3595,5 @@ yeast@0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419" -"zone.js@file:../../node_modules/zone.js": +"zone.js@file:../../dist/zone.js-dist/zone.js": version "0.10.2" diff --git a/integration/ng_update/package.json b/integration/ng_update/package.json index d0d8a7e9e3..a1f977c81b 100644 --- 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:../../dist/bin/packages/zone.js/npm_package" + "zone.js": "file:../../dist/zone.js-dist/zone.js" } } diff --git a/integration/ng_update/yarn.lock b/integration/ng_update/yarn.lock index 91bdb874a0..728c55c808 100644 --- a/integration/ng_update/yarn.lock +++ b/integration/ng_update/yarn.lock @@ -1578,5 +1578,5 @@ yargs@13.1.0: y18n "^4.0.0" yargs-parser "^13.0.0" -"zone.js@file:../../node_modules/zone.js": +"zone.js@file:../../dist/zone.js-dist/zone.js": version "0.10.2" diff --git a/integration/ng_update_migrations/package.json b/integration/ng_update_migrations/package.json index a2e82d8452..6cb72b15ab 100644 --- 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:../../dist/bin/packages/zone.js/npm_package" + "zone.js": "file:../../dist/zone.js-dist/zone.js" }, "devDependencies": { "@angular-devkit/build-angular": "^0.900.0-rc.0", diff --git a/integration/ng_update_migrations/yarn.lock b/integration/ng_update_migrations/yarn.lock index 38e9b6cece..016c828541 100644 --- a/integration/ng_update_migrations/yarn.lock +++ b/integration/ng_update_migrations/yarn.lock @@ -7700,5 +7700,5 @@ yeast@0.1.2: resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419" integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk= -"zone.js@file:../../node_modules/zone.js": +"zone.js@file:../../dist/zone.js-dist/zone.js": version "0.10.2" diff --git a/integration/ngcc/package.json b/integration/ngcc/package.json index 8cbc63043a..c8e3d87839 100644 --- 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:../../dist/bin/packages/zone.js/npm_package" + "zone.js": "file:../../dist/zone.js-dist/zone.js" }, "devDependencies": { "@types/jasmine": "2.5.41", diff --git a/integration/ngcc/yarn.lock b/integration/ngcc/yarn.lock index bd38881f41..2bf7e8407c 100644 --- a/integration/ngcc/yarn.lock +++ b/integration/ngcc/yarn.lock @@ -3594,5 +3594,5 @@ yeast@0.1.2: resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419" integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk= -"zone.js@file:../../node_modules/zone.js": +"zone.js@file:../../dist/zone.js-dist/zone.js": version "0.10.2" diff --git a/integration/platform-server/package.json b/integration/platform-server/package.json index 09bbe6a576..eccc52cdf2 100644 --- 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:../../dist/bin/packages/zone.js/npm_package" + "zone.js": "file:../../dist/zone.js-dist/zone.js" }, "devDependencies": { "@types/jasmine": "2.5.41", diff --git a/integration/platform-server/yarn.lock b/integration/platform-server/yarn.lock index 7f18a46b10..e30e86e6a3 100644 --- a/integration/platform-server/yarn.lock +++ b/integration/platform-server/yarn.lock @@ -4384,5 +4384,5 @@ yargs@~3.10.0: decamelize "^1.0.0" window-size "0.1.0" -"zone.js@file:../../node_modules/zone.js": +"zone.js@file:../../dist/zone.js-dist/zone.js": version "0.10.2" diff --git a/integration/run_tests.sh b/integration/run_tests.sh index 099b1648e1..ab40bd683d 100755 --- a/integration/run_tests.sh +++ b/integration/run_tests.sh @@ -36,9 +36,6 @@ 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 index cf712fd286..26a08141ff 100644 --- 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:../../dist/bin/packages/zone.js/npm_package" + "zone.js": "file:../../dist/zone.js-dist/zone.js" } } diff --git a/integration/terser/package.json b/integration/terser/package.json index ee47786d02..06c0bc595f 100644 --- 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:../../dist/bin/packages/zone.js/npm_package" + "zone.js": "file:../../dist/zone.js-dist/zone.js" } } diff --git a/integration/typings_test_ts36/package.json b/integration/typings_test_ts36/package.json index b3afe8766f..58d97e198e 100644 --- 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:../../dist/bin/packages/zone.js/npm_package" + "zone.js": "file:../../dist/zone.js-dist/zone.js" }, "scripts": { "test": "tsc" diff --git a/scripts/build-packages-dist.sh b/scripts/build-packages-dist.sh index 09104812c5..ca94d7ed5b 100755 --- a/scripts/build-packages-dist.sh +++ b/scripts/build-packages-dist.sh @@ -4,3 +4,23 @@ source $(dirname $0)/package-builder.sh # Build the legacy (view engine) npm packages into dist/packages-dist buildTargetPackages "dist/packages-dist" "legacy" "Production" + +# Build the `zone.js` npm package (into `dist/bin/packages/zone.js/npm_package/`), because it might be needed +# by other scripts/tests. +# +# NOTE: The `zone.js` package is not built as part of `buildTargetPackages()` above, nor is it +# copied into the `dist/packages-dist/` directory (despite its source's being in `packages/`), +# because it is not published to npm under the `@angular` scope (as happens for the rest of +# the packages). +echo "# Building zone.js npm package..." +yarn --silent bazel build //packages/zone.js:npm_package + +# Copy artifacts to `dist/zone.js-dist/`, so they can be easier persisted on CI. +readonly buildOutputDir="$base_dir/dist/bin/packages/zone.js/npm_package" +readonly distTargetDir="$base_dir/dist/zone.js-dist/zone.js" + +echo "# Copying artifacts to '$distTargetDir'..." +mkdir -p $distTargetDir +rm -rf $distTargetDir +cp -R $buildOutputDir $distTargetDir +chmod -R u+w $distTargetDir