Skip to content

Commit a8efc60

Browse files
alan-agius4pkozlowski-opensource
authored andcommitted
feat(zone.js): remove legacy files and access to deep imports (#51752)
This commit removes access to deep imports and `zone-testing-bundle` and `zone-testing-node-bundle` This commit removed access to deep and legacy `dist` imports. `zone-testing-bundle` and `zone-testing-node-bundle` are also no longer generated. BREAKING CHANGE: Deep and legacy `dist/` imports like `zone.js/bundles/zone-testing.js` and `zone.js/dist/zone` are no longer allowed. `zone-testing-bundle` and `zone-testing-node-bundle` are also no longer part of the package. The proper way to import `zone.js` and `zone.js/testing` is: ```js import 'zone.js'; import 'zone.js/testing'; ``` PR Close #51752
1 parent 3a1c57d commit a8efc60

6 files changed

Lines changed: 11 additions & 46 deletions

File tree

packages/zone.js/bundles.bzl

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,4 @@ BUNDLES_ENTRY_POINTS = {
103103
"zone-testing": {
104104
"entrypoint": _DIR + "testing/zone-testing",
105105
},
106-
"zone-testing-bundle": {
107-
"es5": _DIR + "browser/rollup-test-main",
108-
"es2015": _DIR + "browser/rollup-test-main",
109-
},
110-
"zone-testing-node-bundle": {
111-
"entrypoint": _DIR + "node/rollup-test-main",
112-
},
113106
}

packages/zone.js/lib/browser/rollup-test-main.ts

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

packages/zone.js/package.json

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -71,24 +71,6 @@
7171
"./plugins/*": {
7272
"require": "./bundles/*.umd.js",
7373
"default": "./fesm2015/*.js"
74-
},
75-
"./fesm2015/*.js": {
76-
"default": "./fesm2015/*.js"
77-
},
78-
"./fesm2015/*": {
79-
"default": "./fesm2015/*.js"
80-
},
81-
"./bundles/*.js": {
82-
"default": "./bundles/*.js"
83-
},
84-
"./bundles/*": {
85-
"default": "./bundles/*.js"
86-
},
87-
"./dist/*.min": {
88-
"default": "./bundles/*.umd.min.js"
89-
},
90-
"./dist/*": {
91-
"default": "./bundles/*.umd.js"
9274
}
9375
}
9476
}

packages/zone.js/test/BUILD.bazel

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,10 @@ test_deps = [
256256
test_entry_point = ":browser_entry_point.ts"
257257

258258
karma_tests = {
259-
"browser_test": ["//packages/zone.js/bundles:zone-testing-bundle.umd.js"],
259+
"browser_test": [
260+
"//packages/zone.js/bundles:zone.umd.js",
261+
"//packages/zone.js/bundles:zone-testing.umd.js",
262+
],
260263
"browser_green_test": [
261264
"//packages/zone.js/fesm2015:zone.js",
262265
"//packages/zone.js/fesm2015:zone-testing.js",
@@ -283,7 +286,8 @@ karma_test(
283286
karma_test(
284287
name = "browser_shadydom",
285288
bootstraps = {"browser_shadydom": [
286-
"//packages/zone.js/bundles:zone-testing-bundle.umd.js",
289+
"//packages/zone.js/bundles:zone.umd.min.js",
290+
"//packages/zone.js/bundles:zone-testing.umd.min.js",
287291
"//packages/zone.js/bundles:webapis-shadydom.umd.js",
288292
]},
289293
ci = False,
@@ -305,7 +309,8 @@ karma_test(
305309
karma_test(
306310
name = "browser_disable_wrap_uncaught_promise_rejection",
307311
bootstraps = {"browser_disable_wrap_uncaught_promise_rejection": [
308-
"//packages/zone.js/bundles:zone-testing-bundle.umd.js",
312+
"//packages/zone.js/bundles:zone.umd.min.js",
313+
"//packages/zone.js/bundles:zone-testing.umd.min.js",
309314
]},
310315
ci = False,
311316
env_deps = [
@@ -318,7 +323,7 @@ karma_test(
318323
],
319324
test_entry_point = ":browser_disable_wrap_uncaught_promise_rejection_entry_point.ts",
320325
test_srcs = [
321-
"common/promise-disable-wrap-uncaught-promise-rejection.spec.ts",
322326
"browser_disable_wrap_uncaught_promise_rejection_entry_point.ts",
327+
"common/promise-disable-wrap-uncaught-promise-rejection.spec.ts",
323328
],
324329
)

packages/zone.js/test/karma_test.bzl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@ def karma_test(name, env_srcs, env_deps, env_entry_point, test_srcs, test_deps,
9393
bootstrap = [
9494
":saucelabs.js",
9595
":" + name + "_env_rollup.umd",
96-
"//packages/zone.js/bundles:zone-testing-bundle.umd.min.js",
96+
"//packages/zone.js/bundles:zone.umd.js",
97+
"//packages/zone.js/bundles:zone-testing.umd.js",
9798
] + _karma_test_required_dist_files,
9899
browsers = ["@npm//@angular/build-tooling/bazel/browsers/chromium:chromium"],
99100
config_file = "//:karma-js.conf.js",

packages/zone.js/test/npm_package/npm_package.spec.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,10 +176,6 @@ describe('Zone.js npm_package', () => {
176176
'zone-patch-socket-io.min.js',
177177
'zone-patch-user-media.js',
178178
'zone-patch-user-media.min.js',
179-
'zone-testing-bundle.js',
180-
'zone-testing-bundle.min.js',
181-
'zone-testing-node-bundle.js',
182-
'zone-testing-node-bundle.min.js',
183179
'zone-testing.js',
184180
'zone-testing.min.js',
185181
'zone.js',

0 commit comments

Comments
 (0)