Merge branch 'main' into postcss-style-parsing-parser-services

ota-meshi · web-flow · commit fc476cf78597 · 2023-06-10T10:07:22.000+09:00
diff --git a/.github/workflows/NodeCI.yml b/.github/workflows/NodeCI.yml
@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [14.x, 16.x, 17.x, 18.x, 19.x]
+        node-version: [16.x, 17.x, 18.x, 19.x, 20.x]
     steps:
       - uses: actions/checkout@v3
       - uses: pnpm/action-setup@v2
@@ -35,6 +35,26 @@ jobs:
         run: pnpm install
       - name: Test
         run: pnpm run test
+  test-for-svelte-v3:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [14.x]
+    steps:
+      - uses: actions/checkout@v3
+      - uses: pnpm/action-setup@v2
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: Install Svelte v3
+        run: |+
+          pnpm install -D svelte@3
+          rm -rf node_modules
+      - name: Install Packages
+        run: pnpm install
+      - name: Test
+        run: pnpm run test
   test-for-ts-eslint-v4:
     runs-on: ubuntu-latest
     strategy:
@@ -49,7 +69,7 @@ jobs:
           node-version: ${{ matrix.node-version }}
       - name: Install @typescript-eslint v4
         run: |+
-          pnpm install -D @typescript-eslint/parser@4 @typescript-eslint/eslint-plugin@4 eslint@7
+          pnpm install -D @typescript-eslint/parser@4 @typescript-eslint/eslint-plugin@4 eslint@7 svelte@3
           rm -rf node_modules
       - name: Install Packages
         run: pnpm install
@@ -69,7 +89,7 @@ jobs:
           node-version: ${{ matrix.node-version }}
       - name: Install eslint v7
         run: |+
-          pnpm install -D eslint@7
+          pnpm install -D eslint@7 svelte@3
           rm -rf node_modules
       - name: Install Packages
         run: pnpm install
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # svelte-eslint-parser
 
+## 0.30.0
+
+### Minor Changes
+
+- [#343](https://github.com/sveltejs/svelte-eslint-parser/pull/343) [`2c76b13`](https://github.com/sveltejs/svelte-eslint-parser/commit/2c76b1378bad41bf8493d06813eb28283755d570) Thanks [@ota-meshi](https://github.com/ota-meshi)! - feat: add experimental support for Svelte v4
+
 ## 0.29.0
 
 ### 💥 Breaking Changes
diff --git a/explorer-v2/src/lib/Header.svelte b/explorer-v2/src/lib/Header.svelte
@@ -14,23 +14,14 @@
 
 <header class="header">
 	<span class="title">svelte-eslint-parser</span>
-	<a
-		class="menu"
-		class:active={isActive($page.url.pathname, `/`)}
-		sveltekit:prefetch
-		href="{baseUrl}/">AST</a
-	>
+	<a class="menu" class:active={isActive($page.url.pathname, `/`)} href="{baseUrl}/">AST</a>
 	<a
 		class="menu"
 		class:active={isActive($page.url.pathname, `/playground`)}
-		sveltekit:prefetch
 		href="{baseUrl}/playground">Playgroud</a
 	>
-	<a
-		class="menu"
-		class:active={isActive($page.url.pathname, `/scope`)}
-		sveltekit:prefetch
-		href="{baseUrl}/scope">Scope</a
+	<a class="menu" class:active={isActive($page.url.pathname, `/scope`)} href="{baseUrl}/scope"
+		>Scope</a
 	>
 	<a
 		class="menu"
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "svelte-eslint-parser",
-  "version": "0.29.0",
+  "version": "0.30.0",
   "description": "Svelte parser for ESLint",
   "repository": "git+https://github.com/sveltejs/svelte-eslint-parser.git",
   "homepage": "https://github.com/sveltejs/svelte-eslint-parser#readme",
@@ -10,7 +10,7 @@
   ],
   "funding": "https://github.com/sponsors/ota-meshi",
   "license": "MIT",
-  "packageManager": "pnpm@7.32.5",
+  "packageManager": "pnpm@7.33.0",
   "engines": {
     "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
   },
