.bazelci/presubmit.yml

@@ -3,15 +3,21 @@ buildifier:
   version: latest
   warnings: "default"
 platforms:
-  ubuntu1604:
+  ubuntu1804:
     test_targets:
     - "//..."
-  ubuntu1804:
+  ubuntu2004:
+    test_targets:
+    - "//..."
+  ubuntu2204:
     test_targets:
     - "//..."
   macos:
     test_targets:
     - "//..."
+  macos_arm64:
+    test_targets:
+    - "//..."
   windows:
     test_flags:
     - "--enable_runfiles"

.bazelrc

@@ -8,3 +8,10 @@ build:release -c opt --stamp --workspace_status_command="$PWD/status.py"
 # *last* statement in the root configuration file, as the local configuration
 # file should be able to overwrite flags from the root configuration.
 try-import %workspace%/.bazelrc.user
+
+# TODO: migrate all dependencies from WORKSPACE to MODULE.bazel
+# https://github.com/bazelbuild/buildtools/issues/1204
+common --noenable_bzlmod
+
+build --cxxopt=-std=c++14
+build --host_cxxopt=-std=c++14

.pre-commit-config.yaml

@@ -0,0 +1,13 @@
+# First [install pre-commit](https://pre-commit.com/#installation),
+# then run
+# pre-commit install
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+
+repos:
+    # Check formatting and lint for starlark code
+    - repo: https://github.com/keith/pre-commit-buildifier
+      rev: 6.3.3
+      hooks:
+          - id: buildifier
+          - id: buildifier-lint

MODULE.bazel

@@ -0,0 +1,2 @@
+# TODO: migrate all dependencies from WORKSPACE to MODULE.bazel
+# https://github.com/bazelbuild/buildtools/issues/1204

WORKSPACE

