Skip to content

Commit 62e90d0

Browse files
devversiondevversion
committed
build: rename //:root_modules to //:node_modules.
This is necessary as `rules_js` requires this "common name" when dealing with Yarn workspaces, linking first party dependencies automatically. In the future, we may be able to send a PR to `rules_js` to support a custom name somehow.
1 parent 84bbfa5 commit 62e90d0

File tree

35 files changed

+342
-344
lines changed

35 files changed

+342
-344
lines changed

‎BUILD.bazel‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,14 @@ exports_files([
2222
"package.json",
2323
])
2424

25-
npm_link_all_packages(
26-
name = "root_modules",
27-
)
25+
npm_link_all_packages()
2826

2927
rules_js_tsconfig(
3028
name = "build-tsconfig",
3129
src = "tsconfig-build.json",
3230
deps = [
3331
"tsconfig.json",
34-
"//:root_modules/@types/node",
32+
"//:node_modules/@types/node",
3533
],
3634
)
3735

@@ -48,8 +46,8 @@ rules_js_tsconfig(
4846
src = "tsconfig-test.json",
4947
deps = [
5048
"tsconfig.json",
51-
"//:root_modules/@types/jasmine",
52-
"//:root_modules/@types/node",
49+
"//:node_modules/@types/jasmine",
50+
"//:node_modules/@types/node",
5351
],
5452
)
5553

