vite 6.0.0-alpha.16 → 6.0.0-alpha.18

package/dist/node/module-runner.js

@@ -51,24 +51,22 @@ function normalizeString(path, allowAboveRoot) {
       char = "/";
     }
     if (char === "/") {
-      if (!(lastSlash === index - 1 || dots === 1))
-        if (dots === 2) {
-          if (res.length < 2 || lastSegmentLength !== 2 || res[res.length - 1] !== "." || res[res.length - 2] !== ".") {
-            if (res.length > 2) {
-              const lastSlashIndex = res.lastIndexOf("/");
-              lastSlashIndex === -1 ? (res = "", lastSegmentLength = 0) : (res = res.slice(0, lastSlashIndex), lastSegmentLength = res.length - 1 - res.lastIndexOf("/")), lastSlash = index, dots = 0;
-              continue;
-            } else if (res.length > 0) {
-              res = "", lastSegmentLength = 0, lastSlash = index, dots = 0;
-              continue;
-            }
+      if (!(lastSlash === index - 1 || dots === 1)) if (dots === 2) {
+        if (res.length < 2 || lastSegmentLength !== 2 || res[res.length - 1] !== "." || res[res.length - 2] !== ".") {
+          if (res.length > 2) {
+            const lastSlashIndex = res.lastIndexOf("/");
+            lastSlashIndex === -1 ? (res = "", lastSegmentLength = 0) : (res = res.slice(0, lastSlashIndex), lastSegmentLength = res.length - 1 - res.lastIndexOf("/")), lastSlash = index, dots = 0;
+            continue;
+          } else if (res.length > 0) {
+            res = "", lastSegmentLength = 0, lastSlash = index, dots = 0;
+            continue;
           }
-          allowAboveRoot && (res += res.length > 0 ? "/.." : "..", lastSegmentLength = 2);
-        } else
-          res.length > 0 ? res += `/${path.slice(lastSlash + 1, index)}` : res = path.slice(lastSlash + 1, index), lastSegmentLength = index - lastSlash - 1;
+        }
+        allowAboveRoot && (res += res.length > 0 ? "/.." : "..", lastSegmentLength = 2);
+      } else
+        res.length > 0 ? res += `/${path.slice(lastSlash + 1, index)}` : res = path.slice(lastSlash + 1, index), lastSegmentLength = index - lastSlash - 1;
       lastSlash = index, dots = 0;
-    } else
-      char === "." && dots !== -1 ? ++dots : dots = -1;
+    } else char === "." && dots !== -1 ? ++dots : dots = -1;
   }
   return res;
 }
