vite-node 0.30.1 → 0.31.1

package/dist/cli.cjs

@@ -24,7 +24,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var cac__default = /*#__PURE__*/_interopDefaultLegacy(cac);
 var c__default = /*#__PURE__*/_interopDefaultLegacy(c);
 
-var version = "0.30.1";
+var version = "0.31.1";
 
 const cli = cac__default["default"]("vite-node");
 cli.version(version).option("-r, --root <path>", "Use specified root directory").option("-c, --config <path>", "Use specified config file").option("-m, --mode <mode>", "Set env mode").option("-w, --watch", 'Restart on file changes, similar to "nodemon"').option("--script", "Use vite-node as a script runner").option("--options <options>", "Use specified Vite server options").help();

package/dist/cli.d.ts

@@ -1,5 +1,6 @@
-import { e as ViteNodeServerOptions } from './types-c39b64bb.js';
-import './types.d-1e7e3fdf.js';
+import { f as ViteNodeServerOptions } from './types-557128db.js';
+import 'vite/types/hot';
+import './types.d-7442d07f.js';
 
 interface CliOptions {
     root?: string;

package/dist/cli.mjs

@@ -17,7 +17,7 @@ import 'node:path';
 import 'node:vm';
 import 'node:events';
 
-var version = "0.30.1";
+var version = "0.31.1";
 
 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("-m, --mode <mode>", "Set env mode").option("-w, --watch", 'Restart on file changes, similar to "nodemon"').option("--script", "Use vite-node as a script runner").option("--options <options>", "Use specified Vite server options").help();

package/dist/client.cjs

@@ -53,6 +53,8 @@ const clientStub = {
       invalidate: () => {
       },
       on: () => {
+      },
+      send: () => {
       }
     };
   },
@@ -188,16 +190,29 @@ class ViteNodeRunner {
       mod.importers = /* @__PURE__ */ new Set();
     if (importee)
       mod.importers.add(importee);
-    if (callstack.includes(fsPath) && mod.exports)
-      return mod.exports;
-    if (mod.promise)
-      return mod.promise;
-    const promise = this.directRequest(id, fsPath, callstack);
-    Object.assign(mod, { promise, evaluated: false });
+    const getStack = () => `stack:
+${[...callstack, fsPath].reverse().map((p) => `  - ${p}`).join("\n")}`;
+    if (callstack.includes(fsPath) || callstack.some((c) => {
+      var _a;
+      return (_a = this.moduleCache.get(c).importers) == null ? void 0 : _a.has(fsPath);
+    })) {
+      if (mod.exports)
+        return mod.exports;
+    }
+    let debugTimer;
+    if (this.debug)
+      debugTimer = setTimeout(() => console.warn(`[vite-node] module ${fsPath} takes over 2s to load.
+${getStack()}`), 2e3);
     try {
+      if (mod.promise)
+        return await mod.promise;
+      const promise = this.directRequest(id, fsPath, callstack);
+      Object.assign(mod, { promise, evaluated: false });
       return await promise;
     } finally {
       mod.evaluated = true;
+      if (debugTimer)
+        clearTimeout(debugTimer);
     }
   }
   shouldResolveId(id, _importee) {
@@ -228,27 +243,7 @@ class ViteNodeRunner {
   }
   /** @internal */
   async dependencyRequest(id, fsPath, callstack) {
-    var _a;
-    const getStack = () => {
-      return `stack:
-${[...callstack, fsPath].reverse().map((p) => `- ${p}`).join("\n")}`;
-    };
-    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 await this.cachedRequest(id, fsPath, callstack);
-    } finally {
-      if (debugTimer)
-        clearTimeout(debugTimer);
-    }
+    return await this.cachedRequest(id, fsPath, callstack);
   }
   /** @internal */
   async directRequest(id, fsPath, _callstack) {

package/dist/client.d.ts

@@ -1,2 +1,3 @@
-import './types.d-1e7e3fdf.js';
-export { j as DEFAULT_REQUEST_STUBS, M as ModuleCacheMap, h as ViteNodeRunner } from './types-c39b64bb.js';
+import './types.d-7442d07f.js';
+export { i as DEFAULT_REQUEST_STUBS, M as ModuleCacheMap, h as ViteNodeRunner } from './types-557128db.js';
+import 'vite/types/hot';

package/dist/client.mjs

@@ -26,6 +26,8 @@ const clientStub = {
       invalidate: () => {
       },
       on: () => {
+      },
+      send: () => {
       }
     };
   },
