Skip to content

Commit 1c91ed9

Browse files
josephperrottalan-agius4
josephperrott
authored and
alan-agius4
committed
build: remove ts_project interop
1 parent 2a7cb6e commit 1c91ed9

File tree

44 files changed

+107
-258
lines changed

Some content is hidden

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

44 files changed

+107
-258
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

‎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

+1-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"])
@@ -74,7 +74,6 @@ ts_project(
7474
data = RUNTIME_ASSETS,
7575
# TODO: Fix strict_deps failure
7676
ignore_strict_deps = True,
77-
module_name = "@angular/build",
7877
deps = [
7978
":node_modules/@angular-devkit/architect",
8079
":node_modules/@angular-devkit/core",

‎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

+4-5
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",
@@ -113,9 +112,9 @@ ts_project(
113112
":angular-cli",
114113
"//:node_modules/@types/semver",
115114
"//:node_modules/@types/yargs",
116-
"//packages/angular_devkit/core:core",
117-
"//packages/angular_devkit/schematics:schematics",
118-
"//packages/angular_devkit/schematics/testing:testing",
115+
"//packages/angular_devkit/core",
116+
"//packages/angular_devkit/schematics",
117+
"//packages/angular_devkit/schematics/testing",
119118
],
120119
)
121120

‎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

+2-3
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",
@@ -56,7 +55,7 @@ ts_project(
5655
":pwa",
5756
"//:node_modules/@types/jasmine",
5857
"//:node_modules/@types/node",
59-
"//packages/angular_devkit/schematics/testing:testing",
58+
"//packages/angular_devkit/schematics/testing",
6059
],
6160
)
6261

‎packages/angular/ssr/BUILD.bazel

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

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

@@ -25,7 +25,6 @@ ts_project(
2525
data = [
2626
"//packages/angular/ssr/third_party/beasties:beasties_bundled",
2727
],
28-
module_name = "@angular/ssr",
2928
source_map = True,
3029
tsconfig = "//:build-tsconfig-esm",
3130
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//js:defs.bzl", "js_library")
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

+4-5
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

@@ -17,12 +17,11 @@ ts_project(
1717
),
1818
# TODO: Fix strict_deps failure
1919
ignore_strict_deps = True,
20-
module_name = "@angular-devkit/architect/testing",
2120
deps = [
2221
"//:node_modules/@types/node",
2322
"//:node_modules/rxjs",
24-
"//packages/angular_devkit/architect:architect",
25-
"//packages/angular_devkit/core:core",
26-
"//packages/angular_devkit/core/node:node",
23+
"//packages/angular_devkit/architect",
24+
"//packages/angular_devkit/core",
25+
"//packages/angular_devkit/core/node",
2726
],
2827
)

‎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

+17-18
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"])
@@ -129,7 +129,6 @@ ts_project(
129129
data = RUNTIME_ASSETS,
130130
# TODO: Fix strict_deps failure
131131
ignore_strict_deps = True,
132-
module_name = "@angular-devkit/build-angular",
133132
deps = [
134133
":node_modules/@angular-devkit/architect",
135134
":node_modules/@angular-devkit/build-webpack",
@@ -303,14 +302,14 @@ ts_project(
303302
deps = [
304303
":build_angular",
305304
"//:node_modules/@types/jasmine",
306-
"//modules/testing/builder:builder",
307-
"//packages/angular/build:build",
308-
"//packages/angular/build/private:private",
309-
"//packages/angular_devkit/architect:architect",
310-
"//packages/angular_devkit/architect/node:node",
311-
"//packages/angular_devkit/architect/testing:testing",
312-
"//packages/angular_devkit/core:core",
313-
"//packages/angular_devkit/core/node:node",
305+
"//modules/testing/builder",
306+
"//packages/angular/build",
307+
"//packages/angular/build/private",
308+
"//packages/angular_devkit/architect",
309+
"//packages/angular_devkit/architect/node",
310+
"//packages/angular_devkit/architect/testing",
311+
"//packages/angular_devkit/core",
312+
"//packages/angular_devkit/core/node",
314313
],
315314
)
316315

@@ -417,15 +416,15 @@ LARGE_SPECS = {
417416
deps = [
418417
# Dependencies needed to compile and run the specs themselves.
419418
":build_angular",
420-
"//packages/angular_devkit/core:core",
421-
"//packages/angular_devkit/core/node:node",
422-
"//modules/testing/builder:builder",
419+
"//packages/angular_devkit/core",
420+
"//packages/angular_devkit/core/node",
421+
"//modules/testing/builder",
423422
":build_angular_test_utils",
424-
"//packages/angular/build:build",
425-
"//packages/angular/build/private:private",
426-
"//packages/angular_devkit/architect:architect",
427-
"//packages/angular_devkit/architect/node:node",
428-
"//packages/angular_devkit/architect/testing:testing",
423+
"//packages/angular/build",
424+
"//packages/angular/build/private",
425+
"//packages/angular_devkit/architect",
426+
"//packages/angular_devkit/architect/node",
427+
"//packages/angular_devkit/architect/testing",
429428

430429
# Base dependencies for the application in hello-world-app.
431430
# Some tests also require extra dependencies.

‎packages/angular_devkit/build_webpack/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
licenses(["notice"])
@@ -45,7 +45,6 @@ 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",
4948
deps = [
5049
":node_modules/@angular-devkit/architect",
5150
"//:node_modules/@types/node",

‎packages/angular_devkit/core/BUILD.bazel

+1-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,6 @@ ts_project(
2727
],
2828
) + ["index.ts"],
2929
data = RUNTIME_ASSETS,
30-
module_name = "@angular-devkit/core",
3130
deps = [
3231
"//:node_modules/@types/node",
3332
"//:node_modules/@types/picomatch",

‎packages/angular_devkit/core/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

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

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

0 commit comments

Comments
 (0)