vite 5.0.0-beta.1 → 5.0.0-beta.3

package/dist/node-cjs/publicUtils.cjs

@@ -15,7 +15,8 @@ var fs$2 = require('fs');
 var readline = require('node:readline');
 var require$$2 = require('os');
 
-const { version: version$2 } = JSON.parse(fs$1.readFileSync(new URL('../../package.json', (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (document.currentScript && document.currentScript.src || new URL('node-cjs/publicUtils.cjs', document.baseURI).href)))).toString());
+var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
+const { version: version$2 } = JSON.parse(fs$1.readFileSync(new URL('../../package.json', (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.src || new URL('node-cjs/publicUtils.cjs', document.baseURI).href)))).toString());
 const VERSION = version$2;
 /**
  * Prefix for resolved fs paths, since windows paths may not be valid as URLs.
@@ -23,32 +24,11 @@ const VERSION = version$2;
 const FS_PREFIX = `/@fs/`;
 const VITE_PACKAGE_DIR = path$3.resolve(
 // import.meta.url is `dist/node/constants.js` after bundle
-node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (document.currentScript && document.currentScript.src || new URL('node-cjs/publicUtils.cjs', document.baseURI).href))), '../../..');
+node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.src || new URL('node-cjs/publicUtils.cjs', document.baseURI).href))), '../../..');
 const CLIENT_ENTRY = path$3.resolve(VITE_PACKAGE_DIR, 'dist/client/client.mjs');
 path$3.resolve(VITE_PACKAGE_DIR, 'dist/client/env.mjs');
 path$3.dirname(CLIENT_ENTRY);
 
-const chars$1 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
-const intToChar$1 = new Uint8Array(64); // 64 possible chars.
-const charToInt$1 = new Uint8Array(128); // z is 122 in ASCII
-for (let i = 0; i < chars$1.length; i++) {
-    const c = chars$1.charCodeAt(i);
-    intToChar$1[i] = c;
-    charToInt$1[c] = i;
-}
-
-// Matches the scheme of a URL, eg "http://"
-var UrlType;
-(function (UrlType) {
-    UrlType[UrlType["Empty"] = 1] = "Empty";
-    UrlType[UrlType["Hash"] = 2] = "Hash";
-    UrlType[UrlType["Query"] = 3] = "Query";
-    UrlType[UrlType["RelativePath"] = 4] = "RelativePath";
-    UrlType[UrlType["AbsolutePath"] = 5] = "AbsolutePath";
-    UrlType[UrlType["SchemeRelative"] = 6] = "SchemeRelative";
-    UrlType[UrlType["Absolute"] = 7] = "Absolute";
-})(UrlType || (UrlType = {}));
-
 const comma = ','.charCodeAt(0);
 const semicolon = ';'.charCodeAt(0);
 const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
@@ -137,6 +117,18 @@ function encodeInteger(buf, pos, state, segment, j) {
     return pos;
 }
 
+// Matches the scheme of a URL, eg "http://"
+var UrlType;
+(function (UrlType) {
+    UrlType[UrlType["Empty"] = 1] = "Empty";
+    UrlType[UrlType["Hash"] = 2] = "Hash";
+    UrlType[UrlType["Query"] = 3] = "Query";
+    UrlType[UrlType["RelativePath"] = 4] = "RelativePath";
+    UrlType[UrlType["AbsolutePath"] = 5] = "AbsolutePath";
+    UrlType[UrlType["SchemeRelative"] = 6] = "SchemeRelative";
+    UrlType[UrlType["Absolute"] = 7] = "Absolute";
+})(UrlType || (UrlType = {}));
+
 function getDefaultExportFromCjs (x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
 }
@@ -1228,7 +1220,7 @@ if (typeof process === 'undefined' || process.type === 'renderer' || process.bro
 }
 
 var srcExports = src.exports;
-var debug$1 = /*@__PURE__*/getDefaultExportFromCjs(srcExports);
+var debug$2 = /*@__PURE__*/getDefaultExportFromCjs(srcExports);
 
 var utils$3 = {};
 
