vite 6.0.0-alpha.22 → 6.0.0-alpha.23

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

@@ -7,8 +7,8 @@ import { promisify as promisify$4, format as format$2, inspect } from 'node:util
 import { performance as performance$1 } from 'node:perf_hooks';
 import { createRequire as createRequire$1, builtinModules } from 'node:module';
 import require$$0$3 from 'tty';
-import require$$0$4, { win32, posix, isAbsolute, resolve as resolve$3, relative as relative$1, basename as basename$1, extname, dirname as dirname$1, join as join$1, sep as sep$1, normalize as normalize$1 } from 'path';
 import esbuild, { transform as transform$1, formatMessages, build as build$3 } from 'esbuild';
+import require$$0$4, { win32, posix, isAbsolute, resolve as resolve$3, relative as relative$1, basename as basename$1, extname, dirname as dirname$1, join as join$1, sep as sep$1, normalize as normalize$1 } from 'path';
 import { CLIENT_ENTRY, OPTIMIZABLE_ENTRY_RE, wildcardHosts, loopbackHosts, FS_PREFIX, CLIENT_PUBLIC_PATH, ENV_PUBLIC_PATH, DEFAULT_ASSETS_INLINE_LIMIT, ENV_ENTRY, SPECIAL_QUERY_RE, DEP_VERSION_RE, DEFAULT_MAIN_FIELDS, DEFAULT_EXTENSIONS, KNOWN_ASSET_TYPES, JS_TYPES_RE, CSS_LANGS_RE, METADATA_FILENAME, ESBUILD_MODULES_TARGET, VITE_PACKAGE_DIR, CLIENT_DIR, DEFAULT_DEV_PORT, VERSION, ROLLUP_HOOKS, DEFAULT_PREVIEW_PORT, DEFAULT_ASSETS_RE, DEFAULT_CONFIG_FILES } from '../constants.js';
 import * as require$$0$2 from 'fs';
 import require$$0__default, { lstatSync, readdir as readdir$4, readdirSync, readlinkSync, realpathSync as realpathSync$1, existsSync, readFileSync, statSync as statSync$1 } from 'fs';
@@ -160,92 +160,6 @@ picocolors.exports.createColors = createColors;
 var picocolorsExports = picocolors.exports;
 var colors$1 = /*@__PURE__*/getDefaultExportFromCjs(picocolorsExports);
 
-function matches$1(pattern, importee) {
-    if (pattern instanceof RegExp) {
-        return pattern.test(importee);
-    }
-    if (importee.length < pattern.length) {
-        return false;
-    }
-    if (importee === pattern) {
-        return true;
-    }
-    // eslint-disable-next-line prefer-template
-    return importee.startsWith(pattern + '/');
-}
-function getEntries({ entries, customResolver }) {
-    if (!entries) {
-        return [];
-    }
-    const resolverFunctionFromOptions = resolveCustomResolver(customResolver);
-    if (Array.isArray(entries)) {
-        return entries.map((entry) => {
-            return {
-                find: entry.find,
-                replacement: entry.replacement,
-                resolverFunction: resolveCustomResolver(entry.customResolver) || resolverFunctionFromOptions
-            };
-        });
-    }
-    return Object.entries(entries).map(([key, value]) => {
-        return { find: key, replacement: value, resolverFunction: resolverFunctionFromOptions };
-    });
-}
-function getHookFunction(hook) {
-    if (typeof hook === 'function') {
-        return hook;
-    }
-    if (hook && 'handler' in hook && typeof hook.handler === 'function') {
-        return hook.handler;
-    }
-    return null;
-}
-function resolveCustomResolver(customResolver) {
-    if (typeof customResolver === 'function') {
-        return customResolver;
-    }
-    if (customResolver) {
-        return getHookFunction(customResolver.resolveId);
-    }
-    return null;
-}
-function alias$1(options = {}) {
-    const entries = getEntries(options);
-    if (entries.length === 0) {
-        return {
-            name: 'alias',
-            resolveId: () => null
-        };
-    }
-    return {
-        name: 'alias',
-        async buildStart(inputOptions) {
-            await Promise.all([...(Array.isArray(options.entries) ? options.entries : []), options].map(({ customResolver }) => { var _a; return customResolver && ((_a = getHookFunction(customResolver.buildStart)) === null || _a === void 0 ? void 0 : _a.call(this, inputOptions)); }));
-        },
-        resolveId(importee, importer, resolveOptions) {
-            // First match is supposed to be the correct one
-            const matchedEntry = entries.find((entry) => matches$1(entry.find, importee));
-            if (!matchedEntry) {
-                return null;
-            }
-            const updatedId = importee.replace(matchedEntry.find, matchedEntry.replacement);
-            if (matchedEntry.resolverFunction) {
-                return matchedEntry.resolverFunction.call(this, updatedId, importer, resolveOptions);
-            }
-            return this.resolve(updatedId, importer, Object.assign({ skipSelf: true }, resolveOptions)).then((resolved) => {
-                if (resolved)
-                    return resolved;
-                if (!require$$0$4.isAbsolute(updatedId)) {
-                    this.warn(`rewrote ${importee} to ${updatedId} but was not an abolute path and was not handled by other plugins. ` +
-                        `This will lead to duplicated modules for the same path. ` +
-                        `To avoid duplicating modules, you should resolve to an absolute path.`);
-                }
-                return { id: updatedId };
-            });
-        }
-    };
-}
-
 var utils$k = {};
 
 const path$m = require$$0$4;
