Skip to content

Commit b3905a4

Browse files
committed
feat: upgrade to rules_js 2.0
1 parent 97eb82c commit b3905a4

37 files changed

+438
-374
lines changed

.aspect/bazelrc/ci.bazelrc

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
# We recommend enforcing a policy that keeps your CI from being slowed down
2-
# by individual test targets that should be optimized
3-
# or split up into multiple test targets with sharding or manually.
4-
# Set this flag to exclude targets that have their timeout set to eternal (>15m) from running on CI.
5-
# Docs: https://bazel.build/docs/user-manual#test-timeout-filters
6-
test --test_timeout_filters=-eternal
7-
81
# Set this flag to enable re-tries of failed tests on CI.
92
# When any test target fails, try one or more times. This applies regardless of whether the "flaky"
103
# tag appears on the target definition.

.aspect/bazelrc/javascript.bazelrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@
88
# details.
99
# Docs: https://nodejs.org/en/docs/guides/debugging-getting-started/#command-line-options
1010
run:debug -- --node_options=--inspect-brk
11+
test:debug --test_env=NODE_OPTIONS=--inspect-brk

MODULE.bazel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ module(
77
)
88

99
# Lower-bounds (minimum) versions for direct runtime dependencies
10-
bazel_dep(name = "aspect_bazel_lib", version = "1.40.2")
11-
bazel_dep(name = "aspect_rules_js", version = "1.34.0")
12-
bazel_dep(name = "bazel_skylib", version = "1.4.1")
10+
bazel_dep(name = "aspect_bazel_lib", version = "2.7.3")
11+
bazel_dep(name = "aspect_rules_js", version = "2.0.0-alpha.6")
12+
bazel_dep(name = "bazel_skylib", version = "1.5.0")
1313
bazel_dep(name = "platforms", version = "0.0.5")
1414

1515
# TODO(4.x): remove support for non-toolchainized protoc
@@ -26,7 +26,7 @@ bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.5.0", dev_dependenc
2626
bazel_dep(name = "buildifier_prebuilt", version = "6.4.0", dev_dependency = True)
2727
bazel_dep(name = "gazelle", version = "0.36.0", dev_dependency = True, repo_name = "bazel_gazelle")
2828
bazel_dep(name = "rules_go", version = "0.46.0", dev_dependency = True, repo_name = "io_bazel_rules_go")
29-
bazel_dep(name = "rules_nodejs", version = "5.8.2", dev_dependency = True)
29+
bazel_dep(name = "rules_nodejs", version = "6.1.0", dev_dependency = True)
3030
bazel_dep(name = "stardoc", version = "0.6.2", dev_dependency = True, repo_name = "io_bazel_stardoc")
3131

3232
npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm", dev_dependency = True)

WORKSPACE

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@ load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies")
1616

1717
rules_js_dependencies()
1818

19-
load("@aspect_bazel_lib//lib:repositories.bzl", "aspect_bazel_lib_dependencies", "register_coreutils_toolchains")
19+
load("@aspect_rules_js//js:toolchains.bzl", "DEFAULT_NODE_VERSION", "rules_js_register_toolchains")
2020

21-
aspect_bazel_lib_dependencies()
22-
23-
register_coreutils_toolchains()
21+
rules_js_register_toolchains(node_version = DEFAULT_NODE_VERSION)
2422

2523
load("@rules_nodejs//nodejs:repositories.bzl", "nodejs_register_toolchains")
2624

@@ -85,7 +83,7 @@ buildifier_prebuilt_register_toolchains()
8583

8684
###########################################
8785
# A pnpm workspace so we can test 3p deps
88-
load("@aspect_rules_js//npm:npm_import.bzl", "npm_translate_lock")
86+
load("@aspect_rules_js//npm:repositories.bzl", "npm_translate_lock")
8987

