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

fix: don't display 404 page if no pages/

Browse Source
This commit is contained in:
Sébastien Chopin 2021-02-17 15:29:15 +01:00
parent b4251b1389
commit d63b28303e
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/nuxt3/src/app/_templates/routes.js
View File

@ -1,2 +1,2 @@
// TODO: Use webpack-virtual-modules // TODO: Use webpack-virtual-modules
export default <%= app.templates.routes %> export default <%= app.templates.routes || '[]' %>

24
packages/nuxt3/src/builder/app.ts
View File

@ -43,18 +43,20 @@ export async function createApp (
if (app.pages) { if (app.pages) {
app.routes.push(...(await resolvePagesRoutes(builder, app))) app.routes.push(...(await resolvePagesRoutes(builder, app)))
} }
// Add 404 page is not added if (app.routes.length) {
const page404 = app.routes.find(route => route.name === '404') // Add 404 page is not added
if (!page404) { const page404 = app.routes.find(route => route.name === '404')
app.routes.push({ if (!page404) {
name: '404', app.routes.push({
path: '/:catchAll(.*)*', name: '404',
file: resolve(nuxt.options.appDir, 'pages/404.vue'), path: '/:catchAll(.*)*',
children: [] file: resolve(nuxt.options.appDir, 'pages/404.vue'),
}) children: []
})
}
// TODO: Hook to extend routes
app.templates.routes = serializeRoutes(app.routes)
} }
// TODO: Hook to extend routes
app.templates.routes = serializeRoutes(app.routes)
// Fallback app.main // Fallback app.main
if (!app.main && app.routes.length) { if (!app.main && app.routes.length) {