vite 6.0.0-alpha.17 → 6.0.0-alpha.18

package/dist/node/chunks/{dep-CNsiFGD3.js → dep-DlhHXrzk.js}

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

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 { I as colors, A as createLogger, r as resolveConfig } from './chunks/dep-DVlS5vGL.js';
+import { I as colors, A as createLogger, r as resolveConfig } from './chunks/dep-DXWVQosX.js';
 import { VERSION } from './constants.js';
 import 'node:fs/promises';
 import 'node:url';
@@ -766,7 +766,7 @@ cli
     filterDuplicateOptions(options);
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await import('./chunks/dep-DVlS5vGL.js').then(function (n) { return n.M; });
+    const { createServer } = await import('./chunks/dep-DXWVQosX.js').then(function (n) { return n.M; });
     try {
         const server = await createServer({
             root,
@@ -847,7 +847,7 @@ cli
     .option('--app', `[boolean] same as builder.entireApp`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { createBuilder, buildEnvironment } = await import('./chunks/dep-DVlS5vGL.js').then(function (n) { return n.N; });
+    const { createBuilder, buildEnvironment } = await import('./chunks/dep-DXWVQosX.js').then(function (n) { return n.N; });
     const buildOptions = cleanGlobalCLIOptions(cleanBuilderCLIOptions(options));
     const config = {
         root,
@@ -888,7 +888,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-DVlS5vGL.js').then(function (n) { return n.L; });
+    const { optimizeDeps } = await import('./chunks/dep-DXWVQosX.js').then(function (n) { return n.L; });
     try {
         const config = await resolveConfig({
             root,
@@ -914,7 +914,7 @@ cli
     .option('--outDir <dir>', `[string] output directory (default: dist)`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { preview } = await import('./chunks/dep-DVlS5vGL.js').then(function (n) { return n.O; });
+    const { preview } = await import('./chunks/dep-DXWVQosX.js').then(function (n) { return n.O; });
     try {
         const server = await preview({
             root,

package/dist/node/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { PluginHooks, RollupError, SourceMap, ModuleInfo, PartialResolvedId, RollupOptions, WatcherOptions, InputOption, ModuleFormat, RollupOutput, RollupWatcher, InputOptions, CustomPluginOptions, SourceDescription, LoadResult, SourceMapInput, ExistingRawSourceMap, OutputBundle, OutputChunk, ObjectHook, ResolveIdResult, GetManualChunk } from 'rollup';
+import { PluginHooks, RollupError, SourceMap, ModuleInfo, PartialResolvedId, RollupOptions, WatcherOptions, InputOption, ModuleFormat, RollupOutput, RollupWatcher, MinimalPluginContext, InputOptions, CustomPluginOptions, LoadResult, SourceDescription, SourceMapInput, ExistingRawSourceMap, OutputBundle, OutputChunk, ObjectHook, ResolveIdResult, GetManualChunk } from 'rollup';
 import * as rollup from 'rollup';
 export { rollup as Rollup };
 export { parseAst, parseAstAsync } from 'rollup/parseAst';
@@ -15,12 +15,12 @@ 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, ModuleRunnerOptions, ModuleRunnerHMRConnection, ModuleRunnerHmr, ModuleEvaluator, ModuleRunner } from 'vite/module-runner';
+import { FetchResult, FetchFunctionOptions, 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';
 import { HotPayload, CustomPayload } from '../../types/hotPayload.js';
-export { ConnectedPayload, CustomPayload, ErrorPayload, FullReloadPayload, HotPayload, PrunePayload, Update, UpdatePayload } from '../../types/hotPayload.js';
+export { ConnectedPayload, CustomPayload, ErrorPayload, FullReloadPayload, HMRPayload, HotPayload, PrunePayload, Update, UpdatePayload } from '../../types/hotPayload.js';
 import { InferCustomEventPayload } from '../../types/customEvent.js';
 export { CustomEventMap, InferCustomEventPayload, InvalidatePayload } from '../../types/customEvent.js';
 import { SecureContextOptions } from 'node:tls';
@@ -803,6 +803,7 @@ declare class FutureCompatEnvironment extends BaseEnvironment {
 }
 
 interface FetchModuleOptions {
+    cached?: boolean;
     inlineSourceMap?: boolean;
     processSourceMap?<T extends NonNullable<TransformResult['map']>>(map: T): T;
 }
@@ -1074,7 +1075,7 @@ declare class EnvironmentModuleGraph {
 }
 
 /**
- * Backward compatible ModuleNode and ModuleGraph with mixed nodes from both the client and ssr enviornments
+ * Backward compatible ModuleNode and ModuleGraph with mixed nodes from both the client and ssr environments
  * It would be good to take the types names for the new EnvironmentModuleNode and EnvironmentModuleGraph but we can't
  * do that at this point without breaking to much code in the ecosystem.
  * We are going to deprecate these types and we can try to use them back in the future.
@@ -1262,7 +1263,7 @@ declare class DevEnvironment extends BaseEnvironment {
     hot: HotChannel;
     constructor(name: string, config: ResolvedConfig, setup: DevEnvironmentSetup);
     init(): Promise<void>;
-    fetchModule(id: string, importer?: string): Promise<FetchResult>;
+    fetchModule(id: string, importer?: string, options?: FetchFunctionOptions): Promise<FetchResult>;
     transformRequest(url: string): Promise<TransformResult | null>;
     warmupRequest(url: string): Promise<void>;
     close(): Promise<void>;
@@ -1992,7 +1993,7 @@ interface LibraryOptions {
      */
     fileName?: string | ((format: ModuleFormat, entryName: string) => string);
 }
-type LibraryFormats = 'es' | 'cjs' | 'umd' | 'iife';
+type LibraryFormats = 'es' | 'cjs' | 'umd' | 'iife' | 'system';
 interface ModulePreloadOptions {
     /**
      * Whether to inject a module preload polyfill.
@@ -2058,20 +2059,36 @@ declare function createBuilder(inlineConfig?: InlineConfig): Promise<ViteBuilder
 
 type Environment = DevEnvironment | BuildEnvironment | ScanEnvironment | FutureCompatEnvironment;
 
-/**
- * This file is refactored into TypeScript based on
- * https://github.com/preactjs/wmr/blob/main/packages/wmr/src/lib/rollup-plugin-container.js
- */
-
-interface EnvironmentPluginContainer {
-    options: InputOptions;
-    buildStart(options: InputOptions): Promise<void>;
-    resolveId(id: string, importer: string | undefined, options?: {
+declare class EnvironmentPluginContainer {
+    environment: Environment;
+    plugins: Plugin[];
+    watcher?: FSWatcher | undefined;
+    private _pluginContextMap;
+    private _resolvedRollupOptions?;
+    private _processesing;
+    private _seenResolves;
+    private _moduleNodeToLoadAddedImports;
+    getSortedPluginHooks: PluginHookUtils['getSortedPluginHooks'];
+    getSortedPlugins: PluginHookUtils['getSortedPlugins'];
+    moduleGraph: EnvironmentModuleGraph | undefined;
+    watchFiles: Set<string>;
+    minimalContext: MinimalPluginContext;
+    private _closed;
+    private _updateModuleLoadAddedImports;
+    private _getAddedImports;
+    private handleHookPromise;
+    get options(): InputOptions;
+    resolveRollupOptions(): Promise<InputOptions>;
+    private _getPluginContext;
+    private hookParallel;
+    buildStart(_options?: InputOptions): Promise<void>;
+    resolveId(rawId: string, importer?: string | undefined, options?: {
         attributes?: Record<string, string>;
         custom?: CustomPluginOptions;
         skip?: Set<Plugin>;
         isEntry?: boolean;
     }): Promise<PartialResolvedId | null>;
+    load(id: string, options?: {}): Promise<LoadResult | null>;
     transform(code: string, id: string, options?: {
         inMap?: SourceDescription['map'];
     }): Promise<{
@@ -2080,38 +2097,39 @@ interface EnvironmentPluginContainer {
             mappings: '';
         } | null;
     }>;
-    load(id: string, options?: {}): Promise<LoadResult | null>;
     watchChange(id: string, change: {
         event: 'create' | 'update' | 'delete';
     }): Promise<void>;
     close(): Promise<void>;
 }
-interface PluginContainer {
-    options: InputOptions;
-    buildStart(options: InputOptions): Promise<void>;
-    resolveId(id: string, importer?: string, options?: {
+declare class PluginContainer {
+    private environments;
+    constructor(environments: Record<string, Environment>);
+    private _getEnvironment;
+    private _getPluginContainer;
+    get options(): InputOptions;
+    buildStart(_options?: InputOptions): Promise<void>;
+    resolveId(rawId: string, importer?: string, options?: {
         attributes?: Record<string, string>;
         custom?: CustomPluginOptions;
         skip?: Set<Plugin>;
         ssr?: boolean;
-        environment?: Environment;
         isEntry?: boolean;
     }): Promise<PartialResolvedId | null>;
+    load(id: string, options?: {
+        ssr?: boolean;
+    }): Promise<LoadResult | null>;
     transform(code: string, id: string, options?: {
-        inMap?: SourceDescription['map'];
         ssr?: boolean;
         environment?: Environment;
+        inMap?: SourceDescription['map'];
     }): Promise<{
         code: string;
         map: SourceMap | {
             mappings: '';
         } | null;
     }>;
-    load(id: string, options?: {
-        ssr?: boolean;
-        environment?: Environment;
-    }): Promise<LoadResult | null>;
-    watchChange(id: string, change: {
+    watchChange(_id: string, _change: {
         event: 'create' | 'update' | 'delete';
     }): Promise<void>;
     close(): Promise<void>;
@@ -2691,6 +2709,11 @@ interface ServerOptions extends CommonServerOptions {
      * Configure HMR-specific options (port, host, path & protocol)
      */
     hmr?: HmrOptions | boolean;
+    /**
+     * Do not start the websocket connection.
+     * @experimental
+     */
+    ws?: false;
     /**
      * Warm-up files to transform and cache the results in advance. This improves the
      * initial page load during server starts and prevents transform waterfalls.
@@ -3218,7 +3241,10 @@ type IndexHtmlTransform = IndexHtmlTransformHook | {
  * check if they have access to dev specific APIs.
  */
 interface PluginContextExtension {
-    environment?: Environment;
+    /**
+     * Vite-specific environment instance
+     */
+    environment: Environment;
 }
 interface PluginContext extends rollup.PluginContext, PluginContextExtension {
 }
@@ -3478,6 +3504,15 @@ interface ResolvedSSROptions extends SSROptions {
     optimizeDeps: SsrDepOptimizationConfig;
 }
 
+interface FutureDeprecationWarningsOptions {
+    pluginHookHandleHotUpdate?: boolean;
+    pluginHookSsrArgument?: boolean;
+    serverModuleGraph?: boolean;
+    serverHot?: boolean;
+    serverTransformRequest?: boolean;
+    ssrLoadModule?: boolean;
+}
+
 interface ConfigEnv {
     /**
      * 'serve': during dev (`vite` command)
@@ -3692,6 +3727,10 @@ interface UserConfig extends DefaultEnvironmentOptions {
      * @experimental
      */
     experimental?: ExperimentalOptions;
+    /**
+     * Options to opt-in to future behavior
+     */
+    future?: FutureOptions;
     /**
      * Legacy options
      *
@@ -3773,6 +3812,14 @@ interface HTMLOptions {
      */
     cspNonce?: string;
 }
+interface FutureOptions {
+    /**
+     * Emit warning messages for deprecated/will-deprecated features at runtime.
+     *
+     * Setting to `true` to enable all warnings
+     */
+    deprecationWarnings?: boolean | FutureDeprecationWarningsOptions;
+}
 interface ExperimentalOptions {
     /**
      * Append fake `&lang.(ext)` when queries are specified, to preserve the file extension for following plugins to process.
@@ -3876,6 +3923,13 @@ declare function loadConfigFromFile(configEnv: ConfigEnv, configFile?: string, c
     dependencies: string[];
 } | null>;
 
+type ResolveIdFn = (environment: PartialEnvironment, id: string, importer?: string, aliasOnly?: boolean) => Promise<string | undefined>;
+/**
+ * Create an internal resolver to be used in special scenarios, e.g.
+ * optimizer and handling css @imports
+ */
+declare function createIdResolver(config: ResolvedConfig, options: Partial<InternalResolveOptions>): ResolveIdFn;
+
 declare function buildErrorMessage(err: RollupError, args?: string[], includeStack?: boolean): string;
 
 declare function createNodeDevEnvironment(name: string, config: ResolvedConfig, options: DevEnvironmentSetup): DevEnvironment;
@@ -3959,12 +4013,6 @@ declare const rollupVersion: string;
 declare function normalizePath(id: string): string;
 declare function mergeConfig<D extends Record<string, any>, O extends Record<string, any>>(defaults: D extends Function ? never : D, overrides: O extends Function ? never : O, isRoot?: boolean): Record<string, any>;
 declare function mergeAlias(a?: AliasOptions, b?: AliasOptions): AliasOptions | undefined;
-/**
- * Creates a function that hides the complexities of a WeakMap with an initial value
- * to implement object metadata. Used by plugins to implement cross hooks per
- * environment metadata
- */
-declare function createWeakData<Key extends object | symbol, Data>(initial: (key: Key) => Data): (key: Key) => Data;
 
 interface SendOptions {
     etag?: string;
@@ -4004,4 +4052,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 DevEnvironmentOptions, type DevEnvironmentSetup, type ESBuildOptions, type ESBuildTransformResult, type Environment, EnvironmentModuleGraph, EnvironmentModuleNode, type ExperimentalOptions, type ExportsData, FSWatcher, type FetchModuleOptions, type FileSystemServeOptions, type FilterPattern, type HTMLOptions, type HmrContext, type HmrOptions, type HookHandler, type HotChannel, type HotChannelClient, type HotUpdateContext, type HtmlTagDescriptor, HttpProxy, 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, type 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, 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, createLogger, createNodeDevEnvironment, createServer, createServerModuleRunner, createWeakData, 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 DevEnvironmentOptions, type DevEnvironmentSetup, type ESBuildOptions, type ESBuildTransformResult, type Environment, EnvironmentModuleGraph, EnvironmentModuleNode, type ExperimentalOptions, type ExportsData, FSWatcher, type FetchModuleOptions, type FileSystemServeOptions, type FilterPattern, type HTMLOptions, type HmrContext, type HmrOptions, type HookHandler, type HotChannel, type HotChannelClient, type HotUpdateContext, type HtmlTagDescriptor, HttpProxy, 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, 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, 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 };

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-DVlS5vGL.js';
-export { B as BuildEnvironment, D as DevEnvironment, S as ServerHMRConnector, b as build, h as buildErrorMessage, e as createBuilder, w as createFilter, A as createLogger, j as createNodeDevEnvironment, c as createServer, m as createServerModuleRunner, x as createWeakData, d as defineConfig, k as fetchModule, f as formatPostcssSourceMap, F as isFileLoadingAllowed, E as isFileServingAllowed, l as loadConfigFromFile, G as loadEnv, v as mergeAlias, u as mergeConfig, n as moduleRunnerTransform, q as normalizePath, o as optimizeDeps, g 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-DVlS5vGL.js';
+import { i as isInNodeModules, a as arraify } from './chunks/dep-DXWVQosX.js';
+export { B as BuildEnvironment, D as DevEnvironment, S as ServerHMRConnector, 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 createServerModuleRunner, 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-DXWVQosX.js';
 export { VERSION as version } from './constants.js';
 export { version as esbuildVersion } from 'esbuild';
 import 'node:fs';

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

@@ -217,14 +217,20 @@ interface ModuleCache {
     evaluated?: boolean;
     map?: DecodedMap;
     meta?: ResolvedResult;
-    timestamp?: number;
     /**
      * Module ids that imports this module
      */
     importers?: Set<string>;
     imports?: Set<string>;
 }
-type FetchResult = ExternalFetchResult | ViteFetchResult;
+type FetchResult = CachedFetchResult | ExternalFetchResult | ViteFetchResult;
+interface CachedFetchResult {
+    /**
+     * If module cached in the runner, we can just confirm
+     * it wasn't invalidated on the server side.
+     */
+    cache: true;
+}
 interface ExternalFetchResult {
     /**
      * The path to the externalized module starting with file://,
@@ -247,16 +253,21 @@ interface ViteFetchResult {
     /**
      * File path of the module on disk.
      * This will be resolved as import.meta.url/filename
+     * Will be equal to `null` for virtual modules
      */
     file: string | null;
+    /**
+     * Invalidate module on the client side.
+     */
+    invalidate: boolean;
 }
 type ResolvedResult = (ExternalFetchResult | ViteFetchResult) & {
     id: string;
 };
-/**
- * @experimental
- */
-type FetchFunction = (id: string, importer?: string) => Promise<FetchResult>;
+type FetchFunction = (id: string, importer?: string, options?: FetchFunctionOptions) => Promise<FetchResult>;
+interface FetchFunctionOptions {
+    cached?: boolean;
+}
 interface ModuleRunnerHmr {
     /**
      * Configure how HMR communicates between the client and the server.
@@ -332,4 +343,4 @@ declare class ESModulesEvaluator implements ModuleEvaluator {
     runExternalModule(filepath: string): Promise<any>;
 }
 
-export { ESModulesEvaluator, type FetchFunction, 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 SSRImportBaseMetadata as SSRImportMetadata, ssrDynamicImportKey, ssrExportAllKey, ssrImportKey, ssrImportMetaKey, ssrModuleExportsKey };
+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 SSRImportBaseMetadata as SSRImportMetadata, ssrDynamicImportKey, ssrExportAllKey, ssrImportKey, ssrImportMetaKey, ssrModuleExportsKey };

package/dist/node/module-runner.js

@@ -51,24 +51,22 @@ function normalizeString(path, allowAboveRoot) {
       char = "/";
     }
     if (char === "/") {
-      if (!(lastSlash === index - 1 || dots === 1))
-        if (dots === 2) {
-          if (res.length < 2 || lastSegmentLength !== 2 || res[res.length - 1] !== "." || res[res.length - 2] !== ".") {
-            if (res.length > 2) {
-              const lastSlashIndex = res.lastIndexOf("/");
-              lastSlashIndex === -1 ? (res = "", lastSegmentLength = 0) : (res = res.slice(0, lastSlashIndex), lastSegmentLength = res.length - 1 - res.lastIndexOf("/")), lastSlash = index, dots = 0;
-              continue;
-            } else if (res.length > 0) {
-              res = "", lastSegmentLength = 0, lastSlash = index, dots = 0;
-              continue;
-            }
+      if (!(lastSlash === index - 1 || dots === 1)) if (dots === 2) {
+        if (res.length < 2 || lastSegmentLength !== 2 || res[res.length - 1] !== "." || res[res.length - 2] !== ".") {
+          if (res.length > 2) {
+            const lastSlashIndex = res.lastIndexOf("/");
+            lastSlashIndex === -1 ? (res = "", lastSegmentLength = 0) : (res = res.slice(0, lastSlashIndex), lastSegmentLength = res.length - 1 - res.lastIndexOf("/")), lastSlash = index, dots = 0;
+            continue;
+          } else if (res.length > 0) {
+            res = "", lastSegmentLength = 0, lastSlash = index, dots = 0;
+            continue;
           }
-          allowAboveRoot && (res += res.length > 0 ? "/.." : "..", lastSegmentLength = 2);
-        } else
-          res.length > 0 ? res += `/${path.slice(lastSlash + 1, index)}` : res = path.slice(lastSlash + 1, index), lastSegmentLength = index - lastSlash - 1;
+        }
+        allowAboveRoot && (res += res.length > 0 ? "/.." : "..", lastSegmentLength = 2);
+      } else
+        res.length > 0 ? res += `/${path.slice(lastSlash + 1, index)}` : res = path.slice(lastSlash + 1, index), lastSegmentLength = index - lastSlash - 1;
       lastSlash = index, dots = 0;
-    } else
-      char === "." && dots !== -1 ? ++dots : dots = -1;
+    } else char === "." && dots !== -1 ? ++dots : dots = -1;
   }
   return res;
 }
@@ -77,15 +75,7 @@ const isAbsolute = function(p) {
 }, dirname = function(p) {
   const segments = normalizeWindowsPath(p).replace(/\/$/, "").split("/").slice(0, -1);
   return segments.length === 1 && _DRIVE_LETTER_RE.test(segments[0]) && (segments[0] += "/"), segments.join("/") || (isAbsolute(p) ? "/" : ".");
-}, decodeBase64 = typeof atob < "u" ? atob : (str) => Buffer.from(str, "base64").toString("utf-8"), CHAR_FORWARD_SLASH = 47, CHAR_BACKWARD_SLASH = 92, percentRegEx = /%/g, backslashRegEx = /\\/g, newlineRegEx = /\n/g, carriageReturnRegEx = /\r/g, tabRegEx = /\t/g, questionRegex = /\?/g, hashRegex = /#/g, timestampRegex = /[?&]t=(\d{13})(&?)/;
-function parseUrl(url) {
-  const idQuery = url.split("?")[1];
-  let timestamp = 0;
-  return {
-    query: idQuery ? ("?" + idQuery).replace(timestampRegex, (substring, tsString, nextItem) => (timestamp = Number(tsString), substring[0] === "?" && nextItem === "&" ? "?" : "")) : "",
-    timestamp
-  };
-}
+}, decodeBase64 = typeof atob < "u" ? atob : (str) => Buffer.from(str, "base64").toString("utf-8"), CHAR_FORWARD_SLASH = 47, CHAR_BACKWARD_SLASH = 92, percentRegEx = /%/g, backslashRegEx = /\\/g, newlineRegEx = /\n/g, carriageReturnRegEx = /\r/g, tabRegEx = /\t/g, questionRegex = /\?/g, hashRegex = /#/g;
 function encodePathChars(filepath) {
   return filepath.indexOf("%") !== -1 && (filepath = filepath.replace(percentRegEx, "%25")), !isWindows && filepath.indexOf("\\") !== -1 && (filepath = filepath.replace(backslashRegEx, "%5C")), filepath.indexOf(`
 `) !== -1 && (filepath = filepath.replace(newlineRegEx, "%0A")), filepath.indexOf("\r") !== -1 && (filepath = filepath.replace(carriageReturnRegEx, "%0D")), filepath.indexOf("	") !== -1 && (filepath = filepath.replace(tabRegEx, "%09")), filepath;
@@ -503,11 +493,11 @@ class HMRClient {
   }
 }
 function analyzeImportedModDifference(mod, rawId, moduleType, metadata) {
-  if (!metadata?.isDynamicImport && moduleType !== "module" && metadata?.importedNames?.length) {
+  if (!metadata?.isDynamicImport && metadata?.importedNames?.length) {
     const missingBindings = metadata.importedNames.filter((s) => !(s in mod));
     if (missingBindings.length) {
       const lastBinding = missingBindings[missingBindings.length - 1];
-      throw new SyntaxError(`[vite] Named export '${lastBinding}' not found. The requested module '${rawId}' is a CommonJS module, which may not support all module.exports as named exports.
+      throw moduleType === "module" ? new SyntaxError(`[vite] The requested module '${rawId}' does not provide an export named '${lastBinding}'`) : new SyntaxError(`[vite] Named export '${lastBinding}' not found. The requested module '${rawId}' is a CommonJS module, which may not support all module.exports as named exports.
 CommonJS modules can always be imported via the default export, for example using:
 
 import pkg from '${rawId}';
@@ -516,15 +506,6 @@ const {${missingBindings.join(", ")}} = pkg;
     }
   }
 }
-function proxyGuardOnlyEsm(mod, rawId, metadata) {
-  return metadata?.importedNames?.length ? new Proxy(mod, {
-    get(mod2, prop) {
-      if (prop !== "then" && !(prop in mod2))
-        throw new SyntaxError(`[vite] The requested module '${rawId}' does not provide an export named '${prop.toString()}'`);
-      return mod2[prop];
-    }
-  }) : mod;
-}
 const ssrModuleExportsKey = "__vite_ssr_exports__", ssrImportKey = "__vite_ssr_import__", ssrDynamicImportKey = "__vite_ssr_dynamic_import__", ssrExportAllKey = "__vite_ssr_exportAll__", ssrImportMetaKey = "__vite_ssr_import_meta__", noop = () => {
 }, silentConsole = {
   debug: noop,
@@ -765,8 +746,7 @@ function CallSiteToString() {
     typeName === "[object Object]" && (typeName = "null");
     const methodName = this.getMethodName();
     functionName ? (typeName && functionName.indexOf(typeName) !== 0 && (line += `${typeName}.`), line += functionName, methodName && functionName.indexOf(`.${methodName}`) !== functionName.length - methodName.length - 1 && (line += ` [as ${methodName}]`)) : line += `${typeName}.${methodName || "<anonymous>"}`;
-  } else
-    isConstructor ? line += `new ${functionName || "<anonymous>"}` : functionName ? line += functionName : (line += fileLocation, addSuffix = !1);
+  } else isConstructor ? line += `new ${functionName || "<anonymous>"}` : functionName ? line += functionName : (line += fileLocation, addSuffix = !1);
   return addSuffix && (line += ` (${fileLocation})`), line;
 }
 function cloneCallSite(frame) {
@@ -852,10 +832,7 @@ class ModuleRunner {
   resetSourceMapSupport;
   destroyed = !1;
   constructor(options, evaluator, debug) {
-    this.options = options, this.evaluator = evaluator, this.debug = debug, this.moduleCache = options.moduleCache ?? new ModuleCacheMap(options.root), this.transport = options.transport, typeof options.hmr == "object" && (this.hmrClient = new HMRClient(options.hmr.logger === !1 ? silentConsole : options.hmr.logger || hmrLogger, options.hmr.connection, ({ acceptedPath, explicitImportRequired, timestamp }) => {
-      const [acceptedPathWithoutQuery, query] = acceptedPath.split("?"), url = acceptedPathWithoutQuery + `?${explicitImportRequired ? "import&" : ""}t=${timestamp}${query ? `&${query}` : ""}`;
-      return this.import(url);
-    }), options.hmr.connection.onUpdate(createHMRHandler(this))), options.sourcemapInterceptor !== !1 && (this.resetSourceMapSupport = enableSourceMapSupport(this));
+    this.options = options, this.evaluator = evaluator, this.debug = debug, this.moduleCache = options.moduleCache ?? new ModuleCacheMap(options.root), this.transport = options.transport, typeof options.hmr == "object" && (this.hmrClient = new HMRClient(options.hmr.logger === !1 ? silentConsole : options.hmr.logger || hmrLogger, options.hmr.connection, ({ acceptedPath }) => this.import(acceptedPath)), options.hmr.connection.onUpdate(createHMRHandler(this))), options.sourcemapInterceptor !== !1 && (this.resetSourceMapSupport = enableSourceMapSupport(this));
   }
   /**
    * URL to execute. Accepts file path, server path or id relative to the root.
@@ -898,7 +875,7 @@ class ModuleRunner {
     if (!("externalize" in fetchResult))
       return exports;
     const { id, type } = fetchResult;
-    return type !== "module" && type !== "commonjs" ? exports : (analyzeImportedModDifference(exports, id, type, metadata), proxyGuardOnlyEsm(exports, id, metadata));
+    return type !== "module" && type !== "commonjs" || analyzeImportedModDifference(exports, id, type, metadata), exports;
   }
   async cachedRequest(id, mod, callstack = [], metadata) {
     const meta = mod.meta, moduleId = meta.id, { imports, importers } = mod, importee = callstack[callstack.length - 1];
@@ -924,15 +901,23 @@ ${getStack()}`);
   async cachedModule(url, importer) {
     if (this.destroyed)
       throw new Error("Vite module runner has been destroyed.");
+    this.debug?.("[module runner] fetching", url);
     const normalized = this.urlToIdMap.get(url);
-    if (normalized) {
-      const mod2 = this.moduleCache.getByModuleId(normalized);
-      if (mod2.meta)
-        return mod2;
+    let cachedModule = normalized && this.moduleCache.getByModuleId(normalized);
+    cachedModule || (cachedModule = this.moduleCache.getByModuleId(url));
+    const isCached = !!(typeof cachedModule == "object" && cachedModule.meta), fetchedModule = (
+      // fast return for established externalized pattern
+      url.startsWith("data:") ? { externalize: url, type: "builtin" } : await this.transport.fetchModule(url, importer, {
+        cached: isCached
+      })
+    );
+    if ("cache" in fetchedModule) {
+      if (!cachedModule || !cachedModule.meta)
+        throw new Error(`Module "${url}" was mistakenly invalidated during fetch phase.`);
+      return cachedModule;
     }
-    this.debug?.("[module runner] fetching", url);
-    const fetchedModule = url.startsWith("data:") ? { externalize: url, type: "builtin" } : await this.transport.fetchModule(url, importer), { query, timestamp } = parseUrl(url), file = "file" in fetchedModule ? fetchedModule.file : void 0, fileId = file ? `${file}${query}` : url, moduleId = this.moduleCache.normalize(fileId), mod = this.moduleCache.getByModuleId(moduleId);
-    if (mod.timestamp != null && timestamp > 0 && mod.timestamp < timestamp && this.moduleCache.invalidateModule(mod), fetchedModule.id = moduleId, mod.meta = fetchedModule, mod.timestamp = timestamp, file) {
+    const idQuery = url.split("?")[1], query = idQuery ? `?${idQuery}` : "", file = "file" in fetchedModule ? fetchedModule.file : void 0, fileId = file ? `${file}${query}` : url, moduleId = this.moduleCache.normalize(fileId), mod = this.moduleCache.getByModuleId(moduleId);
+    if ("invalidate" in fetchedModule && fetchedModule.invalidate && this.moduleCache.invalidateModule(mod), fetchedModule.id = moduleId, mod.meta = fetchedModule, file) {
       const fileModules = this.fileToIdMap.get(file) || [];
       fileModules.push(moduleId), this.fileToIdMap.set(file, fileModules);
     }

package/dist/node-cjs/publicUtils.cjs

@@ -1127,11 +1127,11 @@ function requireNode () {
 		}
 
 		/**
-		 * Invokes `util.format()` with the specified arguments and writes to stderr.
+		 * Invokes `util.formatWithOptions()` with the specified arguments and writes to stderr.
 		 */
 
 		function log(...args) {
-			return process.stderr.write(util.format(...args) + '\n');
+			return process.stderr.write(util.formatWithOptions(exports.inspectOpts, ...args) + '\n');
 		}
 
 		/**
@@ -3591,22 +3591,6 @@ function normalizeSingleAlias({ find, replacement, customResolver, }) {
     }
     return alias;
 }
-/**
- * Creates a function that hides the complexities of a WeakMap with an initial value
- * to implement object metadata. Used by plugins to implement cross hooks per
- * environment metadata
- */
-function createWeakData(initial) {
-    const cache = new WeakMap();
-    return function (key) {
-        let data = cache.get(key);
-        if (!data) {
-            data = initial(key);
-            cache.set(key, data);
-        }
-        return data;
-    };
-}
 
 // This file will be built for both ESM and CJS. Avoid relying on other modules as possible.
 // copy from constants.ts
@@ -6255,7 +6239,6 @@ function resolveEnvPrefix({ envPrefix = 'VITE_', }) {
 exports.esbuildVersion = esbuild.version;
 exports.createFilter = createFilter;
 exports.createLogger = createLogger;
-exports.createWeakData = createWeakData;
 exports.isCSSRequest = isCSSRequest;
 exports.isFileLoadingAllowed = isFileLoadingAllowed;
 exports.isFileServingAllowed = isFileServingAllowed;