vite 6.0.0-alpha.19 → 6.0.0-alpha.20

package/dist/node-cjs/publicUtils.cjs

@@ -38,6 +38,20 @@ for (let i = 0; i < chars.length; i++) {
     intToChar[i] = c;
     charToInt[c] = i;
 }
+function encodeInteger(builder, num, relative) {
+    let delta = num - relative;
+    delta = delta < 0 ? (-delta << 1) | 1 : delta << 1;
+    do {
+        let clamped = delta & 0b011111;
+        delta >>>= 5;
+        if (delta > 0)
+            clamped |= 0b100000;
+        builder.write(intToChar[clamped]);
+    } while (delta > 0);
+    return num;
+}
+
+const bufLength = 1024 * 16;
 // Provide a fallback for older environments.
 const td = typeof TextDecoder !== 'undefined'
     ? /* #__PURE__ */ new TextDecoder()
@@ -57,63 +71,54 @@ const td = typeof TextDecoder !== 'undefined'
                 return out;
             },
         };
+class StringWriter {
+    constructor() {
+        this.pos = 0;
+        this.out = '';
+        this.buffer = new Uint8Array(bufLength);
+    }
+    write(v) {
+        const { buffer } = this;
+        buffer[this.pos++] = v;
+        if (this.pos === bufLength) {
+            this.out += td.decode(buffer);
+            this.pos = 0;
+        }
+    }
+    flush() {
+        const { buffer, out, pos } = this;
+        return pos > 0 ? out + td.decode(buffer.subarray(0, pos)) : out;
+    }
+}
 function encode(decoded) {
-    const state = new Int32Array(5);
-    const bufLength = 1024 * 16;
-    const subLength = bufLength - 36;
-    const buf = new Uint8Array(bufLength);
-    const sub = buf.subarray(0, subLength);
-    let pos = 0;
-    let out = '';
+    const writer = new StringWriter();
+    let sourcesIndex = 0;
+    let sourceLine = 0;
+    let sourceColumn = 0;
+    let namesIndex = 0;
     for (let i = 0; i < decoded.length; i++) {
         const line = decoded[i];
-        if (i > 0) {
-            if (pos === bufLength) {
-                out += td.decode(buf);
-                pos = 0;
-            }
-            buf[pos++] = semicolon;
-        }
+        if (i > 0)
+            writer.write(semicolon);
         if (line.length === 0)
             continue;
-        state[0] = 0;
+        let genColumn = 0;
         for (let j = 0; j < line.length; j++) {
             const segment = line[j];
-            // We can push up to 5 ints, each int can take at most 7 chars, and we
-            // may push a comma.
-            if (pos > subLength) {
-                out += td.decode(sub);
-                buf.copyWithin(0, subLength, pos);
-                pos -= subLength;
-            }
             if (j > 0)
-                buf[pos++] = comma;
-            pos = encodeInteger(buf, pos, state, segment, 0); // genColumn
+                writer.write(comma);
+            genColumn = encodeInteger(writer, segment[0], genColumn);
             if (segment.length === 1)
                 continue;
-            pos = encodeInteger(buf, pos, state, segment, 1); // sourcesIndex
-            pos = encodeInteger(buf, pos, state, segment, 2); // sourceLine
-            pos = encodeInteger(buf, pos, state, segment, 3); // sourceColumn
+            sourcesIndex = encodeInteger(writer, segment[1], sourcesIndex);
+            sourceLine = encodeInteger(writer, segment[2], sourceLine);
+            sourceColumn = encodeInteger(writer, segment[3], sourceColumn);
             if (segment.length === 4)
                 continue;
-            pos = encodeInteger(buf, pos, state, segment, 4); // namesIndex
+            namesIndex = encodeInteger(writer, segment[4], namesIndex);
         }
     }
-    return out + td.decode(buf.subarray(0, pos));
-}
-function encodeInteger(buf, pos, state, segment, j) {
-    const next = segment[j];
-    let num = next - state[j];
-    state[j] = next;
-    num = num < 0 ? (-num << 1) | 1 : num << 1;
-    do {
-        let clamped = num & 0b011111;
-        num >>>= 5;
-        if (num > 0)
-            clamped |= 0b100000;
-        buf[pos++] = intToChar[clamped];
-    } while (num > 0);
-    return pos;
+    return writer.flush();
 }
 
 function getDefaultExportFromCjs (x) {
@@ -785,6 +790,8 @@ function requireBrowser () {
 				return false;
 			}
 
+			let m;
+
 			// Is webkit? http://stackoverflow.com/a/16459606/376773
 			// document is undefined in react-native: https://github.com/facebook/react-native/pull/1632
 			return (typeof document !== 'undefined' && document.documentElement && document.documentElement.style && document.documentElement.style.WebkitAppearance) ||
@@ -792,7 +799,7 @@ function requireBrowser () {
 				(typeof window !== 'undefined' && window.console && (window.console.firebug || (window.console.exception && window.console.table))) ||
 				// Is firefox >= v31?
 				// https://developer.mozilla.org/en-US/docs/Tools/Web_Console#Styling_messages
-				(typeof navigator !== 'undefined' && navigator.userAgent && navigator.userAgent.toLowerCase().match(/firefox\/(\d+)/) && parseInt(RegExp.$1, 10) >= 31) ||
+				(typeof navigator !== 'undefined' && navigator.userAgent && (m = navigator.userAgent.toLowerCase().match(/firefox\/(\d+)/)) && parseInt(m[1], 10) >= 31) ||
 				// Double check webkit in userAgent just in case we are in a worker
 				(typeof navigator !== 'undefined' && navigator.userAgent && navigator.userAgent.toLowerCase().match(/applewebkit\/(\d+)/));
 		}
@@ -2968,9 +2975,9 @@ const isObject$2 = val => val && typeof val === 'object' && !Array.isArray(val);
  * @api public
  */
 
-const picomatch$2 = (glob, options, returnState = false) => {
+const picomatch$1 = (glob, options, returnState = false) => {
   if (Array.isArray(glob)) {
-    const fns = glob.map(input => picomatch$2(input, options, returnState));
+    const fns = glob.map(input => picomatch$1(input, options, returnState));
     const arrayMatcher = str => {
       for (const isMatch of fns) {
         const state = isMatch(str);
@@ -2990,8 +2997,8 @@ const picomatch$2 = (glob, options, returnState = false) => {
   const opts = options || {};
   const posix = utils.isWindows(options);
   const regex = isState
-    ? picomatch$2.compileRe(glob, options)
-    : picomatch$2.makeRe(glob, options, false, true);
+    ? picomatch$1.compileRe(glob, options)
+    : picomatch$1.makeRe(glob, options, false, true);
 
   const state = regex.state;
   delete regex.state;
@@ -2999,11 +3006,11 @@ const picomatch$2 = (glob, options, returnState = false) => {
   let isIgnored = () => false;
   if (opts.ignore) {
     const ignoreOpts = { ...options, ignore: null, onMatch: null, onResult: null };
-    isIgnored = picomatch$2(opts.ignore, ignoreOpts, returnState);
+    isIgnored = picomatch$1(opts.ignore, ignoreOpts, returnState);
   }
 
   const matcher = (input, returnObject = false) => {
-    const { isMatch, match, output } = picomatch$2.test(input, regex, options, { glob, posix });
+    const { isMatch, match, output } = picomatch$1.test(input, regex, options, { glob, posix });
     const result = { glob, state, regex, posix, input, output, match, isMatch };
 
     if (typeof opts.onResult === 'function') {
@@ -3053,7 +3060,7 @@ const picomatch$2 = (glob, options, returnState = false) => {
  * @api public
  */
 
-picomatch$2.test = (input, regex, options, { glob, posix } = {}) => {
+picomatch$1.test = (input, regex, options, { glob, posix } = {}) => {
   if (typeof input !== 'string') {
     throw new TypeError('Expected input to be a string');
   }
@@ -3074,7 +3081,7 @@ picomatch$2.test = (input, regex, options, { glob, posix } = {}) => {
 
   if (match === false || opts.capture === true) {
     if (opts.matchBase === true || opts.basename === true) {
-      match = picomatch$2.matchBase(input, regex, options, posix);
+      match = picomatch$1.matchBase(input, regex, options, posix);
     } else {
       match = regex.exec(output);
     }
@@ -3097,8 +3104,8 @@ picomatch$2.test = (input, regex, options, { glob, posix } = {}) => {
  * @api public
  */
 
-picomatch$2.matchBase = (input, glob, options, posix = utils.isWindows(options)) => {
-  const regex = glob instanceof RegExp ? glob : picomatch$2.makeRe(glob, options);
+picomatch$1.matchBase = (input, glob, options, posix = utils.isWindows(options)) => {
+  const regex = glob instanceof RegExp ? glob : picomatch$1.makeRe(glob, options);
   return regex.test(path$1.basename(input));
 };
 
@@ -3119,7 +3126,7 @@ picomatch$2.matchBase = (input, glob, options, posix = utils.isWindows(options))
  * @api public
  */
 
-picomatch$2.isMatch = (str, patterns, options) => picomatch$2(patterns, options)(str);
+picomatch$1.isMatch = (str, patterns, options) => picomatch$1(patterns, options)(str);
 
 /**
  * Parse a glob pattern to create the source string for a regular
@@ -3135,8 +3142,8 @@ picomatch$2.isMatch = (str, patterns, options) => picomatch$2(patterns, options)
  * @api public
  */
 
-picomatch$2.parse = (pattern, options) => {
-  if (Array.isArray(pattern)) return pattern.map(p => picomatch$2.parse(p, options));
+picomatch$1.parse = (pattern, options) => {
+  if (Array.isArray(pattern)) return pattern.map(p => picomatch$1.parse(p, options));
   return parse$1(pattern, { ...options, fastpaths: false });
 };
 
@@ -3167,7 +3174,7 @@ picomatch$2.parse = (pattern, options) => {
  * @api public
  */
 
-picomatch$2.scan = (input, options) => scan(input, options);
+picomatch$1.scan = (input, options) => scan(input, options);
 
 /**
  * Compile a regular expression from the `state` object returned by the
@@ -3181,7 +3188,7 @@ picomatch$2.scan = (input, options) => scan(input, options);
  * @api public
  */
 
-picomatch$2.compileRe = (state, options, returnOutput = false, returnState = false) => {
+picomatch$1.compileRe = (state, options, returnOutput = false, returnState = false) => {
   if (returnOutput === true) {
     return state.output;
   }
@@ -3195,7 +3202,7 @@ picomatch$2.compileRe = (state, options, returnOutput = false, returnState = fal
     source = `^(?!${source}).*$`;
   }
 
-  const regex = picomatch$2.toRegex(source, options);
+  const regex = picomatch$1.toRegex(source, options);
   if (returnState === true) {
     regex.state = state;
   }
@@ -3222,7 +3229,7 @@ picomatch$2.compileRe = (state, options, returnOutput = false, returnState = fal
  * @api public
  */
 
-picomatch$2.makeRe = (input, options = {}, returnOutput = false, returnState = false) => {
+picomatch$1.makeRe = (input, options = {}, returnOutput = false, returnState = false) => {
   if (!input || typeof input !== 'string') {
     throw new TypeError('Expected a non-empty string');
   }
@@ -3237,7 +3244,7 @@ picomatch$2.makeRe = (input, options = {}, returnOutput = false, returnState = f
     parsed = parse$1(input, options);
   }
 
-  return picomatch$2.compileRe(parsed, options, returnOutput, returnState);
+  return picomatch$1.compileRe(parsed, options, returnOutput, returnState);
 };
 
 /**
@@ -3257,7 +3264,7 @@ picomatch$2.makeRe = (input, options = {}, returnOutput = false, returnState = f
  * @api public
  */
 
-picomatch$2.toRegex = (source, options) => {
+picomatch$1.toRegex = (source, options) => {
   try {
     const opts = options || {};
     return new RegExp(source, opts.flags || (opts.nocase ? 'i' : ''));
@@ -3272,17 +3279,17 @@ picomatch$2.toRegex = (source, options) => {
  * @return {Object}
  */
 
-picomatch$2.constants = constants;
+picomatch$1.constants = constants;
 
 /**
  * Expose "picomatch"
  */
 
-var picomatch_1 = picomatch$2;
+var picomatch_1 = picomatch$1;
 
 var picomatch = picomatch_1;
 
-var picomatch$1 = /*@__PURE__*/getDefaultExportFromCjs(picomatch);
+var pm = /*@__PURE__*/getDefaultExportFromCjs(picomatch);
 
 // Helper since Typescript can't detect readonly arrays with Array.isArray
 function isArray(arg) {
@@ -3322,7 +3329,7 @@ const createFilter$1 = function createFilter(include, exclude, options) {
             test: (what) => {
                 // this refactor is a tad overly verbose but makes for easy debugging
                 const pattern = getMatcherString(id, resolutionBase);
-                const fn = picomatch$1(pattern, { dot: true });
+                const fn = pm(pattern, { dot: true });
                 const result = fn(what);
                 return result;
             }
@@ -3506,6 +3513,9 @@ function mergeConfigRecursively(defaults, overrides, rootPath) {
         ...backwardCompatibleWorkerPlugins(value)
       ];
       continue;
+    } else if (key === "server" && rootPath === "server.hmr") {
+      merged[key] = value;
+      continue;
     }
     if (Array.isArray(existing) || Array.isArray(value)) {
       merged[key] = [...arraify(existing), ...arraify(value)];
@@ -4794,8 +4804,10 @@ class MagicString {
 	update(start, end, content, options) {
 		if (typeof content !== 'string') throw new TypeError('replacement content must be a string');
 
-		while (start < 0) start += this.original.length;
-		while (end < 0) end += this.original.length;
+		if (this.original.length !== 0) {
+			while (start < 0) start += this.original.length;
+			while (end < 0) end += this.original.length;
+		}
 
 		if (end > this.original.length) throw new Error('end is out of bounds');
 		if (start === end)
@@ -4891,8 +4903,10 @@ class MagicString {
 	}
 
 	remove(start, end) {
-		while (start < 0) start += this.original.length;
-		while (end < 0) end += this.original.length;
+		if (this.original.length !== 0) {
+			while (start < 0) start += this.original.length;
+			while (end < 0) end += this.original.length;
+		}
 
 		if (start === end) return this;
 
@@ -4915,8 +4929,10 @@ class MagicString {
 	}
 
 	reset(start, end) {
-		while (start < 0) start += this.original.length;
-		while (end < 0) end += this.original.length;
+		if (this.original.length !== 0) {
+			while (start < 0) start += this.original.length;
+			while (end < 0) end += this.original.length;
+		}
 
 		if (start === end) return this;
 
@@ -4978,8 +4994,10 @@ class MagicString {
 	}
 
 	slice(start = 0, end = this.original.length) {
-		while (start < 0) start += this.original.length;
-		while (end < 0) end += this.original.length;
+		if (this.original.length !== 0) {
+			while (start < 0) start += this.original.length;
+			while (end < 0) end += this.original.length;
+		}
 
 		let result = '';
 
@@ -5525,35 +5543,6 @@ function searchForWorkspaceRoot(current, root = searchForPackageRoot(current)) {
   return searchForWorkspaceRoot(dir, root);
 }
 
-const safeModulePathsCache = /* @__PURE__ */ new WeakMap();
-function isSafeModulePath(config, filePath) {
-  let safeModulePaths = safeModulePathsCache.get(config);
-  if (!safeModulePaths) {
-    safeModulePaths = /* @__PURE__ */ new Set();
-    safeModulePathsCache.set(config, safeModulePaths);
-  }
-  return safeModulePaths.has(filePath);
-}
-const fsDenyGlobCache = /* @__PURE__ */ new WeakMap();
-function fsDenyGlob(config, filePath) {
-  let matcher = fsDenyGlobCache.get(config);
-  if (!matcher) {
-    matcher = picomatch$1(
-      // matchBase: true does not work as it's documented
-      // https://github.com/micromatch/picomatch/issues/89
-      // convert patterns without `/` on our side for now
-      config.server.fs.deny.map(
-        (pattern) => pattern.includes("/") ? pattern : `**/${pattern}`
-      ),
-      {
-        matchBase: false,
-        nocase: true,
-        dot: true
-      }
-    ), fsDenyGlobCache.set(config, matcher);
-  }
-  return matcher(filePath);
-}
 function isFileServingAllowed(url, server) {
   const { config } = server;
   if (!config.server.fs.strict) return true;
@@ -5566,8 +5555,8 @@ function isUriInFilePath(uri, filePath) {
 function isFileLoadingAllowed(config, filePath) {
   const { fs } = config.server;
   if (!fs.strict) return true;
-  if (fsDenyGlob(config, filePath)) return false;
-  if (isSafeModulePath(config, filePath)) return true;
+  if (config.fsDenyGlob(filePath)) return false;
+  if (config.safeModulePaths.has(filePath)) return true;
   if (fs.allow.some((uri) => isUriInFilePath(uri, filePath))) return true;
   return false;
 }

package/index.cjs

@@ -1,5 +1,3 @@
-/* eslint-disable no-restricted-globals */
-
 warnCjsUsage()
 
 // type utils

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "6.0.0-alpha.19",
+  "version": "6.0.0-alpha.20",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",
@@ -73,15 +73,15 @@
   "//": "READ CONTRIBUTING.md to understand what to put under deps vs. devDeps!",
   "dependencies": {
     "esbuild": "^0.21.3",
-    "postcss": "^8.4.39",
-    "rollup": "^4.13.0"
+    "postcss": "^8.4.41",
+    "rollup": "^4.20.0"
   },
   "optionalDependencies": {
     "fsevents": "~2.3.3"
   },
   "devDependencies": {
     "@ampproject/remapping": "^2.3.0",
-    "@babel/parser": "^7.24.8",
+    "@babel/parser": "^7.25.3",
     "@jridgewell/trace-mapping": "^0.3.25",
     "@polka/compression": "^1.0.0-next.25",
     "@rollup/plugin-alias": "^5.1.0",
@@ -99,7 +99,7 @@
     "convert-source-map": "^2.0.0",
     "cors": "^2.8.5",
     "cross-spawn": "^7.0.3",
-    "debug": "^4.3.5",
+    "debug": "^4.3.6",
     "dep-types": "link:./src/types",
     "dotenv": "^16.4.5",
     "dotenv-expand": "^11.0.6",
@@ -109,12 +109,13 @@
     "etag": "^1.8.1",
     "fast-glob": "^3.3.2",
     "http-proxy": "^1.18.1",
-    "launch-editor-middleware": "^2.8.0",
-    "lightningcss": "^1.25.1",
-    "magic-string": "^0.30.10",
+    "launch-editor-middleware": "^2.8.1",
+    "lightningcss": "^1.26.0",
+    "magic-string": "^0.30.11",
     "micromatch": "^4.0.7",
     "mlly": "^1.7.1",
     "mrmime": "^2.0.0",
+    "nanoid": "^5.0.7",
     "open": "^8.4.2",
     "parse5": "^7.1.2",
     "pathe": "^1.1.2",
@@ -129,6 +130,7 @@
     "rollup-plugin-esbuild": "^6.1.1",
     "rollup-plugin-license": "^3.5.2",
     "sass": "^1.77.8",
+    "sass-embedded": "^1.77.8",
     "sirv": "^2.0.4",
     "source-map-support": "^0.5.21",
     "strip-ansi": "^7.1.0",
@@ -144,6 +146,7 @@
     "less": "*",
     "lightningcss": "^1.21.0",
     "sass": "*",
+    "sass-embedded": "*",
     "stylus": "*",
     "sugarss": "*",
     "terser": "^5.4.0"
@@ -155,6 +158,9 @@
     "sass": {
       "optional": true
     },
+    "sass-embedded": {
+      "optional": true
+    },
     "stylus": {
       "optional": true
     },

package/types/customEvent.d.ts

@@ -3,7 +3,7 @@ import type {
   FullReloadPayload,
   PrunePayload,
   UpdatePayload,
-} from './hotPayload'
+} from './hmrPayload'
 
 export interface CustomEventMap {
   'vite:beforeUpdate': UpdatePayload