Skip to content

Commit e07491e

Browse files
committed
build: move devkit core 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-devkit/core` specific dependencies have now been moved. This is not exhaustive and further changes will continue to move additional dependencies.
1 parent e774476 commit e07491e

File tree

12 files changed

+30
-42
lines changed

12 files changed

+30
-42
lines changed

package.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,13 +105,11 @@
105105
"@typescript-eslint/parser": "8.26.1",
106106
"@web/test-runner": "^0.20.0",
107107
"ajv": "8.17.1",
108-
"ajv-formats": "3.0.1",
109108
"ansi-colors": "4.1.3",
110109
"beasties": "0.2.0",
111110
"browser-sync": "3.0.3",
112111
"browserslist": "^4.21.5",
113112
"buffer": "6.0.3",
114-
"chokidar": "4.0.3",
115113
"esbuild": "0.25.1",
116114
"esbuild-wasm": "0.25.1",
117115
"eslint": "9.22.0",
@@ -130,7 +128,6 @@
130128
"jasmine-core": "~5.6.0",
131129
"jasmine-reporters": "^2.5.2",
132130
"jasmine-spec-reporter": "~7.0.0",
133-
"jsonc-parser": "3.3.1",
134131
"karma": "~6.4.0",
135132
"karma-chrome-launcher": "~3.2.0",
136133
"karma-coverage": "~2.2.0",
@@ -148,7 +145,6 @@
148145
"open": "10.1.0",
149146
"ora": "5.4.1",
150147
"parse5-html-rewriting-stream": "7.0.0",
151-
"picomatch": "4.0.2",
152148
"piscina": "4.9.0",
153149
"postcss": "8.5.3",
154150
"prettier": "^3.0.0",
@@ -162,7 +158,6 @@
162158
"sass": "1.85.1",
163159
"semver": "7.7.1",
164160
"shelljs": "^0.9.0",
165-
"source-map": "0.7.4",
166161
"source-map-support": "0.5.21",
167162
"symbol-observable": "4.0.0",
168163
"tar": "^7.0.0",

packages/angular/build/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ ts_project(
7979
":node_modules/@angular/ssr",
8080
":node_modules/@inquirer/confirm",
8181
":node_modules/@vitejs/plugin-basic-ssl",
82+
":node_modules/jsonc-parser",
83+
":node_modules/picomatch",
8284
":node_modules/vite",
8385
"//:node_modules/@ampproject/remapping",
8486
"//:node_modules/@angular/common",
@@ -105,7 +107,6 @@ ts_project(
105107
"//:node_modules/esbuild-wasm",
106108
"//:node_modules/https-proxy-agent",
107109
"//:node_modules/istanbul-lib-instrument",
108-
"//:node_modules/jsonc-parser",
109110
"//:node_modules/karma",
110111
"//:node_modules/less",
111112
"//:node_modules/listr2",
@@ -114,7 +115,6 @@ ts_project(
114115
"//:node_modules/mrmime",
115116
"//:node_modules/ng-packagr",
116117
"//:node_modules/parse5-html-rewriting-stream",
117-
"//:node_modules/picomatch",
118118
"//:node_modules/piscina",
119119
"//:node_modules/postcss",
120120
"//:node_modules/rollup",

packages/angular/build/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
"esbuild": "0.25.1",
3232
"https-proxy-agent": "7.0.6",
3333
"istanbul-lib-instrument": "6.0.3",
34+
"jsonc-parser": "3.3.1",
3435
"listr2": "8.2.5",
3536
"magic-string": "0.30.17",
3637
"mrmime": "2.0.1",

packages/angular/cli/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ ts_project(
5252
":node_modules/@listr2/prompt-adapter-inquirer",
5353
":node_modules/@yarnpkg/lockfile",
5454
":node_modules/ini",
55+
":node_modules/jsonc-parser",
5556
":node_modules/npm-package-arg",
5657
":node_modules/npm-pick-manifest",
5758
":node_modules/pacote",
@@ -66,7 +67,6 @@ ts_project(
6667
"//:node_modules/@types/semver",
6768
"//:node_modules/@types/yargs",
6869
"//:node_modules/@types/yarnpkg__lockfile",
69-
"//:node_modules/jsonc-parser",
7070
"//:node_modules/listr2",
7171
"//:node_modules/semver",
7272
"//:node_modules/symbol-observable",

packages/angular_devkit/build_angular/BUILD.bazel

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,11 +141,11 @@ ts_project(
141141
":node_modules/@babel/runtime",
142142
":node_modules/@discoveryjs/json-ext",
143143
":node_modules/@ngtools/webpack",
144-
":node_modules/@vitejs/plugin-basic-ssl",
145144
":node_modules/autoprefixer",
146145
":node_modules/babel-loader",
147146
":node_modules/copy-webpack-plugin",
148147
":node_modules/css-loader",
148+
":node_modules/jsonc-parser",
149149
":node_modules/less",
150150
":node_modules/less-loader",
151151
":node_modules/license-webpack-plugin",
@@ -183,7 +183,6 @@ ts_project(
183183
"//:node_modules/@types/semver",
184184
"//:node_modules/@types/watchpack",
185185
"//:node_modules/@web/test-runner",
186-
"//:node_modules/ajv",
187186
"//:node_modules/ansi-colors",
188187
"//:node_modules/browser-sync",
189188
"//:node_modules/browserslist",
@@ -192,7 +191,6 @@ ts_project(
192191
"//:node_modules/fast-glob",
193192
"//:node_modules/http-proxy-middleware",
194193
"//:node_modules/istanbul-lib-instrument",
195-
"//:node_modules/jsonc-parser",
196194
"//:node_modules/karma",
197195
"//:node_modules/karma-source-map-support",
198196
"//:node_modules/ng-packagr",
@@ -365,6 +363,7 @@ LARGE_SPECS = {
365363
"//:node_modules/@types/node",
366364
"//:node_modules/@angular/animations",
367365
"//:node_modules/@angular/material",
366+
"//:node_modules/ajv",
368367
],
369368
},
370369
"prerender": {},

packages/angular_devkit/core/BUILD.bazel

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
load("@devinfra//bazel/api-golden:index_rjs.bzl", "api_golden_test_npm_package")
2+
load("@npm2//:defs.bzl", "npm_link_all_packages")
23
load("//tools:defaults2.bzl", "jasmine_test", "npm_package", "ts_project")
34

45
# Copyright Google Inc. All Rights Reserved.
@@ -9,6 +10,8 @@ package(default_visibility = ["//visibility:public"])
910

1011
licenses(["notice"])
1112

13+
npm_link_all_packages()
14+
1215
RUNTIME_ASSETS = glob(
1316
include = ["**/*.json"],
1417
# NB: we need to exclude the nested node_modules that is laid out by yarn workspaces
@@ -29,19 +32,15 @@ ts_project(
2932
data = RUNTIME_ASSETS,
3033
module_name = "@angular-devkit/core",
3134
deps = [
35+
":node_modules/ajv",
36+
":node_modules/ajv-formats",
37+
":node_modules/jsonc-parser",
38+
":node_modules/picomatch",
39+
":node_modules/source-map",
40+
"//:node_modules/@types/jasmine",
3241
"//:node_modules/@types/node",
3342
"//:node_modules/@types/picomatch",
34-
"//:node_modules/@types/jasmine",
35-
"//:node_modules/ajv",
36-
"//:node_modules/ajv-formats",
37-
"//:node_modules/jsonc-parser",
38-
"//:node_modules/picomatch",
3943
"//:node_modules/rxjs",
40-
"//:node_modules/source-map",
41-
# @node_module: typescript:es2015.proxy
42-
# @node_module: typescript:es2015.reflect
43-
# @node_module: typescript:es2015.symbol.wellknown
44-
# @typings: source_map
4544
],
4645
)
4746

packages/angular_devkit/core/node/BUILD.bazel

Lines changed: 1 addition & 1 deletion
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/chokidar",
2524
"//:node_modules/rxjs",
2625
"//packages/angular_devkit/core",
26+
"//packages/angular_devkit/core:node_modules/chokidar",
2727
],
2828
)
2929

packages/angular_devkit/core/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@
3232
"rxjs": "7.8.2",
3333
"source-map": "0.7.4"
3434
},
35+
"devDependencies": {
36+
"chokidar": "4.0.3"
37+
},
3538
"peerDependencies": {
3639
"chokidar": "^4.0.0"
3740
},

packages/angular_devkit/schematics/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ ts_project(
2828
module_name = "@angular-devkit/schematics",
2929
deps = [
3030
":node_modules/@angular-devkit/core",
31+
":node_modules/jsonc-parser",
3132
"//:node_modules/@types/node",
32-
"//:node_modules/jsonc-parser",
3333
"//:node_modules/magic-string",
3434
"//:node_modules/rxjs",
3535
],

packages/angular_devkit/schematics/tools/BUILD.bazel

Lines changed: 1 addition & 1 deletion
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/jsonc-parser",
2524
"//:node_modules/rxjs",
2625
"//packages/angular_devkit/schematics",
2726
"//packages/angular_devkit/schematics:node_modules/@angular-devkit/core",
27+
"//packages/angular_devkit/schematics:node_modules/jsonc-parser",
2828
"//packages/angular_devkit/schematics/tasks",
2929
"//packages/angular_devkit/schematics/tasks/node",
3030
],

packages/schematics/angular/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@ ts_project(
9090
deps = [
9191
":node_modules/@angular-devkit/core",
9292
":node_modules/@angular-devkit/schematics",
93+
":node_modules/jsonc-parser",
9394
"//:node_modules/@types/node",
9495
"//:node_modules/browserslist",
95-
"//:node_modules/jsonc-parser",
9696
"//packages/schematics/angular/third_party/github.com/Microsoft/TypeScript",
9797
],
9898
)
@@ -123,9 +123,9 @@ ts_project(
123123
":angular",
124124
":node_modules/@angular-devkit/core",
125125
":node_modules/@angular-devkit/schematics",
126+
":node_modules/jsonc-parser",
126127
"//:node_modules/@types/jasmine",
127128
"//:node_modules/@types/node",
128-
"//:node_modules/jsonc-parser",
129129
"//packages/schematics/angular/third_party/github.com/Microsoft/TypeScript",
130130
],
131131
)

pnpm-lock.yaml

Lines changed: 7 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)