Skip to content
This repository was archived by the owner on Apr 6, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion packages/nuxt/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"knitwork": "^0.1.2",
"magic-string": "^0.26.2",
"mlly": "^0.5.7",
"nitropack": "^0.4.12",
"nitropack": "^0.4.14",
"nuxi": "^3.0.0-rc.6",
"ohash": "^0.1.5",
"ohmyfetch": "^0.4.18",
Expand Down
28 changes: 9 additions & 19 deletions packages/nuxt/src/core/runtime/nitro/renderer.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
import { createRenderer } from 'vue-bundle-renderer/runtime'
import type { RenderHandler, RenderResponse } from 'nitropack'
import type { Manifest } from 'vite'
import { eventHandler, useQuery } from 'h3'
import { CompatibilityEvent, getQuery } from 'h3'
import devalue from '@nuxt/devalue'
import { renderToString as _renderToString } from 'vue/server-renderer'
import type { NuxtApp } from '#app'

// @ts-ignore
import { useRuntimeConfig, useNitroApp } from '#internal/nitro'
import { useRuntimeConfig, useNitroApp, defineRenderHandler as _defineRenderHandler } from '#internal/nitro'
// @ts-ignore
import { buildAssetsURL } from '#paths'

export type NuxtSSRContext = NuxtApp['ssrContext']

const defineRenderHandler = _defineRenderHandler as (h: RenderHandler) => CompatibilityEvent

export interface NuxtRenderContext {
ssrContext: NuxtSSRContext
html: {
Expand Down Expand Up @@ -98,9 +101,9 @@ const getSPARenderer = lazyCachedFunction(async () => {
return { renderToString }
})

export default eventHandler(async (event) => {
export default defineRenderHandler(async (event) => {
// Whether we're rendering an error page
const ssrError = event.req.url?.startsWith('/__nuxt_error') ? useQuery(event) as Exclude<NuxtApp['payload']['error'], Error> : null
const ssrError = event.req.url?.startsWith('/__nuxt_error') ? getQuery(event) as Exclude<NuxtApp['payload']['error'], Error> : null
const url = ssrError?.url as string || event.req.url!

// Initialize ssr context
Expand Down Expand Up @@ -168,7 +171,7 @@ export default eventHandler(async (event) => {
await nitroApp.hooks.callHook('nuxt:app:rendered', rendered)

// Construct HTML response
const response: NuxtRenderResponse = {
const response: RenderResponse = {
body: renderHTMLDocument(rendered),
statusCode: event.res.statusCode,
statusMessage: event.res.statusMessage,
Expand All @@ -178,20 +181,7 @@ export default eventHandler(async (event) => {
}
}

// Allow extending the response
await nitroApp.hooks.callHook('nuxt:app:response', { response })

// Send HTML response
if (!event.res.headersSent) {
for (const header in response.headers) {
event.res.setHeader(header, response.headers[header])
}
event.res.statusCode = response.statusCode
event.res.statusMessage = response.statusMessage
}
if (!event.res.writableEnded) {
event.res.end(response.body)
}
return response
})

function lazyCachedFunction <T> (fn: () => Promise<T>): () => Promise<T> {
Expand Down
Loading