fix: change route on setLocale (#2511)

nuxt-modules · Oct 20, 2023 · 7454a4c · 7454a4c
1 parent d485f7f
commit 7454a4c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/specs/fixtures/basic/pages/index.vue b/specs/fixtures/basic/pages/index.vue
@@ -24,15 +24,15 @@ watchEffect(() => {
   refresh()
 })
 
-useHead({
+useHead(() => ({
   title: t('home'),
   htmlAttrs: {
     lang: i18nHead.value.htmlAttrs!.lang,
     dir: i18nHead.value.htmlAttrs!.dir
   },
   link: [...(i18nHead.value.link || [])],
   meta: [...(i18nHead.value.meta || [])]
-})
+}))
 </script>
 
 <template>

diff --git a/specs/issues/2288.spec.ts b/specs/issues/2288.spec.ts
@@ -10,7 +10,7 @@ describe('#2288', async () => {
   })
 
   // TODO: Fix setLocale
-  test.fails('change route with setLocale', async () => {
+  test('change route with setLocale', async () => {
     const home = url('/')
     const page = await createPage()
     await page.goto(home)

diff --git a/specs/routing_strategies/prefix_and_default.spec.ts b/specs/routing_strategies/prefix_and_default.spec.ts
@@ -92,8 +92,7 @@ describe('strategy: prefix_and_default', async () => {
     expect(res!.status()).toBe(404) // eslint-disable-line @typescript-eslint/no-non-null-assertion
   })
 
-  // TODO: Fix setLocale
-  test.fails('reactivity', async () => {
+  test('reactivity', async () => {
     const { page } = await renderPage('/')
 
     // click `fr` lang switch link with NuxtLink
@@ -119,8 +118,11 @@ describe('strategy: prefix_and_default', async () => {
     // click `en` and `fr` lang switch link with setLocale
     await page.locator('#set-locale-link-en').click()
     await waitForURL(page, '/')
+    expect(await getText(page, 'title')).toEqual('Homepage')
+
     await page.locator('#set-locale-link-fr').click()
     await waitForURL(page, '/fr')
+    expect(await getText(page, 'title')).toEqual('Accueil')
 
     // navigation URL
     expect(await page.url()).toEqual(url('/fr'))

diff --git a/src/runtime/utils.ts b/src/runtime/utils.ts
@@ -308,7 +308,7 @@ export function detectRedirect<Context extends NuxtApp = NuxtApp>({
   if (
     !isStaticGenerate &&
     !differentDomains &&
-    (calledWithRouting || (strategy !== 'no_prefix' && strategy !== 'prefix_and_default')) &&
+    (calledWithRouting || strategy !== 'no_prefix') &&
     routeLocaleGetter(route.to) !== targetLocale
   ) {
     // the current route could be 404 in which case attempt to find matching route using the full path