9088
npm_translate_lock(
9189
name = "npm",

docs/rules.md

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/transpiler.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,11 +143,11 @@ ts_project(name = a) --foo.d.ts--> npm_package ---> npm_link_package ---> ts_pro
143143
In this diagram, we'd like to be able to change the TypeScript sources of `a` and then re-run the test target, without waiting for type-checking.
144144
However, since `foo.d.ts` is declared as an input to the `npm_package` rule, Bazel needs to produce it.
145145
146-
To solve this, you can add the flag `--@aspect_rules_js//npm:exclude_declarations_from_npm_packages` to your `bazel` command.
146+
To solve this, you can add the flag `--@aspect_rules_js//npm:exclude_types_from_npm_packages` to your `bazel` command.
147147
148148
Use this flag only for local development! You can add a line to your `.bazelrc` to make this easier to type, for example:
149149
150150
```
151151
# Run bazel --config=dev to choose these options:
152-
build:dev --@aspect_rules_js//npm:exclude_declarations_from_npm_packages
152+
build:dev --@aspect_rules_js//npm:exclude_types_from_npm_packages
153153
```

e2e/bzlmod/MODULE.bazel

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@ local_path_override(
44
path = "../..",
55
)
66

7-
# repeated here only because we use the platforms definitions for rbe
8-
bazel_dep(name = "aspect_rules_js", version = "1.34.0", dev_dependency = True)
9-
bazel_dep(name = "bazel_skylib", version = "1.4.1", dev_dependency = True)
7+
bazel_dep(name = "aspect_rules_js", version = "2.0.0-alpha.6", dev_dependency = True) # repeated here only because we use the platforms definitions for rbe
8+
bazel_dep(name = "bazel_skylib", version = "1.5.0", dev_dependency = True)
109
bazel_dep(name = "rules_proto", version = "5.3.0-21.7", dev_dependency = True)
1110
bazel_dep(name = "toolchains_protoc", version = "0.2.4", dev_dependency = True)
1211

e2e/bzlmod/pnpm-lock.yaml

Lines changed: 37 additions & 49 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2e/external_dep/MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ local_path_override(
1111
# no such package '@[unknown repo 'aspect_rules_js' requested from @]//platforms':
1212
# The repository '@[unknown repo 'aspect_rules_js' requested from @]' could not be resolved:
1313
# No repository visible as '@aspect_rules_js' from main repository
14-
bazel_dep(name = "aspect_rules_js", version = "1.37.1", dev_dependency = True)
15-
bazel_dep(name = "bazel_skylib", version = "1.4.2", dev_dependency = True)
14+
bazel_dep(name = "aspect_rules_js", version = "2.0.0-alpha.6", dev_dependency = True)
15+
bazel_dep(name = "bazel_skylib", version = "1.5.0", dev_dependency = True)
1616

1717
rules_ts_ext = use_extension("@aspect_rules_ts//ts:extensions.bzl", "ext", dev_dependency = True)
1818
rules_ts_ext.deps()

e2e/external_dep/WORKSPACE

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,11 @@ load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies")
1111

1212
rules_js_dependencies()
1313

14-
# Fetch and register node, if you haven't already
15-
load("@rules_nodejs//nodejs:repositories.bzl", "DEFAULT_NODE_VERSION", "nodejs_register_toolchains")
14+
load("@aspect_rules_js//js:toolchains.bzl", "DEFAULT_NODE_VERSION", "rules_js_register_toolchains")
1615

17-
nodejs_register_toolchains(
18-
name = "node",
19-
node_version = DEFAULT_NODE_VERSION,
20-
)
16+
rules_js_register_toolchains(node_version = DEFAULT_NODE_VERSION)
2117

22-
load("@aspect_rules_js//npm:npm_import.bzl", "npm_translate_lock")
18+
load("@aspect_rules_js//npm:repositories.bzl", "npm_translate_lock")
2319

2420
npm_translate_lock(
2521
name = "npm",

0 commit comments

Comments
 (0)