diff --git a/packages/BUILD.bazel b/packages/BUILD.bazel index 50614852d01..68292922826 100644 --- a/packages/BUILD.bazel +++ b/packages/BUILD.bazel @@ -27,12 +27,11 @@ ts_project( ["*.ts"], exclude = ["goog.d.ts"], ), - interop_deps = [ - "//packages/zone.js/lib:zone_d_ts", - ], deps = [ ":goog_types_rjs", "//:node_modules/@types/hammerjs", + "//:node_modules/tslib", + "//:node_modules/zone.js", ], ) @@ -99,8 +98,8 @@ filegroup( "//packages/examples:files_for_docgen", "//packages/platform-browser:files_for_docgen", "//packages/platform-browser-dynamic:files_for_docgen", - "//packages/zone.js/lib:zone_d_ts", "@npm//rxjs", + "@npm//zone.js", ], ) diff --git a/packages/common/http/BUILD.bazel b/packages/common/http/BUILD.bazel index 7f17d67bdf4..b3a5dee9bca 100644 --- a/packages/common/http/BUILD.bazel +++ b/packages/common/http/BUILD.bazel @@ -18,6 +18,7 @@ ng_project( ], deps = [ "//:node_modules/rxjs", + "//:node_modules/zone.js", "//packages/common:common_rjs", ], ) diff --git a/packages/common/test/BUILD.bazel b/packages/common/test/BUILD.bazel index f1b97986835..ab0873c159e 100644 --- a/packages/common/test/BUILD.bazel +++ b/packages/common/test/BUILD.bazel @@ -7,21 +7,20 @@ ts_project( srcs = glob( ["**/*.ts"], ), - interop_deps = [ - "//packages/compiler", - "//packages/core", - "//packages/core/testing", - "//packages/platform-browser", - "//packages/platform-browser/testing", - "//packages/private/testing", - "//packages/common/locales", - ], # Visible to //:saucelabs_unit_tests_poc target visibility = ["//:__pkg__"], deps = [ "//:node_modules/rxjs", + "//:node_modules/zone.js", "//packages/common:common_rjs", + "//packages/common/locales:locales_rjs", "//packages/common/testing:testing_rjs", + "//packages/compiler:compiler_rjs", + "//packages/core:core_rjs", + "//packages/core/testing:testing_rjs", + "//packages/platform-browser:platform-browser_rjs", + "//packages/platform-browser/testing:testing_rjs", + "//packages/private/testing:testing_rjs", ], ) diff --git a/packages/core/BUILD.bazel b/packages/core/BUILD.bazel index ba084257b0b..79fa37ed6e8 100644 --- a/packages/core/BUILD.bazel +++ b/packages/core/BUILD.bazel @@ -46,10 +46,10 @@ ng_project( "//packages/core/primitives/di", "//packages/core/primitives/dom-navigation", "//packages/core/primitives/event-dispatch", - "//packages/zone.js/lib:zone_d_ts", ], deps = [ "//:node_modules/rxjs", + "//:node_modules/zone.js", "//packages:goog_types_rjs", "//packages/core/primitives/signals:signals_rjs", "//packages/core/src/compiler:compiler_rjs", diff --git a/packages/core/test/BUILD.bazel b/packages/core/test/BUILD.bazel index daf0784a587..b6d44977216 100644 --- a/packages/core/test/BUILD.bazel +++ b/packages/core/test/BUILD.bazel @@ -74,6 +74,7 @@ ts_project( deps = [ ":test_utils_rjs", "//:node_modules/rxjs", + "//:node_modules/zone.js", ], ) diff --git a/packages/core/test/bundling/image-directive/BUILD.bazel b/packages/core/test/bundling/image-directive/BUILD.bazel index d5f0cec9e54..8d840ed213c 100644 --- a/packages/core/test/bundling/image-directive/BUILD.bazel +++ b/packages/core/test/bundling/image-directive/BUILD.bazel @@ -54,7 +54,7 @@ http_server( ], deps = [ ":bundle", - "//packages/zone.js/bundles:zone.umd.js", + "@npm//zone.js", ], ) diff --git a/packages/core/test/bundling/image-directive/index.html b/packages/core/test/bundling/image-directive/index.html index 5334961d866..451b3499717 100644 --- a/packages/core/test/bundling/image-directive/index.html +++ b/packages/core/test/bundling/image-directive/index.html @@ -10,7 +10,7 @@ - + diff --git a/packages/core/test/render3/BUILD.bazel b/packages/core/test/render3/BUILD.bazel index 7a158566e14..d69c2fe70cf 100644 --- a/packages/core/test/render3/BUILD.bazel +++ b/packages/core/test/render3/BUILD.bazel @@ -38,6 +38,7 @@ ts_project( ], deps = [ "//:node_modules/rxjs", + "//:node_modules/zone.js", ], ) @@ -85,7 +86,6 @@ jasmine_node_test( ], deps = [ ":render3_node_lib", - "//packages/zone.js/lib", ], ) diff --git a/packages/core/test/render3/ivy/BUILD.bazel b/packages/core/test/render3/ivy/BUILD.bazel index 0ffc6f874a6..0d8b03fd972 100644 --- a/packages/core/test/render3/ivy/BUILD.bazel +++ b/packages/core/test/render3/ivy/BUILD.bazel @@ -21,6 +21,5 @@ jasmine_node_test( ], deps = [ ":ivy_lib", - "//packages/zone.js/lib", ], ) diff --git a/packages/core/testing/BUILD.bazel b/packages/core/testing/BUILD.bazel index e4677a1f7f8..6a519c19f88 100644 --- a/packages/core/testing/BUILD.bazel +++ b/packages/core/testing/BUILD.bazel @@ -17,6 +17,7 @@ ng_project( deps = [ "//:node_modules/@types/jasmine", "//:node_modules/rxjs", + "//:node_modules/zone.js", ], ) diff --git a/packages/elements/BUILD.bazel b/packages/elements/BUILD.bazel index 731c769808d..de66ac9f797 100644 --- a/packages/elements/BUILD.bazel +++ b/packages/elements/BUILD.bazel @@ -17,6 +17,7 @@ ng_project( ], deps = [ "//:node_modules/rxjs", + "//:node_modules/zone.js", ], ) diff --git a/packages/elements/test/BUILD.bazel b/packages/elements/test/BUILD.bazel index 88a7ba8b332..bd67df61abc 100644 --- a/packages/elements/test/BUILD.bazel +++ b/packages/elements/test/BUILD.bazel @@ -15,6 +15,7 @@ ts_project( ], deps = [ "//:node_modules/rxjs", + "//:node_modules/zone.js", ], ) diff --git a/packages/elements/test/component-factory-strategy_spec.ts b/packages/elements/test/component-factory-strategy_spec.ts index d0c978b944f..be6e47321f9 100644 --- a/packages/elements/test/component-factory-strategy_spec.ts +++ b/packages/elements/test/component-factory-strategy_spec.ts @@ -32,6 +32,8 @@ import { } from '../src/component-factory-strategy'; import {NgElementStrategyEvent} from '../src/element-strategy'; +import type {} from 'zone.js'; + describe('ComponentFactoryNgElementStrategy', () => { let strategy: ComponentNgElementStrategy; let injector: Injector; diff --git a/packages/examples/common/BUILD.bazel b/packages/examples/common/BUILD.bazel index 09043920ea5..3201b231e3c 100644 --- a/packages/examples/common/BUILD.bazel +++ b/packages/examples/common/BUILD.bazel @@ -11,10 +11,10 @@ ng_project( ), interop_deps = [ "//packages/platform-browser", - "//packages/zone.js/lib", ], deps = [ "//:node_modules/rxjs", + "//:node_modules/zone.js", "//packages/common:common_rjs", "//packages/core:core_rjs", "//packages/router:router_rjs", diff --git a/packages/examples/common/main.ts b/packages/examples/common/main.ts index 1c383b0f1bc..8388a4ca04b 100644 --- a/packages/examples/common/main.ts +++ b/packages/examples/common/main.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ -import 'zone.js/lib/browser/rollup-main'; +import 'zone.js'; import {platformBrowser} from '@angular/platform-browser'; diff --git a/packages/examples/core/BUILD.bazel b/packages/examples/core/BUILD.bazel index 4a59dc09e98..6a011a866d1 100644 --- a/packages/examples/core/BUILD.bazel +++ b/packages/examples/core/BUILD.bazel @@ -15,10 +15,10 @@ ng_project( interop_deps = [ "//packages/platform-browser", "//packages/platform-browser/animations", - "//packages/zone.js/lib", ], deps = [ "//:node_modules/rxjs", + "//:node_modules/zone.js", "//packages/animations:animations_rjs", "//packages/core:core_rjs", "//packages/forms:forms_rjs", diff --git a/packages/examples/core/main.ts b/packages/examples/core/main.ts index edd67caa021..87bd3173b54 100644 --- a/packages/examples/core/main.ts +++ b/packages/examples/core/main.ts @@ -6,8 +6,8 @@ * found in the LICENSE file at https://angular.dev/license */ -import 'zone.js/lib/browser/rollup-main'; -import 'zone.js/lib/zone-spec/task-tracking'; +import 'zone.js'; +import 'zone.js/plugins/task-tracking'; // okd diff --git a/packages/examples/forms/BUILD.bazel b/packages/examples/forms/BUILD.bazel index c007323e8d7..eb2ae874b8f 100644 --- a/packages/examples/forms/BUILD.bazel +++ b/packages/examples/forms/BUILD.bazel @@ -11,10 +11,10 @@ ng_project( ), interop_deps = [ "//packages/platform-browser", - "//packages/zone.js/lib", ], deps = [ "//:node_modules/rxjs", + "//:node_modules/zone.js", "//packages/core:core_rjs", "//packages/forms:forms_rjs", "//packages/router:router_rjs", diff --git a/packages/examples/forms/main.ts b/packages/examples/forms/main.ts index 1c383b0f1bc..8388a4ca04b 100644 --- a/packages/examples/forms/main.ts +++ b/packages/examples/forms/main.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ -import 'zone.js/lib/browser/rollup-main'; +import 'zone.js'; import {platformBrowser} from '@angular/platform-browser'; diff --git a/packages/examples/router/activated-route/BUILD.bazel b/packages/examples/router/activated-route/BUILD.bazel index beabdddb13e..fdce3ca87d1 100644 --- a/packages/examples/router/activated-route/BUILD.bazel +++ b/packages/examples/router/activated-route/BUILD.bazel @@ -9,11 +9,11 @@ ng_project( ["**/*.ts"], ), interop_deps = [ - "//packages/zone.js/lib", "//packages/platform-browser", ], deps = [ "//:node_modules/rxjs", + "//:node_modules/zone.js", "//packages/core:core_rjs", "//packages/router:router_rjs", ], diff --git a/packages/examples/router/activated-route/main.ts b/packages/examples/router/activated-route/main.ts index 22775fc11a1..58cab6249f3 100644 --- a/packages/examples/router/activated-route/main.ts +++ b/packages/examples/router/activated-route/main.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ -import 'zone.js/lib/browser/rollup-main'; +import 'zone.js'; import {platformBrowser} from '@angular/platform-browser'; diff --git a/packages/examples/service-worker/push/BUILD.bazel b/packages/examples/service-worker/push/BUILD.bazel index dd0aefd149d..bcdf8483a17 100644 --- a/packages/examples/service-worker/push/BUILD.bazel +++ b/packages/examples/service-worker/push/BUILD.bazel @@ -11,9 +11,9 @@ ng_project( ), interop_deps = [ "//packages/platform-browser", - "//packages/zone.js/lib", ], deps = [ + "//:node_modules/zone.js", "//packages/core:core_rjs", "//packages/service-worker:service-worker_rjs", ], diff --git a/packages/examples/service-worker/push/main.ts b/packages/examples/service-worker/push/main.ts index 22775fc11a1..58cab6249f3 100644 --- a/packages/examples/service-worker/push/main.ts +++ b/packages/examples/service-worker/push/main.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ -import 'zone.js/lib/browser/rollup-main'; +import 'zone.js'; import {platformBrowser} from '@angular/platform-browser'; diff --git a/packages/examples/service-worker/registration-options/BUILD.bazel b/packages/examples/service-worker/registration-options/BUILD.bazel index fe43103a983..fbae97b3994 100644 --- a/packages/examples/service-worker/registration-options/BUILD.bazel +++ b/packages/examples/service-worker/registration-options/BUILD.bazel @@ -11,9 +11,9 @@ ng_project( ), interop_deps = [ "//packages/platform-browser", - "//packages/zone.js/lib", ], deps = [ + "//:node_modules/zone.js", "//packages/core:core_rjs", "//packages/service-worker:service-worker_rjs", ], diff --git a/packages/examples/service-worker/registration-options/main.ts b/packages/examples/service-worker/registration-options/main.ts index 22775fc11a1..58cab6249f3 100644 --- a/packages/examples/service-worker/registration-options/main.ts +++ b/packages/examples/service-worker/registration-options/main.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ -import 'zone.js/lib/browser/rollup-main'; +import 'zone.js'; import {platformBrowser} from '@angular/platform-browser'; diff --git a/packages/examples/upgrade/index.html b/packages/examples/upgrade/index.html index 9c9843d9a5b..4b873f062bb 100644 --- a/packages/examples/upgrade/index.html +++ b/packages/examples/upgrade/index.html @@ -12,7 +12,7 @@ Loading... - + diff --git a/packages/examples/upgrade/upgrade_example.bzl b/packages/examples/upgrade/upgrade_example.bzl index 9d471bc0e50..5c7ad018598 100644 --- a/packages/examples/upgrade/upgrade_example.bzl +++ b/packages/examples/upgrade/upgrade_example.bzl @@ -53,7 +53,7 @@ def create_upgrade_example_targets(name, srcs, e2e_srcs, entry_point, assets = [ additional_root_paths = ["angular/packages/examples/upgrade"], srcs = [ "//packages/examples/upgrade:index.html", - "//packages/zone.js/bundles:zone.umd.js", + "@npm//:node_modules/zone.js/bundles/zone.umd.js", "@npm//:node_modules/angular-1.8/angular.js", "@npm//:node_modules/reflect-metadata/Reflect.js", ] + assets, diff --git a/packages/platform-browser/test/BUILD.bazel b/packages/platform-browser/test/BUILD.bazel index 3f59b4d621f..25549d14a8b 100644 --- a/packages/platform-browser/test/BUILD.bazel +++ b/packages/platform-browser/test/BUILD.bazel @@ -18,6 +18,7 @@ ts_project( ], deps = [ "//:node_modules/rxjs", + "//:node_modules/zone.js", "//packages/animations:animations_rjs", "//packages/animations/browser:browser_rjs", "//packages/animations/browser/testing:testing_rjs", diff --git a/packages/platform-browser/test/dom/events/event_manager_spec.ts b/packages/platform-browser/test/dom/events/event_manager_spec.ts index 78f79b8d8f0..4a4325f32c3 100644 --- a/packages/platform-browser/test/dom/events/event_manager_spec.ts +++ b/packages/platform-browser/test/dom/events/event_manager_spec.ts @@ -14,6 +14,8 @@ import {EventManager, EventManagerPlugin} from '../../../src/dom/events/event_ma import {TestBed} from '@angular/core/testing'; import {isNode, createMouseEvent, el} from '@angular/private/testing'; +import type {} from 'zone.js'; + (function () { if (isNode) return; let domEventPlugin: DomEventsPlugin; diff --git a/packages/tsconfig-build.json b/packages/tsconfig-build.json index 58aed0ea583..8bbfd199d6e 100644 --- a/packages/tsconfig-build.json +++ b/packages/tsconfig-build.json @@ -32,7 +32,6 @@ "importHelpers": true, "paths": { "angular-in-memory-web-api": ["./misc/angular-in-memory-web-api/index"], - "zone.js": ["./zone.js/lib/zone"], "@angular/*": ["./*/index"], "@angular/common/locales/*": ["./common/locales/*"] } diff --git a/packages/tsconfig.json b/packages/tsconfig.json index 3a1b12ba623..da86abb8850 100644 --- a/packages/tsconfig.json +++ b/packages/tsconfig.json @@ -24,8 +24,6 @@ "selenium-webdriver": ["./node_modules/@types/selenium-webdriver/index.d.ts"], "rxjs/*": ["./node_modules/rxjs/*"], "@angular/*": ["./packages/*"], - "zone.js": ["./packages/zone.js/lib/zone"], - "zone.js/*": ["./packages/zone.js/*"], "angular-in-memory-web-api": ["./packages/misc/angular-in-memory-web-api/index.ts"] }, "rootDir": ".", diff --git a/packages/upgrade/BUILD.bazel b/packages/upgrade/BUILD.bazel index c04d7889640..7de233d5c10 100644 --- a/packages/upgrade/BUILD.bazel +++ b/packages/upgrade/BUILD.bazel @@ -16,6 +16,7 @@ ng_project( "//packages/platform-browser-dynamic", ], deps = [ + "//:node_modules/zone.js", "//packages/upgrade/src/common:common_rjs", ], ) diff --git a/packages/zone.js/test/karma_test.bzl b/packages/zone.js/test/karma_test.bzl index 104c062bf66..af9a211e82e 100644 --- a/packages/zone.js/test/karma_test.bzl +++ b/packages/zone.js/test/karma_test.bzl @@ -1,5 +1,5 @@ -load("//tools:defaults.bzl", "rollup_bundle", "ts_library") load("@npm//@bazel/concatjs:index.bzl", "karma_web_test_suite") +load("//tools:defaults.bzl", "rollup_bundle", "ts_library") def karma_test_prepare(name, env_srcs, env_deps, env_entry_point, test_srcs, test_deps, test_entry_point): ts_library( @@ -108,7 +108,10 @@ def karma_test(name, env_srcs, env_deps, env_entry_point, test_srcs, test_deps, ":assets/worker.js", ":assets/import.html", ], - tags = ["zone_karma_test"], + tags = [ + "zone_karma_test", + "manual", + ], # Visible to //:saucelabs_unit_tests_poc target visibility = ["//:__pkg__"], runtime_deps = [ diff --git a/tools/testing/BUILD.bazel b/tools/testing/BUILD.bazel index 7316d7bb74e..eee2f6ddc6f 100644 --- a/tools/testing/BUILD.bazel +++ b/tools/testing/BUILD.bazel @@ -7,9 +7,9 @@ ts_project( name = "zone_base_setup_lib", testonly = 1, srcs = ["zone_base_setup.mts"], - interop_deps = [ - "//packages/zone.js/lib", - "@npm//reflect-metadata", + deps = [ + "//:node_modules/reflect-metadata", + "//:node_modules/zone.js", ], ) @@ -17,13 +17,12 @@ ts_project( name = "browser", testonly = 1, srcs = ["browser_tests.init.mts"], - interop_deps = [ - ":zone_base_setup_lib", - "//packages/compiler", - "//packages/core/testing", - "//packages/platform-browser/animations", - "//packages/platform-browser/testing", - "//packages/zone.js/lib", + deps = [ + ":zone_base_setup_lib_rjs", + "//packages/compiler:compiler_rjs", + "//packages/core/testing:testing_rjs", + "//packages/platform-browser/animations:animations_rjs", + "//packages/platform-browser/testing:testing_rjs", ], ) @@ -31,13 +30,13 @@ ts_project( name = "browser_zoneless", testonly = 1, srcs = ["browser_zoneless_tests.init.mts"], - interop_deps = [ - "//packages/compiler", - "//packages/core", - "//packages/core/testing", - "//packages/platform-browser/animations", - "//packages/platform-browser/testing", - "@npm//reflect-metadata", + deps = [ + "//:node_modules/reflect-metadata", + "//packages/compiler:compiler_rjs", + "//packages/core:core_rjs", + "//packages/core/testing:testing_rjs", + "//packages/platform-browser/animations:animations_rjs", + "//packages/platform-browser/testing:testing_rjs", ], ) @@ -46,13 +45,15 @@ ts_project( testonly = 1, srcs = ["node_zoneless_tests.init.mts"], interop_deps = [ - "//packages/compiler", - "//packages/core", - "//packages/core/testing", - "//packages/platform-server", "//packages/platform-server:bundled_domino_lib", - "//packages/platform-server/testing", - "@npm//reflect-metadata", + ], + deps = [ + "//:node_modules/reflect-metadata", + "//packages/compiler:compiler_rjs", + "//packages/core:core_rjs", + "//packages/core/testing:testing_rjs", + "//packages/platform-server:platform-server_rjs", + "//packages/platform-server/testing:testing_rjs", ], ) @@ -61,14 +62,16 @@ ts_project( testonly = 1, srcs = ["node_tests.init.mts"], interop_deps = [ - ":zone_base_setup_lib", - "//packages/compiler", - "//packages/core/testing", - "//packages/platform-server", "//packages/platform-server:bundled_domino_lib", - "//packages/platform-server/testing", - "//packages/zone.js/lib", - "@npm//reflect-metadata", + ], + deps = [ + ":zone_base_setup_lib_rjs", + "//:node_modules/reflect-metadata", + "//:node_modules/zone.js", + "//packages/compiler:compiler_rjs", + "//packages/core/testing:testing_rjs", + "//packages/platform-server:platform-server_rjs", + "//packages/platform-server/testing:testing_rjs", ], ) diff --git a/tools/testing/browser_tests.init.mts b/tools/testing/browser_tests.init.mts index fa8b78577c8..e351656ded5 100644 --- a/tools/testing/browser_tests.init.mts +++ b/tools/testing/browser_tests.init.mts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ -import 'zone.js/lib/browser/rollup-main'; +import 'zone.js'; import './zone_base_setup.mjs'; import '@angular/compiler'; // For JIT mode. Must be in front of any other @angular/* imports. diff --git a/tools/testing/node_tests.init.mts b/tools/testing/node_tests.init.mts index dc0913ca09c..f7df41eb38c 100644 --- a/tools/testing/node_tests.init.mts +++ b/tools/testing/node_tests.init.mts @@ -7,8 +7,7 @@ */ import 'reflect-metadata'; - -import 'zone.js/lib/node/rollup-main'; +import 'zone.js'; import './zone_base_setup.mjs'; (global as any).isNode = true; diff --git a/tools/testing/zone_base_setup.mts b/tools/testing/zone_base_setup.mts index b1ee6ed4936..13c0ca194aa 100644 --- a/tools/testing/zone_base_setup.mts +++ b/tools/testing/zone_base_setup.mts @@ -8,20 +8,10 @@ import 'reflect-metadata'; -import {} from 'zone.js'; - -import {patchLongStackTrace} from 'zone.js/lib/zone-spec/long-stack-trace'; -import {patchTaskTracking} from 'zone.js/lib/zone-spec/task-tracking'; -import {patchProxyZoneSpec} from 'zone.js/lib/zone-spec/proxy'; -import {patchSyncTest} from 'zone.js/lib/zone-spec/sync-test'; -import {patchAsyncTest} from 'zone.js/lib/zone-spec/async-test'; -import {patchFakeAsyncTest} from 'zone.js/lib/zone-spec/fake-async-test'; -import {patchJasmine} from 'zone.js/lib/jasmine/jasmine'; - -patchLongStackTrace(Zone); -patchTaskTracking(Zone); -patchProxyZoneSpec(Zone); -patchSyncTest(Zone); -patchAsyncTest(Zone); -patchFakeAsyncTest(Zone); -patchJasmine(Zone); +import 'zone.js/plugins/long-stack-trace-zone'; +import 'zone.js/plugins/task-tracking'; +import 'zone.js/plugins/proxy'; +import 'zone.js/plugins/sync-test'; +import 'zone.js/plugins/async-test'; +import 'zone.js/plugins/fake-async-test'; +import 'zone.js/plugins/jasmine-patch'; diff --git a/tools/tsconfig.json b/tools/tsconfig.json index 819870461a4..bbc43c3a1ea 100644 --- a/tools/tsconfig.json +++ b/tools/tsconfig.json @@ -9,8 +9,6 @@ "moduleResolution": "node", "types": ["node"], "paths": { - "zone.js": ["../packages/zone.js/lib/zone"], - "zone.js/*": ["../packages/zone.js/*"], "@angular/*": ["../packages/*/index"], } }