vite 5.0.0-beta.14 → 5.0.0-beta.15

package/dist/node/chunks/{dep-L-2yzs6m.js → dep-01ZZG1lv.js}

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

package/dist/node/chunks/{dep-QFst3FNH.js → dep-Kf16Z54K.js}

@@ -32,7 +32,7 @@ import assert$1 from 'node:assert';
 import process$1 from 'node:process';
 import v8 from 'node:v8';
 import { VERSION } from 'rollup';
-import { parseAst } from 'rollup/parseAst';
+import { parseAstAsync, parseAst } from 'rollup/parseAst';
 import * as qs from 'querystring';
 import readline from 'node:readline';
 import { EventEmitter as EventEmitter$4 } from 'node:events';
@@ -38479,8 +38479,8 @@ function createCachedImport(imp) {
         return cached;
     };
 }
-const importPostcssImport = createCachedImport(() => import('./dep-L-2yzs6m.js').then(function (n) { return n.i; }));
-const importPostcssModules = createCachedImport(() => import('./dep-OMqKnqdS.js').then(function (n) { return n.i; }));
+const importPostcssImport = createCachedImport(() => import('./dep-01ZZG1lv.js').then(function (n) { return n.i; }));
+const importPostcssModules = createCachedImport(() => import('./dep-dhvB1mwU.js').then(function (n) { return n.i; }));
 const importPostcss = createCachedImport(() => import('postcss'));
 /**
  * @experimental
@@ -47650,7 +47650,7 @@ async function doTransform(url, server, options, timestamp) {
     // tries to handle soft invalidation of the module if available,
     // returns a boolean true is successful, or false if no handling is needed
     const softInvalidatedTransformResult = module &&
-        (await handleModuleSoftInvalidation(module, ssr, timestamp, server.config.base));
+        (await handleModuleSoftInvalidation(module, ssr, timestamp, server));
     if (softInvalidatedTransformResult) {
         debugCache$1?.(`[memory-hmr] ${prettyUrl}`);
         return softInvalidatedTransformResult;
@@ -47827,7 +47827,7 @@ function createConvertSourceMapReadMap(originalFileName) {
  * - Client: We need to transform the import specifiers with new timestamps
  * - SSR: We don't need to change anything as `ssrLoadModule` controls it
  */