@@ -45,7 +45,7 @@
     "version:ci": "env-cmd -e version-ci pnpm run build:meta && changeset version"
   },
   "peerDependencies": {
-    "svelte": "^3.37.0"
+    "svelte": "^3.37.0 || ^4.0.0-0"
   },
   "peerDependenciesMeta": {
     "svelte": {
@@ -60,55 +60,53 @@
     "postcss-scss": "^4.0.6"
   },
   "devDependencies": {
-    "@changesets/changelog-github": "^0.4.6",
-    "@changesets/cli": "^2.24.2",
-    "@changesets/get-release-plan": "^3.0.0",
-    "@ota-meshi/eslint-plugin": "^0.13.0",
-    "@types/benchmark": "^2.1.1",
-    "@types/chai": "^4.3.0",
-    "@types/eslint": "^8.0.0",
-    "@types/eslint-scope": "^3.7.0",
+    "@changesets/changelog-github": "^0.4.8",
+    "@changesets/cli": "^2.26.1",
+    "@changesets/get-release-plan": "^3.0.16",
+    "@ota-meshi/eslint-plugin": "^0.13.7",
+    "@types/benchmark": "^2.1.2",
+    "@types/chai": "^4.3.5",
+    "@types/eslint": "^8.40.1",
+    "@types/eslint-scope": "^3.7.4",
     "@types/eslint-visitor-keys": "^1.0.0",
-    "@types/estree": "^1.0.0",
-    "@types/mocha": "^10.0.0",
-    "@types/node": "^18.11.0",
-    "@types/semver": "^7.3.9",
-    "@typescript-eslint/eslint-plugin": "^5.4.0",
-    "@typescript-eslint/parser": "~5.59.0",
-    "@typescript-eslint/types": "^5.59.5",
+    "@types/estree": "^1.0.1",
+    "@types/mocha": "^10.0.1",
+    "@types/node": "^18.16.16",
+    "@types/semver": "^7.5.0",
+    "@typescript-eslint/eslint-plugin": "^5.59.9",
+    "@typescript-eslint/parser": "~5.59.9",
+    "@typescript-eslint/types": "^5.59.9",
     "benchmark": "^2.1.4",
-    "chai": "^4.3.4",
+    "chai": "^4.3.7",
     "env-cmd": "^10.1.0",
-    "esbuild": "^0.17.0",
-    "esbuild-register": "^3.3.3",
-    "eslint": "^8.2.0",
+    "esbuild": "^0.17.19",
+    "esbuild-register": "^3.4.2",
+    "eslint": "^8.42.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-eslint-comments": "^3.2.0",
-    "eslint-plugin-json-schema-validator": "^4.0.0",
-    "eslint-plugin-jsonc": "^2.0.0",
+    "eslint-plugin-json-schema-validator": "^4.5.0",
+    "eslint-plugin-jsonc": "^2.8.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-node-dependencies": "^0.11.0",
-    "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-regexp": "^1.5.0",
-    "eslint-plugin-svelte": "^2.28.0",
-    "eslint-plugin-svelte3": "^4.0.0",
-    "eslint-plugin-yml": "^1.0.0",
-    "estree-walker": "^3.0.0",
+    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-regexp": "^1.15.0",
+    "eslint-plugin-svelte": "^2.30.0",
+    "eslint-plugin-yml": "^1.7.0",
+    "estree-walker": "^3.0.3",
     "locate-character": "^2.0.5",
     "magic-string": "^0.30.0",
-    "mocha": "^10.0.0",
-    "mocha-chai-jest-snapshot": "^1.1.3",
+    "mocha": "^10.2.0",
+    "mocha-chai-jest-snapshot": "^1.1.4",
     "nyc": "^15.1.0",
-    "prettier": "^2.8.0",
-    "prettier-plugin-pkg": "^0.17.0",
-    "prettier-plugin-svelte": "^2.10.0",
-    "rimraf": "^5.0.0",
-    "semver": "^7.3.5",
-    "svelte": "^3.57.0",
-    "svelte2tsx": "^0.6.11",
-    "typescript": "~5.0.0",
-    "typescript-eslint-parser-for-extra-files": "^0.5.0",
-    "vue-eslint-parser": "^9.0.0"
+    "prettier": "^2.8.8",
+    "prettier-plugin-pkg": "^0.17.1",
+    "prettier-plugin-svelte": "^2.10.1",
+    "rimraf": "^5.0.1",
+    "semver": "^7.5.1",
+    "svelte": "^4.0.0-next.1",
+    "svelte2tsx": "^0.6.15",
+    "typescript": "~5.1.3",
+    "typescript-eslint-parser-for-extra-files": "^0.5.0"
   },
   "publishConfig": {
     "access": "public"
diff --git a/src/meta.ts b/src/meta.ts
@@ -2,4 +2,4 @@
 // This file has been automatically generated,
 // in order to update its content execute "pnpm run build:meta"
 export const name = "svelte-eslint-parser" as const;
-export const version = "0.29.0" as const;
+export const version = "0.30.0" as const;
diff --git a/src/parser/template.ts b/src/parser/template.ts
@@ -1,3 +1,4 @@
+import type {} from "svelte"; // FIXME: Workaround to get type information for "svelte/compiler"
 import { parse } from "svelte/compiler";
 import type * as SvAST from "./svelte-ast-types";
 import type { Context } from "../context";
diff --git a/tests/fixtures/parser/ast/ts-event02-type-output.svelte b/tests/fixtures/parser/ast/ts-event02-type-output.svelte
@@ -1,5 +1,5 @@
 <script lang="typescript">
-    import Component from 'foo.svelte' // Component: typeof SvelteComponentDev
+    import Component from 'foo.svelte' // Component: any
 </script>
 <button on:click="{e=>{}}"></button> <!-- e: MouseEvent & { currentTarget: EventTarget & HTMLButtonElement; } -->
-<Component on:click="{e=>{}}"></Component> <!-- Component: typeof SvelteComponentDev, e: CustomEvent<any> -->
+<Component on:click="{e=>{}}"></Component> <!-- Component: any, e: any -->
diff --git a/tests/fixtures/parser/ast/ts-event03-type-output.svelte b/tests/fixtures/parser/ast/ts-event03-type-output.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-    import {createEventDispatcher} from 'svelte' // createEventDispatcher: <EventMap extends {} = any>() => <EventKey extends Extract<keyof EventMap, string>>(type: EventKey, detail?: EventMap[EventKey] | undefined, options?: DispatchOptions | undefined) => boolean, createEventDispatcher: <EventMap extends {} = any>() => <EventKey extends Extract<keyof EventMap, string>>(type: EventKey, detail?: EventMap[EventKey] | undefined, options?: DispatchOptions | undefined) => boolean
-    const emit = createEventDispatcher<{ // emit: <EventKey extends "foo" | "bar">(type: EventKey, detail?: { foo: number; bar: string; }[EventKey] | undefined, options?: DispatchOptions | undefined) => boolean, createEventDispatcher<{ foo: number, bar: string }>(): <EventKey extends "foo" | "bar">(type: EventKey, detail?: { foo: number; bar: string; }[EventKey] | undefined, options?: DispatchOptions | undefined) => boolean
+    import {createEventDispatcher} from 'svelte' // createEventDispatcher: <EventMap extends Record<string, any> = any>() => EventDispatcher<EventMap>, createEventDispatcher: <EventMap extends Record<string, any> = any>() => EventDispatcher<EventMap>
+    const emit = createEventDispatcher<{ // emit: EventDispatcher<{ foo: number; bar: string; }>, createEventDispatcher<{ foo: number, bar: string }>(): EventDispatcher<{ foo: number; bar: string; }>
         foo: number,
         bar: string
     }>()
diff --git a/tests/fixtures/parser/ast/ts-event05-type-output.svelte b/tests/fixtures/parser/ast/ts-event05-type-output.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
-    import Component from './ts-event03-input.svelte'; // Component: typeof SvelteComponentDev
+    import Component from './ts-event03-input.svelte'; // Component: any
 </script>
 
-<Component on:foo="{e=>{ // Component: typeof SvelteComponentDev, e: CustomEvent<any>
+<Component on:foo="{e=>{ // Component: any, e: any
     // e.detail is number
     //   `@typescript-eslint/parser` doesn't get the correct types.
     //   Using `typescript-eslint-parser-for-extra-files` will give we the correct types.
diff --git a/tests/fixtures/parser/ast/ts-reactive02-type-output.svelte b/tests/fixtures/parser/ast/ts-reactive02-type-output.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { writable } from 'svelte/store'; // writable: <T>(value?: T | undefined, start?: StartStopNotifier<T> | undefined) => Writable<T>, writable: <T>(value?: T | undefined, start?: StartStopNotifier<T> | undefined) => Writable<T>
+	import { writable } from 'svelte/store'; // writable: <T_1>(value?: T_1 | undefined, start?: StartStopNotifier<T_1> | undefined) => Writable<T_1>, writable: <T_1>(value?: T_1 | undefined, start?: StartStopNotifier<T_1> | undefined) => Writable<T_1>
     let x = "hello" // x: string
     const get = ()=>"hello" // get: () => string
 
diff --git a/tests/fixtures/parser/ast/ts-reactive05-type-output.svelte b/tests/fixtures/parser/ast/ts-reactive05-type-output.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { writable } from 'svelte/store'; // writable: <T>(value?: T | undefined, start?: StartStopNotifier<T> | undefined) => Writable<T>, writable: <T>(value?: T | undefined, start?: StartStopNotifier<T> | undefined) => Writable<T>
+	import { writable } from 'svelte/store'; // writable: <T_1>(value?: T_1 | undefined, start?: StartStopNotifier<T_1> | undefined) => Writable<T_1>, writable: <T_1>(value?: T_1 | undefined, start?: StartStopNotifier<T_1> | undefined) => Writable<T_1>
 
     const a = writable(0) // a: Writable<number>, writable(0): Writable<number>
     $: aValue = $a // $: any, aValue: number, $a: number
diff --git a/tests/fixtures/parser/ast/ts-store01-type-output.svelte b/tests/fixtures/parser/ast/ts-store01-type-output.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { writable } from 'svelte/store'; // writable: <T>(value?: T | undefined, start?: StartStopNotifier<T> | undefined) => Writable<T>, writable: <T>(value?: T | undefined, start?: StartStopNotifier<T> | undefined) => Writable<T>
+	import { writable } from 'svelte/store'; // writable: <T_1>(value?: T_1 | undefined, start?: StartStopNotifier<T_1> | undefined) => Writable<T_1>, writable: <T_1>(value?: T_1 | undefined, start?: StartStopNotifier<T_1> | undefined) => Writable<T_1>
 	const a = writable(0) // a: Writable<number>, writable(0): Writable<number>
 	const b = writable(0) // b: Writable<number>, writable(0): Writable<number>
 	const $b = 'abc' // $b: "abc"
diff --git a/tests/fixtures/parser/ast/ts-store02-type-output.svelte b/tests/fixtures/parser/ast/ts-store02-type-output.svelte
@@ -1,5 +1,5 @@
 <script context="module" lang="ts">
-	import { writable } from 'svelte/store'; // writable: <T>(value?: T | undefined, start?: StartStopNotifier<T> | undefined) => Writable<T>, writable: <T>(value?: T | undefined, start?: StartStopNotifier<T> | undefined) => Writable<T>
+	import { writable } from 'svelte/store'; // writable: <T_1>(value?: T_1 | undefined, start?: StartStopNotifier<T_1> | undefined) => Writable<T_1>, writable: <T_1>(value?: T_1 | undefined, start?: StartStopNotifier<T_1> | undefined) => Writable<T_1>
 	const a = writable(0) // a: Writable<number>, writable(0): Writable<number>
 	declare const $a: string // $a: string
 </script>

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+import type {} from "svelte"; // FIXME: Workaround to get type information for "svelte/compiler"`
`1`	`2`	`import { parse } from "svelte/compiler";`
`2`	`3`	`import type * as SvAST from "./svelte-ast-types";`
`3`	`4`	`import type { Context } from "../context";`