From 35dd29c80a9a4985fee252cc767f4414b857b555 Mon Sep 17 00:00:00 2001 From: Anthony Fu Date: Thu, 21 Apr 2022 15:48:47 +0800 Subject: [PATCH 1/2] fix: await for router.push on SSR --- packages/nuxt/src/pages/runtime/router.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/nuxt/src/pages/runtime/router.ts b/packages/nuxt/src/pages/runtime/router.ts index 9b3e6d68542..ea687392ca2 100644 --- a/packages/nuxt/src/pages/runtime/router.ts +++ b/packages/nuxt/src/pages/runtime/router.ts @@ -167,13 +167,13 @@ export default defineNuxtPlugin((nuxtApp) => { }) if (process.server) { - router.push(nuxtApp.ssrContext.url) - router.afterEach(async (to) => { if (to.fullPath !== nuxtApp.ssrContext.url) { await navigateTo(to.fullPath) } }) + + await router.push(nuxtApp.ssrContext.url) } try { From 45e3f771d0fc366b73c09975cb0b91c8102a2868 Mon Sep 17 00:00:00 2001 From: Anthony Fu Date: Thu, 21 Apr 2022 18:24:40 +0800 Subject: [PATCH 2/2] chore: update --- packages/nuxt/src/pages/runtime/router.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/nuxt/src/pages/runtime/router.ts b/packages/nuxt/src/pages/runtime/router.ts index ea687392ca2..9a7f90ad891 100644 --- a/packages/nuxt/src/pages/runtime/router.ts +++ b/packages/nuxt/src/pages/runtime/router.ts @@ -172,11 +172,13 @@ export default defineNuxtPlugin((nuxtApp) => { await navigateTo(to.fullPath) } }) - - await router.push(nuxtApp.ssrContext.url) } try { + if (process.server) { + await router.push(nuxtApp.ssrContext.url) + } + await router.isReady() } catch (error) { callWithNuxt(nuxtApp, throwError, [error])