fix: loop redirection (nuxt-modules#1854)

rhbgdhvx · Feb 12, 2023 · 225e0b6 · 225e0b6
1 parent 9e32424
commit 225e0b6
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/src/runtime/utils.ts b/src/runtime/utils.ts
@@ -371,16 +371,24 @@ export async function navigate<Context extends NuxtApp = NuxtApp>(
   let { redirectPath } = args
 
   __DEBUG__ && console.log('navigate options ', status, rootRedirect, differentDomains, skipSettingLocaleOnNavigate)
+  __DEBUG__ && console.log('navigate isSSG', isSSG)
 
   if (route.path === '/' && rootRedirect) {
     if (isString(rootRedirect)) {
-      redirectPath = rootRedirect
+      redirectPath = '/' + rootRedirect
     } else if (isRootRedirectOptions(rootRedirect)) {
       redirectPath = '/' + rootRedirect.path
       status = rootRedirect.statusCode
     }
     __DEBUG__ && console.log('navigate: rootRedirect mode redirectPath -> ', redirectPath, ' status -> ', status)
-    return navigateTo(redirectPath, { redirectCode: status })
+    if (isSSG && process.client) {
+      if (window.location.pathname !== redirectPath) {
+        window.location.assign(redirectPath)
+      }
+      return
+    } else {
+      return navigateTo(redirectPath, { redirectCode: status })
+    }
   }
 
   if (process.client && skipSettingLocaleOnNavigate) {
@@ -393,7 +401,14 @@ export async function navigate<Context extends NuxtApp = NuxtApp>(
 
   if (!differentDomains) {
     if (redirectPath) {
-      return navigateTo(redirectPath, { redirectCode: status })
+      if (isSSG && process.client) {
+        if (window.location.pathname !== redirectPath) {
+          window.location.assign(redirectPath)
+        }
+        return
+      } else {
+        return navigateTo(redirectPath, { redirectCode: status })
+      }
     }
   } else {
     const state = useRedirectState()

diff --git a/vitest.config.ts b/vitest.config.ts
@@ -8,7 +8,7 @@ export default defineConfig({
     threads: false,
     testTimeout: 300000,
     deps: {
-      inline: [/@nuxt\/test-utils-edge/]
+      inline: [/@nuxt\/test-utils/]
     }
   }
 })