Merge remote-tracking branch 'origin/main' into feat/fine-gained-file-control

Author: baseballyama

.changeset/eighty-trainers-push.md

@@ -0,0 +1,5 @@
+---
+'eslint-plugin-svelte': patch
+---
+
+chore: add `:exit` for each node listener

.changeset/pre.json

@@ -13,6 +13,7 @@
     "fifty-parents-itch",
     "green-squids-compete",
     "hungry-grapes-shave",
+    "itchy-dragons-boil",
     "lazy-eyes-wait",
     "loud-zoos-kiss",
     "olive-melons-explain",

.github/FUNDING.yml

@@ -1,5 +1,7 @@
 # These are supported funding model platforms
 
+open_collective: svelte
 github: [ota-meshi, JounQin]
-open_collective: rxts
 patreon: 1stG
+custom:
+  - https://opencollective.com/rxts

.github/workflows/NodeCI.yml

@@ -139,31 +139,6 @@ jobs:
         run: pnpm run test
         working-directory: ${{ env.project_root_path }}
 
-  test-for-typescript-eslint-v5:
-    name: Test for typescript-eslint v5
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-        node: [18]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v2
-      - name: Setup Node.js ${{ matrix.node }}
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ matrix.node }}
-      - name: Install typescript-eslint v5
-        run: |
-          pnpm install -D -w @typescript-eslint/parser@5 @typescript-eslint/eslint-plugin@5
-          rm -rf node_modules
-      - name: Install Packages
-        run: pnpm install
-      - name: Test
-        run: pnpm run test
-        working-directory: ${{ env.project_root_path }}
-
   update-resources:
     runs-on: ubuntu-latest
     steps:

package.json

@@ -4,7 +4,7 @@
   "private": true,
   "license": "MIT",
   "funding": "https://github.com/sponsors/ota-meshi",
