bug: SSR page data not escaped correctly

iksaku · May 21, 2023 · 42cc11a · 42cc11a
1 parent fd077e8
commit 42cc11a
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/createInertiaApp.ts b/src/createInertiaApp.ts
@@ -1,6 +1,6 @@
 import { Page, PageResolver, setupProgress } from '@inertiajs/core'
 import { renderTags } from '@solidjs/meta'
-import { createComponent, generateHydrationScript, isServer, renderToString } from 'solid-js/web'
+import { Dynamic, createComponent, generateHydrationScript, isServer, renderToString } from 'solid-js/web'
 import App, { InertiaAppProps } from './App'
 
 type CreateInertiaBaseOptions = {
@@ -54,9 +54,14 @@ export default async function createInertiaApp({
   }
 
   if (isServer) {
-    const body = `<div id='${id}' data-page='${JSON.stringify(initialPage)}'>${renderToString(() =>
-      createComponent(App, props),
-    )}</div>`
+    const body = renderToString(() =>
+      createComponent(Dynamic, {
+        component: 'div',
+        children: createComponent(App, props),
+        id,
+        'data-page': JSON.stringify(initialPage),
+      }),
+    )
 
     const head = renderTags(props.head).concat(generateHydrationScript())