fix: node v24+ directory structure

Author: jbedard

e2e/smoke/BUILD.bazel

@@ -234,20 +234,25 @@ write_file(
     content = ["v16.5.0"],
 )
 
+write_file(
+    name = "write_node_version_20",
+    out = "expected_node_20",
+    content = ["v20.19.6"],
+)
+
+write_file(
+    name = "write_node_version_24",
+    out = "expected_node_24",
+    content = ["v24.12.0"],
+)
+
 # To see what nodejs version is used by default
 my_nodejs(
     name = "run_no_toolchain",
     out = "thing_no_toolchain",
     entry_point = "version.js",
 )
 
-# this tests to make sure that the first version imported in the workspace is used as default
-diff_test(
-    name = "node_version_default_toolchain_test",
-    file1 = "write_node_version_16",
-    file2 = "thing_no_toolchain",
-)
-
 # Output contains the version number of node that is used.
 # This is used in tests later to verify the toolchain specified is resolved correctly
 my_nodejs(
@@ -279,11 +284,11 @@ my_nodejs(
     # using the select statement will download toolchains for all three platforms
     # you can also just provide an individual toolchain if you don't want to download them all
     toolchain = select({
-        "@bazel_tools//src/conditions:linux_x86_64": "@nodejs_linux_amd64//:toolchain",
-        "@bazel_tools//src/conditions:linux_aarch64": "@nodejs_linux_arm64//:toolchain",
-        "@bazel_tools//src/conditions:darwin_x86_64": "@nodejs_darwin_amd64//:toolchain",
-        "@bazel_tools//src/conditions:darwin_arm64": "@nodejs_darwin_arm64//:toolchain",
-        "@bazel_tools//src/conditions:windows": "@nodejs_windows_amd64//:toolchain",
+        "@bazel_tools//src/conditions:linux_x86_64": "@node16_linux_amd64//:toolchain",
+        "@bazel_tools//src/conditions:linux_aarch64": "@node16_linux_arm64//:toolchain",
+        "@bazel_tools//src/conditions:darwin_x86_64": "@node16_darwin_amd64//:toolchain",
+        "@bazel_tools//src/conditions:darwin_arm64": "@node16_darwin_arm64//:toolchain",
+        "@bazel_tools//src/conditions:windows": "@node16_windows_amd64//:toolchain",
     }),
 )
 
@@ -312,3 +317,46 @@ diff_test(
     file1 = "write_node_version_15",
     file2 = "thing_toolchain_15",
 )
+
+my_nodejs(
+    name = "run_default",
+    out = "thing_toolchain_20",
+    entry_point = "version.js",
+    # using the select statement will download toolchains for all three platforms
+    # you can also just provide an individual toolchain if you don't want to download them all
+    toolchain = select({
+        "@bazel_tools//src/conditions:linux_x86_64": "@nodejs_linux_amd64//:toolchain",
+        "@bazel_tools//src/conditions:linux_aarch64": "@nodejs_linux_arm64//:toolchain",
+        "@bazel_tools//src/conditions:darwin_x86_64": "@nodejs_darwin_amd64//:toolchain",
+        "@bazel_tools//src/conditions:darwin_arm64": "@nodejs_darwin_arm64//:toolchain",
+        "@bazel_tools//src/conditions:windows": "@nodejs_windows_amd64//:toolchain",
+    }),
+)
+
+# this tests to make sure that the first version imported in the workspace is used as default
+diff_test(
+    name = "node_version_default_toolchain_test",
+    file1 = "write_node_version_20",
+    file2 = "thing_no_toolchain",
+)
+
+my_nodejs(
+    name = "run_24",
+    out = "thing_toolchain_24",
+    entry_point = "version.js",
+    # using the select statement will download toolchains for all three platforms
+    # you can also just provide an individual toolchain if you don't want to download them all
+    toolchain = select({
+        "@bazel_tools//src/conditions:linux_x86_64": "@node24_linux_amd64//:toolchain",
+        "@bazel_tools//src/conditions:linux_aarch64": "@node24_linux_arm64//:toolchain",
+        "@bazel_tools//src/conditions:darwin_x86_64": "@node24_darwin_amd64//:toolchain",
+        "@bazel_tools//src/conditions:darwin_arm64": "@node24_darwin_arm64//:toolchain",
+        "@bazel_tools//src/conditions:windows": "@node24_windows_amd64//:toolchain",
+    }),
+)
+
+diff_test(
+    name = "test_node_version_24",
+    file1 = "write_node_version_24",
+    file2 = "thing_toolchain_24",
+)

e2e/smoke/MODULE.bazel

@@ -9,7 +9,11 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1", dev_dependency = True)
 bazel_dep(name = "platforms", version = "0.0.10", dev_dependency = True)
 
 node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node", dev_dependency = True)
-node.toolchain(node_version = "16.5.0")
+node.toolchain()
+node.toolchain(
+    name = "node16",
+    node_version = "16.5.0",
+)
 node.toolchain(
     name = "node17",
     node_version = "17.9.1",
@@ -23,17 +27,32 @@ node.toolchain(
     node_version = "15.14.0",
 )
 
+# Node24 changed some directory structures: https://github.com/bazel-contrib/rules_nodejs/issues/3887
+node.toolchain(
+    name = "node24",
+    node_version = "24.12.0",
+)
+
 # FIXME(6.0): a repo rule with name=foo should create a repo named @foo, not @foo_toolchains
 use_repo(
     node,
     "node15_darwin_amd64",
     "node15_linux_amd64",
     "node15_windows_amd64",
+    "node16_darwin_amd64",
+    "node16_darwin_arm64",
+    "node16_linux_amd64",
+    "node16_windows_amd64",
     "node17_darwin_amd64",
     "node17_darwin_arm64",
     "node17_linux_amd64",
     "node17_linux_arm64",
     "node17_windows_amd64",
+    "node24_darwin_amd64",
+    "node24_darwin_arm64",
+    "node24_linux_amd64",
+    "node24_linux_arm64",
+    "node24_windows_amd64",
     "nodejs_darwin_amd64",
     "nodejs_darwin_arm64",
     "nodejs_linux_amd64",

e2e/smoke/WORKSPACE.bazel

@@ -9,7 +9,10 @@ load("@rules_nodejs//nodejs:repositories.bzl", "nodejs_register_toolchains")
 
 # The order matters because Bazel will provide the first registered toolchain when a rule asks Bazel to select it
 # This applies to the resolved_toolchain
-nodejs_register_toolchains(node_version = "16.5.0")
+nodejs_register_toolchains(
+    name = "node16",
+    node_version = "16.5.0",
+)
 
 nodejs_register_toolchains(
     name = "node17",
@@ -25,6 +28,11 @@ nodejs_register_toolchains(
     node_version = "15.14.0",
 )
 
+nodejs_register_toolchains(
+    name = "node24",
+    node_version = "24.12.0",
+)
+
 http_archive(
     name = "npm_acorn-8.5.0",
     build_file_content = """load("@bazel_lib//lib:copy_directory.bzl", "copy_directory")