vite 6.0.0-alpha.23 → 6.0.0-alpha.24

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

@@ -18284,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)}`)
 	);
 }
 
@@ -18879,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
@@ -20272,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) {
@@ -20289,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];
         }
       }
@@ -35884,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() {
@@ -35983,12 +35990,6 @@ class BaseEnvironment extends PartialEnvironment {
     super(name, config, options);
   }
 }
-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.
@@ -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) {
@@ -46464,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);
@@ -55690,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);
@@ -55766,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);
@@ -56059,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;
@@ -56247,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));
@@ -58437,7 +58400,7 @@ async function _createServer(inlineConfig = {}, options) {
     environments,
     pluginContainer,
     get moduleGraph() {
-      warnFutureDeprecation(config, "serverModuleGraph");
+      warnFutureDeprecation(config, "removeServerModuleGraph");
       return moduleGraph;
     },
     set moduleGraph(graph) {
@@ -58456,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"];
@@ -58480,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) {
@@ -58500,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) {
@@ -59072,7 +59025,7 @@ async function handleHMRUpdate(type, file, server) {
       } else if (type === "update") {
         warnFutureDeprecation(
           config,
-          "pluginHookHandleHotUpdate",
+          "removePluginHookHandleHotUpdate",
           `Used in plugin "${plugin.name}".`,
           false
         );
@@ -60165,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) {
@@ -60209,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);
@@ -60316,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)) {
@@ -63006,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);
         };
@@ -63326,8 +63281,8 @@ function createCachedImport(imp) {
     return cached;
   };
 }
-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 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;
@@ -63678,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);
@@ -63692,6 +63647,9 @@ const makeScssWorker = (environment, resolvers, alias, maxWorkers) => {
           "$",
           resolvers.sass
         );
+        if (packageName === "sass-embedded") {
+          return data;
+        }
         return fixScssBugImportValue(data);
       } catch (data) {
         return data;
@@ -63912,7 +63870,8 @@ const scssProcessor = (maxWorkers) => {
             environment,
             resolvers,
             options.alias,
-            maxWorkers
+            maxWorkers,
+            sassPackage.name
           )
         );
       }
@@ -63935,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,
@@ -64509,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);
@@ -65029,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);
@@ -65963,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(
@@ -66004,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;
@@ -67008,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;
       }
@@ -67020,7 +66998,7 @@ class DevEnvironment extends BaseEnvironment {
         error: e,
         timestamp: true
       });
-    });
+    }
   }
   async close() {
     this._closing = true;
@@ -67112,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;
@@ -67141,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: {
@@ -67463,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,
@@ -67501,7 +67488,6 @@ function getDefaultResolvedEnvironmentOptions(config) {
     resolve: config.resolve,
     consumer: "server",
     webCompatible: false,
-    injectInvalidationTimestamp: false,
     dev: config.dev,
     build: config.build
   };
@@ -67536,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 ?? [],
@@ -67548,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
@@ -67563,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 {
@@ -67574,7 +67567,6 @@ function resolveDepOptimizationOptions(optimizeDeps, preserveSymlinks, consumer)
     holdUntilCrawlEnd: optimizeDeps.holdUntilCrawlEnd ?? true,
     esbuildOptions: {
       preserveSymlinks,
-      // TODO: ?
       ...optimizeDeps.esbuildOptions
     },
     disabled: optimizeDeps.disabled,
@@ -67695,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
@@ -67736,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));
@@ -67869,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,
@@ -68291,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 };

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

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

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

package/dist/node/cli.js

@@ -2,7 +2,7 @@ import path from 'node:path';
 import fs__default from 'node:fs';
 import { performance } from 'node:perf_hooks';
 import { EventEmitter } from 'events';
-import { I as colors, A as createLogger, r as resolveConfig } from './chunks/dep-Crhy8pEa.js';
+import { J as colors, C as createLogger, r as resolveConfig } from './chunks/dep-ByEd0NXO.js';
 import { VERSION } from './constants.js';
 import 'node:fs/promises';
 import 'node:url';
@@ -736,7 +736,7 @@ cli.command("[root]", "start dev server").alias("serve").alias("dev").option("--
   `[boolean] force the optimizer to ignore the cache and re-bundle`
 ).action(async (root, options) => {
   filterDuplicateOptions(options);
-  const { createServer } = await import('./chunks/dep-Crhy8pEa.js').then(function (n) { return n.M; });
+  const { createServer } = await import('./chunks/dep-ByEd0NXO.js').then(function (n) { return n.N; });
   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-Crhy8pEa.js').then(function (n) { return n.N; });
+    const build = await import('./chunks/dep-ByEd0NXO.js').then(function (n) { return n.O; });
     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-Crhy8pEa.js').then(function (n) { return n.L; });
+    const { optimizeDeps } = await import('./chunks/dep-ByEd0NXO.js').then(function (n) { return n.M; });
     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-Crhy8pEa.js').then(function (n) { return n.O; });
+    const { preview } = await import('./chunks/dep-ByEd0NXO.js').then(function (n) { return n.P; });
     try {
       const server = await preview({
         root,

package/dist/node/index.d.ts

@@ -807,11 +807,19 @@ declare class BaseEnvironment extends PartialEnvironment {
     constructor(name: string, config: ResolvedConfig, options?: ResolvedEnvironmentOptions);
 }
 /**
- * This is used both to avoid users to hardcode conditions like
- * !scan && !build => dev
+ * This class discourages users from inversely checking the `mode`
+ * to determine the type of environment, e.g.
+ *
+ * ```js
+ * const isDev = environment.mode !== 'build' // bad
+ * const isDev = environment.mode === 'dev'   // good
+ * ```
+ *
+ * You should also not check against `"unknown"` specfically. It's
+ * a placeholder for more possible environment types.
  */
-declare class FutureCompatEnvironment extends BaseEnvironment {
-    mode: "futureCompat";
+declare class UnknownEnvironment extends BaseEnvironment {
+    mode: "unknown";
 }
 
 interface FetchModuleOptions {
@@ -1233,6 +1241,7 @@ interface ServerHotChannel extends HotChannel {
 }
 /** @deprecated use `ServerHotChannel` instead */
 type ServerHMRChannel = ServerHotChannel;
+declare function createServerHotChannel(): ServerHotChannel;
 /** @deprecated use `environment.hot` instead */
 interface HotBroadcaster extends HotChannel {
     readonly channels: HotChannel[];
@@ -1281,6 +1290,7 @@ declare class DevEnvironment extends BaseEnvironment {
         watcher?: FSWatcher;
     }): Promise<void>;
     fetchModule(id: string, importer?: string, options?: FetchFunctionOptions): Promise<FetchResult>;
+    reloadModule(module: EnvironmentModuleNode): Promise<void>;
     transformRequest(url: string): Promise<TransformResult | null>;
     warmupRequest(url: string): Promise<void>;
     close(): Promise<void>;
@@ -2078,7 +2088,7 @@ type ResolvedBuilderOptions = Required<BuilderOptions>;
  */
 declare function createBuilder(inlineConfig?: InlineConfig): Promise<ViteBuilder>;
 
-type Environment = DevEnvironment | BuildEnvironment | ScanEnvironment | FutureCompatEnvironment;
+type Environment = DevEnvironment | BuildEnvironment |  UnknownEnvironment;
 
 declare class EnvironmentPluginContainer {
     environment: Environment;
@@ -2940,11 +2950,6 @@ interface ViteDevServer {
      * API to retrieve the module to be reloaded. If `hmr` is false, this is a no-op.
      */
     reloadModule(module: ModuleNode): Promise<void>;
-    /**
-     * Triggers HMR for an environment module in the module graph.
-     * If `hmr` is false, this is a no-op.
-     */
-    reloadEnvironmentModule(module: EnvironmentModuleNode): Promise<void>;
     /**
      * Start the server.
      */
@@ -3011,7 +3016,7 @@ interface FsUtils {
     initWatcher?: (watcher: FSWatcher) => void;
 }
 
-interface ResolveOptions {
+interface EnvironmentResolveOptions {
     /**
      * @default ['browser', 'module', 'jsnext:main', 'jsnext']
      */
@@ -3023,10 +3028,6 @@ interface ResolveOptions {
      */
     extensions?: string[];
     dedupe?: string[];
-    /**
-     * @default false
-     */
-    preserveSymlinks?: boolean;
     /**
      * external/noExternal logic, this only works for certain environments
      * Previously this was ssr.external/ssr.noExternal
@@ -3035,6 +3036,12 @@ interface ResolveOptions {
     noExternal?: string | RegExp | (string | RegExp)[] | true;
     external?: string[] | true;
 }
+interface ResolveOptions extends EnvironmentResolveOptions {
+    /**
+     * @default false
+     */
+    preserveSymlinks?: boolean;
+}
 interface ResolvePluginOptions {
     root: string;
     isBuild: boolean;
@@ -3507,15 +3514,6 @@ interface ResolvedSSROptions extends SSROptions {
     optimizeDeps: SsrDepOptimizationConfig;
 }
 
-interface FutureDeprecationWarningsOptions {
-    pluginHookHandleHotUpdate?: boolean;
-    pluginHookSsrArgument?: boolean;
-    serverModuleGraph?: boolean;
-    serverHot?: boolean;
-    serverTransformRequest?: boolean;
-    ssrLoadModule?: boolean;
-}
-
 interface ConfigEnv {
     /**
      * 'serve': during dev (`vite` command)
@@ -3601,7 +3599,7 @@ interface DevEnvironmentOptions {
     moduleRunnerTransform?: boolean;
 }
 type ResolvedDevEnvironmentOptions = Required<DevEnvironmentOptions>;
-type EnvironmentResolveOptions = ResolveOptions & {
+type AllResolveOptions = ResolveOptions & {
     alias?: AliasOptions;
 };
 interface SharedEnvironmentOptions {
@@ -3624,13 +3622,6 @@ interface SharedEnvironmentOptions {
      * Temporal options, we should remove these in favor of fine-grained control
      */
     webCompatible?: boolean;
-    /**
-     * Should Vite inject timestamp if module is invalidated
-     * Disabling this will break built-in HMR support
-     * @experimental
-     * @default true
-     */
-    injectInvalidationTimestamp?: boolean;
 }
 interface EnvironmentOptions extends SharedEnvironmentOptions {
     /**
@@ -3642,18 +3633,17 @@ interface EnvironmentOptions extends SharedEnvironmentOptions {
      */
     build?: BuildEnvironmentOptions;
 }
-type ResolvedEnvironmentResolveOptions = Required<EnvironmentResolveOptions>;
+type ResolvedResolveOptions = Required<ResolveOptions>;
 type ResolvedEnvironmentOptions = {
     define?: Record<string, any>;
-    resolve: ResolvedEnvironmentResolveOptions;
+    resolve: ResolvedResolveOptions;
     consumer: 'client' | 'server';
     webCompatible: boolean;
-    injectInvalidationTimestamp: boolean;
     dev: ResolvedDevEnvironmentOptions;
     build: ResolvedBuildEnvironmentOptions;
 };
-type DefaultEnvironmentOptions = Omit<EnvironmentOptions, 'build' | 'consumer' | 'webCompatible' | 'injectInvalidationTimestamp'> & {
-    build?: BuildOptions;
+type DefaultEnvironmentOptions = Omit<EnvironmentOptions, 'consumer' | 'webCompatible' | 'resolve'> & {
+    resolve?: AllResolveOptions;
 };
 interface UserConfig extends DefaultEnvironmentOptions {
     /**
@@ -3822,12 +3812,12 @@ interface HTMLOptions {
     cspNonce?: string;
 }
 interface FutureOptions {
-    /**
-     * Emit warning messages for deprecated/will-deprecated features at runtime.
-     *
-     * Setting to `true` to enable all warnings
-     */
-    deprecationWarnings?: boolean | FutureDeprecationWarningsOptions;
+    removePluginHookHandleHotUpdate?: 'warn';
+    removePluginHookSsrArgument?: 'warn';
+    removeServerModuleGraph?: 'warn';
+    removeServerHot?: 'warn';
+    removeServerTransformRequest?: 'warn';
+    removeSsrLoadModule?: 'warn';
 }
 interface ExperimentalOptions {
     /**
@@ -3924,7 +3914,9 @@ interface PluginHookUtils {
     getSortedPluginHooks: <K extends keyof Plugin>(hookName: K) => NonNullable<HookHandler<Plugin[K]>>[];
 }
 type ResolveFn = (id: string, importer?: string, aliasOnly?: boolean, ssr?: boolean) => Promise<string | undefined>;
-declare function resolveConfig(inlineConfig: InlineConfig, command: 'build' | 'serve', defaultMode?: string, defaultNodeEnv?: string, isPreview?: boolean, patchConfig?: ((config: ResolvedConfig) => void) | undefined, patchPlugins?: ((resolvedPlugins: Plugin[]) => void) | undefined): Promise<ResolvedConfig>;
+declare function resolveConfig(inlineConfig: InlineConfig, command: 'build' | 'serve', defaultMode?: string, defaultNodeEnv?: string, isPreview?: boolean, 
+ 
+): Promise<ResolvedConfig>;
 declare function sortUserPlugins(plugins: (Plugin | Plugin[])[] | undefined): [Plugin[], Plugin[], Plugin[]];
 declare function loadConfigFromFile(configEnv: ConfigEnv, configFile?: string, configRoot?: string, logLevel?: LogLevel, customLogger?: Logger): Promise<{
     path: string;
@@ -4041,6 +4033,10 @@ declare function searchForWorkspaceRoot(current: string, root?: string): string;
 /**
  * Check if the url is allowed to be served, via the `server.fs` config.
  */
+declare function isFileServingAllowed(config: ResolvedConfig, url: string): boolean;
+/**
+ * @deprecated Use the `isFileServingAllowed(config, url)` signature instead.
+ */
 declare function isFileServingAllowed(url: string, server: ViteDevServer): boolean;
 declare function isFileLoadingAllowed(config: ResolvedConfig, filePath: string): boolean;
 
@@ -4060,4 +4056,4 @@ interface ManifestChunk {
     dynamicImports?: string[];
 }
 
-export { type Alias, type AliasOptions, type AnymatchFn, type AnymatchPattern, type AppType, type AwaitWriteFinishOptions, type BindCLIShortcutsOptions, BuildEnvironment, type BuildEnvironmentOptions, type BuildOptions, type BuilderOptions, type CLIShortcut, type CSSModulesOptions, type CSSOptions, type CommonServerOptions, type ConfigEnv, Connect, type CorsOptions, type CorsOrigin, type DepOptimizationConfig, type DepOptimizationMetadata, type DepOptimizationOptions, DevEnvironment, type DevEnvironmentContext, type DevEnvironmentOptions, type ESBuildOptions, type ESBuildTransformResult, type Environment, EnvironmentModuleGraph, EnvironmentModuleNode, type ExperimentalOptions, type ExportsData, FSWatcher, type FetchModuleOptions, type FileSystemServeOptions, type FilterPattern, type HMRBroadcaster, type HMRBroadcasterClient, type HMRChannel, type HTMLOptions, type HmrContext, type HmrOptions, type HookHandler, type HotChannel, type HotChannelClient, type HotUpdateOptions, type HtmlTagDescriptor, HttpProxy, type HttpServer, type IndexHtmlTransform, type IndexHtmlTransformContext, type IndexHtmlTransformHook, type IndexHtmlTransformResult, type InlineConfig, type InternalResolveOptions, type JsonOptions, type LegacyOptions, type LibraryFormats, type LibraryOptions, type LightningCSSOptions, type LogErrorOptions, type LogLevel, type LogOptions, type LogType, type Logger, type LoggerOptions, type Manifest, type ManifestChunk, type MapToFunction, type AnymatchMatcher as Matcher, ModuleGraph, ModuleNode, type ModulePreloadOptions, type ModuleRunnerTransformOptions, type OptimizedDepInfo, type Plugin, PluginContainer, type PluginHookUtils, type PluginOption, type PreprocessCSSResult, type PreviewOptions, type PreviewServer, type PreviewServerHook, type ProxyOptions, RemoteEnvironmentTransport, type RenderBuiltAssetUrl, type ResolveFn, type ResolveModulePreloadDependenciesFn, type ResolveOptions, type ResolvedBuildEnvironmentOptions, type ResolvedBuildOptions, type ResolvedCSSOptions, type ResolvedConfig, type ResolvedDevEnvironmentOptions, type ResolvedModulePreloadOptions, type ResolvedPreviewOptions, type ResolvedSSROptions, type ResolvedServerOptions, type ResolvedServerUrls, type ResolvedUrl, type ResolvedWorkerOptions, type ResolverFunction, type ResolverObject, type RollupCommonJSOptions, type RollupDynamicImportVarsOptions, type SSROptions, type SSRTarget, type SendOptions, type ServerHMRChannel, ServerHMRConnector, type ServerHook, type ServerHotChannel, type ServerModuleRunnerOptions, type ServerOptions, SplitVendorChunkCache, type SsrDepOptimizationConfig, Terser, type TerserOptions, type TransformOptions, type TransformResult, type UserConfig, type UserConfigExport, type UserConfigFn, type UserConfigFnObject, type UserConfigFnPromise, type ViteBuilder, type ViteDevServer, type WatchOptions, WebSocket, WebSocketAlias, type WebSocketClient, type WebSocketCustomListener, WebSocketServer, build, buildErrorMessage, createBuilder, createFilter, createIdResolver, createLogger, createNodeDevEnvironment, createServer, createServerModuleRunner, defineConfig, fetchModule, formatPostcssSourceMap, isCSSRequest, isFileLoadingAllowed, isFileServingAllowed, loadConfigFromFile, loadEnv, mergeAlias, mergeConfig, ssrTransform as moduleRunnerTransform, normalizePath, optimizeDeps, preprocessCSS, preview, resolveConfig, resolveEnvPrefix, rollupVersion, searchForWorkspaceRoot, send, sortUserPlugins, splitVendorChunk, splitVendorChunkPlugin, transformWithEsbuild, VERSION as version };
+export { type Alias, type AliasOptions, type AnymatchFn, type AnymatchPattern, type AppType, type AwaitWriteFinishOptions, type BindCLIShortcutsOptions, BuildEnvironment, type BuildEnvironmentOptions, type BuildOptions, type BuilderOptions, type CLIShortcut, type CSSModulesOptions, type CSSOptions, type CommonServerOptions, type ConfigEnv, Connect, type CorsOptions, type CorsOrigin, type DepOptimizationConfig, type DepOptimizationMetadata, type DepOptimizationOptions, DevEnvironment, type DevEnvironmentContext, type DevEnvironmentOptions, type ESBuildOptions, type ESBuildTransformResult, type Environment, EnvironmentModuleGraph, EnvironmentModuleNode, type ExperimentalOptions, type ExportsData, FSWatcher, type FetchModuleOptions, type FileSystemServeOptions, type FilterPattern, type HMRBroadcaster, type HMRBroadcasterClient, type HMRChannel, type HTMLOptions, type HmrContext, type HmrOptions, type HookHandler, type HotChannel, type HotChannelClient, type HotUpdateOptions, type HtmlTagDescriptor, HttpProxy, type HttpServer, type IndexHtmlTransform, type IndexHtmlTransformContext, type IndexHtmlTransformHook, type IndexHtmlTransformResult, type InlineConfig, type InternalResolveOptions, type JsonOptions, type LegacyOptions, type LibraryFormats, type LibraryOptions, type LightningCSSOptions, type LogErrorOptions, type LogLevel, type LogOptions, type LogType, type Logger, type LoggerOptions, type Manifest, type ManifestChunk, type MapToFunction, type AnymatchMatcher as Matcher, ModuleGraph, ModuleNode, type ModulePreloadOptions, type ModuleRunnerTransformOptions, type OptimizedDepInfo, type Plugin, PluginContainer, type PluginHookUtils, type PluginOption, type PreprocessCSSResult, type PreviewOptions, type PreviewServer, type PreviewServerHook, type ProxyOptions, RemoteEnvironmentTransport, type RenderBuiltAssetUrl, type ResolveFn, type ResolveModulePreloadDependenciesFn, type ResolveOptions, type ResolvedBuildEnvironmentOptions, type ResolvedBuildOptions, type ResolvedCSSOptions, type ResolvedConfig, type ResolvedDevEnvironmentOptions, type ResolvedModulePreloadOptions, type ResolvedPreviewOptions, type ResolvedSSROptions, type ResolvedServerOptions, type ResolvedServerUrls, type ResolvedUrl, type ResolvedWorkerOptions, type ResolverFunction, type ResolverObject, type RollupCommonJSOptions, type RollupDynamicImportVarsOptions, type SSROptions, type SSRTarget, type SendOptions, type ServerHMRChannel, ServerHMRConnector, type ServerHook, type ServerHotChannel, type ServerModuleRunnerOptions, type ServerOptions, SplitVendorChunkCache, type SsrDepOptimizationConfig, Terser, type TerserOptions, type TransformOptions, type TransformResult, type UserConfig, type UserConfigExport, type UserConfigFn, type UserConfigFnObject, type UserConfigFnPromise, type ViteBuilder, type ViteDevServer, type WatchOptions, WebSocket, WebSocketAlias, type WebSocketClient, type WebSocketCustomListener, WebSocketServer, build, buildErrorMessage, createBuilder, createFilter, createIdResolver, createLogger, createNodeDevEnvironment, createServer, createServerHotChannel, createServerModuleRunner, defineConfig, fetchModule, formatPostcssSourceMap, isCSSRequest, isFileLoadingAllowed, isFileServingAllowed, loadConfigFromFile, loadEnv, mergeAlias, mergeConfig, ssrTransform as moduleRunnerTransform, normalizePath, optimizeDeps, preprocessCSS, preview, resolveConfig, resolveEnvPrefix, rollupVersion, searchForWorkspaceRoot, send, sortUserPlugins, splitVendorChunk, splitVendorChunkPlugin, transformWithEsbuild, VERSION as version };

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-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';
+import { i as isInNodeModules, a as arraify } from './chunks/dep-ByEd0NXO.js';
+export { B as BuildEnvironment, D as DevEnvironment, S as ServerHMRConnector, b as build, j as buildErrorMessage, e as createBuilder, y as createFilter, f as createIdResolver, C as createLogger, k as createNodeDevEnvironment, c as createServer, q as createServerHotChannel, n as createServerModuleRunner, d as defineConfig, m as fetchModule, g as formatPostcssSourceMap, G as isFileLoadingAllowed, F as isFileServingAllowed, l as loadConfigFromFile, H as loadEnv, x as mergeAlias, w as mergeConfig, u as moduleRunnerTransform, v as normalizePath, o as optimizeDeps, h as preprocessCSS, p as preview, r as resolveConfig, I as resolveEnvPrefix, z as rollupVersion, E as searchForWorkspaceRoot, A as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-ByEd0NXO.js';
 export { VERSION as version } from './constants.js';
 export { version as esbuildVersion } from 'esbuild';
 import 'node:fs';

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

@@ -143,7 +143,6 @@ declare class ModuleRunner {
      * Returns `true` if the runtime has been destroyed by calling `destroy()` method.
      */
     isDestroyed(): boolean;
-    private normalizeEntryUrl;
     private processImport;
     private isCircularModule;
     private isCircularImport;

package/dist/node/module-runner.js

@@ -2,9 +2,6 @@ const VALID_ID_PREFIX = "/@id/", NULL_BYTE_PLACEHOLDER = "__x00__";
 let SOURCEMAPPING_URL = "sourceMa";
 SOURCEMAPPING_URL += "ppingURL";
 const isWindows = typeof process < "u" && process.platform === "win32";
-function wrapId(id) {
-  return id.startsWith(VALID_ID_PREFIX) ? id : VALID_ID_PREFIX + id.replace("\0", NULL_BYTE_PLACEHOLDER);
-}
 function unwrapId(id) {
   return id.startsWith(VALID_ID_PREFIX) ? id.slice(VALID_ID_PREFIX.length).replace(NULL_BYTE_PLACEHOLDER, "\0") : id;
 }
@@ -881,7 +878,6 @@ class ModuleRunner {
    * URL to execute. Accepts file path, server path or id relative to the root.
    */
   async import(url) {
-    url = this.normalizeEntryUrl(url);
     const fetchedModule = await this.cachedModule(url);
     return await this.cachedRequest(url, fetchedModule);
   }
@@ -904,12 +900,6 @@ class ModuleRunner {
   isDestroyed() {
     return this.destroyed;
   }
-  // we don't use moduleCache.normalize because this URL doesn't have to follow the same rules
-  // this URL is something that user passes down manually, and is later resolved by fetchModule
-  // moduleCache.normalize is used on resolved "file" property
-  normalizeEntryUrl(url) {
-    return url[0] === "." ? url : (url = normalizeAbsoluteUrl(url, this.root), url[0] === "/" ? url : wrapId(url));
-  }
   processImport(exports, fetchResult, metadata) {
     if (!("externalize" in fetchResult))
       return exports;

package/dist/node-cjs/publicUtils.cjs

@@ -5542,8 +5542,9 @@ function searchForWorkspaceRoot(current, root = searchForPackageRoot(current)) {
   return searchForWorkspaceRoot(dir, root);
 }
 
-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);

package/index.cjs

@@ -25,11 +25,36 @@ asyncFunctions.forEach((name) => {
 
 function warnCjsUsage() {
   if (process.env.VITE_CJS_IGNORE_WARNING) return
+  const logLevelIndex = process.argv.findIndex((arg) =>
+    /^(?:-l|--logLevel)/.test(arg),
+  )
+  if (logLevelIndex > 0) {
+    const logLevelValue = process.argv[logLevelIndex + 1]
+    if (logLevelValue === 'silent' || logLevelValue === 'error') {
+      return
+    }
+    if (/silent|error/.test(process.argv[logLevelIndex])) {
+      return
+    }
+  }
   const yellow = (str) => `\u001b[33m${str}\u001b[39m`
-  const log = process.env.VITE_CJS_TRACE ? console.trace : console.warn
-  log(
+  console.warn(
     yellow(
       `The CJS build of Vite's Node API is deprecated. See https://vitejs.dev/guide/troubleshooting.html#vite-cjs-node-api-deprecated for more details.`,
     ),
   )
