Skip to content

Commit 5ae649e

Browse files
committed
build: drop _rjs suffix from ts_project targets
We don't need the `ts_project` interop in principle at this point. We only have one remaining instance left for the SSR `ng_package` integration. This commit cleans up all usages.
1 parent 9645ec6 commit 5ae649e

File tree

39 files changed

+128
-129
lines changed

39 files changed

+128
-129
lines changed

modules/testing/builder/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ ts_project(
3838
],
3939
),
4040
deps = [
41-
":builder_rjs",
41+
":builder",
4242
":node_modules/@angular-devkit/architect",
4343
],
4444
)
4545

4646
jasmine_test(
4747
name = "unit_test",
48-
data = [":unit_test_lib_rjs"],
48+
data = [":unit_test_lib"],
4949
)

packages/angular/build/BUILD.bazel

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -136,30 +136,30 @@ ts_project(
136136
exclude = ["src/builders/**/tests/**"],
137137
),
138138
deps = [
139-
":build_rjs",
139+
":build",
140140
":node_modules/@angular-devkit/core",
141141
"//:node_modules/@angular/compiler-cli",
142142
"//:node_modules/@babel/core",
143143
"//:node_modules/@types/jasmine",
144144
"//:node_modules/prettier",
145145
"//:node_modules/typescript",
146-
"//packages/angular/build/private:private_rjs",
146+
"//packages/angular/build/private",
147147
],
148148
)
149149

150150
jasmine_test(
151151
name = "unit_tests",
152-
data = [":unit_test_lib_rjs"],
152+
data = [":unit_test_lib"],
153153
)
154154

