feat: upgrade to rules_js 2.0

aspect-build · Apr 22, 2024 · eb6fcb1 · eb6fcb1
1 parent efde9fc
commit eb6fcb1
Show file tree

Hide file tree

Showing 18 changed files with 109 additions and 80 deletions.
diff --git 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
@@ -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
@@ -28,12 +28,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 ["<version from .bazelversion>", "5.3.2"]
+ # Will look like ["<version from .bazelversion>", ...]
  bazelversions: ${{ toJSON(steps.*.outputs.bazelversion) }}
 
  matrix-prep-os:

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,12 @@
 bazel-*
 .bazelrc.user
-node_modules
+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/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -9,18 +9,18 @@ default_stages: [commit]
 repos:
  # Check formatting and lint for starlark code
  - repo: https://github.com/keith/pre-commit-buildifier
- rev: 4.0.1.1
+ rev: 6.4.0
  hooks:
  - id: buildifier
  - id: buildifier-lint
  # Enforce that commit messages allow for later changelog generation
  - repo: https://github.com/commitizen-tools/commitizen
- rev: v2.18.0
+ rev: v3.24.0
  hooks:
  # Requires that commitizen is already installed
  - id: commitizen
  stages: [commit-msg]
  - repo: https://github.com/pre-commit/mirrors-prettier
- rev: 'v2.4.0'
+ rev: v3.1.0
  hooks:
  - id: prettier
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -3,12 +3,20 @@ load("@npm//:defs.bzl", "npm_link_all_packages")
 
 npm_link_all_packages(name = "node_modules")
 
-# gazelle:exclude internal_deps.bzl
+buildifier(
+ name = "buildifier",
+ exclude_patterns = ["./.git/*"],
+ lint_mode = "fix",
+ mode = "fix",
+ tags = ["manual"], # tag as manual so windows ci does not build it by default
+)
+
 buildifier(
  name = "buildifier.check",
- exclude_patterns = [
- "./.git/*",
- ],
+ exclude_patterns = ["./.git/*"],
  lint_mode = "warn",
  mode = "diff",
+ tags = ["manual"], # tag as manual so windows ci does not build it by default
 )
+
+# gazelle:exclude internal_deps.bzl
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -6,7 +6,12 @@ module(
  compatibility_level = 1,
 )
 