+  if (process.env.VITE_CJS_TRACE) {
+    const e = {}
+    const stackTraceLimit = Error.stackTraceLimit
+    Error.stackTraceLimit = 100
+    Error.captureStackTrace(e)
+    Error.stackTraceLimit = stackTraceLimit
+    console.log(
+      e.stack
+        .split('\n')
+        .slice(1)
+        .filter((line) => !line.includes('(node:'))
+        .join('\n'),
+    )
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "6.0.0-alpha.23",
+  "version": "6.0.0-alpha.24",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",
@@ -73,7 +73,7 @@
   "//": "READ CONTRIBUTING.md to understand what to put under deps vs. devDeps!",
   "dependencies": {
     "esbuild": "^0.21.3",
-    "postcss": "^8.4.41",
+    "postcss": "^8.4.43",
     "rollup": "^4.20.0"
   },
   "optionalDependencies": {
@@ -81,7 +81,7 @@
   },
   "devDependencies": {
     "@ampproject/remapping": "^2.3.0",
-    "@babel/parser": "^7.25.4",
+    "@babel/parser": "^7.25.6",
     "@jridgewell/trace-mapping": "^0.3.25",
     "@polka/compression": "^1.0.0-next.25",
     "@rollup/plugin-alias": "^5.1.0",
@@ -135,7 +135,7 @@
     "source-map-support": "^0.5.21",
     "strip-ansi": "^7.1.0",
     "strip-literal": "^2.1.0",
-    "tsconfck": "^3.1.1",
+    "tsconfck": "^3.1.3",
     "tslib": "^2.7.0",
     "types": "link:./types",
     "ufo": "^1.5.4",