vite 6.0.0-beta.2 → 6.0.0-beta.3

package/dist/node/index.d.ts

@@ -15,7 +15,7 @@ import * as url from 'node:url';
 import { URL } from 'node:url';
 import * as stream from 'node:stream';
 import { Duplex, DuplexOptions } from 'node:stream';
-import { FetchFunctionOptions, FetchResult, ModuleRunner, ModuleRunnerOptions, ModuleRunnerHMRConnection, ModuleRunnerHmr, ModuleEvaluator } from 'vite/module-runner';
+import { FetchFunctionOptions, FetchResult, ModuleRunnerOptions, ModuleRunnerHMRConnection, ModuleRunnerHmr, ModuleEvaluator, ModuleRunner } from 'vite/module-runner';
 export { FetchFunction, FetchResult } from 'vite/module-runner';
 import { BuildOptions as esbuild_BuildOptions, TransformOptions as esbuild_TransformOptions, TransformResult as esbuild_TransformResult } from 'esbuild';
 export { TransformOptions as EsbuildTransformOptions, version as esbuildVersion } from 'esbuild';
@@ -1771,15 +1771,81 @@ interface TerserOptions extends Terser.MinifyOptions {
     maxWorkers?: number;
 }
 
+interface FsUtils {
+    existsSync: (path: string) => boolean;
+    isDirectory: (path: string) => boolean;
+    tryResolveRealFile: (path: string, preserveSymlinks?: boolean) => string | undefined;
+    tryResolveRealFileWithExtensions: (path: string, extensions: string[], preserveSymlinks?: boolean) => string | undefined;
+    tryResolveRealFileOrType: (path: string, preserveSymlinks?: boolean) => {
+        path?: string;
+        type: 'directory' | 'file';
+    } | undefined;
+    initWatcher?: (watcher: FSWatcher) => void;
+}
+
+interface EnvironmentResolveOptions {
+    /**
+     * @default ['browser', 'module', 'jsnext:main', 'jsnext']
+     */
+    mainFields?: string[];
+    conditions?: string[];
+    externalConditions?: string[];
+    /**
+     * @default ['.mjs', '.js', '.mts', '.ts', '.jsx', '.tsx', '.json']
+     */
+    extensions?: string[];
+    dedupe?: string[];
+    /**
+     * external/noExternal logic, this only works for certain environments
+     * Previously this was ssr.external/ssr.noExternal
+     * TODO: better abstraction that works for the client environment too?
+     */
+    noExternal?: string | RegExp | (string | RegExp)[] | true;
+    external?: string[] | true;
+}
+interface ResolveOptions extends EnvironmentResolveOptions {
+    /**
+     * @default false
+     */
+    preserveSymlinks?: boolean;
+}
+interface ResolvePluginOptions {
+    root: string;
+    isBuild: boolean;
+    isProduction: boolean;
+    packageCache?: PackageCache;
+    fsUtils?: FsUtils;
+    /**
+     * src code mode also attempts the following:
+     * - resolving /xxx as URLs
+     * - resolving bare imports from optimized deps
+     */
+    asSrc?: boolean;
+    tryIndex?: boolean;
+    tryPrefix?: string;
+    preferRelative?: boolean;
+    isRequire?: boolean;
+    webCompatible?: boolean;
+    isFromTsImporter?: boolean;
+    tryEsmOnly?: boolean;
+    scan?: boolean;
+    ssrOptimizeCheck?: boolean;
+    /**
+     * @deprecated environment.config are used instead
+     */
+    ssrConfig?: SSROptions;
+}
+interface InternalResolveOptions extends Required<ResolveOptions>, ResolvePluginOptions {
+}
+type InternalResolveOptionsWithOverrideConditions = InternalResolveOptions & {};
+
 /** Cache for package.json resolution and package.json contents */
 type PackageCache = Map<string, PackageData>;
 interface PackageData {
     dir: string;
     hasSideEffects: (id: string) => boolean | 'no-treeshake' | null;
-    webResolvedImports: Record<string, string | undefined>;
-    nodeResolvedImports: Record<string, string | undefined>;
-    setResolvedCache: (key: string, entry: string, targetWeb: boolean) => void;
-    getResolvedCache: (key: string, targetWeb: boolean) => string | undefined;
+    setResolvedCache: (key: string, entry: string, options: InternalResolveOptionsWithOverrideConditions) => void;
+    getResolvedCache: (key: string, options: InternalResolveOptionsWithOverrideConditions) => string | undefined;
     data: {
         [field: string]: any;
         name: string;
@@ -2996,73 +3062,6 @@ type ESBuildTransformResult = Omit<esbuild_TransformResult, 'map'> & {
 };
 declare function transformWithEsbuild(code: string, filename: string, options?: esbuild_TransformOptions, inMap?: object): Promise<ESBuildTransformResult>;
 
-interface FsUtils {
-    existsSync: (path: string) => boolean;
-    isDirectory: (path: string) => boolean;
-    tryResolveRealFile: (path: string, preserveSymlinks?: boolean) => string | undefined;
-    tryResolveRealFileWithExtensions: (path: string, extensions: string[], preserveSymlinks?: boolean) => string | undefined;
-    tryResolveRealFileOrType: (path: string, preserveSymlinks?: boolean) => {
-        path?: string;
-        type: 'directory' | 'file';
-    } | undefined;
-    initWatcher?: (watcher: FSWatcher) => void;
-}
-
-interface EnvironmentResolveOptions {
-    /**
-     * @default ['browser', 'module', 'jsnext:main', 'jsnext']
-     */
-    mainFields?: string[];
-    conditions?: string[];
-    externalConditions?: string[];
-    /**
-     * @default ['.mjs', '.js', '.mts', '.ts', '.jsx', '.tsx', '.json']
-     */
-    extensions?: string[];
-    dedupe?: string[];
-    /**
-     * external/noExternal logic, this only works for certain environments
-     * Previously this was ssr.external/ssr.noExternal
-     * TODO: better abstraction that works for the client environment too?
-     */
-    noExternal?: string | RegExp | (string | RegExp)[] | true;
-    external?: string[] | true;
-}
-interface ResolveOptions extends EnvironmentResolveOptions {
-    /**
-     * @default false
-     */
-    preserveSymlinks?: boolean;
-}
-interface ResolvePluginOptions {
-    root: string;
-    isBuild: boolean;
-    isProduction: boolean;
-    packageCache?: PackageCache;
-    fsUtils?: FsUtils;
-    /**
-     * src code mode also attempts the following:
-     * - resolving /xxx as URLs
-     * - resolving bare imports from optimized deps
-     */
-    asSrc?: boolean;
-    tryIndex?: boolean;
-    tryPrefix?: string;
-    preferRelative?: boolean;
-    isRequire?: boolean;
-    webCompatible?: boolean;
-    isFromTsImporter?: boolean;
-    tryEsmOnly?: boolean;
-    scan?: boolean;
-    ssrOptimizeCheck?: boolean;
-    /**
-     * @deprecated environment.config are used instead
-     */
-    ssrConfig?: SSROptions;
-}
-interface InternalResolveOptions extends Required<ResolveOptions>, ResolvePluginOptions {
-}
-
 // This file is autogenerated by build-prefixes.js. DO NOT EDIT!
 
 interface Targets {
@@ -3544,6 +3543,8 @@ type UserConfigExport = UserConfig | Promise<UserConfig> | UserConfigFnObject |
 declare function defineConfig(config: UserConfig): UserConfig;
 declare function defineConfig(config: Promise<UserConfig>): Promise<UserConfig>;
 declare function defineConfig(config: UserConfigFnObject): UserConfigFnObject;
+declare function defineConfig(config: UserConfigFnPromise): UserConfigFnPromise;
+declare function defineConfig(config: UserConfigFn): UserConfigFn;
 declare function defineConfig(config: UserConfigExport): UserConfigExport;
 interface CreateDevEnvironmentContext {
     ws: WebSocketServer;
@@ -3933,17 +3934,42 @@ declare function createIdResolver(config: ResolvedConfig, options?: Partial<Inte
 
 declare function buildErrorMessage(err: RollupError, args?: string[], includeStack?: boolean): string;
 
+/**
+ * @experimental
+ */
+interface ServerModuleRunnerOptions extends Omit<ModuleRunnerOptions, 'root' | 'fetchModule' | 'hmr' | 'transport'> {
+    /**
+     * Disable HMR or configure HMR logger.
+     */
+    hmr?: false | {
+        connection?: ModuleRunnerHMRConnection;
+        logger?: ModuleRunnerHmr['logger'];
+    };
+    /**
+     * Provide a custom module evaluator. This controls how the code is executed.
+     */
+    evaluator?: ModuleEvaluator;
+}
+/**
+ * Create an instance of the Vite SSR runtime that support HMR.
+ * @experimental
+ */
+declare function createServerModuleRunner(environment: DevEnvironment, options?: ServerModuleRunnerOptions): ModuleRunner;
+
 declare function createRunnableDevEnvironment(name: string, config: ResolvedConfig, context?: RunnableDevEnvironmentContext): DevEnvironment;
 interface RunnableDevEnvironmentContext extends Omit<DevEnvironmentContext, 'hot'> {
-    runner?: (environment: RunnableDevEnvironment) => ModuleRunner;
+    runner?: (environment: RunnableDevEnvironment, options?: ServerModuleRunnerOptions) => ModuleRunner;
+    runnerOptions?: ServerModuleRunnerOptions;
     hot?: false | HotChannel;
 }
 declare function isRunnableDevEnvironment(environment: Environment): environment is RunnableDevEnvironment;
 declare class RunnableDevEnvironment extends DevEnvironment {
     private _runner;
     private _runnerFactory;
+    private _runnerOptions;
     constructor(name: string, config: ResolvedConfig, context: RunnableDevEnvironmentContext);
     get runner(): ModuleRunner;
+    close(): Promise<void>;
 }
 
 interface FetchModuleOptions {
@@ -3957,28 +3983,6 @@ interface FetchModuleOptions {
  */
 declare function fetchModule(environment: DevEnvironment, url: string, importer?: string, options?: FetchModuleOptions): Promise<FetchResult>;
 
-/**
- * @experimental
- */
-interface ServerModuleRunnerOptions extends Omit<ModuleRunnerOptions, 'root' | 'fetchModule' | 'hmr' | 'transport'> {
-    /**
-     * Disable HMR or configure HMR logger.
-     */
-    hmr?: false | {
-        connection?: ModuleRunnerHMRConnection;
-        logger?: ModuleRunnerHmr['logger'];
-    };
-    /**
-     * Provide a custom module evaluator. This controls how the code is executed.
-     */
-    evaluator?: ModuleEvaluator;
-}
-/**
- * Create an instance of the Vite SSR runtime that support HMR.
- * @experimental
- */
-declare function createServerModuleRunner(environment: DevEnvironment, options?: ServerModuleRunnerOptions): ModuleRunner;
-
 /**
  * The connector class to establish HMR communication between the server and the Vite runtime.
  * @experimental

package/dist/node/index.js

@@ -1,6 +1,6 @@
 export { parseAst, parseAstAsync } from 'rollup/parseAst';
-import { i as isInNodeModules, a as arraify } from './chunks/dep-BHXIdTzn.js';
-export { B as BuildEnvironment, D as DevEnvironment, S as ServerHMRConnector, b as build, j as buildErrorMessage, e as createBuilder, z as createFilter, f as createIdResolver, E as createLogger, k as createRunnableDevEnvironment, c as createServer, u as createServerHotChannel, q as createServerModuleRunner, d as defineConfig, n as fetchModule, g as formatPostcssSourceMap, H as isFileLoadingAllowed, G as isFileServingAllowed, m as isRunnableDevEnvironment, l as loadConfigFromFile, I as loadEnv, y as mergeAlias, x as mergeConfig, v as moduleRunnerTransform, w as normalizePath, o as optimizeDeps, h as preprocessCSS, p as preview, r as resolveConfig, J as resolveEnvPrefix, A as rollupVersion, F as searchForWorkspaceRoot, C as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-BHXIdTzn.js';
+import { i as isInNodeModules, a as arraify } from './chunks/dep-ChZnDG_O.js';
+export { B as BuildEnvironment, D as DevEnvironment, S as ServerHMRConnector, b as build, j as buildErrorMessage, e as createBuilder, z as createFilter, f as createIdResolver, E as createLogger, k as createRunnableDevEnvironment, c as createServer, u as createServerHotChannel, q as createServerModuleRunner, d as defineConfig, n as fetchModule, g as formatPostcssSourceMap, H as isFileLoadingAllowed, G as isFileServingAllowed, m as isRunnableDevEnvironment, l as loadConfigFromFile, I as loadEnv, y as mergeAlias, x as mergeConfig, v as moduleRunnerTransform, w as normalizePath, o as optimizeDeps, h as preprocessCSS, p as preview, r as resolveConfig, J as resolveEnvPrefix, A as rollupVersion, F as searchForWorkspaceRoot, C as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-ChZnDG_O.js';
 export { VERSION as version } from './constants.js';
 export { version as esbuildVersion } from 'esbuild';
 import 'node:fs';
@@ -13,9 +13,6 @@ import 'node:module';
 import 'tty';
 import 'path';
 import 'fs';
-import 'node:events';
-import 'node:stream';
-import 'node:string_decoder';
 import 'node:child_process';
 import 'node:http';
 import 'node:https';
@@ -32,6 +29,7 @@ import 'node:crypto';
 import 'node:dns';
 import 'vite/module-runner';
 import 'node:readline';
+import 'node:events';
 import 'crypto';
 import 'module';
 import 'node:assert';

package/dist/node/module-runner.d.ts

@@ -118,7 +118,7 @@ declare class ModuleRunner {
     private readonly resetSourceMapSupport?;
     private readonly root;
     private readonly concurrentModuleNodePromises;
-    private destroyed;
+    private closed;
     constructor(options: ModuleRunnerOptions, evaluator: ModuleEvaluator, debug?: ModuleRunnerDebugger | undefined);
     /**
      * URL to execute. Accepts file path, server path or id relative to the root.
@@ -132,11 +132,11 @@ declare class ModuleRunner {
      * Clears all caches, removes all HMR listeners, and resets source map support.
      * This method doesn't stop the HMR connection.
      */
-    destroy(): Promise<void>;
+    close(): Promise<void>;
     /**
-     * Returns `true` if the runtime has been destroyed by calling `destroy()` method.
+     * Returns `true` if the runtime has been closed by calling `close()` method.
      */
-    isDestroyed(): boolean;
+    isClosed(): boolean;
     private processImport;
     private isCircularModule;
     private isCircularImport;

package/dist/node/module-runner.js

@@ -536,7 +536,7 @@ function createHMRHandler(runner) {
 }
 async function handleHotPayload(runner, payload) {
   const hmrClient = runner.hmrClient;
-  if (!(!hmrClient || runner.isDestroyed()))
+  if (!(!hmrClient || runner.isClosed()))
     switch (payload.type) {
       case "connected":
         hmrClient.logger.debug("connected."), hmrClient.messenger.flush();
@@ -864,7 +864,7 @@ class ModuleRunner {
   resetSourceMapSupport;
   root;
   concurrentModuleNodePromises = /* @__PURE__ */ new Map();
-  destroyed = !1;
+  closed = !1;
   /**
    * URL to execute. Accepts file path, server path or id relative to the root.
    */
@@ -882,14 +882,14 @@ class ModuleRunner {
    * Clears all caches, removes all HMR listeners, and resets source map support.
    * This method doesn't stop the HMR connection.
    */
-  async destroy() {
-    this.resetSourceMapSupport?.(), this.clearCache(), this.hmrClient = void 0, this.destroyed = !0;
+  async close() {
+    this.resetSourceMapSupport?.(), this.clearCache(), this.hmrClient = void 0, this.closed = !0;
   }
   /**
-   * Returns `true` if the runtime has been destroyed by calling `destroy()` method.
+   * Returns `true` if the runtime has been closed by calling `close()` method.
    */
-  isDestroyed() {
-    return this.destroyed;
+  isClosed() {
+    return this.closed;
   }
   processImport(exports, fetchResult, metadata) {
     if (!("externalize" in fetchResult))
@@ -954,8 +954,8 @@ ${getStack()}`
     return cached;
   }
   async getModuleInformation(url, importer, cachedModule) {
-    if (this.destroyed)
-      throw new Error("Vite module runner has been destroyed.");
+    if (this.closed)
+      throw new Error("Vite module runner has been closed.");
     this.debug?.("[module runner] fetching", url);
     const isCached = !!(typeof cachedModule == "object" && cachedModule.meta), fetchedModule = (
       // fast return for established externalized pattern
@@ -1020,7 +1020,7 @@ ${getStack()}`
       enumerable: !0,
       get: () => {
         if (!this.hmrClient)
-          throw new Error("[module runner] HMR client was destroyed.");
+          throw new Error("[module runner] HMR client was closed.");
         return this.debug?.("[module runner] creating hmr context for", mod.url), hotContext ||= new HMRContext(this.hmrClient, mod.url), hotContext;
       },
       set: (value) => {