Merge branch 'master' into extra_semi_fix

.bazelci/presubmit.yml

@@ -1,8 +1,13 @@
 ---
 buildifier: latest
-bazel: 6.4.0
-platforms:
-  ubuntu1804:
+matrix:
+  bazel:
+    - 7.x
+    - 8.x
+tasks:
+  verify_ubuntu2004:
+    platform: ubuntu2004
+    bazel: ${{ bazel }}
     environment:
       CC: clang
       SWIFT_VERSION: "5.8"
@@ -11,12 +16,14 @@ platforms:
     shell_commands:
       - "echo --- Downloading and extracting Swift $SWIFT_VERSION to $SWIFT_HOME"
       - "mkdir $SWIFT_HOME"
-      - "curl https://download.swift.org/swift-${SWIFT_VERSION}-release/ubuntu1804/swift-${SWIFT_VERSION}-RELEASE/swift-${SWIFT_VERSION}-RELEASE-ubuntu18.04.tar.gz | tar xvz --strip-components=1 -C $SWIFT_HOME"
+      - "curl https://download.swift.org/swift-${SWIFT_VERSION}-release/ubuntu2004/swift-${SWIFT_VERSION}-RELEASE/swift-${SWIFT_VERSION}-RELEASE-ubuntu20.04.tar.gz | tar xvz --strip-components=1 -C $SWIFT_HOME"
     build_targets:
     - "//..."
     test_targets:
     - "//..."
-  ubuntu2004:
+  verify_ubuntu2204:
+    platform: ubuntu2204
+    bazel: ${{ bazel }}
     environment:
       CC: clang
       SWIFT_VERSION: "5.8"
@@ -25,13 +32,27 @@ platforms:
     shell_commands:
       - "echo --- Downloading and extracting Swift $SWIFT_VERSION to $SWIFT_HOME"
       - "mkdir $SWIFT_HOME"
-      - "curl https://download.swift.org/swift-${SWIFT_VERSION}-release/ubuntu2004/swift-${SWIFT_VERSION}-RELEASE/swift-${SWIFT_VERSION}-RELEASE-ubuntu20.04.tar.gz | tar xvz --strip-components=1 -C $SWIFT_HOME"
+      - "curl https://download.swift.org/swift-${SWIFT_VERSION}-release/ubuntu2204/swift-${SWIFT_VERSION}-RELEASE/swift-${SWIFT_VERSION}-RELEASE-ubuntu22.04.tar.gz | tar xvz --strip-components=1 -C $SWIFT_HOME"
+    build_targets:
+    - "//..."
+    test_targets:
+    - "//..."
+  test_module_cpp:
+    platform: ubuntu2204
+    bazel: ${{ bazel }}
+    working_directory: tests/bazel_repository_test_dir
     build_targets:
     - "//..."
+  test_module_ts:
+    platform: ubuntu2204
+    bazel: ${{ bazel }}
+    working_directory: tests/ts/bazel_repository_test_dir
     test_targets:
     - "//..."
-  macos:
-    xcode_version: "14.3"
+  verify_macos:
+    platform: macos
+    bazel: ${{ bazel }}
+    xcode_version: "15.2"
     build_targets:
     - "//:flatbuffers"
     - "//:flatc"

.bazelignore

@@ -1 +1,5 @@
 ts/node_modules
+
+# Test workspaces
+tests/bazel_repository_test_dir
+tests/ts/bazel_repository_test_dir

.bazelrc

@@ -11,4 +11,8 @@ common:windows --enable_runfiles
 # Swift is not required on Windows
 common:windows --deleted_packages=swift
 # Ignore warnings in external dependencies
-build --per_file_copt=external/.*@-Wno-everything --host_per_file_copt=external/.*@-Wno-everything
+build --per_file_copt=external/.*@-Wno-everything --host_per_file_copt=external/.*@-Wno-everything
+# Honor the setting of `skipLibCheck` in the tsconfig.json file.
+common --@aspect_rules_ts//ts:skipLibCheck=honor_tsconfig
+# Use "tsc" as the transpiler when ts_project has no `transpiler` set.
+common --@aspect_rules_ts//ts:default_to_tsc_transpiler

BUILD.bazel

@@ -32,7 +32,6 @@ filegroup(
         ".npmrc",
         "BUILD.bazel",
         "MODULE.bazel",
-        "WORKSPACE",
         "build_defs.bzl",
         "package.json",
         "pnpm-lock.yaml",

MODULE.bazel

@@ -7,19 +7,19 @@ module(
 
 bazel_dep(
     name = "aspect_bazel_lib",
-    version = "1.40.0",
+    version = "2.11.0",
 )
 bazel_dep(
     name = "aspect_rules_esbuild",
-    version = "0.15.0",
+    version = "0.21.0",
 )
 bazel_dep(
     name = "aspect_rules_js",
-    version = "1.34.1",
+    version = "2.1.3",
 )
 bazel_dep(
     name = "aspect_rules_ts",
-    version = "1.4.5",
+    version = "3.4.0",
 )
 bazel_dep(
     name = "grpc",
@@ -41,7 +41,7 @@ bazel_dep(
 )
 bazel_dep(
     name = "rules_nodejs",
-    version = "5.8.3",
+    version = "6.3.3",
 )
 bazel_dep(
     name = "rules_swift",
@@ -55,30 +55,19 @@ bazel_dep(
 
 npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm")
 npm.npm_translate_lock(
-    name = "npm",
+    name = "flatbuffers_npm",
     npmrc = "//:.npmrc",
-    pnpm_lock = "//:pnpm-lock.yaml",
+    pnpm_lock = "//ts:pnpm-lock.yaml",
+    # Override the Bazel package where pnpm-lock.yaml is located and link
+    # to the specified package instead.
+    root_package = "ts",
     verify_node_modules_ignored = "//:.bazelignore",
 )
-use_repo(npm, "npm")
+use_repo(npm, "flatbuffers_npm")
 
 node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node")
 use_repo(node, "nodejs_linux_amd64")
 
-rules_ts_ext = use_extension("@aspect_rules_ts//ts:extensions.bzl", "ext", dev_dependency = True)
+rules_ts_ext = use_extension("@aspect_rules_ts//ts:extensions.bzl", "ext")
 rules_ts_ext.deps()
 use_repo(rules_ts_ext, "npm_typescript")
-
-bazel_dep(
-    name = "rules_bazel_integration_test",
-    version = "0.31.0",
-    dev_dependency = True,
-)
-
-bazel_binaries = use_extension(
-    "@rules_bazel_integration_test//:extensions.bzl",
-    "bazel_binaries",
-    dev_dependency = True,
-)
-bazel_binaries.download(version = "6.3.2")
-use_repo(bazel_binaries, "bazel_binaries", "bazel_binaries_bazelisk", "build_bazel_bazel_6_3_2")