Skip to content

Commit 58a39b4

Browse files
clydinclydin
committed
build: move rxjs dependency out of root
With the migration to `rules_js`, package specific dependencies now only need to be referenced with the source `package.json` for each specific package. The `rxjs` dependency has now been moved to usage locations instead of the root of the repository.
1 parent 63428f3 commit 58a39b4

File tree

22 files changed

+42
-39
lines changed

22 files changed

+42
-39
lines changed

‎modules/testing/builder/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ ts_project(
2424
deps = [
2525
":node_modules/@angular-devkit/architect",
2626
":node_modules/@angular-devkit/core",
27+
":node_modules/rxjs",
2728
"//:node_modules/@types/node",
28-
"//:node_modules/rxjs",
2929
],
3030
)
3131

‎modules/testing/builder/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"@angular-devkit/core": "workspace:*",
44
"@angular-devkit/architect": "workspace:*",
55
"@angular/ssr": "workspace:*",
6-
"@angular-devkit/build-angular": "workspace:*"
6+
"@angular-devkit/build-angular": "workspace:*",
7+
"rxjs": "7.8.2"
78
}
89
}

‎package.json

-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@
132132
"rollup": "4.36.0",
133133
"rollup-license-plugin": "~3.0.1",
134134
"rollup-plugin-sourcemaps": "^0.6.0",
135-
"rxjs": "7.8.2",
136135
"semver": "7.7.1",
137136
"shelljs": "^0.9.0",
138137
"source-map-support": "0.5.21",

‎packages/angular/build/BUILD.bazel

