refactor: use zone.js from npm instead of packages/zone.js throughout repo (#61978)

josephperrott · AndrewKushnir · commit 135c59444318 · 2025-06-10T12:02:36.000-07:00
Use zone.js from npm isntead of from the repo going forward PR Close #61978
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -10,7 +10,7 @@
 
     <app-root></app-root>
 
-    <script src="angular/packages/zone.js/bundles/zone.umd.js"></script>
+    <script src="npm/node_modules/zone.js/bundles/zone.umd.js"></script>
     <script src="bundle.js"></script>
   </body>
 </html>
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -12,7 +12,7 @@
   <body>
     <example-app>Loading...</example-app>
 
-    <script src="/angular/packages/zone.js/bundles/zone.umd.js"></script>
+    <script src="/npm/node_modules/zone.js/bundles/zone.umd.js"></script>
     <script src="/npm/node_modules/angular-1.8/angular.js"></script>
     <script src="/npm/node_modules/reflect-metadata/Reflect.js"></script>
     <script src="/app_bundle.js"></script>
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/tools/testing/browser_tests.init.mts b/tools/testing/browser_tests.init.mts
diff --git a/tools/testing/node_tests.init.mts b/tools/testing/node_tests.init.mts
diff --git a/tools/testing/zone_base_setup.mts b/tools/testing/zone_base_setup.mts
diff --git a/tools/tsconfig.json b/tools/tsconfig.json

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ ng_project(`
`18`	`18`	`],`
`19`	`19`	`deps = [`
`20`	`20`	`"//:node_modules/rxjs",`
	`21`	`+ "//:node_modules/zone.js",`
`21`	`22`	`"//packages/common:common_rjs",`
`22`	`23`	`],`
`23`	`24`	`)`
Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,7 @@ ts_project(`
`74`	`74`	`deps = [`
`75`	`75`	`":test_utils_rjs",`
`76`	`76`	`"//:node_modules/rxjs",`
	`77`	`+ "//:node_modules/zone.js",`
`77`	`78`	`],`
`78`	`79`	`)`
`79`	`80`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ http_server(`
`54`	`54`	`],`
`55`	`55`	`deps = [`
`56`	`56`	`":bundle",`
`57`		`- "//packages/zone.js/bundles:zone.umd.js",`
	`57`	`+ "@npm//zone.js",`
`58`	`58`	`],`
`59`	`59`	`)`
`60`	`60`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ ts_project(`
`38`	`38`	`],`
`39`	`39`	`deps = [`
`40`	`40`	`"//:node_modules/rxjs",`
	`41`	`+ "//:node_modules/zone.js",`
`41`	`42`	`],`
`42`	`43`	`)`
`43`	`44`
`@@ -85,7 +86,6 @@ jasmine_node_test(`
`85`	`86`	`],`
`86`	`87`	`deps = [`
`87`	`88`	`":render3_node_lib",`
`88`		`- "//packages/zone.js/lib",`
`89`	`89`	`],`
`90`	`90`	`)`
`91`	`91`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,5 @@ jasmine_node_test(`
`21`	`21`	`],`
`22`	`22`	`deps = [`
`23`	`23`	`":ivy_lib",`
`24`		`- "//packages/zone.js/lib",`
`25`	`24`	`],`
`26`	`25`	`)`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ ng_project(`
`17`	`17`	`deps = [`
`18`	`18`	`"//:node_modules/@types/jasmine",`
`19`	`19`	`"//:node_modules/rxjs",`
	`20`	`+ "//:node_modules/zone.js",`
`20`	`21`	`],`
`21`	`22`	`)`
`22`	`23`