From 1c483c2b61b651ffac9bd1cff6f1639de796d080 Mon Sep 17 00:00:00 2001
From: Oleg Polin <140200108+olegpolin@users.noreply.github.com>
Date: Sun, 3 Aug 2025 04:56:59 -0400
Subject: [PATCH 1/7] Update +error.svelte creation syntax (#2810)

---
 .../src/sveltekit/generateFiles/templates/error.ts        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/svelte-vscode/src/sveltekit/generateFiles/templates/error.ts b/packages/svelte-vscode/src/sveltekit/generateFiles/templates/error.ts
index 1a6407cc6..d4dd8421a 100644
--- a/packages/svelte-vscode/src/sveltekit/generateFiles/templates/error.ts
+++ b/packages/svelte-vscode/src/sveltekit/generateFiles/templates/error.ts
@@ -2,18 +2,18 @@ import { GenerateConfig, Resource } from '../types';
 
 const defaultScriptTemplate = `
 <script>
-    import { page } from '$app/stores';
+    import { page } from '$app/state';
 </script>
 
-<h1>{$page.status}: {$page.error.message}</h1>
+<h1>{page.status}: {page.error.message}</h1>
 `;
 
 const tsScriptTemplate = `
 <script lang="ts">
-    import { page } from '$app/stores';
+    import { page } from '$app/state';
 </script>
 
-<h1>{$page.status}: {$page.error?.message}</h1>
+<h1>{page.status}: {page.error?.message}</h1>
 `;
 
 export default async function (config: GenerateConfig): ReturnType<Resource['generate']> {

From e01100f6f53de2f224c2f0c5b4f786ec8f6b68cc Mon Sep 17 00:00:00 2001
From: Oleg Polin <140200108+olegpolin@users.noreply.github.com>
Date: Sun, 3 Aug 2025 05:37:40 -0400
Subject: [PATCH 2/7] Add Svelte 5 variants to +error.svelte creation syntax
 template (#2810)

---
 .../generateFiles/templates/error.ts          | 26 +++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/packages/svelte-vscode/src/sveltekit/generateFiles/templates/error.ts b/packages/svelte-vscode/src/sveltekit/generateFiles/templates/error.ts
index d4dd8421a..2fe7dd55e 100644
--- a/packages/svelte-vscode/src/sveltekit/generateFiles/templates/error.ts
+++ b/packages/svelte-vscode/src/sveltekit/generateFiles/templates/error.ts
@@ -1,6 +1,14 @@
 import { GenerateConfig, Resource } from '../types';
 
 const defaultScriptTemplate = `
+<script>
+    import { page } from '$app/stores';
+</script>
+
+<h1>{$page.status}: {$page.error.message}</h1>
+`;
+
+const jsSv5ScriptTemplate = `
 <script>
     import { page } from '$app/state';
 </script>
@@ -9,6 +17,14 @@ const defaultScriptTemplate = `
 `;
 
 const tsScriptTemplate = `
+<script lang="ts">
+    import { page } from '$app/stores';
+</script>
+
+<h1>{$page.status}: {$page.error?.message}</h1>
+`;
+
+const tsSv5ScriptTemplate = `
 <script lang="ts">
     import { page } from '$app/state';
 </script>
@@ -17,11 +33,17 @@ const tsScriptTemplate = `
 `;
 
 export default async function (config: GenerateConfig): ReturnType<Resource['generate']> {
-    const { withTs } = config.kind;
+    const { withRunes, withTs } = config.kind;
     let template = defaultScriptTemplate;
 
-    if (withTs) {
+    if (withRunes && withTs) {
+        template = tsSv5ScriptTemplate;
+    } else if (withRunes && !withTs) {
+        template = jsSv5ScriptTemplate;
+    } else if (!withRunes && withTs) {
         template = tsScriptTemplate;
+    } else if (!withRunes && !withTs) {
+        template = defaultScriptTemplate;
     }
 
     return template.trim();

From 6ca7a8971d343ec1dff1599ad9cbf98d1cb52330 Mon Sep 17 00:00:00 2001
From: Oleg Polin <140200108+olegpolin@users.noreply.github.com>
Date: Mon, 11 Aug 2025 09:18:50 -0400
Subject: [PATCH 3/7] Change withRunes to withProps in +error.svelte template

---
 .../sveltekit/generateFiles/templates/error.ts | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/svelte-vscode/src/sveltekit/generateFiles/templates/error.ts b/packages/svelte-vscode/src/sveltekit/generateFiles/templates/error.ts
index 2fe7dd55e..c8e667032 100644
--- a/packages/svelte-vscode/src/sveltekit/generateFiles/templates/error.ts
+++ b/packages/svelte-vscode/src/sveltekit/generateFiles/templates/error.ts
@@ -8,7 +8,7 @@ const defaultScriptTemplate = `
 <h1>{$page.status}: {$page.error.message}</h1>
 `;
 
-const jsSv5ScriptTemplate = `
+const jsSv5ScriptTemplateProps = `
 <script>
     import { page } from '$app/state';
 </script>
@@ -24,7 +24,7 @@ const tsScriptTemplate = `
 <h1>{$page.status}: {$page.error?.message}</h1>
 `;
 
-const tsSv5ScriptTemplate = `
+const tsSv5ScriptTemplateProps = `
 <script lang="ts">
     import { page } from '$app/state';
 </script>
@@ -33,16 +33,16 @@ const tsSv5ScriptTemplate = `
 `;
 
 export default async function (config: GenerateConfig): ReturnType<Resource['generate']> {
-    const { withRunes, withTs } = config.kind;
+    const { withTs, withProps } = config.kind;
     let template = defaultScriptTemplate;
 
-    if (withRunes && withTs) {
-        template = tsSv5ScriptTemplate;
-    } else if (withRunes && !withTs) {
-        template = jsSv5ScriptTemplate;
-    } else if (!withRunes && withTs) {
+    if (withProps && withTs) {
+        template = tsSv5ScriptTemplateProps;
+    } else if (withProps && !withTs) {
+        template = jsSv5ScriptTemplateProps;
+    } else if (!withProps && withTs) {
         template = tsScriptTemplate;
-    } else if (!withRunes && !withTs) {
+    } else if (!withProps && !withTs) {
         template = defaultScriptTemplate;
     }
 

From 23fd576154bdc6879110cbd6dcd993bc78711a1f Mon Sep 17 00:00:00 2001
From: Oleg Polin <140200108+olegpolin@users.noreply.github.com>
Date: Mon, 11 Aug 2025 10:03:34 -0400
Subject: [PATCH 4/7] Add withAppState option

---
 packages/svelte-vscode/src/sveltekit/utils.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/svelte-vscode/src/sveltekit/utils.ts b/packages/svelte-vscode/src/sveltekit/utils.ts
index cce8e2de9..bea80aa6d 100644
--- a/packages/svelte-vscode/src/sveltekit/utils.ts
+++ b/packages/svelte-vscode/src/sveltekit/utils.ts
@@ -47,6 +47,13 @@ export async function checkProjectKind(path: string): Promise<GenerateConfig['ki
         fallback: true
     });
 
+    let withAppState = atLeast({
+        packageName: '@sveltejs/kit',
+        versionMin: '2.12',
+        versionToCheck: svelteKitVersion ?? '',
+        fallback: true
+    });
+
     const withTs = !!tsconfig && (!jsconfig || tsconfig.length >= jsconfig.length);
     let withSatisfies = false;
     if (withTs) {
@@ -70,7 +77,8 @@ export async function checkProjectKind(path: string): Promise<GenerateConfig['ki
         withTs,
         withSatisfies,
         withRunes,
-        withProps
+        withProps,
+        withAppState,
     };
 }
 

From abec8d70b9e14d04277a3e2af64f68761891795f Mon Sep 17 00:00:00 2001
From: Oleg Polin <140200108+olegpolin@users.noreply.github.com>
Date: Mon, 11 Aug 2025 10:07:21 -0400
Subject: [PATCH 5/7] Change withRunes to withAppState in +error.svelte
 template

---
 .../sveltekit/generateFiles/templates/error.ts | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/svelte-vscode/src/sveltekit/generateFiles/templates/error.ts b/packages/svelte-vscode/src/sveltekit/generateFiles/templates/error.ts
index c8e667032..b8afe9476 100644
--- a/packages/svelte-vscode/src/sveltekit/generateFiles/templates/error.ts
+++ b/packages/svelte-vscode/src/sveltekit/generateFiles/templates/error.ts
@@ -8,7 +8,7 @@ const defaultScriptTemplate = `
 <h1>{$page.status}: {$page.error.message}</h1>
 `;
 
-const jsSv5ScriptTemplateProps = `
+const jsSv5ScriptTemplateAppState = `
 <script>
     import { page } from '$app/state';
 </script>
@@ -24,7 +24,7 @@ const tsScriptTemplate = `
 <h1>{$page.status}: {$page.error?.message}</h1>
 `;
 
-const tsSv5ScriptTemplateProps = `
+const tsSv5ScriptTemplateAppState = `
 <script lang="ts">
     import { page } from '$app/state';
 </script>
@@ -33,16 +33,16 @@ const tsSv5ScriptTemplateProps = `
 `;
 
 export default async function (config: GenerateConfig): ReturnType<Resource['generate']> {
-    const { withTs, withProps } = config.kind;
+    const { withTs, withAppState } = config.kind;
     let template = defaultScriptTemplate;
 
-    if (withProps && withTs) {
-        template = tsSv5ScriptTemplateProps;
-    } else if (withProps && !withTs) {
-        template = jsSv5ScriptTemplateProps;
-    } else if (!withProps && withTs) {
+    if (withAppState && withTs) {
+        template = tsSv5ScriptTemplateAppState;
+    } else if (withAppState && !withTs) {
+        template = jsSv5ScriptTemplateAppState;
+    } else if (!withAppState && withTs) {
         template = tsScriptTemplate;
-    } else if (!withProps && !withTs) {
+    } else if (!withAppState && !withTs) {
         template = defaultScriptTemplate;
     }
 

From 1f0d99d97b17a8b655bb54ddd527d71cd5036e1b Mon Sep 17 00:00:00 2001
From: Oleg Polin <140200108+olegpolin@users.noreply.github.com>
Date: Mon, 11 Aug 2025 10:09:11 -0400
Subject: [PATCH 6/7] Remove trailing comma

---
 packages/svelte-vscode/src/sveltekit/utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/svelte-vscode/src/sveltekit/utils.ts b/packages/svelte-vscode/src/sveltekit/utils.ts
index bea80aa6d..b08740638 100644
--- a/packages/svelte-vscode/src/sveltekit/utils.ts
+++ b/packages/svelte-vscode/src/sveltekit/utils.ts
@@ -78,7 +78,7 @@ export async function checkProjectKind(path: string): Promise<GenerateConfig['ki
         withSatisfies,
         withRunes,
         withProps,
-        withAppState,
+        withAppState
     };
 }
 

From 81355344ca4b660ca945fde0f08ecb359d4f0827 Mon Sep 17 00:00:00 2001
From: Oleg Polin <140200108+olegpolin@users.noreply.github.com>
Date: Mon, 11 Aug 2025 10:52:02 -0400
Subject: [PATCH 7/7] Add type for withAppState

---
 packages/svelte-vscode/src/sveltekit/generateFiles/types.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/svelte-vscode/src/sveltekit/generateFiles/types.ts b/packages/svelte-vscode/src/sveltekit/generateFiles/types.ts
index 978e4dc2c..21d8f5a94 100644
--- a/packages/svelte-vscode/src/sveltekit/generateFiles/types.ts
+++ b/packages/svelte-vscode/src/sveltekit/generateFiles/types.ts
@@ -39,6 +39,7 @@ export interface GenerateConfig {
         withSatisfies: boolean;
         withRunes: boolean;
         withProps: boolean;
+        withAppState: boolean;
     };
     pageExtension: string;
     scriptExtension: string;