Skip to content

Commit 62435f6

Browse files
josephperrottthePunderWoman
authored andcommitted
build: migrate benchpress to use rules_js (angular#61486)
Use ts_project to build targets in benchpress package PR Close angular#61486
1 parent e9eba9f commit 62435f6

File tree

4 files changed

+37
-19
lines changed

4 files changed

+37
-19
lines changed

packages/benchpress/BUILD.bazel

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,32 @@
1-
load("//tools:defaults.bzl", "ng_package", "ts_library")
1+
load("@aspect_rules_ts//ts:defs.bzl", rules_js_tsconfig = "ts_config")
2+
load("//tools:defaults.bzl", "ng_package")
3+
load("//tools:defaults2.bzl", "ts_project")
24

35
package(default_visibility = ["//visibility:public"])
46

5-
ts_library(
7+
rules_js_tsconfig(
8+
name = "tsconfig_build",
9+
src = "tsconfig.json",
10+
deps = [
11+
"//:node_modules/@types/node",
12+
"//packages:tsconfig_build",
13+
],
14+
)
15+
16+
ts_project(
617
name = "benchpress",
718
srcs = glob(
819
[
920
"*.ts",
1021
"src/**/*.ts",
1122
],
1223
),
13-
# TODO(alanagius) fix benchpress to compile with es2022
14-
devmode_target = "es2020",
15-
prodmode_target = "es2020",
16-
deps = [
24+
interop_deps = [
1725
"//packages:types",
18-
"//packages/core",
19-
"@npm//@types/node",
20-
"@npm//reflect-metadata",
26+
],
27+
deps = [
28+
"//:node_modules/reflect-metadata",
29+
"//packages/core:core_rjs",
2130
],
2231
)
2332

packages/benchpress/test/BUILD.bazel

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
load("//tools:defaults.bzl", "jasmine_node_test", "ts_library")
1+
load("//tools:defaults.bzl", "jasmine_node_test")
2+
load("//tools:defaults2.bzl", "ts_project")
23

3-
ts_library(
4+
ts_project(
45
name = "test_lib",
56
testonly = True,
67
srcs = glob(["**/*.ts"]),
7-
# TODO(alanagius) fix benchpress to compile with es2022
8-
devmode_target = "es2020",
9-
prodmode_target = "es2020",
10-
deps = [
8+
interop_deps = [
119
"//packages:types",
12-
"//packages/benchpress",
13-
"//packages/core",
14-
"//packages/core/testing",
15-
"@npm//protractor",
10+
],
11+
deps = [
12+
"//:node_modules/protractor",
13+
"//packages/benchpress:benchpress_rjs",
14+
"//packages/core:core_rjs",
15+
"//packages/core/testing:testing_rjs",
1616
],
1717
)
1818

packages/benchpress/tsconfig.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"extends": "../tsconfig-build.json",
3+
"compilerOptions": {
4+
"types": ["node"]
5+
}
6+
}

tools/defaults2.bzl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ def _determine_tsconfig(testonly):
2121
if native.package_name().startswith("packages/core"):
2222
return "//packages/core:tsconfig_test" if testonly else "//packages/core:tsconfig_build"
2323

24+
if native.package_name().startswith("packages/benchpress"):
25+
return "//packages:tsconfig_test" if testonly else "//packages/benchpress:tsconfig_build"
26+
2427
if native.package_name().startswith("packages"):
2528
return "//packages:tsconfig_test" if testonly else "//packages:tsconfig_build"
2629

0 commit comments

Comments
 (0)