Skip to content

Commit

Permalink
rename onAfterRenderSSRApp to onAfterRenderHtml
Browse files Browse the repository at this point in the history
Signed-off-by: Chris-Robin Ennen <chris-robin@ennen.dev>
  • Loading branch information
4350pChris committed Jun 4, 2024
1 parent 68816cb commit 88e98e1
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion packages/vike-vue-pinia/renderer/+config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { Pinia, StateTree } from 'pinia'
export default {
name: 'vike-vue-pinia',
onCreateApp: 'import:vike-vue-pinia/renderer/installPinia:installPinia',
onAfterRenderSSRApp: 'import:vike-vue-pinia/renderer/dehydratePinia:dehydratePinia',
onAfterRenderHtml: 'import:vike-vue-pinia/renderer/dehydratePinia:dehydratePinia',
onBeforeRenderClient: 'import:vike-vue-pinia/renderer/hydratePinia:hydratePinia',
}

Expand Down
4 changes: 2 additions & 2 deletions packages/vike-vue-pinia/renderer/dehydratePinia.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { OnAfterRenderSSRAppSync } from 'vike-vue/types'
import type { OnAfterRenderHtmlSync } from 'vike-vue/types'

export { dehydratePinia }

const dehydratePinia: OnAfterRenderSSRAppSync = ({ pinia }): ReturnType<OnAfterRenderSSRAppSync> => {
const dehydratePinia: OnAfterRenderHtmlSync = ({ pinia }): ReturnType<OnAfterRenderHtmlSync> => {
return { piniaInitialState: pinia!.state.value }
}
2 changes: 1 addition & 1 deletion packages/vike-vue-query/renderer/+config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { DehydratedState, QueryClient, QueryClientConfig } from '@tanstack/
export default {
name: 'vike-vue-query',
onCreateApp: 'import:vike-vue-query/renderer/installVueQuery:installVueQuery',
onAfterRenderSSRApp: 'import:vike-vue-query/renderer/dehydrateVueQuery:dehydrateVueQuery',
onAfterRenderHtml: 'import:vike-vue-query/renderer/dehydrateVueQuery:dehydrateVueQuery',
onBeforeRenderClient: 'import:vike-vue-query/renderer/hydrateVueQuery:hydrateVueQuery',
meta: {
queryClientConfig: {
Expand Down
4 changes: 2 additions & 2 deletions packages/vike-vue-query/renderer/dehydrateVueQuery.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { dehydrate } from '@tanstack/vue-query'
import type { OnAfterRenderSSRAppSync } from 'vike-vue/types'
import type { OnAfterRenderHtmlSync } from 'vike-vue/types'

export { dehydrateVueQuery }

const dehydrateVueQuery: OnAfterRenderSSRAppSync = ({ queryClient }): ReturnType<OnAfterRenderSSRAppSync> => {
const dehydrateVueQuery: OnAfterRenderHtmlSync = ({ queryClient }): ReturnType<OnAfterRenderHtmlSync> => {
return { vueQueryInitialState: dehydrate(queryClient!) }
}
2 changes: 1 addition & 1 deletion packages/vike-vue/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ Vike and Vue.
`vike-vue` introduces the following new hooks:
* [`onCreateApp()`](https://vike.dev/onCreateApp): Allows you to extend the Vue app, typically for registering a Vue
plugin.
* `onAfterRenderSSRApp()`: Called right after rendering the app on the server. Usually used for dehydration of state management libraries.
* `onAfterRenderHtml()`: Called right after rendering the app on the server. Usually used for dehydration of state management libraries.
* `onBeforeRenderClient()`: Called before mounting the app on the client. Usually used for hydration of state management libraries.

## Settings
Expand Down
8 changes: 4 additions & 4 deletions packages/vike-vue/src/+config.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type {
OnCreateAppSync,
OnCreateAppAsync,
OnAfterRenderSSRAppSync,
OnAfterRenderSSRAppAsync,
OnAfterRenderHtmlSync,
OnAfterRenderHtmlAsync,
OnBeforeRenderClientSync,
OnBeforeRenderClientAsync,
} from './hooks/types'
Expand Down Expand Up @@ -85,7 +85,7 @@ export default {
env: { server: true, client: true },
cumulative: true,
},
onAfterRenderSSRApp: {
onAfterRenderHtml: {
env: { server: true },
cumulative: true,
},
Expand Down Expand Up @@ -169,7 +169,7 @@ declare global {
*
* Typically used for dehydrating state management libraries.
*/
onAfterRenderSSRApp?: OnAfterRenderSSRAppSync | OnAfterRenderSSRAppAsync
onAfterRenderHtml?: OnAfterRenderHtmlSync | OnAfterRenderHtmlAsync

/**
* Hook called right before mounting the page's root Vue component.
Expand Down
8 changes: 4 additions & 4 deletions packages/vike-vue/src/hooks/types.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
export type {
OnCreateAppSync,
OnCreateAppAsync,
OnAfterRenderSSRAppSync,
OnAfterRenderSSRAppAsync,
OnAfterRenderHtmlSync,
OnAfterRenderHtmlAsync,
OnBeforeRenderClientSync,
OnBeforeRenderClientAsync,
}
Expand Down Expand Up @@ -34,14 +34,14 @@ type OnCreateAppAsync = (pageContext: PageContextWithApp) => Promise<void>
*
* Typically used for dehydrating state management libraries.
*/
type OnAfterRenderSSRAppSync = (pageContext: PageContext) => PageContext['fromHtmlRenderer']
type OnAfterRenderHtmlSync = (pageContext: PageContext) => PageContext['fromHtmlRenderer']
/**
* Hook called right after rendering the page's root Vue component.
* The hook can return additional page context that will be passed to the client under `pageContext.fromHtmlRenderer`.
*
* Typically used for dehydrating state management libraries.
*/
type OnAfterRenderSSRAppAsync = (pageContext: PageContext) => Promise<PageContext['fromHtmlRenderer']>
type OnAfterRenderHtmlAsync = (pageContext: PageContext) => Promise<PageContext['fromHtmlRenderer']>

/**
* Hook called right before mounting the page's root Vue component.
Expand Down
2 changes: 1 addition & 1 deletion packages/vike-vue/src/renderer/onRenderHtml.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const onRenderHtml: OnRenderHtmlAsync = async (pageContext): ReturnType<OnRender
? dangerouslySkipEscape(await renderToStringWithErrorHandling(app))
: renderToNodeStreamWithErrorHandling(app)

const afterRenderResults = await callCumulativeHooks(pageContext.config.onAfterRenderSSRApp, pageContext)
const afterRenderResults = await callCumulativeHooks(pageContext.config.onAfterRenderHtml, pageContext)

Object.assign(fromHtmlRenderer, ...afterRenderResults)
}
Expand Down
6 changes: 3 additions & 3 deletions packages/vike-vue/src/types/PageContext.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ export type { Component }

import type { App, defineComponent } from 'vue'
import type {
OnAfterRenderSSRAppAsync,
OnAfterRenderSSRAppSync,
OnAfterRenderHtmlAsync,
OnAfterRenderHtmlSync,
OnBeforeRenderClientAsync,
OnBeforeRenderClientSync,
OnCreateAppAsync,
Expand All @@ -27,7 +27,7 @@ declare global {
}
interface ConfigResolved {
onCreateApp?: Array<OnCreateAppSync | OnCreateAppAsync>
onAfterRenderSSRApp?: Array<OnAfterRenderSSRAppSync | OnAfterRenderSSRAppAsync>
onAfterRenderHtml?: Array<OnAfterRenderHtmlSync | OnAfterRenderHtmlAsync>
onBeforeRenderClient?: Array<OnBeforeRenderClientSync | OnBeforeRenderClientAsync>
}
}
Expand Down

0 comments on commit 88e98e1

Please sign in to comment.