Skip to content

Commit c5111a0

Browse files
devversiondevversion
committed
build: remove rules_js migration interop files and clean up
Removes the `rules_js` migration interop files and cleans up other remainings.
1 parent 09d3ced commit c5111a0

File tree

45 files changed

+96
-264
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+96
-264
lines changed

‎BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
load("@aspect_rules_ts//ts:defs.bzl", rules_js_tsconfig = "ts_config")
22
load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
33
load("@npm2//:defs.bzl", "npm_link_all_packages")
4-
load("//tools:defaults2.bzl", "copy_to_bin")
4+
load("//tools:defaults.bzl", "copy_to_bin")
55

66
package(default_visibility = ["//visibility:public"])
77

‎WORKSPACE

+1-2
Original file line numberDiff line numberDiff line change
@@ -207,10 +207,9 @@ http_archive(
207207
load("@aspect_rules_ts//ts:repositories.bzl", "rules_ts_dependencies")
208208

209209
rules_ts_dependencies(
210-
# ts_version_from = "//:package.json",
210+
ts_version_from = "//:package.json",
211211
# Obtained by: curl --silent https://registry.npmjs.org/typescript/5.7.2 | jq -r '.dist.integrity'
212212
ts_integrity = "sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==",
213-
ts_version = "5.7.2",
214213
)
215214

216215
http_file(

‎modules/testing/builder/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
load("@npm2//:defs.bzl", "npm_link_all_packages")
2-
load("//tools:defaults2.bzl", "jasmine_test", "ts_project")
2+
load("//tools:defaults.bzl", "jasmine_test", "ts_project")
33

44
package(default_visibility = ["//visibility:public"])
55

‎packages/angular/build/BUILD.bazel

+22-33
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
load("@devinfra//bazel/api-golden:index_rjs.bzl", "api_golden_test_npm_package")
22
load("@npm2//:defs.bzl", "npm_link_all_packages")
3-
load("//tools:defaults2.bzl", "copy_to_bin", "jasmine_test", "npm_package", "ts_project")
3+
load("//tools:defaults.bzl", "copy_to_bin", "jasmine_test", "npm_package", "ts_project")
44
load("//tools:ts_json_schema.bzl", "ts_json_schema")
55

66
licenses(["notice"])
@@ -72,7 +72,6 @@ ts_project(
7272
"//packages/angular/build:src/builders/ng-packagr/schema.ts",
7373
],
7474
data = RUNTIME_ASSETS,
75-
module_name = "@angular/build",
7675
deps = [
7776
":node_modules/@angular-devkit/architect",
7877
":node_modules/@angular-devkit/core",
@@ -158,24 +157,22 @@ ts_project(
158157
srcs = glob(include = ["src/builders/application/tests/**/*.ts"]),
159158
deps = [
160159
":build",
161-
"//packages/angular/build/private",
162-
"//modules/testing/builder",
163160
":node_modules/@angular-devkit/architect",
164-
":node_modules/@angular-devkit/core",
165-
166-
# Base dependencies for the application in hello-world-app.
161+
":node_modules/@angular-devkit/core", # Base dependencies for the application in hello-world-app.
167162
"//:node_modules/@angular/common",
168163
"//:node_modules/@angular/compiler",
169164
"//:node_modules/@angular/compiler-cli",
170165
"//:node_modules/@angular/core",
171166
"//:node_modules/@angular/platform-browser",
172167
"//:node_modules/@angular/platform-browser-dynamic",
173168
"//:node_modules/@angular/router",
169+
"//:node_modules/buffer",
174170
"//:node_modules/rxjs",
175171
"//:node_modules/tslib",
176172
"//:node_modules/typescript",
177173
"//:node_modules/zone.js",
178-
"//:node_modules/buffer",
174+
"//modules/testing/builder",
175+
"//packages/angular/build/private",
179176
],
180177
)
181178

@@ -185,31 +182,27 @@ ts_project(
185182
srcs = glob(include = ["src/builders/dev-server/tests/**/*.ts"]),
186183
deps = [
187184
":build",
188-
"//packages/angular/build/private",
189-
"//modules/testing/builder",
190185
":node_modules/@angular-devkit/architect",
191-
":node_modules/@angular-devkit/core",
192-
193-
# dev server only test deps
194-
"//:node_modules/@types/http-proxy",
195-
"//:node_modules/@types/node",
196-
"//:node_modules/http-proxy",
197-
"//:node_modules/puppeteer",
198-
199-
# Base dependencies for the application in hello-world-app.
186+
":node_modules/@angular-devkit/core", # dev server only test deps
200187
"//:node_modules/@angular/common",
201188
"//:node_modules/@angular/compiler",
202189
"//:node_modules/@angular/compiler-cli",
203190
"//:node_modules/@angular/core",
204191
"//:node_modules/@angular/platform-browser",
205192
"//:node_modules/@angular/platform-browser-dynamic",
206193
"//:node_modules/@angular/router",
194+
"//:node_modules/@types/http-proxy",
195+
"//:node_modules/@types/node",
196+
"//:node_modules/buffer",
197+
"//:node_modules/http-proxy",
207198
"//:node_modules/ng-packagr",
199+
"//:node_modules/puppeteer", # Base dependencies for the application in hello-world-app.
208200
"//:node_modules/rxjs",
209201
"//:node_modules/tslib",
210202
"//:node_modules/typescript",
211203
"//:node_modules/zone.js",
212-
"//:node_modules/buffer",
204+
"//modules/testing/builder",
205+
"//packages/angular/build/private",
213206
],
214207
)
215208

@@ -219,32 +212,28 @@ ts_project(
219212
srcs = glob(include = ["src/builders/karma/tests/**/*.ts"]),
220213
deps = [
221214
":build",
222-
"//packages/angular/build/private",
223-
"//modules/testing/builder",
224215
":node_modules/@angular-devkit/architect",
225216
":node_modules/@angular-devkit/core",
226-
"//:node_modules/@types/node",
227-
228-
# karma specific test deps
229-
"//:node_modules/karma-chrome-launcher",
230-
"//:node_modules/karma-coverage",
231-
"//:node_modules/karma-jasmine",
232-
"//:node_modules/karma-jasmine-html-reporter",
233-
"//:node_modules/puppeteer",
234-
235-
# Base dependencies for the karma in hello-world-app.
236217
"//:node_modules/@angular/common",
237218
"//:node_modules/@angular/compiler",
238219
"//:node_modules/@angular/compiler-cli",
239220
"//:node_modules/@angular/core",
240221
"//:node_modules/@angular/platform-browser",
241222
"//:node_modules/@angular/platform-browser-dynamic",
242223
"//:node_modules/@angular/router",
224+
"//:node_modules/@types/node", # karma specific test deps
225+
"//:node_modules/buffer",
226+
"//:node_modules/karma-chrome-launcher",
227+
"//:node_modules/karma-coverage",
228+
"//:node_modules/karma-jasmine",
229+
"//:node_modules/karma-jasmine-html-reporter",
230+
"//:node_modules/puppeteer", # Base dependencies for the karma in hello-world-app.
243231
"//:node_modules/rxjs",
244232
"//:node_modules/tslib",
245233
"//:node_modules/typescript",
246234
"//:node_modules/zone.js",
247-
"//:node_modules/buffer",
235+
"//modules/testing/builder",
236+
"//packages/angular/build/private",
248237
],
249238
)
250239

‎packages/angular/build/private/BUILD.bazel

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
load("//tools:interop.bzl", "ts_project")
1+
load("//tools:defaults.bzl", "ts_project")
22

33
package(default_visibility = ["//visibility:public"])
44

55
ts_project(
66
name = "private",
77
srcs = ["index.ts"],
8-
module_name = "@angular/build/private",
98
deps = [
109
"//packages/angular/build",
1110
],

‎packages/angular/cli/BUILD.bazel

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# found in the LICENSE file at https://angular.dev/license
55

66
load("@npm2//:defs.bzl", "npm_link_all_packages")
7-
load("//tools:defaults2.bzl", "jasmine_test", "npm_package", "ts_project")
7+
load("//tools:defaults.bzl", "jasmine_test", "npm_package", "ts_project")
88
load("//tools:ng_cli_schema_generator.bzl", "cli_json_schema")
99
load("//tools:ts_json_schema.bzl", "ts_json_schema")
1010

@@ -43,7 +43,6 @@ ts_project(
4343
"//packages/angular/cli:src/commands/update/schematic/schema.ts",
4444
],
4545
data = RUNTIME_ASSETS,
46-
module_name = "@angular/cli",
4746
deps = [
4847
":node_modules/@angular-devkit/architect",
4948
":node_modules/@angular-devkit/core",

‎packages/angular/create/BUILD.bazel

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Use of this source code is governed by an MIT-style license that can be
44
# found in the LICENSE file at https://angular.dev/license
55

6-
load("//tools:defaults2.bzl", "npm_package", "ts_project")
6+
load("//tools:defaults.bzl", "npm_package", "ts_project")
77

88
licenses(["notice"])
99

@@ -22,7 +22,6 @@ ts_project(
2222
"src/*.ts",
2323
]),
2424
data = RUNTIME_ASSETS,
25-
module_name = "@angular/create",
2625
deps = [
2726
"//:node_modules/@types/node",
2827
"//packages/angular/cli:angular-cli",

‎packages/angular/pwa/BUILD.bazel

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# found in the LICENSE file at https://angular.dev/license
55

66
load("@npm2//:defs.bzl", "npm_link_all_packages")
7-
load("//tools:defaults2.bzl", "jasmine_test", "npm_package", "ts_project")
7+
load("//tools:defaults.bzl", "jasmine_test", "npm_package", "ts_project")
88
load("//tools:ts_json_schema.bzl", "ts_json_schema")
99

1010
licenses(["notice"])
@@ -32,7 +32,6 @@ ts_project(
3232
"//packages/angular/pwa:pwa/schema.ts",
3333
],
3434
data = RUNTIME_ASSETS,
35-
module_name = "@angular/pwa",
3635
deps = [
3736
":node_modules/@angular-devkit/schematics",
3837
":node_modules/@schematics/angular",

‎packages/angular/ssr/BUILD.bazel

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ load("@aspect_rules_js//npm:defs.bzl", "npm_package")
22
load("@devinfra//bazel/api-golden:index_rjs.bzl", "api_golden_test_npm_package")
33
load("@npm2//:defs.bzl", "npm_link_all_packages")
44
load("@rules_pkg//:pkg.bzl", "pkg_tar")
5-
load("//tools:defaults2.bzl", "ng_package", "ts_project")
5+
load("//tools:defaults.bzl", "ng_package", "ts_project")
66

77
package(default_visibility = ["//visibility:public"])
88

@@ -26,7 +26,6 @@ ts_project(
2626
data = [
2727
"//packages/angular/ssr/third_party/beasties:beasties_bundled",
2828
],
29-
module_name = "@angular/ssr",
3029
source_map = True,
3130
tsconfig = "//:build-tsconfig-esm",
3231
deps = [

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("//tools:interop.bzl", "ts_project")
1+
load("//tools:defaults.bzl", "ts_project")
22

33
package(default_visibility = ["//visibility:public"])
44

@@ -16,7 +16,6 @@ ts_project(
1616
],
1717
# TODO: Fix strict_deps failure
1818
ignore_strict_deps = True,
19-
module_name = "@angular/ssr/node",
2019
source_map = True,
2120
tsconfig = "//:build-tsconfig-esm",
2221
deps = [

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
load("@devinfra//bazel/spec-bundling:index_rjs.bzl", "spec_bundle")
2-
load("//tools:defaults2.bzl", "jasmine_test", "ts_project")
2+
load("//tools:defaults.bzl", "jasmine_test", "ts_project")
33

44
ts_project(
55
name = "unit_test_lib",

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# found in the LICENSE file at https://angular.dev/license
55

66
load("@aspect_rules_js//npm:defs.bzl", "npm_package")
7-
load("//tools:defaults2.bzl", "jasmine_test", "ts_project")
7+
load("//tools:defaults.bzl", "jasmine_test", "ts_project")
88
load("//tools:ts_json_schema.bzl", "ts_json_schema")
99

1010
licenses(["notice"])
@@ -57,7 +57,6 @@ ts_project(
5757
"//packages/angular/ssr/schematics:" + src.replace(".json", ".ts")
5858
for (src, _) in ALL_SCHEMA_TARGETS
5959
],
60-
module_name = "@angular/ssr/schematics",
6160
deps = [
6261
"//packages/angular/ssr:node_modules/@angular-devkit/schematics",
6362
"//packages/angular/ssr:node_modules/@schematics/angular",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
load("@devinfra//bazel/spec-bundling:index_rjs.bzl", "spec_bundle")
2-
load("//tools:defaults2.bzl", "jasmine_test", "ts_project")
2+
load("//tools:defaults.bzl", "jasmine_test", "ts_project")
33

44
ts_project(
55
name = "unit_test_lib",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
load("@bazel_skylib//rules:diff_test.bzl", "diff_test")
22
load("@bazel_skylib//rules:write_file.bzl", "write_file")
3-
load("//tools:defaults2.bzl", "jasmine_test", "ts_project")
3+
load("//tools:defaults.bzl", "jasmine_test", "ts_project")
44

55
ts_project(
66
name = "unit_test_lib",

‎packages/angular_devkit/architect/BUILD.bazel

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
load("@devinfra//bazel/api-golden:index_rjs.bzl", "api_golden_test_npm_package")
77
load("@npm2//:defs.bzl", "npm_link_all_packages")
8-
load("//tools:defaults2.bzl", "jasmine_test", "npm_package", "ts_project")
8+
load("//tools:defaults.bzl", "jasmine_test", "npm_package", "ts_project")
99
load("//tools:ts_json_schema.bzl", "ts_json_schema")
1010

1111
package(default_visibility = ["//visibility:public"])
@@ -66,7 +66,6 @@ ts_project(
6666
],
6767
# Ensure tests can execute the output JS, relying on schemas/JSON files.
6868
data = JSON_FILES,
69-
module_name = "@angular-devkit/architect",
7069
deps = [
7170
":node_modules/@angular-devkit/core",
7271
"//:node_modules/@types/node",

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Use of this source code is governed by an MIT-style license that can be
44
# found in the LICENSE file at https://angular.dev/license
55

6-
load("//tools:defaults2.bzl", "jasmine_test", "ts_project")
6+
load("//tools:defaults.bzl", "jasmine_test", "ts_project")
77

88
licenses(["notice"])
99

@@ -15,7 +15,6 @@ ts_project(
1515
include = ["**/*.ts"],
1616
exclude = ["**/*_spec.ts"],
1717
),
18-
module_name = "@angular-devkit/architect/node",
1918
deps = [
2019
"//:node_modules/@types/node",
2120
"//:node_modules/rxjs",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("//tools:interop.bzl", "ts_project")
1+
load("//tools:defaults.bzl", "ts_project")
22

33
ts_project(
44
name = "test_lib",

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Use of this source code is governed by an MIT-style license that can be
44
# found in the LICENSE file at https://angular.dev/license
55

6-
load("//tools:interop.bzl", "ts_project")
6+
load("//tools:defaults.bzl", "ts_project")
77

88
licenses(["notice"])
99

@@ -15,7 +15,6 @@ ts_project(
1515
include = ["**/*.ts"],
1616
exclude = ["**/*_spec.ts"],
1717
),
18-
module_name = "@angular-devkit/architect/testing",
1918
deps = [
2019
"//:node_modules/@types/node",
2120
"//:node_modules/rxjs",

‎packages/angular_devkit/architect_cli/BUILD.bazel

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
load("@npm2//:defs.bzl", "npm_link_all_packages")
2-
load("//tools:defaults2.bzl", "npm_package", "ts_project")
2+
load("//tools:defaults.bzl", "npm_package", "ts_project")
33

44
# Copyright Google Inc. All Rights Reserved.
55
#
@@ -16,7 +16,6 @@ ts_project(
1616
srcs = [
1717
"bin/architect.ts",
1818
] + glob(["src/**/*.ts"]),
19-
module_name = "@angular-devkit/architect-cli",
2019
deps = [
2120
":node_modules/@angular-devkit/architect",
2221
":node_modules/@angular-devkit/core",

‎packages/angular_devkit/build_angular/BUILD.bazel

+2-5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
load("@devinfra//bazel/api-golden:index_rjs.bzl", "api_golden_test_npm_package")
77
load("@npm2//:defs.bzl", "npm_link_all_packages")
8-
load("//tools:defaults2.bzl", "copy_to_bin", "jasmine_test", "npm_package", "ts_project")
8+
load("//tools:defaults.bzl", "copy_to_bin", "jasmine_test", "npm_package", "ts_project")
99
load("//tools:ts_json_schema.bzl", "ts_json_schema")
1010

1111
licenses(["notice"])
@@ -127,7 +127,6 @@ ts_project(
127127
"//packages/angular_devkit/build_angular:src/builders/web-test-runner/schema.ts",
128128
],
129129
data = RUNTIME_ASSETS,
130-
module_name = "@angular-devkit/build-angular",
131130
deps = [
132131
":node_modules/@angular-devkit/architect",
133132
":node_modules/@angular-devkit/build-webpack",
@@ -394,9 +393,7 @@ LARGE_SPECS = {
394393
":node_modules/@angular-devkit/architect",
395394
":node_modules/@angular-devkit/core",
396395
":node_modules/@angular-devkit/build-webpack",
397-
"//modules/testing/builder",
398-
399-
# Base dependencies for the application in hello-world-app.
396+
"//modules/testing/builder", # Base dependencies for the application in hello-world-app.
400397
# Some tests also require extra dependencies.
401398
"//:node_modules/@angular/common",
402399
"//:node_modules/@angular/compiler",

0 commit comments

Comments
 (0)