From fcadd81d088421875b91e4af4b82eb6de5cb7cab Mon Sep 17 00:00:00 2001 From: Greg Magolan Date: Wed, 8 May 2024 17:25:39 -0700 Subject: [PATCH] fix: add missing transitive dep on bazel_features to rules_webpack_dependencies --- MODULE.bazel | 2 ++ WORKSPACE | 4 ---- e2e/loaders/WORKSPACE | 4 ---- e2e/smoke/MODULE.bazel | 12 +++++------- e2e/smoke/WORKSPACE.bazel | 4 ---- e2e/worker/WORKSPACE | 4 ---- webpack/dependencies.bzl | 8 ++++++++ 7 files changed, 15 insertions(+), 23 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 11a2762..4251c90 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -6,12 +6,14 @@ module( compatibility_level = 1, ) +# Lower-bounds (minimum) versions for direct runtime dependencies bazel_dep(name = "aspect_bazel_lib", version = "1.38.1") bazel_dep(name = "aspect_rules_js", version = "1.34.0") bazel_dep(name = "bazel_skylib", version = "1.4.1") ####### Dev dependencies ######## +bazel_dep(name = "bazel_features", version = "0.1.0", dev_dependency = True) bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.5.0", dev_dependency = True) bazel_dep(name = "buildifier_prebuilt", version = "6.4.0", dev_dependency = True) bazel_dep(name = "gazelle", version = "0.36.0", dev_dependency = True, repo_name = "bazel_gazelle") diff --git a/WORKSPACE b/WORKSPACE index 42454d5..27194c4 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -8,10 +8,6 @@ load("//webpack:dependencies.bzl", "rules_webpack_dependencies") rules_webpack_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_coreutils_toolchains") aspect_bazel_lib_dependencies() diff --git a/e2e/loaders/WORKSPACE b/e2e/loaders/WORKSPACE index c34ddd5..bec87d0 100644 --- a/e2e/loaders/WORKSPACE +++ b/e2e/loaders/WORKSPACE @@ -10,10 +10,6 @@ load("@aspect_rules_webpack//webpack:dependencies.bzl", "rules_webpack_dependenc rules_webpack_dependencies() -load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies") - -rules_js_dependencies() - # Fetch and register a nodejs interpreter, if you haven't already load("@rules_nodejs//nodejs:repositories.bzl", "DEFAULT_NODE_VERSION", "nodejs_register_toolchains") diff --git a/e2e/smoke/MODULE.bazel b/e2e/smoke/MODULE.bazel index 94a609f..d0d2a86 100644 --- a/e2e/smoke/MODULE.bazel +++ b/e2e/smoke/MODULE.bazel @@ -1,16 +1,14 @@ -"Bazel dependencies" - -bazel_dep(name = "aspect_bazel_lib", version = "1.32.0") -bazel_dep(name = "aspect_rules_js", version = "1.33.1") -bazel_dep(name = "bazel_skylib", version = "1.4.1") - bazel_dep(name = "aspect_rules_webpack", version = "0.0.0", dev_dependency = True) local_path_override( module_name = "aspect_rules_webpack", path = "../..", ) -npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm") +bazel_dep(name = "aspect_bazel_lib", version = "1.32.0", dev_dependency = True) +bazel_dep(name = "aspect_rules_js", version = "1.33.1", dev_dependency = True) +bazel_dep(name = "bazel_skylib", version = "1.4.1", dev_dependency = True) + +npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm", dev_dependency = True) npm.npm_translate_lock( name = "v4-npm", pnpm_lock = "//v4:pnpm-lock.yaml", diff --git a/e2e/smoke/WORKSPACE.bazel b/e2e/smoke/WORKSPACE.bazel index 2109430..4596f9d 100644 --- a/e2e/smoke/WORKSPACE.bazel +++ b/e2e/smoke/WORKSPACE.bazel @@ -16,10 +16,6 @@ load("@aspect_rules_webpack//webpack:dependencies.bzl", "rules_webpack_dependenc rules_webpack_dependencies() -load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies") - -rules_js_dependencies() - # Fetch and register a nodejs interpreter, if you haven't already load("@rules_nodejs//nodejs:repositories.bzl", "DEFAULT_NODE_VERSION", "nodejs_register_toolchains") diff --git a/e2e/worker/WORKSPACE b/e2e/worker/WORKSPACE index 15530c7..a7be3de 100644 --- a/e2e/worker/WORKSPACE +++ b/e2e/worker/WORKSPACE @@ -10,10 +10,6 @@ load("@aspect_rules_webpack//webpack:dependencies.bzl", "rules_webpack_dependenc rules_webpack_dependencies() -load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies") - -rules_js_dependencies() - # Fetch and register a nodejs interpreter, if you haven't already load("@rules_nodejs//nodejs:repositories.bzl", "DEFAULT_NODE_VERSION", "nodejs_register_toolchains") diff --git a/webpack/dependencies.bzl b/webpack/dependencies.bzl index 7833043..e618093 100644 --- a/webpack/dependencies.bzl +++ b/webpack/dependencies.bzl @@ -6,6 +6,7 @@ See https://docs.bazel.build/versions/main/skylark/deploying.html#dependencies load("//webpack/private:maybe.bzl", http_archive = "maybe_http_archive") +# buildifier: disable=function-docstring def rules_webpack_dependencies(): http_archive( name = "bazel_skylib", @@ -32,3 +33,10 @@ def rules_webpack_dependencies(): sha256 = "764a3b3757bb8c3c6a02ba3344731a3d71e558220adcb0cf7e43c9bba2c37ba8", urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/5.8.2/rules_nodejs-core-5.8.2.tar.gz"], ) + + http_archive( + name = "bazel_features", + sha256 = "f3082bfcdca73dc77dcd68faace806135a2e08c230b02b1d9fbdbd7db9d9c450", + strip_prefix = "bazel_features-0.1.0", + url = "https://github.com/bazel-contrib/bazel_features/releases/download/v0.1.0/bazel_features-v0.1.0.tar.gz", + )