vite 5.0.0-beta.2 → 5.0.0-beta.4

package/dist/node/chunks/{dep-13ae786e.js → dep-a86a117b.js}

@@ -1,4 +1,4 @@
-import { D as getDefaultExportFromCjs } from './dep-82f73734.js';
+import { D as getDefaultExportFromCjs } from './dep-69dc786c.js';
 import require$$0 from 'path';
 import require$$0__default from 'fs';
 import { l as lib } from './dep-c423598f.js';

package/dist/node/chunks/{dep-5c5f3875.js → dep-ae1dfb84.js}

@@ -1,4 +1,4 @@
-import { E as commonjsGlobal, D as getDefaultExportFromCjs } from './dep-82f73734.js';
+import { E as commonjsGlobal, D as getDefaultExportFromCjs } from './dep-69dc786c.js';
 import require$$0__default from 'fs';
 import require$$0 from 'postcss';
 import require$$0$1 from 'path';

package/dist/node/cli.js

@@ -2,7 +2,7 @@ import path from 'node:path';
 import fs from 'node:fs';
 import { performance } from 'node:perf_hooks';
 import { EventEmitter } from 'events';
-import { C as colors, x as createLogger, h as resolveConfig } from './chunks/dep-82f73734.js';
+import { C as colors, x as createLogger, h as resolveConfig } from './chunks/dep-69dc786c.js';
 import { VERSION } from './constants.js';
 import 'node:fs/promises';
 import 'node:url';
@@ -27,10 +27,10 @@ import 'node:dns';
 import 'crypto';
 import 'node:buffer';
 import 'module';
+import 'rollup';
 import 'node:assert';
 import 'node:process';
 import 'node:v8';
-import 'rollup';
 import 'node:http';
 import 'node:https';
 import 'zlib';
@@ -40,6 +40,7 @@ import 'tls';
 import 'worker_threads';
 import 'querystring';
 import 'node:readline';
