From fdf3a833d023b4a414c6ad765556651aab12f67d Mon Sep 17 00:00:00 2001
From: Felix Hanau <felix@cloudflare.com>
Date: Wed, 21 Feb 2024 22:38:56 -0500
Subject: [PATCH] Update Bazel to 7.1.1, slight cleanup and compatibility
 improvements

7.1 (https://github.com/bazelbuild/bazel/releases/tag/7.1.0) introduces
a number of bug fixes and performance improvements, 7.1.1 has some
additional bug fixes.

- Pass all parameters in kj_test to ensure tags will actually be
  applied, avoiding a considerable footgun.
- Clean up a few globs, allowing us to enable incompatible_disallow_empty_glob
- Flip --legacy_external_runfiles early to avoid generating superfluous
  runfile trees.
- Update wd_ts_bundle to fix --legacy_external_runfiles=false for
  dependents.
---
 .bazelrc                                           |  6 ++++++
 .bazelversion                                      |  2 +-
 build/kj_test.bzl                                  |  2 ++
 build/wd_ts_bundle.bzl                             |  4 ++--
 src/cloudflare/BUILD.bazel                         | 13 +++++++------
 src/cloudflare/internal/test/d1/BUILD.bazel        |  5 +----
 src/cloudflare/internal/test/vectorize/BUILD.bazel |  5 +----
 src/workerd/server/tests/unsafe-module/BUILD.bazel |  5 +----
 8 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/.bazelrc b/.bazelrc
index 6901d2e76a6..31d270e6c70 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -17,6 +17,12 @@ build --remote_download_all
 # Enable webgpu
 build --//src/workerd/io:enable_experimental_webgpu=True
 
+# Avoid generating duplicate runfile trees. This will become the default in a future bazel version.
+build --legacy_external_runfiles=false
+
+# Flip this early to avoid breaking compatibility once it becomes the default.
+build --incompatible_disallow_empty_glob
+
 # Dawn tint build flags
 build --@dawn//src/tint:tint_build_glsl_writer=False
 build --@dawn//src/tint:tint_build_glsl_validator=False
diff --git a/.bazelversion b/.bazelversion
index a8907c025d5..21c8c7b46b8 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-7.0.2
+7.1.1
diff --git a/build/kj_test.bzl b/build/kj_test.bzl
index d17e6dd2195..7cb4f7bf99b 100644
--- a/build/kj_test.bzl
+++ b/build/kj_test.bzl
@@ -17,4 +17,6 @@ def kj_test(
             "@//:use_dead_strip": ["-Wl,-dead_strip", "-Wl,-no_exported_symbols"],
             "//conditions:default": [""],
         }),
+        data = data,
+        tags = tags,
     )
diff --git a/build/wd_ts_bundle.bzl b/build/wd_ts_bundle.bzl
index 9979cd19097..37671c120b0 100644
--- a/build/wd_ts_bundle.bzl
+++ b/build/wd_ts_bundle.bzl
@@ -77,8 +77,8 @@ def wd_ts_bundle(
         eslint_bin.eslint_test(
             name = name + "@eslint",
             args = [
-                "--config $(execpath {})".format(eslintrc_json),
-                "--parser-options project:$(execpath {})".format(tsconfig_json),
+                "--config $(location {})".format(eslintrc_json),
+                "--parser-options project:$(location {})".format(tsconfig_json),
                 "-f stylish",
                 "--report-unused-disable-directives",
             ] + ["$(location " + src + ")" for src in ts_srcs],
diff --git a/src/cloudflare/BUILD.bazel b/src/cloudflare/BUILD.bazel
index aac20a4da95..983a39295e4 100644
--- a/src/cloudflare/BUILD.bazel
+++ b/src/cloudflare/BUILD.bazel
@@ -9,14 +9,15 @@ wd_ts_bundle(
             "internal/*.ts",
             "internal/*.js",
         ],
-        exclude = [
-            "internal/test/*",
+        allow_empty = True,
+    ),
+    modules = glob(
+        [
+            "*.ts",
+            "*.js",
         ],
+        allow_empty = True,
     ),
-    modules = glob([
-        "*.ts",
-        "*.js",
-    ]),
     schema_id = "0xbcc8f57c63814006",
     tsconfig_json = "tsconfig.json",
 )
diff --git a/src/cloudflare/internal/test/d1/BUILD.bazel b/src/cloudflare/internal/test/d1/BUILD.bazel
index 2af4c19eeff..c00b9be041f 100644
--- a/src/cloudflare/internal/test/d1/BUILD.bazel
+++ b/src/cloudflare/internal/test/d1/BUILD.bazel
@@ -3,8 +3,5 @@ load("//:build/wd_test.bzl", "wd_test")
 wd_test(
     src = "d1-api-test.wd-test",
     args = ["--experimental"],
-    data = glob([
-        "*.js",
-        "*.capnp",
-    ]),
+    data = glob(["*.js"]),
 )
diff --git a/src/cloudflare/internal/test/vectorize/BUILD.bazel b/src/cloudflare/internal/test/vectorize/BUILD.bazel
index 2ef48de300f..32679bd2e19 100644
--- a/src/cloudflare/internal/test/vectorize/BUILD.bazel
+++ b/src/cloudflare/internal/test/vectorize/BUILD.bazel
@@ -2,8 +2,5 @@ load("//:build/wd_test.bzl", "wd_test")
 
 wd_test(
     src = "vectorize-api-test.wd-test",
-    data = glob([
-        "*.js",
-        "*.capnp",
-    ]),
+    data = glob(["*.js"]),
 )
diff --git a/src/workerd/server/tests/unsafe-module/BUILD.bazel b/src/workerd/server/tests/unsafe-module/BUILD.bazel
index 32c484b3dc0..28cf8672c91 100644
--- a/src/workerd/server/tests/unsafe-module/BUILD.bazel
+++ b/src/workerd/server/tests/unsafe-module/BUILD.bazel
@@ -3,8 +3,5 @@ load("//:build/wd_test.bzl", "wd_test")
 wd_test(
     src = "unsafe-module-test.wd-test",
     args = ["--experimental"],
-    data = glob([
-        "*.js",
-        "*.capnp",
-    ]),
+    data = glob(["*.js"]),
 )