Merge branch 'main' into alexeagle-patch-5

Author: alexeagle

.aspect/workflows/config.yaml

@@ -1,8 +1,7 @@
 # See https://docs.aspect.build/workflows/configuration
 tasks:
   - test:
-bazel:
-  flags:
-    - --config=ci
+    flags:
+      - --config=ci
 notifications:
   github: {}

.bazelci/presubmit.yml

@@ -1,5 +1,5 @@
 ---
-bazel: 7.1.1
+bazel: 7.3.1
 # Note, this will tell the user to do the wrong thing (manually run buildifer)
 # See https://github.com/bazelbuild/continuous-integration/issues/1161
 buildifier:

.bazelrc

@@ -1,44 +1,8 @@
-# TODO: migrate all root WORKSPACE dependencies to MODULE.bazel
-# https://github.com/bazel-contrib/rules_nodejs/issues/3695
-common --noenable_bzlmod
-common --enable_workspace
+import %workspace%/tools/preset.bazelrc
 
-# Specifies desired output mode for running tests.
-# Valid values are
-#   'summary' to output only test status summary
-#   'errors' to also print test logs for failed tests
-#   'all' to print logs for all tests
-#   'streamed' to output logs for all tests in real time
-#     (this will force tests to be executed locally one at a time regardless of --test_strategy value).
-common --test_output=errors
-
-# Turn on --incompatible_strict_action_env which was on by default
-# in Bazel 0.21.0 but turned off again in 0.22.0. Follow
-# https://github.com/bazelbuild/bazel/issues/7026 for more details.
-# This flag is needed to so that the bazel cache is not invalidated
-# when running bazel via `yarn bazel`.
-# See https://github.com/angular/angular/issues/27514.
-common --incompatible_strict_action_env
-
-# Turn off legacy external runfiles
-# This prevents accidentally depending on this feature, which Bazel will remove.
-common --nolegacy_external_runfiles
-
-# Don’t want to push a rules author to update their deps if not needed.
-# https://bazel.build/reference/command-line-reference#flag--check_direct_dependencies
-# https://bazelbuild.slack.com/archives/C014RARENH0/p1691158021917459?thread_ts=1691156601.420349&cid=C014RARENH0
-common --check_direct_dependencies=off
+common --config=ruleset
 
 # In the root MODULE.bazel file we don't set include_headers on the nodejs toolchain
 # so the `//nodejs/headers:current_node_cc_headers`` target will not build. This target
 # is instead tested in `e2e/headers``
 common --deleted_packages=nodejs/headers
-
-# Load any settings specific to the current user.
-# .bazelrc.user should appear in .gitignore so that settings are not shared with team members
-# This needs to be last statement in this
-# config, as the user configuration should be able to overwrite flags from this file.
-# See https://docs.bazel.build/versions/master/best-practices.html#bazelrc
-# (Note that we use .bazelrc.user so the file appears next to .bazelrc in directory listing,
-# rather than user.bazelrc as suggested in the Bazel docs)
-try-import %workspace%/.bazelrc.user

.bazelversion

@@ -1 +1 @@
-7.3.1
+7.5.0

.bcr/presubmit.yml

@@ -1,7 +1,7 @@
 bcr_test_module:
   module_path: "e2e/smoke"
   matrix:
-    bazel: ["7.x"]
+    bazel: ["7.x", "8.x", "rolling"]
     platform: ["debian10", "macos", "ubuntu2004", "windows"]
   tasks:
     run_tests:

.bcr/source.template.json

@@ -1,5 +1,6 @@
 {
-    "integrity": "**leave this alone**",
-    "strip_prefix": "{REPO}-{VERSION}",
-    "url": "https://github.com/{OWNER}/{REPO}/releases/download/{TAG}/rules_nodejs-{TAG}.tar.gz"
+  "integrity": "**leave this alone**",
+  "strip_prefix": "{REPO}-{VERSION}",
+  "docs_url": "https://github.com/{OWNER}/{REPO}/releases/download/{TAG}/rules_nodejs-{TAG}.docs.tar.gz",
+  "url": "https://github.com/{OWNER}/{REPO}/releases/download/{TAG}/rules_nodejs-{TAG}.tar.gz"
 }

