fix: drop .sh extension from js_binary, merger and js_image_layer lau…

…nchers (#1586)
aspect-build · May 20, 2024 · 8776cac · 8776cac
1 parent 7dea55a
commit 8776cac
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/e2e/worker/BUILD.bazel b/e2e/worker/BUILD.bazel
@@ -16,7 +16,7 @@ copy_file(
 )
 
 js_binary(
-    name = "worker",
+    name = "worker_binary",
     data = [":copy_worker_js"],
     entry_point = ":copy_dummy_worker",
     visibility = ["//visibility:public"],

diff --git a/e2e/worker/defs.bzl b/e2e/worker/defs.bzl
@@ -31,7 +31,7 @@ pi_rule = rule(
         "worker": attr.label(
             executable = True,
             cfg = "exec",
-            default = ":worker",
+            default = ":worker_binary",
         ),
     },
 )
diff --git a/examples/coverage/BUILD.bazel b/examples/coverage/BUILD.bazel
@@ -1,7 +1,7 @@
 load("@aspect_rules_js//js:defs.bzl", "js_test")
 
 js_test(
-    name = "coverage",
+    name = "coverage_test",
     data = [
         "coverage.js",
         "//:node_modules/@types/node",

diff --git a/js/private/coverage/merger.bzl b/js/private/coverage/merger.bzl
@@ -32,7 +32,7 @@ def _coverage_merger_impl(ctx):
         node_path = _deprecated_target_tool_path_to_short_path(nodeinfo.target_tool_path)
 
     # Create launcher
-    bash_launcher = ctx.actions.declare_file("%s.sh" % ctx.label.name)
+    bash_launcher = ctx.actions.declare_file(ctx.label.name)
     ctx.actions.expand_template(
         template = ctx.file._launcher_template,
         output = bash_launcher,

diff --git a/js/private/js_binary.bzl b/js/private/js_binary.bzl
@@ -454,7 +454,7 @@ def _bash_launcher(ctx, nodeinfo, entry_point_path, log_prefix_rule_set, log_pre
         "{{workspace_name}}": ctx.workspace_name,
     }
 
-    launcher = ctx.actions.declare_file("%s.sh" % ctx.label.name)
+    launcher = ctx.actions.declare_file(ctx.label.name)
     ctx.actions.expand_template(
         template = ctx.file._launcher_template,
         output = launcher,

diff --git a/js/private/test/image/checksum.expected b/js/private/test/image/checksum.expected
@@ -1,2 +1,2 @@
-02fec6c845b4f8277d6664c269a90f5016436bda728fae57e7b3ee113f8b6381  js/private/test/image/cksum_app.tar
+6477f43b8663b593b7eb3ba50f7b617849eca2d2ecccdba37a92b0c9faf1226c  js/private/test/image/cksum_app.tar
 813d54ae63067f19103e13f616726ff1f32cf8d51e27789b8d31415300f0a69e  js/private/test/image/cksum_node_modules.tar
diff --git a/js/private/test/image/custom_owner_app.listing b/js/private/test/image/custom_owner_app.listing
@@ -3,14 +3,14 @@ drwxr-xr-x 100/0             0 1970-01-01 00:00 app/js
 drwxr-xr-x 100/0             0 1970-01-01 00:00 app/js/private
 drwxr-xr-x 100/0             0 1970-01-01 00:00 app/js/private/test
 drwxr-xr-x 100/0             0 1970-01-01 00:00 app/js/private/test/image
--r-xr-xr-x 100/0           134 1970-01-01 00:00 app/js/private/test/image/bin
+-r-xr-xr-x 100/0           131 1970-01-01 00:00 app/js/private/test/image/bin
 drwxr-xr-x 100/0             0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles
 drwxr-xr-x 100/0             0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js
 drwxr-xr-x 100/0             0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js
 drwxr-xr-x 100/0             0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private
 drwxr-xr-x 100/0             0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private/test
 drwxr-xr-x 100/0             0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private/test/image
--r-xr-xr-x 100/0         23953 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private/test/image/bin.sh
+-r-xr-xr-x 100/0         24130 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private/test/image/bin
 drwxr-xr-x 100/0             0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private/test/image/bin_node_bin
 -r-xr-xr-x 100/0           133 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private/test/image/bin_node_bin/node
 -r-xr-xr-x 100/0            20 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private/test/image/main.js
diff --git a/js/private/test/image/default_app.listing b/js/private/test/image/default_app.listing
@@ -3,14 +3,14 @@ drwxr-xr-x 0/0               0 1970-01-01 00:00 app/js
 drwxr-xr-x 0/0               0 1970-01-01 00:00 app/js/private
 drwxr-xr-x 0/0               0 1970-01-01 00:00 app/js/private/test
 drwxr-xr-x 0/0               0 1970-01-01 00:00 app/js/private/test/image
--r-xr-xr-x 0/0             134 1970-01-01 00:00 app/js/private/test/image/bin
+-r-xr-xr-x 0/0             131 1970-01-01 00:00 app/js/private/test/image/bin
 drwxr-xr-x 0/0               0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles
 drwxr-xr-x 0/0               0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js
 drwxr-xr-x 0/0               0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js
 drwxr-xr-x 0/0               0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private
 drwxr-xr-x 0/0               0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private/test
 drwxr-xr-x 0/0               0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private/test/image
--r-xr-xr-x 0/0           23953 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private/test/image/bin.sh
+-r-xr-xr-x 0/0           24130 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private/test/image/bin
 drwxr-xr-x 0/0               0 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private/test/image/bin_node_bin
 -r-xr-xr-x 0/0             133 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private/test/image/bin_node_bin/node
 -r-xr-xr-x 0/0              20 1970-01-01 00:00 app/js/private/test/image/bin.runfiles/aspect_rules_js/js/private/test/image/main.js