-async function handleModuleSoftInvalidation(mod, ssr, timestamp, base) {
+async function handleModuleSoftInvalidation(mod, ssr, timestamp, server) {
     const transformResult = ssr ? mod.ssrInvalidationState : mod.invalidationState;
     // Reset invalidation state
     if (ssr)
@@ -47838,7 +47838,7 @@ async function handleModuleSoftInvalidation(mod, ssr, timestamp, base) {
     if (!transformResult || transformResult === 'HARD_INVALIDATED')
         return;
     if (ssr ? mod.ssrTransformResult : mod.transformResult) {
-        throw new Error(`Internal server error: Soft-invalidated module "${mod.url}" should not have existing tranform result`);
+        throw new Error(`Internal server error: Soft-invalidated module "${mod.url}" should not have existing transform result`);
     }
     let result;
     // For SSR soft-invalidation, no transformation is needed
@@ -47861,7 +47861,7 @@ async function handleModuleSoftInvalidation(mod, ssr, timestamp, base) {
             }
             const urlWithoutTimestamp = removeTimestampQuery(rawUrl);
             // hmrUrl must be derived the same way as importAnalysis
-            const hmrUrl = unwrapId(stripBase(removeImportQuery(urlWithoutTimestamp), base));
+            const hmrUrl = unwrapId(stripBase(removeImportQuery(urlWithoutTimestamp), server.config.base));
             for (const importedMod of mod.clientImportedModules) {
                 if (importedMod.url !== hmrUrl)
                     continue;
@@ -47871,6 +47871,10 @@ async function handleModuleSoftInvalidation(mod, ssr, timestamp, base) {
                     const end = hasQuotes ? imp.e - 1 : imp.e;
                     s.overwrite(start, end, replacedUrl);
                 }
+                if (imp.d === -1 && server.config.server.preTransformRequests) {
+                    // pre-transform known direct imports
+                    server.warmupRequest(hmrUrl, { ssr });
+                }
                 break;
             }
         }
@@ -48207,7 +48211,7 @@ async function ssrTransformScript(code, inMap, url, originalCode) {
     const s = new MagicString(code);
     let ast;
     try {
-        ast = parseAst(code);
+        ast = await parseAstAsync(code);
     }
     catch (err) {
         if (!err.loc || !err.loc.line)
@@ -57682,20 +57686,9 @@ function indexHtmlMiddleware(root, server) {
 function preTransformRequest(server, url, base) {
     if (!server.config.server.preTransformRequests)
         return;
-    url = unwrapId(stripBase(url, base));
     // transform all url as non-ssr as html includes client-side assets only
-    server.transformRequest(url).catch((e) => {
-        if (e?.code === ERR_OUTDATED_OPTIMIZED_DEP ||
-            e?.code === ERR_CLOSED_SERVER) {
-            // these are expected errors
-            return;
-        }
-        // Unexpected error, log the issue but avoid an unhandled exception
-        server.config.logger.error(`Pre-transform error: ${e.message}`, {
-            error: e,
-            timestamp: true,
-        });
-    });
+    url = unwrapId(stripBase(url, base));
+    server.warmupRequest(url);
 }
 
 const logTime = createDebugger('vite:time');
@@ -58258,26 +58251,29 @@ function warmupFiles(server) {
     }
 }
 async function warmupFile(server, file, ssr) {
-    try {
-        // transform html with the `transformIndexHtml` hook as Vite internals would
-        // pre-transform the imported JS modules linked. this may cause `transformIndexHtml`
-        // plugins to be executed twice, but that's probably fine.
-        if (file.endsWith('.html')) {
-            const url = htmlFileToUrl(file, server.config.root);
-            if (url) {
+    // transform html with the `transformIndexHtml` hook as Vite internals would
+    // pre-transform the imported JS modules linked. this may cause `transformIndexHtml`
+    // plugins to be executed twice, but that's probably fine.
+    if (file.endsWith('.html')) {
+        const url = htmlFileToUrl(file, server.config.root);
+        if (url) {
+            try {
                 const html = await fsp.readFile(file, 'utf-8');
                 await server.transformIndexHtml(url, html);
             }
-        }
-        // for other files, pass it through `transformRequest`. this is what Vite uses
-        // for it's `server.preTransformRequests` option.
-        else {
-            const url = fileToUrl(file, server.config.root);
-            await server.transformRequest(url, { ssr });
+            catch (e) {
+                // Unexpected error, log the issue but avoid an unhandled exception
+                server.config.logger.error(`Pre-transform error (${colors$1.cyan(file)}): ${e.message}`, {
+                    error: e,
+                    timestamp: true,
+                });
+            }
         }
     }
-    catch (e) {
-        server.config.logger.error(colors$1.red(`Failed to warm up ${colors$1.cyan(file)}:\n`) + e.message);
+    // for other files, pass it through `transformRequest` with warmup
+    else {
+        const url = fileToUrl(file, server.config.root);
+        await server.warmupRequest(url, { ssr });
     }
 }
 function htmlFileToUrl(file, root) {
@@ -58350,6 +58346,20 @@ async function _createServer(inlineConfig = {}, options) {
         transformRequest(url, options) {
             return transformRequest(url, server, options);
         },
+        async warmupRequest(url, options) {
+            await transformRequest(url, server, options).catch((e) => {
+                if (e?.code === ERR_OUTDATED_OPTIMIZED_DEP ||
+                    e?.code === ERR_CLOSED_SERVER) {
+                    // these are expected errors
+                    return;
+                }
+                // Unexpected error, log the issue but avoid an unhandled exception
+                server.config.logger.error(`Pre-transform error: ${e.message}`, {
+                    error: e,
+                    timestamp: true,
+                });
+            });
+        },
         transformIndexHtml: null,
         async ssrLoadModule(url, opts) {
             if (isDepsOptimizerEnabled(config, true)) {
@@ -58500,11 +58510,13 @@ async function _createServer(inlineConfig = {}, options) {
     };
     const onFileAddUnlink = async (file, isUnlink) => {
         file = normalizePath$3(file);
+        await container.watchChange(file, { event: isUnlink ? 'delete' : 'create' });
         await handleFileAddUnlink(file, server, isUnlink);
         await onHMRUpdate(file, true);
     };
     watcher.on('change', async (file) => {
         file = normalizePath$3(file);
+        await container.watchChange(file, { event: 'update' });
         // invalidate module graph cache on file change
         moduleGraph.onFileChange(file);
         await onHMRUpdate(file, false);
@@ -59197,7 +59209,6 @@ function definePlugin(config) {
             'process.env.NODE_ENV': JSON.stringify(nodeEnv),
             'global.process.env.NODE_ENV': JSON.stringify(nodeEnv),
             'globalThis.process.env.NODE_ENV': JSON.stringify(nodeEnv),
-            __vite_process_env_NODE_ENV: JSON.stringify(nodeEnv),
         });
     }
     // during dev, import.meta properties are handled by importAnalysis plugin.
@@ -59234,9 +59245,6 @@ function definePlugin(config) {
             ...(replaceProcessEnv ? processEnv : {}),
         };
         // Additional define fixes based on `ssr` value
-        if (isBuild && !replaceProcessEnv) {
-            define['__vite_process_env_NODE_ENV'] = 'process.env.NODE_ENV';
-        }
         if ('import.meta.env.SSR' in define) {
             define['import.meta.env.SSR'] = ssr + '';
         }
@@ -59247,16 +59255,16 @@ function definePlugin(config) {
                 ...userDefineEnv,
             });
         }
-        const defineKeys = Object.keys(define);
-        const pattern = defineKeys.length
-            ? new RegExp(
-            // Mustn't be preceded by a char that can be part of an identifier
-            // or a '.' that isn't part of a spread operator
-            '(?<![\\p{L}\\p{N}_$]|(?<!\\.\\.)\\.)(' +
-                defineKeys.map(escapeRegex).join('|') +
-                // Mustn't be followed by a char that can be part of an identifier
-                // or an assignment (but allow equality operators)
-                ')(?:(?<=\\.)|(?![\\p{L}\\p{N}_$]|\\s*?=[^=]))', 'gu')
+        // Create regex pattern as a fast check before running esbuild
+        const patternKeys = Object.keys(userDefine);
+        if (replaceProcessEnv && Object.keys(processEnv).length) {
+            patternKeys.push('process.env');
+        }
+        if (Object.keys(importMetaKeys).length) {
+            patternKeys.push('import.meta.env', 'import.meta.hot');
+        }
+        const pattern = patternKeys.length
+            ? new RegExp(patternKeys.map(escapeRegex).join('|'))
             : null;
         return [define, pattern];
     }
@@ -59766,18 +59774,7 @@ function importAnalysisPlugin(config) {
                         // These requests will also be registered in transformRequest to be awaited
                         // by the deps optimizer
                         const url = removeImportQuery(hmrUrl);
-                        server.transformRequest(url, { ssr }).catch((e) => {
-                            if (e?.code === ERR_OUTDATED_OPTIMIZED_DEP ||
-                                e?.code === ERR_CLOSED_SERVER) {
-                                // these are expected errors
-                                return;
-                            }
-                            // Unexpected error, log the issue but avoid an unhandled exception
-                            config.logger.error(`Pre-transform error: ${e.message}`, {
-                                error: e,
-                                timestamp: true,
-                            });
-                        });
+                        server.warmupRequest(url, { ssr });
                     }
                 }
                 else if (!importer.startsWith(withTrailingSlash(clientDir))) {
@@ -61893,6 +61890,10 @@ async function createPluginContainer(config, moduleGraph, watcher) {
                 map: ctx._getCombinedSourcemap(),
             };
         },
+        async watchChange(id, change) {
+            const ctx = new Context();
+            await hookParallel('watchChange', () => ctx, () => [id, change]);
+        },
         async close() {
             if (closed)
                 return;
@@ -63525,12 +63526,10 @@ async function prepareEsbuildOptimizerRun(resolvedConfig, depsInfo, ssr, process
     if (optimizerContext.cancelled)
         return { context: undefined, idToExports };
     // esbuild automatically replaces process.env.NODE_ENV for platform 'browser'
-    // In lib mode, we need to keep process.env.NODE_ENV untouched, so to at build
-    // time we replace it by __vite_process_env_NODE_ENV. This placeholder will be
-    // later replaced by the define plugin
+    // But in lib mode, we need to keep process.env.NODE_ENV untouched
     const define = {
-        'process.env.NODE_ENV': isBuild
-            ? '__vite_process_env_NODE_ENV'
+        'process.env.NODE_ENV': isBuild && config.build.lib
+            ? 'process.env.NODE_ENV'
             : JSON.stringify(process.env.NODE_ENV || config.mode),
     };
     const platform = ssr && config.ssr?.target !== 'webworker' ? 'node' : 'browser';
@@ -65630,10 +65629,6 @@ 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-OMqKnqdS.js → dep-dhvB1mwU.js}

@@ -1,4 +1,4 @@
-import { z as commonjsGlobal, y as getDefaultExportFromCjs } from './dep-QFst3FNH.js';
+import { z as commonjsGlobal, y as getDefaultExportFromCjs } from './dep-Kf16Z54K.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 { x as colors, k as createLogger, r as resolveConfig } from './chunks/dep-QFst3FNH.js';
+import { x as colors, k as createLogger, r as resolveConfig } from './chunks/dep-Kf16Z54K.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-QFst3FNH.js').then(function (n) { return n.A; });
+    const { createServer } = await import('./chunks/dep-Kf16Z54K.js').then(function (n) { return n.A; });
     try {
         const server = await createServer({
             root,
@@ -839,7 +839,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-QFst3FNH.js').then(function (n) { return n.C; });
+    const { build } = await import('./chunks/dep-Kf16Z54K.js').then(function (n) { return n.C; });
     const buildOptions = cleanOptions(options);
     try {
         await build({
@@ -867,7 +867,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-QFst3FNH.js').then(function (n) { return n.B; });
+    const { optimizeDeps } = await import('./chunks/dep-Kf16Z54K.js').then(function (n) { return n.B; });
     try {
         const config = await resolveConfig({
             root,
@@ -893,7 +893,7 @@ cli
     .option('--outDir <dir>', `[string] output directory (default: dist)`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { preview } = await import('./chunks/dep-QFst3FNH.js').then(function (n) { return n.D; });
+    const { preview } = await import('./chunks/dep-Kf16Z54K.js').then(function (n) { return n.D; });
     try {
         const server = await preview({
             root,

package/dist/node/index.d.ts

@@ -3,6 +3,7 @@ import { PluginHooks, RollupError, SourceMap, ModuleInfo, PartialResolvedId, Inp
 import * as rollup from 'rollup';
 export { rollup as Rollup };
 export { VERSION as rollupVersion } from 'rollup';
+export { parseAst, parseAstAsync } from 'rollup/parseAst';
 import * as http from 'node:http';
 import { OutgoingHttpHeaders, ClientRequestArgs, IncomingMessage, ClientRequest, Agent, Server, ServerResponse } from 'node:http';
 import * as fs from 'node:fs';
@@ -859,6 +860,9 @@ interface PluginContainer {
     load(id: string, options?: {
         ssr?: boolean;
     }): Promise<LoadResult | null>;
+    watchChange(id: string, change: {
+        event: 'create' | 'update' | 'delete';
+    }): Promise<void>;
     close(): Promise<void>;
 }
 
@@ -1595,6 +1599,12 @@ interface ViteDevServer {
      * without going through the http request pipeline.
      */
     transformRequest(url: string, options?: TransformOptions): Promise<TransformResult | null>;
+    /**
+     * Same as `transformRequest` but only warm up the URLs so the next request
+     * will already be cached. The function will never throw as it handles and
+     * reports errors internally.
+     */
+    warmupRequest(url: string, options?: TransformOptions): Promise<void>;
     /**
      * Apply vite built-in HTML transforms and any plugin HTML transforms.
      */
@@ -3097,7 +3107,7 @@ interface UserConfig {
          */
         format?: 'es' | 'iife';
         /**
-         * Vite plugins that apply to worker bundle. The plugins retured by this function
+         * Vite plugins that apply to worker bundle. The plugins returned by this function
          * should be new instances every time it is called, because they are used for each
          * rollup worker bundling process.
          */

package/dist/node/index.js

@@ -1,5 +1,6 @@
-import { i as isInNodeModules } from './chunks/dep-QFst3FNH.js';
-export { b as build, e as buildErrorMessage, h as createFilter, k as createLogger, c as createServer, d as defineConfig, f as formatPostcssSourceMap, u as isFileServingAllowed, l as loadConfigFromFile, v as loadEnv, g as mergeAlias, m as mergeConfig, n as normalizePath, o as optimizeDeps, a as preprocessCSS, p as preview, r as resolveConfig, w as resolveEnvPrefix, q as searchForWorkspaceRoot, j as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-QFst3FNH.js';
+export { parseAst, parseAstAsync } from 'rollup/parseAst';
+import { i as isInNodeModules } from './chunks/dep-Kf16Z54K.js';
+export { b as build, e as buildErrorMessage, h as createFilter, k as createLogger, c as createServer, d as defineConfig, f as formatPostcssSourceMap, u as isFileServingAllowed, l as loadConfigFromFile, v as loadEnv, g as mergeAlias, m as mergeConfig, n as normalizePath, o as optimizeDeps, a as preprocessCSS, p as preview, r as resolveConfig, w as resolveEnvPrefix, q as searchForWorkspaceRoot, j as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-Kf16Z54K.js';
 export { VERSION as version } from './constants.js';
 export { version as esbuildVersion } from 'esbuild';
 export { VERSION as rollupVersion } from 'rollup';
@@ -33,7 +34,6 @@ import 'module';
 import 'node:assert';
 import 'node:process';
 import 'node:v8';
-import 'rollup/parseAst';
 import 'querystring';
 import 'node:readline';
 import 'node:events';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "5.0.0-beta.14",
+  "version": "5.0.0-beta.15",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",
@@ -63,7 +63,7 @@
   "dependencies": {
     "esbuild": "^0.19.3",
     "postcss": "^8.4.31",
-    "rollup": "^4.1.4"
+    "rollup": "^4.2.0"
   },
   "optionalDependencies": {
     "fsevents": "~2.3.3"