.github/workflows/ci.yaml

@@ -17,7 +17,7 @@ concurrency:
 
 jobs:
   test:
-    uses: bazel-contrib/.github/.github/workflows/bazel.yaml@v6
+    uses: bazel-contrib/.github/.github/workflows/bazel.yaml@v7.2.3
     with:
       folders: '[".", "e2e/headers", "e2e/smoke", "e2e/nodejs_host", "e2e/conflicting_toolchains"]'
       # stardoc generated docs fail on diff_test with Bazel 6.4.0 so don't test against it in root repository
@@ -27,7 +27,6 @@ jobs:
           {"bazelversion": "6.4.0", "os": "macos-latest"},
           {"bazelversion": "6.4.0", "os": "windows-latest"},
           {"bazelversion": "6.4.0", folder: "."},
-          {"bazelversion": "6.4.0", bzlmodEnabled: true}
-          # this test is for bzlmod only
-          {folder: "e2e/conflicting_toolchains", bzlmodEnabled: false},
+          {"bazelversion": "6.4.0", bzlmodEnabled: true},
+          {folder: "e2e/conflicting_toolchains", bzlmodEnabled: false}
         ]

.github/workflows/publish.yaml

@@ -7,7 +7,7 @@ on:
         required: true
         type: string
     secrets:
-      publish_token:
+      BCR_PUBLISH_TOKEN:
         required: true
   # In case of problems, let release engineers retry by manually dispatching
   # the workflow from the GitHub UI
@@ -19,15 +19,16 @@ on:
 
 jobs:
   publish:
-    uses: bazel-contrib/publish-to-bcr/.github/workflows/publish.yaml@v0.0.4
+    uses: bazel-contrib/publish-to-bcr/.github/workflows/publish.yaml@v1.0.0
     with:
       tag_name: ${{ inputs.tag_name }}
       # GitHub repository which is a fork of the upstream where the Pull Request will be opened.
       registry_fork: bazel-contrib/bazel-central-registry
+      draft: false
     permissions:
       attestations: write
       contents: write
       id-token: write
     secrets:
       # Necessary to push to the BCR fork, and to open a pull request against a registry
-      publish_token: ${{ secrets.publish_token || secrets.BCR_PUBLISH_TOKEN }}
+      publish_token: ${{ secrets.BCR_PUBLISH_TOKEN }}

.github/workflows/release.yml

@@ -28,4 +28,4 @@ jobs:
     with:
       tag_name: ${{ inputs.tag_name || github.ref_name }}
     secrets:
-      publish_token: ${{ secrets.BCR_PUBLISH_TOKEN }}
+      BCR_PUBLISH_TOKEN: ${{ secrets.BCR_PUBLISH_TOKEN }}

.github/workflows/release_prep.sh

@@ -11,6 +11,14 @@ ARCHIVE="rules_nodejs-$TAG.tar.gz"
 git archive --format=tar --prefix="${PREFIX}/" "${TAG}" | gzip > "$ARCHIVE"
 SHA=$(shasum -a 256 "$ARCHIVE" | awk '{print $1}')
 
+# Add generated API docs to the release, see https://github.com/bazelbuild/bazel-central-registry/issues/5593
+docs="$(mktemp -d)"; targets="$(mktemp)"
+bazel --output_base="$docs" query --output=label --output_file="$targets" 'kind("starlark_doc_extract rule", //...)'
+bazel --output_base="$docs" build --target_pattern_file="$targets" --remote_download_regex='.*doc_extract\.binaryproto'
+tar --create --auto-compress \
+    --directory "$(bazel --output_base="$docs" info bazel-bin)" \
+    --file "$GITHUB_WORKSPACE/${ARCHIVE%.tar.gz}.docs.tar.gz" .
+
 cat << EOF
 ## Using Bzlmod with Bazel 6 or greater