Skip to content

Commit a33d630

Browse files
JiaLiPassionmhevery
JiaLiPassion
authored and
mhevery
committed
fix(zone.js): should have better backward compatibilities (#38797)
Close #38561, #38669 zone.js 0.11.1 introduces a breaking change to adpat Angular package format, and it breaks the module loading order, before 0.11, in IE11, the `zone.js` es5 format bundle will be imported, but after 0.11, the `fesm2015` format bundle will be imported, which causes error. And since the only purpose of the `dist` folder of zone.js bundles is to keep backward compatibility, in the original commit, I use package redirect to implement that, but it is not fully backward compatible, we should keep the same dist structure as `0.10.3`. PR Close #38797
1 parent c4b8964 commit a33d630

File tree

76 files changed

+260
-691
lines changed

Some content is hidden

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

76 files changed

+260
-691
lines changed

β€Žpackages/zone.js/dist/BUILD.bazelβ€Ž

Lines changed: 110 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,117 @@
11
package(default_visibility = ["//visibility:public"])
22

3+
load("//packages/zone.js/dist:tools.bzl", "copy_es2015_to_dist", "copy_es5_to_dist")
4+
5+
copy_es2015_to_dist()
6+
7+
copy_es5_to_dist()
8+
9+
genrule(
10+
name = "zone_externs",
11+
srcs = ["//packages/zone.js:zone_externs"],
12+
outs = ["zone_externs.js"],
13+
cmd = "cp $< $@",
14+
)
15+
16+
genrule(
17+
name = "zone_extensions_d_ts",
18+
srcs = ["//packages/zone.js/lib:zone.api.extensions.ts"],
19+
outs = ["zone.api.extensions.ts"],
20+
cmd = "cp $< $@",
21+
)
22+
23+
genrule(
24+
name = "zone_configurations_d_ts",
25+
srcs = ["//packages/zone.js/lib:zone.configurations.api.ts"],
26+
outs = ["zone.configurations.api.ts"],
27+
cmd = "cp $< $@",
28+
)
29+
30+
genrule(
31+
name = "zone_js_d_ts",
32+
srcs = ["//packages/zone.js/lib:zone_d_ts"],
33+
outs = ["zone.js.d.ts"],
34+
cmd = "cp $< $@",
35+
)
36+
337
filegroup(
438
name = "dist_bundle_group",
539
srcs = [
6-
"//packages/zone.js/dist:async-test.min/package.json",
7-
"//packages/zone.js/dist:async-test/package.json",
8-
"//packages/zone.js/dist:fake-async-test.min/package.json",
9-
"//packages/zone.js/dist:fake-async-test/package.json",
10-
"//packages/zone.js/dist:jasmine-patch.min/package.json",
11-
"//packages/zone.js/dist:jasmine-patch/package.json",
12-
"//packages/zone.js/dist:long-stack-trace-zone.min/package.json",
13-
"//packages/zone.js/dist:long-stack-trace-zone/package.json",
14-
"//packages/zone.js/dist:mocha-patch.min/package.json",
15-
"//packages/zone.js/dist:mocha-patch/package.json",
16-
"//packages/zone.js/dist:proxy.min/package.json",
17-
"//packages/zone.js/dist:proxy/package.json",
18-
"//packages/zone.js/dist:sync-test.min/package.json",
19-
"//packages/zone.js/dist:sync-test/package.json",
20-
"//packages/zone.js/dist:task-tracking.min/package.json",
21-
"//packages/zone.js/dist:task-tracking/package.json",
22-
"//packages/zone.js/dist:webapis-media-query.min/package.json",
23-
"//packages/zone.js/dist:webapis-media-query/package.json",
24-
"//packages/zone.js/dist:webapis-notification.min/package.json",
25-
"//packages/zone.js/dist:webapis-notification/package.json",
26-
"//packages/zone.js/dist:webapis-rtc-peer-connection.min/package.json",
27-
"//packages/zone.js/dist:webapis-rtc-peer-connection/package.json",
28-
"//packages/zone.js/dist:webapis-shadydom.min/package.json",
29-
"//packages/zone.js/dist:webapis-shadydom/package.json",
30-
"//packages/zone.js/dist:wtf.min/package.json",
31-
"//packages/zone.js/dist:wtf/package.json",
32-
"//packages/zone.js/dist:zone.min/package.json",
33-
"//packages/zone.js/dist:zone-bluebird.min/package.json",
34-
"//packages/zone.js/dist:zone-bluebird/package.json",
35-
"//packages/zone.js/dist:zone-error.min/package.json",
36-
"//packages/zone.js/dist:zone-error/package.json",
37-
"//packages/zone.js/dist:zone-evergreen.min/package.json",
38-
"//packages/zone.js/dist:zone-evergreen-testing-bundle.min/package.json",
39-
"//packages/zone.js/dist:zone-evergreen-testing-bundle/package.json",
40-
"//packages/zone.js/dist:zone-evergreen/package.json",
41-
"//packages/zone.js/dist:zone-legacy.min/package.json",
42-
"//packages/zone.js/dist:zone-legacy/package.json",
43-
"//packages/zone.js/dist:zone-mix.min/package.json",
44-
"//packages/zone.js/dist:zone-mix/package.json",
45-
"//packages/zone.js/dist:zone-node.min/package.json",
46-
"//packages/zone.js/dist:zone-node/package.json",
47-
"//packages/zone.js/dist:zone-patch-canvas.min/package.json",
48-
"//packages/zone.js/dist:zone-patch-canvas/package.json",
49-
"//packages/zone.js/dist:zone-patch-cordova.min/package.json",
50-
"//packages/zone.js/dist:zone-patch-cordova/package.json",
51-
"//packages/zone.js/dist:zone-patch-electron.min/package.json",
52-
"//packages/zone.js/dist:zone-patch-electron/package.json",
53-
"//packages/zone.js/dist:zone-patch-fetch.min/package.json",
54-
"//packages/zone.js/dist:zone-patch-fetch/package.json",
55-
"//packages/zone.js/dist:zone-patch-jsonp.min/package.json",
56-
"//packages/zone.js/dist:zone-patch-jsonp/package.json",
57-
"//packages/zone.js/dist:zone-patch-message-port.min/package.json",
58-
"//packages/zone.js/dist:zone-patch-message-port/package.json",
59-
"//packages/zone.js/dist:zone-patch-promise-test.min/package.json",
60-
"//packages/zone.js/dist:zone-patch-promise-test/package.json",
61-
"//packages/zone.js/dist:zone-patch-resize-observer.min/package.json",
62-
"//packages/zone.js/dist:zone-patch-resize-observer/package.json",
63-
"//packages/zone.js/dist:zone-patch-rxjs.min/package.json",
64-
"//packages/zone.js/dist:zone-patch-rxjs-fake-async.min/package.json",
65-
"//packages/zone.js/dist:zone-patch-rxjs-fake-async/package.json",
66-
"//packages/zone.js/dist:zone-patch-rxjs/package.json",
67-
"//packages/zone.js/dist:zone-patch-socket-io.min/package.json",
68-
"//packages/zone.js/dist:zone-patch-socket-io/package.json",
69-
"//packages/zone.js/dist:zone-patch-user-media.min/package.json",
70-
"//packages/zone.js/dist:zone-patch-user-media/package.json",
71-
"//packages/zone.js/dist:zone-testing.min/package.json",
72-
"//packages/zone.js/dist:zone-testing-bundle.min/package.json",
73-
"//packages/zone.js/dist:zone-testing-bundle/package.json",
74-
"//packages/zone.js/dist:zone-testing-node-bundle.min/package.json",
75-
"//packages/zone.js/dist:zone-testing-node-bundle/package.json",
76-
"//packages/zone.js/dist:zone-testing/package.json",
77-
"//packages/zone.js/dist:zone/package.json",
78-
"//packages/zone.js/dist:zone_externs/package.json",
40+
":async-test.js",
41+
":async-test.min.js",
42+
":fake-async-test.js",
43+
":fake-async-test.min.js",
44+
":jasmine-patch.js",
45+
":jasmine-patch.min.js",
46+
":long-stack-trace-zone.js",
47+
":long-stack-trace-zone.min.js",
48+
":mocha-patch.js",
49+
":mocha-patch.min.js",
50+
":proxy.js",
51+
":proxy.min.js",
52+
":sync-test.js",
53+
":sync-test.min.js",
54+
":task-tracking.js",
55+
":task-tracking.min.js",
56+
":webapis-media-query.js",
57+
":webapis-media-query.min.js",
58+
":webapis-notification.js",
59+
":webapis-notification.min.js",
60+
":webapis-rtc-peer-connection.js",
61+
":webapis-rtc-peer-connection.min.js",
62+
":webapis-shadydom.js",
63+
":webapis-shadydom.min.js",
64+
":wtf.js",
65+
":wtf.min.js",
66+
":zone.js",
67+
":zone.min.js",
68+
":zone-bluebird.js",
69+
":zone-bluebird.min.js",
70+
":zone-error.js",
71+
":zone-error.min.js",
72+
":zone-evergreen.js",
73+
":zone-evergreen.min.js",
74+
":zone-evergreen-testing-bundle.js",
75+
":zone-evergreen-testing-bundle.min.js",
76+
":zone-legacy.js",
77+
":zone-legacy.min.js",
78+
":zone-mix.js",
79+
":zone-mix.min.js",
80+
":zone-node.js",
81+
":zone-node.min.js",
82+
":zone-patch-canvas.js",
83+
":zone-patch-canvas.min.js",
84+
":zone-patch-cordova.js",
85+
":zone-patch-cordova.min.js",
86+
":zone-patch-electron.js",
87+
":zone-patch-electron.min.js",
88+
":zone-patch-fetch.js",
89+
":zone-patch-fetch.min.js",
90+
":zone-patch-jsonp.js",
91+
":zone-patch-jsonp.min.js",
92+
":zone-patch-message-port.js",
93+
":zone-patch-message-port.min.js",
94+
":zone-patch-promise-test.js",
95+
":zone-patch-promise-test.min.js",
96+
":zone-patch-resize-observer.js",
97+
":zone-patch-resize-observer.min.js",
98+
":zone-patch-rxjs.js",
99+
":zone-patch-rxjs.min.js",
100+
":zone-patch-rxjs-fake-async.js",
101+
":zone-patch-rxjs-fake-async.min.js",
102+
":zone-patch-socket-io.js",
103+
":zone-patch-socket-io.min.js",
104+
":zone-patch-user-media.js",
105+
":zone-patch-user-media.min.js",
106+
":zone-testing.js",
107+
":zone-testing.min.js",
108+
":zone-testing-bundle.js",
109+
":zone-testing-bundle.min.js",
110+
":zone-testing-node-bundle.js",
111+
":zone-testing-node-bundle.min.js",
112+
":zone_configurations_d_ts",
113+
":zone_extensions_d_ts",
114+
":zone_externs",
115+
":zone_js_d_ts",
79116
],
80117
)

β€Žpackages/zone.js/dist/async-test.min/package.jsonβ€Ž

Lines changed: 0 additions & 7 deletions
This file was deleted.

β€Žpackages/zone.js/dist/async-test/package.jsonβ€Ž

Lines changed: 0 additions & 7 deletions
This file was deleted.

β€Žpackages/zone.js/dist/fake-async-test.min/package.jsonβ€Ž

Lines changed: 0 additions & 7 deletions
This file was deleted.

β€Žpackages/zone.js/dist/fake-async-test/package.jsonβ€Ž

Lines changed: 0 additions & 7 deletions
This file was deleted.

β€Žpackages/zone.js/dist/jasmine-patch.min/package.jsonβ€Ž

Lines changed: 0 additions & 7 deletions
This file was deleted.

β€Žpackages/zone.js/dist/jasmine-patch/package.jsonβ€Ž

Lines changed: 0 additions & 7 deletions
This file was deleted.

β€Žpackages/zone.js/dist/long-stack-trace-zone.min/package.jsonβ€Ž

Lines changed: 0 additions & 7 deletions
This file was deleted.

β€Žpackages/zone.js/dist/long-stack-trace-zone/package.jsonβ€Ž

Lines changed: 0 additions & 7 deletions
This file was deleted.

β€Žpackages/zone.js/dist/mocha-patch.min/package.jsonβ€Ž

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
Β (0)