diff --git a/WORKSPACE b/WORKSPACE index 692aaae3c4286..ee78d33792082 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -79,7 +79,7 @@ yarn_install( YARN_LABEL, "//:.yarnrc", "//tools:postinstall-patches.js", - "//tools/esm-interop:patches/npm/@angular+build-tooling+0.0.0-8d4803573edc70b90a1134ffa996303d1dcc18a9.patch", + "//tools/esm-interop:patches/npm/@angular+build-tooling+0.0.0-0109d498b0f6aae418ed4924a5e5c65695f0ac61.patch", "//tools/esm-interop:patches/npm/@bazel+concatjs+5.8.1.patch", "//tools/esm-interop:patches/npm/@bazel+esbuild+5.7.1.patch", "//tools/esm-interop:patches/npm/@bazel+protractor+5.7.1.patch", diff --git a/integration/cli-elements-universal/angular.json b/integration/cli-elements-universal/angular.json index fb2d2fba48680..a5c7c6f1623e2 100644 --- a/integration/cli-elements-universal/angular.json +++ b/integration/cli-elements-universal/angular.json @@ -21,7 +21,7 @@ "index": "src/index.html", "main": "src/main.ts", "polyfills": [ - "zone.js/dist/zone" + "zone.js" ], "tsConfig": "tsconfig.app.json", "aot": true, @@ -83,7 +83,7 @@ "options": { "main": "src/test.ts", "polyfills": [ - "zone.js/dist/zone" + "zone.js" ], "tsConfig": "tsconfig.spec.json", "karmaConfig": "karma.conf.js", diff --git a/integration/cli-elements-universal/src/test.ts b/integration/cli-elements-universal/src/test.ts index ab1ede27f5b82..7f0c12ec3d0de 100644 --- a/integration/cli-elements-universal/src/test.ts +++ b/integration/cli-elements-universal/src/test.ts @@ -1,6 +1,6 @@ // This file is required by karma.conf.js and loads recursively all the .spec and framework files -import 'zone.js/dist/zone-testing'; +import 'zone.js/testing'; import { getTestBed } from '@angular/core/testing'; import { BrowserDynamicTestingModule, diff --git a/integration/injectable-def/src/main.ts b/integration/injectable-def/src/main.ts index b4b6e23fcf770..e853f555cad62 100644 --- a/integration/injectable-def/src/main.ts +++ b/integration/injectable-def/src/main.ts @@ -1,7 +1,4 @@ -// ZoneJS does not add any package exports right now, so we need to directly -// reference the ESM entry-point for ZoneJS in NodeJS. -// TODO: Replace this with a package import if ZoneJS sets the `exports` field. -import 'zone.js/fesm2015/zone-node.js'; +import 'zone.js/node'; // Load the Angular compiler as we will rely on JIT compilation for this test. // This test does not use the CLI and we are not processing the framework packages diff --git a/packages/zone.js/BUILD.bazel b/packages/zone.js/BUILD.bazel index a9f986e5bb7e5..7a10b21746495 100644 --- a/packages/zone.js/BUILD.bazel +++ b/packages/zone.js/BUILD.bazel @@ -53,17 +53,12 @@ pkg_npm( "CHANGELOG.md", "README.md", "package.json", - "//packages/zone.js/mix:package.json", - "//packages/zone.js/node:package.json", - "//packages/zone.js/testing:package.json", ], visibility = ["//visibility:public"], deps = [ ":LICENSE.wrapped", ":LICENSE_copy", ":zone_externs", - "//packages/zone.js/dist:dist_bundle_group", - "//packages/zone.js/plugins:plugin_bundle_group", ] + [ "//packages/zone.js/bundles:" + b + "-es5.dist" for b in BUNDLES_ENTRY_POINTS.keys() diff --git a/packages/zone.js/dist/BUILD.bazel b/packages/zone.js/dist/BUILD.bazel deleted file mode 100644 index f998e89f4500d..0000000000000 --- a/packages/zone.js/dist/BUILD.bazel +++ /dev/null @@ -1,125 +0,0 @@ -load("@build_bazel_rules_nodejs//:index.bzl", "js_library") -load("//packages/zone.js/dist:tools.bzl", "copy_es2015_to_dist", "copy_es5_to_dist") - -package(default_visibility = ["//visibility:public"]) - -copy_es2015_to_dist() - -copy_es5_to_dist() - -genrule( - name = "zone_externs", - srcs = ["//packages/zone.js:zone_externs"], - outs = ["zone_externs.js"], - cmd = "cp $< $@", -) - -genrule( - name = "zone_extensions_d_ts", - srcs = ["//packages/zone.js/lib:zone.api.extensions.ts"], - outs = ["zone.api.extensions.ts"], - cmd = "cp $< $@", -) - -genrule( - name = "zone_configurations_d_ts", - srcs = ["//packages/zone.js/lib:zone.configurations.api.ts"], - outs = ["zone.configurations.api.ts"], - cmd = "cp $< $@", -) - -genrule( - name = "zone_js_d_ts", - srcs = ["//packages/zone.js/lib:zone_d_ts"], - outs = ["zone.js.d.ts"], - cmd = "cp $< $@", -) - -js_library( - name = "zone", - package_name = "zone.js/dist", - srcs = [":zone.js"], - visibility = ["//modules/benchmarks:__subpackages__"], -) - -filegroup( - name = "dist_bundle_group", - srcs = [ - ":async-test.js", - ":async-test.min.js", - ":fake-async-test.js", - ":fake-async-test.min.js", - ":jasmine-patch.js", - ":jasmine-patch.min.js", - ":long-stack-trace-zone.js", - ":long-stack-trace-zone.min.js", - ":mocha-patch.js", - ":mocha-patch.min.js", - ":proxy.js", - ":proxy.min.js", - ":sync-test.js", - ":sync-test.min.js", - ":task-tracking.js", - ":task-tracking.min.js", - ":webapis-media-query.js", - ":webapis-media-query.min.js", - ":webapis-notification.js", - ":webapis-notification.min.js", - ":webapis-rtc-peer-connection.js", - ":webapis-rtc-peer-connection.min.js", - ":webapis-shadydom.js", - ":webapis-shadydom.min.js", - ":wtf.js", - ":wtf.min.js", - ":zone.js", - ":zone.min.js", - ":zone-bluebird.js", - ":zone-bluebird.min.js", - ":zone-error.js", - ":zone-error.min.js", - ":zone-evergreen.js", - ":zone-evergreen.min.js", - ":zone-evergreen-testing-bundle.js", - ":zone-evergreen-testing-bundle.min.js", - ":zone-legacy.js", - ":zone-legacy.min.js", - ":zone-mix.js", - ":zone-mix.min.js", - ":zone-node.js", - ":zone-node.min.js", - ":zone-patch-canvas.js", - ":zone-patch-canvas.min.js", - ":zone-patch-cordova.js", - ":zone-patch-cordova.min.js", - ":zone-patch-electron.js", - ":zone-patch-electron.min.js", - ":zone-patch-fetch.js", - ":zone-patch-fetch.min.js", - ":zone-patch-jsonp.js", - ":zone-patch-jsonp.min.js", - ":zone-patch-message-port.js", - ":zone-patch-message-port.min.js", - ":zone-patch-promise-test.js", - ":zone-patch-promise-test.min.js", - ":zone-patch-resize-observer.js", - ":zone-patch-resize-observer.min.js", - ":zone-patch-rxjs.js", - ":zone-patch-rxjs.min.js", - ":zone-patch-rxjs-fake-async.js", - ":zone-patch-rxjs-fake-async.min.js", - ":zone-patch-socket-io.js", - ":zone-patch-socket-io.min.js", - ":zone-patch-user-media.js", - ":zone-patch-user-media.min.js", - ":zone-testing.js", - ":zone-testing.min.js", - ":zone-testing-bundle.js", - ":zone-testing-bundle.min.js", - ":zone-testing-node-bundle.js", - ":zone-testing-node-bundle.min.js", - ":zone_configurations_d_ts", - ":zone_extensions_d_ts", - ":zone_externs", - ":zone_js_d_ts", - ], -) diff --git a/packages/zone.js/dist/tools.bzl b/packages/zone.js/dist/tools.bzl deleted file mode 100644 index 6ac4af5fef845..0000000000000 --- a/packages/zone.js/dist/tools.bzl +++ /dev/null @@ -1,71 +0,0 @@ -ES5_BUNDLES = [ - "zone", - "zone-mix", - "zone-node", - "zone-testing-node-bundle", - "async-test", - "fake-async-test", - "long-stack-trace-zone", - "proxy", - "zone-patch-rxjs-fake-async", - "sync-test", - "task-tracking", - "wtf", - "zone-error", - "zone-legacy", - "zone-bluebird", - "zone-patch-canvas", - "zone-patch-cordova", - "zone-patch-electron", - "zone-patch-fetch", - "jasmine-patch", - "zone-patch-jsonp", - "webapis-media-query", - "mocha-patch", - "webapis-notification", - "zone-patch-promise-test", - "zone-patch-resize-observer", - "webapis-rtc-peer-connection", - "zone-patch-rxjs", - "webapis-shadydom", - "zone-patch-socket-io", - "zone-patch-user-media", - "zone-patch-message-port", - "zone-testing", - "zone-testing-bundle", -] - -ES2015_BUNDLES = { - "zone-evergreen": "//packages/zone.js/fesm2015:zone", - "zone-evergreen-testing-bundle": "//packages/zone.js/fesm2015:zone-testing-bundle", -} - -def copy_es5_to_dist(): - for b in ES5_BUNDLES: - native.genrule( - name = "zone_copy_" + b, - srcs = ["//packages/zone.js/bundles:" + b + ".umd.js"], - outs = [b + ".js"], - cmd = "cp $< $@", - ) - native.genrule( - name = "zone_copy_min_" + b, - srcs = ["//packages/zone.js/bundles:" + b + ".umd.min.js"], - outs = [b + ".min.js"], - cmd = "cp $< $@", - ) - -def copy_es2015_to_dist(): - for b in ES2015_BUNDLES.items(): - native.genrule( - name = "zone_copy_" + b[0], - srcs = [b[1] + ".js"], - outs = [b[0] + ".js"], - cmd = "cp $< $@", - ) - native.genrule( - name = "zone_copy_min_" + b[0], - srcs = [b[1] + ".min.js"], - outs = [b[0] + ".min.js"], - cmd = "cp $< $@", - ) diff --git a/packages/zone.js/mix/BUILD.bazel b/packages/zone.js/mix/BUILD.bazel deleted file mode 100644 index 11a7cfa6026c1..0000000000000 --- a/packages/zone.js/mix/BUILD.bazel +++ /dev/null @@ -1,3 +0,0 @@ -exports_files([ - "package.json", -]) diff --git a/packages/zone.js/mix/package.json b/packages/zone.js/mix/package.json deleted file mode 100644 index a77a7c50c8ad9..0000000000000 --- a/packages/zone.js/mix/package.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "zone-mix", - "description": "Zone.js for mixed environment(both browser and NodeJS) such as Electron", - "main": "../bundles/zone-mix.umd.js", - "module": "../fesm2015/zone-mix.js", - "es2015": "../fesm2015/zone-mix.js", - "fesm2015": "../fesm2015/zone-mix.js" -} diff --git a/packages/zone.js/node/BUILD.bazel b/packages/zone.js/node/BUILD.bazel deleted file mode 100644 index 11a7cfa6026c1..0000000000000 --- a/packages/zone.js/node/BUILD.bazel +++ /dev/null @@ -1,3 +0,0 @@ -exports_files([ - "package.json", -]) diff --git a/packages/zone.js/node/package.json b/packages/zone.js/node/package.json deleted file mode 100644 index ebc78825ac5b1..0000000000000 --- a/packages/zone.js/node/package.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "zone-node", - "description": "Zone.js for NodeJS", - "main": "../bundles/zone-node.umd.js", - "module": "../fesm2015/zone-node.js", - "es2015": "../fesm2015/zone-node.js", - "fesm2015": "../fesm2015/zone-node.js" -} diff --git a/packages/zone.js/package.json b/packages/zone.js/package.json index ef26277b8b7c7..82138c60e6b81 100644 --- a/packages/zone.js/package.json +++ b/packages/zone.js/package.json @@ -42,5 +42,41 @@ "license": "MIT", "bugs": { "url": "https://github.com/angular/angular/issues" + }, + "exports": { + "./package.json": { + "default": "./package.json" + }, + ".": { + "typings": "./zone.d.ts", + "require": "./bundles/zone.umd.js", + "default": "./fesm2015/zone.js" + }, + "./testing": { + "require": "./bundles/zone-testing.umd.js", + "default": "./fesm2015/zone-testing.js" + }, + "./node": { + "require": "./bundles/zone-node.umd.js", + "default": "./fesm2015/zone-node.js" + }, + "./mix": { + "require": "./bundles/zone-mix.umd.js", + "default": "./fesm2015/zone-mix.js" + }, + "./dist/*.min": { + "default": "./bundles/*.umd.min.js" + }, + "./dist/*": { + "default": "./bundles/*.umd.js" + }, + "./plugins/*.min": { + "require": "./bundles/*.umd.min.js", + "default": "./fesm2015/*.min.js" + }, + "./plugins/*": { + "require": "./bundles/*.umd.js", + "default": "./fesm2015/*.js" + } } } diff --git a/packages/zone.js/plugins/BUILD.bazel b/packages/zone.js/plugins/BUILD.bazel deleted file mode 100644 index 8c03c51d58431..0000000000000 --- a/packages/zone.js/plugins/BUILD.bazel +++ /dev/null @@ -1,63 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -filegroup( - name = "plugin_bundle_group", - srcs = [ - "//packages/zone.js/plugins:async-test.min/package.json", - "//packages/zone.js/plugins:async-test/package.json", - "//packages/zone.js/plugins:fake-async-test.min/package.json", - "//packages/zone.js/plugins:fake-async-test/package.json", - "//packages/zone.js/plugins:jasmine-patch.min/package.json", - "//packages/zone.js/plugins:jasmine-patch/package.json", - "//packages/zone.js/plugins:long-stack-trace-zone.min/package.json", - "//packages/zone.js/plugins:long-stack-trace-zone/package.json", - "//packages/zone.js/plugins:mocha-patch.min/package.json", - "//packages/zone.js/plugins:mocha-patch/package.json", - "//packages/zone.js/plugins:proxy.min/package.json", - "//packages/zone.js/plugins:proxy/package.json", - "//packages/zone.js/plugins:sync-test.min/package.json", - "//packages/zone.js/plugins:sync-test/package.json", - "//packages/zone.js/plugins:task-tracking.min/package.json", - "//packages/zone.js/plugins:task-tracking/package.json", - "//packages/zone.js/plugins:webapis-media-query.min/package.json", - "//packages/zone.js/plugins:webapis-media-query/package.json", - "//packages/zone.js/plugins:webapis-notification.min/package.json", - "//packages/zone.js/plugins:webapis-notification/package.json", - "//packages/zone.js/plugins:webapis-rtc-peer-connection.min/package.json", - "//packages/zone.js/plugins:webapis-rtc-peer-connection/package.json", - "//packages/zone.js/plugins:webapis-shadydom.min/package.json", - "//packages/zone.js/plugins:webapis-shadydom/package.json", - "//packages/zone.js/plugins:wtf.min/package.json", - "//packages/zone.js/plugins:wtf/package.json", - "//packages/zone.js/plugins:zone-bluebird.min/package.json", - "//packages/zone.js/plugins:zone-bluebird/package.json", - "//packages/zone.js/plugins:zone-error.min/package.json", - "//packages/zone.js/plugins:zone-error/package.json", - "//packages/zone.js/plugins:zone-legacy.min/package.json", - "//packages/zone.js/plugins:zone-legacy/package.json", - "//packages/zone.js/plugins:zone-patch-canvas.min/package.json", - "//packages/zone.js/plugins:zone-patch-canvas/package.json", - "//packages/zone.js/plugins:zone-patch-cordova.min/package.json", - "//packages/zone.js/plugins:zone-patch-cordova/package.json", - "//packages/zone.js/plugins:zone-patch-electron.min/package.json", - "//packages/zone.js/plugins:zone-patch-electron/package.json", - "//packages/zone.js/plugins:zone-patch-fetch.min/package.json", - "//packages/zone.js/plugins:zone-patch-fetch/package.json", - "//packages/zone.js/plugins:zone-patch-jsonp.min/package.json", - "//packages/zone.js/plugins:zone-patch-jsonp/package.json", - "//packages/zone.js/plugins:zone-patch-message-port.min/package.json", - "//packages/zone.js/plugins:zone-patch-message-port/package.json", - "//packages/zone.js/plugins:zone-patch-promise-test.min/package.json", - "//packages/zone.js/plugins:zone-patch-promise-test/package.json", - "//packages/zone.js/plugins:zone-patch-resize-observer.min/package.json", - "//packages/zone.js/plugins:zone-patch-resize-observer/package.json", - "//packages/zone.js/plugins:zone-patch-rxjs.min/package.json", - "//packages/zone.js/plugins:zone-patch-rxjs-fake-async.min/package.json", - "//packages/zone.js/plugins:zone-patch-rxjs-fake-async/package.json", - "//packages/zone.js/plugins:zone-patch-rxjs/package.json", - "//packages/zone.js/plugins:zone-patch-socket-io.min/package.json", - "//packages/zone.js/plugins:zone-patch-socket-io/package.json", - "//packages/zone.js/plugins:zone-patch-user-media.min/package.json", - "//packages/zone.js/plugins:zone-patch-user-media/package.json", - ], -) diff --git a/packages/zone.js/plugins/async-test.min/package.json b/packages/zone.js/plugins/async-test.min/package.json deleted file mode 100644 index 99281391061b8..0000000000000 --- a/packages/zone.js/plugins/async-test.min/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/async-test.min", - "main": "../../bundles/async-test.umd.min.js", - "fesm2015": "../../fesm2015/async-test.min.js", - "es2015": "../../fesm2015/async-test.min.js", - "module": "../../fesm2015/async-test.min.js" -} diff --git a/packages/zone.js/plugins/async-test/package.json b/packages/zone.js/plugins/async-test/package.json deleted file mode 100644 index c6dc4c07a1e9b..0000000000000 --- a/packages/zone.js/plugins/async-test/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/async-test", - "main": "../../bundles/async-test.umd.js", - "fesm2015": "../../fesm2015/async-test.js", - "es2015": "../../fesm2015/async-test.js", - "module": "../../fesm2015/async-test.js" -} diff --git a/packages/zone.js/plugins/fake-async-test.min/package.json b/packages/zone.js/plugins/fake-async-test.min/package.json deleted file mode 100644 index df98ce6862113..0000000000000 --- a/packages/zone.js/plugins/fake-async-test.min/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/fake-async-test.min", - "main": "../../bundles/fake-async-test.umd.min.js", - "fesm2015": "../../fesm2015/fake-async-test.min.js", - "es2015": "../../fesm2015/fake-async-test.min.js", - "module": "../../fesm2015/fake-async-test.min.js" -} diff --git a/packages/zone.js/plugins/fake-async-test/package.json b/packages/zone.js/plugins/fake-async-test/package.json deleted file mode 100644 index feab6e986c11e..0000000000000 --- a/packages/zone.js/plugins/fake-async-test/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/fake-async-test", - "main": "../../bundles/fake-async-test.umd.js", - "fesm2015": "../../fesm2015/fake-async-test.js", - "es2015": "../../fesm2015/fake-async-test.js", - "module": "../../fesm2015/fake-async-test.js" -} diff --git a/packages/zone.js/plugins/jasmine-patch.min/package.json b/packages/zone.js/plugins/jasmine-patch.min/package.json deleted file mode 100644 index 2577835c8a2dd..0000000000000 --- a/packages/zone.js/plugins/jasmine-patch.min/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/jasmine-patch.min", - "main": "../../bundles/jasmine-patch.umd.min.js", - "fesm2015": "../../fesm2015/jasmine-patch.min.js", - "es2015": "../../fesm2015/jasmine-patch.min.js", - "module": "../../fesm2015/jasmine-patch.min.js" -} diff --git a/packages/zone.js/plugins/jasmine-patch/package.json b/packages/zone.js/plugins/jasmine-patch/package.json deleted file mode 100644 index 85a712b81232a..0000000000000 --- a/packages/zone.js/plugins/jasmine-patch/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/jasmine-patch", - "main": "../../bundles/jasmine-patch.umd.js", - "fesm2015": "../../fesm2015/jasmine-patch.js", - "es2015": "../../fesm2015/jasmine-patch.js", - "module": "../../fesm2015/jasmine-patch.js" -} diff --git a/packages/zone.js/plugins/long-stack-trace-zone.min/package.json b/packages/zone.js/plugins/long-stack-trace-zone.min/package.json deleted file mode 100644 index fbd117c105c43..0000000000000 --- a/packages/zone.js/plugins/long-stack-trace-zone.min/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/long-stack-trace-zone.min", - "main": "../../bundles/long-stack-trace-zone.umd.min.js", - "fesm2015": "../../fesm2015/long-stack-trace-zone.min.js", - "es2015": "../../fesm2015/long-stack-trace-zone.min.js", - "module": "../../fesm2015/long-stack-trace-zone.min.js" -} diff --git a/packages/zone.js/plugins/long-stack-trace-zone/package.json b/packages/zone.js/plugins/long-stack-trace-zone/package.json deleted file mode 100644 index e3038e1f71c78..0000000000000 --- a/packages/zone.js/plugins/long-stack-trace-zone/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/long-stack-trace-zone", - "main": "../../bundles/long-stack-trace-zone.umd.js", - "fesm2015": "../../fesm2015/long-stack-trace-zone.js", - "es2015": "../../fesm2015/long-stack-trace-zone.js", - "module": "../../fesm2015/long-stack-trace-zone.js" -} diff --git a/packages/zone.js/plugins/mocha-patch.min/package.json b/packages/zone.js/plugins/mocha-patch.min/package.json deleted file mode 100644 index 056fea4c86076..0000000000000 --- a/packages/zone.js/plugins/mocha-patch.min/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/mocha-patch.min", - "main": "../../bundles/mocha-patch.umd.min.js", - "fesm2015": "../../fesm2015/mocha-patch.min.js", - "es2015": "../../fesm2015/mocha-patch.min.js", - "module": "../../fesm2015/mocha-patch.min.js" -} diff --git a/packages/zone.js/plugins/mocha-patch/package.json b/packages/zone.js/plugins/mocha-patch/package.json deleted file mode 100644 index d88ff072282aa..0000000000000 --- a/packages/zone.js/plugins/mocha-patch/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/mocha-patch", - "main": "../../bundles/mocha-patch.umd.js", - "fesm2015": "../../fesm2015/mocha-patch.js", - "es2015": "../../fesm2015/mocha-patch.js", - "module": "../../fesm2015/mocha-patch.js" -} diff --git a/packages/zone.js/plugins/proxy.min/package.json b/packages/zone.js/plugins/proxy.min/package.json deleted file mode 100644 index 3c8b4eced0a89..0000000000000 --- a/packages/zone.js/plugins/proxy.min/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/proxy.min", - "main": "../../bundles/proxy.umd.min.js", - "fesm2015": "../../fesm2015/proxy.min.js", - "es2015": "../../fesm2015/proxy.min.js", - "module": "../../fesm2015/proxy.min.js" -} diff --git a/packages/zone.js/plugins/proxy/package.json b/packages/zone.js/plugins/proxy/package.json deleted file mode 100644 index 26c3b0921e4b3..0000000000000 --- a/packages/zone.js/plugins/proxy/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/proxy", - "main": "../../bundles/proxy.umd.js", - "fesm2015": "../../fesm2015/proxy.js", - "es2015": "../../fesm2015/proxy.js", - "module": "../../fesm2015/proxy.js" -} diff --git a/packages/zone.js/plugins/sync-test.min/package.json b/packages/zone.js/plugins/sync-test.min/package.json deleted file mode 100644 index 47a668f4e3380..0000000000000 --- a/packages/zone.js/plugins/sync-test.min/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/sync-test.min", - "main": "../../bundles/sync-test.umd.min.js", - "fesm2015": "../../fesm2015/sync-test.min.js", - "es2015": "../../fesm2015/sync-test.min.js", - "module": "../../fesm2015/sync-test.min.js" -} diff --git a/packages/zone.js/plugins/sync-test/package.json b/packages/zone.js/plugins/sync-test/package.json deleted file mode 100644 index 31c7a125f6fc5..0000000000000 --- a/packages/zone.js/plugins/sync-test/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/sync-test", - "main": "../../bundles/sync-test.umd.js", - "fesm2015": "../../fesm2015/sync-test.js", - "es2015": "../../fesm2015/sync-test.js", - "module": "../../fesm2015/sync-test.js" -} diff --git a/packages/zone.js/plugins/task-tracking.min/package.json b/packages/zone.js/plugins/task-tracking.min/package.json deleted file mode 100644 index d9247baf2bf76..0000000000000 --- a/packages/zone.js/plugins/task-tracking.min/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/task-tracking.min", - "main": "../../bundles/task-tracking.umd.min.js", - "fesm2015": "../../fesm2015/task-tracking.min.js", - "es2015": "../../fesm2015/task-tracking.min.js", - "module": "../../fesm2015/task-tracking.min.js" -} diff --git a/packages/zone.js/plugins/task-tracking/package.json b/packages/zone.js/plugins/task-tracking/package.json deleted file mode 100644 index dbf8ace6bf0dc..0000000000000 --- a/packages/zone.js/plugins/task-tracking/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/task-tracking", - "main": "../../bundles/task-tracking.umd.js", - "fesm2015": "../../fesm2015/task-tracking.js", - "es2015": "../../fesm2015/task-tracking.js", - "module": "../../fesm2015/task-tracking.js" -} diff --git a/packages/zone.js/plugins/webapis-media-query.min/package.json b/packages/zone.js/plugins/webapis-media-query.min/package.json deleted file mode 100644 index b512baa6633a1..0000000000000 --- a/packages/zone.js/plugins/webapis-media-query.min/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/webapis-media-query.min", - "main": "../../bundles/webapis-media-query.umd.min.js", - "fesm2015": "../../fesm2015/webapis-media-query.min.js", - "es2015": "../../fesm2015/webapis-media-query.min.js", - "module": "../../fesm2015/webapis-media-query.min.js" -} diff --git a/packages/zone.js/plugins/webapis-media-query/package.json b/packages/zone.js/plugins/webapis-media-query/package.json deleted file mode 100644 index 00383a1420763..0000000000000 --- a/packages/zone.js/plugins/webapis-media-query/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/webapis-media-query", - "main": "../../bundles/webapis-media-query.umd.js", - "fesm2015": "../../fesm2015/webapis-media-query.js", - "es2015": "../../fesm2015/webapis-media-query.js", - "module": "../../fesm2015/webapis-media-query.js" -} diff --git a/packages/zone.js/plugins/webapis-notification.min/package.json b/packages/zone.js/plugins/webapis-notification.min/package.json deleted file mode 100644 index 34b7a46fe39b4..0000000000000 --- a/packages/zone.js/plugins/webapis-notification.min/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/webapis-notification.min", - "main": "../../bundles/webapis-notification.umd.min.js", - "fesm2015": "../../fesm2015/webapis-notification.min.js", - "es2015": "../../fesm2015/webapis-notification.min.js", - "module": "../../fesm2015/webapis-notification.min.js" -} diff --git a/packages/zone.js/plugins/webapis-notification/package.json b/packages/zone.js/plugins/webapis-notification/package.json deleted file mode 100644 index 69f50f21927b4..0000000000000 --- a/packages/zone.js/plugins/webapis-notification/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/webapis-notification", - "main": "../../bundles/webapis-notification.umd.js", - "fesm2015": "../../fesm2015/webapis-notification.js", - "es2015": "../../fesm2015/webapis-notification.js", - "module": "../../fesm2015/webapis-notification.js" -} diff --git a/packages/zone.js/plugins/webapis-rtc-peer-connection.min/package.json b/packages/zone.js/plugins/webapis-rtc-peer-connection.min/package.json deleted file mode 100644 index 6cee513b3583f..0000000000000 --- a/packages/zone.js/plugins/webapis-rtc-peer-connection.min/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/webapis-rtc-peer-connection.min", - "main": "../../bundles/webapis-rtc-peer-connection.umd.min.js", - "fesm2015": "../../fesm2015/webapis-rtc-peer-connection.min.js", - "es2015": "../../fesm2015/webapis-rtc-peer-connection.min.js", - "module": "../../fesm2015/webapis-rtc-peer-connection.min.js" -} diff --git a/packages/zone.js/plugins/webapis-rtc-peer-connection/package.json b/packages/zone.js/plugins/webapis-rtc-peer-connection/package.json deleted file mode 100644 index 187857fc3f552..0000000000000 --- a/packages/zone.js/plugins/webapis-rtc-peer-connection/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/webapis-rtc-peer-connection", - "main": "../../bundles/webapis-rtc-peer-connection.umd.js", - "fesm2015": "../../fesm2015/webapis-rtc-peer-connection.js", - "es2015": "../../fesm2015/webapis-rtc-peer-connection.js", - "module": "../../fesm2015/webapis-rtc-peer-connection.js" -} diff --git a/packages/zone.js/plugins/webapis-shadydom.min/package.json b/packages/zone.js/plugins/webapis-shadydom.min/package.json deleted file mode 100644 index c0f63f629dea7..0000000000000 --- a/packages/zone.js/plugins/webapis-shadydom.min/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/webapis-shadydom.min", - "main": "../../bundles/webapis-shadydom.umd.min.js", - "fesm2015": "../../fesm2015/webapis-shadydom.min.js", - "es2015": "../../fesm2015/webapis-shadydom.min.js", - "module": "../../fesm2015/webapis-shadydom.min.js" -} diff --git a/packages/zone.js/plugins/webapis-shadydom/package.json b/packages/zone.js/plugins/webapis-shadydom/package.json deleted file mode 100644 index 094020cfb1a74..0000000000000 --- a/packages/zone.js/plugins/webapis-shadydom/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/webapis-shadydom", - "main": "../../bundles/webapis-shadydom.umd.js", - "fesm2015": "../../fesm2015/webapis-shadydom.js", - "es2015": "../../fesm2015/webapis-shadydom.js", - "module": "../../fesm2015/webapis-shadydom.js" -} diff --git a/packages/zone.js/plugins/wtf.min/package.json b/packages/zone.js/plugins/wtf.min/package.json deleted file mode 100644 index 0cd382df4b26a..0000000000000 --- a/packages/zone.js/plugins/wtf.min/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/wtf.min", - "main": "../../bundles/wtf.umd.min.js", - "fesm2015": "../../fesm2015/wtf.min.js", - "es2015": "../../fesm2015/wtf.min.js", - "module": "../../fesm2015/wtf.min.js" -} diff --git a/packages/zone.js/plugins/wtf/package.json b/packages/zone.js/plugins/wtf/package.json deleted file mode 100644 index 30a38fa85ff41..0000000000000 --- a/packages/zone.js/plugins/wtf/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/wtf", - "main": "../../bundles/wtf.umd.js", - "fesm2015": "../../fesm2015/wtf.js", - "es2015": "../../fesm2015/wtf.js", - "module": "../../fesm2015/wtf.js" -} diff --git a/packages/zone.js/plugins/zone-bluebird.min/package.json b/packages/zone.js/plugins/zone-bluebird.min/package.json deleted file mode 100644 index 4893934a86491..0000000000000 --- a/packages/zone.js/plugins/zone-bluebird.min/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/zone-bluebird.min", - "main": "../../bundles/zone-bluebird.umd.min.js", - "fesm2015": "../../fesm2015/zone-bluebird.min.js", - "es2015": "../../fesm2015/zone-bluebird.min.js", - "module": "../../fesm2015/zone-bluebird.min.js" -} diff --git a/packages/zone.js/plugins/zone-bluebird/package.json b/packages/zone.js/plugins/zone-bluebird/package.json deleted file mode 100644 index cbe50f384c555..0000000000000 --- a/packages/zone.js/plugins/zone-bluebird/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/zone-bluebird", - "main": "../../bundles/zone-bluebird.umd.js", - "fesm2015": "../../fesm2015/zone-bluebird.js", - "es2015": "../../fesm2015/zone-bluebird.js", - "module": "../../fesm2015/zone-bluebird.js" -} diff --git a/packages/zone.js/plugins/zone-error.min/package.json b/packages/zone.js/plugins/zone-error.min/package.json deleted file mode 100644 index 3ab27961e1456..0000000000000 --- a/packages/zone.js/plugins/zone-error.min/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/zone-error.min", - "main": "../../bundles/zone-error.umd.min.js", - "fesm2015": "../../fesm2015/zone-error.min.js", - "es2015": "../../fesm2015/zone-error.min.js", - "module": "../../fesm2015/zone-error.min.js" -} diff --git a/packages/zone.js/plugins/zone-error/package.json b/packages/zone.js/plugins/zone-error/package.json deleted file mode 100644 index c493ca1cee629..0000000000000 --- a/packages/zone.js/plugins/zone-error/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/zone-error", - "main": "../../bundles/zone-error.umd.js", - "fesm2015": "../../fesm2015/zone-error.js", - "es2015": "../../fesm2015/zone-error.js", - "module": "../../fesm2015/zone-error.js" -} diff --git a/packages/zone.js/plugins/zone-legacy.min/package.json b/packages/zone.js/plugins/zone-legacy.min/package.json deleted file mode 100644 index f0f2739db93e9..0000000000000 --- a/packages/zone.js/plugins/zone-legacy.min/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/zone-legacy.min", - "main": "../../bundles/zone-legacy.umd.min.js", - "fesm2015": "../../fesm2015/zone-legacy.min.js", - "es2015": "../../fesm2015/zone-legacy.min.js", - "module": "../../fesm2015/zone-legacy.min.js" -} diff --git a/packages/zone.js/plugins/zone-legacy/package.json b/packages/zone.js/plugins/zone-legacy/package.json deleted file mode 100644 index b87125f159180..0000000000000 --- a/packages/zone.js/plugins/zone-legacy/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/zone-legacy", - "main": "../../bundles/zone-legacy.umd.js", - "fesm2015": "../../fesm2015/zone-legacy.js", - "es2015": "../../fesm2015/zone-legacy.js", - "module": "../../fesm2015/zone-legacy.js" -} diff --git a/packages/zone.js/plugins/zone-patch-canvas.min/package.json b/packages/zone.js/plugins/zone-patch-canvas.min/package.json deleted file mode 100644 index 9b0501c8ec7a2..0000000000000 --- a/packages/zone.js/plugins/zone-patch-canvas.min/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/zone-patch-canvas.min", - "main": "../../bundles/zone-patch-canvas.umd.min.js", - "fesm2015": "../../fesm2015/zone-patch-canvas.min.js", - "es2015": "../../fesm2015/zone-patch-canvas.min.js", - "module": "../../fesm2015/zone-patch-canvas.min.js" -} diff --git a/packages/zone.js/plugins/zone-patch-canvas/package.json b/packages/zone.js/plugins/zone-patch-canvas/package.json deleted file mode 100644 index 5f95609908686..0000000000000 --- a/packages/zone.js/plugins/zone-patch-canvas/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/zone-patch-canvas", - "main": "../../bundles/zone-patch-canvas.umd.js", - "fesm2015": "../../fesm2015/zone-patch-canvas.js", - "es2015": "../../fesm2015/zone-patch-canvas.js", - "module": "../../fesm2015/zone-patch-canvas.js" -} diff --git a/packages/zone.js/plugins/zone-patch-cordova.min/package.json b/packages/zone.js/plugins/zone-patch-cordova.min/package.json deleted file mode 100644 index 0dbbf3aa6650e..0000000000000 --- a/packages/zone.js/plugins/zone-patch-cordova.min/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/zone-patch-cordova.min", - "main": "../../bundles/zone-patch-cordova.umd.min.js", - "fesm2015": "../../fesm2015/zone-patch-cordova.min.js", - "es2015": "../../fesm2015/zone-patch-cordova.min.js", - "module": "../../fesm2015/zone-patch-cordova.min.js" -} diff --git a/packages/zone.js/plugins/zone-patch-cordova/package.json b/packages/zone.js/plugins/zone-patch-cordova/package.json deleted file mode 100644 index c4303225fd1a7..0000000000000 --- a/packages/zone.js/plugins/zone-patch-cordova/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/zone-patch-cordova", - "main": "../../bundles/zone-patch-cordova.umd.js", - "fesm2015": "../../fesm2015/zone-patch-cordova.js", - "es2015": "../../fesm2015/zone-patch-cordova.js", - "module": "../../fesm2015/zone-patch-cordova.js" -} diff --git a/packages/zone.js/plugins/zone-patch-electron.min/package.json b/packages/zone.js/plugins/zone-patch-electron.min/package.json deleted file mode 100644 index c50d2f986b990..0000000000000 --- a/packages/zone.js/plugins/zone-patch-electron.min/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/zone-patch-electron.min", - "main": "../../bundles/zone-patch-electron.umd.min.js", - "fesm2015": "../../fesm2015/zone-patch-electron.min.js", - "es2015": "../../fesm2015/zone-patch-electron.min.js", - "module": "../../fesm2015/zone-patch-electron.min.js" -} diff --git a/packages/zone.js/plugins/zone-patch-electron/package.json b/packages/zone.js/plugins/zone-patch-electron/package.json deleted file mode 100644 index 157e823c00b1e..0000000000000 --- a/packages/zone.js/plugins/zone-patch-electron/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/zone-patch-electron", - "main": "../../bundles/zone-patch-electron.umd.js", - "fesm2015": "../../fesm2015/zone-patch-electron.js", - "es2015": "../../fesm2015/zone-patch-electron.js", - "module": "../../fesm2015/zone-patch-electron.js" -} diff --git a/packages/zone.js/plugins/zone-patch-fetch.min/package.json b/packages/zone.js/plugins/zone-patch-fetch.min/package.json deleted file mode 100644 index 5aa46814bba0b..0000000000000 --- a/packages/zone.js/plugins/zone-patch-fetch.min/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/zone-patch-fetch.min", - "main": "../../bundles/zone-patch-fetch.umd.min.js", - "fesm2015": "../../fesm2015/zone-patch-fetch.min.js", - "es2015": "../../fesm2015/zone-patch-fetch.min.js", - "module": "../../fesm2015/zone-patch-fetch.min.js" -} diff --git a/packages/zone.js/plugins/zone-patch-fetch/package.json b/packages/zone.js/plugins/zone-patch-fetch/package.json deleted file mode 100644 index 2b902bc5a1b39..0000000000000 --- a/packages/zone.js/plugins/zone-patch-fetch/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/zone-patch-fetch", - "main": "../../bundles/zone-patch-fetch.umd.js", - "fesm2015": "../../fesm2015/zone-patch-fetch.js", - "es2015": "../../fesm2015/zone-patch-fetch.js", - "module": "../../fesm2015/zone-patch-fetch.js" -} diff --git a/packages/zone.js/plugins/zone-patch-jsonp.min/package.json b/packages/zone.js/plugins/zone-patch-jsonp.min/package.json deleted file mode 100644 index 9e274dc71b0c0..0000000000000 --- a/packages/zone.js/plugins/zone-patch-jsonp.min/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/zone-patch-jsonp.min", - "main": "../../bundles/zone-patch-jsonp.umd.min.js", - "fesm2015": "../../fesm2015/zone-patch-jsonp.min.js", - "es2015": "../../fesm2015/zone-patch-jsonp.min.js", - "module": "../../fesm2015/zone-patch-jsonp.min.js" -} diff --git a/packages/zone.js/plugins/zone-patch-jsonp/package.json b/packages/zone.js/plugins/zone-patch-jsonp/package.json deleted file mode 100644 index 426a0da45b540..0000000000000 --- a/packages/zone.js/plugins/zone-patch-jsonp/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/zone-patch-jsonp", - "main": "../../bundles/zone-patch-jsonp.umd.js", - "fesm2015": "../../fesm2015/zone-patch-jsonp.js", - "es2015": "../../fesm2015/zone-patch-jsonp.js", - "module": "../../fesm2015/zone-patch-jsonp.js" -} diff --git a/packages/zone.js/plugins/zone-patch-message-port.min/package.json b/packages/zone.js/plugins/zone-patch-message-port.min/package.json deleted file mode 100644 index c1e4a3a2caa84..0000000000000 --- a/packages/zone.js/plugins/zone-patch-message-port.min/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/zone-patch-message-port.min", - "main": "../../bundles/zone-patch-message-port.umd.min.js", - "fesm2015": "../../fesm2015/zone-patch-message-port.min.js", - "es2015": "../../fesm2015/zone-patch-message-port.min.js", - "module": "../../fesm2015/zone-patch-message-port.min.js" -} diff --git a/packages/zone.js/plugins/zone-patch-message-port/package.json b/packages/zone.js/plugins/zone-patch-message-port/package.json deleted file mode 100644 index 3b3ce6317c3be..0000000000000 --- a/packages/zone.js/plugins/zone-patch-message-port/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/zone-patch-message-port", - "main": "../../bundles/zone-patch-message-port.umd.js", - "fesm2015": "../../fesm2015/zone-patch-message-port.js", - "es2015": "../../fesm2015/zone-patch-message-port.js", - "module": "../../fesm2015/zone-patch-message-port.js" -} diff --git a/packages/zone.js/plugins/zone-patch-promise-test.min/package.json b/packages/zone.js/plugins/zone-patch-promise-test.min/package.json deleted file mode 100644 index 30b94a2414e2a..0000000000000 --- a/packages/zone.js/plugins/zone-patch-promise-test.min/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/zone-patch-promise-test.min", - "main": "../../bundles/zone-patch-promise-test.umd.min.js", - "fesm2015": "../../fesm2015/zone-patch-promise-test.min.js", - "es2015": "../../fesm2015/zone-patch-promise-test.min.js", - "module": "../../fesm2015/zone-patch-promise-test.min.js" -} diff --git a/packages/zone.js/plugins/zone-patch-promise-test/package.json b/packages/zone.js/plugins/zone-patch-promise-test/package.json deleted file mode 100644 index 8b9bd469ee205..0000000000000 --- a/packages/zone.js/plugins/zone-patch-promise-test/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/zone-patch-promise-test", - "main": "../../bundles/zone-patch-promise-test.umd.js", - "fesm2015": "../../fesm2015/zone-patch-promise-test.js", - "es2015": "../../fesm2015/zone-patch-promise-test.js", - "module": "../../fesm2015/zone-patch-promise-test.js" -} diff --git a/packages/zone.js/plugins/zone-patch-resize-observer.min/package.json b/packages/zone.js/plugins/zone-patch-resize-observer.min/package.json deleted file mode 100644 index bc8b6a93890f3..0000000000000 --- a/packages/zone.js/plugins/zone-patch-resize-observer.min/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/zone-patch-resize-observer.min", - "main": "../../bundles/zone-patch-resize-observer.umd.min.js", - "fesm2015": "../../fesm2015/zone-patch-resize-observer.min.js", - "es2015": "../../fesm2015/zone-patch-resize-observer.min.js", - "module": "../../fesm2015/zone-patch-resize-observer.min.js" -} diff --git a/packages/zone.js/plugins/zone-patch-resize-observer/package.json b/packages/zone.js/plugins/zone-patch-resize-observer/package.json deleted file mode 100644 index dece1df10ae7e..0000000000000 --- a/packages/zone.js/plugins/zone-patch-resize-observer/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/zone-patch-resize-observer", - "main": "../../bundles/zone-patch-resize-observer.umd.js", - "fesm2015": "../../fesm2015/zone-patch-resize-observer.js", - "es2015": "../../fesm2015/zone-patch-resize-observer.js", - "module": "../../fesm2015/zone-patch-resize-observer.js" -} diff --git a/packages/zone.js/plugins/zone-patch-rxjs-fake-async.min/package.json b/packages/zone.js/plugins/zone-patch-rxjs-fake-async.min/package.json deleted file mode 100644 index e8e2c0f78d994..0000000000000 --- a/packages/zone.js/plugins/zone-patch-rxjs-fake-async.min/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/zone-patch-rxjs-fake-async.min", - "main": "../../bundles/zone-patch-rxjs-fake-async.umd.min.js", - "fesm2015": "../../fesm2015/zone-patch-rxjs-fake-async.min.js", - "es2015": "../../fesm2015/zone-patch-rxjs-fake-async.min.js", - "module": "../../fesm2015/zone-patch-rxjs-fake-async.min.js" -} diff --git a/packages/zone.js/plugins/zone-patch-rxjs-fake-async/package.json b/packages/zone.js/plugins/zone-patch-rxjs-fake-async/package.json deleted file mode 100644 index 5384663123a29..0000000000000 --- a/packages/zone.js/plugins/zone-patch-rxjs-fake-async/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/zone-patch-rxjs-fake-async", - "main": "../../bundles/zone-patch-rxjs-fake-async.umd.js", - "fesm2015": "../../fesm2015/zone-patch-rxjs-fake-async.js", - "es2015": "../../fesm2015/zone-patch-rxjs-fake-async.js", - "module": "../../fesm2015/zone-patch-rxjs-fake-async.js" -} diff --git a/packages/zone.js/plugins/zone-patch-rxjs.min/package.json b/packages/zone.js/plugins/zone-patch-rxjs.min/package.json deleted file mode 100644 index fefe72012f544..0000000000000 --- a/packages/zone.js/plugins/zone-patch-rxjs.min/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/zone-patch-rxjs.min", - "main": "../../bundles/zone-patch-rxjs.umd.min.js", - "fesm2015": "../../fesm2015/zone-patch-rxjs.min.js", - "es2015": "../../fesm2015/zone-patch-rxjs.min.js", - "module": "../../fesm2015/zone-patch-rxjs.min.js" -} diff --git a/packages/zone.js/plugins/zone-patch-rxjs/package.json b/packages/zone.js/plugins/zone-patch-rxjs/package.json deleted file mode 100644 index 4529cc020b71a..0000000000000 --- a/packages/zone.js/plugins/zone-patch-rxjs/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/zone-patch-rxjs", - "main": "../../bundles/zone-patch-rxjs.umd.js", - "fesm2015": "../../fesm2015/zone-patch-rxjs.js", - "es2015": "../../fesm2015/zone-patch-rxjs.js", - "module": "../../fesm2015/zone-patch-rxjs.js" -} diff --git a/packages/zone.js/plugins/zone-patch-socket-io.min/package.json b/packages/zone.js/plugins/zone-patch-socket-io.min/package.json deleted file mode 100644 index 811eb6422806e..0000000000000 --- a/packages/zone.js/plugins/zone-patch-socket-io.min/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/zone-patch-socket-io.min", - "main": "../../bundles/zone-patch-socket-io.umd.min.js", - "fesm2015": "../../fesm2015/zone-patch-socket-io.min.js", - "es2015": "../../fesm2015/zone-patch-socket-io.min.js", - "module": "../../fesm2015/zone-patch-socket-io.min.js" -} diff --git a/packages/zone.js/plugins/zone-patch-socket-io/package.json b/packages/zone.js/plugins/zone-patch-socket-io/package.json deleted file mode 100644 index aa65a90fc1fdd..0000000000000 --- a/packages/zone.js/plugins/zone-patch-socket-io/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/zone-patch-socket-io", - "main": "../../bundles/zone-patch-socket-io.umd.js", - "fesm2015": "../../fesm2015/zone-patch-socket-io.js", - "es2015": "../../fesm2015/zone-patch-socket-io.js", - "module": "../../fesm2015/zone-patch-socket-io.js" -} diff --git a/packages/zone.js/plugins/zone-patch-user-media.min/package.json b/packages/zone.js/plugins/zone-patch-user-media.min/package.json deleted file mode 100644 index 4df7663d243cc..0000000000000 --- a/packages/zone.js/plugins/zone-patch-user-media.min/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/zone-patch-user-media.min", - "main": "../../bundles/zone-patch-user-media.umd.min.js", - "fesm2015": "../../fesm2015/zone-patch-user-media.min.js", - "es2015": "../../fesm2015/zone-patch-user-media.min.js", - "module": "../../fesm2015/zone-patch-user-media.min.js" -} diff --git a/packages/zone.js/plugins/zone-patch-user-media/package.json b/packages/zone.js/plugins/zone-patch-user-media/package.json deleted file mode 100644 index a0a8849a9e131..0000000000000 --- a/packages/zone.js/plugins/zone-patch-user-media/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "zone.js/zone-patch-user-media", - "main": "../../bundles/zone-patch-user-media.umd.js", - "fesm2015": "../../fesm2015/zone-patch-user-media.js", - "es2015": "../../fesm2015/zone-patch-user-media.js", - "module": "../../fesm2015/zone-patch-user-media.js" -} diff --git a/packages/zone.js/test/jest/jest-zone.js b/packages/zone.js/test/jest/jest-zone.js index 55ec80c9f9d63..36c1797e6f92e 100644 --- a/packages/zone.js/test/jest/jest-zone.js +++ b/packages/zone.js/test/jest/jest-zone.js @@ -1,7 +1,7 @@ const {legacyFakeTimers, modernFakeTimers} = global; -require('../../../../dist/bin/packages/zone.js/npm_package/dist/zone'); -require('../../../../dist/bin/packages/zone.js/npm_package/dist/zone-testing'); +require('../../../../dist/bin/packages/zone.js/npm_package/bundles/zone.umd.js'); +require('../../../../dist/bin/packages/zone.js/npm_package/bundles/zone-testing.umd.js'); if (Zone && Zone.patchJestObject) { Zone.patchJestObject(legacyFakeTimers); diff --git a/packages/zone.js/test/npm_package/npm_package.spec.ts b/packages/zone.js/test/npm_package/npm_package.spec.ts index daedd47df77b6..a2888b35027e4 100644 --- a/packages/zone.js/test/npm_package/npm_package.spec.ts +++ b/packages/zone.js/test/npm_package/npm_package.spec.ts @@ -113,86 +113,6 @@ describe('Zone.js npm_package', () => { }); }); - describe('plugins folder check', () => { - it('should contain all plugin folders in ./plugins', () => { - const expected = [ - 'async-test', - 'async-test.min', - 'fake-async-test', - 'fake-async-test.min', - 'jasmine-patch', - 'jasmine-patch.min', - 'long-stack-trace-zone', - 'long-stack-trace-zone.min', - 'mocha-patch', - 'mocha-patch.min', - 'proxy', - 'proxy.min', - 'sync-test', - 'sync-test.min', - 'task-tracking', - 'task-tracking.min', - 'webapis-media-query', - 'webapis-media-query.min', - 'webapis-notification', - 'webapis-notification.min', - 'webapis-rtc-peer-connection', - 'webapis-rtc-peer-connection.min', - 'webapis-shadydom', - 'webapis-shadydom.min', - 'wtf', - 'wtf.min', - 'zone-bluebird', - 'zone-bluebird.min', - 'zone-error', - 'zone-error.min', - 'zone-legacy', - 'zone-legacy.min', - 'zone-patch-canvas', - 'zone-patch-canvas.min', - 'zone-patch-cordova', - 'zone-patch-cordova.min', - 'zone-patch-electron', - 'zone-patch-electron.min', - 'zone-patch-fetch', - 'zone-patch-fetch.min', - 'zone-patch-jsonp', - 'zone-patch-jsonp.min', - 'zone-patch-message-port', - 'zone-patch-message-port.min', - 'zone-patch-promise-test', - 'zone-patch-promise-test.min', - 'zone-patch-resize-observer', - 'zone-patch-resize-observer.min', - 'zone-patch-rxjs-fake-async', - 'zone-patch-rxjs-fake-async.min', - 'zone-patch-rxjs', - 'zone-patch-rxjs.min', - 'zone-patch-socket-io', - 'zone-patch-socket-io.min', - 'zone-patch-user-media', - 'zone-patch-user-media.min', - ].sort(); - - checkInSubFolder('./plugins', () => { - const list = shx.ls('./').stdout.split('\n').sort().slice(1); - expect(list.length).toBe(expected.length); - for (let i = 0; i < list.length; i++) { - expect(list[i]).toEqual(expected[i]); - const packageJson = shx.cat(`${list[i]}/package.json`); - const umdMinName = list[i].indexOf('.min') === -1 ? - `${list[i]}.umd` : - `${list[i].substring(0, list[i].indexOf('.min'))}.umd.min`; - expect(packageJson).toContain(`"name": "zone.js/${list[i]}"`); - expect(packageJson).toContain(`"main": "../../bundles/${umdMinName}.js"`); - expect(packageJson).toContain(`"fesm2015": "../../fesm2015/${list[i]}.js"`); - expect(packageJson).toContain(`"es2015": "../../fesm2015/${list[i]}.js"`); - expect(packageJson).toContain(`"module": "../../fesm2015/${list[i]}.js"`); - } - }); - }); - }); - describe('bundles file list', () => { it('should contain all files', () => { const expected = [ @@ -285,90 +205,5 @@ describe('Zone.js npm_package', () => { }); }); }); - - describe('backward compatible check', () => { - it('should contain all original folders in /dist', () => { - const list = shx.ls('./dist').stdout.split('\n').sort().slice(1); - const expected = [ - 'async-test.js', - 'async-test.min.js', - 'fake-async-test.js', - 'fake-async-test.min.js', - 'jasmine-patch.js', - 'jasmine-patch.min.js', - 'long-stack-trace-zone.js', - 'long-stack-trace-zone.min.js', - 'mocha-patch.js', - 'mocha-patch.min.js', - 'proxy.js', - 'proxy.min.js', - 'sync-test.js', - 'sync-test.min.js', - 'task-tracking.js', - 'task-tracking.min.js', - 'webapis-media-query.js', - 'webapis-media-query.min.js', - 'webapis-notification.js', - 'webapis-notification.min.js', - 'webapis-rtc-peer-connection.js', - 'webapis-rtc-peer-connection.min.js', - 'webapis-shadydom.js', - 'webapis-shadydom.min.js', - 'wtf.js', - 'wtf.min.js', - 'zone_externs.js', - 'zone-bluebird.js', - 'zone-bluebird.min.js', - 'zone-error.js', - 'zone-error.min.js', - 'zone-evergreen.js', - 'zone-evergreen.min.js', - 'zone-evergreen-testing-bundle.js', - 'zone-evergreen-testing-bundle.min.js', - 'zone-legacy.js', - 'zone-legacy.min.js', - 'zone-mix.js', - 'zone-mix.min.js', - 'zone-node.js', - 'zone-node.min.js', - 'zone-patch-canvas.js', - 'zone-patch-canvas.min.js', - 'zone-patch-cordova.js', - 'zone-patch-cordova.min.js', - 'zone-patch-electron.js', - 'zone-patch-electron.min.js', - 'zone-patch-fetch.js', - 'zone-patch-fetch.min.js', - 'zone-patch-jsonp.js', - 'zone-patch-jsonp.min.js', - 'zone-patch-message-port.js', - 'zone-patch-message-port.min.js', - 'zone-patch-promise-test.js', - 'zone-patch-promise-test.min.js', - 'zone-patch-resize-observer.js', - 'zone-patch-resize-observer.min.js', - 'zone-patch-rxjs-fake-async.js', - 'zone-patch-rxjs-fake-async.min.js', - 'zone-patch-rxjs.js', - 'zone-patch-rxjs.min.js', - 'zone-patch-socket-io.js', - 'zone-patch-socket-io.min.js', - 'zone-patch-user-media.js', - 'zone-patch-user-media.min.js', - 'zone-testing-bundle.js', - 'zone-testing-bundle.min.js', - 'zone-testing-node-bundle.js', - 'zone-testing-node-bundle.min.js', - 'zone-testing.js', - 'zone-testing.min.js', - 'zone.js', - 'zone.js.d.ts', - 'zone.api.extensions.ts', - 'zone.configurations.api.ts', - 'zone.min.js', - ].sort(); - expect(list).toEqual(expected); - }); - }); }); }); diff --git a/packages/zone.js/testing/BUILD.bazel b/packages/zone.js/testing/BUILD.bazel deleted file mode 100644 index 11a7cfa6026c1..0000000000000 --- a/packages/zone.js/testing/BUILD.bazel +++ /dev/null @@ -1,3 +0,0 @@ -exports_files([ - "package.json", -]) diff --git a/packages/zone.js/testing/package.json b/packages/zone.js/testing/package.json deleted file mode 100644 index 93a9a1a1de7ff..0000000000000 --- a/packages/zone.js/testing/package.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "zone-testing", - "description": "Testing library implemented by zone.js", - "main": "../bundles/zone-testing.umd.js", - "module": "../fesm2015/zone-testing.js", - "es2015": "../fesm2015/zone-testing.js", - "fesm2015": "../fesm2015/zone-testing.js" -} diff --git a/tools/esm-interop/patches/npm/@angular+build-tooling+0.0.0-8d4803573edc70b90a1134ffa996303d1dcc18a9.patch b/tools/esm-interop/patches/npm/@angular+build-tooling+0.0.0-0109d498b0f6aae418ed4924a5e5c65695f0ac61.patch similarity index 98% rename from tools/esm-interop/patches/npm/@angular+build-tooling+0.0.0-8d4803573edc70b90a1134ffa996303d1dcc18a9.patch rename to tools/esm-interop/patches/npm/@angular+build-tooling+0.0.0-0109d498b0f6aae418ed4924a5e5c65695f0ac61.patch index 3bf58e3d41dd0..e446b7bf0fa94 100644 --- a/tools/esm-interop/patches/npm/@angular+build-tooling+0.0.0-8d4803573edc70b90a1134ffa996303d1dcc18a9.patch +++ b/tools/esm-interop/patches/npm/@angular+build-tooling+0.0.0-0109d498b0f6aae418ed4924a5e5c65695f0ac61.patch @@ -6,7 +6,7 @@ index 6cee158..815a55d 100755 load("@npm//@angular/build-tooling/bazel:extract_types.bzl", "extract_types") -load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary", "nodejs_test") +load("@angular//tools/esm-interop:index.bzl", "nodejs_binary", "nodejs_test") - + nodejs_test_args = [ # Needed so that node doesn't walk back to the source directory. diff --git a/node_modules/@angular/build-tooling/bazel/app-bundling/BUILD.bazel b/node_modules/@angular/build-tooling/bazel/app-bundling/BUILD.bazel @@ -16,21 +16,21 @@ index 1c27a95..c239203 100755 @@ -1,4 +1,4 @@ -load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary") +load("@angular//tools/esm-interop:index.bzl", "nodejs_binary") - + package(default_visibility = ["//visibility:public"]) - + diff --git a/node_modules/@angular/build-tooling/bazel/app-bundling/esbuild.config-tmpl.mjs b/node_modules/@angular/build-tooling/bazel/app-bundling/esbuild.config-tmpl.mjs -index f006d34..c17cefe 100755 +index 81e67de..d1c1ac0 100755 --- a/node_modules/@angular/build-tooling/bazel/app-bundling/esbuild.config-tmpl.mjs +++ b/node_modules/@angular/build-tooling/bazel/app-bundling/esbuild.config-tmpl.mjs @@ -7,7 +7,7 @@ */ - + import {createEsbuildAngularOptimizePlugin} from '@angular/build-tooling/shared-scripts/angular-optimization/esbuild-plugin.mjs'; -import {GLOBAL_DEFS_FOR_TERSER_WITH_AOT} from '@angular/compiler-cli/private/tooling'; +import {GLOBAL_DEFS_FOR_TERSER_WITH_AOT} from '@angular/compiler-cli/private/tooling.mjs'; import * as path from 'path'; - + /** Root path pointing to the app bundle source entry-point file. */ diff --git a/node_modules/@angular/build-tooling/bazel/app-bundling/index.bzl b/node_modules/@angular/build-tooling/bazel/app-bundling/index.bzl index d6249b8..761d50a 100755 @@ -52,13 +52,13 @@ index 8bfab84..175cc9d 100755 @@ -1,4 +1,4 @@ -load("@npm//@bazel/protractor:index.bzl", "protractor_web_test_suite") +load("@angular//tools:defaults.bzl", "protractor_web_test_suite") - + """ Macro that can be used to define a benchmark test. This differentiates from @@ -7,7 +7,7 @@ load("@npm//@bazel/protractor:index.bzl", "protractor_web_test_suite") unless explicitly requested. """ - + -def benchmark_test(name, server, tags = [], **kwargs): +def benchmark_test(name, server, tags = [], data = [], **kwargs): protractor_web_test_suite( @@ -73,7 +73,7 @@ index 8bfab84..175cc9d 100755 "manual", "no-remote-exec", diff --git a/node_modules/@angular/build-tooling/bazel/benchmark/component_benchmark/component_benchmark.bzl b/node_modules/@angular/build-tooling/bazel/benchmark/component_benchmark/component_benchmark.bzl -index 6213703..4d91aa3 100755 +index 6213703..0c1d70f 100755 --- a/node_modules/@angular/build-tooling/bazel/benchmark/component_benchmark/component_benchmark.bzl +++ b/node_modules/@angular/build-tooling/bazel/benchmark/component_benchmark/component_benchmark.bzl @@ -1,7 +1,7 @@ @@ -84,7 +84,7 @@ index 6213703..4d91aa3 100755 +load("@angular//tools:defaults.bzl", "ng_module") load("@npm//@bazel/concatjs:index.bzl", "ts_library") load(":benchmark_test.bzl", "benchmark_test") - + @@ -37,8 +37,8 @@ def component_benchmark( driver_deps, ng_srcs, @@ -101,8 +101,8 @@ index 6213703..4d91aa3 100755 # scope and to make it easier to replace this dependency inside the `angular/angular` # repository with its corresponding source target that does not come with any typings. - ng_bundle_deps.append("@npm//zone.js") -+ ng_bundle_deps.append("@angular//packages/zone.js/dist:zone") - ++ ng_bundle_deps.append("@angular//packages/zone.js:npm_package") + if not assets: html = prefix + "index.html" diff --git a/node_modules/@angular/build-tooling/bazel/http-server/BUILD.bazel b/node_modules/@angular/build-tooling/bazel/http-server/BUILD.bazel @@ -113,7 +113,7 @@ index 04cc755..ec01017 100755 -load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary") +load("@angular//tools/esm-interop:index.bzl", "nodejs_binary") load("@npm//@bazel/concatjs:index.bzl", "ts_library") - + package(default_visibility = ["//visibility:public"]) diff --git a/node_modules/@angular/build-tooling/bazel/integration/index.bzl b/node_modules/@angular/build-tooling/bazel/integration/index.bzl index 662272d..9fc6330 100755 @@ -122,7 +122,7 @@ index 662272d..9fc6330 100755 @@ -1,4 +1,4 @@ -load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_test") +load("@angular//tools/esm-interop:index.bzl", "nodejs_test") - + def _serialize_file(file): """Serializes a file into a struct that matches the `BazelFileInfo` type in the diff --git a/node_modules/@angular/build-tooling/bazel/map-size-tracking/index.bzl b/node_modules/@angular/build-tooling/bazel/map-size-tracking/index.bzl @@ -132,12 +132,12 @@ index af0f305..ce46302 100755 @@ -3,7 +3,7 @@ # Use of this source code is governed by an MIT-style license that can be # found in the LICENSE file at https://angular.io/license - + -load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary", "nodejs_test") +load("@angular//tools/esm-interop:index.bzl", "nodejs_binary", "nodejs_test") - + nodejs_args = ["--nobazel_run_linker"] - + diff --git a/node_modules/@angular/build-tooling/shared-scripts/angular-optimization/BUILD.bazel b/node_modules/@angular/build-tooling/shared-scripts/angular-optimization/BUILD.bazel index 870da1b..e0bdb71 100755 --- a/node_modules/@angular/build-tooling/shared-scripts/angular-optimization/BUILD.bazel @@ -157,7 +157,7 @@ index 6d5ec3f..a4ebfd7 100755 --- a/node_modules/@angular/build-tooling/shared-scripts/angular-optimization/esbuild-plugin.mjs +++ b/node_modules/@angular/build-tooling/shared-scripts/angular-optimization/esbuild-plugin.mjs @@ -60,8 +60,8 @@ export async function createEsbuildAngularOptimizePlugin(opts, additionalBabelPl - + if (opts.enableLinker) { linkerCreator = { - compiler: await import('@angular/compiler-cli'), @@ -166,4 +166,4 @@ index 6d5ec3f..a4ebfd7 100755 + babel: await import('@angular/compiler-cli/linker/babel/index.mjs'), }; } - +