155155
ts_project(
156156
name = "application_integration_test_lib",
157157
testonly = True,
158158
srcs = glob(include = ["src/builders/application/tests/**/*.ts"]),
159159
deps = [
160-
":build_rjs",
161-
"//packages/angular/build/private:private_rjs",
162-
"//modules/testing/builder:builder_rjs",
160+
":build",
161+
"//packages/angular/build/private",
162+
"//modules/testing/builder",
163163
":node_modules/@angular-devkit/architect",
164164
":node_modules/@angular-devkit/core",
165165

@@ -184,9 +184,9 @@ ts_project(
184184
testonly = True,
185185
srcs = glob(include = ["src/builders/dev-server/tests/**/*.ts"]),
186186
deps = [
187-
":build_rjs",
188-
"//packages/angular/build/private:private_rjs",
189-
"//modules/testing/builder:builder_rjs",
187+
":build",
188+
"//packages/angular/build/private",
189+
"//modules/testing/builder",
190190
":node_modules/@angular-devkit/architect",
191191
":node_modules/@angular-devkit/core",
192192

@@ -218,9 +218,9 @@ ts_project(
218218
testonly = True,
219219
srcs = glob(include = ["src/builders/karma/tests/**/*.ts"]),
220220
deps = [
221-
":build_rjs",
222-
"//packages/angular/build/private:private_rjs",
223-
"//modules/testing/builder:builder_rjs",
221+
":build",
222+
"//packages/angular/build/private",
223+
"//modules/testing/builder",
224224
":node_modules/@angular-devkit/architect",
225225
":node_modules/@angular-devkit/core",
226226
"//:node_modules/@types/node",
@@ -251,23 +251,23 @@ ts_project(
251251
jasmine_test(
252252
name = "application_integration_tests",
253253
size = "large",
254-
data = [":application_integration_test_lib_rjs"],
254+
data = [":application_integration_test_lib"],
255255
flaky = True,
256256
shard_count = 10,
257257
)
258258

259259
jasmine_test(
260260
name = "dev-server_integration_tests",
261261
size = "large",
262-
data = [":dev-server_integration_test_lib_rjs"],
262+
data = [":dev-server_integration_test_lib"],
263263
flaky = True,
264264
shard_count = 10,
265265
)
266266

267267
jasmine_test(
268268
name = "karma_integration_tests",
269269
size = "large",
270-
data = [":karma_integration_test_lib_rjs"],
270+
data = [":karma_integration_test_lib"],
271271
env = {
272272
# TODO: Replace Puppeteer downloaded browsers with Bazel-managed browsers,
273273
# or standardize to avoid complex configuration like this!
@@ -297,9 +297,9 @@ npm_package(
297297
tags = ["release-package"],
298298
deps = RUNTIME_ASSETS + [
299299
":README.md",
300-
":build_rjs",
300+
":build",
301301
":license",
302-
"//packages/angular/build/private:private_rjs",
302+
"//packages/angular/build/private",
303303
],
304304
)
305305

packages/angular/build/private/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ ts_project(
77
srcs = ["index.ts"],
88
module_name = "@angular/build/private",
99
deps = [
10-
"//packages/angular/build:build_rjs",
10+
"//packages/angular/build",
1111
],
1212
)

packages/angular/cli/BUILD.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ ts_project(
108108
],
109109
),
110110
deps = [
111-
":angular-cli_rjs",
111+
":angular-cli",
112112
":node_modules/@angular-devkit/core",
113113
":node_modules/@angular-devkit/schematics",
114114
"//:node_modules/@types/semver",
@@ -120,7 +120,7 @@ ts_project(
120120

121121
jasmine_test(
122122
name = "angular-cli_test",
123-
data = [":angular-cli_test_lib_rjs"],
123+
data = [":angular-cli_test_lib"],
124124
)
125125

126126
genrule(
@@ -146,7 +146,7 @@ npm_package(
146146
tags = ["release-package"],
147147
deps = RUNTIME_ASSETS + [
148148
":README.md",
149-
":angular-cli_rjs",
149+
":angular-cli",
150150
":license",
151151
],
152152
)

packages/angular/create/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ npm_package(
4545
visibility = ["//visibility:public"],
4646
deps = RUNTIME_ASSETS + [
4747
":README.md",
48-
":create_rjs",
48+
":create",
4949
":license",
5050
],
5151
)

packages/angular/pwa/BUILD.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,15 @@ ts_project(
5252
srcs = glob(["pwa/**/*_spec.ts"]),
5353
deps = [
5454
":node_modules/@angular-devkit/schematics",
55-
":pwa_rjs",
55+
":pwa",
5656
"//:node_modules/@types/jasmine",
5757
"//:node_modules/@types/node",
5858
],
5959
)
6060

6161
jasmine_test(
6262
name = "pwa_test",
63-
data = [":pwa_test_lib_rjs"],
63+
data = [":pwa_test_lib"],
6464
)
6565

6666
genrule(
@@ -80,6 +80,6 @@ npm_package(
8080
deps = RUNTIME_ASSETS + [
8181
":README.md",
8282
":license",
83-
":pwa_rjs",
83+
":pwa",
8484
],
8585
)

packages/angular/ssr/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ ng_package(
5555
"//packages/angular/ssr/schematics:pkg",
5656
],
5757
deps = [
58-
":ssr",
59-
"//packages/angular/ssr/node",
58+
":ssr_legacy",
59+
"//packages/angular/ssr/node:node_legacy",
6060
],
6161
)
6262

packages/angular/ssr/node/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ ts_project(
2323
"//:node_modules/@angular/core",
2424
"//:node_modules/@angular/platform-server",
2525
"//:node_modules/@types/node",
26-
"//packages/angular/ssr:ssr_rjs",
26+
"//packages/angular/ssr",
2727
],
2828
)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ts_project(
77
srcs = glob(["**/*_spec.ts"]),
88
deps = [
99
"//:node_modules/@types/node",
10-
"//packages/angular/ssr/node:node_rjs",
10+
"//packages/angular/ssr/node",
1111
],
1212
)
1313

packages/angular/ssr/schematics/BUILD.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ ts_project(
7777
],
7878
),
7979
deps = [
80-
":schematics_rjs",
80+
":schematics",
8181
"//:node_modules/@types/node",
8282
"//packages/angular/ssr:node_modules/@angular-devkit/schematics",
8383
],
@@ -87,7 +87,7 @@ jasmine_test(
8787
name = "ssr_schematics_test",
8888
data = [
8989
":schematics_assets",
90-
":ssr_schematics_test_lib_rjs",
90+
":ssr_schematics_test_lib",
9191
],
9292
)
9393

@@ -96,8 +96,8 @@ npm_package(
9696
name = "pkg",
9797
srcs = [
9898
"package.json",
99+
":schematics",
99100
":schematics_assets",
100-
":schematics_rjs",
101101
],
102102
visibility = ["//packages/angular/ssr:__pkg__"],
103103
)

0 commit comments

Comments
 (0)