GitHub/flatbuffers
1
0
Fork 0
mirror of https://github.com/google/flatbuffers.git synced 2025-04-07 00:41:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bump the versions of all aspect Bazel dependencies (#8508)

Browse Source 
* bump all aspect dependency versions to latest

* add workspace file to test bazel repo
This commit is contained in:
Sebastian Barfurth 2025-01-24 19:09:22 +01:00 committed by GitHub
parent 50be3cfe8c
commit 65e49faf76
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 50 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.bazelrc
View File

@ -11,4 +11,8 @@ common:windows --enable_runfiles
# Swift is not required on Windows # Swift is not required on Windows
common:windows --deleted_packages=swift common:windows --deleted_packages=swift
# Ignore warnings in external dependencies # 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

10
MODULE.bazel
View File

@ -7,19 +7,19 @@ module(
bazel_dep( bazel_dep(
name = "aspect_bazel_lib", name = "aspect_bazel_lib",
version = "1.40.0", version = "2.11.0",
) )
bazel_dep( bazel_dep(
name = "aspect_rules_esbuild", name = "aspect_rules_esbuild",
version = "0.15.0", version = "0.21.0",
) )
bazel_dep( bazel_dep(
name = "aspect_rules_js", name = "aspect_rules_js",
version = "1.34.1", version = "2.1.3",
) )
bazel_dep( bazel_dep(
name = "aspect_rules_ts", name = "aspect_rules_ts",
version = "1.4.5", version = "3.4.0",
) )
bazel_dep( bazel_dep(
name = "grpc", name = "grpc",
@ -41,7 +41,7 @@ bazel_dep(
) )
bazel_dep( bazel_dep(
name = "rules_nodejs", name = "rules_nodejs",
version = "5.8.3", version = "6.3.3",
) )
bazel_dep( bazel_dep(
name = "rules_swift", name = "rules_swift",

27
WORKSPACE
View File

@ -129,24 +129,24 @@ grpc_extra_deps()
http_archive( http_archive(
name = "aspect_rules_js", name = "aspect_rules_js",
sha256 = "76a04ef2120ee00231d85d1ff012ede23963733339ad8db81f590791a031f643", sha256 = "875b8d01af629dbf626eddc5cf239c9f0da20330f4d99ad956afc961096448dd",
strip_prefix = "rules_js-1.34.1", strip_prefix = "rules_js-2.1.3",
url = "https://github.com/aspect-build/rules_js/releases/download/v1.34.1/rules_js-v1.34.1.tar.gz", url = "https://github.com/aspect-build/rules_js/releases/download/v2.1.3/rules_js-v2.1.3.tar.gz",
) )
load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies") load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies")
rules_js_dependencies() rules_js_dependencies()
load("@aspect_rules_js//npm:npm_import.bzl", "pnpm_repository") load("@aspect_rules_js//npm:repositories.bzl", "pnpm_repository")
pnpm_repository(name = "pnpm") pnpm_repository(name = "pnpm")
http_archive( http_archive(
name = "aspect_rules_ts", name = "aspect_rules_ts",
sha256 = "4c3f34fff9f96ffc9c26635d8235a32a23a6797324486c7d23c1dfa477e8b451", sha256 = "013a10b2b457add73b081780e604778eb50a141709f9194298f97761acdcc169",
strip_prefix = "rules_ts-1.4.5", strip_prefix = "rules_ts-3.4.0",
url = "https://github.com/aspect-build/rules_ts/releases/download/v1.4.5/rules_ts-v1.4.5.tar.gz", url = "https://github.com/aspect-build/rules_ts/releases/download/v3.4.0/rules_ts-v3.4.0.tar.gz",
) )
load("@aspect_rules_ts//ts:repositories.bzl", "rules_ts_dependencies") load("@aspect_rules_ts//ts:repositories.bzl", "rules_ts_dependencies")
@ -159,12 +159,9 @@ rules_ts_dependencies(
ts_version_from = "//:package.json", ts_version_from = "//:package.json",
) )
load("@rules_nodejs//nodejs:repositories.bzl", "DEFAULT_NODE_VERSION", "nodejs_register_toolchains") load("@aspect_rules_js//js:toolchains.bzl", "DEFAULT_NODE_VERSION", "rules_js_register_toolchains")
nodejs_register_toolchains( rules_js_register_toolchains(node_version = DEFAULT_NODE_VERSION)
name = "nodejs",
node_version = DEFAULT_NODE_VERSION,
)
load("@com_github_google_flatbuffers//ts:repositories.bzl", "flatbuffers_npm") load("@com_github_google_flatbuffers//ts:repositories.bzl", "flatbuffers_npm")
@ -178,9 +175,9 @@ npm_repositories()
http_archive( http_archive(
name = "aspect_rules_esbuild", name = "aspect_rules_esbuild",
sha256 = "098e38e5ee868c14a6484ba263b79e57d48afacfc361ba30137c757a9c4716d6", sha256 = "550e33ddeb86a564b22b2c5d3f84748c6639b1b2b71fae66bf362c33392cbed8",
strip_prefix = "rules_esbuild-0.15.0", strip_prefix = "rules_esbuild-0.21.0",
url = "https://github.com/aspect-build/rules_esbuild/releases/download/v0.15.0/rules_esbuild-v0.15.0.tar.gz", url = "https://github.com/aspect-build/rules_esbuild/releases/download/v0.21.0/rules_esbuild-v0.21.0.tar.gz",
) )
# Register a toolchain containing esbuild npm package and native bindings # Register a toolchain containing esbuild npm package and native bindings

3
tests/bazel_repository_test_dir/WORKSPACE.bzlmod Normal file
View File

@ -0,0 +1,3 @@
# This file is needed during the transition to Bzlmod
# Remove this file if we only support Bazel 8+ which
# defaults to --enable_workspace=false.

4
tests/ts/bazel_repository_test_dir/.bazelrc
View File

@ -1 +1,5 @@
build --symlink_prefix=/ build --symlink_prefix=/
# 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

8
tests/ts/bazel_repository_test_dir/MODULE.bazel
View File

@ -8,19 +8,19 @@ local_path_override(
bazel_dep( bazel_dep(
name = "aspect_rules_esbuild", name = "aspect_rules_esbuild",
version = "0.15.0", version = "0.21.0",
) )
bazel_dep( bazel_dep(
name = "aspect_rules_js", name = "aspect_rules_js",
version = "1.34.1", version = "2.1.3",
) )
bazel_dep( bazel_dep(
name = "aspect_rules_ts", name = "aspect_rules_ts",
version = "1.4.5", version = "3.4.0",
) )
bazel_dep( bazel_dep(
name = "rules_nodejs", name = "rules_nodejs",
version = "5.8.3", version = "6.3.3",
) )
npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm") npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm")

27
tests/ts/bazel_repository_test_dir/WORKSPACE
View File

@ -9,24 +9,24 @@ local_repository(
http_archive( http_archive(
name = "aspect_rules_js", name = "aspect_rules_js",
sha256 = "76a04ef2120ee00231d85d1ff012ede23963733339ad8db81f590791a031f643", sha256 = "875b8d01af629dbf626eddc5cf239c9f0da20330f4d99ad956afc961096448dd",
strip_prefix = "rules_js-1.34.1", strip_prefix = "rules_js-2.1.3",
url = "https://github.com/aspect-build/rules_js/releases/download/v1.34.1/rules_js-v1.34.1.tar.gz", url = "https://github.com/aspect-build/rules_js/releases/download/v2.1.3/rules_js-v2.1.3.tar.gz",
) )
load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies") load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies")
rules_js_dependencies() rules_js_dependencies()
load("@aspect_rules_js//npm:npm_import.bzl", "npm_translate_lock", "pnpm_repository") load("@aspect_rules_js//npm:repositories.bzl", "npm_translate_lock", "pnpm_repository")
pnpm_repository(name = "pnpm") pnpm_repository(name = "pnpm")
http_archive( http_archive(
name = "aspect_rules_ts", name = "aspect_rules_ts",
sha256 = "4c3f34fff9f96ffc9c26635d8235a32a23a6797324486c7d23c1dfa477e8b451", sha256 = "013a10b2b457add73b081780e604778eb50a141709f9194298f97761acdcc169",
strip_prefix = "rules_ts-1.4.5", strip_prefix = "rules_ts-3.4.0",
url = "https://github.com/aspect-build/rules_ts/releases/download/v1.4.5/rules_ts-v1.4.5.tar.gz", url = "https://github.com/aspect-build/rules_ts/releases/download/v3.4.0/rules_ts-v3.4.0.tar.gz",
) )
load("@aspect_rules_ts//ts:repositories.bzl", "rules_ts_dependencies") load("@aspect_rules_ts//ts:repositories.bzl", "rules_ts_dependencies")
@ -37,12 +37,9 @@ rules_ts_dependencies(
ts_version = "5.3.3", ts_version = "5.3.3",
) )
load("@rules_nodejs//nodejs:repositories.bzl", "DEFAULT_NODE_VERSION", "nodejs_register_toolchains") load("@aspect_rules_js//js:toolchains.bzl", "DEFAULT_NODE_VERSION", "rules_js_register_toolchains")
nodejs_register_toolchains( rules_js_register_toolchains(node_version = DEFAULT_NODE_VERSION)
name = "nodejs",
node_version = DEFAULT_NODE_VERSION,
)
npm_translate_lock( npm_translate_lock(
name = "npm", name = "npm",
@ -61,9 +58,9 @@ npm_repositories()
http_archive( http_archive(
name = "aspect_rules_esbuild", name = "aspect_rules_esbuild",
sha256 = "098e38e5ee868c14a6484ba263b79e57d48afacfc361ba30137c757a9c4716d6", sha256 = "550e33ddeb86a564b22b2c5d3f84748c6639b1b2b71fae66bf362c33392cbed8",
strip_prefix = "rules_esbuild-0.15.0", strip_prefix = "rules_esbuild-0.21.0",
url = "https://github.com/aspect-build/rules_esbuild/releases/download/v0.15.0/rules_esbuild-v0.15.0.tar.gz", url = "https://github.com/aspect-build/rules_esbuild/releases/download/v0.21.0/rules_esbuild-v0.21.0.tar.gz",
) )
# Register a toolchain containing esbuild npm package and native bindings # Register a toolchain containing esbuild npm package and native bindings

3
tests/ts/bazel_repository_test_dir/WORKSPACE.bzlmod Normal file
View File

@ -0,0 +1,3 @@
# This file is needed during the transition to Bzlmod
# Remove this file if we only support Bazel 8+ which
# defaults to --enable_workspace=false.

1
ts/package.json Symbolic link
View File

@ -0,0 +1 @@
../package.json

2
ts/repositories.bzl
View File

@ -1,6 +1,6 @@
"""WORKSPACE macro to load flatbuffers's npm package list.""" """WORKSPACE macro to load flatbuffers's npm package list."""
load("@aspect_rules_js//npm:npm_import.bzl", _npm_translate_lock = "npm_translate_lock") load("@aspect_rules_js//npm:repositories.bzl", _npm_translate_lock = "npm_translate_lock")
def flatbuffers_npm(name): def flatbuffers_npm(name):
_npm_translate_lock( _npm_translate_lock(