vite 5.0.0-beta.15 → 5.0.0-beta.16

package/dist/node/chunks/{dep-Kf16Z54K.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';
@@ -38479,8 +38479,8 @@ function createCachedImport(imp) {
         return cached;
     };
 }
-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 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) {
@@ -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)
@@ -54910,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;
@@ -57110,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 (
@@ -57146,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();
             }
         }
@@ -57156,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();
             }
         }
@@ -57166,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();
     };
@@ -58449,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);
@@ -58561,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());
@@ -61306,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,
@@ -61342,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
@@ -61421,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;
@@ -61781,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,
@@ -61830,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)) {
@@ -61856,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 }));
                 }
@@ -61903,6 +61889,9 @@ async function createPluginContainer(config, moduleGraph, watcher) {
             await hookParallel('buildEnd', () => ctx, () => []);
             await hookParallel('closeBundle', () => ctx, () => []);
         },
+        [ASYNC_DISPOSE]() {
+            return this.close();
+        },
     };
     return container;
 }
@@ -62616,6 +62605,9 @@ async function createDepsOptimizer(config, server) {
         resetRegisteredIds,
         ensureFirstRun,
         close,
+        [ASYNC_DISPOSE]() {
+            return this.close();
+        },
         options: getDepOptimizationConfig(config, ssr),
     };
     depsOptimizerMap.set(config, depsOptimizer);
@@ -63150,6 +63142,7 @@ async function createDevSsrDepsOptimizer(config) {
         resetRegisteredIds: () => { },
         ensureFirstRun: () => { },
         close: async () => { },
+        [ASYNC_DISPOSE]: async () => { },
         options: config.ssr.optimizeDeps,
     };
     devSsrDepsOptimizerMap.set(config, depsOptimizer);
@@ -65127,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));
     };
@@ -65144,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]));
@@ -65162,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]));
@@ -65485,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, {
@@ -65504,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,
@@ -65528,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;
 }
@@ -65565,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;
@@ -65579,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) {
@@ -66157,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-01ZZG1lv.js → dep-ayAPZ1OT.js}

@@ -1,4 +1,4 @@
-import { y as getDefaultExportFromCjs } from './dep-Kf16Z54K.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-dhvB1mwU.js → dep-wO2juHOz.js}

@@ -1,4 +1,4 @@
-import { z as commonjsGlobal, y as getDefaultExportFromCjs } from './dep-Kf16Z54K.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-Kf16Z54K.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-Kf16Z54K.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-Kf16Z54K.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-Kf16Z54K.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-Kf16Z54K.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

@@ -6,6 +6,7 @@ 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';
@@ -716,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.
@@ -837,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>;
@@ -1398,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
      */
@@ -1552,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
      */
@@ -1570,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:
@@ -2423,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;
@@ -2924,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 {
     /**
@@ -2942,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
@@ -3210,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,6 +1,6 @@
 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';
+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';

package/package.json

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