vite 6.0.0-alpha.22 → 6.0.0-alpha.24

package/dist/node/chunks/{dep-1C5gbBiU.js → dep-ByEd0NXO.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;
@@ -18370,8 +18284,8 @@ function pattern2regex(resolvedPattern, allowJs) {
 function replaceTokens(tsconfig, configDir) {
 	return JSON.parse(
 		JSON.stringify(tsconfig)
-			// replace ${configDir}, accounting for rebaseRelative emitted ../${configDir}
-			.replaceAll(/"(?:\.\.\/)*\${configDir}/g, `"${native2posix(configDir)}`)
+			// replace ${configDir}
+			.replaceAll(/"\${configDir}/g, `"${native2posix(configDir)}`)
 	);
 }
 
@@ -18965,7 +18879,7 @@ function rebaseRelative(key, value, prependPath) {
  * @returns {string}
  */
 function rebasePath(value, prependPath) {
-	if (path$n.isAbsolute(value)) {
+	if (path$n.isAbsolute(value) || value.startsWith('${configDir}')) {
 		return value;
 	} else {
 		// relative paths use posix syntax in tsconfig
@@ -20358,7 +20272,8 @@ function assetPlugin(config) {
         code: `export default ${JSON.stringify(encodeURIPath(url))}`,
         // Force rollup to keep this module from being shared between other entry points if it's an entrypoint.
         // If the resulting chunk is empty, it will be removed in generateBundle.
-        moduleSideEffects: config.command === "build" && this.getModuleInfo(id)?.isEntry ? "no-treeshake" : false
+        moduleSideEffects: config.command === "build" && this.getModuleInfo(id)?.isEntry ? "no-treeshake" : false,
+        meta: config.command === "build" ? { "vite:asset": true } : void 0
       };
     },
     renderChunk(code, chunk, opts) {
@@ -20375,7 +20290,7 @@ function assetPlugin(config) {
     generateBundle(_, bundle) {
       for (const file in bundle) {
         const chunk = bundle[file];
-        if (chunk.type === "chunk" && chunk.isEntry && chunk.moduleIds.length === 1 && config.assetsInclude(chunk.moduleIds[0])) {
+        if (chunk.type === "chunk" && chunk.isEntry && chunk.moduleIds.length === 1 && config.assetsInclude(chunk.moduleIds[0]) && this.getModuleInfo(chunk.moduleIds[0])?.meta["vite:asset"]) {
           delete bundle[file];
         }
       }
@@ -33917,6 +33832,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 +35660,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;
     {
@@ -35881,6 +35885,12 @@ function esbuildCjsExternalPlugin(externals, platform) {
   };
 }
 
+const environmentColors = [
+  colors$1.blue,
+  colors$1.magenta,
+  colors$1.green,
+  colors$1.gray
+];
 class PartialEnvironment {
   name;
   getTopLevelConfig() {
@@ -35921,7 +35931,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,15 +35990,6 @@ class BaseEnvironment extends PartialEnvironment {
     super(name, config, options);
   }
 }
-class FutureCompatEnvironment extends BaseEnvironment {
-  mode = "futureCompat";
-}
-const environmentColors = [
-  colors$1.blue,
-  colors$1.magenta,
-  colors$1.green,
-  colors$1.gray
-];
 
 // Copyright 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Simon Lydell
 // License: MIT.
@@ -37397,7 +37398,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",
@@ -38124,8 +38125,8 @@ async function extractExportsData(environment, filePath) {
   };
   return exportsData;
 }
-function needsInterop(environmet, id, exportsData, output) {
-  if (environmet.config.dev.optimizeDeps?.needsInterop?.includes(id)) {
+function needsInterop(environment, id, exportsData, output) {
+  if (environment.config.dev.optimizeDeps?.needsInterop?.includes(id)) {
     return true;
   }
   const { hasModuleSyntax, exports } = exportsData;
@@ -39028,26 +39029,24 @@ function resolveEnvPrefix({
 
 const docsURL = "https://deploy-preview-16471--vite-docs-main.netlify.app";
 const deprecationCode = {
-  pluginHookSsrArgument: "changes/this-environment-in-hooks",
-  pluginHookHandleHotUpdate: "changes/hotupdate-hook",
-  serverModuleGraph: "changes/per-environment-apis",
-  serverHot: "changes/per-environment-apis",
-  serverTransformRequest: "changes/per-environment-apis",
-  ssrLoadModule: "changes/ssr-using-modulerunner"
+  removePluginHookSsrArgument: "changes/this-environment-in-hooks",
+  removePluginHookHandleHotUpdate: "changes/hotupdate-hook",
+  removeServerModuleGraph: "changes/per-environment-apis",
+  removeServerHot: "changes/per-environment-apis",
+  removeServerTransformRequest: "changes/per-environment-apis",
+  removeSsrLoadModule: "changes/ssr-using-modulerunner"
 };
 const deprecationMessages = {
-  pluginHookSsrArgument: "Plugin hook `options.ssr` is replaced with `this.environment.config.consumer === 'server'`.",
-  pluginHookHandleHotUpdate: "Plugin hook `handleHotUpdate()` is replaced with `hotUpdate()`.",
-  serverModuleGraph: "The `server.moduleGraph` is replaced with `this.environment.moduleGraph`.",
-  serverHot: "The `server.hot` is replaced with `this.environment.hot`.",
-  serverTransformRequest: "The `server.transformRequest` is replaced with `this.environment.transformRequest`.",
-  ssrLoadModule: "The `server.ssrLoadModule` is replaced with Environment Runner."
+  removePluginHookSsrArgument: "Plugin hook `options.ssr` is replaced with `this.environment.config.consumer === 'server'`.",
+  removePluginHookHandleHotUpdate: "Plugin hook `handleHotUpdate()` is replaced with `hotUpdate()`.",
+  removeServerModuleGraph: "The `server.moduleGraph` is replaced with `this.environment.moduleGraph`.",
+  removeServerHot: "The `server.hot` is replaced with `this.environment.hot`.",
+  removeServerTransformRequest: "The `server.transformRequest` is replaced with `this.environment.transformRequest`.",
+  removeSsrLoadModule: "The `server.ssrLoadModule` is replaced with Environment Runner."
 };
 let _ignoreDeprecationWarnings = false;
 function warnFutureDeprecation(config, type, extraMessage, stacktrace = true) {
-  if (_ignoreDeprecationWarnings) return;
-  if (!config.future?.deprecationWarnings) return;
-  if (config.future.deprecationWarnings !== true && !config.future.deprecationWarnings[type])
+  if (_ignoreDeprecationWarnings || !config.future || config.future[type] !== "warn")
     return;
   let msg = `[vite future] ${deprecationMessages[type]}`;
   if (extraMessage) {
@@ -45888,15 +45887,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;
@@ -46459,45 +46463,6 @@ Object.defineProperty(${ssrModuleExportsKey}, "default", { enumerable: true, con
     dynamicDeps: [...dynamicDeps]
   };
 }
-async function ssrParseImports(url, code) {
-  let ast;
-  try {
-    ast = await parseAstAsync(code);
-  } catch (err) {
-    if (!err.loc || !err.loc.line) throw err;
-    const line = err.loc.line;
-    throw new Error(
-      `Parse failure: ${err.message}
-At file: ${url}
-Contents of line ${line}: ${code.split("\n")[line - 1]}`
-    );
-  }
-  const imports = [];
-  walk$1(ast, {
-    enter(_n, parent) {
-      if (_n.type !== "Identifier") return;
-      const node = _n;
-      const isStaticImport = node.name === ssrImportKey;
-      const isDynamicImport = node.name === ssrDynamicImportKey;
-      if (isStaticImport || isDynamicImport) {
-        const importExpression = parent;
-        const importLiteral = importExpression.arguments[0];
-        imports.push({
-          n: importLiteral.value,
-          s: importLiteral.start,
-          e: importLiteral.end,
-          se: importExpression.start,
-          ss: importExpression.end,
-          t: isStaticImport ? 2 : 1,
-          d: isDynamicImport ? importLiteral.start : -1,
-          a: -1
-          // not used
-        });
-      }
-    }
-  });
-  return imports;
-}
 const isNodeInPatternWeakSet = /* @__PURE__ */ new WeakSet();
 const setIsNodeInPattern = (node) => isNodeInPatternWeakSet.add(node);
 const isNodeInPattern = (node) => isNodeInPatternWeakSet.has(node);
@@ -55685,7 +55650,8 @@ function servePublicMiddleware(server, publicFiles) {
     return normalizePath$3(filePath);
   };
   return function viteServePublicMiddleware(req, res, next) {
-    if (publicFiles && !publicFiles.has(toFilePath(req.url)) || isImportRequest(req.url) || isInternalRequest(req.url)) {
+    if (publicFiles && !publicFiles.has(toFilePath(req.url)) || isImportRequest(req.url) || isInternalRequest(req.url) || // for `/public-file.js?url` to be transformed
+    urlRE.test(req.url)) {
       return next();
     }
     serve(req, res, next);
@@ -55761,8 +55727,9 @@ function serveRawFsMiddleware(server) {
     }
   };
 }
-function isFileServingAllowed(url, server) {
-  const { config } = server;
+function isFileServingAllowed(configOrUrl, urlOrServer) {
+  const config = typeof urlOrServer === "string" ? configOrUrl : urlOrServer.config;
+  const url = typeof urlOrServer === "string" ? urlOrServer : configOrUrl;
   if (!config.server.fs.strict) return true;
   const filePath = fsPathFromUrl(url);
   return isFileLoadingAllowed(config, filePath);
@@ -56054,15 +56021,13 @@ async function handleModuleSoftInvalidation(environment, mod, timestamp) {
     );
   }
   let result;
-  if (!environment.config.injectInvalidationTimestamp) {
+  if (transformResult.ssr) {
     result = transformResult;
   } else {
+    await init;
     const source = transformResult.code;
     const s = new MagicString(source);
-    const imports = transformResult.ssr ? await ssrParseImports(mod.url, source) : await (async () => {
-      await init;
-      return parse$d(source, mod.id || void 0)[0];
-    })();
+    const [imports] = parse$d(source, mod.id || void 0);
     for (const imp of imports) {
       let rawUrl = source.slice(imp.s, imp.e);
       if (rawUrl === "import.meta") continue;
@@ -56242,6 +56207,9 @@ function nodeIsElement(node) {
   return node.nodeName[0] !== "#";
 }
 function traverseNodes(node, visitor) {
+  if (node.nodeName === "template") {
+    node = node.content;
+  }
   visitor(node);
   if (nodeIsElement(node) || node.nodeName === "#document" || node.nodeName === "#document-fragment") {
     node.childNodes.forEach((childNode) => traverseNodes(childNode, visitor));
@@ -56352,7 +56320,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 +56582,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 +56591,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 +56692,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 +56711,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"
           );
@@ -58432,7 +58400,7 @@ async function _createServer(inlineConfig = {}, options) {
     environments,
     pluginContainer,
     get moduleGraph() {
-      warnFutureDeprecation(config, "serverModuleGraph");
+      warnFutureDeprecation(config, "removeServerModuleGraph");
       return moduleGraph;
     },
     set moduleGraph(graph) {
@@ -58451,7 +58419,7 @@ async function _createServer(inlineConfig = {}, options) {
     transformRequest(url, options2) {
       warnFutureDeprecation(
         config,
-        "serverTransformRequest",
+        "removeServerTransformRequest",
         "server.transformRequest() is deprecated. Use environment.transformRequest() instead."
       );
       const environment = server.environments[options2?.ssr ? "ssr" : "client"];
@@ -58475,7 +58443,7 @@ async function _createServer(inlineConfig = {}, options) {
       return devHtmlTransformFn(server, url, html, originalUrl);
     },
     async ssrLoadModule(url, opts) {
-      warnFutureDeprecation(config, "ssrLoadModule");
+      warnFutureDeprecation(config, "removeSsrLoadModule");
       return ssrLoadModule(url, server, opts?.fixStacktrace);
     },
     ssrFixStacktrace(e) {
@@ -58495,16 +58463,6 @@ async function _createServer(inlineConfig = {}, options) {
         );
       }
     },
-    async reloadEnvironmentModule(module) {
-      if (serverConfig.hmr !== false && module.file) {
-        updateModules(
-          environments[module.environment],
-          module.file,
-          [module],
-          Date.now()
-        );
-      }
-    },
     async listen(port, isRestart) {
       await startServer(server, port);
       if (httpServer) {
@@ -59050,13 +59008,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(
@@ -59067,7 +59025,7 @@ async function handleHMRUpdate(type, file, server) {
       } else if (type === "update") {
         warnFutureDeprecation(
           config,
-          "pluginHookHandleHotUpdate",
+          "removePluginHookHandleHotUpdate",
           `Used in plugin "${plugin.name}".`,
           false
         );
@@ -59077,22 +59035,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 +60037,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,
@@ -60160,6 +60118,25 @@ const templateLiteralRE = /^\s*`(.*)`\s*$/;
 function isExplicitImportRequired(url) {
   return !isJSRequest(url) && !isCSSRequest(url);
 }
+function normalizeResolvedIdToUrl(environment, url, resolved) {
+  const root = environment.config.root;
+  const depsOptimizer = environment.depsOptimizer;
+  const fsUtils = getFsUtils(environment.getTopLevelConfig());
+  if (resolved.id.startsWith(withTrailingSlash(root))) {
+    url = resolved.id.slice(root.length);
+  } else if (depsOptimizer?.isOptimizedDepFile(resolved.id) || // vite-plugin-react isn't following the leading \0 virtual module convention.
+  // This is a temporary hack to avoid expensive fs checks for React apps.
+  // We'll remove this as soon we're able to fix the react plugins.
+  resolved.id !== "/@react-refresh" && path$n.isAbsolute(resolved.id) && fsUtils.existsSync(cleanUrl(resolved.id))) {
+    url = path$n.posix.join(FS_PREFIX, resolved.id);
+  } else {
+    url = resolved.id;
+  }
+  if (url[0] !== "." && url[0] !== "/") {
+    url = wrapId$1(resolved.id);
+  }
+  return url;
+}
 function extractImportedBindings(id, source, importSpec, importedBindings) {
   let bindings = importedBindings.get(id);
   if (!bindings) {
@@ -60204,7 +60181,6 @@ function extractImportedBindings(id, source, importSpec, importedBindings) {
 }
 function importAnalysisPlugin(config) {
   const { root, base } = config;
-  const fsUtils = getFsUtils(config);
   const clientPublicPath = path$n.posix.join(base, CLIENT_PUBLIC_PATH);
   const enablePartialAccept = config.experimental?.hmrPartialAccept;
   const matchAlias = getAliasPatternMatcher(config.resolve.alias);
@@ -60311,20 +60287,8 @@ function importAnalysisPlugin(config) {
         }
         const isRelative = url[0] === ".";
         const isSelfImport = !isRelative && cleanUrl(url) === cleanUrl(importer);
-        if (resolved.id.startsWith(withTrailingSlash(root))) {
-          url = resolved.id.slice(root.length);
-        } else if (depsOptimizer?.isOptimizedDepFile(resolved.id) || // vite-plugin-react isn't following the leading \0 virtual module convention.
-        // This is a temporary hack to avoid expensive fs checks for React apps.
-        // We'll remove this as soon we're able to fix the react plugins.
-        resolved.id !== "/@react-refresh" && path$n.isAbsolute(resolved.id) && fsUtils.existsSync(cleanUrl(resolved.id))) {
-          url = path$n.posix.join(FS_PREFIX, resolved.id);
-        } else {
-          url = resolved.id;
-        }
-        if (url[0] !== "." && url[0] !== "/") {
-          url = wrapId$1(resolved.id);
-        }
-        if (environment.config.injectInvalidationTimestamp) {
+        url = normalizeResolvedIdToUrl(environment, url, resolved);
+        if (environment.config.consumer === "client") {
           if (isExplicitImportRequired(url)) {
             url = injectQuery(url, "import");
           } else if ((isRelative || isSelfImport) && !DEP_VERSION_RE.test(url)) {
@@ -61005,7 +60969,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 +61067,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 +61393,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 +61664,7 @@ class EnvironmentPluginContainer {
   watchFiles = /* @__PURE__ */ new Set();
   minimalContext;
   _started = false;
+  _buildStartPromise;
   _closed = false;
   _updateModuleLoadAddedImports(id, addedImports) {
     const module = this.moduleGraph?.getModuleById(id);
@@ -61711,6 +61676,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 +61756,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 +61770,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 +61779,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 +61978,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 +62240,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 +62277,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 +62374,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 +62892,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 +62946,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 +62956,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"],
@@ -62981,12 +62965,8 @@ function createCSSResolvers(config) {
           preferRelative: true
         });
         sassResolve = async (...args) => {
-          const id = args[1];
-          if (id.startsWith("file://")) {
-            const fileUrl = new URL(id);
-            if (fs__default.existsSync(fileUrl)) {
-              return fileURLToPath(fileUrl);
-            }
+          if (args[1].startsWith("file://")) {
+            args[1] = fileURLToPath(args[1]);
           }
           return resolver(...args);
         };
@@ -62994,7 +62974,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 +63281,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-hyosMzMD.js').then(function (n) { return n.i; }));
+const importPostcssModules = createCachedImport(() => import('./dep-yUJ1DpJ5.js').then(function (n) { return n.i; }));
 const importPostcss = createCachedImport(() => import('postcss'));
 const preprocessorWorkerControllerCache = /* @__PURE__ */ new WeakMap();
 let alwaysFakeWorkerWorkerControllerCache;
@@ -63653,7 +63633,7 @@ function fixScssBugImportValue(data) {
   }
   return data;
 }
-const makeScssWorker = (environment, resolvers, alias, maxWorkers) => {
+const makeScssWorker = (environment, resolvers, alias, maxWorkers, packageName) => {
   const internalImporter = async (url, importer, filename) => {
     importer = cleanScssBugUrl(importer);
     const resolved = await resolvers.sass(environment, url, importer);
@@ -63667,6 +63647,9 @@ const makeScssWorker = (environment, resolvers, alias, maxWorkers) => {
           "$",
           resolvers.sass
         );
+        if (packageName === "sass-embedded") {
+          return data;
+        }
         return fixScssBugImportValue(data);
       } catch (data) {
         return data;
@@ -63887,7 +63870,8 @@ const scssProcessor = (maxWorkers) => {
             environment,
             resolvers,
             options.alias,
-            maxWorkers
+            maxWorkers,
+            sassPackage.name
           )
         );
       }
@@ -63910,6 +63894,11 @@ const scssProcessor = (maxWorkers) => {
         );
         const deps = result.stats.includedFiles.map((f) => cleanScssBugUrl(f));
         const map2 = result.map ? JSON.parse(result.map.toString()) : void 0;
+        if (map2) {
+          map2.sources = map2.sources.map(
+            (url) => url.startsWith("file://") ? normalizePath$3(fileURLToPath(url)) : url
+          );
+        }
         return {
           code: result.css.toString(),
           map: map2,
@@ -64484,8 +64473,8 @@ function preload(baseModule, deps, importerUrl) {
         link.rel = isCss ? "stylesheet" : scriptRel;
         if (!isCss) {
           link.as = "script";
-          link.crossOrigin = "";
         }
+        link.crossOrigin = "";
         link.href = dep;
         if (cspNonce) {
           link.setAttribute("nonce", cspNonce);
@@ -64528,9 +64517,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 +64535,6 @@ function buildImportAnalysisPlugin(config) {
       }
     },
     async transform(source, importer) {
-      const { environment } = this;
       if (isInNodeModules$1(importer) && !dynamicImportPrefixRE.test(source)) {
         return;
       }
@@ -64630,16 +64617,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)) {
@@ -65007,7 +64993,7 @@ function ssrManifestPlugin() {
 
 function buildLoadFallbackPlugin() {
   return {
-    name: "vite:build-load-fallback",
+    name: "vite:load-fallback",
     async load(id) {
       try {
         const cleanedId = cleanUrl(id);
@@ -65941,7 +65927,7 @@ async function fetchModule(environment, url, importer, options = {}) {
   if (isExternalUrl(url)) {
     return { externalize: url, type: "network" };
   }
-  if (url[0] !== "." && url[0] !== "/") {
+  if (importer && url[0] !== "." && url[0] !== "/") {
     const { isProduction, root } = environment.config;
     const { externalConditions, dedupe, preserveSymlinks } = environment.config.resolve;
     const resolved = tryNodeResolve(
@@ -65982,6 +65968,13 @@ async function fetchModule(environment, url, importer, options = {}) {
     const type = isFilePathESM(resolved.id, environment.config.packageCache) ? "module" : "commonjs";
     return { externalize: file, type };
   }
+  if (!importer) {
+    const resolved = await environment.pluginContainer.resolveId(url);
+    if (!resolved) {
+      throw new Error(`[vite] cannot find entry point module '${url}'.`);
+    }
+    url = normalizeResolvedIdToUrl(environment, url, resolved);
+  }
   url = unwrapId$1(url);
   let mod = await environment.moduleGraph.getModuleByUrl(url);
   const cached = !!mod?.transformResult;
@@ -66986,11 +66979,18 @@ class DevEnvironment extends BaseEnvironment {
       ...options
     });
   }
+  async reloadModule(module) {
+    if (this.config.server.hmr !== false && module.file) {
+      updateModules(this, module.file, [module], Date.now());
+    }
+  }
   transformRequest(url) {
     return transformRequest(this, url);
   }
   async warmupRequest(url) {
-    await transformRequest(this, url).catch((e) => {
+    try {
+      await this.transformRequest(url);
+    } catch (e) {
       if (e?.code === ERR_OUTDATED_OPTIMIZED_DEP || e?.code === ERR_CLOSED_SERVER) {
         return;
       }
@@ -66998,7 +66998,7 @@ class DevEnvironment extends BaseEnvironment {
         error: e,
         timestamp: true
       });
-    });
+    }
   }
   async close() {
     this._closing = true;
@@ -67090,14 +67090,14 @@ function setupOnCrawlEnd(onCrawlEnd) {
     if (ignoredId) {
       seenIds.add(ignoredId);
       markIdAsDone(ignoredId);
+    } else {
+      checkIfCrawlEndAfterTimeout();
     }
     return onCrawlEndPromiseWithResolvers.promise;
   }
   function markIdAsDone(id) {
-    if (registeredIds.has(id)) {
-      registeredIds.delete(id);
-      checkIfCrawlEndAfterTimeout();
-    }
+    registeredIds.delete(id);
+    checkIfCrawlEndAfterTimeout();
   }
   function checkIfCrawlEndAfterTimeout() {
     if (cancelled || registeredIds.size > 0) return;
@@ -67119,6 +67119,11 @@ function setupOnCrawlEnd(onCrawlEnd) {
 }
 
 function createNodeDevEnvironment(name, config, context) {
+  if (context.hot == null) {
+    throw new Error(
+      "`hot` is a required option. Either explicitly opt out of HMR by setting `hot: false` or provide a hot channel."
+    );
+  }
   return new DevEnvironment(name, config, {
     ...context,
     runner: {
@@ -67441,15 +67446,19 @@ function resolveDevEnvironmentOptions(dev, preserverSymlinks, environmentName, c
     moduleRunnerTransform: dev?.moduleRunnerTransform ?? (skipSsrTransform !== void 0 && consumer === "server" ? skipSsrTransform : consumer === "server")
   };
 }
-function resolveEnvironmentOptions(options, resolvedRoot, logger, environmentName, skipSsrTransform) {
-  const resolve = resolveEnvironmentResolveOptions(options.resolve, logger);
+function resolveEnvironmentOptions(options, resolvedRoot, alias, preserveSymlinks, logger, environmentName, skipSsrTransform) {
+  const resolve = resolveEnvironmentResolveOptions(
+    options.resolve,
+    alias,
+    preserveSymlinks,
+    logger
+  );
   const isClientEnvironment = environmentName === "client";
   const consumer = options.consumer ?? isClientEnvironment ? "client" : "server";
   return {
     resolve,
     consumer,
     webCompatible: options.webCompatible ?? consumer === "client",
-    injectInvalidationTimestamp: options.injectInvalidationTimestamp ?? consumer === "client",
     dev: resolveDevEnvironmentOptions(
       options.dev,
       resolve.preserveSymlinks,
@@ -67479,7 +67488,6 @@ function getDefaultResolvedEnvironmentOptions(config) {
     resolve: config.resolve,
     consumer: "server",
     webCompatible: false,
-    injectInvalidationTimestamp: false,
     dev: config.dev,
     build: config.build
   };
@@ -67514,10 +67522,7 @@ const clientAlias = [
     replacement: path$n.posix.join(FS_PREFIX, normalizePath$3(CLIENT_ENTRY))
   }
 ];
-function resolveEnvironmentResolveOptions(resolve, logger) {
-  const resolvedAlias = normalizeAlias(
-    mergeAlias(clientAlias, resolve?.alias || [])
-  );
+function resolveEnvironmentResolveOptions(resolve, alias, preserveSymlinks, logger) {
   const resolvedResolve = {
     mainFields: resolve?.mainFields ?? DEFAULT_MAIN_FIELDS,
     conditions: resolve?.conditions ?? [],
@@ -67526,8 +67531,8 @@ function resolveEnvironmentResolveOptions(resolve, logger) {
     noExternal: resolve?.noExternal ?? [],
     extensions: resolve?.extensions ?? DEFAULT_EXTENSIONS,
     dedupe: resolve?.dedupe ?? [],
-    preserveSymlinks: resolve?.preserveSymlinks ?? false,
-    alias: resolvedAlias
+    preserveSymlinks,
+    alias
   };
   if (
     // @ts-expect-error removed field
@@ -67541,6 +67546,16 @@ function resolveEnvironmentResolveOptions(resolve, logger) {
   }
   return resolvedResolve;
 }
+function resolveResolveOptions(resolve, logger) {
+  const alias = normalizeAlias(mergeAlias(clientAlias, resolve?.alias || []));
+  const preserveSymlinks = resolve?.preserveSymlinks ?? false;
+  return resolveEnvironmentResolveOptions(
+    resolve,
+    alias,
+    preserveSymlinks,
+    logger
+  );
+}
 function resolveDepOptimizationOptions(optimizeDeps, preserveSymlinks, consumer) {
   optimizeDeps ??= {};
   return {
@@ -67552,7 +67567,6 @@ function resolveDepOptimizationOptions(optimizeDeps, preserveSymlinks, consumer)
     holdUntilCrawlEnd: optimizeDeps.holdUntilCrawlEnd ?? true,
     esbuildOptions: {
       preserveSymlinks,
-      // TODO: ?
       ...optimizeDeps.esbuildOptions
     },
     disabled: optimizeDeps.disabled,
@@ -67673,24 +67687,23 @@ async function resolveConfig(inlineConfig, command, defaultMode = "development",
     );
   }
   await runConfigEnvironmentHook(config.environments, userPlugins, configEnv);
+  const resolvedDefaultResolve = resolveResolveOptions(config.resolve, logger);
   const resolvedEnvironments = {};
   for (const environmentName of Object.keys(config.environments)) {
     resolvedEnvironments[environmentName] = resolveEnvironmentOptions(
       config.environments[environmentName],
       resolvedRoot,
+      resolvedDefaultResolve.alias,
+      resolvedDefaultResolve.preserveSymlinks,
       logger,
       environmentName,
       config.experimental?.skipSsrTransform
     );
   }
-  const resolvedDefaultEnvironmentResolve = resolveEnvironmentResolveOptions(
-    config.resolve,
-    logger
-  );
   const backwardCompatibleOptimizeDeps = resolvedEnvironments.client.dev.optimizeDeps;
   const resolvedDevEnvironmentOptions = resolveDevEnvironmentOptions(
     config.dev,
-    resolvedDefaultEnvironmentResolve.preserveSymlinks,
+    resolvedDefaultResolve.preserveSymlinks,
     // default environment options
     void 0,
     void 0
@@ -67714,7 +67727,7 @@ async function resolveConfig(inlineConfig, command, defaultMode = "development",
   };
   const ssr = resolveSSROptions(
     patchedConfigSsr,
-    resolvedDefaultEnvironmentResolve.preserveSymlinks
+    resolvedDefaultResolve.preserveSymlinks
   );
   const envDir = config.envDir ? normalizePath$3(path$n.resolve(resolvedRoot, config.envDir)) : resolvedRoot;
   const userEnv = inlineConfig.envFile !== false && loadEnv(mode, envDir, resolveEnvPrefix(config));
@@ -67847,8 +67860,7 @@ async function resolveConfig(inlineConfig, command, defaultMode = "development",
     // Backward compatibility, users should use environment.config.dev.optimizeDeps
     optimizeDeps: backwardCompatibleOptimizeDeps,
     ssr,
-    // TODO: deprecate and later remove from ResolvedConfig?
-    resolve: resolvedDefaultEnvironmentResolve,
+    resolve: resolvedDefaultResolve,
     dev: resolvedDevEnvironmentOptions,
     build: resolvedBuildOptions,
     environments: resolvedEnvironments,
@@ -67862,56 +67874,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
@@ -68305,4 +68281,4 @@ function optimizeDepsDisabledBackwardCompatibility(resolved, optimizeDeps, optim
   }
 }
 
-export { createLogger as A, BuildEnvironment as B, searchForWorkspaceRoot as C, DevEnvironment as D, isFileServingAllowed as E, isFileLoadingAllowed as F, loadEnv as G, resolveEnvPrefix as H, colors$1 as I, getDefaultExportFromCjs as J, commonjsGlobal as K, index$1 as L, index as M, build$1 as N, preview$1 as O, ServerHMRConnector as S, arraify as a, build as b, createServer as c, defineConfig as d, createBuilder as e, createIdResolver as f, formatPostcssSourceMap as g, preprocessCSS as h, isInNodeModules$1 as i, buildErrorMessage as j, createNodeDevEnvironment as k, loadConfigFromFile as l, fetchModule as m, createServerModuleRunner as n, optimizeDeps as o, preview as p, ssrTransform as q, resolveConfig as r, sortUserPlugins as s, transformWithEsbuild as t, normalizePath$3 as u, mergeConfig as v, mergeAlias as w, createFilter as x, rollupVersion as y, send$1 as z };
+export { send$1 as A, BuildEnvironment as B, createLogger as C, DevEnvironment as D, searchForWorkspaceRoot as E, isFileServingAllowed as F, isFileLoadingAllowed as G, loadEnv as H, resolveEnvPrefix as I, colors$1 as J, getDefaultExportFromCjs as K, commonjsGlobal as L, index$1 as M, index as N, build$1 as O, preview$1 as P, ServerHMRConnector as S, arraify as a, build as b, createServer as c, defineConfig as d, createBuilder as e, createIdResolver as f, formatPostcssSourceMap as g, preprocessCSS as h, isInNodeModules$1 as i, buildErrorMessage as j, createNodeDevEnvironment as k, loadConfigFromFile as l, fetchModule as m, createServerModuleRunner as n, optimizeDeps as o, preview as p, createServerHotChannel as q, resolveConfig as r, sortUserPlugins as s, transformWithEsbuild as t, ssrTransform as u, normalizePath$3 as v, mergeConfig as w, mergeAlias as x, createFilter as y, rollupVersion as z };