@nuxt/vite-builder-nightly 4.6.0-29776167.796cdae2 → 4.6.0-29778602.bfddf2f0

package/dist/index.mjs

@@ -1795,7 +1795,8 @@ function wrapStringGenerateScopedName(pattern, hashPrefix) {
 function SSRStylesPlugin(nuxt) {
 	if (nuxt.options.dev) return;
 	const chunksWithInlinedCSS = /* @__PURE__ */ new Set();
-	const cssSourcesByChunkSrc = /* @__PURE__ */ new Map();
+	const clientImporters = /* @__PURE__ */ new Map();
+	const cssSourcesByCSSFile = /* @__PURE__ */ new Map();
 	const clientCSSMap = {};
 	const stripQuery = (id) => id.replace(QUERY_RE, "");
 	const withInlineQuery = (id) => {
@@ -1803,38 +1804,101 @@ function SSRStylesPlugin(nuxt) {
 		if (match) return id.slice(0, match.index) + match[1] + "inline&used&" + id.slice(match.index + 1);
 		return id + (id.includes("?") ? "&" : "?") + "inline&used";
 	};
-	const inlinedCSSModuleIds = /* @__PURE__ */ new Set();
+	const inlinedCSSConsumers = /* @__PURE__ */ new Map();
+	const isInlinedForEveryImporter = (cssId) => {
+		const consumers = inlinedCSSConsumers.get(cssId);
+		if (!consumers) return false;
+		const seen = /* @__PURE__ */ new Set();
+		const queue = [cssId];
+		while (queue.length) {
+			const importer = queue.shift();
+			if (seen.has(importer)) continue;
+			seen.add(importer);
+			if (consumers.has(relativeToSrcDir(importer))) continue;
+			const parents = clientImporters.get(importer);
+			if (!parents?.size) return false;
+			queue.push(...parents);
+		}
+		return true;
+	};
+	const isDroppableCSSFile = (file) => {
+		const sources = cssSourcesByCSSFile.get(basename(file));
+		if (!sources?.size) return false;
+		for (const cssId of sources) if (!isInlinedForEveryImporter(cssId)) return false;
+		return true;
+	};
+	const inlinedCSSConditions = /* @__PURE__ */ new Map();
+	const serializeInlinedCSSConditions = () => JSON.stringify(Object.fromEntries(inlinedCSSConditions));
+	/**
+	* Decide how a droppable CSS file should be handled, recording a render-time
+	* condition when some of its sources are only inlined for components that may
+	* not be server-rendered on a given request (for example a component used
+	* inside `<ClientOnly>` on one route and server-rendered on another).
+	*
+	* Returns `true` when the link can be removed from the manifest outright,
+	* i.e. every CSS source is inlined for an entry module, which is always in
+	* `ssrContext.modules`.
+	*/
+	const dropCSSFile = (file, entryIds) => {
+		const cssFile = basename(file);
+		const sources = cssSourcesByCSSFile.get(cssFile);
+		const conditions = [];
+		for (const cssId of sources) {
+			const consumers = inlinedCSSConsumers.get(cssId);
+			if (!consumers?.size) continue;
+			let alwaysRendered = false;
+			for (const consumer of consumers) if (entryIds.has(consumer)) {
+				alwaysRendered = true;
+				break;
+			}
+			if (!alwaysRendered) conditions.push(Array.from(consumers));
+		}
+		if (!conditions.length) return true;
+		inlinedCSSConditions.set(cssFile, conditions);
+		return false;
+	};
+	/**
+	* Record a render-time condition for CSS files attributed to a single
+	* component, used for rolldown-generated chunks whose CSS is matched to the
+	* component by filename rather than through the module graph.
+	*/
+	const dropComponentCSSFile = (file, componentId, entryIds) => {
+		if (entryIds.has(componentId)) return true;
+		inlinedCSSConditions.set(basename(file), [[componentId]]);
+		return false;
+	};
 	nuxt.hook("build:manifest", (manifest) => {
 		const entryIds = /* @__PURE__ */ new Set();
-		for (const { cssIds, files, inBundle } of Object.values(cssMap)) {
-			if (!cssIds || !inBundle || !files.length) continue;
-			for (const cssId of cssIds) inlinedCSSModuleIds.add(cssId);
+		for (const [id, { cssIds, files, inBundle }] of Object.entries(cssMap)) {
+			if (!inBundle || !files.length) continue;
+			chunksWithInlinedCSS.add(id);
+			if (!cssIds) continue;
+			for (const cssId of cssIds) {
+				const consumers = inlinedCSSConsumers.get(cssId) ?? /* @__PURE__ */ new Set();
+				inlinedCSSConsumers.set(cssId, consumers);
+				consumers.add(id);
+			}
+		}
+		for (const id of chunksWithInlinedCSS) {
+			const chunk = manifest[id];
+			if (chunk?.isEntry && chunk.src) entryIds.add(chunk.src);
 		}
 		for (const id of chunksWithInlinedCSS) {
 			const chunk = manifest[id];
 			if (!chunk) continue;
-			if (chunk.isEntry && chunk.src) entryIds.add(chunk.src);
-			else chunk.css &&= [];
 			if (chunk.imports && chunk.src) {
 				const componentBaseName = filename(chunk.src);
 				for (const imp of chunk.imports) {
 					const imported = manifest[imp];
 					if (imported?.css?.length && !imported.isEntry && !imported.src) {
-						if (imported.css.every((css) => css.startsWith(componentBaseName + "."))) imported.css = [];
+						if (imported.css.every((css) => css.startsWith(componentBaseName + "."))) imported.css = imported.css.filter((file) => !dropComponentCSSFile(file, id, entryIds));
 					}
 				}
 			}
 		}
 		for (const chunk of Object.values(manifest)) {
-			if (!chunk.css?.length || !chunk.src) continue;
-			const cssSources = cssSourcesByChunkSrc.get(chunk.src);
-			if (!cssSources?.size) continue;
-			let allInlined = true;
-			for (const cssId of cssSources) if (!inlinedCSSModuleIds.has(cssId)) {
-				allInlined = false;
-				break;
-			}
-			if (allInlined) chunk.css = [];
+			if (!chunk.css?.length) continue;
+			chunk.css = chunk.css.filter((file) => !(isDroppableCSSFile(file) && dropCSSFile(file, entryIds)));
 		}
 		setBuildOutput("entryIds", () => `export default ${JSON.stringify(Array.from(entryIds))}`, nuxt);
 	});
@@ -1882,7 +1946,7 @@ function SSRStylesPlugin(nuxt) {
 				buildStart() {
 					if (this.environment.name === "ssr") {
 						const stylesPath = resolve(this.environment.config.build.outDir, "styles.mjs");
-						setBuildOutput("ssrStyles", () => `export { default } from ${JSON.stringify(stylesPath)}`, nuxt);
+						setBuildOutput("ssrStyles", () => [`export { default } from ${JSON.stringify(stylesPath)}`, `export const inlinedCSS = ${serializeInlinedCSSConditions()}`].join("\n"), nuxt);
 					}
 				},
 				resolveId: {
@@ -1904,8 +1968,30 @@ function SSRStylesPlugin(nuxt) {
 						};
 					}
 				},
-				generateBundle(outputOptions) {
-					if (environment.name === "client") return;
+				generateBundle(outputOptions, bundle) {
+					if (environment.name === "client") {
+						for (const chunk of Object.values(bundle)) {
+							if (chunk.type !== "chunk") continue;
+							for (const moduleId of chunk.moduleIds) {
+								const id = stripQuery(moduleId);
+								const importers = clientImporters.get(id) ?? /* @__PURE__ */ new Set();
+								clientImporters.set(id, importers);
+								for (const importer of this.getModuleInfo(moduleId)?.importers ?? []) {
+									const importerId = stripQuery(importer);
+									if (importerId !== id) importers.add(importerId);
+								}
+							}
+							const cssSources = /* @__PURE__ */ new Set();
+							for (const moduleId of chunk.moduleIds) if (isCSS(moduleId)) cssSources.add(stripQuery(moduleId));
+							if (cssSources.size) for (const file of chunk.viteMetadata?.importedCss ?? []) {
+								const cssFile = basename(file);
+								const sources = cssSourcesByCSSFile.get(cssFile) ?? /* @__PURE__ */ new Set();
+								cssSourcesByCSSFile.set(cssFile, sources);
+								for (const cssId of cssSources) sources.add(cssId);
+							}
+						}
+						return;
+					}
 					const emitted = {};
 					const usedNames = /* @__PURE__ */ new Set();
 					for (const [file, { files, inBundle }] of Object.entries(cssMap)) {
@@ -1952,22 +2038,10 @@ function SSRStylesPlugin(nuxt) {
 				renderChunk(_code, chunk) {
 					const isEntry = chunk.facadeModuleId === entry;
 					if (isEntry) clientCSSMap[chunk.facadeModuleId] ||= /* @__PURE__ */ new Set();
-					let chunkCSSSources;
-					if (environment.name === "client" && chunk.facadeModuleId) {
-						const chunkSrc = relativeToSrcDir(chunk.facadeModuleId);
-						if (chunkSrc) {
-							chunkCSSSources = cssSourcesByChunkSrc.get(chunkSrc);
-							if (!chunkCSSSources) {
-								chunkCSSSources = /* @__PURE__ */ new Set();
-								cssSourcesByChunkSrc.set(chunkSrc, chunkCSSSources);
-							}
-						}
-					}
 					for (const moduleId of [chunk.facadeModuleId, ...chunk.moduleIds].filter(Boolean)) {
 						if (environment.name === "client") {
 							const moduleMap = clientCSSMap[moduleId] ||= /* @__PURE__ */ new Set();
 							if (isCSS(moduleId)) {
-								chunkCSSSources?.add(stripQuery(moduleId));
 								if (isVue(moduleId)) {
 									moduleMap.add(moduleId);
 									const parent = moduleId.replace(/\?.+$/, "");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/vite-builder-nightly",
-  "version": "4.6.0-29776167.796cdae2",
+  "version": "4.6.0-29778602.bfddf2f0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -24,7 +24,7 @@
     "dist"
   ],
   "dependencies": {
-    "@nuxt/kit": "npm:@nuxt/kit-nightly@4.6.0-29776167.796cdae2",
+    "@nuxt/kit": "npm:@nuxt/kit-nightly@4.6.0-29778602.bfddf2f0",
     "@vitejs/plugin-vue": "^6.0.8",
     "@vitejs/plugin-vue-jsx": "^5.1.6",
     "autoprefixer": "^10.5.4",
@@ -55,7 +55,7 @@
   "devDependencies": {
     "@babel/plugin-proposal-decorators": "8.0.2",
     "@babel/plugin-syntax-jsx": "8.0.1",
-    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.6.0-29776167.796cdae2",
+    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.6.0-29778602.bfddf2f0",
     "h3": "1.15.11",
     "h3-next": "npm:h3@2.0.1-rc.26",
     "nitropack": "2.13.4",
@@ -68,7 +68,7 @@
   "peerDependencies": {
     "@babel/plugin-proposal-decorators": "^7.25.0 || ^8.0.0",
     "@babel/plugin-syntax-jsx": "^7.25.0 || ^8.0.0",
-    "nuxt": "npm:nuxt-nightly@4.6.0-29776167.796cdae2",
+    "nuxt": "npm:nuxt-nightly@4.6.0-29778602.bfddf2f0",
     "rolldown": "^1.0.0",
     "rollup-plugin-visualizer": "^6.0.0 || ^7.0.1",
     "vue": "^3.3.4"