Skip to content

Commit

Permalink
Bump the versions of all aspect Bazel dependencies (#8508)
Browse files Browse the repository at this point in the history
* bump all aspect dependency versions to latest

* add workspace file to test bazel repo
  • Loading branch information
sbarfurth authored Jan 24, 2025
1 parent 50be3cf commit 65e49fa
Show file tree
Hide file tree
Showing 10 changed files with 50 additions and 41 deletions.
6 changes: 5 additions & 1 deletion .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 5 additions & 5 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -41,7 +41,7 @@ bazel_dep(
)
bazel_dep(
name = "rules_nodejs",
version = "5.8.3",
version = "6.3.3",
)
bazel_dep(
name = "rules_swift",
Expand Down
27 changes: 12 additions & 15 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -129,24 +129,24 @@ grpc_extra_deps()

http_archive(
name = "aspect_rules_js",
sha256 = "76a04ef2120ee00231d85d1ff012ede23963733339ad8db81f590791a031f643",
strip_prefix = "rules_js-1.34.1",
url = "https://github.com/aspect-build/rules_js/releases/download/v1.34.1/rules_js-v1.34.1.tar.gz",
sha256 = "875b8d01af629dbf626eddc5cf239c9f0da20330f4d99ad956afc961096448dd",
strip_prefix = "rules_js-2.1.3",
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")

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")

http_archive(
name = "aspect_rules_ts",
sha256 = "4c3f34fff9f96ffc9c26635d8235a32a23a6797324486c7d23c1dfa477e8b451",
strip_prefix = "rules_ts-1.4.5",
url = "https://github.com/aspect-build/rules_ts/releases/download/v1.4.5/rules_ts-v1.4.5.tar.gz",
sha256 = "013a10b2b457add73b081780e604778eb50a141709f9194298f97761acdcc169",
strip_prefix = "rules_ts-3.4.0",
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")
Expand All @@ -159,12 +159,9 @@ rules_ts_dependencies(
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(
name = "nodejs",
node_version = DEFAULT_NODE_VERSION,
)
rules_js_register_toolchains(node_version = DEFAULT_NODE_VERSION)

load("@com_github_google_flatbuffers//ts:repositories.bzl", "flatbuffers_npm")

Expand All @@ -178,9 +175,9 @@ npm_repositories()

http_archive(
name = "aspect_rules_esbuild",
sha256 = "098e38e5ee868c14a6484ba263b79e57d48afacfc361ba30137c757a9c4716d6",
strip_prefix = "rules_esbuild-0.15.0",
url = "https://github.com/aspect-build/rules_esbuild/releases/download/v0.15.0/rules_esbuild-v0.15.0.tar.gz",
sha256 = "550e33ddeb86a564b22b2c5d3f84748c6639b1b2b71fae66bf362c33392cbed8",
strip_prefix = "rules_esbuild-0.21.0",
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
Expand Down
3 changes: 3 additions & 0 deletions tests/bazel_repository_test_dir/WORKSPACE.bzlmod
Original file line number Diff line number Diff line change
@@ -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 changes: 4 additions & 0 deletions tests/ts/bazel_repository_test_dir/.bazelrc
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
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 changes: 4 additions & 4 deletions tests/ts/bazel_repository_test_dir/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@ local_path_override(

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 = "rules_nodejs",
version = "5.8.3",
version = "6.3.3",
)

npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm")
Expand Down
27 changes: 12 additions & 15 deletions tests/ts/bazel_repository_test_dir/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,24 @@ local_repository(

http_archive(
name = "aspect_rules_js",
sha256 = "76a04ef2120ee00231d85d1ff012ede23963733339ad8db81f590791a031f643",
strip_prefix = "rules_js-1.34.1",
url = "https://github.com/aspect-build/rules_js/releases/download/v1.34.1/rules_js-v1.34.1.tar.gz",
sha256 = "875b8d01af629dbf626eddc5cf239c9f0da20330f4d99ad956afc961096448dd",
strip_prefix = "rules_js-2.1.3",
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")

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")

http_archive(
name = "aspect_rules_ts",
sha256 = "4c3f34fff9f96ffc9c26635d8235a32a23a6797324486c7d23c1dfa477e8b451",
strip_prefix = "rules_ts-1.4.5",
url = "https://github.com/aspect-build/rules_ts/releases/download/v1.4.5/rules_ts-v1.4.5.tar.gz",
sha256 = "013a10b2b457add73b081780e604778eb50a141709f9194298f97761acdcc169",
strip_prefix = "rules_ts-3.4.0",
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")
Expand All @@ -37,12 +37,9 @@ rules_ts_dependencies(
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(
name = "nodejs",
node_version = DEFAULT_NODE_VERSION,
)
rules_js_register_toolchains(node_version = DEFAULT_NODE_VERSION)

npm_translate_lock(
name = "npm",
Expand All @@ -61,9 +58,9 @@ npm_repositories()

http_archive(
name = "aspect_rules_esbuild",
sha256 = "098e38e5ee868c14a6484ba263b79e57d48afacfc361ba30137c757a9c4716d6",
strip_prefix = "rules_esbuild-0.15.0",
url = "https://github.com/aspect-build/rules_esbuild/releases/download/v0.15.0/rules_esbuild-v0.15.0.tar.gz",
sha256 = "550e33ddeb86a564b22b2c5d3f84748c6639b1b2b71fae66bf362c33392cbed8",
strip_prefix = "rules_esbuild-0.21.0",
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
Expand Down
3 changes: 3 additions & 0 deletions tests/ts/bazel_repository_test_dir/WORKSPACE.bzlmod
Original file line number Diff line number Diff line change
@@ -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 change: 1 addition & 0 deletions ts/package.json
2 changes: 1 addition & 1 deletion ts/repositories.bzl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""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):
_npm_translate_lock(
Expand Down

0 comments on commit 65e49fa

Please sign in to comment.