vite 5.4.0 → 5.4.1

package/client.d.ts

@@ -251,15 +251,6 @@ declare interface VitePreloadErrorEvent extends Event {
   payload: Error
 }
 
-declare interface Window {
-  addEventListener(
-    type: 'vite:preloadError',
-    listener: (this: Window, ev: VitePreloadErrorEvent) => unknown,
-    options?: boolean | AddEventListenerOptions,
-  ): void
-  removeEventListener(
-    type: 'vite:preloadError',
-    listener: (this: Window, ev: VitePreloadErrorEvent) => unknown,
-    options?: boolean | EventListenerOptions,
-  ): void
+declare interface WindowEventMap {
+  'vite:preloadError': VitePreloadErrorEvent
 }

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

@@ -1,4 +1,4 @@
-import { C as commonjsGlobal, B as getDefaultExportFromCjs } from './dep-NjL7WTE1.js';
+import { C as commonjsGlobal, B as getDefaultExportFromCjs } from './dep-Cy9twKMn.js';
 import require$$0__default from 'fs';
 import require$$0 from 'postcss';
 import require$$0$1 from 'path';

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

@@ -16662,11 +16662,6 @@ function watchPackageDataPlugin(packageCache) {
       if (id.endsWith("/package.json")) {
         invalidatePackageData(packageCache, path$n.normalize(id));
       }
-    },
-    handleHotUpdate({ file }) {
-      if (file.endsWith("/package.json")) {
-        invalidatePackageData(packageCache, path$n.normalize(file));
-      }
     }
   };
 }
@@ -36930,8 +36925,8 @@ function createCachedImport(imp) {
     return cached;
   };
 }
-const importPostcssImport = createCachedImport(() => import('./dep-C3NStZH1.js').then(function (n) { return n.i; }));
-const importPostcssModules = createCachedImport(() => import('./dep-DvdjAuZF.js').then(function (n) { return n.i; }));
+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 importPostcss = createCachedImport(() => import('postcss'));
 const preprocessorWorkerControllerCache = /* @__PURE__ */ new WeakMap();
 let alwaysFakeWorkerWorkerControllerCache;
