vite-node 0.25.5 → 0.25.6

package/dist/cli.cjs

@@ -632,7 +632,7 @@ class CAC extends events.EventEmitter {
 
 const cac = (name = "") => new CAC(name);
 
-var version = "0.25.5";
+var version = "0.25.6";
 
 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-de49c638.js';
+import { e as ViteNodeServerOptions } from './types-60eb9672.js';
 
 interface CliOptions {
     root?: string;

package/dist/cli.mjs

@@ -630,7 +630,7 @@ class CAC extends EventEmitter {
 
 const cac = (name = "") => new CAC(name);
 
-var version = "0.25.5";
+var version = "0.25.6";
 
 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

@@ -177,9 +177,9 @@ class ViteNodeRunner {
   async directRequest(id, fsPath, _callstack) {
     const callstack = [..._callstack, fsPath];
     let mod = this.moduleCache.get(fsPath);
-    const request = async (dep) => {
+    const request = async (dep2) => {
       var _a;
-      const depFsPath = utils.toFilePath(utils.normalizeRequestId(dep, this.options.base), this.root);
+      const depFsPath = utils.toFilePath(utils.normalizeRequestId(dep2, this.options.base), this.root);
       const getStack = () => {
         return `stack:
 ${[...callstack, depFsPath].reverse().map((p) => `- ${p}`).join("\n")}`;
@@ -195,37 +195,40 @@ ${getStack()}`), 2e3);
             return depExports;
           throw new Error(`[vite-node] Failed to resolve circular dependency, ${getStack()}`);
         }
-        return await this.cachedRequest(dep, callstack);
+        return await this.cachedRequest(dep2, callstack);
       } finally {
         if (debugTimer)
           clearTimeout(debugTimer);
       }
     };
     Object.defineProperty(request, "callstack", { get: () => callstack });
-    const resolveId = async (dep, callstackPosition = 1) => {
-      if (this.options.resolveId && this.shouldResolveId(dep)) {
+    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 { id: id2 } = await this.options.resolveId(dep, importer) || {};
-        dep = id2 && pathe.isAbsolute(id2) ? utils.mergeSlashes(`/@fs/${id2}`) : id2 || dep;
+        const resolved = await this.options.resolveId(utils.normalizeRequestId(dep2), importer);
+        return [dep2, resolved == null ? void 0 : resolved.id];
       }
-      return dep;
+      return [dep2, void 0];
     };
+    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, file } = await this.options.fetchModule(id);
-    if (file && !fsPath.includes("?") && fsPath !== file) {
-      if (this.moduleCache.has(file)) {
-        mod = this.moduleCache.get(file);
+    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(file, mod);
+        this.moduleCache.set(resolvedId, mod);
       }
     }
     if (externalize) {
@@ -236,7 +239,8 @@ ${getStack()}`), 2e3);
     }
     if (transformed == null)
       throw new Error(`[vite-node] Failed to load ${id}`);
-    const url$1 = url.pathToFileURL(file || fsPath).href;
+    const file = utils.cleanUrl(resolvedId || fsPath);
+    const url$1 = url.pathToFileURL(file).href;
     const meta = { url: url$1 };
     const exports = /* @__PURE__ */ Object.create(null);
     Object.defineProperty(exports, Symbol.toStringTag, {

package/dist/client.d.ts

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

package/dist/client.mjs

@@ -4,7 +4,7 @@ import vm from 'vm';
 import { resolve, dirname, isAbsolute, extname } from 'pathe';
 import { isNodeBuiltin } from 'mlly';
 import createDebug from 'debug';
-import { normalizeModuleId, slash, normalizeRequestId, toFilePath, isPrimitive, mergeSlashes } from './utils.mjs';
+import { normalizeModuleId, slash, normalizeRequestId, toFilePath, cleanUrl, isPrimitive } from './utils.mjs';
 import { extractSourceMap } from './source-map.mjs';
 import 'fs';
 import 'source-map-support';
@@ -150,9 +150,9 @@ class ViteNodeRunner {
   async directRequest(id, fsPath, _callstack) {
     const callstack = [..._callstack, fsPath];
     let mod = this.moduleCache.get(fsPath);
-    const request = async (dep) => {
+    const request = async (dep2) => {
       var _a;
-      const depFsPath = toFilePath(normalizeRequestId(dep, this.options.base), this.root);
+      const depFsPath = toFilePath(normalizeRequestId(dep2, this.options.base), this.root);
       const getStack = () => {
         return `stack:
 ${[...callstack, depFsPath].reverse().map((p) => `- ${p}`).join("\n")}`;
@@ -168,37 +168,40 @@ ${getStack()}`), 2e3);
             return depExports;
           throw new Error(`[vite-node] Failed to resolve circular dependency, ${getStack()}`);
         }
-        return await this.cachedRequest(dep, callstack);
+        return await this.cachedRequest(dep2, callstack);
       } finally {
         if (debugTimer)
           clearTimeout(debugTimer);
       }
     };
     Object.defineProperty(request, "callstack", { get: () => callstack });
-    const resolveId = async (dep, callstackPosition = 1) => {
-      if (this.options.resolveId && this.shouldResolveId(dep)) {
+    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 { id: id2 } = await this.options.resolveId(dep, importer) || {};
-        dep = id2 && isAbsolute(id2) ? mergeSlashes(`/@fs/${id2}`) : id2 || dep;
+        const resolved = await this.options.resolveId(normalizeRequestId(dep2), importer);
+        return [dep2, resolved == null ? void 0 : resolved.id];
       }
-      return dep;
+      return [dep2, void 0];
     };
+    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, file } = await this.options.fetchModule(id);
-    if (file && !fsPath.includes("?") && fsPath !== file) {
-      if (this.moduleCache.has(file)) {
-        mod = this.moduleCache.get(file);
+    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(file, mod);
+        this.moduleCache.set(resolvedId, mod);
       }
     }
     if (externalize) {
@@ -209,7 +212,8 @@ ${getStack()}`), 2e3);
     }
     if (transformed == null)
       throw new Error(`[vite-node] Failed to load ${id}`);
-    const url = pathToFileURL(file || fsPath).href;
+    const file = cleanUrl(resolvedId || fsPath);
+    const url = pathToFileURL(file).href;
     const meta = { url };
     const exports = /* @__PURE__ */ Object.create(null);
     Object.defineProperty(exports, Symbol.toStringTag, {

package/dist/hmr.d.ts

@@ -1,6 +1,6 @@
 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-de49c638.js';
+import { g as CustomEventMap, h as ViteNodeRunner, i as HMRPayload$1, H as HotContext } from './types-60eb9672.js';
 
 declare type EventType = string | symbol;
 declare 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-de49c638.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-60eb9672.js';

package/dist/server.cjs

@@ -263,8 +263,6 @@ class ViteNodeServer {
     const module = this.server.moduleGraph.getModuleById(id);
     const timestamp = module ? module.lastHMRTimestamp : null;
     const cache = this.fetchCache.get(filePath);
-    if (cache == null ? void 0 : cache.result.id)
-      id = cache.result.id;
     if (timestamp !== null && cache && cache.timestamp >= timestamp)
       return cache.result;
     const time = Date.now();
@@ -274,16 +272,10 @@ class ViteNodeServer {
       result = { externalize };
       (_a = this.debugger) == null ? void 0 : _a.recordExternalize(id, externalize);
     } else {
-      let file = module == null ? void 0 : module.file;
-      if (!file) {
-        const [, resolvedId] = await this.server.moduleGraph.resolveUrl(id, true);
-        id = resolvedId;
-        file = utils.cleanUrl(resolvedId);
-      }
       const start = perf_hooks.performance.now();
       const r = await this._transformRequest(id);
       duration = perf_hooks.performance.now() - start;
-      result = { file, id, code: r == null ? void 0 : r.code, map: r == null ? void 0 : r.map };
+      result = { code: r == null ? void 0 : r.code, map: r == null ? void 0 : r.map };
     }
     this.fetchCache.set(filePath, {
       duration,

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-de49c638.js';
+import { f as DebuggerOptions, D as DepsHandlingOptions, e as ViteNodeServerOptions, F as FetchResult, d as ViteNodeResolveId, R as RawSourceMap } from './types-60eb9672.js';
 
 declare class Debugger {
     options: DebuggerOptions;

package/dist/server.mjs

@@ -3,7 +3,7 @@ import { resolve, join } from 'pathe';
 import createDebug from 'debug';
 import { existsSync, promises } from 'fs';
 import { isNodeBuiltin, isValidNodeImport } from 'mlly';
-import { slash, toArray, normalizeModuleId, toFilePath, cleanUrl } from './utils.mjs';
+import { slash, toArray, normalizeModuleId, toFilePath } from './utils.mjs';
 import { p as picocolors } from './chunk-picocolors.mjs';
 import { withInlineSourcemap } from './source-map.mjs';
 import 'url';
@@ -255,8 +255,6 @@ class ViteNodeServer {
     const module = this.server.moduleGraph.getModuleById(id);
     const timestamp = module ? module.lastHMRTimestamp : null;
     const cache = this.fetchCache.get(filePath);
-    if (cache == null ? void 0 : cache.result.id)
-      id = cache.result.id;
     if (timestamp !== null && cache && cache.timestamp >= timestamp)
       return cache.result;
     const time = Date.now();
@@ -266,16 +264,10 @@ class ViteNodeServer {
       result = { externalize };
       (_a = this.debugger) == null ? void 0 : _a.recordExternalize(id, externalize);
     } else {
-      let file = module == null ? void 0 : module.file;
-      if (!file) {
-        const [, resolvedId] = await this.server.moduleGraph.resolveUrl(id, true);
-        id = resolvedId;
-        file = cleanUrl(resolvedId);
-      }
       const start = performance.now();
       const r = await this._transformRequest(id);
       duration = performance.now() - start;
-      result = { file, id, code: r == null ? void 0 : r.code, map: r == null ? void 0 : r.map };
+      result = { code: r == null ? void 0 : r.code, map: r == null ? void 0 : r.map };
     }
     this.fetchCache.set(filePath, {
       duration,

package/dist/source-map.d.ts

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

package/dist/{types-de49c638.d.ts → types-60eb9672.d.ts}

@@ -201,8 +201,6 @@ interface FetchResult {
     code?: string;
     externalize?: string;
     map?: RawSourceMap;
-    id?: string;
-    file?: string;
 }
 declare type HotContext = Omit<ViteHotContext, 'acceptDeps' | 'decline'>;
 declare type FetchFunction = (id: string) => Promise<FetchResult>;

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-de49c638.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-60eb9672.js';

package/dist/utils.d.ts

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

package/package.json

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