Skip to content

Commit 0412c53

Browse files
devversionalan-agius4
devversion
authored and
alan-agius4
committed
build: never use interop targets for ts compilations
* Removes `interop_deps` from the `ts_project` interop macro. * Keeps `_rjs` suffix for now as we still need the interop targets for e.g. `jasmine_node_test` and the `rules_nodejs` linker. In follow-ups we can remove the suffix, and interop layer. (cherry picked from commit a8335cf)
1 parent 8140c93 commit 0412c53

File tree

20 files changed

+84
-184
lines changed

20 files changed

+84
-184
lines changed

‎packages/angular/build/BUILD.bazel‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,6 @@ ts_project(
5858
"builders.json",
5959
"package.json",
6060
],
61-
interop_deps = [
62-
"//packages/angular/ssr",
63-
"//packages/angular/ssr/node",
64-
"//packages/angular_devkit/architect",
65-
],
6661
module_name = "@angular/build",
6762
deps = [
6863
"//:root_modules/@ampproject/remapping",
@@ -108,6 +103,9 @@ ts_project(
108103
"//:root_modules/typescript",
109104
"//:root_modules/vite",
110105
"//:root_modules/watchpack",
106+
"//packages/angular/ssr:ssr_rjs",
107+
"//packages/angular/ssr/node:node_rjs",
108+
"//packages/angular_devkit/architect:architect_rjs",
111109
],
112110
)
113111

‎packages/angular/cli/BUILD.bazel‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,6 @@ ts_project(
4040
) + [
4141
"//packages/angular/cli:lib/config/schema.json",
4242
],
43-
interop_deps = [
44-
"//packages/angular_devkit/schematics",
45-
"//packages/angular_devkit/schematics/tasks",
46-
"//packages/angular_devkit/schematics/tools",
47-
],
4843
module_name = "@angular/cli",
4944
deps = [
5045
"//:root_modules/@angular/core",
@@ -71,6 +66,9 @@ ts_project(
7166
"//packages/angular_devkit/architect/node:node_rjs",
7267
"//packages/angular_devkit/core:core_rjs",
7368
"//packages/angular_devkit/core/node:node_rjs",
69+
"//packages/angular_devkit/schematics:schematics_rjs",
70+
"//packages/angular_devkit/schematics/tasks:tasks_rjs",
71+
"//packages/angular_devkit/schematics/tools:tools_rjs",
7472
],
7573
)
7674

@@ -139,15 +137,13 @@ ts_project(
139137
"node_modules/**",
140138
],
141139
),
142-
interop_deps = [
143-
"//packages/angular_devkit/schematics",
144-
"//packages/angular_devkit/schematics/testing",
145-
],
146140
deps = [
147141
":angular-cli_rjs",
148142
"//:root_modules/@types/semver",
149143
"//:root_modules/@types/yargs",
150144
"//packages/angular_devkit/core:core_rjs",
145+
"//packages/angular_devkit/schematics:schematics_rjs",
146+
"//packages/angular_devkit/schematics/testing:testing_rjs",
151147
],
152148
)
153149

‎packages/angular/pwa/BUILD.bazel‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,11 @@ ts_project(
2626
"pwa/files/**/*",
2727
],
2828
),
29-
interop_deps = [
30-
"//packages/angular_devkit/schematics",
31-
],
3229
module_name = "@angular/pwa",
3330
deps = [
3431
"//:root_modules/@types/node",
3532
"//:root_modules/parse5-html-rewriting-stream",
33+
"//packages/angular_devkit/schematics:schematics_rjs",
3634
"//packages/schematics/angular:angular_rjs",
3735
],
3836
)
@@ -46,12 +44,10 @@ ts_project(
4644
name = "pwa_test_lib",
4745
testonly = True,
4846
srcs = glob(["pwa/**/*_spec.ts"]),
49-
interop_deps = [
50-
"//packages/angular_devkit/schematics/testing",
51-
],
5247
deps = [
5348
":pwa_rjs",
5449
"//:root_modules/@types/jasmine",
50+
"//packages/angular_devkit/schematics/testing:testing_rjs",
5551
],
5652
)
5753