+import 'node:events';
 import 'node:zlib';
 
 function toArr(any) {
@@ -758,7 +759,7 @@ cli
     filterDuplicateOptions(options);
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await import('./chunks/dep-82f73734.js').then(function (n) { return n.H; });
+    const { createServer } = await import('./chunks/dep-69dc786c.js').then(function (n) { return n.H; });
     try {
         const server = await createServer({
             root,
@@ -779,7 +780,10 @@ cli
         const startupDurationString = viteStartTime
             ? colors.dim(`ready in ${colors.reset(colors.bold(Math.ceil(performance.now() - viteStartTime)))} ms`)
             : '';
-        info(`\n  ${colors.green(`${colors.bold('VITE')} v${VERSION}`)}  ${startupDurationString}\n`, { clear: !server.config.logger.hasWarned });
+        info(`\n  ${colors.green(`${colors.bold('VITE')} v${VERSION}`)}  ${startupDurationString}\n`, {
+            clear: !server.config.logger.hasWarned &&
+                !globalThis.__vite_cjs_skip_clear_screen,
+        });
         server.printUrls();
         server.bindCLIShortcuts({
             print: true,
@@ -836,7 +840,7 @@ cli
     .option('-w, --watch', `[boolean] rebuilds when modules have changed on disk`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { build } = await import('./chunks/dep-82f73734.js').then(function (n) { return n.G; });
+    const { build } = await import('./chunks/dep-69dc786c.js').then(function (n) { return n.G; });
     const buildOptions = cleanOptions(options);
     try {
         await build({
@@ -864,7 +868,7 @@ cli
     .option('--force', `[boolean] force the optimizer to ignore the cache and re-bundle`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { optimizeDeps } = await import('./chunks/dep-82f73734.js').then(function (n) { return n.F; });
+    const { optimizeDeps } = await import('./chunks/dep-69dc786c.js').then(function (n) { return n.F; });
     try {
         const config = await resolveConfig({
             root,
@@ -891,7 +895,7 @@ cli
     .option('--outDir <dir>', `[string] output directory (default: dist)`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { preview } = await import('./chunks/dep-82f73734.js').then(function (n) { return n.I; });
+    const { preview } = await import('./chunks/dep-69dc786c.js').then(function (n) { return n.I; });
     try {
         const server = await preview({
             root,

package/dist/node/index.d.ts

@@ -225,8 +225,11 @@ export declare interface BuildOptions {
     /**
      * Options for terser
      * https://terser.org/docs/api-reference#minify-options
+     *
+     * In addition, you can also pass a `maxWorkers: number` option to specify the
+     * max number of workers to spawn. Defaults to the number of CPUs minus 1.
      */
-    terserOptions?: Terser.MinifyOptions;
+    terserOptions?: TerserOptions;
     /**
      * Will be merged with internal rollup options.
      * https://rollupjs.org/configuration-options/
@@ -256,7 +259,7 @@ export declare interface BuildOptions {
      */
     copyPublicDir?: boolean;
     /**
-     * Whether to emit a manifest.json under assets dir to map hash-less filenames
+     * Whether to emit a .vite/manifest.json under assets dir to map hash-less filenames
      * to their hashed versions. Useful when you want to generate your own HTML
      * instead of using the one generated by Vite.
      *
@@ -728,8 +731,6 @@ export declare interface DepsOptimizer {
 }
 
 declare interface Drafts {
-    /** Whether to enable CSS nesting. */
-    nesting?: boolean,
     /** Whether to enable @custom-media rules. */
     customMedia?: boolean
 }
@@ -791,32 +792,6 @@ export declare type ExportsData = {
     jsxLoader?: boolean;
 };
 
-declare const enum Features {
-    Nesting = 1,
-    NotSelectorList = 2,
-    DirSelector = 4,
-    LangSelectorList = 8,
-    IsSelector = 16,
-    TextDecorationThicknessPercent = 32,
-    MediaIntervalSyntax = 64,
-    MediaRangeSyntax = 128,
-    CustomMediaQueries = 256,
-    ClampFunction = 512,
-    ColorFunction = 1024,
-    OklabColors = 2048,
-    LabColors = 4096,
-    P3Colors = 8192,
-    HexAlphaColors = 16384,
-    SpaceSeparatedColorNotation = 32768,
-    FontFamilySystemUi = 65536,
-    DoublePositionGradients = 131072,
-    VendorPrefixes = 262144,
-    LogicalProperties = 524288,
-    Selectors = 31,
-    MediaQueries = 448,
-    Colors = 64512,
-}
-
 export declare interface FileSystemServeOptions {
     /**
      * Strictly restrict file accessing outside of allowing paths.
@@ -1297,14 +1272,6 @@ export declare interface JsonOptions {
 export { KnownAsTypeMap }
 
 export declare interface LegacyOptions {
-    /**
-     * Revert vite build --ssr to the v2.9 strategy. Use CJS SSR build and v2.9 externalization heuristics
-     *
-     * @experimental
-     * @deprecated
-     * @default false
-     */
-    buildSsrCjsExternalHeuristics?: boolean;
 }
 
 export declare type LibraryFormats = 'es' | 'cjs' | 'umd' | 'iife';
@@ -1338,8 +1305,8 @@ export declare interface LibraryOptions {
  */
 export declare type LightningCSSOptions = {
     targets?: Targets
-    include?: Features
-    exclude?: Features
+    include?: number
+    exclude?: number
     drafts?: Drafts
     nonStandard?: NonStandard
     pseudoClasses?: PseudoClasses
@@ -1559,7 +1526,7 @@ export declare interface PackageData {
  * If a plugin should be applied only for server or build, a function format
  * config file can be used to conditional determine the plugins to use.
  */
-declare interface Plugin_2 extends Plugin_3 {
+declare interface Plugin_2<A = any> extends Plugin_3<A> {
     /**
      * Enforce plugin invocation tier similar to webpack loaders.
      *
@@ -1860,7 +1827,6 @@ export declare interface ResolvedServerUrls {
 
 export declare interface ResolvedSSROptions extends SSROptions {
     target: SSRTarget;
-    format: SSRFormat;
     optimizeDeps: SsrDepOptimizationOptions;
 }
 
@@ -2195,10 +2161,10 @@ export declare interface ServerOptions extends CommonServerOptions {
      */
     hmr?: HmrOptions | boolean;
     /**
-     * chokidar watch options
+     * chokidar watch options or null to disable FS watching
      * https://github.com/paulmillr/chokidar#api
      */
-    watch?: WatchOptions;
+    watch?: WatchOptions | null;
     /**
      * Create Vite dev server to be used as a middleware in an existing server
      * @default false
@@ -2253,8 +2219,6 @@ export declare function splitVendorChunkPlugin(): Plugin_2;
 
 export declare type SsrDepOptimizationOptions = DepOptimizationConfig;
 
-export declare type SSRFormat = 'esm' | 'cjs';
-
 export declare interface SSROptions {
     noExternal?: string | RegExp | (string | RegExp)[] | true;
     external?: string[];
@@ -2264,16 +2228,6 @@ export declare interface SSROptions {
      * @default 'node'
      */
     target?: SSRTarget;
-    /**
-     * Define the format for the ssr build. Since Vite v3 the SSR build generates ESM by default.
-     * `'cjs'` can be selected to generate a CJS build, but it isn't recommended. This option is
-     * left marked as experimental to give users more time to update to ESM. CJS builds requires
-     * complex externalization heuristics that aren't present in the ESM format.
-     * @experimental
-     * @deprecated
-     * @default 'esm'
-     */
-    format?: SSRFormat;
     /**
      * Control over which dependencies are optimized during SSR and esbuild options
      * During build:
@@ -2514,6 +2468,16 @@ export declare namespace Terser {
     }
 }
 
+export declare interface TerserOptions extends Terser.MinifyOptions {
+    /**
+     * Vite-specific option to specify the max number of workers to spawn
+     * when minifying files with terser.
+     *
+     * @default number of CPUs minus 1
+     */
+    maxWorkers?: number;
+}
+
 export declare interface TransformOptions {
     ssr?: boolean;
     html?: boolean;
@@ -2802,7 +2766,6 @@ export declare interface ViteDevServer {
      */
     openBrowser(): void;
     /* Excluded from this release type: _importGlobMap */
-    /* Excluded from this release type: _ssrExternals */
     /* Excluded from this release type: _restartPromise */
     /* Excluded from this release type: _forceOptimizeOnRestart */
     /* Excluded from this release type: _pendingRequests */

package/dist/node/index.js

@@ -1,5 +1,5 @@
-import { i as isInNodeModules } from './chunks/dep-82f73734.js';
-export { b as build, e as buildErrorMessage, v as createFilter, x as createLogger, c as createServer, g as defineConfig, f as formatPostcssSourceMap, k as getDepOptimizationConfig, m as isDepsOptimizerEnabled, z as isFileServingAllowed, l as loadConfigFromFile, A as loadEnv, u as mergeAlias, q as mergeConfig, n as normalizePath, o as optimizeDeps, a as preprocessCSS, p as preview, j as resolveBaseUrl, h as resolveConfig, B as resolveEnvPrefix, d as resolvePackageData, r as resolvePackageEntry, y as searchForWorkspaceRoot, w as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-82f73734.js';
+import { i as isInNodeModules } from './chunks/dep-69dc786c.js';
+export { b as build, e as buildErrorMessage, v as createFilter, x as createLogger, c as createServer, g as defineConfig, f as formatPostcssSourceMap, k as getDepOptimizationConfig, m as isDepsOptimizerEnabled, z as isFileServingAllowed, l as loadConfigFromFile, A as loadEnv, u as mergeAlias, q as mergeConfig, n as normalizePath, o as optimizeDeps, a as preprocessCSS, p as preview, j as resolveBaseUrl, h as resolveConfig, B as resolveEnvPrefix, d as resolvePackageData, r as resolvePackageEntry, y as searchForWorkspaceRoot, w as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-69dc786c.js';
 export { VERSION as version } from './constants.js';
 export { version as esbuildVersion } from 'esbuild';
 export { VERSION as rollupVersion } from 'rollup';
@@ -41,6 +41,7 @@ import 'tls';
 import 'worker_threads';
 import 'querystring';
 import 'node:readline';
+import 'node:events';
 import 'node:zlib';
 
 // This file will be built for both ESM and CJS. Avoid relying on other modules as possible.

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;
 }
@@ -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,11 +3368,13 @@ 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;
@@ -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) {
@@ -4184,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 = '';
@@ -4212,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 {
@@ -4230,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;
@@ -5444,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)));
@@ -5894,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) {
@@ -5943,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
@@ -5958,6 +5987,14 @@ function expand (config) {
 
 var expand_1 = expand;
 
+function getEnvFilesForMode(mode) {
+    return [
+        /** default file */ `.env`,
+        /** local file */ `.env.local`,
+        /** mode file */ `.env.${mode}`,
+        /** mode local file */ `.env.${mode}.local`,
+    ];
+}
 function loadEnv(mode, envDir, prefixes = 'VITE_') {
     if (mode === 'local') {
         throw new Error(`"local" cannot be used as a mode name because it conflicts with ` +
@@ -5965,12 +6002,7 @@ function loadEnv(mode, envDir, prefixes = 'VITE_') {
     }
     prefixes = arraify(prefixes);
     const env = {};
-    const envFiles = [
-        /** default file */ `.env`,
-        /** local file */ `.env.local`,
-        /** mode file */ `.env.${mode}`,
-        /** mode local file */ `.env.${mode}.local`,
-    ];
+    const envFiles = getEnvFilesForMode(mode);
     const parsed = Object.fromEntries(envFiles.flatMap((file) => {
         const filePath = path$3.join(envDir, file);
         if (!tryStatSync(filePath)?.isFile())

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