Skip to content

Commit ba5cf3d

Browse files
devversiondevversion
authored
More changes to migrate to ts_project (#30704)
* build: fix `ts_project` interop causing conflicting mappings The `ts_project` interop currently conflicts with some mappings from e.g. `ts_library`. This can happen when the same target is transitively referenced via the interop, or directly in e.g. `ng_module` still. * build: migrate all `ng_test_library` targets to `ts_project` Migrates all `ng_test_library` targets to `ts_project`.
1 parent e64d183 commit ba5cf3d

File tree

157 files changed

+1314
-650
lines changed

Some content is hidden

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

157 files changed

+1314
-650
lines changed

‎src/bazel-tsconfig-build.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,12 @@
3131
"inlineSources": true,
3232
"target": "es2022",
3333
"lib": ["es2020", "dom"],
34+
"types": [],
3435
"skipLibCheck": true,
3536
"paths": {
36-
"@angular/cdk/*": ["./cdk/*"]
37+
"@angular/cdk/*": ["./cdk/*"],
38+
"@angular/cdk-experimental/*": ["./cdk-experimental/*"],
39+
"@angular/material/*": ["./material/*"]
3740
}
3841
},
3942
"angularCompilerOptions": {

‎src/cdk-experimental/combobox/BUILD.bazel‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite")
1+
load("//tools:defaults.bzl", "ng_module", "ng_web_test_suite")
2+
load("//tools:defaults2.bzl", "ts_project")
23

34
package(default_visibility = ["//visibility:public"])
45

@@ -17,17 +18,21 @@ ng_module(
1718
],
1819
)
1920

