vite-node 0.25.7 → 0.26.0

package/dist/cli.cjs

@@ -17,6 +17,7 @@ require('mlly');
 require('url');
 require('source-map-support');
 require('module');
+require('path');
 require('vm');
 
 function toArr(any) {
@@ -632,7 +633,7 @@ class CAC extends events.EventEmitter {
 
 const cac = (name = "") => new CAC(name);
 
-var version = "0.25.7";
+var version = "0.26.0";
 
 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-c9a1a6b2.js';
+import { e as ViteNodeServerOptions } from './types-aaf02e1c.js';
 
 interface CliOptions {
     root?: string;
@@ -7,10 +7,10 @@ interface CliOptions {
     options?: ViteNodeServerOptionsCLI;
     '--'?: string[];
 }
-declare type Optional<T> = T | undefined;
-declare type ComputeViteNodeServerOptionsCLI<T extends Record<string, any>> = {
+type Optional<T> = T | undefined;
+type ComputeViteNodeServerOptionsCLI<T extends Record<string, any>> = {
     [K in keyof T]: T[K] extends Optional<RegExp[]> ? string | string[] : T[K] extends Optional<(string | RegExp)[]> ? string | string[] : T[K] extends Optional<(string | RegExp)[] | true> ? string | string[] | true : T[K] extends Optional<Record<string, any>> ? ComputeViteNodeServerOptionsCLI<T[K]> : T[K];
 };
-declare type ViteNodeServerOptionsCLI = ComputeViteNodeServerOptionsCLI<ViteNodeServerOptions>;
+type ViteNodeServerOptionsCLI = ComputeViteNodeServerOptionsCLI<ViteNodeServerOptions>;
 
 export { CliOptions, ViteNodeServerOptionsCLI };

package/dist/cli.mjs

@@ -15,6 +15,7 @@ import 'mlly';
 import 'url';
 import 'source-map-support';
 import 'module';
+import 'path';
 import 'vm';
 
 function toArr(any) {
@@ -630,7 +631,7 @@ class CAC extends EventEmitter {
 
 const cac = (name = "") => new CAC(name);
 
-var version = "0.25.7";
+var version = "0.26.0";
 
 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

@@ -3,10 +3,10 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var module$1 = require('module');
+var path = require('path');
 var url = require('url');
 var vm = require('vm');
 var pathe = require('pathe');
-var mlly = require('mlly');
 var createDebug = require('debug');
 var utils = require('./utils.cjs');
 var sourceMap = require('./source-map.cjs');
@@ -146,19 +146,19 @@ class ViteNodeRunner {
     this.debug = options.debug ?? (typeof process !== "undefined" ? !!process.env.VITE_NODE_DEBUG_RUNNER : false);
   }
   async executeFile(file) {
-    return await this.cachedRequest(`/@fs/${utils.slash(pathe.resolve(file))}`, []);
+    const url = `/@fs/${utils.slash(pathe.resolve(file))}`;
+    return await this.cachedRequest(url, url, []);
   }
-  async executeId(id) {
-    return await this.cachedRequest(id, []);
+  async executeId(rawId) {
+    const [id, url] = await this.resolveUrl(rawId);
+    return await this.cachedRequest(id, url, []);
   }
   getSourceMap(id) {
     return this.moduleCache.getSourceMap(id);
   }
-  async cachedRequest(rawId, callstack) {
-    const id = utils.normalizeRequestId(rawId, this.options.base);
-    const fsPath = utils.toFilePath(id, this.root);
-    const mod = this.moduleCache.get(fsPath);
+  async cachedRequest(id, fsPath, callstack) {
     const importee = callstack[callstack.length - 1];
+    const mod = this.moduleCache.get(fsPath);
     if (!mod.importers)
       mod.importers = /* @__PURE__ */ new Set();
     if (importee)
@@ -169,68 +169,60 @@ class ViteNodeRunner {
       return mod.promise;
     const promise = this.directRequest(id, fsPath, callstack);
     Object.assign(mod, { promise, evaluated: false });
-    promise.finally(() => {
+    try {
+      return await promise;
+    } finally {
       mod.evaluated = true;
-    });
-    return await promise;
+    }
   }
-  async directRequest(id, fsPath, _callstack) {
-    const callstack = [..._callstack, fsPath];
-    let mod = this.moduleCache.get(fsPath);
-    const request = async (dep2) => {
-      var _a;
-      const depFsPath = utils.toFilePath(utils.normalizeRequestId(dep2, this.options.base), this.root);
-      const getStack = () => {
-        return `stack:
-${[...callstack, depFsPath].reverse().map((p) => `- ${p}`).join("\n")}`;
-      };
-      let debugTimer;
-      if (this.debug)
-        debugTimer = setTimeout(() => console.warn(() => `module ${depFsPath} takes over 2s to load.
-${getStack()}`), 2e3);
-      try {
-        if (callstack.includes(depFsPath)) {
-          const depExports = (_a = this.moduleCache.get(depFsPath)) == null ? void 0 : _a.exports;
-          if (depExports)
-            return depExports;
-          throw new Error(`[vite-node] Failed to resolve circular dependency, ${getStack()}`);
-        }
-        return await this.cachedRequest(dep2, callstack);
-      } finally {
-        if (debugTimer)
-          clearTimeout(debugTimer);
-      }
+  async resolveUrl(id, importee) {
+    if (utils.isInternalRequest(id))
+      return [id, id];
+    if (importee && id.startsWith(utils.VALID_ID_PREFIX))
+      importee = void 0;
+    id = utils.normalizeRequestId(id, this.options.base);
+    if (!this.options.resolveId)
+      return [id, utils.toFilePath(id, this.root)];
+    const resolved = await this.options.resolveId(id, importee);
+    const resolvedId = resolved ? utils.normalizeRequestId(resolved.id, this.options.base) : id;
+    const fsPath = resolved ? resolvedId : utils.toFilePath(id, this.root);
+    return [resolvedId, fsPath];
+  }
+  async dependencyRequest(id, fsPath, callstack) {
+    var _a;
+    const getStack = () => {
+      return `stack:
+${[...callstack, fsPath].reverse().map((p) => `- ${p}`).join("\n")}`;
     };
-    Object.defineProperty(request, "callstack", { get: () => callstack });
-    const resolveId = async (dep2, callstackPosition = 1) => {
-      if (this.options.resolveId && this.shouldResolveId(dep2)) {
-        let importer = callstack[callstack.length - callstackPosition];
-        if (importer && !dep2.startsWith("."))
-          importer = void 0;
-        if (importer && importer.startsWith("mock:"))
-          importer = importer.slice(5);
-        const resolved = await this.options.resolveId(utils.normalizeRequestId(dep2), importer);
-        return [dep2, resolved == null ? void 0 : resolved.id];
+    let debugTimer;
+    if (this.debug)
+      debugTimer = setTimeout(() => console.warn(() => `module ${fsPath} takes over 2s to load.
+${getStack()}`), 2e3);
+    try {
+      if (callstack.includes(fsPath)) {
+        const depExports = (_a = this.moduleCache.get(fsPath)) == null ? void 0 : _a.exports;
+        if (depExports)
+          return depExports;
+        throw new Error(`[vite-node] Failed to resolve circular dependency, ${getStack()}`);
       }
-      return [dep2, void 0];
+      return await this.cachedRequest(id, fsPath, callstack);
+    } finally {
+      if (debugTimer)
+        clearTimeout(debugTimer);
+    }
+  }
+  async directRequest(id, fsPath, _callstack) {
+    const moduleId = utils.normalizeModuleId(fsPath);
+    const callstack = [..._callstack, moduleId];
+    const mod = this.moduleCache.get(fsPath);
+    const request = async (dep) => {
+      const [id2, depFsPath] = await this.resolveUrl(dep, fsPath);
+      return this.dependencyRequest(id2, depFsPath, callstack);
     };
-    const [dep, resolvedId] = await resolveId(id, 2);
     const requestStubs = this.options.requestStubs || DEFAULT_REQUEST_STUBS;
     if (id in requestStubs)
       return requestStubs[id];
-    let { code: transformed, externalize } = await this.options.fetchModule(resolvedId || dep);
-    if (resolvedId && !fsPath.includes("?") && fsPath !== resolvedId) {
-      if (this.moduleCache.has(resolvedId)) {
-        mod = this.moduleCache.get(resolvedId);
-        this.moduleCache.set(fsPath, mod);
-        if (mod.promise)
-          return mod.promise;
-        if (mod.exports)
-          return mod.exports;
-      } else {
-        this.moduleCache.set(resolvedId, mod);
-      }
-    }
+    let { code: transformed, externalize } = await this.options.fetchModule(id);
     if (externalize) {
       debugNative(externalize);
       const exports2 = await this.interopedImport(externalize);
@@ -238,10 +230,10 @@ ${getStack()}`), 2e3);
       return exports2;
     }
     if (transformed == null)
-      throw new Error(`[vite-node] Failed to load ${id}`);
-    const file = utils.cleanUrl(resolvedId || fsPath);
-    const url$1 = url.pathToFileURL(file).href;
-    const meta = { url: url$1 };
+      throw new Error(`[vite-node] Failed to load "${id}" imported from ${callstack[callstack.length - 2]}`);
+    const modulePath = utils.cleanUrl(moduleId);
+    const href = url.pathToFileURL(modulePath).href;
+    const meta = { url: href };
     const exports = /* @__PURE__ */ Object.create(null);
     Object.defineProperty(exports, Symbol.toStringTag, {
       value: "Module",
@@ -249,7 +241,12 @@ ${getStack()}`), 2e3);
       configurable: false
     });
     const cjsExports = new Proxy(exports, {
-      set(_, p, value) {
+      set: (_, p, value) => {
+        if (p === "default" && this.shouldInterop(modulePath, { default: value })) {
+          exportAll(cjsExports, value);
+          exports.default = value;
+          return true;
+        }
         if (!Reflect.has(exports, "default"))
           exports.default = {};
         if (utils.isPrimitive(exports.default)) {
@@ -263,7 +260,7 @@ ${getStack()}`), 2e3);
       }
     });
     Object.assign(mod, { code: transformed, exports });
-    const __filename = url.fileURLToPath(url$1);
+    const __filename = url.fileURLToPath(href);
     const moduleProxy = {
       set exports(value) {
         exportAll(cjsExports, value);
@@ -281,6 +278,9 @@ ${getStack()}`), 2e3);
           var _a, _b;
           hotContext || (hotContext = (_b = (_a = this.options).createHotContext) == null ? void 0 : _b.call(_a, this, `/@fs/${fsPath}`));
           return hotContext;
+        },
+        set: (value) => {
+          hotContext = value;
         }
       });
     }
@@ -290,12 +290,11 @@ ${getStack()}`), 2e3);
       __vite_ssr_exports__: exports,
       __vite_ssr_exportAll__: (obj) => exportAll(exports, obj),
       __vite_ssr_import_meta__: meta,
-      __vitest_resolve_id__: resolveId,
-      require: module$1.createRequire(url$1),
+      require: module$1.createRequire(href),
       exports: cjsExports,
       module: moduleProxy,
       __filename,
-      __dirname: pathe.dirname(__filename)
+      __dirname: path.dirname(__filename)
     });
     debugExecute(__filename);
     if (transformed[0] === "#")
@@ -314,42 +313,44 @@ ${getStack()}`), 2e3);
   prepareContext(context) {
     return context;
   }
-  shouldResolveId(dep) {
-    if (mlly.isNodeBuiltin(dep) || dep in (this.options.requestStubs || DEFAULT_REQUEST_STUBS) || dep.startsWith("/@vite"))
-      return false;
-    return !pathe.isAbsolute(dep) || !pathe.extname(dep);
-  }
   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;
+    const importedModule = await (function (t) { return Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(t)); }); })(path);
+    if (!this.shouldInterop(path, importedModule))
+      return importedModule;
+    const { mod, defaultExport } = interopModule(importedModule);
+    return new Proxy(mod, {
+      get(mod2, prop) {
+        if (prop === "default")
+          return defaultExport;
+        return mod2[prop] ?? (defaultExport == null ? void 0 : defaultExport[prop]);
+      },
+      has(mod2, prop) {
+        if (prop === "default")
+          return defaultExport !== void 0;
+        return prop in mod2 || defaultExport && prop in defaultExport;
+      }
+    });
   }
 }
-function proxyMethod(name, tryDefault) {
-  return function(target, key, ...args) {
-    const result = Reflect[name](target, key, ...args);
-    if (utils.isPrimitive(target.default))
-      return result;
-    if (tryDefault && key === "default" || typeof result === "undefined")
-      return Reflect[name](target.default, key, ...args);
-    return result;
-  };
+function interopModule(mod) {
+  if (utils.isPrimitive(mod)) {
+    return {
+      mod: { default: mod },
+      defaultExport: mod
+    };
+  }
+  let defaultExport = "default" in mod ? mod.default : mod;
+  if (!utils.isPrimitive(defaultExport) && "__esModule" in defaultExport) {
+    mod = defaultExport;
+    if ("default" in defaultExport)
+      defaultExport = defaultExport.default;
+  }
+  return { mod, defaultExport };
 }
 function defineExport(exports, key, value) {
   Object.defineProperty(exports, key, {

package/dist/client.d.ts

@@ -1 +1 @@
-export { j as DEFAULT_REQUEST_STUBS, M as ModuleCacheMap, h as ViteNodeRunner } from './types-c9a1a6b2.js';
+export { j as DEFAULT_REQUEST_STUBS, M as ModuleCacheMap, h as ViteNodeRunner } from './types-aaf02e1c.js';

package/dist/client.mjs

@@ -1,10 +1,10 @@
 import { createRequire } from 'module';
+import { dirname } from 'path';
 import { pathToFileURL, fileURLToPath } from 'url';
 import vm from 'vm';
-import { resolve, dirname, isAbsolute, extname } from 'pathe';
-import { isNodeBuiltin } from 'mlly';
+import { resolve } from 'pathe';
 import createDebug from 'debug';
-import { normalizeModuleId, slash, normalizeRequestId, toFilePath, cleanUrl, isPrimitive } from './utils.mjs';
+import { normalizeModuleId, slash, isInternalRequest, VALID_ID_PREFIX, normalizeRequestId, toFilePath, cleanUrl, isPrimitive } from './utils.mjs';
 import { extractSourceMap } from './source-map.mjs';
 import 'fs';
 import 'source-map-support';
@@ -119,19 +119,19 @@ class ViteNodeRunner {
     this.debug = options.debug ?? (typeof process !== "undefined" ? !!process.env.VITE_NODE_DEBUG_RUNNER : false);
   }
   async executeFile(file) {
-    return await this.cachedRequest(`/@fs/${slash(resolve(file))}`, []);
+    const url = `/@fs/${slash(resolve(file))}`;
+    return await this.cachedRequest(url, url, []);
   }
-  async executeId(id) {
-    return await this.cachedRequest(id, []);
+  async executeId(rawId) {
+    const [id, url] = await this.resolveUrl(rawId);
+    return await this.cachedRequest(id, url, []);
   }
   getSourceMap(id) {
     return this.moduleCache.getSourceMap(id);
   }
-  async cachedRequest(rawId, callstack) {
-    const id = normalizeRequestId(rawId, this.options.base);
-    const fsPath = toFilePath(id, this.root);
-    const mod = this.moduleCache.get(fsPath);
+  async cachedRequest(id, fsPath, callstack) {
     const importee = callstack[callstack.length - 1];
+    const mod = this.moduleCache.get(fsPath);
     if (!mod.importers)
       mod.importers = /* @__PURE__ */ new Set();
     if (importee)
@@ -142,68 +142,60 @@ class ViteNodeRunner {
       return mod.promise;
     const promise = this.directRequest(id, fsPath, callstack);
     Object.assign(mod, { promise, evaluated: false });
-    promise.finally(() => {
+    try {
+      return await promise;
+    } finally {
       mod.evaluated = true;
-    });
-    return await promise;
+    }
   }
-  async directRequest(id, fsPath, _callstack) {
-    const callstack = [..._callstack, fsPath];
-    let mod = this.moduleCache.get(fsPath);
-    const request = async (dep2) => {
-      var _a;
-      const depFsPath = toFilePath(normalizeRequestId(dep2, this.options.base), this.root);
-      const getStack = () => {
-        return `stack:
-${[...callstack, depFsPath].reverse().map((p) => `- ${p}`).join("\n")}`;
-      };
-      let debugTimer;
-      if (this.debug)
-        debugTimer = setTimeout(() => console.warn(() => `module ${depFsPath} takes over 2s to load.
-${getStack()}`), 2e3);
-      try {
-        if (callstack.includes(depFsPath)) {
-          const depExports = (_a = this.moduleCache.get(depFsPath)) == null ? void 0 : _a.exports;
-          if (depExports)
-            return depExports;
-          throw new Error(`[vite-node] Failed to resolve circular dependency, ${getStack()}`);
-        }
-        return await this.cachedRequest(dep2, callstack);
-      } finally {
-        if (debugTimer)
-          clearTimeout(debugTimer);
-      }
+  async resolveUrl(id, importee) {
+    if (isInternalRequest(id))
+      return [id, id];
+    if (importee && id.startsWith(VALID_ID_PREFIX))
+      importee = void 0;
+    id = normalizeRequestId(id, this.options.base);
+    if (!this.options.resolveId)
+      return [id, toFilePath(id, this.root)];
+    const resolved = await this.options.resolveId(id, importee);
+    const resolvedId = resolved ? normalizeRequestId(resolved.id, this.options.base) : id;
+    const fsPath = resolved ? resolvedId : toFilePath(id, this.root);
+    return [resolvedId, fsPath];
+  }
+  async dependencyRequest(id, fsPath, callstack) {
+    var _a;
+    const getStack = () => {
+      return `stack:
+${[...callstack, fsPath].reverse().map((p) => `- ${p}`).join("\n")}`;
     };
-    Object.defineProperty(request, "callstack", { get: () => callstack });
-    const resolveId = async (dep2, callstackPosition = 1) => {
-      if (this.options.resolveId && this.shouldResolveId(dep2)) {
-        let importer = callstack[callstack.length - callstackPosition];
-        if (importer && !dep2.startsWith("."))
-          importer = void 0;
-        if (importer && importer.startsWith("mock:"))
-          importer = importer.slice(5);
-        const resolved = await this.options.resolveId(normalizeRequestId(dep2), importer);
-        return [dep2, resolved == null ? void 0 : resolved.id];
+    let debugTimer;
+    if (this.debug)
+      debugTimer = setTimeout(() => console.warn(() => `module ${fsPath} takes over 2s to load.
+${getStack()}`), 2e3);
+    try {
+      if (callstack.includes(fsPath)) {
+        const depExports = (_a = this.moduleCache.get(fsPath)) == null ? void 0 : _a.exports;
+        if (depExports)
+          return depExports;
+        throw new Error(`[vite-node] Failed to resolve circular dependency, ${getStack()}`);
       }
-      return [dep2, void 0];
+      return await this.cachedRequest(id, fsPath, callstack);
+    } finally {
+      if (debugTimer)
+        clearTimeout(debugTimer);
+    }
+  }
+  async directRequest(id, fsPath, _callstack) {
+    const moduleId = normalizeModuleId(fsPath);
+    const callstack = [..._callstack, moduleId];
+    const mod = this.moduleCache.get(fsPath);
+    const request = async (dep) => {
+      const [id2, depFsPath] = await this.resolveUrl(dep, fsPath);
+      return this.dependencyRequest(id2, depFsPath, callstack);
     };
-    const [dep, resolvedId] = await resolveId(id, 2);
     const requestStubs = this.options.requestStubs || DEFAULT_REQUEST_STUBS;
     if (id in requestStubs)
       return requestStubs[id];
-    let { code: transformed, externalize } = await this.options.fetchModule(resolvedId || dep);
-    if (resolvedId && !fsPath.includes("?") && fsPath !== resolvedId) {
-      if (this.moduleCache.has(resolvedId)) {
-        mod = this.moduleCache.get(resolvedId);
-        this.moduleCache.set(fsPath, mod);
-        if (mod.promise)
-          return mod.promise;
-        if (mod.exports)
-          return mod.exports;
-      } else {
-        this.moduleCache.set(resolvedId, mod);
-      }
-    }
+    let { code: transformed, externalize } = await this.options.fetchModule(id);
     if (externalize) {
       debugNative(externalize);
       const exports2 = await this.interopedImport(externalize);
@@ -211,10 +203,10 @@ ${getStack()}`), 2e3);
       return exports2;
     }
     if (transformed == null)
-      throw new Error(`[vite-node] Failed to load ${id}`);
-    const file = cleanUrl(resolvedId || fsPath);
-    const url = pathToFileURL(file).href;
-    const meta = { url };
+      throw new Error(`[vite-node] Failed to load "${id}" imported from ${callstack[callstack.length - 2]}`);
+    const modulePath = cleanUrl(moduleId);
+    const href = pathToFileURL(modulePath).href;
+    const meta = { url: href };
     const exports = /* @__PURE__ */ Object.create(null);
     Object.defineProperty(exports, Symbol.toStringTag, {
       value: "Module",
@@ -222,7 +214,12 @@ ${getStack()}`), 2e3);
       configurable: false
     });
     const cjsExports = new Proxy(exports, {
-      set(_, p, value) {
+      set: (_, p, value) => {
+        if (p === "default" && this.shouldInterop(modulePath, { default: value })) {
+          exportAll(cjsExports, value);
+          exports.default = value;
+          return true;
+        }
         if (!Reflect.has(exports, "default"))
           exports.default = {};
         if (isPrimitive(exports.default)) {
@@ -236,7 +233,7 @@ ${getStack()}`), 2e3);
       }
     });
     Object.assign(mod, { code: transformed, exports });
-    const __filename = fileURLToPath(url);
+    const __filename = fileURLToPath(href);
     const moduleProxy = {
       set exports(value) {
         exportAll(cjsExports, value);
@@ -254,6 +251,9 @@ ${getStack()}`), 2e3);
           var _a, _b;
           hotContext || (hotContext = (_b = (_a = this.options).createHotContext) == null ? void 0 : _b.call(_a, this, `/@fs/${fsPath}`));
           return hotContext;
+        },
+        set: (value) => {
+          hotContext = value;
         }
       });
     }
@@ -263,8 +263,7 @@ ${getStack()}`), 2e3);
       __vite_ssr_exports__: exports,
       __vite_ssr_exportAll__: (obj) => exportAll(exports, obj),
       __vite_ssr_import_meta__: meta,
-      __vitest_resolve_id__: resolveId,
-      require: createRequire(url),
+      require: createRequire(href),
       exports: cjsExports,
       module: moduleProxy,
       __filename,
@@ -287,42 +286,44 @@ ${getStack()}`), 2e3);
   prepareContext(context) {
     return context;
   }
-  shouldResolveId(dep) {
-    if (isNodeBuiltin(dep) || dep in (this.options.requestStubs || DEFAULT_REQUEST_STUBS) || dep.startsWith("/@vite"))
-      return false;
-    return !isAbsolute(dep) || !extname(dep);
-  }
   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;
+    const importedModule = await import(path);
+    if (!this.shouldInterop(path, importedModule))
+      return importedModule;
+    const { mod, defaultExport } = interopModule(importedModule);
+    return new Proxy(mod, {
+      get(mod2, prop) {
+        if (prop === "default")
+          return defaultExport;
+        return mod2[prop] ?? (defaultExport == null ? void 0 : defaultExport[prop]);
+      },
+      has(mod2, prop) {
+        if (prop === "default")
+          return defaultExport !== void 0;
+        return prop in mod2 || defaultExport && prop in defaultExport;
+      }
+    });
   }
 }
-function proxyMethod(name, tryDefault) {
-  return function(target, key, ...args) {
-    const result = Reflect[name](target, key, ...args);
-    if (isPrimitive(target.default))
-      return result;
-    if (tryDefault && key === "default" || typeof result === "undefined")
-      return Reflect[name](target.default, key, ...args);
-    return result;
-  };
+function interopModule(mod) {
+  if (isPrimitive(mod)) {
+    return {
+      mod: { default: mod },
+      defaultExport: mod
+    };
+  }
+  let defaultExport = "default" in mod ? mod.default : mod;
+  if (!isPrimitive(defaultExport) && "__esModule" in defaultExport) {
+    mod = defaultExport;
+    if ("default" in defaultExport)
+      defaultExport = defaultExport.default;
+  }
+  return { mod, defaultExport };
 }
 function defineExport(exports, key, value) {
   Object.defineProperty(exports, key, {

package/dist/hmr.d.ts

@@ -1,16 +1,16 @@
 import { EventEmitter } from 'events';
 import { HMRPayload, Plugin } from 'vite';
-import { g as CustomEventMap, h as ViteNodeRunner, i as HMRPayload$1, H as HotContext } from './types-c9a1a6b2.js';
+import { g as CustomEventMap, h as ViteNodeRunner, i as HMRPayload$1, H as HotContext } from './types-aaf02e1c.js';
 
-declare type EventType = string | symbol;
-declare type Handler<T = unknown> = (event: T) => void;
+type EventType = string | symbol;
+type Handler<T = unknown> = (event: T) => void;
 interface Emitter<Events extends Record<EventType, unknown>> {
     on<Key extends keyof Events>(type: Key, handler: Handler<Events[Key]>): void;
     off<Key extends keyof Events>(type: Key, handler?: Handler<Events[Key]>): void;
     emit<Key extends keyof Events>(type: Key, event: Events[Key]): void;
     emit<Key extends keyof Events>(type: undefined extends Events[Key] ? Key : never): void;
 }
-declare type HMREmitter = Emitter<{
+type HMREmitter = Emitter<{
     'message': HMRPayload;
 }> & EventEmitter;
 declare module 'vite' {
@@ -21,7 +21,7 @@ declare module 'vite' {
 declare function createHmrEmitter(): HMREmitter;
 declare function viteNodeHmrPlugin(): Plugin;
 
-declare type InferCustomEventPayload<T extends string> = T extends keyof CustomEventMap ? CustomEventMap[T] : any;
+type InferCustomEventPayload<T extends string> = T extends keyof CustomEventMap ? CustomEventMap[T] : any;
 interface HotModule {
     id: string;
     callbacks: HotCallback[];

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-c9a1a6b2.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-aaf02e1c.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-c9a1a6b2.js';
+import { f as DebuggerOptions, D as DepsHandlingOptions, e as ViteNodeServerOptions, F as FetchResult, d as ViteNodeResolveId, R as RawSourceMap } from './types-aaf02e1c.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-c9a1a6b2.js';
+import { R as RawSourceMap } from './types-aaf02e1c.js';
 
 interface InstallSourceMapSupportOptions {
     getSourceMap: (source: string) => RawSourceMap | null | undefined;

package/dist/{types-c9a1a6b2.d.ts → types-aaf02e1c.d.ts}

@@ -155,14 +155,16 @@ declare class ViteNodeRunner {
     moduleCache: ModuleCacheMap;
     constructor(options: ViteNodeRunnerOptions);
     executeFile(file: string): Promise<any>;
-    executeId(id: string): Promise<any>;
+    executeId(rawId: string): Promise<any>;
     getSourceMap(id: string): RawSourceMap | null;
     /** @internal */
-    cachedRequest(rawId: string, callstack: string[]): Promise<any>;
+    cachedRequest(id: string, fsPath: string, callstack: string[]): Promise<any>;
+    resolveUrl(id: string, importee?: string): Promise<[url: string, fsPath: string]>;
+    /** @internal */
+    dependencyRequest(id: string, fsPath: string, callstack: string[]): Promise<any>;
     /** @internal */
     directRequest(id: string, fsPath: string, _callstack: string[]): Promise<any>;
     prepareContext(context: Record<string, any>): Record<string, any>;
-    shouldResolveId(dep: string): boolean;
     /**
      * Define if a module should be interop-ed
      * This function mostly for the ability to override by subclass
@@ -172,11 +174,10 @@ declare class ViteNodeRunner {
      * Import a module and interop it
      */
     interopedImport(path: string): Promise<any>;
-    hasNestedDefault(target: any): any;
 }
 
-declare type Nullable<T> = T | null | undefined;
-declare type Arrayable<T> = T | Array<T>;
+type Nullable<T> = T | null | undefined;
+type Arrayable<T> = T | Array<T>;
 interface DepsHandlingOptions {
     external?: (string | RegExp)[];
     inline?: (string | RegExp)[] | true;
@@ -202,10 +203,10 @@ interface FetchResult {
     externalize?: string;
     map?: RawSourceMap;
 }
-declare type HotContext = Omit<ViteHotContext, 'acceptDeps' | 'decline'>;
-declare type FetchFunction = (id: string) => Promise<FetchResult>;
-declare type ResolveIdFunction = (id: string, importer?: string) => Promise<ViteNodeResolveId | null>;
-declare type CreateHotContextFunction = (runner: ViteNodeRunner, url: string) => HotContext;
+type HotContext = Omit<ViteHotContext, 'acceptDeps' | 'decline'>;
+type FetchFunction = (id: string) => Promise<FetchResult>;
+type ResolveIdFunction = (id: string, importer?: string) => Promise<ViteNodeResolveId | null>;
+type CreateHotContextFunction = (runner: ViteNodeRunner, url: string) => HotContext;
 interface ModuleCache {
     promise?: Promise<any>;
     exports?: any;

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-c9a1a6b2.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-aaf02e1c.js';

package/dist/utils.cjs

@@ -5,7 +5,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var url = require('url');
 var fs = require('fs');
 var pathe = require('pathe');
-var mlly = require('mlly');
 
 const isWindows = process.platform === "win32";
 function slash(str) {
@@ -14,6 +13,7 @@ function slash(str) {
 function mergeSlashes(str) {
   return str.replace(/\/\//g, "/");
 }
+const VALID_ID_PREFIX = "/@id/";
 function normalizeRequestId(id, base) {
   if (base && id.startsWith(base))
     id = `/${id.slice(base.length)}`;
@@ -22,23 +22,15 @@ function normalizeRequestId(id, base) {
 const queryRE = /\?.*$/s;
 const hashRE = /#.*$/s;
 const cleanUrl = (url) => url.replace(hashRE, "").replace(queryRE, "");
+const isInternalRequest = (id) => {
+  return id.startsWith("/@vite/");
+};
 function normalizeModuleId(id) {
-  return id.replace(/\\/g, "/").replace(/^\/@fs\//, "/").replace(/^file:\//, "/").replace(/^\/+/, "/");
+  return id.replace(/\\/g, "/").replace(/^\/@fs\//, isWindows ? "" : "/").replace(/^file:\//, "/").replace(/^\/+/, "/");
 }
 function isPrimitive(v) {
   return v !== Object(v);
 }
-function pathFromRoot(root, filename) {
-  if (mlly.isNodeBuiltin(filename))
-    return filename;
-  filename = filename.replace(/^\/@fs\//, isWindows ? "" : "/");
-  if (!filename.startsWith(root))
-    return filename;
-  const relativePath = pathe.relative(root, filename);
-  const segments = relativePath.split("/");
-  const startIndex = segments.findIndex((segment) => segment !== ".." && segment !== ".");
-  return `/${segments.slice(startIndex).join("/")}`;
-}
 function toFilePath(id, root) {
   let absolute = (() => {
     if (id.startsWith("/@fs/"))
@@ -62,14 +54,15 @@ function toArray(array) {
   return [array];
 }
 
+exports.VALID_ID_PREFIX = VALID_ID_PREFIX;
 exports.cleanUrl = cleanUrl;
 exports.hashRE = hashRE;
+exports.isInternalRequest = isInternalRequest;
 exports.isPrimitive = isPrimitive;
 exports.isWindows = isWindows;
 exports.mergeSlashes = mergeSlashes;
 exports.normalizeModuleId = normalizeModuleId;
 exports.normalizeRequestId = normalizeRequestId;
-exports.pathFromRoot = pathFromRoot;
 exports.queryRE = queryRE;
 exports.slash = slash;
 exports.toArray = toArray;

package/dist/utils.d.ts

@@ -1,15 +1,16 @@
-import { N as Nullable, A as Arrayable } from './types-c9a1a6b2.js';
+import { N as Nullable, A as Arrayable } from './types-aaf02e1c.js';
 
 declare const isWindows: boolean;
 declare function slash(str: string): string;
 declare function mergeSlashes(str: string): string;
+declare const VALID_ID_PREFIX = "/@id/";
 declare function normalizeRequestId(id: string, base?: string): string;
 declare const queryRE: RegExp;
 declare const hashRE: RegExp;
 declare const cleanUrl: (url: string) => string;
+declare const isInternalRequest: (id: string) => boolean;
 declare function normalizeModuleId(id: string): string;
 declare function isPrimitive(v: any): boolean;
-declare function pathFromRoot(root: string, filename: string): string;
 declare function toFilePath(id: string, root: string): string;
 /**
  * Convert `Arrayable<T>` to `Array<T>`
@@ -18,4 +19,4 @@ declare function toFilePath(id: string, root: string): string;
  */
 declare function toArray<T>(array?: Nullable<Arrayable<T>>): Array<T>;
 
-export { cleanUrl, hashRE, isPrimitive, isWindows, mergeSlashes, normalizeModuleId, normalizeRequestId, pathFromRoot, queryRE, slash, toArray, toFilePath };
+export { VALID_ID_PREFIX, cleanUrl, hashRE, isInternalRequest, isPrimitive, isWindows, mergeSlashes, normalizeModuleId, normalizeRequestId, queryRE, slash, toArray, toFilePath };

package/dist/utils.mjs

@@ -1,7 +1,6 @@
 import { fileURLToPath, pathToFileURL } from 'url';
 import { existsSync } from 'fs';
-import { relative, resolve } from 'pathe';
-import { isNodeBuiltin } from 'mlly';
+import { resolve } from 'pathe';
 
 const isWindows = process.platform === "win32";
 function slash(str) {
@@ -10,6 +9,7 @@ function slash(str) {
 function mergeSlashes(str) {
   return str.replace(/\/\//g, "/");
 }
+const VALID_ID_PREFIX = "/@id/";
 function normalizeRequestId(id, base) {
   if (base && id.startsWith(base))
     id = `/${id.slice(base.length)}`;
@@ -18,23 +18,15 @@ function normalizeRequestId(id, base) {
 const queryRE = /\?.*$/s;
 const hashRE = /#.*$/s;
 const cleanUrl = (url) => url.replace(hashRE, "").replace(queryRE, "");
+const isInternalRequest = (id) => {
+  return id.startsWith("/@vite/");
+};
 function normalizeModuleId(id) {
-  return id.replace(/\\/g, "/").replace(/^\/@fs\//, "/").replace(/^file:\//, "/").replace(/^\/+/, "/");
+  return id.replace(/\\/g, "/").replace(/^\/@fs\//, isWindows ? "" : "/").replace(/^file:\//, "/").replace(/^\/+/, "/");
 }
 function isPrimitive(v) {
   return v !== Object(v);
 }
-function pathFromRoot(root, filename) {
-  if (isNodeBuiltin(filename))
-    return filename;
-  filename = filename.replace(/^\/@fs\//, isWindows ? "" : "/");
-  if (!filename.startsWith(root))
-    return filename;
-  const relativePath = relative(root, filename);
-  const segments = relativePath.split("/");
-  const startIndex = segments.findIndex((segment) => segment !== ".." && segment !== ".");
-  return `/${segments.slice(startIndex).join("/")}`;
-}
 function toFilePath(id, root) {
   let absolute = (() => {
     if (id.startsWith("/@fs/"))
@@ -58,4 +50,4 @@ function toArray(array) {
   return [array];
 }
 
-export { cleanUrl, hashRE, isPrimitive, isWindows, mergeSlashes, normalizeModuleId, normalizeRequestId, pathFromRoot, queryRE, slash, toArray, toFilePath };
+export { VALID_ID_PREFIX, cleanUrl, hashRE, isInternalRequest, isPrimitive, isWindows, mergeSlashes, normalizeModuleId, normalizeRequestId, queryRE, slash, toArray, toFilePath };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-node",
-  "version": "0.25.7",
+  "version": "0.26.0",
   "description": "Vite as Node.js runtime",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -86,7 +86,7 @@
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",
-    "dev": "rollup -c --watch --watch.include=src -m inline",
+    "dev": "rollup -c --watch --watch.include 'src/**' -m inline",
     "typecheck": "tsc --noEmit"
   }
 }