@nuxt/nitro-server-nightly 5.0.0-29776938.e673c552 → 5.0.0-29778218.1397500a

package/dist/index.mjs

@@ -22,7 +22,7 @@ import { nitro } from "nitro/vite";
 import MagicString from "magic-string";
 import remapping from "@ampproject/remapping";
 //#region package.json
-var version = "5.0.0-29776938.e673c552";
+var version = "5.0.0-29778218.1397500a";
 //#endregion
 //#region src/utils.ts
 function toArray(value) {
@@ -221,8 +221,11 @@ const NITRO_VIRTUAL_PREFIX = "\0nuxt-nitro-virtual:";
 * minifier nor Nitro's subsequent inline-and-minify pass can rename or
 * tree-shake it before the substitution runs. Because the sentinel sits in
 * expression position, deferred providers must produce a module body of
-* exactly the form `export default <expression>` (no other statements); the
-* substitution inlines the expression, parenthesised, in its place.
+* exactly the form `export default <expression>`; the
+* substitution inlines the expression, parenthesised, in its place. A provider
+* may append `export const <name> = <expression>` statements for the named
+* exports declared in `DEFERRED_NAMED_EXPORTS`; each gets its own sentinel and
+* resolves to `undefined` when the provider omits it.
 *
 * `entryChunkName` is excluded: `StableEntryPlugin` finalises it in the client
 * env's `writeBundle`, which completes before the ssr env loads it.
@@ -238,13 +241,34 @@ const DEFERRED_KEYS = /* @__PURE__ */ new Set([
 	"entryIds",
 	"ssrStyles"
 ]);
-function sentinel(specifier) {
-	return `__NUXT_BUILD_OUTPUT__${specifier.replace(/\W/g, "_")}__`;
+/**
+* Named exports a deferred build output provides in addition to its default
+* export. Each one gets its own sentinel, and the provider must append an
+* `export const <name> = <expression>` statement for it.
+*/
+const DEFERRED_NAMED_EXPORTS = { ssrStyles: ["inlinedCSS"] };
+function sentinel(specifier, name) {
+	return `__NUXT_BUILD_OUTPUT__${specifier.replace(/\W/g, "_")}${name ? `__${name}` : ""}__`;
 }
-async function getDeferredExpression(nuxt, key) {
+const NAMED_EXPORT_RE = /\nexport const (\w+) = /;
+/**
+* Split a deferred provider's module body into the expression for its default
+* export and one for each of its named exports.
+*/
+async function getDeferredExpressions(nuxt, key) {
 	const body = String(await nuxt.buildOutputs[key]() ?? "export default {}").trim().replace(/;$/, "");
 	if (!body.startsWith("export default ")) throw new Error(`[nuxt] Deferred build output \`${key}\` must be a module body of the form \`export default <expression>\`.`);
-	return body.slice(15);
+	const expressions = /* @__PURE__ */ new Map();
+	let name;
+	let rest = body.slice(15);
+	let match;
+	while (match = rest.match(NAMED_EXPORT_RE)) {
+		expressions.set(name, rest.slice(0, match.index).trim().replace(/;$/, ""));
+		name = match[1];
+		rest = rest.slice(match.index + match[0].length);
+	}
+	expressions.set(name, rest.trim().replace(/;$/, ""));
+	return expressions;
 }
 /**
 * Resolves the `nuxt/*` build-output specifiers for the ssr environment.
@@ -270,10 +294,14 @@ function NuxtBuildOutputsPlugin(nuxt) {
 				const specifier = id.slice(19);
 				const key = NUXT_BUILD_OUTPUT_MAP[specifier];
 				if (!key) return;
-				if (!nuxt.options.dev && DEFERRED_KEYS.has(key)) return {
-					code: `export default ${JSON.stringify(sentinel(specifier))}`,
-					map: null
-				};
+				if (!nuxt.options.dev && DEFERRED_KEYS.has(key)) {
+					const statements = [`export default ${JSON.stringify(sentinel(specifier))}`];
+					for (const name of DEFERRED_NAMED_EXPORTS[key] ?? []) statements.push(`export const ${name} = ${JSON.stringify(sentinel(specifier, name))}`);
+					return {
+						code: statements.join("\n"),
+						map: null
+					};
+				}
 				return {
 					code: await nuxt.buildOutputs[key]() ?? "",
 					map: null
@@ -287,7 +315,9 @@ function NuxtBuildOutputsPlugin(nuxt) {
 				const replacements = /* @__PURE__ */ new Map();
 				for (const [specifier, key] of Object.entries(NUXT_BUILD_OUTPUT_MAP)) {
 					if (!DEFERRED_KEYS.has(key)) continue;
-					replacements.set(sentinel(specifier), `(${await getDeferredExpression(nuxt, key)})`);
+					const expressions = await getDeferredExpressions(nuxt, key);
+					replacements.set(sentinel(specifier), `(${expressions.get(void 0)})`);
+					for (const name of DEFERRED_NAMED_EXPORTS[key] ?? []) replacements.set(sentinel(specifier, name), `(${expressions.get(name) ?? "undefined"})`);
 				}
 				const sourcemap = !!this.environment.config.build.sourcemap;
 				for (const file of Object.values(bundle)) {

package/dist/runtime/handlers/renderer.mjs

@@ -10,6 +10,7 @@ import { renderInlineStyles } from "../utils/renderer/inline-styles.mjs";
 import { renderStreamedIslandTeleports, replaceIslandTeleports } from "../utils/renderer/islands.mjs";
 import { patchDevClientCss } from "../utils/renderer/dev-css.mjs";
 import { renderPayloadJsonScript, renderPayloadResponse, 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 { FastResponse } from "srvx";
@@ -213,8 +214,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),
@@ -225,6 +232,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/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/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": "5.0.0-29776938.e673c552",
+  "version": "5.0.0-29778218.1397500a",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -32,7 +32,7 @@
   ],
   "dependencies": {
     "@ampproject/remapping": "^2.3.0",
-    "@nuxt/kit": "npm:@nuxt/kit-nightly@5.0.0-29776938.e673c552",
+    "@nuxt/kit": "npm:@nuxt/kit-nightly@5.0.0-29778218.1397500a",
     "@unhead/vue": "^3.3.1",
     "@vue/shared": "^3.5.40",
     "consola": "^3.4.2",
@@ -65,7 +65,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@5.0.0-29776938.e673c552"
+    "nuxt": "npm:nuxt-nightly@5.0.0-29778218.1397500a"
   },
   "peerDependenciesMeta": {
     "@babel/plugin-proposal-decorators": {
@@ -81,10 +81,10 @@
   "devDependencies": {
     "@babel/plugin-proposal-decorators": "8.0.2",
     "@babel/plugin-syntax-typescript": "8.0.3",
-    "@nuxt/schema": "npm:@nuxt/schema-nightly@5.0.0-29776938.e673c552",
+    "@nuxt/schema": "npm:@nuxt/schema-nightly@5.0.0-29778218.1397500a",
     "@rollup/plugin-babel": "7.1.0",
     "hookable": "^6.1.1",
-    "nuxt": "npm:nuxt-nightly@5.0.0-29776938.e673c552",
+    "nuxt": "npm:nuxt-nightly@5.0.0-29778218.1397500a",
     "tsdown": "0.22.14",
     "vitest": "4.1.10"
   },