fix: adjust generated +layout.svelte file contents (#2580)

YpsilonTM · dummdidumm · web-flow · commit bf1b8ef01eaa · 2024-11-11T15:22:14.000+01:00
---------

Co-authored-by: Simon H &lt;5968653+dummdidumm@users.noreply.github.com&gt;
diff --git a/packages/svelte-vscode/src/sveltekit/generateFiles/templates/layout.ts b/packages/svelte-vscode/src/sveltekit/generateFiles/templates/layout.ts
@@ -5,29 +5,38 @@ const defaultScriptTemplate = `
     /** @type {import('./$types').LayoutData} */
     export let data;
 </script>
+
+<slot />
 `;
 
 const tsSv5ScriptTemplate = `
 <script lang="ts">
+    import type { Snippet } from 'svelte';
     import type { LayoutData } from './$types';
-    
-    let { data }: LayoutData = $props();
+
+    let { data, children }: { data: LayoutData, children: Snippet } = $props();
 </script>
+
+{@render children()}
 `;
 
 const tsScriptTemplate = `
 <script lang="ts">
     import type { LayoutData } from './$types';
-    
+
     export let data: LayoutData;
 </script>
+
+<slot />
 `;
 
 const jsSv5ScriptTemplate = `
 <script>
-    /** @type {import('./$types').LayoutData} */
-    let { data } = $props();
+    /** @type {{ data: import('./$types').LayoutData, children: import('svelte').Snippet }} */
+    let { data, children } = $props();
 </script>
+
+{@render children()}
 `;
 
 const scriptTemplate: ReadonlyMap<ProjectType, string> = new Map([
diff --git a/packages/svelte-vscode/src/sveltekit/generateFiles/templates/page.ts b/packages/svelte-vscode/src/sveltekit/generateFiles/templates/page.ts
@@ -10,22 +10,22 @@ const defaultScriptTemplate = `
 const tsSv5ScriptTemplate = `
 <script lang="ts">
     import type { PageData } from './$types';
-    
-    let { data }: PageData = $props();
+
+    let { data }: { data: PageData } = $props();
 </script>
 `;
 
 const tsScriptTemplate = `
 <script lang="ts">
     import type { PageData } from './$types';
-    
+
     export let data: PageData;
 </script>
 `;
 
 const jsSv5ScriptTemplate = `
 <script>
-    /** @type {import('./$types').PageData} */
+    /** @type {{ data: import('./$types').PageData }} */
     let { data } = $props();
 </script>
 `;
