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

feat: update error handler to use Youch for HTML formatting

Browse Source
This commit is contained in:
Daniel Philip Johnson 2025-01-15 11:09:55 +00:00
parent 27a703af81
commit 5d74ae3c6b
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/nuxt/src/core/runtime/nitro/error.ts
View File

@ -1,7 +1,8 @@
import { joinURL, withQuery } from 'ufo' import { joinURL, withQuery } from 'ufo'
import type { NitroErrorHandler } from 'nitro/types' import type { NitroErrorHandler } from 'nitro/types'
import type { H3Error, H3Event } from 'h3' import type { H3Error, H3Event } from 'h3'
import { getRequestHeader, getRequestHeaders, send, setResponseHeader, setResponseStatus } from 'h3' import { getRequestHeader, getRequestHeaders, getRequestURL, send, setResponseHeader, setResponseStatus } from 'h3'
import { Youch } from "youch";
import { useNitroApp, useRuntimeConfig } from 'nitro/runtime' import { useNitroApp, useRuntimeConfig } from 'nitro/runtime'
import type { NuxtPayload } from 'nuxt/app' import type { NuxtPayload } from 'nuxt/app'
@ -9,6 +10,11 @@ export default <NitroErrorHandler> async function errorhandler (error: H3Error,
// Parse and normalize error // Parse and normalize error
const { stack, statusCode, statusMessage, message } = normalizeError(error) const { stack, statusCode, statusMessage, message } = normalizeError(error)
const url = getRequestURL(event, { xForwardedHost: true, xForwardedProto: true }).toString()
// Create a Youch instance for HTML output
const youch = new Youch()
// Create an error object // Create an error object
const errorObject = { const errorObject = {
url: event.path, url: event.path,
@ -74,7 +80,14 @@ export default <NitroErrorHandler> async function errorhandler (error: H3Error,
return send(event, template(errorObject)) return send(event, template(errorObject))
} }
const html = await res.text() const html = await youch.toHTML(error, {
request: {
url,
method: event.method,
headers: getRequestHeaders(event),
},
})
if (event.handled) { return } if (event.handled) { return }
for (const [header, value] of res.headers.entries()) { for (const [header, value] of res.headers.entries()) {
@ -82,7 +95,7 @@ export default <NitroErrorHandler> async function errorhandler (error: H3Error,
} }
setResponseStatus(event, res.status && res.status !== 200 ? res.status : undefined, res.statusText) setResponseStatus(event, res.status && res.status !== 200 ? res.status : undefined, res.statusText)
return send(event, html) return send(event, html,"text/html")
} }
/** /**