rename hydrate / dehydrate hooks

Signed-off-by: Chris-Robin Ennen <[email protected]>
HillwoodPark · Jan 15, 2024 · dd9274d · dd9274d
1 parent 9104ecf
commit dd9274d
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/packages/vike-pinia/renderer/+config.ts b/packages/vike-pinia/renderer/+config.ts
@@ -2,8 +2,8 @@ import type { Pinia } from 'pinia'
 
 export default {
   onCreateApp: 'import:vike-pinia/renderer/installPinia:installPinia',
-  dehydrateStore: 'import:vike-pinia/renderer/dehydratePinia:dehydratePinia',
-  hydrateStore: 'import:vike-pinia/renderer/hydratePinia:hydratePinia',
+  onAfterRenderSSRApp: 'import:vike-pinia/renderer/dehydratePinia:dehydratePinia',
+  onBeforeMountApp: 'import:vike-pinia/renderer/hydratePinia:hydratePinia',
 }
 
 declare global {

diff --git a/packages/vike-pinia/renderer/dehydratePinia.ts b/packages/vike-pinia/renderer/dehydratePinia.ts
@@ -1,8 +1,8 @@
-import type { DehydrateStore } from 'vike-vue';
+import type { OnAfterRenderSSRApp } from 'vike-vue';
 
 export { dehydratePinia }
 
-const dehydratePinia: DehydrateStore = ({ pinia }): ReturnType<DehydrateStore> => {
+const dehydratePinia: OnAfterRenderSSRApp = ({ pinia }): ReturnType<OnAfterRenderSSRApp> => {
   if (!pinia) {
     console.warn("[vike-pinia] Missing pinia from pageContext. Did you forget to use `installPinia()` in `+onCreateApp()`?")
     return

diff --git a/packages/vike-pinia/renderer/hydratePinia.ts b/packages/vike-pinia/renderer/hydratePinia.ts
@@ -1,8 +1,8 @@
-import type { HydrateStore } from 'vike-vue'
+import type { OnBeforeMountApp } from 'vike-vue'
 
 export { hydratePinia }
 
-const hydratePinia: HydrateStore = ({ pinia, initialStoreState }): ReturnType<HydrateStore> => {
+const hydratePinia: OnBeforeMountApp = ({ pinia, initialStoreState }): ReturnType<OnBeforeMountApp> => {
   if (!pinia) {
     console.warn("[vike-pinia] Missing pinia from pageContext. Did you forget to use `installPinia()` in `+onCreateApp()`?")
     return

diff --git a/vike-vue/renderer/+config.ts b/vike-vue/renderer/+config.ts
@@ -1,6 +1,6 @@
 export type { OnCreateAppSync }
 export type { OnCreateAppAsync }
-export type { DehydrateStore, HydrateStore }
+export type { OnAfterRenderSSRApp, OnBeforeMountApp }
 
 import type { Config, ConfigEffect, PageContext } from 'vike/types'
 import type { Component, PageContextWithApp } from './types'
@@ -28,9 +28,9 @@ type OnCreateAppSync = (pageContext: PageContextWithApp) => void
  */
 type OnCreateAppAsync = (pageContext: PageContextWithApp) => Promise<void>
 
-type DehydrateStore = (pageContext: PageContextWithApp) => any
+type OnAfterRenderSSRApp = (pageContext: PageContextWithApp) => any
 
-type HydrateStore = (pageContext: PageContextWithApp) => void
+type OnBeforeMountApp = (pageContext: PageContextWithApp) => void
 
 // Depending on the value of `config.meta.ssr`, set other config options' `env`
 // accordingly.
@@ -106,10 +106,10 @@ export default {
     onCreateApp: {
       env: { server: true, client: true }
     },
-    dehydrateStore: {
+    onAfterRenderSSRApp: {
       env: { server: true }
     },
-    hydrateStore: {
+    onBeforeMountApp: {
       env: { server: false, client: true }
     },
   }
@@ -182,9 +182,9 @@ declare global {
        */
       onCreateApp?: OnCreateAppSync | OnCreateAppAsync
 
-      dehydrateStore?: DehydrateStore
+      onAfterRenderSSRApp?: OnAfterRenderSSRApp
 
-      hydrateStore?: HydrateStore
+      onBeforeMountApp?: OnBeforeMountApp
     }
   }
 }

diff --git a/vike-vue/renderer/onRenderClient.ts b/vike-vue/renderer/onRenderClient.ts
@@ -17,7 +17,7 @@ const onRenderClient: OnRenderClientAsync = async (pageContext): ReturnType<OnRe
     const ctxWithApp = createVueApp(pageContext, ssr)
     app = ctxWithApp.app
 
-    pageContext.config.hydrateStore?.(ctxWithApp)
+    pageContext.config.onBeforeMountApp?.(ctxWithApp)
 
     app.mount(container)
   } else {

diff --git a/vike-vue/renderer/onRenderHtml.ts b/vike-vue/renderer/onRenderHtml.ts
@@ -24,7 +24,7 @@ const onRenderHtml: OnRenderHtmlAsync = async (pageContext): ReturnType<OnRender
       ? dangerouslySkipEscape(await renderToStringWithErrorHandling(app))
       : renderToNodeStreamWithErrorHandling(app)
 
-    storeState = pageContext.config.dehydrateStore?.(ctxWithApp)
+    storeState = pageContext.config.onAfterRenderSSRApp?.(ctxWithApp)
   }
 
   const title = getTitle(pageContext)