Skip to content

Commit fe34982

Browse files
josephperrottatscott
josephperrott
authored and
atscott
committed
build: separate zone.js dependencies into their own directory (#63425)
Separate out zone.js dependencies PR Close #63425
1 parent 38de2b3 commit fe34982

File tree

18 files changed

+2412
-4498
lines changed

18 files changed

+2412
-4498
lines changed

‎.bazelignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,6 @@ packages/zone.js/test/typings/node_modules
6565
packages/upgrade/node_modules
6666
packages/benchpress/node_modules
6767
packages/service-worker/node_modules
68+
packages/zone.js/test/typings/node_modules
69+
packages/zone.js/node_modules
6870
tools/bazel/rules_angular_store/node_modules

‎.github/workflows/pr.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,6 @@ jobs:
157157
cp dist/bin/packages/zone.js/npm_package/bundles/zone-patch-electron.umd.js ./packages/zone.js/test/extra/
158158
cp dist/bin/packages/zone.js/test/closure/zone.closure.js ./packages/zone.js/build/test/zone.closure.mjs
159159
160-
# Install
161-
- run: pnpm -C packages/zone.js install --frozen-lockfile
162160
# Run zone.js tools tests
163161
- run: pnpm -C packages/zone.js promisefinallytest
164162
- run: pnpm -C packages/zone.js jest:test

‎packages/zone.js/BUILD.bazel‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1+
load("@npm//:defs.bzl", "npm_link_all_packages")
12
load("//packages/zone.js:bundles.bzl", "BUNDLES_ENTRY_POINTS")
2-
load("//packages/zone.js:tools.bzl", "generate_rollup_bundle")
3-
load("//tools:defaults.bzl", "npm_package", "ts_config", "ts_project")
3+
load("//packages/zone.js:tools.bzl", "generate_rollup_bundle", "npm_package", "ts_config", "ts_project")
44

55
package(default_visibility = ["//visibility:public"])
66

7+
npm_link_all_packages(
8+
name = "node_modules",
9+
)
10+
711
ts_config(
812
name = "tsconfig_build",
913
src = "tsconfig.json",
@@ -14,8 +18,8 @@ ts_config(
1418
src = "tsconfig-test.json",
1519
deps = [
1620
":tsconfig_build",
17-
"//:node_modules/@types/jasmine",
18-
"//:node_modules/@types/node",
21+
"//packages/zone.js:node_modules/@types/jasmine",
22+
"//packages/zone.js:node_modules/@types/node",
1923
],
2024
)
2125

@@ -49,6 +53,7 @@ generate_rollup_bundle(
4953
)
5054

5155
npm_package(
56+
name = "npm_package",
5257
srcs = [
5358
"CHANGELOG.md",
5459
"README.md",
@@ -74,3 +79,8 @@ npm_package(
7479
package = "zone.js",
7580
visibility = ["//visibility:public"],
7681
)
82+
83+
alias(
84+
name = "pkg",
85+
actual = ":npm_package",
86+
)

‎packages/zone.js/lib/BUILD.bazel‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("//tools:defaults.bzl", "copy_to_bin", "ts_project")
1+
load("//packages/zone.js:tools.bzl", "copy_to_bin", "ts_project")
22

33
package(default_visibility = ["//visibility:public"])
44

@@ -65,8 +65,8 @@ ts_project(
6565
),
6666
deps = [
6767
":zone_d_ts",
68-
"//:node_modules/@types/jasmine",
69-
"//:node_modules/@types/node",
70-
"//:node_modules/rxjs",
68+
"//packages/zone.js:node_modules/@types/jasmine",
69+
"//packages/zone.js:node_modules/@types/node",
70+
"//packages/zone.js:node_modules/rxjs",
7171
],
7272
)

‎packages/zone.js/package.json‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,28 @@
88
"fesm2015": "./fesm2015/zone.js",
99
"typings": "./zone.d.ts",
1010
"devDependencies": {
11-
"@externs/nodejs": "^1.5.0",
12-
"@types/node": "^10.9.4",
11+
"@csstools/css-calc": "2.1.4",
12+
"@csstools/css-color-parser": "3.1.0",
13+
"@externs/nodejs": "1.5.0",
14+
"@types/jasmine": "5.1.9",
15+
"@types/node": "24.3.0",
16+
"@types/shelljs": "0.8.17",
17+
"@types/systemjs": "6.15.3",
18+
"bluebird": "3.7.2",
1319
"domino": "https://github.com/angular/domino.git#93e720f143d0296dd2726ffbcf4fc12283363a7b",
14-
"jest": "^30.0.0",
15-
"jest-environment-jsdom": "^30.0.0",
16-
"jest-environment-node": "^30.0.0",
17-
"mocha": "^11.0.0",
20+
"esbuild-plugin-umd-wrapper": "3.0.0",
21+
"jest-environment-jsdom": "30.1.1",
22+
"jest-environment-node": "30.1.1",
23+
"jest": "30.1.1",
24+
"mocha": "11.7.1",
1825
"mock-require": "3.0.3",
26+
"jasmine": "5.9.0",
27+
"source-map-support": "0.5.21",
28+
"jasmine-core": "5.9.0",
29+
"jasmine-reporters": "2.5.2",
30+
"rxjs": "7.8.2",
31+
"shelljs": "0.10.0",
32+
"systemjs": "6.15.1",
1933
"tslib": "^2.3.0",
2034
"vitest": "^3.1.3"
2135
},

0 commit comments

Comments
 (0)