From 46ecbc558d22c2beae7fddce339cf6050b2d65fa Mon Sep 17 00:00:00 2001
From: Anthony Fu <anthonyfu117@hotmail.com>
Date: Fri, 22 Apr 2022 23:37:52 +0800
Subject: [PATCH] fix(nuxt): await for `router.push` on ssr (#4491)

---
 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 9b3e6d6854..9a7f90ad89 100644
--- a/packages/nuxt/src/pages/runtime/router.ts
+++ b/packages/nuxt/src/pages/runtime/router.ts
@@ -167,8 +167,6 @@ 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)
@@ -177,6 +175,10 @@ export default defineNuxtPlugin((nuxtApp) => {
     }
 
     try {
+      if (process.server) {
+        await router.push(nuxtApp.ssrContext.url)
+      }
+
       await router.isReady()
     } catch (error) {
       callWithNuxt(nuxtApp, throwError, [error])