Skip to content

Commit 67cac0e

Browse files
committed
fix(deps): adopt eslint 10 with ts-eslint compatibility patch
1 parent a910c3c commit 67cac0e

4 files changed

Lines changed: 169 additions & 130 deletions

File tree

package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@
4343
"@parcel/watcher",
4444
"msgpackr-extract",
4545
"unrs-resolver"
46-
]
46+
],
47+
"patchedDependencies": {
48+
"@typescript-eslint/eslint-plugin@8.55.0": "patches/@typescript-eslint__eslint-plugin@8.55.0.patch"
49+
}
4750
}
4851
}

packages/app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
"@typescript-eslint/parser": "^8.55.0",
8181
"@vitest/coverage-v8": "^4.0.18",
8282
"@vitest/eslint-plugin": "^1.6.7",
83-
"eslint": "^9.39.1",
83+
"eslint": "^10.0.0",
8484
"eslint-import-resolver-typescript": "^4.4.4",
8585
"eslint-plugin-codegen": "0.34.1",
8686
"eslint-plugin-import": "^2.32.0",
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
diff --git a/dist/rules/consistent-generic-constructors.js b/dist/rules/consistent-generic-constructors.js
2+
index 9977214d04d64cdbc3a90fc2a9f9f9e39572dbf4..c9b1fc79e198138b62f9333722068fc0cd7f2a86 100644
3+
--- a/dist/rules/consistent-generic-constructors.js
4+
+++ b/dist/rules/consistent-generic-constructors.js
5+
@@ -98,7 +98,7 @@ exports.default = (0, util_1.createRule)({
6+
}
7+
return;
8+
}
9+
- const isolatedDeclarations = context.parserOptions.isolatedDeclarations;
10+
+ const isolatedDeclarations = context.languageOptions?.parserOptions?.isolatedDeclarations ?? context.parserOptions?.isolatedDeclarations;
11+
if (!isolatedDeclarations && lhs?.typeArguments && !rhs.typeArguments) {
12+
const hasParens = context.sourceCode.getTokenAfter(rhs.callee)?.value === '(';
13+
const extraComments = new Set(context.sourceCode.getCommentsInside(lhs.parent));
14+
diff --git a/dist/rules/no-deprecated.js b/dist/rules/no-deprecated.js
15+
index 293d007ba9ef084f622f9e8da7c763ea02a17fa4..6d53d6181877005b3645bcaa030344954f195d8a 100644
16+
--- a/dist/rules/no-deprecated.js
17+
+++ b/dist/rules/no-deprecated.js
18+
@@ -69,7 +69,7 @@ exports.default = (0, util_1.createRule)({
19+
},
20+
],
21+
create(context, [options]) {
22+
- const { jsDocParsingMode } = context.parserOptions;
23+
+ const { jsDocParsingMode } = (context.languageOptions?.parserOptions ?? context.parserOptions ?? {});
24+
const allow = options.allow;
25+
if (jsDocParsingMode === 'none' || jsDocParsingMode === 'type-info') {
26+
throw new Error(`Cannot be used with jsDocParsingMode: '${jsDocParsingMode}'.`);

0 commit comments

Comments
 (0)