@nuxt/vite-builder-nightly 4.3.0-29436247.ecea7a86 → 4.3.0-29436330.9aa80014

package/dist/index.mjs

@@ -1260,27 +1260,32 @@ const SourcemapPreserverPlugin = (nuxt) => {
   if (!nuxt.options.sourcemap.server || nuxt.options.dev) {
     return [];
   }
-  const nitroPlugin = {
+  const nitroPlugin = () => ({
     name: "nuxt:sourcemap-import",
-    async load(id) {
-      id = resolve(id);
-      if (!ids.has(id)) {
-        return;
-      }
-      const [code, map] = await Promise.all([
-        readFile(id, "utf-8").catch(() => void 0),
-        readFile(id + ".map.json", "utf-8").catch(() => void 0)
-      ]);
-      if (!code) {
-        this.warn("Failed loading file");
-        return null;
+    load: {
+      filter: {
+        id: new RegExp("^(\\w:)?" + escapeStringRegexp(outputDir.replace(/\/?$/, "/")).replace(/\//g, "[\\\\/]"))
+      },
+      async handler(id) {
+        id = resolve(id);
+        if (!ids.has(id)) {
+          return;
+        }
+        const [code, map] = await Promise.all([
+          readFile(id, "utf-8").catch(() => void 0),
+          readFile(id + ".map.json", "utf-8").catch(() => void 0)
+        ]);
+        if (!code) {
+          this.warn("Failed loading file");
+          return null;
+        }
+        return {
+          code,
+          map
+        };
       }
-      return {
-        code,
-        map
-      };
     }
-  };
+  });
   nuxt.hook("nitro:build:before", (nitro) => {
     nitro.options.rollupConfig = defu(nitro.options.rollupConfig, {
       plugins: [nitroPlugin]
@@ -1753,108 +1758,116 @@ function SSRStylesPlugin(nuxt) {
           }
           return null;
         },
-        async transform(code, id) {
-          if (environment.name === "client") {
-            if (id === entry && (options.shouldInline === true || typeof options.shouldInline === "function" && options.shouldInline(id))) {
-              const s = new MagicString(code);
-              const idClientCSSMap = clientCSSMap[id] ||= /* @__PURE__ */ new Set();
-              if (!options.globalCSS.length) {
-                return;
-              }
-              for (const file of options.globalCSS) {
-                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);
-                if (!resolved || !res) {
-                  if (!warnCache.has(file)) {
-                    warnCache.add(file);
-                    this.warn(`[nuxt] Cannot extract styles for \`${file}\`. Its styles will not be inlined when server-rendering.`);
-                  }
-                  s.prepend(`${genImport(file)}
+        transform: {
+          filter: {
+            id: {
+              include: environment.name === "client" ? new RegExp("^" + escapeStringRegexp(entry) + "$") : void 0,
+              exclude: environment.name === "client" ? [] : [/\?.*macro=/, /\?.*nuxt_component=/]
+            }
+          },
+          async handler(code, id) {
+            if (environment.name === "client") {
+              if (id === entry && (options.shouldInline === true || typeof options.shouldInline === "function" && options.shouldInline(id))) {
+                const s = new MagicString(code);
+                const idClientCSSMap = clientCSSMap[id] ||= /* @__PURE__ */ new Set();
+                if (!options.globalCSS.length) {
+                  return;
+                }
+                for (const file of options.globalCSS) {
+                  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);
+                  if (!resolved || !res) {
+                    if (!warnCache.has(file)) {
+                      warnCache.add(file);
+                      this.warn(`[nuxt] Cannot extract styles for \`${file}\`. Its styles will not be inlined when server-rendering.`);
+                    }
+                    s.prepend(`${genImport(file)}
 `);
-                  continue;
+                    continue;
+                  }
+                  idClientCSSMap.add(resolved.id);
+                }
+                if (s.hasChanged()) {
+                  return {
+                    code: s.toString(),
+                    map: s.generateMap({ hires: true })
+                  };
                 }
-                idClientCSSMap.add(resolved.id);
-              }
-              if (s.hasChanged()) {
-                return {
-                  code: s.toString(),
-                  map: s.generateMap({ hires: true })
-                };
               }
+              return;
             }
-            return;
-          }
-          const { pathname, search } = parseURL(decodeURIComponent(pathToFileURL(id).href));
-          if (!(id in clientCSSMap) && !islandPaths.has(pathname)) {
-            return;
-          }
-          const query = parseQuery(search);
-          if (query.macro || query.nuxt_component) {
-            return;
-          }
-          if (!islandPaths.has(pathname)) {
-            if (options.shouldInline === false || typeof options.shouldInline === "function" && !options.shouldInline(id)) {
+            const { pathname, search } = parseURL(decodeURIComponent(pathToFileURL(id).href));
+            if (!(id in clientCSSMap) && !islandPaths.has(pathname)) {
               return;
             }
-          }
-          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 query = parseQuery(search);
+            if (query.macro || query.nuxt_component) {
+              return;
             }
-            const fileInline = file + "?inline&used";
-            const resolved = await this.resolve(file) ?? await this.resolve(file, id);
-            const res = await this.resolve(fileInline) ?? await this.resolve(fileInline, id);
-            if (!resolved || !res) {
-              if (!warnCache.has(file)) {
-                warnCache.add(file);
-                this.warn(`[nuxt] Cannot extract styles for \`${file}\`. Its styles will not be inlined when server-rendering.`);
+            if (!islandPaths.has(pathname)) {
+              if (options.shouldInline === false || typeof options.shouldInline === "function" && !options.shouldInline(id)) {
+                return;
               }
-              continue;
             }
-            emittedIds.add(file);
-            const ref = this.emitFile({
-              type: "chunk",
-              name: `${idFilename}-styles-${++styleCtr}.mjs`,
-              id: fileInline
-            });
-            idRefMap[relativeToSrcDir(file)] = ref;
-            idMap.files.push(ref);
-          }
-          if (!SUPPORTED_FILES_RE.test(pathname)) {
-            return;
-          }
-          for (const i of findStaticImports(code)) {
-            if (!i.specifier.endsWith(".css") && parseQuery(i.specifier).type !== "style") {
-              continue;
+            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(fileInline) ?? await this.resolve(fileInline, id);
+              if (!resolved || !res) {
+                if (!warnCache.has(file)) {
+                  warnCache.add(file);
+                  this.warn(`[nuxt] Cannot extract styles for \`${file}\`. Its styles will not be inlined when server-rendering.`);
+                }
+                continue;
+              }
+              emittedIds.add(file);
+              const ref = this.emitFile({
+                type: "chunk",
+                name: `${idFilename}-styles-${++styleCtr}.mjs`,
+                id: fileInline
+              });
+              idRefMap[relativeToSrcDir(file)] = ref;
+              idMap.files.push(ref);
             }
-            const resolved = await this.resolve(i.specifier, id);
-            if (!resolved) {
-              continue;
+            if (!SUPPORTED_FILES_RE.test(pathname)) {
+              return;
             }
-            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.`);
+            for (const i of findStaticImports(code)) {
+              if (!i.specifier.endsWith(".css") && parseQuery(i.specifier).type !== "style") {
+                continue;
               }
-              continue;
-            }
-            if (emittedIds.has(resolved.id)) {
-              continue;
+              const resolved = await this.resolve(i.specifier, id);
+              if (!resolved) {
+                continue;
+              }
+              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.`);
+                }
+                continue;
+              }
+              if (emittedIds.has(resolved.id)) {
+                continue;
+              }
+              const ref = this.emitFile({
+                type: "chunk",
+                name: `${idFilename}-styles-${++styleCtr}.mjs`,
+                id: resolvedIdInline
+              });
+              idRefMap[relativeToSrcDir(resolved.id)] = ref;
+              idMap.files.push(ref);
             }
-            const ref = this.emitFile({
-              type: "chunk",
-              name: `${idFilename}-styles-${++styleCtr}.mjs`,
-              id: resolvedIdInline
-            });
-            idRefMap[relativeToSrcDir(resolved.id)] = ref;
-            idMap.files.push(ref);
           }
         }
       };
@@ -1906,15 +1919,17 @@ function LayerDepOptimizePlugin(nuxt) {
     return {
       name: "nuxt:optimize-layer-deps",
       enforce: "pre",
-      async resolveId(source, _importer) {
-        if (!_importer || !dirs.length) {
-          return;
-        }
-        const importer = normalize(_importer);
-        const layerIndex = dirs.findIndex((dir) => importer.startsWith(dir));
-        if (layerIndex !== -1) {
-          dirs.splice(layerIndex, 1);
-          await this.resolve(source, join(nuxt.options.srcDir, "index.html"), { skipSelf: true }).catch(() => null);
+      resolveId: {
+        async handler(source, _importer) {
+          if (!_importer) {
+            return;
+          }
+          const importer = normalize(_importer);
+          const layerIndex = dirs.findIndex((dir) => importer.startsWith(dir));
+          if (layerIndex !== -1) {
+            dirs.splice(layerIndex, 1);
+            await this.resolve(source, join(nuxt.options.srcDir, "index.html"), { skipSelf: true }).catch(() => null);
+          }
         }
       }
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxt/vite-builder-nightly",
-  "version": "4.3.0-29436247.ecea7a86",
+  "version": "4.3.0-29436330.9aa80014",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nuxt/nuxt.git",
@@ -25,7 +25,7 @@
     "dist"
   ],
   "devDependencies": {
-    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.3.0-29436247.ecea7a86",
+    "@nuxt/schema": "npm:@nuxt/schema-nightly@4.3.0-29436330.9aa80014",
     "nitropack": "2.12.9",
     "rolldown": "1.0.0-beta.54",
     "rollup": "4.53.4",
@@ -33,7 +33,7 @@
     "vue": "3.5.25"
   },
   "dependencies": {
-    "@nuxt/kit": "npm:@nuxt/kit-nightly@4.3.0-29436247.ecea7a86",
+    "@nuxt/kit": "npm:@nuxt/kit-nightly@4.3.0-29436330.9aa80014",
     "@rollup/plugin-replace": "^6.0.3",
     "@vitejs/plugin-vue": "^6.0.3",
     "@vitejs/plugin-vue-jsx": "^5.1.2",
@@ -65,7 +65,7 @@
     "vue-bundle-renderer": "^2.2.0"
   },
   "peerDependencies": {
-    "nuxt": "npm:nuxt-nightly@4.3.0-29436247.ecea7a86",
+    "nuxt": "npm:nuxt-nightly@4.3.0-29436330.9aa80014",
     "rolldown": "^1.0.0-beta.38",
     "vue": "^3.3.4"
   },