@nuxt/nitro-server-nightly 4.6.0-29776167.796cdae2 → 4.6.0-29778602.bfddf2f0

package/dist/index.mjs

@@ -21,7 +21,7 @@ import { ImpoundPlugin } from "impound";
 import { resolveModulePath } from "exsolve";
 import { runtimeDependencies } from "nitropack/runtime/meta";
 //#region package.json
-var version = "4.6.0-29776167.796cdae2";
+var version = "4.6.0-29778602.bfddf2f0";
 //#endregion
 //#region src/utils.ts
 function toArray(value) {
@@ -327,6 +327,8 @@ const NUXT_BUILD_OUTPUT_MAP = {
 	"nuxt/entry-ids": "entryIds"
 };
 async function bundle(nuxt) {
+	const errorPageOption = nuxt.options.experimental.prerenderErrorPages;
+	const errorPages = errorPageOption === true ? [404] : errorPageOption || [];
 	const layerDirs = getLayerDirectories(nuxt);
 	const excludePattern = [getLayerNodeModulesExcludePattern(layerDirs.map((dirs) => dirs.root))];
 	const layerPublicAssetsDirs = [];
@@ -454,8 +456,15 @@ async function bundle(nuxt) {
 				const hasCachedRoutes = Object.values(nitro.options.routeRules).some((r) => r.isr || r.cache);
 				const noScriptsPatterns = [...new Set(Object.entries(nitro.options.routeRules).filter(([_route, rules]) => rules.noScripts).map(([route]) => rou3PatternToURLPattern(route).pattern))];
 				const pagePatterns = nitro.options._noScriptsPagePatterns ?? [];
+				const noSSRRoutes = [
+					"/index.html",
+					"/200.html",
+					"/404.html"
+				].filter((route) => !errorPages.includes(Number(route.slice(1, -5))));
 				return [
 					`export const NUXT_NO_SSR = ${nuxt.options.ssr === false}`,
+					`export const NUXT_PRERENDER_ERROR_PAGES = ${JSON.stringify(errorPages)}`,
+					`export const NUXT_PRERENDER_NO_SSR_ROUTES = ${JSON.stringify(noSSRRoutes)}`,
 					`export const NUXT_EARLY_HINTS = ${nuxt.options.experimental.writeEarlyHints !== false}`,
 					`export const NUXT_NO_SCRIPTS = ${nuxt.options.features.noScripts === "all" || !!nuxt.options.features.noScripts && !nuxt.options.dev}`,
 					`export const NUXT_NO_SCRIPTS_PROD = ${nuxt.options.features.noScripts === "production"}`,
@@ -849,11 +858,14 @@ async function bundle(nuxt) {
 		"h3",
 		"h3/package.json"
 	];
-	const basePath = nitroConfig.typescript.tsConfig.compilerOptions?.baseUrl ? resolve(nuxt.options.buildDir, nitroConfig.typescript.tsConfig.compilerOptions?.baseUrl) : nuxt.options.buildDir;
+	const isV5OrHigher = nuxt.options.future.compatibilityVersion >= 5;
+	const baseUrl = isV5OrHigher ? void 0 : nitroConfig.typescript.tsConfig.compilerOptions?.baseUrl;
+	const basePath = baseUrl ? resolve(nuxt.options.buildDir, baseUrl) : nuxt.options.buildDir;
 	const aliases = nitroConfig.alias;
 	const importPaths = nuxt.options.modulesDir.map((d) => pathToFileURL(withTrailingSlash(d)));
 	const tsConfig = nitroConfig.typescript.tsConfig;
 	tsConfig.compilerOptions ||= {};
+	if (isV5OrHigher) Reflect.deleteProperty(tsConfig.compilerOptions, "baseUrl");
 	tsConfig.compilerOptions.paths ||= {};
 	for (const _alias in aliases) {
 		const alias = _alias;
@@ -1050,6 +1062,7 @@ async function bundle(nuxt) {
 	});
 	if (nitro.options.static) nitro.hooks.hook("prerender:routes", (routes) => {
 		for (const route of ["/200.html", "/404.html"]) routes.add(route);
+		for (const status of errorPages) routes.add(`/${status}.html`);
 		if (!nuxt.options.ssr) routes.add("/index.html");
 	});
 	if (!nuxt.options.dev) nitro.hooks.hook("rollup:before", async (nitro) => {

package/dist/runtime/handlers/island.mjs

@@ -8,6 +8,7 @@ import { createSSRContext } 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 { isStyleOfModule } from "../utils/renderer/dev-css.mjs";
 import { getQuery } from "ufo";
 import { createError, defineEventHandler, getQuery as getQuery$1, getRequestHeader, getRequestWebStream, setResponseHeader, setResponseHeaders, setResponseStatus } from "h3";
 import { useNitroApp } from "nitropack/runtime";
@@ -108,9 +109,10 @@ async function renderIsland(event) {
 	if (import.meta.dev) {
 		const { styles } = getRequestDependencies(ssrContext, renderer.rendererContext);
 		const link = [];
+		const modules = ssrContext.modules ?? [];
 		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({
+			if (isStyleOfModule(resource.file, modules)) link.push({
 				rel: "stylesheet",
 				href: renderer.rendererContext.buildAssetsURL(resource.file),
 				crossorigin: ""

package/dist/runtime/handlers/renderer.mjs

@@ -7,6 +7,7 @@ import { APP_ROOT_CLOSE_TAG, APP_ROOT_OPEN_TAG, getRenderer, getServerApp } from
 import { renderInlineStyles } from "../utils/renderer/inline-styles.mjs";
 import { renderStreamedIslandTeleports, replaceIslandTeleports } from "../utils/renderer/islands.mjs";
 import { renderPayloadJsonScript, renderPayloadResponse, renderPayloadScript, splitPayload } from "../utils/renderer/payload.mjs";
+import { createInlinedCSSFilter } from "../utils/renderer/inlined-css.mjs";
 import { warnNoScriptsClientReliance } from "../utils/renderer/no-scripts.mjs";
 import { getQuery, joinURL } from "ufo";
 import { appendResponseHeader, createError, getQuery as getQuery$1, getRequestHeader, getResponseStatus, getResponseStatusText, removeResponseHeader, setResponseHeader, writeEarlyHints } from "h3";
@@ -15,7 +16,7 @@ import destr from "destr";
 import { getPrefetchLinks, getPreloadLinks, getRequestDependencies, renderResourceHeaders } from "vue-bundle-renderer/runtime";
 import { appHead, appTeleportAttrs, appTeleportTag, componentIslands, componentIslandsActive, tracingChannelNuxt } from "#internal/nuxt.config.mjs";
 import { AsyncLocalStorage } from "node:async_hooks";
-import { NUXT_ASYNC_CONTEXT, NUXT_EARLY_HINTS, NUXT_INLINE_STYLES, NUXT_JSON_PAYLOADS, NUXT_NO_SCRIPTS, NUXT_NO_SCRIPTS_PATTERNS, NUXT_NO_SCRIPTS_PROD, NUXT_PAGE_PATTERNS, NUXT_PAYLOAD_EXTRACTION, NUXT_PAYLOAD_INLINE, NUXT_RUNTIME_PAYLOAD_EXTRACTION, NUXT_SSR_STREAMING, NUXT_SSR_STREAMING_BOT_RE, NUXT_VIEW_TRANSITIONS, PARSE_ERROR_DATA } from "#internal/nuxt/nitro-config.mjs";
+import { NUXT_ASYNC_CONTEXT, NUXT_EARLY_HINTS, NUXT_INLINE_STYLES, NUXT_JSON_PAYLOADS, NUXT_NO_SCRIPTS, NUXT_NO_SCRIPTS_PATTERNS, NUXT_NO_SCRIPTS_PROD, NUXT_PAGE_PATTERNS, NUXT_PAYLOAD_EXTRACTION, NUXT_PAYLOAD_INLINE, NUXT_PRERENDER_ERROR_PAGES, NUXT_RUNTIME_PAYLOAD_EXTRACTION, NUXT_SSR_STREAMING, NUXT_SSR_STREAMING_BOT_RE, NUXT_VIEW_TRANSITIONS, PARSE_ERROR_DATA } from "#internal/nuxt/nitro-config.mjs";
 import { propsToString, renderSSRHead } from "@unhead/vue/server";
 import { renderToWebStream } from "vue/server-renderer";
 import { createBootstrapScript, renderSSRHeadSuspenseChunk, renderShell } from "@unhead/vue/stream/server";
@@ -38,7 +39,7 @@ const PAYLOAD_BUILD_ID_PARAM = "_b";
 let entryPath;
 const SSR_BOT_RE = NUXT_SSR_STREAMING_BOT_RE;
 const handler = defineRenderHandler((event) => {
-	const ssrError = event.path.startsWith("/__nuxt_error") ? getQuery$1(event) : null;
+	const ssrError = event.path.startsWith("/__nuxt_error") ? getQuery$1(event) : import.meta.prerender ? getPrerenderedErrorPage(event) : null;
 	if (ssrError && !("__unenv__" in event.node.req)) throw createError({
 		status: 404,
 		statusText: "Page Not Found: /__nuxt_error",
@@ -58,6 +59,38 @@ const handler = defineRenderHandler((event) => {
 	}
 	return renderRoute(event, ssrError);
 });
+const ERROR_PAGE_RE = /^\/(\d{3})\.html$/;
+const STATUS_TEXT = {
+	400: "Bad Request",
+	401: "Unauthorized",
+	403: "Forbidden",
+	404: "Page Not Found",
+	410: "Gone",
+	500: "Internal Server Error",
+	503: "Service Unavailable"
+};
+function isPrerenderedErrorPage(pathname) {
+	const status = Number(ERROR_PAGE_RE.exec(pathname)?.[1]);
+	return status && NUXT_PRERENDER_ERROR_PAGES.includes(status) ? status : void 0;
+}
+/**
+* Synthesise the error a static error page (`404.html` and friends) renders
+* with, so the page is server-rendered at build time rather than written out as
+* an empty SPA shell.
+*/
+function getPrerenderedErrorPage(event) {
+	const pathname = event.path.replace(/[?#].*$/, "");
+	const status = isPrerenderedErrorPage(pathname);
+	if (!status) return null;
+	const statusText = STATUS_TEXT[status] || "Error";
+	return {
+		status,
+		statusText,
+		message: statusText,
+		fatal: false,
+		url: pathname
+	};
+}
 async function renderRoute(event, ssrError) {
 	const nitroApp = useNitroApp();
 	const ssrContext = createSSRContext(event);
@@ -73,7 +106,7 @@ async function renderRoute(event, ssrError) {
 	}
 	const routeOptions = getRouteRules(event);
 	if (routeOptions.ssr === false) ssrContext.noSSR = true;
-	const _PAYLOAD_EXTRACTION = !ssrContext.noSSR && (import.meta.prerender && NUXT_PAYLOAD_EXTRACTION || NUXT_RUNTIME_PAYLOAD_EXTRACTION && (routeOptions.isr || routeOptions.cache));
+	const _PAYLOAD_EXTRACTION = !ssrContext.noSSR && !ssrError && (import.meta.prerender && NUXT_PAYLOAD_EXTRACTION || NUXT_RUNTIME_PAYLOAD_EXTRACTION && (routeOptions.isr || routeOptions.cache));
 	const _PAYLOAD_INLINE = !_PAYLOAD_EXTRACTION || NUXT_PAYLOAD_INLINE;
 	const isRenderingPayload = (_PAYLOAD_EXTRACTION || import.meta.dev && routeOptions.prerender) && PAYLOAD_URL_RE.test(ssrContext.url);
 	if (isRenderingPayload) {
@@ -126,6 +159,10 @@ async function renderRoute(event, ssrError) {
 		throw _err;
 	});
 	const inlinedStyles = NUXT_INLINE_STYLES && !ssrContext["~renderResponse"] && !ssrContext._renderResponse && !isRenderingPayload ? await renderInlineStyles(ssrContext.modules ?? []) : [];
+	if (import.meta.prerender && ssrError && isPrerenderedErrorPage(event.path.replace(/[?#].*$/, ""))) {
+		delete ssrContext.payload.path;
+		if (ssrContext.payload.error) ssrContext.payload.error.url = void 0;
+	}
 	await ssrContext.nuxt?.hooks.callHook("app:rendered", {
 		ssrContext,
 		renderResult: _rendered
@@ -172,8 +209,14 @@ async function renderRoute(event, ssrError) {
 	}] });
 	if (inlinedStyles.length) ssrContext.head.push({ style: inlinedStyles });
 	const link = [];
+	const inlinedHrefs = [];
+	const isCSSInlined = NUXT_INLINE_STYLES ? await createInlinedCSSFilter(ssrContext.modules) : void 0;
 	for (const resource of Object.values(styles)) {
 		if (import.meta.dev && "inline" in getQuery(resource.file)) continue;
+		if (isCSSInlined?.(resource.file)) {
+			inlinedHrefs.push(renderer.rendererContext.buildAssetsURL(resource.file));
+			continue;
+		}
 		link.push({
 			rel: "stylesheet",
 			href: renderer.rendererContext.buildAssetsURL(resource.file),
@@ -184,6 +227,7 @@ async function renderRoute(event, ssrError) {
 	if (!NO_SCRIPTS) {
 		const dependencyOptions = ssrContext["~lazyHydratedModules"]?.size ? { exclude: ssrContext["~lazyHydratedModules"] } : void 0;
 		const excludeHrefs = new Set(link.map((l) => l.href));
+		for (const href of inlinedHrefs) excludeHrefs.add(href);
 		for (const id of ssrContext["~neverHydratedModules"] ?? []) {
 			const file = renderer.rendererContext.manifest?.[id]?.file;
 			if (file) excludeHrefs.add(renderer.rendererContext.buildAssetsURL(file));

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

@@ -1,19 +1,23 @@
 import { sharedPrerenderCache } from "../cache.mjs";
-import { encodePath } from "ufo";
 import { useRuntimeConfig } from "nitropack/runtime";
-import { NUXT_NO_SSR, NUXT_SHARED_DATA } from "#internal/nuxt/nitro-config.mjs";
+import { NUXT_NO_SSR, NUXT_PRERENDER_NO_SSR_ROUTES, NUXT_SHARED_DATA } from "#internal/nuxt/nitro-config.mjs";
 import { createHead } from "@unhead/vue/server";
 import unheadOptions from "#internal/unhead-options.mjs";
 //#region src/runtime/utils/renderer/app.ts
-const PRERENDER_NO_SSR_ROUTES = /* @__PURE__ */ new Set([
-	"/index.html",
-	"/200.html",
-	"/404.html"
-]);
+const PRERENDER_NO_SSR_ROUTES = new Set(NUXT_PRERENDER_NO_SSR_ROUTES);
+const ENC_PIPE_RE = /%7C/g;
+const ENC_BRACKET_OPEN_RE = /%5B/g;
+const ENC_BRACKET_CLOSE_RE = /%5D/g;
+const ENC_ENC_SLASH_RE = /%252F/gi;
+const HASH_RE = /#/g;
+const QUESTION_MARK_RE = /\?/g;
 function encodeEventPath(path) {
 	const queryIndex = path.indexOf("?");
-	if (queryIndex === -1) return encodePath(path);
-	return encodePath(path.slice(0, queryIndex)) + path.slice(queryIndex);
+	if (queryIndex === -1) return encodeVueRouterPath(path);
+	return encodeVueRouterPath(path.slice(0, queryIndex)) + path.slice(queryIndex);
+}
+function encodeVueRouterPath(path) {
+	return encodeURI(path).replace(ENC_PIPE_RE, "|").replace(ENC_BRACKET_OPEN_RE, "[").replace(ENC_BRACKET_CLOSE_RE, "]").replace(HASH_RE, "%23").replace(QUESTION_MARK_RE, "%3F").replace(ENC_ENC_SLASH_RE, "%2F");
 }
 function createSSRContext(event) {
 	const url = encodeEventPath(event.path);

package/dist/runtime/utils/renderer/build-files.mjs

@@ -68,5 +68,6 @@ function getRenderer(ssrContext) {
 }
 const getServerApp = lazyCachedFunction(getServerEntry);
 const getSSRStyles = lazyCachedFunction(() => import("nuxt/styles").then((r) => r.default || r));
+const getInlinedCSS = lazyCachedFunction(() => import("nuxt/styles").then((r) => r.inlinedCSS || {}));
 //#endregion
-export { APP_ROOT_CLOSE_TAG, APP_ROOT_OPEN_TAG, getRenderer, getSSRRenderer, getSSRStyles, getServerApp };
+export { APP_ROOT_CLOSE_TAG, APP_ROOT_OPEN_TAG, getInlinedCSS, getRenderer, getSSRRenderer, getSSRStyles, getServerApp };

package/dist/runtime/utils/renderer/dev-css.mjs

@@ -0,0 +1,20 @@
+//#region src/runtime/utils/renderer/dev-css.ts
+const QUERY_RE = /\?.*$/;
+const LEADING_RELATIVE_RE = /^(?:\.\.?\/)+/;
+/**
+* Whether a dev stylesheet belongs to one of the modules a render actually used.
+*
+* The dev CSS set is the builder's whole module graph, not a per-request subset, so
+* consumers that must not leak unrelated styles (islands) narrow it with the modules
+* Vue registered during their own render.
+*/
+function isStyleOfModule(file, modules) {
+	const path = file.replace(QUERY_RE, "");
+	for (const mod of modules) {
+		const normalized = mod.replace(LEADING_RELATIVE_RE, "");
+		if (normalized && (path === normalized || path.endsWith("/" + normalized))) return true;
+	}
+	return false;
+}
+//#endregion
+export { isStyleOfModule };

package/dist/runtime/utils/renderer/inlined-css.mjs

@@ -0,0 +1,33 @@
+import { getInlinedCSS } from "./build-files.mjs";
+//#region src/runtime/utils/renderer/inlined-css.ts
+/**
+* Build a predicate telling whether the contents of an emitted CSS file were
+* inlined as `<style>` tags for this request, meaning its `<link>` can be
+* dropped.
+*
+* The builder can only remove a link at build time when every CSS source in
+* the file is inlined for a module that is always rendered. For the rest it
+* records the modules that inline each source, and the answer depends on what
+* the request actually rendered: a component inside `<ClientOnly>` never
+* reaches `ssrContext.modules`, so its styles are only ever delivered by the
+* link. (#36058)
+*/
+async function createInlinedCSSFilter(modules) {
+	const inlinedCSS = await getInlinedCSS();
+	return (file) => {
+		const conditions = inlinedCSS[file.slice(file.lastIndexOf("/") + 1)];
+		if (!conditions) return false;
+		if (!modules?.size) return false;
+		for (const inliners of conditions) {
+			let inlined = false;
+			for (const id of inliners) if (modules.has(id)) {
+				inlined = true;
+				break;
+			}
+			if (!inlined) return false;
+		}
+		return true;
+	};
+}
+//#endregion
+export { createInlinedCSSFilter };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/nitro-server-nightly",
-  "version": "4.6.0-29776167.796cdae2",
+  "version": "4.6.0-29778602.bfddf2f0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -32,7 +32,7 @@
   ],
   "dependencies": {
     "@nuxt/devalue": "^2.0.2",
-    "@nuxt/kit": "npm:@nuxt/kit-nightly@4.6.0-29776167.796cdae2",
+    "@nuxt/kit": "npm:@nuxt/kit-nightly@4.6.0-29778602.bfddf2f0",
     "@unhead/vue": "^3.3.1",
     "@vue/shared": "^3.5.40",
     "consola": "^3.4.2",
@@ -54,7 +54,7 @@
     "std-env": "^4.2.0",
     "ufo": "^1.6.4",
     "unctx": "^3.0.0",
-    "unrouting": "^0.2.2",
+    "unrouting": "^0.2.3",
     "unstorage": "^1.17.5",
     "vue": "^3.5.40",
     "vue-bundle-renderer": "^2.3.1",
@@ -64,7 +64,7 @@
     "@babel/plugin-proposal-decorators": "^7.25.0 || ^8.0.0",
     "@babel/plugin-syntax-typescript": "^7.25.0 || ^8.0.0",
     "@rollup/plugin-babel": "^6.0.0 || ^7.0.0",
-    "nuxt": "npm:nuxt-nightly@4.6.0-29776167.796cdae2"
+    "nuxt": "npm:nuxt-nightly@4.6.0-29778602.bfddf2f0"
   },
   "peerDependenciesMeta": {
     "@babel/plugin-proposal-decorators": {
@@ -80,9 +80,9 @@
   "devDependencies": {
     "@babel/plugin-proposal-decorators": "8.0.2",
     "@babel/plugin-syntax-typescript": "8.0.3",
-    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.6.0-29776167.796cdae2",
+    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.6.0-29778602.bfddf2f0",
     "@rollup/plugin-babel": "7.1.0",
-    "nuxt": "npm:nuxt-nightly@4.6.0-29776167.796cdae2",
+    "nuxt": "npm:nuxt-nightly@4.6.0-29778602.bfddf2f0",
     "tsdown": "0.22.14",
     "vitest": "4.1.10"
   },