Skip to content
This repository was archived by the owner on Apr 6, 2023. It is now read-only.
/frameworkPublic archive

feat(nuxt): support for extending error.vue in layers#9521

Merged
danielroe merged 5 commits into from
Dec 6, 2022
Merged

feat(nuxt): support for extending error.vue in layers #9521

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
819b93e
feat(layers): support for error.vue
TheAlexLichter Dec 5, 2022
c6009ed
fix: use default component
TheAlexLichter Dec 5, 2022
2f538c4
refactor: pathe.join + fallback
TheAlexLichter Dec 5, 2022
435a39d
chore: lint
TheAlexLichter Dec 5, 2022
c8be652
Update packages/nuxt/src/core/app.ts
TheAlexLichter Dec 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions packages/nuxt/src/core/app.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { promises as fsp } from 'node:fs'
import { dirname, resolve } from 'pathe'
import { dirname, resolve, join } from 'pathe'
import defu from 'defu'
import type { Nuxt, NuxtApp, NuxtPlugin, NuxtTemplate, ResolvedNuxtTemplate } from '@nuxt/schema'
import { findPath, resolveFiles, normalizePlugin, normalizeTemplate, compileTemplate, templateUtils, tryResolveModule, resolvePath, resolveAlias } from '@nuxt/kit'
Expand DownExpand Up@@ -74,7 +74,9 @@ export async function resolveApp (nuxt: Nuxt, app: NuxtApp) {

// Resolve error component
if (!app.errorComponent) {
app.errorComponent = (await findPath(['~/error'])) || resolve(nuxt.options.appDir, 'components/nuxt-error-page.vue')
app.errorComponent = (await findPath(
nuxt.options._layers.map(layer => join(layer.config.srcDir, 'error'))
)) ?? resolve(nuxt.options.appDir, 'components/nuxt-error-page.vue')
}

// Resolve layouts/ from all config layers
Expand Down