Skip to content

Commit 8c6fb17

Browse files
JiaLiPassionatscott
authored andcommitted
build: reference zone.js from source directly instead of npm. (angular#33046)
Close angular#32482 PR Close angular#33046
1 parent 3de72e4 commit 8c6fb17

File tree

100 files changed

+180
-158
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+180
-158
lines changed

.circleci/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -667,6 +667,7 @@ jobs:
667667
background: true
668668
- run: yarn tsc -p packages
669669
- run: yarn tsc -p modules
670+
- run: yarn bazel build //packages/zone.js:npm_package
670671
# Waits for the Saucelabs tunnel to be ready. This ensures that we don't run tests
671672
# too early without Saucelabs not being ready.
672673
- run: ./scripts/saucelabs/wait-for-tunnel.sh

BUILD.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ filegroup(
1919
# do not sort
2020
srcs = [
2121
"@npm//:node_modules/core-js/client/core.js",
22-
"@npm//:node_modules/zone.js/dist/zone.js",
23-
"@npm//:node_modules/zone.js/dist/zone-testing.js",
24-
"@npm//:node_modules/zone.js/dist/task-tracking.js",
22+
"//packages/zone.js/dist:zone.js",
23+
"//packages/zone.js/dist:zone-testing.js",
24+
"//packages/zone.js/dist:task-tracking.js",
2525
"//:test-events.js",
2626
"//:shims_for_IE.js",
2727
# Including systemjs because it defines `__eval`, which produces correct stack traces.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"@angular/router": "file:../../dist/packages-dist/router",
2626
"rxjs": "file:../../node_modules/rxjs",
2727
"tslib": "file:../../node_modules/tslib",
28-
"zone.js": "file:../../node_modules/zone.js"
28+
"zone.js": "file:../../dist/bin/packages/zone.js/npm_package"
2929
},
3030
"devDependencies": {
3131
"@angular-devkit/build-angular": "^0.900.0-rc.0",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"rxjs": "file:../../node_modules/rxjs",
3232
"serve": "^11.2.0",
3333
"tslib": "file:../../node_modules/tslib",
34-
"zone.js": "file:../../node_modules/zone.js"
34+
"zone.js": "file:../../dist/bin/packages/zone.js/npm_package"
3535
},
3636
"devDependencies": {
3737
"@angular-devkit/build-angular": "^0.900.0-rc.0",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"@angular/router": "file:../../dist/packages-dist/router",
2626
"rxjs": "file:../../node_modules/rxjs",
2727
"tslib": "file:../../node_modules/tslib",
28-
"zone.js": "file:../../node_modules/zone.js"
28+
"zone.js": "file:../../dist/bin/packages/zone.js/npm_package"
2929
},
3030
"devDependencies": {
3131
"@angular-devkit/build-angular": "^0.900.0-rc.0",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"@angular/router": "file:../../dist/packages-dist/router",
2121
"rxjs": "file:../../node_modules/rxjs",
2222
"tslib": "^1.10.0",
23-
"zone.js": "file:../../node_modules/zone.js"
23+
"zone.js": "file:../../dist/bin/packages/zone.js/npm_package"
2424
},
2525
"devDependencies": {
2626
"@angular-devkit/build-angular": "^0.900.0-rc.0",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"@angular/router": "file:../../dist/packages-dist/router",
2121
"rxjs": "file:../../node_modules/rxjs",
2222
"tslib": "^1.10.0",
23-
"zone.js": "file:../../node_modules/zone.js"
23+
"zone.js": "file:../../dist/bin/packages/zone.js/npm_package"
2424
},
2525
"devDependencies": {
2626
"@angular-devkit/build-angular": "^0.900.0-rc.0",

integration/cli-hello-world/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"@angular/router": "file:../../dist/packages-dist/router",
2424
"rxjs": "file:../../node_modules/rxjs",
2525
"tslib": "file:../../node_modules/tslib",
26-
"zone.js": "file:../../node_modules/zone.js"
26+
"zone.js": "file:../../dist/bin/packages/zone.js/npm_package"
2727
},
2828
"devDependencies": {
2929
"@angular-devkit/build-angular": "^0.900.0-rc.0",

integration/dynamic-compiler/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@
4141
"core-js": "file:../../node_modules/core-js",
4242
"rxjs": "file:../../node_modules/rxjs",
4343
"systemjs": "file:../../node_modules/systemjs",
44-
"zone.js": "file:../../node_modules/zone.js"
44+
"zone.js": "file:../../dist/bin/packages/zone.js/npm_package"
4545
}
4646
}

integration/hello_world__closure/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"google-closure-compiler": "20180716.0.0",
1414
"rxjs": "file:../../node_modules/rxjs",
1515
"typescript": "file:../../node_modules/typescript",
16-
"zone.js": "file:../../node_modules/zone.js"
16+
"zone.js": "file:../../dist/bin/packages/zone.js/npm_package"
1717
},
1818
"devDependencies": {
1919
"@types/jasmine": "2.5.41",

0 commit comments

Comments
 (0)