@@ -77,15 +75,7 @@ const isAbsolute = function(p) {
 }, dirname = function(p) {
   const segments = normalizeWindowsPath(p).replace(/\/$/, "").split("/").slice(0, -1);
   return segments.length === 1 && _DRIVE_LETTER_RE.test(segments[0]) && (segments[0] += "/"), segments.join("/") || (isAbsolute(p) ? "/" : ".");
-}, decodeBase64 = typeof atob < "u" ? atob : (str) => Buffer.from(str, "base64").toString("utf-8"), CHAR_FORWARD_SLASH = 47, CHAR_BACKWARD_SLASH = 92, percentRegEx = /%/g, backslashRegEx = /\\/g, newlineRegEx = /\n/g, carriageReturnRegEx = /\r/g, tabRegEx = /\t/g, questionRegex = /\?/g, hashRegex = /#/g, timestampRegex = /[?&]t=(\d{13})(&?)/;
-function parseUrl(url) {
-  const idQuery = url.split("?")[1];
-  let timestamp = 0;
-  return {
-    query: idQuery ? ("?" + idQuery).replace(timestampRegex, (substring, tsString, nextItem) => (timestamp = Number(tsString), substring[0] === "?" && nextItem === "&" ? "?" : "")) : "",
-    timestamp
-  };
-}
+}, decodeBase64 = typeof atob < "u" ? atob : (str) => Buffer.from(str, "base64").toString("utf-8"), CHAR_FORWARD_SLASH = 47, CHAR_BACKWARD_SLASH = 92, percentRegEx = /%/g, backslashRegEx = /\\/g, newlineRegEx = /\n/g, carriageReturnRegEx = /\r/g, tabRegEx = /\t/g, questionRegex = /\?/g, hashRegex = /#/g;
 function encodePathChars(filepath) {
   return filepath.indexOf("%") !== -1 && (filepath = filepath.replace(percentRegEx, "%25")), !isWindows && filepath.indexOf("\\") !== -1 && (filepath = filepath.replace(backslashRegEx, "%5C")), filepath.indexOf(`
 `) !== -1 && (filepath = filepath.replace(newlineRegEx, "%0A")), filepath.indexOf("\r") !== -1 && (filepath = filepath.replace(carriageReturnRegEx, "%0D")), filepath.indexOf("	") !== -1 && (filepath = filepath.replace(tabRegEx, "%09")), filepath;
@@ -503,11 +493,11 @@ class HMRClient {
   }
 }
 function analyzeImportedModDifference(mod, rawId, moduleType, metadata) {
-  if (!metadata?.isDynamicImport && moduleType !== "module" && metadata?.importedNames?.length) {
+  if (!metadata?.isDynamicImport && metadata?.importedNames?.length) {
     const missingBindings = metadata.importedNames.filter((s) => !(s in mod));
     if (missingBindings.length) {
       const lastBinding = missingBindings[missingBindings.length - 1];
-      throw new SyntaxError(`[vite] Named export '${lastBinding}' not found. The requested module '${rawId}' is a CommonJS module, which may not support all module.exports as named exports.
+      throw moduleType === "module" ? new SyntaxError(`[vite] The requested module '${rawId}' does not provide an export named '${lastBinding}'`) : new SyntaxError(`[vite] Named export '${lastBinding}' not found. The requested module '${rawId}' is a CommonJS module, which may not support all module.exports as named exports.
 CommonJS modules can always be imported via the default export, for example using:
 
 import pkg from '${rawId}';
@@ -516,15 +506,6 @@ const {${missingBindings.join(", ")}} = pkg;
     }
   }
 }
-function proxyGuardOnlyEsm(mod, rawId, metadata) {
-  return metadata?.importedNames?.length ? new Proxy(mod, {
-    get(mod2, prop) {
-      if (prop !== "then" && !(prop in mod2))
-        throw new SyntaxError(`[vite] The requested module '${rawId}' does not provide an export named '${prop.toString()}'`);
-      return mod2[prop];
-    }
-  }) : mod;
-}
 const ssrModuleExportsKey = "__vite_ssr_exports__", ssrImportKey = "__vite_ssr_import__", ssrDynamicImportKey = "__vite_ssr_dynamic_import__", ssrExportAllKey = "__vite_ssr_exportAll__", ssrImportMetaKey = "__vite_ssr_import_meta__", noop = () => {
 }, silentConsole = {
   debug: noop,
@@ -535,9 +516,9 @@ const ssrModuleExportsKey = "__vite_ssr_exports__", ssrImportKey = "__vite_ssr_i
 };
 function createHMRHandler(runner) {
   const queue = new Queue();
-  return (payload) => queue.enqueue(() => handleHMRPayload(runner, payload));
+  return (payload) => queue.enqueue(() => handleHotPayload(runner, payload));
 }
-async function handleHMRPayload(runner, payload) {
+async function handleHotPayload(runner, payload) {
   const hmrClient = runner.hmrClient;
   if (!(!hmrClient || runner.isDestroyed()))
     switch (payload.type) {
@@ -765,8 +746,7 @@ function CallSiteToString() {
     typeName === "[object Object]" && (typeName = "null");
     const methodName = this.getMethodName();
     functionName ? (typeName && functionName.indexOf(typeName) !== 0 && (line += `${typeName}.`), line += functionName, methodName && functionName.indexOf(`.${methodName}`) !== functionName.length - methodName.length - 1 && (line += ` [as ${methodName}]`)) : line += `${typeName}.${methodName || "<anonymous>"}`;
-  } else
-    isConstructor ? line += `new ${functionName || "<anonymous>"}` : functionName ? line += functionName : (line += fileLocation, addSuffix = !1);
+  } else isConstructor ? line += `new ${functionName || "<anonymous>"}` : functionName ? line += functionName : (line += fileLocation, addSuffix = !1);
   return addSuffix && (line += ` (${fileLocation})`), line;
 }
 function cloneCallSite(frame) {
@@ -852,10 +832,7 @@ class ModuleRunner {
   resetSourceMapSupport;
   destroyed = !1;
   constructor(options, evaluator, debug) {
-    this.options = options, this.evaluator = evaluator, this.debug = debug, this.moduleCache = options.moduleCache ?? new ModuleCacheMap(options.root), this.transport = options.transport, typeof options.hmr == "object" && (this.hmrClient = new HMRClient(options.hmr.logger === !1 ? silentConsole : options.hmr.logger || hmrLogger, options.hmr.connection, ({ acceptedPath, explicitImportRequired, timestamp }) => {
-      const [acceptedPathWithoutQuery, query] = acceptedPath.split("?"), url = acceptedPathWithoutQuery + `?${explicitImportRequired ? "import&" : ""}t=${timestamp}${query ? `&${query}` : ""}`;
-      return this.import(url);
-    }), options.hmr.connection.onUpdate(createHMRHandler(this))), options.sourcemapInterceptor !== !1 && (this.resetSourceMapSupport = enableSourceMapSupport(this));
+    this.options = options, this.evaluator = evaluator, this.debug = debug, this.moduleCache = options.moduleCache ?? new ModuleCacheMap(options.root), this.transport = options.transport, typeof options.hmr == "object" && (this.hmrClient = new HMRClient(options.hmr.logger === !1 ? silentConsole : options.hmr.logger || hmrLogger, options.hmr.connection, ({ acceptedPath }) => this.import(acceptedPath)), options.hmr.connection.onUpdate(createHMRHandler(this))), options.sourcemapInterceptor !== !1 && (this.resetSourceMapSupport = enableSourceMapSupport(this));
   }
   /**
    * URL to execute. Accepts file path, server path or id relative to the root.
@@ -898,7 +875,7 @@ class ModuleRunner {
     if (!("externalize" in fetchResult))
       return exports;
     const { id, type } = fetchResult;
-    return type !== "module" && type !== "commonjs" ? exports : (analyzeImportedModDifference(exports, id, type, metadata), proxyGuardOnlyEsm(exports, id, metadata));
+    return type !== "module" && type !== "commonjs" || analyzeImportedModDifference(exports, id, type, metadata), exports;
   }
   async cachedRequest(id, mod, callstack = [], metadata) {
     const meta = mod.meta, moduleId = meta.id, { imports, importers } = mod, importee = callstack[callstack.length - 1];
@@ -924,15 +901,23 @@ ${getStack()}`);
   async cachedModule(url, importer) {
     if (this.destroyed)
       throw new Error("Vite module runner has been destroyed.");
+    this.debug?.("[module runner] fetching", url);
     const normalized = this.urlToIdMap.get(url);
-    if (normalized) {
-      const mod2 = this.moduleCache.getByModuleId(normalized);
-      if (mod2.meta)
-        return mod2;
+    let cachedModule = normalized && this.moduleCache.getByModuleId(normalized);
+    cachedModule || (cachedModule = this.moduleCache.getByModuleId(url));
+    const isCached = !!(typeof cachedModule == "object" && cachedModule.meta), fetchedModule = (
+      // fast return for established externalized pattern
+      url.startsWith("data:") ? { externalize: url, type: "builtin" } : await this.transport.fetchModule(url, importer, {
+        cached: isCached
+      })
+    );
+    if ("cache" in fetchedModule) {
+      if (!cachedModule || !cachedModule.meta)
+        throw new Error(`Module "${url}" was mistakenly invalidated during fetch phase.`);
+      return cachedModule;
     }
-    this.debug?.("[module runner] fetching", url);
-    const fetchedModule = url.startsWith("data:") ? { externalize: url, type: "builtin" } : await this.transport.fetchModule(url, importer), { query, timestamp } = parseUrl(url), file = "file" in fetchedModule ? fetchedModule.file : void 0, fileId = file ? `${file}${query}` : url, moduleId = this.moduleCache.normalize(fileId), mod = this.moduleCache.getByModuleId(moduleId);
-    if (mod.timestamp != null && timestamp > 0 && mod.timestamp < timestamp && this.moduleCache.invalidateModule(mod), fetchedModule.id = moduleId, mod.meta = fetchedModule, mod.timestamp = timestamp, file) {
+    const idQuery = url.split("?")[1], query = idQuery ? `?${idQuery}` : "", file = "file" in fetchedModule ? fetchedModule.file : void 0, fileId = file ? `${file}${query}` : url, moduleId = this.moduleCache.normalize(fileId), mod = this.moduleCache.getByModuleId(moduleId);
+    if ("invalidate" in fetchedModule && fetchedModule.invalidate && this.moduleCache.invalidateModule(mod), fetchedModule.id = moduleId, mod.meta = fetchedModule, file) {
       const fileModules = this.fileToIdMap.get(file) || [];
       fileModules.push(moduleId), this.fileToIdMap.set(file, fileModules);
     }

package/dist/node-cjs/publicUtils.cjs

@@ -1127,11 +1127,11 @@ function requireNode () {
 		}
 
 		/**
-		 * Invokes `util.format()` with the specified arguments and writes to stderr.
+		 * Invokes `util.formatWithOptions()` with the specified arguments and writes to stderr.
 		 */
 
 		function log(...args) {
-			return process.stderr.write(util.format(...args) + '\n');
+			return process.stderr.write(util.formatWithOptions(exports.inspectOpts, ...args) + '\n');
 		}
 
 		/**
@@ -3591,22 +3591,6 @@ function normalizeSingleAlias({ find, replacement, customResolver, }) {
     }
     return alias;
 }
-/**
- * Creates a function that hides the complexities of a WeakMap with an initial value
- * to implement object metadata. Used by plugins to implement cross hooks per
- * environment metadata
- */
-function createWeakData(initial) {
-    const cache = new WeakMap();
-    return function (key) {
-        let data = cache.get(key);
-        if (!data) {
-            data = initial(key);
-            cache.set(key, data);
-        }
-        return data;
-    };
-}
 
 // This file will be built for both ESM and CJS. Avoid relying on other modules as possible.
 // copy from constants.ts
@@ -6255,7 +6239,6 @@ function resolveEnvPrefix({ envPrefix = 'VITE_', }) {
 exports.esbuildVersion = esbuild.version;
 exports.createFilter = createFilter;
 exports.createLogger = createLogger;
-exports.createWeakData = createWeakData;
 exports.isCSSRequest = isCSSRequest;
 exports.isFileLoadingAllowed = isFileLoadingAllowed;
 exports.isFileServingAllowed = isFileServingAllowed;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "6.0.0-alpha.16",
+  "version": "6.0.0-alpha.18",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",
@@ -72,7 +72,7 @@
   "funding": "https://github.com/vitejs/vite?sponsor=1",
   "//": "READ CONTRIBUTING.md to understand what to put under deps vs. devDeps!",
   "dependencies": {
-    "esbuild": "^0.20.1",
+    "esbuild": "^0.21.3",
     "postcss": "^8.4.38",
     "rollup": "^4.13.0"
   },
@@ -81,11 +81,11 @@
   },
   "devDependencies": {
     "@ampproject/remapping": "^2.3.0",
-    "@babel/parser": "^7.24.5",
+    "@babel/parser": "^7.24.6",
     "@jridgewell/trace-mapping": "^0.3.25",
     "@polka/compression": "^1.0.0-next.25",
     "@rollup/plugin-alias": "^5.1.0",
-    "@rollup/plugin-commonjs": "^25.0.7",
+    "@rollup/plugin-commonjs": "^25.0.8",
     "@rollup/plugin-dynamic-import-vars": "^2.1.2",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "15.2.3",
@@ -93,8 +93,6 @@
     "@rollup/pluginutils": "^5.1.0",
     "@types/escape-html": "^1.0.4",
     "@types/pnpapi": "^0.0.5",
-    "acorn": "^8.11.3",
-    "acorn-walk": "^8.3.2",
     "artichokie": "^0.2.1",
     "cac": "^6.7.14",
     "chokidar": "^3.6.0",
@@ -102,7 +100,7 @@
     "convert-source-map": "^2.0.0",
     "cors": "^2.8.5",
     "cross-spawn": "^7.0.3",
-    "debug": "^4.3.4",
+    "debug": "^4.3.5",
     "dep-types": "link:./src/types",
     "dotenv": "^16.4.5",
     "dotenv-expand": "^11.0.6",
@@ -113,9 +111,9 @@
     "fast-glob": "^3.3.2",
     "http-proxy": "^1.18.1",
     "launch-editor-middleware": "^2.6.1",
-    "lightningcss": "^1.25.0",
+    "lightningcss": "^1.25.1",
     "magic-string": "^0.30.10",
-    "micromatch": "^4.0.5",
+    "micromatch": "^4.0.7",
     "mlly": "^1.7.0",
     "mrmime": "^2.0.0",
     "open": "^8.4.2",
@@ -131,12 +129,12 @@
     "rollup-plugin-dts": "^6.1.1",
     "rollup-plugin-esbuild": "^6.1.1",
     "rollup-plugin-license": "^3.4.0",
-    "sass": "^1.77.2",
+    "sass": "^1.77.4",
     "sirv": "^2.0.4",
     "source-map-support": "^0.5.21",
     "strip-ansi": "^7.1.0",
     "strip-literal": "^2.1.0",
-    "tsconfck": "^3.0.3",
+    "tsconfck": "^3.1.0",
     "tslib": "^2.6.2",
     "types": "link:./types",
     "ufo": "^1.5.3",

package/types/customEvent.d.ts

@@ -3,7 +3,7 @@ import type {
   FullReloadPayload,
   PrunePayload,
   UpdatePayload,
-} from './hmrPayload'
+} from './hotPayload'
 
 export interface CustomEventMap {
   'vite:beforeUpdate': UpdatePayload
@@ -23,6 +23,7 @@ export interface WebSocketConnectionPayload {
    * This might be removed in the future if we didn't find reasonable use cases.
    * If you find this useful, please open an issue with details so we can discuss and make it stable API.
    */
+  // eslint-disable-next-line n/no-unsupported-features/node-builtins
   webSocket: WebSocket
 }
 

package/types/{hmrPayload.d.ts → hotPayload.d.ts}

@@ -1,4 +1,6 @@
-export type HMRPayload =
+/** @deprecated use HotPayload */
+export type HMRPayload = HotPayload
+export type HotPayload =
   | ConnectedPayload
   | UpdatePayload
   | FullReloadPayload