From 9584050c611aa69c489ce1c85552f3f9837acbd7 Mon Sep 17 00:00:00 2001 From: Alan Agius <17563226+alan-agius4@users.noreply.github.com> Date: Thu, 12 Mar 2026 09:12:13 +0000 Subject: [PATCH] refactor: use native `wtr.wtr_test` rule This now can be used as the issue was fixed upstream. --- bazel/rules/rules_browsers/wtr/BUILD.bazel | 2 -- bazel/rules/rules_browsers/wtr/index.bzl | 8 ++------ bazel/rules/rules_browsers/wtr/wtr_runner.mjs | 11 ----------- 3 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 bazel/rules/rules_browsers/wtr/wtr_runner.mjs diff --git a/bazel/rules/rules_browsers/wtr/BUILD.bazel b/bazel/rules/rules_browsers/wtr/BUILD.bazel index 88c2e76c4..87b075376 100644 --- a/bazel/rules/rules_browsers/wtr/BUILD.bazel +++ b/bazel/rules/rules_browsers/wtr/BUILD.bazel @@ -8,5 +8,3 @@ js_library( "wtr.config.mjs", ], ) - -exports_files(["wtr_runner.mjs"]) diff --git a/bazel/rules/rules_browsers/wtr/index.bzl b/bazel/rules/rules_browsers/wtr/index.bzl index ef101ef82..effab269a 100644 --- a/bazel/rules/rules_browsers/wtr/index.bzl +++ b/bazel/rules/rules_browsers/wtr/index.bzl @@ -1,4 +1,4 @@ -load("@aspect_rules_js//js:defs.bzl", "js_test") +load("@npm_rules_browsers//:@web/test-runner/package_json.bzl", wtr = "bin") def _base_wtr_test(name, mode, deps, tags = [], **kwargs): is_firefox = mode == "firefox" @@ -31,13 +31,9 @@ def _base_wtr_test(name, mode, deps, tags = [], **kwargs): env = {"MANUAL_MODE": "1"} extra_tags += ["requires-network", "manual"] - # TODO(alanagius): Switch to `load("@npm_rules_browsers//:@web/test-runner/package_json.bzl", wtr = "bin")` once https://github.com/aspect-build/rules_js/commit/49201d1a4d362a3bf745b257fbf8d1f032e198c7#diff-b39b101d15f6349ce1a186d027b55e14d7e68f36604acf434d4e3f125f2c5519R86-R87 is fixed. - js_test( + wtr.wtr_test( name = name, - entry_point = Label(":wtr_runner.mjs"), - copy_data_to_bin = False, data = browser_deps + deps + [ - Label("//:node_modules/@web/test-runner"), Label("//:node_modules/@web/test-runner-core"), Label("//:node_modules/@web/test-runner-puppeteer"), Label("//:node_modules/get-port"), diff --git a/bazel/rules/rules_browsers/wtr/wtr_runner.mjs b/bazel/rules/rules_browsers/wtr/wtr_runner.mjs deleted file mode 100644 index 07a99168f..000000000 --- a/bazel/rules/rules_browsers/wtr/wtr_runner.mjs +++ /dev/null @@ -1,11 +0,0 @@ -/** - * @license - * Copyright Google LLC All Rights Reserved. - * - * Use of this source code is governed by an MIT-style license that can be - * found in the LICENSE file at https://angular.dev/license - */ - -// Workaround for https://github.com/aspect-build/rules_js/commit/49201d1a4d362a3bf745b257fbf8d1f032e198c7#diff-b39b101d15f6349ce1a186d027b55e14d7e68f36604acf434d4e3f125f2c5519R86-R87 -import {startTestRunner} from '@web/test-runner'; -startTestRunner();