@@ -33917,6 +33831,92 @@ var src$1 = rc;
 
 var postcssrc = /*@__PURE__*/getDefaultExportFromCjs(src$1);
 
+function matches$1(pattern, importee) {
+    if (pattern instanceof RegExp) {
+        return pattern.test(importee);
+    }
+    if (importee.length < pattern.length) {
+        return false;
+    }
+    if (importee === pattern) {
+        return true;
+    }
+    // eslint-disable-next-line prefer-template
+    return importee.startsWith(pattern + '/');
+}
+function getEntries({ entries, customResolver }) {
+    if (!entries) {
+        return [];
+    }
+    const resolverFunctionFromOptions = resolveCustomResolver(customResolver);
+    if (Array.isArray(entries)) {
+        return entries.map((entry) => {
+            return {
+                find: entry.find,
+                replacement: entry.replacement,
+                resolverFunction: resolveCustomResolver(entry.customResolver) || resolverFunctionFromOptions
+            };
+        });
+    }
+    return Object.entries(entries).map(([key, value]) => {
+        return { find: key, replacement: value, resolverFunction: resolverFunctionFromOptions };
+    });
+}
+function getHookFunction(hook) {
+    if (typeof hook === 'function') {
+        return hook;
+    }
+    if (hook && 'handler' in hook && typeof hook.handler === 'function') {
+        return hook.handler;
+    }
+    return null;
+}
+function resolveCustomResolver(customResolver) {
+    if (typeof customResolver === 'function') {
+        return customResolver;
+    }
+    if (customResolver) {
+        return getHookFunction(customResolver.resolveId);
+    }
+    return null;
+}
+function alias$1(options = {}) {
+    const entries = getEntries(options);
+    if (entries.length === 0) {
+        return {
+            name: 'alias',
+            resolveId: () => null
+        };
+    }
+    return {
+        name: 'alias',
+        async buildStart(inputOptions) {
+            await Promise.all([...(Array.isArray(options.entries) ? options.entries : []), options].map(({ customResolver }) => { var _a; return customResolver && ((_a = getHookFunction(customResolver.buildStart)) === null || _a === void 0 ? void 0 : _a.call(this, inputOptions)); }));
+        },
+        resolveId(importee, importer, resolveOptions) {
+            // First match is supposed to be the correct one
+            const matchedEntry = entries.find((entry) => matches$1(entry.find, importee));
+            if (!matchedEntry) {
+                return null;
+            }
+            const updatedId = importee.replace(matchedEntry.find, matchedEntry.replacement);
+            if (matchedEntry.resolverFunction) {
+                return matchedEntry.resolverFunction.call(this, updatedId, importer, resolveOptions);
+            }
+            return this.resolve(updatedId, importer, Object.assign({ skipSelf: true }, resolveOptions)).then((resolved) => {
+                if (resolved)
+                    return resolved;
+                if (!require$$0$4.isAbsolute(updatedId)) {
+                    this.warn(`rewrote ${importee} to ${updatedId} but was not an abolute path and was not handled by other plugins. ` +
+                        `This will lead to duplicated modules for the same path. ` +
+                        `To avoid duplicating modules, you should resolve to an absolute path.`);
+                }
+                return { id: updatedId };
+            });
+        }
+    };
+}
+
 function e(e,n,r){throw new Error(r?`No known conditions for "${n}" specifier in "${e}" package`:`Missing "${n}" specifier in "${e}" package`)}function n(n,i,o,f){let s,u,l=r(n,o),c=function(e){let n=new Set(["default",...e.conditions||[]]);return e.unsafe||n.add(e.require?"require":"import"),e.unsafe||n.add(e.browser?"browser":"node"),n}(f||{}),a=i[l];if(void 0===a){let e,n,r,t;for(t in i)n&&t.length<n.length||("/"===t[t.length-1]&&l.startsWith(t)?(u=l.substring(t.length),n=t):t.length>1&&(r=t.indexOf("*",1),~r&&(e=RegExp("^"+t.substring(0,r)+"(.*)"+t.substring(1+r)).exec(l),e&&e[1]&&(u=e[1],n=t))));a=i[n];}return a||e(n,l),s=t(a,c),s||e(n,l,1),u&&function(e,n){let r,t=0,i=e.length,o=/[*]/g,f=/[/]$/;for(;t<i;t++)e[t]=o.test(r=e[t])?r.replace(o,n):f.test(r)?r+n:r;}(s,u),s}function r(e,n,r){if(e===n||"."===n)return ".";let t=e+"/",i=t.length,o=n.slice(0,i)===t,f=o?n.slice(i):n;return "#"===f[0]?f:o||!r?"./"===f.slice(0,2)?f:"./"+f:f}function t(e,n,r){if(e){if("string"==typeof e)return r&&r.add(e),[e];let i,o;if(Array.isArray(e)){for(o=r||new Set,i=0;i<e.length;i++)t(e[i],n,o);if(!r&&o.size)return [...o]}else for(i in e)if(n.has(i))return t(e[i],n,r)}}function o(e,r,t){let i,o=e.exports;if(o){if("string"==typeof o)o={".":o};else for(i in o){"."!==i[0]&&(o={".":o});break}return n(e.name,o,r||".",t)}}function f(e,r,t){if(e.imports)return n(e.name,e.imports,r,t)}
 
 const HASH_RE = /#/g;
