From 6f45b4fd1633964bf9f258ae806cc9b83f9cf3be Mon Sep 17 00:00:00 2001 From: Greg Magolan Date: Tue, 2 Apr 2024 21:25:58 -0400 Subject: [PATCH] refactor: set minimum aspect_bazel_lib to 2.6.1 (#1580) --- MODULE.bazel | 2 +- e2e/js_run_devserver/MODULE.bazel | 2 +- e2e/npm_translate_lock/MODULE.bazel | 2 +- e2e/npm_translate_lock_auth/MODULE.bazel | 2 +- e2e/npm_translate_lock_empty/MODULE.bazel | 2 +- e2e/npm_translate_lock_git+ssh/MODULE.bazel | 2 +- e2e/npm_translate_lock_multi/MODULE.bazel | 2 +- e2e/npm_translate_lock_partial_clone/MODULE.bazel | 2 +- e2e/npm_translate_lock_subdir_patch/MODULE.bazel | 2 +- e2e/npm_translate_package_lock/MODULE.bazel | 2 +- e2e/npm_translate_yarn_lock/MODULE.bazel | 2 +- e2e/package_json_module/MODULE.bazel | 2 +- e2e/pnpm_workspace_rerooted/MODULE.bazel | 2 +- e2e/update_pnpm_lock/MODULE.bazel | 2 +- e2e/update_pnpm_lock_with_import/MODULE.bazel | 2 +- e2e/vendored_node/MODULE.bazel | 2 +- e2e/vendored_tarfile/MODULE.bazel | 2 +- e2e/verify_patches/MODULE.bazel | 2 +- e2e/webpack_devserver/MODULE.bazel | 2 +- e2e/webpack_devserver_esm/MODULE.bazel | 2 +- js/private/BUILD.bazel | 1 + js/repositories.bzl | 6 +++--- 22 files changed, 24 insertions(+), 23 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 14e24b74c..b2288adaf 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -8,7 +8,7 @@ module( # Lower-bounds for runtime dependencies. # Do not bump these unless rules_js requires a newer version to function. -bazel_dep(name = "aspect_bazel_lib", version = "1.42.2") +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") diff --git a/e2e/js_run_devserver/MODULE.bazel b/e2e/js_run_devserver/MODULE.bazel index 1ca0720f0..d618ac47a 100644 --- a/e2e/js_run_devserver/MODULE.bazel +++ b/e2e/js_run_devserver/MODULE.bazel @@ -4,7 +4,7 @@ module( compatibility_level = 1, ) -bazel_dep(name = "aspect_bazel_lib", version = "1.42.2") +bazel_dep(name = "aspect_bazel_lib", version = "2.6.1") bazel_dep(name = "aspect_rules_js", version = "0.0.0") bazel_dep(name = "bazel_skylib", version = "1.5.0") bazel_dep(name = "rules_go", version = "0.46.0") diff --git a/e2e/npm_translate_lock/MODULE.bazel b/e2e/npm_translate_lock/MODULE.bazel index fda24b265..a662b2d82 100644 --- a/e2e/npm_translate_lock/MODULE.bazel +++ b/e2e/npm_translate_lock/MODULE.bazel @@ -5,7 +5,7 @@ module( ) bazel_dep(name = "bazel_skylib", version = "1.5.0") -bazel_dep(name = "aspect_bazel_lib", version = "1.42.2") +bazel_dep(name = "aspect_bazel_lib", version = "2.6.1") bazel_dep(name = "aspect_rules_js", version = "0.0.0") bazel_dep(name = "platforms", version = "0.0.8") diff --git a/e2e/npm_translate_lock_auth/MODULE.bazel b/e2e/npm_translate_lock_auth/MODULE.bazel index 5a54d0150..a08b9d0c3 100644 --- a/e2e/npm_translate_lock_auth/MODULE.bazel +++ b/e2e/npm_translate_lock_auth/MODULE.bazel @@ -5,7 +5,7 @@ module( ) bazel_dep(name = "bazel_skylib", version = "1.5.0") -bazel_dep(name = "aspect_bazel_lib", version = "1.42.2") +bazel_dep(name = "aspect_bazel_lib", version = "2.6.1") bazel_dep(name = "aspect_rules_js", version = "0.0.0") local_path_override( module_name = "aspect_rules_js", diff --git a/e2e/npm_translate_lock_empty/MODULE.bazel b/e2e/npm_translate_lock_empty/MODULE.bazel index 38e3c764c..0951f4997 100644 --- a/e2e/npm_translate_lock_empty/MODULE.bazel +++ b/e2e/npm_translate_lock_empty/MODULE.bazel @@ -5,7 +5,7 @@ module( ) bazel_dep(name = "bazel_skylib", version = "1.5.0") -bazel_dep(name = "aspect_bazel_lib", version = "1.42.2") +bazel_dep(name = "aspect_bazel_lib", version = "2.6.1") bazel_dep(name = "aspect_rules_js", version = "0.0.0") bazel_dep(name = "platforms", version = "0.0.8") diff --git a/e2e/npm_translate_lock_git+ssh/MODULE.bazel b/e2e/npm_translate_lock_git+ssh/MODULE.bazel index a93a4030c..8fdfa23f4 100644 --- a/e2e/npm_translate_lock_git+ssh/MODULE.bazel +++ b/e2e/npm_translate_lock_git+ssh/MODULE.bazel @@ -5,7 +5,7 @@ module( ) bazel_dep(name = "bazel_skylib", version = "1.5.0") -bazel_dep(name = "aspect_bazel_lib", version = "1.42.2") +bazel_dep(name = "aspect_bazel_lib", version = "2.6.1") bazel_dep(name = "aspect_rules_js", version = "0.0.0") local_path_override( module_name = "aspect_rules_js", diff --git a/e2e/npm_translate_lock_multi/MODULE.bazel b/e2e/npm_translate_lock_multi/MODULE.bazel index 9b4273eec..9be8a7e1b 100644 --- a/e2e/npm_translate_lock_multi/MODULE.bazel +++ b/e2e/npm_translate_lock_multi/MODULE.bazel @@ -4,7 +4,7 @@ module( compatibility_level = 1, ) -bazel_dep(name = "aspect_bazel_lib", version = "1.42.2") +bazel_dep(name = "aspect_bazel_lib", version = "2.6.1") bazel_dep(name = "bazel_skylib", version = "1.5.0") bazel_dep(name = "aspect_rules_js", version = "0.0.0") local_path_override( diff --git a/e2e/npm_translate_lock_partial_clone/MODULE.bazel b/e2e/npm_translate_lock_partial_clone/MODULE.bazel index b2702264d..6ab0ba32f 100644 --- a/e2e/npm_translate_lock_partial_clone/MODULE.bazel +++ b/e2e/npm_translate_lock_partial_clone/MODULE.bazel @@ -5,7 +5,7 @@ module( ) bazel_dep(name = "bazel_skylib", version = "1.5.0") -bazel_dep(name = "aspect_bazel_lib", version = "1.42.2") +bazel_dep(name = "aspect_bazel_lib", version = "2.6.1") bazel_dep(name = "aspect_rules_js", version = "0.0.0") local_path_override( module_name = "aspect_rules_js", diff --git a/e2e/npm_translate_lock_subdir_patch/MODULE.bazel b/e2e/npm_translate_lock_subdir_patch/MODULE.bazel index ef3c21cf0..07f4464bb 100644 --- a/e2e/npm_translate_lock_subdir_patch/MODULE.bazel +++ b/e2e/npm_translate_lock_subdir_patch/MODULE.bazel @@ -1,4 +1,4 @@ -bazel_dep(name = "aspect_bazel_lib", version = "1.42.2") +bazel_dep(name = "aspect_bazel_lib", version = "2.6.1") bazel_dep(name = "aspect_rules_js", version = "0.0.0") local_path_override( module_name = "aspect_rules_js", diff --git a/e2e/npm_translate_package_lock/MODULE.bazel b/e2e/npm_translate_package_lock/MODULE.bazel index 573a5fed3..cfb93b3cf 100644 --- a/e2e/npm_translate_package_lock/MODULE.bazel +++ b/e2e/npm_translate_package_lock/MODULE.bazel @@ -4,7 +4,7 @@ module( compatibility_level = 1, ) -bazel_dep(name = "aspect_bazel_lib", version = "1.42.2") +bazel_dep(name = "aspect_bazel_lib", version = "2.6.1") bazel_dep(name = "bazel_skylib", version = "1.5.0") bazel_dep(name = "aspect_rules_js", version = "0.0.0") local_path_override( diff --git a/e2e/npm_translate_yarn_lock/MODULE.bazel b/e2e/npm_translate_yarn_lock/MODULE.bazel index 125dbd04f..a963a45c1 100644 --- a/e2e/npm_translate_yarn_lock/MODULE.bazel +++ b/e2e/npm_translate_yarn_lock/MODULE.bazel @@ -4,7 +4,7 @@ module( compatibility_level = 1, ) -bazel_dep(name = "aspect_bazel_lib", version = "1.42.2") +bazel_dep(name = "aspect_bazel_lib", version = "2.6.1") bazel_dep(name = "bazel_skylib", version = "1.5.0") bazel_dep(name = "aspect_rules_js", version = "0.0.0") local_path_override( diff --git a/e2e/package_json_module/MODULE.bazel b/e2e/package_json_module/MODULE.bazel index 6e9e70b57..e50d4f9fe 100644 --- a/e2e/package_json_module/MODULE.bazel +++ b/e2e/package_json_module/MODULE.bazel @@ -4,7 +4,7 @@ module( compatibility_level = 1, ) -bazel_dep(name = "aspect_bazel_lib", version = "1.42.2") +bazel_dep(name = "aspect_bazel_lib", version = "2.6.1") bazel_dep(name = "aspect_rules_js", version = "0.0.0") local_path_override( module_name = "aspect_rules_js", diff --git a/e2e/pnpm_workspace_rerooted/MODULE.bazel b/e2e/pnpm_workspace_rerooted/MODULE.bazel index 5af599761..7b8fe48ca 100644 --- a/e2e/pnpm_workspace_rerooted/MODULE.bazel +++ b/e2e/pnpm_workspace_rerooted/MODULE.bazel @@ -5,7 +5,7 @@ module( ) bazel_dep(name = "rules_nodejs", version = "6.1.0") -bazel_dep(name = "aspect_bazel_lib", version = "1.42.2") +bazel_dep(name = "aspect_bazel_lib", version = "2.6.1") bazel_dep(name = "aspect_rules_js", version = "0.0.0") local_path_override( module_name = "aspect_rules_js", diff --git a/e2e/update_pnpm_lock/MODULE.bazel b/e2e/update_pnpm_lock/MODULE.bazel index fcf5065df..665bfe9a4 100644 --- a/e2e/update_pnpm_lock/MODULE.bazel +++ b/e2e/update_pnpm_lock/MODULE.bazel @@ -5,7 +5,7 @@ module( ) bazel_dep(name = "bazel_skylib", version = "1.5.0") -bazel_dep(name = "aspect_bazel_lib", version = "1.42.2") +bazel_dep(name = "aspect_bazel_lib", version = "2.6.1") bazel_dep(name = "aspect_rules_js", version = "0.0.0") local_path_override( module_name = "aspect_rules_js", diff --git a/e2e/update_pnpm_lock_with_import/MODULE.bazel b/e2e/update_pnpm_lock_with_import/MODULE.bazel index 49a974561..0c823fa76 100644 --- a/e2e/update_pnpm_lock_with_import/MODULE.bazel +++ b/e2e/update_pnpm_lock_with_import/MODULE.bazel @@ -5,7 +5,7 @@ module( ) bazel_dep(name = "bazel_skylib", version = "1.5.0") -bazel_dep(name = "aspect_bazel_lib", version = "1.42.2") +bazel_dep(name = "aspect_bazel_lib", version = "2.6.1") bazel_dep(name = "aspect_rules_js", version = "0.0.0") local_path_override( module_name = "aspect_rules_js", diff --git a/e2e/vendored_node/MODULE.bazel b/e2e/vendored_node/MODULE.bazel index 85867185e..70b95f0dd 100644 --- a/e2e/vendored_node/MODULE.bazel +++ b/e2e/vendored_node/MODULE.bazel @@ -4,7 +4,7 @@ module( compatibility_level = 1, ) -bazel_dep(name = "aspect_bazel_lib", version = "1.42.2") +bazel_dep(name = "aspect_bazel_lib", version = "2.6.1") bazel_dep(name = "aspect_rules_js", version = "0.0.0") bazel_dep(name = "rules_nodejs", version = "6.1.0") bazel_dep(name = "platforms", version = "0.0.4") diff --git a/e2e/vendored_tarfile/MODULE.bazel b/e2e/vendored_tarfile/MODULE.bazel index a446ad9fe..b8b4c539c 100644 --- a/e2e/vendored_tarfile/MODULE.bazel +++ b/e2e/vendored_tarfile/MODULE.bazel @@ -5,7 +5,7 @@ module( ) bazel_dep(name = "bazel_skylib", version = "1.5.0") -bazel_dep(name = "aspect_bazel_lib", version = "1.42.2") +bazel_dep(name = "aspect_bazel_lib", version = "2.6.1") bazel_dep(name = "aspect_rules_js", version = "0.0.0") local_path_override( module_name = "aspect_rules_js", diff --git a/e2e/verify_patches/MODULE.bazel b/e2e/verify_patches/MODULE.bazel index 4b7777fd0..41b0f5370 100644 --- a/e2e/verify_patches/MODULE.bazel +++ b/e2e/verify_patches/MODULE.bazel @@ -5,7 +5,7 @@ module( ) bazel_dep(name = "bazel_skylib", version = "1.5.0") -bazel_dep(name = "aspect_bazel_lib", version = "1.42.2") +bazel_dep(name = "aspect_bazel_lib", version = "2.6.1") bazel_dep(name = "aspect_rules_js", version = "0.0.0") local_path_override( module_name = "aspect_rules_js", diff --git a/e2e/webpack_devserver/MODULE.bazel b/e2e/webpack_devserver/MODULE.bazel index fe7e14760..31b71c38e 100644 --- a/e2e/webpack_devserver/MODULE.bazel +++ b/e2e/webpack_devserver/MODULE.bazel @@ -1,6 +1,6 @@ bazel_dep(name = "bazel_skylib", version = "1.5.0") bazel_dep(name = "rules_go", version = "0.46.0") -bazel_dep(name = "aspect_bazel_lib", version = "1.42.2") +bazel_dep(name = "aspect_bazel_lib", version = "2.6.1") bazel_dep(name = "aspect_rules_js", version = "0.0.0") local_path_override( module_name = "aspect_rules_js", diff --git a/e2e/webpack_devserver_esm/MODULE.bazel b/e2e/webpack_devserver_esm/MODULE.bazel index 9e1dc8303..74621c676 100644 --- a/e2e/webpack_devserver_esm/MODULE.bazel +++ b/e2e/webpack_devserver_esm/MODULE.bazel @@ -1,6 +1,6 @@ bazel_dep(name = "bazel_skylib", version = "1.5.0") bazel_dep(name = "rules_go", version = "0.46.0") -bazel_dep(name = "aspect_bazel_lib", version = "1.42.2") +bazel_dep(name = "aspect_bazel_lib", version = "2.6.1") bazel_dep(name = "aspect_rules_js", version = "0.0.0") local_path_override( module_name = "aspect_rules_js", diff --git a/js/private/BUILD.bazel b/js/private/BUILD.bazel index 1c98fb3d3..af6e5cb05 100644 --- a/js/private/BUILD.bazel +++ b/js/private/BUILD.bazel @@ -46,6 +46,7 @@ bzl_library( "@aspect_bazel_lib//lib:expand_make_vars", "@aspect_bazel_lib//lib:paths", "@aspect_bazel_lib//lib:windows_utils", + "@bazel_skylib//lib:dicts", ] + (["@bazel_tools//tools/build_defs/repo:cache.bzl"] if is_bazel_7_or_greater() else []), ) diff --git a/js/repositories.bzl b/js/repositories.bzl index a41055a0f..bac885697 100644 --- a/js/repositories.bzl +++ b/js/repositories.bzl @@ -23,9 +23,9 @@ def rules_js_dependencies(): http_archive( name = "aspect_bazel_lib", - sha256 = "f9a0bb072aef719859aae5ad37722e97812ffffb263fd56a36cd8614a2e5d199", - strip_prefix = "bazel-lib-1.42.2", - url = "https://github.com/aspect-build/bazel-lib/releases/download/v1.42.2/bazel-lib-v1.42.2.tar.gz", + sha256 = "ac6392cbe5e1cc7701bbd81caf94016bae6f248780e12af4485d4a7127b4cb2b", + strip_prefix = "bazel-lib-2.6.1", + url = "https://github.com/aspect-build/bazel-lib/releases/download/v2.6.1/bazel-lib-v2.6.1.tar.gz", ) http_archive(