Skip to content

Commit 583a9d3

Browse files
JiaLiPassionmhevery
JiaLiPassion
authored and
mhevery
committed
feat(zone.js): upgrade zone.js to angular package format(APF) (#36540)
Close #35157 In the current version of zone.js, zone.js uses it's own package format, and it is not following the rule of Angualr package format(APF), so it is not easily to be consumed by Angular CLI or other bundle tools. For example, zone.js npm package has two bundles, 1. zone.js/dist/zone.js, this is a `es5` bundle. 2. zone.js/dist/zone-evergreen.js, this is a `es2015` bundle. And Angular CLI has to add some hard-coding code to handle this case, ohttps://github.com/angular/angular-cli/blob/5376a8b1392ac7bd252782d8474161ce03a4d1cb/packages/schematics/angular/application/files/src/polyfills.ts.template#L55-L58 This PR upgrade zone.js npm package format to follow APF rule, https://docs.google.com/document/d/1CZC2rcpxffTDfRDs6p1cfbmKNLA6x5O-NtkJglDaBVs/edit#heading=h.k0mh3o8u5hx The updated points are: 1. in package.json, update all bundle related properties ``` "main": "./bundles/zone.umd.js", "module": "./fesm2015/zone.js", "es2015": "./fesm2015/zone.js", "fesm2015": "./fesm2015/zone.js", ``` 2. re-organize dist folder, for example for `zone.js` bundle, now we have ``` dist/ bundles/ zone.js // this is the es5 bundle fesm2015/ zone.js // this is the es2015 bundle (in the old version is `zone-evergreen.js`) ``` 3. have several sub-packages. 1. `zone-testing`, provide zone-testing bundles include zone.js and testing libraries 2. `zone-node`, provide zone.js implemention for NodeJS 3. `zone-mix`, provide zone.js patches for both Browser and NodeJS All those sub-packages will have their own `package.json` and the bundle will reference `bundles(es5)` and `fesm2015(es2015)`. 4. keep backward compatibility, still keep the `zone.js/dist` folder, and all bundles will be redirected to `zone.js/bundles` or `zone.js/fesm2015` folders. PR Close #36540
1 parent 1fce6d6 commit 583a9d3

182 files changed

Lines changed: 1708 additions & 902 deletions

File tree

Some content is hidden

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

‎.circleci/config.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -731,8 +731,8 @@ jobs:
731731
- run: yarn --cwd packages/zone.js promisetest
732732
- run: yarn --cwd packages/zone.js promisefinallytest
733733
- run: yarn bazel build //packages/zone.js:npm_package &&
734-
cp dist/bin/packages/zone.js/npm_package/dist/zone-mix.js ./packages/zone.js/test/extra/ &&
735-
cp dist/bin/packages/zone.js/npm_package/dist/zone-patch-electron.js ./packages/zone.js/test/extra/ &&
734+
cp dist/bin/packages/zone.js/npm_package/bundles/zone-mix.umd.js ./packages/zone.js/test/extra/ &&
735+
cp dist/bin/packages/zone.js/npm_package/bundles/zone-patch-electron.umd.js ./packages/zone.js/test/extra/ &&
736736
yarn --cwd packages/zone.js electrontest
737737
- run: yarn --cwd packages/zone.js jesttest
738738

‎BUILD.bazel‎

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

‎aio/content/examples/setup/src/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<!-- Polyfills -->
1212
<script src="node_modules/core-js/client/shim.min.js"></script>
1313

14-
<script src="node_modules/zone.js/dist/zone.js"></script>
14+
<script src="node_modules/zone.js/bundles/zone.umd.js"></script>
1515
<script src="node_modules/systemjs/dist/system.src.js"></script>
1616
<script src="systemjs.config.js"></script>
1717
<script>

‎aio/content/examples/upgrade-module/src/index-a-to-ajs-providers.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<!-- Polyfills -->
1313
<script src="node_modules/core-js/client/shim.min.js"></script>
1414

15-
<script src="node_modules/zone.js/dist/zone.js"></script>
15+
<script src="node_modules/zone.js/bundles/zone.umd.js"></script>
1616
<script src="node_modules/systemjs/dist/system.src.js"></script>
1717

1818
<script src="systemjs.config.1.js"></script>

‎aio/content/examples/upgrade-module/src/index-a-to-ajs-transclusion.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<!-- Polyfills -->
1313
<script src="node_modules/core-js/client/shim.min.js"></script>
1414

15-
<script src="node_modules/zone.js/dist/zone.js"></script>
15+
<script src="node_modules/zone.js/bundles/zone.umd.js"></script>
1616
<script src="node_modules/systemjs/dist/system.src.js"></script>
1717

1818
<script src="systemjs.config.1.js"></script>

‎aio/content/examples/upgrade-module/src/index-ajs-a-hybrid-bootstrap.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<!-- Polyfills -->
1313
<script src="node_modules/core-js/client/shim.min.js"></script>
1414

15-
<script src="node_modules/zone.js/dist/zone.js"></script>
15+
<script src="node_modules/zone.js/bundles/zone.umd.js"></script>
1616
<script src="node_modules/systemjs/dist/system.src.js"></script>
1717

1818
<script src="systemjs.config.1.js"></script>

‎aio/content/examples/upgrade-module/src/index-ajs-to-a-projection.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<!-- Polyfills -->
1313
<script src="node_modules/core-js/client/shim.min.js"></script>
1414

15-
<script src="node_modules/zone.js/dist/zone.js"></script>
15+
<script src="node_modules/zone.js/bundles/zone.umd.js"></script>
1616
<script src="node_modules/systemjs/dist/system.src.js"></script>
1717

1818
<script src="systemjs.config.1.js"></script>

‎aio/content/examples/upgrade-module/src/index-ajs-to-a-providers.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<!-- Polyfills -->
1313
<script src="node_modules/core-js/client/shim.min.js"></script>
1414

15-
<script src="node_modules/zone.js/dist/zone.js"></script>
15+
<script src="node_modules/zone.js/bundles/zone.umd.js"></script>
1616
<script src="node_modules/systemjs/dist/system.src.js"></script>
1717

1818
<script src="systemjs.config.1.js"></script>

‎aio/content/examples/upgrade-module/src/index-downgrade-io.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<!-- Polyfills -->
1313
<script src="node_modules/core-js/client/shim.min.js"></script>
1414

15-
<script src="node_modules/zone.js/dist/zone.js"></script>
15+
<script src="node_modules/zone.js/bundles/zone.umd.js"></script>
1616
<script src="node_modules/systemjs/dist/system.src.js"></script>
1717

1818
<script src="systemjs.config.1.js"></script>

‎aio/content/examples/upgrade-module/src/index-downgrade-static.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<!-- Polyfills -->
1313
<script src="node_modules/core-js/client/shim.min.js"></script>
1414

15-
<script src="node_modules/zone.js/dist/zone.js"></script>
15+
<script src="node_modules/zone.js/bundles/zone.umd.js"></script>
1616
<script src="node_modules/systemjs/dist/system.src.js"></script>
1717

1818
<script src="systemjs.config.1.js"></script>

0 commit comments

Comments
 (0)