chore: switch to bazel-lib

alexeagle · alexeagle · commit 12cb04b665eb · 2025-09-29T07:53:54.000-07:00
Removes the older aspect_bazel_lib which will never go past 2.x
diff --git a/WORKSPACE b/WORKSPACE
@@ -60,9 +60,9 @@ http_archive(
 # Dependencies & toolchains needed for unit tests & generating documentation
 #
 
-load("@aspect_bazel_lib//lib:repositories.bzl", "aspect_bazel_lib_dependencies", "register_copy_directory_toolchains", "register_copy_to_directory_toolchains")
+load("@bazel_lib//lib:repositories.bzl", "bazel_lib_dependencies", "register_copy_directory_toolchains", "register_copy_to_directory_toolchains")
 
-aspect_bazel_lib_dependencies()
+bazel_lib_dependencies()
 
 register_copy_directory_toolchains()
 
diff --git a/e2e/nodejs_host/MODULE.bazel b/e2e/nodejs_host/MODULE.bazel
@@ -4,7 +4,7 @@ local_path_override(
     path = "../..",
 )
 
-bazel_dep(name = "aspect_bazel_lib", version = "2.7.7", dev_dependency = True)
+bazel_dep(name = "bazel_lib", version = "3.0.0-beta.1", dev_dependency = True)
 bazel_dep(name = "bazel_skylib", version = "1.7.1", dev_dependency = True)
 
 node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node", dev_dependency = True)
diff --git a/e2e/smoke/MODULE.bazel b/e2e/smoke/MODULE.bazel
@@ -4,7 +4,7 @@ local_path_override(
     path = "../..",
 )
 
-bazel_dep(name = "aspect_bazel_lib", version = "2.7.7", dev_dependency = True)
+bazel_dep(name = "bazel_lib", version = "3.0.0-beta.1", dev_dependency = True)
 bazel_dep(name = "bazel_skylib", version = "1.7.1", dev_dependency = True)
 bazel_dep(name = "platforms", version = "0.0.10", dev_dependency = True)
 
@@ -42,7 +42,7 @@ http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "ht
 
 http_archive(
     name = "npm_acorn-8.5.0",
-    build_file_content = """load("@aspect_bazel_lib//lib:copy_directory.bzl", "copy_directory")
+    build_file_content = """load("@bazel_lib//lib:copy_directory.bzl", "copy_directory")
 
 # Turn a source directory into a TreeArtifact for RBE-compat
 copy_directory(
diff --git a/e2e/smoke/WORKSPACE.bazel b/e2e/smoke/WORKSPACE.bazel
@@ -18,7 +18,7 @@ nodejs_register_toolchains(
 
 http_archive(
     name = "npm_acorn-8.5.0",
-    build_file_content = """load("@aspect_bazel_lib//lib:copy_directory.bzl", "copy_directory")
+    build_file_content = """load("@bazel_lib//lib:copy_directory.bzl", "copy_directory")
 
 # Turn a source directory into a TreeArtifact for RBE-compat
 copy_directory(
@@ -33,14 +33,14 @@ copy_directory(
 )
 
 http_archive(
-    name = "aspect_bazel_lib",
-    sha256 = "6d758a8f646ecee7a3e294fbe4386daafbe0e5966723009c290d493f227c390b",
-    strip_prefix = "bazel-lib-2.7.7",
-    url = "https://github.com/aspect-build/bazel-lib/releases/download/v2.7.7/bazel-lib-v2.7.7.tar.gz",
+    name = "bazel_lib",
+    sha256 = "46960e9fa6c9352d883768280951ac388dba8cb9ff0256182fb77925eae2b6ac",
+    strip_prefix = "bazel-lib-3.0.0-beta.1",
+    url = "https://github.com/bazel-contrib/bazel-lib/releases/download/v3.0.0-beta.1/bazel-lib-v3.0.0-beta.1.tar.gz",
 )
 
-load("@aspect_bazel_lib//lib:repositories.bzl", "aspect_bazel_lib_dependencies", "aspect_bazel_lib_register_toolchains")
+load("@bazel_lib//lib:repositories.bzl", "bazel_lib_dependencies", "bazel_lib_register_toolchains")
 
-aspect_bazel_lib_dependencies()
+bazel_lib_dependencies()
 
-aspect_bazel_lib_register_toolchains()
+bazel_lib_register_toolchains()
diff --git a/external/types_node.BUILD b/external/types_node.BUILD
@@ -1,4 +1,4 @@
-load("@aspect_bazel_lib//lib:copy_directory.bzl", "copy_directory")
+load("@bazel_lib//lib:copy_directory.bzl", "copy_directory")
 
 # Turn a source directory into a TreeArtifact for RBE-compat
 copy_directory(
diff --git a/external/typescript.BUILD b/external/typescript.BUILD
@@ -1,4 +1,4 @@
-load("@aspect_bazel_lib//lib:copy_directory.bzl", "copy_directory")
+load("@bazel_lib//lib:copy_directory.bzl", "copy_directory")
 
 # Turn a source directory into a TreeArtifact for RBE-compat
 copy_directory(
diff --git a/nodejs/BUILD.bazel b/nodejs/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
+load("@bazel_lib//:bzl_library.bzl", "bzl_library")
 load("//nodejs/private:nodejs_toolchains_repo.bzl", "PLATFORMS")
 load("//nodejs/private:user_build_settings.bzl", "user_args")
 
diff --git a/nodejs/private/BUILD.bazel b/nodejs/private/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
+load("@bazel_lib//:bzl_library.bzl", "bzl_library")
 
 bzl_library(
     name = "bzl",
diff --git a/nodejs/private/providers/BUILD.bazel b/nodejs/private/providers/BUILD.bazel
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
+load("@bazel_lib//:bzl_library.bzl", "bzl_library")
 
 bzl_library(
     name = "bzl",
diff --git a/packages/runfiles/BUILD.bazel b/packages/runfiles/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@aspect_bazel_lib//lib:copy_to_directory.bzl", "copy_to_directory")
+load("@bazel_lib//lib:copy_to_directory.bzl", "copy_to_directory")
 load("@bazel_skylib//rules:build_test.bzl", "build_test")
 load("//internal:tsc.bzl", "tsc")
 
diff --git a/repositories.bzl b/repositories.bzl
@@ -44,10 +44,10 @@ def rules_nodejs_dev_dependencies():
     )
 
     http_archive(
-        name = "aspect_bazel_lib",
-        sha256 = "40ba9d0f62deac87195723f0f891a9803a7b720d7b89206981ca5570ef9df15b",
-        strip_prefix = "bazel-lib-2.14.0",
-        url = "https://github.com/aspect-build/bazel-lib/releases/download/v2.14.0/bazel-lib-v2.14.0.tar.gz",
+        name = "bazel_lib",
+        sha256 = "46960e9fa6c9352d883768280951ac388dba8cb9ff0256182fb77925eae2b6ac",
+        strip_prefix = "bazel-lib-3.0.0-beta.1",
+        url = "https://github.com/bazel-contrib/bazel-lib/releases/download/v3.0.0-beta.1/bazel-lib-v3.0.0-beta.1.tar.gz",
     )
 
     http_archive(
diff --git a/tools/stardoc/index.bzl b/tools/stardoc/index.bzl
@@ -1,6 +1,6 @@
 "Wrap stardoc to set our repo-wide defaults"
 
-load("@aspect_bazel_lib//lib:docs.bzl", _stardoc = "stardoc_with_diff_test")
+load("@bazel_lib//lib:docs.bzl", _stardoc = "stardoc_with_diff_test")
 
 _PKG = "@rules_nodejs//tools/stardoc"
 

Original file line number	Diff line number	Diff line change
`@@ -60,9 +60,9 @@ http_archive(`
`60`	`60`	`# Dependencies & toolchains needed for unit tests & generating documentation`
`61`	`61`	`#`
`62`	`62`
`63`		`-load("@aspect_bazel_lib//lib:repositories.bzl", "aspect_bazel_lib_dependencies", "register_copy_directory_toolchains", "register_copy_to_directory_toolchains")`
	`63`	`+load("@bazel_lib//lib:repositories.bzl", "bazel_lib_dependencies", "register_copy_directory_toolchains", "register_copy_to_directory_toolchains")`
`64`	`64`
`65`		`-aspect_bazel_lib_dependencies()`
	`65`	`+bazel_lib_dependencies()`
`66`	`66`
`67`	`67`	`register_copy_directory_toolchains()`
`68`	`68`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ local_path_override(`
`4`	`4`	`path = "../..",`
`5`	`5`	`)`
`6`	`6`
`7`		`-bazel_dep(name = "aspect_bazel_lib", version = "2.7.7", dev_dependency = True)`
	`7`	`+bazel_dep(name = "bazel_lib", version = "3.0.0-beta.1", dev_dependency = True)`
`8`	`8`	`bazel_dep(name = "bazel_skylib", version = "1.7.1", dev_dependency = True)`
`9`	`9`
`10`	`10`	`node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node", dev_dependency = True)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-load("@aspect_bazel_lib//lib:copy_directory.bzl", "copy_directory")`
	`1`	`+load("@bazel_lib//lib:copy_directory.bzl", "copy_directory")`
`2`	`2`
`3`	`3`	`# Turn a source directory into a TreeArtifact for RBE-compat`
`4`	`4`	`copy_directory(`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-load("@bazel_skylib//:bzl_library.bzl", "bzl_library")`
	`1`	`+load("@bazel_lib//:bzl_library.bzl", "bzl_library")`
`2`	`2`	`load("//nodejs/private:nodejs_toolchains_repo.bzl", "PLATFORMS")`
`3`	`3`	`load("//nodejs/private:user_build_settings.bzl", "user_args")`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-load("@aspect_bazel_lib//lib:copy_to_directory.bzl", "copy_to_directory")`
	`1`	`+load("@bazel_lib//lib:copy_to_directory.bzl", "copy_to_directory")`
`2`	`2`	`load("@bazel_skylib//rules:build_test.bzl", "build_test")`
`3`	`3`	`load("//internal:tsc.bzl", "tsc")`
`4`	`4`