From d7f5959785aa03e7e417530f3cd228015e2f4fe0 Mon Sep 17 00:00:00 2001 From: Sebastian Barfurth Date: Fri, 24 Jan 2025 10:18:35 +0000 Subject: [PATCH 1/2] bump all aspect dependency versions to latest --- .bazelrc | 6 ++++- MODULE.bazel | 10 +++---- WORKSPACE | 27 +++++++++---------- tests/ts/bazel_repository_test_dir/.bazelrc | 4 +++ .../ts/bazel_repository_test_dir/MODULE.bazel | 8 +++--- tests/ts/bazel_repository_test_dir/WORKSPACE | 27 +++++++++---------- .../WORKSPACE.bzlmod | 3 +++ ts/package.json | 1 + ts/repositories.bzl | 2 +- 9 files changed, 47 insertions(+), 41 deletions(-) create mode 100644 tests/ts/bazel_repository_test_dir/WORKSPACE.bzlmod create mode 120000 ts/package.json diff --git a/.bazelrc b/.bazelrc index 47509ad5fad..a02667e1821 100644 --- a/.bazelrc +++ b/.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 \ No newline at end of file +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 diff --git a/MODULE.bazel b/MODULE.bazel index caddfcb471c..bd42b806a7e 100644 --- a/MODULE.bazel +++ b/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", diff --git a/WORKSPACE b/WORKSPACE index 0ac83c70dde..602283ac6dd 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -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") @@ -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") @@ -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 diff --git a/tests/ts/bazel_repository_test_dir/.bazelrc b/tests/ts/bazel_repository_test_dir/.bazelrc index 78003332b01..9eee37f9454 100644 --- a/tests/ts/bazel_repository_test_dir/.bazelrc +++ b/tests/ts/bazel_repository_test_dir/.bazelrc @@ -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 diff --git a/tests/ts/bazel_repository_test_dir/MODULE.bazel b/tests/ts/bazel_repository_test_dir/MODULE.bazel index f22f73148a6..d3ddf665557 100644 --- a/tests/ts/bazel_repository_test_dir/MODULE.bazel +++ b/tests/ts/bazel_repository_test_dir/MODULE.bazel @@ -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") diff --git a/tests/ts/bazel_repository_test_dir/WORKSPACE b/tests/ts/bazel_repository_test_dir/WORKSPACE index 79fd8bee0dd..4d2b03a34fd 100644 --- a/tests/ts/bazel_repository_test_dir/WORKSPACE +++ b/tests/ts/bazel_repository_test_dir/WORKSPACE @@ -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") @@ -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", @@ -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 diff --git a/tests/ts/bazel_repository_test_dir/WORKSPACE.bzlmod b/tests/ts/bazel_repository_test_dir/WORKSPACE.bzlmod new file mode 100644 index 00000000000..6ec367744ba --- /dev/null +++ b/tests/ts/bazel_repository_test_dir/WORKSPACE.bzlmod @@ -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. diff --git a/ts/package.json b/ts/package.json new file mode 120000 index 00000000000..4e26811d416 --- /dev/null +++ b/ts/package.json @@ -0,0 +1 @@ +../package.json \ No newline at end of file diff --git a/ts/repositories.bzl b/ts/repositories.bzl index 3e66915b7e2..042fb88032a 100644 --- a/ts/repositories.bzl +++ b/ts/repositories.bzl @@ -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( From 735f18e02c12a2ae46e4a3897036e407782a4ba1 Mon Sep 17 00:00:00 2001 From: Sebastian Barfurth Date: Fri, 24 Jan 2025 10:19:37 +0000 Subject: [PATCH 2/2] add workspace file to test bazel repo --- tests/bazel_repository_test_dir/WORKSPACE.bzlmod | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 tests/bazel_repository_test_dir/WORKSPACE.bzlmod diff --git a/tests/bazel_repository_test_dir/WORKSPACE.bzlmod b/tests/bazel_repository_test_dir/WORKSPACE.bzlmod new file mode 100644 index 00000000000..6ec367744ba --- /dev/null +++ b/tests/bazel_repository_test_dir/WORKSPACE.bzlmod @@ -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.