vite 5.1.1 → 5.1.2

package/dist/node/chunks/{dep-XbJJvsnO.js → dep-7WSsXf4P.js}

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

package/dist/node/chunks/{dep-94_H5fT6.js → dep-Glf1enhJ.js}

@@ -13077,6 +13077,21 @@ function sortObjectKeys(obj) {
     }
     return sorted;
 }
+function displayTime(time) {
+    // display: {X}ms
+    if (time < 1000) {
+        return `${time}ms`;
+    }
+    time = time / 1000;
+    // display: {X}s
+    if (time < 60) {
+        return `${time.toFixed(2)}s`;
+    }
+    const mins = parseInt((time / 60).toString());
+    const seconds = time % 60;
+    // display: {X}m {Y}s
+    return `${mins}m${seconds < 1 ? '' : ` ${seconds.toFixed(0)}s`}`;
+}
 
 /* eslint no-console: 0 */
 const LogLevels = {
@@ -13226,8 +13241,6 @@ function buildReporterPlugin(config) {
     let transformedCount = 0;
     let chunkCount = 0;
     let compressedCount = 0;
-    let startTime = Date.now();
-    let buildFailed = false;
     async function getCompressedSize(code) {
         if (config.build.ssr || !config.build.reportCompressedSize) {
             return null;
@@ -13270,14 +13283,10 @@ function buildReporterPlugin(config) {
             }
             return null;
         },
-        options() {
-            startTime = Date.now();
-        },
         buildStart() {
             transformedCount = 0;
         },
-        buildEnd(error) {
-            buildFailed = !!error;
+        buildEnd() {
             if (shouldLogInfo) {
                 if (tty) {
                     clearLine$1();
@@ -13424,11 +13433,6 @@ function buildReporterPlugin(config) {
                     `- Adjust chunk size limit for this warning via build.chunkSizeWarningLimit.`));
             }
         },
-        closeBundle() {
-            if (shouldLogInfo && !config.build.watch && !buildFailed) {
-                config.logger.info(`${colors$1.green(`✓ built in ${displayTime(Date.now() - startTime)}`)}`);
-            }
-        },
     };
 }
 function writeLine(output) {
@@ -13455,21 +13459,6 @@ function throttle(fn) {
         }, 100);
     };
 }
-function displayTime(time) {
-    // display: {X}ms
-    if (time < 1000) {
-        return `${time}ms`;
-    }
-    time = time / 1000;
-    // display: {X}s
-    if (time < 60) {
-        return `${time.toFixed(2)}s`;
-    }
-    const mins = parseInt((time / 60).toString());
-    const seconds = time % 60;
-    // display: {X}m {Y}s
-    return `${mins}m${seconds < 1 ? '' : ` ${seconds.toFixed(0)}s`}`;
-}
 
 const POSIX_SEP_RE = new RegExp('\\' + path$o.posix.sep, 'g');
 const NATIVE_SEP_RE = new RegExp('\\' + path$o.sep, 'g');
