Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2025-01-19 01:45:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(nuxt): prevent error page rendering a null error (#7119)

Browse Source
This commit is contained in:
Daniel Roe 2022-08-31 21:19:28 +01:00 committed by GitHub
parent 0339a23372
commit d7b2d32b5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/nuxt/src/app/components/nuxt-error-page.vue
View File

@ -5,12 +5,14 @@
<script setup> <script setup>
import { defineAsyncComponent } from 'vue' import { defineAsyncComponent } from 'vue'
const props = defineProps({ // Deliberately prevent reactive update when error is cleared
// eslint-disable-next-line vue/no-setup-props-destructure
const { error } = defineProps({
error: Object error: Object
}) })
// TODO: extract to a separate utility // TODO: extract to a separate utility
const stacktrace = (props.error.stack || '') const stacktrace = (error.stack || '')
.split('\n') .split('\n')
.splice(1) .splice(1)
.map((line) => { .map((line) => {
@ -27,12 +29,12 @@ const stacktrace = (props.error.stack || '')
}).map(i => `<span class="stack${i.internal ? ' internal' : ''}">${i.text}</span>`).join('\n') }).map(i => `<span class="stack${i.internal ? ' internal' : ''}">${i.text}</span>`).join('\n')
// Error page props // Error page props
const statusCode = Number(props.error.statusCode || 500) const statusCode = Number(error.statusCode || 500)
const is404 = statusCode === 404 const is404 = statusCode === 404
const statusMessage = props.error.statusMessage ?? (is404 ? 'Page Not Found' : 'Internal Server Error') const statusMessage = error.statusMessage ?? (is404 ? 'Page Not Found' : 'Internal Server Error')
const description = props.error.message || props.error.toString() const description = error.message || error.toString()
const stack = process.dev && !is404 ? props.error.description || `<pre>${stacktrace}</pre>` : undefined const stack = process.dev && !is404 ? error.description || `<pre>${stacktrace}</pre>` : undefined
// TODO: Investigate side-effect issue with imports // TODO: Investigate side-effect issue with imports
const _Error404 = defineAsyncComponent(() => import('@nuxt/ui-templates/templates/error-404.vue')) const _Error404 = defineAsyncComponent(() => import('@nuxt/ui-templates/templates/error-404.vue'))