Skip to content

Commit 5d27e7c

Browse files
devversiondevversion
committed
build: remove interop_deps
This commit combines `interop_deps` with `deps`; as we are in the stage where the interop is no longer the default; but rather opt-in via a `_legacy` suffix (until we migrate consuming rules further).
1 parent 81c39da commit 5d27e7c

File tree

277 files changed

+1236
-1964
lines changed

Some content is hidden

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

277 files changed

+1236
-1964
lines changed

‎integration/module-tests/index.bzl

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def module_test(name, npm_packages, skipped_entry_points = [], additional_deps =
1515
name = "test",
1616
data = [
1717
":%s_config" % name,
18-
"//integration/module-tests:test_lib_rjs",
18+
"//integration/module-tests:test_lib",
1919
"//:node_modules/@angular/common",
2020
"//:node_modules/@angular/core",
2121
] + additional_deps + [pkg[0] for pkg in npm_packages.items()],

‎src/cdk-experimental/BUILD.bazel

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
load("//src/cdk-experimental:config.bzl", "CDK_EXPERIMENTAL_TARGETS")
22
load("//tools:defaults.bzl", "ng_package")
33
load("//tools:defaults2.bzl", "ts_project")
4+
load("//tools/bazel:legacy_target.bzl", "get_legacy_label")
45

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

@@ -17,5 +18,5 @@ ng_package(
1718
name = "npm_package",
1819
srcs = ["package.json"],
1920
tags = ["release-package"],
20-
deps = CDK_EXPERIMENTAL_TARGETS,
21+
deps = [get_legacy_label(t) for t in CDK_EXPERIMENTAL_TARGETS],
2122
)

‎src/cdk-experimental/column-resize/BUILD.bazel

+4-6
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ ng_project(
88
["**/*.ts"],
99
exclude = ["**/*.spec.ts"],
1010
),
11-
interop_deps = [
11+
deps = [
12+
"//:node_modules/@angular/common",
13+
"//:node_modules/@angular/core",
14+
"//:node_modules/rxjs",
1215
"//src/cdk-experimental/popover-edit",
1316
"//src/cdk/bidi",
1417
"//src/cdk/coercion",
@@ -17,9 +20,4 @@ ng_project(
1720
"//src/cdk/portal",
1821
"//src/cdk/table",
1922
],
20-
deps = [
21-
"//:node_modules/@angular/common",
22-
"//:node_modules/@angular/core",
23-
"//:node_modules/rxjs",
24-
],
2523
)

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

+6-10
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,15 @@ ng_project(
99
["**/*.ts"],
1010
exclude = ["**/*.spec.ts"],
1111
),
12-
interop_deps = [
12+
deps = [
13+
"//:node_modules/@angular/common",
14+
"//:node_modules/@angular/core",
1315
"//src:dev_mode_types",
1416
"//src/cdk/a11y",
1517
"//src/cdk/bidi",
1618
"//src/cdk/collections",
1719
"//src/cdk/overlay",
1820
],
19-
deps = [
20-
"//:node_modules/@angular/common",
21-
"//:node_modules/@angular/core",
22-
],
2321
)
2422

2523
ts_project(
@@ -29,14 +27,12 @@ ts_project(
2927
["**/*.spec.ts"],
3028
exclude = ["**/*.e2e.spec.ts"],
3129
),
32-
interop_deps = [
33-
":combobox",
34-
"//src/cdk/keycodes",
35-
"//src/cdk/testing/private",
36-
],
3730
deps = [
31+
":combobox",
3832
"//:node_modules/@angular/core",
3933
"//:node_modules/@angular/platform-browser",
34+
"//src/cdk/keycodes",
35+
"//src/cdk/testing/private",
4036
],
4137
)
4238

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

+2-4
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,10 @@ ng_project(
88
["**/*.ts"],
99
exclude = ["**/*.spec.ts"],
1010
),
11-
interop_deps = [
11+
deps = [
12+
"//:node_modules/@angular/core",
1213
"//src/cdk-experimental/ui-patterns",
1314
"//src/cdk/a11y",
1415
"//src/cdk/bidi",
1516
],
16-
deps = [
17-
"//:node_modules/@angular/core",
18-
],
1917
)

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

+10-14
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,18 @@ ng_project(
99
["**/*.ts"],
1010
exclude = ["**/*.spec.ts"],
1111
),
12-
interop_deps = [
12+
deps = [
13+
"//:node_modules/@angular/common",
14+
"//:node_modules/@angular/core",
15+
"//:node_modules/@angular/forms",
16+
"//:node_modules/rxjs",
1317
"//src/cdk/a11y",
1418
"//src/cdk/bidi",
1519
"//src/cdk/keycodes",
1620
"//src/cdk/overlay",
1721
"//src/cdk/portal",
1822
"//src/cdk/scrolling",
1923
],
20-
deps = [
21-
"//:node_modules/@angular/common",
22-
"//:node_modules/@angular/core",
23-
"//:node_modules/@angular/forms",
24-
"//:node_modules/rxjs",
25-
],
2624
)
2725

2826
ts_project(
@@ -32,21 +30,19 @@ ts_project(
3230
["**/*.spec.ts"],
3331
exclude = ["**/*.e2e.spec.ts"],
3432
),
35-
interop_deps = [
33+
deps = [
3634
":popover-edit",
35+
"//:node_modules/@angular/common",
36+
"//:node_modules/@angular/core",
37+
"//:node_modules/@angular/forms",
38+
"//:node_modules/rxjs",
3739
"//src/cdk/bidi",
3840
"//src/cdk/collections",
3941
"//src/cdk/keycodes",
4042
"//src/cdk/overlay",
4143
"//src/cdk/table",
4244
"//src/cdk/testing/private",
4345
],
44-
deps = [
45-
"//:node_modules/@angular/common",
46-
"//:node_modules/@angular/core",
47-
"//:node_modules/@angular/forms",
48-
"//:node_modules/rxjs",
49-
],
5046
)
5147

5248
ng_web_test_suite(

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

+6-10
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,14 @@ ng_project(
1010
["**/*.ts"],
1111
exclude = ["**/*.spec.ts"],
1212
),
13-
interop_deps = [
13+
deps = [
14+
"//:node_modules/@angular/core",
15+
"//:node_modules/rxjs",
1416
"//src:dev_mode_types",
1517
"//src/cdk/coercion",
1618
"//src/cdk/collections",
1719
"//src/cdk/scrolling",
1820
],
19-
deps = [
20-
"//:node_modules/@angular/core",
21-
"//:node_modules/rxjs",
22-
],
2321
)
2422

2523
ts_project(
@@ -29,12 +27,10 @@ ts_project(
2927
["**/*.spec.ts"],
3028
exclude = ["**/*.e2e.spec.ts"],
3129
),
32-
interop_deps = [
33-
":scrolling",
34-
"//src/cdk/scrolling",
35-
],
3630
deps = [
31+
":scrolling",
3732
"//:node_modules/@angular/core",
33+
"//src/cdk/scrolling",
3834
],
3935
)
4036

@@ -56,6 +52,6 @@ ts_project(
5652
e2e_test_suite(
5753
name = "e2e_tests",
5854
deps = [
59-
":e2e_test_sources",
55+
":e2e_test_sources_legacy",
6056
],
6157
)

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

+7-11
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,15 @@ ng_project(
99
["**/*.ts"],
1010
exclude = ["**/*.spec.ts"],
1111
),
12-
interop_deps = [
13-
"//src:dev_mode_types",
14-
"//src/cdk/coercion",
15-
"//src/cdk/collections",
16-
"//src/cdk/table",
17-
],
1812
deps = [
1913
"//:node_modules/@angular/common",
2014
"//:node_modules/@angular/core",
2115
"//:node_modules/@angular/forms",
2216
"//:node_modules/rxjs",
17+
"//src:dev_mode_types",
18+
"//src/cdk/coercion",
19+
"//src/cdk/collections",
20+
"//src/cdk/table",
2321
],
2422
)
2523

@@ -30,14 +28,12 @@ ts_project(
3028
["**/*.spec.ts"],
3129
exclude = ["**/*.e2e.spec.ts"],
3230
),
33-
interop_deps = [
34-
":selection",
35-
"//src/cdk/table",
36-
"//src/cdk/testing/private",
37-
],
3831
deps = [
32+
":selection",
3933
"//:node_modules/@angular/common",
4034
"//:node_modules/@angular/core",
35+
"//src/cdk/table",
36+
"//src/cdk/testing/private",
4137
],
4238
)
4339

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

+7-11
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,14 @@ ng_project(
1212
["**/*.ts"],
1313
exclude = ["**/*.spec.ts"],
1414
),
15-
interop_deps = [
16-
"//src/cdk/a11y",
17-
"//src/cdk/bidi",
18-
"//src/cdk/platform",
19-
"//src/cdk/table",
20-
],
2115
deps = [
2216
"//:node_modules/@angular/common",
2317
"//:node_modules/@angular/core",
2418
"//:node_modules/rxjs",
19+
"//src/cdk/a11y",
20+
"//src/cdk/bidi",
21+
"//src/cdk/platform",
22+
"//src/cdk/table",
2523
],
2624
)
2725

@@ -32,16 +30,14 @@ ts_project(
3230
["**/*.spec.ts"],
3331
exclude = ["**/*.e2e.spec.ts"],
3432
),
35-
interop_deps = [
33+
deps = [
3634
":table-scroll-container",
35+
"//:node_modules/@angular/core",
36+
"//:node_modules/rxjs",
3737
"//src/cdk/collections",
3838
"//src/cdk/platform",
3939
"//src/cdk/table",
4040
],
41-
deps = [
42-
"//:node_modules/@angular/core",
43-
"//:node_modules/rxjs",
44-
],
4541
)
4642

4743
ng_web_test_suite(

‎src/cdk-experimental/ui-patterns/BUILD.bazel

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ts_project(
1010
),
1111
deps = [
1212
"//:node_modules/@angular/core",
13-
"//src/cdk-experimental/ui-patterns/behaviors/signal-like:signal-like_rjs",
14-
"//src/cdk-experimental/ui-patterns/listbox:listbox_rjs",
13+
"//src/cdk-experimental/ui-patterns/behaviors/signal-like",
14+
"//src/cdk-experimental/ui-patterns/listbox",
1515
],
1616
)

‎src/cdk-experimental/ui-patterns/behaviors/event-manager/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ ts_project(
99
exclude = ["**/*.spec.ts"],
1010
),
1111
deps = [
12-
"//src/cdk-experimental/ui-patterns/behaviors/signal-like:signal-like_rjs",
12+
"//src/cdk-experimental/ui-patterns/behaviors/signal-like",
1313
],
1414
)

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

+4-6
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,21 @@ ts_project(
1010
exclude = ["**/*.spec.ts"],
1111
),
1212
deps = [
13-
"//src/cdk-experimental/ui-patterns/behaviors/list-navigation:list-navigation_rjs",
14-
"//src/cdk-experimental/ui-patterns/behaviors/signal-like:signal-like_rjs",
13+
"//src/cdk-experimental/ui-patterns/behaviors/list-navigation",
14+
"//src/cdk-experimental/ui-patterns/behaviors/signal-like",
1515
],
1616
)
1717

