vite 4.0.0-beta.0 → 4.0.0-beta.1

package/dist/node/chunks/{dep-753720be.js → dep-2ee6aff6.js}

@@ -1,6 +1,6 @@
 import require$$0__default from 'fs';
 import require$$0 from 'postcss';
-import { A as commonjsGlobal } from './dep-a5101d9f.js';
+import { A as commonjsGlobal } from './dep-86149127.js';
 import require$$0$1 from 'path';
 import require$$5 from 'crypto';
 import require$$0$2 from 'util';

package/dist/node/chunks/{dep-a5101d9f.js → dep-86149127.js}

@@ -21955,7 +21955,22 @@ function saveEmitWorkerAsset(config, asset) {
     const workerMap = workerCache.get(config.mainConfig || config);
     workerMap.assets.set(fileName, asset);
 }
+// Ensure that only one rollup build is called at the same time to avoid
+// leaking state in plugins between worker builds.
+// TODO: Review if we can parallelize the bundling of workers.
+const workerConfigSemaphore = new WeakMap();
 async function bundleWorkerEntry(config, id, query) {
+    const processing = workerConfigSemaphore.get(config);
+    if (processing) {
+        await processing;
+        return bundleWorkerEntry(config, id, query);
+    }
+    const promise = serialBundleWorkerEntry(config, id, query);
+    workerConfigSemaphore.set(config, promise);
+    promise.then(() => workerConfigSemaphore.delete(config));
+    return promise;
+}
+async function serialBundleWorkerEntry(config, id, query) {
     // bundle the file as entry to support imports
     const { rollup } = await import('rollup');
     const { plugins, rollupOptions, format } = config.worker;
@@ -37572,7 +37587,7 @@ async function compileCSS(id, code, config, urlReplacer) {
         }));
     }
     if (isModule) {
-        postcssPlugins.unshift((await import('./dep-753720be.js').then(function (n) { return n.i; })).default({
+        postcssPlugins.unshift((await import('./dep-2ee6aff6.js').then(function (n) { return n.i; })).default({
             ...modulesOptions,
             localsConvention: modulesOptions?.localsConvention,
             getJSON(cssFileName, _modules, outputFileName) {
@@ -45169,9 +45184,10 @@ function expand (config) {
     config.parsed[configKey] = _interpolate(value, environment, config);
   }
 
-  for (const processKey in config.parsed) {
-    environment[processKey] = config.parsed[processKey];
-  }
+  // PATCH: don't write to process.env
+  // for (const processKey in config.parsed) {
+  //   environment[processKey] = config.parsed[processKey]
+  // }
 
   return config
 }
@@ -45200,18 +45216,18 @@ function loadEnv(mode, envDir, prefixes = 'VITE_') {
             return [];
         return Object.entries(parse_1$1(fs$l.readFileSync(path)));
     }));
-    // let environment variables use each other
-    const expandParsed = expand_1({
-        parsed: {
-            ...process.env,
-            ...parsed,
-        },
-        // prevent process.env mutation
-        ignoreProcessEnv: true,
-    }).parsed;
-    Object.keys(parsed).forEach((key) => {
-        parsed[key] = expandParsed[key];
-    });
+    try {
+        // let environment variables use each other
+        expand_1({ parsed });
+    }
+    catch (e) {
+        // custom error handling until https://github.com/motdotla/dotenv-expand/issues/65 is fixed upstream
+        // check for message "TypeError: Cannot read properties of undefined (reading 'split')"
+        if (e.message.includes('split')) {
+            throw new Error('dotenv-expand failed to expand env vars. Maybe you need to escape `$`?');
+        }
+        throw e;
+    }
     // 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))) {
@@ -58590,7 +58606,7 @@ var debug_1 = function () {
   if (!debug$3) {
     try {
       /* eslint global-require: off */
-      debug$3 = require("debug")("follow-redirects");
+      debug$3 = src$2.exports("follow-redirects");
     }
     catch (error) { /* */ }
     if (typeof debug$3 !== "function") {
@@ -62869,7 +62885,6 @@ async function bundleConfigFile(fileName, isESM) {
                         root: path$o.dirname(fileName),
                         isBuild: true,
                         isProduction: true,
-                        isRequire: !isESM,
                         preferRelative: false,
                         tryIndex: true,
                         mainFields: [],
@@ -62891,8 +62906,9 @@ async function bundleConfigFile(fileName, isESM) {
                         if (id.startsWith('npm:')) {
                             return { external: true };
                         }
-                        let idFsPath = tryNodeResolve(id, importer, options, false)?.id;
-                        if (idFsPath && (isESM || kind === 'dynamic-import')) {
+                        const isIdESM = isESM || kind === 'dynamic-import';
+                        let idFsPath = tryNodeResolve(id, importer, { ...options, isRequire: !isIdESM }, false)?.id;
+                        if (idFsPath && isIdESM) {
                             idFsPath = pathToFileURL(idFsPath).href;
                         }
                         return {

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 { z as picocolors, v as createLogger, g as resolveConfig } from './chunks/dep-a5101d9f.js';
+import { z as picocolors, v as createLogger, g as resolveConfig } from './chunks/dep-86149127.js';
 import { VERSION } from './constants.js';
 import 'node:url';
 import 'node:module';
@@ -720,7 +720,7 @@ cli
     filterDuplicateOptions(options);
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await import('./chunks/dep-a5101d9f.js').then(function (n) { return n.D; });
+    const { createServer } = await import('./chunks/dep-86149127.js').then(function (n) { return n.D; });
     try {
         const server = await createServer({
             root,
@@ -773,7 +773,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-a5101d9f.js').then(function (n) { return n.C; });
+    const { build } = await import('./chunks/dep-86149127.js').then(function (n) { return n.C; });
     const buildOptions = cleanOptions(options);
     try {
         await build({
@@ -801,7 +801,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-a5101d9f.js').then(function (n) { return n.B; });
+    const { optimizeDeps } = await import('./chunks/dep-86149127.js').then(function (n) { return n.B; });
     try {
         const config = await resolveConfig({
             root,
@@ -826,7 +826,7 @@ cli
     .option('--outDir <dir>', `[string] output directory (default: dist)`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { preview } = await import('./chunks/dep-a5101d9f.js').then(function (n) { return n.E; });
+    const { preview } = await import('./chunks/dep-86149127.js').then(function (n) { return n.E; });
     try {
         const server = await preview({
             root,

package/dist/node/index.js

@@ -1,4 +1,4 @@
-export { b as build, q as createFilter, v as createLogger, c as createServer, e as defineConfig, f as formatPostcssSourceMap, i as getDepOptimizationConfig, j as isDepsOptimizerEnabled, l as loadConfigFromFile, x as loadEnv, k as mergeAlias, m as mergeConfig, n as normalizePath, o as optimizeDeps, a as preprocessCSS, p as preview, h as resolveBaseUrl, g as resolveConfig, y as resolveEnvPrefix, d as resolvePackageData, r as resolvePackageEntry, w as searchForWorkspaceRoot, u as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-a5101d9f.js';
+export { b as build, q as createFilter, v as createLogger, c as createServer, e as defineConfig, f as formatPostcssSourceMap, i as getDepOptimizationConfig, j as isDepsOptimizerEnabled, l as loadConfigFromFile, x as loadEnv, k as mergeAlias, m as mergeConfig, n as normalizePath, o as optimizeDeps, a as preprocessCSS, p as preview, h as resolveBaseUrl, g as resolveConfig, y as resolveEnvPrefix, d as resolvePackageData, r as resolvePackageEntry, w as searchForWorkspaceRoot, u as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-86149127.js';
 export { VERSION as version } from './constants.js';
 export { version as esbuildVersion } from 'esbuild';
 export { VERSION as rollupVersion } from 'rollup';

package/dist/node-cjs/publicUtils.cjs

@@ -4199,9 +4199,10 @@ function expand (config) {
     config.parsed[configKey] = _interpolate(value, environment, config);
   }
 
-  for (const processKey in config.parsed) {
-    environment[processKey] = config.parsed[processKey];
-  }
+  // PATCH: don't write to process.env
+  // for (const processKey in config.parsed) {
+  //   environment[processKey] = config.parsed[processKey]
+  // }
 
   return config
 }
@@ -4230,18 +4231,18 @@ function loadEnv(mode, envDir, prefixes = 'VITE_') {
             return [];
         return Object.entries(parse_1(fs$1.readFileSync(path)));
     }));
-    // let environment variables use each other
-    const expandParsed = expand_1({
-        parsed: {
-            ...process.env,
-            ...parsed,
-        },
-        // prevent process.env mutation
-        ignoreProcessEnv: true,
-    }).parsed;
-    Object.keys(parsed).forEach((key) => {
-        parsed[key] = expandParsed[key];
-    });
+    try {
+        // let environment variables use each other
+        expand_1({ parsed });
+    }
+    catch (e) {
+        // custom error handling until https://github.com/motdotla/dotenv-expand/issues/65 is fixed upstream
+        // check for message "TypeError: Cannot read properties of undefined (reading 'split')"
+        if (e.message.includes('split')) {
+            throw new Error('dotenv-expand failed to expand env vars. Maybe you need to escape `$`?');
+        }
+        throw e;
+    }
     // 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": "4.0.0-beta.0",
+  "version": "4.0.0-beta.1",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",
@@ -61,7 +61,7 @@
     "esbuild": "^0.15.9",
     "postcss": "^8.4.19",
     "resolve": "^1.22.1",
-    "rollup": "~3.5.1"
+    "rollup": "^3.6.0"
   },
   "optionalDependencies": {
     "fsevents": "~2.3.2"