Skip to content

Commit 77d2a7c

Browse files
devversionkirjs
devversion
authored and
kirjs
committed
build: migrate all modules/... code to ts_project (#61779)
Migrates all `modules/...` code to `ts_project`. PR Close #61779
1 parent 5fce27d commit 77d2a7c

17 files changed

Lines changed: 173 additions & 121 deletions

File tree

‎modules/benchmarks/BUILD.bazel‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
load("//tools:defaults2.bzl", "ts_config")
22

3-
package(default_visibility = ["//visibility:public"])
4-
5-
exports_files([
6-
"tsconfig-build.json",
7-
"tsconfig-e2e.json",
8-
])
3+
package(default_visibility = ["//modules/benchmarks:__subpackages__"])
94

105
ts_config(
116
name = "tsconfig_build",

‎modules/benchmarks/src/change_detection/BUILD.bazel‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
load("//tools:defaults.bzl", "ts_library")
21
load("//tools:defaults2.bzl", "ts_project")
32

43
package(default_visibility = ["//visibility:public"])
@@ -10,24 +9,28 @@ ts_project(
109
deps = ["//modules/benchmarks/src:util_lib_rjs"],
1110
)
1211

13-
ts_library(
12+
ts_project(
1413
name = "perf_tests_lib",
1514
testonly = 1,
1615
srcs = ["change_detection.perf-spec.ts"],
17-
tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
18-
deps = [
16+
interop_deps = [
1917
"@npm//@angular/build-tooling/bazel/benchmark/driver-utilities",
20-
"@npm//protractor",
18+
],
19+
tsconfig = "//modules/benchmarks:tsconfig_e2e",
20+
deps = [
21+
"//:node_modules/protractor",
2122
],
2223
)
2324

24-
ts_library(
25+
ts_project(
2526
name = "e2e_tests_lib",
2627
testonly = 1,
2728
srcs = ["change_detection.e2e-spec.ts"],
28-
tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
29-
deps = [
29+
interop_deps = [
3030
"@npm//@angular/build-tooling/bazel/benchmark/driver-utilities",
31-
"@npm//protractor",
31+
],
32+
tsconfig = "//modules/benchmarks:tsconfig_e2e",
33+
deps = [
34+
"//:node_modules/protractor",
3235
],
3336
)

‎modules/benchmarks/src/defer/BUILD.bazel‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
load("//tools:defaults.bzl", "ts_library")
2-
load("//tools:defaults2.bzl", "ng_project")
1+
load("//tools:defaults2.bzl", "ng_project", "ts_project")
32

43
package(default_visibility = ["//visibility:public"])
54

@@ -16,24 +15,28 @@ ng_project(
1615
],
1716
)
1817

19-
ts_library(
18+
ts_project(
2019
name = "perf_tests_lib",
2120
testonly = 1,
2221
srcs = ["defer.perf-spec.ts"],
23-
tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
24-
deps = [
22+
interop_deps = [
2523
"@npm//@angular/build-tooling/bazel/benchmark/driver-utilities",
26-
"@npm//protractor",
24+
],
25+
tsconfig = "//modules/benchmarks:tsconfig_e2e",
26+
deps = [
27+
"//:node_modules/protractor",
2728
],
2829
)
2930

30-
ts_library(
31+
ts_project(
3132
name = "e2e_tests_lib",
3233
testonly = 1,
3334
srcs = ["defer.e2e-spec.ts"],
34-
tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
35-
deps = [
35+
interop_deps = [
3636
"@npm//@angular/build-tooling/bazel/benchmark/driver-utilities",
37-
"@npm//protractor",
37+
],
38+
tsconfig = "//modules/benchmarks:tsconfig_e2e",
39+
deps = [
40+
"//:node_modules/protractor",
3841
],
3942
)

‎modules/benchmarks/src/expanding_rows/BUILD.bazel‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
load("@npm//@angular/build-tooling/bazel/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
22
load("@rules_angular//src/optimization:index.bzl", "optimize_angular_app")
3-
load("//tools:defaults.bzl", "http_server", "ts_library")
3+
load("//tools:defaults.bzl", "http_server")
4+
load("//tools:defaults2.bzl", "ts_project")
45

56
package(default_visibility = ["//modules/benchmarks:__subpackages__"])
67

@@ -31,14 +32,16 @@ genrule(
3132
cmd = "cp $</main.js $@",
3233
)
3334

34-
ts_library(
35+
ts_project(
3536
name = "perf_lib",
3637
testonly = 1,
3738
srcs = ["expanding_rows.perf-spec.ts"],
38-
tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
39-
deps = [
39+
interop_deps = [
4040
"@npm//@angular/build-tooling/bazel/benchmark/driver-utilities",
41-
"@npm//protractor",
41+
],
42+
tsconfig = "//modules/benchmarks:tsconfig_e2e",
43+
deps = [
44+
"//:node_modules/protractor",
4245
],
4346
)
4447

‎modules/benchmarks/src/hydration/BUILD.bazel‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
load("//tools:defaults.bzl", "ts_library")
2-
load("//tools:defaults2.bzl", "ng_project")
1+
load("//tools:defaults2.bzl", "ng_project", "ts_project")
32

43
package(default_visibility = ["//visibility:public"])
54

@@ -20,24 +19,28 @@ ng_project(
2019
],
2120
)
2221

23-
ts_library(
22+
ts_project(
2423
name = "perf_tests_lib",
2524
testonly = 1,
2625
srcs = ["hydration.perf-spec.ts"],
27-
tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
28-
deps = [
26+
interop_deps = [
2927
"@npm//@angular/build-tooling/bazel/benchmark/driver-utilities",
30-
"@npm//protractor",
28+
],
29+
tsconfig = "//modules/benchmarks:tsconfig_e2e",
30+
deps = [
31+
"//:node_modules/protractor",
3132
],
3233
)
3334

34-
ts_library(
35+
ts_project(
3536
name = "e2e_tests_lib",
3637
testonly = 1,
3738
srcs = ["hydration.e2e-spec.ts"],
38-
tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
39-
deps = [
39+
interop_deps = [
4040
"@npm//@angular/build-tooling/bazel/benchmark/driver-utilities",
41-
"@npm//protractor",
41+
],
42+
tsconfig = "//modules/benchmarks:tsconfig_e2e",
43+
deps = [
44+
"//:node_modules/protractor",
4245
],
4346
)

‎modules/benchmarks/src/largeform/BUILD.bazel‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,29 @@
1-
load("//tools:defaults.bzl", "ts_library")
1+
load("//tools:defaults2.bzl", "ts_project")
22

33
package(default_visibility = ["//modules/benchmarks:__subpackages__"])
44

5-
ts_library(
5+
ts_project(
66
name = "perf_tests_lib",
77
testonly = 1,
88
srcs = ["largeform.perf-spec.ts"],
9-
tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
10-
deps = [
9+
interop_deps = [
1110
"@npm//@angular/build-tooling/bazel/benchmark/driver-utilities",
12-
"@npm//protractor",
11+
],
12+
tsconfig = "//modules/benchmarks:tsconfig_e2e",
13+
deps = [
14+
"//:node_modules/protractor",
1315
],
1416
)
1517

16-
ts_library(
18+
ts_project(
1719
name = "e2e_tests_lib",
1820
testonly = 1,
1921
srcs = ["largeform.e2e-spec.ts"],
20-
tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
21-
deps = [
22+
interop_deps = [
2223
"@npm//@angular/build-tooling/bazel/benchmark/driver-utilities",
23-
"@npm//protractor",
24+
],
25+
tsconfig = "//modules/benchmarks:tsconfig_e2e",
26+
deps = [
27+
"//:node_modules/protractor",
2428
],
2529
)

‎modules/benchmarks/src/largetable/BUILD.bazel‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
load("//tools:defaults.bzl", "ts_library")
21
load("//tools:defaults2.bzl", "ts_project")
32

43
package(default_visibility = ["//visibility:public"])
@@ -10,24 +9,28 @@ ts_project(
109
deps = ["//modules/benchmarks/src:util_lib_rjs"],
1110
)
1211

13-
ts_library(
12+
ts_project(
1413
name = "perf_tests_lib",
1514
testonly = 1,
1615
srcs = ["largetable.perf-spec.ts"],
17-
tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
18-
deps = [
16+
interop_deps = [
1917
"@npm//@angular/build-tooling/bazel/benchmark/driver-utilities",
20-
"@npm//protractor",
18+
],
19+
tsconfig = "//modules/benchmarks:tsconfig_e2e",
20+
deps = [
21+
"//:node_modules/protractor",
2122
],
2223
)
2324

24-
ts_library(
25+
ts_project(
2526
name = "e2e_tests_lib",
2627
testonly = 1,
2728
srcs = ["largetable.e2e-spec.ts"],
28-
tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
29-
deps = [
29+
interop_deps = [
3030
"@npm//@angular/build-tooling/bazel/benchmark/driver-utilities",
31-
"@npm//protractor",
31+
],
32+
tsconfig = "//modules/benchmarks:tsconfig_e2e",
33+
deps = [
34+
"//:node_modules/protractor",
3235
],
3336
)

‎modules/benchmarks/src/ng_template_outlet_context/BUILD.bazel‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
load("//tools:defaults.bzl", "ts_library")
1+
load("//tools:defaults2.bzl", "ts_project")
22

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

5-
ts_library(
5+
ts_project(
66
name = "perf_lib",
77
testonly = True,
88
srcs = ["ng_template_outlet_context.perf-spec.ts"],
9-
tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
10-
deps = [
9+
interop_deps = [
1110
"@npm//@angular/build-tooling/bazel/benchmark/driver-utilities",
12-
"@npm//protractor",
11+
],
12+
tsconfig = "//modules/benchmarks:tsconfig_e2e",
13+
deps = [
14+
"//:node_modules/protractor",
1315
],
1416
)

‎modules/benchmarks/src/styling/BUILD.bazel‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
load("//tools:defaults.bzl", "ts_library")
1+
load("//tools:defaults2.bzl", "ts_project")
22

33
package(default_visibility = ["//modules/benchmarks:__subpackages__"])
44

5-
ts_library(
5+
ts_project(
66
name = "tests_lib",
77
testonly = True,
88
srcs = ["styling_perf.spec.ts"],
9-
tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
10-
deps = [
9+
interop_deps = [
1110
"@npm//@angular/build-tooling/bazel/benchmark/driver-utilities",
12-
"@npm//protractor",
11+
],
12+
tsconfig = "//modules/benchmarks:tsconfig_e2e",
13+
deps = [
14+
"//:node_modules/protractor",
1315
],
1416
)

‎modules/benchmarks/src/tree/BUILD.bazel‎

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

43
package(default_visibility = ["//visibility:public"])
@@ -10,57 +9,59 @@ ts_project(
109
deps = ["//modules/benchmarks/src:util_lib_rjs"],
1110
)
1211

13-
ts_library(
12+
ts_project(
1413
name = "test_utils_lib",
1514
testonly = 1,
1615
srcs = ["test_utils.ts"],
17-
tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
18-
deps = [
16+
interop_deps = [
1917
"@npm//@angular/build-tooling/bazel/benchmark/driver-utilities",
20-
"@npm//protractor",
18+
],
19+
tsconfig = "//modules/benchmarks:tsconfig_e2e",
20+
deps = [
21+
"//:node_modules/protractor",
2122
],
2223
)
2324

24-
ts_library(
25+
ts_project(
2526
name = "perf_tests_lib",
2627
testonly = 1,
2728
srcs = ["tree.perf-spec.ts"],
28-
tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
29+
tsconfig = "//modules/benchmarks:tsconfig_e2e",
2930
deps = [
30-
":test_utils_lib",
31-
"@npm//protractor",
31+
":test_utils_lib_rjs",
32+
"//:node_modules/protractor",
3233
],
3334
)
3435

35-
ts_library(
36+
ts_project(
3637
name = "e2e_tests_lib",
3738
testonly = 1,
3839
srcs = ["tree.e2e-spec.ts"],
39-
tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
40+
tsconfig = "//modules/benchmarks:tsconfig_e2e",
4041
deps = [
41-
":test_utils_lib",
42-
"@npm//protractor",
42+
":test_utils_lib_rjs",
43+
"//:node_modules/protractor",
4344
],
4445
)
4546

46-
ts_library(
47+
ts_project(
4748
name = "detect_changes_perf_tests_lib",
4849
testonly = 1,
4950
srcs = ["tree_detect_changes.perf-spec.ts"],
50-
tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
51+
tsconfig = "//modules/benchmarks:tsconfig_e2e",
5152
deps = [
52-
":test_utils_lib",
53-
"@npm//protractor",
53+
":test_utils_lib_rjs",
54+
"//:node_modules/protractor",
5455
],
5556
)
5657

57-
ts_library(
58+
ts_project(
5859
name = "detect_changes_e2e_tests_lib",
5960
testonly = 1,
6061
srcs = ["tree_detect_changes.e2e-spec.ts"],
61-
tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
62+
tsconfig = "//modules/benchmarks:tsconfig_e2e",
6263
deps = [
63-
":test_utils_lib",
64-
"@npm//protractor",
64+
":test_utils_lib_rjs",
65+
"//:node_modules/protractor",
6566
],
6667
)

0 commit comments

Comments
 (0)