Skip to content

Commit e071520

Browse files
authored
chore(deps): upgrade rules_js and friends to final (#493)
Also update linter install to current recommendation
1 parent 58949bd commit e071520

File tree

7 files changed

+21
-18
lines changed

7 files changed

+21
-18
lines changed

Diff for: frontend/BUILD.bazel

-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
"Root BUILD file for all frontend examples"
22

33
load("@npm//:defs.bzl", "npm_link_all_packages")
4-
load("@npm//:eslint/package_json.bzl", eslint_bin = "bin")
54

65
package(default_visibility = ["//:__subpackages__"])
76

87
# Create the root of the "virtual store" of npm dependencies under bazel-out.
98
# This must be done in the package where the pnpm workspace is rooted.
109
npm_link_all_packages(name = "node_modules")
11-
12-
eslint_bin.eslint_binary(name = "eslint")

Diff for: frontend/MODULE.bazel

+7-7
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
bazel_dep(name = "aspect_bazel_lib", version = "2.8.1")
44
bazel_dep(name = "aspect_rules_lint", version = "1.0.0-rc4")
5-
bazel_dep(name = "aspect_rules_jest", version = "0.22.0-rc0")
6-
bazel_dep(name = "aspect_rules_js", version = "2.0.0-rc1")
7-
bazel_dep(name = "aspect_rules_swc", version = "2.0.0-rc0")
8-
bazel_dep(name = "aspect_rules_ts", version = "3.0.0-rc0")
9-
bazel_dep(name = "aspect_rules_rollup", version = "2.0.0-rc0")
10-
bazel_dep(name = "aspect_rules_webpack", version = "0.16.0-rc0")
5+
bazel_dep(name = "aspect_rules_jest", version = "0.22.0")
6+
bazel_dep(name = "aspect_rules_js", version = "2.0.0")
7+
bazel_dep(name = "aspect_rules_swc", version = "2.0.0")
8+
bazel_dep(name = "aspect_rules_ts", version = "3.1.0")
9+
bazel_dep(name = "aspect_rules_rollup", version = "2.0.0")
10+
bazel_dep(name = "aspect_rules_webpack", version = "0.16.0")
1111
bazel_dep(name = "bazel_skylib", version = "1.7.1")
12-
bazel_dep(name = "rules_nodejs", version = "6.1.1")
12+
bazel_dep(name = "rules_nodejs", version = "6.2.0")
1313

1414
node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node", dev_dependency = True)
1515
node.toolchain(node_version = "20.13.1")

Diff for: frontend/packages/one/tsconfig.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"compilerOptions": {
33
"declaration": true,
4-
"esModuleInterop": true,
5-
6-
}
4+
"esModuleInterop": true,
5+
},
6+
"exclude": []
77
}

Diff for: frontend/react/src/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
load("@aspect_rules_js//js:defs.bzl", "js_library")
22
load("@aspect_rules_ts//ts:defs.bzl", "ts_project")
3-
load("//:lint.bzl", "eslint_test")
43
load("//:vitest.bzl", "vitest")
54
load("//react:defs.bzl", "ASSET_PATTERNS", "SRC_PATTERNS", "TEST_PATTERNS", "TRANSPILER")
5+
load("//tools/lint:linters.bzl", "eslint_test")
66

77
js_library(
88
name = "assets",

Diff for: frontend/react/tsconfig.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@
1616
"declaration": true,
1717
"jsx": "react-jsx"
1818
},
19-
"include": ["src"]
19+
"include": ["src"],
20+
"exclude": []
2021
}

Diff for: frontend/tools/lint/BUILD.bazel

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
load("@npm//:eslint/package_json.bzl", eslint_bin = "bin")
2+
3+
eslint_bin.eslint_binary(name = "eslint")

Diff for: frontend/lint.bzl renamed to frontend/tools/lint/linters.bzl

+5-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@
33
load("@aspect_rules_lint//lint:eslint.bzl", "lint_eslint_aspect")
44
load("@aspect_rules_lint//lint:lint_test.bzl", "lint_test")
55

6+
# NB: use of explicit Label constructor avoids our strings being interpreted
7+
# in the context of aspect_rules_lint.
68
eslint = lint_eslint_aspect(
7-
binary = "@@//:eslint",
9+
binary = Label(":eslint"),
810
configs = [
9-
"@@//react:package_json",
10-
"@@//next.js:eslintrc",
11+
Label("//react:package_json"),
12+
Label("//next.js:eslintrc"),
1113
],
1214
)
1315

0 commit comments

Comments
 (0)