-  "packageManager": "[email protected].2",
+  "packageManager": "[email protected].3",
   "scripts": {
     "prerelease": "cd packages/eslint-plugin-svelte && pnpm clean && pnpm run build && cd ../.. && cp README.md packages/eslint-plugin-svelte",
     "release": "changeset publish",
@@ -24,7 +24,7 @@
     "@typescript-eslint/parser": "^8.16.0",
     "c8": "^10.1.2",
     "env-cmd": "^10.1.0",
-    "eslint": "~9.17.0",
+    "eslint": "~9.18.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-formatter-friendly": "^7.0.0",
     "eslint-plugin-eslint-plugin": "^6.3.2",

packages/eslint-plugin-svelte/CHANGELOG.md

@@ -1,5 +1,11 @@
 # eslint-plugin-svelte
 
+## 3.0.0-next.10
+
+### Patch Changes
+
+- [#965](https://github.com/sveltejs/eslint-plugin-svelte/pull/965) [`47760ad`](https://github.com/sveltejs/eslint-plugin-svelte/commit/47760ad1b7f6b83d4c29380b3ef3cf09cde42dc8) Thanks [@marekdedic](https://github.com/marekdedic)! - chore: using svelte-eslint-parser for style selector parsing
+
 ## 3.0.0-next.9
 
 ### Minor Changes

packages/eslint-plugin-svelte/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-svelte",
-  "version": "3.0.0-next.9",
+  "version": "3.0.0-next.10",
   "description": "ESLint plugin for Svelte using AST",
   "repository": "git+https://github.com/sveltejs/eslint-plugin-svelte.git",
   "homepage": "https://sveltejs.github.io/eslint-plugin-svelte",
@@ -86,7 +86,7 @@
     "assert": "^2.1.0",
     "esbuild": "^0.24.0",
     "eslint-scope": "^8.2.0",
-    "eslint-typegen": "^0.3.2",
+    "eslint-typegen": "^1.0.0",
     "eslint-visitor-keys": "^4.2.0",
     "espree": "^10.3.0",
     "less": "^4.2.1",

packages/eslint-plugin-svelte/src/meta.ts

@@ -2,4 +2,4 @@
 // This file has been automatically generated,
 // in order to update its content execute "pnpm run update"
 export const name = 'eslint-plugin-svelte';
-export const version = '3.0.0-next.9';
+export const version = '3.0.0-next.10';

packages/eslint-plugin-svelte/src/rules/indent-helpers/index.ts

@@ -1,5 +1,4 @@
 import type { AST } from 'svelte-eslint-parser';
-import type { TSESTree } from '@typescript-eslint/types';
 import type { ASTNode, RuleContext, RuleListener } from '../../types.js';
 import * as SV from './svelte.js';
 import * as ES from './es.js';
@@ -244,7 +243,7 @@ export function defineVisitor(
 				offsets.ignore(node);
 			}
 		},
-		'Program:exit'(node: TSESTree.Program) {
+		'Program:exit'(node: AST.SvelteProgram) {
 			const calculator = offsets.getOffsetCalculator();
 
 			let prevToken: AnyToken | null = null;

packages/eslint-plugin-svelte/src/rules/no-unused-class-name.ts

@@ -111,7 +111,7 @@ function findClassesInPostCSSNode(
 ): string[] {
 	if (node.type === 'rule') {
 		let classes = node.nodes.flatMap((node) => findClassesInPostCSSNode(node, parserServices));
-		classes = classes.concat(findClassesInSelector(parserServices.getStyleSelectorAST(node)));
+		classes = classes.concat(findClassesInSelector(parserServices.getStyleSelectorAST!(node)));
 		return classes;
 	}
 	if ((node.type === 'root' || node.type === 'atrule') && node.nodes !== undefined) {

packages/eslint-plugin-svelte/src/types-for-node.ts

@@ -223,10 +223,10 @@ export interface SourceCode {
 		isSvelteScript?: boolean;
 		getSvelteHtmlAst?: () => unknown;
 		getStyleContext?: () => StyleContext;
-		getStyleSelectorAST: (rule: StyleRule) => SelectorRoot;
-		styleNodeLoc: (node: Node) => Partial<SourceLocation>;
-		styleNodeRange: (node: Node) => [number | undefined, number | undefined];
-		styleSelectorNodeLoc: (node: SelectorNode) => Partial<SourceLocation>;
+		getStyleSelectorAST?: (rule: StyleRule) => SelectorRoot;
+		styleNodeLoc?: (node: Node) => Partial<SourceLocation>;
+		styleNodeRange?: (node: Node) => [number | undefined, number | undefined];
+		styleSelectorNodeLoc?: (node: SelectorNode) => Partial<SourceLocation>;
 		svelteParseContext?: {
 			/**
 			 * Whether to use Runes mode.

packages/eslint-plugin-svelte/src/types.ts

@@ -70,20 +70,23 @@ for (const nodeType of tsEsNodeNames) {
 		argType = `TSESTree.Node & { type: AST_NODE_TYPES.${nodeType}}`;
 	}
 	typesForNodeCode.push(`  ${nodeType}?: (node: ${argType} & ASTNodeWithParent) => void`);
+	typesForNodeCode.push(`  '${nodeType}:exit'?: (node: ${argType} & ASTNodeWithParent) => void`);
 }
 for (const nodeType of svelteNodeNames) {
 	let argType = `AST.${nodeType}`;
 	if (nodeType === 'Program') {
 		argType = `AST.SvelteProgram`;
 	}
 	typesForNodeCode.push(`  ${nodeType}?: (node: ${argType} & ASTNodeWithParent) => void`);
+	typesForNodeCode.push(`  '${nodeType}:exit'?: (node: ${argType} & ASTNodeWithParent) => void`);
 }
 typesForNodeCode.push(`}`);
 typesForNodeCode.push(``);
 typesForNodeCode.push(`export type ESNodeListener = {`);
 for (const nodeType of esNodeNames) {
 	const argType = `TSESTree.${nodeType}`;
 	typesForNodeCode.push(`  ${nodeType}?: (node: ${argType} & ASTNodeWithParent) => void`);
+	typesForNodeCode.push(`  '${nodeType}:exit'?: (node: ${argType} & ASTNodeWithParent) => void`);
 	estreeCode.push(`export type ${nodeType} = TSESTree.${nodeType}`);
 }
 for (const nodeType of esSvelteNodeNames) {
@@ -92,6 +95,7 @@ for (const nodeType of esSvelteNodeNames) {
 		argType = `AST.SvelteProgram`;
 	}
 	typesForNodeCode.push(`  ${nodeType}?: (node: ${argType} & ASTNodeWithParent) => void`);
+	typesForNodeCode.push(`  '${nodeType}:exit'?: (node: ${argType} & ASTNodeWithParent) => void`);
 }
 typesForNodeCode.push(`}`);
 typesForNodeCode.push(``);
@@ -102,13 +106,15 @@ for (const nodeType of tsNodeNames) {
 		argType = `TSESTree.Node & { type: AST_NODE_TYPES.${nodeType}}`;
 	}
 	typesForNodeCode.push(`  ${nodeType}?: (node: ${argType} & ASTNodeWithParent) => void`);
+	typesForNodeCode.push(`  '${nodeType}:exit'?: (node: ${argType} & ASTNodeWithParent) => void`);
 }
 typesForNodeCode.push(`}`);
 typesForNodeCode.push(``);
 typesForNodeCode.push(`export type SvelteNodeListener = {`);
 for (const nodeType of svelteNodeNames.filter((k) => !esSvelteNodeNames.includes(k))) {
 	const argType = `AST.${nodeType}`;
 	typesForNodeCode.push(`  ${nodeType}?: (node: ${argType} & ASTNodeWithParent) => void`);
+	typesForNodeCode.push(`  '${nodeType}:exit'?: (node: ${argType} & ASTNodeWithParent) => void`);
 }
 typesForNodeCode.push(`}`);