refactor: upgrade to latest rules_nodejs 6.x and move toolchain regis…

…tration call to new rules_js_configure WORKSPACE function
aspect-build · Apr 4, 2024 · 78a0bc4 · 78a0bc4
1 parent b407431
commit 78a0bc4
Show file tree

Hide file tree

Showing 79 changed files with 434 additions and 327 deletions.
diff --git a/.github/workflows/release_prep.sh b/.github/workflows/release_prep.sh
@@ -33,7 +33,7 @@ bazel_dep(name = "aspect_rules_js", version = "${TAG:1}")
 ####### Node.js version #########
 # By default you get the node version from DEFAULT_NODE_VERSION in @rules_nodejs//nodejs:repositories.bzl
 # Optionally you can pin a different node version:
-bazel_dep(name = "rules_nodejs", version = "5.8.2")
+bazel_dep(name = "rules_nodejs", version = "6.0.5")
 node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node")
 node.toolchain(node_version = "16.14.2")
 #################################

diff --git a/MODULE.bazel b/MODULE.bazel
@@ -12,19 +12,16 @@ bazel_dep(name = "aspect_bazel_lib", version = "2.6.1")
 bazel_dep(name = "aspect_rules_lint", version = "0.12.0")
 bazel_dep(name = "bazel_features", version = "1.9.0")
 bazel_dep(name = "bazel_skylib", version = "1.5.0")
+bazel_dep(name = "rules_nodejs", version = "6.0.5")
+bazel_dep(name = "platforms", version = "0.0.5")
 