@@ -3311,7 +3303,7 @@ const normalizePath$1 = function normalizePath(filename) {
 };
 
 function getMatcherString(id, resolutionBase) {
-    if (resolutionBase === false || require$$0$1.isAbsolute(id) || id.startsWith('*')) {
+    if (resolutionBase === false || require$$0$1.isAbsolute(id) || id.startsWith('**')) {
         return normalizePath$1(id);
     }
     // resolve('') is valid and will default to process.cwd()
@@ -3366,7 +3358,7 @@ forbiddenIdentifiers.add('');
 
 if (process.versions.pnp) {
     try {
-        node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (document.currentScript && document.currentScript.src || new URL('node-cjs/publicUtils.cjs', document.baseURI).href)))('pnpapi');
+        node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.src || new URL('node-cjs/publicUtils.cjs', document.baseURI).href)))('pnpapi');
     }
     catch { }
 }
@@ -3376,16 +3368,18 @@ const windowsSlashRE = /\\/g;
 function slash(p) {
     return p.replace(windowsSlashRE, '/');
 }
+// Some runtimes like Bun injects namespaced modules here, which is not a node builtin
+node_module.builtinModules.filter((id) => !id.includes(':'));
 function isInNodeModules(id) {
     return id.includes('node_modules');
 }
 // TODO: use import()
