Skip to content

Commit d8830f8

Browse files
committed
fix: migrate to flat eslint config
Signed-off-by: Christian Stewart <christian@aperture.us>
1 parent 8e35acc commit d8830f8

File tree

5 files changed

+53
-33
lines changed

5 files changed

+53
-33
lines changed

.eslintrc.cjs

Lines changed: 0 additions & 28 deletions
This file was deleted.

eslint.config.js

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
import eslint from '@eslint/js'
2+
import tseslint from '@typescript-eslint/eslint-plugin'
3+
import prettier from 'eslint-config-prettier'
4+
import reactHooks from 'eslint-plugin-react-hooks'
5+
import unusedImports from 'eslint-plugin-unused-imports'
6+
import globals from 'globals'
7+
8+
export default [
9+
{
10+
ignores: [
11+
'node_modules/**',
12+
'dist/**',
13+
'coverage/**',
14+
'bundle/**',
15+
'runtime/**',
16+
'vendor/**',
17+
'**/wasm_exec.js',
18+
'**/*.pb.ts',
19+
],
20+
},
21+
eslint.configs.recommended,
22+
...tseslint.configs['flat/recommended'],
23+
reactHooks.configs.flat.recommended,
24+
{
25+
languageOptions: {
26+
globals: {
27+
...globals.node,
28+
...globals.browser,
29+
},
30+
},
31+
plugins: {
32+
'unused-imports': unusedImports,
33+
},
34+
rules: {
35+
'@typescript-eslint/explicit-module-boundary-types': 'off',
36+
'@typescript-eslint/no-non-null-assertion': 'off',
37+
},
38+
},
39+
prettier,
40+
]

go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ go 1.25
55
require (
66
github.com/aperturerobotics/abseil-cpp v0.0.0-20260131110040-4bb56e2f9017 // indirect
77
github.com/aperturerobotics/cli v1.1.0 // latest
8-
github.com/aperturerobotics/common v0.30.1 // latest
8+
github.com/aperturerobotics/common v0.30.3 // latest
99
github.com/aperturerobotics/controllerbus v0.52.1 // latest
1010
github.com/aperturerobotics/entitygraph v0.11.0 // latest
1111
github.com/aperturerobotics/go-protoc-wasi v0.0.0-20260131050911-b5f94b044584 // indirect
1212
github.com/aperturerobotics/json-iterator-lite v1.0.1-0.20251104042408-0c9eb8a3f726 // indirect
1313
github.com/aperturerobotics/protobuf v0.0.0-20260203024654-8201686529c4 // indirect; wasi
1414
github.com/aperturerobotics/protobuf-go-lite v0.12.1 // latest
15-
github.com/aperturerobotics/starpc v0.46.1 // latest
15+
github.com/aperturerobotics/starpc v0.46.2 // latest
1616
github.com/aperturerobotics/util v1.32.3 // latest
1717
)
1818

