Adopt new NodeJS runtime toolchain

js_binary should use the new runtime toolchain to avoid execution toolchain being leaked into target environments (eg.,  js_image_oci)

See bazel-contrib/rules_nodejs#3854

Author: guw

MODULE.bazel

@@ -13,7 +13,7 @@ bazel_dep(name = "aspect_tools_telemetry", version = "0.2.8")
 bazel_dep(name = "bazel_features", version = "1.9.0")
 bazel_dep(name = "bazel_skylib", version = "1.5.0")
 bazel_dep(name = "platforms", version = "0.0.5")
-bazel_dep(name = "rules_nodejs", version = "6.3.0")
+bazel_dep(name = "rules_nodejs", version = "6.6.0")
 
 tel = use_extension("@aspect_tools_telemetry//:extension.bzl", "telemetry")
 use_repo(tel, "aspect_tools_telemetry_report")
@@ -58,10 +58,10 @@ bazel_dep(name = "rules_shell", version = "0.6.1", dev_dependency = True)
 # Overrides of non-dev deps for local testing using recent versions
 archive_override(
     module_name = "rules_nodejs",
-    integrity = "sha256-OY23vNcf28WAxvjReCrpn1JQeRFypf/jHS+dgTjzOC4=",
-    strip_prefix = "rules_nodejs-7cbb1fb5378fb4739e4d9698a14abd9eada900f0",
+    integrity = "sha256-jFmNXCy0m8FjDy2Je31l1PC/kvDq3J3TdNhZ3+mojUs=",
+    strip_prefix = "rules_nodejs-2d3b73e0596924e5798df464ebc5d85463ac6a75",
     urls = [
-        "https://github.com/bazel-contrib/rules_nodejs/archive/7cbb1fb5378fb4739e4d9698a14abd9eada900f0.tar.gz",
+        "https://github.com/bazel-contrib/rules_nodejs/archive/2d3b73e0596924e5798df464ebc5d85463ac6a75.tar.gz",
     ],
 )
 

e2e/pnpm_workspace/BUILD.bazel

@@ -19,7 +19,7 @@ sh_test(
         "@nodejs_linux_amd64//:node_files",
         "@nodejs_linux_arm64//:node_files",
     ],
-    toolchains = ["@nodejs_toolchains//:resolved_toolchain"],
+    toolchains = ["@rules_nodejs//nodejs:current_node_runtime"],
 )
 
 build_test(

e2e/pnpm_workspace_rerooted/BUILD.bazel

@@ -19,7 +19,7 @@ sh_test(
         "@nodejs_linux_amd64//:node_files",
         "@nodejs_linux_arm64//:node_files",
     ],
-    toolchains = ["@nodejs_toolchains//:resolved_toolchain"],
+    toolchains = ["@rules_nodejs//nodejs:current_node_runtime"],
 )
 
 build_test(

examples/genrule/BUILD.bazel

@@ -43,8 +43,8 @@ genrule(
         # $@ is bazel shorthand for the path of the output file
         ">$@",
     ]),
-    toolchains = ["@nodejs_toolchains//:resolved_toolchain"],
-    tools = ["@nodejs_toolchains//:resolved_toolchain"],
+    toolchains = ["@rules_nodejs//nodejs:current_node_toolchain"],
+    tools = ["@rules_nodejs//nodejs:current_node_toolchain"],
 )
 
 diff_test(
@@ -74,8 +74,8 @@ genrule(
         $(NODE_PATH) \\
         ./$(execpath :require_acorn_js) \\
         $@""",
-    toolchains = ["@nodejs_toolchains//:resolved_toolchain"],
-    tools = ["@nodejs_toolchains//:resolved_toolchain"],
+    toolchains = ["@rules_nodejs//nodejs:current_node_toolchain"],
+    tools = ["@rules_nodejs//nodejs:current_node_toolchain"],
 )
 
 diff_test(

js/private/js_binary.bzl

@@ -287,7 +287,7 @@ _ATTRS = {
         """,
     ),
     "node_toolchain": attr.label(
-        doc = """The Node.js toolchain to use for this target.
+        doc = """The Node.js runtime toolchain to use for this target.
 
         See https://bazel-contrib.github.io/rules_nodejs/Toolchains.html
 
@@ -505,7 +505,7 @@ def _create_launcher(ctx, log_prefix_rule_set, log_prefix_rule, fixed_args = [],
     if ctx.attr.node_toolchain:
         nodeinfo = ctx.attr.node_toolchain[platform_common.ToolchainInfo].nodeinfo
     else:
-        nodeinfo = ctx.toolchains["@rules_nodejs//nodejs:toolchain_type"].nodeinfo
+        nodeinfo = ctx.toolchains["@rules_nodejs//nodejs:runtime_toolchain_type"].nodeinfo
 
     if DirectoryPathInfo in ctx.attr.entry_point:
         entry_point = ctx.attr.entry_point[DirectoryPathInfo].directory
@@ -636,7 +636,7 @@ js_binary_lib = struct(
     toolchains = [
         # TODO: on Windows this toolchain is never referenced
         "@bazel_tools//tools/sh:toolchain_type",
-        "@rules_nodejs//nodejs:toolchain_type",
+        "@rules_nodejs//nodejs:runtime_toolchain_type",
     ] + COPY_FILE_TO_BIN_TOOLCHAINS,
 )
 

js/private/js_image_layer.bzl

@@ -408,7 +408,7 @@ else {
         transitive = [files],
     )
 
-    nodeinfo = ctx.attr._current_node[platform_common.ToolchainInfo].nodeinfo
+    nodeinfo = ctx.attr._node_tool[platform_common.ToolchainInfo].nodeinfo
     if hasattr(nodeinfo, "node"):
         node_exec = nodeinfo.node
     else:
@@ -627,8 +627,8 @@ js_image_layer_lib = struct(
             default = "//js/private:js_image_layer.mjs",
             allow_single_file = True,
         ),
-        "_current_node": attr.label(
-            default = "@nodejs_toolchains//:resolved_toolchain",
+        "_node_tool": attr.label(
+            default = "@rules_nodejs//nodejs:current_node_toolchain",
             cfg = "exec",
         ),
         "binary": attr.label(
@@ -687,6 +687,7 @@ js_image_layer = rule(
     doc = _DOC,
     toolchains = [
         tar_lib.toolchain_type,
-        "@rules_nodejs//nodejs:toolchain_type",
+        config_common.toolchain_type("@rules_nodejs//nodejs:toolchain_type", mandatory = False),  # for executing Node in our actions (must not be mandatory because it only available in 'exec' config)
+        "@rules_nodejs//nodejs:runtime_toolchain_type",  # for bundling Node for target platform (rely on js_binary)
     ],
 )

npm/private/test/BUILD.bazel

@@ -76,5 +76,5 @@ sh_test(
         "@nodejs_linux_amd64//:node_files",
         "@nodejs_linux_arm64//:node_files",
     ],
-    toolchains = ["@nodejs_toolchains//:resolved_toolchain"],
+    toolchains = ["@rules_nodejs//nodejs:current_node_runtime"],
 )