-const _require = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (document.currentScript && document.currentScript.src || new URL('node-cjs/publicUtils.cjs', document.baseURI).href)));
+const _require = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.src || new URL('node-cjs/publicUtils.cjs', document.baseURI).href)));
 // set in bin/vite.js
 const filter = process.env.VITE_DEBUG_FILTER;
 const DEBUG = process.env.DEBUG;
 function createDebugger(namespace, options = {}) {
-    const log = debug$1(namespace);
+    const log = debug$2(namespace);
     const { onlyWhenFocused } = options;
     let enabled = log.enabled;
     if (enabled && onlyWhenFocused) {
@@ -3470,6 +3464,7 @@ function isObject$1(value) {
 }
 function tryStatSync(file) {
     try {
+        // The "throwIfNoEntry" is a performance optimization for cases where the file does not exist
         return fs$1.statSync(file, { throwIfNoEntry: false });
     }
     catch {
@@ -3477,11 +3472,10 @@ function tryStatSync(file) {
     }
 }
 function isFileReadable(filename) {
+    if (!tryStatSync(filename)) {
+        return false;
+    }
     try {
-        // The "throwIfNoEntry" is a performance optimization for cases where the file does not exist
-        if (!fs$1.statSync(filename, { throwIfNoEntry: false })) {
-            return false;
-        }
         // Check if current process has read permission to the file
         fs$1.accessSync(filename, fs$1.constants.R_OK);
         return true;
@@ -3507,7 +3501,7 @@ const usingDynamicImport = typeof jest === 'undefined';
 usingDynamicImport
     ? new Function('file', 'return import(file)')
     : _require;
-path$3.dirname(node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (document.currentScript && document.currentScript.src || new URL('node-cjs/publicUtils.cjs', document.baseURI).href))));
+path$3.dirname(node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.src || new URL('node-cjs/publicUtils.cjs', document.baseURI).href))));
 function mergeConfigRecursively(defaults, overrides, rootPath) {
     const merged = { ...defaults };
     for (const key in overrides) {
@@ -3704,6 +3698,245 @@ function splitVendorChunkPlugin() {
     };
 }
 
+var convertSourceMap$1 = {};
+
+(function (exports) {
+
+	Object.defineProperty(exports, 'commentRegex', {
+	  get: function getCommentRegex () {
+	    // Groups: 1: media type, 2: MIME type, 3: charset, 4: encoding, 5: data.
+	    return /^\s*?\/[\/\*][@#]\s+?sourceMappingURL=data:(((?:application|text)\/json)(?:;charset=([^;,]+?)?)?)?(?:;(base64))?,(.*?)$/mg;
+	  }
+	});
+
+
+	Object.defineProperty(exports, 'mapFileCommentRegex', {
+	  get: function getMapFileCommentRegex () {
+	    // Matches sourceMappingURL in either // or /* comment styles.
+	    return /(?:\/\/[@#][ \t]+?sourceMappingURL=([^\s'"`]+?)[ \t]*?$)|(?:\/\*[@#][ \t]+sourceMappingURL=([^*]+?)[ \t]*?(?:\*\/){1}[ \t]*?$)/mg;
+	  }
+	});
+
+	var decodeBase64;
+	if (typeof Buffer !== 'undefined') {
+	  if (typeof Buffer.from === 'function') {
+	    decodeBase64 = decodeBase64WithBufferFrom;
+	  } else {
+	    decodeBase64 = decodeBase64WithNewBuffer;
+	  }
+	} else {
+	  decodeBase64 = decodeBase64WithAtob;
+	}
+
+	function decodeBase64WithBufferFrom(base64) {
+	  return Buffer.from(base64, 'base64').toString();
+	}
+
+	function decodeBase64WithNewBuffer(base64) {
+	  if (typeof value === 'number') {
+	    throw new TypeError('The value to decode must not be of type number.');
+	  }
+	  return new Buffer(base64, 'base64').toString();
+	}
+
+	function decodeBase64WithAtob(base64) {
+	  return decodeURIComponent(escape(atob(base64)));
+	}
+
+	function stripComment(sm) {
+	  return sm.split(',').pop();
+	}
+
+	function readFromFileMap(sm, read) {
+	  var r = exports.mapFileCommentRegex.exec(sm);
+	  // for some odd reason //# .. captures in 1 and /* .. */ in 2
+	  var filename = r[1] || r[2];
+
+	  try {
+	    var sm = read(filename);
+	    if (sm != null && typeof sm.catch === 'function') {
+	      return sm.catch(throwError);
+	    } else {
+	      return sm;
+	    }
+	  } catch (e) {
+	    throwError(e);
+	  }
+
+	  function throwError(e) {
+	    throw new Error('An error occurred while trying to read the map file at ' + filename + '\n' + e.stack);
+	  }
+	}
+
+	function Converter (sm, opts) {
+	  opts = opts || {};
+
+	  if (opts.hasComment) {
+	    sm = stripComment(sm);
+	  }
+
+	  if (opts.encoding === 'base64') {
+	    sm = decodeBase64(sm);
+	  } else if (opts.encoding === 'uri') {
+	    sm = decodeURIComponent(sm);
+	  }
+
+	  if (opts.isJSON || opts.encoding) {
+	    sm = JSON.parse(sm);
+	  }
+
+	  this.sourcemap = sm;
+	}
+
+	Converter.prototype.toJSON = function (space) {
+	  return JSON.stringify(this.sourcemap, null, space);
+	};
+
+	if (typeof Buffer !== 'undefined') {
+	  if (typeof Buffer.from === 'function') {
+	    Converter.prototype.toBase64 = encodeBase64WithBufferFrom;
+	  } else {
+	    Converter.prototype.toBase64 = encodeBase64WithNewBuffer;
+	  }
+	} else {
+	  Converter.prototype.toBase64 = encodeBase64WithBtoa;
+	}
+
+	function encodeBase64WithBufferFrom() {
+	  var json = this.toJSON();
+	  return Buffer.from(json, 'utf8').toString('base64');
+	}
+
+	function encodeBase64WithNewBuffer() {
+	  var json = this.toJSON();
+	  if (typeof json === 'number') {
+	    throw new TypeError('The json to encode must not be of type number.');
+	  }
+	  return new Buffer(json, 'utf8').toString('base64');
+	}
+
+	function encodeBase64WithBtoa() {
+	  var json = this.toJSON();
+	  return btoa(unescape(encodeURIComponent(json)));
+	}
+
+	Converter.prototype.toURI = function () {
+	  var json = this.toJSON();
+	  return encodeURIComponent(json);
+	};
+
+	Converter.prototype.toComment = function (options) {
+	  var encoding, content, data;
+	  if (options != null && options.encoding === 'uri') {
+	    encoding = '';
+	    content = this.toURI();
+	  } else {
+	    encoding = ';base64';
+	    content = this.toBase64();
+	  }
+	  data = 'sourceMappingURL=data:application/json;charset=utf-8' + encoding + ',' + content;
+	  return options != null && options.multiline ? '/*# ' + data + ' */' : '//# ' + data;
+	};
+
+	// returns copy instead of original
+	Converter.prototype.toObject = function () {
+	  return JSON.parse(this.toJSON());
+	};
+
+	Converter.prototype.addProperty = function (key, value) {
+	  if (this.sourcemap.hasOwnProperty(key)) throw new Error('property "' + key + '" already exists on the sourcemap, use set property instead');
+	  return this.setProperty(key, value);
+	};
+
+	Converter.prototype.setProperty = function (key, value) {
+	  this.sourcemap[key] = value;
+	  return this;
+	};
+
+	Converter.prototype.getProperty = function (key) {
+	  return this.sourcemap[key];
+	};
+
+	exports.fromObject = function (obj) {
+	  return new Converter(obj);
+	};
+
+	exports.fromJSON = function (json) {
+	  return new Converter(json, { isJSON: true });
+	};
+
+	exports.fromURI = function (uri) {
+	  return new Converter(uri, { encoding: 'uri' });
+	};
+
+	exports.fromBase64 = function (base64) {
+	  return new Converter(base64, { encoding: 'base64' });
+	};
+
+	exports.fromComment = function (comment) {
+	  var m, encoding;
+	  comment = comment
+	    .replace(/^\/\*/g, '//')
+	    .replace(/\*\/$/g, '');
+	  m = exports.commentRegex.exec(comment);
+	  encoding = m && m[4] || 'uri';
+	  return new Converter(comment, { encoding: encoding, hasComment: true });
+	};
+
+	function makeConverter(sm) {
+	  return new Converter(sm, { isJSON: true });
+	}
+
+	exports.fromMapFileComment = function (comment, read) {
+	  if (typeof read === 'string') {
+	    throw new Error(
+	      'String directory paths are no longer supported with `fromMapFileComment`\n' +
+	      'Please review the Upgrading documentation at https://github.com/thlorenz/convert-source-map#upgrading'
+	    )
+	  }
+
+	  var sm = readFromFileMap(comment, read);
+	  if (sm != null && typeof sm.then === 'function') {
+	    return sm.then(makeConverter);
+	  } else {
+	    return makeConverter(sm);
+	  }
+	};
+
+	// Finds last sourcemap comment in file or returns null if none was found
+	exports.fromSource = function (content) {
+	  var m = content.match(exports.commentRegex);
+	  return m ? exports.fromComment(m.pop()) : null;
+	};
+
+	// Finds last sourcemap comment in file or returns null if none was found
+	exports.fromMapFileSource = function (content, read) {
+	  if (typeof read === 'string') {
+	    throw new Error(
+	      'String directory paths are no longer supported with `fromMapFileSource`\n' +
+	      'Please review the Upgrading documentation at https://github.com/thlorenz/convert-source-map#upgrading'
+	    )
+	  }
+	  var m = content.match(exports.mapFileCommentRegex);
+	  return m ? exports.fromMapFileComment(m.pop(), read) : null;
+	};
+
+	exports.removeComments = function (src) {
+	  return src.replace(exports.commentRegex, '');
+	};
+
+	exports.removeMapFileComments = function (src) {
+	  return src.replace(exports.mapFileCommentRegex, '');
+	};
+
+	exports.generateMapFileComment = function (file, options) {
+	  var data = 'sourceMappingURL=' + file;
+	  return options && options.multiline ? '/*# ' + data + ' */' : '//# ' + data;
+	}; 
+} (convertSourceMap$1));
+
+var convertSourceMap = /*@__PURE__*/getDefaultExportFromCjs(convertSourceMap$1);
+
 /*!
  * etag
  * Copyright(c) 2014-2016 Douglas Christopher Wilson
@@ -3945,6 +4178,13 @@ class Chunk {
 		this.end = index;
 
 		if (this.edited) {
+			// after split we should save the edit content record into the correct chunk
+			// to make sure sourcemap correct
+			// For example:
+			// '  test'.trim()
+			//     split   -> '  ' + 'test'
+			//   ✔️ edit    -> '' + 'test'
+			//   ✖️ edit    -> 'test' + '' 
 			// TODO is this block necessary?...
 			newChunk.edit('', false);
 			this.content = '';
@@ -3973,6 +4213,10 @@ class Chunk {
 		if (trimmed.length) {
 			if (trimmed !== this.content) {
 				this.split(this.start + trimmed.length).edit('', undefined, true);
+				if (this.edited) {
+					// save the change, if it has been edited
+					this.edit(trimmed, this.storeName, true);
+				}
 			}
 			return true;
 		} else {
@@ -3991,7 +4235,11 @@ class Chunk {
 
 		if (trimmed.length) {
 			if (trimmed !== this.content) {
-				this.split(this.end - trimmed.length);
+				const newChunk = this.split(this.end - trimmed.length);
+				if (this.edited) {
+					// save the change, if it has been edited
+					newChunk.edit(trimmed, this.storeName, true);
+				}
 				this.edit('', undefined, true);
 			}
 			return true;
@@ -4016,7 +4264,7 @@ function getBtoa() {
 	}
 }
 
-const btoa = /*#__PURE__*/ getBtoa();
+const btoa$1 = /*#__PURE__*/ getBtoa();
 
 class SourceMap {
 	constructor(properties) {
@@ -4036,7 +4284,7 @@ class SourceMap {
 	}
 
 	toUrl() {
-		return 'data:application/json;charset=utf-8;base64,' + btoa(this.toString());
+		return 'data:application/json;charset=utf-8;base64,' + btoa$1(this.toString());
 	}
 }
 
@@ -5003,7 +5251,7 @@ class MagicString {
 	}
 }
 
-const debug = createDebugger('vite:sourcemap', {
+const debug$1 = createDebugger('vite:sourcemap', {
     onlyWhenFocused: true,
 });
 function genSourceMapUrl(map) {
@@ -5013,7 +5261,7 @@ function genSourceMapUrl(map) {
     return `data:application/json;base64,${Buffer.from(map).toString('base64')}`;
 }
 function getCodeWithSourcemap(type, code, map) {
-    if (debug) {
+    if (debug$1) {
         code += `\n/*${JSON.stringify(map, null, 2).replace(/\*\//g, '*\\/')}*/\n`;
     }
     if (type === 'js') {
@@ -5025,6 +5273,9 @@ function getCodeWithSourcemap(type, code, map) {
     return code;
 }
 
+const debug = createDebugger('vite:send', {
+    onlyWhenFocused: true,
+});
 const alias = {
     js: 'application/javascript',
     css: 'text/css',
@@ -5055,11 +5306,22 @@ function send(req, res, content, type, options) {
             content = getCodeWithSourcemap(type, content.toString(), map);
         }
     }
-    else {
-        if (type === 'js' && (!map || map.mappings !== '')) {
+    // inject fallback sourcemap for js for improved debugging
+    // https://github.com/vitejs/vite/pull/13514#issuecomment-1592431496
+    else if (type === 'js' && (!map || map.mappings !== '')) {
+        const code = content.toString();
+        // if the code has existing inline sourcemap, assume it's correct and skip
+        if (convertSourceMap.mapFileCommentRegex.test(code)) {
+            debug?.(`Skipped injecting fallback sourcemap for ${req.url}`);
+        }
+        else {
             const urlWithoutTimestamp = removeTimestampQuery(req.url);
-            const ms = new MagicString(content.toString());
-            content = getCodeWithSourcemap(type, content.toString(), ms.generateMap({ source: urlWithoutTimestamp, hires: 'boundary' }));
+            const ms = new MagicString(code);
+            content = getCodeWithSourcemap(type, code, ms.generateMap({
+                source: path$3.basename(urlWithoutTimestamp),
+                hires: 'boundary',
+                includeContent: true,
+            }));
         }
     }
     res.statusCode = 200;
@@ -5191,8 +5453,13 @@ function hasWorkspacePackageJSON(root) {
     if (!isFileReadable(path)) {
         return false;
     }
-    const content = JSON.parse(fs$1.readFileSync(path, 'utf-8')) || {};
-    return !!content.workspaces;
+    try {
+        const content = JSON.parse(fs$1.readFileSync(path, 'utf-8')) || {};
+        return !!content.workspaces;
+    }
+    catch {
+        return false;
+    }
 }
 function hasRootFile(root) {
     return ROOT_FILES.some((file) => fs$1.existsSync(path$3.join(root, file)));
@@ -5641,48 +5908,59 @@ main$1.exports.populate = DotenvModule.populate;
 
 main$1.exports = DotenvModule;
 
+// like String.prototype.search but returns the last index
+function _searchLast (str, rgx) {
+  const matches = Array.from(str.matchAll(rgx));
+  return matches.length > 0 ? matches.slice(-1)[0].index : -1
+}
+
 function _interpolate (envValue, environment, config) {
-  const matches = envValue.match(/(.?\${*[\w]*(?::-[\w/]*)?}*)/g) || [];
+  // find the last unescaped dollar sign in the
+  // value so that we can evaluate it
+  const lastUnescapedDollarSignIndex = _searchLast(envValue, /(?!(?<=\\))\$/g);
 
-  return matches.reduce(function (newEnv, match, index) {
-    const parts = /(.?)\${*([\w]*(?::-[\w/]*)?)?}*/g.exec(match);
-    if (!parts || parts.length === 0) {
-      return newEnv
-    }
+  // If we couldn't match any unescaped dollar sign
+  // let's return the string as is
+  if (lastUnescapedDollarSignIndex === -1) return envValue
 
-    const prefix = parts[1];
+  // This is the right-most group of variables in the string
+  const rightMostGroup = envValue.slice(lastUnescapedDollarSignIndex);
 
-    let value, replacePart;
+  /**
+   * This finds the inner most variable/group divided
+   * by variable name and default value (if present)
+   * (
+   *   (?!(?<=\\))\$        // only match dollar signs that are not escaped
+   *   {?                   // optional opening curly brace
+   *     ([\w]+)            // match the variable name
+   *     (?::-([^}\\]*))?   // match an optional default value
+   *   }?                   // optional closing curly brace
+   * )
+   */
+  const matchGroup = /((?!(?<=\\))\${?([\w]+)(?::-([^}\\]*))?}?)/;
+  const match = rightMostGroup.match(matchGroup);
+
+  if (match != null) {
+    const [, group, variableName, defaultValue] = match;
+
+    return _interpolate(
+      envValue.replace(
+        group,
+        environment[variableName] ||
+          defaultValue ||
+          config.parsed[variableName] ||
+          ''
+      ),
+      environment,
+      config
+    )
+  }
 
-    if (prefix === '\\') {
-      replacePart = parts[0];
-      value = replacePart.replace('\\$', '$');
-    } else {
-      // PATCH: compatible with env variables ended with unescaped $
-      if(!parts[2]) {
-        return newEnv
-      }
-      const keyParts = parts[2].split(':-');
-      const key = keyParts[0];
-      replacePart = parts[0].substring(prefix.length);
-      // process.env value 'wins' over .env file's value
-      value = Object.prototype.hasOwnProperty.call(environment, key)
-        ? environment[key]
-        : (config.parsed[key] || keyParts[1] || '');
-
-      // If the value is found, remove nested expansions.
-      if (keyParts.length > 1 && value) {
-        const replaceNested = matches[index + 1];
-        matches[index + 1] = '';
-
-        newEnv = newEnv.replace(replaceNested, '');
-      }
-      // Resolve recursive interpolations
-      value = _interpolate(value, environment, config);
-    }
+  return envValue
+}
 
-    return newEnv.replace(replacePart, value)
-  }, envValue)
+function _resolveEscapeSequences (value) {
+  return value.replace(/\\\$/g, '$')
 }
 
 function expand (config) {
@@ -5690,9 +5968,13 @@ function expand (config) {
   const environment = config.ignoreProcessEnv ? {} : process.env;
 
   for (const configKey in config.parsed) {
-    const value = Object.prototype.hasOwnProperty.call(environment, configKey) ? environment[configKey] : config.parsed[configKey];
+    const value = Object.prototype.hasOwnProperty.call(environment, configKey)
+      ? environment[configKey]
+      : config.parsed[configKey];
 
-    config.parsed[configKey] = _interpolate(value, environment, config);
+    config.parsed[configKey] = _resolveEscapeSequences(
+      _interpolate(value, environment, config)
+    );
   }
 
   // PATCH: don't write to process.env

package/index.cjs

@@ -1,5 +1,7 @@
 /* eslint-disable no-restricted-globals */
 
+warnCjsUsage()
+
 // type utils
 module.exports.defineConfig = (config) => config
 
@@ -32,3 +34,15 @@ unsupportedCJS.forEach((name) => {
     )
   }
 })
+
+function warnCjsUsage() {
+  if (process.env.VITE_CJS_IGNORE_WARNING) return
+  globalThis.__vite_cjs_skip_clear_screen = true
+  const yellow = (str) => `\u001b[33m${str}\u001b[39m`
+  const log = process.env.VITE_CJS_TRACE ? console.trace : console.warn
+  log(
+    yellow(
+      `The CJS build of Vite's Node API is deprecated. See https://vitejs.dev/guide/troubleshooting.html#vite-cjs-node-api-deprecated for more details.`,
+    ),
+  )
+}

package/index.d.cts

@@ -0,0 +1,6 @@
+/**
+ * @deprecated The CJS build of Vite's Node API is deprecated. See https://vitejs.dev/guide/troubleshooting.html#vite-cjs-node-api-deprecated for more details.
+ */
+declare const module: any
+
+export = module