minor refactor

brillout · brillout · commit 44acc53171ee · 2024-04-10T15:27:17.000+02:00
diff --git a/packages/vike-vue/src/renderer/app.ts b/packages/vike-vue/src/renderer/app.ts
@@ -6,13 +6,18 @@ import type { PageContext } from 'vike/types'
 import { setPageContext } from '../hooks/usePageContext.js'
 import { objectAssign } from '../utils/objectAssign'
 
-async function createVueApp(pageContext: PageContext, ssr: boolean, renderHead = false): Promise<PageContextWithApp> {
-  const rootComponentRef = ref(markRaw(pageContext.config[renderHead ? 'Head' : 'Page']))
+async function createVueApp(
+  pageContext: PageContext,
+  ssr: boolean,
+  rootComponentName: 'Head' | 'Page'
+): Promise<PageContextWithApp> {
+  const rootComponentRef = ref(markRaw(pageContext.config[rootComponentName]))
   const layoutRef = ref(markRaw(pageContext.config.Layout))
 
   const PageWithLayout = defineComponent({
     render() {
-      if (!!layoutRef.value && !renderHead) {
+      if (!!layoutRef.value && rootComponentName === 'Page') {
+        // Wrap <Page> with <Layout>
         return h(layoutRef.value, {}, { default: () => h(rootComponentRef.value) })
       } else {
         return h(rootComponentRef.value)
@@ -35,7 +40,7 @@ async function createVueApp(pageContext: PageContext, ssr: boolean, renderHead =
         }
       }
       Object.assign(pageContextReactive, pageContext)
-      rootComponentRef.value = markRaw(pageContext.config[renderHead ? 'Head' : 'Page'])
+      rootComponentRef.value = markRaw(pageContext.config[rootComponentName])
       layoutRef.value = markRaw(pageContext.config.Layout)
       await nextTick()
       returned = true
diff --git a/packages/vike-vue/src/renderer/onRenderClient.ts b/packages/vike-vue/src/renderer/onRenderClient.ts
@@ -13,7 +13,7 @@ const onRenderClient: OnRenderClientAsync = async (pageContext): ReturnType<OnRe
 
     const container = document.getElementById('page-view')!
     const ssr = container.innerHTML !== ''
-    const ctxWithApp = await createVueApp(pageContext, ssr)
+    const ctxWithApp = await createVueApp(pageContext, ssr, 'Page')
     app = ctxWithApp.app
 
     await pageContext.config.onBeforeMountApp?.(ctxWithApp)
diff --git a/packages/vike-vue/src/renderer/onRenderHtml.ts b/packages/vike-vue/src/renderer/onRenderHtml.ts
@@ -23,7 +23,7 @@ const onRenderHtml: OnRenderHtmlAsync = async (pageContext): ReturnType<OnRender
 
   if (!!pageContext.Page) {
     // SSR is enabled
-    const ctxWithApp = await createVueApp(pageContext, true)
+    const ctxWithApp = await createVueApp(pageContext, true, 'Page')
     const { app } = ctxWithApp
     pageView = !pageContext.config.stream
       ? dangerouslySkipEscape(await renderToStringWithErrorHandling(app))
@@ -34,7 +34,7 @@ const onRenderHtml: OnRenderHtmlAsync = async (pageContext): ReturnType<OnRender
 
   let headHtml: ReturnType<typeof dangerouslySkipEscape> | string = ''
   if (pageContext.config.Head) {
-    const { app } = await createVueApp(pageContext, true, true)
+    const { app } = await createVueApp(pageContext, true, 'Head')
     headHtml = dangerouslySkipEscape(await renderToStringWithErrorHandling(app))
   }
 
