Skip to content

Commit 429b38b

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 429b38b

File tree

45 files changed

+84
-230
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

+84
-230
lines changed

Diff for: ‎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

Diff for: ‎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(

Diff for: ‎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

Diff for: ‎packages/angular/build/BUILD.bazel

+2-2
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,7 @@ ts_project(
7272
"//packages/angular/build:src/builders/ng-packagr/schema.ts",
7373
],
7474
data = RUNTIME_ASSETS,
75-
module_name = "@angular/build",
75+
7676
deps = [
7777
":node_modules/@angular-devkit/architect",
7878
":node_modules/@angular-devkit/core",

Diff for: ‎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
],

Diff for: ‎packages/angular/cli/BUILD.bazel

+2-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,7 @@ ts_project(
4343
"//packages/angular/cli:src/commands/update/schematic/schema.ts",
4444
],
4545
data = RUNTIME_ASSETS,
46-
module_name = "@angular/cli",
46+
4747
deps = [
4848
":node_modules/@angular-devkit/architect",
4949
":node_modules/@angular-devkit/core",

Diff for: ‎packages/angular/create/BUILD.bazel

+2-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,7 @@ ts_project(
2222
"src/*.ts",
2323
]),
2424
data = RUNTIME_ASSETS,
25-
module_name = "@angular/create",
25+
2626
deps = [
2727
"//:node_modules/@types/node",
2828
"//packages/angular/cli:angular-cli",

Diff for: ‎packages/angular/pwa/BUILD.bazel

+2-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,7 @@ ts_project(
3232
"//packages/angular/pwa:pwa/schema.ts",
3333
],
3434
data = RUNTIME_ASSETS,
35-
module_name = "@angular/pwa",
35+
3636
deps = [
3737
":node_modules/@angular-devkit/schematics",
3838
":node_modules/@schematics/angular",

Diff for: ‎packages/angular/ssr/BUILD.bazel

+2-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,7 @@ ts_project(
2626
data = [
2727
"//packages/angular/ssr/third_party/beasties:beasties_bundled",
2828
],
29-
module_name = "@angular/ssr",
29+
3030
source_map = True,
3131
tsconfig = "//:build-tsconfig-esm",
3232
deps = [

Diff for: ‎packages/angular/ssr/node/BUILD.bazel

+2-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,7 @@ ts_project(
1616
],
1717
# TODO: Fix strict_deps failure
1818
ignore_strict_deps = True,
19-
module_name = "@angular/ssr/node",
19+
2020
source_map = True,
2121
tsconfig = "//:build-tsconfig-esm",
2222
deps = [

Diff for: ‎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",

Diff for: ‎packages/angular/ssr/schematics/BUILD.bazel

+2-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,7 @@ 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",
60+
6161
deps = [
6262
"//packages/angular/ssr:node_modules/@angular-devkit/schematics",
6363
"//packages/angular/ssr:node_modules/@schematics/angular",

Diff for: ‎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",

Diff for: ‎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",

Diff for: ‎packages/angular_devkit/architect/BUILD.bazel

+2-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,7 @@ 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",
69+
7070
deps = [
7171
":node_modules/@angular-devkit/core",
7272
"//:node_modules/@types/node",

Diff for: ‎packages/angular_devkit/architect/node/BUILD.bazel

+2-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,7 @@ ts_project(
1515
include = ["**/*.ts"],
1616
exclude = ["**/*_spec.ts"],
1717
),
18-
module_name = "@angular-devkit/architect/node",
18+
1919
deps = [
2020
"//:node_modules/@types/node",
2121
"//:node_modules/rxjs",

Diff for: ‎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",

Diff for: ‎packages/angular_devkit/architect/testing/BUILD.bazel

+2-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,7 @@ ts_project(
1515
include = ["**/*.ts"],
1616
exclude = ["**/*_spec.ts"],
1717
),
18-
module_name = "@angular-devkit/architect/testing",
18+
1919
deps = [
2020
"//:node_modules/@types/node",
2121
"//:node_modules/rxjs",

Diff for: ‎packages/angular_devkit/architect_cli/BUILD.bazel

+2-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,7 @@ ts_project(
1616
srcs = [
1717
"bin/architect.ts",
1818
] + glob(["src/**/*.ts"]),
19-
module_name = "@angular-devkit/architect-cli",
19+
2020
deps = [
2121
":node_modules/@angular-devkit/architect",
2222
":node_modules/@angular-devkit/core",

Diff for: ‎packages/angular_devkit/build_angular/BUILD.bazel

+2-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", "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,7 @@ 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",
130+
131131
deps = [
132132
":node_modules/@angular-devkit/architect",
133133
":node_modules/@angular-devkit/build-webpack",

Diff for: ‎packages/angular_devkit/build_webpack/BUILD.bazel

+2-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
licenses(["notice"])
@@ -45,7 +45,7 @@ ts_project(
4545
"//packages/angular_devkit/build_webpack:src/builders/webpack/schema.ts",
4646
],
4747
data = RUNTIME_ASSETS,
48-
module_name = "@angular-devkit/build-webpack",
48+
4949
deps = [
5050
":node_modules/@angular-devkit/architect",
5151
"//:node_modules/@types/node",

Diff for: ‎packages/angular_devkit/core/BUILD.bazel

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

44
# Copyright Google Inc. All Rights Reserved.
55
#
@@ -27,7 +27,7 @@ ts_project(
2727
],
2828
) + ["index.ts"],
2929
data = RUNTIME_ASSETS,
30-
module_name = "@angular-devkit/core",
30+
3131
deps = [
3232
"//:node_modules/@types/node",
3333
"//:node_modules/@types/picomatch",

Diff for: ‎packages/angular_devkit/core/node/BUILD.bazel

+2-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

@@ -18,7 +18,7 @@ ts_project(
1818
"**/*_spec.ts",
1919
],
2020
),
21-
module_name = "@angular-devkit/core/node",
21+
2222
deps = [
2323
"//:node_modules/@types/node",
2424
"//:node_modules/chokidar",

Diff for: ‎packages/angular_devkit/core/node/testing/BUILD.bazel

+2-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
# Copyright Google Inc. All Rights Reserved.
44
#
@@ -16,7 +16,7 @@ ts_project(
1616
"**/*_spec.ts",
1717
],
1818
),
19-
module_name = "@angular-devkit/core/node/testing",
19+
2020
deps = [
2121
"//:node_modules/@types/jasmine",
2222
"//:node_modules/@types/node",

Diff for: ‎packages/angular_devkit/schematics/BUILD.bazel

+2-2
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", "jasmine_test", "npm_package", "ts_project")
3+
load("//tools:defaults.bzl", "jasmine_test", "npm_package", "ts_project")
44

55
# Copyright Google Inc. All Rights Reserved.
66
#
@@ -25,7 +25,7 @@ ts_project(
2525
data = [
2626
"package.json",
2727
],
28-
module_name = "@angular-devkit/schematics",
28+
2929
deps = [
3030
":node_modules/@angular-devkit/core",
3131
"//:node_modules/@types/node",

Diff for: ‎packages/angular_devkit/schematics/tasks/BUILD.bazel

+2-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
# Copyright Google Inc. All Rights Reserved.
44
#
@@ -18,7 +18,7 @@ ts_project(
1818
],
1919
),
2020
data = ["package.json"],
21-
module_name = "@angular-devkit/schematics/tasks",
21+
2222
deps = [
2323
"//:node_modules/@types/node",
2424
"//:node_modules/ora",

Diff for: ‎packages/angular_devkit/schematics/tasks/node/BUILD.bazel

+2-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
# Copyright Google Inc. All Rights Reserved.
44
#
@@ -16,7 +16,7 @@ ts_project(
1616
"**/*_spec.ts",
1717
],
1818
),
19-
module_name = "@angular-devkit/schematics/tasks/node",
19+
2020
deps = [
2121
"//:node_modules/@types/node",
2222
"//:node_modules/rxjs",

0 commit comments

Comments
 (0)