@@ -161,16 +163,29 @@ class ViteNodeRunner {
       mod.importers = /* @__PURE__ */ new Set();
     if (importee)
       mod.importers.add(importee);
-    if (callstack.includes(fsPath) && mod.exports)
-      return mod.exports;
-    if (mod.promise)
-      return mod.promise;
-    const promise = this.directRequest(id, fsPath, callstack);
-    Object.assign(mod, { promise, evaluated: false });
+    const getStack = () => `stack:
+${[...callstack, fsPath].reverse().map((p) => `  - ${p}`).join("\n")}`;
+    if (callstack.includes(fsPath) || callstack.some((c) => {
+      var _a;
+      return (_a = this.moduleCache.get(c).importers) == null ? void 0 : _a.has(fsPath);
+    })) {
+      if (mod.exports)
+        return mod.exports;
+    }
+    let debugTimer;
+    if (this.debug)
+      debugTimer = setTimeout(() => console.warn(`[vite-node] module ${fsPath} takes over 2s to load.
+${getStack()}`), 2e3);
     try {
+      if (mod.promise)
+        return await mod.promise;
+      const promise = this.directRequest(id, fsPath, callstack);
+      Object.assign(mod, { promise, evaluated: false });
       return await promise;
     } finally {
       mod.evaluated = true;
+      if (debugTimer)
+        clearTimeout(debugTimer);
     }
   }
   shouldResolveId(id, _importee) {
@@ -201,27 +216,7 @@ class ViteNodeRunner {
   }
   /** @internal */
   async dependencyRequest(id, fsPath, callstack) {
-    var _a;
-    const getStack = () => {
-      return `stack:
-${[...callstack, fsPath].reverse().map((p) => `- ${p}`).join("\n")}`;
-    };
-    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 await this.cachedRequest(id, fsPath, callstack);
-    } finally {
-      if (debugTimer)
-        clearTimeout(debugTimer);
-    }
+    return await this.cachedRequest(id, fsPath, callstack);
   }
   /** @internal */
   async directRequest(id, fsPath, _callstack) {

package/dist/hmr.d.ts

@@ -1,7 +1,8 @@
 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-c39b64bb.js';
-import './types.d-1e7e3fdf.js';
+import { HMRPayload as HMRPayload$1, Plugin } from 'vite';
+import { h as ViteNodeRunner, H as HotContext } from './types-557128db.js';
+import 'vite/types/hot';
+import './types.d-7442d07f.js';
 
 type EventType = string | symbol;
 type Handler<T = unknown> = (event: T) => void;
@@ -12,7 +13,7 @@ interface Emitter<Events extends Record<EventType, unknown>> {
     emit<Key extends keyof Events>(type: undefined extends Events[Key] ? Key : never): void;
 }
 type HMREmitter = Emitter<{
-    'message': HMRPayload;
+    'message': HMRPayload$1;
 }> & EventEmitter;
 declare module 'vite' {
     interface ViteDevServer {
@@ -22,6 +23,82 @@ declare module 'vite' {
 declare function createHmrEmitter(): HMREmitter;
 declare function viteNodeHmrPlugin(): Plugin;
 
+type HMRPayload =
+  | ConnectedPayload
+  | UpdatePayload
+  | FullReloadPayload
+  | CustomPayload
+  | ErrorPayload
+  | PrunePayload
+
+interface ConnectedPayload {
+  type: 'connected'
+}
+
+interface UpdatePayload {
+  type: 'update'
+  updates: Update[]
+}
+
+interface Update {
+  type: 'js-update' | 'css-update'
+  path: string
+  acceptedPath: string
+  timestamp: number
+  /**
+   * @experimental internal
+   */
+  explicitImportRequired?: boolean | undefined
+}
+
+interface PrunePayload {
+  type: 'prune'
+  paths: string[]
+}
+
+interface FullReloadPayload {
+  type: 'full-reload'
+  path?: string
+}
+
+interface CustomPayload {
+  type: 'custom'
+  event: string
+  data?: any
+}
+
+interface ErrorPayload {
+  type: 'error'
+  err: {
+    [name: string]: any
+    message: string
+    stack: string
+    id?: string
+    frame?: string
+    plugin?: string
+    pluginCode?: string
+    loc?: {
+      file?: string
+      line: number
+      column: number
+    }
+  }
+}
+
+interface CustomEventMap {
+  'vite:beforeUpdate': UpdatePayload
+  'vite:afterUpdate': UpdatePayload
+  'vite:beforePrune': PrunePayload
+  'vite:beforeFullReload': FullReloadPayload
+  'vite:error': ErrorPayload
+  'vite:invalidate': InvalidatePayload
+}
+
+interface InvalidatePayload {
+  path: string
+  message: string | undefined
+}
+
 type InferCustomEventPayload<T extends string> = T extends keyof CustomEventMap ? CustomEventMap[T] : any;
 interface HotModule {
     id: string;
@@ -46,7 +123,7 @@ interface CacheData {
 declare function getCache(runner: ViteNodeRunner): CacheData;
 declare function sendMessageBuffer(runner: ViteNodeRunner, emitter: HMREmitter): void;
 declare function reload(runner: ViteNodeRunner, files: string[]): Promise<any[]>;
-declare function handleMessage(runner: ViteNodeRunner, emitter: HMREmitter, files: string[], payload: HMRPayload$1): Promise<void>;
+declare function handleMessage(runner: ViteNodeRunner, emitter: HMREmitter, files: string[], payload: HMRPayload): Promise<void>;
 declare function createHotContext(runner: ViteNodeRunner, emitter: HMREmitter, files: string[], ownerPath: string): HotContext;
 
 export { Emitter, EventType, HMREmitter, Handler, HotCallback, HotModule, InferCustomEventPayload, createHmrEmitter, createHotContext, getCache, handleMessage, reload, sendMessageBuffer, viteNodeHmrPlugin };

package/dist/index.d.ts

@@ -1,2 +1,3 @@
-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-c39b64bb.js';
-export { D as DecodedSourceMap, E as EncodedSourceMap } from './types.d-1e7e3fdf.js';
+export { A as Arrayable, a as Awaitable, C as CreateHotContextFunction, g as DebuggerOptions, D as DepsHandlingOptions, b as FetchFunction, F as FetchResult, H as HotContext, d as ModuleCache, M as ModuleCacheMap, N as Nullable, R as RawSourceMap, c as ResolveIdFunction, S as StartOfSourceMap, e as ViteNodeResolveId, V as ViteNodeRunnerOptions, f as ViteNodeServerOptions } from './types-557128db.js';
+export { D as DecodedSourceMap, E as EncodedSourceMap } from './types.d-7442d07f.js';
+import 'vite/types/hot';

package/dist/server.d.ts

@@ -1,6 +1,7 @@
 import { TransformResult, ViteDevServer } from 'vite';
-import { E as EncodedSourceMap } from './types.d-1e7e3fdf.js';
-import { f as DebuggerOptions, D as DepsHandlingOptions, e as ViteNodeServerOptions, F as FetchResult, d as ViteNodeResolveId } from './types-c39b64bb.js';
+import { E as EncodedSourceMap } from './types.d-7442d07f.js';
+import { g as DebuggerOptions, D as DepsHandlingOptions, f as ViteNodeServerOptions, F as FetchResult, e as ViteNodeResolveId } from './types-557128db.js';
+import 'vite/types/hot';
 
 declare class Debugger {
     options: DebuggerOptions;

package/dist/source-map.cjs

@@ -802,7 +802,7 @@ function wrapCallSite(frame, state) {
       return state.nextPosition.name || originalFunctionName();
     };
     frame.getFileName = function() {
-      return position.source;
+      return position.source ?? void 0;
     };
     frame.getLineNumber = function() {
       return position.line;

package/dist/source-map.d.ts

@@ -1,5 +1,5 @@
 import { TransformResult } from 'vite';
-import { E as EncodedSourceMap } from './types.d-1e7e3fdf.js';
+import { E as EncodedSourceMap } from './types.d-7442d07f.js';
 
 interface InstallSourceMapSupportOptions {
     getSourceMap: (source: string) => EncodedSourceMap | null | undefined;

package/dist/source-map.mjs

@@ -793,7 +793,7 @@ function wrapCallSite(frame, state) {
       return state.nextPosition.name || originalFunctionName();
     };
     frame.getFileName = function() {
-      return position.source;
+      return position.source ?? void 0;
     };
     frame.getLineNumber = function() {
       return position.line;

package/dist/{types-c39b64bb.d.ts → types-557128db.d.ts}

@@ -1,114 +1,5 @@
-import { E as EncodedSourceMap } from './types.d-1e7e3fdf.js';
-
-type HMRPayload =
-  | ConnectedPayload
-  | UpdatePayload
-  | FullReloadPayload
-  | CustomPayload
-  | ErrorPayload
-  | PrunePayload
-
-interface ConnectedPayload {
-  type: 'connected'
-}
-
-interface UpdatePayload {
-  type: 'update'
-  updates: Update[]
-}
-
-interface Update {
-  type: 'js-update' | 'css-update'
-  path: string
-  acceptedPath: string
-  timestamp: number
-  /**
-   * @experimental internal
-   */
-  explicitImportRequired?: boolean | undefined
-}
-
-interface PrunePayload {
-  type: 'prune'
-  paths: string[]
-}
-
-interface FullReloadPayload {
-  type: 'full-reload'
-  path?: string
-}
-
-interface CustomPayload {
-  type: 'custom'
-  event: string
-  data?: any
-}
-
-interface ErrorPayload {
-  type: 'error'
-  err: {
-    [name: string]: any
-    message: string
-    stack: string
-    id?: string
-    frame?: string
-    plugin?: string
-    pluginCode?: string
-    loc?: {
-      file?: string
-      line: number
-      column: number
-    }
-  }
-}
-
-interface CustomEventMap {
-  'vite:beforeUpdate': UpdatePayload
-  'vite:afterUpdate': UpdatePayload
-  'vite:beforePrune': PrunePayload
-  'vite:beforeFullReload': FullReloadPayload
-  'vite:error': ErrorPayload
-  'vite:invalidate': InvalidatePayload
-}
-
-interface InvalidatePayload {
-  path: string
-  message: string | undefined
-}
-
-type InferCustomEventPayload<T extends string> =
-  T extends keyof CustomEventMap ? CustomEventMap[T] : any
-
-type ModuleNamespace = Record<string, any> & {
-  [Symbol.toStringTag]: 'Module'
-}
-
-interface ViteHotContext {
-  readonly data: any
-
-  accept(): void
-  accept(cb: (mod: ModuleNamespace | undefined) => void): void
-  accept(dep: string, cb: (mod: ModuleNamespace | undefined) => void): void
-  accept(
-    deps: readonly string[],
-    cb: (mods: Array<ModuleNamespace | undefined>) => void,
-  ): void
-
-  acceptExports(
-    exportNames: string | readonly string[],
-    cb?: (mod: ModuleNamespace | undefined) => void,
-  ): void
-
-  dispose(cb: (data: any) => void): void
-  prune(cb: (data: any) => void): void
-  invalidate(message?: string): void
-
-  on<T extends string>(
-    event: T,
-    cb: (payload: InferCustomEventPayload<T>) => void,
-  ): void
-  send<T extends string>(event: T, data?: InferCustomEventPayload<T>): void
-}
+import { ViteHotContext } from 'vite/types/hot';
+import { E as EncodedSourceMap } from './types.d-7442d07f.js';
 
 declare const DEFAULT_REQUEST_STUBS: Record<string, unknown>;
 declare class ModuleCacheMap extends Map<string, ModuleCache> {
@@ -172,6 +63,7 @@ declare class ViteNodeRunner {
 
 type Nullable<T> = T | null | undefined;
 type Arrayable<T> = T | Array<T>;
+type Awaitable<T> = T | PromiseLike<T>;
 interface DepsHandlingOptions {
     external?: (string | RegExp)[];
     inline?: (string | RegExp)[] | true;
@@ -201,7 +93,7 @@ interface FetchResult {
 }
 type HotContext = Omit<ViteHotContext, 'acceptDeps' | 'decline'>;
 type FetchFunction = (id: string) => Promise<FetchResult>;
-type ResolveIdFunction = (id: string, importer?: string) => Promise<ViteNodeResolveId | null>;
+type ResolveIdFunction = (id: string, importer?: string) => Awaitable<ViteNodeResolveId | null | undefined | void>;
 type CreateHotContextFunction = (runner: ViteNodeRunner, url: string) => HotContext;
 interface ModuleCache {
     promise?: Promise<any>;
@@ -265,4 +157,4 @@ interface DebuggerOptions {
     loadDumppedModules?: boolean;
 }
 
-export { Arrayable as A, CreateHotContextFunction as C, DepsHandlingOptions as D, FetchResult as F, HotContext as H, ModuleCacheMap as M, Nullable as N, RawSourceMap as R, StartOfSourceMap as S, ViteNodeRunnerOptions as V, FetchFunction as a, ResolveIdFunction as b, ModuleCache as c, ViteNodeResolveId as d, ViteNodeServerOptions as e, DebuggerOptions as f, CustomEventMap as g, ViteNodeRunner as h, HMRPayload as i, DEFAULT_REQUEST_STUBS as j };
+export { Arrayable as A, CreateHotContextFunction as C, DepsHandlingOptions as D, FetchResult as F, HotContext as H, ModuleCacheMap as M, Nullable as N, RawSourceMap as R, StartOfSourceMap as S, ViteNodeRunnerOptions as V, Awaitable as a, FetchFunction as b, ResolveIdFunction as c, ModuleCache as d, ViteNodeResolveId as e, ViteNodeServerOptions as f, DebuggerOptions as g, ViteNodeRunner as h, DEFAULT_REQUEST_STUBS as i };

package/dist/types.d.ts

@@ -1,2 +1,3 @@
-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-c39b64bb.js';
-export { D as DecodedSourceMap, E as EncodedSourceMap } from './types.d-1e7e3fdf.js';
+import 'vite/types/hot';
+export { D as DecodedSourceMap, E as EncodedSourceMap } from './types.d-7442d07f.js';
+export { A as Arrayable, a as Awaitable, C as CreateHotContextFunction, g as DebuggerOptions, D as DepsHandlingOptions, b as FetchFunction, F as FetchResult, H as HotContext, d as ModuleCache, M as ModuleCacheMap, N as Nullable, R as RawSourceMap, c as ResolveIdFunction, S as StartOfSourceMap, e as ViteNodeResolveId, V as ViteNodeRunnerOptions, f as ViteNodeServerOptions } from './types-557128db.js';

package/dist/utils.d.ts

@@ -1,5 +1,6 @@
-import { N as Nullable, A as Arrayable } from './types-c39b64bb.js';
-import './types.d-1e7e3fdf.js';
+import { N as Nullable, A as Arrayable } from './types-557128db.js';
+import 'vite/types/hot';
+import './types.d-7442d07f.js';
 
 declare const isWindows: boolean;
 declare function slash(str: string): string;

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "vite-node",
-  "version": "0.30.1",
+  "version": "0.31.1",
   "description": "Vite as Node.js runtime",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
-  "funding": "https://github.com/sponsors/antfu",
+  "funding": "https://opencollective.com/vitest",
   "homepage": "https://github.com/vitest-dev/vitest/blob/main/packages/vite-node#readme",
   "repository": {
     "type": "git",
@@ -78,7 +78,7 @@
     "vite": "^3.0.0 || ^4.0.0"
   },
   "devDependencies": {
-    "@jridgewell/trace-mapping": "^0.3.17",
+    "@jridgewell/trace-mapping": "^0.3.18",
     "@types/debug": "^4.1.7",
     "rollup": "^2.79.1"
   },