vite 6.0.0-beta.0 → 6.0.0-beta.2

package/dist/node/chunks/{dep-Bv1xMYNy.js → dep-BHXIdTzn.js}

@@ -1,15 +1,15 @@
 import * as fs$j from 'node:fs';
-import fs__default, { promises as promises$1 } from 'node:fs';
+import fs__default, { promises as promises$1, existsSync as existsSync$1, readFileSync as readFileSync$1 } from 'node:fs';
 import fsp, { lstat as lstat$3, readdir as readdir$5, readlink, realpath as realpath$2 } from 'node:fs/promises';
 import path$n, { win32 as win32$1, posix as posix$1, isAbsolute as isAbsolute$1, join as join$2, dirname as dirname$2, relative as relative$2, basename as basename$2, extname as extname$1 } from 'node:path';
-import { fileURLToPath, URL as URL$3, parse as parse$h, pathToFileURL } from 'node:url';
+import { fileURLToPath, URL as URL$3, pathToFileURL } from 'node:url';
 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 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 require$$0$4, { posix, win32, 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, ERR_OPTIMIZE_DEPS_PROCESSING_ERROR, ERR_OUTDATED_OPTIMIZED_DEP, ERR_FILE_NOT_FOUND_IN_OPTIMIZED_DEP_DIR, 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';
 import { EventEmitter as EventEmitter$4 } from 'node:events';
@@ -31,13 +31,13 @@ import { createHash as createHash$2 } from 'node:crypto';
 import { promises } from 'node:dns';
 import { ModuleRunner, ESModulesEvaluator } from 'vite/module-runner';
 import { parseAstAsync, parseAst } from 'rollup/parseAst';
+import readline from 'node:readline';
+import require$$3$1 from 'crypto';
 import require$$0$8, { createRequire as createRequire$2 } from 'module';
 import assert$1 from 'node:assert';
 import v8 from 'node:v8';
 import { Worker as Worker$1 } from 'node:worker_threads';
-import require$$3$1 from 'crypto';
 import { Buffer as Buffer$1 } from 'node:buffer';
-import readline from 'node:readline';
 import zlib$1 from 'zlib';
 import require$$0$a from 'buffer';
 import require$$1$1 from 'https';
@@ -2265,19 +2265,16 @@ const postfixRE = /[?#].*$/;
 function cleanUrl(url) {
   return url.replace(postfixRE, "");
 }
+function splitFileAndPostfix(path) {
+  const file = cleanUrl(path);
+  return { file, postfix: path.slice(file.length) };
+}
 function withTrailingSlash(path) {
   if (path[path.length - 1] !== "/") {
     return `${path}/`;
   }
   return path;
 }
-const AsyncFunction = async function() {
-}.constructor;
-const asyncFunctionDeclarationPaddingLineCount = /* @__PURE__ */ (() => {
-  const body = "/*code*/";
-  const source = new AsyncFunction("a", "b", body).toString();
-  return source.slice(0, source.indexOf(body)).split("\n").length - 1;
-})();
 
 // @ts-check
 /** @typedef { import('estree').BaseNode} BaseNode */
@@ -2554,7 +2551,7 @@ const attachScopes = function attachScopes(ast, propertyName = 'scope') {
             const node = n;
             // function foo () {...}
             // class Foo {...}
-            if (/(Function|Class)Declaration/.test(node.type)) {
+            if (/(?:Function|Class)Declaration/.test(node.type)) {
                 scope.addDeclaration(node, false, false);
             }
             // var foo = 1
@@ -2581,7 +2578,7 @@ const attachScopes = function attachScopes(ast, propertyName = 'scope') {
                 }
             }
             // create new for scope
-            if (/For(In|Of)?Statement/.test(node.type)) {
+            if (/For(?:In|Of)?Statement/.test(node.type)) {
                 newScope = new Scope({
                     parent: scope,
                     block: true
@@ -2631,8 +2628,9 @@ function ensureArray(thing) {
     return [thing];
 }
 
+const normalizePathRegExp = new RegExp(`\\${win32.sep}`, 'g');
 const normalizePath$5 = function normalizePath(filename) {
-    return filename.split(win32.sep).join(posix.sep);
+    return filename.replace(normalizePathRegExp, posix.sep);
 };
 
 function getMatcherString(id, resolutionBase) {
@@ -2664,10 +2662,12 @@ const createFilter$1 = function createFilter(include, exclude, options) {
         };
     const includeMatchers = ensureArray(include).map(getMatcher);
     const excludeMatchers = ensureArray(exclude).map(getMatcher);
+    if (!includeMatchers.length && !excludeMatchers.length)
+        return (id) => typeof id === 'string' && !id.includes('\0');
     return function result(id) {
         if (typeof id !== 'string')
             return false;
-        if (/\0/.test(id))
+        if (id.includes('\0'))
             return false;
         const pathId = normalizePath$5(id);
         for (let i = 0; i < excludeMatchers.length; ++i) {
@@ -2778,7 +2778,7 @@ const dataToEsm = function dataToEsm(data, options = {}) {
     }
     let maxUnderbarPrefixLength = 0;
     for (const key of Object.keys(data)) {
-        const underbarPrefixLength = (_b = (_a = key.match(/^(_+)/)) === null || _a === void 0 ? void 0 : _a[0].length) !== null && _b !== void 0 ? _b : 0;
+        const underbarPrefixLength = (_b = (_a = /^(_+)/.exec(key)) === null || _a === void 0 ? void 0 : _a[0].length) !== null && _b !== void 0 ? _b : 0;
         if (underbarPrefixLength > maxUnderbarPrefixLength) {
             maxUnderbarPrefixLength = underbarPrefixLength;
         }
@@ -12185,7 +12185,7 @@ function isReference(node, parent) {
     return false;
 }
 
-var version$2 = "26.0.1";
+var version$2 = "26.0.3";
 var peerDependencies = {
 	rollup: "^2.68.0||^3.0.0||^4.0.0"
 };
@@ -16706,11 +16706,8 @@ function isOptimizable(id, optimizeDeps) {
 const bareImportRE = /^(?![a-zA-Z]:)[\w@](?!.*:\/\/)/;
 const deepImportRE = /^([^@][^/]*)\/|^(@[^/]+\/[^/]+)\//;
 const _require$1 = createRequire$1(import.meta.url);
-function resolveDependencyVersion(dep, pkgRelativePath = "../../package.json") {
-  const pkgPath = path$n.resolve(_require$1.resolve(dep), pkgRelativePath);
-  return JSON.parse(fs__default.readFileSync(pkgPath, "utf-8")).version;
-}
-const rollupVersion = resolveDependencyVersion("rollup");
+const _dirname = path$n.dirname(fileURLToPath(import.meta.url));
+const rollupVersion = resolvePackageData("rollup", _dirname, true)?.data.version ?? "";
 const filter = process.env.VITE_DEBUG_FILTER;
 const DEBUG = process.env.DEBUG;
 function createDebugger(namespace, options = {}) {
@@ -17329,7 +17326,6 @@ function getHash(text, length = 8) {
   if (length <= 64) return h;
   return h.padEnd(length, "_");
 }
-const _dirname = path$n.dirname(fileURLToPath(import.meta.url));
 const requireResolveFromRootWithFallback = (root, id) => {
   const found = resolvePackageData(id, root) || resolvePackageData(id, _dirname);
   if (!found) {
@@ -17797,7 +17793,7 @@ function buildReporterPlugin(config) {
     let chunkCount = 0;
     let compressedCount = 0;
     async function getCompressedSize(code) {
-      if (environment.config.build.ssr || !environment.config.build.reportCompressedSize) {
+      if (environment.config.consumer !== "client" || !environment.config.build.reportCompressedSize) {
         return null;
       }
       if (shouldLogInfo && !hasCompressChunk) {
@@ -17928,7 +17924,7 @@ function buildReporterPlugin(config) {
             return chunk.type === "chunk" && chunk.code.length / 1e3 > chunkLimit;
           });
         }
-        if (hasLargeChunks && environment.config.build.minify && !config.build.lib && !environment.config.build.ssr) {
+        if (hasLargeChunks && environment.config.build.minify && !config.build.lib && environment.config.consumer === "client") {
           environment.logger.warn(
             colors$1.yellow(
               `
@@ -20383,7 +20379,7 @@ async function fileToBuiltUrl(pluginContext, id, skipPublicCheck = false, forceI
   if (cached) {
     return cached;
   }
-  const file = cleanUrl(id);
+  const { file, postfix } = splitFileAndPostfix(id);
   const content = await fsp.readFile(file);
   let url;
   if (shouldInline(pluginContext, file, id, content, forceInline)) {
@@ -20399,8 +20395,6 @@ async function fileToBuiltUrl(pluginContext, id, skipPublicCheck = false, forceI
       url = `data:${mimeType};base64,${content.toString("base64")}`;
     }
   } else {
-    const { search, hash } = parse$h(id);
-    const postfix = (search || "") + (hash || "");
     const originalFileName = normalizePath$3(
       path$n.relative(environment.config.root, file)
     );
@@ -20613,7 +20607,7 @@ function dataURIPlugin() {
       resolved = /* @__PURE__ */ new Map();
     },
     resolveId(id) {
-      if (!dataUriRE.test(id)) {
+      if (!id.trimStart().startsWith("data:")) {
         return;
       }
       const uri = new URL$3(id);
@@ -32478,6 +32472,9 @@ function getFirstKeyStartProps(prev) {
                 break loop;
         }
     }
+    while (prev[++i]?.type === 'space') {
+        /* loop */
+    }
     return prev.splice(i, prev.length);
 }
 function fixFlowSeqItems(fc) {
@@ -35153,10 +35150,6 @@ function ensureVersionQuery(resolved, id, options, ssr, depsOptimizer) {
   }
   return resolved;
 }
-function splitFileAndPostfix(path2) {
-  const file = cleanUrl(path2);
-  return { file, postfix: path2.slice(file.length) };
-}
 function tryFsResolve(fsPath, options, tryIndex = true, skipPackageJson = false) {
   const hashIndex = fsPath.indexOf("#");
   if (hashIndex >= 0 && isInNodeModules$1(fsPath)) {
@@ -35897,6 +35890,16 @@ const environmentColors = [
   colors$1.green,
   colors$1.gray
 ];
+function getDefaultResolvedEnvironmentOptions(config) {
+  return {
+    define: config.define,
+    resolve: config.resolve,
+    consumer: "server",
+    webCompatible: false,
+    dev: config.dev,
+    build: config.build
+  };
+}
 class PartialEnvironment {
   name;
   getTopLevelConfig() {
@@ -38188,7 +38191,8 @@ function getConfigHash(environment) {
           ...optimizeDeps2?.esbuildOptions,
           plugins: optimizeDeps2?.esbuildOptions?.plugins?.map((p) => p.name)
         }
-      }
+      },
+      webCompatible: config.webCompatible
     },
     (_, value) => {
       if (typeof value === "function" || value instanceof RegExp) {
@@ -38371,9 +38375,6 @@ function extractJsonErrorPosition(errorMessage, inputLength) {
   return errorMessageList ? Math.max(parseInt(errorMessageList[1], 10) - 1, 0) : void 0;
 }
 
-const ERR_OPTIMIZE_DEPS_PROCESSING_ERROR = "ERR_OPTIMIZE_DEPS_PROCESSING_ERROR";
-const ERR_OUTDATED_OPTIMIZED_DEP = "ERR_OUTDATED_OPTIMIZED_DEP";
-const ERR_FILE_NOT_FOUND_IN_OPTIMIZED_DEP_DIR = "ERR_FILE_NOT_FOUND_IN_OPTIMIZED_DEP_DIR";
 const debug$b = createDebugger("vite:optimize-deps");
 function optimizedDepsPlugin() {
   return {
@@ -45814,17 +45815,17 @@ function ssrFixStacktrace(e, moduleGraph) {
 }
 
 async function ssrLoadModule(url, server, fixStacktrace) {
-  server._ssrCompatModuleRunner ||= new SSRCompatModuleRunner(server);
+  const environment = server.environments.ssr;
+  server._ssrCompatModuleRunner ||= new SSRCompatModuleRunner(environment);
   url = unwrapId$1(url);
   return instantiateModule(
     url,
     server._ssrCompatModuleRunner,
-    server,
+    environment,
     fixStacktrace
   );
 }
-async function instantiateModule(url, runner, server, fixStacktrace) {
-  const environment = server.environments.ssr;
+async function instantiateModule(url, runner, environment, fixStacktrace) {
   const mod = await environment.moduleGraph.ensureEntryFromUrl(url);
   if (mod.ssrError) {
     throw mod.ssrError;
@@ -45841,7 +45842,7 @@ async function instantiateModule(url, runner, server, fixStacktrace) {
 `),
       {
         timestamp: true,
-        clear: server.config.clearScreen,
+        clear: environment.config.clearScreen,
         error: e
       }
     );
@@ -45849,31 +45850,31 @@ async function instantiateModule(url, runner, server, fixStacktrace) {
   }
 }
 class SSRCompatModuleRunner extends ModuleRunner {
-  constructor(server) {
+  constructor(environment) {
     super(
       {
-        root: server.environments.ssr.config.root,
+        root: environment.config.root,
         transport: {
-          fetchModule: (id, importer, options) => server.environments.ssr.fetchModule(id, importer, options)
+          fetchModule: (id, importer, options) => environment.fetchModule(id, importer, options)
         },
         sourcemapInterceptor: false,
         hmr: false
       },
       new ESModulesEvaluator()
     );
-    this.server = server;
+    this.environment = environment;
   }
-  async directRequest(id, mod, _callstack) {
-    const serverId = mod.meta && "serverId" in mod.meta && mod.meta.serverId;
-    if (!serverId) {
-      return super.directRequest(id, mod, _callstack);
+  async directRequest(url, mod, callstack) {
+    const id = mod.meta && "id" in mod.meta && mod.meta.id;
+    if (!id) {
+      return super.directRequest(url, mod, callstack);
     }
-    const viteMod = this.server.environments.ssr.moduleGraph.getModuleById(serverId);
+    const viteMod = this.environment.moduleGraph.getModuleById(id);
     if (!viteMod) {
-      return super.directRequest(id, mod, _callstack);
+      return super.directRequest(id, mod, callstack);
     }
     try {
-      const exports = await super.directRequest(id, mod, _callstack);
+      const exports = await super.directRequest(id, mod, callstack);
       viteMod.ssrModule = exports;
       return exports;
     } catch (err) {
@@ -46233,7 +46234,7 @@ Contents of line ${line}: ${code.split("\n")[line - 1]}`
     s.appendLeft(
       position,
       `
-Object.defineProperty(${ssrModuleExportsKey}, "${name}", { enumerable: true, configurable: true, get(){ return ${local} }});`
+Object.defineProperty(${ssrModuleExportsKey}, ${JSON.stringify(name)}, { enumerable: true, configurable: true, get(){ return ${local} }});`
     );
   }
   const imports = [];
@@ -46249,10 +46250,7 @@ Object.defineProperty(${ssrModuleExportsKey}, "${name}", { enumerable: true, con
     const importId = defineImport(hoistIndex, node.source.value, {
       importedNames: node.specifiers.map((s2) => {
         if (s2.type === "ImportSpecifier")
-          return s2.imported.type === "Identifier" ? s2.imported.name : (
-            // @ts-expect-error TODO: Estree types don't consider arbitrary module namespace specifiers yet
-            s2.imported.value
-          );
+          return getIdentifierNameOrLiteralValue(s2.imported);
         else if (s2.type === "ImportDefaultSpecifier") return "default";
       }).filter(isDefined)
     });
@@ -46267,8 +46265,7 @@ Object.defineProperty(${ssrModuleExportsKey}, "${name}", { enumerable: true, con
         } else {
           idToImportMap.set(
             spec.local.name,
-            `${importId}[${// @ts-expect-error TODO: Estree types don't consider arbitrary module namespace specifiers yet
-            JSON.stringify(spec.imported.value)}]`
+            `${importId}[${JSON.stringify(spec.imported.value)}]`
           );
         }
       } else if (spec.type === "ImportDefaultSpecifier") {
@@ -46299,27 +46296,35 @@ Object.defineProperty(${ssrModuleExportsKey}, "${name}", { enumerable: true, con
             node.start,
             node.source.value,
             {
-              importedNames: node.specifiers.map((s2) => s2.local.name)
+              importedNames: node.specifiers.map(
+                (s2) => getIdentifierNameOrLiteralValue(s2.local)
+              )
             }
           );
           for (const spec of node.specifiers) {
-            const exportedAs = spec.exported.type === "Identifier" ? spec.exported.name : (
-              // @ts-expect-error TODO: Estree types don't consider arbitrary module namespace specifiers yet
-              spec.exported.value
-            );
-            defineExport(
-              node.start,
-              exportedAs,
-              `${importId}.${spec.local.name}`
+            const exportedAs = getIdentifierNameOrLiteralValue(
+              spec.exported
             );
+            if (spec.local.type === "Identifier") {
+              defineExport(
+                node.start,
+                exportedAs,
+                `${importId}.${spec.local.name}`
+              );
+            } else {
+              defineExport(
+                node.start,
+                exportedAs,
+                `${importId}[${JSON.stringify(spec.local.value)}]`
+              );
+            }
           }
         } else {
           for (const spec of node.specifiers) {
             const local = spec.local.name;
             const binding = idToImportMap.get(local);
-            const exportedAs = spec.exported.type === "Identifier" ? spec.exported.name : (
-              // @ts-expect-error TODO: Estree types don't consider arbitrary module namespace specifiers yet
-              spec.exported.value
+            const exportedAs = getIdentifierNameOrLiteralValue(
+              spec.exported
             );
             defineExport(node.end, exportedAs, binding || local);
           }
@@ -46351,7 +46356,10 @@ Object.defineProperty(${ssrModuleExportsKey}, "default", { enumerable: true, con
       s.remove(node.start, node.end);
       const importId = defineImport(node.start, node.source.value);
       if (node.exported) {
-        defineExport(node.start, node.exported.name, `${importId}`);
+        const exportedAs = getIdentifierNameOrLiteralValue(
+          node.exported
+        );
+        defineExport(node.start, exportedAs, `${importId}`);
       } else {
         s.appendLeft(node.start, `${ssrExportAllKey}(${importId});
 `);
@@ -46394,18 +46402,13 @@ Object.defineProperty(${ssrModuleExportsKey}, "default", { enumerable: true, con
     }
   });
   let map = s.generateMap({ hires: "boundary" });
+  map.sources = [path$n.basename(url)];
+  map.sourcesContent = [originalCode];
   if (inMap && inMap.mappings && "sources" in inMap && inMap.sources.length > 0) {
     map = combineSourcemaps(url, [
-      {
-        ...map,
-        sources: inMap.sources,
-        sourcesContent: inMap.sourcesContent
-      },
+      map,
       inMap
     ]);
-  } else {
-    map.sources = [path$n.basename(url)];
-    map.sourcesContent = [originalCode];
   }
   return {
     code: s.toString(),
@@ -46415,6 +46418,9 @@ Object.defineProperty(${ssrModuleExportsKey}, "default", { enumerable: true, con
     dynamicDeps: [...dynamicDeps]
   };
 }
+function getIdentifierNameOrLiteralValue(node) {
+  return node.type === "Identifier" ? node.name : node.value;
+}
 const isNodeInPatternWeakSet = /* @__PURE__ */ new WeakSet();
 const setIsNodeInPattern = (node) => isNodeInPatternWeakSet.add(node);
 const isNodeInPattern = (node) => isNodeInPatternWeakSet.has(node);
@@ -52594,6 +52600,7 @@ const WebSocketServerRaw = process.versions.bun ? (
   import.meta.require("ws").WebSocketServer
 ) : WebSocketServerRaw_;
 const HMR_HEADER = "vite-hmr";
+const isWebSocketServer = Symbol("isWebSocketServer");
 const wsServerEvents = [
   "connection",
   "error",
@@ -52606,6 +52613,7 @@ function noop$3() {
 function createWebSocketServer(server, config, httpsOptions) {
   if (config.server.ws === false) {
     return {
+      [isWebSocketServer]: true,
       get clients() {
         return /* @__PURE__ */ new Set();
       },
@@ -52727,6 +52735,7 @@ ${e.stack || e.message}`),
   }
   let bufferedError = null;
   return {
+    [isWebSocketServer]: true,
     listen: () => {
       wsHttpServer?.listen(port, host);
     },
@@ -56026,7 +56035,6 @@ async function handleModuleSoftInvalidation(environment, mod, timestamp) {
 const modulePreloadPolyfillId = "vite/modulepreload-polyfill";
 const resolvedModulePreloadPolyfillId = "\0" + modulePreloadPolyfillId + ".js";
 function modulePreloadPolyfillPlugin(config) {
-  const skip = config.command !== "build" || config.build.ssr;
   let polyfillString;
   return {
     name: "vite:modulepreload-polyfill",
@@ -56037,7 +56045,7 @@ function modulePreloadPolyfillPlugin(config) {
     },
     load(id) {
       if (id === resolvedModulePreloadPolyfillId) {
-        if (skip) {
+        if (config.command !== "build" || this.environment.config.consumer !== "client") {
           return "";
         }
         if (!polyfillString) {
@@ -56265,7 +56273,7 @@ function buildHtmlPlugin(config) {
   preHooks.push(htmlEnvHook(config));
   postHooks.push(injectNonceAttributeTagHook(config));
   postHooks.push(postImportMapHook());
-  const processedHtml = /* @__PURE__ */ new Map();
+  const processedHtml = usePerEnvironmentState(() => /* @__PURE__ */ new Map());
   const isExcludedUrl = (url) => url[0] === "#" || isExternalUrl(url) || isDataUrl(url);
   isAsyncScriptMap.set(config, /* @__PURE__ */ new Map());
   return {
@@ -56533,7 +56541,7 @@ import ${JSON.stringify(url)}`;
             s.remove(start, end);
           }
         }
-        processedHtml.set(id, s.toString());
+        processedHtml(this).set(id, s.toString());
         const { modulePreload } = this.environment.config.build;
         if (modulePreload !== false && modulePreload.polyfill && (someScriptsAreAsync || someScriptsAreDefer)) {
           js = `import "${modulePreloadPolyfillId}";
@@ -56606,7 +56614,7 @@ ${js}`;
         });
         return tags;
       };
-      for (const [normalizedId, html] of processedHtml) {
+      for (const [normalizedId, html] of processedHtml(this)) {
         const relativeUrlPath = normalizePath$3(
           path$n.relative(config.root, normalizedId)
         );
@@ -57211,6 +57219,9 @@ function transformMiddleware(server) {
       if (publicDirInRoot && url.startsWith(publicPath)) {
         warnAboutExplicitPublicPathInUrl(url);
       }
+      if ((rawRE.test(url) || urlRE.test(url)) && !ensureServingAccess(url, server, res, next)) {
+        return;
+      }
       if (isJSRequest(url) || isImportRequest(url) || isCSSRequest(url) || isHTMLProxy(url)) {
         url = removeImportQuery(url);
         url = unwrapId$1(url);
@@ -57875,7 +57886,7 @@ class ModuleGraph {
     }
     if (ssrModules) {
       for (const mod of ssrModules) {
-        if (!this._client.getModuleById(mod.id)) {
+        if (mod.id == null || !this._client.getModuleById(mod.id)) {
           result.add(this.getBackwardCompatibleBrowserModuleNode(mod));
         }
       }
@@ -59987,7 +59998,7 @@ function preAliasPlugin(config) {
     name: "vite:pre-alias",
     async resolveId(id, importer, options) {
       const { environment } = this;
-      const ssr = options?.ssr === true;
+      const ssr = environment.config.consumer === "server";
       const depsOptimizer = environment.mode === "dev" ? environment.depsOptimizer : void 0;
       if (importer && depsOptimizer && bareImportRE.test(id) && !options?.scan && id !== "@vite/client" && id !== "@vite/env") {
         if (findPatterns.find((pattern) => matches(pattern, id))) {
@@ -61011,6 +61022,9 @@ function assetImportMetaUrlPlugin(config) {
             }
           }
           const url = rawUrl.slice(1, -1);
+          if (isDataUrl(url)) {
+            continue;
+          }
           let file;
           if (url[0] === ".") {
             file = slash$1(path$n.resolve(path$n.dirname(id), url));
@@ -61236,7 +61250,7 @@ function dynamicImportToGlob(node, sourceString) {
   }
 
   // Disallow ./*.ext
-  const ownDirectoryStarExtension = /^\.\/\*\.[\w]+$/;
+  const ownDirectoryStarExtension = /^\.\/\*\.\w+$/;
   if (ownDirectoryStarExtension.test(glob)) {
     throw new VariableDynamicImportError(
       `${
@@ -61593,7 +61607,8 @@ class EnvironmentPluginContainer {
       info: noop,
       warn: noop,
       // @ts-expect-error noop
-      error: noop
+      error: noop,
+      environment
     };
     const utils = createPluginHookUtils(plugins);
     this.getSortedPlugins = utils.getSortedPlugins;
@@ -62465,7 +62480,7 @@ function cssPostPlugin(config) {
       chunkCSSMap = /* @__PURE__ */ new Map();
       codeSplitEmitQueue = createSerialPromiseQueue();
     },
-    async transform(css, id, options) {
+    async transform(css, id) {
       if (!isCSSRequest(id) || commonjsProxyRE.test(id) || SPECIAL_QUERY_RE.test(id)) {
         return;
       }
@@ -62503,7 +62518,7 @@ function cssPostPlugin(config) {
         if (isDirectCSSRequest(id)) {
           return null;
         }
-        if (options?.ssr) {
+        if (this.environment.config.consumer !== "client") {
           return modulesCode || `export default ${JSON.stringify(css)}`;
         }
         if (inlined) {
@@ -62710,7 +62725,7 @@ function cssPostPlugin(config) {
             });
             generatedAssets.set(referenceId, { originalFileName, isEntry });
             chunk.viteMetadata.importedCss.add(this.getFileName(referenceId));
-          } else if (!config.build.ssr) {
+          } else if (this.environment.config.consumer === "client") {
             chunkCSS = await finalizeCss(chunkCSS, true, config);
             let cssString = JSON.stringify(chunkCSS);
             cssString = renderAssetUrlInJS(this, chunk, opts, cssString)?.toString() || cssString;
@@ -63229,8 +63244,8 @@ function createCachedImport(imp) {
     return cached;
   };
 }
-const importPostcssImport = createCachedImport(() => import('./dep-CSD_20z-.js').then(function (n) { return n.i; }));
-const importPostcssModules = createCachedImport(() => import('./dep-D9t7igss.js').then(function (n) { return n.i; }));
+const importPostcssImport = createCachedImport(() => import('./dep-BabmomGK.js').then(function (n) { return n.i; }));
+const importPostcssModules = createCachedImport(() => import('./dep-DTHr9Se7.js').then(function (n) { return n.i; }));
 const importPostcss = createCachedImport(() => import('postcss'));
 const preprocessorWorkerControllerCache = /* @__PURE__ */ new WeakMap();
 let alwaysFakeWorkerWorkerControllerCache;
@@ -63708,7 +63723,7 @@ const makeModernScssWorker = (environment, resolvers, alias, maxWorkers) => {
             fileURLToPath2(canonicalUrl),
             options.filename
           );
-          return { contents, syntax };
+          return { contents, syntax, sourceMapUrl: canonicalUrl };
         }
       };
       sassOptions.importers = [
@@ -63738,11 +63753,12 @@ const makeModernScssWorker = (environment, resolvers, alias, maxWorkers) => {
   return worker;
 };
 const makeModernCompilerScssWorker = (environment, resolvers, alias, _maxWorkers) => {
-  let compiler;
+  let compilerPromise;
   const worker = {
     async run(sassPath, data, options) {
       const sass = (await import(pathToFileURL(sassPath).href)).default;
-      compiler ??= await sass.initAsyncCompiler();
+      compilerPromise ??= sass.initAsyncCompiler();
+      const compiler = await compilerPromise;
       const sassOptions = { ...options };
       sassOptions.url = pathToFileURL(options.filename);
       sassOptions.sourceMap = options.enableSourcemap;
@@ -63773,7 +63789,7 @@ const makeModernCompilerScssWorker = (environment, resolvers, alias, _maxWorkers
             resolvers.sass
           );
           const contents = result2.contents ?? await fsp.readFile(result2.file, "utf-8");
-          return { contents, syntax };
+          return { contents, syntax, sourceMapUrl: canonicalUrl };
         }
       };
       sassOptions.importers = [
@@ -63790,8 +63806,8 @@ const makeModernCompilerScssWorker = (environment, resolvers, alias, _maxWorkers
       };
     },
     async stop() {
-      compiler?.dispose();
-      compiler = void 0;
+      (await compilerPromise)?.dispose();
+      compilerPromise = void 0;
     }
   };
   return worker;
@@ -64277,7 +64293,10 @@ async function compileLightningCSS(id, src, environment, urlReplacer) {
         }
         deps.add(dep.url);
         if (urlReplacer) {
-          const replaceUrl = await urlReplacer(dep.url, dep.loc.filePath);
+          const replaceUrl = await urlReplacer(
+            dep.url,
+            toAbsolute(dep.loc.filePath)
+          );
           css = css.replace(dep.placeholder, () => replaceUrl);
         } else {
           css = css.replace(dep.placeholder, () => dep.url);
@@ -64446,25 +64465,26 @@ function preload(baseModule, deps, importerUrl) {
       })
     );
   }
+  function handlePreloadError(err) {
+    const e = new Event("vite:preloadError", {
+      cancelable: true
+    });
+    e.payload = err;
+    window.dispatchEvent(e);
+    if (!e.defaultPrevented) {
+      throw err;
+    }
+  }
   return promise.then((res) => {
     for (const item of res || []) {
       if (item.status !== "rejected") continue;
-      const e = new Event("vite:preloadError", {
-        cancelable: true
-      });
-      e.payload = item.reason;
-      window.dispatchEvent(e);
-      if (!e.defaultPrevented) {
-        throw item.reason;
-      }
+      handlePreloadError(item.reason);
     }
-    return baseModule();
+    return baseModule().catch(handlePreloadError);
   });
 }
 function buildImportAnalysisPlugin(config) {
-  const ssr = !!config.build.ssr;
-  const isWorker = config.isWorker;
-  const insertPreload = !(ssr || !!config.build.lib || isWorker);
+  const getInsertPreload = (environment) => environment.config.consumer === "client" && !config.isWorker && !config.build.lib;
   const renderBuiltUrl = config.experimental.renderBuiltUrl;
   const isRelativeBase = config.base === "./" || config.base === "";
   return {
@@ -64511,6 +64531,7 @@ function buildImportAnalysisPlugin(config) {
       if (!imports.length) {
         return null;
       }
+      const insertPreload = getInsertPreload(this.environment);
       const dynamicImports = {};
       if (insertPreload) {
         let match;
@@ -64603,7 +64624,7 @@ function buildImportAnalysisPlugin(config) {
       if (format !== "es") {
         return;
       }
-      if (!insertPreload) {
+      if (!getInsertPreload(this.environment)) {
         const removedPureCssFiles = removedPureCssFilesCache.get(config);
         if (removedPureCssFiles && removedPureCssFiles.size > 0) {
           for (const file in bundle) {
@@ -65655,7 +65676,7 @@ function escapeId(id) {
 }
 const getResolveUrl = (path2, URL = "URL") => `new ${URL}(${path2}).href`;
 const getRelativeUrlFromDocument = (relativePath, umd = false) => getResolveUrl(
-  `'${escapeId(partialEncodeURIPath(relativePath))}', ${umd ? `typeof document === 'undefined' ? location.href : ` : ""}document.currentScript && document.currentScript.src || document.baseURI`
+  `'${escapeId(partialEncodeURIPath(relativePath))}', ${umd ? `typeof document === 'undefined' ? location.href : ` : ""}document.currentScript && document.currentScript.tagName.toUpperCase() === 'SCRIPT' && document.currentScript.src || document.baseURI`
 );
 const getFileUrlFromFullPath = (path2) => `require('u' + 'rl').pathToFileURL(${path2}).href`;
 const getFileUrlFromRelativePath = (path2) => getFileUrlFromFullPath(`__dirname + '/${escapeId(path2)}'`);
@@ -65952,14 +65973,15 @@ async function fetchModule(environment, url, importer, options = {}) {
     );
   }
   if (options.inlineSourceMap !== false) {
-    result = inlineSourceMap(mod, result, options.processSourceMap);
+    result = inlineSourceMap(mod, result, options.startOffset);
   }
   if (result.code[0] === "#")
     result.code = result.code.replace(/^#!.*/, (s) => " ".repeat(s.length));
   return {
     code: result.code,
     file: mod.file,
-    serverId: mod.id,
+    id: mod.id,
+    url: mod.url,
     invalidate: !cached
   };
 }
@@ -65967,7 +65989,7 @@ const OTHER_SOURCE_MAP_REGEXP = new RegExp(
   `//# ${SOURCEMAPPING_URL}=data:application/json[^,]+base64,([A-Za-z0-9+/=]+)$`,
   "gm"
 );
-function inlineSourceMap(mod, result, processSourceMap) {
+function inlineSourceMap(mod, result, startOffset) {
   const map = result.map;
   let code = result.code;
   if (!map || !("version" in map) || code.includes(MODULE_RUNNER_SOURCEMAPPING_SOURCE))
@@ -65975,7 +65997,9 @@ function inlineSourceMap(mod, result, processSourceMap) {
   OTHER_SOURCE_MAP_REGEXP.lastIndex = 0;
   if (OTHER_SOURCE_MAP_REGEXP.test(code))
     code = code.replace(OTHER_SOURCE_MAP_REGEXP, "");
-  const sourceMap = processSourceMap?.(map) || map;
+  const sourceMap = startOffset ? Object.assign({}, map, {
+    mappings: ";".repeat(startOffset) + map.mappings
+  }) : map;
   result.code = `${code.trimEnd()}
 //# sourceURL=${mod.id}
 ${MODULE_RUNNER_SOURCEMAPPING_SOURCE}
@@ -66071,7 +66095,7 @@ function createDepsOptimizer(environment) {
     firstRunCalled = !!cachedMetadata;
     metadata = depsOptimizer.metadata = cachedMetadata || initDepsOptimizerMetadata(environment, sessionTimestamp);
     if (!cachedMetadata) {
-      environment._onCrawlEnd(onCrawlEnd);
+      environment.waitForRequestsIdle().then(onCrawlEnd);
       waitingForCrawlEnd = true;
       currentlyProcessing = true;
       const manuallyIncludedDeps = {};
@@ -66848,7 +66872,7 @@ class DevEnvironment extends BaseEnvironment {
   /**
    * @internal
    */
-  _ssrRunnerOptions;
+  _remoteRunnerOptions;
   get pluginContainer() {
     if (!this._pluginContainer)
       throw new Error(
@@ -66868,10 +66892,6 @@ class DevEnvironment extends BaseEnvironment {
    * @internal
    */
   _pendingRequests;
-  /**
-   * @internal
-   */
-  _onCrawlEndCallbacks;
   /**
    * @internal
    */
@@ -66899,12 +66919,9 @@ class DevEnvironment extends BaseEnvironment {
       (url) => this.pluginContainer.resolveId(url, void 0)
     );
     this.hot = context.hot || createNoopHotChannel();
-    this._onCrawlEndCallbacks = [];
-    this._crawlEndFinder = setupOnCrawlEnd(() => {
-      this._onCrawlEndCallbacks.forEach((cb) => cb());
-    });
-    this._ssrRunnerOptions = context.runner ?? {};
-    context.runner?.transport?.register(this);
+    this._crawlEndFinder = setupOnCrawlEnd();
+    this._remoteRunnerOptions = context.remoteRunner ?? {};
+    context.remoteRunner?.transport?.register(this);
     this.hot.on("vite:invalidate", async ({ path, message }) => {
       invalidateModule(this, {
         path,
@@ -66934,7 +66951,7 @@ class DevEnvironment extends BaseEnvironment {
   }
   fetchModule(id, importer, options) {
     return fetchModule(this, id, importer, {
-      ...this._ssrRunnerOptions,
+      ...this._remoteRunnerOptions,
       ...options
     });
   }
@@ -66965,6 +66982,8 @@ class DevEnvironment extends BaseEnvironment {
     await Promise.allSettled([
       this.pluginContainer.close(),
       this.depsOptimizer?.close(),
+      // WebSocketServer is independent of HotChannel and should not be closed on environment close
+      isWebSocketServer in this.hot ? Promise.resolve() : this.hot.close(),
       (async () => {
         while (this._pendingRequests.size > 0) {
           await Promise.allSettled(
@@ -66993,13 +67012,6 @@ class DevEnvironment extends BaseEnvironment {
   _registerRequestProcessing(id, done) {
     this._crawlEndFinder.registerRequestProcessing(id, done);
   }
-  /**
-   * @internal
-   * TODO: use waitForRequestsIdle in the optimizer instead of this function
-   */
-  _onCrawlEnd(cb) {
-    this._onCrawlEndCallbacks.push(cb);
-  }
 }
 function invalidateModule(environment, m) {
   const mod = environment.moduleGraph.urlToModuleMap.get(m.path);
@@ -67020,7 +67032,7 @@ function invalidateModule(environment, m) {
   }
 }
 const callCrawlEndIfIdleAfterMs = 50;
-function setupOnCrawlEnd(onCrawlEnd) {
+function setupOnCrawlEnd() {
   const registeredIds = /* @__PURE__ */ new Set();
   const seenIds = /* @__PURE__ */ new Set();
   const onCrawlEndPromiseWithResolvers = promiseWithResolvers();
@@ -67029,14 +67041,6 @@ function setupOnCrawlEnd(onCrawlEnd) {
   function cancel() {
     cancelled = true;
   }
-  let crawlEndCalled = false;
-  function callOnCrawlEnd() {
-    if (!cancelled && !crawlEndCalled) {
-      crawlEndCalled = true;
-      onCrawlEnd();
-    }
-    onCrawlEndPromiseWithResolvers.resolve();
-  }
   function registerRequestProcessing(id, done) {
     if (!seenIds.has(id)) {
       seenIds.add(id);
@@ -67068,7 +67072,7 @@ function setupOnCrawlEnd(onCrawlEnd) {
   }
   async function callOnCrawlEndWhenIdle() {
     if (cancelled || registeredIds.size > 0) return;
-    callOnCrawlEnd();
+    onCrawlEndPromiseWithResolvers.resolve();
   }
   return {
     registerRequestProcessing,
@@ -67077,23 +67081,141 @@ 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."
+class ServerHMRBroadcasterClient {
+  constructor(hotChannel) {
+    this.hotChannel = hotChannel;
+  }
+  send(...args) {
+    let payload;
+    if (typeof args[0] === "string") {
+      payload = {
+        type: "custom",
+        event: args[0],
+        data: args[1]
+      };
+    } else {
+      payload = args[0];
+    }
+    if (payload.type !== "custom") {
+      throw new Error(
+        "Cannot send non-custom events from the client to the server."
+      );
+    }
+    this.hotChannel.send(payload);
+  }
+}
+class ServerHMRConnector {
+  constructor(hotChannel) {
+    this.hotChannel = hotChannel;
+    this.hmrClient = new ServerHMRBroadcasterClient(hotChannel);
+    hotChannel.api.outsideEmitter.on("send", (payload) => {
+      this.handlers.forEach((listener) => listener(payload));
+    });
+    this.hotChannel = hotChannel;
+  }
+  handlers = [];
+  hmrClient;
+  connected = false;
+  isReady() {
+    return this.connected;
+  }
+  send(payload_) {
+    const payload = payload_;
+    this.hotChannel.api.innerEmitter.emit(
+      payload.event,
+      payload.data,
+      this.hmrClient
     );
   }
-  return new DevEnvironment(name, config, {
-    ...context,
-    runner: {
-      processSourceMap(map) {
-        return Object.assign({}, map, {
-          mappings: ";".repeat(asyncFunctionDeclarationPaddingLineCount) + map.mappings
-        });
+  onUpdate(handler) {
+    this.handlers.push(handler);
+    handler({ type: "connected" });
+    this.connected = true;
+  }
+}
+
+function createHMROptions(environment, options) {
+  if (environment.config.server.hmr === false || options.hmr === false) {
+    return false;
+  }
+  if (options.hmr?.connection) {
+    return {
+      connection: options.hmr.connection,
+      logger: options.hmr.logger
+    };
+  }
+  if (!("api" in environment.hot)) return false;
+  const connection = new ServerHMRConnector(environment.hot);
+  return {
+    connection,
+    logger: options.hmr?.logger
+  };
+}
+const prepareStackTrace = {
+  retrieveFile(id) {
+    if (existsSync$1(id)) {
+      return readFileSync$1(id, "utf-8");
+    }
+  }
+};
+function resolveSourceMapOptions(options) {
+  if (options.sourcemapInterceptor != null) {
+    if (options.sourcemapInterceptor === "prepareStackTrace") {
+      return prepareStackTrace;
+    }
+    if (typeof options.sourcemapInterceptor === "object") {
+      return { ...prepareStackTrace, ...options.sourcemapInterceptor };
+    }
+    return options.sourcemapInterceptor;
+  }
+  if (typeof process !== "undefined" && "setSourceMapsEnabled" in process) {
+    return "node";
+  }
+  return prepareStackTrace;
+}
+function createServerModuleRunner(environment, options = {}) {
+  const hmr = createHMROptions(environment, options);
+  return new ModuleRunner(
+    {
+      ...options,
+      root: environment.config.root,
+      transport: {
+        fetchModule: (id, importer, options2) => environment.fetchModule(id, importer, options2)
       },
-      ...context.runner
+      hmr,
+      sourcemapInterceptor: resolveSourceMapOptions(options)
+    },
+    options.evaluator || new ESModulesEvaluator()
+  );
+}
+
+function createRunnableDevEnvironment(name, config, context = {}) {
+  if (context.hot == null) {
+    context.hot = createServerHotChannel();
+  }
+  return new RunnableDevEnvironment(name, config, context);
+}
+function isRunnableDevEnvironment(environment) {
+  return environment instanceof RunnableDevEnvironment;
+}
+class RunnableDevEnvironment extends DevEnvironment {
+  _runner;
+  _runnerFactory;
+  constructor(name, config, context) {
+    super(name, config, context);
+    this._runnerFactory = context.runner;
+  }
+  get runner() {
+    if (this._runner) {
+      return this._runner;
     }
-  });
+    if (this._runnerFactory) {
+      this._runner = this._runnerFactory(this);
+      return this._runner;
+    }
+    this._runner = createServerModuleRunner(this);
+    return this._runner;
+  }
 }
 
 // NOTE: supports Node 6.x
@@ -67380,9 +67502,7 @@ function defaultCreateClientDevEnvironment(name, config, context) {
   });
 }
 function defaultCreateSsrDevEnvironment(name, config) {
-  return createNodeDevEnvironment(name, config, {
-    hot: createServerHotChannel()
-  });
+  return createRunnableDevEnvironment(name, config);
 }
 function defaultCreateDevEnvironment(name, config) {
   return new DevEnvironment(name, config, {
@@ -67441,16 +67561,6 @@ function getDefaultEnvironmentOptions(config) {
     build: config.build
   };
 }
-function getDefaultResolvedEnvironmentOptions(config) {
-  return {
-    define: config.define,
-    resolve: config.resolve,
-    consumer: "server",
-    webCompatible: false,
-    dev: config.dev,
-    build: config.build
-  };
-}
 function checkBadCharactersInPath(path2, logger) {
   const badChars = [];
   if (path2.includes("#")) {
@@ -67998,7 +68108,7 @@ async function loadConfigFromFile(configEnv, configFile, configRoot = process.cw
     debug?.("no config file found.");
     return null;
   }
-  const isESM = isFilePathESM(resolvedPath);
+  const isESM = typeof process.versions.deno === "string" || isFilePathESM(resolvedPath);
   try {
     const bundled = await bundleConfigFile(resolvedPath, isESM);
     const userConfig = await loadConfigFromBundledFile(
@@ -68240,4 +68350,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, 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, createServerHotChannel 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 { rollupVersion as A, BuildEnvironment as B, send$1 as C, DevEnvironment as D, createLogger as E, searchForWorkspaceRoot as F, isFileServingAllowed as G, isFileLoadingAllowed as H, loadEnv as I, resolveEnvPrefix as J, colors$1 as K, getDefaultExportFromCjs as L, commonjsGlobal as M, index$1 as N, index as O, build$1 as P, preview$1 as Q, 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, createRunnableDevEnvironment as k, loadConfigFromFile as l, isRunnableDevEnvironment as m, fetchModule as n, optimizeDeps as o, preview as p, createServerModuleRunner as q, resolveConfig as r, sortUserPlugins as s, transformWithEsbuild as t, createServerHotChannel as u, ssrTransform as v, normalizePath$3 as w, mergeConfig as x, mergeAlias as y, createFilter as z };