refactor: also register bazel-lib coreutils toolchain now that we dep…

…end on a mininum bazel-lib 2.6.1 (#1582)

.github/workflows/release_prep.sh

@@ -72,14 +72,3 @@ EOF
 
 awk 'f;/--SNIP--/{f=1}' e2e/workspace/WORKSPACE
 echo "\`\`\`"
-
-cat <<EOF
-
-To use rules_js with bazel-lib 2.x, you must additionally register the coreutils toolchain.
-
-\`\`\`starlark
-load("@aspect_bazel_lib//lib:repositories.bzl", "register_coreutils_toolchains")
-
-register_coreutils_toolchains()
-\`\`\`
-EOF

WORKSPACE

@@ -23,9 +23,7 @@ load("//js:repositories.bzl", "rules_js_dependencies")
 
 rules_js_dependencies()
 
-load("@aspect_bazel_lib//lib:repositories.bzl", "register_coreutils_toolchains", "register_expand_template_toolchains", "register_jq_toolchains")
-
-register_coreutils_toolchains()
+load("@aspect_bazel_lib//lib:repositories.bzl", "register_expand_template_toolchains", "register_jq_toolchains")
 
 register_expand_template_toolchains()
 

e2e/pnpm_workspace/WORKSPACE

@@ -7,12 +7,10 @@ load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies")
 
 rules_js_dependencies()
 
-load("@aspect_bazel_lib//lib:repositories.bzl", "aspect_bazel_lib_dependencies", "register_coreutils_toolchains")
+load("@aspect_bazel_lib//lib:repositories.bzl", "aspect_bazel_lib_dependencies")
 
 aspect_bazel_lib_dependencies()
 
-register_coreutils_toolchains()
-
 load("@rules_nodejs//nodejs:repositories.bzl", "DEFAULT_NODE_VERSION", "nodejs_register_toolchains")
 
 nodejs_register_toolchains(

e2e/pnpm_workspace_deps/WORKSPACE

@@ -7,12 +7,10 @@ load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies")
 
 rules_js_dependencies()
 
-load("@aspect_bazel_lib//lib:repositories.bzl", "aspect_bazel_lib_dependencies", "register_coreutils_toolchains")
+load("@aspect_bazel_lib//lib:repositories.bzl", "aspect_bazel_lib_dependencies")
 
 aspect_bazel_lib_dependencies()
 
-register_coreutils_toolchains()
-
 load("@rules_nodejs//nodejs:repositories.bzl", "DEFAULT_NODE_VERSION", "nodejs_register_toolchains")
 
 nodejs_register_toolchains(

npm/extensions.bzl

@@ -66,6 +66,7 @@ def _npm_translate_lock_bzlmod(attr):
         quiet = attr.quiet,
         register_copy_directory_toolchains = False,  # this registration is handled elsewhere with bzlmod
         register_copy_to_directory_toolchains = False,  # this registration is handled elsewhere with bzlmod
+        register_coreutils_toolchains = False,  # this registration is handled elsewhere with bzlmod
         register_yq_toolchains = False,  # this registration is handled elsewhere with bzlmod
         register_tar_toolchains = False,  # this registration is handled elsewhere with bzlmod
         replace_packages = attr.replace_packages,

npm/private/npm_translate_lock.bzl

@@ -26,7 +26,14 @@ Advanced users may want to directly fetch a package from npm rather than start f
 """
 
 load("@bazel_skylib//lib:paths.bzl", "paths")
-load("@aspect_bazel_lib//lib:repositories.bzl", _register_copy_directory_toolchains = "register_copy_directory_toolchains", _register_copy_to_directory_toolchains = "register_copy_to_directory_toolchains", _register_tar_toolchains = "register_tar_toolchains", _register_yq_toolchains = "register_yq_toolchains")
+load(
+    "@aspect_bazel_lib//lib:repositories.bzl",
+    _register_copy_directory_toolchains = "register_copy_directory_toolchains",
+    _register_copy_to_directory_toolchains = "register_copy_to_directory_toolchains",
+    _register_coreutils_toolchains = "register_coreutils_toolchains",
+    _register_tar_toolchains = "register_tar_toolchains",
+    _register_yq_toolchains = "register_yq_toolchains",
+)
 load("@aspect_bazel_lib//lib:write_source_files.bzl", "write_source_file")
 load(":list_sources.bzl", "list_sources")
 load(":npm_translate_lock_generate.bzl", "generate_repository_files")
@@ -188,6 +195,7 @@ def npm_translate_lock(
         use_pnpm = None,
         register_copy_directory_toolchains = True,
         register_copy_to_directory_toolchains = True,
+        register_coreutils_toolchains = True,
         register_yq_toolchains = True,
         register_tar_toolchains = True,
         npm_package_target_name = "{dirname}",
@@ -508,6 +516,8 @@ def npm_translate_lock(
 
         register_copy_to_directory_toolchains: if True, `@aspect_bazel_lib//lib:repositories.bzl` `register_copy_to_directory_toolchains()` is called if the toolchain is not already registered
 
+        register_coreutils_toolchains: if True, `@aspect_bazel_lib//lib:repositories.bzl` `register_coreutils_toolchains()` is called if the toolchain is not already registered
+
         register_yq_toolchains: if True, `@aspect_bazel_lib//lib:repositories.bzl` `register_yq_toolchains()` is called if the toolchain is not already registered
 
         register_tar_toolchains: if True, `@aspect_bazel_lib//lib:repositories.bzl` `register_tar_toolchains()` is called if the toolchain is not already registered
@@ -554,6 +564,8 @@ def npm_translate_lock(
         _register_copy_directory_toolchains()
     if register_copy_to_directory_toolchains and not native.existing_rule("copy_to_directory_toolchains"):
         _register_copy_to_directory_toolchains()
+    if register_coreutils_toolchains and not native.existing_rule("register_coreutils_toolchains"):
+        _register_coreutils_toolchains()
     if register_yq_toolchains and not native.existing_rule("yq_toolchains"):
         _register_yq_toolchains()
     if register_tar_toolchains and not native.existing_rule("tar_toolchains"):