[Svelte] Fix SSR for Svelte 5 build 179+

jamesst20 · Sep 4, 2024 · c8493ab · c8493ab
1 parent 7d04716
commit c8493ab
Show file tree

Hide file tree

Showing 5 changed files with 191 additions and 197 deletions.
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
@@ -41,7 +41,7 @@
     "@types/lodash": "^4.17.7",
     "axios": "^1.7.6",
     "publint": "^0.2.10",
-    "svelte": "5.0.0-next.178",
+    "svelte": "5.0.0-next.243",
     "svelte-check": "^3.8.6",
     "tslib": "^2.7.0",
     "typescript": "^5.5.4",
@@ -62,6 +62,7 @@
   "type": "module",
   "dependencies": {
     "@jamesst20/inertia-core": "workspace:*",
+    "html-entities": "^2.5.2",
     "lodash": "^4.17.21"
   }
 }
diff --git a/packages/svelte/src/lib/components/SSR.svelte b/packages/svelte/src/lib/components/SSR.svelte
diff --git a/packages/svelte/src/lib/createInertiaApp.ts b/packages/svelte/src/lib/createInertiaApp.ts
@@ -1,10 +1,10 @@
 import { router, setupProgress, type InertiaAppResponse, type Page } from '@jamesst20/inertia-core'
+import { encode } from 'html-entities'
 import type { ComponentType } from 'svelte'
+import { render } from 'svelte/server'
 import App from './components/App.svelte'
-import SSR, { type SSRProps } from './components/SSR.svelte'
 import store from './store.svelte'
 import type { ComponentResolver, ResolvedComponent } from './types'
-import { render } from 'svelte/server'
 
 interface CreateInertiaAppProps {
   id?: string
@@ -46,10 +46,10 @@ export default async function createInertiaApp({
   })
 
   if (isServer) {
-    const { html, head } = render(SSR, { props: { id, initialPage } as SSRProps})
+    const { html, head } = render(App, {})
 
     return {
-      body: html,
+      body: `<div data-server-rendered="true" id="${id}" data-page="${encode(JSON.stringify(initialPage))}">${html}</div>`,
       head: [head],
     }
   }

diff --git a/playgrounds/svelte/package.json b/playgrounds/svelte/package.json
@@ -15,7 +15,7 @@
     "laravel-vite-plugin": "^1.0.5",
     "lodash": "^4.17.21",
     "postcss": "^8.4.42",
-    "svelte": "5.0.0-next.178",
+    "svelte": "5.0.0-next.243",
     "svelte-check": "^3.8.6",
     "tailwindcss": "^3.4.10",
     "tslib": "^2.7.0",