vite 6.0.0-beta.1 → 6.0.0-beta.2

package/dist/node/chunks/{dep-DiM5uMHt.js → dep-BabmomGK.js}

@@ -1,4 +1,4 @@
-import { J as getDefaultExportFromCjs } from './dep-BZ_CwQkz.js';
+import { L as getDefaultExportFromCjs } from './dep-BHXIdTzn.js';
 import require$$0 from 'path';
 import require$$0__default from 'fs';
 import { l as lib } from './dep-IQS-Za7F.js';

package/dist/node/chunks/{dep-BZeeNeMJ.js → dep-DTHr9Se7.js}

@@ -1,4 +1,4 @@
-import { K as commonjsGlobal, J as getDefaultExportFromCjs } from './dep-BZ_CwQkz.js';
+import { M as commonjsGlobal, L as getDefaultExportFromCjs } from './dep-BHXIdTzn.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__default from 'node:fs';
 import { performance } from 'node:perf_hooks';
 import { EventEmitter } from 'events';
-import { I as colors, A as createLogger, r as resolveConfig } from './chunks/dep-BZ_CwQkz.js';
+import { K as colors, E as createLogger, r as resolveConfig } from './chunks/dep-BHXIdTzn.js';
 import { VERSION } from './constants.js';
 import 'node:fs/promises';
 import 'node:url';
@@ -30,13 +30,13 @@ import 'node:crypto';
 import 'node:dns';
 import 'vite/module-runner';
 import 'rollup/parseAst';
+import 'node:readline';
+import 'crypto';
 import 'module';
 import 'node:assert';
 import 'node:v8';
 import 'node:worker_threads';
-import 'crypto';
 import 'node:buffer';
-import 'node:readline';
 import 'zlib';
 import 'buffer';
 import 'https';
