Skip to content

Commit 9b12e6e

Browse files
chore: switch internal eslint config to defineConfig
Bump vitest because they recently made the same fix. Lock us to a specific version of config-helpers due to type incompatibilities.
1 parent f2eb282 commit 9b12e6e

File tree

3 files changed

+23
-19
lines changed

3 files changed

+23
-19
lines changed

eslint.config.mjs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
// @ts-check
22
import js from '@eslint/js';
33
import stylistic from '@stylistic/eslint-plugin';
4+
import vitest from '@vitest/eslint-plugin';
45
import gitignore from 'eslint-config-flat-gitignore';
6+
import eslintPlugin from 'eslint-plugin-eslint-plugin';
57
import importX from 'eslint-plugin-import-x';
68
import n from 'eslint-plugin-n';
9+
import { defineConfig } from 'eslint/config';
710
import tseslint from 'typescript-eslint';
8-
import vitest from '@vitest/eslint-plugin';
9-
import eslintPlugin from 'eslint-plugin-eslint-plugin';
1011

11-
export default tseslint.config(gitignore(), {
12+
export default defineConfig(gitignore(), {
1213
files: [
1314
'src/**/*.ts',
1415
'tests/**/*.ts',

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,15 @@
7272
}
7373
},
7474
"devDependencies": {
75+
"@eslint/config-helpers": "0.4.1",
7576
"@eslint/js": "^9.38.0",
7677
"@stylistic/eslint-plugin": "^5.5.0",
7778
"@types/common-tags": "^1.8.4",
7879
"@types/node": "~18.18.0",
7980
"@typescript-eslint/rule-tester": "^8.46.2",
8081
"@typescript/vfs": "^1.6.1",
8182
"@vitest/coverage-v8": "^3.2.4",
82-
"@vitest/eslint-plugin": "^1.2.7",
83+
"@vitest/eslint-plugin": "^1.4.0",
8384
"bumpp": "^10.3.1",
8485
"eslint": "^9.38.0",
8586
"eslint-config-flat-gitignore": "^2.1.0",

yarn.lock

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -312,12 +312,12 @@ __metadata:
312312
languageName: node
313313
linkType: hard
314314

315-
"@eslint/config-helpers@npm:^0.4.1":
316-
version: 0.4.2
317-
resolution: "@eslint/config-helpers@npm:0.4.2"
315+
"@eslint/config-helpers@npm:0.4.1, @eslint/config-helpers@npm:^0.4.1":
316+
version: 0.4.1
317+
resolution: "@eslint/config-helpers@npm:0.4.1"
318318
dependencies:
319-
"@eslint/core": "npm:^0.17.0"
320-
checksum: 10c0/92efd7a527b2d17eb1a148409d71d80f9ac160b565ac73ee092252e8bf08ecd08670699f46b306b94f13d22e88ac88a612120e7847570dd7cdc72f234d50dcb4
319+
"@eslint/core": "npm:^0.16.0"
320+
checksum: 10c0/bb7dd534019a975320ac0f8e0699b37433cee9a3731354c1ee941648e6651032386e7848792060fb53a0fd603ea6cf7a101ed3bd5b82ee2f641598986d1e080a
321321
languageName: node
322322
linkType: hard
323323

@@ -886,7 +886,7 @@ __metadata:
886886
languageName: node
887887
linkType: hard
888888

889-
"@typescript-eslint/scope-manager@npm:8.46.2, @typescript-eslint/scope-manager@npm:^8.19.1":
889+
"@typescript-eslint/scope-manager@npm:8.46.2, @typescript-eslint/scope-manager@npm:^8.19.1, @typescript-eslint/scope-manager@npm:^8.46.1":
890890
version: 8.46.2
891891
resolution: "@typescript-eslint/scope-manager@npm:8.46.2"
892892
dependencies:
@@ -948,7 +948,7 @@ __metadata:
948948
languageName: node
949949
linkType: hard
950950

951-
"@typescript-eslint/utils@npm:8.46.2, @typescript-eslint/utils@npm:^8.0.0, @typescript-eslint/utils@npm:^8.19.1, @typescript-eslint/utils@npm:^8.24.1":
951+
"@typescript-eslint/utils@npm:8.46.2, @typescript-eslint/utils@npm:^8.0.0, @typescript-eslint/utils@npm:^8.19.1, @typescript-eslint/utils@npm:^8.46.1":
952952
version: 8.46.2
953953
resolution: "@typescript-eslint/utils@npm:8.46.2"
954954
dependencies:
@@ -1146,21 +1146,22 @@ __metadata:
11461146
languageName: node
11471147
linkType: hard
11481148

1149-
"@vitest/eslint-plugin@npm:^1.2.7":
1150-
version: 1.2.7
1151-
resolution: "@vitest/eslint-plugin@npm:1.2.7"
1149+
"@vitest/eslint-plugin@npm:^1.4.0":
1150+
version: 1.4.0
1151+
resolution: "@vitest/eslint-plugin@npm:1.4.0"
11521152
dependencies:
1153-
"@typescript-eslint/utils": "npm:^8.24.1"
1153+
"@typescript-eslint/scope-manager": "npm:^8.46.1"
1154+
"@typescript-eslint/utils": "npm:^8.46.1"
11541155
peerDependencies:
1155-
eslint: ">= 8.57.0"
1156-
typescript: ">= 5.0.0"
1156+
eslint: ">=8.57.0"
1157+
typescript: ">=5.0.0"
11571158
vitest: "*"
11581159
peerDependenciesMeta:
11591160
typescript:
11601161
optional: true
11611162
vitest:
11621163
optional: true
1163-
checksum: 10c0/85f71e977ed898345fbe32aaa3c149a5ec62b447a021978c002ce8c10494249f5d47f84eee7e5ee68df323fe893dd7a5fe2a04dab8daa6bd3e3f898196bdc340
1164+
checksum: 10c0/6958ce071d4118560c126077e2aae7b628a3dd26bf586511ed168ec833f5aaf3981cc43ba8783b1b0db5f8517e7d8ed4e7b54b616b4beee43a4bc957d2b1a076
11641165
languageName: node
11651166
linkType: hard
11661167

@@ -2181,6 +2182,7 @@ __metadata:
21812182
version: 0.0.0-use.local
21822183
resolution: "eslint-plugin-rxjs-x@workspace:."
21832184
dependencies:
2185+
"@eslint/config-helpers": "npm:0.4.1"
21842186
"@eslint/js": "npm:^9.38.0"
21852187
"@stylistic/eslint-plugin": "npm:^5.5.0"
21862188
"@types/common-tags": "npm:^1.8.4"
@@ -2190,7 +2192,7 @@ __metadata:
21902192
"@typescript-eslint/utils": "npm:^8.19.1"
21912193
"@typescript/vfs": "npm:^1.6.1"
21922194
"@vitest/coverage-v8": "npm:^3.2.4"
2193-
"@vitest/eslint-plugin": "npm:^1.2.7"
2195+
"@vitest/eslint-plugin": "npm:^1.4.0"
21942196
bumpp: "npm:^10.3.1"
21952197
common-tags: "npm:^1.8.0"
21962198
decamelize: "npm:^5.0.1"

0 commit comments

Comments
 (0)