QA: Move the if server up

inertiajs · Jul 31, 2024 · 12b689a · 12b689a
1 parent ede5f25
commit 12b689a
Showing 1 changed file with 29 additions and 31 deletions.
diff --git a/packages/svelte/src/lib/createInertiaApp.ts b/packages/svelte/src/lib/createInertiaApp.ts
@@ -49,37 +49,6 @@ export default async function createInertiaApp({
     })
   })
 
-  if (!isServer) {
-    if (!el) {
-      throw new Error(`Element with ID "${id}" not found.`)
-    }
-
-    router.init({
-      initialPage,
-      resolveComponent,
-      swapComponent: async ({ component, page, preserveState }) => {
-        store.update((current) => ({
-          component: component as ResolvedComponent,
-          page,
-          key: preserveState ? current.key : Date.now(),
-        }))
-      },
-    })
-
-    if (progress) {
-      setupProgress(progress)
-    }
-
-    setup({
-      el,
-      App,
-      props: {
-        initialPage,
-        resolveComponent,
-      },
-    })
-  }
-
   if (isServer) {
     const { html, head, css } = (SSR as SSRComponent).render({ id, initialPage })
 
@@ -88,4 +57,33 @@ export default async function createInertiaApp({
       head: [head, `<style data-vite-css>${css.code}</style>`],
     }
   }
+
+  if (!el) {
+    throw new Error(`Element with ID "${id}" not found.`)
+  }
+
+  router.init({
+    initialPage,
+    resolveComponent,
+    swapComponent: async ({ component, page, preserveState }) => {
+      store.update((current) => ({
+        component: component as ResolvedComponent,
+        page,
+        key: preserveState ? current.key : Date.now(),
+      }))
+    },
+  })
+
+  if (progress) {
+    setupProgress(progress)
+  }
+
+  setup({
+    el,
+    App,
+    props: {
+      initialPage,
+      resolveComponent,
+    },
+  })
 }