‎packages/angular_devkit/architect/BUILD.bazel‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,29 +64,25 @@ ts_project(
6464
"node_modules/**",
6565
],
6666
),
67-
interop_deps = [
68-
"//packages/angular_devkit/core",
69-
"//packages/angular_devkit/core/node",
70-
],
7167
module_name = "@angular-devkit/architect",
7268
deps = [
7369
"//:root_modules/@types/node",
7470
"//:root_modules/rxjs",
71+
"//packages/angular_devkit/core:core_rjs",
72+
"//packages/angular_devkit/core/node:node_rjs",
7573
],
7674
)
7775

7876
ts_project(
7977
name = "architect_test_lib",
8078
testonly = True,
8179
srcs = glob(["src/**/*_spec.ts"]),
82-
interop_deps = [
83-
"//packages/angular_devkit/core",
84-
],
8580
deps = [
8681
":architect_rjs",
8782
"//:root_modules/@types/jasmine",
8883
"//:root_modules/rxjs",
8984
"//packages/angular_devkit/architect/testing:testing_rjs",
85+
"//packages/angular_devkit/core:core_rjs",
9086
],
9187
)
9288

‎packages/angular_devkit/architect/node/BUILD.bazel‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,13 @@ ts_project(
1616
include = ["**/*.ts"],
1717
exclude = ["**/*_spec.ts"],
1818
),
19-
interop_deps = [
20-
"//packages/angular_devkit/core",
21-
"//packages/angular_devkit/core/node",
22-
],
2319
module_name = "@angular-devkit/architect/node",
2420
deps = [
2521
"//:root_modules/@types/node",
2622
"//:root_modules/rxjs",
2723
"//packages/angular_devkit/architect:architect_rjs",
24+
"//packages/angular_devkit/core:core_rjs",
25+
"//packages/angular_devkit/core/node:node_rjs",
2826
],
2927
)
3028

@@ -36,14 +34,12 @@ ts_project(
3634
"**/*_spec.ts",
3735
],
3836
),
39-
interop_deps = [
40-
"//tests/angular_devkit/architect/node/jobs:jobs_test_lib",
41-
],
4237
deps = [
4338
":node_rjs",
4439
"//:root_modules/@types/jasmine",
4540
"//:root_modules/rxjs",
4641
"//packages/angular_devkit/architect:architect_rjs",
42+
"//tests/angular_devkit/architect/node/jobs:jobs_test_lib_rjs",
4743
],
4844
)
4945

‎packages/angular_devkit/architect/testing/BUILD.bazel‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,12 @@ ts_project(
1515
include = ["**/*.ts"],
1616
exclude = ["**/*_spec.ts"],
1717
),
18-
interop_deps = [
19-
"//packages/angular_devkit/architect",
20-
"//packages/angular_devkit/core",
21-
"//packages/angular_devkit/core/node",
22-
],
2318
module_name = "@angular-devkit/architect/testing",
2419
deps = [
2520
"//:root_modules/@types/node",
2621
"//:root_modules/rxjs",
22+
"//packages/angular_devkit/architect:architect_rjs",
23+
"//packages/angular_devkit/core:core_rjs",
24+
"//packages/angular_devkit/core/node:node_rjs",
2725
],
2826
)

