@nuxt/vite-builder-nightly 4.2.3-29426963.691e6887 → 4.2.3-29427013.01d459e0

package/dist/index.mjs

@@ -142,7 +142,7 @@ function resolveServerEntry(config) {
   throw new Error("No entry found in rollupOptions.input");
 }
 
-const QUERY_RE$1 = /\?.+$/;
+const QUERY_RE$2 = /\?.+$/;
 function TypeCheckPlugin(nuxt) {
   let entry;
   let sourcemap;
@@ -161,7 +161,7 @@ function TypeCheckPlugin(nuxt) {
       }
     },
     transform(code, id) {
-      if (id.replace(QUERY_RE$1, "") !== entry) {
+      if (id.replace(QUERY_RE$2, "") !== entry) {
         return;
       }
       const s = new MagicString(code);
@@ -174,7 +174,7 @@ function TypeCheckPlugin(nuxt) {
   };
 }
 
-const QUERY_RE = /\?.+$/;
+const QUERY_RE$1 = /\?.+$/;
 function ModulePreloadPolyfillPlugin() {
   let isDisabled = false;
   let entry;
@@ -192,7 +192,7 @@ function ModulePreloadPolyfillPlugin() {
       }
     },
     transform(code, id) {
-      if (isDisabled || id.replace(QUERY_RE, "") !== entry) {
+      if (isDisabled || id.replace(QUERY_RE$1, "") !== entry) {
         return;
       }
       const s = new MagicString(code);
@@ -1587,6 +1587,7 @@ async function resolveCSSOptions(nuxt) {
 }
 
 const SUPPORTED_FILES_RE = /\.(?:vue|(?:[cm]?j|t)sx?)$/;
+const QUERY_RE = /\?.+$/;
 function SSRStylesPlugin(nuxt) {
   if (nuxt.options.dev) {
     return;
@@ -1617,13 +1618,22 @@ function SSRStylesPlugin(nuxt) {
     shouldInline: nuxt.options.features.inlineStyles,
     globalCSS: nuxt.options.css
   };
-  const relativeToSrcDir = (path) => relative(nuxt.options.srcDir, path);
+  const relativeCache = /* @__PURE__ */ new Map();
+  const relativeToSrcDir = (path) => {
+    let cached = relativeCache.get(path);
+    if (cached === void 0) {
+      cached = relative(nuxt.options.srcDir, path);
+      relativeCache.set(path, cached);
+    }
+    return cached;
+  };
   const warnCache = /* @__PURE__ */ new Set();
   const components = nuxt.apps.default.components || [];
   const islands = components.filter(
     (component) => component.island || // .server components without a corresponding .client component will need to be rendered as an island
     component.mode === "server" && !components.some((c) => c.pascalName === component.pascalName && c.mode === "client")
   );
+  const islandPaths = new Set(islands.map((c) => c.filePath));
   let entry;
   return {
     name: "ssr-styles",
@@ -1638,6 +1648,11 @@ function SSRStylesPlugin(nuxt) {
         enforce: "pre",
         resolveId: {
           order: "pre",
+          filter: {
+            id: {
+              include: [/^#build\/css$/, /\.vue$/, IS_CSS_RE]
+            }
+          },
           async handler(id, importer, _options) {
             if (options.shouldInline === false || typeof options.shouldInline === "function" && !options.shouldInline(importer)) {
               return;
@@ -1734,7 +1749,7 @@ function SSRStylesPlugin(nuxt) {
             }
             const relativePath = relativeToSrcDir(moduleId);
             if (relativePath in cssMap) {
-              cssMap[relativePath].inBundle = cssMap[relativePath].inBundle ?? (isVue(moduleId) && !!relativeToSrcDir(moduleId) || isEntry);
+              cssMap[relativePath].inBundle = cssMap[relativePath].inBundle ?? (isVue(moduleId) && !!relativePath || isEntry);
             }
           }
           return null;
@@ -1771,14 +1786,14 @@ function SSRStylesPlugin(nuxt) {
             return;
           }
           const { pathname, search } = parseURL(decodeURIComponent(pathToFileURL(id).href));
-          if (!(id in clientCSSMap) && !islands.some((c) => c.filePath === pathname)) {
+          if (!(id in clientCSSMap) && !islandPaths.has(pathname)) {
             return;
           }
           const query = parseQuery(search);
           if (query.macro || query.nuxt_component) {
             return;
           }
-          if (!islands.some((c) => c.filePath === pathname)) {
+          if (!islandPaths.has(pathname)) {
             if (options.shouldInline === false || typeof options.shouldInline === "function" && !options.shouldInline(id)) {
               return;
             }
@@ -1786,11 +1801,16 @@ function SSRStylesPlugin(nuxt) {
           const relativeId = relativeToSrcDir(id);
           const idMap = cssMap[relativeId] ||= { files: [] };
           const emittedIds = /* @__PURE__ */ new Set();
+          const idFilename = filename(id);
           let styleCtr = 0;
           const ids = clientCSSMap[id] || [];
           for (const file of ids) {
+            if (emittedIds.has(file)) {
+              continue;
+            }
+            const fileInline = file + "?inline&used";
             const resolved = await this.resolve(file) ?? await this.resolve(file, id);
-            const res = await this.resolve(file + "?inline&used") ?? await this.resolve(file + "?inline&used", id);
+            const res = await this.resolve(fileInline) ?? await this.resolve(fileInline, id);
             if (!resolved || !res) {
               if (!warnCache.has(file)) {
                 warnCache.add(file);
@@ -1798,13 +1818,11 @@ function SSRStylesPlugin(nuxt) {
               }
               continue;
             }
-            if (emittedIds.has(file)) {
-              continue;
-            }
+            emittedIds.add(file);
             const ref = this.emitFile({
               type: "chunk",
-              name: `${filename(id)}-styles-${++styleCtr}.mjs`,
-              id: file + "?inline&used"
+              name: `${idFilename}-styles-${++styleCtr}.mjs`,
+              id: fileInline
             });
             idRefMap[relativeToSrcDir(file)] = ref;
             idMap.files.push(ref);
@@ -1813,15 +1831,15 @@ function SSRStylesPlugin(nuxt) {
             return;
           }
           for (const i of findStaticImports(code)) {
-            const { type } = parseQuery(i.specifier);
-            if (type !== "style" && !i.specifier.endsWith(".css")) {
+            if (!i.specifier.endsWith(".css") && parseQuery(i.specifier).type !== "style") {
               continue;
             }
             const resolved = await this.resolve(i.specifier, id);
             if (!resolved) {
               continue;
             }
-            if (!await this.resolve(resolved.id + "?inline&used")) {
+            const resolvedIdInline = resolved.id + "?inline&used";
+            if (!await this.resolve(resolvedIdInline)) {
               if (!warnCache.has(resolved.id)) {
                 warnCache.add(resolved.id);
                 this.warn(`[nuxt] Cannot extract styles for \`${i.specifier}\`. Its styles will not be inlined when server-rendering.`);
@@ -1833,8 +1851,8 @@ function SSRStylesPlugin(nuxt) {
             }
             const ref = this.emitFile({
               type: "chunk",
-              name: `${filename(id)}-styles-${++styleCtr}.mjs`,
-              id: resolved.id + "?inline&used"
+              name: `${idFilename}-styles-${++styleCtr}.mjs`,
+              id: resolvedIdInline
             });
             idRefMap[relativeToSrcDir(resolved.id)] = ref;
             idMap.files.push(ref);
@@ -1845,7 +1863,7 @@ function SSRStylesPlugin(nuxt) {
   };
 }
 function filename(name) {
-  return filename$1(name.replace(/\?.+$/, ""));
+  return filename$1(name.replace(QUERY_RE, ""));
 }
 
 function ReplacePlugin() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/vite-builder-nightly",
-  "version": "4.2.3-29426963.691e6887",
+  "version": "4.2.3-29427013.01d459e0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -21,7 +21,7 @@
     "dist"
   ],
   "devDependencies": {
-    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.2.3-29426963.691e6887",
+    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.2.3-29427013.01d459e0",
     "nitropack": "2.12.9",
     "rolldown": "1.0.0-beta.53",
     "rollup": "4.53.3",
@@ -29,7 +29,7 @@
     "vue": "3.5.25"
   },
   "dependencies": {
-    "@nuxt/kit": "npm:@nuxt/kit-nightly@4.2.3-29426963.691e6887",
+    "@nuxt/kit": "npm:@nuxt/kit-nightly@4.2.3-29427013.01d459e0",
     "@rollup/plugin-replace": "^6.0.3",
     "@vitejs/plugin-vue": "^6.0.2",
     "@vitejs/plugin-vue-jsx": "^5.1.2",
@@ -61,7 +61,7 @@
     "vue-bundle-renderer": "^2.2.0"
   },
   "peerDependencies": {
-    "nuxt": "npm:nuxt-nightly@4.2.3-29426963.691e6887",
+    "nuxt": "npm:nuxt-nightly@4.2.3-29427013.01d459e0",
     "rolldown": "^1.0.0-beta.38",
     "vue": "^3.3.4"
   },