1818
ts_project(
1919
name = "unit_test_sources",
2020
testonly = True,
2121
srcs = glob(["**/*.spec.ts"]),
22-
interop_deps = [
22+
deps = [
2323
":list-focus",
24+
"//:node_modules/@angular/core",
2425
"//src/cdk-experimental/ui-patterns/behaviors/list-navigation",
2526
"//src/cdk-experimental/ui-patterns/behaviors/signal-like",
2627
],
27-
deps = [
28-
"//:node_modules/@angular/core",
29-
],
3028
)
3129

3230
ng_web_test_suite(

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

+3-5
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,18 @@ ts_project(
1111
),
1212
deps = [
1313
"//:node_modules/@angular/core",
14-
"//src/cdk-experimental/ui-patterns/behaviors/signal-like:signal-like_rjs",
14+
"//src/cdk-experimental/ui-patterns/behaviors/signal-like",
1515
],
1616
)
1717

1818
ts_project(
1919
name = "unit_test_sources",
2020
testonly = True,
2121
srcs = glob(["**/*.spec.ts"]),
22-
interop_deps = [
23-
":list-navigation",
24-
"//src/cdk-experimental/ui-patterns/behaviors/signal-like",
25-
],
2622
deps = [
23+
":list-navigation",
2724
"//:node_modules/@angular/core",
25+
"//src/cdk-experimental/ui-patterns/behaviors/signal-like",
2826
],
2927
)
3028

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

+4-6
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,21 @@ ts_project(
1111
),
1212
deps = [
1313
"//:node_modules/@angular/core",
14-
"//src/cdk-experimental/ui-patterns/behaviors/list-navigation:list-navigation_rjs",
15-
"//src/cdk-experimental/ui-patterns/behaviors/signal-like:signal-like_rjs",
14+
"//src/cdk-experimental/ui-patterns/behaviors/list-navigation",
15+
"//src/cdk-experimental/ui-patterns/behaviors/signal-like",
1616
],
1717
)
1818

1919
ts_project(
2020
name = "unit_test_sources",
2121
testonly = True,
2222
srcs = glob(["**/*.spec.ts"]),
23-
interop_deps = [
23+
deps = [
2424
":list-selection",
25+
"//:node_modules/@angular/core",
2526
"//src/cdk-experimental/ui-patterns/behaviors/list-navigation",
2627
"//src/cdk-experimental/ui-patterns/behaviors/signal-like",
2728
],
28-
deps = [
29-
"//:node_modules/@angular/core",
30-
],
3129
)
3230

3331
ng_web_test_suite(

0 commit comments

Comments
 (0)