@@ -29603,7 +29592,7 @@ function stripLiteralDetailed(code, options) {
 var main$1 = {exports: {}};
 
 var name = "dotenv";
-var version$2 = "16.4.1";
+var version$2 = "16.4.2";
 var description = "Loads environment variables from .env file";
 var main = "lib/main.js";
 var types$2 = "lib/main.d.ts";
@@ -29634,7 +29623,7 @@ var repository = {
 	type: "git",
 	url: "git://github.com/motdotla/dotenv.git"
 };
-var funding = "https://github.com/motdotla/dotenv?sponsor=1";
+var funding = "https://dotenvx.com";
 var keywords$2 = [
 	"dotenv",
 	"env",
@@ -29743,7 +29732,7 @@ function _parseVault (options) {
   }
 
   // handle scenario for comma separated keys - for use with key rotation
-  // example: DOTENV_KEY="dotenv://:key_1234@dotenv.org/vault/.env.vault?environment=prod,dotenv://:key_7890@dotenv.org/vault/.env.vault?environment=prod"
+  // example: DOTENV_KEY="dotenv://:key_1234@dotenvx.com/vault/.env.vault?environment=prod,dotenv://:key_7890@dotenvx.com/vault/.env.vault?environment=prod"
   const keys = _dotenvKey(options).split(',');
   const length = keys.length;
 
@@ -29807,7 +29796,7 @@ function _instructions (result, dotenvKey) {
     uri = new URL(dotenvKey);
   } catch (error) {
     if (error.code === 'ERR_INVALID_URL') {
-      const err = new Error('INVALID_DOTENV_KEY: Wrong format. Must be in valid uri format like dotenv://:key_1234@dotenv.org/vault/.env.vault?environment=development');
+      const err = new Error('INVALID_DOTENV_KEY: Wrong format. Must be in valid uri format like dotenv://:key_1234@dotenvx.com/vault/.env.vault?environment=development');
       err.code = 'INVALID_DOTENV_KEY';
       throw err
     }
@@ -30037,81 +30026,80 @@ 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
-}
+// * /
+// *   (\\)?            # is it escaped with a backslash?
+// *   (\$)             # literal $
+// *   (?!\()           # shouldnt be followed by parenthesis
+// *   (\{?)            # first brace wrap opening
+// *   ([\w.]+)         # key
+// *   (?::-((?:\$\{(?:\$\{(?:\$\{[^}]*\}|[^}])*}|[^}])*}|[^}])+))? # optional default nested 3 times
+// *   (\}?)            # last brace warp closing
+// * /xi
 
-function _interpolate (envValue, environment, config) {
-  // find the last unescaped dollar sign in the
-  // value so that we can evaluate it
-  const lastUnescapedDollarSignIndex = _searchLast(envValue, /(?!(?<=\\))\$/g);
+const DOTENV_SUBSTITUTION_REGEX = /(\\)?(\$)(?!\()(\{?)([\w.]+)(?::?-((?:\$\{(?:\$\{(?:\$\{[^}]*\}|[^}])*}|[^}])*}|[^}])+))?(\}?)/gi;
 
-  // If we couldn't match any unescaped dollar sign
-  // let's return the string as is
-  if (lastUnescapedDollarSignIndex === -1) return envValue
+function _resolveEscapeSequences (value) {
+  return value.replace(/\\\$/g, '$')
+}
 
