Use 'tool' instead of 'command' for js_run_devserver_test

aspect-build · Aug 17, 2023 · 4c5326c · 4c5326c
1 parent d4dd118
commit 4c5326c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -65,9 +65,6 @@ load("@aspect_rules_js//npm:repositories.bzl", "npm_import", "npm_translate_lock
 npm_translate_lock(
     name = "npm",
     bins = {
-        "jasmine": {
-            "jasmine": "./bin/jasmine.js",
-        },
         # derived from "bin" attribute in node_modules/typescript/package.json
         "typescript": {
             "tsc": "./bin/tsc",

diff --git a/js/private/test/js_run_devserver/BUILD b/js/private/test/js_run_devserver/BUILD
@@ -1,4 +1,5 @@
 load("@npm//:defs.bzl", "npm_link_all_packages")
+load("@npm//js/private/test/js_run_devserver:jasmine/package_json.bzl", jasmine_bin = "bin")
 load(":js_run_devserver_test.bzl", "js_run_devserver_test")
 
 npm_link_all_packages(name = "node_modules")
@@ -11,7 +12,6 @@ js_run_devserver_test(
     name = "node_modules_symlink_to_execroot_test",
     args = ["node_modules_symlink_to_execroot.test.mjs"],
     chdir = "js/private/test/js_run_devserver",
-    command = "./node_modules/.bin/jasmine",
     data = [
         "node_modules_symlink_to_execroot.test.mjs",
 
@@ -21,4 +21,9 @@ js_run_devserver_test(
         ":node_modules/@types/node",
         ":node_modules/jasmine",
     ],
+    tool = ":jasmine",
+)
+
+jasmine_bin.jasmine_binary(
+    name = "jasmine",
 )
diff --git a/npm/private/test/repositories_checked.bzl b/npm/private/test/repositories_checked.bzl
@@ -13508,9 +13508,6 @@ def npm_repositories():
             "isexe": ["2.0.0"],
             "shebang-regex": ["3.0.0"],
         },
-        bins = {
-            "jasmine": "./bin/jasmine.js",
-        },
     )
 
     npm_import(