vite-node 0.26.1 → 0.26.3

package/dist/cli.cjs

@@ -634,7 +634,7 @@ class CAC extends events.EventEmitter {
 
 const cac = (name = "") => new CAC(name);
 
-var version = "0.26.1";
+var version = "0.26.3";
 
 const cli = cac("vite-node");
 cli.version(version).option("-r, --root <path>", "Use specified root directory").option("-c, --config <path>", "Use specified config file").option("-w, --watch", 'Restart on file changes, similar to "nodemon"').option("--options <options>", "Use specified Vite server options").help();

package/dist/cli.d.ts

@@ -1,4 +1,4 @@
-import { e as ViteNodeServerOptions } from './types-57a192bf.js';
+import { e as ViteNodeServerOptions } from './types-63205a44.js';
 
 interface CliOptions {
     root?: string;

package/dist/cli.mjs

@@ -632,7 +632,7 @@ class CAC extends EventEmitter {
 
 const cac = (name = "") => new CAC(name);
 
-var version = "0.26.1";
+var version = "0.26.3";
 
 const cli = cac("vite-node");
 cli.version(version).option("-r, --root <path>", "Use specified root directory").option("-c, --config <path>", "Use specified config file").option("-w, --watch", 'Restart on file changes, similar to "nodemon"').option("--options <options>", "Use specified Vite server options").help();

package/dist/client.cjs

@@ -39,40 +39,42 @@ var createDebug__default = /*#__PURE__*/_interopDefaultLegacy(createDebug);
 
 const debugExecute = createDebug__default["default"]("vite-node:client:execute");
 const debugNative = createDebug__default["default"]("vite-node:client:native");
-const DEFAULT_REQUEST_STUBS = {
-  "/@vite/client": {
-    injectQuery: (id) => id,
-    createHotContext() {
-      return {
-        accept: () => {
-        },
-        prune: () => {
-        },
-        dispose: () => {
-        },
-        decline: () => {
-        },
-        invalidate: () => {
-        },
-        on: () => {
-        }
-      };
-    },
-    updateStyle(id, css) {
-      if (typeof document === "undefined")
-        return;
-      const element = document.getElementById(id);
-      if (element)
-        element.remove();
-      const head = document.querySelector("head");
-      const style = document.createElement("style");
-      style.setAttribute("type", "text/css");
-      style.id = id;
-      style.innerHTML = css;
-      head == null ? void 0 : head.appendChild(style);
-    }
+const clientStub = {
+  injectQuery: (id) => id,
+  createHotContext() {
+    return {
+      accept: () => {
+      },
+      prune: () => {
+      },
+      dispose: () => {
+      },
+      decline: () => {
+      },
+      invalidate: () => {
+      },
+      on: () => {
+      }
+    };
+  },
+  updateStyle(id, css) {
+    if (typeof document === "undefined")
+      return;
+    const element = document.getElementById(id);
+    if (element)
+      element.remove();
+    const head = document.querySelector("head");
+    const style = document.createElement("style");
+    style.setAttribute("type", "text/css");
+    style.id = id;
+    style.innerHTML = css;
+    head == null ? void 0 : head.appendChild(style);
   }
 };
+const DEFAULT_REQUEST_STUBS = {
+  "/@vite/client": clientStub,
+  "@vite/client": clientStub
+};
 class ModuleCacheMap extends Map {
   normalizePath(fsPath) {
     return utils.normalizeModuleId(fsPath);
@@ -85,19 +87,25 @@ class ModuleCacheMap extends Map {
       Object.assign(super.get(fsPath), mod);
     return this;
   }
+  setByModuleId(modulePath, mod) {
+    return super.set(modulePath, mod);
+  }
   set(fsPath, mod) {
-    fsPath = this.normalizePath(fsPath);
-    return super.set(fsPath, mod);
+    return this.setByModuleId(this.normalizePath(fsPath), mod);
+  }
+  getByModuleId(modulePath) {
+    if (!super.has(modulePath))
+      super.set(modulePath, {});
+    return super.get(modulePath);
   }
   get(fsPath) {
-    fsPath = this.normalizePath(fsPath);
-    if (!super.has(fsPath))
-      super.set(fsPath, {});
-    return super.get(fsPath);
+    return this.getByModuleId(this.normalizePath(fsPath));
+  }
+  deleteByModuleId(modulePath) {
+    return super.delete(modulePath);
   }
   delete(fsPath) {
-    fsPath = this.normalizePath(fsPath);
-    return super.delete(fsPath);
+    return this.deleteByModuleId(this.normalizePath(fsPath));
   }
   invalidateDepTree(ids, invalidated = /* @__PURE__ */ new Set()) {
     for (const _id of ids) {
@@ -179,7 +187,7 @@ class ViteNodeRunner {
   shouldResolveId(id, _importee) {
     return !utils.isInternalRequest(id) && !mlly.isNodeBuiltin(id);
   }
-  async resolveUrl(id, importee) {
+  async _resolveUrl(id, importee) {
     if (!this.shouldResolveId(id))
       return [id, id];
     if (importee && id.startsWith(utils.VALID_ID_PREFIX))
@@ -192,6 +200,15 @@ class ViteNodeRunner {
     const fsPath = resolved ? resolvedId : utils.toFilePath(id, this.root);
     return [resolvedId, fsPath];
   }
+  async resolveUrl(id, importee) {
+    const resolveKey = `resolve:${id}`;
+    this.moduleCache.setByModuleId(resolveKey, { resolving: true });
+    try {
+      return await this._resolveUrl(id, importee);
+    } finally {
+      this.moduleCache.deleteByModuleId(resolveKey);
+    }
+  }
   async dependencyRequest(id, fsPath, callstack) {
     var _a;
     const getStack = () => {
@@ -218,7 +235,7 @@ ${getStack()}`), 2e3);
   async directRequest(id, fsPath, _callstack) {
     const moduleId = utils.normalizeModuleId(fsPath);
     const callstack = [..._callstack, moduleId];
-    const mod = this.moduleCache.get(fsPath);
+    const mod = this.moduleCache.getByModuleId(moduleId);
     const request = async (dep) => {
       const [id2, depFsPath] = await this.resolveUrl(dep, fsPath);
       return this.dependencyRequest(id2, depFsPath, callstack);
@@ -337,6 +354,25 @@ ${getStack()}`), 2e3);
         if (prop === "default")
           return defaultExport !== void 0;
         return prop in mod2 || defaultExport && prop in defaultExport;
+      },
+      ownKeys(mod2) {
+        const keys = Reflect.ownKeys(mod2);
+        if (!defaultExport || utils.isPrimitive(defaultExport))
+          return keys;
+        const allKeys = [...keys, "default", ...Reflect.ownKeys(defaultExport)];
+        return Array.from(new Set(allKeys));
+      },
+      getOwnPropertyDescriptor(mod2, prop) {
+        const descriptor = Reflect.getOwnPropertyDescriptor(mod2, prop);
+        if (descriptor)
+          return descriptor;
+        if (prop === "default" && defaultExport !== void 0) {
+          return {
+            value: defaultExport,
+            enumerable: true,
+            configurable: true
+          };
+        }
       }
     });
   }

package/dist/client.d.ts

@@ -1 +1 @@
-export { j as DEFAULT_REQUEST_STUBS, M as ModuleCacheMap, h as ViteNodeRunner } from './types-57a192bf.js';
+export { j as DEFAULT_REQUEST_STUBS, M as ModuleCacheMap, h as ViteNodeRunner } from './types-63205a44.js';

package/dist/client.mjs

@@ -12,40 +12,42 @@ import 'source-map-support';
 
 const debugExecute = createDebug("vite-node:client:execute");
 const debugNative = createDebug("vite-node:client:native");
-const DEFAULT_REQUEST_STUBS = {
-  "/@vite/client": {
-    injectQuery: (id) => id,
-    createHotContext() {
-      return {
-        accept: () => {
-        },
-        prune: () => {
-        },
-        dispose: () => {
-        },
-        decline: () => {
-        },
-        invalidate: () => {
-        },
-        on: () => {
-        }
-      };
-    },
-    updateStyle(id, css) {
-      if (typeof document === "undefined")
-        return;
-      const element = document.getElementById(id);
-      if (element)
-        element.remove();
-      const head = document.querySelector("head");
-      const style = document.createElement("style");
-      style.setAttribute("type", "text/css");
-      style.id = id;
-      style.innerHTML = css;
-      head == null ? void 0 : head.appendChild(style);
-    }
+const clientStub = {
+  injectQuery: (id) => id,
+  createHotContext() {
+    return {
+      accept: () => {
+      },
+      prune: () => {
+      },
+      dispose: () => {
+      },
+      decline: () => {
+      },
+      invalidate: () => {
+      },
+      on: () => {
+      }
+    };
+  },
+  updateStyle(id, css) {
+    if (typeof document === "undefined")
+      return;
+    const element = document.getElementById(id);
+    if (element)
+      element.remove();
+    const head = document.querySelector("head");
+    const style = document.createElement("style");
+    style.setAttribute("type", "text/css");
+    style.id = id;
+    style.innerHTML = css;
+    head == null ? void 0 : head.appendChild(style);
   }
 };
+const DEFAULT_REQUEST_STUBS = {
+  "/@vite/client": clientStub,
+  "@vite/client": clientStub
+};
 class ModuleCacheMap extends Map {
   normalizePath(fsPath) {
     return normalizeModuleId(fsPath);
@@ -58,19 +60,25 @@ class ModuleCacheMap extends Map {
       Object.assign(super.get(fsPath), mod);
     return this;
   }
+  setByModuleId(modulePath, mod) {
+    return super.set(modulePath, mod);
+  }
   set(fsPath, mod) {
-    fsPath = this.normalizePath(fsPath);
-    return super.set(fsPath, mod);
+    return this.setByModuleId(this.normalizePath(fsPath), mod);
+  }
+  getByModuleId(modulePath) {
+    if (!super.has(modulePath))
+      super.set(modulePath, {});
+    return super.get(modulePath);
   }
   get(fsPath) {
-    fsPath = this.normalizePath(fsPath);
-    if (!super.has(fsPath))
-      super.set(fsPath, {});
-    return super.get(fsPath);
+    return this.getByModuleId(this.normalizePath(fsPath));
+  }
+  deleteByModuleId(modulePath) {
+    return super.delete(modulePath);
   }
   delete(fsPath) {
-    fsPath = this.normalizePath(fsPath);
-    return super.delete(fsPath);
+    return this.deleteByModuleId(this.normalizePath(fsPath));
   }
   invalidateDepTree(ids, invalidated = /* @__PURE__ */ new Set()) {
     for (const _id of ids) {
@@ -152,7 +160,7 @@ class ViteNodeRunner {
   shouldResolveId(id, _importee) {
     return !isInternalRequest(id) && !isNodeBuiltin(id);
   }
-  async resolveUrl(id, importee) {
+  async _resolveUrl(id, importee) {
     if (!this.shouldResolveId(id))
       return [id, id];
     if (importee && id.startsWith(VALID_ID_PREFIX))
@@ -165,6 +173,15 @@ class ViteNodeRunner {
     const fsPath = resolved ? resolvedId : toFilePath(id, this.root);
     return [resolvedId, fsPath];
   }
+  async resolveUrl(id, importee) {
+    const resolveKey = `resolve:${id}`;
+    this.moduleCache.setByModuleId(resolveKey, { resolving: true });
+    try {
+      return await this._resolveUrl(id, importee);
+    } finally {
+      this.moduleCache.deleteByModuleId(resolveKey);
+    }
+  }
   async dependencyRequest(id, fsPath, callstack) {
     var _a;
     const getStack = () => {
@@ -191,7 +208,7 @@ ${getStack()}`), 2e3);
   async directRequest(id, fsPath, _callstack) {
     const moduleId = normalizeModuleId(fsPath);
     const callstack = [..._callstack, moduleId];
-    const mod = this.moduleCache.get(fsPath);
+    const mod = this.moduleCache.getByModuleId(moduleId);
     const request = async (dep) => {
       const [id2, depFsPath] = await this.resolveUrl(dep, fsPath);
       return this.dependencyRequest(id2, depFsPath, callstack);
@@ -310,6 +327,25 @@ ${getStack()}`), 2e3);
         if (prop === "default")
           return defaultExport !== void 0;
         return prop in mod2 || defaultExport && prop in defaultExport;
+      },
+      ownKeys(mod2) {
+        const keys = Reflect.ownKeys(mod2);
+        if (!defaultExport || isPrimitive(defaultExport))
+          return keys;
+        const allKeys = [...keys, "default", ...Reflect.ownKeys(defaultExport)];
+        return Array.from(new Set(allKeys));
+      },
+      getOwnPropertyDescriptor(mod2, prop) {
+        const descriptor = Reflect.getOwnPropertyDescriptor(mod2, prop);
+        if (descriptor)
+          return descriptor;
+        if (prop === "default" && defaultExport !== void 0) {
+          return {
+            value: defaultExport,
+            enumerable: true,
+            configurable: true
+          };
+        }
       }
     });
   }

package/dist/hmr.d.ts

@@ -1,6 +1,6 @@
 import { EventEmitter } from 'node:events';
 import { HMRPayload, Plugin } from 'vite';
-import { g as CustomEventMap, h as ViteNodeRunner, i as HMRPayload$1, H as HotContext } from './types-57a192bf.js';
+import { g as CustomEventMap, h as ViteNodeRunner, i as HMRPayload$1, H as HotContext } from './types-63205a44.js';
 
 type EventType = string | symbol;
 type Handler<T = unknown> = (event: T) => void;

package/dist/index.d.ts

@@ -1 +1 @@
-export { A as Arrayable, C as CreateHotContextFunction, f as DebuggerOptions, D as DepsHandlingOptions, a as FetchFunction, F as FetchResult, H as HotContext, c as ModuleCache, M as ModuleCacheMap, N as Nullable, R as RawSourceMap, b as ResolveIdFunction, S as StartOfSourceMap, d as ViteNodeResolveId, V as ViteNodeRunnerOptions, e as ViteNodeServerOptions } from './types-57a192bf.js';
+export { A as Arrayable, C as CreateHotContextFunction, f as DebuggerOptions, D as DepsHandlingOptions, a as FetchFunction, F as FetchResult, H as HotContext, c as ModuleCache, M as ModuleCacheMap, N as Nullable, R as RawSourceMap, b as ResolveIdFunction, S as StartOfSourceMap, d as ViteNodeResolveId, V as ViteNodeRunnerOptions, e as ViteNodeServerOptions } from './types-63205a44.js';

package/dist/server.d.ts

@@ -1,5 +1,5 @@
 import { TransformResult, ViteDevServer } from 'vite';
-import { f as DebuggerOptions, D as DepsHandlingOptions, e as ViteNodeServerOptions, F as FetchResult, d as ViteNodeResolveId, R as RawSourceMap } from './types-57a192bf.js';
+import { f as DebuggerOptions, D as DepsHandlingOptions, e as ViteNodeServerOptions, F as FetchResult, d as ViteNodeResolveId, R as RawSourceMap } from './types-63205a44.js';
 
 declare class Debugger {
     options: DebuggerOptions;

package/dist/source-map.d.ts

@@ -1,5 +1,5 @@
 import { TransformResult } from 'vite';
-import { R as RawSourceMap } from './types-57a192bf.js';
+import { R as RawSourceMap } from './types-63205a44.js';
 
 interface InstallSourceMapSupportOptions {
     getSourceMap: (source: string) => RawSourceMap | null | undefined;

package/dist/{types-57a192bf.d.ts → types-63205a44.d.ts}

@@ -121,6 +121,18 @@ declare const DEFAULT_REQUEST_STUBS: {
         };
         updateStyle(id: string, css: string): void;
     };
+    '@vite/client': {
+        injectQuery: (id: string) => string;
+        createHotContext(): {
+            accept: () => void;
+            prune: () => void;
+            dispose: () => void;
+            decline: () => void;
+            invalidate: () => void;
+            on: () => void;
+        };
+        updateStyle(id: string, css: string): void;
+    };
 };
 declare class ModuleCacheMap extends Map<string, ModuleCache> {
     normalizePath(fsPath: string): string;
@@ -128,8 +140,11 @@ declare class ModuleCacheMap extends Map<string, ModuleCache> {
      * Assign partial data to the map
      */
     update(fsPath: string, mod: Partial<ModuleCache>): this;
+    setByModuleId(modulePath: string, mod: ModuleCache): this;
     set(fsPath: string, mod: ModuleCache): this;
+    getByModuleId(modulePath: string): ModuleCache;
     get(fsPath: string): ModuleCache;
+    deleteByModuleId(modulePath: string): boolean;
     delete(fsPath: string): boolean;
     /**
      * Invalidate modules that dependent on the given modules, up to the main entry
@@ -160,6 +175,7 @@ declare class ViteNodeRunner {
     /** @internal */
     cachedRequest(id: string, fsPath: string, callstack: string[]): Promise<any>;
     shouldResolveId(id: string, _importee?: string): boolean;
+    private _resolveUrl;
     resolveUrl(id: string, importee?: string): Promise<[url: string, fsPath: string]>;
     /** @internal */
     dependencyRequest(id: string, fsPath: string, callstack: string[]): Promise<any>;
@@ -212,6 +228,7 @@ interface ModuleCache {
     promise?: Promise<any>;
     exports?: any;
     evaluated?: boolean;
+    resolving?: boolean;
     code?: string;
     map?: RawSourceMap;
     /**

package/dist/types.d.ts

@@ -1 +1 @@
-export { A as Arrayable, C as CreateHotContextFunction, f as DebuggerOptions, D as DepsHandlingOptions, a as FetchFunction, F as FetchResult, H as HotContext, c as ModuleCache, M as ModuleCacheMap, N as Nullable, R as RawSourceMap, b as ResolveIdFunction, S as StartOfSourceMap, d as ViteNodeResolveId, V as ViteNodeRunnerOptions, e as ViteNodeServerOptions } from './types-57a192bf.js';
+export { A as Arrayable, C as CreateHotContextFunction, f as DebuggerOptions, D as DepsHandlingOptions, a as FetchFunction, F as FetchResult, H as HotContext, c as ModuleCache, M as ModuleCacheMap, N as Nullable, R as RawSourceMap, b as ResolveIdFunction, S as StartOfSourceMap, d as ViteNodeResolveId, V as ViteNodeRunnerOptions, e as ViteNodeServerOptions } from './types-63205a44.js';

package/dist/utils.cjs

@@ -22,8 +22,13 @@ function normalizeRequestId(id, base) {
 const queryRE = /\?.*$/s;
 const hashRE = /#.*$/s;
 const cleanUrl = (url) => url.replace(hashRE, "").replace(queryRE, "");
+const internalRequests = [
+  "@vite/client",
+  "@vite/env"
+];
+const internalRequestRegexp = new RegExp(`^/?(${internalRequests.join("|")})$`);
 const isInternalRequest = (id) => {
-  return id.startsWith("/@vite/");
+  return internalRequestRegexp.test(id);
 };
 function normalizeModuleId(id) {
   return id.replace(/\\/g, "/").replace(/^\/@fs\//, isWindows ? "" : "/").replace(/^file:\//, "/").replace(/^node:/, "").replace(/^\/+/, "/");

package/dist/utils.d.ts

@@ -1,4 +1,4 @@
-import { N as Nullable, A as Arrayable } from './types-57a192bf.js';
+import { N as Nullable, A as Arrayable } from './types-63205a44.js';
 
 declare const isWindows: boolean;
 declare function slash(str: string): string;

package/dist/utils.mjs

@@ -18,8 +18,13 @@ function normalizeRequestId(id, base) {
 const queryRE = /\?.*$/s;
 const hashRE = /#.*$/s;
 const cleanUrl = (url) => url.replace(hashRE, "").replace(queryRE, "");
+const internalRequests = [
+  "@vite/client",
+  "@vite/env"
+];
+const internalRequestRegexp = new RegExp(`^/?(${internalRequests.join("|")})$`);
 const isInternalRequest = (id) => {
-  return id.startsWith("/@vite/");
+  return internalRequestRegexp.test(id);
 };
 function normalizeModuleId(id) {
   return id.replace(/\\/g, "/").replace(/^\/@fs\//, isWindows ? "" : "/").replace(/^file:\//, "/").replace(/^node:/, "").replace(/^\/+/, "/");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-node",
-  "version": "0.26.1",
+  "version": "0.26.3",
   "description": "Vite as Node.js runtime",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",