@@ -37926,7 +37921,7 @@ async function compileLightningCSS(id, src, config, urlReplacer) {
         }
         deps.add(dep.url);
         if (urlReplacer) {
-          const replaceUrl = await urlReplacer(dep.url, id);
+          const replaceUrl = await urlReplacer(dep.url, dep.loc.filePath);
           css = css.replace(dep.placeholder, () => replaceUrl);
         } else {
           css = css.replace(dep.placeholder, () => dep.url);
@@ -47174,8 +47169,7 @@ function throwFileNotFoundInOptimizedDep(id) {
 const nonJsRe = /\.json(?:$|\?)/;
 const isNonJsRequest = (request) => nonJsRe.test(request);
 const importMetaEnvMarker = "__vite_import_meta_env__";
-const bareImportMetaEnvRe = new RegExp(`${importMetaEnvMarker}(?!\\.)\\b`);
-const importMetaEnvKeyRe = new RegExp(`${importMetaEnvMarker}\\..+?\\b`, "g");
+const importMetaEnvKeyReCache = /* @__PURE__ */ new Map();
 function definePlugin(config) {
   const isBuild = config.command === "build";
   const isBuildLib = isBuild && config.build.lib;
@@ -47231,8 +47225,6 @@ function definePlugin(config) {
       SSR: ssr + "",
       ...userDefineEnv
     });
-    const banner = `const ${importMetaEnvMarker} = ${importMetaEnvVal};
-`;
     const patternKeys = Object.keys(userDefine);
     if (replaceProcessEnv && Object.keys(processEnv).length) {
       patternKeys.push("process.env");
@@ -47241,7 +47233,7 @@ function definePlugin(config) {
       patternKeys.push("import.meta.env", "import.meta.hot");
     }
     const pattern = patternKeys.length ? new RegExp(patternKeys.map(escapeRegex).join("|")) : null;
-    return [define, pattern, banner];
+    return [define, pattern, importMetaEnvVal];
   }
   const defaultPattern = generatePattern(false);
   const ssrPattern = generatePattern(true);
@@ -47258,21 +47250,35 @@ function definePlugin(config) {
       ) {
         return;
       }
-      const [define, pattern, banner] = ssr ? ssrPattern : defaultPattern;
+      let [define, pattern, importMetaEnvVal] = ssr ? ssrPattern : defaultPattern;
       if (!pattern) return;
       pattern.lastIndex = 0;
       if (!pattern.test(code)) return;
+      const hasDefineImportMetaEnv = "import.meta.env" in define;
+      let marker = importMetaEnvMarker;
+      if (hasDefineImportMetaEnv && code.includes(marker)) {
+        let i = 1;
+        do {
+          marker = importMetaEnvMarker + i++;
+        } while (code.includes(marker));
+        if (marker !== importMetaEnvMarker) {
+          define = { ...define, "import.meta.env": marker };
+        }
+      }
       const result = await replaceDefine(code, id, define, config);
-      result.code = result.code.replaceAll(
-        importMetaEnvKeyRe,
-        (m) => "undefined".padEnd(m.length)
-      );
-      if (bareImportMetaEnvRe.test(result.code)) {
-        result.code = banner + result.code;
-        if (result.map) {
-          const map = JSON.parse(result.map);
-          map.mappings = ";" + map.mappings;
-          result.map = map;
+      if (hasDefineImportMetaEnv) {
+        result.code = result.code.replaceAll(
+          getImportMetaEnvKeyRe(marker),
+          (m) => "undefined".padEnd(m.length)
+        );
+        if (result.code.includes(marker)) {
+          result.code = `const ${marker} = ${importMetaEnvVal};
+` + result.code;
+          if (result.map) {
+            const map = JSON.parse(result.map);
+            map.mappings = ";" + map.mappings;
+            result.map = map;
+          }
         }
       }
       return result;
@@ -47328,6 +47334,14 @@ function handleDefineValue(value) {
   if (typeof value === "string") return value;
   return JSON.stringify(value);
 }
+function getImportMetaEnvKeyRe(marker) {
+  let re = importMetaEnvKeyReCache.get(marker);
+  if (!re) {
+    re = new RegExp(`${marker}\\..+?\\b`, "g");
+    importMetaEnvKeyReCache.set(marker, re);
+  }
+  return re;
+}
 
 const normalizedClientEntry = normalizePath$3(CLIENT_ENTRY);
 const normalizedEnvEntry = normalizePath$3(ENV_ENTRY);
@@ -47671,7 +47685,7 @@ function webWorkerPlugin(config) {
       }`;
       let urlCode;
       if (isBuild) {
-        if (isWorker && this.getModuleInfo(cleanUrl(id))?.isEntry) {
+        if (isWorker && config.bundleChain.at(-1) === cleanUrl(id)) {
           urlCode = "self.location.href";
         } else if (inlineRE.test(id)) {
           const chunk = await bundleWorkerEntry(config, id);
@@ -48000,7 +48014,7 @@ function workerImportMetaUrlPlugin(config) {
             file = await workerResolver(url, id);
             file ??= url[0] === "/" ? slash$1(path$n.join(config.publicDir, url)) : slash$1(path$n.resolve(path$n.dirname(id), url));
           }
-          if (isBuild && config.isWorker && this.getModuleInfo(cleanUrl(file))?.isEntry) {
+          if (isBuild && config.isWorker && config.bundleChain.at(-1) === cleanUrl(file)) {
             s.update(expStart, expEnd, "self.location.href");
           } else {
             let builtUrl;
@@ -54228,10 +54242,10 @@ function resolveEmptyOutDir(emptyOutDir, root, outDirs, logger) {
   for (const outDir of outDirs) {
     if (!normalizePath$3(outDir).startsWith(withTrailingSlash(root))) {
       logger?.warn(
-        picocolorsExports.yellow(
+        colors$1.yellow(
           `
-${picocolorsExports.bold(`(!)`)} outDir ${picocolorsExports.white(
-            picocolorsExports.dim(outDir)
+${colors$1.bold(`(!)`)} outDir ${colors$1.white(
+            colors$1.dim(outDir)
           )} is not inside project root and will not be emptied.
 Use --emptyOutDir to override.
 `
@@ -64465,17 +64479,15 @@ function buildImportAnalysisPlugin(config) {
   const ssr = !!config.build.ssr;
   const isWorker = config.isWorker;
   const insertPreload = !(ssr || !!config.build.lib || isWorker);
-  const resolveModulePreloadDependencies = config.build.modulePreload && config.build.modulePreload.resolveDependencies;
   const renderBuiltUrl = config.experimental.renderBuiltUrl;
-  const customModulePreloadPaths = !!(resolveModulePreloadDependencies || renderBuiltUrl);
   const isRelativeBase = config.base === "./" || config.base === "";
-  const optimizeModulePreloadRelativePaths = isRelativeBase && !customModulePreloadPaths;
+  const optimizeModulePreloadRelativePaths = isRelativeBase && !renderBuiltUrl;
   const { modulePreload } = config.build;
   const scriptRel2 = modulePreload && modulePreload.polyfill ? `'modulepreload'` : `(${detectScriptRel.toString()})()`;
-  const assetsURL2 = customModulePreloadPaths ? (
-    // If `experimental.renderBuiltUrl` or `build.modulePreload.resolveDependencies` are 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.
+  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
@@ -64573,7 +64585,7 @@ function buildImportAnalysisPlugin(config) {
           }
           str().appendRight(
             expEnd,
-            `,${isModernFlag}?${preloadMarker}:void 0${optimizeModulePreloadRelativePaths || customModulePreloadPaths ? ",import.meta.url" : ""})`
+            `,${isModernFlag}?${preloadMarker}:void 0${optimizeModulePreloadRelativePaths || renderBuiltUrl ? ",import.meta.url" : ""})`
           );
         }
       }
@@ -64754,34 +64766,30 @@ function buildImportAnalysisPlugin(config) {
                 markerStartPos2 = indexOfMatchInSlice(code, preloadMarkerRE);
               }
               if (markerStartPos2 > 0) {
-                const depsArray = deps.size > 1 || // main chunk is removed
+                let depsArray = deps.size > 1 || // main chunk is removed
                 hasRemovedPureCssChunk && deps.size > 0 ? modulePreload === false ? (
                   // CSS deps use the same mechanism as module preloads, so even if disabled,
                   // we still need to pass these deps to the preload helper in dynamic imports.
                   [...deps].filter((d) => d.endsWith(".css"))
                 ) : [...deps] : [];
-                let renderedDeps;
-                if (normalizedFile && customModulePreloadPaths) {
-                  const { modulePreload: modulePreload2 } = config.build;
-                  const resolveDependencies = modulePreload2 ? modulePreload2.resolveDependencies : void 0;
-                  let resolvedDeps;
-                  if (resolveDependencies) {
-                    const cssDeps = [];
-                    const otherDeps = [];
-                    for (const dep of depsArray) {
-                      (dep.endsWith(".css") ? cssDeps : otherDeps).push(dep);
-                    }
-                    resolvedDeps = [
-                      ...resolveDependencies(normalizedFile, otherDeps, {
-                        hostId: file,
-                        hostType: "js"
-                      }),
-                      ...cssDeps
-                    ];
-                  } else {
-                    resolvedDeps = depsArray;
+                const resolveDependencies = modulePreload ? modulePreload.resolveDependencies : void 0;
+                if (resolveDependencies && normalizedFile) {
+                  const cssDeps = [];
+                  const otherDeps = [];
+                  for (const dep of depsArray) {
+                    (dep.endsWith(".css") ? cssDeps : otherDeps).push(dep);
                   }
-                  renderedDeps = resolvedDeps.map((dep) => {
+                  depsArray = [
+                    ...resolveDependencies(normalizedFile, otherDeps, {
+                      hostId: file,
+                      hostType: "js"
+                    }),
+                    ...cssDeps
+                  ];
+                }
+                let renderedDeps;
+                if (renderBuiltUrl) {
+                  renderedDeps = depsArray.map((dep) => {
                     const replacement = toOutputFilePathInJS(
                       dep,
                       "asset",

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

@@ -1,4 +1,4 @@
-import { B as getDefaultExportFromCjs } from './dep-NjL7WTE1.js';
+import { B as getDefaultExportFromCjs } from './dep-Cy9twKMn.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-NjL7WTE1.js';
+import { A as colors, v as createLogger, r as resolveConfig } from './chunks/dep-Cy9twKMn.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-NjL7WTE1.js').then(function (n) { return n.E; });
+  const { createServer } = await import('./chunks/dep-Cy9twKMn.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-NjL7WTE1.js').then(function (n) { return n.F; });
+  const { build } = await import('./chunks/dep-Cy9twKMn.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-NjL7WTE1.js').then(function (n) { return n.D; });
+    const { optimizeDeps } = await import('./chunks/dep-Cy9twKMn.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-NjL7WTE1.js').then(function (n) { return n.G; });
+    const { preview } = await import('./chunks/dep-Cy9twKMn.js').then(function (n) { return n.G; });
     try {
       const server = await preview({
         root,

package/dist/node/index.d.ts

@@ -717,7 +717,7 @@ interface CommonServerOptions {
  * https://github.com/expressjs/cors#configuration-options
  */
 interface CorsOptions {
-    origin?: CorsOrigin | ((origin: string, cb: (err: Error, origins: CorsOrigin) => void) => void);
+    origin?: CorsOrigin | ((origin: string | undefined, cb: (err: Error, origins: CorsOrigin) => void) => void);
     methods?: string | string[];
     allowedHeaders?: string | string[];
     exposedHeaders?: string | string[];

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-NjL7WTE1.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-NjL7WTE1.js';
+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';
 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.0",
+  "version": "5.4.1",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",
@@ -73,7 +73,7 @@
   "//": "READ CONTRIBUTING.md to understand what to put under deps vs. devDeps!",
   "dependencies": {
     "esbuild": "^0.21.3",
-    "postcss": "^8.4.40",
+    "postcss": "^8.4.41",
     "rollup": "^4.13.0"
   },
   "optionalDependencies": {
@@ -110,7 +110,7 @@
     "fast-glob": "^3.3.2",
     "http-proxy": "^1.18.1",
     "launch-editor-middleware": "^2.8.1",
-    "lightningcss": "^1.25.1",
+    "lightningcss": "^1.26.0",
     "magic-string": "^0.30.11",
     "micromatch": "^4.0.7",
     "mlly": "^1.7.1",