@@ -736,7 +736,7 @@ cli.command("[root]", "start dev server").alias("serve").alias("dev").option("--
   `[boolean] force the optimizer to ignore the cache and re-bundle`
 ).action(async (root, options) => {
   filterDuplicateOptions(options);
-  const { createServer } = await import('./chunks/dep-BZ_CwQkz.js').then(function (n) { return n.M; });
+  const { createServer } = await import('./chunks/dep-BHXIdTzn.js').then(function (n) { return n.O; });
   try {
     const server = await createServer({
       root,
@@ -829,7 +829,7 @@ cli.command("build [root]", "build for production").option("--target <target>",
 ).option("-w, --watch", `[boolean] rebuilds when modules have changed on disk`).option("--app", `[boolean] same as builder.entireApp`).action(
   async (root, options) => {
     filterDuplicateOptions(options);
-    const build = await import('./chunks/dep-BZ_CwQkz.js').then(function (n) { return n.N; });
+    const build = await import('./chunks/dep-BHXIdTzn.js').then(function (n) { return n.P; });
     const buildOptions = cleanGlobalCLIOptions(
       cleanBuilderCLIOptions(options)
     );
@@ -884,7 +884,7 @@ cli.command("optimize [root]", "pre-bundle dependencies").option(
 ).action(
   async (root, options) => {
     filterDuplicateOptions(options);
-    const { optimizeDeps } = await import('./chunks/dep-BZ_CwQkz.js').then(function (n) { return n.L; });
+    const { optimizeDeps } = await import('./chunks/dep-BHXIdTzn.js').then(function (n) { return n.N; });
     try {
       const config = await resolveConfig(
         {
@@ -910,7 +910,7 @@ ${e.stack}`),
 cli.command("preview [root]", "locally preview production build").option("--host [host]", `[string] specify hostname`, { type: [convertHost] }).option("--port <port>", `[number] specify port`).option("--strictPort", `[boolean] exit if specified port is already in use`).option("--open [path]", `[boolean | string] open browser on startup`).option("--outDir <dir>", `[string] output directory (default: dist)`).action(
   async (root, options) => {
     filterDuplicateOptions(options);
-    const { preview } = await import('./chunks/dep-BZ_CwQkz.js').then(function (n) { return n.O; });
+    const { preview } = await import('./chunks/dep-BHXIdTzn.js').then(function (n) { return n.Q; });
     try {
       const server = await preview({
         root,

package/dist/node/constants.js

@@ -6,6 +6,7 @@ const { version } = JSON.parse(
   readFileSync(new URL("../../package.json", import.meta.url)).toString()
 );
 const ROLLUP_HOOKS = [
+  "options",
   "buildStart",
   "buildEnd",
   "renderStart",
@@ -30,7 +31,8 @@ const ROLLUP_HOOKS = [
   "resolveDynamicImport",
   "resolveId",
   "shouldTransformCachedModule",
-  "transform"
+  "transform",
+  "onLog"
 ];
 const VERSION = version;
 const DEFAULT_MAIN_FIELDS = [
@@ -135,5 +137,8 @@ const DEFAULT_DEV_PORT = 5173;
 const DEFAULT_PREVIEW_PORT = 4173;
 const DEFAULT_ASSETS_INLINE_LIMIT = 4096;
 const METADATA_FILENAME = "_metadata.json";
+const ERR_OPTIMIZE_DEPS_PROCESSING_ERROR = "ERR_OPTIMIZE_DEPS_PROCESSING_ERROR";
+const ERR_OUTDATED_OPTIMIZED_DEP = "ERR_OUTDATED_OPTIMIZED_DEP";
+const ERR_FILE_NOT_FOUND_IN_OPTIMIZED_DEP_DIR = "ERR_FILE_NOT_FOUND_IN_OPTIMIZED_DEP_DIR";
 
-export { CLIENT_DIR, CLIENT_ENTRY, CLIENT_PUBLIC_PATH, CSS_LANGS_RE, DEFAULT_ASSETS_INLINE_LIMIT, 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, METADATA_FILENAME, OPTIMIZABLE_ENTRY_RE, ROLLUP_HOOKS, SPECIAL_QUERY_RE, VERSION, VITE_PACKAGE_DIR, loopbackHosts, wildcardHosts };
+export { CLIENT_DIR, CLIENT_ENTRY, CLIENT_PUBLIC_PATH, CSS_LANGS_RE, DEFAULT_ASSETS_INLINE_LIMIT, 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, ERR_FILE_NOT_FOUND_IN_OPTIMIZED_DEP_DIR, ERR_OPTIMIZE_DEPS_PROCESSING_ERROR, ERR_OUTDATED_OPTIMIZED_DEP, ESBUILD_MODULES_TARGET, FS_PREFIX, JS_TYPES_RE, KNOWN_ASSET_TYPES, METADATA_FILENAME, OPTIMIZABLE_ENTRY_RE, ROLLUP_HOOKS, SPECIAL_QUERY_RE, VERSION, VITE_PACKAGE_DIR, loopbackHosts, wildcardHosts };

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 { FetchResult, FetchFunctionOptions, ModuleRunnerOptions, ModuleRunnerHMRConnection, ModuleRunnerHmr, ModuleEvaluator, ModuleRunner } from 'vite/module-runner';
+import { FetchFunctionOptions, FetchResult, ModuleRunner, ModuleRunnerOptions, ModuleRunnerHMRConnection, ModuleRunnerHmr, ModuleEvaluator } 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';
@@ -619,7 +619,7 @@ interface ProxyOptions extends HttpProxy.ServerOptions {
      */
     bypass?: (req: http.IncomingMessage, res: http.ServerResponse, options: ProxyOptions) => void | null | undefined | false | string;
     /**
-     * rewrite the Origin header of a WebSocket request to match the the target
+     * rewrite the Origin header of a WebSocket request to match the target
      *
      * **Exercise caution as rewriting the Origin can leave the proxying open to [CSRF attacks](https://owasp.org/www-community/attacks/csrf).**
      */
@@ -822,17 +822,6 @@ declare class UnknownEnvironment extends BaseEnvironment {
     mode: "unknown";
 }
 
-interface FetchModuleOptions {
-    cached?: boolean;
-    inlineSourceMap?: boolean;
-    processSourceMap?<T extends NonNullable<TransformResult['map']>>(map: T): T;
-}
-/**
- * Fetch module information for Vite runner.
- * @experimental
- */
-declare function fetchModule(environment: DevEnvironment, url: string, importer?: string, options?: FetchModuleOptions): Promise<FetchResult>;
-
 declare class ScanEnvironment extends BaseEnvironment {
     mode: "scan";
     get pluginContainer(): EnvironmentPluginContainer;
@@ -1229,7 +1218,7 @@ interface HotChannel {
     /**
      * Disconnect all clients, called when server is closed or restarted.
      */
-    close(): void;
+    close(): Promise<unknown> | void;
 }
 /** @deprecated use `HotChannel` instead */
 type HMRChannel = HotChannel;
@@ -1267,7 +1256,8 @@ declare class RemoteEnvironmentTransport {
 interface DevEnvironmentContext {
     hot: false | HotChannel;
     options?: EnvironmentOptions;
-    runner?: FetchModuleOptions & {
+    remoteRunner?: {
+        inlineSourceMap?: boolean;
         transport?: RemoteEnvironmentTransport;
     };
     depsOptimizer?: DepsOptimizer;
@@ -2705,7 +2695,9 @@ declare namespace WebSocket {
 }
 
 type WebSocketCustomListener<T> = (data: T, client: WebSocketClient) => void;
+declare const isWebSocketServer: unique symbol;
 interface WebSocketServer extends HotChannel {
+    [isWebSocketServer]: true;
     /**
      * Listen on port and host
      */
@@ -3107,7 +3099,15 @@ interface CSSModulesConfig {
   /** The pattern to use when renaming class names and other identifiers. Default is `[hash]_[local]`. */
   pattern?: string,
   /** Whether to rename dashed identifiers, e.g. custom properties. */
-  dashedIdents?: boolean
+  dashedIdents?: boolean,
+  /** Whether to enable hashing for `@keyframes`. */
+  animation?: boolean,
+  /** Whether to enable hashing for CSS grid identifiers. */
+  grid?: boolean,
+  /** Whether to enable hashing for custom identifiers. */
+  customIdents?: boolean,
+  /** Whether to require at least one class or id selector in each rule. */
+  pure?: boolean
 }
 
 /**
@@ -3287,7 +3287,7 @@ interface ResolveIdPluginContext extends rollup.PluginContext, PluginContextExte
 interface TransformPluginContext extends rollup.TransformPluginContext, PluginContextExtension {
 }
 declare module 'rollup' {
-    interface PluginContext extends PluginContextExtension {
+    interface MinimalPluginContext extends PluginContextExtension {
     }
 }
 /**
@@ -3933,7 +3933,29 @@ declare function createIdResolver(config: ResolvedConfig, options?: Partial<Inte
 
 declare function buildErrorMessage(err: RollupError, args?: string[], includeStack?: boolean): string;
 
-declare function createNodeDevEnvironment(name: string, config: ResolvedConfig, context: DevEnvironmentContext): DevEnvironment;
+declare function createRunnableDevEnvironment(name: string, config: ResolvedConfig, context?: RunnableDevEnvironmentContext): DevEnvironment;
+interface RunnableDevEnvironmentContext extends Omit<DevEnvironmentContext, 'hot'> {
+    runner?: (environment: RunnableDevEnvironment) => ModuleRunner;
+    hot?: false | HotChannel;
+}
+declare function isRunnableDevEnvironment(environment: Environment): environment is RunnableDevEnvironment;
+declare class RunnableDevEnvironment extends DevEnvironment {
+    private _runner;
+    private _runnerFactory;
+    constructor(name: string, config: ResolvedConfig, context: RunnableDevEnvironmentContext);
+    get runner(): ModuleRunner;
+}
+
+interface FetchModuleOptions {
+    cached?: boolean;
+    inlineSourceMap?: boolean;
+    startOffset?: number;
+}
+/**
+ * Fetch module information for Vite runner.
+ * @experimental
+ */
+declare function fetchModule(environment: DevEnvironment, url: string, importer?: string, options?: FetchModuleOptions): Promise<FetchResult>;
 
 /**
  * @experimental
@@ -3968,7 +3990,7 @@ declare class ServerHMRConnector implements ModuleRunnerHMRConnection {
     private connected;
     constructor(hotChannel: ServerHotChannel);
     isReady(): boolean;
-    send(message: string): void;
+    send(payload_: HotPayload): void;
     onUpdate(handler: (payload: HotPayload) => void): void;
 }
 
@@ -4056,4 +4078,4 @@ interface ManifestChunk {
     dynamicImports?: string[];
 }
 
-export { type Alias, type AliasOptions, type AnymatchFn, type AnymatchPattern, type AppType, type AwaitWriteFinishOptions, type BindCLIShortcutsOptions, BuildEnvironment, type BuildEnvironmentOptions, type BuildOptions, type BuilderOptions, type CLIShortcut, type CSSModulesOptions, type CSSOptions, type CommonServerOptions, type ConfigEnv, Connect, type CorsOptions, type CorsOrigin, type DepOptimizationConfig, type DepOptimizationMetadata, type DepOptimizationOptions, DevEnvironment, type DevEnvironmentContext, type DevEnvironmentOptions, type ESBuildOptions, type ESBuildTransformResult, type Environment, EnvironmentModuleGraph, EnvironmentModuleNode, type EnvironmentOptions, type ExperimentalOptions, type ExportsData, FSWatcher, type FetchModuleOptions, type FileSystemServeOptions, type FilterPattern, type HMRBroadcaster, type HMRBroadcasterClient, type HMRChannel, type HTMLOptions, type HmrContext, type HmrOptions, type HookHandler, type HotChannel, type HotChannelClient, type HotUpdateOptions, type HtmlTagDescriptor, HttpProxy, type HttpServer, type IndexHtmlTransform, type IndexHtmlTransformContext, type IndexHtmlTransformHook, type IndexHtmlTransformResult, type InlineConfig, type InternalResolveOptions, type JsonOptions, type LegacyOptions, type LibraryFormats, type LibraryOptions, type LightningCSSOptions, type LogErrorOptions, type LogLevel, type LogOptions, type LogType, type Logger, type LoggerOptions, type Manifest, type ManifestChunk, type MapToFunction, type AnymatchMatcher as Matcher, ModuleGraph, ModuleNode, type ModulePreloadOptions, type ModuleRunnerTransformOptions, type OptimizedDepInfo, type Plugin, PluginContainer, type PluginHookUtils, type PluginOption, type PreprocessCSSResult, type PreviewOptions, type PreviewServer, type PreviewServerHook, type ProxyOptions, RemoteEnvironmentTransport, type RenderBuiltAssetUrl, type ResolveFn, type ResolveModulePreloadDependenciesFn, type ResolveOptions, type ResolvedBuildEnvironmentOptions, type ResolvedBuildOptions, type ResolvedCSSOptions, type ResolvedConfig, type ResolvedDevEnvironmentOptions, type ResolvedModulePreloadOptions, type ResolvedPreviewOptions, type ResolvedSSROptions, type ResolvedServerOptions, type ResolvedServerUrls, type ResolvedUrl, type ResolvedWorkerOptions, type ResolverFunction, type ResolverObject, type RollupCommonJSOptions, type RollupDynamicImportVarsOptions, type SSROptions, type SSRTarget, type SendOptions, type ServerHMRChannel, ServerHMRConnector, type ServerHook, type ServerHotChannel, type ServerModuleRunnerOptions, type ServerOptions, SplitVendorChunkCache, type SsrDepOptimizationConfig, Terser, type TerserOptions, type TransformOptions, type TransformResult, type UserConfig, type UserConfigExport, type UserConfigFn, type UserConfigFnObject, type UserConfigFnPromise, type ViteBuilder, type ViteDevServer, type WatchOptions, WebSocket, WebSocketAlias, type WebSocketClient, type WebSocketCustomListener, WebSocketServer, build, buildErrorMessage, createBuilder, createFilter, createIdResolver, createLogger, createNodeDevEnvironment, createServer, createServerHotChannel, createServerModuleRunner, defineConfig, fetchModule, formatPostcssSourceMap, isCSSRequest, isFileLoadingAllowed, isFileServingAllowed, loadConfigFromFile, loadEnv, mergeAlias, mergeConfig, ssrTransform as moduleRunnerTransform, normalizePath, optimizeDeps, preprocessCSS, preview, resolveConfig, resolveEnvPrefix, rollupVersion, searchForWorkspaceRoot, send, sortUserPlugins, splitVendorChunk, splitVendorChunkPlugin, transformWithEsbuild, VERSION as version };
+export { type Alias, type AliasOptions, type AnymatchFn, type AnymatchPattern, type AppType, type AwaitWriteFinishOptions, type BindCLIShortcutsOptions, BuildEnvironment, type BuildEnvironmentOptions, type BuildOptions, type BuilderOptions, type CLIShortcut, type CSSModulesOptions, type CSSOptions, type CommonServerOptions, type ConfigEnv, Connect, type CorsOptions, type CorsOrigin, type DepOptimizationConfig, type DepOptimizationMetadata, type DepOptimizationOptions, DevEnvironment, type DevEnvironmentContext, type DevEnvironmentOptions, type ESBuildOptions, type ESBuildTransformResult, type Environment, EnvironmentModuleGraph, EnvironmentModuleNode, type EnvironmentOptions, type ExperimentalOptions, type ExportsData, FSWatcher, type FetchModuleOptions, type FileSystemServeOptions, type FilterPattern, type HMRBroadcaster, type HMRBroadcasterClient, type HMRChannel, type HTMLOptions, type HmrContext, type HmrOptions, type HookHandler, type HotChannel, type HotChannelClient, type HotUpdateOptions, type HtmlTagDescriptor, HttpProxy, type HttpServer, type IndexHtmlTransform, type IndexHtmlTransformContext, type IndexHtmlTransformHook, type IndexHtmlTransformResult, type InlineConfig, type InternalResolveOptions, type JsonOptions, type LegacyOptions, type LibraryFormats, type LibraryOptions, type LightningCSSOptions, type LogErrorOptions, type LogLevel, type LogOptions, type LogType, type Logger, type LoggerOptions, type Manifest, type ManifestChunk, type MapToFunction, type AnymatchMatcher as Matcher, ModuleGraph, ModuleNode, type ModulePreloadOptions, type ModuleRunnerTransformOptions, type OptimizedDepInfo, type Plugin, PluginContainer, type PluginHookUtils, type PluginOption, type PreprocessCSSResult, type PreviewOptions, type PreviewServer, type PreviewServerHook, type ProxyOptions, RemoteEnvironmentTransport, type RenderBuiltAssetUrl, type ResolveFn, type ResolveModulePreloadDependenciesFn, type ResolveOptions, type ResolvedBuildEnvironmentOptions, type ResolvedBuildOptions, type ResolvedCSSOptions, type ResolvedConfig, type ResolvedDevEnvironmentOptions, type ResolvedModulePreloadOptions, type ResolvedPreviewOptions, type ResolvedSSROptions, type ResolvedServerOptions, type ResolvedServerUrls, type ResolvedUrl, type ResolvedWorkerOptions, type ResolverFunction, type ResolverObject, type RollupCommonJSOptions, type RollupDynamicImportVarsOptions, RunnableDevEnvironment, type RunnableDevEnvironmentContext, type SSROptions, type SSRTarget, type SendOptions, type ServerHMRChannel, ServerHMRConnector, type ServerHook, type ServerHotChannel, type ServerModuleRunnerOptions, type ServerOptions, SplitVendorChunkCache, type SsrDepOptimizationConfig, Terser, type TerserOptions, type TransformOptions, type TransformResult, type UserConfig, type UserConfigExport, type UserConfigFn, type UserConfigFnObject, type UserConfigFnPromise, type ViteBuilder, type ViteDevServer, type WatchOptions, WebSocket, WebSocketAlias, type WebSocketClient, type WebSocketCustomListener, WebSocketServer, build, buildErrorMessage, createBuilder, createFilter, createIdResolver, createLogger, createRunnableDevEnvironment, createServer, createServerHotChannel, createServerModuleRunner, defineConfig, fetchModule, formatPostcssSourceMap, isCSSRequest, isFileLoadingAllowed, isFileServingAllowed, isRunnableDevEnvironment, loadConfigFromFile, loadEnv, mergeAlias, mergeConfig, ssrTransform as moduleRunnerTransform, normalizePath, optimizeDeps, preprocessCSS, preview, resolveConfig, resolveEnvPrefix, rollupVersion, searchForWorkspaceRoot, send, sortUserPlugins, splitVendorChunk, splitVendorChunkPlugin, transformWithEsbuild, VERSION as version };

package/dist/node/index.js

@@ -1,10 +1,9 @@
 export { parseAst, parseAstAsync } from 'rollup/parseAst';
-import { i as isInNodeModules, a as arraify } from './chunks/dep-BZ_CwQkz.js';
-export { B as BuildEnvironment, D as DevEnvironment, b as build, j as buildErrorMessage, e as createBuilder, x as createFilter, f as createIdResolver, A as createLogger, k as createNodeDevEnvironment, c as createServer, n as createServerHotChannel, d as defineConfig, m as fetchModule, g as formatPostcssSourceMap, F as isFileLoadingAllowed, E as isFileServingAllowed, l as loadConfigFromFile, G as loadEnv, w as mergeAlias, v as mergeConfig, q as moduleRunnerTransform, u as normalizePath, o as optimizeDeps, h as preprocessCSS, p as preview, r as resolveConfig, H as resolveEnvPrefix, y as rollupVersion, C as searchForWorkspaceRoot, z as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-BZ_CwQkz.js';
-import { existsSync, readFileSync } from 'node:fs';
-import { ModuleRunner, ESModulesEvaluator } from 'vite/module-runner';
+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';
 export { VERSION as version } from './constants.js';
 export { version as esbuildVersion } from 'esbuild';
+import 'node:fs';
 import 'node:fs/promises';
 import 'node:path';
 import 'node:url';
@@ -31,13 +30,14 @@ import 'child_process';
 import 'node:os';
 import 'node:crypto';
 import 'node:dns';
+import 'vite/module-runner';
+import 'node:readline';
+import 'crypto';
 import 'module';
 import 'node:assert';
 import 'node:v8';
 import 'node:worker_threads';
-import 'crypto';
 import 'node:buffer';
-import 'node:readline';
 import 'zlib';
 import 'buffer';
 import 'https';
@@ -181,112 +181,4 @@ class RemoteEnvironmentTransport {
   }
 }
 
-class ServerHMRBroadcasterClient {
-  constructor(hotChannel) {
-    this.hotChannel = hotChannel;
-  }
-  send(...args) {
-    let payload;
-    if (typeof args[0] === "string") {
-      payload = {
-        type: "custom",
-        event: args[0],
-        data: args[1]
-      };
-    } else {
-      payload = args[0];
-    }
-    if (payload.type !== "custom") {
-      throw new Error(
-        "Cannot send non-custom events from the client to the server."
-      );
-    }
-    this.hotChannel.send(payload);
-  }
-}
-class ServerHMRConnector {
-  constructor(hotChannel) {
-    this.hotChannel = hotChannel;
-    this.hmrClient = new ServerHMRBroadcasterClient(hotChannel);
-    hotChannel.api.outsideEmitter.on("send", (payload) => {
-      this.handlers.forEach((listener) => listener(payload));
-    });
-    this.hotChannel = hotChannel;
-  }
-  handlers = [];
-  hmrClient;
-  connected = false;
-  isReady() {
-    return this.connected;
-  }
-  send(message) {
-    const payload = JSON.parse(message);
-    this.hotChannel.api.innerEmitter.emit(
-      payload.event,
-      payload.data,
-      this.hmrClient
-    );
-  }
-  onUpdate(handler) {
-    this.handlers.push(handler);
-    handler({ type: "connected" });
-    this.connected = true;
-  }
-}
-
-function createHMROptions(environment, options) {
-  if (environment.config.server.hmr === false || options.hmr === false) {
-    return false;
-  }
-  if (options.hmr?.connection) {
-    return {
-      connection: options.hmr.connection,
-      logger: options.hmr.logger
-    };
-  }
-  if (!("api" in environment.hot)) return false;
-  const connection = new ServerHMRConnector(environment.hot);
-  return {
-    connection,
-    logger: options.hmr?.logger
-  };
-}
-const prepareStackTrace = {
-  retrieveFile(id) {
-    if (existsSync(id)) {
-      return readFileSync(id, "utf-8");
-    }
-  }
-};
-function resolveSourceMapOptions(options) {
-  if (options.sourcemapInterceptor != null) {
-    if (options.sourcemapInterceptor === "prepareStackTrace") {
-      return prepareStackTrace;
-    }
-    if (typeof options.sourcemapInterceptor === "object") {
-      return { ...prepareStackTrace, ...options.sourcemapInterceptor };
-    }
-    return options.sourcemapInterceptor;
-  }
-  if (typeof process !== "undefined" && "setSourceMapsEnabled" in process) {
-    return "node";
-  }
-  return prepareStackTrace;
-}
-function createServerModuleRunner(environment, options = {}) {
-  const hmr = createHMROptions(environment, options);
-  return new ModuleRunner(
-    {
-      ...options,
-      root: environment.config.root,
-      transport: {
-        fetchModule: (id, importer, options2) => environment.fetchModule(id, importer, options2)
-      },
-      hmr,
-      sourcemapInterceptor: resolveSourceMapOptions(options)
-    },
-    options.evaluator || new ESModulesEvaluator()
-  );
-}
-
-export { RemoteEnvironmentTransport, ServerHMRConnector, createServerModuleRunner, isCSSRequest, splitVendorChunk, splitVendorChunkPlugin };
+export { RemoteEnvironmentTransport, isCSSRequest, splitVendorChunk, splitVendorChunkPlugin };

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

@@ -1,5 +1,5 @@
 import { ModuleNamespace, ViteHotContext } from '../../types/hot.js';
-import { Update, HotPayload } from '../../types/hmrPayload.js';
+import { HotPayload, Update } from '../../types/hmrPayload.js';
 import { InferCustomEventPayload } from '../../types/customEvent.js';
 
 interface SourceMapLike {
@@ -47,13 +47,13 @@ interface HMRConnection {
     /**
      * Send message to the client.
      */
-    send(messages: string): void;
+    send(messages: HotPayload): void;
 }
 declare class HMRMessenger {
     private connection;
     constructor(connection: HMRConnection);
     private queue;
-    send(message: string): void;
+    send(payload: HotPayload): void;
     flush(): void;
 }
 declare class HMRClient {
@@ -111,19 +111,13 @@ declare class ModuleRunner {
     options: ModuleRunnerOptions;
     evaluator: ModuleEvaluator;
     private debug?;
-    /**
-     * Holds the cache of modules
-     * Keys of the map are ids
-     */
-    moduleCache: ModuleCacheMap;
+    evaluatedModules: EvaluatedModules;
     hmrClient?: HMRClient;
-    private readonly urlToIdMap;
-    private readonly fileToIdMap;
     private readonly envProxy;
     private readonly transport;
     private readonly resetSourceMapSupport?;
     private readonly root;
-    private readonly moduleInfoCache;
+    private readonly concurrentModuleNodePromises;
     private destroyed;
     constructor(options: ModuleRunnerOptions, evaluator: ModuleEvaluator, debug?: ModuleRunnerDebugger | undefined);
     /**
@@ -149,7 +143,7 @@ declare class ModuleRunner {
     private cachedRequest;
     private cachedModule;
     private getModuleInformation;
-    protected directRequest(id: string, mod: ModuleCache, _callstack: string[]): Promise<any>;
+    protected directRequest(url: string, mod: EvaluatedModuleNode, _callstack: string[]): Promise<any>;
 }
 
 interface RetrieveFileHandler {
@@ -202,31 +196,23 @@ interface ModuleRunnerContext {
     [ssrImportMetaKey]: ModuleRunnerImportMeta;
 }
 interface ModuleEvaluator {
+    /**
+     * Number of prefixed lines in the transformed code.
+     */
+    startOffset?: number;
     /**
      * Run code that was transformed by Vite.
      * @param context Function context
      * @param code Transformed code
-     * @param id ID that was used to fetch the module
+     * @param module The module node
      */
-    runInlinedModule(context: ModuleRunnerContext, code: string, id: string): Promise<any>;
+    runInlinedModule(context: ModuleRunnerContext, code: string, module: Readonly<EvaluatedModuleNode>): Promise<any>;
     /**
      * Run externalized module.
      * @param file File URL to the external module
      */
     runExternalModule(file: string): Promise<any>;
 }
-interface ModuleCache {
-    promise?: Promise<any>;
-    exports?: any;
-    evaluated?: boolean;
-    map?: DecodedMap;
-    meta?: ResolvedResult;
-    /**
-     * Module ids that imports this module
-     */
-    importers?: Set<string>;
-    imports?: Set<string>;
-}
 type FetchResult = CachedFetchResult | ExternalFetchResult | ViteFetchResult;
 interface CachedFetchResult {
     /**
@@ -246,7 +232,7 @@ interface ExternalFetchResult {
      * Type of the module. Will be used to determine if import statement is correct.
      * For example, if Vite needs to throw an error if variable is not actually exported
      */
-    type?: 'module' | 'commonjs' | 'builtin' | 'network';
+    type: 'module' | 'commonjs' | 'builtin' | 'network';
 }
 interface ViteFetchResult {
     /**
@@ -263,7 +249,11 @@ interface ViteFetchResult {
     /**
      * Module ID in the server module graph.
      */
-    serverId: string;
+    id: string;
+    /**
+     * Module URL used in the import.
+     */
+    url: string;
     /**
      * Invalidate module on the client side.
      */
@@ -271,10 +261,12 @@ interface ViteFetchResult {
 }
 type ResolvedResult = (ExternalFetchResult | ViteFetchResult) & {
     url: string;
+    id: string;
 };
 type FetchFunction = (id: string, importer?: string, options?: FetchFunctionOptions) => Promise<FetchResult>;
 interface FetchFunctionOptions {
     cached?: boolean;
+    startOffset?: number;
 }
 interface ModuleRunnerHmr {
     /**
@@ -308,7 +300,7 @@ interface ModuleRunnerOptions {
     /**
      * Custom module cache. If not provided, creates a separate module cache for each ModuleRunner instance.
      */
-    moduleCache?: ModuleCacheMap;
+    evaluatedModules?: EvaluatedModules;
 }
 interface ImportMetaEnv {
     [key: string]: any;
@@ -319,36 +311,66 @@ interface ImportMetaEnv {
     SSR: boolean;
 }
 
-declare class ModuleCacheMap extends Map<string, ModuleCache> {
-    private root;
-    constructor(root: string, entries?: [string, ModuleCache][]);
-    normalize(fsPath: string): string;
+declare class EvaluatedModuleNode {
+    id: string;
+    url: string;
+    importers: Set<string>;
+    imports: Set<string>;
+    evaluated: boolean;
+    meta: ResolvedResult | undefined;
+    promise: Promise<any> | undefined;
+    exports: any | undefined;
+    file: string;
+    map: DecodedMap | undefined;
+    constructor(id: string, url: string);
+}
+declare class EvaluatedModules {
+    readonly idToModuleMap: Map<string, EvaluatedModuleNode>;
+    readonly fileToModulesMap: Map<string, Set<EvaluatedModuleNode>>;
+    readonly urlToIdModuleMap: Map<string, EvaluatedModuleNode>;
+    /**
+     * Returns the module node by the resolved module ID. Usually, module ID is
+     * the file system path with query and/or hash. It can also be a virtual module.
+     *
+     * Module runner graph will have 1 to 1 mapping with the server module graph.
+     * @param id Resolved module ID
+     */
+    getModuleById(id: string): EvaluatedModuleNode | undefined;
     /**
-     * Assign partial data to the map
+     * Returns all modules related to the file system path. Different modules
+     * might have different query parameters or hash, so it's possible to have
+     * multiple modules for the same file.
+     * @param file The file system path of the module
      */
-    update(fsPath: string, mod: ModuleCache): this;
-    setByModuleId(modulePath: string, mod: ModuleCache): this;
-    set(fsPath: string, mod: ModuleCache): this;
-    getByModuleId(modulePath: string): ModuleCache;
-    get(fsPath: string): ModuleCache;
-    deleteByModuleId(modulePath: string): boolean;
-    delete(fsPath: string): boolean;
-    invalidateUrl(id: string): void;
-    invalidateModule(module: ModuleCache): void;
+    getModulesByFile(file: string): Set<EvaluatedModuleNode> | undefined;
     /**
-     * Invalidate modules that dependent on the given modules, up to the main entry
+     * Returns the module node by the URL that was used in the import statement.
+     * Unlike module graph on the server, the URL is not resolved and is used as is.
+     * @param url Server URL that was used in the import statement
      */
-    invalidateDepTree(ids: string[] | Set<string>, invalidated?: Set<string>): Set<string>;
+    getModuleByUrl(url: string): EvaluatedModuleNode | undefined;
     /**
-     * Invalidate dependency modules of the given modules, down to the bottom-level dependencies
+     * Ensure that module is in the graph. If the module is already in the graph,
+     * it will return the existing module node. Otherwise, it will create a new
+     * module node and add it to the graph.
+     * @param id Resolved module ID
+     * @param url URL that was used in the import statement
      */
-    invalidateSubDepTree(ids: string[] | Set<string>, invalidated?: Set<string>): Set<string>;
-    getSourceMap(moduleId: string): null | DecodedMap;
+    ensureModule(id: string, url: string): EvaluatedModuleNode;
+    invalidateModule(node: EvaluatedModuleNode): void;
+    /**
+     * Extracts the inlined source map from the module code and returns the decoded
+     * source map. If the source map is not inlined, it will return null.
+     * @param id Resolved module ID
+     */
+    getModuleSourceMapById(id: string): DecodedMap | null;
+    clear(): void;
 }
 
 declare class ESModulesEvaluator implements ModuleEvaluator {
+    startOffset: number;
     runInlinedModule(context: ModuleRunnerContext, code: string): Promise<any>;
     runExternalModule(filepath: string): Promise<any>;
 }
 
-export { ESModulesEvaluator, type FetchFunction, type FetchFunctionOptions, type FetchResult, type HMRConnection, type HMRLogger, type ModuleCache, ModuleCacheMap, type ModuleEvaluator, ModuleRunner, type ModuleRunnerContext, type ModuleRunnerHMRConnection, type ModuleRunnerHmr, type ModuleRunnerImportMeta, type ModuleRunnerOptions, RemoteRunnerTransport, type ResolvedResult, type RunnerTransport, type SSRImportMetadata, ssrDynamicImportKey, ssrExportAllKey, ssrImportKey, ssrImportMetaKey, ssrModuleExportsKey };
+export { ESModulesEvaluator, EvaluatedModuleNode, EvaluatedModules, type FetchFunction, type FetchFunctionOptions, type FetchResult, type HMRConnection, type HMRLogger, type ModuleEvaluator, ModuleRunner, type ModuleRunnerContext, type ModuleRunnerHMRConnection, type ModuleRunnerHmr, type ModuleRunnerImportMeta, type ModuleRunnerOptions, RemoteRunnerTransport, type ResolvedResult, type RunnerTransport, type SSRImportMetadata, ssrDynamicImportKey, ssrExportAllKey, ssrImportKey, ssrImportMetaKey, ssrModuleExportsKey };