-  // This is the right-most group of variables in the string
-  const rightMostGroup = envValue.slice(lastUnescapedDollarSignIndex);
+function interpolate (value, processEnv, parsed) {
+  return value.replace(DOTENV_SUBSTITUTION_REGEX, (match, escaped, dollarSign, openBrace, key, defaultValue, closeBrace) => {
+    if (escaped === '\\') {
+      return match.slice(1)
+    } else {
+      if (processEnv[key]) {
+        return processEnv[key]
+      }
 
-  /**
-   * 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 (parsed[key]) {
+        return parsed[key]
+      }
 
-  return envValue
-}
+      if (defaultValue) {
+        if (defaultValue.startsWith('$')) {
+          return interpolate(defaultValue, processEnv, parsed)
+        } else {
+          return defaultValue
+        }
+      }
 
-function _resolveEscapeSequences (value) {
-  return value.replace(/\\\$/g, '$')
+      return ''
+    }
+  })
 }
 
-function expand (config) {
-  // if ignoring process.env, use a blank object
-  const environment = config.ignoreProcessEnv ? {} : process.env;
+function expand (options) {
+  let processEnv = process.env;
+  if (options && options.processEnv != null) {
+    processEnv = options.processEnv;
+  }
 
-  for (const configKey in config.parsed) {
-    const value = Object.prototype.hasOwnProperty.call(environment, configKey)
-      ? environment[configKey]
-      : config.parsed[configKey];
+  for (const key in options.parsed) {
+    let value = options.parsed[key];
 
-    config.parsed[configKey] = _resolveEscapeSequences(
-      _interpolate(value, environment, config)
-    );
+    const inProcessEnv = Object.prototype.hasOwnProperty.call(processEnv, key);
+
+    if (inProcessEnv) {
+      if (processEnv[key] === options.parsed[key]) {
+        // assume was set to processEnv from the .env file if the values match and therefore interpolate
+        value = interpolate(value, processEnv, options.parsed);
+      } else {
+        // do not interpolate - assume processEnv had the intended value even if containing a $.
+        value = processEnv[key];
+      }
+    } else {
+      // not inProcessEnv so assume interpolation for this .env key
+      value = interpolate(value, processEnv, options.parsed);
+    }
+
+    options.parsed[key] = _resolveEscapeSequences(value);
   }
 
-  // PATCH: don't write to process.env
-  // for (const processKey in config.parsed) {
-  //   environment[processKey] = config.parsed[processKey]
-  // }
+  for (const processKey in options.parsed) {
+    processEnv[processKey] = options.parsed[processKey];
+  }
 
-  return config
+  return options
 }
 
 var expand_1 = expand;
@@ -30148,9 +30136,10 @@ function loadEnv(mode, envDir, prefixes = 'VITE_') {
     if (parsed.BROWSER_ARGS && process.env.BROWSER_ARGS === undefined) {
         process.env.BROWSER_ARGS = parsed.BROWSER_ARGS;
     }
-    // let environment variables use each other
-    // `expand` patched in patches/dotenv-expand@9.0.0.patch
-    expand_1({ parsed });
+    // let environment variables use each other. make a copy of `process.env` so that `dotenv-expand`
+    // doesn't re-assign the expanded values to the global `process.env`.
+    const processEnv = { ...process.env };
+    expand_1({ parsed, processEnv });
     // only keys that start with prefix are exposed to client
     for (const [key, value] of Object.entries(parsed)) {
         if (prefixes.some((prefix) => key.startsWith(prefix))) {
@@ -32082,8 +32071,8 @@ function createCachedImport(imp) {
         return cached;
     };
 }
-const importPostcssImport = createCachedImport(() => import('./dep-xESY8DUV.js').then(function (n) { return n.i; }));
-const importPostcssModules = createCachedImport(() => import('./dep-XbJJvsnO.js').then(function (n) { return n.i; }));
+const importPostcssImport = createCachedImport(() => import('./dep-vBYKhUMg.js').then(function (n) { return n.i; }));
+const importPostcssModules = createCachedImport(() => import('./dep-7WSsXf4P.js').then(function (n) { return n.i; }));
 const importPostcss = createCachedImport(() => import('postcss'));
 const preprocessorWorkerControllerCache = new WeakMap();
 let alwaysFakeWorkerWorkerControllerCache;
@@ -49247,10 +49236,11 @@ function webWorkerPlugin(config) {
                     // Using blob URL for SharedWorker results in multiple instances of a same worker
                     workerConstructor === 'Worker'
                         ? `${encodedJs}
+          const decodeBase64 = (base64) => Uint8Array.from(atob(base64), c => c.charCodeAt(0));
           const blob = typeof window !== "undefined" && window.Blob && new Blob([${workerType === 'classic'
                             ? ''
                             : // `URL` is always available, in `Worker[type="module"]`
-                                `'URL.revokeObjectURL(import.meta.url);'+`}atob(encodedJs)], { type: "text/javascript;charset=utf-8" });
+                                `'URL.revokeObjectURL(import.meta.url);',`}decodeBase64(encodedJs)], { type: "text/javascript;charset=utf-8" });
           export default function WorkerWrapper(options) {
             let objURL;
             try {
@@ -56180,7 +56170,7 @@ async function fetchModule(server, url, importer, options = {}) {
             throw err;
         }
         const file = pathToFileURL(resolved.id).toString();
-        const type = isFilePathESM(file, server.config.packageCache)
+        const type = isFilePathESM(resolved.id, server.config.packageCache)
             ? 'module'
             : 'commonjs';
         return { externalize: file, type };
@@ -65558,7 +65548,7 @@ function importAnalysisPlugin(config) {
                     }
                     // fix#9534, prevent the importerModuleNode being stopped from propagating updates
                     importerModule.isSelfAccepting = false;
-                    return this.error(`Failed to resolve import "${url}" from "${path$o.relative(process.cwd(), importerFile)}". Does the file exist?`, pos);
+                    return this.error(`Failed to resolve import "${url}" from "${normalizePath$3(path$o.relative(process.cwd(), importerFile))}". Does the file exist?`, pos);
                 }
                 if (isExternalUrl(resolved.id)) {
                     return [resolved.id, resolved.id];
@@ -66793,6 +66783,7 @@ async function build(inlineConfig = {}) {
         config.logger.error(msg, { error: e });
     };
     let bundle;
+    let startTime;
     try {
         const buildOutputOptions = (output = {}) => {
             // @ts-expect-error See https://github.com/vitejs/vite/issues/5812#issuecomment-984345618
@@ -66890,6 +66881,7 @@ async function build(inlineConfig = {}) {
         }
         // write or generate files with rollup
         const { rollup } = await import('rollup');
+        startTime = Date.now();
         bundle = await rollup(rollupOptions);
         if (options.write) {
             prepareOutDir(outDirs, options.emptyOutDir, config);
@@ -66898,11 +66890,16 @@ async function build(inlineConfig = {}) {
         for (const output of normalizedOutputs) {
             res.push(await bundle[options.write ? 'write' : 'generate'](output));
         }
+        config.logger.info(`${colors$1.green(`✓ built in ${displayTime(Date.now() - startTime)}`)}`);
         return Array.isArray(outputs) ? res : res[0];
     }
     catch (e) {
         e.message = mergeRollupError(e);
         clearLine();
+        if (startTime) {
+            config.logger.error(`${colors$1.red('x')} Build failed in ${displayTime(Date.now() - startTime)}`);
+            startTime = undefined;
+        }
         throw e;
     }
     finally {

package/dist/node/chunks/{dep-xESY8DUV.js → dep-vBYKhUMg.js}

@@ -1,4 +1,4 @@
-import { B as getDefaultExportFromCjs } from './dep-94_H5fT6.js';
+import { B as getDefaultExportFromCjs } from './dep-Glf1enhJ.js';
 import require$$0 from 'path';
 import require$$0__default from 'fs';
 import { l as lib } from './dep-8a-6Quh6.js';

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, a as createLogger, r as resolveConfig } from './chunks/dep-94_H5fT6.js';
+import { c as colors, a as createLogger, r as resolveConfig } from './chunks/dep-Glf1enhJ.js';
 import { VERSION } from './constants.js';
 import 'node:fs/promises';
 import 'node:url';
@@ -757,7 +757,7 @@ cli
     filterDuplicateOptions(options);
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await import('./chunks/dep-94_H5fT6.js').then(function (n) { return n.E; });
+    const { createServer } = await import('./chunks/dep-Glf1enhJ.js').then(function (n) { return n.E; });
     try {
         const server = await createServer({
             root,
@@ -836,7 +836,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-94_H5fT6.js').then(function (n) { return n.F; });
+    const { build } = await import('./chunks/dep-Glf1enhJ.js').then(function (n) { return n.F; });
     const buildOptions = cleanOptions(options);
     try {
         await build({
@@ -863,7 +863,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-94_H5fT6.js').then(function (n) { return n.D; });
+    const { optimizeDeps } = await import('./chunks/dep-Glf1enhJ.js').then(function (n) { return n.D; });
     try {
         const config = await resolveConfig({
             root,
@@ -889,7 +889,7 @@ cli
     .option('--outDir <dir>', `[string] output directory (default: dist)`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { preview } = await import('./chunks/dep-94_H5fT6.js').then(function (n) { return n.G; });
+    const { preview } = await import('./chunks/dep-Glf1enhJ.js').then(function (n) { return n.G; });
     try {
         const server = await preview({
             root,

package/dist/node/index.js

@@ -1,6 +1,6 @@
 export { parseAst, parseAstAsync } from 'rollup/parseAst';
-import { i as isInNodeModules, b as arraify } from './chunks/dep-94_H5fT6.js';
-export { f as build, j as buildErrorMessage, u as createFilter, a as createLogger, e as createServer, d as defineConfig, k as fetchModule, g as formatPostcssSourceMap, y as isFileServingAllowed, l as loadConfigFromFile, z as loadEnv, q as mergeAlias, m as mergeConfig, n as normalizePath, o as optimizeDeps, h as preprocessCSS, p as preview, r as resolveConfig, A as resolveEnvPrefix, v as rollupVersion, x as searchForWorkspaceRoot, w as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-94_H5fT6.js';
+import { i as isInNodeModules, b as arraify } from './chunks/dep-Glf1enhJ.js';
+export { f as build, j as buildErrorMessage, u as createFilter, a as createLogger, e as createServer, d as defineConfig, k as fetchModule, g as formatPostcssSourceMap, y as isFileServingAllowed, l as loadConfigFromFile, z as loadEnv, q as mergeAlias, m as mergeConfig, n as normalizePath, o as optimizeDeps, h as preprocessCSS, p as preview, r as resolveConfig, A as resolveEnvPrefix, v as rollupVersion, x as searchForWorkspaceRoot, w as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-Glf1enhJ.js';
 export { VERSION as version } from './constants.js';
 export { version as esbuildVersion } from 'esbuild';
 import { existsSync, readFileSync } from 'node:fs';

package/dist/node-cjs/publicUtils.cjs

@@ -5577,7 +5577,7 @@ function isFileServingAllowed(url, server) {
 var main$1 = {exports: {}};
 
 var name = "dotenv";
-var version$1 = "16.4.1";
+var version$1 = "16.4.2";
 var description = "Loads environment variables from .env file";
 var main = "lib/main.js";
 var types = "lib/main.d.ts";
@@ -5608,7 +5608,7 @@ var repository = {
 	type: "git",
 	url: "git://github.com/motdotla/dotenv.git"
 };
-var funding = "https://github.com/motdotla/dotenv?sponsor=1";
+var funding = "https://dotenvx.com";
 var keywords = [
 	"dotenv",
 	"env",
@@ -5717,7 +5717,7 @@ function _parseVault (options) {
   }
 
   // handle scenario for comma separated keys - for use with key rotation
-  // example: DOTENV_KEY="dotenv://:key_1234@dotenv.org/vault/.env.vault?environment=prod,dotenv://:key_7890@dotenv.org/vault/.env.vault?environment=prod"
+  // example: DOTENV_KEY="dotenv://:key_1234@dotenvx.com/vault/.env.vault?environment=prod,dotenv://:key_7890@dotenvx.com/vault/.env.vault?environment=prod"
   const keys = _dotenvKey(options).split(',');
   const length = keys.length;
 
@@ -5781,7 +5781,7 @@ function _instructions (result, dotenvKey) {
     uri = new URL(dotenvKey);
   } catch (error) {
     if (error.code === 'ERR_INVALID_URL') {
-      const err = new Error('INVALID_DOTENV_KEY: Wrong format. Must be in valid uri format like dotenv://:key_1234@dotenv.org/vault/.env.vault?environment=development');
+      const err = new Error('INVALID_DOTENV_KEY: Wrong format. Must be in valid uri format like dotenv://:key_1234@dotenvx.com/vault/.env.vault?environment=development');
       err.code = 'INVALID_DOTENV_KEY';
       throw err
     }
@@ -6011,81 +6011,80 @@ 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
-}
+// * /
+// *   (\\)?            # is it escaped with a backslash?
+// *   (\$)             # literal $
+// *   (?!\()           # shouldnt be followed by parenthesis
+// *   (\{?)            # first brace wrap opening
+// *   ([\w.]+)         # key
+// *   (?::-((?:\$\{(?:\$\{(?:\$\{[^}]*\}|[^}])*}|[^}])*}|[^}])+))? # optional default nested 3 times
+// *   (\}?)            # last brace warp closing
+// * /xi
 
-function _interpolate (envValue, environment, config) {
-  // find the last unescaped dollar sign in the
-  // value so that we can evaluate it
-  const lastUnescapedDollarSignIndex = _searchLast(envValue, /(?!(?<=\\))\$/g);
+const DOTENV_SUBSTITUTION_REGEX = /(\\)?(\$)(?!\()(\{?)([\w.]+)(?::?-((?:\$\{(?:\$\{(?:\$\{[^}]*\}|[^}])*}|[^}])*}|[^}])+))?(\}?)/gi;
 
-  // If we couldn't match any unescaped dollar sign
-  // let's return the string as is
-  if (lastUnescapedDollarSignIndex === -1) return envValue
+function _resolveEscapeSequences (value) {
+  return value.replace(/\\\$/g, '$')
+}
 
-  // This is the right-most group of variables in the string
-  const rightMostGroup = envValue.slice(lastUnescapedDollarSignIndex);
+function interpolate (value, processEnv, parsed) {
+  return value.replace(DOTENV_SUBSTITUTION_REGEX, (match, escaped, dollarSign, openBrace, key, defaultValue, closeBrace) => {
+    if (escaped === '\\') {
+      return match.slice(1)
+    } else {
+      if (processEnv[key]) {
+        return processEnv[key]
+      }
 
-  /**
-   * 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 (parsed[key]) {
+        return parsed[key]
+      }
 
-  return envValue
-}
+      if (defaultValue) {
+        if (defaultValue.startsWith('$')) {
+          return interpolate(defaultValue, processEnv, parsed)
+        } else {
+          return defaultValue
+        }
+      }
 
-function _resolveEscapeSequences (value) {
-  return value.replace(/\\\$/g, '$')
+      return ''
+    }
+  })
 }
 
-function expand (config) {
-  // if ignoring process.env, use a blank object
-  const environment = config.ignoreProcessEnv ? {} : process.env;
+function expand (options) {
+  let processEnv = process.env;
+  if (options && options.processEnv != null) {
+    processEnv = options.processEnv;
+  }
+
+  for (const key in options.parsed) {
+    let value = options.parsed[key];
 
-  for (const configKey in config.parsed) {
-    const value = Object.prototype.hasOwnProperty.call(environment, configKey)
-      ? environment[configKey]
-      : config.parsed[configKey];
+    const inProcessEnv = Object.prototype.hasOwnProperty.call(processEnv, key);
 
-    config.parsed[configKey] = _resolveEscapeSequences(
-      _interpolate(value, environment, config)
-    );
+    if (inProcessEnv) {
+      if (processEnv[key] === options.parsed[key]) {
+        // assume was set to processEnv from the .env file if the values match and therefore interpolate
+        value = interpolate(value, processEnv, options.parsed);
+      } else {
+        // do not interpolate - assume processEnv had the intended value even if containing a $.
+        value = processEnv[key];
+      }
+    } else {
+      // not inProcessEnv so assume interpolation for this .env key
+      value = interpolate(value, processEnv, options.parsed);
+    }
+
+    options.parsed[key] = _resolveEscapeSequences(value);
   }
 
-  // PATCH: don't write to process.env
-  // for (const processKey in config.parsed) {
-  //   environment[processKey] = config.parsed[processKey]
-  // }
+  for (const processKey in options.parsed) {
+    processEnv[processKey] = options.parsed[processKey];
+  }
 
-  return config
+  return options
 }
 
 var expand_1 = expand;
@@ -6122,9 +6121,10 @@ function loadEnv(mode, envDir, prefixes = 'VITE_') {
     if (parsed.BROWSER_ARGS && process.env.BROWSER_ARGS === undefined) {
         process.env.BROWSER_ARGS = parsed.BROWSER_ARGS;
     }
-    // let environment variables use each other
-    // `expand` patched in patches/dotenv-expand@9.0.0.patch
-    expand_1({ parsed });
+    // let environment variables use each other. make a copy of `process.env` so that `dotenv-expand`
+    // doesn't re-assign the expanded values to the global `process.env`.
+    const processEnv = { ...process.env };
+    expand_1({ parsed, processEnv });
     // only keys that start with prefix are exposed to client
     for (const [key, value] of Object.entries(parsed)) {
         if (prefixes.some((prefix) => key.startsWith(prefix))) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "5.1.1",
+  "version": "5.1.2",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",
@@ -103,8 +103,8 @@
     "cross-spawn": "^7.0.3",
     "debug": "^4.3.4",
     "dep-types": "link:./src/types",
-    "dotenv": "^16.4.1",
-    "dotenv-expand": "^10.0.0",
+    "dotenv": "^16.4.2",
+    "dotenv-expand": "^11.0.3",
     "es-module-lexer": "^1.4.1",
     "escape-html": "^1.0.3",
     "estree-walker": "^3.0.3",