vite 5.0.0-beta.3 → 5.0.0-beta.4

package/dist/node/chunks/{dep-dc9999ab.js → dep-69dc786c.js}

@@ -12291,9 +12291,9 @@ function windowsSafeRealPathSync(path) {
     return fs$l.realpathSync(path);
 }
 function optimizeSafeRealPathSync() {
-    // Skip if using Node <16.18 due to MAX_PATH issue: https://github.com/vitejs/vite/issues/12931
+    // Skip if using Node <18.10 due to MAX_PATH issue: https://github.com/vitejs/vite/issues/12931
     const nodeVersion = process.versions.node.split('.').map(Number);
-    if (nodeVersion[0] < 16 || (nodeVersion[0] === 16 && nodeVersion[1] < 18)) {
+    if (nodeVersion[0] < 18 || (nodeVersion[0] === 18 && nodeVersion[1] < 10)) {
         safeRealpathSync = fs$l.realpathSync;
         return;
     }
@@ -14721,11 +14721,14 @@ const loadTerserPath = (root) => {
     return terserPath;
 };
 function terserPlugin(config) {
+    const { maxWorkers, ...terserOptions } = config.build.terserOptions;
     const makeWorker = () => new Worker_1(async (terserPath, code, options) => {
         // test fails when using `import`. maybe related: https://github.com/nodejs/node/issues/43205
         // eslint-disable-next-line no-restricted-globals -- this function runs inside cjs
         const terser = require(terserPath);
         return terser.minify(code, options);
+    }, {
+        max: maxWorkers,
     });
     let worker;
     return {
@@ -14749,7 +14752,7 @@ function terserPlugin(config) {
             const terserPath = loadTerserPath(config.root);
             const res = await worker.run(terserPath, code, {
                 safari10: true,
-                ...config.build.terserOptions,
+                ...terserOptions,
                 sourceMap: !!outputOptions.sourcemap,
                 module: outputOptions.format.startsWith('es'),
                 toplevel: outputOptions.format === 'cjs',
@@ -28821,8 +28824,10 @@ function tryNodeResolve(id, importer, options, targetWeb, depsOptimizer, ssr = f
             bareImportRE.test(id)) {
             const mainPkg = findNearestMainPackageData(basedir, packageCache)?.data;
             if (mainPkg) {
-                if (mainPkg.peerDependencies?.[id] &&
-                    mainPkg.peerDependenciesMeta?.[id]?.optional) {
+                const pkgName = getNpmPackageName(id);
+                if (pkgName != null &&
+                    mainPkg.peerDependencies?.[pkgName] &&
+                    mainPkg.peerDependenciesMeta?.[pkgName]?.optional) {
                     return {
                         id: `${optionalPeerDepId}:${id}:${mainPkg.name}`,
                     };
@@ -37111,7 +37116,7 @@ function _stripLiteralAcorn(code, options) {
 
 const multilineCommentsRE = /\/\*([^*\/])*?\*\//gms;
 const singlelineCommentsRE = /(?:^|\n|\r)\s*\/\/.*(?:\r|\n|$)/gm;
-const templateLiteralRE = /\$\{(\s*(?:|{.*}|(?!\$\{).|\n|\r)*?\s*)\}/g;
+const templateLiteralRE$1 = /\$\{(\s*(?:|{.*}|(?!\$\{).|\n|\r)*?\s*)\}/g;
 const quotesRE = [
   /(["'`])((?:\\\1|(?!\1)|.|\r)*?)\1/gm,
   /([`])((?:\\\1|(?!\1)|.|\n|\r)*?)\1/gm
@@ -37125,7 +37130,7 @@ function stripLiteralRegex(code, options) {
   let expanded = code;
   for (let i = 0; i < 16; i++) {
     const before = expanded;
-    expanded = expanded.replace(templateLiteralRE, "` $1`");
+    expanded = expanded.replace(templateLiteralRE$1, "` $1`");
     if (expanded === before)
       break;
   }
@@ -37635,6 +37640,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 ` +
@@ -37642,12 +37655,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$o.join(envDir, file);
         if (!tryStatSync(filePath)?.isFile())
@@ -39399,8 +39407,8 @@ function createCachedImport(imp) {
         return cached;
     };
 }
-const importPostcssImport = createCachedImport(() => import('./dep-68c42983.js').then(function (n) { return n.i; }));
-const importPostcssModules = createCachedImport(() => import('./dep-9586b1f1.js').then(function (n) { return n.i; }));
+const importPostcssImport = createCachedImport(() => import('./dep-a86a117b.js').then(function (n) { return n.i; }));
+const importPostcssModules = createCachedImport(() => import('./dep-ae1dfb84.js').then(function (n) { return n.i; }));
 const importPostcss = createCachedImport(() => import('postcss'));
 /**
  * @experimental
@@ -41716,7 +41724,7 @@ async function handleHMRUpdate(file, server, configOnly) {
     const isConfig = file === config.configFile;
     const isConfigDependency = config.configFileDependencies.some((name) => file === name);
     const isEnv = config.inlineConfig.envFile !== false &&
-        (fileName === '.env' || fileName.startsWith('.env.'));
+        getEnvFilesForMode(config.mode).includes(fileName);
     if (isConfig || isConfigDependency || isEnv) {
         // auto restart server
         debugHmr?.(`[config change] ${colors$1.dim(shortFile)}`);
@@ -42098,6 +42106,7 @@ const hasImportInQueryParamsRE = /[?&]import=?\b/;
 const hasViteIgnoreRE = /\/\*\s*@vite-ignore\s*\*\//;
 const cleanUpRawUrlRE = /\/\*[\s\S]*?\*\/|([^\\:]|^)\/\/.*$/gm;
 const urlIsStringRE = /^(?:'.*'|".*"|`.*`)$/;
+const templateLiteralRE = /^\s*`(.*)`\s*$/;
 function isExplicitImportRequired(url) {
     return !isJSRequest(cleanUrl(url)) && !isCSSRequest(url);
 }
@@ -42255,7 +42264,6 @@ function importAnalysisPlugin(config) {
             let needQueryInjectHelper = false;
             let s;
             const str = () => s || (s = new MagicString(source));
-            const importedUrls = new Set();
             let isPartiallySelfAccepting = false;
             const importedBindings = enablePartialAccept
                 ? new Map()
@@ -42356,13 +42364,14 @@ function importAnalysisPlugin(config) {
                 }
                 return [url, resolved.id];
             };
+            const orderedImportedUrls = new Array(imports.length);
             const orderedAcceptedUrls = new Array(imports.length);
             const orderedAcceptedExports = new Array(imports.length);
             await Promise.all(imports.map(async (importSpecifier, index) => {
-                const { s: start, e: end, ss: expStart, se: expEnd, d: dynamicIndex, 
+                const { s: start, e: end, ss: expStart, se: expEnd, d: dynamicIndex, a: assertIndex, } = importSpecifier;
                 // #2083 User may use escape path,
                 // so use imports[index].n to get the unescaped string
-                n: specifier, a: assertIndex, } = importSpecifier;
+                let specifier = importSpecifier.n;
                 const rawUrl = source.slice(start, end);
                 // check import.meta usage
                 if (rawUrl === 'import.meta') {
@@ -42392,6 +42401,15 @@ function importAnalysisPlugin(config) {
                     }
                     return;
                 }
+                else if (templateLiteralRE.test(rawUrl)) {
+                    // If the import has backticks but isn't transformed as a glob import
+                    // (as there's nothing to glob), check if it's simply a plain string.
+                    // If so, we can replace the specifier as a plain string to prevent
+                    // an incorrect "cannot be analyzed" warning.
+                    if (!(rawUrl.includes('${') && rawUrl.includes('}'))) {
+                        specifier = rawUrl.replace(templateLiteralRE, '$1');
+                    }
+                }
                 const isDynamicImport = dynamicIndex > -1;
                 // strip import assertions as we can process them ourselves
                 if (!isDynamicImport && assertIndex > -1) {
@@ -42479,7 +42497,7 @@ function importAnalysisPlugin(config) {
                     const hmrUrl = unwrapId(stripBase(url, base));
                     const isLocalImport = !isExternalUrl(hmrUrl) && !isDataUrl(hmrUrl);
                     if (isLocalImport) {
-                        importedUrls.add(hmrUrl);
+                        orderedImportedUrls[index] = hmrUrl;
                     }
                     if (enablePartialAccept && importedBindings) {
                         extractImportedBindings(resolvedId, source, importSpecifier, importedBindings);
@@ -42530,6 +42548,7 @@ function importAnalysisPlugin(config) {
                     }
                 }
             }));
+            const importedUrls = new Set(orderedImportedUrls.filter(Boolean));
             const acceptedUrls = mergeAcceptedUrls(orderedAcceptedUrls);
             const acceptedExports = mergeAcceptedUrls(orderedAcceptedExports);
             if (hasEnv) {
@@ -64885,11 +64904,16 @@ function htmlFallbackMiddleware(root, spaFallback) {
                     return spaFallback ? `/index.html` : request.url;
                 },
             },
-            // don't rewrite paths ending with .html
             {
                 from: /\.html$/,
-                to({ request }) {
-                    return request.url;
+                to({ parsedUrl, request }) {
+                    // .html files are not handled by serveStaticMiddleware
+                    // so we need to check if the file exists
+                    const pathname = decodeURIComponent(parsedUrl.pathname);
+                    if (fs$l.existsSync(path$o.join(root, pathname))) {
+                        return request.url;
+                    }
+                    return spaFallback ? `/index.html` : request.url;
                 },
             },
         ],
@@ -66273,6 +66297,7 @@ async function preview(inlineConfig = {}) {
         etag: true,
         dev: true,
         single: config.appType === 'spa',
+        ignores: false,
         setHeaders(res) {
             if (headers) {
                 for (const name in headers) {
@@ -66403,6 +66428,10 @@ async function resolveConfig(inlineConfig, command, defaultMode = 'development',
         allowClearScreen: config.clearScreen,
         customLogger: config.customLogger,
     });
+    let foundDiscouragedVariableName;
+    if ((foundDiscouragedVariableName = Object.keys(config.define ?? {}).find((k) => ['process', 'global'].includes(k)))) {
+        logger.warn(colors$1.yellow(`Replacing ${colors$1.bold(foundDiscouragedVariableName)} using the define option is discouraged. See https://vitejs.dev/config/shared-options.html#define for more details.`));
+    }
     // resolve root
     const resolvedRoot = normalizePath$3(config.root ? path$o.resolve(config.root) : process.cwd());
     if (resolvedRoot.includes('#')) {

package/dist/node/chunks/{dep-68c42983.js → dep-a86a117b.js}

@@ -1,4 +1,4 @@
-import { D as getDefaultExportFromCjs } from './dep-dc9999ab.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-9586b1f1.js → dep-ae1dfb84.js}

@@ -1,4 +1,4 @@
-import { E as commonjsGlobal, D as getDefaultExportFromCjs } from './dep-dc9999ab.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-dc9999ab.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';
@@ -759,7 +759,7 @@ cli
     filterDuplicateOptions(options);
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await import('./chunks/dep-dc9999ab.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,
@@ -840,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-dc9999ab.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({
@@ -868,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-dc9999ab.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,
@@ -895,7 +895,7 @@ cli
     .option('--outDir <dir>', `[string] output directory (default: dist)`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { preview } = await import('./chunks/dep-dc9999ab.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/
@@ -2465,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;

package/dist/node/index.js

@@ -1,5 +1,5 @@
-import { i as isInNodeModules } from './chunks/dep-dc9999ab.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-dc9999ab.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';

package/dist/node-cjs/publicUtils.cjs

@@ -5987,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 ` +
@@ -5994,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "5.0.0-beta.3",
+  "version": "5.0.0-beta.4",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",