diff --git a/.bazeliskrc b/.bazeliskrc index a28c887..269fbb0 100644 --- a/.bazeliskrc +++ b/.bazeliskrc @@ -1,2 +1,2 @@ BAZELISK_BASE_URL=https://github.com/aspect-build/aspect-cli/releases/download -USE_BAZEL_VERSION=aspect/5.7.2 +USE_BAZEL_VERSION=aspect/5.9.25 diff --git a/.bazelversion b/.bazelversion index 6c7efdc..2b1ea10 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1,4 +1,4 @@ -6.3.2 +7.1.1 # The first line of this file is used by Bazelisk and Bazel to be sure # the right version of Bazel is used to build and test this repo. # This also defines which version is used on CI. diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d3bcd04..edd8286 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -29,12 +29,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - id: bazel_6 + - id: bazel_7 run: echo "bazelversion=$(head -n 1 .bazelversion)" >> $GITHUB_OUTPUT - - id: bazel_5 - run: echo "bazelversion=5.3.2" >> $GITHUB_OUTPUT outputs: - # Will look like ["", "5.3.2"] + # Will look like ["", ...] bazelversions: ${{ toJSON(steps.*.outputs.bazelversion) }} matrix-prep-os: diff --git a/.gitignore b/.gitignore index 3a3f650..7724321 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,12 @@ bazel-* .bazelrc.user -node_modules \ No newline at end of file +node_modules + +# Don't commit lockfile for now as it is unstable. Do allow for it to be +# created, however, since it gives a performance boost for local development. +# https://github.com/bazelbuild/bazel/issues/19026 +# https://github.com/bazelbuild/bazel/issues/19621 +# https://github.com/bazelbuild/bazel/issues/19971 +# https://github.com/bazelbuild/bazel/issues/20272 +# https://github.com/bazelbuild/bazel/issues/20369 +MODULE.bazel.lock diff --git a/MODULE.bazel b/MODULE.bazel index cd41380..d7caa7e 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -8,10 +8,11 @@ module( # Lower-bounds (minimum) versions for direct runtime dependencies bazel_dep(name = "aspect_bazel_lib", version = "1.38.0") -bazel_dep(name = "aspect_rules_js", version = "1.29.2") +bazel_dep(name = "aspect_rules_js", version = "1.31.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 = "buildifier_prebuilt", version = "6.4.0", dev_dependency = True) bazel_dep(name = "stardoc", version = "0.6.2", dev_dependency = True, repo_name = "io_bazel_stardoc") diff --git a/e2e/smoke/MODULE.bazel b/e2e/smoke/MODULE.bazel index 49207bb..e4a0e50 100644 --- a/e2e/smoke/MODULE.bazel +++ b/e2e/smoke/MODULE.bazel @@ -2,7 +2,7 @@ bazel_dep(name = "aspect_bazel_lib", version = "1.38.0", dev_dependency = True) bazel_dep(name = "aspect_rules_terser", version = "0.0.0", dev_dependency = True) -bazel_dep(name = "aspect_rules_js", version = "1.23.2", dev_dependency = True) +bazel_dep(name = "aspect_rules_js", version = "1.31.0", dev_dependency = True) local_path_override( module_name = "aspect_rules_terser", diff --git a/terser/dependencies.bzl b/terser/dependencies.bzl index 4599407..d840848 100644 --- a/terser/dependencies.bzl +++ b/terser/dependencies.bzl @@ -2,6 +2,7 @@ load("//terser/private:maybe.bzl", http_archive = "maybe_http_archive") +# buildifier: disable=function-docstring def rules_terser_dependencies(): http_archive( name = "bazel_skylib", @@ -18,9 +19,9 @@ def rules_terser_dependencies(): http_archive( name = "aspect_rules_js", - sha256 = "7cb2d84b7d5220194627c9a0267ae599e357350e75ea4f28f337a25ca6219b83", - strip_prefix = "rules_js-1.29.2", - url = "https://github.com/aspect-build/rules_js/releases/download/v1.29.2/rules_js-v1.29.2.tar.gz", + sha256 = "7b2a4d1d264e105eae49a27e2e78065b23e2e45724df2251eacdd317e95bfdfd", + strip_prefix = "rules_js-1.31.0", + url = "https://github.com/aspect-build/rules_js/releases/download/v1.31.0/rules_js-v1.31.0.tar.gz", ) http_archive( @@ -28,3 +29,10 @@ def rules_terser_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", + )