@nuxt/vite-builder-nightly 5.0.0-29741513.94de156f → 5.0.0-29741521.e01f6e8b

package/dist/index.mjs

@@ -16,6 +16,7 @@ import { hasTTY, isCI } from "std-env";
 import { generateTransform, rolldownString } from "rolldown-string";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { genArrayFromRaw, genImport, genObjectFromRawEntries } from "knitwork";
+import genericNames from "generic-names";
 import "unplugin";
 import { replacePlugin } from "rolldown/plugins";
 import { mkdir, readFile, rm, writeFile } from "node:fs/promises";
@@ -704,6 +705,31 @@ const QUERY_RE$2 = /\?.+$/;
 const MACRO_QUERY_RE = /[?&]macro(?:=|&|$)/;
 const NUXT_COMPONENT_QUERY_RE = /[?&]nuxt_component=/;
 const STYLE_QUERY_RE$1 = /[?&]type=style/;
+/**
+* Wrap a string `generateScopedName` pattern into a function that strips any
+* Vite query string (e.g. `?inline&used`) from the resource path before it is
+* hashed.
+*
+* When `features.inlineStyles` is enabled, this plugin imports CSS files with
+* `?inline&used` appended to the module id. For string patterns Vite delegates
+* scoped-name generation to `generic-names`, which folds the full resource path
+* (query included) into the `[hash]`. The client build processes the same file
+* without the query, so it produces a different hash and therefore different
+* class names, leaving the SSR markup mismatched against the inlined `<style>`
+* tags (see https://github.com/nuxt/nuxt/issues/35591 and
+* https://github.com/vitejs/vite/issues/22957).
+*
+* Delegating to `generic-names` with `process.cwd()` (the same context Vite
+* uses) means the generated names stay byte-identical to the client build for
+* every supported token, not just `[local]`/`[hash]`.
+*/
+function wrapStringGenerateScopedName(pattern, hashPrefix) {
+	const generate = genericNames(pattern, {
+		context: process.cwd(),
+		hashPrefix
+	});
+	return (localName, resourcePath) => generate(localName, resourcePath.replace(QUERY_RE$2, ""));
+}
 function SSRStylesPlugin(nuxt) {
 	if (nuxt.options.dev) return;
 	const chunksWithInlinedCSS = /* @__PURE__ */ new Set();
@@ -774,6 +800,13 @@ function SSRStylesPlugin(nuxt) {
 	let entry;
 	return {
 		name: "ssr-styles",
+		config(config) {
+			if (!nuxt.options.features.inlineStyles) return;
+			const modules = config.css?.modules;
+			if (typeof modules !== "object" || !modules || typeof modules.generateScopedName !== "string") return;
+			const hashPrefix = typeof modules.hashPrefix === "string" ? modules.hashPrefix : "";
+			modules.generateScopedName = wrapStringGenerateScopedName(modules.generateScopedName, hashPrefix);
+		},
 		configResolved(config) {
 			entry = resolveClientEntry(config);
 		},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/vite-builder-nightly",
-  "version": "5.0.0-29741513.94de156f",
+  "version": "5.0.0-29741521.e01f6e8b",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -24,12 +24,13 @@
     "dist"
   ],
   "dependencies": {
-    "@nuxt/kit": "npm:@nuxt/kit-nightly@5.0.0-29741513.94de156f",
+    "@nuxt/kit": "npm:@nuxt/kit-nightly@5.0.0-29741521.e01f6e8b",
     "@vitejs/plugin-vue": "^6.0.8",
     "consola": "^3.4.2",
     "defu": "^6.1.7",
     "escape-string-regexp": "^5.0.0",
     "exsolve": "^1.1.0",
+    "generic-names": "^4.0.0",
     "get-port-please": "^3.2.0",
     "jiti": "^2.7.0",
     "js-tokens": "^10.0.0",
@@ -51,7 +52,7 @@
   "devDependencies": {
     "@babel/plugin-proposal-decorators": "8.0.2",
     "@babel/plugin-syntax-jsx": "8.0.1",
-    "@nuxt/schema": "npm:@nuxt/schema-nightly@5.0.0-29741513.94de156f",
+    "@nuxt/schema": "npm:@nuxt/schema-nightly@5.0.0-29741521.e01f6e8b",
     "@vitejs/plugin-vue-jsx": "5.1.6",
     "autoprefixer": "10.5.4",
     "cssnano": "8.0.2",
@@ -71,7 +72,7 @@
     "@vitejs/plugin-vue-jsx": "^5.1.5",
     "autoprefixer": "^10.4.27",
     "cssnano": "^7.1.3 || ^8.0.0",
-    "nuxt": "npm:nuxt-nightly@5.0.0-29741513.94de156f",
+    "nuxt": "npm:nuxt-nightly@5.0.0-29741521.e01f6e8b",
     "rollup-plugin-visualizer": "^6.0.0 || ^7.0.1",
     "vue": "^3.3.4"
   },