diff --git a/.bazelversion b/.bazelversion index 09b254e9..21c8c7b4 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -6.0.0 +7.1.1 diff --git a/BUILD b/BUILD index 3b3abec5..93a9ac9a 100644 --- a/BUILD +++ b/BUILD @@ -1,6 +1,6 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library", "go_test") load("@bazel_gazelle//:def.bzl", "gazelle") -load("@build_bazel_rules_nodejs//:index.bzl", "pkg_npm") +load("@aspect_rules_js//npm:defs.bzl", "npm_package", "stamped_package_json") # gazelle:prefix github.com/bazelbuild/bazelisk gazelle(name = "gazelle") @@ -152,22 +152,25 @@ go_binary( visibility = ["//visibility:public"], ) -pkg_npm( +stamped_package_json( + name = "package", + # This key is defined by /stamp.sh + stamp_var = "BUILD_SCM_VERSION", +) + +npm_package( name = "npm_package", - package_name = "@bazel/bazelisk", srcs = [ "LICENSE", "README.md", "bazelisk.d.ts", "bazelisk.js", - "package.json", - ], - substitutions = {"0.0.0-PLACEHOLDER": "{BUILD_SCM_VERSION}"}, - deps = [ ":bazelisk-darwin-amd64", ":bazelisk-darwin-arm64", ":bazelisk-linux-amd64", ":bazelisk-linux-arm64", ":bazelisk-windows-amd64", + ":package", ], + package = "@bazel/bazelisk", ) diff --git a/MODULE.bazel b/MODULE.bazel index 6cf861b7..f22d5f16 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -1,10 +1,9 @@ module(name = "bazelisk", version="") -bazel_dep(name = "bazel_skylib", version = "1.4.2") bazel_dep(name = "gazelle", version = "0.32.0", repo_name = "bazel_gazelle") bazel_dep(name = "platforms", version = "0.0.7") -bazel_dep(name = "rules_nodejs", version = "5.5.3", repo_name = "build_bazel_rules_nodejs") bazel_dep(name = "rules_go", version = "0.41.0", repo_name = "io_bazel_rules_go") +bazel_dep(name = "aspect_rules_js", version = "1.39.1") # -- bazel_dep definitions -- # go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk") diff --git a/WORKSPACE b/WORKSPACE deleted file mode 100644 index bdcca7fe..00000000 --- a/WORKSPACE +++ /dev/null @@ -1,94 +0,0 @@ -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") - -http_archive( - name = "io_bazel_rules_go", - sha256 = "278b7ff5a826f3dc10f04feaf0b70d48b68748ccd512d7f98bf442077f043fe3", - urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.41.0/rules_go-v0.41.0.zip", - "https://github.com/bazelbuild/rules_go/releases/download/v0.41.0/rules_go-v0.41.0.zip", - ], -) - -http_archive( - name = "bazel_gazelle", - sha256 = "448e37e0dbf61d6fa8f00aaa12d191745e14f07c31cabfa731f0c8e8a4f41b97", - urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.28.0/bazel-gazelle-v0.28.0.tar.gz", - "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.28.0/bazel-gazelle-v0.28.0.tar.gz", - ], -) - -load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies") -load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository") - -go_repository( - name = "com_github_bazelbuild_rules_go", - importpath = "github.com/bazelbuild/rules_go", - sum = "h1:vbnESGv/t2WgGEbXatwbXAS95dTx93Lv6Uh5QkVF13s=", - version = "v0.42.0", -) - -go_repository( - name = "com_github_hashicorp_go_version", - importpath = "github.com/hashicorp/go-version", - sum = "h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek=", - version = "v1.6.0", -) - -go_repository( - name = "com_github_mitchellh_go_homedir", - importpath = "github.com/mitchellh/go-homedir", - sum = "h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=", - version = "v1.1.0", -) - -go_repository( - name = "com_github_bgentry_go_netrc", - importpath = "github.com/bgentry/go-netrc", - sum = "h1:xDfNPAt8lFiC1UJrqV3uuy861HCTo708pDMbjHHdCas=", - version = "v0.0.0-20140422174119-9fd32a8b3d3d", -) - -go_repository( - name = "org_golang_x_term", - importpath = "golang.org/x/term", - sum = "h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=", - version = "v0.13.0", -) - -go_repository( - name = "org_golang_x_sys", - importpath = "golang.org/x/sys", - sum = "h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=", - version = "v0.13.0", -) - -go_rules_dependencies() - -go_register_toolchains(version = "1.20.5") - -gazelle_dependencies() - -# We don't use any nodejs but this includes a rule for publishing releases to npm -http_archive( - name = "build_bazel_rules_nodejs", - sha256 = "f10a3a12894fc3c9bf578ee5a5691769f6805c4be84359681a785a0c12e8d2b6", - urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/5.5.3/rules_nodejs-5.5.3.tar.gz"], -) - -load("@build_bazel_rules_nodejs//:repositories.bzl", "build_bazel_rules_nodejs_dependencies") - -build_bazel_rules_nodejs_dependencies() - -load("@build_bazel_rules_nodejs//:index.bzl", "node_repositories") - -node_repositories() - -http_archive( - name = "platforms", - sha256 = "079945598e4b6cc075846f7fd6a9d0857c33a7afc0de868c2ccb96405225135d", - urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.4/platforms-0.0.4.tar.gz", - "https://github.com/bazelbuild/platforms/releases/download/0.0.4/platforms-0.0.4.tar.gz", - ], -) diff --git a/WORKSPACE.bzlmod b/WORKSPACE.bzlmod deleted file mode 100644 index e69de29b..00000000 diff --git a/package.json b/package.json index a8b56b0a..edf944ba 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,6 @@ { "name": "@bazel/bazelisk", "description": "A user-friendly launcher for Bazel", - "version": "0.0.0-PLACEHOLDER", "license": "Apache-2.0", "bin": { "bazelisk": "bazelisk.js",