-# Keep v5 in to avoid breaking changes.
-# TODO(2.0): change minimum to v6
-bazel_dep(name = "rules_nodejs", version = "5.8.2")
-
-# Override rules_nodejs to v6 to test the latest and recommended version internally.
-single_version_override(
+archive_override(
     module_name = "rules_nodejs",
-    version = "6.0.5",
+    integrity = "sha256-pqOPIuJHFcv7kOCqYExYr6p0j/wPxdd4ywK/PMYXiBA=",
+    strip_prefix = "rules_nodejs-dd02dc8bda04ab272e392f3b6dbef8dab71587e6",
+    urls = ["https://github.com/bazelbuild/rules_nodejs/archive/dd02dc8bda04ab272e392f3b6dbef8dab71587e6.tar.gz"],
 )
 
-bazel_dep(name = "platforms", version = "0.0.5")
-
 node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node")
 use_repo(node, "nodejs_darwin_amd64")
 use_repo(node, "nodejs_darwin_arm64")

diff --git a/WORKSPACE b/WORKSPACE
@@ -3,38 +3,23 @@ workspace(
     name = "aspect_rules_js",
 )
 
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-
-# Override rules_nodejs to v6 to test the latest and recommended versional internally,
-# while keeping v5 in rules_js_dependencies() to avoid breaking changes.
-# TODO(2.0): change minimum to v6 in repositories.bzl
-http_archive(
-    name = "rules_nodejs",
-    sha256 = "a50986c7d2f2dc43a5b9b81a6245fd89bdc4866f1d5e316d9cef2782dd859292",
-    strip_prefix = "rules_nodejs-6.0.5",
-    url = "https://github.com/bazelbuild/rules_nodejs/releases/download/v6.0.5/rules_nodejs-v6.0.5.tar.gz",
-)
-
-load("//js:dev_repositories.bzl", "rules_js_dev_dependencies")
+load("@aspect_rules_js//js:dev_repositories.bzl", "rules_js_dev_dependencies")
 
 rules_js_dev_dependencies()
 
-load("//js:repositories.bzl", "rules_js_dependencies")
+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_jq_toolchains")
+load("@aspect_rules_js//js:configure.bzl", "rules_js_configure")
 
-aspect_bazel_lib_dependencies()
+rules_js_configure(node_version = "16.14.2")
 
-register_jq_toolchains()
+load("@aspect_bazel_lib//lib:repositories.bzl", "aspect_bazel_lib_dependencies")
 
-load("@rules_nodejs//nodejs:repositories.bzl", "nodejs_register_toolchains")
+aspect_bazel_lib_dependencies()
 
-nodejs_register_toolchains(
-    name = "nodejs",
-    node_version = "16.14.2",
-)
+load("@rules_nodejs//nodejs:repositories.bzl", "nodejs_register_toolchains")
 
 # Alternate toolchains for testing across versions
 nodejs_register_toolchains(

diff --git a/docs/npm_import.md b/docs/npm_import.md
diff --git a/docs/npm_package.md b/docs/npm_package.md
diff --git a/docs/npm_translate_lock.md b/docs/npm_translate_lock.md
diff --git a/e2e/bzlmod/MODULE.bazel b/e2e/bzlmod/MODULE.bazel
@@ -13,6 +13,13 @@ local_path_override(
     path = "../..",
 )
 
+archive_override(
+    module_name = "rules_nodejs",
+    integrity = "sha256-pqOPIuJHFcv7kOCqYExYr6p0j/wPxdd4ywK/PMYXiBA=",
+    strip_prefix = "rules_nodejs-dd02dc8bda04ab272e392f3b6dbef8dab71587e6",
+    urls = ["https://github.com/bazelbuild/rules_nodejs/archive/dd02dc8bda04ab272e392f3b6dbef8dab71587e6.tar.gz"],
+)
+
 npm = use_extension(
     "@aspect_rules_js//npm:extensions.bzl",
     "npm",

diff --git a/e2e/git_dep_metadata/MODULE.bazel b/e2e/git_dep_metadata/MODULE.bazel
@@ -9,6 +9,13 @@ local_path_override(
     path = "../..",
 )
 
+archive_override(
+    module_name = "rules_nodejs",
+    integrity = "sha256-pqOPIuJHFcv7kOCqYExYr6p0j/wPxdd4ywK/PMYXiBA=",
+    strip_prefix = "rules_nodejs-dd02dc8bda04ab272e392f3b6dbef8dab71587e6",
+    urls = ["https://github.com/bazelbuild/rules_nodejs/archive/dd02dc8bda04ab272e392f3b6dbef8dab71587e6.tar.gz"],
+)
+
 npm = use_extension(
     "@aspect_rules_js//npm:extensions.bzl",
     "npm",

diff --git a/e2e/git_dep_metadata/WORKSPACE b/e2e/git_dep_metadata/WORKSPACE
@@ -7,12 +7,9 @@ load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies")
 
 rules_js_dependencies()
 
-load("@rules_nodejs//nodejs:repositories.bzl", "DEFAULT_NODE_VERSION", "nodejs_register_toolchains")
+load("@aspect_rules_js//js:configure.bzl", "rules_js_configure")
 
-nodejs_register_toolchains(
-    name = "nodejs",
-    node_version = DEFAULT_NODE_VERSION,
-)
+rules_js_configure()
 
 load("@aspect_rules_js//npm:repositories.bzl", "npm_import")
 

diff --git a/e2e/gyp_no_install_script/MODULE.bazel b/e2e/gyp_no_install_script/MODULE.bazel
@@ -5,6 +5,13 @@ local_path_override(
     path = "../..",
 )
 
+archive_override(
+    module_name = "rules_nodejs",
+    integrity = "sha256-pqOPIuJHFcv7kOCqYExYr6p0j/wPxdd4ywK/PMYXiBA=",
+    strip_prefix = "rules_nodejs-dd02dc8bda04ab272e392f3b6dbef8dab71587e6",
+    urls = ["https://github.com/bazelbuild/rules_nodejs/archive/dd02dc8bda04ab272e392f3b6dbef8dab71587e6.tar.gz"],
+)
+
 npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm")
 npm.npm_translate_lock(
     name = "npm",

diff --git a/e2e/gyp_no_install_script/WORKSPACE b/e2e/gyp_no_install_script/WORKSPACE
@@ -16,12 +16,9 @@ load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies")
 
 rules_js_dependencies()
 
-load("@rules_nodejs//nodejs:repositories.bzl", "DEFAULT_NODE_VERSION", "nodejs_register_toolchains")
+load("@aspect_rules_js//js:configure.bzl", "rules_js_configure")
 
-nodejs_register_toolchains(
-    name = "nodejs",
-    node_version = DEFAULT_NODE_VERSION,
-)
+rules_js_configure()
 
 load("@aspect_rules_js//npm:repositories.bzl", "npm_translate_lock")
 

diff --git a/e2e/js_image_docker/WORKSPACE b/e2e/js_image_docker/WORKSPACE
@@ -12,12 +12,9 @@ load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies")
 
 rules_js_dependencies()
 
-load("@rules_nodejs//nodejs:repositories.bzl", "nodejs_register_toolchains")
+load("@aspect_rules_js//js:configure.bzl", "rules_js_configure")
 
-nodejs_register_toolchains(
-    name = "nodejs",
-    node_version = "16.14.2",
-)
+rules_js_configure(node_version = "16.14.2")
 
 load("@aspect_rules_js//npm:repositories.bzl", "npm_translate_lock")
 

diff --git a/e2e/js_image_oci/WORKSPACE b/e2e/js_image_oci/WORKSPACE
@@ -14,12 +14,9 @@ load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies")
 
 rules_js_dependencies()
 
-load("@rules_nodejs//nodejs:repositories.bzl", "nodejs_register_toolchains")
+load("@aspect_rules_js//js:configure.bzl", "rules_js_configure")
 
-nodejs_register_toolchains(
-    name = "nodejs",
-    node_version = "16.14.2",
-)
+rules_js_configure(node_version = "16.14.2")
 
 load("@aspect_rules_js//npm:repositories.bzl", "npm_translate_lock")
 

diff --git a/e2e/js_run_devserver/MODULE.bazel b/e2e/js_run_devserver/MODULE.bazel
@@ -14,6 +14,13 @@ local_path_override(
     path = "../..",
 )
 
+archive_override(
+    module_name = "rules_nodejs",
+    integrity = "sha256-pqOPIuJHFcv7kOCqYExYr6p0j/wPxdd4ywK/PMYXiBA=",
+    strip_prefix = "rules_nodejs-dd02dc8bda04ab272e392f3b6dbef8dab71587e6",
+    urls = ["https://github.com/bazelbuild/rules_nodejs/archive/dd02dc8bda04ab272e392f3b6dbef8dab71587e6.tar.gz"],
+)
+
 pnpm = use_extension("@aspect_rules_js//npm:extensions.bzl", "pnpm")
 use_repo(pnpm, "pnpm")
 

diff --git a/e2e/js_run_devserver/WORKSPACE b/e2e/js_run_devserver/WORKSPACE
@@ -7,12 +7,9 @@ load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies")
 
 rules_js_dependencies()
 
-load("@rules_nodejs//nodejs:repositories.bzl", "DEFAULT_NODE_VERSION", "nodejs_register_toolchains")
+load("@aspect_rules_js//js:configure.bzl", "rules_js_configure")
 
-nodejs_register_toolchains(
-    name = "nodejs",
-    node_version = DEFAULT_NODE_VERSION,
-)
+rules_js_configure()
 
 load("@aspect_rules_js//npm:repositories.bzl", "npm_translate_lock")
 

diff --git a/e2e/npm_link_package-esm/WORKSPACE b/e2e/npm_link_package-esm/WORKSPACE
@@ -7,12 +7,9 @@ load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies")
 
 rules_js_dependencies()
 
-load("@rules_nodejs//nodejs:repositories.bzl", "nodejs_register_toolchains")
+load("@aspect_rules_js//js:configure.bzl", "rules_js_configure")
 
-nodejs_register_toolchains(
-    name = "nodejs",
-    node_version = "16.9.0",
-)
+rules_js_configure(node_version = "16.9.0")
 
 load("@aspect_rules_js//npm:repositories.bzl", "npm_translate_lock")
 

diff --git a/e2e/npm_link_package/WORKSPACE b/e2e/npm_link_package/WORKSPACE
@@ -7,12 +7,9 @@ load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies")
 
 rules_js_dependencies()
 
-load("@rules_nodejs//nodejs:repositories.bzl", "nodejs_register_toolchains")
+load("@aspect_rules_js//js:configure.bzl", "rules_js_configure")
 
-nodejs_register_toolchains(
-    name = "nodejs",
-    node_version = "16.14.2",
-)
+rules_js_configure(node_version = "16.14.2")
 
 load("@aspect_rules_js//npm:repositories.bzl", "npm_translate_lock")
 

diff --git a/e2e/npm_translate_lock/MODULE.bazel b/e2e/npm_translate_lock/MODULE.bazel
@@ -14,6 +14,13 @@ local_path_override(
     path = "../..",
 )
 
+archive_override(
+    module_name = "rules_nodejs",
+    integrity = "sha256-pqOPIuJHFcv7kOCqYExYr6p0j/wPxdd4ywK/PMYXiBA=",
+    strip_prefix = "rules_nodejs-dd02dc8bda04ab272e392f3b6dbef8dab71587e6",
+    urls = ["https://github.com/bazelbuild/rules_nodejs/archive/dd02dc8bda04ab272e392f3b6dbef8dab71587e6.tar.gz"],
+)
+
 npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm")
 npm.npm_translate_lock(
     name = "npm",

diff --git a/e2e/npm_translate_lock/WORKSPACE b/e2e/npm_translate_lock/WORKSPACE
@@ -7,12 +7,9 @@ load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies")
 
 rules_js_dependencies()
 
-load("@rules_nodejs//nodejs:repositories.bzl", "DEFAULT_NODE_VERSION", "nodejs_register_toolchains")
+load("@aspect_rules_js//js:configure.bzl", "rules_js_configure")
 
-nodejs_register_toolchains(
-    name = "nodejs",
-    node_version = DEFAULT_NODE_VERSION,
-)
+rules_js_configure()
 
 load("@aspect_rules_js//npm:repositories.bzl", "npm_translate_lock")
 

diff --git a/e2e/npm_translate_lock_auth/MODULE.bazel b/e2e/npm_translate_lock_auth/MODULE.bazel
@@ -12,6 +12,13 @@ local_path_override(
     path = "../..",
 )
 
+archive_override(
+    module_name = "rules_nodejs",
+    integrity = "sha256-pqOPIuJHFcv7kOCqYExYr6p0j/wPxdd4ywK/PMYXiBA=",
+    strip_prefix = "rules_nodejs-dd02dc8bda04ab272e392f3b6dbef8dab71587e6",
+    urls = ["https://github.com/bazelbuild/rules_nodejs/archive/dd02dc8bda04ab272e392f3b6dbef8dab71587e6.tar.gz"],
+)
+
 npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm")
 npm.npm_translate_lock(
     name = "npm",