‎modules/testing/builder/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ts_project(
1616
),
1717
data = glob(["projects/**/*"]),
1818
deps = [
19-
"//:root_modules/rxjs",
19+
"//:node_modules/rxjs",
2020
"//packages/angular_devkit/architect:architect_rjs",
2121
"//packages/angular_devkit/architect/node:node_rjs",
2222
"//packages/angular_devkit/architect/testing:testing_rjs",

‎packages/angular/build/BUILD.bazel‎

Lines changed: 76 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -61,49 +61,49 @@ ts_project(
6161
data = RUNTIME_ASSETS,
6262
module_name = "@angular/build",
6363
deps = [
64-
"//:root_modules/@ampproject/remapping",
65-
"//:root_modules/@angular/common",
66-
"//:root_modules/@angular/compiler",
67-
"//:root_modules/@angular/compiler-cli",
68-
"//:root_modules/@angular/core",
69-
"//:root_modules/@angular/localize",
70-
"//:root_modules/@angular/platform-server",
71-
"//:root_modules/@angular/service-worker",
72-
"//:root_modules/@babel/core",
73-
"//:root_modules/@babel/helper-annotate-as-pure",
74-
"//:root_modules/@babel/helper-split-export-declaration",
75-
"//:root_modules/@babel/plugin-syntax-import-attributes",
76-
"//:root_modules/@inquirer/confirm",
77-
"//:root_modules/@types/babel__core",
78-
"//:root_modules/@types/less",
79-
"//:root_modules/@types/node",
80-
"//:root_modules/@types/picomatch",
81-
"//:root_modules/@types/semver",
82-
"//:root_modules/@types/watchpack",
83-
"//:root_modules/@vitejs/plugin-basic-ssl",
84-
"//:root_modules/beasties",
85-
"//:root_modules/browserslist",
86-
"//:root_modules/esbuild",
87-
"//:root_modules/esbuild-wasm",
88-
"//:root_modules/fast-glob",
89-
"//:root_modules/https-proxy-agent",
90-
"//:root_modules/jsonc-parser",
91-
"//:root_modules/listr2",
92-
"//:root_modules/lmdb",
93-
"//:root_modules/magic-string",
94-
"//:root_modules/mrmime",
95-
"//:root_modules/ng-packagr",
96-
"//:root_modules/parse5-html-rewriting-stream",
97-
"//:root_modules/picomatch",
98-
"//:root_modules/piscina",
99-
"//:root_modules/postcss",
100-
"//:root_modules/rollup",
101-
"//:root_modules/sass",
102-
"//:root_modules/semver",
103-
"//:root_modules/tslib",
104-
"//:root_modules/typescript",
105-
"//:root_modules/vite",
106-
"//:root_modules/watchpack",
64+
"//:node_modules/@ampproject/remapping",
65+
"//:node_modules/@angular/common",
66+
"//:node_modules/@angular/compiler",
67+
"//:node_modules/@angular/compiler-cli",
68+
"//:node_modules/@angular/core",
69+
"//:node_modules/@angular/localize",
70+
"//:node_modules/@angular/platform-server",
71+
"//:node_modules/@angular/service-worker",
72+
"//:node_modules/@babel/core",
73+
"//:node_modules/@babel/helper-annotate-as-pure",
74+
"//:node_modules/@babel/helper-split-export-declaration",
75+
"//:node_modules/@babel/plugin-syntax-import-attributes",
76+
"//:node_modules/@inquirer/confirm",
77+
"//:node_modules/@types/babel__core",
78+
"//:node_modules/@types/less",
79+
"//:node_modules/@types/node",
80+
"//:node_modules/@types/picomatch",
81+
"//:node_modules/@types/semver",
82+
"//:node_modules/@types/watchpack",
83+
"//:node_modules/@vitejs/plugin-basic-ssl",
84+
"//:node_modules/beasties",
85+
"//:node_modules/browserslist",
86+
"//:node_modules/esbuild",
87+
"//:node_modules/esbuild-wasm",
88+
"//:node_modules/fast-glob",
89+
"//:node_modules/https-proxy-agent",
90+
"//:node_modules/jsonc-parser",
91+
"//:node_modules/listr2",
92+
"//:node_modules/lmdb",
93+
"//:node_modules/magic-string",
94+
"//:node_modules/mrmime",
95+
"//:node_modules/ng-packagr",
96+
"//:node_modules/parse5-html-rewriting-stream",
97+
"//:node_modules/picomatch",
98+
"//:node_modules/piscina",
99+
"//:node_modules/postcss",
100+
"//:node_modules/rollup",
101+
"//:node_modules/sass",
102+
"//:node_modules/semver",
103+
"//:node_modules/tslib",
104+
"//:node_modules/typescript",
105+
"//:node_modules/vite",
106+
"//:node_modules/watchpack",
107107
"//packages/angular/ssr:ssr_rjs",
108108
"//packages/angular/ssr/node:node_rjs",
109109
"//packages/angular_devkit/architect:architect_rjs",
@@ -119,11 +119,11 @@ ts_project(
119119
),
120120
deps = [
121121
":build_rjs",
122-
"//:root_modules/@angular/compiler-cli",
123-
"//:root_modules/@babel/core",
124-
"//:root_modules/@types/jasmine",
125-
"//:root_modules/prettier",
126-
"//:root_modules/typescript",
122+
"//:node_modules/@angular/compiler-cli",
123+
"//:node_modules/@babel/core",
124+
"//:node_modules/@types/jasmine",
125+
"//:node_modules/prettier",
126+
"//:node_modules/typescript",
127127
"//packages/angular/build/private:private_rjs",
128128
"//packages/angular_devkit/core:core_rjs",
129129
"//packages/angular_devkit/core/node:node_rjs",
@@ -150,18 +150,18 @@ ts_project(
150150
"//packages/angular_devkit/core/node:node_rjs",
151151

152152
# Base dependencies for the application in hello-world-app.
153-
"//:root_modules/@angular/common",
154-
"//:root_modules/@angular/compiler",
155-
"//:root_modules/@angular/compiler-cli",
156-
"//:root_modules/@angular/core",
157-
"//:root_modules/@angular/platform-browser",
158-
"//:root_modules/@angular/platform-browser-dynamic",
159-
"//:root_modules/@angular/router",
160-
"//:root_modules/rxjs",
161-
"//:root_modules/tslib",
162-
"//:root_modules/typescript",
163-
"//:root_modules/zone.js",
164-
"//:root_modules/buffer",
153+
"//:node_modules/@angular/common",
154+
"//:node_modules/@angular/compiler",
155+
"//:node_modules/@angular/compiler-cli",
156+
"//:node_modules/@angular/core",
157+
"//:node_modules/@angular/platform-browser",
158+
"//:node_modules/@angular/platform-browser-dynamic",
159+
"//:node_modules/@angular/router",
160+
"//:node_modules/rxjs",
161+
"//:node_modules/tslib",
162+
"//:node_modules/typescript",
163+
"//:node_modules/zone.js",
164+
"//:node_modules/buffer",
165165
],
166166
)
167167

@@ -180,24 +180,24 @@ ts_project(
180180
"//packages/angular_devkit/core/node:node_rjs",
181181

182182
# dev server only test deps
183-
"//:root_modules/@types/http-proxy",
184-
"//:root_modules/http-proxy",
185-
"//:root_modules/puppeteer",
183+
"//:node_modules/@types/http-proxy",
184+
"//:node_modules/http-proxy",
185+
"//:node_modules/puppeteer",
186186

187187
# Base dependencies for the application in hello-world-app.
188-
"//:root_modules/@angular/common",
189-
"//:root_modules/@angular/compiler",
190-
"//:root_modules/@angular/compiler-cli",
191-
"//:root_modules/@angular/core",
192-
"//:root_modules/@angular/platform-browser",
193-
"//:root_modules/@angular/platform-browser-dynamic",
194-
"//:root_modules/@angular/router",
195-
"//:root_modules/ng-packagr",
196-
"//:root_modules/rxjs",
197-
"//:root_modules/tslib",
198-
"//:root_modules/typescript",
199-
"//:root_modules/zone.js",
200-
"//:root_modules/buffer",
188+
"//:node_modules/@angular/common",
189+
"//:node_modules/@angular/compiler",
190+
"//:node_modules/@angular/compiler-cli",
191+
"//:node_modules/@angular/core",
192+
"//:node_modules/@angular/platform-browser",
193+
"//:node_modules/@angular/platform-browser-dynamic",
194+
"//:node_modules/@angular/router",
195+
"//:node_modules/ng-packagr",
196+
"//:node_modules/rxjs",
197+
"//:node_modules/tslib",
198+
"//:node_modules/typescript",
199+
"//:node_modules/zone.js",
200+
"//:node_modules/buffer",
201201
],
202202
)
203203

‎packages/angular/cli/BUILD.bazel‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -43,26 +43,26 @@ ts_project(
4343
data = RUNTIME_ASSETS,
4444
module_name = "@angular/cli",
4545
deps = [
46-
"//:root_modules/@angular/core",
47-
"//:root_modules/@inquirer/prompts",
48-
"//:root_modules/@listr2/prompt-adapter-inquirer",
49-
"//:root_modules/@types/ini",
50-
"//:root_modules/@types/node",
51-
"//:root_modules/@types/npm-package-arg",
52-
"//:root_modules/@types/pacote",
53-
"//:root_modules/@types/resolve",
54-
"//:root_modules/@types/semver",
55-
"//:root_modules/@types/yargs",
56-
"//:root_modules/@types/yarnpkg__lockfile",
57-
"//:root_modules/@yarnpkg/lockfile",
58-
"//:root_modules/ini",
59-
"//:root_modules/jsonc-parser",
60-
"//:root_modules/listr2",
61-
"//:root_modules/npm-package-arg",
62-
"//:root_modules/npm-pick-manifest",
63-
"//:root_modules/pacote",
64-
"//:root_modules/semver",
65-
"//:root_modules/yargs",
46+
"//:node_modules/@angular/core",
47+
"//:node_modules/@inquirer/prompts",
48+
"//:node_modules/@listr2/prompt-adapter-inquirer",
49+
"//:node_modules/@types/ini",
50+
"//:node_modules/@types/node",
51+
"//:node_modules/@types/npm-package-arg",
52+
"//:node_modules/@types/pacote",
53+
"//:node_modules/@types/resolve",
54+
"//:node_modules/@types/semver",
55+
"//:node_modules/@types/yargs",
56+
"//:node_modules/@types/yarnpkg__lockfile",
57+
"//:node_modules/@yarnpkg/lockfile",
58+
"//:node_modules/ini",
59+
"//:node_modules/jsonc-parser",
60+
"//:node_modules/listr2",
61+
"//:node_modules/npm-package-arg",
62+
"//:node_modules/npm-pick-manifest",
63+
"//:node_modules/pacote",
64+
"//:node_modules/semver",
65+
"//:node_modules/yargs",
6666
"//packages/angular_devkit/architect:architect_rjs",
6767
"//packages/angular_devkit/architect/node:node_rjs",
6868
"//packages/angular_devkit/core:core_rjs",
@@ -140,8 +140,8 @@ ts_project(
140140
),
141141
deps = [
142142
":angular-cli_rjs",
143-
"//:root_modules/@types/semver",
144-
"//:root_modules/@types/yargs",
143+
"//:node_modules/@types/semver",
144+
"//:node_modules/@types/yargs",
145145
"//packages/angular_devkit/core:core_rjs",
146146
"//packages/angular_devkit/schematics:schematics_rjs",
147147
"//packages/angular_devkit/schematics/testing:testing_rjs",

‎packages/angular/create/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ts_project(
2424
data = RUNTIME_ASSETS,
2525
module_name = "@angular/create",
2626
deps = [
27-
"//:root_modules/@types/node",
27+
"//:node_modules/@types/node",
2828
"//packages/angular/cli:angular-cli",
2929
],
3030
)

‎packages/angular/pwa/BUILD.bazel‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ ts_project(
3232
data = RUNTIME_ASSETS,
3333
module_name = "@angular/pwa",
3434
deps = [
35-
"//:root_modules/@types/node",
36-
"//:root_modules/parse5-html-rewriting-stream",
35+
"//:node_modules/@types/node",
36+
"//:node_modules/parse5-html-rewriting-stream",
3737
"//packages/angular_devkit/schematics:schematics_rjs",
3838
"//packages/schematics/angular:angular_rjs",
3939
],
@@ -50,7 +50,7 @@ ts_project(
5050
srcs = glob(["pwa/**/*_spec.ts"]),
5151
deps = [
5252
":pwa_rjs",
53-
"//:root_modules/@types/jasmine",
53+
"//:node_modules/@types/jasmine",
5454
"//packages/angular_devkit/schematics/testing:testing_rjs",
5555
],
5656
)

‎packages/angular/ssr/BUILD.bazel‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ ts_project(
2727
source_map = True,
2828
tsconfig = "//:build-tsconfig-angular",
2929
deps = [
30-
"//:root_modules/@angular/common",
31-
"//:root_modules/@angular/core",
32-
"//:root_modules/@angular/platform-server",
33-
"//:root_modules/@angular/router",
34-
"//:root_modules/tslib",
30+
"//:node_modules/@angular/common",
31+
"//:node_modules/@angular/core",
32+
"//:node_modules/@angular/platform-server",
33+
"//:node_modules/@angular/router",
34+
"//:node_modules/tslib",
3535
"//packages/angular/ssr/third_party/beasties:beasties_dts",
3636
],
3737
)

‎packages/angular/ssr/node/BUILD.bazel‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ ts_project(
1818
source_map = True,
1919
tsconfig = "//:build-tsconfig-angular",
2020
deps = [
21-
"//:root_modules/@angular/core",
22-
"//:root_modules/@angular/platform-server",
23-
"//:root_modules/@types/node",
21+
"//:node_modules/@angular/core",
22+
"//:node_modules/@angular/platform-server",
23+
"//:node_modules/@types/node",
2424
"//packages/angular/ssr:ssr_rjs",
2525
],
2626
)

‎packages/angular/ssr/test/BUILD.bazel‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ ts_project(
99
include = ["**/*.ts"],
1010
),
1111
deps = [
12-
"//:root_modules/@angular/common",
13-
"//:root_modules/@angular/compiler",
14-
"//:root_modules/@angular/core",
15-
"//:root_modules/@angular/platform-browser",
16-
"//:root_modules/@angular/platform-server",
17-
"//:root_modules/@angular/router",
12+
"//:node_modules/@angular/common",
13+
"//:node_modules/@angular/compiler",
14+
"//:node_modules/@angular/core",
15+
"//:node_modules/@angular/platform-browser",
16+
"//:node_modules/@angular/platform-server",
17+
"//:node_modules/@angular/router",
1818
"//packages/angular/ssr:ssr_rjs",
1919
],
2020
)

‎packages/angular/ssr/test/npm_package/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ts_project(
88
testonly = True,
99
srcs = glob(["**/*.ts"]),
1010
deps = [
11-
"//:root_modules/@bazel/runfiles",
11+
"//:node_modules/@bazel/runfiles",
1212
],
1313
)
1414

0 commit comments

Comments
 (0)