From 583a9d38a10dad1afacdcfd565050ee03fa246e2 Mon Sep 17 00:00:00 2001 From: JiaLiPassion Date: Sun, 17 May 2020 10:53:03 +0900 Subject: [PATCH] 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 --- .circleci/config.yml | 4 +- BUILD.bazel | 6 +- aio/content/examples/setup/src/index.html | 2 +- .../src/index-a-to-ajs-providers.html | 2 +- .../src/index-a-to-ajs-transclusion.html | 2 +- .../src/index-ajs-a-hybrid-bootstrap.html | 2 +- .../src/index-ajs-to-a-projection.html | 2 +- .../src/index-ajs-to-a-providers.html | 2 +- .../src/index-downgrade-io.html | 2 +- .../src/index-downgrade-static.html | 2 +- .../upgrade-module/src/index-upgrade-io.html | 2 +- .../src/index-upgrade-static.html | 2 +- .../upgrade-phonecat-2-hybrid/aot/index.html | 2 +- .../copy-dist-files.js | 5 +- .../upgrade-phonecat-2-hybrid/index.html | 2 +- .../karma.conf.ajs.js | 4 +- .../upgrade-phonecat-2-hybrid/karma.conf.js | 4 +- .../upgrade-phonecat-3-final/index.html | 2 +- .../upgrade-phonecat-3-final/karma.conf.js | 4 +- aio/content/guide/browser-support.md | 2 +- aio/content/guide/universal.md | 2 +- .../component_benchmark.bzl | 2 +- integration/bazel/package.json | 2 +- integration/bazel/src/BUILD.bazel | 4 +- integration/bazel/src/hello-world/BUILD.bazel | 2 +- integration/bazel/src/index.html | 2 +- integration/bazel/yarn.lock | 405 +++++------------- integration/dynamic-compiler/index.html | 2 +- integration/hello_world__closure/closure.conf | 2 +- .../hello_world__closure/src/index.html | 4 +- integration/hello_world__closure/yarn.lock | 255 +++++++++-- .../hello_world__systemjs_umd/src/index.html | 2 +- integration/i18n/closure.conf | 2 +- integration/i18n/src/index.html | 4 +- integration/ng_elements/closure.conf | 2 +- .../platform-server/src/helloworld/client.ts | 2 +- integration/platform-server/src/server.ts | 2 +- .../src/transferstate/client.ts | 2 +- integration/platform-server/yarn.lock | 374 ++++++---------- karma-js.conf.js | 6 +- .../transplanted_views/BUILD.bazel | 2 +- .../benchmarks/src/expanding_rows/BUILD.bazel | 4 +- .../src/js-web-frameworks/ng2/BUILD.bazel | 2 +- .../benchmarks/src/largeform/ng2/BUILD.bazel | 2 +- .../benchmarks/src/largetable/ng2/BUILD.bazel | 2 +- .../src/largetable/ng2_switch/BUILD.bazel | 2 +- .../benchmarks/src/styling/ng2/BUILD.bazel | 2 +- modules/benchmarks/src/tree/ng2/BUILD.bazel | 2 +- .../src/tree/ng2_static/BUILD.bazel | 2 +- .../src/tree/ng2_switch/BUILD.bazel | 2 +- modules/benchmarks/src/views/BUILD.bazel | 4 +- modules/benchmarks/src/views/index.html | 2 +- modules/playground/src/animate/BUILD.bazel | 2 +- modules/playground/src/async/BUILD.bazel | 2 +- modules/playground/src/gestures/BUILD.bazel | 2 +- .../playground/src/hello_world/BUILD.bazel | 2 +- modules/playground/src/http/BUILD.bazel | 2 +- modules/playground/src/jsonp/BUILD.bazel | 2 +- modules/playground/src/key_events/BUILD.bazel | 2 +- .../src/model_driven_forms/BUILD.bazel | 2 +- .../src/order_management/BUILD.bazel | 2 +- .../src/person_management/BUILD.bazel | 2 +- .../src/relative_assets/BUILD.bazel | 2 +- modules/playground/src/routing/BUILD.bazel | 2 +- modules/playground/src/routing/index.html | 2 +- modules/playground/src/sourcemap/BUILD.bazel | 2 +- modules/playground/src/svg/BUILD.bazel | 2 +- .../src/template_driven_forms/BUILD.bazel | 2 +- modules/playground/src/todo/BUILD.bazel | 2 +- modules/playground/src/upgrade/BUILD.bazel | 2 +- .../playground/src/web_workers/BUILD.bazel | 2 +- .../src/web_workers/animations/BUILD.bazel | 2 +- .../src/web_workers/images/BUILD.bazel | 2 +- .../src/web_workers/input/BUILD.bazel | 4 +- .../src/web_workers/kitchen_sink/BUILD.bazel | 4 +- .../web_workers/message_broker/BUILD.bazel | 4 +- .../src/web_workers/router/BUILD.bazel | 4 +- .../src/web_workers/todo/BUILD.bazel | 4 +- .../src/web_workers/worker-configure.js | 4 +- .../src/zippy_component/BUILD.bazel | 2 +- .../bazel/src/schematics/ng-add/index_spec.ts | 2 +- packages/elements/test/BUILD.bazel | 4 +- packages/examples/common/BUILD.bazel | 2 +- packages/examples/core/BUILD.bazel | 4 +- packages/examples/forms/BUILD.bazel | 2 +- .../router/activated-route/BUILD.bazel | 2 +- .../examples/service-worker/push/BUILD.bazel | 2 +- .../registration-options/BUILD.bazel | 2 +- packages/examples/upgrade/upgrade_example.bzl | 2 +- packages/router/karma.conf.js | 4 +- packages/zone.js/BUILD.bazel | 71 ++- packages/zone.js/bundles.bzl | 182 ++++++-- packages/zone.js/bundles/BUILD.bazel | 8 + packages/zone.js/dist/BUILD.bazel | 130 +++--- .../zone.js/dist/async-test.min/package.json | 7 + packages/zone.js/dist/async-test/package.json | 7 + .../dist/fake-async-test.min/package.json | 7 + .../zone.js/dist/fake-async-test/package.json | 7 + .../dist/jasmine-patch.min/package.json | 7 + .../zone.js/dist/jasmine-patch/package.json | 7 + .../long-stack-trace-zone.min/package.json | 7 + .../dist/long-stack-trace-zone/package.json | 7 + .../zone.js/dist/mocha-patch.min/package.json | 7 + .../zone.js/dist/mocha-patch/package.json | 7 + packages/zone.js/dist/proxy.min/package.json | 7 + packages/zone.js/dist/proxy/package.json | 7 + .../zone.js/dist/sync-test.min/package.json | 7 + packages/zone.js/dist/sync-test/package.json | 7 + .../dist/task-tracking.min/package.json | 7 + .../zone.js/dist/task-tracking/package.json | 7 + packages/zone.js/dist/tools.bzl | 36 -- .../dist/webapis-media-query.min/package.json | 7 + .../dist/webapis-media-query/package.json | 7 + .../webapis-notification.min/package.json | 7 + .../dist/webapis-notification/package.json | 7 + .../package.json | 7 + .../webapis-rtc-peer-connection/package.json | 7 + .../dist/webapis-shadydom.min/package.json | 7 + .../dist/webapis-shadydom/package.json | 7 + packages/zone.js/dist/wtf.min/package.json | 7 + packages/zone.js/dist/wtf/package.json | 7 + .../dist/zone-bluebird.min/package.json | 7 + .../zone.js/dist/zone-bluebird/package.json | 7 + .../zone.js/dist/zone-error.min/package.json | 7 + packages/zone.js/dist/zone-error/package.json | 7 + .../package.json | 7 + .../package.json | 7 + .../dist/zone-evergreen.min/package.json | 7 + .../zone.js/dist/zone-evergreen/package.json | 7 + .../zone.js/dist/zone-legacy.min/package.json | 7 + .../zone.js/dist/zone-legacy/package.json | 7 + .../zone.js/dist/zone-mix.min/package.json | 7 + packages/zone.js/dist/zone-mix/package.json | 7 + .../zone.js/dist/zone-node.min/package.json | 7 + packages/zone.js/dist/zone-node/package.json | 7 + .../dist/zone-patch-canvas.min/package.json | 7 + .../dist/zone-patch-canvas/package.json | 7 + .../dist/zone-patch-cordova.min/package.json | 7 + .../dist/zone-patch-cordova/package.json | 7 + .../dist/zone-patch-electron.min/package.json | 7 + .../dist/zone-patch-electron/package.json | 7 + .../dist/zone-patch-fetch.min/package.json | 7 + .../dist/zone-patch-fetch/package.json | 7 + .../dist/zone-patch-jsonp.min/package.json | 7 + .../dist/zone-patch-jsonp/package.json | 7 + .../zone-patch-message-port.min/package.json | 7 + .../dist/zone-patch-message-port/package.json | 7 + .../zone-patch-promise-test.min/package.json | 7 + .../dist/zone-patch-promise-test/package.json | 7 + .../package.json | 7 + .../zone-patch-resize-observer/package.json | 7 + .../package.json | 7 + .../zone-patch-rxjs-fake-async/package.json | 7 + .../dist/zone-patch-rxjs.min/package.json | 7 + .../zone.js/dist/zone-patch-rxjs/package.json | 7 + .../zone-patch-socket-io.min/package.json | 7 + .../dist/zone-patch-socket-io/package.json | 7 + .../zone-patch-user-media.min/package.json | 7 + .../dist/zone-patch-user-media/package.json | 7 + .../dist/zone-testing-bundle.min/package.json | 7 + .../dist/zone-testing-bundle/package.json | 7 + .../zone-testing-node-bundle.min/package.json | 7 + .../zone-testing-node-bundle/package.json | 7 + .../dist/zone-testing.min/package.json | 7 + .../zone.js/dist/zone-testing/package.json | 7 + packages/zone.js/dist/zone.min/package.json | 7 + packages/zone.js/dist/zone/package.json | 7 + .../zone.js/dist/zone_externs/package.json | 7 + packages/zone.js/fesm2015/BUILD.bazel | 8 + .../zone.js/lib/zone-spec/fake-async-test.ts | 43 +- packages/zone.js/mix/BUILD.bazel | 3 + packages/zone.js/mix/package.json | 8 + packages/zone.js/node/BUILD.bazel | 3 + packages/zone.js/node/package.json | 8 + packages/zone.js/package.json | 15 +- packages/zone.js/test/BUILD.bazel | 18 +- packages/zone.js/test/extra/electron.js | 4 +- packages/zone.js/test/karma_test.bzl | 20 +- .../test/npm_package/npm_package.spec.ts | 190 ++++++-- packages/zone.js/testing/BUILD.bazel | 3 + packages/zone.js/testing/package.json | 8 + packages/zone.js/tools.bzl | 90 ++++ 182 files changed, 1710 insertions(+), 904 deletions(-) create mode 100644 packages/zone.js/bundles/BUILD.bazel create mode 100644 packages/zone.js/dist/async-test.min/package.json create mode 100644 packages/zone.js/dist/async-test/package.json create mode 100644 packages/zone.js/dist/fake-async-test.min/package.json create mode 100644 packages/zone.js/dist/fake-async-test/package.json create mode 100644 packages/zone.js/dist/jasmine-patch.min/package.json create mode 100644 packages/zone.js/dist/jasmine-patch/package.json create mode 100644 packages/zone.js/dist/long-stack-trace-zone.min/package.json create mode 100644 packages/zone.js/dist/long-stack-trace-zone/package.json create mode 100644 packages/zone.js/dist/mocha-patch.min/package.json create mode 100644 packages/zone.js/dist/mocha-patch/package.json create mode 100644 packages/zone.js/dist/proxy.min/package.json create mode 100644 packages/zone.js/dist/proxy/package.json create mode 100644 packages/zone.js/dist/sync-test.min/package.json create mode 100644 packages/zone.js/dist/sync-test/package.json create mode 100644 packages/zone.js/dist/task-tracking.min/package.json create mode 100644 packages/zone.js/dist/task-tracking/package.json delete mode 100644 packages/zone.js/dist/tools.bzl create mode 100644 packages/zone.js/dist/webapis-media-query.min/package.json create mode 100644 packages/zone.js/dist/webapis-media-query/package.json create mode 100644 packages/zone.js/dist/webapis-notification.min/package.json create mode 100644 packages/zone.js/dist/webapis-notification/package.json create mode 100644 packages/zone.js/dist/webapis-rtc-peer-connection.min/package.json create mode 100644 packages/zone.js/dist/webapis-rtc-peer-connection/package.json create mode 100644 packages/zone.js/dist/webapis-shadydom.min/package.json create mode 100644 packages/zone.js/dist/webapis-shadydom/package.json create mode 100644 packages/zone.js/dist/wtf.min/package.json create mode 100644 packages/zone.js/dist/wtf/package.json create mode 100644 packages/zone.js/dist/zone-bluebird.min/package.json create mode 100644 packages/zone.js/dist/zone-bluebird/package.json create mode 100644 packages/zone.js/dist/zone-error.min/package.json create mode 100644 packages/zone.js/dist/zone-error/package.json create mode 100644 packages/zone.js/dist/zone-evergreen-testing-bundle.min/package.json create mode 100644 packages/zone.js/dist/zone-evergreen-testing-bundle/package.json create mode 100644 packages/zone.js/dist/zone-evergreen.min/package.json create mode 100644 packages/zone.js/dist/zone-evergreen/package.json create mode 100644 packages/zone.js/dist/zone-legacy.min/package.json create mode 100644 packages/zone.js/dist/zone-legacy/package.json create mode 100644 packages/zone.js/dist/zone-mix.min/package.json create mode 100644 packages/zone.js/dist/zone-mix/package.json create mode 100644 packages/zone.js/dist/zone-node.min/package.json create mode 100644 packages/zone.js/dist/zone-node/package.json create mode 100644 packages/zone.js/dist/zone-patch-canvas.min/package.json create mode 100644 packages/zone.js/dist/zone-patch-canvas/package.json create mode 100644 packages/zone.js/dist/zone-patch-cordova.min/package.json create mode 100644 packages/zone.js/dist/zone-patch-cordova/package.json create mode 100644 packages/zone.js/dist/zone-patch-electron.min/package.json create mode 100644 packages/zone.js/dist/zone-patch-electron/package.json create mode 100644 packages/zone.js/dist/zone-patch-fetch.min/package.json create mode 100644 packages/zone.js/dist/zone-patch-fetch/package.json create mode 100644 packages/zone.js/dist/zone-patch-jsonp.min/package.json create mode 100644 packages/zone.js/dist/zone-patch-jsonp/package.json create mode 100644 packages/zone.js/dist/zone-patch-message-port.min/package.json create mode 100644 packages/zone.js/dist/zone-patch-message-port/package.json create mode 100644 packages/zone.js/dist/zone-patch-promise-test.min/package.json create mode 100644 packages/zone.js/dist/zone-patch-promise-test/package.json create mode 100644 packages/zone.js/dist/zone-patch-resize-observer.min/package.json create mode 100644 packages/zone.js/dist/zone-patch-resize-observer/package.json create mode 100644 packages/zone.js/dist/zone-patch-rxjs-fake-async.min/package.json create mode 100644 packages/zone.js/dist/zone-patch-rxjs-fake-async/package.json create mode 100644 packages/zone.js/dist/zone-patch-rxjs.min/package.json create mode 100644 packages/zone.js/dist/zone-patch-rxjs/package.json create mode 100644 packages/zone.js/dist/zone-patch-socket-io.min/package.json create mode 100644 packages/zone.js/dist/zone-patch-socket-io/package.json create mode 100644 packages/zone.js/dist/zone-patch-user-media.min/package.json create mode 100644 packages/zone.js/dist/zone-patch-user-media/package.json create mode 100644 packages/zone.js/dist/zone-testing-bundle.min/package.json create mode 100644 packages/zone.js/dist/zone-testing-bundle/package.json create mode 100644 packages/zone.js/dist/zone-testing-node-bundle.min/package.json create mode 100644 packages/zone.js/dist/zone-testing-node-bundle/package.json create mode 100644 packages/zone.js/dist/zone-testing.min/package.json create mode 100644 packages/zone.js/dist/zone-testing/package.json create mode 100644 packages/zone.js/dist/zone.min/package.json create mode 100644 packages/zone.js/dist/zone/package.json create mode 100644 packages/zone.js/dist/zone_externs/package.json create mode 100644 packages/zone.js/fesm2015/BUILD.bazel create mode 100644 packages/zone.js/mix/BUILD.bazel create mode 100644 packages/zone.js/mix/package.json create mode 100644 packages/zone.js/node/BUILD.bazel create mode 100644 packages/zone.js/node/package.json create mode 100644 packages/zone.js/testing/BUILD.bazel create mode 100644 packages/zone.js/testing/package.json create mode 100644 packages/zone.js/tools.bzl diff --git a/.circleci/config.yml b/.circleci/config.yml index 398b698ee7..625c644f70 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -731,8 +731,8 @@ jobs: - run: yarn --cwd packages/zone.js promisetest - run: yarn --cwd packages/zone.js promisefinallytest - run: yarn bazel build //packages/zone.js:npm_package && - cp dist/bin/packages/zone.js/npm_package/dist/zone-mix.js ./packages/zone.js/test/extra/ && - cp dist/bin/packages/zone.js/npm_package/dist/zone-patch-electron.js ./packages/zone.js/test/extra/ && + cp dist/bin/packages/zone.js/npm_package/bundles/zone-mix.umd.js ./packages/zone.js/test/extra/ && + cp dist/bin/packages/zone.js/npm_package/bundles/zone-patch-electron.umd.js ./packages/zone.js/test/extra/ && yarn --cwd packages/zone.js electrontest - run: yarn --cwd packages/zone.js jesttest diff --git a/BUILD.bazel b/BUILD.bazel index 7a97832224..48e84cc328 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -20,9 +20,9 @@ filegroup( # do not sort srcs = [ "@npm//:node_modules/core-js/client/core.js", - "//packages/zone.js/dist:zone.js", - "//packages/zone.js/dist:zone-testing.js", - "//packages/zone.js/dist:task-tracking.js", + "//packages/zone.js/bundles:zone.umd.js", + "//packages/zone.js/bundles:zone-testing.umd.js", + "//packages/zone.js/bundles:task-tracking.umd.js", "//:test-events.js", "//:shims_for_IE.js", # Including systemjs because it defines `__eval`, which produces correct stack traces. diff --git a/aio/content/examples/setup/src/index.html b/aio/content/examples/setup/src/index.html index d28fe05691..9943adfb10 100644 --- a/aio/content/examples/setup/src/index.html +++ b/aio/content/examples/setup/src/index.html @@ -11,7 +11,7 @@ - + - + diff --git a/aio/content/examples/upgrade-module/src/index-a-to-ajs-transclusion.html b/aio/content/examples/upgrade-module/src/index-a-to-ajs-transclusion.html index 767ce3312b..9a03da2748 100644 --- a/aio/content/examples/upgrade-module/src/index-a-to-ajs-transclusion.html +++ b/aio/content/examples/upgrade-module/src/index-a-to-ajs-transclusion.html @@ -12,7 +12,7 @@ - + diff --git a/aio/content/examples/upgrade-module/src/index-ajs-a-hybrid-bootstrap.html b/aio/content/examples/upgrade-module/src/index-ajs-a-hybrid-bootstrap.html index 7bcc58d0ee..f00aaf722f 100644 --- a/aio/content/examples/upgrade-module/src/index-ajs-a-hybrid-bootstrap.html +++ b/aio/content/examples/upgrade-module/src/index-ajs-a-hybrid-bootstrap.html @@ -12,7 +12,7 @@ - + diff --git a/aio/content/examples/upgrade-module/src/index-ajs-to-a-projection.html b/aio/content/examples/upgrade-module/src/index-ajs-to-a-projection.html index a49e5070df..4ce22ee94f 100644 --- a/aio/content/examples/upgrade-module/src/index-ajs-to-a-projection.html +++ b/aio/content/examples/upgrade-module/src/index-ajs-to-a-projection.html @@ -12,7 +12,7 @@ - + diff --git a/aio/content/examples/upgrade-module/src/index-ajs-to-a-providers.html b/aio/content/examples/upgrade-module/src/index-ajs-to-a-providers.html index a0cc20d068..c545edf8e6 100644 --- a/aio/content/examples/upgrade-module/src/index-ajs-to-a-providers.html +++ b/aio/content/examples/upgrade-module/src/index-ajs-to-a-providers.html @@ -12,7 +12,7 @@ - + diff --git a/aio/content/examples/upgrade-module/src/index-downgrade-io.html b/aio/content/examples/upgrade-module/src/index-downgrade-io.html index 0d71f04404..48956abdf4 100644 --- a/aio/content/examples/upgrade-module/src/index-downgrade-io.html +++ b/aio/content/examples/upgrade-module/src/index-downgrade-io.html @@ -12,7 +12,7 @@ - + diff --git a/aio/content/examples/upgrade-module/src/index-downgrade-static.html b/aio/content/examples/upgrade-module/src/index-downgrade-static.html index fe4e327292..7b68bc1cba 100644 --- a/aio/content/examples/upgrade-module/src/index-downgrade-static.html +++ b/aio/content/examples/upgrade-module/src/index-downgrade-static.html @@ -12,7 +12,7 @@ - + diff --git a/aio/content/examples/upgrade-module/src/index-upgrade-io.html b/aio/content/examples/upgrade-module/src/index-upgrade-io.html index 7d87a2fa27..e57a05bac2 100644 --- a/aio/content/examples/upgrade-module/src/index-upgrade-io.html +++ b/aio/content/examples/upgrade-module/src/index-upgrade-io.html @@ -12,7 +12,7 @@ - + diff --git a/aio/content/examples/upgrade-module/src/index-upgrade-static.html b/aio/content/examples/upgrade-module/src/index-upgrade-static.html index bd36796c55..74461d9ce2 100644 --- a/aio/content/examples/upgrade-module/src/index-upgrade-static.html +++ b/aio/content/examples/upgrade-module/src/index-upgrade-static.html @@ -12,7 +12,7 @@ - + diff --git a/aio/content/examples/upgrade-phonecat-2-hybrid/aot/index.html b/aio/content/examples/upgrade-phonecat-2-hybrid/aot/index.html index fdc9584928..a051e91e8d 100644 --- a/aio/content/examples/upgrade-phonecat-2-hybrid/aot/index.html +++ b/aio/content/examples/upgrade-phonecat-2-hybrid/aot/index.html @@ -26,7 +26,7 @@ - + diff --git a/aio/content/examples/upgrade-phonecat-2-hybrid/copy-dist-files.js b/aio/content/examples/upgrade-phonecat-2-hybrid/copy-dist-files.js index a857af085c..50088e69ea 100644 --- a/aio/content/examples/upgrade-phonecat-2-hybrid/copy-dist-files.js +++ b/aio/content/examples/upgrade-phonecat-2-hybrid/copy-dist-files.js @@ -3,7 +3,7 @@ var fsExtra = require('fs-extra'); var resources = [ // polyfills 'node_modules/core-js/client/shim.min.js', - 'node_modules/zone.js/dist/zone.min.js', + 'node_modules/zone.js/bundles/zone.umd.min.js', // css 'app/app.css', 'app/app.animations.css', @@ -20,6 +20,7 @@ var resources = [ 'app/phone-detail/phone-detail.module.js' ]; resources.map(function(sourcePath) { - var destPath = `aot/${sourcePath}`; + // Need to rename zone.umd.min.js to zone.min.js + var destPath = `aot/${sourcePath}`.replace('.umd.min.js', '.min.js'); fsExtra.copySync(sourcePath, destPath); }); diff --git a/aio/content/examples/upgrade-phonecat-2-hybrid/index.html b/aio/content/examples/upgrade-phonecat-2-hybrid/index.html index f747e641e0..f313fb2855 100644 --- a/aio/content/examples/upgrade-phonecat-2-hybrid/index.html +++ b/aio/content/examples/upgrade-phonecat-2-hybrid/index.html @@ -27,7 +27,7 @@ - + diff --git a/aio/content/examples/upgrade-phonecat-2-hybrid/karma.conf.ajs.js b/aio/content/examples/upgrade-phonecat-2-hybrid/karma.conf.ajs.js index 699b5075f7..ee2d3ea8e9 100644 --- a/aio/content/examples/upgrade-phonecat-2-hybrid/karma.conf.ajs.js +++ b/aio/content/examples/upgrade-phonecat-2-hybrid/karma.conf.ajs.js @@ -21,8 +21,8 @@ module.exports = function(config) { 'node_modules/core-js/client/shim.js', // zone.js - 'node_modules/zone.js/dist/zone.js', - 'node_modules/zone.js/dist/zone-testing.js', + 'node_modules/zone.js/bundles/zone.umd.js', + 'node_modules/zone.js/bundles/zone-testing.umd.js', // RxJs. { pattern: 'node_modules/rxjs/**/*.js', included: false, watched: false }, diff --git a/aio/content/examples/upgrade-phonecat-2-hybrid/karma.conf.js b/aio/content/examples/upgrade-phonecat-2-hybrid/karma.conf.js index fe8a6bc8dc..a90f534178 100644 --- a/aio/content/examples/upgrade-phonecat-2-hybrid/karma.conf.js +++ b/aio/content/examples/upgrade-phonecat-2-hybrid/karma.conf.js @@ -31,8 +31,8 @@ module.exports = function(config) { 'node_modules/core-js/client/shim.js', // zone.js - 'node_modules/zone.js/dist/zone.js', - 'node_modules/zone.js/dist/zone-testing.js', + 'node_modules/zone.js/bundles/zone.umd.js', + 'node_modules/zone.js/bundles/zone-testing.umd.js', // RxJs { pattern: 'node_modules/rxjs/**/*.js', included: false, watched: false }, diff --git a/aio/content/examples/upgrade-phonecat-3-final/index.html b/aio/content/examples/upgrade-phonecat-3-final/index.html index fee59370e6..5a74aba36d 100644 --- a/aio/content/examples/upgrade-phonecat-3-final/index.html +++ b/aio/content/examples/upgrade-phonecat-3-final/index.html @@ -12,7 +12,7 @@ - + diff --git a/aio/content/examples/upgrade-phonecat-3-final/karma.conf.js b/aio/content/examples/upgrade-phonecat-3-final/karma.conf.js index d290d6e61e..455eae2715 100644 --- a/aio/content/examples/upgrade-phonecat-3-final/karma.conf.js +++ b/aio/content/examples/upgrade-phonecat-3-final/karma.conf.js @@ -31,8 +31,8 @@ module.exports = function(config) { 'node_modules/core-js/client/shim.js', // zone.js - 'node_modules/zone.js/dist/zone.js', - 'node_modules/zone.js/dist/zone-testing.js', + 'node_modules/zone.js/bundles/zone.umd.js', + 'node_modules/zone.js/bundles/zone-testing.umd.js', // RxJs { pattern: 'node_modules/rxjs/**/*.js', included: false, watched: false }, diff --git a/aio/content/guide/browser-support.md b/aio/content/guide/browser-support.md index 9a3d7b57bf..b4e315b97b 100644 --- a/aio/content/guide/browser-support.md +++ b/aio/content/guide/browser-support.md @@ -526,7 +526,7 @@ For example: // __Zone_enable_cross_context_check = true; </script> <!-- zone.js required by Angular --> - <script src="node_modules/zone.js/dist/zone.js"></script> + <script src="node_modules/zone.js/bundles/zone.umd.js"></script> <!-- application polyfills --> diff --git a/aio/content/guide/universal.md b/aio/content/guide/universal.md index 8ac0f40efd..d7b70c5ad9 100644 --- a/aio/content/guide/universal.md +++ b/aio/content/guide/universal.md @@ -227,7 +227,7 @@ as a navigation URL intended for the router. Fortunately, application routes have something in common: their URLs lack file extensions. (Data requests also lack extensions but they're easy to recognize because they always begin with `/api`.) -All static asset requests have a file extension (such as `main.js` or `/node_modules/zone.js/dist/zone.js`). +All static asset requests have a file extension (such as `main.js` or `/node_modules/zone.js/bundles/zone.umd.js`). Because we use routing, we can easily recognize the three types of requests and handle them differently. diff --git a/dev-infra/benchmark/component_benchmark/component_benchmark.bzl b/dev-infra/benchmark/component_benchmark/component_benchmark.bzl index da68981680..9394cdd69a 100644 --- a/dev-infra/benchmark/component_benchmark/component_benchmark.bzl +++ b/dev-infra/benchmark/component_benchmark/component_benchmark.bzl @@ -129,7 +129,7 @@ def component_benchmark( # The server for our application. ts_devserver( name = server, - bootstrap = ["//packages/zone.js/dist:zone.js"], + bootstrap = ["//packages/zone.js/bundles:zone.umd.js"], port = 4200, static_files = assets + styles, deps = [":" + app_main + ".min_debug.es2015.js"], diff --git a/integration/bazel/package.json b/integration/bazel/package.json index 5a95287ca0..b87ab109d0 100644 --- a/integration/bazel/package.json +++ b/integration/bazel/package.json @@ -16,7 +16,7 @@ "reflect-metadata": "0.1.12", "rxjs": "file:../../node_modules/rxjs", "tslib": "file:../../node_modules/tslib", - "zone.js": "0.10.3" + "zone.js": "file:../../dist/zone.js-dist" }, "devDependencies": { "@angular/bazel": "file:../../dist/packages-dist/bazel", diff --git a/integration/bazel/src/BUILD.bazel b/integration/bazel/src/BUILD.bazel index 65dbb8ff41..2968f24a0d 100644 --- a/integration/bazel/src/BUILD.bazel +++ b/integration/bazel/src/BUILD.bazel @@ -46,7 +46,7 @@ ts_devserver( serving_path = "/bundle.min.js", static_files = [ "index.html", - "@npm//:node_modules/zone.js/dist/zone.min.js", + "@npm//:node_modules/zone.js/bundles/zone.umd.min.js", ], deps = ["//src"], ) @@ -72,7 +72,7 @@ pkg_web( srcs = [ "index.html", ":bundle.min", - "@npm//:node_modules/zone.js/dist/zone.min.js", + "@npm//:node_modules/zone.js/bundles/zone.umd.min.js", ], ) diff --git a/integration/bazel/src/hello-world/BUILD.bazel b/integration/bazel/src/hello-world/BUILD.bazel index cfc93212a9..5f72e67774 100644 --- a/integration/bazel/src/hello-world/BUILD.bazel +++ b/integration/bazel/src/hello-world/BUILD.bazel @@ -49,7 +49,7 @@ ts_library( karma_web_test_suite( name = "test", bootstrap = [ - "@npm//:node_modules/zone.js/dist/zone-testing-bundle.js", + "@npm//:node_modules/zone.js/bundles/zone-testing-bundle.umd.js", "@npm//:node_modules/reflect-metadata/Reflect.js", ], browsers = [ diff --git a/integration/bazel/src/index.html b/integration/bazel/src/index.html index a23562e782..c422507145 100644 --- a/integration/bazel/src/index.html +++ b/integration/bazel/src/index.html @@ -9,7 +9,7 @@ - + diff --git a/integration/bazel/yarn.lock b/integration/bazel/yarn.lock index 1a64234e2e..07d373b800 100644 --- a/integration/bazel/yarn.lock +++ b/integration/bazel/yarn.lock @@ -3,10 +3,10 @@ "@angular/animations@file:../../dist/packages-dist/animations": - version "9.1.0-next.2" + version "10.0.0-next.5" "@angular/bazel@file:../../dist/packages-dist/bazel": - version "9.1.0-next.2" + version "10.0.0-next.5" dependencies: "@microsoft/api-extractor" "^7.3.9" shelljs "0.8.2" @@ -22,10 +22,10 @@ parse5 "^5.0.0" "@angular/common@file:../../dist/packages-dist/common": - version "9.1.0-next.2" + version "10.0.0-next.5" "@angular/compiler-cli@file:../../dist/packages-dist/compiler-cli": - version "9.1.0-next.2" + version "10.0.0-next.5" dependencies: canonical-path "1.0.0" chokidar "^3.0.0" @@ -38,16 +38,16 @@ semver "^6.3.0" source-map "^0.6.1" sourcemap-codec "^1.4.8" - yargs "13.1.0" + yargs "15.3.0" "@angular/compiler@file:../../dist/packages-dist/compiler": - version "9.1.0-next.2" + version "10.0.0-next.5" "@angular/core@file:../../dist/packages-dist/core": - version "9.1.0-next.2" + version "10.0.0-next.5" "@angular/forms@file:../../dist/packages-dist/forms": - version "9.1.0-next.2" + version "10.0.0-next.5" "@angular/material@8.0.1": version "8.0.1" @@ -57,13 +57,13 @@ tslib "^1.7.1" "@angular/platform-browser-dynamic@file:../../dist/packages-dist/platform-browser-dynamic": - version "9.1.0-next.2" + version "10.0.0-next.5" "@angular/platform-browser@file:../../dist/packages-dist/platform-browser": - version "9.1.0-next.2" + version "10.0.0-next.5" "@angular/router@file:../../dist/packages-dist/router": - version "9.1.0-next.2" + version "10.0.0-next.5" "@bazel/bazelisk@file:../../node_modules/@bazel/bazelisk": version "1.4.0" @@ -208,6 +208,11 @@ resolved "https://registry.yarnpkg.com/@types/argparse/-/argparse-1.0.33.tgz#2728669427cdd74a99e53c9f457ca2866a37c52d" integrity sha512-VQgHxyPMTj3hIlq9SY1mctqx+Jj8kpQfoLvDlVSDNOyuYs8JYfkuY3OW/4+dO657yPmNhHpePRx0/Tje5ImNVQ== +"@types/color-name@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0" + integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ== + "@types/estree@*", "@types/estree@0.0.39": version "0.0.39" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f" @@ -300,21 +305,24 @@ ansi-regex@^2.0.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= -ansi-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" - integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= - -ansi-regex@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" - integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== +ansi-regex@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" + integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= +ansi-styles@^4.0.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359" + integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA== + dependencies: + "@types/color-name" "^1.1.1" + color-convert "^2.0.1" + anymatch@~3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142" @@ -574,19 +582,26 @@ chokidar@^3.0.0: optionalDependencies: fsevents "~2.1.1" -cliui@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49" - integrity sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ== +cliui@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1" + integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ== dependencies: - string-width "^2.1.1" - strip-ansi "^4.0.0" - wrap-ansi "^2.0.0" + string-width "^4.2.0" + strip-ansi "^6.0.0" + wrap-ansi "^6.2.0" -code-point-at@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" - integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== colors@^1.1.0, colors@^1.3.3: version "1.4.0" @@ -667,17 +682,6 @@ corser@^2.0.1: resolved "https://registry.yarnpkg.com/corser/-/corser-2.0.1.tgz#8eda252ecaab5840dcd975ceb90d9370c819ff87" integrity sha1-jtolLsqrWEDc2XXOuQ2TcMgZ/4c= -cross-spawn@^6.0.0: - version "6.0.5" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" - integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== - dependencies: - nice-try "^1.0.4" - path-key "^2.0.1" - semver "^5.5.0" - shebang-command "^1.2.0" - which "^1.2.9" - custom-event@~1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425" @@ -806,23 +810,16 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= -emoji-regex@^7.0.1: - version "7.0.3" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" - integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== +emoji-regex@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== encodeurl@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= -end-of-stream@^1.1.0: - version "1.4.4" - resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" - integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== - dependencies: - once "^1.4.0" - engine.io-client@~3.2.0: version "3.2.1" resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.2.1.tgz#6f54c0475de487158a1a7c77d10178708b6add36" @@ -925,19 +922,6 @@ eventemitter3@^4.0.0: resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.0.tgz#d65176163887ee59f386d64c82610b696a4a74eb" integrity sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg== -execa@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8" - integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA== - dependencies: - cross-spawn "^6.0.0" - get-stream "^4.0.0" - is-stream "^1.1.0" - npm-run-path "^2.0.0" - p-finally "^1.0.0" - signal-exit "^3.0.0" - strip-eof "^1.0.0" - exit@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" @@ -988,12 +972,13 @@ finalhandler@1.1.2: statuses "~1.5.0" unpipe "~1.0.0" -find-up@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" - integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg== +find-up@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" + integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== dependencies: - locate-path "^3.0.0" + locate-path "^5.0.0" + path-exists "^4.0.0" flatted@^2.0.0: version "2.0.1" @@ -1059,13 +1044,6 @@ get-caller-file@^2.0.1: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== -get-stream@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" - integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w== - dependencies: - pump "^3.0.0" - getpass@^0.1.1: version "0.1.7" resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" @@ -1268,11 +1246,6 @@ interpret@^1.0.0: resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296" integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw== -invert-kv@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02" - integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA== - is-binary-path@~2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" @@ -1295,17 +1268,10 @@ is-extglob@^2.1.1: resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= -is-fullwidth-code-point@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" - integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= - dependencies: - number-is-nan "^1.0.0" - -is-fullwidth-code-point@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" - integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= +is-fullwidth-code-point@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" + integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== is-glob@^4.0.1, is-glob@~4.0.1: version "4.0.1" @@ -1357,11 +1323,6 @@ is-regex@^1.0.4: dependencies: has "^1.0.1" -is-stream@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" - integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= - is-symbol@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937" @@ -1547,13 +1508,6 @@ karma@4.4.1: tmp "0.0.33" useragent "2.3.0" -lcid@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf" - integrity sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA== - dependencies: - invert-kv "^2.0.0" - lie@~3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/lie/-/lie-3.3.0.tgz#dcf82dee545f46074daf200c7c1c5a08e0f40f6a" @@ -1561,13 +1515,12 @@ lie@~3.3.0: dependencies: immediate "~3.0.5" -locate-path@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" - integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A== +locate-path@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" + integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== dependencies: - p-locate "^3.0.0" - path-exists "^3.0.0" + p-locate "^4.1.0" lodash.get@^4.0.0: version "4.4.2" @@ -1615,27 +1568,11 @@ magic-string@^0.25.0, magic-string@^0.25.2: dependencies: sourcemap-codec "^1.4.4" -map-age-cleaner@^0.1.1: - version "0.1.3" - resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a" - integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w== - dependencies: - p-defer "^1.0.0" - media-typer@0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= -mem@^4.0.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178" - integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w== - dependencies: - map-age-cleaner "^0.1.1" - mimic-fn "^2.0.0" - p-is-promise "^2.0.0" - mime-db@1.42.0: version "1.42.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.42.0.tgz#3e252907b4c7adb906597b4b65636272cf9e7bac" @@ -1658,11 +1595,6 @@ mime@^2.3.1: resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5" integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA== -mimic-fn@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" - integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== - minimatch@^3.0.2, minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" @@ -1707,28 +1639,11 @@ negotiator@0.6.2: resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== -nice-try@^1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" - integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== - normalize-path@^3.0.0, normalize-path@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== -npm-run-path@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" - integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8= - dependencies: - path-key "^2.0.0" - -number-is-nan@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" - integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= - oauth-sign@~0.9.0: version "0.9.0" resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" @@ -1769,7 +1684,7 @@ on-finished@~2.3.0: dependencies: ee-first "1.1.1" -once@^1.3.0, once@^1.3.1, once@^1.4.0: +once@^1.3.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= @@ -1789,48 +1704,24 @@ optimist@^0.6.1, optimist@~0.6.0, optimist@~0.6.1: minimist "~0.0.1" wordwrap "~0.0.2" -os-locale@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a" - integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q== - dependencies: - execa "^1.0.0" - lcid "^2.0.0" - mem "^4.0.0" - os-tmpdir@~1.0.1, os-tmpdir@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= -p-defer@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c" - integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww= - -p-finally@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" - integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= - -p-is-promise@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e" - integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg== - -p-limit@^2.0.0: - version "2.2.2" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz#61279b67721f5287aa1c13a9a7fbbc48c9291b1e" - integrity sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ== +p-limit@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== dependencies: p-try "^2.0.0" -p-locate@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" - integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ== +p-locate@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" + integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== dependencies: - p-limit "^2.0.0" + p-limit "^2.2.0" p-try@^2.0.0: version "2.2.0" @@ -1866,10 +1757,10 @@ parseurl@~1.3.3: resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== -path-exists@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" - integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= +path-exists@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== path-is-absolute@^1.0.0: version "1.0.1" @@ -1881,11 +1772,6 @@ path-is-inside@^1.0.1: resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM= -path-key@^2.0.0, path-key@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" - integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= - path-parse@^1.0.5, path-parse@^1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" @@ -1982,14 +1868,6 @@ psl@^1.1.24: resolved "https://registry.yarnpkg.com/psl/-/psl-1.4.0.tgz#5dd26156cdb69fa1fdb8ab1991667d3f80ced7c2" integrity sha512-HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw== -pump@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" - integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== - dependencies: - end-of-stream "^1.1.0" - once "^1.3.1" - punycode@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" @@ -2206,7 +2084,7 @@ rollup@1.27.5: acorn "^7.1.0" "rxjs@file:../../node_modules/rxjs": - version "6.5.3" + version "6.5.4" dependencies: tslib "^1.9.0" @@ -2257,7 +2135,7 @@ semver@5.6.0: resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004" integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg== -semver@^5.3.0, semver@^5.5.0: +semver@^5.3.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -2287,18 +2165,6 @@ setprototypeof@1.1.1: resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== -shebang-command@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" - integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= - dependencies: - shebang-regex "^1.0.0" - -shebang-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" - integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= - shelljs@0.8.2: version "0.8.2" resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.2.tgz#345b7df7763f4c2340d584abb532c5f752ca9e35" @@ -2308,11 +2174,6 @@ shelljs@0.8.2: interpret "^1.0.0" rechoir "^0.6.2" -signal-exit@^3.0.0: - version "3.0.3" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" - integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== - socket.io-adapter@~1.1.0: version "1.1.2" resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz#ab3f0d6f66b8fc7fca3959ab5991f82221789be9" @@ -2454,31 +2315,14 @@ streamroller@^1.0.6: fs-extra "^7.0.1" lodash "^4.17.14" -string-width@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" - integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= +string-width@^4.1.0, string-width@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5" + integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg== dependencies: - code-point-at "^1.0.0" - is-fullwidth-code-point "^1.0.0" - strip-ansi "^3.0.0" - -string-width@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" - integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== - dependencies: - is-fullwidth-code-point "^2.0.0" - strip-ansi "^4.0.0" - -string-width@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" - integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== - dependencies: - emoji-regex "^7.0.1" - is-fullwidth-code-point "^2.0.0" - strip-ansi "^5.1.0" + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.0" string.prototype.trimleft@^2.1.0: version "2.1.0" @@ -2503,31 +2347,19 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -strip-ansi@^3.0.0, strip-ansi@^3.0.1: +strip-ansi@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= dependencies: ansi-regex "^2.0.0" -strip-ansi@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" - integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= +strip-ansi@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" + integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== dependencies: - ansi-regex "^3.0.0" - -strip-ansi@^5.1.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" - integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== - dependencies: - ansi-regex "^4.1.0" - -strip-eof@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" - integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= + ansi-regex "^5.0.0" supports-color@^2.0.0: version "2.0.0" @@ -2605,7 +2437,7 @@ tslib@^1.7.1, tslib@^1.8.1, tslib@^1.9.0: integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ== "tslib@file:../../node_modules/tslib": - version "1.10.0" + version "1.11.1" tsutils@2.27.2: version "2.27.2" @@ -2763,7 +2595,7 @@ which-module@^2.0.0: resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= -which@^1.2.1, which@^1.2.9: +which@^1.2.1: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== @@ -2775,13 +2607,14 @@ wordwrap@~0.0.2: resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107" integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc= -wrap-ansi@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" - integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU= +wrap-ansi@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53" + integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA== dependencies: - string-width "^1.0.1" - strip-ansi "^3.0.1" + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" wrappy@1: version "1.0.2" @@ -2826,30 +2659,30 @@ yallist@^2.1.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= -yargs-parser@^13.0.0: - version "13.1.2" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38" - integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg== +yargs-parser@^18.1.0: + version "18.1.3" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0" + integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ== dependencies: camelcase "^5.0.0" decamelize "^1.2.0" -yargs@13.1.0: - version "13.1.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.1.0.tgz#b2729ce4bfc0c584939719514099d8a916ad2301" - integrity sha512-1UhJbXfzHiPqkfXNHYhiz79qM/kZqjTE8yGlEjZa85Q+3+OwcV6NRkV7XOV1W2Eom2bzILeUn55pQYffjVOLAg== +yargs@15.3.0: + version "15.3.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.3.0.tgz#403af6edc75b3ae04bf66c94202228ba119f0976" + integrity sha512-g/QCnmjgOl1YJjGsnUg2SatC7NUYEiLXJqxNOQU9qSpjzGtGXda9b+OKccr1kLTy8BN9yqEyqfq5lxlwdc13TA== dependencies: - cliui "^4.0.0" - find-up "^3.0.0" + cliui "^6.0.0" + decamelize "^1.2.0" + find-up "^4.1.0" get-caller-file "^2.0.1" - os-locale "^3.1.0" require-directory "^2.1.1" require-main-filename "^2.0.0" set-blocking "^2.0.0" - string-width "^3.0.0" + string-width "^4.2.0" which-module "^2.0.0" y18n "^4.0.0" - yargs-parser "^13.0.0" + yargs-parser "^18.1.0" yeast@0.1.2: version "0.1.2" @@ -2867,7 +2700,5 @@ z-schema@~3.18.3: optionalDependencies: commander "^2.7.1" -zone.js@0.10.3: - version "0.10.3" - resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.10.3.tgz#3e5e4da03c607c9dcd92e37dd35687a14a140c16" - integrity sha512-LXVLVEq0NNOqK/fLJo3d0kfzd4sxwn2/h67/02pjCjfKDxgx1i9QqpvtHD8CrBnSSwMw5+dy11O7FRX5mkO7Cg== +"zone.js@file:../../dist/zone.js-dist": + version "0.0.0" diff --git a/integration/dynamic-compiler/index.html b/integration/dynamic-compiler/index.html index 6c291a4a5f..5f3d20688f 100644 --- a/integration/dynamic-compiler/index.html +++ b/integration/dynamic-compiler/index.html @@ -6,7 +6,7 @@ - + diff --git a/integration/hello_world__closure/closure.conf b/integration/hello_world__closure/closure.conf index 4fedf7457e..57d74ec2f7 100644 --- a/integration/hello_world__closure/closure.conf +++ b/integration/hello_world__closure/closure.conf @@ -14,7 +14,7 @@ --module_resolution=node --package_json_entry_names es2015,module -node_modules/zone.js/dist/zone_externs.js +node_modules/zone.js/zone_externs.js --js node_modules/tslib/package.json --js node_modules/tslib/**.js diff --git a/integration/hello_world__closure/src/index.html b/integration/hello_world__closure/src/index.html index ffbd2616e9..5a1c1afc2d 100644 --- a/integration/hello_world__closure/src/index.html +++ b/integration/hello_world__closure/src/index.html @@ -10,9 +10,9 @@ Loading... - + - \ No newline at end of file + diff --git a/integration/hello_world__closure/yarn.lock b/integration/hello_world__closure/yarn.lock index 9e4cde8848..12b1350774 100644 --- a/integration/hello_world__closure/yarn.lock +++ b/integration/hello_world__closure/yarn.lock @@ -2,13 +2,14 @@ # yarn lockfile v1 +"@angular/animations@file:../../dist/packages-dist/animations": + version "10.0.0-next.5" + "@angular/common@file:../../dist/packages-dist/common": - version "10.0.0-next.9" - dependencies: - tslib "^2.0.0" + version "10.0.0-next.5" "@angular/compiler-cli@file:../../dist/packages-dist/compiler-cli": - version "10.0.0-next.9" + version "10.0.0-next.5" dependencies: canonical-path "1.0.0" chokidar "^3.0.0" @@ -21,28 +22,22 @@ semver "^6.3.0" source-map "^0.6.1" sourcemap-codec "^1.4.8" - tslib "^2.0.0" yargs "15.3.0" "@angular/compiler@file:../../dist/packages-dist/compiler": - version "10.0.0-next.9" - dependencies: - tslib "^2.0.0" + version "10.0.0-next.5" "@angular/core@file:../../dist/packages-dist/core": - version "10.0.0-next.9" - dependencies: - tslib "^2.0.0" - -"@angular/elements@file:../../dist/packages-dist/elements": - version "10.0.0-next.9" - dependencies: - tslib "^2.0.0" + version "10.0.0-next.5" "@angular/platform-browser@file:../../dist/packages-dist/platform-browser": - version "10.0.0-next.9" + version "10.0.0-next.5" + +"@angular/platform-server@file:../../dist/packages-dist/platform-server": + version "10.0.0-next.5" dependencies: - tslib "^2.0.0" + domino "^2.1.2" + xhr2 "^0.2.0" "@types/color-name@^1.1.1": version "1.1.1" @@ -142,13 +137,6 @@ ansi-styles@^2.2.1: resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= -ansi-styles@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" - integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== - dependencies: - color-convert "^1.9.0" - ansi-styles@^4.0.0: version "4.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359" @@ -157,6 +145,11 @@ ansi-styles@^4.0.0: "@types/color-name" "^1.1.1" color-convert "^2.0.1" +ansi-wrap@0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf" + integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768= + anymatch@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" @@ -173,6 +166,11 @@ anymatch@~3.1.1: normalize-path "^3.0.0" picomatch "^2.0.4" +archy@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40" + integrity sha1-+cjBN1fMHde8N5rHeyxipcKGjEA= + arr-diff@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" @@ -647,13 +645,6 @@ collection-visit@^1.0.0: map-visit "^1.0.0" object-visit "^1.0.0" -color-convert@^1.9.0: - version "1.9.3" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" - integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== - dependencies: - color-name "1.1.3" - color-convert@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" @@ -661,7 +652,12 @@ color-convert@^2.0.1: dependencies: color-name "~1.1.4" -color-name@1.1.3: +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + +color-support@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= @@ -831,6 +827,13 @@ decode-uri-component@^0.2.0: resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= +defaults@^1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d" + integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730= + dependencies: + clone "^1.0.2" + define-property@^0.2.5: version "0.2.5" resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" @@ -886,6 +889,11 @@ destroy@~1.0.4: resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= +detect-file@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7" + integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc= + dev-ip@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/dev-ip/-/dev-ip-1.0.1.tgz#a76a3ed1855be7a012bb8ac16cb80f3c00dc28f0" @@ -928,6 +936,13 @@ encodeurl@~1.0.1, encodeurl@~1.0.2: resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= +end-of-stream@~0.1.5: + version "0.1.5" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-0.1.5.tgz#8e177206c3c80837d85632e8b9359dfe8b2f6eaf" + integrity sha1-jhdyBsPICDfYVjLouTWd/osvbq8= + dependencies: + once "~1.3.0" + engine.io-client@~3.2.0: version "3.2.1" resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.2.1.tgz#6f54c0475de487158a1a7c77d10178708b6add36" @@ -1175,6 +1190,24 @@ find-up@^4.1.0: locate-path "^5.0.0" path-exists "^4.0.0" +findup-sync@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc" + integrity sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw= + dependencies: + detect-file "^1.0.0" + is-glob "^3.1.0" + micromatch "^3.0.4" + resolve-dir "^1.0.1" + +fined@^1.0.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/fined/-/fined-1.2.0.tgz#d00beccf1aa2b475d16d423b0238b713a2c4a37b" + integrity sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng== + dependencies: + locate-path "^5.0.0" + path-exists "^4.0.0" + follow-redirects@1.5.10: version "1.5.10" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a" @@ -1249,6 +1282,13 @@ fsevents@~2.1.2: resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.2.tgz#4c0a1fb34bc68e543b4b82a9ec392bfbda840805" integrity sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA== +gaze@^0.5.1: + version "0.5.2" + resolved "https://registry.yarnpkg.com/gaze/-/gaze-0.5.2.tgz#40b709537d24d1d45767db5a908689dfe69ac44f" + integrity sha1-QLcJU30k0dRXZ9takIaJ3+aaxE8= + dependencies: + globule "~0.1.0" + get-caller-file@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a" @@ -1398,10 +1438,12 @@ has-flag@^1.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa" integrity sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo= -has-flag@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= +has-gulplog@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/has-gulplog/-/has-gulplog-0.1.0.tgz#6414c82913697da51590397dafb12f22967811ce" + integrity sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4= + dependencies: + sparkles "^1.0.0" has-value@^0.3.1: version "0.3.1" @@ -1543,6 +1585,14 @@ invert-kv@^1.0.0: resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY= +is-absolute@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576" + integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA== + dependencies: + is-relative "^1.0.0" + is-windows "^1.0.1" + is-accessor-descriptor@^0.1.6: version "0.1.6" resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" @@ -1706,6 +1756,13 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4: dependencies: isobject "^3.0.1" +is-relative@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d" + integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA== + dependencies: + is-unc-path "^1.0.0" + is-typedarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" @@ -1908,6 +1965,58 @@ locate-path@^5.0.0: dependencies: p-locate "^4.1.0" +lodash._basecopy@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36" + integrity sha1-jaDmqHbPNEwK2KVIghEd08XHyjY= + +lodash._basetostring@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz#d1861d877f824a52f669832dcaf3ee15566a07d5" + integrity sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U= + +lodash._basevalues@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz#5b775762802bde3d3297503e26300820fdf661b7" + integrity sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc= + +lodash._getnative@^3.0.0: + version "3.9.1" + resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" + integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U= + +lodash._isiterateecall@^3.0.0: + version "3.0.9" + resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c" + integrity sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw= + +lodash._reescape@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/lodash._reescape/-/lodash._reescape-3.0.0.tgz#2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a" + integrity sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo= + +lodash._reevaluate@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz#58bc74c40664953ae0b124d806996daca431e2ed" + integrity sha1-WLx0xAZklTrgsSTYBpltrKQx4u0= + +lodash._reinterpolate@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" + integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0= + +lodash._root@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692" + integrity sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI= + +lodash.escape@^3.0.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698" + integrity sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg= + dependencies: + p-locate "^4.1.0" + lodash.isfinite@^3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/lodash.isfinite/-/lodash.isfinite-3.3.2.tgz#fb89b65a9a80281833f0b7478b3a5104f898ebb3" @@ -1925,7 +2034,14 @@ magic-string@^0.25.0: dependencies: sourcemap-codec "^1.4.4" -map-cache@^0.2.2: +make-iterator@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.1.tgz#29b33f312aa8f547c4a5e490f56afcec99133ad6" + integrity sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw== + dependencies: + kind-of "^6.0.2" + +map-cache@^0.2.0, map-cache@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8= @@ -1937,7 +2053,7 @@ map-visit@^1.0.0: dependencies: object-visit "^1.0.0" -micromatch@^3.1.10, micromatch@^3.1.4: +micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4: version "3.1.10" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== @@ -1978,6 +2094,13 @@ mime@^2.0.3: resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5" integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA== +minimatch@^2.0.1: + version "2.0.10" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-2.0.10.tgz#8d087c39c6b38c001b97fca7ce6d0e1e80afbac7" + integrity sha1-jQh8OcazjAAbl/ynzm0OHoCvusc= + dependencies: + brace-expansion "^1.0.0" + minimatch@^3.0.2, minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" @@ -2018,7 +2141,7 @@ mixin-deep@^1.2.0: for-in "^1.0.2" is-extendable "^1.0.1" -mkdirp@0.5.1: +mkdirp@0.5.1, mkdirp@^0.5.0: version "0.5.1" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= @@ -2062,6 +2185,11 @@ nanomatch@^1.2.9: snapdragon "^0.8.1" to-regex "^3.0.1" +natives@^1.1.3: + version "1.1.6" + resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.6.tgz#a603b4a498ab77173612b9ea1acdec4d980f00bb" + integrity sha512-6+TDFewD4yxY14ptjKaS63GVdtKiES1pTPyxn9Jb0rBqPMZ7VcCiooEhPNsr+mqHtMGxa/5c/HhcC4uPEUw/nA== + negotiator@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" @@ -2099,6 +2227,11 @@ oauth-sign@~0.9.0: resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== +object-assign@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2" + integrity sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I= + object-assign@^4.0.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" @@ -2439,6 +2572,16 @@ read-pkg@^1.0.0: normalize-package-data "^2.3.2" path-type "^1.0.0" +"readable-stream@>=1.0.33-1 <1.1.0-0": + version "1.0.34" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" + integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw= + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.1" + isarray "0.0.1" + string_decoder "~0.10.x" + readable-stream@^2.0.2, readable-stream@^2.2.2, readable-stream@^2.3.5, readable-stream@~2.3.6: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" @@ -2732,6 +2875,11 @@ setprototypeof@1.1.1: resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== +sigmund@~1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590" + integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA= + snapdragon-node@^2.0.1: version "2.1.1" resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" @@ -2977,6 +3125,11 @@ string-width@^4.1.0, string-width@^4.2.0: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.0" +string_decoder@~0.10.x: + version "0.10.31" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" + integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ= + string_decoder@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" @@ -3005,6 +3158,14 @@ strip-ansi@^6.0.0: dependencies: ansi-regex "^5.0.0" +strip-bom@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-1.0.0.tgz#85b8862f3844b5a6d5ec8467a93598173a36f794" + integrity sha1-hbiGLzhEtabV7IRnqTWYFzo295Q= + dependencies: + first-chunk-stream "^1.0.0" + is-utf8 "^0.2.0" + strip-bom@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e" @@ -3145,7 +3306,7 @@ typedarray@^0.0.6: integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= "typescript@file:../../node_modules/typescript": - version "3.9.2" + version "3.8.3" ua-parser-js@0.7.17: version "0.7.17" @@ -3291,6 +3452,13 @@ which-module@^2.0.0: resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= +which@^1.2.14: + version "1.3.1" + resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" + integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== + dependencies: + isexe "^2.0.0" + window-size@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075" @@ -3346,6 +3514,11 @@ ws@~6.1.0: dependencies: async-limiter "~1.0.0" +xhr2@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/xhr2/-/xhr2-0.2.0.tgz#eddeff782f3b7551061b8d75645085269396e521" + integrity sha512-BDtiD0i2iKPK/S8OAZfpk6tyzEDnKKSjxWHcMBVmh+LuqJ8A32qXTyOx+TVOg2dKvq6zGBq2sgKPkEeRs1qTRA== + xml2js@^0.4.17: version "0.4.23" resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66" diff --git a/integration/hello_world__systemjs_umd/src/index.html b/integration/hello_world__systemjs_umd/src/index.html index c28b092273..c6fe3c129a 100644 --- a/integration/hello_world__systemjs_umd/src/index.html +++ b/integration/hello_world__systemjs_umd/src/index.html @@ -6,7 +6,7 @@ Hello World - + + - \ No newline at end of file + diff --git a/integration/ng_elements/closure.conf b/integration/ng_elements/closure.conf index 28c8b5bccf..ab3a391d3c 100644 --- a/integration/ng_elements/closure.conf +++ b/integration/ng_elements/closure.conf @@ -14,7 +14,7 @@ --module_resolution=node --package_json_entry_names es2015,module -node_modules/zone.js/dist/zone_externs.js +node_modules/zone.js/zone_externs.js --js node_modules/tslib/package.json --js node_modules/tslib/**.js diff --git a/integration/platform-server/src/helloworld/client.ts b/integration/platform-server/src/helloworld/client.ts index ea2eff5765..f2461a9520 100644 --- a/integration/platform-server/src/helloworld/client.ts +++ b/integration/platform-server/src/helloworld/client.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import 'zone.js/dist/zone.js'; +import 'zone.js/bundles/zone.umd'; import {enableProdMode} from '@angular/core'; import {platformBrowser} from '@angular/platform-browser'; diff --git a/integration/platform-server/src/server.ts b/integration/platform-server/src/server.ts index 091e44d637..a19d32a472 100644 --- a/integration/platform-server/src/server.ts +++ b/integration/platform-server/src/server.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ /* tslint:disable:no-console */ -require('zone.js/dist/zone-node.js'); +require('zone.js/bundles/zone-node.umd.js'); import {enableProdMode, NgModuleFactory} from '@angular/core'; import {renderModuleFactory} from '@angular/platform-server'; diff --git a/integration/platform-server/src/transferstate/client.ts b/integration/platform-server/src/transferstate/client.ts index 26b1037c6a..5b92b45706 100644 --- a/integration/platform-server/src/transferstate/client.ts +++ b/integration/platform-server/src/transferstate/client.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import 'zone.js/dist/zone.js'; +import 'zone.js/bundles/zone.umd'; import {enableProdMode} from '@angular/core'; import {platformBrowser} from '@angular/platform-browser'; diff --git a/integration/platform-server/yarn.lock b/integration/platform-server/yarn.lock index 134fd16666..2102365993 100644 --- a/integration/platform-server/yarn.lock +++ b/integration/platform-server/yarn.lock @@ -3,13 +3,13 @@ "@angular/animations@file:../../dist/packages-dist/animations": - version "9.0.0-rc.1" + version "10.0.0-next.5" "@angular/common@file:../../dist/packages-dist/common": - version "9.0.0-rc.1" + version "10.0.0-next.5" "@angular/compiler-cli@file:../../dist/packages-dist/compiler-cli": - version "9.0.0-rc.1" + version "10.0.0-next.5" dependencies: canonical-path "1.0.0" chokidar "^3.0.0" @@ -21,25 +21,31 @@ reflect-metadata "^0.1.2" semver "^6.3.0" source-map "^0.6.1" - yargs "13.1.0" + sourcemap-codec "^1.4.8" + yargs "15.3.0" "@angular/compiler@file:../../dist/packages-dist/compiler": - version "9.0.0-rc.1" + version "10.0.0-next.5" "@angular/core@file:../../dist/packages-dist/core": - version "9.0.0-rc.1" + version "10.0.0-next.5" "@angular/platform-browser-dynamic@file:../../dist/packages-dist/platform-browser-dynamic": - version "9.0.0-rc.1" + version "10.0.0-next.5" "@angular/platform-browser@file:../../dist/packages-dist/platform-browser": - version "9.0.0-rc.1" + version "10.0.0-next.5" "@angular/platform-server@file:../../dist/packages-dist/platform-server": - version "9.0.0-rc.1" + version "10.0.0-next.5" dependencies: domino "^2.1.2" - xhr2 "^0.1.4" + xhr2 "^0.2.0" + +"@types/color-name@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0" + integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ== "@types/jasmine@*": version "3.5.3" @@ -47,10 +53,10 @@ integrity sha512-LRJ21f/BO4QNZ3YDaMP0OEurOfE77x8mi8MfEnUsei5IKfmZL0GKl7juhABMdUIJHhVS9OCLotKHfsFNAuJ+DA== "@types/jasmine@file:../../node_modules/@types/jasmine": - version "2.8.8" + version "3.5.10" "@types/jasminewd2@file:../../node_modules/@types/jasminewd2": - version "2.0.6" + version "2.0.8" dependencies: "@types/jasmine" "*" @@ -60,7 +66,7 @@ integrity sha1-nKUs2jY/aZxpRmwqbM2q2RPqenM= "@types/node@file:../../node_modules/@types/node": - version "12.11.1" + version "12.12.34" "@types/q@^0.0.32": version "0.0.32" @@ -166,10 +172,10 @@ ansi-regex@^3.0.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= -ansi-regex@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" - integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== +ansi-regex@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" + integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== ansi-styles@^1.1.0: version "1.1.0" @@ -181,6 +187,14 @@ ansi-styles@^2.2.1: resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= +ansi-styles@^4.0.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359" + integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA== + dependencies: + "@types/color-name" "^1.1.1" + color-convert "^2.0.1" + anymatch@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" @@ -1135,14 +1149,14 @@ cliui@^3.2.0: strip-ansi "^3.0.1" wrap-ansi "^2.0.0" -cliui@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49" - integrity sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ== +cliui@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1" + integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ== dependencies: - string-width "^2.1.1" - strip-ansi "^4.0.0" - wrap-ansi "^2.0.0" + string-width "^4.2.0" + strip-ansi "^6.0.0" + wrap-ansi "^6.2.0" co@^4.6.0: version "4.6.0" @@ -1162,6 +1176,18 @@ collection-visit@^1.0.0: map-visit "^1.0.0" object-visit "^1.0.0" +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + combined-stream@^1.0.6, combined-stream@~1.0.6: version "1.0.7" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828" @@ -1308,17 +1334,6 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4: safe-buffer "^5.0.1" sha.js "^2.4.8" -cross-spawn@^6.0.0: - version "6.0.5" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" - integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== - dependencies: - nice-try "^1.0.4" - path-key "^2.0.1" - semver "^5.5.0" - shebang-command "^1.2.0" - which "^1.2.9" - crypto-browserify@^3.11.0: version "3.12.0" resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec" @@ -1509,10 +1524,10 @@ elliptic@^6.0.0: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.0" -emoji-regex@^7.0.1: - version "7.0.3" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" - integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== +emoji-regex@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== emojis-list@^2.0.0: version "2.1.0" @@ -1524,13 +1539,6 @@ encodeurl@~1.0.2: resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= -end-of-stream@^1.1.0: - version "1.4.4" - resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" - integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== - dependencies: - once "^1.4.0" - enhanced-resolve@^3.3.0: version "3.4.1" resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz#0421e339fd71419b3da13d129b3979040230476e" @@ -1605,19 +1613,6 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: md5.js "^1.3.4" safe-buffer "^5.1.1" -execa@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8" - integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA== - dependencies: - cross-spawn "^6.0.0" - get-stream "^4.0.0" - is-stream "^1.1.0" - npm-run-path "^2.0.0" - p-finally "^1.0.0" - signal-exit "^3.0.0" - strip-eof "^1.0.0" - exit@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" @@ -1790,12 +1785,13 @@ find-up@^1.0.0: path-exists "^2.0.0" pinkie-promise "^2.0.0" -find-up@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" - integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg== +find-up@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" + integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== dependencies: - locate-path "^3.0.0" + locate-path "^5.0.0" + path-exists "^4.0.0" for-in@^1.0.2: version "1.0.2" @@ -1891,13 +1887,6 @@ get-caller-file@^2.0.1: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== -get-stream@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" - integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w== - dependencies: - pump "^3.0.0" - get-value@^2.0.3, get-value@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" @@ -2186,11 +2175,6 @@ invert-kv@^1.0.0: resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY= -invert-kv@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02" - integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA== - ipaddr.js@1.8.0: version "1.8.0" resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e" @@ -2309,6 +2293,11 @@ is-fullwidth-code-point@^2.0.0: resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= +is-fullwidth-code-point@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" + integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== + is-glob@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" @@ -2368,11 +2357,6 @@ is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4: dependencies: isobject "^3.0.1" -is-stream@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" - integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= - is-typedarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" @@ -2393,11 +2377,6 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= -isexe@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= - isobject@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" @@ -2560,13 +2539,6 @@ lcid@^1.0.0: dependencies: invert-kv "^1.0.0" -lcid@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf" - integrity sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA== - dependencies: - invert-kv "^2.0.0" - lie@~3.1.0: version "3.1.1" resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e" @@ -2600,13 +2572,12 @@ loader-utils@^0.2.16: json5 "^0.5.0" object-assign "^4.0.1" -locate-path@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" - integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A== +locate-path@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" + integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== dependencies: - p-locate "^3.0.0" - path-exists "^3.0.0" + p-locate "^4.1.0" lodash.debounce@^4.0.8: version "4.0.8" @@ -2637,13 +2608,6 @@ magic-string@^0.25.0: dependencies: sourcemap-codec "^1.4.1" -map-age-cleaner@^0.1.1: - version "0.1.3" - resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a" - integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w== - dependencies: - p-defer "^1.0.0" - map-cache@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" @@ -2670,15 +2634,6 @@ media-typer@0.3.0: resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= -mem@^4.0.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178" - integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w== - dependencies: - map-age-cleaner "^0.1.1" - mimic-fn "^2.0.0" - p-is-promise "^2.0.0" - memory-fs@^0.4.0, memory-fs@~0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552" @@ -2758,11 +2713,6 @@ mime@^2.0.3: resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5" integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA== -mimic-fn@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" - integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== - minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" @@ -2881,11 +2831,6 @@ neo-async@^2.5.0: resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835" integrity sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA== -nice-try@^1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" - integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== - node-libs-browser@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.1.0.tgz#5f94263d404f6e44767d726901fff05478d600df" @@ -2974,13 +2919,6 @@ npm-packlist@^1.1.6: ignore-walk "^3.0.1" npm-bundled "^1.0.1" -npm-run-path@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" - integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8= - dependencies: - path-key "^2.0.0" - npmlog@^4.0.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" @@ -3036,7 +2974,7 @@ on-finished@~2.3.0: dependencies: ee-first "1.1.1" -once@^1.3.0, once@^1.3.1, once@^1.4.0: +once@^1.3.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= @@ -3068,15 +3006,6 @@ os-locale@^1.4.0: dependencies: lcid "^1.0.0" -os-locale@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a" - integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q== - dependencies: - execa "^1.0.0" - lcid "^2.0.0" - mem "^4.0.0" - os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" @@ -3090,34 +3019,19 @@ osenv@^0.1.4: os-homedir "^1.0.0" os-tmpdir "^1.0.0" -p-defer@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c" - integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww= - -p-finally@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" - integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= - -p-is-promise@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e" - integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg== - -p-limit@^2.0.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.1.tgz#aa07a788cc3151c939b5131f63570f0dd2009537" - integrity sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg== +p-limit@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== dependencies: p-try "^2.0.0" -p-locate@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" - integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ== +p-locate@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" + integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== dependencies: - p-limit "^2.0.0" + p-limit "^2.2.0" p-try@^2.0.0: version "2.2.0" @@ -3174,10 +3088,10 @@ path-exists@^2.0.0: dependencies: pinkie-promise "^2.0.0" -path-exists@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" - integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= +path-exists@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== path-is-absolute@^1.0.0, path-is-absolute@^1.0.1: version "1.0.1" @@ -3189,11 +3103,6 @@ path-is-inside@^1.0.1: resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM= -path-key@^2.0.0, path-key@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" - integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= - path-to-regexp@0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" @@ -3342,14 +3251,6 @@ public-encrypt@^4.0.0: randombytes "^2.0.1" safe-buffer "^5.1.2" -pump@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" - integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== - dependencies: - end-of-stream "^1.1.0" - once "^1.3.1" - punycode@1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" @@ -3674,7 +3575,7 @@ rx@2.3.24: integrity sha1-FPlQpCF9fjXapxu8vljv9o6ksrc= "rxjs@file:../../node_modules/rxjs": - version "6.5.3" + version "6.5.4" dependencies: tslib "^1.9.0" @@ -3722,11 +3623,6 @@ selenium-webdriver@3.6.0, selenium-webdriver@^3.0.1: resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004" integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg== -semver@^5.5.0: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== - semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" @@ -3804,18 +3700,6 @@ sha.js@^2.4.0, sha.js@^2.4.8: inherits "^2.0.1" safe-buffer "^5.0.1" -shebang-command@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" - integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= - dependencies: - shebang-regex "^1.0.0" - -shebang-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" - integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= - signal-exit@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" @@ -3899,6 +3783,11 @@ sourcemap-codec@^1.4.1: resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.4.tgz#c63ea927c029dd6bd9a2b7fa03b3fec02ad56e9f" integrity sha512-CYAPYdBu34781kLHkaW3m6b/uUSyMOC2R61gcYMWooeuaGtjof86ZA/8T+qVPPt7np1085CR9hmMGrySwEc8Xg== +sourcemap-codec@^1.4.8: + version "1.4.8" + resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4" + integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA== + spawn-default-shell@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/spawn-default-shell/-/spawn-default-shell-1.1.0.tgz#095439d44c4b7c0aff56a53929fbaab87878e7c6" @@ -3998,7 +3887,7 @@ string-width@^1.0.1, string-width@^1.0.2: is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" -"string-width@^1.0.2 || 2", string-width@^2.1.1: +"string-width@^1.0.2 || 2": version "2.1.1" resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== @@ -4006,14 +3895,14 @@ string-width@^1.0.1, string-width@^1.0.2: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" -string-width@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961" - integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w== +string-width@^4.1.0, string-width@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5" + integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg== dependencies: - emoji-regex "^7.0.1" - is-fullwidth-code-point "^2.0.0" - strip-ansi "^5.1.0" + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.0" string_decoder@^1.0.0: version "1.2.0" @@ -4055,12 +3944,12 @@ strip-ansi@^4.0.0: dependencies: ansi-regex "^3.0.0" -strip-ansi@^5.1.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" - integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== +strip-ansi@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" + integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== dependencies: - ansi-regex "^4.1.0" + ansi-regex "^5.0.0" strip-bom@^2.0.0: version "2.0.0" @@ -4069,11 +3958,6 @@ strip-bom@^2.0.0: dependencies: is-utf8 "^0.2.0" -strip-eof@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" - integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= - strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" @@ -4224,7 +4108,7 @@ typedarray@^0.0.6: integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= "typescript@file:../../node_modules/typescript": - version "3.7.4" + version "3.8.3" uglify-js@^2.8.27: version "2.8.29" @@ -4434,13 +4318,6 @@ which-module@^2.0.0: resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= -which@^1.2.9: - version "1.3.1" - resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" - integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== - dependencies: - isexe "^2.0.0" - wide-align@^1.1.0: version "1.1.3" resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" @@ -4471,6 +4348,15 @@ wrap-ansi@^2.0.0: string-width "^1.0.1" strip-ansi "^3.0.1" +wrap-ansi@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53" + integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" @@ -4483,10 +4369,10 @@ ws@^6.1.0: dependencies: async-limiter "~1.0.0" -xhr2@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/xhr2/-/xhr2-0.1.4.tgz#7f87658847716db5026323812f818cadab387a5f" - integrity sha1-f4dliEdxbbUCYyOBL4GMras4el8= +xhr2@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/xhr2/-/xhr2-0.2.0.tgz#eddeff782f3b7551061b8d75645085269396e521" + integrity sha512-BDtiD0i2iKPK/S8OAZfpk6tyzEDnKKSjxWHcMBVmh+LuqJ8A32qXTyOx+TVOg2dKvq6zGBq2sgKPkEeRs1qTRA== xml2js@^0.4.17: version "0.4.19" @@ -4521,10 +4407,10 @@ yallist@^3.0.0, yallist@^3.0.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9" integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A== -yargs-parser@^13.0.0: - version "13.1.1" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0" - integrity sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ== +yargs-parser@^18.1.0: + version "18.1.3" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0" + integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ== dependencies: camelcase "^5.0.0" decamelize "^1.2.0" @@ -4536,22 +4422,22 @@ yargs-parser@^4.2.0: dependencies: camelcase "^3.0.0" -yargs@13.1.0: - version "13.1.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.1.0.tgz#b2729ce4bfc0c584939719514099d8a916ad2301" - integrity sha512-1UhJbXfzHiPqkfXNHYhiz79qM/kZqjTE8yGlEjZa85Q+3+OwcV6NRkV7XOV1W2Eom2bzILeUn55pQYffjVOLAg== +yargs@15.3.0: + version "15.3.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.3.0.tgz#403af6edc75b3ae04bf66c94202228ba119f0976" + integrity sha512-g/QCnmjgOl1YJjGsnUg2SatC7NUYEiLXJqxNOQU9qSpjzGtGXda9b+OKccr1kLTy8BN9yqEyqfq5lxlwdc13TA== dependencies: - cliui "^4.0.0" - find-up "^3.0.0" + cliui "^6.0.0" + decamelize "^1.2.0" + find-up "^4.1.0" get-caller-file "^2.0.1" - os-locale "^3.1.0" require-directory "^2.1.1" require-main-filename "^2.0.0" set-blocking "^2.0.0" - string-width "^3.0.0" + string-width "^4.2.0" which-module "^2.0.0" y18n "^4.0.0" - yargs-parser "^13.0.0" + yargs-parser "^18.1.0" yargs@^6.0.0: version "6.6.0" diff --git a/karma-js.conf.js b/karma-js.conf.js index 290f1f4205..5beafbe25e 100644 --- a/karma-js.conf.js +++ b/karma-js.conf.js @@ -36,9 +36,9 @@ module.exports = function(config) { {pattern: 'node_modules/angular-mocks/angular-mocks.js', included: false, watched: false}, 'node_modules/core-js/client/core.js', - 'dist/bin/packages/zone.js/npm_package/dist/zone.js', - 'dist/bin/packages/zone.js/npm_package/dist/zone-testing.js', - 'dist/bin/packages/zone.js/npm_package/dist/task-tracking.js', + 'dist/bin/packages/zone.js/npm_package/bundles/zone.umd.js', + 'dist/bin/packages/zone.js/npm_package/bundles/zone-testing.umd.js', + 'dist/bin/packages/zone.js/npm_package/bundles/task-tracking.umd.js', // Including systemjs because it defines `__eval`, which produces correct stack traces. 'test-events.js', diff --git a/modules/benchmarks/src/change_detection/transplanted_views/BUILD.bazel b/modules/benchmarks/src/change_detection/transplanted_views/BUILD.bazel index 4d21624b04..b4e3a91593 100644 --- a/modules/benchmarks/src/change_detection/transplanted_views/BUILD.bazel +++ b/modules/benchmarks/src/change_detection/transplanted_views/BUILD.bazel @@ -29,7 +29,7 @@ ng_rollup_bundle( ts_devserver( name = "prodserver", - bootstrap = ["//packages/zone.js/dist:zone.js"], + bootstrap = ["//packages/zone.js/bundles:zone.umd.js"], port = 4200, static_files = ["index.html"], deps = [":bundle.min_debug.es2015.js"], diff --git a/modules/benchmarks/src/expanding_rows/BUILD.bazel b/modules/benchmarks/src/expanding_rows/BUILD.bazel index 4e0aad1457..3c8da121b4 100644 --- a/modules/benchmarks/src/expanding_rows/BUILD.bazel +++ b/modules/benchmarks/src/expanding_rows/BUILD.bazel @@ -42,7 +42,7 @@ ng_rollup_bundle( ts_devserver( name = "prodserver", - bootstrap = ["//packages/zone.js/dist:zone.js"], + bootstrap = ["//packages/zone.js/bundles:zone.umd.js"], port = 4200, static_files = ["index.html"], deps = [":bundle.min_debug.es2015.js"], @@ -50,7 +50,7 @@ ts_devserver( ts_devserver( name = "devserver", - bootstrap = ["//packages/zone.js/dist:zone.js"], + bootstrap = ["//packages/zone.js/bundles:zone.umd.js"], entry_module = "angular/modules/benchmarks/src/expanding_rows/index_aot", port = 4200, scripts = [ diff --git a/modules/benchmarks/src/js-web-frameworks/ng2/BUILD.bazel b/modules/benchmarks/src/js-web-frameworks/ng2/BUILD.bazel index 66c9de654c..d8f1f6e859 100644 --- a/modules/benchmarks/src/js-web-frameworks/ng2/BUILD.bazel +++ b/modules/benchmarks/src/js-web-frameworks/ng2/BUILD.bazel @@ -26,7 +26,7 @@ ng_rollup_bundle( ts_devserver( name = "prodserver", - bootstrap = ["//packages/zone.js/dist:zone.js"], + bootstrap = ["//packages/zone.js/bundles:zone.umd.js"], port = 4200, static_files = ["index.html"], deps = [":bundle.min_debug.es2015.js"], diff --git a/modules/benchmarks/src/largeform/ng2/BUILD.bazel b/modules/benchmarks/src/largeform/ng2/BUILD.bazel index 3cc1d9e7f7..7fd2e37619 100644 --- a/modules/benchmarks/src/largeform/ng2/BUILD.bazel +++ b/modules/benchmarks/src/largeform/ng2/BUILD.bazel @@ -24,7 +24,7 @@ ts_devserver( name = "devserver", bootstrap = [ "@npm//:node_modules/reflect-metadata/Reflect.js", - "//packages/zone.js/dist:zone.js", + "//packages/zone.js/bundles:zone.umd.js", ], entry_module = "angular/modules/benchmarks/src/largeform/ng2/index", port = 4200, diff --git a/modules/benchmarks/src/largetable/ng2/BUILD.bazel b/modules/benchmarks/src/largetable/ng2/BUILD.bazel index 4f692c40e3..d5c6973b72 100644 --- a/modules/benchmarks/src/largetable/ng2/BUILD.bazel +++ b/modules/benchmarks/src/largetable/ng2/BUILD.bazel @@ -32,7 +32,7 @@ ng_rollup_bundle( ts_devserver( name = "prodserver", - bootstrap = ["//packages/zone.js/dist:zone.js"], + bootstrap = ["//packages/zone.js/bundles:zone.umd.js"], port = 4200, static_files = ["index.html"], deps = [":bundle.min_debug.es2015.js"], diff --git a/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel b/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel index dac90bfdfc..1873064336 100644 --- a/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel +++ b/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel @@ -22,7 +22,7 @@ ts_devserver( name = "devserver", bootstrap = [ "@npm//:node_modules/reflect-metadata/Reflect.js", - "//packages/zone.js/dist:zone.js", + "//packages/zone.js/bundles:zone.umd.js", ], entry_module = "angular/modules/benchmarks/src/largetable/ng2_switch/index", port = 4200, diff --git a/modules/benchmarks/src/styling/ng2/BUILD.bazel b/modules/benchmarks/src/styling/ng2/BUILD.bazel index 2c94d73a16..0171978d5a 100644 --- a/modules/benchmarks/src/styling/ng2/BUILD.bazel +++ b/modules/benchmarks/src/styling/ng2/BUILD.bazel @@ -26,7 +26,7 @@ ng_rollup_bundle( ts_devserver( name = "prodserver", - bootstrap = ["//packages/zone.js/dist:zone.js"], + bootstrap = ["//packages/zone.js/bundles:zone.umd.js"], port = 4200, static_files = ["index.html"], deps = [":bundle.min_debug.es2015.js"], diff --git a/modules/benchmarks/src/tree/ng2/BUILD.bazel b/modules/benchmarks/src/tree/ng2/BUILD.bazel index 4f479c0f09..953688869e 100644 --- a/modules/benchmarks/src/tree/ng2/BUILD.bazel +++ b/modules/benchmarks/src/tree/ng2/BUILD.bazel @@ -32,7 +32,7 @@ ng_rollup_bundle( ts_devserver( name = "prodserver", - bootstrap = ["//packages/zone.js/dist:zone.js"], + bootstrap = ["//packages/zone.js/bundles:zone.umd.js"], port = 4200, static_files = ["index.html"], deps = [":bundle.min_debug.es2015.js"], diff --git a/modules/benchmarks/src/tree/ng2_static/BUILD.bazel b/modules/benchmarks/src/tree/ng2_static/BUILD.bazel index 0af1f9111d..35fd394a35 100644 --- a/modules/benchmarks/src/tree/ng2_static/BUILD.bazel +++ b/modules/benchmarks/src/tree/ng2_static/BUILD.bazel @@ -21,7 +21,7 @@ ts_devserver( name = "devserver", bootstrap = [ "@npm//:node_modules/reflect-metadata/Reflect.js", - "//packages/zone.js/dist:zone.js", + "//packages/zone.js/bundles:zone.umd.js", ], entry_module = "angular/modules/benchmarks/src/tree/ng2_static/index", port = 4200, diff --git a/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel b/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel index 5f849591fc..0dfa80e29a 100644 --- a/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel +++ b/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel @@ -22,7 +22,7 @@ ts_devserver( name = "devserver", bootstrap = [ "@npm//:node_modules/reflect-metadata/Reflect.js", - "//packages/zone.js/dist:zone.js", + "//packages/zone.js/bundles:zone.umd.js", ], entry_module = "angular/modules/benchmarks/src/tree/ng2_switch/index", port = 4200, diff --git a/modules/benchmarks/src/views/BUILD.bazel b/modules/benchmarks/src/views/BUILD.bazel index 05b283a2f1..8956162683 100644 --- a/modules/benchmarks/src/views/BUILD.bazel +++ b/modules/benchmarks/src/views/BUILD.bazel @@ -30,7 +30,7 @@ ts_devserver( static_files = [ ":bundle.min_debug.es2015.js", ":bundle.min.es2015.js", - "//packages/zone.js/dist:zone.js", + "//packages/zone.js/bundles:zone.umd.js", "index.html", ], ) @@ -44,7 +44,7 @@ ts_devserver( ], serving_path = "/index.js", static_files = [ - "//packages/zone.js/dist:zone.js", + "//packages/zone.js/bundles:zone.umd.js", "index.html", ], deps = [":application_lib"], diff --git a/modules/benchmarks/src/views/index.html b/modules/benchmarks/src/views/index.html index 41812705a7..bb9186b4c9 100644 --- a/modules/benchmarks/src/views/index.html +++ b/modules/benchmarks/src/views/index.html @@ -27,7 +27,7 @@ }); } // zone.js must be loaded and processed before Angular bundle gets executed - loadScript('/npm/node_modules/zone.js/dist/zone.js').then(function () { + loadScript('/npm/node_modules/zone.js/bundles/zone.umd.js').then(function () { loadScript(document.location.search.endsWith('debug') ? 'bundle.min_debug.es2015.js' : 'bundle.min.es2015.js'); }); } diff --git a/modules/playground/src/animate/BUILD.bazel b/modules/playground/src/animate/BUILD.bazel index a304367895..dfb23dcf51 100644 --- a/modules/playground/src/animate/BUILD.bazel +++ b/modules/playground/src/animate/BUILD.bazel @@ -22,7 +22,7 @@ ts_devserver( scripts = ["@npm//:node_modules/tslib/tslib.js"], static_files = [ "index.html", - "//packages/zone.js/dist:zone.js", + "//packages/zone.js/bundles:zone.umd.js", "@npm//:node_modules/reflect-metadata/Reflect.js", ], deps = [":animate"], diff --git a/modules/playground/src/async/BUILD.bazel b/modules/playground/src/async/BUILD.bazel index c5479214cf..321282e920 100644 --- a/modules/playground/src/async/BUILD.bazel +++ b/modules/playground/src/async/BUILD.bazel @@ -16,7 +16,7 @@ ng_module( ts_devserver( name = "devserver", bootstrap = [ - "//packages/zone.js/dist:zone.js", + "//packages/zone.js/bundles:zone.umd.js", "@npm//:node_modules/reflect-metadata/Reflect.js", ], entry_module = "angular/modules/playground/src/async/index", diff --git a/modules/playground/src/gestures/BUILD.bazel b/modules/playground/src/gestures/BUILD.bazel index d50dc9e077..34308bc287 100644 --- a/modules/playground/src/gestures/BUILD.bazel +++ b/modules/playground/src/gestures/BUILD.bazel @@ -19,7 +19,7 @@ ts_devserver( name = "devserver", bootstrap = [ "@npm//:node_modules/hammerjs/hammer.js", - "//packages/zone.js/dist:zone.js", + "//packages/zone.js/bundles:zone.umd.js", "@npm//:node_modules/reflect-metadata/Reflect.js", ], entry_module = "angular/modules/playground/src/gestures/index", diff --git a/modules/playground/src/hello_world/BUILD.bazel b/modules/playground/src/hello_world/BUILD.bazel index 52150bcbbd..65cbd259d6 100644 --- a/modules/playground/src/hello_world/BUILD.bazel +++ b/modules/playground/src/hello_world/BUILD.bazel @@ -16,7 +16,7 @@ ng_module( ts_devserver( name = "devserver", bootstrap = [ - "//packages/zone.js/dist:zone.js", + "//packages/zone.js/bundles:zone.umd.js", "@npm//:node_modules/reflect-metadata/Reflect.js", ], entry_module = "angular/modules/playground/src/hello_world/index", diff --git a/modules/playground/src/http/BUILD.bazel b/modules/playground/src/http/BUILD.bazel index a4e36e30b7..5d5996a965 100644 --- a/modules/playground/src/http/BUILD.bazel +++ b/modules/playground/src/http/BUILD.bazel @@ -18,7 +18,7 @@ ng_module( ts_devserver( name = "devserver", bootstrap = [ - "//packages/zone.js/dist:zone.js", + "//packages/zone.js/bundles:zone.umd.js", "@npm//:node_modules/reflect-metadata/Reflect.js", ], entry_module = "angular/modules/playground/src/http/index", diff --git a/modules/playground/src/jsonp/BUILD.bazel b/modules/playground/src/jsonp/BUILD.bazel index f9807ef4de..2c8a356a42 100644 --- a/modules/playground/src/jsonp/BUILD.bazel +++ b/modules/playground/src/jsonp/BUILD.bazel @@ -17,7 +17,7 @@ ng_module( ts_devserver( name = "devserver", bootstrap = [ - "//packages/zone.js/dist:zone.js", + "//packages/zone.js/bundles:zone.umd.js", "@npm//:node_modules/reflect-metadata/Reflect.js", ], entry_module = "angular/modules/playground/src/jsonp/index", diff --git a/modules/playground/src/key_events/BUILD.bazel b/modules/playground/src/key_events/BUILD.bazel index 2aa2d84b77..24d2e0aeed 100644 --- a/modules/playground/src/key_events/BUILD.bazel +++ b/modules/playground/src/key_events/BUILD.bazel @@ -16,7 +16,7 @@ ng_module( ts_devserver( name = "devserver", bootstrap = [ - "//packages/zone.js/dist:zone.js", + "//packages/zone.js/bundles:zone.umd.js", "@npm//:node_modules/reflect-metadata/Reflect.js", ], entry_module = "angular/modules/playground/src/key_events/index", diff --git a/modules/playground/src/model_driven_forms/BUILD.bazel b/modules/playground/src/model_driven_forms/BUILD.bazel index 84b2ee4824..2e32824371 100644 --- a/modules/playground/src/model_driven_forms/BUILD.bazel +++ b/modules/playground/src/model_driven_forms/BUILD.bazel @@ -17,7 +17,7 @@ ng_module( ts_devserver( name = "devserver", bootstrap = [ - "//packages/zone.js/dist:zone.js", + "//packages/zone.js/bundles:zone.umd.js", "@npm//:node_modules/reflect-metadata/Reflect.js", ], entry_module = "angular/modules/playground/src/model_driven_forms/index", diff --git a/modules/playground/src/order_management/BUILD.bazel b/modules/playground/src/order_management/BUILD.bazel index 9b6eacf765..0e254fdb3e 100644 --- a/modules/playground/src/order_management/BUILD.bazel +++ b/modules/playground/src/order_management/BUILD.bazel @@ -17,7 +17,7 @@ ng_module( ts_devserver( name = "devserver", bootstrap = [ - "//packages/zone.js/dist:zone.js", + "//packages/zone.js/bundles:zone.umd.js", "@npm//:node_modules/reflect-metadata/Reflect.js", ], entry_module = "angular/modules/playground/src/order_management/index", diff --git a/modules/playground/src/person_management/BUILD.bazel b/modules/playground/src/person_management/BUILD.bazel index 883d5d7648..7755a3411c 100644 --- a/modules/playground/src/person_management/BUILD.bazel +++ b/modules/playground/src/person_management/BUILD.bazel @@ -17,7 +17,7 @@ ng_module( ts_devserver( name = "devserver", bootstrap = [ - "//packages/zone.js/dist:zone.js", + "//packages/zone.js/bundles:zone.umd.js", "@npm//:node_modules/reflect-metadata/Reflect.js", ], entry_module = "angular/modules/playground/src/person_management/index", diff --git a/modules/playground/src/relative_assets/BUILD.bazel b/modules/playground/src/relative_assets/BUILD.bazel index 4606d92abe..7cb086fcd2 100644 --- a/modules/playground/src/relative_assets/BUILD.bazel +++ b/modules/playground/src/relative_assets/BUILD.bazel @@ -25,7 +25,7 @@ ng_module( ts_devserver( name = "devserver", bootstrap = [ - "//packages/zone.js/dist:zone.js", + "//packages/zone.js/bundles:zone.umd.js", "@npm//:node_modules/reflect-metadata/Reflect.js", ], entry_module = "angular/modules/playground/src/relative_assets/index", diff --git a/modules/playground/src/routing/BUILD.bazel b/modules/playground/src/routing/BUILD.bazel index d343253915..cc3f595014 100644 --- a/modules/playground/src/routing/BUILD.bazel +++ b/modules/playground/src/routing/BUILD.bazel @@ -26,7 +26,7 @@ ts_devserver( "//third_party/fonts.google.com/open-sans", "@npm//:node_modules/rxjs/bundles/rxjs.umd.js", "@npm//:node_modules/tslib/tslib.js", - "//packages/zone.js/dist:zone.js", + "//packages/zone.js/bundles:zone.umd.js", "index.html", "@npm//:node_modules/reflect-metadata/Reflect.js", "@npm//:node_modules/systemjs/dist/system.js", diff --git a/modules/playground/src/routing/index.html b/modules/playground/src/routing/index.html index 99632b8b74..822c51d861 100644 --- a/modules/playground/src/routing/index.html +++ b/modules/playground/src/routing/index.html @@ -15,7 +15,7 @@ This is because we want to use SystemJS instead of RequireJS and want to support lazy loading of routes. Read more in the "load-app.js" file. --> - + diff --git a/modules/playground/src/sourcemap/BUILD.bazel b/modules/playground/src/sourcemap/BUILD.bazel index 65290945e4..6e7503ba28 100644 --- a/modules/playground/src/sourcemap/BUILD.bazel +++ b/modules/playground/src/sourcemap/BUILD.bazel @@ -20,7 +20,7 @@ ng_module( ts_devserver( name = "devserver", bootstrap = [ - "//packages/zone.js/dist:zone.js", + "//packages/zone.js/bundles:zone.umd.js", "@npm//:node_modules/reflect-metadata/Reflect.js", ], entry_module = "angular/modules/playground/src/sourcemap/index", diff --git a/modules/playground/src/svg/BUILD.bazel b/modules/playground/src/svg/BUILD.bazel index a3d3cb15d8..e5e8bab7fe 100644 --- a/modules/playground/src/svg/BUILD.bazel +++ b/modules/playground/src/svg/BUILD.bazel @@ -16,7 +16,7 @@ ng_module( ts_devserver( name = "devserver", bootstrap = [ - "//packages/zone.js/dist:zone.js", + "//packages/zone.js/bundles:zone.umd.js", "@npm//:node_modules/reflect-metadata/Reflect.js", ], entry_module = "angular/modules/playground/src/svg/index", diff --git a/modules/playground/src/template_driven_forms/BUILD.bazel b/modules/playground/src/template_driven_forms/BUILD.bazel index 4ac363e7ff..853c139116 100644 --- a/modules/playground/src/template_driven_forms/BUILD.bazel +++ b/modules/playground/src/template_driven_forms/BUILD.bazel @@ -17,7 +17,7 @@ ng_module( ts_devserver( name = "devserver", bootstrap = [ - "//packages/zone.js/dist:zone.js", + "//packages/zone.js/bundles:zone.umd.js", "@npm//:node_modules/reflect-metadata/Reflect.js", ], entry_module = "angular/modules/playground/src/template_driven_forms/index", diff --git a/modules/playground/src/todo/BUILD.bazel b/modules/playground/src/todo/BUILD.bazel index ff03f33bdf..fba349fd73 100644 --- a/modules/playground/src/todo/BUILD.bazel +++ b/modules/playground/src/todo/BUILD.bazel @@ -20,7 +20,7 @@ ng_module( ts_devserver( name = "devserver", bootstrap = [ - "//packages/zone.js/dist:zone.js", + "//packages/zone.js/bundles:zone.umd.js", "@npm//:node_modules/reflect-metadata/Reflect.js", ], entry_module = "angular/modules/playground/src/todo/index", diff --git a/modules/playground/src/upgrade/BUILD.bazel b/modules/playground/src/upgrade/BUILD.bazel index b557b2220e..93ae3cf13e 100644 --- a/modules/playground/src/upgrade/BUILD.bazel +++ b/modules/playground/src/upgrade/BUILD.bazel @@ -18,7 +18,7 @@ ts_library( ts_devserver( name = "devserver", bootstrap = [ - "//packages/zone.js/dist:zone.js", + "//packages/zone.js/bundles:zone.umd.js", "@npm//:node_modules/reflect-metadata/Reflect.js", "@npm//:node_modules/angular/angular.js", ], diff --git a/modules/playground/src/web_workers/BUILD.bazel b/modules/playground/src/web_workers/BUILD.bazel index 68f08a1840..101d5649d7 100644 --- a/modules/playground/src/web_workers/BUILD.bazel +++ b/modules/playground/src/web_workers/BUILD.bazel @@ -6,7 +6,7 @@ filegroup( data = [ "//modules/playground:systemjs-config.js", "//modules/playground:systemjs-rxjs-operators.js", - "//packages/zone.js/dist:zone.js", + "//packages/zone.js/bundles:zone.umd.js", "@npm//reflect-metadata", "@npm//systemjs", ], diff --git a/modules/playground/src/web_workers/animations/BUILD.bazel b/modules/playground/src/web_workers/animations/BUILD.bazel index a2c0883afa..9b6cf7012e 100644 --- a/modules/playground/src/web_workers/animations/BUILD.bazel +++ b/modules/playground/src/web_workers/animations/BUILD.bazel @@ -25,7 +25,7 @@ ts_devserver( "@npm//:node_modules/rxjs/bundles/rxjs.umd.js", "@npm//:node_modules/tslib/tslib.js", "index.html", - "//packages/zone.js/dist:zone.js", + "//packages/zone.js/bundles:zone.umd.js", ], deps = [":animations"], ) diff --git a/modules/playground/src/web_workers/images/BUILD.bazel b/modules/playground/src/web_workers/images/BUILD.bazel index 965b9ffff9..e55c51a651 100644 --- a/modules/playground/src/web_workers/images/BUILD.bazel +++ b/modules/playground/src/web_workers/images/BUILD.bazel @@ -20,7 +20,7 @@ ts_devserver( # Workaround for: https://github.com/bazelbuild/rules_typescript/issues/409 additional_root_paths = ["angular"], bootstrap = [ - "//packages/zone.js/dist:zone.js", + "//packages/zone.js/bundles:zone.umd.js", "@npm//:node_modules/jquery/dist/jquery.min.js", "@npm//:node_modules/materialize-css/dist/js/materialize.min.js", ], diff --git a/modules/playground/src/web_workers/input/BUILD.bazel b/modules/playground/src/web_workers/input/BUILD.bazel index 5e690c2a91..ab49918324 100644 --- a/modules/playground/src/web_workers/input/BUILD.bazel +++ b/modules/playground/src/web_workers/input/BUILD.bazel @@ -17,8 +17,8 @@ ts_devserver( name = "devserver", bootstrap = [ "@npm//:node_modules/systemjs/dist/system.js", - "//packages/zone.js/dist:zone.js", - "//packages/zone.js/dist:long-stack-trace-zone.js", + "//packages/zone.js/bundles:zone.umd.js", + "//packages/zone.js/bundles:long-stack-trace-zone.umd.js", "@npm//:node_modules/reflect-metadata/Reflect.js", ], entry_module = "angular/modules/playground/src/web_workers/input/index", diff --git a/modules/playground/src/web_workers/kitchen_sink/BUILD.bazel b/modules/playground/src/web_workers/kitchen_sink/BUILD.bazel index 19953e699d..686ef0468b 100644 --- a/modules/playground/src/web_workers/kitchen_sink/BUILD.bazel +++ b/modules/playground/src/web_workers/kitchen_sink/BUILD.bazel @@ -17,8 +17,8 @@ ts_devserver( name = "devserver", bootstrap = [ "@npm//:node_modules/systemjs/dist/system.js", - "//packages/zone.js/dist:zone.js", - "//packages/zone.js/dist:long-stack-trace-zone.js", + "//packages/zone.js/bundles:zone.umd.js", + "//packages/zone.js/bundles:long-stack-trace-zone.umd.js", "@npm//:node_modules/reflect-metadata/Reflect.js", ], entry_module = "angular/modules/playground/src/web_workers/kitchen_sink/index", diff --git a/modules/playground/src/web_workers/message_broker/BUILD.bazel b/modules/playground/src/web_workers/message_broker/BUILD.bazel index 7f81951530..9dd6417a30 100644 --- a/modules/playground/src/web_workers/message_broker/BUILD.bazel +++ b/modules/playground/src/web_workers/message_broker/BUILD.bazel @@ -17,8 +17,8 @@ ts_devserver( name = "devserver", bootstrap = [ "@npm//:node_modules/systemjs/dist/system.js", - "//packages/zone.js/dist:zone.js", - "//packages/zone.js/dist:long-stack-trace-zone.js", + "//packages/zone.js/bundles:zone.umd.js", + "//packages/zone.js/bundles:long-stack-trace-zone.umd.js", "@npm//:node_modules/reflect-metadata/Reflect.js", ], entry_module = "angular/modules/playground/src/web_workers/message_broker/index", diff --git a/modules/playground/src/web_workers/router/BUILD.bazel b/modules/playground/src/web_workers/router/BUILD.bazel index 624d46cc8b..e771007426 100644 --- a/modules/playground/src/web_workers/router/BUILD.bazel +++ b/modules/playground/src/web_workers/router/BUILD.bazel @@ -20,8 +20,8 @@ ts_devserver( name = "devserver", bootstrap = [ "@npm//:node_modules/systemjs/dist/system.js", - "//packages/zone.js/dist:zone.js", - "//packages/zone.js/dist:long-stack-trace-zone.js", + "//packages/zone.js/bundles:zone.umd.js", + "//packages/zone.js/bundles:long-stack-trace-zone.umd.js", "@npm//:node_modules/reflect-metadata/Reflect.js", ], entry_module = "angular/modules/playground/src/web_workers/router/index", diff --git a/modules/playground/src/web_workers/todo/BUILD.bazel b/modules/playground/src/web_workers/todo/BUILD.bazel index d45dcd05f8..ab7d016886 100644 --- a/modules/playground/src/web_workers/todo/BUILD.bazel +++ b/modules/playground/src/web_workers/todo/BUILD.bazel @@ -19,8 +19,8 @@ ts_devserver( name = "devserver", bootstrap = [ "@npm//:node_modules/systemjs/dist/system.js", - "//packages/zone.js/dist:zone.js", - "//packages/zone.js/dist:long-stack-trace-zone.js", + "//packages/zone.js/bundles:zone.umd.js", + "//packages/zone.js/bundles:long-stack-trace-zone.umd.js", "@npm//:node_modules/reflect-metadata/Reflect.js", ], entry_module = "angular/modules/playground/src/web_workers/todo/index", diff --git a/modules/playground/src/web_workers/worker-configure.js b/modules/playground/src/web_workers/worker-configure.js index 22b85079c0..8aba8ffcfa 100644 --- a/modules/playground/src/web_workers/worker-configure.js +++ b/modules/playground/src/web_workers/worker-configure.js @@ -7,8 +7,8 @@ */ importScripts('npm/node_modules/reflect-metadata/Reflect.js'); -importScripts('angular/packages/zone.js/dist/zone.js'); -importScripts('angular/packages/zone.js/dist/long-stack-trace-zone.js'); +importScripts('angular/packages/zone.js/bundles/zone.umd.js'); +importScripts('angular/packages/zone.js/bundles/long-stack-trace-zone.umd.js'); importScripts('npm/node_modules/systemjs/dist/system.js'); importScripts('angular/modules/playground/systemjs-config.js'); diff --git a/modules/playground/src/zippy_component/BUILD.bazel b/modules/playground/src/zippy_component/BUILD.bazel index dd1fbe8d4e..2ccdb7785e 100644 --- a/modules/playground/src/zippy_component/BUILD.bazel +++ b/modules/playground/src/zippy_component/BUILD.bazel @@ -17,7 +17,7 @@ ng_module( ts_devserver( name = "devserver", bootstrap = [ - "//packages/zone.js/dist:zone.js", + "//packages/zone.js/bundles:zone.umd.js", "@npm//:node_modules/reflect-metadata/Reflect.js", ], entry_module = "angular/modules/playground/src/zippy_component/index", diff --git a/packages/bazel/src/schematics/ng-add/index_spec.ts b/packages/bazel/src/schematics/ng-add/index_spec.ts index 38bac458e5..d751890774 100644 --- a/packages/bazel/src/schematics/ng-add/index_spec.ts +++ b/packages/bazel/src/schematics/ng-add/index_spec.ts @@ -204,7 +204,7 @@ describe('ng-add schematic', () => { const {files} = host; expect(files).toContain('/src/index.html'); const content = host.readContent('/src/index.html'); - expect(content).not.toMatch(''); + expect(content).not.toMatch(''); expect(content).not.toMatch(''); }); diff --git a/packages/elements/test/BUILD.bazel b/packages/elements/test/BUILD.bazel index 334bcc49e7..132083c917 100644 --- a/packages/elements/test/BUILD.bazel +++ b/packages/elements/test/BUILD.bazel @@ -41,8 +41,8 @@ filegroup( "@npm//:node_modules/core-js/client/core.js", ":custom_elements_native_shim", "@npm//:node_modules/reflect-metadata/Reflect.js", - "//packages/zone.js/dist:zone.js", - "//packages/zone.js/dist:zone-testing.js", + "//packages/zone.js/bundles:zone.umd.js", + "//packages/zone.js/bundles:zone-testing.umd.js", ], ) diff --git a/packages/examples/common/BUILD.bazel b/packages/examples/common/BUILD.bazel index 5231f5809e..d813eb928e 100644 --- a/packages/examples/common/BUILD.bazel +++ b/packages/examples/common/BUILD.bazel @@ -35,7 +35,7 @@ ts_library( ts_devserver( name = "devserver", additional_root_paths = ["angular/packages/examples"], - bootstrap = ["//packages/zone.js/dist:zone.js"], + bootstrap = ["//packages/zone.js/bundles:zone.umd.js"], entry_module = "@angular/examples/common/main", port = 4200, scripts = [ diff --git a/packages/examples/core/BUILD.bazel b/packages/examples/core/BUILD.bazel index 8ee6574f02..2befe31a35 100644 --- a/packages/examples/core/BUILD.bazel +++ b/packages/examples/core/BUILD.bazel @@ -53,8 +53,8 @@ ts_devserver( name = "devserver", additional_root_paths = ["angular/packages/examples"], bootstrap = [ - "//packages/zone.js/dist:zone.js", - "//packages/zone.js/dist:task-tracking.js", + "//packages/zone.js/bundles:zone.umd.js", + "//packages/zone.js/bundles:task-tracking.umd.js", ], entry_module = "@angular/examples/core/main", port = 4200, diff --git a/packages/examples/forms/BUILD.bazel b/packages/examples/forms/BUILD.bazel index 21a199e34b..69d52e11a4 100644 --- a/packages/examples/forms/BUILD.bazel +++ b/packages/examples/forms/BUILD.bazel @@ -35,7 +35,7 @@ ts_library( ts_devserver( name = "devserver", additional_root_paths = ["angular/packages/examples"], - bootstrap = ["//packages/zone.js/dist:zone.js"], + bootstrap = ["//packages/zone.js/bundles:zone.umd.js"], entry_module = "@angular/examples/forms/main", port = 4200, scripts = [ diff --git a/packages/examples/router/activated-route/BUILD.bazel b/packages/examples/router/activated-route/BUILD.bazel index f9dac5b28f..56fe54909b 100644 --- a/packages/examples/router/activated-route/BUILD.bazel +++ b/packages/examples/router/activated-route/BUILD.bazel @@ -27,7 +27,7 @@ ts_devserver( ], static_files = [ "//packages/examples:index.html", - "//packages/zone.js/dist:zone.js", + "//packages/zone.js/bundles:zone.umd.js", ], deps = [":router_activated_route_examples"], ) diff --git a/packages/examples/service-worker/push/BUILD.bazel b/packages/examples/service-worker/push/BUILD.bazel index 568ddf4354..c6b89efa45 100644 --- a/packages/examples/service-worker/push/BUILD.bazel +++ b/packages/examples/service-worker/push/BUILD.bazel @@ -34,7 +34,7 @@ ts_devserver( name = "devserver", additional_root_paths = ["angular/packages/examples"], bootstrap = [ - "//packages/zone.js/dist:zone.js", + "//packages/zone.js/bundles:zone.umd.js", "ngsw-worker.js", ], entry_module = "@angular/examples/service-worker/push/main", diff --git a/packages/examples/service-worker/registration-options/BUILD.bazel b/packages/examples/service-worker/registration-options/BUILD.bazel index 7b451088ca..147a428972 100644 --- a/packages/examples/service-worker/registration-options/BUILD.bazel +++ b/packages/examples/service-worker/registration-options/BUILD.bazel @@ -34,7 +34,7 @@ ts_devserver( name = "devserver", additional_root_paths = ["angular/packages/examples"], bootstrap = [ - "//packages/zone.js/dist:zone.js", + "//packages/zone.js/bundles:zone.umd.js", "ngsw-worker.js", ], entry_module = "@angular/examples/service-worker/registration-options/main", diff --git a/packages/examples/upgrade/upgrade_example.bzl b/packages/examples/upgrade/upgrade_example.bzl index e6b8a45a27..d3bca942a7 100644 --- a/packages/examples/upgrade/upgrade_example.bzl +++ b/packages/examples/upgrade/upgrade_example.bzl @@ -44,7 +44,7 @@ def create_upgrade_example_targets(name, srcs, e2e_srcs, entry_module, assets = entry_module = entry_module, additional_root_paths = ["angular/packages/examples"], bootstrap = [ - "//packages/zone.js/dist:zone.js", + "//packages/zone.js/bundles:zone.umd.js", "@npm//:node_modules/angular/angular.js", "@npm//:node_modules/reflect-metadata/Reflect.js", ], diff --git a/packages/router/karma.conf.js b/packages/router/karma.conf.js index 103d78e967..038d8e2654 100644 --- a/packages/router/karma.conf.js +++ b/packages/router/karma.conf.js @@ -35,8 +35,8 @@ module.exports = function(config) { 'node_modules/systemjs/dist/system.src.js', // Zone.js dependencies - 'dist/bin/packages/zone.js/npm_package/dist/zone.js', - 'dist/bin/packages/zone.js/npm_package/dist/zone-testing.js', + 'dist/bin/packages/zone.js/npm_package/bundles/zone.umd.js', + 'dist/bin/packages/zone.js/npm_package/bundles/zone-testing.umd.js', {pattern: 'node_modules/rxjs/**/*', included: false, watched: false}, diff --git a/packages/zone.js/BUILD.bazel b/packages/zone.js/BUILD.bazel index 9b866c78c6..176e95ff89 100644 --- a/packages/zone.js/BUILD.bazel +++ b/packages/zone.js/BUILD.bazel @@ -1,5 +1,8 @@ load("//tools:defaults.bzl", "pkg_npm") -load("//packages/zone.js:bundles.bzl", "ES2015_BUNDLES", "ES5_BUNDLES", "ES5_GLOBAL_BUNDLES") +load("//packages/zone.js:bundles.bzl", "BUNDLES_ENTRY_POINTS") +load("//packages/zone.js:tools.bzl", "generate_rollup_bundle") + +package(default_visibility = ["//visibility:public"]) exports_files([ "tsconfig.json", @@ -21,27 +24,75 @@ genrule( cmd = "(echo '/**\n @license' && cat $< && echo '*/') > $@", ) +# copy this file from //lib to //dist +genrule( + name = "zone_externs", + srcs = ["//packages/zone.js/lib:closure/zone_externs.js"], + outs = ["zone_externs.js"], + cmd = "cp $< $@", +) + +genrule( + name = "zone_js_d_ts", + srcs = ["//packages/zone.js/lib:zone_d_ts"], + outs = ["zone.js.d.ts"], + 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 $< $@", +) + +filegroup( + name = "zone_d_ts", + srcs = [ + ":zone_configurations_d_ts", + ":zone_extensions_d_ts", + ":zone_js_d_ts", + ], +) + +generate_rollup_bundle( + bundles = BUNDLES_ENTRY_POINTS, +) + pkg_npm( name = "npm_package", srcs = [ "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", - "//packages/zone.js/dist:zone_externs", - "//packages/zone.js/lib", + ":zone_externs", + "//packages/zone.js/dist:dist_bundle_group", ] + [ - "//packages/zone.js/dist:" + b + "-dist" - for b in ES5_BUNDLES + "//packages/zone.js/bundles:" + b + "-es5.dist" + for b in BUNDLES_ENTRY_POINTS.keys() ] + [ - "//packages/zone.js/dist:" + b + "-dist" - for b in ES2015_BUNDLES + "//packages/zone.js/bundles:" + b + "-es5.min.dist" + for b in BUNDLES_ENTRY_POINTS.keys() ] + [ - "//packages/zone.js/dist:" + b + "-dist" - for b in ES5_GLOBAL_BUNDLES - ] + ["//packages/zone.js/dist:zone_d_ts"], + "//packages/zone.js/fesm2015:" + b + "-es2015.dist" + for b in BUNDLES_ENTRY_POINTS.keys() + ] + [ + "//packages/zone.js/fesm2015:" + b + "-es2015.min.dist" + for b in BUNDLES_ENTRY_POINTS.keys() + ] + [":zone_d_ts"], ) diff --git a/packages/zone.js/bundles.bzl b/packages/zone.js/bundles.bzl index 9abbf1610f..6e2c1d3746 100644 --- a/packages/zone.js/bundles.bzl +++ b/packages/zone.js/bundles.bzl @@ -5,47 +5,143 @@ by mapping the bundle name to the source location. _DIR = "//packages/zone.js/lib:" -ES5_GLOBAL_BUNDLES = { - "zone": _DIR + "browser/rollup-legacy-main", - "zone-mix": _DIR + "mix/rollup-mix", - "zone-node": _DIR + "node/rollup-main", - "zone-testing-node-bundle": _DIR + "node/rollup-test-main", -} - -ES5_BUNDLES = { - "async-test": _DIR + "testing/async-testing", - "fake-async-test": _DIR + "testing/fake-async", - "long-stack-trace-zone": _DIR + "zone-spec/long-stack-trace", - "proxy": _DIR + "zone-spec/proxy", - "zone-patch-rxjs-fake-async": _DIR + "rxjs/rxjs-fake-async", - "sync-test": _DIR + "zone-spec/sync-test", - "task-tracking": _DIR + "zone-spec/task-tracking", - "wtf": _DIR + "zone-spec/wtf", - "zone-error": _DIR + "common/error-rewrite", - "zone-legacy": _DIR + "browser/browser-legacy", - "zone-bluebird": _DIR + "extra/bluebird", - "zone-patch-canvas": _DIR + "browser/canvas", - "zone-patch-cordova": _DIR + "extra/cordova", - "zone-patch-electron": _DIR + "extra/electron", - "zone-patch-fetch": _DIR + "common/fetch", - "jasmine-patch": _DIR + "jasmine/jasmine", - "zone-patch-jsonp": _DIR + "extra/jsonp", - "webapis-media-query": _DIR + "browser/webapis-media-query", - "mocha-patch": _DIR + "mocha/mocha", - "webapis-notification": _DIR + "browser/webapis-notification", - "zone-patch-promise-test": _DIR + "testing/promise-testing", - "zone-patch-resize-observer": _DIR + "browser/webapis-resize-observer", - "webapis-rtc-peer-connection": _DIR + "browser/webapis-rtc-peer-connection", - "zone-patch-rxjs": _DIR + "rxjs/rxjs", - "webapis-shadydom": _DIR + "browser/shadydom", - "zone-patch-socket-io": _DIR + "extra/socket-io", - "zone-patch-message-port": _DIR + "browser/message-port", - "zone-patch-user-media": _DIR + "browser/webapis-user-media", - "zone-testing": _DIR + "testing/zone-testing", - "zone-testing-bundle": _DIR + "browser/rollup-legacy-test-main", -} - -ES2015_BUNDLES = { - "zone-evergreen": _DIR + "browser/rollup-main", - "zone-evergreen-testing-bundle": _DIR + "browser/rollup-test-main", +BUNDLES_ENTRY_POINTS = { + "zone": { + "es5": _DIR + "browser/rollup-legacy-main", + "es2015": _DIR + "browser/rollup-main", + "rollup": "global-es2015", + }, + "zone-mix": { + "entrypoint": _DIR + "mix/rollup-mix", + "rollup": "global-es2015", + }, + "zone-node": { + "entrypoint": _DIR + "node/rollup-main", + "rollup": "global-es2015", + }, + "async-test": { + "entrypoint": _DIR + "testing/async-testing", + "rollup": "es5", + }, + "fake-async-test": { + "entrypoint": _DIR + "testing/fake-async", + "rollup": "es5", + }, + "long-stack-trace-zone": { + "entrypoint": _DIR + "zone-spec/long-stack-trace", + "rollup": "es5", + }, + "proxy": { + "entrypoint": _DIR + "zone-spec/proxy", + "rollup": "es5", + }, + "zone-patch-rxjs-fake-async": { + "entrypoint": _DIR + "zone-spec/proxy", + "rollup": "es5", + }, + "sync-test": { + "entrypoint": _DIR + "zone-spec/sync-test", + "rollup": "es5", + }, + "task-tracking": { + "entrypoint": _DIR + "zone-spec/task-tracking", + "rollup": "es5", + }, + "wtf": { + "entrypoint": _DIR + "zone-spec/wtf", + "rollup": "es5", + }, + "zone-error": { + "entrypoint": _DIR + "common/error-rewrite", + "rollup": "es5", + }, + "zone-legacy": { + "entrypoint": _DIR + "browser/browser-legacy", + "rollup": "es5", + }, + "zone-bluebird": { + "entrypoint": _DIR + "extra/bluebird", + "rollup": "es5", + }, + "zone-patch-canvas": { + "entrypoint": _DIR + "browser/canvas", + "rollup": "es5", + }, + "zone-patch-cordova": { + "entrypoint": _DIR + "extra/cordova", + "rollup": "es5", + }, + "zone-patch-electron": { + "entrypoint": _DIR + "extra/electron", + "rollup": "es5", + }, + "zone-patch-fetch": { + "entrypoint": _DIR + "common/fetch", + "rollup": "es5", + }, + "jasmine-patch": { + "entrypoint": _DIR + "jasmine/jasmine", + "rollup": "es5", + }, + "zone-patch-jsonp": { + "entrypoint": _DIR + "extra/jsonp", + "rollup": "es5", + }, + "webapis-media-query": { + "entrypoint": _DIR + "browser/webapis-media-query", + "rollup": "es5", + }, + "mocha-patch": { + "entrypoint": _DIR + "mocha/mocha", + "rollup": "es5", + }, + "webapis-notification": { + "entrypoint": _DIR + "browser/webapis-notification", + "rollup": "es5", + }, + "zone-patch-promise-test": { + "entrypoint": _DIR + "testing/promise-testing", + "rollup": "es5", + }, + "zone-patch-resize-observer": { + "entrypoint": _DIR + "browser/webapis-resize-observer", + "rollup": "es5", + }, + "webapis-rtc-peer-connection": { + "entrypoint": _DIR + "browser/webapis-rtc-peer-connection", + "rollup": "es5", + }, + "zone-patch-rxjs": { + "entrypoint": _DIR + "rxjs/rxjs", + "rollup": "es5", + }, + "webapis-shadydom": { + "entrypoint": _DIR + "browser/shadydom", + "rollup": "es5", + }, + "zone-patch-socket-io": { + "entrypoint": _DIR + "extra/socket-io", + "rollup": "es5", + }, + "zone-patch-message-port": { + "entrypoint": _DIR + "browser/message-port", + "rollup": "es5", + }, + "zone-patch-user-media": { + "entrypoint": _DIR + "browser/webapis-user-media", + "rollup": "es5", + }, + "zone-testing": { + "entrypoint": _DIR + "testing/zone-testing", + "rollup": "es5", + }, + "zone-testing-bundle": { + "es5": _DIR + "browser/rollup-legacy-test-main", + "es2015": _DIR + "browser/rollup-test-main", + "rollup": "global-es2015", + }, + "zone-testing-node-bundle": { + "entrypoint": _DIR + "node/rollup-test-main", + "rollup": "global-es2015", + }, } diff --git a/packages/zone.js/bundles/BUILD.bazel b/packages/zone.js/bundles/BUILD.bazel new file mode 100644 index 0000000000..db4a66dc53 --- /dev/null +++ b/packages/zone.js/bundles/BUILD.bazel @@ -0,0 +1,8 @@ +load("//packages/zone.js:tools.bzl", "generate_dist") +load("//packages/zone.js:bundles.bzl", "BUNDLES_ENTRY_POINTS") + +generate_dist( + bundles = BUNDLES_ENTRY_POINTS.items(), + output_format = "es5", + umd = "umd", +) diff --git a/packages/zone.js/dist/BUILD.bazel b/packages/zone.js/dist/BUILD.bazel index c851b34339..1452b05a0e 100644 --- a/packages/zone.js/dist/BUILD.bazel +++ b/packages/zone.js/dist/BUILD.bazel @@ -1,62 +1,80 @@ -load("//packages/zone.js:bundles.bzl", "ES2015_BUNDLES", "ES5_BUNDLES", "ES5_GLOBAL_BUNDLES") -load("//packages/zone.js/dist:tools.bzl", "generate_dist", "zone_rollup_bundle") - package(default_visibility = ["//visibility:public"]) -# copy this file from //lib to //dist -genrule( - name = "zone_externs", - srcs = ["//packages/zone.js/lib:closure/zone_externs.js"], - outs = ["zone_externs.js"], - cmd = "cp $< $@", -) - -genrule( - name = "zone_js_d_ts", - srcs = ["//packages/zone.js/lib:zone_d_ts"], - outs = ["zone.js.d.ts"], - 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 $< $@", -) - filegroup( - name = "zone_d_ts", + name = "dist_bundle_group", srcs = [ - ":zone_configurations_d_ts", - ":zone_extensions_d_ts", - ":zone_js_d_ts", + "//packages/zone.js/dist:async-test.min/package.json", + "//packages/zone.js/dist:async-test/package.json", + "//packages/zone.js/dist:fake-async-test.min/package.json", + "//packages/zone.js/dist:fake-async-test/package.json", + "//packages/zone.js/dist:jasmine-patch.min/package.json", + "//packages/zone.js/dist:jasmine-patch/package.json", + "//packages/zone.js/dist:long-stack-trace-zone.min/package.json", + "//packages/zone.js/dist:long-stack-trace-zone/package.json", + "//packages/zone.js/dist:mocha-patch.min/package.json", + "//packages/zone.js/dist:mocha-patch/package.json", + "//packages/zone.js/dist:proxy.min/package.json", + "//packages/zone.js/dist:proxy/package.json", + "//packages/zone.js/dist:sync-test.min/package.json", + "//packages/zone.js/dist:sync-test/package.json", + "//packages/zone.js/dist:task-tracking.min/package.json", + "//packages/zone.js/dist:task-tracking/package.json", + "//packages/zone.js/dist:webapis-media-query.min/package.json", + "//packages/zone.js/dist:webapis-media-query/package.json", + "//packages/zone.js/dist:webapis-notification.min/package.json", + "//packages/zone.js/dist:webapis-notification/package.json", + "//packages/zone.js/dist:webapis-rtc-peer-connection.min/package.json", + "//packages/zone.js/dist:webapis-rtc-peer-connection/package.json", + "//packages/zone.js/dist:webapis-shadydom.min/package.json", + "//packages/zone.js/dist:webapis-shadydom/package.json", + "//packages/zone.js/dist:wtf.min/package.json", + "//packages/zone.js/dist:wtf/package.json", + "//packages/zone.js/dist:zone.min/package.json", + "//packages/zone.js/dist:zone-bluebird.min/package.json", + "//packages/zone.js/dist:zone-bluebird/package.json", + "//packages/zone.js/dist:zone-error.min/package.json", + "//packages/zone.js/dist:zone-error/package.json", + "//packages/zone.js/dist:zone-evergreen.min/package.json", + "//packages/zone.js/dist:zone-evergreen-testing-bundle.min/package.json", + "//packages/zone.js/dist:zone-evergreen-testing-bundle/package.json", + "//packages/zone.js/dist:zone-evergreen/package.json", + "//packages/zone.js/dist:zone-legacy.min/package.json", + "//packages/zone.js/dist:zone-legacy/package.json", + "//packages/zone.js/dist:zone-mix.min/package.json", + "//packages/zone.js/dist:zone-mix/package.json", + "//packages/zone.js/dist:zone-node.min/package.json", + "//packages/zone.js/dist:zone-node/package.json", + "//packages/zone.js/dist:zone-patch-canvas.min/package.json", + "//packages/zone.js/dist:zone-patch-canvas/package.json", + "//packages/zone.js/dist:zone-patch-cordova.min/package.json", + "//packages/zone.js/dist:zone-patch-cordova/package.json", + "//packages/zone.js/dist:zone-patch-electron.min/package.json", + "//packages/zone.js/dist:zone-patch-electron/package.json", + "//packages/zone.js/dist:zone-patch-fetch.min/package.json", + "//packages/zone.js/dist:zone-patch-fetch/package.json", + "//packages/zone.js/dist:zone-patch-jsonp.min/package.json", + "//packages/zone.js/dist:zone-patch-jsonp/package.json", + "//packages/zone.js/dist:zone-patch-message-port.min/package.json", + "//packages/zone.js/dist:zone-patch-message-port/package.json", + "//packages/zone.js/dist:zone-patch-promise-test.min/package.json", + "//packages/zone.js/dist:zone-patch-promise-test/package.json", + "//packages/zone.js/dist:zone-patch-resize-observer.min/package.json", + "//packages/zone.js/dist:zone-patch-resize-observer/package.json", + "//packages/zone.js/dist:zone-patch-rxjs.min/package.json", + "//packages/zone.js/dist:zone-patch-rxjs-fake-async.min/package.json", + "//packages/zone.js/dist:zone-patch-rxjs-fake-async/package.json", + "//packages/zone.js/dist:zone-patch-rxjs/package.json", + "//packages/zone.js/dist:zone-patch-socket-io.min/package.json", + "//packages/zone.js/dist:zone-patch-socket-io/package.json", + "//packages/zone.js/dist:zone-patch-user-media.min/package.json", + "//packages/zone.js/dist:zone-patch-user-media/package.json", + "//packages/zone.js/dist:zone-testing.min/package.json", + "//packages/zone.js/dist:zone-testing-bundle.min/package.json", + "//packages/zone.js/dist:zone-testing-bundle/package.json", + "//packages/zone.js/dist:zone-testing-node-bundle.min/package.json", + "//packages/zone.js/dist:zone-testing-node-bundle/package.json", + "//packages/zone.js/dist:zone-testing/package.json", + "//packages/zone.js/dist:zone/package.json", + "//packages/zone.js/dist:zone_externs/package.json", ], ) - -zone_rollup_bundle( - bundles = ES5_BUNDLES.items(), - config_file = "//packages/zone.js:rollup-es5.config.js", -) - -zone_rollup_bundle( - bundles = ES5_GLOBAL_BUNDLES.items() + ES2015_BUNDLES.items(), - config_file = "//packages/zone.js:rollup-es5_global-es2015.config.js", -) - -generate_dist( - bundles = ES5_BUNDLES.items() + ES5_GLOBAL_BUNDLES.items(), - module = "es5", -) - -generate_dist( - bundles = ES2015_BUNDLES.items(), - module = "", -) diff --git a/packages/zone.js/dist/async-test.min/package.json b/packages/zone.js/dist/async-test.min/package.json new file mode 100644 index 0000000000..9928139106 --- /dev/null +++ b/packages/zone.js/dist/async-test.min/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/async-test/package.json b/packages/zone.js/dist/async-test/package.json new file mode 100644 index 0000000000..c6dc4c07a1 --- /dev/null +++ b/packages/zone.js/dist/async-test/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/fake-async-test.min/package.json b/packages/zone.js/dist/fake-async-test.min/package.json new file mode 100644 index 0000000000..df98ce6862 --- /dev/null +++ b/packages/zone.js/dist/fake-async-test.min/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/fake-async-test/package.json b/packages/zone.js/dist/fake-async-test/package.json new file mode 100644 index 0000000000..feab6e986c --- /dev/null +++ b/packages/zone.js/dist/fake-async-test/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/jasmine-patch.min/package.json b/packages/zone.js/dist/jasmine-patch.min/package.json new file mode 100644 index 0000000000..2577835c8a --- /dev/null +++ b/packages/zone.js/dist/jasmine-patch.min/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/jasmine-patch/package.json b/packages/zone.js/dist/jasmine-patch/package.json new file mode 100644 index 0000000000..85a712b812 --- /dev/null +++ b/packages/zone.js/dist/jasmine-patch/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/long-stack-trace-zone.min/package.json b/packages/zone.js/dist/long-stack-trace-zone.min/package.json new file mode 100644 index 0000000000..fbd117c105 --- /dev/null +++ b/packages/zone.js/dist/long-stack-trace-zone.min/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/long-stack-trace-zone/package.json b/packages/zone.js/dist/long-stack-trace-zone/package.json new file mode 100644 index 0000000000..e3038e1f71 --- /dev/null +++ b/packages/zone.js/dist/long-stack-trace-zone/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/mocha-patch.min/package.json b/packages/zone.js/dist/mocha-patch.min/package.json new file mode 100644 index 0000000000..056fea4c86 --- /dev/null +++ b/packages/zone.js/dist/mocha-patch.min/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/mocha-patch/package.json b/packages/zone.js/dist/mocha-patch/package.json new file mode 100644 index 0000000000..d88ff07228 --- /dev/null +++ b/packages/zone.js/dist/mocha-patch/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/proxy.min/package.json b/packages/zone.js/dist/proxy.min/package.json new file mode 100644 index 0000000000..3c8b4eced0 --- /dev/null +++ b/packages/zone.js/dist/proxy.min/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/proxy/package.json b/packages/zone.js/dist/proxy/package.json new file mode 100644 index 0000000000..26c3b0921e --- /dev/null +++ b/packages/zone.js/dist/proxy/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/sync-test.min/package.json b/packages/zone.js/dist/sync-test.min/package.json new file mode 100644 index 0000000000..47a668f4e3 --- /dev/null +++ b/packages/zone.js/dist/sync-test.min/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/sync-test/package.json b/packages/zone.js/dist/sync-test/package.json new file mode 100644 index 0000000000..31c7a125f6 --- /dev/null +++ b/packages/zone.js/dist/sync-test/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/task-tracking.min/package.json b/packages/zone.js/dist/task-tracking.min/package.json new file mode 100644 index 0000000000..d9247baf2b --- /dev/null +++ b/packages/zone.js/dist/task-tracking.min/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/task-tracking/package.json b/packages/zone.js/dist/task-tracking/package.json new file mode 100644 index 0000000000..dbf8ace6bf --- /dev/null +++ b/packages/zone.js/dist/task-tracking/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/tools.bzl b/packages/zone.js/dist/tools.bzl deleted file mode 100644 index ec22b2e776..0000000000 --- a/packages/zone.js/dist/tools.bzl +++ /dev/null @@ -1,36 +0,0 @@ -"""Provides the rollup and dist file generation macro.""" - -load("//tools:defaults.bzl", "rollup_bundle") - -def zone_rollup_bundle(config_file, bundles): - for b in bundles: - rollup_bundle( - name = b[0] + "-rollup", - config_file = config_file, - entry_point = b[1] + ".ts", - silent = True, - sourcemap = "false", - deps = [ - "//packages/zone.js/lib", - "@npm//rollup-plugin-commonjs", - "@npm//rollup-plugin-node-resolve", - ], - ) - -def generate_dist(module, bundles): - for b in bundles: - native.genrule( - name = b[0] + "-dist", - srcs = [ - b[0] + "-rollup." + module + "umd.js", - b[0] + "-rollup.min." + module + "umd.js", - ], - outs = [ - b[0] + ".js", - b[0] + ".min.js", - ], - cmd = " && ".join([ - "cp $(@D)/" + b[0] + "-rollup." + module + "umd.js $(@D)/" + b[0] + ".js", - "cp $(@D)/" + b[0] + "-rollup.min." + module + "umd.js $(@D)/" + b[0] + ".min.js", - ]), - ) diff --git a/packages/zone.js/dist/webapis-media-query.min/package.json b/packages/zone.js/dist/webapis-media-query.min/package.json new file mode 100644 index 0000000000..b512baa663 --- /dev/null +++ b/packages/zone.js/dist/webapis-media-query.min/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/webapis-media-query/package.json b/packages/zone.js/dist/webapis-media-query/package.json new file mode 100644 index 0000000000..00383a1420 --- /dev/null +++ b/packages/zone.js/dist/webapis-media-query/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/webapis-notification.min/package.json b/packages/zone.js/dist/webapis-notification.min/package.json new file mode 100644 index 0000000000..34b7a46fe3 --- /dev/null +++ b/packages/zone.js/dist/webapis-notification.min/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/webapis-notification/package.json b/packages/zone.js/dist/webapis-notification/package.json new file mode 100644 index 0000000000..69f50f2192 --- /dev/null +++ b/packages/zone.js/dist/webapis-notification/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/webapis-rtc-peer-connection.min/package.json b/packages/zone.js/dist/webapis-rtc-peer-connection.min/package.json new file mode 100644 index 0000000000..6cee513b35 --- /dev/null +++ b/packages/zone.js/dist/webapis-rtc-peer-connection.min/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/webapis-rtc-peer-connection/package.json b/packages/zone.js/dist/webapis-rtc-peer-connection/package.json new file mode 100644 index 0000000000..187857fc3f --- /dev/null +++ b/packages/zone.js/dist/webapis-rtc-peer-connection/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/webapis-shadydom.min/package.json b/packages/zone.js/dist/webapis-shadydom.min/package.json new file mode 100644 index 0000000000..c0f63f629d --- /dev/null +++ b/packages/zone.js/dist/webapis-shadydom.min/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/webapis-shadydom/package.json b/packages/zone.js/dist/webapis-shadydom/package.json new file mode 100644 index 0000000000..094020cfb1 --- /dev/null +++ b/packages/zone.js/dist/webapis-shadydom/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/wtf.min/package.json b/packages/zone.js/dist/wtf.min/package.json new file mode 100644 index 0000000000..0cd382df4b --- /dev/null +++ b/packages/zone.js/dist/wtf.min/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/wtf/package.json b/packages/zone.js/dist/wtf/package.json new file mode 100644 index 0000000000..30a38fa85f --- /dev/null +++ b/packages/zone.js/dist/wtf/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/zone-bluebird.min/package.json b/packages/zone.js/dist/zone-bluebird.min/package.json new file mode 100644 index 0000000000..4893934a86 --- /dev/null +++ b/packages/zone.js/dist/zone-bluebird.min/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/zone-bluebird/package.json b/packages/zone.js/dist/zone-bluebird/package.json new file mode 100644 index 0000000000..cbe50f384c --- /dev/null +++ b/packages/zone.js/dist/zone-bluebird/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/zone-error.min/package.json b/packages/zone.js/dist/zone-error.min/package.json new file mode 100644 index 0000000000..3ab27961e1 --- /dev/null +++ b/packages/zone.js/dist/zone-error.min/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/zone-error/package.json b/packages/zone.js/dist/zone-error/package.json new file mode 100644 index 0000000000..c493ca1cee --- /dev/null +++ b/packages/zone.js/dist/zone-error/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/zone-evergreen-testing-bundle.min/package.json b/packages/zone.js/dist/zone-evergreen-testing-bundle.min/package.json new file mode 100644 index 0000000000..8ace64a646 --- /dev/null +++ b/packages/zone.js/dist/zone-evergreen-testing-bundle.min/package.json @@ -0,0 +1,7 @@ +{ + "name": "zone.js/zone-evergreen-testing-bundle.min", + "main": "../../fesm2015/zone-testing-bundle.min.js", + "fesm2015": "../../fesm2015/zone-testing-bundle.min.js", + "es2015": "../../fesm2015/zone-testing-bundle.min.js", + "module": "../../fesm2015/zone-testing-bundle.min.js" +} diff --git a/packages/zone.js/dist/zone-evergreen-testing-bundle/package.json b/packages/zone.js/dist/zone-evergreen-testing-bundle/package.json new file mode 100644 index 0000000000..816a921284 --- /dev/null +++ b/packages/zone.js/dist/zone-evergreen-testing-bundle/package.json @@ -0,0 +1,7 @@ +{ + "name": "zone.js/zone-evergreen-testing-bundle", + "main": "../../fesm2015/zone-testing-bundle.js", + "fesm2015": "../../fesm2015/zone-testing-bundle.js", + "es2015": "../../fesm2015/zone-testing-bundle.js", + "module": "../../fesm2015/zone-testing-bundle.js" +} diff --git a/packages/zone.js/dist/zone-evergreen.min/package.json b/packages/zone.js/dist/zone-evergreen.min/package.json new file mode 100644 index 0000000000..11fe4968c8 --- /dev/null +++ b/packages/zone.js/dist/zone-evergreen.min/package.json @@ -0,0 +1,7 @@ +{ + "name": "zone.js/zone-evergreen.min", + "main": "../../fesm2015/zone.min.js", + "fesm2015": "../../fesm2015/zone.min.js", + "es2015": "../../fesm2015/zone.min.js", + "module": "../../fesm2015/zone.min.js" +} diff --git a/packages/zone.js/dist/zone-evergreen/package.json b/packages/zone.js/dist/zone-evergreen/package.json new file mode 100644 index 0000000000..7b39adcc6b --- /dev/null +++ b/packages/zone.js/dist/zone-evergreen/package.json @@ -0,0 +1,7 @@ +{ + "name": "zone.js/zone-evergreen", + "main": "../../fesm2015/zone.js", + "fesm2015": "../../fesm2015/zone.js", + "es2015": "../../fesm2015/zone.js", + "module": "../../fesm2015/zone.js" +} diff --git a/packages/zone.js/dist/zone-legacy.min/package.json b/packages/zone.js/dist/zone-legacy.min/package.json new file mode 100644 index 0000000000..f0f2739db9 --- /dev/null +++ b/packages/zone.js/dist/zone-legacy.min/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/zone-legacy/package.json b/packages/zone.js/dist/zone-legacy/package.json new file mode 100644 index 0000000000..b87125f159 --- /dev/null +++ b/packages/zone.js/dist/zone-legacy/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/zone-mix.min/package.json b/packages/zone.js/dist/zone-mix.min/package.json new file mode 100644 index 0000000000..f9bcee10fd --- /dev/null +++ b/packages/zone.js/dist/zone-mix.min/package.json @@ -0,0 +1,7 @@ +{ + "name": "zone.js/zone-mix.min", + "main": "../../bundles/zone-mix.umd.min.js", + "fesm2015": "../../fesm2015/zone-mix.min.js", + "es2015": "../../fesm2015/zone-mix.min.js", + "module": "../../fesm2015/zone-mix.min.js" +} diff --git a/packages/zone.js/dist/zone-mix/package.json b/packages/zone.js/dist/zone-mix/package.json new file mode 100644 index 0000000000..ba9b5db934 --- /dev/null +++ b/packages/zone.js/dist/zone-mix/package.json @@ -0,0 +1,7 @@ +{ + "name": "zone.js/zone-mix", + "main": "../../bundles/zone-mix.umd.js", + "fesm2015": "../../fesm2015/zone-mix.js", + "es2015": "../../fesm2015/zone-mix.js", + "module": "../../fesm2015/zone-mix.js" +} diff --git a/packages/zone.js/dist/zone-node.min/package.json b/packages/zone.js/dist/zone-node.min/package.json new file mode 100644 index 0000000000..ae9c89901d --- /dev/null +++ b/packages/zone.js/dist/zone-node.min/package.json @@ -0,0 +1,7 @@ +{ + "name": "zone.js/zone-node.min", + "main": "../../bundles/zone-node.umd.min.js", + "fesm2015": "../../fesm2015/zone-node.min.js", + "es2015": "../../fesm2015/zone-node.min.js", + "module": "../../fesm2015/zone-node.min.js" +} diff --git a/packages/zone.js/dist/zone-node/package.json b/packages/zone.js/dist/zone-node/package.json new file mode 100644 index 0000000000..4636504304 --- /dev/null +++ b/packages/zone.js/dist/zone-node/package.json @@ -0,0 +1,7 @@ +{ + "name": "zone.js/zone-node", + "main": "../../bundles/zone-node.umd.js", + "fesm2015": "../../fesm2015/zone-node.js", + "es2015": "../../fesm2015/zone-node.js", + "module": "../../fesm2015/zone-node.js" +} diff --git a/packages/zone.js/dist/zone-patch-canvas.min/package.json b/packages/zone.js/dist/zone-patch-canvas.min/package.json new file mode 100644 index 0000000000..9b0501c8ec --- /dev/null +++ b/packages/zone.js/dist/zone-patch-canvas.min/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/zone-patch-canvas/package.json b/packages/zone.js/dist/zone-patch-canvas/package.json new file mode 100644 index 0000000000..5f95609908 --- /dev/null +++ b/packages/zone.js/dist/zone-patch-canvas/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/zone-patch-cordova.min/package.json b/packages/zone.js/dist/zone-patch-cordova.min/package.json new file mode 100644 index 0000000000..0dbbf3aa66 --- /dev/null +++ b/packages/zone.js/dist/zone-patch-cordova.min/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/zone-patch-cordova/package.json b/packages/zone.js/dist/zone-patch-cordova/package.json new file mode 100644 index 0000000000..c4303225fd --- /dev/null +++ b/packages/zone.js/dist/zone-patch-cordova/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/zone-patch-electron.min/package.json b/packages/zone.js/dist/zone-patch-electron.min/package.json new file mode 100644 index 0000000000..c50d2f986b --- /dev/null +++ b/packages/zone.js/dist/zone-patch-electron.min/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/zone-patch-electron/package.json b/packages/zone.js/dist/zone-patch-electron/package.json new file mode 100644 index 0000000000..157e823c00 --- /dev/null +++ b/packages/zone.js/dist/zone-patch-electron/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/zone-patch-fetch.min/package.json b/packages/zone.js/dist/zone-patch-fetch.min/package.json new file mode 100644 index 0000000000..5aa46814bb --- /dev/null +++ b/packages/zone.js/dist/zone-patch-fetch.min/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/zone-patch-fetch/package.json b/packages/zone.js/dist/zone-patch-fetch/package.json new file mode 100644 index 0000000000..2b902bc5a1 --- /dev/null +++ b/packages/zone.js/dist/zone-patch-fetch/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/zone-patch-jsonp.min/package.json b/packages/zone.js/dist/zone-patch-jsonp.min/package.json new file mode 100644 index 0000000000..9e274dc71b --- /dev/null +++ b/packages/zone.js/dist/zone-patch-jsonp.min/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/zone-patch-jsonp/package.json b/packages/zone.js/dist/zone-patch-jsonp/package.json new file mode 100644 index 0000000000..426a0da45b --- /dev/null +++ b/packages/zone.js/dist/zone-patch-jsonp/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/zone-patch-message-port.min/package.json b/packages/zone.js/dist/zone-patch-message-port.min/package.json new file mode 100644 index 0000000000..c1e4a3a2ca --- /dev/null +++ b/packages/zone.js/dist/zone-patch-message-port.min/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/zone-patch-message-port/package.json b/packages/zone.js/dist/zone-patch-message-port/package.json new file mode 100644 index 0000000000..3b3ce6317c --- /dev/null +++ b/packages/zone.js/dist/zone-patch-message-port/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/zone-patch-promise-test.min/package.json b/packages/zone.js/dist/zone-patch-promise-test.min/package.json new file mode 100644 index 0000000000..30b94a2414 --- /dev/null +++ b/packages/zone.js/dist/zone-patch-promise-test.min/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/zone-patch-promise-test/package.json b/packages/zone.js/dist/zone-patch-promise-test/package.json new file mode 100644 index 0000000000..8b9bd469ee --- /dev/null +++ b/packages/zone.js/dist/zone-patch-promise-test/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/zone-patch-resize-observer.min/package.json b/packages/zone.js/dist/zone-patch-resize-observer.min/package.json new file mode 100644 index 0000000000..bc8b6a9389 --- /dev/null +++ b/packages/zone.js/dist/zone-patch-resize-observer.min/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/zone-patch-resize-observer/package.json b/packages/zone.js/dist/zone-patch-resize-observer/package.json new file mode 100644 index 0000000000..dece1df10a --- /dev/null +++ b/packages/zone.js/dist/zone-patch-resize-observer/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/zone-patch-rxjs-fake-async.min/package.json b/packages/zone.js/dist/zone-patch-rxjs-fake-async.min/package.json new file mode 100644 index 0000000000..e8e2c0f78d --- /dev/null +++ b/packages/zone.js/dist/zone-patch-rxjs-fake-async.min/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/zone-patch-rxjs-fake-async/package.json b/packages/zone.js/dist/zone-patch-rxjs-fake-async/package.json new file mode 100644 index 0000000000..5384663123 --- /dev/null +++ b/packages/zone.js/dist/zone-patch-rxjs-fake-async/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/zone-patch-rxjs.min/package.json b/packages/zone.js/dist/zone-patch-rxjs.min/package.json new file mode 100644 index 0000000000..fefe72012f --- /dev/null +++ b/packages/zone.js/dist/zone-patch-rxjs.min/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/zone-patch-rxjs/package.json b/packages/zone.js/dist/zone-patch-rxjs/package.json new file mode 100644 index 0000000000..4529cc020b --- /dev/null +++ b/packages/zone.js/dist/zone-patch-rxjs/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/zone-patch-socket-io.min/package.json b/packages/zone.js/dist/zone-patch-socket-io.min/package.json new file mode 100644 index 0000000000..811eb64228 --- /dev/null +++ b/packages/zone.js/dist/zone-patch-socket-io.min/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/zone-patch-socket-io/package.json b/packages/zone.js/dist/zone-patch-socket-io/package.json new file mode 100644 index 0000000000..aa65a90fc1 --- /dev/null +++ b/packages/zone.js/dist/zone-patch-socket-io/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/zone-patch-user-media.min/package.json b/packages/zone.js/dist/zone-patch-user-media.min/package.json new file mode 100644 index 0000000000..4df7663d24 --- /dev/null +++ b/packages/zone.js/dist/zone-patch-user-media.min/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/zone-patch-user-media/package.json b/packages/zone.js/dist/zone-patch-user-media/package.json new file mode 100644 index 0000000000..a0a8849a9e --- /dev/null +++ b/packages/zone.js/dist/zone-patch-user-media/package.json @@ -0,0 +1,7 @@ +{ + "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/dist/zone-testing-bundle.min/package.json b/packages/zone.js/dist/zone-testing-bundle.min/package.json new file mode 100644 index 0000000000..59357b7b80 --- /dev/null +++ b/packages/zone.js/dist/zone-testing-bundle.min/package.json @@ -0,0 +1,7 @@ +{ + "name": "zone.js/zone-testing-bundle.min", + "main": "../../bundles/zone-testing-bundle.umd.min.js", + "fesm2015": "../../fesm2015/zone-testing-bundle.min.js", + "es2015": "../../fesm2015/zone-testing-bundle.min.js", + "module": "../../fesm2015/zone-testing-bundle.min.js" +} diff --git a/packages/zone.js/dist/zone-testing-bundle/package.json b/packages/zone.js/dist/zone-testing-bundle/package.json new file mode 100644 index 0000000000..f466591796 --- /dev/null +++ b/packages/zone.js/dist/zone-testing-bundle/package.json @@ -0,0 +1,7 @@ +{ + "name": "zone.js/zone-testing-bundle", + "main": "../../bundles/zone-testing-bundle.umd.js", + "fesm2015": "../../fesm2015/zone-testing-bundle.js", + "es2015": "../../fesm2015/zone-testing-bundle.js", + "module": "../../fesm2015/zone-testing-bundle.js" +} diff --git a/packages/zone.js/dist/zone-testing-node-bundle.min/package.json b/packages/zone.js/dist/zone-testing-node-bundle.min/package.json new file mode 100644 index 0000000000..585a93fb37 --- /dev/null +++ b/packages/zone.js/dist/zone-testing-node-bundle.min/package.json @@ -0,0 +1,7 @@ +{ + "name": "zone.js/zone-testing-node-bundle.min", + "main": "../../bundles/zone-testing-node-bundle.umd.min.js", + "fesm2015": "../../fesm2015/zone-testing-node-bundle.min.js", + "es2015": "../../fesm2015/zone-testing-node-bundle.min.js", + "module": "../../fesm2015/zone-testing-node-bundle.min.js" +} diff --git a/packages/zone.js/dist/zone-testing-node-bundle/package.json b/packages/zone.js/dist/zone-testing-node-bundle/package.json new file mode 100644 index 0000000000..a73e5566d6 --- /dev/null +++ b/packages/zone.js/dist/zone-testing-node-bundle/package.json @@ -0,0 +1,7 @@ +{ + "name": "zone.js/zone-testing-node-bundle", + "main": "../../bundles/zone-testing-node-bundle.umd.js", + "fesm2015": "../../fesm2015/zone-testing-node-bundle.js", + "es2015": "../../fesm2015/zone-testing-node-bundle.js", + "module": "../../fesm2015/zone-testing-node-bundle.js" +} diff --git a/packages/zone.js/dist/zone-testing.min/package.json b/packages/zone.js/dist/zone-testing.min/package.json new file mode 100644 index 0000000000..e07c6be6f3 --- /dev/null +++ b/packages/zone.js/dist/zone-testing.min/package.json @@ -0,0 +1,7 @@ +{ + "name": "zone.js/zone-testing.min", + "main": "../../bundles/zone-testing.umd.min.js", + "fesm2015": "../../fesm2015/zone-testing.min.js", + "es2015": "../../fesm2015/zone-testing.min.js", + "module": "../../fesm2015/zone-testing.min.js" +} diff --git a/packages/zone.js/dist/zone-testing/package.json b/packages/zone.js/dist/zone-testing/package.json new file mode 100644 index 0000000000..dbed6c0b3e --- /dev/null +++ b/packages/zone.js/dist/zone-testing/package.json @@ -0,0 +1,7 @@ +{ + "name": "zone.js/zone-testing", + "main": "../../bundles/zone-testing.umd.js", + "fesm2015": "../../fesm2015/zone-testing.js", + "es2015": "../../fesm2015/zone-testing.js", + "module": "../../fesm2015/zone-testing.js" +} diff --git a/packages/zone.js/dist/zone.min/package.json b/packages/zone.js/dist/zone.min/package.json new file mode 100644 index 0000000000..3adf65f73b --- /dev/null +++ b/packages/zone.js/dist/zone.min/package.json @@ -0,0 +1,7 @@ +{ + "name": "zone.js/zone.min", + "main": "../../bundles/zone.umd.min.js", + "fesm2015": "../../fesm2015/zone.min.js", + "es2015": "../../fesm2015/zone.min.js", + "module": "../../fesm2015/zone.min.js" +} diff --git a/packages/zone.js/dist/zone/package.json b/packages/zone.js/dist/zone/package.json new file mode 100644 index 0000000000..0fcd1c15f3 --- /dev/null +++ b/packages/zone.js/dist/zone/package.json @@ -0,0 +1,7 @@ +{ + "name": "zone.js/zone", + "main": "../../bundles/zone.umd.js", + "fesm2015": "../../fesm2015/zone.js", + "es2015": "../../fesm2015/zone.js", + "module": "../../fesm2015/zone.js" +} diff --git a/packages/zone.js/dist/zone_externs/package.json b/packages/zone.js/dist/zone_externs/package.json new file mode 100644 index 0000000000..7da5b085b0 --- /dev/null +++ b/packages/zone.js/dist/zone_externs/package.json @@ -0,0 +1,7 @@ +{ + "name": "zone.js/zone_externs", + "main": "../../zone_externs.js", + "fesm2015": "../../zone_externs.js", + "es2015": "../../zone_externs.js", + "module": "../../zone_externs.js" +} diff --git a/packages/zone.js/fesm2015/BUILD.bazel b/packages/zone.js/fesm2015/BUILD.bazel new file mode 100644 index 0000000000..796ef543df --- /dev/null +++ b/packages/zone.js/fesm2015/BUILD.bazel @@ -0,0 +1,8 @@ +load("//packages/zone.js:tools.bzl", "generate_dist") +load("//packages/zone.js:bundles.bzl", "BUNDLES_ENTRY_POINTS") + +generate_dist( + bundles = BUNDLES_ENTRY_POINTS.items(), + output_format = "es2015", + umd = "", +) diff --git a/packages/zone.js/lib/zone-spec/fake-async-test.ts b/packages/zone.js/lib/zone-spec/fake-async-test.ts index 719efea835..ba768c1372 100644 --- a/packages/zone.js/lib/zone-spec/fake-async-test.ts +++ b/packages/zone.js/lib/zone-spec/fake-async-test.ts @@ -30,29 +30,32 @@ interface MacroTaskOptions { } const OriginalDate = global.Date; -class FakeDate { - constructor() { - if (arguments.length === 0) { - const d = new OriginalDate(); - d.setTime(FakeDate.now()); - return d; - } else { - const args = Array.prototype.slice.call(arguments); - return new OriginalDate(...args); - } - } - - static now() { - const fakeAsyncTestZoneSpec = Zone.current.get('FakeAsyncTestZoneSpec'); - if (fakeAsyncTestZoneSpec) { - return fakeAsyncTestZoneSpec.getCurrentRealTime() + fakeAsyncTestZoneSpec.getCurrentTime(); - } - return OriginalDate.now.apply(this, arguments); +// Since when we compile this file to `es2015`, and if we define +// this `FakeDate` as `class FakeDate`, and then set `FakeDate.prototype` +// there will be an error which is `Cannot assign to read only property 'prototype'` +// so we need to use function implementation here. +function FakeDate() { + if (arguments.length === 0) { + const d = new OriginalDate(); + d.setTime(FakeDate.now()); + return d; + } else { + const args = Array.prototype.slice.call(arguments); + return new OriginalDate(...args); } } -(FakeDate as any).UTC = OriginalDate.UTC; -(FakeDate as any).parse = OriginalDate.parse; +FakeDate.now = + function(this: unknown) { + const fakeAsyncTestZoneSpec = Zone.current.get('FakeAsyncTestZoneSpec'); + if (fakeAsyncTestZoneSpec) { + return fakeAsyncTestZoneSpec.getCurrentRealTime() + fakeAsyncTestZoneSpec.getCurrentTime(); + } + return OriginalDate.now.apply(this, arguments); +} + + FakeDate.UTC = OriginalDate.UTC; +FakeDate.parse = OriginalDate.parse; // keep a reference for zone patched timer function const timers = { diff --git a/packages/zone.js/mix/BUILD.bazel b/packages/zone.js/mix/BUILD.bazel new file mode 100644 index 0000000000..11a7cfa602 --- /dev/null +++ b/packages/zone.js/mix/BUILD.bazel @@ -0,0 +1,3 @@ +exports_files([ + "package.json", +]) diff --git a/packages/zone.js/mix/package.json b/packages/zone.js/mix/package.json new file mode 100644 index 0000000000..a77a7c50c8 --- /dev/null +++ b/packages/zone.js/mix/package.json @@ -0,0 +1,8 @@ +{ + "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 new file mode 100644 index 0000000000..11a7cfa602 --- /dev/null +++ b/packages/zone.js/node/BUILD.bazel @@ -0,0 +1,3 @@ +exports_files([ + "package.json", +]) diff --git a/packages/zone.js/node/package.json b/packages/zone.js/node/package.json new file mode 100644 index 0000000000..ebc78825ac --- /dev/null +++ b/packages/zone.js/node/package.json @@ -0,0 +1,8 @@ +{ + "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 c5c00caf10..de98a551e0 100644 --- a/packages/zone.js/package.json +++ b/packages/zone.js/package.json @@ -2,13 +2,14 @@ "name": "zone.js", "version": "0.10.3", "description": "Zones for JavaScript", - "main": "dist/zone-node.js", - "browser": "dist/zone.js", - "unpkg": "dist/zone.js", - "typings": "dist/zone.js.d.ts", + "main": "./bundles/zone.umd.js", + "module": "./fesm2015/zone.js", + "es2015": "./fesm2015/zone.js", + "fesm2015": "./fesm2015/zone.js", "files": [ - "lib", - "dist" + "./zone.js.d.ts", + "./zone.api.extensions.ts", + "./zone.configurations.api.ts" ], "dependencies": { "tslib": "^2.0.0" @@ -24,7 +25,7 @@ "mocha": "^3.1.2", "mock-require": "3.0.3", "promises-aplus-tests": "^2.1.2", - "typescript": "~3.4.2" + "typescript": "^3.8.3" }, "scripts": { "electrontest": "cd test/extra && node electron.js", diff --git a/packages/zone.js/test/BUILD.bazel b/packages/zone.js/test/BUILD.bazel index 57b17eea76..a461668524 100644 --- a/packages/zone.js/test/BUILD.bazel +++ b/packages/zone.js/test/BUILD.bazel @@ -282,15 +282,15 @@ test_deps = [ test_entry_point = ":browser_entry_point.ts" karma_tests = { - "browser_test": ["//packages/zone.js/dist:zone-testing-bundle.js"], + "browser_test": ["//packages/zone.js/bundles:zone-testing-bundle.umd.js"], "browser_green_test": [ - "//packages/zone.js/dist:zone-evergreen.js", - "//packages/zone.js/dist:zone-testing.js", + "//packages/zone.js/fesm2015:zone.js", + "//packages/zone.js/fesm2015:zone-testing.js", ], "browser_legacy_test": [ - "//packages/zone.js/dist:zone-legacy.js", - "//packages/zone.js/dist:zone-evergreen.js", - "//packages/zone.js/dist:zone-testing.js", + "//packages/zone.js/bundles:zone-legacy.umd.js", + "//packages/zone.js/bundles:zone.umd.js", + "//packages/zone.js/bundles:zone-testing.umd.js", ], } @@ -309,8 +309,8 @@ karma_test( karma_test( name = "browser_shadydom", bootstraps = {"browser_shadydom": [ - "//packages/zone.js/dist:zone-testing-bundle.js", - "//packages/zone.js/dist:webapis-shadydom.js", + "//packages/zone.js/bundles:zone-testing-bundle.umd.js", + "//packages/zone.js/bundles:webapis-shadydom.umd.js", ]}, ci = False, env_deps = [ @@ -331,7 +331,7 @@ karma_test( karma_test( name = "browser_disable_wrap_uncaught_promise_rejection", bootstraps = {"browser_disable_wrap_uncaught_promise_rejection": [ - "//packages/zone.js/dist:zone-testing-bundle.js", + "//packages/zone.js/bundles:zone-testing-bundle.umd.js", ]}, ci = False, env_deps = [ diff --git a/packages/zone.js/test/extra/electron.js b/packages/zone.js/test/extra/electron.js index d3332fefd0..f5a43912ec 100644 --- a/packages/zone.js/test/extra/electron.js +++ b/packages/zone.js/test/extra/electron.js @@ -8,7 +8,7 @@ var domino = require('domino'); var mockRequire = require('mock-require'); var nativeTimeout = setTimeout; -require('./zone-mix'); +require('./zone-mix.umd'); mockRequire('electron', { desktopCapturer: { getSources: function(callback) { @@ -26,7 +26,7 @@ mockRequire('electron', { } }, }); -require('./zone-patch-electron'); +require('./zone-patch-electron.umd'); var electron = require('electron'); var zone = Zone.current.fork({name: 'zone'}); zone.run(function() { diff --git a/packages/zone.js/test/karma_test.bzl b/packages/zone.js/test/karma_test.bzl index af17568399..6193f1af7c 100644 --- a/packages/zone.js/test/karma_test.bzl +++ b/packages/zone.js/test/karma_test.bzl @@ -49,15 +49,15 @@ def karma_test(name, env_srcs, env_deps, env_entry_point, test_srcs, test_deps, first = False karma_test_prepare(name, env_srcs, env_deps, env_entry_point, test_srcs, test_deps, test_entry_point) _karma_test_required_dist_files = [ - "//packages/zone.js/dist:task-tracking.js", - "//packages/zone.js/dist:wtf.js", - "//packages/zone.js/dist:webapis-notification.js", - "//packages/zone.js/dist:webapis-media-query.js", - "//packages/zone.js/dist:zone-patch-canvas.js", - "//packages/zone.js/dist:zone-patch-fetch.js", - "//packages/zone.js/dist:zone-patch-resize-observer.js", - "//packages/zone.js/dist:zone-patch-message-port.js", - "//packages/zone.js/dist:zone-patch-user-media.js", + "//packages/zone.js/bundles:task-tracking.umd.js", + "//packages/zone.js/bundles:wtf.umd.js", + "//packages/zone.js/bundles:webapis-notification.umd.js", + "//packages/zone.js/bundles:webapis-media-query.umd.js", + "//packages/zone.js/bundles:zone-patch-canvas.umd.js", + "//packages/zone.js/bundles:zone-patch-fetch.umd.js", + "//packages/zone.js/bundles:zone-patch-resize-observer.umd.js", + "//packages/zone.js/bundles:zone-patch-message-port.umd.js", + "//packages/zone.js/bundles:zone-patch-user-media.umd.js", ":" + name + "_rollup.umd", ] @@ -91,7 +91,7 @@ def karma_test(name, env_srcs, env_deps, env_entry_point, test_srcs, test_deps, bootstrap = [ ":saucelabs.js", ":" + name + "_env_rollup.umd", - "//packages/zone.js/dist:zone-testing-bundle.min.js", + "//packages/zone.js/bundles:zone-testing-bundle.umd.min.js", ] + _karma_test_required_dist_files, browsers = ["//dev-infra/browsers:chromium"], config_file = "//:karma-js.conf.js", 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 921a6f54b9..bde0dbca84 100644 --- a/packages/zone.js/test/npm_package/npm_package.spec.ts +++ b/packages/zone.js/test/npm_package/npm_package.spec.ts @@ -8,6 +8,12 @@ import * as path from 'path'; import * as shx from 'shelljs'; +function checkInSubFolder(subFolder: string, testFn: Function) { + shx.cd(subFolder); + testFn(); + shx.cd('../'); +} + describe('Zone.js npm_package', () => { beforeEach( () => {shx.cd( @@ -32,17 +38,11 @@ describe('Zone.js npm_package', () => { }); it('should contain module resolution mappings', () => { - expect(shx.grep('"main":', packageJson)).toContain(`dist/zone-node.js`); + expect(shx.grep('"main":', packageJson)).toContain(`zone.umd.js`); }); }); - describe('check dist folder', () => { - beforeEach(() => { - shx.cd('./dist'); - }); - afterEach(() => { - shx.cd('../'); - }); + describe('check npm_package root folder', () => { describe('typescript support', () => { it('should have an zone.js.d.ts file', () => { expect(shx.cat('zone.js.d.ts')).toContain('declare const'); @@ -65,33 +65,46 @@ describe('Zone.js npm_package', () => { describe('rxjs patch', () => { it('should not contain rxjs source', () => { - expect(shx.cat('zone-patch-rxjs.js')) - .not.toContain('_enable_super_gross_mode_that_will_cause_bad_things'); + checkInSubFolder('./bundles', () => { + expect(shx.cat('zone-patch-rxjs.umd.js')) + .not.toContain('_enable_super_gross_mode_that_will_cause_bad_things'); + }); + checkInSubFolder('./fesm2015', () => { + expect(shx.cat('zone-patch-rxjs.js')) + .not.toContain('_enable_super_gross_mode_that_will_cause_bad_things'); + }); }); }); describe('es5', () => { it('zone.js(es5) should not contain es6 spread code', () => { - expect(shx.cat('zone.js')).not.toContain('let value of values'); + checkInSubFolder('./bundles', () => { + expect(shx.cat('zone.umd.js')).not.toContain('let value of values'); + }); }); it('zone.js(es5) should not contain source map comment', () => { - expect(shx.cat('zone.js')).not.toContain('sourceMappingURL'); + checkInSubFolder('./bundles', () => { + expect(shx.cat('zone.umd.js')).not.toContain('sourceMappingURL'); + }); }); }); describe('es2015', () => { - it('zone-evergreen.js(es2015) should contain es6 code', () => { - expect(shx.cat('zone-evergreen.js')).toContain('let value of values'); + it('zone.js(es2015) should contain es6 code', () => { + checkInSubFolder('./fesm2015', () => { + expect(shx.cat('zone.js')).toContain('let value of values'); + }); }); - it('zone.js(es5) should not contain source map comment', () => { - expect(shx.cat('zone-evergreen.js')).not.toContain('sourceMappingURL'); + it('zone.js(es2015) should not contain source map comment', () => { + checkInSubFolder('./fesm2015', () => { + expect(shx.cat('zone.js')).not.toContain('sourceMappingURL'); + }); }); }); describe('dist file list', () => { it('should contain all files', () => { - const list = shx.ls('./').stdout.split('\n').sort().slice(1); const expected = [ 'async-test.js', 'async-test.min.js', @@ -119,15 +132,10 @@ describe('Zone.js npm_package', () => { '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', @@ -165,15 +173,139 @@ describe('Zone.js npm_package', () => { '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.length).toBe(expected.length); - for (let i = 0; i < list.length; i++) { - expect(list[i]).toEqual(expected[i]); - } + checkInSubFolder('./bundles', () => { + const list = shx.ls('./').stdout.split('\n').sort().slice(1); + expect(list.length).toBe(expected.length); + for (let i = 0; i < list.length; i++) { + if (expected[i].indexOf('.min.js') !== -1) { + expect(list[i]).toEqual(expected[i].replace('.min.js', '.umd.min.js')); + } else { + expect(list[i]).toEqual(expected[i].replace('.js', '.umd.js')); + } + } + }); + checkInSubFolder('./fesm2015', () => { + 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]); + } + }); + }); + }); + + describe('backward compatible check', () => { + it('should contain all original folders in /dist', () => { + 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-mix', + 'zone-mix.min', + 'zone-node', + 'zone-node.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', + 'zone-testing-bundle', + 'zone-testing-bundle.min', + 'zone-testing-node-bundle', + 'zone-testing-node-bundle.min', + 'zone-testing', + 'zone-testing.min', + 'zone', + 'zone.min', + 'zone_externs', + 'zone-evergreen', + 'zone-evergreen.min', + 'zone-evergreen-testing-bundle', + 'zone-evergreen-testing-bundle.min', + ].sort(); + checkInSubFolder('./dist', () => { + 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`); + if (list[i].indexOf('_externs') !== -1) { + expect(packageJson).toContain(`"name": "zone.js/${list[i]}"`); + expect(packageJson).toContain(`"main": "../../${list[i]}.js"`); + expect(packageJson).toContain(`"fesm2015": "../../${list[i]}.js"`); + expect(packageJson).toContain(`"es2015": "../../${list[i]}.js"`); + expect(packageJson).toContain(`"module": "../../${list[i]}.js"`); + continue; + } + if (list[i].indexOf('evergreen') === -1) { + 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"`); + } else { + const removeEvergreen = list[i].replace('-evergreen', ''); + expect(packageJson).toContain(`"name": "zone.js/${list[i]}"`); + expect(packageJson).toContain(`"main": "../../fesm2015/${removeEvergreen}.js"`); + expect(packageJson).toContain(`"fesm2015": "../../fesm2015/${removeEvergreen}.js"`); + expect(packageJson).toContain(`"es2015": "../../fesm2015/${removeEvergreen}.js"`); + expect(packageJson).toContain(`"module": "../../fesm2015/${removeEvergreen}.js"`); + } + } + }); }); }); }); diff --git a/packages/zone.js/testing/BUILD.bazel b/packages/zone.js/testing/BUILD.bazel new file mode 100644 index 0000000000..11a7cfa602 --- /dev/null +++ b/packages/zone.js/testing/BUILD.bazel @@ -0,0 +1,3 @@ +exports_files([ + "package.json", +]) diff --git a/packages/zone.js/testing/package.json b/packages/zone.js/testing/package.json new file mode 100644 index 0000000000..93a9a1a1de --- /dev/null +++ b/packages/zone.js/testing/package.json @@ -0,0 +1,8 @@ +{ + "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/packages/zone.js/tools.bzl b/packages/zone.js/tools.bzl new file mode 100644 index 0000000000..3731c7dc18 --- /dev/null +++ b/packages/zone.js/tools.bzl @@ -0,0 +1,90 @@ +"""Provides the rollup and dist file generation macro.""" + +load("//tools:defaults.bzl", "rollup_bundle") + +def zone_rollup_bundle(module_name, entry_point, rollup_config): + config_file = "" + if rollup_config["rollup"] == "global-es2015": + config_file = "//packages/zone.js:rollup-es5_global-es2015.config.js" + if rollup_config["rollup"] == "es5": + config_file = "//packages/zone.js:rollup-es5.config.js" + rollup_bundle( + name = module_name + "-rollup", + config_file = config_file, + entry_point = entry_point + ".ts", + silent = True, + sourcemap = "false", + deps = [ + "//packages/zone.js/lib", + "@npm//rollup-plugin-commonjs", + "@npm//rollup-plugin-node-resolve", + ], + ) + +def copy_dist(module_name, module_format, output_module_name, suffix, umd): + umd_output = umd + suffix_output = suffix + if umd == "umd": + umd_output = "umd." + if suffix == "min": + suffix_output = "min." + native.genrule( + name = module_name + "." + suffix_output + "dist", + srcs = [ + "//packages/zone.js:" + module_name + "-rollup." + suffix_output + module_format + "umd.js", + ], + outs = [ + output_module_name + "." + umd_output + suffix_output + "js", + ], + visibility = ["//visibility:public"], + cmd = "cp $< $@", + ) + +def generate_rollup_bundle(bundles): + for b in bundles.items(): + module_name = b[0] + rollup_config = b[1] + if rollup_config.get("entrypoint") != None: + entry_point = rollup_config.get("entrypoint") + zone_rollup_bundle( + module_name = module_name + "-es5", + rollup_config = rollup_config, + entry_point = entry_point, + ) + zone_rollup_bundle( + module_name = module_name + "-es2015", + rollup_config = rollup_config, + entry_point = entry_point, + ) + else: + zone_rollup_bundle( + module_name = module_name + "-es5", + rollup_config = rollup_config, + entry_point = rollup_config.get("es5"), + ) + zone_rollup_bundle( + module_name = module_name + "-es2015", + rollup_config = rollup_config, + entry_point = rollup_config.get("es2015"), + ) + +def generate_dist(bundles, output_format, umd): + module_format = "" + if output_format == "es5": + module_format = "es5" + for b in bundles: + module_name = b[0] + copy_dist( + module_name = module_name + "-" + output_format, + module_format = module_format, + output_module_name = module_name, + suffix = "", + umd = umd, + ) + copy_dist( + module_name = module_name + "-" + output_format, + module_format = module_format, + output_module_name = module_name, + suffix = "min.", + umd = umd, + )