Skip to content

Commit 24935f4

Browse files
authored
Bump Bazel to 7.1.1 (#564)
Switch to bzlmod exclusively (no WORKSPACE anymore). Fix bzlmod integration with npm. The 5.x series of rules_js is unmaintained and does not support bzlmod, and the 6.x series only has toolchains (with no packaging rules). Switch to aspect_rules_js which is currently the best source of npm packaging rules.
1 parent fec36a9 commit 24935f4

File tree

6 files changed

+12
-105
lines changed

6 files changed

+12
-105
lines changed

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.0.0
1+
7.1.1

BUILD

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library", "go_test")
22
load("@bazel_gazelle//:def.bzl", "gazelle")
3-
load("@build_bazel_rules_nodejs//:index.bzl", "pkg_npm")
3+
load("@aspect_rules_js//npm:defs.bzl", "npm_package", "stamped_package_json")
44

55
# gazelle:prefix github.com/bazelbuild/bazelisk
66
gazelle(name = "gazelle")
@@ -152,22 +152,25 @@ go_binary(
152152
visibility = ["//visibility:public"],
153153
)
154154

155-
pkg_npm(
155+
stamped_package_json(
156+
name = "package",
157+
# This key is defined by /stamp.sh
158+
stamp_var = "BUILD_SCM_VERSION",
159+
)
160+
161+
npm_package(
156162
name = "npm_package",
157-
package_name = "@bazel/bazelisk",
158163
srcs = [
159164
"LICENSE",
160165
"README.md",
161166
"bazelisk.d.ts",
162167
"bazelisk.js",
163-
"package.json",
164-
],
165-
substitutions = {"0.0.0-PLACEHOLDER": "{BUILD_SCM_VERSION}"},
166-
deps = [
167168
":bazelisk-darwin-amd64",
168169
":bazelisk-darwin-arm64",
169170
":bazelisk-linux-amd64",
170171
":bazelisk-linux-arm64",
171172
":bazelisk-windows-amd64",
173+
":package",
172174
],
175+
package = "@bazel/bazelisk",
173176
)

MODULE.bazel

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
module(name = "bazelisk", version="")
22

3-
bazel_dep(name = "bazel_skylib", version = "1.4.2")
43
bazel_dep(name = "gazelle", version = "0.32.0", repo_name = "bazel_gazelle")
54
bazel_dep(name = "platforms", version = "0.0.7")
6-
bazel_dep(name = "rules_nodejs", version = "5.5.3", repo_name = "build_bazel_rules_nodejs")
75
bazel_dep(name = "rules_go", version = "0.41.0", repo_name = "io_bazel_rules_go")
6+
bazel_dep(name = "aspect_rules_js", version = "1.39.1")
87
# -- bazel_dep definitions -- #
98

109
go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk")

WORKSPACE

Lines changed: 0 additions & 94 deletions
This file was deleted.

WORKSPACE.bzlmod

Whitespace-only changes.

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"name": "@bazel/bazelisk",
33
"description": "A user-friendly launcher for Bazel",
4-
"version": "0.0.0-PLACEHOLDER",
54
"license": "Apache-2.0",
65
"bin": {
76
"bazelisk": "bazelisk.js",

0 commit comments

Comments
 (0)