-bazel_dep(name = "aspect_bazel_lib", version = "1.30.2")
-bazel_dep(name = "aspect_rules_js", version = "1.29.2")
-bazel_dep(name = "bazel_skylib", version = "1.4.1")
-bazel_dep(name = "buildifier_prebuilt", version = "6.0.0.1", dev_dependency = True)
+# Lower-bounds (minimum) versions for direct runtime dependencies
+bazel_dep(name = "aspect_bazel_lib", version = "2.7.1")
+bazel_dep(name = "aspect_rules_js", version = "2.0.0-alpha.2")
+bazel_dep(name = "bazel_skylib", version = "1.5.0")
+
+####### Dev dependencies ########
+
+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/WORKSPACE b/WORKSPACE
@@ -10,18 +10,11 @@ load("@aspect_rules_terser//terser:dependencies.bzl", "rules_terser_dependencies
 
 rules_terser_dependencies()
 
-load("@aspect_bazel_lib//lib:repositories.bzl", "aspect_bazel_lib_dependencies")
+load("@aspect_rules_js//js:toolchains.bzl", "DEFAULT_NODE_VERSION", "rules_js_register_toolchains")
 
-aspect_bazel_lib_dependencies(override_local_config_platform = True)
+rules_js_register_toolchains(node_version = DEFAULT_NODE_VERSION)
 
-load("@rules_nodejs//nodejs:repositories.bzl", "nodejs_register_toolchains")
-
-nodejs_register_toolchains(
- name = "node16",
- node_version = "16.9.0",
-)
-
-load("@aspect_rules_js//npm:npm_import.bzl", "npm_translate_lock")
+load("@aspect_rules_js//npm:repositories.bzl", "npm_translate_lock")
 
 npm_translate_lock(
  name = "npm",
@@ -39,6 +32,28 @@ load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
 
 bazel_skylib_workspace()
 
+############################################
+# Stardoc
+load("@io_bazel_stardoc//:setup.bzl", "stardoc_repositories")
+
+stardoc_repositories()
+
+load("@rules_jvm_external//:repositories.bzl", "rules_jvm_external_deps")
+
+rules_jvm_external_deps()
+
+load("@rules_jvm_external//:setup.bzl", "rules_jvm_external_setup")
+
+rules_jvm_external_setup()
+
+load("@io_bazel_stardoc//:deps.bzl", "stardoc_external_deps")
+
+stardoc_external_deps()
+
+load("@stardoc_maven//:defs.bzl", stardoc_pinned_maven_install = "pinned_maven_install")
+
+stardoc_pinned_maven_install()
+
 # Buildifier
 load("@buildifier_prebuilt//:deps.bzl", "buildifier_prebuilt_deps")
 

diff --git a/docs/rules.md b/docs/rules.md
diff --git a/e2e/smoke/BUILD.bazel b/e2e/smoke/BUILD.bazel
@@ -1,5 +1,5 @@
-load("@aspect_rules_terser//terser:defs.bzl", "terser")
 load("@aspect_bazel_lib//lib:write_source_files.bzl", "write_source_files")
+load("@aspect_rules_terser//terser:defs.bzl", "terser")
 load("@npm//:defs.bzl", "npm_link_all_packages")
 
 npm_link_all_packages(name = "node_modules")

diff --git a/e2e/smoke/MODULE.bazel b/e2e/smoke/MODULE.bazel
@@ -1,15 +1,13 @@
-"Bazel dependencies"
-
-bazel_dep(name = "aspect_bazel_lib", version = "1.30.2", 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)
-
 local_path_override(
  module_name = "aspect_rules_terser",
  path = "../..",
 )
 
-npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm")
+bazel_dep(name = "aspect_bazel_lib", version = "2.7.1", dev_dependency = True)
+bazel_dep(name = "aspect_rules_js", version = "2.0.0-alpha.2", dev_dependency = True)
+
+npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm", dev_dependency = True)
 npm.npm_translate_lock(
  name = "npm",
  pnpm_lock = "//:pnpm-lock.yaml",

diff --git a/e2e/smoke/WORKSPACE.bazel b/e2e/smoke/WORKSPACE.bazel
@@ -18,14 +18,11 @@ rules_terser_dependencies()
 
 # Fetch and register a nodejs interpreter, if you haven't already
 
-load("@rules_nodejs//nodejs:repositories.bzl", "DEFAULT_NODE_VERSION", "nodejs_register_toolchains")
+load("@aspect_rules_js//js:toolchains.bzl", "DEFAULT_NODE_VERSION", "rules_js_register_toolchains")
 
-nodejs_register_toolchains(
- name = "node",
- node_version = DEFAULT_NODE_VERSION,
-)
+rules_js_register_toolchains(node_version = DEFAULT_NODE_VERSION)
 
-load("@aspect_rules_js//npm:npm_import.bzl", "npm_translate_lock")
+load("@aspect_rules_js//npm:repositories.bzl", "npm_translate_lock")
 
 npm_translate_lock(
  name = "npm",

diff --git a/examples/minify/BUILD.bazel b/examples/minify/BUILD.bazel
@@ -1,5 +1,5 @@
-load("@aspect_rules_terser//terser:defs.bzl", "terser")
 load("@aspect_bazel_lib//lib:write_source_files.bzl", "write_source_files")
+load("@aspect_rules_terser//terser:defs.bzl", "terser")
 
 terser(
  name = "minified",

diff --git a/internal_deps.bzl b/internal_deps.bzl
@@ -11,15 +11,13 @@ def rules_terser_internal_deps():
  "Fetch deps needed for local development"
  http_archive(
  name = "io_bazel_stardoc",
- sha256 = "3fd8fec4ddec3c670bd810904e2e33170bedfe12f90adf943508184be458c8bb",
- urls = ["https://github.com/bazelbuild/stardoc/releases/download/0.5.3/stardoc-0.5.3.tar.gz"],
+ sha256 = "62bd2e60216b7a6fec3ac79341aa201e0956477e7c8f6ccc286f279ad1d96432",
+ urls = ["https://github.com/bazelbuild/stardoc/releases/download/0.6.2/stardoc-0.6.2.tar.gz"],
  )
 
  http_archive(
  name = "buildifier_prebuilt",
- sha256 = "e46c16180bc49487bfd0f1ffa7345364718c57334fa0b5b67cb5f27eba10f309",
- strip_prefix = "buildifier-prebuilt-6.1.0",
- urls = [
- "https://github.com/keith/buildifier-prebuilt/archive/6.1.0.tar.gz",
- ],
+ sha256 = "8ada9d88e51ebf5a1fdff37d75ed41d51f5e677cdbeafb0a22dda54747d6e07e",
+ strip_prefix = "buildifier-prebuilt-6.4.0",
+ urls = ["http://github.com/keith/buildifier-prebuilt/archive/6.4.0.tar.gz"],
  )
diff --git a/terser/defs.bzl b/terser/defs.bzl
@@ -7,6 +7,7 @@ load("//terser/private:terser.bzl", terser_lib = "lib")
 _terser = rule(
  implementation = terser_lib.implementation,
  attrs = terser_lib.attrs,
+ toolchains = terser_lib.toolchains,
 )
 
 def terser(

diff --git a/terser/dependencies.bzl b/terser/dependencies.bzl
@@ -5,26 +5,27 @@ load("//terser/private:maybe.bzl", http_archive = "maybe_http_archive")
 def rules_terser_dependencies():
  http_archive(
  name = "bazel_skylib",
- sha256 = "b8a1527901774180afc798aeb28c4634bdccf19c4d98e7bdd1ce79d1fe9aaad7",
- urls = ["https://github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz"],
+ sha256 = "cd55a062e763b9349921f0f5db8c3933288dc8ba4f76dd9416aac68acee3cb94",
+ urls = ["https://github.com/bazelbuild/bazel-skylib/releases/download/1.5.0/bazel-skylib-1.5.0.tar.gz"],
  )
 
  http_archive(
  name = "aspect_bazel_lib",
- sha256 = "ee95bbc80f9ca219b93a8cc49fa19a2d4aa8649ddc9024f46abcdd33935753ca",
- strip_prefix = "bazel-lib-1.29.2",
- url = "https://github.com/aspect-build/bazel-lib/releases/download/v1.29.2/bazel-lib-v1.29.2.tar.gz",
+ sha256 = "b554eb7942a5ab44c90077df6a0c76fc67c5874c9446a007e9ba68be82bd4796",
+ strip_prefix = "bazel-lib-2.7.1",
+ url = "https://github.com/aspect-build/bazel-lib/releases/download/v2.7.1/bazel-lib-v2.7.1.tar.gz",
  )
 
  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 = "b627acf34f928507dfabae69d3fd8702ce3d45bed568ad4c44b243cb789f08c6",
+ strip_prefix = "rules_js-2.0.0-alpha.2",
+ url = "https://github.com/aspect-build/rules_js/releases/download/v2.0.0-alpha.2/rules_js-v2.0.0-alpha.2.tar.gz",
  )
 
  http_archive(
  name = "rules_nodejs",
- sha256 = "764a3b3757bb8c3c6a02ba3344731a3d71e558220adcb0cf7e43c9bba2c37ba8",
- urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/5.8.2/rules_nodejs-core-5.8.2.tar.gz"],
+ sha256 = "dddd60acc3f2f30359bef502c9d788f67e33814b0ddd99aa27c5a15eb7a41b8c",
+ strip_prefix = "rules_nodejs-6.1.0",
+ url = "https://github.com/bazelbuild/rules_nodejs/releases/download/v6.1.0/rules_nodejs-v6.1.0.tar.gz",
  )
diff --git a/terser/private/BUILD.bazel b/terser/private/BUILD.bazel
@@ -15,6 +15,5 @@ bzl_library(
  "@aspect_bazel_lib//lib:copy_to_bin",
  "@aspect_rules_js//js:libs",
  "@aspect_rules_js//js:providers",
- "@rules_nodejs//nodejs:bzl",
  ],
 )