fix: custom routes not working for nested pages from layers (#2555)

nuxt-modules · Nov 19, 2023 · ee5fc28 · ee5fc28
1 parent 1616839
commit ee5fc28
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 2 deletions.
diff --git a/specs/basic_usage.spec.ts b/specs/basic_usage.spec.ts
@@ -84,9 +84,13 @@ test('layer provides locale `nl` and translation for key `hello`', async () => {
   const { page } = await renderPage('/layer-page')
 
   expect(await getText(page, '#i18n-layer-target')).toEqual('Hello world!')
+  expect(await page.locator('#i18n-layer-parent-link').getAttribute('href')).toEqual('/layer-parent')
+  expect(await page.locator('#i18n-layer-parent-child-link').getAttribute('href')).toEqual('/layer-parent/layer-child')
 
   await gotoPath(page, '/nl/layer-page')
   expect(await getText(page, '#i18n-layer-target')).toEqual('Hallo wereld!')
+  expect(await page.locator('#i18n-layer-parent-link').getAttribute('href')).toEqual('/nl/layer-ouder')
+  expect(await page.locator('#i18n-layer-parent-child-link').getAttribute('href')).toEqual('/nl/layer-ouder/layer-kind')
 })
 
 test('layer vueI18n options provides `nl` message', async () => {

diff --git a/specs/fixtures/layers/layer-lazy/nuxt.config.ts b/specs/fixtures/layers/layer-lazy/nuxt.config.ts
@@ -21,6 +21,15 @@ export default defineNuxtConfig({
         file: 'nl.json',
         name: 'Nederlands'
       }
-    ]
+    ],
+    customRoutes: 'config',
+    pages: {
+      'layer-parent': {
+        nl: '/layer-ouder'
+      },
+      'layer-parent/layer-child': {
+        nl: '/layer-ouder/layer-kind'
+      }
+    }
   }
 })
diff --git a/specs/fixtures/layers/layer-lazy/pages/layer-page.vue b/specs/fixtures/layers/layer-lazy/pages/layer-page.vue
@@ -3,6 +3,12 @@
     <div id="i18n-layer-target">
       {{ $t('hello') }}
     </div>
+    <div>
+      <NuxtLink id="i18n-layer-parent-link" :to="localePath('/layer-parent')">Layer parent page</NuxtLink>
+      <NuxtLink id="i18n-layer-parent-child-link" :to="localePath('/layer-parent/layer-child')">
+        Layer parent-child page
+      </NuxtLink>
+    </div>
     <div>
       {{ switchLocalePath('nl') }}
       {{ switchLocalePath('fr') }}
@@ -13,5 +19,6 @@
 
 <script setup>
 const switchLocalePath = useSwitchLocalePath()
+const localePath = useLocalePath()
 // const { locales } = useI18n()
 </script>
diff --git a/specs/fixtures/layers/layer-lazy/pages/layer-parent.vue b/specs/fixtures/layers/layer-lazy/pages/layer-parent.vue
@@ -0,0 +1,3 @@
+<template>
+  <div></div>
+</template>
diff --git a/specs/fixtures/layers/layer-lazy/pages/layer-parent/layer-child.vue b/specs/fixtures/layers/layer-lazy/pages/layer-parent/layer-child.vue
@@ -0,0 +1,3 @@
+<template>
+  <div></div>
+</template>
diff --git a/src/pages.ts b/src/pages.ts
@@ -114,7 +114,7 @@ export function analyzeNuxtPages(ctx: NuxtPageAnalyzeContext, pages: NuxtPage[],
 
       if (page.children && page.children.length > 0) {
         ctx.stack.push(page.path)
-        analyzeNuxtPages(ctx, page.children)
+        analyzeNuxtPages(ctx, page.children, pageDirOverride)
         ctx.stack.pop()
       }
     }