vite 6.0.0-beta.1 → 6.0.0-beta.10

package/dist/node/module-runner.js

@@ -16,11 +16,24 @@ function cleanUrl(url) {
 function isPrimitive(value) {
   return !value || typeof value != "object" && typeof value != "function";
 }
-function withTrailingSlash(path) {
-  return path[path.length - 1] !== "/" ? `${path}/` : path;
-}
 const AsyncFunction = async function() {
-}.constructor, _DRIVE_LETTER_START_RE = /^[A-Za-z]:\//;
+}.constructor;
+let asyncFunctionDeclarationPaddingLineCount;
+function getAsyncFunctionDeclarationPaddingLineCount() {
+  if (typeof asyncFunctionDeclarationPaddingLineCount > "u") {
+    const body = "/*code*/", source = new AsyncFunction("a", "b", body).toString();
+    asyncFunctionDeclarationPaddingLineCount = source.slice(0, source.indexOf(body)).split(`
+`).length - 1;
+  }
+  return asyncFunctionDeclarationPaddingLineCount;
+}
+function promiseWithResolvers() {
+  let resolve2, reject;
+  return { promise: new Promise((_resolve, _reject) => {
+    resolve2 = _resolve, reject = _reject;
+  }), resolve: resolve2, reject };
+}
+const _DRIVE_LETTER_START_RE = /^[A-Za-z]:\//;
 function normalizeWindowsPath(input = "") {
   return input && input.replace(/\\/g, "/").replace(_DRIVE_LETTER_START_RE, (r) => r.toUpperCase());
 }
