fix: not work to wait for page transition (#2285)

nuxt-modules · Aug 1, 2023 · 03b020b · 03b020b
1 parent 7341bd2
commit 03b020b
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 9 deletions.
diff --git a/playground/nuxt.config.ts b/playground/nuxt.config.ts
@@ -148,7 +148,7 @@ export default defineNuxtConfig({
       }
     ],
     // trailingSlash: true,
-    // debug: true,
+    debug: true,
     defaultLocale: 'en',
     // strategy: 'no_prefix',
     // strategy: 'prefix',
@@ -166,7 +166,7 @@ export default defineNuxtConfig({
       }
     },
     // differentDomains: true,
-    // skipSettingLocaleOnNavigate: true,
+    skipSettingLocaleOnNavigate: true,
     detectBrowserLanguage: false,
     // detectBrowserLanguage: {
     //   // useCookie: true

diff --git a/specs/lang_switcher.spec.ts b/specs/lang_switcher.spec.ts
@@ -32,15 +32,19 @@ test('switching', async () => {
   expect(await getText(page, '#lang-switcher-with-nuxt-link a')).toMatch('English')
   expect(await getText(page, '#set-locale-link-en')).toMatch('English')
 
+  // click `en` lang switch with `setLocale`
+  await page.locator('#set-locale-link-en').click()
+  await page.waitForTimeout(1000)
+
   // page path
   expect(await getData(page, '#home-use-async-data')).toMatchObject({
-    aboutPath: '/fr/about',
-    aboutTranslation: 'À propos'
+    aboutPath: '/about',
+    aboutTranslation: 'About us'
   })
   expect(await page.getAttribute('#lang-switcher-with-nuxt-link a', 'href')).toMatch('/')
 
   // current locale
-  expect(await getText(page, '#lang-switcher-current-locale code')).toEqual('fr')
+  expect(await getText(page, '#lang-switcher-current-locale code')).toEqual('en')
 })
 
 describe('dynamic route parameter', () => {

diff --git a/src/runtime/plugins/i18n.ts b/src/runtime/plugins/i18n.ts
@@ -213,7 +213,8 @@ export default defineNuxtPlugin(async nuxt => {
             {
               differentDomains,
               skipSettingLocaleOnNavigate,
-              rootRedirect
+              rootRedirect,
+              enableNavigate: true
             }
           )
         }

diff --git a/src/runtime/utils.ts b/src/runtime/utils.ts
@@ -370,15 +370,25 @@ export async function navigate<Context extends NuxtApp = NuxtApp>(
     status = 301,
     rootRedirect = nuxtI18nOptionsDefault.rootRedirect,
     differentDomains = nuxtI18nOptionsDefault.differentDomains,
-    skipSettingLocaleOnNavigate = nuxtI18nOptionsDefault.skipSettingLocaleOnNavigate
+    skipSettingLocaleOnNavigate = nuxtI18nOptionsDefault.skipSettingLocaleOnNavigate,
+    enableNavigate = false
   }: {
     status?: number
+    enableNavigate?: boolean
   } & Pick<NuxtI18nOptions<Context>, 'skipSettingLocaleOnNavigate' | 'differentDomains' | 'rootRedirect'> = {}
 ) {
   const { i18n, locale, route } = args
   let { redirectPath } = args
 
-  __DEBUG__ && console.log('navigate options ', status, rootRedirect, differentDomains, skipSettingLocaleOnNavigate)
+  __DEBUG__ &&
+    console.log(
+      'navigate options ',
+      status,
+      rootRedirect,
+      differentDomains,
+      skipSettingLocaleOnNavigate,
+      enableNavigate
+    )
   __DEBUG__ && console.log('navigate isSSG', isSSG)
 
   if (route.path === '/' && rootRedirect) {
@@ -397,7 +407,9 @@ export async function navigate<Context extends NuxtApp = NuxtApp>(
     i18n.__pendingLocalePromise = new Promise(resolve => {
       i18n.__resolvePendingLocalePromise = resolve
     })
-    return
+    if (!enableNavigate) {
+      return
+    }
   }
 
   if (!differentDomains) {