20-
ng_test_library(
21+
ts_project(
2122
name = "unit_test_sources",
23+
testonly = True,
2224
srcs = glob(
2325
["**/*.spec.ts"],
2426
exclude = ["**/*.e2e.spec.ts"],
2527
),
26-
deps = [
28+
interop_deps = [
2729
":combobox",
2830
"//src/cdk/keycodes",
2931
"//src/cdk/testing/private",
30-
"@npm//@angular/platform-browser",
32+
],
33+
deps = [
34+
"//:node_modules/@angular/core",
35+
"//:node_modules/@angular/platform-browser",
3136
],
3237
)
3338

‎src/cdk-experimental/popover-edit/BUILD.bazel‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite")
1+
load("//tools:defaults.bzl", "ng_module", "ng_web_test_suite")
2+
load("//tools:defaults2.bzl", "ts_project")
23

34
package(default_visibility = ["//visibility:public"])
45

@@ -22,23 +23,27 @@ ng_module(
2223
],
2324
)
2425

25-
ng_test_library(
26+
ts_project(
2627
name = "unit_test_sources",
28+
testonly = True,
2729
srcs = glob(
2830
["**/*.spec.ts"],
2931
exclude = ["**/*.e2e.spec.ts"],
3032
),
31-
deps = [
33+
interop_deps = [
3234
":popover-edit",
3335
"//src/cdk/bidi",
3436
"//src/cdk/collections",
3537
"//src/cdk/keycodes",
3638
"//src/cdk/overlay",
3739
"//src/cdk/table",
3840
"//src/cdk/testing/private",
39-
"@npm//@angular/common",
40-
"@npm//@angular/forms",
41-
"@npm//rxjs",
41+
],
42+
deps = [
43+
"//:node_modules/@angular/common",
44+
"//:node_modules/@angular/core",
45+
"//:node_modules/@angular/forms",
46+
"//:node_modules/rxjs",
4247
],
4348
)
4449

‎src/cdk-experimental/scrolling/BUILD.bazel‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
load("//src/e2e-app:test_suite.bzl", "e2e_test_suite")
2-
load("//tools:defaults.bzl", "ng_e2e_test_library", "ng_module", "ng_test_library", "ng_web_test_suite")
2+
load("//tools:defaults.bzl", "ng_e2e_test_library", "ng_module", "ng_web_test_suite")
3+
load("//tools:defaults2.bzl", "ts_project")
34

45
package(default_visibility = ["//visibility:public"])
56

@@ -19,16 +20,20 @@ ng_module(
1920
],
2021
)
2122

22-
ng_test_library(
23+
ts_project(
2324
name = "unit_test_sources",
25+
testonly = True,
2426
srcs = glob(
2527
["**/*.spec.ts"],
2628
exclude = ["**/*.e2e.spec.ts"],
2729
),
28-
deps = [
30+
interop_deps = [
2931
":scrolling",
3032
"//src/cdk/scrolling",
3133
],
34+
deps = [
35+
"//:node_modules/@angular/core",
36+
],
3237
)
3338

3439
ng_web_test_suite(

‎src/cdk-experimental/selection/BUILD.bazel‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite")
1+
load("//tools:defaults.bzl", "ng_module", "ng_web_test_suite")
2+
load("//tools:defaults2.bzl", "ts_project")
23

34
package(default_visibility = ["//visibility:public"])
45

@@ -19,17 +20,21 @@ ng_module(
1920
],
2021
)
2122

22-
ng_test_library(
23+
ts_project(
2324
name = "unit_test_sources",
25+
testonly = True,
2426
srcs = glob(
2527
["**/*.spec.ts"],
2628
exclude = ["**/*.e2e.spec.ts"],
2729
),
28-
deps = [
30+
interop_deps = [
2931
":selection",
3032
"//src/cdk/table",
3133
"//src/cdk/testing/private",
32-
"@npm//@angular/common",
34+
],
35+
deps = [
36+
"//:node_modules/@angular/common",
37+
"//:node_modules/@angular/core",
3338
],
3439
)
3540

‎src/cdk-experimental/table-scroll-container/BUILD.bazel‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
load(
22
"//tools:defaults.bzl",
33
"ng_module",
4-
"ng_test_library",
54
"ng_web_test_suite",
65
)
6+
load("//tools:defaults2.bzl", "ts_project")
77

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

@@ -24,18 +24,22 @@ ng_module(
2424
],
2525
)
2626

27-
ng_test_library(
27+
ts_project(
2828
name = "unit_test_sources",
29+
testonly = True,
2930
srcs = glob(
3031
["**/*.spec.ts"],
3132
exclude = ["**/*.e2e.spec.ts"],
3233
),
33-
deps = [
34+
interop_deps = [
3435
":table-scroll-container",
3536
"//src/cdk/collections",
3637
"//src/cdk/platform",
3738
"//src/cdk/table",
38-
"@npm//rxjs",
39+
],
40+
deps = [
41+
"//:node_modules/@angular/core",
42+
"//:node_modules/rxjs",
3943
],
4044
)
4145

‎src/cdk-experimental/ui-patterns/behaviors/list-focus/BUILD.bazel‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("//tools:defaults.bzl", "ng_test_library", "ng_web_test_suite")
1+
load("//tools:defaults.bzl", "ng_web_test_suite")
22
load("//tools:defaults2.bzl", "ts_project")
33

44
package(default_visibility = ["//visibility:public"])
@@ -15,14 +15,18 @@ ts_project(
1515
],
1616
)
1717

18-
ng_test_library(
18+
ts_project(
1919
name = "unit_test_sources",
20+
testonly = True,
2021
srcs = glob(["**/*.spec.ts"]),
21-
deps = [
22+
interop_deps = [
2223
":list-focus",
2324
"//src/cdk-experimental/ui-patterns/behaviors/list-navigation",
2425
"//src/cdk-experimental/ui-patterns/behaviors/signal-like",
2526
],
27+
deps = [
28+
"//:node_modules/@angular/core",
29+
],
2630
)
2731

2832
ng_web_test_suite(

‎src/cdk-experimental/ui-patterns/behaviors/list-navigation/BUILD.bazel‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("//tools:defaults.bzl", "ng_test_library", "ng_web_test_suite")
1+
load("//tools:defaults.bzl", "ng_web_test_suite")
22
load("//tools:defaults2.bzl", "ts_project")
33

44
package(default_visibility = ["//visibility:public"])
@@ -15,13 +15,17 @@ ts_project(
1515
],
1616
)
1717

18-
ng_test_library(
18+
ts_project(
1919
name = "unit_test_sources",
20+
testonly = True,
2021
srcs = glob(["**/*.spec.ts"]),
21-
deps = [
22+
interop_deps = [
2223
":list-navigation",
2324
"//src/cdk-experimental/ui-patterns/behaviors/signal-like",
2425
],
26+
deps = [
27+
"//:node_modules/@angular/core",
28+
],
2529
)
2630

2731
ng_web_test_suite(

‎src/cdk-experimental/ui-patterns/behaviors/list-selection/BUILD.bazel‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("//tools:defaults.bzl", "ng_test_library", "ng_web_test_suite")
1+
load("//tools:defaults.bzl", "ng_web_test_suite")
22
load("//tools:defaults2.bzl", "ts_project")
33

44
package(default_visibility = ["//visibility:public"])
@@ -16,14 +16,18 @@ ts_project(
1616
],
1717
)
1818

19-
ng_test_library(
19+
ts_project(
2020
name = "unit_test_sources",
21+
testonly = True,
2122
srcs = glob(["**/*.spec.ts"]),
22-
deps = [
23+
interop_deps = [
2324
":list-selection",
2425
"//src/cdk-experimental/ui-patterns/behaviors/list-navigation",
2526
"//src/cdk-experimental/ui-patterns/behaviors/signal-like",
2627
],
28+
deps = [
29+
"//:node_modules/@angular/core",
30+
],
2731
)
2832

2933
ng_web_test_suite(

‎src/cdk-experimental/ui-patterns/behaviors/list-typeahead/BUILD.bazel‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("//tools:defaults.bzl", "ng_test_library", "ng_web_test_suite")
1+
load("//tools:defaults.bzl", "ng_web_test_suite")
22
load("//tools:defaults2.bzl", "ts_project")
33

44
package(default_visibility = ["//visibility:public"])
@@ -16,14 +16,18 @@ ts_project(
1616
],
1717
)
1818

19-
ng_test_library(
19+
ts_project(
2020
name = "unit_test_sources",
21+
testonly = True,
2122
srcs = glob(["**/*.spec.ts"]),
22-
deps = [
23+
interop_deps = [
2324
":list-typeahead",
2425
"//src/cdk-experimental/ui-patterns/behaviors/list-navigation",
2526
"//src/cdk-experimental/ui-patterns/behaviors/signal-like",
2627
],
28+
deps = [
29+
"//:node_modules/@angular/core",
30+
],
2731
)
2832

2933
ng_web_test_suite(

0 commit comments

Comments
 (0)