‎packages/angular_devkit/architect_cli/BUILD.bazel‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ ts_project(
1414
srcs = [
1515
"bin/architect.ts",
1616
] + glob(["src/**/*.ts"]),
17-
interop_deps = [
18-
"//packages/angular_devkit/core",
19-
"//packages/angular_devkit/core/node",
20-
],
2117
module_name = "@angular-devkit/architect-cli",
2218
deps = [
2319
"//:root_modules/@types/node",
@@ -26,6 +22,8 @@ ts_project(
2622
"//:root_modules/ansi-colors",
2723
"//packages/angular_devkit/architect:architect_rjs",
2824
"//packages/angular_devkit/architect/node:node_rjs",
25+
"//packages/angular_devkit/core:core_rjs",
26+
"//packages/angular_devkit/core/node:node_rjs",
2927
],
3028
)
3129

‎packages/angular_devkit/build_angular/BUILD.bazel‎

Lines changed: 14 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -119,13 +119,6 @@ ts_project(
119119
"builders.json",
120120
"package.json",
121121
],
122-
interop_deps = [
123-
"//packages/angular/ssr",
124-
"//packages/angular_devkit/build_webpack",
125-
"//packages/angular_devkit/core",
126-
"//packages/angular_devkit/core/node",
127-
"//packages/ngtools/webpack",
128-
],
129122
module_name = "@angular-devkit/build-angular",
130123
deps = [
131124
"//:root_modules/@ampproject/remapping",
@@ -201,7 +194,12 @@ ts_project(
201194
"//:root_modules/webpack-subresource-integrity",
202195
"//packages/angular/build:build_rjs",
203196
"//packages/angular/build/private:private_rjs",
197+
"//packages/angular/ssr:ssr_rjs",
204198
"//packages/angular_devkit/architect",
199+
"//packages/angular_devkit/build_webpack:build_webpack_rjs",
200+
"//packages/angular_devkit/core:core_rjs",
201+
"//packages/angular_devkit/core/node:node_rjs",
202+
"//packages/ngtools/webpack:webpack_rjs",
205203
],
206204
)
207205

@@ -217,9 +215,6 @@ ts_project(
217215
],
218216
),
219217
data = glob(["test/**/*"]),
220-
interop_deps = [
221-
"//packages/angular_devkit/core",
222-
],
223218
deps = [
224219
":build_angular_rjs",
225220
":build_angular_test_utils_rjs",
@@ -228,6 +223,7 @@ ts_project(
228223
"//:root_modules/typescript",
229224
"//:root_modules/webpack",
230225
"//packages/angular_devkit/architect/testing:testing_rjs",
226+
"//packages/angular_devkit/core:core_rjs",
231227
],
232228
)
233229