@@ -51,7 +51,7 @@ require (
5151
require github.com/cloudflare/circl v1.6.3
5252

5353
require (
54-
github.com/aperturerobotics/go-protoc-gen-prost v0.0.0-20260203094828-3faf47d2c868 // indirect
54+
github.com/aperturerobotics/go-protoc-gen-prost v0.0.0-20260204215916-dc1f0fed8cfc // indirect
5555
github.com/bwesterb/go-ristretto v1.2.3 // indirect
5656
github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
5757
github.com/ghodss/yaml v1.0.0 // indirect
@@ -86,7 +86,7 @@ require (
8686
github.com/tetratelabs/wazero v1.11.0 // indirect
8787
github.com/wlynxg/anet v0.0.5 // indirect
8888
github.com/xrash/smetrics v0.0.0-20250705151800-55b8f293f342 // indirect
89-
golang.org/x/mod v0.32.0 // indirect
89+
golang.org/x/mod v0.33.0 // indirect
9090
golang.org/x/net v0.49.0 // indirect
9191
golang.org/x/sys v0.40.0 // indirect
9292
golang.org/x/time v0.12.0 // indirect

go.sum

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ github.com/aperturerobotics/cli v1.1.0 h1:7a+YRC+EY3npAnTzhHV5gLCiw91KS0Ts3XwLIL
66
github.com/aperturerobotics/cli v1.1.0/go.mod h1:M7BFP9wow5ytTzMyJQOOO991fGfsUqdTI7gGEsHfTQ8=
77
github.com/aperturerobotics/common v0.30.1 h1:bpgRROOmTY+NSuiKPEVLuPnDv6cuGXtoyFPYHGkWzJU=
88
github.com/aperturerobotics/common v0.30.1/go.mod h1:o3LkfVkdyNtWz31nGkCKuMP7H2dxarmYCYgXmy1zjtg=
9+
github.com/aperturerobotics/common v0.30.3 h1:NlyKlCkqD45y7O5iWGOC+QNnzzXe6dtmKYG2in+nYMU=
10+
github.com/aperturerobotics/common v0.30.3/go.mod h1:rdhYmixjslfBT0lEMADQHWjgRKIDxZ+8Paxv4lGZfp0=
911
github.com/aperturerobotics/controllerbus v0.52.1 h1:kzuq9N8+4M6ymcGYgjiCdVyvA1TGuZz/yvay6PwZceU=
1012
github.com/aperturerobotics/controllerbus v0.52.1/go.mod h1:hCUUtERKKc/hDPhF5qzcfeRJh7XeyMjWoMYI8SuNg8U=
1113
github.com/aperturerobotics/entitygraph v0.11.0 h1:nPnT0SXsEMqsxmn/lWGR50JHbfmSd3pVanyJAm6v8rI=
@@ -20,6 +22,8 @@ github.com/aperturerobotics/go-multihash v0.2.3 h1:/dzKxmtr0eadFUcG/8uJdKtcQ5yHw
2022
github.com/aperturerobotics/go-multihash v0.2.3/go.mod h1:jEGfK9IqlKuD9BaFHgadXORk3i9Rw7DmVOOM6UgauGU=
2123
github.com/aperturerobotics/go-protoc-gen-prost v0.0.0-20260203094828-3faf47d2c868 h1:r2j7F1tGHkchPBLL55e44g/DfYqK2JV0Ed8suMAxmlU=
2224
github.com/aperturerobotics/go-protoc-gen-prost v0.0.0-20260203094828-3faf47d2c868/go.mod h1:OBb/beWmr/pDIZAUfi86j/4tBh2v5ctTxKMqSnh9c/4=
25+
github.com/aperturerobotics/go-protoc-gen-prost v0.0.0-20260204215916-dc1f0fed8cfc h1:MQKYvrnue6iT6DlQdGbaBYvyY/WuR63cbhUtRZjx4OM=
26+
github.com/aperturerobotics/go-protoc-gen-prost v0.0.0-20260204215916-dc1f0fed8cfc/go.mod h1:OBb/beWmr/pDIZAUfi86j/4tBh2v5ctTxKMqSnh9c/4=
2327
github.com/aperturerobotics/go-protoc-wasi v0.0.0-20260131050911-b5f94b044584 h1:ER8DYYL71cTg39uZ+Gi699tL/hZoscUWDOw4DbizqhI=
2428
github.com/aperturerobotics/go-protoc-wasi v0.0.0-20260131050911-b5f94b044584/go.mod h1:vEq8i7EKb32+KXGtIEZjjhNns+BdsL2dUMw4uhy3578=
2529
github.com/aperturerobotics/json-iterator-lite v1.0.1-0.20251104042408-0c9eb8a3f726 h1:4B1F0DzuqPzb6WqgCjWaqDD7JU9RDsevQG5OP0DFBgs=
@@ -32,6 +36,8 @@ github.com/aperturerobotics/protobuf-go-lite v0.12.1 h1:o9of87F/LFS2p5xfq32CrU99
3236
github.com/aperturerobotics/protobuf-go-lite v0.12.1/go.mod h1:lGH3s5ArCTXKI4wJdlNpaybUtwSjfAG0vdWjxOfMcF8=
3337
github.com/aperturerobotics/starpc v0.46.1 h1:RdyPA1UsU4WNj0ISzNQRcQvDk9hkwBrmRzpCrJD2XP0=
3438
github.com/aperturerobotics/starpc v0.46.1/go.mod h1:x1CyVEdQz1N90KtpEF6hv9Bn0gWSqoEx090mpnyPZIk=
39+
github.com/aperturerobotics/starpc v0.46.2 h1:HwNzU48H2MLlbQPIZpXz9Rgx1leqCWhIN/k8177b4MQ=
40+
github.com/aperturerobotics/starpc v0.46.2/go.mod h1:x1CyVEdQz1N90KtpEF6hv9Bn0gWSqoEx090mpnyPZIk=
3541
github.com/aperturerobotics/util v1.32.3 h1:wBc6L2guYMgLEzFwORH3CLMoMpfEqbV6pDqYervo3S0=
3642
github.com/aperturerobotics/util v1.32.3/go.mod h1:qfRZZUDn0sEfc43JRA6rKP8bwFxliqGqJZX+p1jeOnQ=
3743
github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
@@ -161,6 +167,8 @@ golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 h1:R84qjqJb5nVJMxqWYb3np9L5Z
161167
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0/go.mod h1:S9Xr4PYopiDyqSyp5NjCrhFrqg6A5zA2E/iPHPhqnS8=
162168
golang.org/x/mod v0.32.0 h1:9F4d3PHLljb6x//jOyokMv3eX+YDeepZSEo3mFJy93c=
163169
golang.org/x/mod v0.32.0/go.mod h1:SgipZ/3h2Ci89DlEtEXWUk/HteuRin+HHhN+WbNhguU=
170+
golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8=
171+
golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w=
164172
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
165173
golang.org/x/net v0.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o=
166174
golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8=

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"test:js": "echo No JS tests.",
3636
"lint": "bun run lint:go && npm run lint:js",
3737
"lint:go": "bun run go:aptre -- lint",
38-
"lint:js": "ESLINT_USE_FLAT_CONFIG=false eslint -c .eslintrc.cjs --ignore-pattern wasm_exec.js ./",
38+
"lint:js": "eslint ./",
3939
"prepare": "go mod vendor && rimraf ./.tools",
4040
"go:aptre": "go run -mod=mod github.com/aperturerobotics/common/cmd/aptre",
4141
"release": "bun run release:version && npm run release:commit",

0 commit comments

Comments
 (0)