Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-25 15:15:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(nuxt): keep route param optionality when sibling is an index (#5300)

Browse Source
This commit is contained in:
Daniel Roe 2022-06-09 14:03:08 +01:00 committed by GitHub
parent b31186b658
commit 27a0084b6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/nuxt/src/pages/utils.ts
View File

@ -211,14 +211,6 @@ function prepareRoutes (routes: NuxtPage[], parent?: NuxtPage) {
route.name = route.name.replace(/-index$/, '')
}
if (route.path === '/') {
// Remove ? suffix when index page at same level
routes.forEach((siblingRoute) => {
if (siblingRoute.path.endsWith('?')) {
siblingRoute.path = siblingRoute.path.slice(0, -1)
}
})
}
// Remove leading / if children route
if (parent && route.path.startsWith('/')) {
route.path = route.path.slice(1)

22
packages/nuxt/test/pages.test.ts
View File

@ -96,18 +96,32 @@ describe('pages:generateRoutesFromFiles', () => {
{
description: 'should generate correct dynamic routes',
files: [
`${pagesDir}/index.vue`,
`${pagesDir}/[slug].vue`,
`${pagesDir}/[[foo]]`,
`${pagesDir}/[[foo]]/index.vue`,
`${pagesDir}/[bar]/index.vue`,
`${pagesDir}/sub/[slug].vue`,
`${pagesDir}/nonopt/[slug].vue`,
`${pagesDir}/opt/[[slug]].vue`,
`${pagesDir}/[[sub]]/route-[slug].vue`
],
output: [
{
name: 'sub-slug',
path: '/sub/:slug',
file: `${pagesDir}/sub/[slug].vue`,
name: 'index',
path: '/',
file: `${pagesDir}/index.vue`,
children: []
},
{
name: 'nonopt-slug',
path: '/nonopt/:slug',
file: `${pagesDir}/nonopt/[slug].vue`,
children: []
},
{
name: 'opt-slug',
path: '/opt/:slug?',
file: `${pagesDir}/opt/[[slug]].vue`,
children: []
},
{