vite 6.0.0-alpha.2 → 6.0.0-alpha.21

package/dist/node/module-runner.js

@@ -51,24 +51,22 @@ function normalizeString(path, allowAboveRoot) {
       char = "/";
     }
     if (char === "/") {
-      if (!(lastSlash === index - 1 || dots === 1))
-        if (dots === 2) {
-          if (res.length < 2 || lastSegmentLength !== 2 || res[res.length - 1] !== "." || res[res.length - 2] !== ".") {
-            if (res.length > 2) {
-              const lastSlashIndex = res.lastIndexOf("/");
-              lastSlashIndex === -1 ? (res = "", lastSegmentLength = 0) : (res = res.slice(0, lastSlashIndex), lastSegmentLength = res.length - 1 - res.lastIndexOf("/")), lastSlash = index, dots = 0;
-              continue;
-            } else if (res.length > 0) {
-              res = "", lastSegmentLength = 0, lastSlash = index, dots = 0;
-              continue;
-            }
+      if (!(lastSlash === index - 1 || dots === 1)) if (dots === 2) {
+        if (res.length < 2 || lastSegmentLength !== 2 || res[res.length - 1] !== "." || res[res.length - 2] !== ".") {
+          if (res.length > 2) {
+            const lastSlashIndex = res.lastIndexOf("/");
+            lastSlashIndex === -1 ? (res = "", lastSegmentLength = 0) : (res = res.slice(0, lastSlashIndex), lastSegmentLength = res.length - 1 - res.lastIndexOf("/")), lastSlash = index, dots = 0;
+            continue;
+          } else if (res.length > 0) {
+            res = "", lastSegmentLength = 0, lastSlash = index, dots = 0;
+            continue;
           }
-          allowAboveRoot && (res += res.length > 0 ? "/.." : "..", lastSegmentLength = 2);
-        } else
-          res.length > 0 ? res += `/${path.slice(lastSlash + 1, index)}` : res = path.slice(lastSlash + 1, index), lastSegmentLength = index - lastSlash - 1;
+        }
+        allowAboveRoot && (res += res.length > 0 ? "/.." : "..", lastSegmentLength = 2);
+      } else
+        res.length > 0 ? res += `/${path.slice(lastSlash + 1, index)}` : res = path.slice(lastSlash + 1, index), lastSegmentLength = index - lastSlash - 1;
       lastSlash = index, dots = 0;
-    } else
-      char === "." && dots !== -1 ? ++dots : dots = -1;
+    } else char === "." && dots !== -1 ? ++dots : dots = -1;
   }
   return res;
 }
