vite 5.0.0-beta.14 → 5.0.0-beta.16

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

@@ -20,11 +20,11 @@ import require$$1$1 from 'http';
 import require$$0$7 from 'stream';
 import require$$2 from 'os';
 import require$$2$1 from 'child_process';
+import { CLIENT_ENTRY, VALID_ID_PREFIX, NULL_BYTE_PLACEHOLDER, OPTIMIZABLE_ENTRY_RE, FS_PREFIX, wildcardHosts, loopbackHosts, CLIENT_PUBLIC_PATH, ENV_PUBLIC_PATH, ENV_ENTRY, DEP_VERSION_RE, SPECIAL_QUERY_RE, DEFAULT_MAIN_FIELDS, DEFAULT_EXTENSIONS, CSS_LANGS_RE, ESBUILD_MODULES_TARGET, KNOWN_ASSET_TYPES, VITE_PACKAGE_DIR, ASYNC_DISPOSE, DEFAULT_DEV_PORT, CLIENT_DIR, JS_TYPES_RE, VERSION as VERSION$1, DEFAULT_PREVIEW_PORT, DEFAULT_ASSETS_RE, DEFAULT_CONFIG_FILES } from '../constants.js';
 import os$4 from 'node:os';
 import { exec } from 'node:child_process';
 import { createHash as createHash$2 } from 'node:crypto';
 import { promises } from 'node:dns';
-import { CLIENT_ENTRY, VALID_ID_PREFIX, NULL_BYTE_PLACEHOLDER, OPTIMIZABLE_ENTRY_RE, FS_PREFIX, wildcardHosts, loopbackHosts, CLIENT_PUBLIC_PATH, ENV_PUBLIC_PATH, ENV_ENTRY, DEP_VERSION_RE, SPECIAL_QUERY_RE, DEFAULT_MAIN_FIELDS, DEFAULT_EXTENSIONS, CSS_LANGS_RE, ESBUILD_MODULES_TARGET, KNOWN_ASSET_TYPES, VITE_PACKAGE_DIR, DEFAULT_DEV_PORT, CLIENT_DIR, JS_TYPES_RE, VERSION as VERSION$1, DEFAULT_PREVIEW_PORT, DEFAULT_ASSETS_RE, DEFAULT_CONFIG_FILES } from '../constants.js';
 import require$$0$a from 'crypto';
 import { Buffer as Buffer$1 } from 'node:buffer';
 import require$$0$8, { createRequire as createRequire$2 } from 'module';
