diff --git a/packages/zone.js/bundles.bzl b/packages/zone.js/bundles.bzl index 90ecfac59a29f..79d0e861568e0 100644 --- a/packages/zone.js/bundles.bzl +++ b/packages/zone.js/bundles.bzl @@ -103,11 +103,4 @@ BUNDLES_ENTRY_POINTS = { "zone-testing": { "entrypoint": _DIR + "testing/zone-testing", }, - "zone-testing-bundle": { - "es5": _DIR + "browser/rollup-test-main", - "es2015": _DIR + "browser/rollup-test-main", - }, - "zone-testing-node-bundle": { - "entrypoint": _DIR + "node/rollup-test-main", - }, } diff --git a/packages/zone.js/lib/browser/rollup-test-main.ts b/packages/zone.js/lib/browser/rollup-test-main.ts deleted file mode 100644 index b0881f8d22a7e..0000000000000 --- a/packages/zone.js/lib/browser/rollup-test-main.ts +++ /dev/null @@ -1,12 +0,0 @@ -/** - * @license - * Copyright Google LLC All Rights Reserved. - * - * Use of this source code is governed by an MIT-style license that can be - * found in the LICENSE file at https://angular.io/license - */ - -import './rollup-main'; - -// load test related files into bundle -import '../testing/zone-testing'; diff --git a/packages/zone.js/package.json b/packages/zone.js/package.json index 7e9831d3b3d82..d32990af7e89f 100644 --- a/packages/zone.js/package.json +++ b/packages/zone.js/package.json @@ -71,24 +71,6 @@ "./plugins/*": { "require": "./bundles/*.umd.js", "default": "./fesm2015/*.js" - }, - "./fesm2015/*.js": { - "default": "./fesm2015/*.js" - }, - "./fesm2015/*": { - "default": "./fesm2015/*.js" - }, - "./bundles/*.js": { - "default": "./bundles/*.js" - }, - "./bundles/*": { - "default": "./bundles/*.js" - }, - "./dist/*.min": { - "default": "./bundles/*.umd.min.js" - }, - "./dist/*": { - "default": "./bundles/*.umd.js" } } } diff --git a/packages/zone.js/test/BUILD.bazel b/packages/zone.js/test/BUILD.bazel index e2c728ab8d56a..51b93cfe7b1c3 100644 --- a/packages/zone.js/test/BUILD.bazel +++ b/packages/zone.js/test/BUILD.bazel @@ -256,7 +256,10 @@ test_deps = [ test_entry_point = ":browser_entry_point.ts" karma_tests = { - "browser_test": ["//packages/zone.js/bundles:zone-testing-bundle.umd.js"], + "browser_test": [ + "//packages/zone.js/bundles:zone.umd.js", + "//packages/zone.js/bundles:zone-testing.umd.js", + ], "browser_green_test": [ "//packages/zone.js/fesm2015:zone.js", "//packages/zone.js/fesm2015:zone-testing.js", @@ -283,7 +286,8 @@ karma_test( karma_test( name = "browser_shadydom", bootstraps = {"browser_shadydom": [ - "//packages/zone.js/bundles:zone-testing-bundle.umd.js", + "//packages/zone.js/bundles:zone.umd.min.js", + "//packages/zone.js/bundles:zone-testing.umd.min.js", "//packages/zone.js/bundles:webapis-shadydom.umd.js", ]}, ci = False, @@ -305,7 +309,8 @@ karma_test( karma_test( name = "browser_disable_wrap_uncaught_promise_rejection", bootstraps = {"browser_disable_wrap_uncaught_promise_rejection": [ - "//packages/zone.js/bundles:zone-testing-bundle.umd.js", + "//packages/zone.js/bundles:zone.umd.min.js", + "//packages/zone.js/bundles:zone-testing.umd.min.js", ]}, ci = False, env_deps = [ @@ -318,7 +323,7 @@ karma_test( ], test_entry_point = ":browser_disable_wrap_uncaught_promise_rejection_entry_point.ts", test_srcs = [ - "common/promise-disable-wrap-uncaught-promise-rejection.spec.ts", "browser_disable_wrap_uncaught_promise_rejection_entry_point.ts", + "common/promise-disable-wrap-uncaught-promise-rejection.spec.ts", ], ) diff --git a/packages/zone.js/test/karma_test.bzl b/packages/zone.js/test/karma_test.bzl index 18f660fe5a33c..104c062bf66c3 100644 --- a/packages/zone.js/test/karma_test.bzl +++ b/packages/zone.js/test/karma_test.bzl @@ -93,7 +93,8 @@ 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/bundles:zone-testing-bundle.umd.min.js", + "//packages/zone.js/bundles:zone.umd.js", + "//packages/zone.js/bundles:zone-testing.umd.js", ] + _karma_test_required_dist_files, browsers = ["@npm//@angular/build-tooling/bazel/browsers/chromium: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 a2888b35027e4..ecf911d54f55e 100644 --- a/packages/zone.js/test/npm_package/npm_package.spec.ts +++ b/packages/zone.js/test/npm_package/npm_package.spec.ts @@ -176,10 +176,6 @@ describe('Zone.js npm_package', () => { 'zone-patch-socket-io.min.js', 'zone-patch-user-media.js', 'zone-patch-user-media.min.js', - 'zone-testing-bundle.js', - 'zone-testing-bundle.min.js', - 'zone-testing-node-bundle.js', - 'zone-testing-node-bundle.min.js', 'zone-testing.js', 'zone-testing.min.js', 'zone.js',