+3-3
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ ts_project(
170170
"//:node_modules/@angular/core",
171171
"//:node_modules/@angular/platform-browser",
172172
"//:node_modules/@angular/router",
173-
"//:node_modules/rxjs",
173+
":node_modules/rxjs",
174174
"//:node_modules/tslib",
175175
"//:node_modules/typescript",
176176
"//:node_modules/zone.js",
@@ -203,7 +203,7 @@ ts_project(
203203
"//:node_modules/@angular/platform-browser",
204204
"//:node_modules/@angular/router",
205205
":node_modules/ng-packagr",
206-
"//:node_modules/rxjs",
206+
":node_modules/rxjs",
207207
"//:node_modules/tslib",
208208
"//:node_modules/typescript",
209209
"//:node_modules/zone.js",
@@ -237,7 +237,7 @@ ts_project(
237237
"//:node_modules/@angular/core",
238238
"//:node_modules/@angular/platform-browser",
239239
"//:node_modules/@angular/router",
240-
"//:node_modules/rxjs",
240+
":node_modules/rxjs",
241241
"//:node_modules/tslib",
242242
"//:node_modules/typescript",
243243
"//:node_modules/zone.js",

‎packages/angular/build/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@
5454
"@angular-devkit/core": "workspace:*",
5555
"less": "4.2.2",
5656
"ng-packagr": "20.0.0-next.1",
57-
"postcss": "8.5.3"
57+
"postcss": "8.5.3",
58+
"rxjs": "7.8.2"
5859
},
5960
"peerDependencies": {
6061
"@angular/compiler": "0.0.0-ANGULAR-FW-PEER-DEP",

‎packages/angular_devkit/architect/BUILD.bazel

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ ts_project(
6969
module_name = "@angular-devkit/architect",
7070
deps = [
7171
":node_modules/@angular-devkit/core",
72+
":node_modules/rxjs",
7273
"//:node_modules/@types/node",
73-
"//:node_modules/rxjs",
7474
],
7575
)
7676

@@ -81,9 +81,9 @@ ts_project(
8181
deps = [
8282
":architect",
8383
":node_modules/@angular-devkit/core",
84+
":node_modules/rxjs",
8485
"//:node_modules/@types/jasmine",
8586
"//:node_modules/@types/node",
86-
"//:node_modules/rxjs",
8787
"//packages/angular_devkit/architect/testing",
8888
],
8989
)

‎packages/angular_devkit/architect/node/BUILD.bazel

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ ts_project(
1818
module_name = "@angular-devkit/architect/node",
1919
deps = [
2020
"//:node_modules/@types/node",
21-
"//:node_modules/rxjs",
2221
"//packages/angular_devkit/architect",
2322
"//packages/angular_devkit/architect:node_modules/@angular-devkit/core",
23+
"//packages/angular_devkit/architect:node_modules/rxjs",
2424
],
2525
)
2626

@@ -36,8 +36,8 @@ ts_project(
3636
":node",
3737
"//:node_modules/@types/jasmine",
3838
"//:node_modules/@types/node",
39-
"//:node_modules/rxjs",
4039
"//packages/angular_devkit/architect",
40+
"//packages/angular_devkit/architect:node_modules/rxjs",
4141
"//packages/angular_devkit/architect/node/test:test_lib",
4242
],
4343
)

‎packages/angular_devkit/architect/testing/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ ts_project(
1818
module_name = "@angular-devkit/architect/testing",
1919
deps = [
2020
"//:node_modules/@types/node",
21-
"//:node_modules/rxjs",
2221
"//packages/angular_devkit/architect",
2322
"//packages/angular_devkit/architect:node_modules/@angular-devkit/core",
23+
"//packages/angular_devkit/architect:node_modules/rxjs",
2424
],
2525
)

‎packages/angular_devkit/build_angular/BUILD.bazel

+3-3
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ ts_project(
169169
":node_modules/postcss",
170170
":node_modules/postcss-loader",
171171
":node_modules/resolve-url-loader",
172+
":node_modules/rxjs",
172173
":node_modules/sass",
173174
":node_modules/sass-loader",
174175
":node_modules/source-map-loader",
@@ -201,7 +202,6 @@ ts_project(
201202
"//:node_modules/fast-glob",
202203
"//:node_modules/karma",
203204
"//:node_modules/karma-source-map-support",
204-
"//:node_modules/rxjs",
205205
"//:node_modules/semver",
206206
"//:node_modules/tslib",
207207
"//:node_modules/typescript",
@@ -299,9 +299,9 @@ ts_project(
299299
":node_modules/@angular-devkit/architect",
300300
":node_modules/@angular-devkit/core",
301301
":node_modules/@angular/build",
302+
":node_modules/rxjs",
302303
"//:node_modules/@types/jasmine",
303304
"//:node_modules/@types/node",
304-
"//:node_modules/rxjs",
305305
"//modules/testing/builder",
306306
],
307307
)
@@ -403,7 +403,7 @@ LARGE_SPECS = {
403403
"//:node_modules/@angular/core",
404404
"//:node_modules/@angular/platform-browser",
405405
"//:node_modules/@angular/router",
406-
"//:node_modules/rxjs",
406+
":node_modules/rxjs",
407407
"//:node_modules/tslib",
408408
"//:node_modules/typescript",
409409
"//:node_modules/zone.js",

‎packages/angular_devkit/build_angular/src/builders/browser/specs/lazy-module_spec.ts

+2-7
Original file line numberDiff line numberDiff line change
@@ -149,15 +149,10 @@ describe('Browser Builder lazy modules', () => {
149149
'src/main.ts': `import('./one'); import('./two');`,
150150
});
151151

152-
const { files } = await browserBuild(architect, host, target, {
153-
// Preserve symlinks to reliably verify the chunk names. When symlinks
154-
// would be dereferenced, the `@angular/common` file can originate from a
155-
// less predictable path in e.g. node_modules/.pnpm/<...>`.
156-
preserveSymlinks: true,
157-
});
152+
const { files } = await browserBuild(architect, host, target);
158153
expect(files['src_one_ts.js']).toBeDefined();
159154
expect(files['src_two_ts.js']).toBeDefined();
160-
expect(files['default-node_modules_angular_common_fesm2022_http_mjs.js']).toBeDefined();
155+
expect(Object.keys(files)).toContain(jasmine.stringContaining('_angular_common_'));
161156
});
162157

163158
it(`supports disabling the common bundle`, async () => {

‎packages/angular_devkit/build_webpack/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ ts_project(
4848
module_name = "@angular-devkit/build-webpack",
4949
deps = [
5050
":node_modules/@angular-devkit/architect",
51+
":node_modules/rxjs",
5152
":node_modules/webpack",
5253
":node_modules/webpack-dev-server",
5354
"//:node_modules/@types/node",
54-
"//:node_modules/rxjs",
5555
],
5656
)
5757

‎packages/angular_devkit/core/BUILD.bazel

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ ts_project(
3636
":node_modules/ajv-formats",
3737
":node_modules/jsonc-parser",
3838
":node_modules/picomatch",
39+
":node_modules/rxjs",
3940
":node_modules/source-map",
4041
"//:node_modules/@types/jasmine",
4142
"//:node_modules/@types/node",
4243
"//:node_modules/@types/picomatch",
43-
"//:node_modules/rxjs",
4444
],
4545
)
4646

@@ -53,8 +53,8 @@ ts_project(
5353
data = glob(["src/workspace/json/test/**/*.json"]),
5454
deps = [
5555
":core",
56+
":node_modules/rxjs",
5657
"//:node_modules/@types/node",
57-
"//:node_modules/rxjs",
5858
"//packages/angular_devkit/core/node",
5959
],
6060
)

‎packages/angular_devkit/core/node/BUILD.bazel

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ ts_project(
2121
module_name = "@angular-devkit/core/node",
2222
deps = [
2323
"//:node_modules/@types/node",
24-
"//:node_modules/rxjs",
2524
"//packages/angular_devkit/core",
2625
"//packages/angular_devkit/core:node_modules/chokidar",
26+
"//packages/angular_devkit/core:node_modules/rxjs",
2727
],
2828
)
2929

@@ -42,8 +42,8 @@ ts_project(
4242
":node",
4343
"//:node_modules/@types/jasmine",
4444
"//:node_modules/@types/node",
45-
"//:node_modules/rxjs",
4645
"//packages/angular_devkit/core",
46+
"//packages/angular_devkit/core:node_modules/rxjs",
4747
],
4848
)
4949

‎packages/angular_devkit/core/node/testing/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ ts_project(
2020
deps = [
2121
"//:node_modules/@types/jasmine",
2222
"//:node_modules/@types/node",
23-
"//:node_modules/rxjs",
2423
"//packages/angular_devkit/core",
24+
"//packages/angular_devkit/core:node_modules/rxjs",
2525
"//packages/angular_devkit/core/node",
2626
],
2727
)

‎packages/angular_devkit/schematics/BUILD.bazel

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ ts_project(
3030
":node_modules/@angular-devkit/core",
3131
":node_modules/jsonc-parser",
3232
":node_modules/magic-string",
33+
":node_modules/rxjs",
3334
"//:node_modules/@types/node",
34-
"//:node_modules/rxjs",
3535
],
3636
)
3737

@@ -41,9 +41,9 @@ ts_project(
4141
srcs = glob(["src/**/*_spec.ts"]),
4242
deps = [
4343
":node_modules/@angular-devkit/core",
44+
":node_modules/rxjs",
4445
":schematics",
4546
"//:node_modules/@types/jasmine",
46-
"//:node_modules/rxjs",
4747
"//packages/angular_devkit/schematics/testing",
4848
],
4949
)

‎packages/angular_devkit/schematics/tasks/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ ts_project(
2121
module_name = "@angular-devkit/schematics/tasks",
2222
deps = [
2323
"//:node_modules/@types/node",
24-
"//:node_modules/rxjs",
2524
"//packages/angular_devkit/schematics",
2625
"//packages/angular_devkit/schematics:node_modules/@angular-devkit/core",
2726
"//packages/angular_devkit/schematics:node_modules/ora",
27+
"//packages/angular_devkit/schematics:node_modules/rxjs",
2828
],
2929
)

‎packages/angular_devkit/schematics/tasks/node/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ ts_project(
1919
module_name = "@angular-devkit/schematics/tasks/node",
2020
deps = [
2121
"//:node_modules/@types/node",
22-
"//:node_modules/rxjs",
2322
"//packages/angular_devkit/core",
2423
"//packages/angular_devkit/core/node",
2524
"//packages/angular_devkit/schematics",
25+
"//packages/angular_devkit/schematics:node_modules/rxjs",
2626
"//packages/angular_devkit/schematics/tasks",
2727
],
2828
)

‎packages/angular_devkit/schematics/testing/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ ts_project(
1616
data = ["package.json"],
1717
module_name = "@angular-devkit/schematics/testing",
1818
deps = [
19-
"//:node_modules/rxjs",
2019
"//packages/angular_devkit/schematics",
2120
"//packages/angular_devkit/schematics:node_modules/@angular-devkit/core",
21+
"//packages/angular_devkit/schematics:node_modules/rxjs",
2222
"//packages/angular_devkit/schematics/tasks/node",
2323
"//packages/angular_devkit/schematics/tools",
2424
],

‎packages/angular_devkit/schematics/tools/BUILD.bazel

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ ts_project(
2121
module_name = "@angular-devkit/schematics/tools",
2222
deps = [
2323
"//:node_modules/@types/node",
24-
"//:node_modules/rxjs",
2524
"//packages/angular_devkit/schematics",
2625
"//packages/angular_devkit/schematics:node_modules/@angular-devkit/core",
2726
"//packages/angular_devkit/schematics:node_modules/jsonc-parser",
27+
"//packages/angular_devkit/schematics:node_modules/rxjs",
2828
"//packages/angular_devkit/schematics/tasks",
2929
"//packages/angular_devkit/schematics/tasks/node",
3030
],
@@ -43,9 +43,9 @@ ts_project(
4343
":tools",
4444
"//:node_modules/@types/jasmine",
4545
"//:node_modules/@types/node",
46-
"//:node_modules/rxjs",
4746
"//packages/angular_devkit/schematics",
4847
"//packages/angular_devkit/schematics:node_modules/@angular-devkit/core",
48+
"//packages/angular_devkit/schematics:node_modules/rxjs",
4949
"//packages/angular_devkit/schematics/tasks",
5050
"//packages/angular_devkit/schematics/testing",
5151
"//tests/angular_devkit/schematics/tools/file-system-engine-host:file_system_engine_host_test_lib",

‎pnpm-lock.yaml

+9-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/legacy-cli/e2e/utils/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ ts_project(
1717
"//:node_modules/fast-glob",
1818
"//:node_modules/npm",
1919
"//:node_modules/protractor",
20-
"//:node_modules/rxjs",
2120
"//:node_modules/semver",
2221
"//:node_modules/tar",
2322
"//:node_modules/verdaccio",
2423
"//:node_modules/verdaccio-auth-memory",
24+
"//tests:node_modules/rxjs",
2525
"//tests:node_modules/tree-kill",
2626
],
2727
)

‎tests/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"devDependencies": {
33
"@angular-devkit/schematics": "workspace:*",
4+
"rxjs": "7.8.2",
45
"tree-kill": "1.2.2"
56
}
67
}

0 commit comments

Comments
 (0)