Skip to content

Commit 38b91e7

Browse files
committed
build: migrate nodejs_test targets to rules_js
Migrates `nodejs_test` targets to `rules_js`.
1 parent 9ce713b commit 38b91e7

File tree

3 files changed

+11
-14
lines changed

3 files changed

+11
-14
lines changed

integration/linker/BUILD.bazel

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_test")
1+
load("@aspect_rules_js//js:defs.bzl", "js_test")
22

33
# Test which ensures that specified NPM packages can be transformed from their partial
44
# declarations to definitions using the `@angular/compiler-cli` linker babel plugin.
5-
nodejs_test(
5+
js_test(
66
name = "linker",
77
data = [
88
"link-packages-test.mjs",
9+
"//:node_modules/@angular/compiler-cli",
10+
"//:node_modules/@babel/core",
11+
"//:node_modules/chalk",
12+
"//:node_modules/glob",
913
"//integration:npm-packages-from-runfiles",
1014
"//src/cdk:npm_package",
1115
"//src/cdk-experimental:npm_package",
1216
"//src/google-maps:npm_package",
1317
"//src/material:npm_package",
1418
"//src/material-experimental:npm_package",
1519
"//src/youtube-player:npm_package",
16-
"@npm//@angular/compiler-cli",
17-
"@npm//@babel/core",
18-
"@npm//chalk",
19-
"@npm//glob",
2020
],
2121
entry_point = "link-packages-test.mjs",
2222
)

integration/linker/link-packages-test.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ if (failedPackages) {
4747
// uses exit code `3` to indicate non-fatal test failures.
4848
process.exitCode = 3;
4949
} else {
50-
console.info(chalk.green('✓ All packages have been successfully linked.'));
50+
console.info(chalk.green(`✓ All packages have been successfully linked: ${npmPackages.length}`));
5151
}
5252

5353
/**

tools/server-test/index.bzl

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_test")
1+
load("@aspect_rules_js//js:defs.bzl", "js_test")
22

33
"""
44
Runs a given test together with the specified server. The server executable is expected
@@ -7,12 +7,9 @@ load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_test")
77
"""
88

99
def server_test(server, test, **kwargs):
10-
nodejs_test(
11-
data = [server, test, "//tools/server-test:test_runner_lib_legacy"],
10+
js_test(
11+
data = [server, test, "//tools/server-test:test_runner_lib"],
1212
args = ["$(rootpath %s)" % server, "$(rootpath %s)" % test],
13-
entry_point = "//tools/server-test:test-runner.ts",
14-
# TODO(josephperrott): update dependency usages to no longer need bazel patch module resolver
15-
# See: https://github.com/bazelbuild/rules_nodejs/wiki#--bazel_patch_module_resolver-now-defaults-to-false-2324
16-
templated_args = ["--bazel_patch_module_resolver"],
13+
entry_point = "//tools/server-test:test-runner.js",
1714
**kwargs
1815
)

0 commit comments

Comments
 (0)