@@ -285,19 +281,17 @@ ts_project(
285281
],
286282
),
287283
data = glob(["test/**/*"]),
288-
interop_deps = [
289-
"//modules/testing/builder",
290-
"//packages/angular_devkit/core",
291-
"//packages/angular_devkit/core/node",
292-
],
293284
deps = [
294285
":build_angular_rjs",
295286
"//:root_modules/@types/jasmine",
287+
"//modules/testing/builder:builder_rjs",
296288
"//packages/angular/build:build_rjs",
297289
"//packages/angular/build/private:private_rjs",
298290
"//packages/angular_devkit/architect:architect_rjs",
299291
"//packages/angular_devkit/architect/node:node_rjs",
300292
"//packages/angular_devkit/architect/testing:testing_rjs",
293+
"//packages/angular_devkit/core:core_rjs",
294+
"//packages/angular_devkit/core/node:node_rjs",
301295
"@npm//rxjs",
302296
],
303297
)
@@ -308,10 +302,8 @@ LARGE_SPECS = {
308302
"shards": 10,
309303
"size": "large",
310304
"flaky": True,
311-
"extra_interop_deps": [
312-
"//packages/angular_devkit/build_webpack",
313-
],
314305
"extra_deps": [
306+
"//packages/angular_devkit/build_webpack:build_webpack_rjs",
315307
"//:root_modules/@types/http-proxy",
316308
"//:root_modules/http-proxy",
317309
"//:root_modules/puppeteer",
@@ -364,10 +356,8 @@ LARGE_SPECS = {
364356
"prerender": {},
365357
"browser-esbuild": {},
366358
"ssr-dev-server": {
367-
"extra_interop_deps": [
368-
"//packages/angular/ssr/node",
369-
],
370359
"extra_deps": [
360+
"//packages/angular/ssr/node:node_rjs",
371361
"//:root_modules/@types/browser-sync",
372362
"//:root_modules/browser-sync",
373363
"//:root_modules/express",
@@ -381,15 +371,12 @@ LARGE_SPECS = {
381371
name = "build_angular_" + spec + "_test_lib",
382372
testonly = True,
383373
srcs = glob(["src/builders/" + spec + "/**/*_spec.ts"]),
384-
interop_deps = [
385-
# Dependencies needed to compile and run the specs themselves.
386-
"//packages/angular_devkit/core",
387-
"//packages/angular_devkit/core/node",
388-
"//modules/testing/builder",
389-
] + LARGE_SPECS[spec].get("extra_interop_deps", []),
390374
deps = [
391375
# Dependencies needed to compile and run the specs themselves.
392376
":build_angular_rjs",
377+
"//packages/angular_devkit/core:core_rjs",
378+
"//packages/angular_devkit/core/node:node_rjs",
379+
"//modules/testing/builder:builder_rjs",
393380
":build_angular_test_utils_rjs",
394381
"//packages/angular/build:build_rjs",
395382
"//packages/angular/build/private:private_rjs",

‎packages/angular_devkit/build_webpack/BUILD.bazel‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,13 @@ ts_project(
4242
"src/builders/webpack-dev-server/schema.json",
4343
"src/builders/webpack/schema.json",
4444
],
45-
interop_deps = [
46-
"//packages/angular_devkit/architect",
47-
],
4845
module_name = "@angular-devkit/build-webpack",
4946
deps = [
5047
"//:root_modules/@types/node",
5148
"//:root_modules/rxjs",
5249
"//:root_modules/webpack",
5350
"//:root_modules/webpack-dev-server",
51+
"//packages/angular_devkit/architect:architect_rjs",
5452
],
5553
)
5654

@@ -67,17 +65,15 @@ ts_project(
6765
"test/**/*",
6866
],
6967
),
70-
interop_deps = [
71-
"//packages/angular_devkit/core",
72-
"//packages/angular_devkit/core/node",
73-
"//packages/ngtools/webpack",
74-
"//packages/angular_devkit/architect",
75-
"//packages/angular_devkit/architect/node",
76-
"//packages/angular_devkit/architect/testing",
77-
],
7868
deps = [
7969
":build_webpack_rjs",
8070
"//:root_modules/@types/jasmine",
71+
"//packages/angular_devkit/architect:architect_rjs",
72+
"//packages/angular_devkit/architect/node:node_rjs",
73+
"//packages/angular_devkit/architect/testing:testing_rjs",
74+
"//packages/angular_devkit/core:core_rjs",
75+
"//packages/angular_devkit/core/node:node_rjs",
76+
"//packages/ngtools/webpack:webpack_rjs",
8177
],
8278
)
8379

‎packages/angular_devkit/schematics/BUILD.bazel‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,32 +24,28 @@ ts_project(
2424
data = [
2525
"package.json",
2626
],
27-
interop_deps = [
28-
"//packages/angular_devkit/core",
29-
"//packages/angular_devkit/core/node", # TODO: get rid of this for 6.0
30-
],
3127
module_name = "@angular-devkit/schematics",
3228
deps = [
3329
"//:root_modules/@types/node",
3430
"//:root_modules/jsonc-parser",
3531
"//:root_modules/magic-string",
3632
"//:root_modules/rxjs",
33+
"//packages/angular_devkit/core:core_rjs",
34+
"//packages/angular_devkit/core/node:node_rjs", # TODO: get rid of this for 6.0
3735
],
3836
)
3937

4038
ts_project(
4139
name = "schematics_test_lib",
4240
testonly = True,
4341
srcs = glob(["src/**/*_spec.ts"]),
44-
interop_deps = [
45-
"//packages/angular_devkit/core",
46-
"//packages/angular_devkit/core/node",
47-
"//packages/angular_devkit/schematics/testing",
48-
],
4942
deps = [
50-
":schematics_rjs",
43+
":schematics",
5144
"//:root_modules/@types/jasmine",
5245
"//:root_modules/rxjs",
46+
"//packages/angular_devkit/core:core_rjs",
47+
"//packages/angular_devkit/core/node:node_rjs",
48+
"//packages/angular_devkit/schematics/testing:testing_rjs",
5349
],
5450
)
5551

0 commit comments

Comments
 (0)