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

fix(nuxt): remove absolute paths from routes objects (#9655)

Browse Source
This commit is contained in:
Daniel Roe 2022-12-12 12:25:00 +00:00 committed by GitHub
parent 050c6dfd8a
commit 23307cd8e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -223,28 +223,34 @@ function prepareRoutes (routes: NuxtPage[], parent?: NuxtPage) {
} }
export function normalizeRoutes (routes: NuxtPage[], metaImports: Set<string> = new Set()): { imports: Set<string>, routes: string } { export function normalizeRoutes (routes: NuxtPage[], metaImports: Set<string> = new Set()): { imports: Set<string>, routes: string } {
const nuxt = useNuxt()
return { return {
imports: metaImports, imports: metaImports,
routes: genArrayFromRaw(routes.map((route) => { routes: genArrayFromRaw(routes.map((page) => {
const file = normalize(route.file) const file = normalize(page.file)
const metaImportName = genSafeVariableName(file) + 'Meta' const metaImportName = genSafeVariableName(relative(nuxt.options.rootDir, file)) + 'Meta'
metaImports.add(genImport(`${file}?macro=true`, [{ name: 'default', as: metaImportName }])) metaImports.add(genImport(`${file}?macro=true`, [{ name: 'default', as: metaImportName }]))
let aliasCode = `${metaImportName}?.alias || []` let aliasCode = `${metaImportName}?.alias || []`
if (Array.isArray(route.alias) && route.alias.length) { if (Array.isArray(page.alias) && page.alias.length) {
aliasCode = `${JSON.stringify(route.alias)}.concat(${aliasCode})` aliasCode = `${JSON.stringify(page.alias)}.concat(${aliasCode})`
} }
return { const route = {
...Object.fromEntries(Object.entries(route).map(([key, value]) => [key, JSON.stringify(value)])), ...Object.fromEntries(Object.entries(page).map(([key, value]) => [key, JSON.stringify(value)])),
name: `${metaImportName}?.name ?? ${route.name ? JSON.stringify(route.name) : 'undefined'}`, file: undefined,
path: `${metaImportName}?.path ?? ${JSON.stringify(route.path)}`, name: `${metaImportName}?.name ?? ${page.name ? JSON.stringify(page.name) : 'undefined'}`,
children: route.children ? normalizeRoutes(route.children, metaImports).routes : [], path: `${metaImportName}?.path ?? ${JSON.stringify(page.path)}`,
meta: route.meta ? `{...(${metaImportName} || {}), ...${JSON.stringify(route.meta)}}` : metaImportName, children: page.children ? normalizeRoutes(page.children, metaImports).routes : [],
meta: page.meta ? `{...(${metaImportName} || {}), ...${JSON.stringify(page.meta)}}` : metaImportName,
alias: aliasCode, alias: aliasCode,
redirect: route.redirect ? JSON.stringify(route.redirect) : `${metaImportName}?.redirect || undefined`, redirect: page.redirect ? JSON.stringify(page.redirect) : `${metaImportName}?.redirect || undefined`,
component: genDynamicImport(file, { interopDefault: true }) component: genDynamicImport(file, { interopDefault: true })
} }
delete route.file
return route
})) }))
} }
} }