Elgato_dark/angular
1
0
Fork 0
mirror of https://github.com/angular/angular synced 2026-05-24 09:28:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source 
Use zone.js from npm isntead of from the repo going forward

PR Close #61977
This commit is contained in:
Joey Perrott 2025-06-09 21:39:42 +00:00 committed by Andrew Kushnir
parent e1bd13d854
commit dfbdbbe882
38 changed files with 88 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
packages/BUILD.bazel
View file

@ -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",
],
)

1
packages/common/http/BUILD.bazel
View file

@ -18,6 +18,7 @@ ng_project(
],
deps = [
"//:node_modules/rxjs",
"//:node_modules/zone.js",
"//packages/common:common_rjs",
],
)

17
packages/common/test/BUILD.bazel
View file

@ -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",
],
)

2
packages/core/BUILD.bazel
View file

@ -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",

1
packages/core/test/BUILD.bazel
View file

@ -74,6 +74,7 @@ ts_project(
deps = [
":test_utils_rjs",
"//:node_modules/rxjs",
"//:node_modules/zone.js",
],
)

2
packages/core/test/bundling/image-directive/BUILD.bazel
View file

@ -54,7 +54,7 @@ http_server(
],
deps = [
":bundle",
"//packages/zone.js/bundles:zone.umd.js",
"@npm//zone.js",
],
)

2
packages/core/test/bundling/image-directive/index.html
View file

@ -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>

2
packages/core/test/render3/BUILD.bazel
View file

@ -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",
],
)

1
packages/core/test/render3/ivy/BUILD.bazel
View file

@ -21,6 +21,5 @@ jasmine_node_test(
],
deps = [
":ivy_lib",
"//packages/zone.js/lib",
],
)

1
packages/core/testing/BUILD.bazel
View file

@ -17,6 +17,7 @@ ng_project(
deps = [
"//:node_modules/@types/jasmine",
"//:node_modules/rxjs",
"//:node_modules/zone.js",
],
)

1
packages/elements/BUILD.bazel
View file

@ -17,6 +17,7 @@ ng_project(
],
deps = [
"//:node_modules/rxjs",
"//:node_modules/zone.js",
],
)

1
packages/elements/test/BUILD.bazel
View file

@ -15,6 +15,7 @@ ts_project(
],
deps = [
"//:node_modules/rxjs",
"//:node_modules/zone.js",
],
)

2
packages/elements/test/component-factory-strategy_spec.ts
View file

@ -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;

2
packages/examples/common/BUILD.bazel
View file

@ -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",

2
packages/examples/common/main.ts
View file

@ -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';

2
packages/examples/core/BUILD.bazel
View file

@ -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",

4
packages/examples/core/main.ts
View file

@ -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

2
packages/examples/forms/BUILD.bazel
View file

@ -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",

2
packages/examples/forms/main.ts
View file

@ -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';

2
packages/examples/router/activated-route/BUILD.bazel
View file

@ -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",
],

2
packages/examples/router/activated-route/main.ts
View file

@ -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';

2
packages/examples/service-worker/push/BUILD.bazel
View file

@ -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",
],

2
packages/examples/service-worker/push/main.ts
View file

@ -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';

2
packages/examples/service-worker/registration-options/BUILD.bazel
View file

@ -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",
],

2
packages/examples/service-worker/registration-options/main.ts
View file

@ -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';

2
packages/examples/upgrade/index.html
View file

@ -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>

2
packages/examples/upgrade/upgrade_example.bzl
View file

@ -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,

1
packages/platform-browser/test/BUILD.bazel
View file

@ -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",

2
packages/platform-browser/test/dom/events/event_manager_spec.ts
View file

@ -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;

1
packages/tsconfig-build.json
View file

@ -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/*"]
}

2
packages/tsconfig.json
View file

@ -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": ".",

1
packages/upgrade/BUILD.bazel
View file

@ -16,6 +16,7 @@ ng_project(
"//packages/platform-browser-dynamic",
],
deps = [
"//:node_modules/zone.js",
"//packages/upgrade/src/common:common_rjs",
],
)

7
packages/zone.js/test/karma_test.bzl
View file

@ -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 = [

63
tools/testing/BUILD.bazel
View file

@ -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",
],
)

2
tools/testing/browser_tests.init.mts
View file

@ -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.

3
tools/testing/node_tests.init.mts
View file

@ -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;

24
tools/testing/zone_base_setup.mts
View file

@ -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';

2
tools/tsconfig.json
View file

@ -9,8 +9,6 @@
"moduleResolution": "node",
"types": ["node"],
"paths": {
"zone.js": ["../packages/zone.js/lib/zone"],
"zone.js/*": ["../packages/zone.js/*"],
"@angular/*": ["../packages/*/index"],
}
}