From d5d661ea8d33edbd1ef97a6cb87efcf09a1511d0 Mon Sep 17 00:00:00 2001 From: Greg Magolan Date: Mon, 15 Apr 2024 21:15:14 -0700 Subject: [PATCH] chore: load rules_js_dev_dependencies from js/private --- WORKSPACE | 3 ++- js/BUILD.bazel | 10 ---------- js/private/BUILD.bazel | 10 ++++++++++ js/{dev_repositories.bzl => private/dev_deps.bzl} | 0 4 files changed, 12 insertions(+), 11 deletions(-) rename js/{dev_repositories.bzl => private/dev_deps.bzl} (100%) diff --git a/WORKSPACE b/WORKSPACE index b8f99b563..aecad2751 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -3,7 +3,8 @@ workspace( name = "aspect_rules_js", ) -load("//js:dev_repositories.bzl", "rules_js_dev_dependencies") +# buildifier: disable=bzl-visibility +load("//js/private:dev_deps.bzl", "rules_js_dev_dependencies") rules_js_dev_dependencies() diff --git a/js/BUILD.bazel b/js/BUILD.bazel index b01e30b41..becfaf657 100644 --- a/js/BUILD.bazel +++ b/js/BUILD.bazel @@ -49,13 +49,3 @@ bzl_library( "@bazel_tools//tools/build_defs/repo:utils.bzl", ] + (["@bazel_tools//tools/build_defs/repo:cache.bzl"] if bazel_lib_utils.is_bazel_7_or_greater() else []), ) - -bzl_library( - name = "dev_repositories", - srcs = ["dev_repositories.bzl"], - visibility = ["//visibility:public"], - 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 bazel_lib_utils.is_bazel_7_or_greater() else []), -) diff --git a/js/private/BUILD.bazel b/js/private/BUILD.bazel index 16e59b39c..b8ddfc468 100644 --- a/js/private/BUILD.bazel +++ b/js/private/BUILD.bazel @@ -19,6 +19,16 @@ exports_files([ "npm_wrapper.sh", ]) +bzl_library( + name = "dev_deps", + srcs = ["dev_deps.bzl"], + visibility = ["//visibility:public"], + 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 bazel_lib_utils.is_bazel_7_or_greater() else []), +) + bzl_library( name = "js_info_files", srcs = ["js_info_files.bzl"], diff --git a/js/dev_repositories.bzl b/js/private/dev_deps.bzl similarity index 100% rename from js/dev_repositories.bzl rename to js/private/dev_deps.bzl