From 537ae8f0b4615fc375c060dce9b7e76213a2ccbf Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Thu, 3 Jun 2021 15:42:37 +0100 Subject: [PATCH] fix: update types and make rendered sync --- packages/types/app/index.d.ts | 3 ++- packages/vue-app/template/server.js | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/types/app/index.d.ts b/packages/types/app/index.d.ts index 2cafa7633bf3..4d39e45754de 100644 --- a/packages/types/app/index.d.ts +++ b/packages/types/app/index.d.ts @@ -72,7 +72,7 @@ export interface Context { redirected: boolean next: NextFunction beforeRenderFns: Array<() => any> - afterRenderFns: Array<() => any> + beforeRenderHooks: Array<() => any> fetchCounters: Record nuxt: { layout: string @@ -88,6 +88,7 @@ export interface Context { error(params: NuxtError): void nuxtState: NuxtState beforeNuxtRender(fn: (params: { Components: VueRouter['getMatchedComponents'], nuxtState: NuxtState }) => void): void + beforeRender(fn: (params: { Components: VueRouter['getMatchedComponents'], nuxtState: NuxtState }) => void): void enablePreview?: (previewData?: Record) => void $preview?: Record } diff --git a/packages/vue-app/template/server.js b/packages/vue-app/template/server.js index e14daaf1b19e..fca65c068172 100644 --- a/packages/vue-app/template/server.js +++ b/packages/vue-app/template/server.js @@ -83,7 +83,7 @@ export default async (ssrContext) => { // Create ssrContext.next for simulate next() of beforeEach() when wanted to redirect ssrContext.redirected = false ssrContext.next = createNext(ssrContext) - // deprectated: Used for beforeNuxtRender({ Components, nuxtState }) + // deprecated: Used for beforeNuxtRender({ Components, nuxtState }) ssrContext.beforeRenderFns = [] // for beforeRender({ Components, nuxtState }) ssrContext.beforeRenderHooks = [] @@ -123,7 +123,7 @@ export default async (ssrContext) => { // Deprecated: Call beforeNuxtRender() methods await Promise.all(ssrContext.beforeRenderFns.map(fn => promisify(fn, { Components, nuxtState: ssrContext.nuxt }))) - ssrContext.rendered = async () => { + ssrContext.rendered = () => { // Call beforeRender() hooks ssrContext.beforeRenderHooks.forEach(fn => fn({ Components, nuxtState: ssrContext.nuxt }))