From b49029a861b701ddfb02686abaff36cdec3fea86 Mon Sep 17 00:00:00 2001
From: Yosuke Ota <otameshiyo23@gmail.com>
Date: Sat, 10 Jun 2023 00:54:49 +0000
Subject: [PATCH 1/2] fix: CI error with svelte v4.next.1

---
 package.json                                  | 71 +++++++++----------
 src/parser/template.ts                        |  1 +
 .../parser/ast/ts-event02-type-output.svelte  |  4 +-
 .../parser/ast/ts-event05-type-output.svelte  |  4 +-
 .../ast/ts-reactive02-type-output.svelte      |  2 +-
 .../ast/ts-reactive05-type-output.svelte      |  2 +-
 .../parser/ast/ts-store01-type-output.svelte  |  2 +-
 .../parser/ast/ts-store02-type-output.svelte  |  2 +-
 8 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/package.json b/package.json
index 9bb7e3d4..5729760e 100644
--- a/package.json
+++ b/package.json
@@ -58,54 +58,53 @@
     "espree": "^9.0.0"
   },
   "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-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": "^2.8.8",
+    "prettier-plugin-pkg": "^0.17.1",
     "prettier-plugin-svelte": "^2.10.1",
-    "rimraf": "^5.0.0",
-    "semver": "^7.3.5",
-    "svelte": "^4.0.0-0",
+    "rimraf": "^5.0.1",
+    "semver": "^7.5.1",
+    "svelte": "^4.0.0-next.1",
     "svelte2tsx": "^0.6.15",
-    "typescript": "~5.1.0",
-    "typescript-eslint-parser-for-extra-files": "^0.5.0",
-    "vue-eslint-parser": "^9.0.0"
+    "typescript": "~5.1.3",
+    "typescript-eslint-parser-for-extra-files": "^0.5.0"
   },
   "publishConfig": {
     "access": "public"
diff --git a/src/parser/template.ts b/src/parser/template.ts
index 2744e716..1a46dcac 100644
--- 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
index 701c32b5..ec2c5835 100644
--- 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-event05-type-output.svelte b/tests/fixtures/parser/ast/ts-event05-type-output.svelte
index e8fa12a4..d1c4fff9 100644
--- 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
index c8cebb0d..c9ac14b2 100644
--- 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, start?: StartStopNotifier<T> | undefined) => Writable<T>, writable: <T>(value: T, 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
index e07c688f..b5f63f1d 100644
--- 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, start?: StartStopNotifier<T> | undefined) => Writable<T>, writable: <T>(value: T, 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
index 32a67631..4942ef13 100644
--- 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, start?: StartStopNotifier<T> | undefined) => Writable<T>, writable: <T>(value: T, 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
index f77a70e1..bf0d74d1 100644
--- 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, start?: StartStopNotifier<T> | undefined) => Writable<T>, writable: <T>(value: T, 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>

From a53d56611c7cf155b4646b21a42349280d076e3b Mon Sep 17 00:00:00 2001
From: Yosuke Ota <otameshiyo23@gmail.com>
Date: Sat, 10 Jun 2023 01:03:35 +0000
Subject: [PATCH 2/2] format

---
 src/parser/template.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/parser/template.ts b/src/parser/template.ts
index 1a46dcac..0f260aee 100644
--- a/src/parser/template.ts
+++ b/src/parser/template.ts
@@ -1,4 +1,4 @@
-import type {} from "svelte" // FIXME: Workaround to get type information for "svelte/compiler"
+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";