Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): update typescript-eslint monorepo to v8 (major) #836

Merged
merged 7 commits into from
Nov 27, 2024
Merged

chore(deps): update typescript-eslint monorepo to v8 (major) #836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
74c3d17
chore(deps): update typescript-eslint monorepo to v8
renovate[bot] Nov 27, 2024
c8cb229
feat: support for tseslint v8 to `svelte/indent` rule
ota-meshi Nov 27, 2024
283df41
Create quiet-toys-burn.md
ota-meshi Nov 27, 2024
e2a2b8a
fix
ota-meshi Nov 27, 2024
621c7a2
fix
ota-meshi Nov 27, 2024
85ffb4b
fix
ota-meshi Nov 27, 2024
cd27c19
update
ota-meshi Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/quiet-toys-burn.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'eslint-plugin-svelte': minor
---

feat: support for typescript-eslint v8 to `svelte/indent` rule
32 changes: 16 additions & 16 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,34 +15,34 @@
},
"devDependencies": {
"@changesets/changelog-github": "^0.5.0",
"@changesets/cli": "^2.27.9",
"@changesets/get-release-plan": "^4.0.4",
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
"@changesets/cli": "^2.27.10",
"@changesets/get-release-plan": "^4.0.5",
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.1",
"@ota-meshi/eslint-plugin": "^0.17.5",
"@types/eslint": "^9.6.1",
"@typescript-eslint/eslint-plugin": "^7.18.0",
"@typescript-eslint/parser": "^7.18.0",
"@typescript-eslint/eslint-plugin": "^8.16.0",
"@typescript-eslint/parser": "^8.16.0",
"env-cmd": "^10.1.0",
"eslint": "~9.14.0",
"eslint-config-prettier": "^9.1.0",
"eslint-formatter-friendly": "^7.0.0",
"eslint-plugin-eslint-plugin": "^6.2.0",
"eslint-plugin-jsdoc": "^50.4.1",
"eslint-plugin-eslint-plugin": "^6.3.2",
"eslint-plugin-jsdoc": "^50.6.0",
"eslint-plugin-json-schema-validator": "^5.1.3",
"eslint-plugin-jsonc": "^2.16.0",
"eslint-plugin-jsonc": "^2.18.2",
"eslint-plugin-markdown": "^5.1.0",
"eslint-plugin-mdx": "^3.1.5",
"eslint-plugin-n": "^17.11.1",
"eslint-plugin-n": "^17.14.0",
"eslint-plugin-node-dependencies": "^0.12.0",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-regexp": "^2.6.0",
"eslint-plugin-yml": "^1.14.0",
"npm-run-all2": "^7.0.0",
"prettier": "^3.3.3",
"prettier-plugin-svelte": "^3.2.7",
"eslint-plugin-regexp": "^2.7.0",
"eslint-plugin-yml": "^1.15.0",
"npm-run-all2": "^7.0.1",
"prettier": "^3.4.1",
"prettier-plugin-svelte": "^3.3.2",
"rimraf": "^6.0.1",
"typescript": "~5.7.0",
"typescript-eslint": "^7.18.0"
"typescript": "~5.7.2",
"typescript-eslint": "^8.16.0"
},
"publishConfig": {
"access": "public"
Expand Down
46 changes: 23 additions & 23 deletions packages/eslint-plugin-svelte/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,52 +56,52 @@
}
},
"dependencies": {
"@eslint-community/eslint-utils": "^4.4.0",
"@jridgewell/sourcemap-codec": "^1.4.15",
"eslint-compat-utils": "^0.6.0",
"@eslint-community/eslint-utils": "^4.4.1",
"@jridgewell/sourcemap-codec": "^1.5.0",
"eslint-compat-utils": "^0.6.3",
"esutils": "^2.0.3",
"known-css-properties": "^0.35.0",
"postcss": "^8.4.38",
"postcss": "^8.4.49",
"postcss-load-config": "^3.1.4",
"postcss-safe-parser": "^6.0.0",
"postcss-selector-parser": "^7.0.0",
"semver": "^7.6.2",
"semver": "^7.6.3",
"svelte-eslint-parser": "^1.0.0-0"
},
"devDependencies": {
"@babel/core": "^7.25.8",
"@babel/eslint-parser": "^7.25.8",
"@babel/plugin-proposal-function-bind": "^7.25.8",
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
"@babel/core": "^7.26.0",
"@babel/eslint-parser": "^7.25.9",
"@babel/plugin-proposal-function-bind": "^7.25.9",
"@eslint-community/eslint-plugin-eslint-comments": "^4.4.1",
"@types/babel__core": "^7.20.5",
"@types/eslint-utils": "^3.0.5",
"@types/esutils": "^2.0.2",
"@types/json-schema": "^7.0.15",
"@types/less": "^3.0.6",
"@types/mocha": "^10.0.9",
"@types/node": "^22.0.0",
"@types/less": "^3.0.7",
"@types/mocha": "^10.0.10",
"@types/node": "^22.10.0",
"@types/postcss-safe-parser": "^5.0.4",
"@types/semver": "^7.5.8",
"@types/stylus": "^0.48.43",
"acorn": "^8.13.0",
"acorn": "^8.14.0",
"assert": "^2.1.0",
"esbuild": "^0.24.0",
"esbuild-register": "^3.6.0",
"eslint-scope": "^8.1.0",
"eslint-scope": "^8.2.0",
"eslint-typegen": "^0.3.2",
"eslint-visitor-keys": "^4.1.0",
"espree": "^10.2.0",
"less": "^4.2.0",
"mocha": "^10.7.3",
"eslint-visitor-keys": "^4.2.0",
"espree": "^10.3.0",
"less": "^4.2.1",
"mocha": "^10.8.2",
"nyc": "^17.1.0",
"postcss-nested": "^7.0.0",
"sass": "^1.79.5",
"postcss-nested": "^7.0.2",
"sass": "^1.81.0",
"source-map-js": "^1.2.1",
"stylus": "^0.64.0",
"svelte": "^5.0.0",
"svelte-i18n": "^4.0.0",
"svelte": "^5.2.9",
"svelte-i18n": "^4.0.1",
"type-coverage": "^2.29.7",
"yaml": "^2.6.0"
"yaml": "^2.6.1"
},
"publishConfig": {
"access": "public"
Expand Down
10 changes: 8 additions & 2 deletions packages/eslint-plugin-svelte/src/rules/indent-helpers/es.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,10 @@ export function defineVisitor(context: IndentContext): NodeListener {
visitor.BreakStatement(node);
},
CallExpression(node: TSESTree.CallExpression) {
const typeArguments = node.typeArguments ?? node.typeParameters;
const typeArguments =
node.typeArguments ??
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Support old typescript-eslint
(node as any).typeParameters;
const firstToken = sourceCode.getFirstToken(node);
const leftParenToken = sourceCode.getTokenAfter(typeArguments || node.callee, {
filter: isOpeningParenToken,
Expand Down Expand Up @@ -706,7 +709,10 @@ export function defineVisitor(context: IndentContext): NodeListener {
visitor.MethodDefinition(node);
},
NewExpression(node: TSESTree.NewExpression) {
const typeArguments = node.typeArguments ?? node.typeParameters;
const typeArguments =
node.typeArguments ??
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Support old typescript-eslint
(node as any).typeParameters;
const newToken = sourceCode.getFirstToken(node);
const calleeTokens = getFirstAndLastTokens(sourceCode, node.callee);
offsets.setOffsetToken(calleeTokens.firstToken, 1, newToken);
Expand Down
48 changes: 41 additions & 7 deletions packages/eslint-plugin-svelte/src/rules/indent-helpers/ts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,10 @@ export function defineVisitor(context: IndentContext): NodeListener {
// or
// const ErrorMap = Map<string, Error>
// ^^^^^^^^^^^^^^^^^^
const typeArguments = node.typeArguments ?? node.typeParameters;
const typeArguments =
node.typeArguments ??
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Support old typescript-eslint
(node as any).typeParameters;
if (typeArguments) {
const firstToken = sourceCode.getFirstToken(node);
offsets.setOffsetToken(sourceCode.getFirstToken(typeArguments), 1, firstToken);
Expand Down Expand Up @@ -254,20 +257,34 @@ export function defineVisitor(context: IndentContext): NodeListener {
// {[key in foo]: bar}
const leftBraceToken = sourceCode.getFirstToken(node);

const leftBracketToken = sourceCode.getTokenBefore(node.typeParameter)!;
const rightBracketToken = sourceCode.getTokenAfter(node.nameType || node.typeParameter)!;
const leftBracketToken = sourceCode.getTokenBefore(node.key || node.typeParameter)!;
const rightBracketToken = sourceCode.getTokenAfter(
node.nameType || node.constraint || node.typeParameter
)!;
offsets.setOffsetToken(
[...sourceCode.getTokensBetween(leftBraceToken, leftBracketToken), leftBracketToken],
1,
leftBraceToken
);
offsets.setOffsetElementList(
[node.typeParameter, node.nameType],
[node.key, node.constraint, node.typeParameter, node.nameType],
leftBracketToken,
rightBracketToken,
1
);

if (node.key && node.constraint) {
const firstToken = sourceCode.getFirstToken(node.key);
offsets.setOffsetToken(
[
...sourceCode.getTokensBetween(firstToken, node.constraint),
sourceCode.getFirstToken(node.constraint)
],
1,
firstToken
);
}

const rightBraceToken = sourceCode.getLastToken(node);
if (node.typeAnnotation) {
const typeAnnotationToken = sourceCode.getFirstToken(node.typeAnnotation);
Expand Down Expand Up @@ -402,7 +419,10 @@ export function defineVisitor(context: IndentContext): NodeListener {
TSClassImplements(node: TSESTree.TSClassImplements | TSESTree.TSInterfaceHeritage) {
// class C implements T {}
// ^
const typeArguments = node.typeArguments ?? node.typeParameters;
const typeArguments =
node.typeArguments ??
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Support old typescript-eslint
(node as any).typeParameters;
if (typeArguments) {
offsets.setOffsetToken(
sourceCode.getFirstToken(typeArguments),
Expand All @@ -427,6 +447,14 @@ export function defineVisitor(context: IndentContext): NodeListener {
const leftBraceToken = sourceCode.getTokenAfter(idTokens.lastToken)!;
const rightBraceToken = sourceCode.getLastToken(node);
offsets.setOffsetToken(leftBraceToken, 0, firstToken);
if (node.members)
offsets.setOffsetElementList(node.members, leftBraceToken, rightBraceToken, 1);
},
TSEnumBody(node: TSESTree.TSEnumBody) {
// enum E {...}
// ^^^^^
const leftBraceToken = sourceCode.getFirstToken(node);
const rightBraceToken = sourceCode.getLastToken(node);
offsets.setOffsetElementList(node.members, leftBraceToken, rightBraceToken, 1);
},
TSModuleDeclaration(node: TSESTree.TSModuleDeclaration) {
Expand Down Expand Up @@ -677,7 +705,10 @@ export function defineVisitor(context: IndentContext): NodeListener {
},
TSImportType(node: TSESTree.TSImportType) {
// import('foo').B
const typeArguments = node.typeArguments ?? node.typeParameters;
const typeArguments =
node.typeArguments ??
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Support old typescript-eslint
(node as any).typeParameters;
const firstToken = sourceCode.getFirstToken(node);
const leftParenToken = sourceCode.getTokenAfter(firstToken, {
filter: isOpeningParenToken,
Expand Down Expand Up @@ -1057,7 +1088,10 @@ export function defineVisitor(context: IndentContext): NodeListener {
sourceCode.getFirstToken(node.id || node)
);
}
const superTypeArguments = node.superTypeArguments ?? node.superTypeParameters;
const superTypeArguments =
node.superTypeArguments ??
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Support old typescript-eslint
(node as any).superTypeParameters;
if (superTypeArguments != null && node.superClass != null) {
offsets.setOffsetToken(
sourceCode.getFirstToken(superTypeArguments),
Expand Down
6 changes: 5 additions & 1 deletion packages/eslint-plugin-svelte/src/rules/require-event-dispatcher-types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,11 @@ export default createRule('require-event-dispatcher-types', {
}
})) {
const node = n as TSESTree.CallExpression;
if ((node.typeArguments ?? node.typeParameters) === undefined) {
if (
(node.typeArguments ??
// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Support old typescript-eslint
(node as any).typeParameters) === undefined
) {
context.report({ node, messageId: 'missingTypeParameter' });
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-plugin-svelte/src/shared/svelte-compile-warns/transform/babel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export function transform(
output: output.code!,
mappings: output.map!.mappings
};
} catch (_e) {
} catch {
return null;
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-plugin-svelte/src/shared/svelte-compile-warns/transform/less.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export function transform(
output: output.css,
mappings: JSON.parse(output.map).mappings
};
} catch (_e) {
} catch {
return null;
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-plugin-svelte/src/shared/svelte-compile-warns/transform/postcss.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export function transform(
output: result.content,
mappings: result.map.toJSON().mappings
};
} catch (_e) {
} catch {
// console.log(e)
return null;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-plugin-svelte/src/shared/svelte-compile-warns/transform/sass.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export function transform(
output: output.css,
mappings: output.sourceMap!.mappings
};
} catch (_e) {
} catch {
return null;
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-plugin-svelte/src/shared/svelte-compile-warns/transform/stylus.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export function transform(
output,
mappings: (style as unknown as { sourcemap: RawSourceMap }).sourcemap.mappings
};
} catch (_e) {
} catch {
return null;
}
}
Expand Down
14 changes: 8 additions & 6 deletions packages/eslint-plugin-svelte/src/types-for-node.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ export type ASTNodeListener = {
TSEmptyBodyFunctionExpression?: (
node: TSESTree.TSEmptyBodyFunctionExpression & ASTNodeWithParent
) => void;
TSEnumBody?: (node: TSESTree.TSEnumBody & ASTNodeWithParent) => void;
TSEnumDeclaration?: (node: TSESTree.TSEnumDeclaration & ASTNodeWithParent) => void;
TSEnumMember?: (node: TSESTree.TSEnumMember & ASTNodeWithParent) => void;
TSExportAssignment?: (node: TSESTree.TSExportAssignment & ASTNodeWithParent) => void;
Expand All @@ -143,16 +144,16 @@ export type ASTNodeListener = {
node: TSESTree.TSExternalModuleReference & ASTNodeWithParent
) => void;
TSFunctionType?: (node: TSESTree.TSFunctionType & ASTNodeWithParent) => void;
TSInstantiationExpression?: (
node: TSESTree.TSInstantiationExpression & ASTNodeWithParent
) => void;
TSImportEqualsDeclaration?: (
node: TSESTree.TSImportEqualsDeclaration & ASTNodeWithParent
) => void;
TSImportType?: (node: TSESTree.TSImportType & ASTNodeWithParent) => void;
TSIndexedAccessType?: (node: TSESTree.TSIndexedAccessType & ASTNodeWithParent) => void;
TSIndexSignature?: (node: TSESTree.TSIndexSignature & ASTNodeWithParent) => void;
TSInferType?: (node: TSESTree.TSInferType & ASTNodeWithParent) => void;
TSInstantiationExpression?: (
node: TSESTree.TSInstantiationExpression & ASTNodeWithParent
) => void;
TSInterfaceBody?: (node: TSESTree.TSInterfaceBody & ASTNodeWithParent) => void;
TSInterfaceDeclaration?: (node: TSESTree.TSInterfaceDeclaration & ASTNodeWithParent) => void;
TSInterfaceHeritage?: (node: TSESTree.TSInterfaceHeritage & ASTNodeWithParent) => void;
Expand Down Expand Up @@ -354,6 +355,7 @@ export type TSNodeListener = {
TSEmptyBodyFunctionExpression?: (
node: TSESTree.TSEmptyBodyFunctionExpression & ASTNodeWithParent
) => void;
TSEnumBody?: (node: TSESTree.TSEnumBody & ASTNodeWithParent) => void;
TSEnumDeclaration?: (node: TSESTree.TSEnumDeclaration & ASTNodeWithParent) => void;
TSEnumMember?: (node: TSESTree.TSEnumMember & ASTNodeWithParent) => void;
TSExportAssignment?: (node: TSESTree.TSExportAssignment & ASTNodeWithParent) => void;
Expand All @@ -362,16 +364,16 @@ export type TSNodeListener = {
node: TSESTree.TSExternalModuleReference & ASTNodeWithParent
) => void;
TSFunctionType?: (node: TSESTree.TSFunctionType & ASTNodeWithParent) => void;
TSInstantiationExpression?: (
node: TSESTree.TSInstantiationExpression & ASTNodeWithParent
) => void;
TSImportEqualsDeclaration?: (
node: TSESTree.TSImportEqualsDeclaration & ASTNodeWithParent
) => void;
TSImportType?: (node: TSESTree.TSImportType & ASTNodeWithParent) => void;
TSIndexedAccessType?: (node: TSESTree.TSIndexedAccessType & ASTNodeWithParent) => void;
TSIndexSignature?: (node: TSESTree.TSIndexSignature & ASTNodeWithParent) => void;
TSInferType?: (node: TSESTree.TSInferType & ASTNodeWithParent) => void;
TSInstantiationExpression?: (
node: TSESTree.TSInstantiationExpression & ASTNodeWithParent
) => void;
TSInterfaceBody?: (node: TSESTree.TSInterfaceBody & ASTNodeWithParent) => void;
TSInterfaceDeclaration?: (node: TSESTree.TSInterfaceDeclaration & ASTNodeWithParent) => void;
TSInterfaceHeritage?: (node: TSESTree.TSInterfaceHeritage & ASTNodeWithParent) => void;
Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-plugin-svelte/src/utils/get-package-json.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ function readPackageJson(dir: string): PackageJson | null {
data.filePath = filePath;
return data;
}
} catch (_err) {
} catch {
// do nothing.
}

Expand Down
2 changes: 1 addition & 1 deletion packages/eslint-plugin-svelte/src/utils/svelte-kit.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ function hasSvelteKit(filePath: string): boolean {
return Boolean(
packageJson.dependencies?.['@sveltejs/kit'] ?? packageJson.devDependencies?.['@sveltejs/kit']
);
} catch (_e) {
} catch {
return false;
}
}
Expand Down
3 changes: 2 additions & 1 deletion packages/eslint-plugin-svelte/tests/src/rules/@typescript-eslint/no-unnecessary-condition.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ const tester = new RuleTester({
ts: '@typescript-eslint/parser',
js: 'espree'
},
project: RULES_PROJECT
project: RULES_PROJECT,
disallowAutomaticSingleRunInference: true
}
}
});
Expand Down
Loading
Loading