From cd3bbdbad68d7e845e0e84bb4772e4467d1a91f3 Mon Sep 17 00:00:00 2001 From: Joey Perrott Date: Wed, 4 Jun 2025 17:04:38 +0000 Subject: [PATCH] build: add zone.js as an npm based dependency (#61947) Add zone.js as an npm based dependency PR Close #61947 --- .../npm_translate_lock_MzA5NzUwNzMx | 6 +++--- package.json | 3 ++- pnpm-lock.yaml | 17 ++++++++++------- yarn.lock | 5 +++++ 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx b/.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx index e99f6d2e7da..6f43fd37568 100755 --- a/.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx +++ b/.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx @@ -6,7 +6,7 @@ adev/shared-docs/pipeline/api-gen/package.json=939673974 integration/package.json=-239561259 modules/package.json=-159368300 -package.json=-571783503 +package.json=1094344471 packages/animations/package.json=-678724831 packages/common/package.json=1729763064 packages/compiler-cli/linker/babel/test/package.json=939673974 @@ -21,7 +21,7 @@ packages/platform-browser/package.json=-1163479450 packages/router/package.json=860819913 packages/upgrade/package.json=16347051 packages/zone.js/package.json=-1577512523 -pnpm-lock.yaml=-1453911694 +pnpm-lock.yaml=-1404319971 pnpm-workspace.yaml=1973735808 tools/bazel/rules_angular_store/package.json=-239561259 -yarn.lock=355531618 +yarn.lock=-355487767 diff --git a/package.json b/package.json index 218df78ca18..28a9b6607eb 100644 --- a/package.json +++ b/package.json @@ -158,7 +158,8 @@ "webtreemap": "^2.0.1", "ws": "^8.15.0", "xhr2": "0.2.1", - "yargs": "^18.0.0" + "yargs": "^18.0.0", + "zone.js": "0.15.1" }, "// 2": "devDependencies are not used under Bazel. Many can be removed after test.sh is deleted.", "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 41109ac4178..ae3fa760e4b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -347,6 +347,9 @@ importers: yargs: specifier: ^18.0.0 version: 18.0.0 + zone.js: + specifier: 0.15.1 + version: link:packages/zone.js devDependencies: '@actions/core': specifier: ^1.10.0 @@ -359,7 +362,7 @@ importers: version: 0.2001.0-next.0(chokidar@4.0.3) '@angular/build-tooling': specifier: https://github.com/angular/dev-infra-private-build-tooling-builds.git#5db176c0f3211663830fd3ff4064c1dff0eaccb4 - version: github.com/angular/dev-infra-private-build-tooling-builds/5db176c0f3211663830fd3ff4064c1dff0eaccb4(@angular/compiler-cli@packages+compiler-cli)(@angular/compiler@packages+compiler)(@angular/ssr@20.1.0-next.0)(chokidar@4.0.3)(karma-chrome-launcher@3.2.0)(karma-firefox-launcher@2.1.3)(karma-jasmine@5.1.0)(karma-requirejs@1.1.0)(karma-sourcemap-loader@0.4.0)(karma@6.4.4)(rxjs@7.8.2)(terser@5.41.0)(tsx@4.19.4) + version: github.com/angular/dev-infra-private-build-tooling-builds/5db176c0f3211663830fd3ff4064c1dff0eaccb4(@angular/compiler-cli@packages+compiler-cli)(@angular/compiler@packages+compiler)(@angular/ssr@20.1.0-next.0)(chokidar@4.0.3)(karma-chrome-launcher@3.2.0)(karma-firefox-launcher@2.1.3)(karma-jasmine@5.1.0)(karma-requirejs@1.1.0)(karma-sourcemap-loader@0.4.0)(karma@6.4.4)(rxjs@7.8.2)(terser@5.41.0)(tsx@4.19.4)(zone.js@packages+zone.js) '@angular/ng-dev': specifier: https://github.com/angular/dev-infra-private-ng-dev-builds.git#03896acc53dcd538c4b3b71240af9e344ba3cfec version: github.com/angular/dev-infra-private-ng-dev-builds/03896acc53dcd538c4b3b71240af9e344ba3cfec @@ -1204,10 +1207,10 @@ packages: - chokidar dev: false - /@angular/benchpress@0.3.0(rxjs@7.8.2): + /@angular/benchpress@0.3.0(rxjs@7.8.2)(zone.js@packages+zone.js): resolution: {integrity: sha512-ApxoY5lTj1S0QFLdq5ZdTfdkIds1m3tma9EJOZpNVHRU9eCj2D/5+VFb5tlWsv9NHQ2S0XXkJjauFOAdfzT8uw==, tarball: https://registry.npmjs.org/@angular/benchpress/-/benchpress-0.3.0.tgz} dependencies: - '@angular/core': 14.3.0(rxjs@7.8.2) + '@angular/core': 14.3.0(rxjs@7.8.2)(zone.js@packages+zone.js) reflect-metadata: 0.1.14 transitivePeerDependencies: - rxjs @@ -1524,7 +1527,7 @@ packages: - supports-color dev: false - /@angular/core@14.3.0(rxjs@7.8.2): + /@angular/core@14.3.0(rxjs@7.8.2)(zone.js@packages+zone.js): resolution: {integrity: sha512-wYiwItc0Uyn4FWZ/OAx/Ubp2/WrD3EgUJ476y1XI7yATGPF8n9Ld5iCXT08HOvc4eBcYlDfh90kTXR6/MfhzdQ==, tarball: https://registry.npmjs.org/@angular/core/-/core-14.3.0.tgz} engines: {node: ^14.15.0 || >=16.10.0} peerDependencies: @@ -1533,6 +1536,7 @@ packages: dependencies: rxjs: 7.8.2 tslib: 2.8.1 + zone.js: link:packages/zone.js dev: true /@angular/material@20.1.0-next.0(@angular/cdk@20.1.0-next.0)(rxjs@7.8.2): @@ -3032,7 +3036,6 @@ packages: /@bazel/typescript@5.8.1(typescript@5.7.3): resolution: {integrity: sha512-NAJ8WQHZL1WE1YmRoCrq/1hhG15Mvy/viWh6TkvFnBeEhNUiQUsA5GYyhU1ztnBIYW03nATO3vwhAEfO7Q0U5g==, tarball: https://registry.npmjs.org/@bazel/typescript/-/typescript-5.8.1.tgz} - deprecated: No longer maintained, https://github.com/aspect-build/rules_ts is the recommended replacement hasBin: true peerDependencies: typescript: '>=3.0.0' @@ -21128,13 +21131,13 @@ packages: resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==, tarball: https://registry.npmjs.org/zwitch/-/zwitch-2.0.4.tgz} dev: true - github.com/angular/dev-infra-private-build-tooling-builds/5db176c0f3211663830fd3ff4064c1dff0eaccb4(@angular/compiler-cli@packages+compiler-cli)(@angular/compiler@packages+compiler)(@angular/ssr@20.1.0-next.0)(chokidar@4.0.3)(karma-chrome-launcher@3.2.0)(karma-firefox-launcher@2.1.3)(karma-jasmine@5.1.0)(karma-requirejs@1.1.0)(karma-sourcemap-loader@0.4.0)(karma@6.4.4)(rxjs@7.8.2)(terser@5.41.0)(tsx@4.19.4): + github.com/angular/dev-infra-private-build-tooling-builds/5db176c0f3211663830fd3ff4064c1dff0eaccb4(@angular/compiler-cli@packages+compiler-cli)(@angular/compiler@packages+compiler)(@angular/ssr@20.1.0-next.0)(chokidar@4.0.3)(karma-chrome-launcher@3.2.0)(karma-firefox-launcher@2.1.3)(karma-jasmine@5.1.0)(karma-requirejs@1.1.0)(karma-sourcemap-loader@0.4.0)(karma@6.4.4)(rxjs@7.8.2)(terser@5.41.0)(tsx@4.19.4)(zone.js@packages+zone.js): resolution: {tarball: https://codeload.github.com/angular/dev-infra-private-build-tooling-builds/tar.gz/5db176c0f3211663830fd3ff4064c1dff0eaccb4} id: github.com/angular/dev-infra-private-build-tooling-builds/5db176c0f3211663830fd3ff4064c1dff0eaccb4 name: '@angular/build-tooling' version: 0.0.0-d44be7e28087c3499d70dda9859d51c1cd3fe1bf dependencies: - '@angular/benchpress': 0.3.0(rxjs@7.8.2) + '@angular/benchpress': 0.3.0(rxjs@7.8.2)(zone.js@packages+zone.js) '@angular/build': 19.1.0-rc.0(@angular/compiler-cli@packages+compiler-cli)(@angular/compiler@packages+compiler)(@angular/ssr@20.1.0-next.0)(@types/node@18.19.110)(chokidar@4.0.3)(terser@5.41.0)(tsx@4.19.4)(typescript@5.7.3) '@babel/core': 7.27.4 '@babel/plugin-proposal-async-generator-functions': 7.20.7(@babel/core@7.27.4) diff --git a/yarn.lock b/yarn.lock index 77681e4c957..230237e8c44 100644 --- a/yarn.lock +++ b/yarn.lock @@ -18102,6 +18102,11 @@ zod@^3.23.8, zod@^3.24.1, zod@^3.24.3: resolved "https://registry.yarnpkg.com/zod/-/zod-3.25.49.tgz#e044541aac57bd12d1cec5dbf9309cdc768774c2" integrity sha512-JMMPMy9ZBk3XFEdbM3iL1brx4NUSejd6xr3ELrrGEfGb355gjhiAWtG3K5o+AViV/3ZfkIrCzXsZn6SbLwTR8Q== +zone.js@0.15.1: + version "0.15.1" + resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.15.1.tgz#1e109adb75f80e9e004ee8e0d4a0a52e0a336481" + integrity sha512-XE96n56IQpJM7NAoXswY3XRLcWFW83xe0BiAOeMD7K5k5xecOeul3Qcpx6GqEeeHNkW5DWL5zOyTbEfB4eti8w== + zwitch@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-2.0.4.tgz#c827d4b0acb76fc3e685a4c6ec2902d51070e9d7"