From 766593cda8026801045d9cf77ee033eeb478bfcb Mon Sep 17 00:00:00 2001 From: Charles Lyding <19598772+clydin@users.noreply.github.com> Date: Mon, 17 Mar 2025 20:37:19 -0400 Subject: [PATCH] build: move `@angular/build` specific dependencies 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. Most of the `@angular/build` specific dependencies have now been moved. This is not exhaustive and further changes will continue to move additional dependencies. --- package.json | 12 ---- packages/angular/build/BUILD.bazel | 30 ++++----- packages/angular/build/package.json | 5 +- packages/angular/pwa/BUILD.bazel | 2 +- .../angular_devkit/build_angular/BUILD.bazel | 12 ++-- .../angular_devkit/build_angular/package.json | 5 +- .../angular_devkit/schematics/BUILD.bazel | 2 +- pnpm-lock.yaml | 63 +++++++------------ 8 files changed, 53 insertions(+), 78 deletions(-) diff --git a/package.json b/package.json index 3ab29836476d..82a6fd460c8f 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,6 @@ }, "homepage": "https://github.com/angular/angular-cli", "devDependencies": { - "@ampproject/remapping": "2.3.0", "@angular/animations": "20.0.0-next.2", "@angular/cdk": "20.0.0-next.1", "@angular/common": "20.0.0-next.2", @@ -134,19 +133,11 @@ "karma-jasmine": "~5.1.0", "karma-jasmine-html-reporter": "~2.1.0", "karma-source-map-support": "1.4.0", - "less": "4.2.2", "listr2": "8.2.5", - "lmdb": "3.2.6", "lodash": "^4.17.21", - "magic-string": "0.30.17", - "mrmime": "2.0.1", - "ng-packagr": "20.0.0-next.1", "npm": "^11.0.0", "open": "10.1.0", "ora": "5.4.1", - "parse5-html-rewriting-stream": "7.0.0", - "piscina": "4.9.0", - "postcss": "8.5.3", "prettier": "^3.0.0", "protractor": "~7.0.0", "puppeteer": "18.2.1", @@ -155,13 +146,11 @@ "rollup-license-plugin": "~3.0.1", "rollup-plugin-sourcemaps": "^0.6.0", "rxjs": "7.8.2", - "sass": "1.85.1", "semver": "7.7.1", "shelljs": "^0.9.0", "source-map-support": "0.5.21", "symbol-observable": "4.0.0", "tar": "^7.0.0", - "tinyglobby": "0.2.12", "tree-kill": "1.2.2", "ts-node": "^10.9.1", "tslib": "2.8.1", @@ -170,7 +159,6 @@ "unenv": "^1.10.0", "verdaccio": "6.0.5", "verdaccio-auth-memory": "^10.0.0", - "watchpack": "2.4.2", "yargs-parser": "21.1.1", "zone.js": "^0.15.0" }, diff --git a/packages/angular/build/BUILD.bazel b/packages/angular/build/BUILD.bazel index 624e8c31dc35..360a934950d2 100644 --- a/packages/angular/build/BUILD.bazel +++ b/packages/angular/build/BUILD.bazel @@ -74,15 +74,28 @@ ts_project( data = RUNTIME_ASSETS, module_name = "@angular/build", deps = [ + ":node_modules/@ampproject/remapping", ":node_modules/@angular-devkit/architect", ":node_modules/@angular-devkit/core", ":node_modules/@angular/ssr", ":node_modules/@inquirer/confirm", ":node_modules/@vitejs/plugin-basic-ssl", ":node_modules/jsonc-parser", + ":node_modules/less", + ":node_modules/listr2", + ":node_modules/lmdb", + ":node_modules/magic-string", + ":node_modules/mrmime", + ":node_modules/ng-packagr", + ":node_modules/parse5-html-rewriting-stream", ":node_modules/picomatch", + ":node_modules/piscina", + ":node_modules/postcss", + ":node_modules/sass", + ":node_modules/source-map-support", + ":node_modules/tinyglobby", ":node_modules/vite", - "//:node_modules/@ampproject/remapping", + ":node_modules/watchpack", "//:node_modules/@angular/common", "//:node_modules/@angular/compiler", "//:node_modules/@angular/compiler-cli", @@ -108,23 +121,10 @@ ts_project( "//:node_modules/https-proxy-agent", "//:node_modules/istanbul-lib-instrument", "//:node_modules/karma", - "//:node_modules/less", - "//:node_modules/listr2", - "//:node_modules/lmdb", - "//:node_modules/magic-string", - "//:node_modules/mrmime", - "//:node_modules/ng-packagr", - "//:node_modules/parse5-html-rewriting-stream", - "//:node_modules/piscina", - "//:node_modules/postcss", "//:node_modules/rollup", - "//:node_modules/sass", "//:node_modules/semver", - "//:node_modules/source-map-support", - "//:node_modules/tinyglobby", "//:node_modules/tslib", "//:node_modules/typescript", - "//:node_modules/watchpack", ], ) @@ -204,7 +204,7 @@ ts_project( "//:node_modules/@angular/platform-browser", "//:node_modules/@angular/platform-browser-dynamic", "//:node_modules/@angular/router", - "//:node_modules/ng-packagr", + ":node_modules/ng-packagr", "//:node_modules/rxjs", "//:node_modules/tslib", "//:node_modules/typescript", diff --git a/packages/angular/build/package.json b/packages/angular/build/package.json index 77a5743eaa84..24b7b13b7fdf 100644 --- a/packages/angular/build/package.json +++ b/packages/angular/build/package.json @@ -51,7 +51,10 @@ }, "devDependencies": { "@angular/ssr": "workspace:*", - "@angular-devkit/core": "workspace:*" + "@angular-devkit/core": "workspace:*", + "less": "4.2.2", + "ng-packagr": "20.0.0-next.1", + "postcss": "8.5.3" }, "peerDependencies": { "@angular/compiler": "0.0.0-ANGULAR-FW-PEER-DEP", diff --git a/packages/angular/pwa/BUILD.bazel b/packages/angular/pwa/BUILD.bazel index 1e0355fe015c..ae0131acbb1f 100644 --- a/packages/angular/pwa/BUILD.bazel +++ b/packages/angular/pwa/BUILD.bazel @@ -36,8 +36,8 @@ ts_project( deps = [ ":node_modules/@angular-devkit/schematics", ":node_modules/@schematics/angular", + ":node_modules/parse5-html-rewriting-stream", "//:node_modules/@types/node", - "//:node_modules/parse5-html-rewriting-stream", ], ) diff --git a/packages/angular_devkit/build_angular/BUILD.bazel b/packages/angular_devkit/build_angular/BUILD.bazel index 55548ff4b108..7297a03b4264 100644 --- a/packages/angular_devkit/build_angular/BUILD.bazel +++ b/packages/angular_devkit/build_angular/BUILD.bazel @@ -129,6 +129,7 @@ ts_project( data = RUNTIME_ASSETS, module_name = "@angular-devkit/build-angular", deps = [ + ":node_modules/@ampproject/remapping", ":node_modules/@angular-devkit/architect", ":node_modules/@angular-devkit/build-webpack", ":node_modules/@angular-devkit/core", @@ -151,17 +152,21 @@ ts_project( ":node_modules/license-webpack-plugin", ":node_modules/loader-utils", ":node_modules/mini-css-extract-plugin", + ":node_modules/ng-packagr", + ":node_modules/piscina", + ":node_modules/postcss", ":node_modules/postcss-loader", ":node_modules/resolve-url-loader", + ":node_modules/sass", ":node_modules/sass-loader", ":node_modules/source-map-loader", + ":node_modules/source-map-support", ":node_modules/terser", ":node_modules/webpack", ":node_modules/webpack-dev-middleware", ":node_modules/webpack-dev-server", ":node_modules/webpack-merge", ":node_modules/webpack-subresource-integrity", - "//:node_modules/@ampproject/remapping", "//:node_modules/@angular/common", "//:node_modules/@angular/compiler-cli", "//:node_modules/@angular/core", @@ -193,15 +198,10 @@ ts_project( "//:node_modules/istanbul-lib-instrument", "//:node_modules/karma", "//:node_modules/karma-source-map-support", - "//:node_modules/ng-packagr", "//:node_modules/open", "//:node_modules/ora", - "//:node_modules/piscina", - "//:node_modules/postcss", "//:node_modules/rxjs", - "//:node_modules/sass", "//:node_modules/semver", - "//:node_modules/source-map-support", "//:node_modules/tree-kill", "//:node_modules/tslib", "//:node_modules/typescript", diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json index 573444d7c74e..897256b6876f 100644 --- a/packages/angular_devkit/build_angular/package.json +++ b/packages/angular_devkit/build_angular/package.json @@ -66,8 +66,9 @@ "esbuild": "0.25.1" }, "devDependencies": { - "undici": "7.5.0", - "@angular/ssr": "workspace:*" + "@angular/ssr": "workspace:*", + "ng-packagr": "20.0.0-next.1", + "undici": "7.5.0" }, "peerDependencies": { "@angular/compiler-cli": "0.0.0-ANGULAR-FW-PEER-DEP", diff --git a/packages/angular_devkit/schematics/BUILD.bazel b/packages/angular_devkit/schematics/BUILD.bazel index 43ea9318f7bb..878a20442373 100644 --- a/packages/angular_devkit/schematics/BUILD.bazel +++ b/packages/angular_devkit/schematics/BUILD.bazel @@ -29,8 +29,8 @@ ts_project( deps = [ ":node_modules/@angular-devkit/core", ":node_modules/jsonc-parser", + ":node_modules/magic-string", "//:node_modules/@types/node", - "//:node_modules/magic-string", "//:node_modules/rxjs", ], ) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e815d7c1df5b..0159672ca741 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -14,9 +14,6 @@ importers: .: devDependencies: - '@ampproject/remapping': - specifier: 2.3.0 - version: 2.3.0 '@angular/animations': specifier: 20.0.0-next.2 version: 20.0.0-next.2(@angular/core@20.0.0-next.2) @@ -278,27 +275,12 @@ importers: karma-source-map-support: specifier: 1.4.0 version: 1.4.0 - less: - specifier: 4.2.2 - version: 4.2.2 listr2: specifier: 8.2.5 version: 8.2.5 - lmdb: - specifier: 3.2.6 - version: 3.2.6 lodash: specifier: ^4.17.21 version: 4.17.21 - magic-string: - specifier: 0.30.17 - version: 0.30.17 - mrmime: - specifier: 2.0.1 - version: 2.0.1 - ng-packagr: - specifier: 20.0.0-next.1 - version: 20.0.0-next.1(@angular/compiler-cli@20.0.0-next.2(@angular/compiler@20.0.0-next.2)(typescript@5.8.2))(tslib@2.8.1)(typescript@5.8.2) npm: specifier: ^11.0.0 version: 11.2.0 @@ -308,15 +290,6 @@ importers: ora: specifier: 5.4.1 version: 5.4.1 - parse5-html-rewriting-stream: - specifier: 7.0.0 - version: 7.0.0 - piscina: - specifier: 4.9.0 - version: 4.9.0 - postcss: - specifier: 8.5.3 - version: 8.5.3 prettier: specifier: ^3.0.0 version: 3.5.3 @@ -341,9 +314,6 @@ importers: rxjs: specifier: 7.8.2 version: 7.8.2 - sass: - specifier: 1.85.1 - version: 1.85.1 semver: specifier: 7.7.1 version: 7.7.1 @@ -359,9 +329,6 @@ importers: tar: specifier: ^7.0.0 version: 7.4.3 - tinyglobby: - specifier: 0.2.12 - version: 0.2.12 tree-kill: specifier: 1.2.2 version: 1.2.2 @@ -386,9 +353,6 @@ importers: verdaccio-auth-memory: specifier: ^10.0.0 version: 10.2.2 - watchpack: - specifier: 2.4.2 - version: 2.4.2 yargs-parser: specifier: 21.1.1 version: 21.1.1 @@ -510,6 +474,15 @@ importers: '@angular/ssr': specifier: workspace:* version: link:../ssr + less: + specifier: 4.2.2 + version: 4.2.2 + ng-packagr: + specifier: 20.0.0-next.1 + version: 20.0.0-next.1(@angular/compiler-cli@20.0.0-next.2(@angular/compiler@20.0.0-next.2)(typescript@5.8.2))(tslib@2.8.1)(typescript@5.8.2) + postcss: + specifier: 8.5.3 + version: 8.5.3 packages/angular/cli: dependencies: @@ -817,6 +790,9 @@ importers: '@angular/ssr': specifier: workspace:* version: link:../../angular/ssr + ng-packagr: + specifier: 20.0.0-next.1 + version: 20.0.0-next.1(@angular/compiler-cli@20.0.0-next.2(@angular/compiler@20.0.0-next.2)(typescript@5.8.2))(tslib@2.8.1)(typescript@5.8.2) undici: specifier: 7.5.0 version: 7.5.0 @@ -11636,7 +11612,8 @@ snapshots: detect-libc@1.0.3: optional: true - detect-libc@2.0.3: {} + detect-libc@2.0.3: + optional: true detect-node@2.1.0: {} @@ -13457,6 +13434,7 @@ snapshots: '@lmdb/lmdb-linux-arm64': 3.2.6 '@lmdb/lmdb-linux-x64': 3.2.6 '@lmdb/lmdb-win32-x64': 3.2.6 + optional: true loader-runner@4.3.0: {} @@ -13737,6 +13715,7 @@ snapshots: msgpackr@1.11.2: optionalDependencies: msgpackr-extract: 3.0.3 + optional: true multicast-dns@7.2.5: dependencies: @@ -13799,7 +13778,8 @@ snapshots: nice-try@1.0.5: {} - node-addon-api@6.1.0: {} + node-addon-api@6.1.0: + optional: true node-addon-api@7.1.1: optional: true @@ -13831,6 +13811,7 @@ snapshots: node-gyp-build-optional-packages@5.2.2: dependencies: detect-libc: 2.0.3 + optional: true node-gyp@11.1.0: dependencies: @@ -14017,7 +13998,8 @@ snapshots: strip-ansi: 6.0.1 wcwidth: 1.0.1 - ordered-binary@1.5.3: {} + ordered-binary@1.5.3: + optional: true os-tmpdir@1.0.2: {} @@ -15773,7 +15755,8 @@ snapshots: dependencies: defaults: 1.0.4 - weak-lru-cache@1.2.2: {} + weak-lru-cache@1.2.2: + optional: true web-streams-polyfill@3.3.3: {}