vite 5.4.1 → 5.4.2

package/dist/node/chunks/{dep-BkYu-SNl.js → dep-B8yndt7W.js}

@@ -1,4 +1,4 @@
-import { C as commonjsGlobal, B as getDefaultExportFromCjs } from './dep-Cy9twKMn.js';
+import { C as commonjsGlobal, B as getDefaultExportFromCjs } from './dep-BzOvws4Y.js';
 import require$$0__default from 'fs';
 import require$$0 from 'postcss';
 import require$$0$1 from 'path';
@@ -2615,7 +2615,7 @@ types.UNIVERSAL = UNIVERSAL;
 	function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 	function _interopRequireWildcard(obj, nodeInterop) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-	function _createForOfIteratorHelperLoose(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (it) return (it = it.call(o)).next.bind(it); if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike  ) { if (it) o = it; var i = 0; return function () { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+	function _createForOfIteratorHelperLoose(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (it) return (it = it.call(o)).next.bind(it); if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike) { if (it) o = it; var i = 0; return function () { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 	function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 	function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 	function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }

package/dist/node/chunks/{dep-Cy9twKMn.js → dep-BzOvws4Y.js}

@@ -20344,7 +20344,7 @@ async function fileToUrl$1(id, config, ctx) {
     return fileToBuiltUrl(id, config, ctx);
   }
 }
-function fileToDevUrl(id, config) {
+function fileToDevUrl(id, config, skipBase = false) {
   let rtn;
   if (checkPublicFile(id, config)) {
     rtn = id;
@@ -20353,6 +20353,9 @@ function fileToDevUrl(id, config) {
   } else {
     rtn = path$n.posix.join(FS_PREFIX, id);
   }
+  if (skipBase) {
+    return rtn;
+  }
   const base = joinUrlSegments(config.server?.origin ?? "", config.decodedBase);
   return joinUrlSegments(base, removeLeadingSlash(rtn));
 }
@@ -20408,14 +20411,15 @@ async function fileToBuiltUrl(id, config, pluginContext, skipPublicCheck = false
   } else {
     const { search, hash } = parse$h(id);
     const postfix = (search || "") + (hash || "");
+    const originalFileName = normalizePath$3(path$n.relative(config.root, file));
     const referenceId = pluginContext.emitFile({
+      type: "asset",
       // Ignore directory structure for asset file names
       name: path$n.basename(file),
-      type: "asset",
+      originalFileName,
       source: content
     });
-    const originalName = normalizePath$3(path$n.relative(config.root, file));
-    generatedAssets.get(config).set(referenceId, { originalName });
+    generatedAssets.get(config).set(referenceId, { originalFileName });
     url = `__VITE_ASSET__${referenceId}__${postfix ? `$_${postfix}__` : ``}`;
   }
   cache.set(id, url);
@@ -20526,40 +20530,42 @@ function manifestPlugin(config) {
         if (isEntry) manifestChunk.isEntry = true;
         return manifestChunk;
       }
-      const fileNameToAssetMeta = /* @__PURE__ */ new Map();
       const assets = generatedAssets.get(config);
-      assets.forEach((asset, referenceId) => {
-        try {
-          const fileName = this.getFileName(referenceId);
-          fileNameToAssetMeta.set(fileName, asset);
-        } catch (error) {
-          assets.delete(referenceId);
+      const entryCssAssetFileNames = /* @__PURE__ */ new Set();
+      for (const [id, asset] of assets.entries()) {
+        if (asset.isEntry) {
+          try {
+            const fileName = this.getFileName(id);
+            entryCssAssetFileNames.add(fileName);
+          } catch (error) {
+            assets.delete(id);
+          }
         }
-      });
+      }
       const fileNameToAsset = /* @__PURE__ */ new Map();
       for (const file in bundle) {
         const chunk = bundle[file];
         if (chunk.type === "chunk") {
           manifest[getChunkName(chunk)] = createChunk(chunk);
         } else if (chunk.type === "asset" && typeof chunk.name === "string") {
-          const assetMeta = fileNameToAssetMeta.get(chunk.fileName);
-          const src = assetMeta?.originalName ?? chunk.name;
-          const asset = createAsset(chunk, src, assetMeta?.isEntry);
+          const src = chunk.originalFileName ?? chunk.name;
+          const isEntry = entryCssAssetFileNames.has(chunk.fileName);
+          const asset = createAsset(chunk, src, isEntry);
           const file2 = manifest[src]?.file;
           if (file2 && endsWithJSRE.test(file2)) continue;
           manifest[src] = asset;
           fileNameToAsset.set(chunk.fileName, asset);
         }
       }
-      assets.forEach(({ originalName }, referenceId) => {
-        if (!manifest[originalName]) {
+      for (const [referenceId, { originalFileName }] of assets.entries()) {
+        if (!manifest[originalFileName]) {
           const fileName = this.getFileName(referenceId);
           const asset = fileNameToAsset.get(fileName);
           if (asset) {
-            manifest[originalName] = asset;
+            manifest[originalFileName] = asset;
           }
         }
-      });
+      }
       outputCount++;
       const output = config.build.rollupOptions?.output;
       const outputLength = Array.isArray(output) ? output.length : 1;
@@ -32456,9 +32462,6 @@ function getFirstKeyStartProps(prev) {
                 break loop;
         }
     }
-    while (prev[++i]?.type === 'space') {
-        /* loop */
-    }
     return prev.splice(i, prev.length);
 }
 function fixFlowSeqItems(fc) {
@@ -35601,6 +35604,7 @@ ${js}`;
         );
         this.emitFile({
           type: "asset",
+          originalFileName: normalizedId,
           fileName: shortEmitName,
           source: result
         });
@@ -36163,8 +36167,9 @@ function cssPostPlugin(config) {
     } else {
       return path$n.dirname(
         assetFileNames({
-          name: cssAssetName,
           type: "asset",
+          name: cssAssetName,
+          originalFileName: null,
           source: "/* vite internal call, ignore */"
         })
       );
@@ -36334,9 +36339,9 @@ function cssPostPlugin(config) {
         while (match = cssUrlAssetRE.exec(code)) {
           const [full, idHex] = match;
           const id = Buffer.from(idHex, "hex").toString();
-          const originalFilename = cleanUrl(id);
+          const originalFileName = cleanUrl(id);
           const cssAssetName = ensureFileExt(
-            path$n.basename(originalFilename),
+            path$n.basename(originalFileName),
             ".css"
           );
           if (!styles.has(id)) {
@@ -36348,7 +36353,7 @@ function cssPostPlugin(config) {
           cssContent = resolveAssetUrlsInCss(cssContent, cssAssetName);
           urlEmitTasks.push({
             cssAssetName,
-            originalFilename,
+            originalFileName,
             content: cssContent,
             start: match.index,
             end: match.index + full.length
@@ -36370,17 +36375,18 @@ function cssPostPlugin(config) {
         s ||= new MagicString(code);
         for (const {
           cssAssetName,
-          originalFilename,
+          originalFileName,
           content,
           start,
           end
         } of urlEmitTasks) {
           const referenceId = this.emitFile({
-            name: cssAssetName,
             type: "asset",
+            name: cssAssetName,
+            originalFileName,
             source: content
           });
-          generatedAssets.get(config).set(referenceId, { originalName: originalFilename });
+          generatedAssets.get(config).set(referenceId, { originalFileName });
           const filename = this.getFileName(referenceId);
           chunk.viteMetadata.importedAssets.add(cleanUrl(filename));
           const replacement = toOutputFilePathInJS(
@@ -36404,7 +36410,7 @@ function cssPostPlugin(config) {
             const isEntry = chunk.isEntry && isPureCssChunk;
             const cssFullAssetName = ensureFileExt(chunk.name, ".css");
             const cssAssetName = chunk.isEntry && (!chunk.facadeModuleId || !isCSSRequest(chunk.facadeModuleId)) ? path$n.basename(cssFullAssetName) : cssFullAssetName;
-            const originalFilename = getChunkOriginalFileName(
+            const originalFileName = getChunkOriginalFileName(
               chunk,
               config.root,
               opts.format
@@ -36414,11 +36420,12 @@ function cssPostPlugin(config) {
               return finalizeCss(chunkCSS, true, config);
             });
             const referenceId = this.emitFile({
-              name: cssAssetName,
               type: "asset",
+              name: cssAssetName,
+              originalFileName,
               source: chunkCSS
             });
-            generatedAssets.get(config).set(referenceId, { originalName: originalFilename, isEntry });
+            generatedAssets.get(config).set(referenceId, { originalFileName, isEntry });
             chunk.viteMetadata.importedCss.add(this.getFileName(referenceId));
           } else if (!config.build.ssr) {
             chunkCSS = await finalizeCss(chunkCSS, true, config);
@@ -36568,13 +36575,14 @@ function cssAnalysisPlugin(config) {
         const pluginImports = this._addedImports;
         if (pluginImports) {
           const depModules = /* @__PURE__ */ new Set();
-          const devBase = config.base;
           for (const file of pluginImports) {
             depModules.add(
               isCSSRequest(file) ? moduleGraph.createFileOnlyEntry(file) : await moduleGraph.ensureEntryFromUrl(
-                stripBase(
-                  await fileToUrl$1(file, config, this),
-                  (config.server?.origin ?? "") + devBase
+                fileToDevUrl(
+                  file,
+                  config,
+                  /* skipBase */
+                  true
                 ),
                 ssr
               )
@@ -36925,8 +36933,8 @@ function createCachedImport(imp) {
     return cached;
   };
 }
-const importPostcssImport = createCachedImport(() => import('./dep-SDtFYyy1.js').then(function (n) { return n.i; }));
-const importPostcssModules = createCachedImport(() => import('./dep-BkYu-SNl.js').then(function (n) { return n.i; }));
+const importPostcssImport = createCachedImport(() => import('./dep-CHbHjMYU.js').then(function (n) { return n.i; }));
+const importPostcssModules = createCachedImport(() => import('./dep-B8yndt7W.js').then(function (n) { return n.i; }));
 const importPostcss = createCachedImport(() => import('postcss'));
 const preprocessorWorkerControllerCache = /* @__PURE__ */ new WeakMap();
 let alwaysFakeWorkerWorkerControllerCache;
@@ -47548,6 +47556,7 @@ async function bundleWorkerEntry(config, id) {
       } else if (outputChunk2.type === "chunk") {
         saveEmitWorkerAsset(config, {
           fileName: outputChunk2.fileName,
+          originalFileName: null,
           source: outputChunk2.code
         });
       }
@@ -47565,6 +47574,7 @@ function emitSourcemapForWorkerEntry(config, chunk) {
       const mapFileName = chunk.fileName + ".map";
       saveEmitWorkerAsset(config, {
         fileName: mapFileName,
+        originalFileName: null,
         source: data
       });
     }
@@ -47588,6 +47598,7 @@ async function workerFileToUrl(config, id) {
     fileName = outputChunk.fileName;
     saveEmitWorkerAsset(config, {
       fileName,
+      originalFileName: null,
       source: outputChunk.code
     });
     workerMap.bundle.set(id, fileName);
@@ -47812,6 +47823,7 @@ function webWorkerPlugin(config) {
         this.emitFile({
           type: "asset",
           fileName: asset.fileName,
+          originalFileName: asset.originalFileName,
           source: asset.source
         });
       });
@@ -64481,17 +64493,11 @@ function buildImportAnalysisPlugin(config) {
   const insertPreload = !(ssr || !!config.build.lib || isWorker);
   const renderBuiltUrl = config.experimental.renderBuiltUrl;
   const isRelativeBase = config.base === "./" || config.base === "";
-  const optimizeModulePreloadRelativePaths = isRelativeBase && !renderBuiltUrl;
   const { modulePreload } = config.build;
   const scriptRel2 = modulePreload && modulePreload.polyfill ? `'modulepreload'` : `(${detectScriptRel.toString()})()`;
-  const assetsURL2 = renderBuiltUrl ? (
-    // If `experimental.renderBuiltUrl` is used, the dependencies are already resolved.
-    // To avoid the need for `new URL(dep, import.meta.url)`, a helper `__vitePreloadRelativeDep` is
-    // used to resolve from relative paths which can be minimized.
-    `function(dep, importerUrl) { return dep[0] === '.' ? new URL(dep, importerUrl).href : dep }`
-  ) : optimizeModulePreloadRelativePaths ? (
-    // If there isn't custom resolvers affecting the deps list, deps in the list are relative
-    // to the current chunk and are resolved to absolute URL by the __vitePreload helper itself.
+  const assetsURL2 = renderBuiltUrl || isRelativeBase ? (
+    // If `experimental.renderBuiltUrl` is used, the dependencies might be relative to the current chunk.
+    // If relative base is used, the dependencies are relative to the current chunk.
     // The importerUrl is passed as third parameter to __vitePreload in this case
     `function(dep, importerUrl) { return new URL(dep, importerUrl).href }`
   ) : (
@@ -64585,7 +64591,7 @@ function buildImportAnalysisPlugin(config) {
           }
           str().appendRight(
             expEnd,
-            `,${isModernFlag}?${preloadMarker}:void 0${optimizeModulePreloadRelativePaths || renderBuiltUrl ? ",import.meta.url" : ""})`
+            `,${isModernFlag}?${preloadMarker}:void 0${renderBuiltUrl || isRelativeBase ? ",import.meta.url" : ""})`
           );
         }
       }
@@ -64808,7 +64814,7 @@ function buildImportAnalysisPlugin(config) {
                     (d) => (
                       // Don't include the assets dir if the default asset file names
                       // are used, the path will be reconstructed by the import preload helper
-                      optimizeModulePreloadRelativePaths ? addFileDep(toRelativePath(d, file)) : addFileDep(d)
+                      isRelativeBase ? addFileDep(toRelativePath(d, file)) : addFileDep(d)
                     )
                   );
                 }

package/dist/node/chunks/{dep-SDtFYyy1.js → dep-CHbHjMYU.js}

@@ -1,4 +1,4 @@
-import { B as getDefaultExportFromCjs } from './dep-Cy9twKMn.js';
+import { B as getDefaultExportFromCjs } from './dep-BzOvws4Y.js';
 import require$$0 from 'path';
 import require$$0__default from 'fs';
 import { l as lib } from './dep-IQS-Za7F.js';

package/dist/node/cli.js

@@ -2,7 +2,7 @@ import path from 'node:path';
 import fs__default from 'node:fs';
 import { performance } from 'node:perf_hooks';
 import { EventEmitter } from 'events';
-import { A as colors, v as createLogger, r as resolveConfig } from './chunks/dep-Cy9twKMn.js';
+import { A as colors, v as createLogger, r as resolveConfig } from './chunks/dep-BzOvws4Y.js';
 import { VERSION } from './constants.js';
 import 'node:fs/promises';
 import 'node:url';
@@ -730,7 +730,7 @@ cli.command("[root]", "start dev server").alias("serve").alias("dev").option("--
   `[boolean] force the optimizer to ignore the cache and re-bundle`
 ).action(async (root, options) => {
   filterDuplicateOptions(options);
-  const { createServer } = await import('./chunks/dep-Cy9twKMn.js').then(function (n) { return n.E; });
+  const { createServer } = await import('./chunks/dep-BzOvws4Y.js').then(function (n) { return n.E; });
   try {
     const server = await createServer({
       root,
@@ -822,7 +822,7 @@ cli.command("build [root]", "build for production").option("--target <target>",
   `[boolean] force empty outDir when it's outside of root`
 ).option("-w, --watch", `[boolean] rebuilds when modules have changed on disk`).action(async (root, options) => {
   filterDuplicateOptions(options);
-  const { build } = await import('./chunks/dep-Cy9twKMn.js').then(function (n) { return n.F; });
+  const { build } = await import('./chunks/dep-BzOvws4Y.js').then(function (n) { return n.F; });
   const buildOptions = cleanOptions(options);
   try {
     await build({
@@ -851,7 +851,7 @@ cli.command("optimize [root]", "pre-bundle dependencies").option(
 ).action(
   async (root, options) => {
     filterDuplicateOptions(options);
-    const { optimizeDeps } = await import('./chunks/dep-Cy9twKMn.js').then(function (n) { return n.D; });
+    const { optimizeDeps } = await import('./chunks/dep-BzOvws4Y.js').then(function (n) { return n.D; });
     try {
       const config = await resolveConfig(
         {
@@ -877,7 +877,7 @@ ${e.stack}`),
 cli.command("preview [root]", "locally preview production build").option("--host [host]", `[string] specify hostname`, { type: [convertHost] }).option("--port <port>", `[number] specify port`).option("--strictPort", `[boolean] exit if specified port is already in use`).option("--open [path]", `[boolean | string] open browser on startup`).option("--outDir <dir>", `[string] output directory (default: dist)`).action(
   async (root, options) => {
     filterDuplicateOptions(options);
-    const { preview } = await import('./chunks/dep-Cy9twKMn.js').then(function (n) { return n.G; });
+    const { preview } = await import('./chunks/dep-BzOvws4Y.js').then(function (n) { return n.G; });
     try {
       const server = await preview({
         root,

package/dist/node/index.js

@@ -1,6 +1,6 @@
 export { parseAst, parseAstAsync } from 'rollup/parseAst';
-import { i as isInNodeModules, a as arraify } from './chunks/dep-Cy9twKMn.js';
-export { b as build, g as buildErrorMessage, k as createFilter, v as createLogger, c as createServer, d as defineConfig, h as fetchModule, f as formatPostcssSourceMap, x as isFileServingAllowed, l as loadConfigFromFile, y as loadEnv, j as mergeAlias, m as mergeConfig, n as normalizePath, o as optimizeDeps, e as preprocessCSS, p as preview, r as resolveConfig, z as resolveEnvPrefix, q as rollupVersion, w as searchForWorkspaceRoot, u as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-Cy9twKMn.js';
+import { i as isInNodeModules, a as arraify } from './chunks/dep-BzOvws4Y.js';
+export { b as build, g as buildErrorMessage, k as createFilter, v as createLogger, c as createServer, d as defineConfig, h as fetchModule, f as formatPostcssSourceMap, x as isFileServingAllowed, l as loadConfigFromFile, y as loadEnv, j as mergeAlias, m as mergeConfig, n as normalizePath, o as optimizeDeps, e as preprocessCSS, p as preview, r as resolveConfig, z as resolveEnvPrefix, q as rollupVersion, w as searchForWorkspaceRoot, u as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-BzOvws4Y.js';
 export { VERSION as version } from './constants.js';
 export { version as esbuildVersion } from 'esbuild';
 import { existsSync, readFileSync } from 'node:fs';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "5.4.1",
+  "version": "5.4.2",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",
@@ -74,7 +74,7 @@
   "dependencies": {
     "esbuild": "^0.21.3",
     "postcss": "^8.4.41",
-    "rollup": "^4.13.0"
+    "rollup": "^4.20.0"
   },
   "optionalDependencies": {
     "fsevents": "~2.3.3"