@@ -35659,17 +35659,20 @@ function esbuildDepPlugin(environment, qualified, external) {
   const allExternalTypes = extensions ? externalTypes.filter((type) => !extensions?.includes("." + type)) : externalTypes;
   const esmPackageCache = /* @__PURE__ */ new Map();
   const cjsPackageCache = /* @__PURE__ */ new Map();
-  const _resolve = createIdResolver(environment.getTopLevelConfig(), {
+  const _resolve = createBackCompatIdResolver(environment.getTopLevelConfig(), {
     asSrc: false,
     scan: true,
     packageCache: esmPackageCache
   });
-  const _resolveRequire = createIdResolver(environment.getTopLevelConfig(), {
-    asSrc: false,
-    isRequire: true,
-    scan: true,
-    packageCache: cjsPackageCache
-  });
+  const _resolveRequire = createBackCompatIdResolver(
+    environment.getTopLevelConfig(),
+    {
+      asSrc: false,
+      isRequire: true,
+      scan: true,
+      packageCache: cjsPackageCache
+    }
+  );
   const resolve = (id, importer, kind, resolveDir) => {
     let _importer;
     {
@@ -35921,7 +35924,7 @@ class PartialEnvironment {
       }
     );
     const environment = colors$1.dim(`(${this.name})`);
-    const colorIndex = [...environment].reduce((acc, c) => acc + c.charCodeAt(0), 0) % environmentColors.length;
+    const colorIndex = [...this.name].reduce((acc, c) => acc + c.charCodeAt(0), 0) % environmentColors.length;
     const infoColor = environmentColors[colorIndex || 0];
     this.logger = {
       get hasWarned() {
@@ -35980,9 +35983,6 @@ class BaseEnvironment extends PartialEnvironment {
     super(name, config, options);
   }
 }
-class FutureCompatEnvironment extends BaseEnvironment {
-  mode = "futureCompat";
-}
 const environmentColors = [
   colors$1.blue,
   colors$1.magenta,
@@ -37397,7 +37397,7 @@ function isScannable(id, extensions) {
 
 function createOptimizeDepsIncludeResolver(environment) {
   const topLevelConfig = environment.getTopLevelConfig();
-  const resolve = createIdResolver(topLevelConfig, {
+  const resolve = createBackCompatIdResolver(topLevelConfig, {
     asSrc: false,
     scan: true,
     ssrOptimizeCheck: environment.config.consumer === "server",
@@ -45888,15 +45888,20 @@ function createServerModuleRunner(environment, options = {}) {
 }
 
 async function ssrLoadModule(url, server, fixStacktrace) {
-  const runner = server._ssrCompatModuleRunner || (server._ssrCompatModuleRunner = createServerModuleRunner(
+  server._ssrCompatModuleRunner ||= createServerModuleRunner(
     server.environments.ssr,
     {
       sourcemapInterceptor: false,
       hmr: false
     }
-  ));
+  );
   url = unwrapId$1(url);
-  return instantiateModule(url, runner, server, fixStacktrace);
+  return instantiateModule(
+    url,
+    server._ssrCompatModuleRunner,
+    server,
+    fixStacktrace
+  );
 }
 async function instantiateModule(url, runner, server, fixStacktrace) {
   const environment = server.environments.ssr;
@@ -56352,7 +56357,6 @@ function buildHtmlPlugin(config) {
     name: "vite:build-html",
     async transform(html, id) {
       if (id.endsWith(".html")) {
-        const { modulePreload } = this.environment.config.build;
         id = normalizePath$3(id);
         const relativeUrlPath = normalizePath$3(path$n.relative(config.root, id));
         const publicPath = `/${relativeUrlPath}`;
@@ -56615,6 +56619,7 @@ import ${JSON.stringify(url)}`;
           }
         }
         processedHtml.set(id, s.toString());
+        const { modulePreload } = this.environment.config.build;
         if (modulePreload !== false && modulePreload.polyfill && (someScriptsAreAsync || someScriptsAreDefer)) {
           js = `import "${modulePreloadPolyfillId}";
 ${js}`;
@@ -56623,7 +56628,6 @@ ${js}`;
       }
     },
     async generateBundle(options, bundle) {
-      const { modulePreload } = this.environment.config.build;
       const analyzedChunk = /* @__PURE__ */ new Map();
       const inlineEntryChunk = /* @__PURE__ */ new Set();
       const getImportedChunks = (chunk, seen = /* @__PURE__ */ new Set()) => {
@@ -56725,6 +56729,7 @@ ${js}`;
               (chunk2) => toScriptTag(chunk2, toOutputAssetFilePath, isAsync)
             );
           } else {
+            const { modulePreload } = this.environment.config.build;
             assetTags = [toScriptTag(chunk, toOutputAssetFilePath, isAsync)];
             if (modulePreload !== false) {
               const resolveDependencies = typeof modulePreload === "object" && modulePreload.resolveDependencies;
@@ -56743,7 +56748,7 @@ ${js}`;
           assetTags.push(...getCssTagsForChunk(chunk, toOutputAssetFilePath));
           result = injectToHead(result, assetTags);
         }
-        if (this.environment.config.build.cssCodeSplit === false) {
+        if (!this.environment.config.build.cssCodeSplit) {
           const cssChunk = Object.values(bundle).find(
             (chunk2) => chunk2.type === "asset" && chunk2.name === "style.css"
           );
@@ -59050,13 +59055,13 @@ async function handleHMRUpdate(type, file, server) {
         if (filteredModules) {
           clientHotUpdateOptions.modules = filteredModules;
           mixedHmrContext.modules = mixedHmrContext.modules.filter(
-            (mixedMod) => filteredModules.find((mod) => mixedMod.id === mod.id) || ssrHotUpdateOptions?.modules.find(
+            (mixedMod) => filteredModules.some((mod) => mixedMod.id === mod.id) || ssrHotUpdateOptions?.modules.some(
               (ssrMod) => ssrMod.id === mixedMod.id
             )
           );
           mixedHmrContext.modules.push(
             ...filteredModules.filter(
-              (mod) => !mixedHmrContext.modules.find(
+              (mod) => !mixedHmrContext.modules.some(
                 (mixedMod) => mixedMod.id === mod.id
               )
             ).map(
@@ -59077,22 +59082,22 @@ async function handleHMRUpdate(type, file, server) {
         if (filteredModules) {
           mixedHmrContext.modules = filteredModules;
           clientHotUpdateOptions.modules = clientHotUpdateOptions.modules.filter(
-            (mod) => filteredModules.find((mixedMod) => mod.id === mixedMod.id)
+            (mod) => filteredModules.some((mixedMod) => mod.id === mixedMod.id)
           );
           clientHotUpdateOptions.modules.push(
             ...filteredModules.filter(
-              (mixedMod) => !clientHotUpdateOptions.modules.find(
+              (mixedMod) => !clientHotUpdateOptions.modules.some(
                 (mod) => mod.id === mixedMod.id
               )
             ).map((mixedMod) => mixedMod._clientModule).filter(Boolean)
           );
           if (ssrHotUpdateOptions) {
             ssrHotUpdateOptions.modules = ssrHotUpdateOptions.modules.filter(
-              (mod) => filteredModules.find((mixedMod) => mod.id === mixedMod.id)
+              (mod) => filteredModules.some((mixedMod) => mod.id === mixedMod.id)
             );
             ssrHotUpdateOptions.modules.push(
               ...filteredModules.filter(
-                (mixedMod) => !ssrHotUpdateOptions.modules.find(
+                (mixedMod) => !ssrHotUpdateOptions.modules.some(
                   (mod) => mod.id === mixedMod.id
                 )
               ).map((mixedMod) => mixedMod._ssrModule).filter(Boolean)
@@ -60079,7 +60084,7 @@ function preAliasPlugin(config) {
       const { environment } = this;
       const ssr = options?.ssr === true;
       const depsOptimizer = environment.mode === "dev" ? environment.depsOptimizer : void 0;
-      if (environment && importer && depsOptimizer && bareImportRE.test(id) && !options?.scan && id !== "@vite/client" && id !== "@vite/env") {
+      if (importer && depsOptimizer && bareImportRE.test(id) && !options?.scan && id !== "@vite/client" && id !== "@vite/env") {
         if (findPatterns.find((pattern) => matches(pattern, id))) {
           const optimizedId = await tryOptimizedResolve(
             depsOptimizer,
@@ -61005,7 +61010,7 @@ function workerImportMetaUrlPlugin(config) {
             file = path$n.resolve(path$n.dirname(id), url);
             file = tryFsResolve(file, fsResolveOptions) ?? file;
           } else {
-            workerResolver ??= createIdResolver(config, {
+            workerResolver ??= createBackCompatIdResolver(config, {
               extensions: [],
               tryIndex: false,
               preferRelative: true
@@ -61103,7 +61108,7 @@ function assetImportMetaUrlPlugin(config) {
             file = slash$1(path$n.resolve(path$n.dirname(id), url));
             file = tryFsResolve(file, fsResolveOptions) ?? file;
           } else {
-            assetResolver ??= createIdResolver(config, {
+            assetResolver ??= createBackCompatIdResolver(config, {
               extensions: [],
               mainFields: [],
               tryIndex: false,
@@ -61429,7 +61434,7 @@ async function transformDynamicImport(importSource, importer, resolve, root) {
   };
 }
 function dynamicImportVarsPlugin(config) {
-  const resolve = createIdResolver(config, {
+  const resolve = createBackCompatIdResolver(config, {
     preferRelative: true,
     tryIndex: false,
     extensions: []
@@ -61700,6 +61705,7 @@ class EnvironmentPluginContainer {
   watchFiles = /* @__PURE__ */ new Set();
   minimalContext;
   _started = false;
+  _buildStartPromise;
   _closed = false;
   _updateModuleLoadAddedImports(id, addedImports) {
     const module = this.moduleGraph?.getModuleById(id);
@@ -61711,6 +61717,33 @@ class EnvironmentPluginContainer {
     const module = this.moduleGraph?.getModuleById(id);
     return module ? this._moduleNodeToLoadAddedImports.get(module) || null : null;
   }
+  getModuleInfo(id) {
+    const module = this.moduleGraph?.getModuleById(id);
+    if (!module) {
+      return null;
+    }
+    if (!module.info) {
+      module.info = new Proxy(
+        { id, meta: module.meta || EMPTY_OBJECT },
+        // throw when an unsupported ModuleInfo property is accessed,
+        // so that incompatible plugins fail in a non-cryptic way.
+        {
+          get(info, key) {
+            if (key in info) {
+              return info[key];
+            }
+            if (key === "then") {
+              return void 0;
+            }
+            throw Error(
+              `[vite] The "${key}" property of ModuleInfo is not supported.`
+            );
+          }
+        }
+      );
+    }
+    return module.info ?? null;
+  }
   // keeps track of hook promises so that we can wait for them all to finish upon closing the server
   handleHookPromise(maybePromise) {
     if (!maybePromise?.then) {
@@ -61764,10 +61797,13 @@ class EnvironmentPluginContainer {
   }
   async buildStart(_options) {
     if (this._started) {
-      await this._started;
+      if (this._buildStartPromise) {
+        await this._buildStartPromise;
+      }
       return;
     }
-    this._started = this.handleHookPromise(
+    this._started = true;
+    this._buildStartPromise = this.handleHookPromise(
       this.hookParallel(
         "buildStart",
         (plugin) => this._getPluginContext(plugin),
@@ -61775,8 +61811,8 @@ class EnvironmentPluginContainer {
         (plugin) => this.environment.name === "client" || plugin.perEnvironmentStartEndDuringDev === true
       )
     );
-    await this._started;
-    this._started = true;
+    await this._buildStartPromise;
+    this._buildStartPromise = void 0;
   }
   async resolveId(rawId, importer = join$2(
     this.environment.config.root,
@@ -61784,9 +61820,7 @@ class EnvironmentPluginContainer {
   ), options) {
     if (!this._started) {
       this.buildStart();
-    }
-    if (this._started !== true) {
-      await this._started;
+      await this._buildStartPromise;
     }
     const skip = options?.skip;
     const scan = !!options?.scan;
@@ -61985,31 +62019,7 @@ class PluginContext {
     return moduleInfo;
   }
   getModuleInfo(id) {
-    const module = this._container.moduleGraph?.getModuleById(id);
-    if (!module) {
-      return null;
-    }
-    if (!module.info) {
-      module.info = new Proxy(
-        { id, meta: module.meta || EMPTY_OBJECT },
-        // throw when an unsupported ModuleInfo property is accessed,
-        // so that incompatible plugins fail in a non-cryptic way.
-        {
-          get(info, key) {
-            if (key in info) {
-              return info[key];
-            }
-            if (key === "then") {
-              return void 0;
-            }
-            throw Error(
-              `[vite] The "${key}" property of ModuleInfo is not supported.`
-            );
-          }
-        }
-      );
-    }
-    return module.info ?? null;
+    return this._container.getModuleInfo(id);
   }
   _updateModuleInfo(id, { meta }) {
     if (meta) {
@@ -62271,6 +62281,11 @@ class PluginContainer {
   _getPluginContainer(options) {
     return this._getEnvironment(options).pluginContainer;
   }
+  getModuleInfo(id) {
+    return this.environments.client.pluginContainer.getModuleInfo(id) || this.environments.ssr.pluginContainer.getModuleInfo(
+      id
+    );
+  }
   get options() {
     return this.environments.client.pluginContainer.options;
   }
@@ -62303,6 +62318,17 @@ function createPluginContainer(environments) {
   return new PluginContainer(environments);
 }
 
+function createBackCompatIdResolver(config, options) {
+  const compatResolve = config.createResolver(options);
+  let resolve;
+  return async (environment, id, importer, aliasOnly) => {
+    if (environment.name === "client" || environment.name === "ssr") {
+      return compatResolve(id, importer, aliasOnly, environment.name === "ssr");
+    }
+    resolve ??= createIdResolver(config, options);
+    return resolve(environment, id, importer, aliasOnly);
+  };
+}
 function createIdResolver(config, options) {
   const scan = options?.scan;
   const pluginContainerMap = /* @__PURE__ */ new Map();
@@ -62389,7 +62415,7 @@ const cssUrlAssetRE = /__VITE_CSS_URL__([\da-f]+)__/g;
 function cssPlugin(config) {
   const isBuild = config.command === "build";
   let moduleCache;
-  const idResolver = createIdResolver(config, {
+  const idResolver = createBackCompatIdResolver(config, {
     preferRelative: true,
     tryIndex: false,
     extensions: []
@@ -62907,9 +62933,8 @@ function cssAnalysisPlugin(config) {
       if (!isCSSRequest(id) || commonjsProxyRE.test(id) || SPECIAL_QUERY_RE.test(id)) {
         return;
       }
-      const environment = this.environment;
-      const moduleGraph = environment.mode === "dev" ? environment.moduleGraph : void 0;
-      const thisModule = moduleGraph?.getModuleById(id);
+      const { moduleGraph } = this.environment;
+      const thisModule = moduleGraph.getModuleById(id);
       if (thisModule) {
         const isSelfAccepting = !cssModulesCache.get(config)?.get(id) && !inlineRE.test(id) && !htmlProxyRE.test(id);
         const pluginImports = this._addedImports;
@@ -62962,7 +62987,7 @@ function createCSSResolvers(config) {
   let lessResolve;
   return {
     get css() {
-      return cssResolve ??= createIdResolver(config, {
+      return cssResolve ??= createBackCompatIdResolver(config, {
         extensions: [".css"],
         mainFields: ["style"],
         conditions: ["style"],
@@ -62972,7 +62997,7 @@ function createCSSResolvers(config) {
     },
     get sass() {
       if (!sassResolve) {
-        const resolver = createIdResolver(config, {
+        const resolver = createBackCompatIdResolver(config, {
           extensions: [".scss", ".sass", ".css"],
           mainFields: ["sass", "style"],
           conditions: ["sass", "style"],
@@ -62994,7 +63019,7 @@ function createCSSResolvers(config) {
       return sassResolve;
     },
     get less() {
-      return lessResolve ??= createIdResolver(config, {
+      return lessResolve ??= createBackCompatIdResolver(config, {
         extensions: [".less", ".css"],
         mainFields: ["less", "style"],
         conditions: ["less", "style"],
@@ -63301,8 +63326,8 @@ function createCachedImport(imp) {
     return cached;
   };
 }
-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 importPostcssImport = createCachedImport(() => import('./dep-DuPPQ7KX.js').then(function (n) { return n.i; }));
+const importPostcssModules = createCachedImport(() => import('./dep-M7bVrye1.js').then(function (n) { return n.i; }));
 const importPostcss = createCachedImport(() => import('postcss'));
 const preprocessorWorkerControllerCache = /* @__PURE__ */ new WeakMap();
 let alwaysFakeWorkerWorkerControllerCache;
@@ -64528,9 +64553,8 @@ function buildImportAnalysisPlugin(config) {
       }
     },
     load(id) {
-      const { environment } = this;
-      if (environment && id === preloadHelperId) {
-        const { modulePreload } = environment.config.build;
+      if (id === preloadHelperId) {
+        const { modulePreload } = this.environment.config.build;
         const scriptRel2 = modulePreload && modulePreload.polyfill ? `'modulepreload'` : `(${detectScriptRel.toString()})()`;
         const assetsURL2 = renderBuiltUrl || isRelativeBase ? (
           // If `experimental.renderBuiltUrl` is used, the dependencies might be relative to the current chunk.
@@ -64547,7 +64571,6 @@ function buildImportAnalysisPlugin(config) {
       }
     },
     async transform(source, importer) {
-      const { environment } = this;
       if (isInNodeModules$1(importer) && !dynamicImportPrefixRE.test(source)) {
         return;
       }
@@ -64630,16 +64653,15 @@ function buildImportAnalysisPlugin(config) {
       if (s) {
         return {
           code: s.toString(),
-          map: environment.config.build.sourcemap ? s.generateMap({ hires: "boundary" }) : null
+          map: this.environment.config.build.sourcemap ? s.generateMap({ hires: "boundary" }) : null
         };
       }
     },
     renderChunk(code, _, { format }) {
-      const { environment } = this;
-      if (environment && code.indexOf(isModernFlag) > -1) {
+      if (code.indexOf(isModernFlag) > -1) {
         const re = new RegExp(isModernFlag, "g");
         const isModern = String(format === "es");
-        if (environment.config.build.sourcemap) {
+        if (this.environment.config.build.sourcemap) {
           const s = new MagicString(code);
           let match;
           while (match = re.exec(code)) {
@@ -67862,56 +67884,20 @@ async function resolveConfig(inlineConfig, command, defaultMode = "development",
      * optimizer & handling css @imports
      */
     createResolver(options) {
-      const alias = {};
-      const resolver = {};
-      const environments = this.environments ?? resolvedEnvironments;
-      const createPluginContainer = async (environmentName, plugins) => {
-        const environment = new FutureCompatEnvironment(environmentName, this);
-        const pluginContainer = await createEnvironmentPluginContainer(
-          environment,
-          plugins
+      const resolve = createIdResolver(this, options);
+      const clientEnvironment = new PartialEnvironment("client", this);
+      let ssrEnvironment;
+      return async (id, importer, aliasOnly, ssr2) => {
+        if (ssr2) {
+          ssrEnvironment ??= new PartialEnvironment("ssr", this);
+        }
+        return await resolve(
+          ssr2 ? ssrEnvironment : clientEnvironment,
+          id,
+          importer,
+          aliasOnly
         );
-        await pluginContainer.buildStart({});
-        return pluginContainer;
       };
-      async function resolve(id, importer, aliasOnly, ssr2) {
-        const environmentName = ssr2 ? "ssr" : "client";
-        let container;
-        if (aliasOnly) {
-          let aliasContainer = alias[environmentName];
-          if (!aliasContainer) {
-            aliasContainer = alias[environmentName] = await createPluginContainer(environmentName, [
-              alias$1({ entries: resolved.resolve.alias })
-            ]);
-          }
-          container = aliasContainer;
-        } else {
-          let resolverContainer = resolver[environmentName];
-          if (!resolverContainer) {
-            resolverContainer = resolver[environmentName] = await createPluginContainer(environmentName, [
-              alias$1({ entries: resolved.resolve.alias }),
-              resolvePlugin(
-                {
-                  ...resolved.resolve,
-                  root: resolvedRoot,
-                  isProduction,
-                  isBuild: command === "build",
-                  asSrc: true,
-                  preferRelative: false,
-                  tryIndex: true,
-                  ...options,
-                  idOnly: true,
-                  fsUtils: getFsUtils(resolved)
-                },
-                environments
-              )
-            ]);
-          }
-          container = resolverContainer;
-        }
-        return await container.resolveId(id, importer, { scan: options?.scan });
-      }
-      return async (id, importer, aliasOnly, ssr2) => (await resolve(id, importer, aliasOnly, ssr2))?.id;
     },
     fsDenyGlob: picomatch$4(
       // matchBase: true does not work as it's documented

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

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

@@ -1,4 +1,4 @@
-import { K as commonjsGlobal, J as getDefaultExportFromCjs } from './dep-1C5gbBiU.js';
+import { K as commonjsGlobal, J as getDefaultExportFromCjs } from './dep-Crhy8pEa.js';
 import require$$0__default from 'fs';
 import require$$0 from 'postcss';
 import require$$0$1 from 'path';

package/dist/node/cli.js

@@ -2,15 +2,15 @@ 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-1C5gbBiU.js';
+import { I as colors, A as createLogger, r as resolveConfig } from './chunks/dep-Crhy8pEa.js';
 import { VERSION } from './constants.js';
 import 'node:fs/promises';
 import 'node:url';
 import 'node:util';
 import 'node:module';
 import 'tty';
-import 'path';
 import 'esbuild';
+import 'path';
 import 'fs';
 import 'node:events';
 import 'node:stream';
@@ -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-1C5gbBiU.js').then(function (n) { return n.M; });
+  const { createServer } = await import('./chunks/dep-Crhy8pEa.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-1C5gbBiU.js').then(function (n) { return n.N; });
+    const build = await import('./chunks/dep-Crhy8pEa.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-1C5gbBiU.js').then(function (n) { return n.L; });
+    const { optimizeDeps } = await import('./chunks/dep-Crhy8pEa.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-1C5gbBiU.js').then(function (n) { return n.O; });
+    const { preview } = await import('./chunks/dep-Crhy8pEa.js').then(function (n) { return n.O; });
     try {
       const server = await preview({
         root,

package/dist/node/index.d.ts

@@ -2095,9 +2095,11 @@ declare class EnvironmentPluginContainer {
     watchFiles: Set<string>;
     minimalContext: MinimalPluginContext;
     private _started;
+    private _buildStartPromise;
     private _closed;
     private _updateModuleLoadAddedImports;
     private _getAddedImports;
+    getModuleInfo(id: string): ModuleInfo | null;
     private handleHookPromise;
     get options(): InputOptions;
     resolveRollupOptions(): Promise<InputOptions>;
@@ -2129,6 +2131,7 @@ declare class PluginContainer {
     constructor(environments: Record<string, Environment>);
     private _getEnvironment;
     private _getPluginContainer;
+    getModuleInfo(id: string): ModuleInfo | null;
     get options(): InputOptions;
     buildStart(_options?: InputOptions): Promise<void>;
     watchChange(id: string, change: {
@@ -2886,7 +2889,7 @@ interface ViteDevServer {
     /**
      * Module execution environments attached to the Vite server.
      */
-    environments: Record<'client' | 'ssr' | (string & Record<string, never>), DevEnvironment>;
+    environments: Record<'client' | 'ssr' | (string & {}), DevEnvironment>;
     /**
      * Module graph that tracks the import relationships, url to file mapping
      * and hmr state.
@@ -3934,7 +3937,7 @@ type ResolveIdFn = (environment: PartialEnvironment, id: string, importer?: stri
  * 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 createIdResolver(config: ResolvedConfig, options?: Partial<InternalResolveOptions>): ResolveIdFn;
 
 declare function buildErrorMessage(err: RollupError, args?: string[], includeStack?: boolean): string;
 

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

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

@@ -94,7 +94,7 @@ interface DefineImportMetadata {
      */
     importedNames?: string[];
 }
-interface SSRImportBaseMetadata extends DefineImportMetadata {
+interface SSRImportMetadata extends DefineImportMetadata {
     isDynamicImport?: boolean;
 }
 
@@ -348,4 +348,4 @@ declare class ESModulesEvaluator implements ModuleEvaluator {
     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 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 SSRImportMetadata, ssrDynamicImportKey, ssrExportAllKey, ssrImportKey, ssrImportMetaKey, ssrModuleExportsKey };

package/dist/node/module-runner.js

@@ -960,19 +960,21 @@ ${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);
+    url = normalizeAbsoluteUrl(url, this.root);
     const normalized = this.urlToIdMap.get(url);
     let cachedModule = normalized && this.moduleCache.getByModuleId(normalized);
     cachedModule || (cachedModule = this.moduleCache.getByModuleId(url));
+    let cached = this.moduleInfoCache.get(url);
+    return cached ? this.debug?.("[module runner] using cached module info for", url) : (cached = this.getModuleInformation(url, importer, cachedModule).finally(
+      () => {
+        this.moduleInfoCache.delete(url);
+      }
+    ), this.moduleInfoCache.set(url, cached)), cached;
+  }
+  async getModuleInformation(url, importer, cachedModule) {
+    if (this.destroyed)
+      throw new Error("Vite module runner has been destroyed.");
+    this.debug?.("[module runner] fetching", 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, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "6.0.0-alpha.22",
+  "version": "6.0.0-alpha.23",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",