mirror of
https://github.com/nuxt/nuxt.git
synced 2024-11-22 13:45:18 +00:00
refactor(nuxt)!: remove support for 404.vue
shorthand (#8809)
This commit is contained in:
parent
0cf0f59bc5
commit
10c2272f4f
@ -177,8 +177,6 @@ export default defineNuxtPlugin(async (nuxtApp) => {
|
||||
fatal: false,
|
||||
statusMessage: `Page not found: ${to.fullPath}`
|
||||
})])
|
||||
} else if (process.server && to.matched[0].name === '404' && nuxtApp.ssrContext) {
|
||||
nuxtApp.ssrContext.event.res.statusCode = 404
|
||||
} else if (process.server) {
|
||||
const currentURL = to.fullPath || '/'
|
||||
if (!isEqual(currentURL, initialURL)) {
|
||||
|
@ -68,7 +68,6 @@ export function generateRoutesFromFiles (files: string[], pagesDir: string): Nux
|
||||
|
||||
const tokens = parseSegment(segment)
|
||||
const segmentName = tokens.map(({ value }) => value).join('')
|
||||
const isSingleSegment = segments.length === 1
|
||||
|
||||
// ex: parent/[slug].vue -> parent-slug
|
||||
route.name += (route.name && '-') + segmentName
|
||||
@ -79,8 +78,6 @@ export function generateRoutesFromFiles (files: string[], pagesDir: string): Nux
|
||||
if (child && child.children) {
|
||||
parent = child.children
|
||||
route.path = ''
|
||||
} else if (segmentName === '404' && isSingleSegment) {
|
||||
route.path += '/:catchAll(.*)*'
|
||||
} else if (segmentName === 'index' && !route.path) {
|
||||
route.path += '/'
|
||||
} else if (segmentName !== 'index') {
|
||||
|
@ -5,18 +5,6 @@ import { generateRouteKey } from '../src/pages/runtime/utils'
|
||||
describe('pages:generateRoutesFromFiles', () => {
|
||||
const pagesDir = 'pages'
|
||||
const tests = [
|
||||
{
|
||||
description: 'should generate correct route for 404',
|
||||
files: [`${pagesDir}/404.vue`],
|
||||
output: [
|
||||
{
|
||||
name: '404',
|
||||
path: '/:catchAll(.*)*',
|
||||
file: `${pagesDir}/404.vue`,
|
||||
children: []
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
description: 'should generate correct routes for index pages',
|
||||
files: [
|
||||
|
Loading…
Reference in New Issue
Block a user