vite-node 0.1.19 → 0.1.23

package/client.d.ts

@@ -14,7 +14,7 @@ interface ViteNodeRunnerOptions {
     root: string;
     base?: string;
     moduleCache?: Map<string, ModuleCache>;
-    interpretDefault?: boolean;
+    interopDefault?: boolean;
     requestStubs?: Record<string, any>;
 }
 interface ViteNodeResolveId {
@@ -25,10 +25,19 @@ interface ViteNodeResolveId {
     syntheticNamedExports?: boolean | string | null;
 }
 
+declare const DEFAULT_REQUEST_STUBS: {
+    '/@vite/client': {
+        injectQuery: (id: string) => string;
+        createHotContext(): {
+            accept: () => void;
+            prune: () => void;
+        };
+        updateStyle(): void;
+    };
+};
 declare class ViteNodeRunner {
     options: ViteNodeRunnerOptions;
     root: string;
-    externalCache: Map<string, string | Promise<false | string>>;
     moduleCache: Map<string, ModuleCache>;
     constructor(options: ViteNodeRunnerOptions);
     executeFile(file: string): Promise<any>;
@@ -37,6 +46,16 @@ declare class ViteNodeRunner {
     directRequest(id: string, fsPath: string, callstack: string[]): Promise<any>;
     prepareContext(context: Record<string, any>): Record<string, any>;
     setCache(id: string, mod: Partial<ModuleCache>): void;
+    /**
+     * Define if a module should be interop-ed
+     * This function mostly for the ability to override by subclass
+     */
+    shouldInterop(path: string, mod: any): boolean;
+    /**
+     * Import a module and interop it
+     */
+    interopedImport(path: string): Promise<any>;
+    hasNestedDefault(target: any): any;
 }
 
-export { ViteNodeRunner };
+export { DEFAULT_REQUEST_STUBS, ViteNodeRunner };

package/dist/cli.cjs

@@ -46,7 +46,7 @@ function isPrimitive(v) {
   return v !== Object(v);
 }
 function toFilePath(id, root) {
-  let absolute = slash(id).startsWith("/@fs/") ? id.slice(4) : id.startsWith(pathe.dirname(root)) ? id : id.startsWith("/") ? slash(pathe.resolve(root, id.slice(1))) : id;
+  let absolute = slash(id).startsWith("/@fs/") ? id.slice(4) : id.startsWith(pathe.dirname(root)) && pathe.dirname(root) !== "/" ? id : id.startsWith("/") ? slash(pathe.resolve(root, id.slice(1))) : id;
   if (absolute.startsWith("//"))
     absolute = absolute.slice(1);
   return isWindows && absolute.startsWith("/") ? url.fileURLToPath(url.pathToFileURL(absolute.slice(1)).href) : absolute;
@@ -202,13 +202,26 @@ async function withInlineSourcemap(result) {
   return result;
 }
 
+const DEFAULT_REQUEST_STUBS = {
+  "/@vite/client": {
+    injectQuery: (id) => id,
+    createHotContext() {
+      return {
+        accept: () => {
+        },
+        prune: () => {
+        }
+      };
+    },
+    updateStyle() {
+    }
+  }
+};
 class ViteNodeRunner {
   constructor(options) {
     this.options = options;
     this.root = options.root || process.cwd();
     this.moduleCache = options.moduleCache || new Map();
-    this.externalCache = new Map();
-    module$1.builtinModules.forEach((m) => this.externalCache.set(m, m));
   }
   async executeFile(file) {
     return await this.cachedRequest(`/@fs/${slash(pathe.resolve(file))}`, []);
@@ -219,11 +232,11 @@ class ViteNodeRunner {
   async cachedRequest(rawId, callstack) {
     var _a, _b;
     const id = normalizeId(rawId, this.options.base);
+    if ((_a = this.moduleCache.get(id)) == null ? void 0 : _a.promise)
+      return (_b = this.moduleCache.get(id)) == null ? void 0 : _b.promise;
     const fsPath = toFilePath(id, this.root);
-    if ((_a = this.moduleCache.get(fsPath)) == null ? void 0 : _a.promise)
-      return (_b = this.moduleCache.get(fsPath)) == null ? void 0 : _b.promise;
     const promise = this.directRequest(id, fsPath, callstack);
-    this.setCache(fsPath, { promise });
+    this.setCache(id, { promise });
     return await promise;
   }
   async directRequest(id, fsPath, callstack) {
@@ -231,28 +244,28 @@ class ViteNodeRunner {
     const request = async (dep) => {
       var _a;
       if (callstack.includes(dep)) {
-        const cacheKey = toFilePath(dep, this.root);
-        if (!((_a = this.moduleCache.get(cacheKey)) == null ? void 0 : _a.exports))
-          throw new Error(`Circular dependency detected
+        if (!((_a = this.moduleCache.get(dep)) == null ? void 0 : _a.exports))
+          throw new Error(`[vite-node] Circular dependency detected
 Stack:
 ${[...callstack, dep].reverse().map((p) => `- ${p}`).join("\n")}`);
-        return this.moduleCache.get(cacheKey).exports;
+        return this.moduleCache.get(dep).exports;
       }
       return this.cachedRequest(dep, callstack);
     };
-    if (this.options.requestStubs && id in this.options.requestStubs)
-      return this.options.requestStubs[id];
+    const requestStubs = this.options.requestStubs || DEFAULT_REQUEST_STUBS;
+    if (id in requestStubs)
+      return requestStubs[id];
     const { code: transformed, externalize } = await this.options.fetchModule(id);
     if (externalize) {
-      const mod = await interpretedImport(externalize, this.options.interpretDefault ?? true);
-      this.setCache(fsPath, { exports: mod });
+      const mod = await this.interopedImport(externalize);
+      this.setCache(id, { exports: mod });
       return mod;
     }
     if (transformed == null)
-      throw new Error(`failed to load ${id}`);
+      throw new Error(`[vite-node] Failed to load ${id}`);
     const url$1 = url.pathToFileURL(fsPath).href;
     const exports = {};
-    this.setCache(fsPath, { code: transformed, exports });
+    this.setCache(id, { code: transformed, exports });
     const __filename = url.fileURLToPath(url$1);
     const moduleProxy = {
       set exports(value) {
@@ -292,9 +305,27 @@ ${[...callstack, dep].reverse().map((p) => `- ${p}`).join("\n")}`);
     else
       Object.assign(this.moduleCache.get(id), mod);
   }
-}
-function hasNestedDefault(target) {
-  return "__esModule" in target && target.__esModule && "default" in target.default;
+  shouldInterop(path, mod) {
+    if (this.options.interopDefault === false)
+      return false;
+    return !path.endsWith(".mjs") && "default" in mod;
+  }
+  async interopedImport(path) {
+    const mod = await (function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(t)); }); })(path);
+    if (this.shouldInterop(path, mod)) {
+      const tryDefault = this.hasNestedDefault(mod);
+      return new Proxy(mod, {
+        get: proxyMethod("get", tryDefault),
+        set: proxyMethod("set", tryDefault),
+        has: proxyMethod("has", tryDefault),
+        deleteProperty: proxyMethod("deleteProperty", tryDefault)
+      });
+    }
+    return mod;
+  }
+  hasNestedDefault(target) {
+    return "__esModule" in target && target.__esModule && "default" in target.default;
+  }
 }
 function proxyMethod(name, tryDefault) {
   return function(target, key, ...args) {
@@ -306,19 +337,6 @@ function proxyMethod(name, tryDefault) {
     return result;
   };
 }
-async function interpretedImport(path, interpretDefault) {
-  const mod = await (function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(t)); }); })(path);
-  if (interpretDefault && "default" in mod) {
-    const tryDefault = hasNestedDefault(mod);
-    return new Proxy(mod, {
-      get: proxyMethod("get", tryDefault),
-      set: proxyMethod("set", tryDefault),
-      has: proxyMethod("has", tryDefault),
-      deleteProperty: proxyMethod("deleteProperty", tryDefault)
-    });
-  }
-  return mod;
-}
 function exportAll(exports, sourceModule) {
   for (const key in sourceModule) {
     if (key !== "default") {

package/dist/cli.js

@@ -5,7 +5,7 @@ import { existsSync } from 'fs';
 import { isNodeBuiltin, isValidNodeImport } from 'mlly';
 import { fileURLToPath, pathToFileURL } from 'url';
 import { dirname, resolve } from 'pathe';
-import { builtinModules, createRequire } from 'module';
+import { createRequire } from 'module';
 import vm from 'vm';
 
 const isWindows = process.platform === "win32";
@@ -21,7 +21,7 @@ function isPrimitive(v) {
   return v !== Object(v);
 }
 function toFilePath(id, root) {
-  let absolute = slash(id).startsWith("/@fs/") ? id.slice(4) : id.startsWith(dirname(root)) ? id : id.startsWith("/") ? slash(resolve(root, id.slice(1))) : id;
+  let absolute = slash(id).startsWith("/@fs/") ? id.slice(4) : id.startsWith(dirname(root)) && dirname(root) !== "/" ? id : id.startsWith("/") ? slash(resolve(root, id.slice(1))) : id;
   if (absolute.startsWith("//"))
     absolute = absolute.slice(1);
   return isWindows && absolute.startsWith("/") ? fileURLToPath(pathToFileURL(absolute.slice(1)).href) : absolute;
@@ -177,13 +177,26 @@ async function withInlineSourcemap(result) {
   return result;
 }
 
+const DEFAULT_REQUEST_STUBS = {
+  "/@vite/client": {
+    injectQuery: (id) => id,
+    createHotContext() {
+      return {
+        accept: () => {
+        },
+        prune: () => {
+        }
+      };
+    },
+    updateStyle() {
+    }
+  }
+};
 class ViteNodeRunner {
   constructor(options) {
     this.options = options;
     this.root = options.root || process.cwd();
     this.moduleCache = options.moduleCache || new Map();
-    this.externalCache = new Map();
-    builtinModules.forEach((m) => this.externalCache.set(m, m));
   }
   async executeFile(file) {
     return await this.cachedRequest(`/@fs/${slash(resolve(file))}`, []);
@@ -194,11 +207,11 @@ class ViteNodeRunner {
   async cachedRequest(rawId, callstack) {
     var _a, _b;
     const id = normalizeId(rawId, this.options.base);
+    if ((_a = this.moduleCache.get(id)) == null ? void 0 : _a.promise)
+      return (_b = this.moduleCache.get(id)) == null ? void 0 : _b.promise;
     const fsPath = toFilePath(id, this.root);
-    if ((_a = this.moduleCache.get(fsPath)) == null ? void 0 : _a.promise)
-      return (_b = this.moduleCache.get(fsPath)) == null ? void 0 : _b.promise;
     const promise = this.directRequest(id, fsPath, callstack);
-    this.setCache(fsPath, { promise });
+    this.setCache(id, { promise });
     return await promise;
   }
   async directRequest(id, fsPath, callstack) {
@@ -206,28 +219,28 @@ class ViteNodeRunner {
     const request = async (dep) => {
       var _a;
       if (callstack.includes(dep)) {
-        const cacheKey = toFilePath(dep, this.root);
-        if (!((_a = this.moduleCache.get(cacheKey)) == null ? void 0 : _a.exports))
-          throw new Error(`Circular dependency detected
+        if (!((_a = this.moduleCache.get(dep)) == null ? void 0 : _a.exports))
+          throw new Error(`[vite-node] Circular dependency detected
 Stack:
 ${[...callstack, dep].reverse().map((p) => `- ${p}`).join("\n")}`);
-        return this.moduleCache.get(cacheKey).exports;
+        return this.moduleCache.get(dep).exports;
       }
       return this.cachedRequest(dep, callstack);
     };
-    if (this.options.requestStubs && id in this.options.requestStubs)
-      return this.options.requestStubs[id];
+    const requestStubs = this.options.requestStubs || DEFAULT_REQUEST_STUBS;
+    if (id in requestStubs)
+      return requestStubs[id];
     const { code: transformed, externalize } = await this.options.fetchModule(id);
     if (externalize) {
-      const mod = await interpretedImport(externalize, this.options.interpretDefault ?? true);
-      this.setCache(fsPath, { exports: mod });
+      const mod = await this.interopedImport(externalize);
+      this.setCache(id, { exports: mod });
       return mod;
     }
     if (transformed == null)
-      throw new Error(`failed to load ${id}`);
+      throw new Error(`[vite-node] Failed to load ${id}`);
     const url = pathToFileURL(fsPath).href;
     const exports = {};
-    this.setCache(fsPath, { code: transformed, exports });
+    this.setCache(id, { code: transformed, exports });
     const __filename = fileURLToPath(url);
     const moduleProxy = {
       set exports(value) {
@@ -267,9 +280,27 @@ ${[...callstack, dep].reverse().map((p) => `- ${p}`).join("\n")}`);
     else
       Object.assign(this.moduleCache.get(id), mod);
   }
-}
-function hasNestedDefault(target) {
-  return "__esModule" in target && target.__esModule && "default" in target.default;
+  shouldInterop(path, mod) {
+    if (this.options.interopDefault === false)
+      return false;
+    return !path.endsWith(".mjs") && "default" in mod;
+  }
+  async interopedImport(path) {
+    const mod = await import(path);
+    if (this.shouldInterop(path, mod)) {
+      const tryDefault = this.hasNestedDefault(mod);
+      return new Proxy(mod, {
+        get: proxyMethod("get", tryDefault),
+        set: proxyMethod("set", tryDefault),
+        has: proxyMethod("has", tryDefault),
+        deleteProperty: proxyMethod("deleteProperty", tryDefault)
+      });
+    }
+    return mod;
+  }
+  hasNestedDefault(target) {
+    return "__esModule" in target && target.__esModule && "default" in target.default;
+  }
 }
 function proxyMethod(name, tryDefault) {
   return function(target, key, ...args) {
@@ -281,19 +312,6 @@ function proxyMethod(name, tryDefault) {
     return result;
   };
 }
-async function interpretedImport(path, interpretDefault) {
-  const mod = await import(path);
-  if (interpretDefault && "default" in mod) {
-    const tryDefault = hasNestedDefault(mod);
-    return new Proxy(mod, {
-      get: proxyMethod("get", tryDefault),
-      set: proxyMethod("set", tryDefault),
-      has: proxyMethod("has", tryDefault),
-      deleteProperty: proxyMethod("deleteProperty", tryDefault)
-    });
-  }
-  return mod;
-}
 function exportAll(exports, sourceModule) {
   for (const key in sourceModule) {
     if (key !== "default") {

package/dist/client.cjs

@@ -42,19 +42,32 @@ function isPrimitive(v) {
   return v !== Object(v);
 }
 function toFilePath(id, root) {
-  let absolute = slash(id).startsWith("/@fs/") ? id.slice(4) : id.startsWith(pathe.dirname(root)) ? id : id.startsWith("/") ? slash(pathe.resolve(root, id.slice(1))) : id;
+  let absolute = slash(id).startsWith("/@fs/") ? id.slice(4) : id.startsWith(pathe.dirname(root)) && pathe.dirname(root) !== "/" ? id : id.startsWith("/") ? slash(pathe.resolve(root, id.slice(1))) : id;
   if (absolute.startsWith("//"))
     absolute = absolute.slice(1);
   return isWindows && absolute.startsWith("/") ? url.fileURLToPath(url.pathToFileURL(absolute.slice(1)).href) : absolute;
 }
 
+const DEFAULT_REQUEST_STUBS = {
+  "/@vite/client": {
+    injectQuery: (id) => id,
+    createHotContext() {
+      return {
+        accept: () => {
+        },
+        prune: () => {
+        }
+      };
+    },
+    updateStyle() {
+    }
+  }
+};
 class ViteNodeRunner {
   constructor(options) {
     this.options = options;
     this.root = options.root || process.cwd();
     this.moduleCache = options.moduleCache || new Map();
-    this.externalCache = new Map();
-    module$1.builtinModules.forEach((m) => this.externalCache.set(m, m));
   }
   async executeFile(file) {
     return await this.cachedRequest(`/@fs/${slash(pathe.resolve(file))}`, []);
@@ -65,11 +78,11 @@ class ViteNodeRunner {
   async cachedRequest(rawId, callstack) {
     var _a, _b;
     const id = normalizeId(rawId, this.options.base);
+    if ((_a = this.moduleCache.get(id)) == null ? void 0 : _a.promise)
+      return (_b = this.moduleCache.get(id)) == null ? void 0 : _b.promise;
     const fsPath = toFilePath(id, this.root);
-    if ((_a = this.moduleCache.get(fsPath)) == null ? void 0 : _a.promise)
-      return (_b = this.moduleCache.get(fsPath)) == null ? void 0 : _b.promise;
     const promise = this.directRequest(id, fsPath, callstack);
-    this.setCache(fsPath, { promise });
+    this.setCache(id, { promise });
     return await promise;
   }
   async directRequest(id, fsPath, callstack) {
@@ -77,28 +90,28 @@ class ViteNodeRunner {
     const request = async (dep) => {
       var _a;
       if (callstack.includes(dep)) {
-        const cacheKey = toFilePath(dep, this.root);
-        if (!((_a = this.moduleCache.get(cacheKey)) == null ? void 0 : _a.exports))
-          throw new Error(`Circular dependency detected
+        if (!((_a = this.moduleCache.get(dep)) == null ? void 0 : _a.exports))
+          throw new Error(`[vite-node] Circular dependency detected
 Stack:
 ${[...callstack, dep].reverse().map((p) => `- ${p}`).join("\n")}`);
-        return this.moduleCache.get(cacheKey).exports;
+        return this.moduleCache.get(dep).exports;
       }
       return this.cachedRequest(dep, callstack);
     };
-    if (this.options.requestStubs && id in this.options.requestStubs)
-      return this.options.requestStubs[id];
+    const requestStubs = this.options.requestStubs || DEFAULT_REQUEST_STUBS;
+    if (id in requestStubs)
+      return requestStubs[id];
     const { code: transformed, externalize } = await this.options.fetchModule(id);
     if (externalize) {
-      const mod = await interpretedImport(externalize, this.options.interpretDefault ?? true);
-      this.setCache(fsPath, { exports: mod });
+      const mod = await this.interopedImport(externalize);
+      this.setCache(id, { exports: mod });
       return mod;
     }
     if (transformed == null)
-      throw new Error(`failed to load ${id}`);
+      throw new Error(`[vite-node] Failed to load ${id}`);
     const url$1 = url.pathToFileURL(fsPath).href;
     const exports = {};
-    this.setCache(fsPath, { code: transformed, exports });
+    this.setCache(id, { code: transformed, exports });
     const __filename = url.fileURLToPath(url$1);
     const moduleProxy = {
       set exports(value) {
@@ -138,9 +151,27 @@ ${[...callstack, dep].reverse().map((p) => `- ${p}`).join("\n")}`);
     else
       Object.assign(this.moduleCache.get(id), mod);
   }
-}
-function hasNestedDefault(target) {
-  return "__esModule" in target && target.__esModule && "default" in target.default;
+  shouldInterop(path, mod) {
+    if (this.options.interopDefault === false)
+      return false;
+    return !path.endsWith(".mjs") && "default" in mod;
+  }
+  async interopedImport(path) {
+    const mod = await (function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(t)); }); })(path);
+    if (this.shouldInterop(path, mod)) {
+      const tryDefault = this.hasNestedDefault(mod);
+      return new Proxy(mod, {
+        get: proxyMethod("get", tryDefault),
+        set: proxyMethod("set", tryDefault),
+        has: proxyMethod("has", tryDefault),
+        deleteProperty: proxyMethod("deleteProperty", tryDefault)
+      });
+    }
+    return mod;
+  }
+  hasNestedDefault(target) {
+    return "__esModule" in target && target.__esModule && "default" in target.default;
+  }
 }
 function proxyMethod(name, tryDefault) {
   return function(target, key, ...args) {
@@ -152,19 +183,6 @@ function proxyMethod(name, tryDefault) {
     return result;
   };
 }
-async function interpretedImport(path, interpretDefault) {
-  const mod = await (function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(t)); }); })(path);
-  if (interpretDefault && "default" in mod) {
-    const tryDefault = hasNestedDefault(mod);
-    return new Proxy(mod, {
-      get: proxyMethod("get", tryDefault),
-      set: proxyMethod("set", tryDefault),
-      has: proxyMethod("has", tryDefault),
-      deleteProperty: proxyMethod("deleteProperty", tryDefault)
-    });
-  }
-  return mod;
-}
 function exportAll(exports, sourceModule) {
   for (const key in sourceModule) {
     if (key !== "default") {
@@ -182,4 +200,5 @@ function exportAll(exports, sourceModule) {
   }
 }
 
+exports.DEFAULT_REQUEST_STUBS = DEFAULT_REQUEST_STUBS;
 exports.ViteNodeRunner = ViteNodeRunner;

package/dist/client.js

@@ -1,4 +1,4 @@
-import { builtinModules, createRequire } from 'module';
+import { createRequire } from 'module';
 import { fileURLToPath, pathToFileURL } from 'url';
 import vm from 'vm';
 import { dirname, resolve } from 'pathe';
@@ -16,19 +16,32 @@ function isPrimitive(v) {
   return v !== Object(v);
 }
 function toFilePath(id, root) {
-  let absolute = slash(id).startsWith("/@fs/") ? id.slice(4) : id.startsWith(dirname(root)) ? id : id.startsWith("/") ? slash(resolve(root, id.slice(1))) : id;
+  let absolute = slash(id).startsWith("/@fs/") ? id.slice(4) : id.startsWith(dirname(root)) && dirname(root) !== "/" ? id : id.startsWith("/") ? slash(resolve(root, id.slice(1))) : id;
   if (absolute.startsWith("//"))
     absolute = absolute.slice(1);
   return isWindows && absolute.startsWith("/") ? fileURLToPath(pathToFileURL(absolute.slice(1)).href) : absolute;
 }
 
+const DEFAULT_REQUEST_STUBS = {
+  "/@vite/client": {
+    injectQuery: (id) => id,
+    createHotContext() {
+      return {
+        accept: () => {
+        },
+        prune: () => {
+        }
+      };
+    },
+    updateStyle() {
+    }
+  }
+};
 class ViteNodeRunner {
   constructor(options) {
     this.options = options;
     this.root = options.root || process.cwd();
     this.moduleCache = options.moduleCache || new Map();
-    this.externalCache = new Map();
-    builtinModules.forEach((m) => this.externalCache.set(m, m));
   }
   async executeFile(file) {
     return await this.cachedRequest(`/@fs/${slash(resolve(file))}`, []);
@@ -39,11 +52,11 @@ class ViteNodeRunner {
   async cachedRequest(rawId, callstack) {
     var _a, _b;
     const id = normalizeId(rawId, this.options.base);
+    if ((_a = this.moduleCache.get(id)) == null ? void 0 : _a.promise)
+      return (_b = this.moduleCache.get(id)) == null ? void 0 : _b.promise;
     const fsPath = toFilePath(id, this.root);
-    if ((_a = this.moduleCache.get(fsPath)) == null ? void 0 : _a.promise)
-      return (_b = this.moduleCache.get(fsPath)) == null ? void 0 : _b.promise;
     const promise = this.directRequest(id, fsPath, callstack);
-    this.setCache(fsPath, { promise });
+    this.setCache(id, { promise });
     return await promise;
   }
   async directRequest(id, fsPath, callstack) {
@@ -51,28 +64,28 @@ class ViteNodeRunner {
     const request = async (dep) => {
       var _a;
       if (callstack.includes(dep)) {
-        const cacheKey = toFilePath(dep, this.root);
-        if (!((_a = this.moduleCache.get(cacheKey)) == null ? void 0 : _a.exports))
-          throw new Error(`Circular dependency detected
+        if (!((_a = this.moduleCache.get(dep)) == null ? void 0 : _a.exports))
+          throw new Error(`[vite-node] Circular dependency detected
 Stack:
 ${[...callstack, dep].reverse().map((p) => `- ${p}`).join("\n")}`);
-        return this.moduleCache.get(cacheKey).exports;
+        return this.moduleCache.get(dep).exports;
       }
       return this.cachedRequest(dep, callstack);
     };
-    if (this.options.requestStubs && id in this.options.requestStubs)
-      return this.options.requestStubs[id];
+    const requestStubs = this.options.requestStubs || DEFAULT_REQUEST_STUBS;
+    if (id in requestStubs)
+      return requestStubs[id];
     const { code: transformed, externalize } = await this.options.fetchModule(id);
     if (externalize) {
-      const mod = await interpretedImport(externalize, this.options.interpretDefault ?? true);
-      this.setCache(fsPath, { exports: mod });
+      const mod = await this.interopedImport(externalize);
+      this.setCache(id, { exports: mod });
       return mod;
     }
     if (transformed == null)
-      throw new Error(`failed to load ${id}`);
+      throw new Error(`[vite-node] Failed to load ${id}`);
     const url = pathToFileURL(fsPath).href;
     const exports = {};
-    this.setCache(fsPath, { code: transformed, exports });
+    this.setCache(id, { code: transformed, exports });
     const __filename = fileURLToPath(url);
     const moduleProxy = {
       set exports(value) {
@@ -112,9 +125,27 @@ ${[...callstack, dep].reverse().map((p) => `- ${p}`).join("\n")}`);
     else
       Object.assign(this.moduleCache.get(id), mod);
   }
-}
-function hasNestedDefault(target) {
-  return "__esModule" in target && target.__esModule && "default" in target.default;
+  shouldInterop(path, mod) {
+    if (this.options.interopDefault === false)
+      return false;
+    return !path.endsWith(".mjs") && "default" in mod;
+  }
+  async interopedImport(path) {
+    const mod = await import(path);
+    if (this.shouldInterop(path, mod)) {
+      const tryDefault = this.hasNestedDefault(mod);
+      return new Proxy(mod, {
+        get: proxyMethod("get", tryDefault),
+        set: proxyMethod("set", tryDefault),
+        has: proxyMethod("has", tryDefault),
+        deleteProperty: proxyMethod("deleteProperty", tryDefault)
+      });
+    }
+    return mod;
+  }
+  hasNestedDefault(target) {
+    return "__esModule" in target && target.__esModule && "default" in target.default;
+  }
 }
 function proxyMethod(name, tryDefault) {
   return function(target, key, ...args) {
@@ -126,19 +157,6 @@ function proxyMethod(name, tryDefault) {
     return result;
   };
 }
-async function interpretedImport(path, interpretDefault) {
-  const mod = await import(path);
-  if (interpretDefault && "default" in mod) {
-    const tryDefault = hasNestedDefault(mod);
-    return new Proxy(mod, {
-      get: proxyMethod("get", tryDefault),
-      set: proxyMethod("set", tryDefault),
-      has: proxyMethod("has", tryDefault),
-      deleteProperty: proxyMethod("deleteProperty", tryDefault)
-    });
-  }
-  return mod;
-}
 function exportAll(exports, sourceModule) {
   for (const key in sourceModule) {
     if (key !== "default") {
@@ -156,4 +174,4 @@ function exportAll(exports, sourceModule) {
   }
 }
 
-export { ViteNodeRunner };
+export { DEFAULT_REQUEST_STUBS, ViteNodeRunner };

package/dist/server.cjs

@@ -12,7 +12,7 @@ function slash(str) {
   return str.replace(/\\/g, "/");
 }
 function toFilePath(id, root) {
-  let absolute = slash(id).startsWith("/@fs/") ? id.slice(4) : id.startsWith(pathe.dirname(root)) ? id : id.startsWith("/") ? slash(pathe.resolve(root, id.slice(1))) : id;
+  let absolute = slash(id).startsWith("/@fs/") ? id.slice(4) : id.startsWith(pathe.dirname(root)) && pathe.dirname(root) !== "/" ? id : id.startsWith("/") ? slash(pathe.resolve(root, id.slice(1))) : id;
   if (absolute.startsWith("//"))
     absolute = absolute.slice(1);
   return isWindows && absolute.startsWith("/") ? url.fileURLToPath(url.pathToFileURL(absolute.slice(1)).href) : absolute;

package/dist/server.js

@@ -8,7 +8,7 @@ function slash(str) {
   return str.replace(/\\/g, "/");
 }
 function toFilePath(id, root) {
-  let absolute = slash(id).startsWith("/@fs/") ? id.slice(4) : id.startsWith(dirname(root)) ? id : id.startsWith("/") ? slash(resolve(root, id.slice(1))) : id;
+  let absolute = slash(id).startsWith("/@fs/") ? id.slice(4) : id.startsWith(dirname(root)) && dirname(root) !== "/" ? id : id.startsWith("/") ? slash(resolve(root, id.slice(1))) : id;
   if (absolute.startsWith("//"))
     absolute = absolute.slice(1);
   return isWindows && absolute.startsWith("/") ? fileURLToPath(pathToFileURL(absolute.slice(1)).href) : absolute;

package/dist/utils.cjs

@@ -18,7 +18,7 @@ function isPrimitive(v) {
   return v !== Object(v);
 }
 function toFilePath(id, root) {
-  let absolute = slash(id).startsWith("/@fs/") ? id.slice(4) : id.startsWith(pathe.dirname(root)) ? id : id.startsWith("/") ? slash(pathe.resolve(root, id.slice(1))) : id;
+  let absolute = slash(id).startsWith("/@fs/") ? id.slice(4) : id.startsWith(pathe.dirname(root)) && pathe.dirname(root) !== "/" ? id : id.startsWith("/") ? slash(pathe.resolve(root, id.slice(1))) : id;
   if (absolute.startsWith("//"))
     absolute = absolute.slice(1);
   return isWindows && absolute.startsWith("/") ? url.fileURLToPath(url.pathToFileURL(absolute.slice(1)).href) : absolute;

package/dist/utils.js

@@ -14,7 +14,7 @@ function isPrimitive(v) {
   return v !== Object(v);
 }
 function toFilePath(id, root) {
-  let absolute = slash(id).startsWith("/@fs/") ? id.slice(4) : id.startsWith(dirname(root)) ? id : id.startsWith("/") ? slash(resolve(root, id.slice(1))) : id;
+  let absolute = slash(id).startsWith("/@fs/") ? id.slice(4) : id.startsWith(dirname(root)) && dirname(root) !== "/" ? id : id.startsWith("/") ? slash(resolve(root, id.slice(1))) : id;
   if (absolute.startsWith("//"))
     absolute = absolute.slice(1);
   return isWindows && absolute.startsWith("/") ? fileURLToPath(pathToFileURL(absolute.slice(1)).href) : absolute;

package/index.d.ts

@@ -23,7 +23,7 @@ interface ViteNodeRunnerOptions {
     root: string;
     base?: string;
     moduleCache?: Map<string, ModuleCache>;
-    interpretDefault?: boolean;
+    interopDefault?: boolean;
     requestStubs?: Record<string, any>;
 }
 interface ViteNodeResolveId {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-node",
-  "version": "0.1.19",
+  "version": "0.1.23",
   "description": "Vite as Node.js runtime",
   "homepage": "https://github.com/vitest-dev/vitest#readme",
   "bugs": {
@@ -51,13 +51,13 @@
   "dependencies": {
     "kolorist": "^1.5.1",
     "minimist": "^1.2.5",
-    "mlly": "^0.3.17",
+    "mlly": "^0.3.19",
     "pathe": "^0.2.0",
-    "vite": "^2.7.12"
+    "vite": "^2.7.13"
   },
   "devDependencies": {
     "@types/minimist": "^1.2.2",
-    "rollup": "^2.63.0"
+    "rollup": "^2.64.0"
   },
   "engines": {
     "node": ">=14.14.0"