vite 6.0.0-alpha.20 → 6.0.0-alpha.22

package/dist/node/chunks/{dep-CpuHsFvF.js → dep-1C5gbBiU.js}

@@ -17435,8 +17435,7 @@ function mergeConfigRecursively(defaults, overrides, rootPath) {
     } else if (key === "assetsInclude" && rootPath === "") {
       merged[key] = [].concat(existing, value);
       continue;
-    } else if (key === "noExternal" && // TODO: environments
-    rootPath === "ssr" && (existing === true || value === true)) {
+    } else if (key === "noExternal" && (rootPath === "ssr" || rootPath === "resolve") && (existing === true || value === true)) {
       merged[key] = true;
       continue;
     } else if (key === "plugins" && rootPath === "worker") {
@@ -18012,6 +18011,7 @@ function buildReporterPlugin(config) {
   return {
     name: "vite:reporter",
     sharedDuringBuild: true,
+    perEnvironmentStartEndDuringDev: true,
     transform(_, id) {
       modulesReporter(this).register(id);
     },
@@ -20319,6 +20319,7 @@ function assetPlugin(config) {
   registerCustomMime();
   return {
     name: "vite:asset",
+    perEnvironmentStartEndDuringDev: true,
     buildStart() {
       assetCache.set(this.environment, /* @__PURE__ */ new Map());
       generatedAssetsMap.set(this.environment, /* @__PURE__ */ new Map());
@@ -20536,6 +20537,7 @@ function manifestPlugin() {
   });
   return {
     name: "vite:manifest",
+    perEnvironmentStartEndDuringDev: true,
     applyToEnvironment(environment) {
       return !!environment.config.build.manifest;
     },
@@ -22840,7 +22842,12 @@ const util = require$$0$5;
 const braces$1 = braces_1;
 const picomatch$2 = picomatch$3;
 const utils$b = utils$k;
-const isEmptyString = val => val === '' || val === './';
+
+const isEmptyString = v => v === '' || v === './';
+const hasBraces = v => {
+  const index = v.indexOf('{');
+  return index > -1 && v.indexOf('}', index) > -1;
+};
 
 /**
  * Returns an array of strings that match one or more glob patterns.
@@ -23281,7 +23288,7 @@ micromatch$1.parse = (patterns, options) => {
 
 micromatch$1.braces = (pattern, options) => {
   if (typeof pattern !== 'string') throw new TypeError('Expected a string');
-  if ((options && options.nobrace === true) || !/\{.*\}/.test(pattern)) {
+  if ((options && options.nobrace === true) || !hasBraces(pattern)) {
     return [pattern];
   }
   return braces$1(pattern, options);
@@ -23300,6 +23307,8 @@ micromatch$1.braceExpand = (pattern, options) => {
  * Expose micromatch
  */
 
+// exposed for tests
+micromatch$1.hasBraces = hasBraces;
 var micromatch_1 = micromatch$1;
 
 var micromatch$2 = /*@__PURE__*/getDefaultExportFromCjs(micromatch_1);
@@ -36883,7 +36892,7 @@ class ScanEnvironment extends BaseEnvironment {
       this,
       this.plugins
     );
-    await this._pluginContainer.buildStart({});
+    await this._pluginContainer.buildStart();
   }
 }
 function devToScanEnvironment(environment) {
@@ -57718,6 +57727,14 @@ class ModuleNode {
   _get(prop) {
     return this._clientModule?.[prop] ?? this._ssrModule?.[prop];
   }
+  _set(prop, value) {
+    if (this._clientModule) {
+      this._clientModule[prop] = value;
+    }
+    if (this._ssrModule) {
+      this._ssrModule[prop] = value;
+    }
+  }
   _wrapModuleSet(prop, module) {
     if (!module) {
       return /* @__PURE__ */ new Set();
@@ -57749,12 +57766,21 @@ class ModuleNode {
   get url() {
     return this._get("url");
   }
+  set url(value) {
+    this._set("url", value);
+  }
   get id() {
     return this._get("id");
   }
+  set id(value) {
+    this._set("id", value);
+  }
   get file() {
     return this._get("file");
   }
+  set file(value) {
+    this._set("file", value);
+  }
   get type() {
     return this._get("type");
   }
@@ -57917,22 +57943,24 @@ class ModuleGraph {
   }
   getModulesByFile(file) {
     const clientModules = this._client.getModulesByFile(file);
+    const ssrModules = this._ssr.getModulesByFile(file);
+    if (!clientModules && !ssrModules) {
+      return void 0;
+    }
+    const result = /* @__PURE__ */ new Set();
     if (clientModules) {
-      return new Set(
-        [...clientModules].map(
-          (mod) => this.getBackwardCompatibleBrowserModuleNode(mod)
-        )
-      );
+      for (const mod of clientModules) {
+        result.add(this.getBackwardCompatibleBrowserModuleNode(mod));
+      }
     }
-    const ssrModules = this._ssr.getModulesByFile(file);
     if (ssrModules) {
-      return new Set(
-        [...ssrModules].map(
-          (mod) => this.getBackwardCompatibleServerModuleNode(mod)
-        )
-      );
+      for (const mod of ssrModules) {
+        if (!this._client.getModuleById(mod.id)) {
+          result.add(this.getBackwardCompatibleBrowserModuleNode(mod));
+        }
+      }
     }
-    return void 0;
+    return result;
   }
   onFileChange(file) {
     this._client.onFileChange(file);
@@ -57981,7 +58009,8 @@ class ModuleGraph {
     this._client.invalidateAll();
     this._ssr.invalidateAll();
   }
-  /* TODO: I don't know if we need to implement this method (or how to do it yet)
+  /* TODO: It seems there isn't usage of this method in the ecosystem
+     Waiting to check if we really need this for backwards compatibility
   async updateModuleInfo(
     module: ModuleNode,
     importedModules: Set<string | ModuleNode>,
@@ -57992,22 +58021,7 @@ class ModuleGraph {
     ssr?: boolean,
     staticImportedUrls?: Set<string>, // internal
   ): Promise<Set<ModuleNode> | undefined> {
-    const modules = await this._getModuleGraph(
-      module.environment,
-    ).updateModuleInfo(
-      module,
-      importedModules, // ?
-      importedBindings,
-      acceptedModules, // ?
-      acceptedExports,
-      isSelfAccepting,
-      staticImportedUrls,
-    )
-    return modules
-      ? new Set(
-          [...modules].map((mod) => this.getBackwardCompatibleModuleNode(mod)!),
-        )
-      : undefined
+    // Not implemented
   }
   */
   async ensureEntryFromUrl(rawUrl, ssr, setIsSelfAccepting = true) {
@@ -58090,9 +58104,9 @@ function createBackwardCompatibleModuleSet(moduleGraph, prop, module) {
         );
       });
     }
-    // TODO: should we implement all the set methods?
-    // missing: add, clear, delete, difference, intersection, isDisjointFrom,
-    // isSubsetOf, isSupersetOf, symmetricDifference, union
+    // There are several methods missing. We can implement them if downstream
+    // projects are relying on them: add, clear, delete, difference, intersection,
+    // sDisjointFrom, isSubsetOf, isSupersetOf, symmetricDifference, union
   };
 }
 function createBackwardCompatibleModuleMap(moduleGraph, prop, getModuleMap) {
@@ -58111,6 +58125,16 @@ function createBackwardCompatibleModuleMap(moduleGraph, prop, getModuleMap) {
         ssrModule
       );
     },
+    set(key, mod) {
+      const clientModule = mod._clientModule;
+      if (clientModule) {
+        moduleGraph._client[prop].set(key, clientModule);
+      }
+      const ssrModule = mod._ssrModule;
+      if (ssrModule) {
+        moduleGraph._ssr[prop].set(key, ssrModule);
+      }
+    },
     keys() {
       return getModuleMap().keys();
     },
@@ -58702,7 +58726,7 @@ async function _createServer(inlineConfig = {}, options) {
     if (serverInited) return;
     if (initingServer) return initingServer;
     initingServer = async function() {
-      await server.environments.client.pluginContainer.buildStart({});
+      await environments.client.pluginContainer.buildStart();
       await Promise.all(
         Object.values(server.environments).map(
           (environment) => environment.depsOptimizer?.init()
@@ -58788,6 +58812,7 @@ function resolvedAllowDir(root, dir) {
 function resolveServerOptions(root, raw, logger) {
   const server = {
     preTransformRequests: true,
+    perEnvironmentBuildStartEnd: false,
     ...raw,
     sourcemapIgnoreList: raw?.sourcemapIgnoreList === false ? () => false : raw?.sourcemapIgnoreList || isInNodeModules$1,
     middlewareMode: raw?.middlewareMode || false
@@ -61558,7 +61583,6 @@ async function resolvePlugins(config, prePlugins, normalPlugins, postPlugins) {
       clientInjectionsPlugin(config),
       cssAnalysisPlugin(config),
       importAnalysisPlugin(config)
-      // TODO: loadFallbackPlugin(config),
     ]
   ].filter(Boolean);
 }
@@ -61675,6 +61699,7 @@ class EnvironmentPluginContainer {
   moduleGraph;
   watchFiles = /* @__PURE__ */ new Set();
   minimalContext;
+  _started = false;
   _closed = false;
   _updateModuleLoadAddedImports(id, addedImports) {
     const module = this.moduleGraph?.getModuleById(id);
@@ -61720,11 +61745,12 @@ class EnvironmentPluginContainer {
     return this._pluginContextMap.get(plugin);
   }
   // parallel, ignores returns
-  async hookParallel(hookName, context, args) {
+  async hookParallel(hookName, context, args, condition) {
     const parallelPromises = [];
     for (const plugin of this.getSortedPlugins(hookName)) {
       const hook = plugin[hookName];
       if (!hook) continue;
+      if (condition && !condition(plugin)) continue;
       const handler = getHookHandler(hook);
       if (hook.sequential) {
         await Promise.all(parallelPromises);
@@ -61737,18 +61763,31 @@ class EnvironmentPluginContainer {
     await Promise.all(parallelPromises);
   }
   async buildStart(_options) {
-    await this.handleHookPromise(
+    if (this._started) {
+      await this._started;
+      return;
+    }
+    this._started = this.handleHookPromise(
       this.hookParallel(
         "buildStart",
         (plugin) => this._getPluginContext(plugin),
-        () => [this.options]
+        () => [this.options],
+        (plugin) => this.environment.name === "client" || plugin.perEnvironmentStartEndDuringDev === true
       )
     );
+    await this._started;
+    this._started = true;
   }
   async resolveId(rawId, importer = join$2(
     this.environment.config.root,
     "index.html"
   ), options) {
+    if (!this._started) {
+      this.buildStart();
+    }
+    if (this._started !== true) {
+      await this._started;
+    }
     const skip = options?.skip;
     const scan = !!options?.scan;
     const ssr = this.environment.config.consumer === "server";
@@ -61890,7 +61929,8 @@ class EnvironmentPluginContainer {
     await this.hookParallel(
       "buildEnd",
       (plugin) => this._getPluginContext(plugin),
-      () => []
+      () => [],
+      (plugin) => this.environment.name === "client" || plugin.perEnvironmentStartEndDuringDev !== true
     );
     await this.hookParallel(
       "closeBundle",
@@ -62234,11 +62274,19 @@ class PluginContainer {
   get options() {
     return this.environments.client.pluginContainer.options;
   }
+  // For backward compatibility, buildStart and watchChange are called only for the client environment
+  // buildStart is called per environment for a plugin with the perEnvironmentStartEndDuring dev flag
   async buildStart(_options) {
     this.environments.client.pluginContainer.buildStart(
       _options
     );
   }
+  async watchChange(id, change) {
+    this.environments.client.pluginContainer.watchChange(
+      id,
+      change
+    );
+  }
   async resolveId(rawId, importer, options) {
     return this._getPluginContainer(options).resolveId(rawId, importer, options);
   }
@@ -62248,8 +62296,6 @@ class PluginContainer {
   async transform(code, id, options) {
     return this._getPluginContainer(options).transform(code, id, options);
   }
-  async watchChange(_id, _change) {
-  }
   async close() {
   }
 }
@@ -63255,8 +63301,8 @@ function createCachedImport(imp) {
     return cached;
   };
 }
-const importPostcssImport = createCachedImport(() => import('./dep-BVDN2Cqw.js').then(function (n) { return n.i; }));
-const importPostcssModules = createCachedImport(() => import('./dep-D1nw2wDG.js').then(function (n) { return n.i; }));
+const importPostcssImport = createCachedImport(() => import('./dep-BzHfSPcV.js').then(function (n) { return n.i; }));
+const importPostcssModules = createCachedImport(() => import('./dep-DGaPvi2R.js').then(function (n) { return n.i; }));
 const importPostcss = createCachedImport(() => import('postcss'));
 const preprocessorWorkerControllerCache = /* @__PURE__ */ new WeakMap();
 let alwaysFakeWorkerWorkerControllerCache;
@@ -66508,7 +66554,6 @@ class EnvironmentModuleNode {
    * Resolved file system path + query
    */
   id = null;
-  // TODO: remove null
   file = null;
   type;
   info;
@@ -66864,7 +66909,6 @@ class DevEnvironment extends BaseEnvironment {
    */
   _pluginContainer;
   /**
-   * TODO: should this be public?
    * @internal
    */
   _closing = false;
@@ -67579,11 +67623,10 @@ async function resolveConfig(inlineConfig, command, defaultMode = "development",
     config.root ? path$n.resolve(config.root) : process.cwd()
   );
   checkBadCharactersInPath(resolvedRoot, logger);
-  const { entries, force, ...deprecatedClientOptimizeDepsConfig } = config.optimizeDeps ?? {};
   const configEnvironmentsClient = config.environments.client;
   configEnvironmentsClient.dev ??= {};
   configEnvironmentsClient.dev.optimizeDeps = mergeConfig(
-    deprecatedClientOptimizeDepsConfig,
+    config.optimizeDeps ?? {},
     configEnvironmentsClient.dev.optimizeDeps ?? {}
   );
   const deprecatedSsrOptimizeDepsConfig = config.ssr?.optimizeDeps ?? {};
@@ -67644,16 +67687,7 @@ async function resolveConfig(inlineConfig, command, defaultMode = "development",
     config.resolve,
     logger
   );
-  const resolvedConfigEnvironmentsClient = resolvedEnvironments.client;
-  const patchedOptimizeDeps = resolvedConfigEnvironmentsClient.dev?.optimizeDeps;
-  const backwardCompatibleOptimizeDeps = {
-    holdUntilCrawlEnd: true,
-    ...patchedOptimizeDeps,
-    esbuildOptions: {
-      preserveSymlinks: resolvedDefaultEnvironmentResolve.preserveSymlinks,
-      ...patchedOptimizeDeps.esbuildOptions
-    }
-  };
+  const backwardCompatibleOptimizeDeps = resolvedEnvironments.client.dev.optimizeDeps;
   const resolvedDevEnvironmentOptions = resolveDevEnvironmentOptions(
     config.dev,
     resolvedDefaultEnvironmentResolve.preserveSymlinks,
@@ -67917,6 +67951,9 @@ async function resolveConfig(inlineConfig, command, defaultMode = "development",
     resolved.ssr.optimizeDeps,
     "ssr."
   );
+  if (resolved.environments.ssr) {
+    resolved.environments.ssr.build.emitAssets = resolved.build.ssrEmitAssets || resolved.build.emitAssets;
+  }
   debug?.(`using resolved config: %O`, {
     ...resolved,
     plugins: resolved.plugins.map((p) => p.name),

package/dist/node/chunks/{dep-BVDN2Cqw.js → dep-BzHfSPcV.js}

@@ -1,4 +1,4 @@
-import { J as getDefaultExportFromCjs } from './dep-CpuHsFvF.js';
+import { J as getDefaultExportFromCjs } from './dep-1C5gbBiU.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-D1nw2wDG.js → dep-DGaPvi2R.js}

@@ -1,4 +1,4 @@
-import { K as commonjsGlobal, J as getDefaultExportFromCjs } from './dep-CpuHsFvF.js';
+import { K as commonjsGlobal, J as getDefaultExportFromCjs } from './dep-1C5gbBiU.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-CpuHsFvF.js';
+import { I as colors, A as createLogger, r as resolveConfig } from './chunks/dep-1C5gbBiU.js';
 import { VERSION } from './constants.js';
 import 'node:fs/promises';
 import 'node:url';
@@ -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-CpuHsFvF.js').then(function (n) { return n.M; });
+  const { createServer } = await import('./chunks/dep-1C5gbBiU.js').then(function (n) { return n.M; });
   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-CpuHsFvF.js').then(function (n) { return n.N; });
+    const build = await import('./chunks/dep-1C5gbBiU.js').then(function (n) { return n.N; });
     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-CpuHsFvF.js').then(function (n) { return n.L; });
+    const { optimizeDeps } = await import('./chunks/dep-1C5gbBiU.js').then(function (n) { return n.L; });
     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-CpuHsFvF.js').then(function (n) { return n.O; });
+    const { preview } = await import('./chunks/dep-1C5gbBiU.js').then(function (n) { return n.O; });
     try {
       const server = await preview({
         root,

package/dist/node/index.d.ts

@@ -1094,11 +1094,15 @@ declare class ModuleNode {
     _ssrModule: EnvironmentModuleNode | undefined;
     constructor(moduleGraph: ModuleGraph, clientModule?: EnvironmentModuleNode, ssrModule?: EnvironmentModuleNode);
     _get<T extends keyof EnvironmentModuleNode>(prop: T): EnvironmentModuleNode[T];
+    _set<T extends keyof EnvironmentModuleNode>(prop: T, value: EnvironmentModuleNode[T]): void;
     _wrapModuleSet(prop: ModuleSetNames, module: EnvironmentModuleNode | undefined): Set<ModuleNode>;
     _getModuleSetUnion(prop: 'importedModules' | 'importers'): Set<ModuleNode>;
     get url(): string;
+    set url(value: string);
     get id(): string | null;
+    set id(value: string | null);
     get file(): string | null;
+    set file(value: string | null);
     get type(): 'js' | 'css';
     get info(): ModuleInfo | undefined;
     get meta(): Record<string, any> | undefined;
@@ -2090,6 +2094,7 @@ declare class EnvironmentPluginContainer {
     moduleGraph: EnvironmentModuleGraph | undefined;
     watchFiles: Set<string>;
     minimalContext: MinimalPluginContext;
+    private _started;
     private _closed;
     private _updateModuleLoadAddedImports;
     private _getAddedImports;
@@ -2126,6 +2131,9 @@ declare class PluginContainer {
     private _getPluginContainer;
     get options(): InputOptions;
     buildStart(_options?: InputOptions): Promise<void>;
+    watchChange(id: string, change: {
+        event: 'create' | 'update' | 'delete';
+    }): Promise<void>;
     resolveId(rawId: string, importer?: string, options?: {
         attributes?: Record<string, string>;
         custom?: CustomPluginOptions;
@@ -2146,9 +2154,6 @@ declare class PluginContainer {
             mappings: '';
         } | null;
     }>;
-    watchChange(_id: string, _change: {
-        event: 'create' | 'update' | 'delete';
-    }): Promise<void>;
     close(): Promise<void>;
 }
 
@@ -2786,6 +2791,13 @@ interface ServerOptions extends CommonServerOptions {
      * sourcemap path and returns whether to ignore the source path.
      */
     sourcemapIgnoreList?: false | ((sourcePath: string, sourcemapPath: string) => boolean);
+    /**
+     * Backward compatibility. The buildStart and buildEnd hooks were called only once for all
+     * environments. This option enables per-environment buildStart and buildEnd hooks.
+     * @default false
+     * @experimental
+     */
+    perEnvironmentBuildStartEnd?: boolean;
     /**
      * Run HMR tasks, by default the HMR propagation is done in parallel for all environments
      * @experimental
@@ -2902,7 +2914,6 @@ interface ViteDevServer {
     transformIndexHtml(url: string, html: string, originalUrl?: string): Promise<string>;
     /**
      * Transform module code into SSR format.
-     * TODO: expose this to any environment?
      */
     ssrTransform(code: string, inMap: SourceMap | {
         mappings: '';
@@ -3320,6 +3331,14 @@ interface Plugin<A = any> extends rollup.Plugin<A> {
      * @experimental
      */
     sharedDuringBuild?: boolean;
+    /**
+     * Opt-in this plugin into per-environment buildStart and buildEnd during dev.
+     * For backward-compatibility, the buildStart hook is called only once during
+     * dev, for the client environment. Plugins can opt-in to be called
+     * per-environment, aligning with the build hook behavior.
+     * @experimental
+     */
+    perEnvironmentStartEndDuringDev?: boolean;
     /**
      * Enforce plugin invocation tier similar to webpack loaders. Hooks ordering
      * is still subject to the `order` property in the hook object.
@@ -3450,13 +3469,7 @@ interface SSROptions {
     /**
      * Define the target for the ssr build. The browser field in package.json
      * is ignored for node but used if webworker is the target
-     *
-     * if (ssr.target === 'webworker') {
-     *   build.rollupOptions.entryFileNames = '[name].js'
-     *   build.rollupOptions.inlineDynamicImports = (typeof input === 'string' || Object.keys(input).length === 1))
-     *   webCompatible = true
-     * }
-     *
+     * This option may be replaced by the experimental `environmentOptions.webCompatible`
      * @default 'node'
      */
     target?: SSRTarget;

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-CpuHsFvF.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-CpuHsFvF.js';
+import { i as isInNodeModules, a as arraify } from './chunks/dep-1C5gbBiU.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-1C5gbBiU.js';
 export { VERSION as version } from './constants.js';
 export { version as esbuildVersion } from 'esbuild';
 import 'node:fs';

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

@@ -123,6 +123,7 @@ declare class ModuleRunner {
     private readonly transport;
     private readonly resetSourceMapSupport?;
     private readonly root;
+    private readonly moduleInfoCache;
     private destroyed;
     constructor(options: ModuleRunnerOptions, evaluator: ModuleEvaluator, debug?: ModuleRunnerDebugger | undefined);
     /**
@@ -148,6 +149,7 @@ declare class ModuleRunner {
     private isCircularImport;
     private cachedRequest;
     private cachedModule;
+    private getModuleInformation;
     protected directRequest(id: string, mod: ModuleCache, _callstack: string[]): Promise<any>;
 }
 

package/dist/node/module-runner.js

@@ -875,6 +875,7 @@ class ModuleRunner {
   transport;
   resetSourceMapSupport;
   root;
+  moduleInfoCache = /* @__PURE__ */ new Map();
   destroyed = !1;
   /**
    * URL to execute. Accepts file path, server path or id relative to the root.
@@ -959,6 +960,13 @@ ${getStack()}`
     }
   }
   async cachedModule(url, importer) {
+    const cacheKey = `${url}~~${importer}`;
+    let cached = this.moduleInfoCache.get(cacheKey);
+    return cached || (cached = this.getModuleInformation(url, importer).finally(() => {
+      this.moduleInfoCache.delete(cacheKey);
+    }), this.moduleInfoCache.set(cacheKey, cached)), cached;
+  }
+  async getModuleInformation(url, importer) {
     if (this.destroyed)
       throw new Error("Vite module runner has been destroyed.");
     this.debug?.("[module runner] fetching", url), url = normalizeAbsoluteUrl(url, this.root);

package/dist/node-cjs/publicUtils.cjs

@@ -3503,8 +3503,7 @@ function mergeConfigRecursively(defaults, overrides, rootPath) {
     } else if (key === "assetsInclude" && rootPath === "") {
       merged[key] = [].concat(existing, value);
       continue;
-    } else if (key === "noExternal" && // TODO: environments
-    rootPath === "ssr" && (existing === true || value === true)) {
+    } else if (key === "noExternal" && (rootPath === "ssr" || rootPath === "resolve") && (existing === true || value === true)) {
       merged[key] = true;
       continue;
     } else if (key === "plugins" && rootPath === "worker") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "6.0.0-alpha.20",
+  "version": "6.0.0-alpha.22",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",
@@ -81,7 +81,7 @@
   },
   "devDependencies": {
     "@ampproject/remapping": "^2.3.0",
-    "@babel/parser": "^7.25.3",
+    "@babel/parser": "^7.25.4",
     "@jridgewell/trace-mapping": "^0.3.25",
     "@polka/compression": "^1.0.0-next.25",
     "@rollup/plugin-alias": "^5.1.0",
@@ -112,7 +112,7 @@
     "launch-editor-middleware": "^2.8.1",
     "lightningcss": "^1.26.0",
     "magic-string": "^0.30.11",
-    "micromatch": "^4.0.7",
+    "micromatch": "^4.0.8",
     "mlly": "^1.7.1",
     "mrmime": "^2.0.0",
     "nanoid": "^5.0.7",
@@ -136,7 +136,7 @@
     "strip-ansi": "^7.1.0",
     "strip-literal": "^2.1.0",
     "tsconfck": "^3.1.1",
-    "tslib": "^2.6.3",
+    "tslib": "^2.7.0",
     "types": "link:./types",
     "ufo": "^1.5.4",
     "ws": "^8.18.0"