diff --git a/modules/testing/builder/BUILD.bazel b/modules/testing/builder/BUILD.bazel index 6983baca7fda..0b8bf95dfaa2 100644 --- a/modules/testing/builder/BUILD.bazel +++ b/modules/testing/builder/BUILD.bazel @@ -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", ], ) diff --git a/modules/testing/builder/package.json b/modules/testing/builder/package.json index d315fc454ede..9e62d668aeee 100644 --- a/modules/testing/builder/package.json +++ b/modules/testing/builder/package.json @@ -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" } } diff --git a/package.json b/package.json index 1e3605d3082b..38e5ead91c3d 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/packages/angular/build/BUILD.bazel b/packages/angular/build/BUILD.bazel index 061e096e6e58..5b39432001dd 100644 --- a/packages/angular/build/BUILD.bazel +++ b/packages/angular/build/BUILD.bazel @@ -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", @@ -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", @@ -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", diff --git a/packages/angular/build/package.json b/packages/angular/build/package.json index 793796fdb7f2..dd70a870a8c9 100644 --- a/packages/angular/build/package.json +++ b/packages/angular/build/package.json @@ -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", diff --git a/packages/angular_devkit/architect/BUILD.bazel b/packages/angular_devkit/architect/BUILD.bazel index 5edb897086a8..b198d8733dad 100644 --- a/packages/angular_devkit/architect/BUILD.bazel +++ b/packages/angular_devkit/architect/BUILD.bazel @@ -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", ], ) @@ -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", ], ) diff --git a/packages/angular_devkit/architect/node/BUILD.bazel b/packages/angular_devkit/architect/node/BUILD.bazel index 2dbbc9a7c3b4..bf10f87babac 100644 --- a/packages/angular_devkit/architect/node/BUILD.bazel +++ b/packages/angular_devkit/architect/node/BUILD.bazel @@ -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", ], ) @@ -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", ], ) diff --git a/packages/angular_devkit/architect/testing/BUILD.bazel b/packages/angular_devkit/architect/testing/BUILD.bazel index 589ed96abb5d..c6dfbab8a7a8 100644 --- a/packages/angular_devkit/architect/testing/BUILD.bazel +++ b/packages/angular_devkit/architect/testing/BUILD.bazel @@ -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", ], ) diff --git a/packages/angular_devkit/build_angular/BUILD.bazel b/packages/angular_devkit/build_angular/BUILD.bazel index 8b1783f04c47..0cc68258c778 100644 --- a/packages/angular_devkit/build_angular/BUILD.bazel +++ b/packages/angular_devkit/build_angular/BUILD.bazel @@ -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", @@ -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", @@ -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", ], ) @@ -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", diff --git a/packages/angular_devkit/build_angular/src/builders/browser/specs/lazy-module_spec.ts b/packages/angular_devkit/build_angular/src/builders/browser/specs/lazy-module_spec.ts index f280658ac6a6..a68936a65036 100644 --- a/packages/angular_devkit/build_angular/src/builders/browser/specs/lazy-module_spec.ts +++ b/packages/angular_devkit/build_angular/src/builders/browser/specs/lazy-module_spec.ts @@ -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 () => { diff --git a/packages/angular_devkit/build_webpack/BUILD.bazel b/packages/angular_devkit/build_webpack/BUILD.bazel index f8f7be349938..b1a7171100f9 100644 --- a/packages/angular_devkit/build_webpack/BUILD.bazel +++ b/packages/angular_devkit/build_webpack/BUILD.bazel @@ -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", ], ) diff --git a/packages/angular_devkit/core/BUILD.bazel b/packages/angular_devkit/core/BUILD.bazel index b83bb47e0b23..aa55824c3975 100644 --- a/packages/angular_devkit/core/BUILD.bazel +++ b/packages/angular_devkit/core/BUILD.bazel @@ -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", ], ) @@ -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", ], ) diff --git a/packages/angular_devkit/core/node/BUILD.bazel b/packages/angular_devkit/core/node/BUILD.bazel index f9247d41161d..a71684f1d882 100644 --- a/packages/angular_devkit/core/node/BUILD.bazel +++ b/packages/angular_devkit/core/node/BUILD.bazel @@ -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", ], ) @@ -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", ], ) diff --git a/packages/angular_devkit/core/node/testing/BUILD.bazel b/packages/angular_devkit/core/node/testing/BUILD.bazel index 473b47e5ade7..c57f3d95f55d 100644 --- a/packages/angular_devkit/core/node/testing/BUILD.bazel +++ b/packages/angular_devkit/core/node/testing/BUILD.bazel @@ -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", ], ) diff --git a/packages/angular_devkit/schematics/BUILD.bazel b/packages/angular_devkit/schematics/BUILD.bazel index 878a20442373..70e7cc247da0 100644 --- a/packages/angular_devkit/schematics/BUILD.bazel +++ b/packages/angular_devkit/schematics/BUILD.bazel @@ -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", ], ) @@ -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", ], ) diff --git a/packages/angular_devkit/schematics/tasks/BUILD.bazel b/packages/angular_devkit/schematics/tasks/BUILD.bazel index 852646d7585f..3027c56b123f 100644 --- a/packages/angular_devkit/schematics/tasks/BUILD.bazel +++ b/packages/angular_devkit/schematics/tasks/BUILD.bazel @@ -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", ], ) diff --git a/packages/angular_devkit/schematics/tasks/node/BUILD.bazel b/packages/angular_devkit/schematics/tasks/node/BUILD.bazel index c6d26d420436..ad190a93adce 100644 --- a/packages/angular_devkit/schematics/tasks/node/BUILD.bazel +++ b/packages/angular_devkit/schematics/tasks/node/BUILD.bazel @@ -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", ], ) diff --git a/packages/angular_devkit/schematics/testing/BUILD.bazel b/packages/angular_devkit/schematics/testing/BUILD.bazel index 3a6e5f898598..b860574c36a4 100644 --- a/packages/angular_devkit/schematics/testing/BUILD.bazel +++ b/packages/angular_devkit/schematics/testing/BUILD.bazel @@ -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", ], diff --git a/packages/angular_devkit/schematics/tools/BUILD.bazel b/packages/angular_devkit/schematics/tools/BUILD.bazel index be7d3e946edf..776d97502840 100644 --- a/packages/angular_devkit/schematics/tools/BUILD.bazel +++ b/packages/angular_devkit/schematics/tools/BUILD.bazel @@ -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", ], @@ -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", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ee57ab9920e9..a7b85632829b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -275,9 +275,6 @@ importers: rollup-plugin-sourcemaps: specifier: ^0.6.0 version: 0.6.3(@types/node@20.17.24)(rollup@4.36.0) - rxjs: - specifier: 7.8.2 - version: 7.8.2 semver: specifier: 7.7.1 version: 7.7.1 @@ -340,6 +337,9 @@ importers: '@angular/ssr': specifier: workspace:* version: link:../../../packages/angular/ssr + rxjs: + specifier: 7.8.2 + version: 7.8.2 packages/angular/build: dependencies: @@ -444,6 +444,9 @@ importers: postcss: specifier: 8.5.3 version: 8.5.3 + rxjs: + specifier: 7.8.2 + version: 7.8.2 packages/angular/cli: dependencies: @@ -885,6 +888,9 @@ importers: '@angular-devkit/schematics': specifier: workspace:* version: link:../packages/angular_devkit/schematics + rxjs: + specifier: 7.8.2 + version: 7.8.2 tree-kill: specifier: 1.2.2 version: 1.2.2 diff --git a/tests/legacy-cli/e2e/utils/BUILD.bazel b/tests/legacy-cli/e2e/utils/BUILD.bazel index 9c7a6c530504..044c1ba409bd 100644 --- a/tests/legacy-cli/e2e/utils/BUILD.bazel +++ b/tests/legacy-cli/e2e/utils/BUILD.bazel @@ -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", ], ) diff --git a/tests/package.json b/tests/package.json index baa0d682413b..4aec9553824b 100644 --- a/tests/package.json +++ b/tests/package.json @@ -1,6 +1,7 @@ { "devDependencies": { "@angular-devkit/schematics": "workspace:*", + "rxjs": "7.8.2", "tree-kill": "1.2.2" } }