@nuxt/nitro-server-nightly 5.0.0-29705271.19701cef → 5.0.0-29706259.91cb2fe2

package/dist/index.mjs

@@ -19,7 +19,7 @@ import { resolveModulePath } from "exsolve";
 import { runtimeDependencies } from "nitro/meta";
 import { resolveModuleExportNames } from "mlly";
 //#region package.json
-var version = "5.0.0-29705271.19701cef";
+var version = "5.0.0-29706259.91cb2fe2";
 //#endregion
 //#region src/utils.ts
 function toArray(value) {
@@ -296,17 +296,12 @@ async function bundle(nuxt) {
 	});
 	if (nuxt.options.experimental.componentIslands) {
 		const islandHandlerPath = JSON.stringify(resolve(distDir, "runtime/handlers/island"));
-		const h3Path = JSON.stringify(resolve(distDir, "h3"));
 		const ISLAND_RENDERER_KEY = "#internal/nuxt/island-renderer.mjs";
 		nuxt.options.nitro.virtual ||= {};
 		nuxt.options.nitro.virtual[ISLAND_RENDERER_KEY] = () => {
 			if (nuxt.options.dev || nuxt.options.experimental.componentIslands !== "auto" || nuxt.apps.default?.pages?.some((p) => p.mode === "server") || nuxt.apps.default?.components?.some((c) => c.mode === "server" && !nuxt.apps.default?.components.some((other) => other.pascalName === c.pascalName && other.mode === "client"))) return `export { default } from ${islandHandlerPath}`;
-			return `import { defineEventHandler } from ${h3Path}; export default defineEventHandler(() => {});`;
+			return `export default { fetch: () => undefined }`;
 		};
-		nuxt.options.serverHandlers.push({
-			route: "/__nuxt_island/**",
-			handler: ISLAND_RENDERER_KEY
-		});
 		if (!nuxt.options.ssr && nuxt.options.experimental.componentIslands !== "auto") {
 			nuxt.options.ssr = true;
 			nuxt.options.nitro.routeRules ||= {};

package/dist/runtime/handlers/island.mjs

@@ -1,13 +1,14 @@
 import { computeIslandHash } from "../nuxt/src/app/island-hash.mjs";
 import { traceAsync } from "../nuxt/src/app/internal/tracing.mjs";
-import { createSSRContext } from "../utils/renderer/app.mjs";
+import { createSSRContext, rethrowWithResponseHeaders, returnRenderResponse } from "../utils/renderer/app.mjs";
 import { getSSRRenderer } from "../utils/renderer/build-files.mjs";
 import { renderInlineStyles } from "../utils/renderer/inline-styles.mjs";
 import { getClientIslandResponse, getServerComponentHTML, getSlotIslandResponse } from "../utils/renderer/islands.mjs";
 import { getQuery } from "ufo";
+import { FastResponse } from "srvx";
 import { useNitroHooks } from "nitro/app";
 import { destr } from "destr";
-import { HTTPError, defineEventHandler, getQuery as getQuery$1, readBody } from "nitro/h3";
+import { H3Event, HTTPError, getQuery as getQuery$1, readBody } from "nitro/h3";
 import { VueResolver, walkResolver } from "@unhead/vue/utils";
 import { getRequestDependencies } from "vue-bundle-renderer/runtime";
 import { tracingChannelNuxt } from "#internal/nuxt.config.mjs";
@@ -16,87 +17,78 @@ import { useStorage } from "nitro/storage";
 const islandCache = import.meta.prerender ? useStorage("internal:nuxt:prerender:island") : null;
 const islandPropCache = import.meta.prerender ? useStorage("internal:nuxt:prerender:island-props") : null;
 const ISLAND_SUFFIX_RE = /\.json(?:\?.*)?$/;
-const handler = defineEventHandler(async (event) => {
-	event.res.headers.set("content-type", "application/json;charset=utf-8");
-	event.res.headers.set("x-powered-by", "Nuxt");
-	const islandPath = event.url.pathname;
-	if (import.meta.prerender && await islandCache.hasItem(islandPath)) return await islandCache.getItem(islandPath) || void 0;
-	const islandContext = await getIslandContext(event);
-	const ssrContext = {
-		...createSSRContext(event),
-		islandContext,
-		noSSR: false,
-		url: islandContext.url
-	};
-	const renderer = await getSSRRenderer();
-	const renderResult = await (tracingChannelNuxt ? traceAsync("nuxt.island", {
-		event,
-		ssrContext,
-		islandContext
-	}, () => renderer.renderToString(ssrContext)) : renderer.renderToString(ssrContext)).catch(async (err) => {
-		if (ssrContext["~renderResponse"] && err?.message === "skipping render") return {};
-		await ssrContext.nuxt?.hooks.callHook("app:error", err);
-		throw err;
-	});
-	await ssrContext.nuxt?.hooks.callHook("app:rendered", {
-		ssrContext,
-		renderResult
-	});
-	if (ssrContext["~renderResponse"]) {
-		const response = ssrContext["~renderResponse"];
-		if (response.status && response.status >= 400) throw new HTTPError({
-			status: response.status,
-			statusText: response.statusText
+var island_default = { async fetch(request) {
+	const event = new H3Event(request);
+	try {
+		event.res.headers.set("content-type", "application/json;charset=utf-8");
+		event.res.headers.set("x-powered-by", "Nuxt");
+		const islandPath = event.url.pathname;
+		if (import.meta.prerender && await islandCache.hasItem(islandPath)) return new FastResponse(JSON.stringify(await islandCache.getItem(islandPath)), event.res);
+		const islandContext = await getIslandContext(event);
+		const ssrContext = {
+			...createSSRContext(event),
+			islandContext,
+			noSSR: false,
+			url: islandContext.url
+		};
+		const renderer = await getSSRRenderer();
+		const renderResult = await (tracingChannelNuxt ? traceAsync("nuxt.island", {
+			event,
+			ssrContext,
+			islandContext
+		}, () => renderer.renderToString(ssrContext)) : renderer.renderToString(ssrContext)).catch(async (err) => {
+			if (ssrContext["~renderResponse"] && err?.message === "skipping render") return {};
+			await ssrContext.nuxt?.hooks.callHook("app:error", err);
+			throw err;
 		});
-		return returnIslandResponse(event, response);
-	}
-	if (ssrContext.payload?.error) throw ssrContext.payload.error;
-	const inlinedStyles = await renderInlineStyles(ssrContext.modules ?? []);
-	if (inlinedStyles.length) ssrContext.head.push({ style: inlinedStyles });
-	if (import.meta.dev) {
-		const { styles } = getRequestDependencies(ssrContext, renderer.rendererContext);
-		const link = [];
-		for (const resource of Object.values(styles)) {
-			if ("inline" in getQuery(resource.file)) continue;
-			if (resource.file.includes("scoped") && !resource.file.includes("pages/")) link.push({
-				rel: "stylesheet",
-				href: renderer.rendererContext.buildAssetsURL(resource.file),
-				crossorigin: ""
-			});
+		await ssrContext.nuxt?.hooks.callHook("app:rendered", {
+			ssrContext,
+			renderResult
+		});
+		if (ssrContext["~renderResponse"]) return returnRenderResponse(event, ssrContext["~renderResponse"]);
+		if (ssrContext.payload?.error) throw ssrContext.payload.error;
+		const inlinedStyles = await renderInlineStyles(ssrContext.modules ?? []);
+		if (inlinedStyles.length) ssrContext.head.push({ style: inlinedStyles });
+		if (import.meta.dev) {
+			const { styles } = getRequestDependencies(ssrContext, renderer.rendererContext);
+			const link = [];
+			for (const resource of Object.values(styles)) {
+				if ("inline" in getQuery(resource.file)) continue;
+				if (resource.file.includes("scoped") && !resource.file.includes("pages/")) link.push({
+					rel: "stylesheet",
+					href: renderer.rendererContext.buildAssetsURL(resource.file),
+					crossorigin: ""
+				});
+			}
+			if (link.length) ssrContext.head.push({ link });
 		}
-		if (link.length) ssrContext.head.push({ link });
-	}
-	const islandHead = {};
-	for (const entry of ssrContext.head.entries.values()) for (const [key, value] of Object.entries(walkResolver(entry.input, VueResolver))) {
-		const currentValue = islandHead[key];
-		if (Array.isArray(currentValue)) currentValue.push(...value);
-		else islandHead[key] = value;
-	}
-	const islandResponse = {
-		id: islandContext.id,
-		head: islandHead,
-		html: getServerComponentHTML(renderResult.html),
-		components: getClientIslandResponse(ssrContext),
-		slots: getSlotIslandResponse(ssrContext)
-	};
-	await useNitroHooks().callHook("render:island", islandResponse, {
-		event,
-		islandContext
-	});
-	const islandResponseString = JSON.stringify(islandResponse);
-	if (import.meta.prerender) {
-		const requestUrl = islandPath + event.url.search + event.url.hash;
-		await islandCache.setItem(islandPath, islandResponseString);
-		await islandPropCache.setItem(islandPath, requestUrl);
+		const islandHead = {};
+		for (const entry of ssrContext.head.entries.values()) for (const [key, value] of Object.entries(walkResolver(entry.input, VueResolver))) {
+			const currentValue = islandHead[key];
+			if (Array.isArray(currentValue)) currentValue.push(...value);
+			else islandHead[key] = value;
+		}
+		const islandResponse = {
+			id: islandContext.id,
+			head: islandHead,
+			html: getServerComponentHTML(renderResult.html),
+			components: getClientIslandResponse(ssrContext),
+			slots: getSlotIslandResponse(ssrContext)
+		};
+		await useNitroHooks().callHook("render:island", islandResponse, {
+			event,
+			islandContext
+		});
+		if (import.meta.prerender) {
+			const requestUrl = islandPath + event.url.search + event.url.hash;
+			await islandCache.setItem(islandPath, islandResponse);
+			await islandPropCache.setItem(islandPath, requestUrl);
+		}
+		return new FastResponse(JSON.stringify(islandResponse), event.res);
+	} catch (error) {
+		rethrowWithResponseHeaders(event, error);
 	}
-	return islandResponseString;
-});
-function returnIslandResponse(event, response) {
-	for (const header in response.headers || {}) event.res.headers.set(header, response.headers[header]);
-	if (response.status) event.res.status = response.status;
-	if (response.statusText) event.res.statusText = response.statusText;
-	return response.body;
-}
+} };
 const ISLAND_PATH_PREFIX = "/__nuxt_island/";
 const VALID_COMPONENT_NAME_RE = /^[a-z][\w.-]*$/i;
 async function getIslandContext(event) {
@@ -136,4 +128,4 @@ async function getIslandContext(event) {
 	};
 }
 //#endregion
-export { handler as default, islandCache, islandPropCache };
+export { island_default as default, islandCache, islandPropCache };

package/dist/runtime/handlers/renderer.mjs

@@ -1,15 +1,16 @@
 import { traceAsync } from "../nuxt/src/app/internal/tracing.mjs";
 import { payloadCache, prerenderRenderingURLs } from "../utils/cache.mjs";
-import { createSSRContext, setSSRError } from "../utils/renderer/app.mjs";
+import { createSSRContext, rethrowWithResponseHeaders, returnRenderResponse, setSSRError } from "../utils/renderer/app.mjs";
 import { buildAssetsURL, publicAssetsURL } from "../utils/paths.mjs";
 import { APP_ROOT_CLOSE_TAG, APP_ROOT_OPEN_TAG, getRenderer, getServerApp } from "../utils/renderer/build-files.mjs";
 import { renderInlineStyles } from "../utils/renderer/inline-styles.mjs";
 import { renderStreamedIslandTeleports, replaceIslandTeleports } from "../utils/renderer/islands.mjs";
 import { renderPayloadJsonScript, renderPayloadResponse, splitPayload } from "../utils/renderer/payload.mjs";
 import { getQuery, joinURL } from "ufo";
+import { FastResponse } from "srvx";
 import { getRouteRules, useNitroHooks } from "nitro/app";
 import destr$1 from "destr";
-import { HTTPError, defineEventHandler, getQuery as getQuery$1, writeEarlyHints } from "nitro/h3";
+import { H3Event, HTTPError, getQuery as getQuery$1, writeEarlyHints } from "nitro/h3";
 import { getPrefetchLinks, getPreloadLinks, getRequestDependencies, renderResourceHeaders } from "vue-bundle-renderer/runtime";
 import { appHead, appTeleportAttrs, appTeleportTag, componentIslands, componentIslandsActive, tracingChannelNuxt } from "#internal/nuxt.config.mjs";
 import { propsToString, renderSSRHead } from "@unhead/vue/server";
@@ -34,7 +35,9 @@ const PAYLOAD_URL_RE = /^[^?]*\/_payload.json(?:\?.*)?$/;
 const PAYLOAD_FILENAME = "_payload.json";
 let entryPath;
 const SSR_BOT_RE = NUXT_SSR_STREAMING_BOT_RE;
-const handler = defineEventHandler((event) => {
+var renderer_default = { fetch(request) {
+	const event = new H3Event(request);
+	if (componentIslands && event.url.pathname.startsWith("/__nuxt_island/")) return import("#internal/nuxt/island-renderer.mjs").then((r) => r.default.fetch(request));
 	const ssrError = event.url.pathname.startsWith("/__nuxt_error") ? getQuery$1(event) : void 0;
 	if (ssrError && !event.context.nuxt?.["~rendering-error"]) throw new HTTPError({
 		status: 404,
@@ -47,10 +50,10 @@ const handler = defineEventHandler((event) => {
 			status: 508,
 			statusText: `Loop detected while prerendering "${renderingURL}" (${[...stack, renderingURL].filter((url) => !url.startsWith("/__nuxt_error")).map((url) => `"${url}"`).join(" -> ")}). Check for \`useFetch\`/\`$fetch\` calls targeting a URL that is currently being rendered.`
 		});
-		return prerenderRenderingURLs.run([...stack || [], renderingURL], () => renderRoute(event, ssrError));
+		return prerenderRenderingURLs.run([...stack || [], renderingURL], () => renderRoute(event, ssrError)).catch((error) => rethrowWithResponseHeaders(event, error));
 	}
-	return renderRoute(event, ssrError);
-});
+	return renderRoute(event, ssrError).catch((error) => rethrowWithResponseHeaders(event, error));
+} };
 async function renderRoute(event, ssrError) {
 	const ssrContext = createSSRContext(event);
 	ssrContext.head.push(appHead);
@@ -71,7 +74,8 @@ async function renderRoute(event, ssrError) {
 		ssrContext.url = url;
 		if (import.meta.prerender && await payloadCache.hasItem(url + ".json")) {
 			event.res.headers.set("content-type", "application/json");
-			return returnResponse(event, await payloadCache.getItem(url + ".json") || void 0);
+			const response = await payloadCache.getItem(url + ".json") || void 0;
+			return new FastResponse(response?.body, response);
 		}
 	}
 	const payloadURL = _PAYLOAD_EXTRACTION ? joinURL(ssrContext.runtimeConfig.app.cdnURL || ssrContext.runtimeConfig.app.baseURL, ssrContext.url.replace(/\?.*$/, ""), PAYLOAD_FILENAME) + "?" + ssrContext.runtimeConfig.app.buildId : void 0;
@@ -123,12 +127,12 @@ async function renderRoute(event, ssrError) {
 		renderResult: _rendered
 	});
 	if (appRenderedResult instanceof Promise) await appRenderedResult;
-	if (ssrContext["~renderResponse"]) return returnResponse(event, ssrContext["~renderResponse"]);
+	if (ssrContext["~renderResponse"]) return returnRenderResponse(event, ssrContext["~renderResponse"]);
 	if (ssrContext.payload?.error && !ssrError) throw ssrContext.payload.error;
 	if (isRenderingPayload) {
 		const response = renderPayloadResponse(ssrContext);
 		if (import.meta.prerender) await payloadCache.setItem(ssrContext.url + ".json", response);
-		return returnResponse(event, response);
+		return new FastResponse(response.body, response);
 	}
 	if (_PAYLOAD_EXTRACTION && import.meta.prerender) {
 		event.res.headers.append("x-nitro-prerender", joinURL(ssrContext.url.replace(/\?.*$/, ""), PAYLOAD_FILENAME));
@@ -206,7 +210,7 @@ async function renderRoute(event, ssrError) {
 	if (renderHtmlResult instanceof Promise) await renderHtmlResult;
 	event.res.headers.set("content-type", "text/html;charset=utf-8");
 	event.res.headers.set("x-powered-by", "Nuxt");
-	return renderHTMLDocument(htmlContext);
+	return new FastResponse(renderHTMLDocument(htmlContext), event.res);
 }
 async function renderStreamedResponse(ctx) {
 	const { event, ssrContext, renderer, routeOptions, ssrError, _PAYLOAD_EXTRACTION, _PAYLOAD_INLINE, payloadURL } = ctx;
@@ -272,7 +276,7 @@ async function renderStreamedResponse(ctx) {
 	} catch (error) {
 		if (ssrContext["~renderResponse"] && error?.message === "skipping render") {
 			event.res.headers.delete("link");
-			return returnResponse(event, ssrContext["~renderResponse"]);
+			return returnRenderResponse(event, ssrContext["~renderResponse"]);
 		}
 		const r = ssrContext.nuxt?.hooks.callHook("app:error", error);
 		if (r instanceof Promise) await r;
@@ -280,7 +284,7 @@ async function renderStreamedResponse(ctx) {
 	}
 	if (ssrContext["~renderResponse"]) {
 		event.res.headers.delete("link");
-		return returnResponse(event, ssrContext["~renderResponse"]);
+		return returnRenderResponse(event, ssrContext["~renderResponse"]);
 	}
 	const { headTags, bodyTags, bodyTagsOpen, htmlAttrs, bodyAttrs } = renderShell(ssrContext.head);
 	const cspNonce = headTags.match(/<script[^>]+\bnonce="([^"]*)"/)?.[1];
@@ -324,7 +328,7 @@ async function renderStreamedResponse(ctx) {
 		reader.releaseLock();
 		event.res.headers.delete("link");
 		const response = ssrContext["~renderResponse"];
-		if (response) return returnResponse(event, response);
+		if (response) return returnRenderResponse(event, response);
 		const _err = !ssrError && ssrContext.payload?.error || error;
 		const r = ssrContext.nuxt?.hooks.callHook("app:error", _err);
 		if (r instanceof Promise) await r;
@@ -334,7 +338,7 @@ async function renderStreamedResponse(ctx) {
 	if (response) {
 		reader.cancel().catch(() => {});
 		event.res.headers.delete("link");
-		return returnResponse(event, response);
+		return returnRenderResponse(event, response);
 	}
 	if (ssrContext.payload?.error && !ssrError) {
 		reader.cancel().catch(() => {});
@@ -468,7 +472,7 @@ async function renderStreamedResponse(ctx) {
 	});
 	event.res.headers.set("content-type", "text/html;charset=utf-8");
 	event.res.headers.set("x-powered-by", "Nuxt");
-	return outputStream;
+	return new FastResponse(outputStream, event.res);
 }
 function normalizeChunks(chunks) {
 	const result = [];
@@ -503,12 +507,5 @@ function stripInlineOnlyPayloadFields(payload) {
 	const { prefetchLinks: _, ...rest } = payload;
 	return rest;
 }
-function returnResponse(event, response) {
-	if (!response) return;
-	for (const header in response.headers || {}) event.res.headers.set(header, response.headers[header]);
-	if (response.status) event.res.status = response.status;
-	if (response.statusText) event.res.statusText = response.statusText;
-	return response.body;
-}
 //#endregion
-export { handler as default };
+export { renderer_default as default };

package/dist/runtime/utils/renderer/app.mjs

@@ -1,4 +1,5 @@
 import { sharedPrerenderCache } from "../cache.mjs";
+import { FastResponse } from "srvx";
 import { useRuntimeConfig } from "nitro/runtime-config";
 import { createHead } from "@unhead/vue/server";
 import { NUXT_NO_SSR, NUXT_SHARED_DATA } from "#internal/nuxt/nitro-config.mjs";
@@ -35,5 +36,25 @@ function setSSRError(ssrContext, error) {
 	const url = new URL(error.url);
 	ssrContext.url = url.pathname + url.search + url.hash;
 }
+function mergeHeaders(base, overlay) {
+	for (const [name, value] of overlay) {
+		if (name === "set-cookie") continue;
+		base.set(name, value);
+	}
+	for (const cookie of overlay.getSetCookie()) base.append("set-cookie", cookie);
+	return base;
+}
+function returnRenderResponse(event, response) {
+	const headers = mergeHeaders(new Headers(event.res.headers), response.headers);
+	return new FastResponse(response.body, {
+		status: response.status,
+		statusText: response.statusText,
+		headers
+	});
+}
+function rethrowWithResponseHeaders(event, error) {
+	error.headers = mergeHeaders(error.headers instanceof Headers ? error.headers : new Headers(error.headers), event.res.headers);
+	throw error;
+}
 //#endregion
-export { createSSRContext, setSSRError };
+export { createSSRContext, mergeHeaders, rethrowWithResponseHeaders, returnRenderResponse, setSSRError };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/nitro-server-nightly",
-  "version": "5.0.0-29705271.19701cef",
+  "version": "5.0.0-29706259.91cb2fe2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -27,7 +27,7 @@
     "dist"
   ],
   "dependencies": {
-    "@nuxt/kit": "npm:@nuxt/kit-nightly@5.0.0-29705271.19701cef",
+    "@nuxt/kit": "npm:@nuxt/kit-nightly@5.0.0-29706259.91cb2fe2",
     "@unhead/vue": "^3.1.4",
     "@vue/shared": "3.5.38",
     "consola": "^3.4.2",
@@ -58,7 +58,7 @@
     "@babel/plugin-proposal-decorators": "^7.25.0",
     "@babel/plugin-syntax-typescript": "^7.25.0",
     "@rollup/plugin-babel": "^6.0.0 || ^7.0.0",
-    "nuxt": "npm:nuxt-nightly@5.0.0-29705271.19701cef"
+    "nuxt": "npm:nuxt-nightly@5.0.0-29706259.91cb2fe2"
   },
   "peerDependenciesMeta": {
     "@babel/plugin-proposal-decorators": {
@@ -74,10 +74,10 @@
   "devDependencies": {
     "@babel/plugin-proposal-decorators": "7.29.7",
     "@babel/plugin-syntax-typescript": "7.29.7",
-    "@nuxt/schema": "npm:@nuxt/schema-nightly@5.0.0-29705271.19701cef",
+    "@nuxt/schema": "npm:@nuxt/schema-nightly@5.0.0-29706259.91cb2fe2",
     "@rollup/plugin-babel": "7.1.0",
     "hookable": "6.1.1",
-    "nuxt": "npm:nuxt-nightly@5.0.0-29705271.19701cef",
+    "nuxt": "npm:nuxt-nightly@5.0.0-29706259.91cb2fe2",
     "tsdown": "0.22.3",
     "vitest": "4.1.9"
   },