@@ -77,7 +75,11 @@ const isAbsolute = function(p) {
 }, dirname = function(p) {
   const segments = normalizeWindowsPath(p).replace(/\/$/, "").split("/").slice(0, -1);
   return segments.length === 1 && _DRIVE_LETTER_RE.test(segments[0]) && (segments[0] += "/"), segments.join("/") || (isAbsolute(p) ? "/" : ".");
-}, decodeBase64 = typeof atob < "u" ? atob : (str) => Buffer.from(str, "base64").toString("utf-8"), CHAR_FORWARD_SLASH = 47, CHAR_BACKWARD_SLASH = 92, percentRegEx = /%/g, backslashRegEx = /\\/g, newlineRegEx = /\n/g, carriageReturnRegEx = /\r/g, tabRegEx = /\t/g, questionRegex = /\?/g, hashRegex = /#/g;
+};
+function normalizeAbsoluteUrl(url, root) {
+  return url = slash(url), url.startsWith("file://") && (url = url.slice(isWindows ? 8 : 7)), url.startsWith(root) && (url = url.slice(root.length - 1)), url;
+}
+const decodeBase64 = typeof atob < "u" ? atob : (str) => Buffer.from(str, "base64").toString("utf-8"), CHAR_FORWARD_SLASH = 47, CHAR_BACKWARD_SLASH = 92, percentRegEx = /%/g, backslashRegEx = /\\/g, newlineRegEx = /\n/g, carriageReturnRegEx = /\r/g, tabRegEx = /\t/g, questionRegex = /\?/g, hashRegex = /#/g;
 function encodePathChars(filepath) {
   return filepath.indexOf("%") !== -1 && (filepath = filepath.replace(percentRegEx, "%25")), !isWindows && filepath.indexOf("\\") !== -1 && (filepath = filepath.replace(backslashRegEx, "%5C")), filepath.indexOf(`
 `) !== -1 && (filepath = filepath.replace(newlineRegEx, "%0A")), filepath.indexOf("\r") !== -1 && (filepath = filepath.replace(carriageReturnRegEx, "%0D")), filepath.indexOf("	") !== -1 && (filepath = filepath.replace(tabRegEx, "%09")), filepath;
@@ -96,38 +98,46 @@ for (let i = 0; i < chars.length; i++) {
   const c = chars.charCodeAt(i);
   intToChar[i] = c, charToInt[c] = i;
 }
-function decode(mappings) {
-  const state = new Int32Array(5), decoded = [];
-  let index = 0;
-  do {
-    const semi = indexOf(mappings, index), line = [];
-    let sorted = !0, lastCol = 0;
-    state[0] = 0;
-    for (let i = index; i < semi; i++) {
-      let seg;
-      i = decodeInteger(mappings, i, state, 0);
-      const col = state[0];
-      col < lastCol && (sorted = !1), lastCol = col, hasMoreVlq(mappings, i, semi) ? (i = decodeInteger(mappings, i, state, 1), i = decodeInteger(mappings, i, state, 2), i = decodeInteger(mappings, i, state, 3), hasMoreVlq(mappings, i, semi) ? (i = decodeInteger(mappings, i, state, 4), seg = [col, state[1], state[2], state[3], state[4]]) : seg = [col, state[1], state[2], state[3]]) : seg = [col], line.push(seg);
-    }
-    sorted || sort(line), decoded.push(line), index = semi + 1;
-  } while (index <= mappings.length);
-  return decoded;
-}
-function indexOf(mappings, index) {
-  const idx = mappings.indexOf(";", index);
-  return idx === -1 ? mappings.length : idx;
-}
-function decodeInteger(mappings, pos, state, j) {
+function decodeInteger(reader, relative) {
   let value = 0, shift = 0, integer = 0;
   do {
-    const c = mappings.charCodeAt(pos++);
+    const c = reader.next();
     integer = charToInt[c], value |= (integer & 31) << shift, shift += 5;
   } while (integer & 32);
   const shouldNegate = value & 1;
-  return value >>>= 1, shouldNegate && (value = -2147483648 | -value), state[j] += value, pos;
+  return value >>>= 1, shouldNegate && (value = -2147483648 | -value), relative + value;
+}
+function hasMoreVlq(reader, max) {
+  return reader.pos >= max ? !1 : reader.peek() !== comma;
 }
-function hasMoreVlq(mappings, i, length) {
-  return i >= length ? !1 : mappings.charCodeAt(i) !== comma;
+class StringReader {
+  constructor(buffer) {
+    this.pos = 0, this.buffer = buffer;
+  }
+  next() {
+    return this.buffer.charCodeAt(this.pos++);
+  }
+  peek() {
+    return this.buffer.charCodeAt(this.pos);
+  }
+  indexOf(char) {
+    const { buffer, pos } = this, idx = buffer.indexOf(char, pos);
+    return idx === -1 ? buffer.length : idx;
+  }
+}
+function decode(mappings) {
+  const { length } = mappings, reader = new StringReader(mappings), decoded = [];
+  let genColumn = 0, sourcesIndex = 0, sourceLine = 0, sourceColumn = 0, namesIndex = 0;
+  do {
+    const semi = reader.indexOf(";"), line = [];
+    let sorted = !0, lastCol = 0;
+    for (genColumn = 0; reader.pos < semi; ) {
+      let seg;
+      genColumn = decodeInteger(reader, genColumn), genColumn < lastCol && (sorted = !1), lastCol = genColumn, hasMoreVlq(reader, semi) ? (sourcesIndex = decodeInteger(reader, sourcesIndex), sourceLine = decodeInteger(reader, sourceLine), sourceColumn = decodeInteger(reader, sourceColumn), hasMoreVlq(reader, semi) ? (namesIndex = decodeInteger(reader, namesIndex), seg = [genColumn, sourcesIndex, sourceLine, sourceColumn, namesIndex]) : seg = [genColumn, sourcesIndex, sourceLine, sourceColumn]) : seg = [genColumn], line.push(seg), reader.pos++;
+    }
+    sorted || sort(line), decoded.push(line), reader.pos = semi + 1;
+  } while (reader.pos <= length);
+  return decoded;
 }
 function sort(line) {
   line.sort(sortComparator);
@@ -200,7 +210,13 @@ function traceSegmentInternal(segments, memo, line, column, bias) {
   return found ? index = (bias === LEAST_UPPER_BOUND ? upperBound : lowerBound)(segments, column, index) : bias === LEAST_UPPER_BOUND && index++, index === -1 || index === segments.length ? -1 : index;
 }
 class DecodedMap {
-  map;
+  constructor(map, from) {
+    this.map = map;
+    const { mappings, names, sources } = map;
+    this.version = map.version, this.names = names || [], this._encoded = mappings || "", this._decodedMemo = memoizedState(), this.url = from, this.resolvedSources = (sources || []).map(
+      (s) => posixResolve(s || "", from)
+    );
+  }
   _encoded;
   _decoded;
   _decodedMemo;
@@ -208,11 +224,6 @@ class DecodedMap {
   version;
   names = [];
   resolvedSources;
-  constructor(map, from) {
-    this.map = map;
-    const { mappings, names, sources } = map;
-    this.version = map.version, this.names = names || [], this._encoded = mappings || "", this._decodedMemo = memoizedState(), this.url = from, this.resolvedSources = (sources || []).map((s) => posixResolve(s || "", from));
-  }
 }
 function memoizedState() {
   return {
@@ -225,7 +236,9 @@ function getOriginalPosition(map, needle) {
   const result = originalPositionFor(map, needle);
   return result.column == null ? null : result;
 }
-const MODULE_RUNNER_SOURCEMAPPING_REGEXP = new RegExp(`//# ${SOURCEMAPPING_URL}=data:application/json;base64,(.+)`);
+const MODULE_RUNNER_SOURCEMAPPING_REGEXP = new RegExp(
+  `//# ${SOURCEMAPPING_URL}=data:application/json;base64,(.+)`
+);
 class ModuleCacheMap extends Map {
   root;
   constructor(root, entries) {
@@ -251,7 +264,8 @@ class ModuleCacheMap extends Map {
     const mod = super.get(modulePath);
     return mod.imports || Object.assign(mod, {
       imports: /* @__PURE__ */ new Set(),
-      importers: /* @__PURE__ */ new Set()
+      importers: /* @__PURE__ */ new Set(),
+      timestamp: 0
     }), mod;
   }
   get(fsPath) {
@@ -263,8 +277,11 @@ class ModuleCacheMap extends Map {
   delete(fsPath) {
     return this.deleteByModuleId(this.normalize(fsPath));
   }
-  invalidate(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();
   }
   /**
@@ -273,11 +290,10 @@ class ModuleCacheMap extends Map {
   invalidateDepTree(ids, invalidated = /* @__PURE__ */ new Set()) {
     for (const _id of ids) {
       const id = this.normalize(_id);
-      if (invalidated.has(id))
-        continue;
+      if (invalidated.has(id)) continue;
       invalidated.add(id);
       const mod = super.get(id);
-      mod?.importers && this.invalidateDepTree(mod.importers, invalidated), this.invalidate(id);
+      mod?.importers && this.invalidateDepTree(mod.importers, invalidated), this.invalidateUrl(id);
     }
     return invalidated;
   }
@@ -287,8 +303,7 @@ class ModuleCacheMap extends Map {
   invalidateSubDepTree(ids, invalidated = /* @__PURE__ */ new Set()) {
     for (const _id of ids) {
       const id = this.normalize(_id);
-      if (invalidated.has(id))
-        continue;
+      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);
@@ -297,28 +312,23 @@ class ModuleCacheMap extends Map {
   }
   getSourceMap(moduleId) {
     const mod = this.get(moduleId);
-    if (mod.map)
-      return mod.map;
-    if (!mod.meta || !("code" in mod.meta))
-      return null;
-    const mapString = mod.meta.code.match(MODULE_RUNNER_SOURCEMAPPING_REGEXP)?.[1];
-    if (!mapString)
-      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;
   }
 }
-const prefixedBuiltins = /* @__PURE__ */ new Set(["node:test"]);
+const prefixedBuiltins = /* @__PURE__ */ new Set(["node:test", "node:sqlite"]);
 function normalizeModuleId(file, root) {
-  if (prefixedBuiltins.has(file))
-    return file;
+  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:\//, "/");
 }
 class HMRContext {
-  hmrClient;
-  ownerPath;
-  newListeners;
   constructor(hmrClient, ownerPath) {
     this.hmrClient = hmrClient, this.ownerPath = ownerPath, hmrClient.dataMap.has(ownerPath) || hmrClient.dataMap.set(ownerPath, {});
     const mod = hmrClient.hotModulesMap.get(ownerPath);
@@ -327,10 +337,14 @@ class HMRContext {
     if (staleListeners)
       for (const [event, staleFns] of staleListeners) {
         const listeners = hmrClient.customListenersMap.get(event);
-        listeners && hmrClient.customListenersMap.set(event, listeners.filter((l) => !staleFns.includes(l)));
+        listeners && hmrClient.customListenersMap.set(
+          event,
+          listeners.filter((l) => !staleFns.includes(l))
+        );
       }
     this.newListeners = /* @__PURE__ */ new Map(), hmrClient.ctxToListenersMap.set(ownerPath, this.newListeners);
   }
+  newListeners;
   get data() {
     return this.hmrClient.dataMap.get(this.ownerPath);
   }
@@ -366,7 +380,9 @@ class HMRContext {
     }), this.send("vite:invalidate", {
       path: this.ownerPath,
       message
-    }), this.hmrClient.logger.debug(`[vite] invalidate ${this.ownerPath}${message ? `: ${message}` : ""}`);
+    }), this.hmrClient.logger.debug(
+      `invalidate ${this.ownerPath}${message ? `: ${message}` : ""}`
+    );
   }
   on(event, cb) {
     const addToMap = (map) => {
@@ -390,7 +406,9 @@ class HMRContext {
     removeFromMap(this.hmrClient.customListenersMap), removeFromMap(this.newListeners);
   }
   send(event, data) {
-    this.hmrClient.messenger.send(JSON.stringify({ type: "custom", event, data }));
+    this.hmrClient.messenger.send(
+      JSON.stringify({ type: "custom", event, data })
+    );
   }
   acceptDeps(deps, callback = () => {
   }) {
@@ -405,7 +423,6 @@ class HMRContext {
   }
 }
 class HMRMessenger {
-  connection;
   constructor(connection) {
     this.connection = connection;
   }
@@ -418,8 +435,9 @@ class HMRMessenger {
   }
 }
 class HMRClient {
-  logger;
-  importUpdatedModule;
+  constructor(logger, connection, importUpdatedModule) {
+    this.logger = logger, this.importUpdatedModule = importUpdatedModule, this.messenger = new HMRMessenger(connection);
+  }
   hotModulesMap = /* @__PURE__ */ new Map();
   disposeMap = /* @__PURE__ */ new Map();
   pruneMap = /* @__PURE__ */ new Map();
@@ -427,9 +445,6 @@ class HMRClient {
   customListenersMap = /* @__PURE__ */ new Map();
   ctxToListenersMap = /* @__PURE__ */ new Map();
   messenger;
-  constructor(logger, connection, importUpdatedModule) {
-    this.logger = logger, this.importUpdatedModule = importUpdatedModule, this.messenger = new HMRMessenger(connection);
-  }
   async notifyListeners(event, data) {
     const cbs = this.customListenersMap.get(event);
     cbs && await Promise.allSettled(cbs.map((cb) => cb(data)));
@@ -441,17 +456,20 @@ class HMRClient {
   // but they may have left behind side effects that need to be cleaned up
   // (.e.g style injections)
   async prunePaths(paths) {
-    await Promise.all(paths.map((path) => {
-      const disposer = this.disposeMap.get(path);
-      if (disposer)
-        return disposer(this.dataMap.get(path));
-    })), paths.forEach((path) => {
+    await Promise.all(
+      paths.map((path) => {
+        const disposer = this.disposeMap.get(path);
+        if (disposer) return disposer(this.dataMap.get(path));
+      })
+    ), paths.forEach((path) => {
       const fn = this.pruneMap.get(path);
       fn && fn(this.dataMap.get(path));
     });
   }
   warnFailedUpdate(err, path) {
-    err.message.includes("fetch") || this.logger.error(err), this.logger.error(`[hmr] Failed to reload ${path}. This could be due to syntax errors or importing non-existent modules. (see errors above)`);
+    err.message.includes("fetch") || this.logger.error(err), this.logger.error(
+      `Failed to reload ${path}. This could be due to syntax errors or importing non-existent modules. (see errors above)`
+    );
   }
   updateQueue = [];
   pendingUpdateQueue = !1;
@@ -472,7 +490,9 @@ class HMRClient {
     if (!mod)
       return;
     let fetchedModule;
-    const isSelfUpdate = path === acceptedPath, qualifiedCallbacks = mod.callbacks.filter(({ deps }) => deps.includes(acceptedPath));
+    const isSelfUpdate = path === acceptedPath, qualifiedCallbacks = mod.callbacks.filter(
+      ({ deps }) => deps.includes(acceptedPath)
+    );
     if (isSelfUpdate || qualifiedCallbacks.length > 0) {
       const disposer = this.disposeMap.get(acceptedPath);
       disposer && await disposer(this.dataMap.get(acceptedPath));
@@ -484,18 +504,22 @@ class HMRClient {
     }
     return () => {
       for (const { deps, fn } of qualifiedCallbacks)
-        fn(deps.map((dep) => dep === acceptedPath ? fetchedModule : void 0));
+        fn(
+          deps.map((dep) => dep === acceptedPath ? fetchedModule : void 0)
+        );
       const loggedPath = isSelfUpdate ? path : `${acceptedPath} via ${path}`;
-      this.logger.debug(`[vite] hot updated: ${loggedPath}`);
+      this.logger.debug(`hot updated: ${loggedPath}`);
     };
   }
 }
 function analyzeImportedModDifference(mod, rawId, moduleType, metadata) {
-  if (!metadata?.isDynamicImport && moduleType !== "module" && metadata?.importedNames?.length) {
+  if (!metadata?.isDynamicImport && metadata?.importedNames?.length) {
     const missingBindings = metadata.importedNames.filter((s) => !(s in mod));
     if (missingBindings.length) {
       const lastBinding = missingBindings[missingBindings.length - 1];
-      throw new SyntaxError(`[vite] Named export '${lastBinding}' not found. The requested module '${rawId}' is a CommonJS module, which may not support all module.exports as named exports.
+      throw moduleType === "module" ? new SyntaxError(
+        `[vite] The requested module '${rawId}' does not provide an export named '${lastBinding}'`
+      ) : new SyntaxError(`[vite] Named export '${lastBinding}' not found. The requested module '${rawId}' is a CommonJS module, which may not support all module.exports as named exports.
 CommonJS modules can always be imported via the default export, for example using:
 
 import pkg from '${rawId}';
@@ -504,47 +528,45 @@ const {${missingBindings.join(", ")}} = pkg;
     }
   }
 }
-function proxyGuardOnlyEsm(mod, rawId, metadata) {
-  return metadata?.importedNames?.length ? new Proxy(mod, {
-    get(mod2, prop) {
-      if (prop !== "then" && !(prop in mod2))
-        throw new SyntaxError(`[vite] The requested module '${rawId}' does not provide an export named '${prop.toString()}'`);
-      return mod2[prop];
-    }
-  }) : mod;
-}
 const 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
+}, hmrLogger = {
+  debug: (...msg) => console.log("[vite]", ...msg),
+  error: (error) => console.log("[vite]", error)
 };
 function createHMRHandler(runner) {
   const queue = new Queue();
-  return (payload) => queue.enqueue(() => handleHMRPayload(runner, payload));
+  return (payload) => queue.enqueue(() => handleHotPayload(runner, payload));
 }
-async function handleHMRPayload(runner, payload) {
+async function handleHotPayload(runner, payload) {
   const hmrClient = runner.hmrClient;
   if (!(!hmrClient || runner.isDestroyed()))
     switch (payload.type) {
       case "connected":
-        hmrClient.logger.debug("[vite] connected."), hmrClient.messenger.flush();
+        hmrClient.logger.debug("connected."), hmrClient.messenger.flush();
         break;
       case "update":
-        await hmrClient.notifyListeners("vite:beforeUpdate", payload), await Promise.all(payload.updates.map(async (update) => {
-          if (update.type === "js-update")
-            return update.acceptedPath = unwrapId(update.acceptedPath), update.path = unwrapId(update.path), hmrClient.queueUpdate(update);
-          hmrClient.logger.error("[vite] css hmr is not supported in runner mode.");
-        })), await hmrClient.notifyListeners("vite:afterUpdate", payload);
+        await hmrClient.notifyListeners("vite:beforeUpdate", payload), await Promise.all(
+          payload.updates.map(async (update) => {
+            if (update.type === "js-update")
+              return update.acceptedPath = unwrapId(update.acceptedPath), update.path = unwrapId(update.path), hmrClient.queueUpdate(update);
+            hmrClient.logger.error("css hmr is not supported in runner mode.");
+          })
+        ), await hmrClient.notifyListeners("vite:afterUpdate", payload);
         break;
       case "custom": {
         await hmrClient.notifyListeners(payload.event, payload.data);
         break;
       }
       case "full-reload": {
-        const { triggeredBy } = payload, clearEntrypoints = triggeredBy ? getModulesEntrypoints(runner, getModulesByFile(runner, slash(triggeredBy))) : findAllEntrypoints(runner);
-        if (!clearEntrypoints.size)
-          break;
-        hmrClient.logger.debug("[vite] program reload"), await hmrClient.notifyListeners("vite:beforeFullReload", payload), runner.moduleCache.clear();
+        const { triggeredBy } = payload, clearEntrypoints = 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);
         break;
@@ -555,9 +577,11 @@ async function handleHMRPayload(runner, payload) {
       case "error": {
         await hmrClient.notifyListeners("vite:error", payload);
         const err = payload.err;
-        hmrClient.logger.error(`[vite] Internal Server Error
+        hmrClient.logger.error(
+          `Internal Server Error
 ${err.message}
-${err.stack}`);
+${err.stack}`
+        );
         break;
       }
       default:
@@ -593,8 +617,7 @@ function getModulesByFile(runner, file) {
 }
 function getModulesEntrypoints(runner, modules, visited = /* @__PURE__ */ new Set(), entrypoints = /* @__PURE__ */ new Set()) {
   for (const moduleId of modules) {
-    if (visited.has(moduleId))
-      continue;
+    if (visited.has(moduleId)) continue;
     visited.add(moduleId);
     const module = runner.moduleCache.getByModuleId(moduleId);
     if (module.importers && !module.importers.size) {
@@ -614,11 +637,12 @@ function findAllEntrypoints(runner, entrypoints = /* @__PURE__ */ new Set()) {
 const sourceMapCache = {}, fileContentsCache = {}, moduleGraphs = /* @__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;
+    if (result) return result;
   }
   return null;
-}, retrieveFileFromHandlers = createExecHandlers(retrieveFileHandlers), retrieveSourceMapFromHandlers = createExecHandlers(retrieveSourceMapHandlers);
+}, retrieveFileFromHandlers = createExecHandlers(retrieveFileHandlers), retrieveSourceMapFromHandlers = createExecHandlers(
+  retrieveSourceMapHandlers
+);
 let overridden = !1;
 const originalPrepare = Error.prepareStackTrace;
 function resetInterceptor(runner, options) {
@@ -628,8 +652,7 @@ 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);
 }
 function supportRelativeURL(file, url) {
-  if (!file)
-    return url;
+  if (!file) return url;
   const dir = posixDirname(slash(file)), match = /^\w+:\/\/[^/]*/.exec(dir);
   let protocol = match ? match[0] : "";
   const startPath = dir.slice(protocol.length);
@@ -648,29 +671,24 @@ function getRunnerSourceMap(position) {
   return null;
 }
 function retrieveFile(path) {
-  if (path in fileContentsCache)
-    return fileContentsCache[path];
+  if (path in fileContentsCache) return fileContentsCache[path];
   const content = retrieveFileFromHandlers(path);
   return typeof content == "string" ? (fileContentsCache[path] = content, content) : null;
 }
 function retrieveSourceMapURL(source) {
   const fileData = retrieveFile(source);
-  if (!fileData)
-    return null;
+  if (!fileData) return null;
   const re = /\/\/[@#]\s*sourceMappingURL=([^\s'"]+)\s*$|\/\*[@#]\s*sourceMappingURL=[^\s*'"]+\s*\*\/\s*$/gm;
   let lastMatch, match;
-  for (; match = re.exec(fileData); )
-    lastMatch = match;
+  for (; match = re.exec(fileData); ) lastMatch = match;
   return lastMatch ? lastMatch[1] : null;
 }
 const reSourceMap = /^data:application\/json[^,]+base64,/;
 function retrieveSourceMap(source) {
   const urlAndMap = retrieveSourceMapFromHandlers(source);
-  if (urlAndMap)
-    return urlAndMap;
+  if (urlAndMap) return urlAndMap;
   let sourceMappingURL = retrieveSourceMapURL(source);
-  if (!sourceMappingURL)
-    return null;
+  if (!sourceMappingURL) return null;
   let sourceMapData;
   if (reSourceMap.test(sourceMappingURL)) {
     const rawData = sourceMappingURL.slice(sourceMappingURL.indexOf(",") + 1);
@@ -683,8 +701,7 @@ function retrieveSourceMap(source) {
   } : null;
 }
 function mapSourcePosition(position) {
-  if (!position.source)
-    return position;
+  if (!position.source) return position;
   let sourceMap = getRunnerSourceMap(position);
   if (sourceMap || (sourceMap = sourceMapCache[position.source]), !sourceMap) {
     const urlAndMap = retrieveSourceMap(position.source);
@@ -692,7 +709,10 @@ function mapSourcePosition(position) {
       const url = urlAndMap.url;
       sourceMap = sourceMapCache[position.source] = {
         url,
-        map: new DecodedMap(typeof urlAndMap.map == "string" ? JSON.parse(urlAndMap.map) : urlAndMap.map, url)
+        map: new DecodedMap(
+          typeof urlAndMap.map == "string" ? JSON.parse(urlAndMap.map) : urlAndMap.map,
+          url
+        )
       };
       const contents = sourceMap.map?.map.sourcesContent;
       sourceMap.map && contents && sourceMap.map.resolvedSources.forEach((source, i) => {
@@ -711,7 +731,10 @@ function mapSourcePosition(position) {
   if (sourceMap && sourceMap.map && sourceMap.url) {
     const originalPosition = getOriginalPosition(sourceMap.map, position);
     if (originalPosition && originalPosition.source != null)
-      return originalPosition.source = supportRelativeURL(sourceMap.url, originalPosition.source), sourceMap.vite && (originalPosition._vite = !0), originalPosition;
+      return originalPosition.source = supportRelativeURL(
+        sourceMap.url,
+        originalPosition.source
+      ), sourceMap.vite && (originalPosition._vite = !0), originalPosition;
   }
   return position;
 }
@@ -745,13 +768,14 @@ function CallSiteToString() {
   const functionName = this.getFunctionName();
   let addSuffix = !0;
   const isConstructor = this.isConstructor();
-  if (!(this.isToplevel() || isConstructor)) {
+  if (this.isToplevel() || isConstructor)
+    isConstructor ? line += `new ${functionName || "<anonymous>"}` : functionName ? line += functionName : (line += fileLocation, addSuffix = !1);
+  else {
     let typeName = this.getTypeName();
     typeName === "[object Object]" && (typeName = "null");
     const methodName = this.getMethodName();
     functionName ? (typeName && functionName.indexOf(typeName) !== 0 && (line += `${typeName}.`), line += functionName, methodName && functionName.indexOf(`.${methodName}`) !== functionName.length - methodName.length - 1 && (line += ` [as ${methodName}]`)) : line += `${typeName}.${methodName || "<anonymous>"}`;
-  } else
-    isConstructor ? line += `new ${functionName || "<anonymous>"}` : functionName ? line += functionName : (line += fileLocation, addSuffix = !1);
+  }
   return addSuffix && (line += ` (${fileLocation})`), line;
 }
 function cloneCallSite(frame) {
@@ -808,37 +832,50 @@ function prepareStackTrace(error, stack) {
 function enableSourceMapSupport(runner) {
   if (runner.options.sourcemapInterceptor === "node") {
     if (typeof process > "u")
-      throw new TypeError(`Cannot use "sourcemapInterceptor: 'node'" because global "process" variable is not available.`);
+      throw new TypeError(
+        `Cannot use "sourcemapInterceptor: 'node'" because global "process" variable is not available.`
+      );
     if (typeof process.setSourceMapsEnabled != "function")
-      throw new TypeError(`Cannot use "sourcemapInterceptor: 'node'" because "process.setSourceMapsEnabled" function is not available. Please use Node >= 16.6.0.`);
+      throw new TypeError(
+        `Cannot use "sourcemapInterceptor: 'node'" because "process.setSourceMapsEnabled" function is not available. Please use Node >= 16.6.0.`
+      );
     const isEnabledAlready = process.sourceMapsEnabled ?? !1;
     return process.setSourceMapsEnabled(!0), () => !isEnabledAlready && process.setSourceMapsEnabled(!1);
   }
-  return interceptStackTrace(runner, typeof runner.options.sourcemapInterceptor == "object" ? runner.options.sourcemapInterceptor : void 0);
+  return interceptStackTrace(
+    runner,
+    typeof runner.options.sourcemapInterceptor == "object" ? runner.options.sourcemapInterceptor : void 0
+  );
 }
 class ModuleRunner {
-  options;
-  evaluator;
-  debug;
+  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));
+  }
   /**
    * Holds the cache of modules
    * Keys of the map are ids
    */
   moduleCache;
   hmrClient;
-  idToUrlMap = /* @__PURE__ */ new Map();
+  urlToIdMap = /* @__PURE__ */ new Map();
   fileToIdMap = /* @__PURE__ */ new Map();
   envProxy = new Proxy({}, {
     get(_, p) {
-      throw new Error(`[module runner] Dynamic access of "import.meta.env" is not supported. Please, use "import.meta.env.${String(p)}" instead.`);
+      throw new Error(
+        `[module runner] Dynamic access of "import.meta.env" is not supported. Please, use "import.meta.env.${String(p)}" instead.`
+      );
     }
   });
   transport;
-  _destroyed = !1;
-  _resetSourceMapSupport;
-  constructor(options, evaluator, debug) {
-    this.options = options, this.evaluator = evaluator, this.debug = debug, 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 || console, options.hmr.connection, ({ acceptedPath, invalidates }) => (this.moduleCache.invalidate(acceptedPath), invalidates && this.invalidateFiles(invalidates), this.import(acceptedPath))), options.hmr.connection.onUpdate(createHMRHandler(this))), options.sourcemapInterceptor !== !1 && (this._resetSourceMapSupport = enableSourceMapSupport(this));
-  }
+  resetSourceMapSupport;
+  root;
+  destroyed = !1;
   /**
    * URL to execute. Accepts file path, server path or id relative to the root.
    */
@@ -851,87 +888,108 @@ class ModuleRunner {
    * Clear all caches including HMR listeners.
    */
   clearCache() {
-    this.moduleCache.clear(), this.idToUrlMap.clear(), this.hmrClient?.clear();
+    this.moduleCache.clear(), this.urlToIdMap.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;
+    this.resetSourceMapSupport?.(), this.clearCache(), this.hmrClient = void 0, this.destroyed = !0;
   }
   /**
    * Returns `true` if the runtime has been destroyed by calling `destroy()` method.
    */
   isDestroyed() {
-    return this._destroyed;
-  }
-  // map files to modules and invalidate them
-  invalidateFiles(files) {
-    files.forEach((file) => {
-      const ids = this.fileToIdMap.get(file);
-      ids && ids.forEach((id) => this.moduleCache.invalidate(id));
-    });
+    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) {
-    if (url[0] === ".")
-      return url;
-    url.startsWith("file://") && (url = url.slice(isWindows ? 8 : 7)), url = slash(url);
-    const _root = this.options.root, root = _root[_root.length - 1] === "/" ? _root : `${_root}/`;
-    return url.startsWith(root) ? url.slice(root.length - 1) : url[0] === "/" ? url : wrapId(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;
     const { id, type } = fetchResult;
-    return type !== "module" && type !== "commonjs" ? exports : (analyzeImportedModDifference(exports, id, type, metadata), proxyGuardOnlyEsm(exports, id, metadata));
+    return type !== "module" && type !== "commonjs" || analyzeImportedModDifference(exports, id, type, metadata), exports;
+  }
+  isCircularModule(mod) {
+    for (const importedFile of mod.imports)
+      if (mod.importers.has(importedFile))
+        return !0;
+    return !1;
+  }
+  isCircularImport(importers, moduleId, visited = /* @__PURE__ */ new Set()) {
+    for (const importer of importers) {
+      if (visited.has(importer))
+        continue;
+      if (visited.add(importer), importer === moduleId)
+        return !0;
+      const mod = this.moduleCache.getByModuleId(
+        importer
+      );
+      if (mod.importers.size && this.isCircularImport(mod.importers, moduleId, visited))
+        return !0;
+    }
+    return !1;
   }
-  async cachedRequest(id, fetchedModule, callstack = [], metadata) {
-    const moduleId = fetchedModule.id, mod = this.moduleCache.getByModuleId(moduleId), { imports, importers } = mod, importee = callstack[callstack.length - 1];
-    if (importee && importers.add(importee), (callstack.includes(moduleId) || Array.from(imports.values()).some((i) => importers.has(i))) && mod.exports)
-      return this.processImport(mod.exports, fetchedModule, metadata);
+  async cachedRequest(id, mod_, callstack = [], metadata) {
+    const mod = mod_, 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, moduleId].reverse().map((p) => `  - ${p}`).join(`
 `)}`;
-      this.debug(`[module runner] module ${moduleId} takes over 2s to load.
-${getStack()}`);
+      this.debug(
+        `[module runner] module ${moduleId} takes over 2s to load.
+${getStack()}`
+      );
     }, 2e3));
     try {
       if (mod.promise)
-        return this.processImport(await mod.promise, fetchedModule, metadata);
-      const promise = this.directRequest(id, fetchedModule, callstack);
-      return mod.promise = promise, mod.evaluated = !1, this.processImport(await promise, fetchedModule, metadata);
+        return this.processImport(await mod.promise, meta, metadata);
+      const promise = this.directRequest(id, mod, callstack);
+      return mod.promise = promise, mod.evaluated = !1, this.processImport(await promise, meta, metadata);
     } finally {
       mod.evaluated = !0, debugTimer && clearTimeout(debugTimer);
     }
   }
-  async cachedModule(id, importer) {
-    if (this._destroyed)
-      throw new Error("[vite] Vite runtime has been destroyed.");
-    const normalized = this.idToUrlMap.get(id);
-    if (normalized) {
-      const mod2 = this.moduleCache.getByModuleId(normalized);
-      if (mod2.meta)
-        return mod2.meta;
+  async cachedModule(url, importer) {
+    if (this.destroyed)
+      throw new Error("Vite module runner has been destroyed.");
+    this.debug?.("[module runner] fetching", url), url = normalizeAbsoluteUrl(url, this.root);
+    const normalized = this.urlToIdMap.get(url);
+    let cachedModule = normalized && this.moduleCache.getByModuleId(normalized);
+    cachedModule || (cachedModule = this.moduleCache.getByModuleId(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
+      })
+    );
+    if ("cache" in fetchedModule) {
+      if (!cachedModule || !cachedModule.meta)
+        throw new Error(
+          `Module "${url}" was mistakenly invalidated during fetch phase.`
+        );
+      return cachedModule;
     }
-    this.debug?.("[module runner] fetching", id);
-    const fetchedModule = id.startsWith("data:") ? { externalize: id, type: "builtin" } : await this.transport.fetchModule(id, importer), idQuery = id.split("?")[1], query = idQuery ? `?${idQuery}` : "", file = "file" in fetchedModule ? fetchedModule.file : void 0, fullFile = file ? `${file}${query}` : id, moduleId = this.moduleCache.normalize(fullFile), mod = this.moduleCache.getByModuleId(moduleId);
-    if (fetchedModule.id = moduleId, mod.meta = fetchedModule, file) {
+    const idQuery = url.split("?")[1], query = idQuery ? `?${idQuery}` : "", file = "file" in fetchedModule ? fetchedModule.file : void 0, fileId = file ? `${file}${query}` : url, moduleId = this.moduleCache.normalize(fileId), mod = this.moduleCache.getByModuleId(moduleId);
+    if ("invalidate" in fetchedModule && fetchedModule.invalidate && this.moduleCache.invalidateModule(mod), fetchedModule.id = moduleId, mod.meta = fetchedModule, file) {
       const fileModules = this.fileToIdMap.get(file) || [];
       fileModules.push(moduleId), this.fileToIdMap.set(file, fileModules);
     }
-    return this.idToUrlMap.set(id, moduleId), this.idToUrlMap.set(unwrapId(id), moduleId), fetchedModule;
+    return this.urlToIdMap.set(url, moduleId), this.urlToIdMap.set(unwrapId(url), moduleId), mod;
   }
   // override is allowed, consider this a public API
-  async directRequest(id, fetchResult, _callstack) {
-    const moduleId = fetchResult.id, callstack = [..._callstack, moduleId], mod = this.moduleCache.getByModuleId(moduleId), request = async (dep, metadata) => {
-      const fetchedModule = await this.cachedModule(dep, moduleId);
-      return this.moduleCache.getByModuleId(fetchedModule.id).importers.add(moduleId), mod.imports.add(fetchedModule.id), this.cachedRequest(dep, fetchedModule, callstack, metadata);
+  async directRequest(id, mod, _callstack) {
+    const fetchResult = mod.meta, moduleId = fetchResult.id, callstack = [..._callstack, moduleId], request = async (dep, metadata) => {
+      const importer = "file" in fetchResult && fetchResult.file || moduleId, fetchedModule = await this.cachedModule(dep, importer), resolvedId = fetchedModule.meta.id;
+      return this.moduleCache.getByModuleId(resolvedId).importers.add(moduleId), 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 }));
     if ("externalize" in fetchResult) {
       const { externalize } = fetchResult;
@@ -942,7 +1000,9 @@ ${getStack()}`);
     const { code, file } = fetchResult;
     if (code == null) {
       const importer = callstack[callstack.length - 2];
-      throw new Error(`[module runner] Failed to load "${id}"${importer ? ` imported from ${importer}` : ""}`);
+      throw new Error(
+        `[module runner] Failed to load "${id}"${importer ? ` imported from ${importer}` : ""}`
+      );
     }
     const modulePath = cleanUrl(file || moduleId), href = posixPathToFileHref(modulePath), filename = modulePath, dirname2 = posixDirname(modulePath), meta = {
       filename: isWindows ? toWindowsPath(filename) : filename,
@@ -950,7 +1010,9 @@ ${getStack()}`);
       url: href,
       env: this.envProxy,
       resolve(id2, parent) {
-        throw new Error('[module runner] "import.meta.resolve" is not supported.');
+        throw new Error(
+          '[module runner] "import.meta.resolve" is not supported.'
+        );
       },
       // should be replaced during transformation
       glob() {
@@ -1008,23 +1070,33 @@ class ESModulesEvaluator {
       ssrExportAllKey,
       // source map should already be inlined by Vite
       '"use strict";' + code
-    )(context[ssrModuleExportsKey], context[ssrImportMetaKey], context[ssrImportKey], context[ssrDynamicImportKey], context[ssrExportAllKey]), Object.seal(context[ssrModuleExportsKey]);
+    )(
+      context[ssrModuleExportsKey],
+      context[ssrImportMetaKey],
+      context[ssrImportKey],
+      context[ssrDynamicImportKey],
+      context[ssrExportAllKey]
+    ), Object.seal(context[ssrModuleExportsKey]);
   }
   runExternalModule(filepath) {
     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 {
-  options;
-  rpcPromises = /* @__PURE__ */ new Map();
   constructor(options) {
     this.options = options, this.options.onMessage(async (data) => {
-      if (typeof data != "object" || !data || !data.__v)
-        return;
+      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({
@@ -1036,7 +1108,11 @@ class RemoteRunnerTransport {
       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`));
+        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 });
     });
   }
@@ -1044,13 +1120,6 @@ class RemoteRunnerTransport {
     return this.resolve("fetchModule", id, importer);
   }
 }
-const urlAlphabet = "useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict";
-function nanoid(size = 21) {
-  let id = "", i = size;
-  for (; i--; )
-    id += urlAlphabet[Math.random() * 64 | 0];
-  return id;
-}
 export {
   ESModulesEvaluator,
   ModuleCacheMap,