@@ -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-ayAPZ1OT.js').then(function (n) { return n.i; }));
+const importPostcssModules = createCachedImport(() => import('./dep-wO2juHOz.js').then(function (n) { return n.i; }));
 const importPostcss = createCachedImport(() => import('postcss'));
 /**
  * @experimental
@@ -39757,7 +39757,6 @@ function optimizedDepsPlugin(config) {
                         // something unexpected has happened. In this case, Vite
                         // returns an empty response that will error.
                         throwProcessingError(id);
-                        return;
                     }
                     const newMetadata = depsOptimizer.metadata;
                     if (metadata !== newMetadata) {
@@ -47650,7 +47649,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;
@@ -47731,10 +47730,14 @@ async function loadAndTransform(id, url, server, options, timestamp, mod, resolv
     }
     if (code == null) {
         const isPublicFile = checkPublicFile(url, config);
+        let publicDirName = path$o.relative(config.root, config.publicDir);
+        if (publicDirName[0] !== '.')
+            publicDirName = '/' + publicDirName;
         const msg = isPublicFile
-            ? `This file is in /public and will be copied as-is during build without ` +
-                `going through the plugin transforms, and therefore should not be ` +
-                `imported from source code. It can only be referenced via HTML tags.`
+            ? `This file is in ${publicDirName} and will be copied as-is during ` +
+                `build without going through the plugin transforms, and therefore ` +
+                `should not be imported from source code. It can only be referenced ` +
+                `via HTML tags.`
             : `Does the file exist?`;
         const importerMod = server.moduleGraph.idToModuleMap
             .get(id)
@@ -47827,7 +47830,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 +47841,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 +47864,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 +47874,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 +48214,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)
@@ -54906,31 +54913,33 @@ function createWebSocketServer(server, config, httpsOptions) {
                 });
             });
         },
+        [ASYNC_DISPOSE]() {
+            return this.close();
+        },
     };
 }
 
 // this middleware is only active when (base !== '/')
-function baseMiddleware({ config, }) {
+function baseMiddleware(rawBase, middlewareMode) {
     // Keep the named function. The name is visible in debug logs via `DEBUG=connect:dispatcher ...`
     return function viteBaseMiddleware(req, res, next) {
         const url = req.url;
-        const parsed = new URL(url, 'http://vitejs.dev');
-        const path = parsed.pathname || '/';
-        const base = config.rawBase;
-        if (path.startsWith(base)) {
+        const pathname = cleanUrl(url);
+        const base = rawBase;
+        if (pathname.startsWith(base)) {
             // rewrite url to remove base. this ensures that other middleware does
             // not need to consider base being prepended or not
             req.url = stripBase(url, base);
             return next();
         }
         // skip redirect and error fallback on middleware mode, #4057
-        if (config.server.middlewareMode) {
+        if (middlewareMode) {
             return next();
         }
-        if (path === '/' || path === '/index.html') {
+        if (pathname === '/' || pathname === '/index.html') {
             // redirect root visit to based url with search and hash
             res.writeHead(302, {
-                Location: base + (parsed.search || '') + (parsed.hash || ''),
+                Location: base + url.slice(pathname.length),
             });
             res.end();
             return;
@@ -57106,19 +57115,7 @@ function doesProxyContextMatchUrl(context, url) {
 }
 
 const debug$6 = createDebugger('vite:html-fallback');
-function htmlFallbackMiddleware(root, spaFallback, mounted = false) {
-    // When this middleware is mounted on a route, we need to re-assign `req.url` with a
-    // leading `.` to signal a relative rewrite. Returning with a leading `/` returns a
-    // buggy `req.url`. e.g.:
-    //
-    // mount /foo/bar:
-    //  req.url = /index.html
-    //  final   = /foo/barindex.html
-    //
-    // mount /foo/bar:
-    //  req.url = ./index.html
-    //  final   = /foo/bar/index.html
-    const prepend = mounted ? '.' : '';
+function htmlFallbackMiddleware(root, spaFallback) {
     // Keep the named function. The name is visible in debug logs via `DEBUG=connect:dispatcher ...`
     return function viteHtmlFallbackMiddleware(req, res, next) {
         if (
@@ -57142,7 +57139,7 @@ function htmlFallbackMiddleware(root, spaFallback, mounted = false) {
             const filePath = path$o.join(root, pathname);
             if (fs$l.existsSync(filePath)) {
                 debug$6?.(`Rewriting ${req.method} ${req.url} to ${url}`);
-                req.url = prepend + url;
+                req.url = url;
                 return next();
             }
         }
@@ -57152,7 +57149,7 @@ function htmlFallbackMiddleware(root, spaFallback, mounted = false) {
             if (fs$l.existsSync(filePath)) {
                 const newUrl = url + 'index.html';
                 debug$6?.(`Rewriting ${req.method} ${req.url} to ${newUrl}`);
-                req.url = prepend + newUrl;
+                req.url = newUrl;
                 return next();
             }
         }
@@ -57162,13 +57159,13 @@ function htmlFallbackMiddleware(root, spaFallback, mounted = false) {
             if (fs$l.existsSync(filePath)) {
                 const newUrl = url + '.html';
                 debug$6?.(`Rewriting ${req.method} ${req.url} to ${newUrl}`);
-                req.url = prepend + newUrl;
+                req.url = newUrl;
                 return next();
             }
         }
         if (spaFallback) {
             debug$6?.(`Rewriting ${req.method} ${req.url} to /index.html`);
-            req.url = prepend + '/index.html';
+            req.url = '/index.html';
         }
         next();
     };
@@ -57682,20 +57679,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 +58244,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 +58339,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)) {
@@ -58439,6 +58442,9 @@ async function _createServer(inlineConfig = {}, options) {
             }
             server.resolvedUrls = null;
         },
+        [ASYNC_DISPOSE]() {
+            return this.close();
+        },
         printUrls() {
             if (server.resolvedUrls) {
                 printServerUrls(server.resolvedUrls, serverConfig.host, config.logger.info);
@@ -58500,11 +58506,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);
@@ -58549,7 +58557,7 @@ async function _createServer(inlineConfig = {}, options) {
     }
     // base
     if (config.base !== '/') {
-        middlewares.use(baseMiddleware(server));
+        middlewares.use(baseMiddleware(config.rawBase, middlewareMode));
     }
     // open in editor support
     middlewares.use('/__open-in-editor', launchEditorMiddleware$1());
@@ -59197,7 +59205,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 +59241,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 +59251,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 +59770,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))) {
@@ -61309,14 +61302,7 @@ function createPluginHookUtils(plugins) {
     }
     function getSortedPluginHooks(hookName) {
         const plugins = getSortedPlugins(hookName);
-        return plugins
-            .map((p) => {
-            const hook = p[hookName];
-            return typeof hook === 'object' && 'handler' in hook
-                ? hook.handler
-                : hook;
-        })
-            .filter(Boolean);
+        return plugins.map((p) => getHookHandler(p[hookName])).filter(Boolean);
     }
     return {
         getSortedPlugins,
@@ -61345,6 +61331,9 @@ function getSortedPluginsByHook(hookName, plugins) {
     }
     return [...pre, ...normal, ...post];
 }
+function getHookHandler(hook) {
+    return (typeof hook === 'object' ? hook.handler : hook);
+}
 
 /**
  * This file is refactored into TypeScript based on
@@ -61424,9 +61413,7 @@ async function createPluginContainer(config, moduleGraph, watcher) {
             const hook = plugin[hookName];
             if (!hook)
                 continue;
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-ignore hook is not a primitive
-            const handler = 'handler' in hook ? hook.handler : hook;
+            const handler = getHookHandler(hook);
             if (hook.sequential) {
                 await Promise.all(parallelPromises);
                 parallelPromises.length = 0;
@@ -61784,9 +61771,7 @@ async function createPluginContainer(config, moduleGraph, watcher) {
                     continue;
                 ctx._activePlugin = plugin;
                 const pluginResolveStart = debugPluginResolve ? performance.now() : 0;
-                const handler = 'handler' in plugin.resolveId
-                    ? plugin.resolveId.handler
-                    : plugin.resolveId;
+                const handler = getHookHandler(plugin.resolveId);
                 const result = await handleHookPromise(handler.call(ctx, rawId, importer, {
                     attributes: options?.attributes ?? {},
                     custom: options?.custom,
@@ -61833,7 +61818,7 @@ async function createPluginContainer(config, moduleGraph, watcher) {
                 if (!plugin.load)
                     continue;
                 ctx._activePlugin = plugin;
-                const handler = 'handler' in plugin.load ? plugin.load.handler : plugin.load;
+                const handler = getHookHandler(plugin.load);
                 const result = await handleHookPromise(handler.call(ctx, id, { ssr }));
                 if (result != null) {
                     if (isObject$1(result)) {
@@ -61859,9 +61844,7 @@ async function createPluginContainer(config, moduleGraph, watcher) {
                 ctx._activeCode = code;
                 const start = debugPluginTransform ? performance.now() : 0;
                 let result;
-                const handler = 'handler' in plugin.transform
-                    ? plugin.transform.handler
-                    : plugin.transform;
+                const handler = getHookHandler(plugin.transform);
                 try {
                     result = await handleHookPromise(handler.call(ctx, code, id, { ssr }));
                 }
@@ -61893,6 +61876,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;
@@ -61902,6 +61889,9 @@ async function createPluginContainer(config, moduleGraph, watcher) {
             await hookParallel('buildEnd', () => ctx, () => []);
             await hookParallel('closeBundle', () => ctx, () => []);
         },
+        [ASYNC_DISPOSE]() {
+            return this.close();
+        },
     };
     return container;
 }
@@ -62615,6 +62605,9 @@ async function createDepsOptimizer(config, server) {
         resetRegisteredIds,
         ensureFirstRun,
         close,
+        [ASYNC_DISPOSE]() {
+            return this.close();
+        },
         options: getDepOptimizationConfig(config, ssr),
     };
     depsOptimizerMap.set(config, depsOptimizer);
@@ -63149,6 +63142,7 @@ async function createDevSsrDepsOptimizer(config) {
         resetRegisteredIds: () => { },
         ensureFirstRun: () => { },
         close: async () => { },
+        [ASYNC_DISPOSE]: async () => { },
         options: config.ssr.optimizeDeps,
     };
     devSsrDepsOptimizerMap.set(config, depsOptimizer);
@@ -63525,12 +63519,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';
@@ -65128,7 +65120,7 @@ function injectSsrFlagToHooks(plugin) {
 function wrapSsrResolveId(hook) {
     if (!hook)
         return;
-    const fn = 'handler' in hook ? hook.handler : hook;
+    const fn = getHookHandler(hook);
     const handler = function (id, importer, options) {
         return fn.call(this, id, importer, injectSsrFlag(options));
     };
@@ -65145,7 +65137,7 @@ function wrapSsrResolveId(hook) {
 function wrapSsrLoad(hook) {
     if (!hook)
         return;
-    const fn = 'handler' in hook ? hook.handler : hook;
+    const fn = getHookHandler(hook);
     const handler = function (id, ...args) {
         // @ts-expect-error: Receiving options param to be future-proof if Rollup adds it
         return fn.call(this, id, injectSsrFlag(args[0]));
@@ -65163,7 +65155,7 @@ function wrapSsrLoad(hook) {
 function wrapSsrTransform(hook) {
     if (!hook)
         return;
-    const fn = 'handler' in hook ? hook.handler : hook;
+    const fn = getHookHandler(hook);
     const handler = function (code, importer, ...args) {
         // @ts-expect-error: Receiving options param to be future-proof if Rollup adds it
         return fn.call(this, code, importer, injectSsrFlag(args[0]));
@@ -65486,7 +65478,10 @@ async function preview(inlineConfig = {}) {
         app.use(proxyMiddleware(httpServer, proxy, config));
     }
     app.use(compression());
-    const previewBase = config.base === './' || config.base === '' ? '/' : config.base;
+    // base
+    if (config.base !== '/') {
+        app.use(baseMiddleware(config.rawBase, false));
+    }
     // static assets
     const headers = config.preview.headers;
     const viteAssetMiddleware = (...args) => sirv(distDir, {
@@ -65505,23 +65500,22 @@ async function preview(inlineConfig = {}) {
             return shouldServeFile(filePath, distDir);
         },
     })(...args);
-    app.use(previewBase, viteAssetMiddleware);
+    app.use(viteAssetMiddleware);
     // html fallback
     if (config.appType === 'spa' || config.appType === 'mpa') {
-        app.use(previewBase, htmlFallbackMiddleware(distDir, config.appType === 'spa', previewBase !== '/'));
+        app.use(htmlFallbackMiddleware(distDir, config.appType === 'spa'));
     }
     // apply post server hooks from plugins
     postHooks.forEach((fn) => fn && fn());
     if (config.appType === 'spa' || config.appType === 'mpa') {
         // transform index.html
-        app.use(previewBase, indexHtmlMiddleware(distDir, server));
+        app.use(indexHtmlMiddleware(distDir, server));
         // handle 404s
-        app.use(previewBase, notFoundMiddleware());
+        app.use(notFoundMiddleware());
     }
     const hostname = await resolveHostname(options.host);
     const port = options.port ?? DEFAULT_PREVIEW_PORT;
-    const protocol = options.https ? 'https' : 'http';
-    const serverPort = await httpServerStart(httpServer, {
+    await httpServerStart(httpServer, {
         port,
         strictPort: options.strictPort,
         host: hostname.host,
@@ -65529,10 +65523,11 @@ async function preview(inlineConfig = {}) {
     });
     server.resolvedUrls = await resolveServerUrls(httpServer, config.preview, config);
     if (options.open) {
-        const path = typeof options.open === 'string' ? options.open : previewBase;
-        openBrowser(path.startsWith('http')
-            ? path
-            : new URL(path, `${protocol}://${hostname.name}:${serverPort}`).href, true, logger);
+        const url = server.resolvedUrls?.local[0] ?? server.resolvedUrls?.network[0];
+        if (url) {
+            const path = typeof options.open === 'string' ? new URL(options.open, url).href : url;
+            openBrowser(path, true, logger);
+        }
     }
     return server;
 }
@@ -65566,7 +65561,7 @@ const promisifiedRealpath = promisify$4(fs$l.realpath);
 function defineConfig(config) {
     return config;
 }
-async function resolveConfig(inlineConfig, command, defaultMode = 'development', defaultNodeEnv = 'development') {
+async function resolveConfig(inlineConfig, command, defaultMode = 'development', defaultNodeEnv = 'development', isPreview = false) {
     let config = inlineConfig;
     let configFileDependencies = [];
     let mode = inlineConfig.mode || defaultMode;
@@ -65580,7 +65575,8 @@ async function resolveConfig(inlineConfig, command, defaultMode = 'development',
     const configEnv = {
         mode,
         command,
-        ssrBuild: !!config.build?.ssr,
+        isSsrBuild: !!config.build?.ssr,
+        isPreview,
     };
     let { configFile } = config;
     if (configFile !== false) {
@@ -65630,10 +65626,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('#')) {
@@ -66162,7 +66154,7 @@ async function runConfigHook(config, plugins, configEnv) {
     let conf = config;
     for (const p of getSortedPluginsByHook('config', plugins)) {
         const hook = p.config;
-        const handler = hook && 'handler' in hook ? hook.handler : hook;
+        const handler = getHookHandler(hook);
         if (handler) {
             const res = await handler(conf, configEnv);
             if (res) {

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

@@ -1,4 +1,4 @@
-import { y as getDefaultExportFromCjs } from './dep-QFst3FNH.js';
+import { y as getDefaultExportFromCjs } from './dep-WN9UKUor.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-OMqKnqdS.js → dep-wO2juHOz.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-WN9UKUor.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-WN9UKUor.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-WN9UKUor.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-WN9UKUor.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-WN9UKUor.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-WN9UKUor.js').then(function (n) { return n.D; });
     try {
         const server = await preview({
             root,

package/dist/node/constants.js

@@ -122,5 +122,6 @@ const wildcardHosts = new Set([
 ]);
 const DEFAULT_DEV_PORT = 5173;
 const DEFAULT_PREVIEW_PORT = 4173;
+const ASYNC_DISPOSE = Symbol.asyncDispose || Symbol.for('Symbol.asyncDispose');
 
-export { CLIENT_DIR, CLIENT_ENTRY, CLIENT_PUBLIC_PATH, CSS_LANGS_RE, DEFAULT_ASSETS_RE, DEFAULT_CONFIG_FILES, DEFAULT_DEV_PORT, DEFAULT_EXTENSIONS, DEFAULT_MAIN_FIELDS, DEFAULT_PREVIEW_PORT, DEP_VERSION_RE, ENV_ENTRY, ENV_PUBLIC_PATH, ESBUILD_MODULES_TARGET, FS_PREFIX, JS_TYPES_RE, KNOWN_ASSET_TYPES, NULL_BYTE_PLACEHOLDER, OPTIMIZABLE_ENTRY_RE, SPECIAL_QUERY_RE, VALID_ID_PREFIX, VERSION, VITE_PACKAGE_DIR, loopbackHosts, wildcardHosts };
+export { ASYNC_DISPOSE, CLIENT_DIR, CLIENT_ENTRY, CLIENT_PUBLIC_PATH, CSS_LANGS_RE, DEFAULT_ASSETS_RE, DEFAULT_CONFIG_FILES, DEFAULT_DEV_PORT, DEFAULT_EXTENSIONS, DEFAULT_MAIN_FIELDS, DEFAULT_PREVIEW_PORT, DEP_VERSION_RE, ENV_ENTRY, ENV_PUBLIC_PATH, ESBUILD_MODULES_TARGET, FS_PREFIX, JS_TYPES_RE, KNOWN_ASSET_TYPES, NULL_BYTE_PLACEHOLDER, OPTIMIZABLE_ENTRY_RE, SPECIAL_QUERY_RE, VALID_ID_PREFIX, VERSION, VITE_PACKAGE_DIR, loopbackHosts, wildcardHosts };

package/dist/node/index.d.ts

@@ -3,8 +3,10 @@ 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 { Http2SecureServer } from 'node:http2';
 import * as fs from 'node:fs';
 import * as events from 'node:events';
 import { EventEmitter } from 'node:events';
@@ -715,7 +717,7 @@ interface PreviewServer {
     /**
      * native Node http server instance
      */
