diff --git a/js/BUILD.bazel b/js/BUILD.bazel index a4f8bef58..b01e30b41 100644 --- a/js/BUILD.bazel +++ b/js/BUILD.bazel @@ -1,6 +1,6 @@ "Public API" -load("@aspect_bazel_lib//lib:utils.bzl", "is_bazel_7_or_greater") +load("@aspect_bazel_lib//lib:utils.bzl", bazel_lib_utils = "utils") load("@bazel_skylib//:bzl_library.bzl", "bzl_library") exports_files( @@ -47,7 +47,7 @@ bzl_library( deps = [ "@bazel_tools//tools/build_defs/repo:http.bzl", "@bazel_tools//tools/build_defs/repo:utils.bzl", - ] + (["@bazel_tools//tools/build_defs/repo:cache.bzl"] if is_bazel_7_or_greater() else []), + ] + (["@bazel_tools//tools/build_defs/repo:cache.bzl"] if bazel_lib_utils.is_bazel_7_or_greater() else []), ) bzl_library( @@ -57,5 +57,5 @@ bzl_library( deps = [ "@bazel_tools//tools/build_defs/repo:http.bzl", "@bazel_tools//tools/build_defs/repo:utils.bzl", - ] + (["@bazel_tools//tools/build_defs/repo:cache.bzl"] if is_bazel_7_or_greater() else []), + ] + (["@bazel_tools//tools/build_defs/repo:cache.bzl"] if bazel_lib_utils.is_bazel_7_or_greater() else []), ) diff --git a/js/private/BUILD.bazel b/js/private/BUILD.bazel index 868aeb2b6..b223fea54 100644 --- a/js/private/BUILD.bazel +++ b/js/private/BUILD.bazel @@ -1,7 +1,7 @@ "Internal implementation details" load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin") -load("@aspect_bazel_lib//lib:utils.bzl", "is_bazel_7_or_greater") +load("@aspect_bazel_lib//lib:utils.bzl", bazel_lib_utils = "utils") load("@aspect_bazel_lib//lib:write_source_files.bzl", "write_source_files") load("@bazel_skylib//:bzl_library.bzl", "bzl_library") load("//js:defs.bzl", "js_binary") @@ -28,7 +28,7 @@ bzl_library( ], deps = [ ":js_helpers", - ] + (["@bazel_tools//tools/build_defs/repo:cache.bzl"] if is_bazel_7_or_greater() else []), + ] + (["@bazel_tools//tools/build_defs/repo:cache.bzl"] if bazel_lib_utils.is_bazel_7_or_greater() else []), ) bzl_library( @@ -47,7 +47,7 @@ bzl_library( "@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 []), + ] + (["@bazel_tools//tools/build_defs/repo:cache.bzl"] if bazel_lib_utils.is_bazel_7_or_greater() else []), ) bzl_library( @@ -76,7 +76,7 @@ bzl_library( ":js_info", "@aspect_bazel_lib//lib:copy_to_bin", "@bazel_skylib//lib:dicts", - ] + (["@bazel_tools//tools/build_defs/repo:cache.bzl"] if is_bazel_7_or_greater() else []), + ] + (["@bazel_tools//tools/build_defs/repo:cache.bzl"] if bazel_lib_utils.is_bazel_7_or_greater() else []), ) bzl_library( @@ -107,7 +107,7 @@ bzl_library( ":js_binary", ":js_helpers", "@bazel_skylib//lib:dicts", - ] + (["@bazel_tools//tools/build_defs/repo:cache.bzl"] if is_bazel_7_or_greater() else []), + ] + (["@bazel_tools//tools/build_defs/repo:cache.bzl"] if bazel_lib_utils.is_bazel_7_or_greater() else []), ) bzl_library( @@ -133,7 +133,7 @@ bzl_library( "@aspect_bazel_lib//lib:paths", "@aspect_bazel_lib//lib:utils", "@bazel_skylib//lib:paths", - ] + (["@bazel_tools//tools/build_defs/repo:cache.bzl"] if is_bazel_7_or_greater() else []), + ] + (["@bazel_tools//tools/build_defs/repo:cache.bzl"] if bazel_lib_utils.is_bazel_7_or_greater() else []), ) copy_to_bin( diff --git a/js/private/js_image_layer.bzl b/js/private/js_image_layer.bzl index e2c78a2ca..8560634c7 100644 --- a/js/private/js_image_layer.bzl +++ b/js/private/js_image_layer.bzl @@ -14,7 +14,7 @@ js_image_layer( """ load("@aspect_bazel_lib//lib:paths.bzl", "to_rlocation_path") -load("@aspect_bazel_lib//lib:utils.bzl", "is_bazel_6_or_greater") +load("@aspect_bazel_lib//lib:utils.bzl", bazel_lib_utils = "utils") load("@bazel_skylib//lib:paths.bzl", "paths") _DOC = """Create container image layers from js_binary targets. @@ -217,7 +217,7 @@ def _build_layer(ctx, type, entries, inputs): args.add(output) args.add(ctx.attr.compression) args.add(ctx.attr.owner) - if not is_bazel_6_or_greater(): + if not bazel_lib_utils.is_bazel_6_or_greater(): args.add("true") ctx.actions.run( diff --git a/js/private/js_run_binary.bzl b/js/private/js_run_binary.bzl index 7eff984cc..e2cd5d916 100644 --- a/js/private/js_run_binary.bzl +++ b/js/private/js_run_binary.bzl @@ -11,7 +11,7 @@ load("@aspect_rules_js//js:defs.bzl", "js_run_binary") """ load("@aspect_bazel_lib//lib:run_binary.bzl", _run_binary = "run_binary") -load("@aspect_bazel_lib//lib:utils.bzl", "to_label") +load("@aspect_bazel_lib//lib:utils.bzl", bazel_lib_utils = "utils") load("@aspect_bazel_lib//lib:copy_to_bin.bzl", _copy_to_bin = "copy_to_bin") load("@bazel_skylib//lib:dicts.bzl", "dicts") load(":js_helpers.bzl", _envs_for_log_level = "envs_for_log_level") @@ -332,7 +332,7 @@ WARNING: {name} is not configured to produce outputs. If this is a generated bin from package_json.bzl, consider using the *_binary or *_test variant instead. See https://github.com/aspect-build/rules_js/tree/main/docs#using-binaries-published-to-npm """.format( - name = to_label(name), + name = bazel_lib_utils.to_label(name), )) # Configure run from execroot diff --git a/npm/private/BUILD.bazel b/npm/private/BUILD.bazel index b0134da92..2a4d4ea61 100644 --- a/npm/private/BUILD.bazel +++ b/npm/private/BUILD.bazel @@ -1,7 +1,7 @@ "Internal implementation details" load("@aspect_bazel_lib//lib:testing.bzl", "assert_contains") -load("@aspect_bazel_lib//lib:utils.bzl", "is_bazel_7_or_greater") +load("@aspect_bazel_lib//lib:utils.bzl", bazel_lib_utils = "utils") load("@aspect_rules_js//js:defs.bzl", "js_library") load("@bazel_skylib//:bzl_library.bzl", "bzl_library") @@ -216,7 +216,7 @@ bzl_library( "@aspect_bazel_lib//lib:repo_utils", "@aspect_bazel_lib//lib:utils", "@bazel_skylib//lib:types", - ] + (["@bazel_tools//tools/build_defs/repo:cache.bzl"] if is_bazel_7_or_greater() else []), + ] + (["@bazel_tools//tools/build_defs/repo:cache.bzl"] if bazel_lib_utils.is_bazel_7_or_greater() else []), ) bzl_library( diff --git a/npm/private/repository_label_store.bzl b/npm/private/repository_label_store.bzl index 618988191..ec4b27477 100644 --- a/npm/private/repository_label_store.bzl +++ b/npm/private/repository_label_store.bzl @@ -7,7 +7,6 @@ resolve the underlying issue in the future https://github.com/bazelbuild/bazel/i """ load("@bazel_skylib//lib:paths.bzl", "paths") -load("@aspect_bazel_lib//lib:utils.bzl", "is_bazel_6_or_greater") ################################################################################ def _make_sibling_label(sibling_label, path): @@ -16,9 +15,9 @@ def _make_sibling_label(sibling_label, path): dirname = paths.dirname(sibling_label.name) if path.startswith("../"): # we have no idea what package this sibling is in so just assume the root package which works for repository rules - return Label("{}{}//:{}".format("@@" if is_bazel_6_or_greater() else "@", sibling_label.workspace_name, paths.normalize(paths.join(sibling_label.package, dirname, path)))) + return Label("@@{}//:{}".format(sibling_label.workspace_name, paths.normalize(paths.join(sibling_label.package, dirname, path)))) else: - return Label("{}{}//{}:{}".format("@@" if is_bazel_6_or_greater() else "@", sibling_label.workspace_name, sibling_label.package, paths.join(dirname, path))) + return Label("@@{}//{}:{}".format(sibling_label.workspace_name, sibling_label.package, paths.join(dirname, path))) ################################################################################ def _seed_root(priv, rctx_path, label): diff --git a/npm/private/utils.bzl b/npm/private/utils.bzl index a6c17b8c3..9a8d111b3 100644 --- a/npm/private/utils.bzl +++ b/npm/private/utils.bzl @@ -1,6 +1,6 @@ "Utility functions for npm rules" -load("@aspect_bazel_lib//lib:utils.bzl", "is_bazel_6_or_greater") +load("@aspect_bazel_lib//lib:utils.bzl", bazel_lib_utils = "utils") load("@aspect_bazel_lib//lib:paths.bzl", "relative_file") load("@aspect_bazel_lib//lib:repo_utils.bzl", "repo_utils") load("@bazel_skylib//lib:paths.bzl", "paths") @@ -247,7 +247,7 @@ def _virtual_store_name(name, version): return "%s@%s" % (escaped_name, escaped_version) def _make_symlink(ctx, symlink_path, target_file): - if not is_bazel_6_or_greater(): + if not bazel_lib_utils.is_bazel_6_or_greater(): # ctx.actions.declare_symlink was added in Bazel 6 fail("A minimum version of Bazel 6 required to use rules_js") symlink = ctx.actions.declare_symlink(symlink_path)