@@ -39,10 +39,10 @@ go_repository(
 
 http_archive(
     name = "com_google_protobuf",
-    sha256 = "9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a",
-    strip_prefix = "protobuf-3.13.0",
+    sha256 = "616bb3536ac1fff3fb1a141450fa28b875e985712170ea7f1bfe5e5fc41e2cd8",
+    strip_prefix = "protobuf-24.4",
     urls = [
-        "https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz",
+        "https://github.com/protocolbuffers/protobuf/archive/v24.4.tar.gz",
     ],
 )
 
@@ -76,20 +76,37 @@ load("@com_github_bazelbuild_buildtools//buildifier:deps.bzl", "buildifier_depen
 
 buildifier_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 = "8a7c981217239085f78acc9898a1f7ba99af887c1996ceb3b4504655383a2c3c",
-    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/4.0.0/rules_nodejs-4.0.0.tar.gz"],
+    name = "rules_nodejs",
+    sha256 = "162f4adfd719ba42b8a6f16030a20f434dc110c65dc608660ef7b3411c9873f9",
+    strip_prefix = "rules_nodejs-6.0.2",
+    url = "https://github.com/bazelbuild/rules_nodejs/releases/download/v6.0.2/rules_nodejs-v6.0.2.tar.gz",
 )
 
-load("@build_bazel_rules_nodejs//:index.bzl", "node_repositories", "npm_install")
+load("@rules_nodejs//nodejs:repositories.bzl", "nodejs_register_toolchains")
 
-node_repositories(node_version = "16.7.0")
+nodejs_register_toolchains(
+    name = "nodejs",
+    node_version = "16.7.0",
+)
 
-# Fetch third-party dependencies for building npm packages
-npm_install(
-    name = "buildozer_npm_deps",
-    package_json = "//buildozer/npm:package.json",
-    package_lock_json = "//buildozer/npm:package-lock.json",
+http_archive(
+    name = "aspect_rules_js",
+    sha256 = "7ab9776bcca823af361577a1a2ebb9a30d2eb5b94ecc964b8be360f443f714b2",
+    strip_prefix = "rules_js-1.32.6",
+    url = "https://github.com/aspect-build/rules_js/releases/download/v1.32.6/rules_js-v1.32.6.tar.gz",
 )
+
+load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies")
+
+rules_js_dependencies()
+
+load("@bazel_features//:deps.bzl", "bazel_features_deps")
+
+bazel_features_deps()
+
+load("@aspect_bazel_lib//lib:repositories.bzl", "register_copy_to_directory_toolchains", "register_jq_toolchains")
+
+register_jq_toolchains()
+
+register_copy_to_directory_toolchains()

api_proto/api.proto

@@ -34,6 +34,7 @@ message Output {
       enum ERROR {
         UNKNOWN = 0;
         MISSING = 1;
+        MISSING_LIST_ITEM = 2;
       }
     }
   }

buildifier/README.md

@@ -47,6 +47,7 @@ detection use the `--type` flag explicitly:
     $ cat foo.bar | buildifier --type=bzl
     $ cat foo.bar | buildifier --type=workspace
     $ cat foo.bar | buildifier --type=default
+    $ cat foo.bar | buildifier --type=module
 
 ## Linter
 

buildifier/config/config.go

@@ -72,7 +72,8 @@ func FindConfigPath(rootDir string) string {
 type Config struct {
 	// InputType determines the input file type: build (for BUILD files), bzl
 	// (for .bzl files), workspace (for WORKSPACE files), default (for generic
-	// Starlark files) or auto (default, based on the filename)
+	// Starlark files), module (for MODULE.bazel files)
+	// or auto (default, based on the filename)
 	InputType string `json:"type,omitempty"`
 	// Format sets the diagnostics format: text or json (default text)
 	Format string `json:"format,omitempty"`
@@ -159,7 +160,7 @@ func (c *Config) FlagSet(name string, errorHandling flag.ErrorHandling) *flag.Fl
 	flags.StringVar(&c.WorkspaceRelativePath, "path", c.WorkspaceRelativePath, "assume BUILD file has this path relative to the workspace directory")
 	flags.StringVar(&c.TablesPath, "tables", c.TablesPath, "path to JSON file with custom table definitions which will replace the built-in tables")
 	flags.StringVar(&c.AddTablesPath, "add_tables", c.AddTablesPath, "path to JSON file with custom table definitions which will be merged with the built-in tables")
-	flags.StringVar(&c.InputType, "type", c.InputType, "Input file type: build (for BUILD files), bzl (for .bzl files), workspace (for WORKSPACE files), default (for generic Starlark files) or auto (default, based on the filename)")
+	flags.StringVar(&c.InputType, "type", c.InputType, "Input file type: build (for BUILD files), bzl (for .bzl files), workspace (for WORKSPACE files), module (for MODULE.bazel files), default (for generic Starlark files) or auto (default, based on the filename)")
 	flags.StringVar(&c.ConfigPath, "config", "", "path to .buildifier.json config file")
 	flags.Var(&c.AllowSort, "allowsort", "additional sort contexts to treat as safe")
 	flags.Var(&c.DisableRewrites, "buildifier_disable", "list of buildifier rewrites to disable")

buildifier/config/config_test.go

@@ -132,7 +132,7 @@ func ExampleFlagSet() {
 	// path: assume BUILD file has this path relative to the workspace directory ("")
 	// r: find starlark files recursively ("false")
 	// tables: path to JSON file with custom table definitions which will replace the built-in tables ("")
-	// type: Input file type: build (for BUILD files), bzl (for .bzl files), workspace (for WORKSPACE files), default (for generic Starlark files) or auto (default, based on the filename) ("auto")
+	// type: Input file type: build (for BUILD files), bzl (for .bzl files), workspace (for WORKSPACE files), module (for MODULE.bazel files), default (for generic Starlark files) or auto (default, based on the filename) ("auto")
 	// v: print verbose information to standard error ("false")
 	// version: print the version of buildifier ("false")
 	// warnings: comma-separated warnings used in the lint mode or "all" ("")

buildifier/internal/factory.bzl

@@ -91,6 +91,7 @@ def buildifier_attr_factory(test_rule = False):
                     ".sky",
                     "BUILD",
                     "WORKSPACE",
+                    "WORKSPACE.bzlmod",
                 ],
                 doc = "A list of labels representing the starlark files to include in the test",
             ),

buildifier/npm/BUILD.bazel

@@ -1,4 +1,5 @@
-load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_test", "pkg_npm")
+load("@aspect_rules_js//js:defs.bzl", "js_test")
+load("@aspect_rules_js//npm:defs.bzl", "npm_package", "stamped_package_json")
 load("@bazel_skylib//rules:copy_file.bzl", "copy_file")
 
 copy_file(
@@ -39,22 +40,22 @@ _PARENT_PACKAGE_FILES = [
     for s in _PARENT_PACKAGE_FILES
 ]
 
-pkg_npm(
+stamped_package_json(
+    name = "package",
+    stamp_var = "BUILD_SCM_VERSION",
+)
+
+npm_package(
     name = "buildifier",
-    package_name = "@bazel/buildifier",
     srcs = [
-        "package.json",
-    ],
-    substitutions = {
-        "0.0.0-PLACEHOLDER": "{BUILD_SCM_VERSION}",
-    },
-    deps = [
         "LICENSE",
         "buildifier.js",
+        ":package",
     ] + _PARENT_PACKAGE_FILES,
+    package = "@bazel/buildifier",
 )
 
-nodejs_test(
+js_test(
     name = "integration_test",
     data = [":buildifier"],
     entry_point = "test.js",

buildifier/npm/test.js

@@ -1,6 +1,6 @@
 const dir = require('path').join(
     process.env['TEST_SRCDIR'],
-    process.env['BAZEL_WORKSPACE'],
+    process.env['JS_BINARY__WORKSPACE'],
     'buildifier/npm/buildifier');
 process.chdir(dir);
 const {stdout} = require('child_process').spawnSync(

buildifier/runner.bash.template

@@ -11,7 +11,7 @@ buildifier_short_path=$(readlink "$BUILDIFIER_SHORT_PATH")
 if [[ ! -z "${TEST_WORKSPACE+x}" && -z "${BUILD_WORKSPACE_DIRECTORY+x}" ]]; then
   FIND_FILE_TYPE="l"
   # If WORKSPACE was provided, then the script is being run under a test in no_sandbox mode
-  if [[ ! -z "${WORKSPACE+x}" ]]; then
+  if [[ ! -z "${WORKSPACE:+x}" ]]; then
     FIND_FILE_TYPE="f"
 
     # resolve the WORKSPACE symlink
@@ -52,9 +52,11 @@ find . \
     -o -name '*.BUILD' \
     -o -name 'BUILD.*.bazel' \
     -o -name 'BUILD.*.oss' \
+    -o -name MODULE.bazel \
     -o -name WORKSPACE \
     -o -name WORKSPACE.bazel \
     -o -name WORKSPACE.oss \
+    -o -name WORKSPACE.bzlmod \
     -o -name 'WORKSPACE.*.bazel' \
     -o -name 'WORKSPACE.*.oss' \
   \) -print | xargs "$buildifier_short_path" "${ARGS[@]}"