-    httpServer: http.Server;
+    httpServer: HttpServer;
     /**
      * The resolved urls Vite prints on the CLI.
      * null before server is listening.
@@ -836,7 +838,7 @@ declare class ModuleGraph {
  * https:
  */
 
-interface PluginContainer {
+interface PluginContainer extends AsyncDisposable {
     options: InputOptions;
     getModuleInfo(id: string): ModuleInfo | null;
     buildStart(options: InputOptions): Promise<void>;
@@ -859,6 +861,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>;
 }
 
@@ -1394,7 +1399,7 @@ declare namespace WebSocket {
 }
 
 type WebSocketCustomListener<T> = (data: T, client: WebSocketClient) => void;
-interface WebSocketServer {
+interface WebSocketServer extends AsyncDisposable {
     /**
      * Listen on port and host
      */
@@ -1548,7 +1553,8 @@ interface FileSystemServeOptions {
     deny?: string[];
 }
 type ServerHook = (this: void, server: ViteDevServer) => (() => void) | void | Promise<(() => void) | void>;
-interface ViteDevServer {
+type HttpServer = http.Server | Http2SecureServer;
+interface ViteDevServer extends AsyncDisposable {
     /**
      * The resolved vite config object
      */
@@ -1566,7 +1572,7 @@ interface ViteDevServer {
      * native Node http server instance
      * will be null in middleware mode
      */
-    httpServer: http.Server | null;
+    httpServer: HttpServer | null;
     /**
      * chokidar watcher instance
      * https:
@@ -1595,6 +1601,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.
      */
@@ -2413,7 +2425,7 @@ type ExportsData = {
     exports: readonly string[];
     jsxLoader?: boolean;
 };
-interface DepsOptimizer {
+interface DepsOptimizer extends AsyncDisposable {
     metadata: DepOptimizationMetadata;
     scanProcessing?: Promise<void>;
     registerMissingImport: (id: string, resolved: string) => OptimizedDepInfo;
@@ -2914,6 +2926,9 @@ interface Plugin<A = any> extends rollup.Plugin<A> {
     }) => Promise<rollup.TransformResult> | rollup.TransformResult>;
 }
 type HookHandler<T> = T extends ObjectHook<infer H> ? H : T;
+type PluginWithRequiredHook<K extends keyof Plugin> = Plugin & {
+    [P in K]: NonNullable<Plugin[P]>;
+};
 
 interface JsonOptions {
     /**
@@ -2932,10 +2947,8 @@ interface JsonOptions {
 interface ConfigEnv {
     command: 'build' | 'serve';
     mode: string;
-    /**
-     * @experimental
-     */
-    ssrBuild?: boolean;
+    isSsrBuild?: boolean;
+    isPreview?: boolean;
 }
 /**
  * spa: include SPA fallback middleware and configure sirv with `single: true` in preview
@@ -3097,7 +3110,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.
          */
@@ -3200,11 +3213,11 @@ type ResolvedConfig = Readonly<Omit<UserConfig, 'plugins' | 'css' | 'assetsInclu
     experimental: ExperimentalOptions;
 } & PluginHookUtils>;
 interface PluginHookUtils {
-    getSortedPlugins: (hookName: keyof Plugin) => Plugin[];
+    getSortedPlugins: <K extends keyof Plugin>(hookName: K) => PluginWithRequiredHook<K>[];
     getSortedPluginHooks: <K extends keyof Plugin>(hookName: K) => NonNullable<HookHandler<Plugin[K]>>[];
 }
 type ResolveFn = (id: string, importer?: string, aliasOnly?: boolean, ssr?: boolean) => Promise<string | undefined>;
-declare function resolveConfig(inlineConfig: InlineConfig, command: 'build' | 'serve', defaultMode?: string, defaultNodeEnv?: string): Promise<ResolvedConfig>;
+declare function resolveConfig(inlineConfig: InlineConfig, command: 'build' | 'serve', defaultMode?: string, defaultNodeEnv?: string, isPreview?: boolean): Promise<ResolvedConfig>;
 declare function sortUserPlugins(plugins: (Plugin | Plugin[])[] | undefined): [Plugin[], Plugin[], Plugin[]];
 declare function loadConfigFromFile(configEnv: ConfigEnv, configFile?: string, configRoot?: string, logLevel?: LogLevel): Promise<{
     path: string;

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-WN9UKUor.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-WN9UKUor.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.16",
   "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"