Svelte: Don't resolve component twice on first load

inertiajs · Apr 19, 2024 · 9c148e2 · 9c148e2
1 parent ca7e7cb
commit 9c148e2
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/packages/svelte/src/createInertiaApp.js b/packages/svelte/src/createInertiaApp.js
@@ -9,13 +9,6 @@ export default async function createInertiaApp({ id = 'app', resolve, setup, pro
   const initialPage = page || JSON.parse(el.dataset.page)
   const resolveComponent = (name) => Promise.resolve(resolve(name))
 
-  await resolveComponent(initialPage.component).then((initialComponent) => {
-    store.set({
-      component: initialComponent,
-      page: initialPage,
-    })
-  })
-
   if (!isServer) {
     router.init({
       initialPage,
@@ -44,6 +37,13 @@ export default async function createInertiaApp({ id = 'app', resolve, setup, pro
   }
 
   if (isServer) {
+    await resolveComponent(initialPage.component).then((initialComponent) => {
+      store.set({
+        component: initialComponent,
+        page: initialPage,
+      })
+    })
+
     const { html, head } = SSR.render({ id, initialPage })
 
     return {