@@ -236,94 +249,97 @@ function getOriginalPosition(map, needle) {
 const MODULE_RUNNER_SOURCEMAPPING_REGEXP = new RegExp(
   `//# ${SOURCEMAPPING_URL}=data:application/json;base64,(.+)`
 );
-class ModuleCacheMap extends Map {
-  root;
-  constructor(root, entries) {
-    super(entries), this.root = withTrailingSlash(root);
-  }
-  normalize(fsPath) {
-    return normalizeModuleId(fsPath, this.root);
-  }
+class EvaluatedModuleNode {
+  constructor(id, url) {
+    this.id = id, this.url = url, this.file = cleanUrl(id);
+  }
+  importers = /* @__PURE__ */ new Set();
+  imports = /* @__PURE__ */ new Set();
+  evaluated = !1;
+  meta;
+  promise;
+  exports;
+  file;
+  map;
+}
+class EvaluatedModules {
+  idToModuleMap = /* @__PURE__ */ new Map();
+  fileToModulesMap = /* @__PURE__ */ new Map();
+  urlToIdModuleMap = /* @__PURE__ */ new Map();
   /**
-   * Assign partial data to the map
+   * Returns the module node by the resolved module ID. Usually, module ID is
+   * the file system path with query and/or hash. It can also be a virtual module.
+   *
+   * Module runner graph will have 1 to 1 mapping with the server module graph.
+   * @param id Resolved module ID
    */
-  update(fsPath, mod) {
-    return fsPath = this.normalize(fsPath), super.has(fsPath) ? Object.assign(super.get(fsPath), mod) : this.setByModuleId(fsPath, mod), this;
-  }
-  setByModuleId(modulePath, mod) {
-    return super.set(modulePath, mod);
-  }
-  set(fsPath, mod) {
-    return this.setByModuleId(this.normalize(fsPath), mod);
-  }
-  getByModuleId(modulePath) {
-    super.has(modulePath) || this.setByModuleId(modulePath, {});
-    const mod = super.get(modulePath);
-    return mod.imports || Object.assign(mod, {
-      imports: /* @__PURE__ */ new Set(),
-      importers: /* @__PURE__ */ new Set(),
-      timestamp: 0
-    }), mod;
-  }
-  get(fsPath) {
-    return this.getByModuleId(this.normalize(fsPath));
-  }
-  deleteByModuleId(modulePath) {
-    return super.delete(modulePath);
-  }
-  delete(fsPath) {
-    return this.deleteByModuleId(this.normalize(fsPath));
+  getModuleById(id) {
+    return this.idToModuleMap.get(id);
   }
-  invalidateUrl(id) {
-    const module = this.get(id);
-    this.invalidateModule(module);
-  }
-  invalidateModule(module) {
-    module.evaluated = !1, module.meta = void 0, module.map = void 0, module.promise = void 0, module.exports = void 0, module.imports?.clear();
+  /**
+   * Returns all modules related to the file system path. Different modules
+   * might have different query parameters or hash, so it's possible to have
+   * multiple modules for the same file.
+   * @param file The file system path of the module
+   */
+  getModulesByFile(file) {
+    return this.fileToModulesMap.get(file);
   }
   /**
-   * Invalidate modules that dependent on the given modules, up to the main entry
+   * Returns the module node by the URL that was used in the import statement.
+   * Unlike module graph on the server, the URL is not resolved and is used as is.
+   * @param url Server URL that was used in the import statement
    */
-  invalidateDepTree(ids, invalidated = /* @__PURE__ */ new Set()) {
-    for (const _id of ids) {
-      const id = this.normalize(_id);
-      if (invalidated.has(id)) continue;
-      invalidated.add(id);
-      const mod = super.get(id);
-      mod?.importers && this.invalidateDepTree(mod.importers, invalidated), this.invalidateUrl(id);
-    }
-    return invalidated;
+  getModuleByUrl(url) {
+    return this.urlToIdModuleMap.get(unwrapId(url));
   }
   /**
-   * Invalidate dependency modules of the given modules, down to the bottom-level dependencies
+   * Ensure that module is in the graph. If the module is already in the graph,
+   * it will return the existing module node. Otherwise, it will create a new
+   * module node and add it to the graph.
+   * @param id Resolved module ID
+   * @param url URL that was used in the import statement
    */
-  invalidateSubDepTree(ids, invalidated = /* @__PURE__ */ new Set()) {
-    for (const _id of ids) {
-      const id = this.normalize(_id);
-      if (invalidated.has(id)) continue;
-      invalidated.add(id);
-      const subIds = Array.from(super.entries()).filter(([, mod]) => mod.importers?.has(id)).map(([key]) => key);
-      subIds.length && this.invalidateSubDepTree(subIds, invalidated), super.delete(id);
+  ensureModule(id, url) {
+    if (id = normalizeModuleId(id), this.idToModuleMap.has(id)) {
+      const moduleNode2 = this.idToModuleMap.get(id);
+      return this.urlToIdModuleMap.set(url, moduleNode2), moduleNode2;
     }
-    return invalidated;
+    const moduleNode = new EvaluatedModuleNode(id, url);
+    this.idToModuleMap.set(id, moduleNode), this.urlToIdModuleMap.set(url, moduleNode);
+    const fileModules = this.fileToModulesMap.get(moduleNode.file) || /* @__PURE__ */ new Set();
+    return fileModules.add(moduleNode), this.fileToModulesMap.set(moduleNode.file, fileModules), moduleNode;
   }
-  getSourceMap(moduleId) {
-    const mod = this.get(moduleId);
+  invalidateModule(node) {
+    node.evaluated = !1, node.meta = void 0, node.map = void 0, node.promise = void 0, node.exports = void 0, node.imports.clear();
+  }
+  /**
+   * Extracts the inlined source map from the module code and returns the decoded
+   * source map. If the source map is not inlined, it will return null.
+   * @param id Resolved module ID
+   */
+  getModuleSourceMapById(id) {
+    const mod = this.getModuleById(id);
+    if (!mod) return null;
     if (mod.map) return mod.map;
     if (!mod.meta || !("code" in mod.meta)) return null;
     const mapString = MODULE_RUNNER_SOURCEMAPPING_REGEXP.exec(
       mod.meta.code
     )?.[1];
-    if (!mapString) return null;
-    const baseFile = mod.meta.file || moduleId.split("?")[0];
-    return mod.map = new DecodedMap(JSON.parse(decodeBase64(mapString)), baseFile), mod.map;
+    return mapString ? (mod.map = new DecodedMap(JSON.parse(decodeBase64(mapString)), mod.file), mod.map) : null;
+  }
+  clear() {
+    this.idToModuleMap.clear(), this.fileToModulesMap.clear(), this.urlToIdModuleMap.clear();
   }
 }
-const prefixedBuiltins = /* @__PURE__ */ new Set(["node:test", "node:sqlite"]);
-function normalizeModuleId(file, root) {
-  if (prefixedBuiltins.has(file)) return file;
-  let unixFile = slash(file).replace(/^\/@fs\//, isWindows ? "" : "/").replace(/^node:/, "").replace(/^\/+/, "/");
-  return unixFile.startsWith(root) && (unixFile = unixFile.slice(root.length - 1)), unixFile.replace(/^file:\//, "/");
+const prefixedBuiltins = /* @__PURE__ */ new Set([
+  "node:sea",
+  "node:sqlite",
+  "node:test",
+  "node:test/reporters"
+]);
+function normalizeModuleId(file) {
+  return prefixedBuiltins.has(file) ? file : slash(file).replace(/^\/@fs\//, isWindows ? "" : "/").replace(/^node:/, "").replace(/^\/+/, "/").replace(/^file:\//, "/");
 }
 class HMRContext {
   constructor(hmrClient, ownerPath) {
@@ -403,9 +419,7 @@ class HMRContext {
     removeFromMap(this.hmrClient.customListenersMap), removeFromMap(this.newListeners);
   }
   send(event, data) {
-    this.hmrClient.messenger.send(
-      JSON.stringify({ type: "custom", event, data })
-    );
+    this.hmrClient.send({ type: "custom", event, data });
   }
   acceptDeps(deps, callback = () => {
   }) {
@@ -419,21 +433,9 @@ class HMRContext {
     }), this.hmrClient.hotModulesMap.set(this.ownerPath, mod);
   }
 }
-class HMRMessenger {
-  constructor(connection) {
-    this.connection = connection;
-  }
-  queue = [];
-  send(message) {
-    this.queue.push(message), this.flush();
-  }
-  flush() {
-    this.connection.isReady() && (this.queue.forEach((msg) => this.connection.send(msg)), this.queue = []);
-  }
-}
 class HMRClient {
-  constructor(logger, connection, importUpdatedModule) {
-    this.logger = logger, this.importUpdatedModule = importUpdatedModule, this.messenger = new HMRMessenger(connection);
+  constructor(logger, transport, importUpdatedModule) {
+    this.logger = logger, this.transport = transport, this.importUpdatedModule = importUpdatedModule;
   }
   hotModulesMap = /* @__PURE__ */ new Map();
   disposeMap = /* @__PURE__ */ new Map();
@@ -441,17 +443,19 @@ class HMRClient {
   dataMap = /* @__PURE__ */ new Map();
   customListenersMap = /* @__PURE__ */ new Map();
   ctxToListenersMap = /* @__PURE__ */ new Map();
-  messenger;
   async notifyListeners(event, data) {
     const cbs = this.customListenersMap.get(event);
     cbs && await Promise.allSettled(cbs.map((cb) => cb(data)));
   }
+  send(payload) {
+    this.transport.send(payload);
+  }
   clear() {
     this.hotModulesMap.clear(), this.disposeMap.clear(), this.pruneMap.clear(), this.dataMap.clear(), this.customListenersMap.clear(), this.ctxToListenersMap.clear();
   }
   // After an HMR update, some modules are no longer imported on the page
   // but they may have left behind side effects that need to be cleaned up
-  // (.e.g style injections)
+  // (e.g. style injections)
   async prunePaths(paths) {
     await Promise.all(
       paths.map((path) => {
@@ -525,7 +529,184 @@ const {${missingBindings.join(", ")}} = pkg;
     }
   }
 }
-const ssrModuleExportsKey = "__vite_ssr_exports__", ssrImportKey = "__vite_ssr_import__", ssrDynamicImportKey = "__vite_ssr_dynamic_import__", ssrExportAllKey = "__vite_ssr_exportAll__", ssrImportMetaKey = "__vite_ssr_import_meta__", noop = () => {
+let urlAlphabet = "useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict", nanoid = (size = 21) => {
+  let id = "", i = size;
+  for (; i--; )
+    id += urlAlphabet[Math.random() * 64 | 0];
+  return id;
+};
+function reviveInvokeError(e) {
+  return Object.assign(new Error(e.message || "Unknown invoke error"), e);
+}
+const createInvokeableTransport = (transport) => {
+  if (transport.invoke)
+    return {
+      ...transport,
+      async invoke(name, data) {
+        const result = await transport.invoke({
+          type: "custom",
+          event: "vite:invoke",
+          data: {
+            id: "send",
+            name,
+            data
+          }
+        });
+        if ("e" in result)
+          throw reviveInvokeError(result.e);
+        return result.r;
+      }
+    };
+  if (!transport.send || !transport.connect)
+    throw new Error(
+      "transport must implement send and connect when invoke is not implemented"
+    );
+  const rpcPromises = /* @__PURE__ */ new Map();
+  return {
+    ...transport,
+    connect({ onMessage, onDisconnection }) {
+      return transport.connect({
+        onMessage(payload) {
+          if (payload.type === "custom" && payload.event === "vite:invoke") {
+            const data = payload.data;
+            if (data.id.startsWith("response:")) {
+              const invokeId = data.id.slice(9), promise = rpcPromises.get(invokeId);
+              if (!promise) return;
+              promise.timeoutId && clearTimeout(promise.timeoutId), rpcPromises.delete(invokeId);
+              const { e, r } = data.data;
+              e ? promise.reject(reviveInvokeError(e)) : promise.resolve(r);
+              return;
+            }
+          }
+          onMessage(payload);
+        },
+        onDisconnection
+      });
+    },
+    disconnect() {
+      return rpcPromises.forEach((promise) => {
+        promise.reject(
+          new Error(
+            `transport was disconnected, cannot call ${JSON.stringify(promise.name)}`
+          )
+        );
+      }), rpcPromises.clear(), transport.disconnect?.();
+    },
+    send(data) {
+      return transport.send(data);
+    },
+    async invoke(name, data) {
+      const promiseId = nanoid(), wrappedData = {
+        type: "custom",
+        event: "vite:invoke",
+        data: {
+          name,
+          id: `send:${promiseId}`,
+          data
+        }
+      }, sendPromise = transport.send(wrappedData), { promise, resolve: resolve2, reject } = promiseWithResolvers(), timeout = transport.timeout ?? 6e4;
+      let timeoutId;
+      return timeout > 0 && (timeoutId = setTimeout(() => {
+        rpcPromises.delete(promiseId), reject(
+          new Error(
+            `transport invoke timed out after ${timeout}ms (data: ${JSON.stringify(wrappedData)})`
+          )
+        );
+      }, timeout), timeoutId?.unref?.()), rpcPromises.set(promiseId, { resolve: resolve2, reject, name, timeoutId }), sendPromise && sendPromise.catch((err) => {
+        clearTimeout(timeoutId), rpcPromises.delete(promiseId), reject(err);
+      }), await promise;
+    }
+  };
+}, normalizeModuleRunnerTransport = (transport) => {
+  const invokeableTransport = createInvokeableTransport(transport);
+  let isConnected = !invokeableTransport.connect, connectingPromise;
+  return {
+    ...transport,
+    ...invokeableTransport.connect ? {
+      async connect(onMessage) {
+        if (isConnected) return;
+        if (connectingPromise) {
+          await connectingPromise;
+          return;
+        }
+        const maybePromise = invokeableTransport.connect({
+          onMessage: onMessage ?? (() => {
+          }),
+          onDisconnection() {
+            isConnected = !1;
+          }
+        });
+        maybePromise && (connectingPromise = maybePromise, await connectingPromise, connectingPromise = void 0), isConnected = !0;
+      }
+    } : {},
+    ...invokeableTransport.disconnect ? {
+      async disconnect() {
+        isConnected && (connectingPromise && await connectingPromise, isConnected = !1, await invokeableTransport.disconnect());
+      }
+    } : {},
+    async send(data) {
+      if (invokeableTransport.send) {
+        if (!isConnected)
+          if (connectingPromise)
+            await connectingPromise;
+          else
+            throw new Error("send was called before connect");
+        await invokeableTransport.send(data);
+      }
+    },
+    async invoke(name, data) {
+      if (!isConnected)
+        if (connectingPromise)
+          await connectingPromise;
+        else
+          throw new Error("invoke was called before connect");
+      return invokeableTransport.invoke(name, data);
+    }
+  };
+}, createWebSocketModuleRunnerTransport = (options) => {
+  const pingInterval = options.pingInterval ?? 3e4;
+  let ws, pingIntervalId;
+  return {
+    async connect({ onMessage, onDisconnection }) {
+      const socket = options.createConnection();
+      socket.addEventListener("message", async ({ data }) => {
+        onMessage(JSON.parse(data));
+      });
+      let isOpened = socket.readyState === socket.OPEN;
+      isOpened || await new Promise((resolve2, reject) => {
+        socket.addEventListener(
+          "open",
+          () => {
+            isOpened = !0, resolve2();
+          },
+          { once: !0 }
+        ), socket.addEventListener("close", async () => {
+          if (!isOpened) {
+            reject(new Error("WebSocket closed without opened."));
+            return;
+          }
+          onMessage({
+            type: "custom",
+            event: "vite:ws:disconnect",
+            data: { webSocket: socket }
+          }), onDisconnection();
+        });
+      }), onMessage({
+        type: "custom",
+        event: "vite:ws:connect",
+        data: { webSocket: socket }
+      }), ws = socket, pingIntervalId = setInterval(() => {
+        socket.readyState === socket.OPEN && socket.send(JSON.stringify({ type: "ping" }));
+      }, pingInterval);
+    },
+    disconnect() {
+      clearInterval(pingIntervalId), ws?.close();
+    },
+    send(data) {
+      ws.send(JSON.stringify(data));
+    }
+  };
+}, ssrModuleExportsKey = "__vite_ssr_exports__", ssrImportKey = "__vite_ssr_import__", ssrDynamicImportKey = "__vite_ssr_dynamic_import__", ssrExportAllKey = "__vite_ssr_exportAll__", ssrImportMetaKey = "__vite_ssr_import_meta__", noop = () => {
 }, silentConsole = {
   debug: noop,
   error: noop
@@ -539,10 +720,10 @@ function createHMRHandler(runner) {
 }
 async function handleHotPayload(runner, payload) {
   const hmrClient = runner.hmrClient;
-  if (!(!hmrClient || runner.isDestroyed()))
+  if (!(!hmrClient || runner.isClosed()))
     switch (payload.type) {
       case "connected":
-        hmrClient.logger.debug("connected."), hmrClient.messenger.flush();
+        hmrClient.logger.debug("connected.");
         break;
       case "update":
         await hmrClient.notifyListeners("vite:beforeUpdate", payload), await Promise.all(
@@ -558,14 +739,14 @@ async function handleHotPayload(runner, payload) {
         break;
       }
       case "full-reload": {
-        const { triggeredBy } = payload, clearEntrypoints = triggeredBy ? getModulesEntrypoints(
+        const { triggeredBy } = payload, clearEntrypointUrls = triggeredBy ? getModulesEntrypoints(
           runner,
           getModulesByFile(runner, slash(triggeredBy))
         ) : findAllEntrypoints(runner);
-        if (!clearEntrypoints.size) break;
-        hmrClient.logger.debug("program reload"), await hmrClient.notifyListeners("vite:beforeFullReload", payload), runner.moduleCache.clear();
-        for (const id of clearEntrypoints)
-          await runner.import(id);
+        if (!clearEntrypointUrls.size) break;
+        hmrClient.logger.debug("program reload"), await hmrClient.notifyListeners("vite:beforeFullReload", payload), runner.evaluatedModules.clear();
+        for (const url of clearEntrypointUrls)
+          await runner.import(url);
         break;
       }
       case "prune":
@@ -581,6 +762,8 @@ ${err.stack}`
         );
         break;
       }
+      case "ping":
+        break;
       default:
         return payload;
     }
@@ -607,31 +790,31 @@ class Queue {
   }
 }
 function getModulesByFile(runner, file) {
-  const modules = [];
-  for (const [id, mod] of runner.moduleCache.entries())
-    mod.meta && "file" in mod.meta && mod.meta.file === file && modules.push(id);
-  return modules;
+  const nodes = runner.evaluatedModules.getModulesByFile(file);
+  return nodes ? [...nodes].map((node) => node.id) : [];
 }
 function getModulesEntrypoints(runner, modules, visited = /* @__PURE__ */ new Set(), entrypoints = /* @__PURE__ */ new Set()) {
   for (const moduleId of modules) {
     if (visited.has(moduleId)) continue;
     visited.add(moduleId);
-    const module = runner.moduleCache.getByModuleId(moduleId);
-    if (module.importers && !module.importers.size) {
-      entrypoints.add(moduleId);
-      continue;
+    const module = runner.evaluatedModules.getModuleById(moduleId);
+    if (module) {
+      if (module.importers && !module.importers.size) {
+        entrypoints.add(module.url);
+        continue;
+      }
+      for (const importer of module.importers || [])
+        getModulesEntrypoints(runner, [importer], visited, entrypoints);
     }
-    for (const importer of module.importers || [])
-      getModulesEntrypoints(runner, [importer], visited, entrypoints);
   }
   return entrypoints;
 }
 function findAllEntrypoints(runner, entrypoints = /* @__PURE__ */ new Set()) {
-  for (const [id, mod] of runner.moduleCache.entries())
-    mod.importers && !mod.importers.size && entrypoints.add(id);
+  for (const mod of runner.evaluatedModules.idToModuleMap.values())
+    mod.importers && !mod.importers.size && entrypoints.add(mod.url);
   return entrypoints;
 }
-const sourceMapCache = {}, fileContentsCache = {}, moduleGraphs = /* @__PURE__ */ new Set(), retrieveFileHandlers = /* @__PURE__ */ new Set(), retrieveSourceMapHandlers = /* @__PURE__ */ new Set(), createExecHandlers = (handlers) => (...args) => {
+const sourceMapCache = {}, fileContentsCache = {}, evaluatedModulesCache = /* @__PURE__ */ new Set(), retrieveFileHandlers = /* @__PURE__ */ new Set(), retrieveSourceMapHandlers = /* @__PURE__ */ new Set(), createExecHandlers = (handlers) => (...args) => {
   for (const handler of handlers) {
     const result = handler(...args);
     if (result) return result;
@@ -643,10 +826,10 @@ const sourceMapCache = {}, fileContentsCache = {}, moduleGraphs = /* @__PURE__ *
 let overridden = !1;
 const originalPrepare = Error.prepareStackTrace;
 function resetInterceptor(runner, options) {
-  moduleGraphs.delete(runner.moduleCache), options.retrieveFile && retrieveFileHandlers.delete(options.retrieveFile), options.retrieveSourceMap && retrieveSourceMapHandlers.delete(options.retrieveSourceMap), moduleGraphs.size === 0 && (Error.prepareStackTrace = originalPrepare, overridden = !1);
+  evaluatedModulesCache.delete(runner.evaluatedModules), options.retrieveFile && retrieveFileHandlers.delete(options.retrieveFile), options.retrieveSourceMap && retrieveSourceMapHandlers.delete(options.retrieveSourceMap), evaluatedModulesCache.size === 0 && (Error.prepareStackTrace = originalPrepare, overridden = !1);
 }
 function interceptStackTrace(runner, options = {}) {
-  return overridden || (Error.prepareStackTrace = prepareStackTrace, overridden = !0), moduleGraphs.add(runner.moduleCache), options.retrieveFile && retrieveFileHandlers.add(options.retrieveFile), options.retrieveSourceMap && retrieveSourceMapHandlers.add(options.retrieveSourceMap), () => resetInterceptor(runner, options);
+  return overridden || (Error.prepareStackTrace = prepareStackTrace, overridden = !0), evaluatedModulesCache.add(runner.evaluatedModules), options.retrieveFile && retrieveFileHandlers.add(options.retrieveFile), options.retrieveSourceMap && retrieveSourceMapHandlers.add(options.retrieveSourceMap), () => resetInterceptor(runner, options);
 }
 function supportRelativeURL(file, url) {
   if (!file) return url;
@@ -656,8 +839,8 @@ function supportRelativeURL(file, url) {
   return protocol && /^\/\w:/.test(startPath) ? (protocol += "/", protocol + slash(posixResolve(startPath, url))) : protocol + posixResolve(startPath, url);
 }
 function getRunnerSourceMap(position) {
-  for (const moduleCache of moduleGraphs) {
-    const sourceMap = moduleCache.getSourceMap(position.source);
+  for (const moduleGraph of evaluatedModulesCache) {
+    const sourceMap = moduleGraph.getModuleSourceMapById(position.source);
     if (sourceMap)
       return {
         url: position.source,
@@ -848,20 +1031,23 @@ class ModuleRunner {
   constructor(options, evaluator, debug) {
     this.options = options, this.evaluator = evaluator, this.debug = debug;
     const root = this.options.root;
-    this.root = root[root.length - 1] === "/" ? root : `${root}/`, this.moduleCache = options.moduleCache ?? new ModuleCacheMap(options.root), this.transport = options.transport, typeof options.hmr == "object" && (this.hmrClient = new HMRClient(
-      options.hmr.logger === !1 ? silentConsole : options.hmr.logger || hmrLogger,
-      options.hmr.connection,
-      ({ acceptedPath }) => this.import(acceptedPath)
-    ), options.hmr.connection.onUpdate(createHMRHandler(this))), options.sourcemapInterceptor !== !1 && (this.resetSourceMapSupport = enableSourceMapSupport(this));
+    if (this.root = root[root.length - 1] === "/" ? root : `${root}/`, this.evaluatedModules = options.evaluatedModules ?? new EvaluatedModules(), this.transport = normalizeModuleRunnerTransport(options.transport), options.hmr) {
+      const resolvedHmrLogger = options.hmr === !0 || options.hmr.logger === void 0 ? hmrLogger : options.hmr.logger === !1 ? silentConsole : options.hmr.logger;
+      if (this.hmrClient = new HMRClient(
+        resolvedHmrLogger,
+        this.transport,
+        ({ acceptedPath }) => this.import(acceptedPath)
+      ), !this.transport.connect)
+        throw new Error(
+          "HMR is not supported by this runner transport, but `hmr` option was set to true"
+        );
+      this.transport.connect(createHMRHandler(this));
+    } else
+      this.transport.connect?.();
+    options.sourcemapInterceptor !== !1 && (this.resetSourceMapSupport = enableSourceMapSupport(this));
   }
-  /**
-   * Holds the cache of modules
-   * Keys of the map are ids
-   */
-  moduleCache;
+  evaluatedModules;
   hmrClient;
-  urlToIdMap = /* @__PURE__ */ new Map();
-  fileToIdMap = /* @__PURE__ */ new Map();
   envProxy = new Proxy({}, {
     get(_, p) {
       throw new Error(
@@ -872,8 +1058,8 @@ class ModuleRunner {
   transport;
   resetSourceMapSupport;
   root;
-  moduleInfoCache = /* @__PURE__ */ new Map();
-  destroyed = !1;
+  concurrentModuleNodePromises = /* @__PURE__ */ new Map();
+  closed = !1;
   /**
    * URL to execute. Accepts file path, server path or id relative to the root.
    */
@@ -885,26 +1071,26 @@ class ModuleRunner {
    * Clear all caches including HMR listeners.
    */
   clearCache() {
-    this.moduleCache.clear(), this.urlToIdMap.clear(), this.hmrClient?.clear();
+    this.evaluatedModules.clear(), this.hmrClient?.clear();
   }
   /**
    * Clears all caches, removes all HMR listeners, and resets source map support.
    * This method doesn't stop the HMR connection.
    */
-  async destroy() {
-    this.resetSourceMapSupport?.(), this.clearCache(), this.hmrClient = void 0, this.destroyed = !0;
+  async close() {
+    this.resetSourceMapSupport?.(), this.clearCache(), this.hmrClient = void 0, this.closed = !0, await this.transport.disconnect?.();
   }
   /**
-   * Returns `true` if the runtime has been destroyed by calling `destroy()` method.
+   * Returns `true` if the runtime has been closed by calling `close()` method.
    */
-  isDestroyed() {
-    return this.destroyed;
+  isClosed() {
+    return this.closed;
   }
   processImport(exports, fetchResult, metadata) {
     if (!("externalize" in fetchResult))
       return exports;
-    const { url: id, type } = fetchResult;
-    return type !== "module" && type !== "commonjs" || analyzeImportedModDifference(exports, id, type, metadata), exports;
+    const { url, type } = fetchResult;
+    return type !== "module" && type !== "commonjs" || analyzeImportedModDifference(exports, url, type, metadata), exports;
   }
   isCircularModule(mod) {
     for (const importedFile of mod.imports)
@@ -918,32 +1104,30 @@ class ModuleRunner {
         continue;
       if (visited.add(importer), importer === moduleUrl)
         return !0;
-      const mod = this.moduleCache.getByModuleId(
-        importer
-      );
-      if (mod.importers.size && this.isCircularImport(mod.importers, moduleUrl, visited))
+      const mod = this.evaluatedModules.getModuleById(importer);
+      if (mod && mod.importers.size && this.isCircularImport(mod.importers, moduleUrl, visited))
         return !0;
     }
     return !1;
   }
-  async cachedRequest(id, mod_, callstack = [], metadata) {
-    const mod = mod_, meta = mod.meta, moduleUrl = meta.url, { importers } = mod, importee = callstack[callstack.length - 1];
-    if (importee && importers.add(importee), (callstack.includes(moduleUrl) || this.isCircularModule(mod) || this.isCircularImport(importers, moduleUrl)) && mod.exports)
+  async cachedRequest(url, mod, callstack = [], metadata) {
+    const meta = mod.meta, moduleId = meta.id, { importers } = mod, importee = callstack[callstack.length - 1];
+    if (importee && importers.add(importee), (callstack.includes(moduleId) || this.isCircularModule(mod) || this.isCircularImport(importers, moduleId)) && mod.exports)
       return this.processImport(mod.exports, meta, metadata);
     let debugTimer;
     this.debug && (debugTimer = setTimeout(() => {
       const getStack = () => `stack:
-${[...callstack, moduleUrl].reverse().map((p) => `  - ${p}`).join(`
+${[...callstack, moduleId].reverse().map((p) => `  - ${p}`).join(`
 `)}`;
       this.debug(
-        `[module runner] module ${moduleUrl} takes over 2s to load.
+        `[module runner] module ${moduleId} takes over 2s to load.
 ${getStack()}`
       );
     }, 2e3));
     try {
       if (mod.promise)
         return this.processImport(await mod.promise, meta, metadata);
-      const promise = this.directRequest(id, mod, callstack);
+      const promise = this.directRequest(url, mod, callstack);
       return mod.promise = promise, mod.evaluated = !1, this.processImport(await promise, meta, metadata);
     } finally {
       mod.evaluated = !0, debugTimer && clearTimeout(debugTimer);
@@ -951,25 +1135,33 @@ ${getStack()}`
   }
   async cachedModule(url, importer) {
     url = normalizeAbsoluteUrl(url, this.root);
-    const normalized = this.urlToIdMap.get(url);
-    let cachedModule = normalized && this.moduleCache.getByModuleId(normalized);
-    cachedModule || (cachedModule = this.moduleCache.getByModuleId(url));
-    let cached = this.moduleInfoCache.get(url);
-    return cached ? this.debug?.("[module runner] using cached module info for", url) : (cached = this.getModuleInformation(url, importer, cachedModule).finally(
-      () => {
-        this.moduleInfoCache.delete(url);
-      }
-    ), this.moduleInfoCache.set(url, cached)), cached;
+    let cached = this.concurrentModuleNodePromises.get(url);
+    if (cached)
+      this.debug?.("[module runner] using cached module info for", url);
+    else {
+      const cachedModule = this.evaluatedModules.getModuleByUrl(url);
+      cached = this.getModuleInformation(url, importer, cachedModule).finally(
+        () => {
+          this.concurrentModuleNodePromises.delete(url);
+        }
+      ), this.concurrentModuleNodePromises.set(url, cached);
+    }
+    return cached;
   }
   async getModuleInformation(url, importer, cachedModule) {
-    if (this.destroyed)
-      throw new Error("Vite module runner has been destroyed.");
+    if (this.closed)
+      throw new Error("Vite module runner has been closed.");
     this.debug?.("[module runner] fetching", url);
     const isCached = !!(typeof cachedModule == "object" && cachedModule.meta), fetchedModule = (
       // fast return for established externalized pattern
-      url.startsWith("data:") ? { externalize: url, type: "builtin" } : await this.transport.fetchModule(url, importer, {
-        cached: isCached
-      })
+      url.startsWith("data:") ? { externalize: url, type: "builtin" } : await this.transport.invoke("fetchModule", [
+        url,
+        importer,
+        {
+          cached: isCached,
+          startOffset: this.evaluator.startOffset
+        }
+      ])
     );
     if ("cache" in fetchedModule) {
       if (!cachedModule || !cachedModule.meta)
@@ -978,19 +1170,15 @@ ${getStack()}`
         );
       return cachedModule;
     }
-    const idQuery = url.split("?")[1], query = idQuery ? `?${idQuery}` : "", file = "file" in fetchedModule ? fetchedModule.file : void 0, fileId = file ? `${file}${query}` : url, moduleUrl = this.moduleCache.normalize(fileId), mod = this.moduleCache.getByModuleId(moduleUrl);
-    if ("invalidate" in fetchedModule && fetchedModule.invalidate && this.moduleCache.invalidateModule(mod), fetchedModule.url = moduleUrl, mod.meta = fetchedModule, file) {
-      const fileModules = this.fileToIdMap.get(file) || [];
-      fileModules.push(moduleUrl), this.fileToIdMap.set(file, fileModules);
-    }
-    return this.urlToIdMap.set(url, moduleUrl), this.urlToIdMap.set(unwrapId(url), moduleUrl), mod;
+    const moduleId = "externalize" in fetchedModule ? fetchedModule.externalize : fetchedModule.id, moduleUrl = "url" in fetchedModule ? fetchedModule.url : url, module = this.evaluatedModules.ensureModule(moduleId, moduleUrl);
+    return "invalidate" in fetchedModule && fetchedModule.invalidate && this.evaluatedModules.invalidateModule(module), fetchedModule.url = moduleUrl, fetchedModule.id = moduleId, module.meta = fetchedModule, module;
   }
   // override is allowed, consider this a public API
-  async directRequest(id, mod, _callstack) {
-    const fetchResult = mod.meta, moduleUrl = fetchResult.url, callstack = [..._callstack, moduleUrl], request = async (dep, metadata) => {
-      const importer = "file" in fetchResult && fetchResult.file || moduleUrl, fetchedModule = await this.cachedModule(dep, importer), resolvedId = fetchedModule.meta.url;
-      return this.moduleCache.getByModuleId(resolvedId).importers.add(moduleUrl), mod.imports.add(resolvedId), this.cachedRequest(dep, fetchedModule, callstack, metadata);
-    }, dynamicRequest = async (dep) => (dep = String(dep), dep[0] === "." && (dep = posixResolve(posixDirname(id), dep)), request(dep, { isDynamicImport: !0 }));
+  async directRequest(url, mod, _callstack) {
+    const fetchResult = mod.meta, moduleId = fetchResult.id, callstack = [..._callstack, moduleId], request = async (dep, metadata) => {
+      const importer = "file" in fetchResult && fetchResult.file || moduleId, depMod = await this.cachedModule(dep, importer);
+      return depMod.importers.add(moduleId), mod.imports.add(depMod.id), this.cachedRequest(dep, depMod, callstack, metadata);
+    }, dynamicRequest = async (dep) => (dep = String(dep), dep[0] === "." && (dep = posixResolve(posixDirname(url), dep)), request(dep, { isDynamicImport: !0 }));
     if ("externalize" in fetchResult) {
       const { externalize } = fetchResult;
       this.debug?.("[module runner] externalizing", externalize);
@@ -1001,10 +1189,10 @@ ${getStack()}`
     if (code == null) {
       const importer = callstack[callstack.length - 2];
       throw new Error(
-        `[module runner] Failed to load "${id}"${importer ? ` imported from ${importer}` : ""}`
+        `[module runner] Failed to load "${url}"${importer ? ` imported from ${importer}` : ""}`
       );
     }
-    const modulePath = cleanUrl(file || moduleUrl), href = posixPathToFileHref(modulePath), filename = modulePath, dirname2 = posixDirname(modulePath), meta = {
+    const modulePath = cleanUrl(file || moduleId), href = posixPathToFileHref(modulePath), filename = modulePath, dirname2 = posixDirname(modulePath), meta = {
       filename: isWindows ? toWindowsPath(filename) : filename,
       dirname: isWindows ? toWindowsPath(dirname2) : dirname2,
       url: href,
@@ -1016,7 +1204,9 @@ ${getStack()}`
       },
       // should be replaced during transformation
       glob() {
-        throw new Error('[module runner] "import.meta.glob" is not supported.');
+        throw new Error(
+          '[module runner] "import.meta.glob" is statically replaced during file transformation. Make sure to reference it by the full name.'
+        );
       }
     }, exports = /* @__PURE__ */ Object.create(null);
     Object.defineProperty(exports, Symbol.toStringTag, {
@@ -1029,8 +1219,8 @@ ${getStack()}`
       enumerable: !0,
       get: () => {
         if (!this.hmrClient)
-          throw new Error("[module runner] HMR client was destroyed.");
-        return this.debug?.("[module runner] creating hmr context for", moduleUrl), hotContext ||= new HMRContext(this.hmrClient, moduleUrl), hotContext;
+          throw new Error("[module runner] HMR client was closed.");
+        return this.debug?.("[module runner] creating hmr context for", mod.url), hotContext ||= new HMRContext(this.hmrClient, mod.url), hotContext;
       },
       set: (value) => {
         hotContext = value;
@@ -1043,7 +1233,7 @@ ${getStack()}`
       [ssrExportAllKey]: (obj) => exportAll(exports, obj),
       [ssrImportMetaKey]: meta
     };
-    return this.debug?.("[module runner] executing", href), await this.evaluator.runInlinedModule(context, code, id), exports;
+    return this.debug?.("[module runner] executing", href), await this.evaluator.runInlinedModule(context, code, mod), exports;
   }
 }
 function exportAll(exports, sourceModule) {
@@ -1061,6 +1251,7 @@ function exportAll(exports, sourceModule) {
   }
 }
 class ESModulesEvaluator {
+  startOffset = getAsyncFunctionDeclarationPaddingLineCount();
   async runInlinedModule(context, code) {
     await new AsyncFunction(
       ssrModuleExportsKey,
@@ -1082,49 +1273,11 @@ class ESModulesEvaluator {
     return import(filepath);
   }
 }
-let urlAlphabet = "useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict", nanoid = (size = 21) => {
-  let id = "", i = size;
-  for (; i--; )
-    id += urlAlphabet[Math.random() * 64 | 0];
-  return id;
-};
-class RemoteRunnerTransport {
-  constructor(options) {
-    this.options = options, this.options.onMessage(async (data) => {
-      if (typeof data != "object" || !data || !data.__v) return;
-      const promise = this.rpcPromises.get(data.i);
-      promise && (promise.timeoutId && clearTimeout(promise.timeoutId), this.rpcPromises.delete(data.i), data.e ? promise.reject(data.e) : promise.resolve(data.r));
-    });
-  }
-  rpcPromises = /* @__PURE__ */ new Map();
-  resolve(method, ...args) {
-    const promiseId = nanoid();
-    return this.options.send({
-      __v: !0,
-      m: method,
-      a: args,
-      i: promiseId
-    }), new Promise((resolve2, reject) => {
-      const timeout = this.options.timeout ?? 6e4;
-      let timeoutId;
-      timeout > 0 && (timeoutId = setTimeout(() => {
-        this.rpcPromises.delete(promiseId), reject(
-          new Error(
-            `${method}(${args.map((arg) => JSON.stringify(arg)).join(", ")}) timed out after ${timeout}ms`
-          )
-        );
-      }, timeout), timeoutId?.unref?.()), this.rpcPromises.set(promiseId, { resolve: resolve2, reject, timeoutId });
-    });
-  }
-  fetchModule(id, importer) {
-    return this.resolve("fetchModule", id, importer);
-  }
-}
 export {
   ESModulesEvaluator,
-  ModuleCacheMap,
+  EvaluatedModules,
   ModuleRunner,
-  RemoteRunnerTransport,
+  createWebSocketModuleRunnerTransport,
   ssrDynamicImportKey,
   ssrExportAllKey,
   ssrImportKey,