Skip to content

build: move rxjs dependency out of root #29895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 20, 2025
Merged

build: move rxjs dependency out of root #29895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/testing/builder/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ ts_project(
deps = [
":node_modules/@angular-devkit/architect",
":node_modules/@angular-devkit/core",
":node_modules/rxjs",
"//:node_modules/@types/node",
"//:node_modules/rxjs",
],
)

Expand Down
3 changes: 2 additions & 1 deletion modules/testing/builder/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"@angular-devkit/core": "workspace:*",
"@angular-devkit/architect": "workspace:*",
"@angular/ssr": "workspace:*",
"@angular-devkit/build-angular": "workspace:*"
"@angular-devkit/build-angular": "workspace:*",
"rxjs": "7.8.2"
}
}
1 change: 0 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@
"rollup": "4.36.0",
"rollup-license-plugin": "~3.0.1",
"rollup-plugin-sourcemaps": "^0.6.0",
"rxjs": "7.8.2",
"semver": "7.7.1",
"shelljs": "^0.9.0",
"source-map-support": "0.5.21",
Expand Down
6 changes: 3 additions & 3 deletions packages/angular/build/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ ts_project(
"//:node_modules/@angular/platform-browser",
"//:node_modules/@angular/platform-browser-dynamic",
"//:node_modules/@angular/router",
"//:node_modules/rxjs",
":node_modules/rxjs",
"//:node_modules/tslib",
"//:node_modules/typescript",
"//:node_modules/zone.js",
Expand Down Expand Up @@ -205,7 +205,7 @@ ts_project(
"//:node_modules/@angular/platform-browser-dynamic",
"//:node_modules/@angular/router",
":node_modules/ng-packagr",
"//:node_modules/rxjs",
":node_modules/rxjs",
"//:node_modules/tslib",
"//:node_modules/typescript",
"//:node_modules/zone.js",
Expand Down Expand Up @@ -240,7 +240,7 @@ ts_project(
"//:node_modules/@angular/platform-browser",
"//:node_modules/@angular/platform-browser-dynamic",
"//:node_modules/@angular/router",
"//:node_modules/rxjs",
":node_modules/rxjs",
"//:node_modules/tslib",
"//:node_modules/typescript",
"//:node_modules/zone.js",
Expand Down
3 changes: 2 additions & 1 deletion packages/angular/build/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@
"@angular-devkit/core": "workspace:*",
"less": "4.2.2",
"ng-packagr": "20.0.0-next.1",
"postcss": "8.5.3"
"postcss": "8.5.3",
"rxjs": "7.8.2"
},
"peerDependencies": {
"@angular/compiler": "0.0.0-ANGULAR-FW-PEER-DEP",
Expand Down
4 changes: 2 additions & 2 deletions packages/angular_devkit/architect/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ ts_project(
module_name = "@angular-devkit/architect",
deps = [
":node_modules/@angular-devkit/core",
":node_modules/rxjs",
"//:node_modules/@types/node",
"//:node_modules/rxjs",
],
)

Expand All @@ -81,9 +81,9 @@ ts_project(
deps = [
":architect",
":node_modules/@angular-devkit/core",
":node_modules/rxjs",
"//:node_modules/@types/jasmine",
"//:node_modules/@types/node",
"//:node_modules/rxjs",
"//packages/angular_devkit/architect/testing",
],
)
Expand Down
4 changes: 2 additions & 2 deletions packages/angular_devkit/architect/node/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ ts_project(
module_name = "@angular-devkit/architect/node",
deps = [
"//:node_modules/@types/node",
"//:node_modules/rxjs",
"//packages/angular_devkit/architect",
"//packages/angular_devkit/architect:node_modules/@angular-devkit/core",
"//packages/angular_devkit/architect:node_modules/rxjs",
],
)

Expand All @@ -36,8 +36,8 @@ ts_project(
":node",
"//:node_modules/@types/jasmine",
"//:node_modules/@types/node",
"//:node_modules/rxjs",
"//packages/angular_devkit/architect",
"//packages/angular_devkit/architect:node_modules/rxjs",
"//packages/angular_devkit/architect/node/test:test_lib",
],
)
Expand Down
2 changes: 1 addition & 1 deletion packages/angular_devkit/architect/testing/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ ts_project(
module_name = "@angular-devkit/architect/testing",
deps = [
"//:node_modules/@types/node",
"//:node_modules/rxjs",
"//packages/angular_devkit/architect",
"//packages/angular_devkit/architect:node_modules/@angular-devkit/core",
"//packages/angular_devkit/architect:node_modules/rxjs",
],
)
6 changes: 3 additions & 3 deletions packages/angular_devkit/build_angular/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ ts_project(
":node_modules/postcss",
":node_modules/postcss-loader",
":node_modules/resolve-url-loader",
":node_modules/rxjs",
":node_modules/sass",
":node_modules/sass-loader",
":node_modules/source-map-loader",
Expand Down Expand Up @@ -201,7 +202,6 @@ ts_project(
"//:node_modules/fast-glob",
"//:node_modules/karma",
"//:node_modules/karma-source-map-support",
"//:node_modules/rxjs",
"//:node_modules/semver",
"//:node_modules/tslib",
"//:node_modules/typescript",
Expand Down Expand Up @@ -299,9 +299,9 @@ ts_project(
":node_modules/@angular-devkit/architect",
":node_modules/@angular-devkit/core",
":node_modules/@angular/build",
":node_modules/rxjs",
"//:node_modules/@types/jasmine",
"//:node_modules/@types/node",
"//:node_modules/rxjs",
"//modules/testing/builder",
],
)
Expand Down Expand Up @@ -404,7 +404,7 @@ LARGE_SPECS = {
"//:node_modules/@angular/platform-browser",
"//:node_modules/@angular/platform-browser-dynamic",
"//:node_modules/@angular/router",
"//:node_modules/rxjs",
":node_modules/rxjs",
"//:node_modules/tslib",
"//:node_modules/typescript",
"//:node_modules/zone.js",
Expand Down
9 changes: 2 additions & 7 deletions packages/angular_devkit/build_angular/src/builders/browser/specs/lazy-module_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,15 +149,10 @@ describe('Browser Builder lazy modules', () => {
'src/main.ts': `import('./one'); import('./two');`,
});

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

it(`supports disabling the common bundle`, async () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/angular_devkit/build_webpack/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ ts_project(
module_name = "@angular-devkit/build-webpack",
deps = [
":node_modules/@angular-devkit/architect",
":node_modules/rxjs",
":node_modules/webpack",
":node_modules/webpack-dev-server",
"//:node_modules/@types/node",
"//:node_modules/rxjs",
],
)

Expand Down
4 changes: 2 additions & 2 deletions packages/angular_devkit/core/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ ts_project(
":node_modules/ajv-formats",
":node_modules/jsonc-parser",
":node_modules/picomatch",
":node_modules/rxjs",
":node_modules/source-map",
"//:node_modules/@types/jasmine",
"//:node_modules/@types/node",
"//:node_modules/@types/picomatch",
"//:node_modules/rxjs",
],
)

Expand All @@ -53,8 +53,8 @@ ts_project(
data = glob(["src/workspace/json/test/**/*.json"]),
deps = [
":core",
":node_modules/rxjs",
"//:node_modules/@types/node",
"//:node_modules/rxjs",
"//packages/angular_devkit/core/node",
],
)
Expand Down
4 changes: 2 additions & 2 deletions packages/angular_devkit/core/node/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ ts_project(
module_name = "@angular-devkit/core/node",
deps = [
"//:node_modules/@types/node",
"//:node_modules/rxjs",
"//packages/angular_devkit/core",
"//packages/angular_devkit/core:node_modules/chokidar",
"//packages/angular_devkit/core:node_modules/rxjs",
],
)

Expand All @@ -42,8 +42,8 @@ ts_project(
":node",
"//:node_modules/@types/jasmine",
"//:node_modules/@types/node",
"//:node_modules/rxjs",
"//packages/angular_devkit/core",
"//packages/angular_devkit/core:node_modules/rxjs",
],
)

Expand Down
2 changes: 1 addition & 1 deletion packages/angular_devkit/core/node/testing/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ ts_project(
deps = [
"//:node_modules/@types/jasmine",
"//:node_modules/@types/node",
"//:node_modules/rxjs",
"//packages/angular_devkit/core",
"//packages/angular_devkit/core:node_modules/rxjs",
"//packages/angular_devkit/core/node",
],
)
4 changes: 2 additions & 2 deletions packages/angular_devkit/schematics/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ ts_project(
":node_modules/@angular-devkit/core",
":node_modules/jsonc-parser",
":node_modules/magic-string",
":node_modules/rxjs",
"//:node_modules/@types/node",
"//:node_modules/rxjs",
],
)

Expand All @@ -41,9 +41,9 @@ ts_project(
srcs = glob(["src/**/*_spec.ts"]),
deps = [
":node_modules/@angular-devkit/core",
":node_modules/rxjs",
":schematics",
"//:node_modules/@types/jasmine",
"//:node_modules/rxjs",
"//packages/angular_devkit/schematics/testing",
],
)
Expand Down
2 changes: 1 addition & 1 deletion packages/angular_devkit/schematics/tasks/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ ts_project(
module_name = "@angular-devkit/schematics/tasks",
deps = [
"//:node_modules/@types/node",
"//:node_modules/rxjs",
"//packages/angular_devkit/schematics",
"//packages/angular_devkit/schematics:node_modules/@angular-devkit/core",
"//packages/angular_devkit/schematics:node_modules/ora",
"//packages/angular_devkit/schematics:node_modules/rxjs",
],
)
2 changes: 1 addition & 1 deletion packages/angular_devkit/schematics/tasks/node/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ ts_project(
module_name = "@angular-devkit/schematics/tasks/node",
deps = [
"//:node_modules/@types/node",
"//:node_modules/rxjs",
"//packages/angular_devkit/core",
"//packages/angular_devkit/core/node",
"//packages/angular_devkit/schematics",
"//packages/angular_devkit/schematics:node_modules/rxjs",
"//packages/angular_devkit/schematics/tasks",
],
)
2 changes: 1 addition & 1 deletion packages/angular_devkit/schematics/testing/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ ts_project(
data = ["package.json"],
module_name = "@angular-devkit/schematics/testing",
deps = [
"//:node_modules/rxjs",
"//packages/angular_devkit/schematics",
"//packages/angular_devkit/schematics:node_modules/@angular-devkit/core",
"//packages/angular_devkit/schematics:node_modules/rxjs",
"//packages/angular_devkit/schematics/tasks/node",
"//packages/angular_devkit/schematics/tools",
],
Expand Down
4 changes: 2 additions & 2 deletions packages/angular_devkit/schematics/tools/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ ts_project(
module_name = "@angular-devkit/schematics/tools",
deps = [
"//:node_modules/@types/node",
"//:node_modules/rxjs",
"//packages/angular_devkit/schematics",
"//packages/angular_devkit/schematics:node_modules/@angular-devkit/core",
"//packages/angular_devkit/schematics:node_modules/jsonc-parser",
"//packages/angular_devkit/schematics:node_modules/rxjs",
"//packages/angular_devkit/schematics/tasks",
"//packages/angular_devkit/schematics/tasks/node",
],
Expand All @@ -43,9 +43,9 @@ ts_project(
":tools",
"//:node_modules/@types/jasmine",
"//:node_modules/@types/node",
"//:node_modules/rxjs",
"//packages/angular_devkit/schematics",
"//packages/angular_devkit/schematics:node_modules/@angular-devkit/core",
"//packages/angular_devkit/schematics:node_modules/rxjs",
"//packages/angular_devkit/schematics/tasks",
"//packages/angular_devkit/schematics/testing",
"//tests/angular_devkit/schematics/tools/file-system-engine-host:file_system_engine_host_test_lib",
Expand Down
12 changes: 9 additions & 3 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tests/legacy-cli/e2e/utils/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ ts_project(
"//:node_modules/fast-glob",
"//:node_modules/npm",
"//:node_modules/protractor",
"//:node_modules/rxjs",
"//:node_modules/semver",
"//:node_modules/tar",
"//:node_modules/verdaccio",
"//:node_modules/verdaccio-auth-memory",
"//tests:node_modules/rxjs",
"//tests:node_modules/tree-kill",
],
)
1 change: 1 addition & 0 deletions tests/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"devDependencies": {
"@angular-devkit/schematics": "workspace:*",
"rxjs": "7.8.2",
"tree-kill": "1.2.2"
}
}