vite-node 1.0.0-beta.0 → 1.0.0-beta.2

package/dist/cli.cjs

@@ -10,6 +10,7 @@ var sourceMap = require('./source-map.cjs');
 var hmr = require('./hmr.cjs');
 require('perf_hooks');
 require('fs');
+require('assert');
 require('pathe');
 require('debug');
 require('mlly');
@@ -20,7 +21,7 @@ require('node:url');
 require('node:vm');
 require('node:events');
 
-var version = "1.0.0-beta.0";
+var version = "1.0.0-beta.2";
 
 const cli = cac("vite-node");
 cli.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").option("-v, --version", "Output the version number").option("-h, --help", "Display help for command");

package/dist/cli.d.ts

@@ -1,5 +1,5 @@
-import { V as ViteNodeServerOptions } from './index-6fb787b2.js';
-import './trace-mapping.d-e677e8f4.js';
+import { V as ViteNodeServerOptions } from './index-e4206afe.js';
+import './trace-mapping.d-cf594fd7.js';
 
 interface CliOptions {
     root?: string;
@@ -18,4 +18,4 @@ type ComputeViteNodeServerOptionsCLI<T extends Record<string, any>> = {
 };
 type ViteNodeServerOptionsCLI = ComputeViteNodeServerOptionsCLI<ViteNodeServerOptions>;
 
-export { CliOptions, ViteNodeServerOptionsCLI };
+export type { CliOptions, ViteNodeServerOptionsCLI };

package/dist/cli.mjs

@@ -8,6 +8,7 @@ import { installSourcemapsSupport } from './source-map.mjs';
 import { viteNodeHmrPlugin, createHotContext, handleMessage } from './hmr.mjs';
 import 'node:perf_hooks';
 import 'node:fs';
+import 'node:assert';
 import 'pathe';
 import 'debug';
 import 'mlly';
@@ -18,7 +19,7 @@ import 'node:url';
 import 'node:vm';
 import 'node:events';
 
-var version = "1.0.0-beta.0";
+var version = "1.0.0-beta.2";
 
 const cli = cac("vite-node");
 cli.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").option("-v, --version", "Output the version number").option("-h, --help", "Display help for command");

package/dist/client.d.ts

@@ -1,2 +1,2 @@
-import './trace-mapping.d-e677e8f4.js';
-export { e as DEFAULT_REQUEST_STUBS, M as ModuleCacheMap, a as ViteNodeRunner } from './index-6fb787b2.js';
+import './trace-mapping.d-cf594fd7.js';
+export { e as DEFAULT_REQUEST_STUBS, M as ModuleCacheMap, a as ViteNodeRunner } from './index-e4206afe.js';

package/dist/hmr.d.ts

@@ -1,7 +1,7 @@
 import { EventEmitter } from 'node:events';
 import { HMRPayload, Plugin } from 'vite';
-import { C as CustomEventMap, a as ViteNodeRunner, H as HMRPayload$1, b as HotContext } from './index-6fb787b2.js';
-import './trace-mapping.d-e677e8f4.js';
+import { C as CustomEventMap, a as ViteNodeRunner, H as HMRPayload$1, b as HotContext } from './index-e4206afe.js';
+import './trace-mapping.d-cf594fd7.js';
 
 type EventType = string | symbol;
 type Handler<T = unknown> = (event: T) => void;
@@ -52,4 +52,4 @@ 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 createHotContext(runner: ViteNodeRunner, emitter: HMREmitter, files: string[], ownerPath: string): HotContext;
 
-export { Emitter, EventType, HMREmitter, Handler, HotCallback, HotModule, InferCustomEventPayload, ModuleNamespace, createHmrEmitter, createHotContext, getCache, handleMessage, reload, sendMessageBuffer, viteNodeHmrPlugin };
+export { type Emitter, type EventType, type HMREmitter, type Handler, type HotCallback, type HotModule, type InferCustomEventPayload, type ModuleNamespace, createHmrEmitter, createHotContext, getCache, handleMessage, reload, sendMessageBuffer, viteNodeHmrPlugin };

package/dist/{index-6fb787b2.d.ts → index-e4206afe.d.ts}

@@ -1,4 +1,4 @@
-import { E as EncodedSourceMap } from './trace-mapping.d-e677e8f4.js';
+import { E as EncodedSourceMap } from './trace-mapping.d-cf594fd7.js';
 
 type HMRPayload =
   | ConnectedPayload
@@ -295,4 +295,4 @@ interface DebuggerOptions {
     loadDumppedModules?: boolean;
 }
 
-export { Arrayable as A, CustomEventMap as C, DebuggerOptions as D, FetchResult as F, HMRPayload as H, ModuleCacheMap as M, Nullable as N, RawSourceMap as R, StartOfSourceMap as S, ViteNodeServerOptions as V, ViteNodeRunner as a, HotContext as b, DepsHandlingOptions as c, ViteNodeResolveId as d, DEFAULT_REQUEST_STUBS as e, Awaitable as f, FetchFunction as g, ResolveIdFunction as h, CreateHotContextFunction as i, ModuleCache as j, ViteNodeRunnerOptions as k };
+export { type Arrayable as A, type CustomEventMap as C, type DebuggerOptions as D, type FetchResult as F, type HMRPayload as H, ModuleCacheMap as M, type Nullable as N, type RawSourceMap as R, type StartOfSourceMap as S, type ViteNodeServerOptions as V, ViteNodeRunner as a, type HotContext as b, type DepsHandlingOptions as c, type ViteNodeResolveId as d, DEFAULT_REQUEST_STUBS as e, type Awaitable as f, type FetchFunction as g, type ResolveIdFunction as h, type CreateHotContextFunction as i, type ModuleCache as j, type ViteNodeRunnerOptions as k };

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-export { A as Arrayable, f as Awaitable, i as CreateHotContextFunction, D as DebuggerOptions, c as DepsHandlingOptions, g as FetchFunction, F as FetchResult, b as HotContext, j as ModuleCache, M as ModuleCacheMap, N as Nullable, R as RawSourceMap, h as ResolveIdFunction, S as StartOfSourceMap, d as ViteNodeResolveId, k as ViteNodeRunnerOptions, V as ViteNodeServerOptions } from './index-6fb787b2.js';
-export { D as DecodedSourceMap, E as EncodedSourceMap, S as SourceMapInput } from './trace-mapping.d-e677e8f4.js';
+export { A as Arrayable, f as Awaitable, i as CreateHotContextFunction, D as DebuggerOptions, c as DepsHandlingOptions, g as FetchFunction, F as FetchResult, b as HotContext, j as ModuleCache, M as ModuleCacheMap, N as Nullable, R as RawSourceMap, h as ResolveIdFunction, S as StartOfSourceMap, d as ViteNodeResolveId, k as ViteNodeRunnerOptions, V as ViteNodeServerOptions } from './index-e4206afe.js';
+export { D as DecodedSourceMap, E as EncodedSourceMap, S as SourceMapInput } from './trace-mapping.d-cf594fd7.js';

package/dist/server.cjs

@@ -2,6 +2,7 @@
 
 var perf_hooks = require('perf_hooks');
 var fs = require('fs');
+var assert = require('assert');
 var pathe = require('pathe');
 var createDebug = require('debug');
 var mlly = require('mlly');
@@ -24,8 +25,8 @@ const defaultInline = [
   new RegExp(`\\.(${constants.KNOWN_ASSET_TYPES.join("|")})$`)
 ];
 const depsExternal = [
-  /\.cjs\.js$/,
-  /\.mjs$/
+  /\/node_modules\/.*\.cjs\.js$/,
+  /\/node_modules\/.*\.mjs$/
 ];
 function guessCJSversion(id) {
   if (id.match(ESM_EXT_RE)) {
@@ -217,9 +218,19 @@ class ViteNodeServer {
     if (!options.deps.moduleDirectories.includes("/node_modules/"))
       options.deps.moduleDirectories.push("/node_modules/");
   }
-  fetchPromiseMap = /* @__PURE__ */ new Map();
-  transformPromiseMap = /* @__PURE__ */ new Map();
+  fetchPromiseMap = {
+    ssr: /* @__PURE__ */ new Map(),
+    web: /* @__PURE__ */ new Map()
+  };
+  transformPromiseMap = {
+    ssr: /* @__PURE__ */ new Map(),
+    web: /* @__PURE__ */ new Map()
+  };
   existingOptimizedDeps = /* @__PURE__ */ new Set();
+  fetchCaches = {
+    ssr: /* @__PURE__ */ new Map(),
+    web: /* @__PURE__ */ new Map()
+  };
   fetchCache = /* @__PURE__ */ new Map();
   externalizeCache = /* @__PURE__ */ new Map();
   debugger;
@@ -255,30 +266,39 @@ class ViteNodeServer {
     const ssrTransformResult = (_b = this.server.moduleGraph.getModuleById(source)) == null ? void 0 : _b.ssrTransformResult;
     return (ssrTransformResult == null ? void 0 : ssrTransformResult.map) || null;
   }
+  assertMode(mode) {
+    assert(mode === "web" || mode === "ssr", `"transformMode" can only be "web" or "ssr", received "${mode}".`);
+  }
   async fetchModule(id, transformMode) {
-    id = utils.normalizeModuleId(id);
-    if (!this.fetchPromiseMap.has(id)) {
-      this.fetchPromiseMap.set(
-        id,
-        this._fetchModule(id, transformMode).then((r) => {
+    const moduleId = utils.normalizeModuleId(id);
+    const mode = transformMode || this.getTransformMode(id);
+    this.assertMode(mode);
+    const promiseMap = this.fetchPromiseMap[mode];
+    if (!promiseMap.has(moduleId)) {
+      promiseMap.set(
+        moduleId,
+        this._fetchModule(moduleId, mode).then((r) => {
           return this.options.sourcemap !== true ? { ...r, map: void 0 } : r;
         }).finally(() => {
-          this.fetchPromiseMap.delete(id);
+          promiseMap.delete(moduleId);
         })
       );
     }
-    return this.fetchPromiseMap.get(id);
+    return promiseMap.get(moduleId);
   }
-  async transformRequest(id, filepath = id) {
-    if (!this.transformPromiseMap.has(id)) {
-      this.transformPromiseMap.set(
+  async transformRequest(id, filepath = id, transformMode) {
+    const mode = transformMode || this.getTransformMode(id);
+    this.assertMode(mode);
+    const promiseMap = this.transformPromiseMap[mode];
+    if (!promiseMap.has(id)) {
+      promiseMap.set(
         id,
-        this._transformRequest(id, filepath).finally(() => {
-          this.transformPromiseMap.delete(id);
+        this._transformRequest(id, filepath, mode).finally(() => {
+          promiseMap.delete(id);
         })
       );
     }
-    return this.transformPromiseMap.get(id);
+    return promiseMap.get(id);
   }
   async transformModule(id, transformMode) {
     if (transformMode !== "web")
@@ -317,7 +337,7 @@ class ViteNodeServer {
     const { path: filePath } = utils.toFilePath(id, this.server.config.root);
     const module = this.server.moduleGraph.getModuleById(id);
     const timestamp = module ? module.lastHMRTimestamp : null;
-    const cache = this.fetchCache.get(filePath);
+    const cache = this.fetchCaches[transformMode].get(filePath);
     if (timestamp && cache && cache.timestamp >= timestamp)
       return cache.result;
     const time = Date.now();
@@ -332,11 +352,13 @@ class ViteNodeServer {
       duration = perf_hooks.performance.now() - start;
       result = { code: r == null ? void 0 : r.code, map: r == null ? void 0 : r.map };
     }
-    this.fetchCache.set(filePath, {
+    const cacheEntry = {
       duration,
       timestamp: time,
       result
-    });
+    };
+    this.fetchCaches[transformMode].set(filePath, cacheEntry);
+    this.fetchCache.set(filePath, cacheEntry);
     return result;
   }
   async processTransformResult(filepath, result) {
@@ -346,7 +368,7 @@ class ViteNodeServer {
       root: this.server.config.root
     });
   }
-  async _transformRequest(id, filepath, customTransformMode) {
+  async _transformRequest(id, filepath, transformMode) {
     var _a, _b, _c, _d;
     debugRequest(id);
     let result = null;
@@ -355,7 +377,6 @@ class ViteNodeServer {
       if (result)
         return result;
     }
-    const transformMode = customTransformMode ?? this.getTransformMode(id);
     if (transformMode === "web") {
       result = await this.server.transformRequest(id);
       if (result)

package/dist/server.d.ts

@@ -1,6 +1,6 @@
 import { TransformResult, ViteDevServer } from 'vite';
-import { D as DebuggerOptions, c as DepsHandlingOptions, V as ViteNodeServerOptions, F as FetchResult, d as ViteNodeResolveId } from './index-6fb787b2.js';
-import { E as EncodedSourceMap } from './trace-mapping.d-e677e8f4.js';
+import { D as DebuggerOptions, c as DepsHandlingOptions, V as ViteNodeServerOptions, d as ViteNodeResolveId, F as FetchResult } from './index-e4206afe.js';
+import { E as EncodedSourceMap } from './trace-mapping.d-cf594fd7.js';
 
 declare class Debugger {
     options: DebuggerOptions;
@@ -19,17 +19,22 @@ declare class Debugger {
 declare function guessCJSversion(id: string): string | undefined;
 declare function shouldExternalize(id: string, options?: DepsHandlingOptions, cache?: Map<string, Promise<string | false>>): Promise<string | false>;
 
+interface FetchCache {
+    duration?: number;
+    timestamp: number;
+    result: FetchResult;
+}
 declare class ViteNodeServer {
     server: ViteDevServer;
     options: ViteNodeServerOptions;
     private fetchPromiseMap;
     private transformPromiseMap;
     private existingOptimizedDeps;
-    fetchCache: Map<string, {
-        duration?: number | undefined;
-        timestamp: number;
-        result: FetchResult;
-    }>;
+    fetchCaches: {
+        ssr: Map<string, FetchCache>;
+        web: Map<string, FetchCache>;
+    };
+    fetchCache: Map<string, FetchCache>;
     externalizeCache: Map<string, Promise<string | false>>;
     debugger?: Debugger;
     constructor(server: ViteDevServer, options?: ViteNodeServerOptions);
@@ -37,8 +42,9 @@ declare class ViteNodeServer {
     private ensureExists;
     resolveId(id: string, importer?: string, transformMode?: 'web' | 'ssr'): Promise<ViteNodeResolveId | null>;
     getSourceMap(source: string): EncodedSourceMap | null;
+    private assertMode;
     fetchModule(id: string, transformMode?: 'web' | 'ssr'): Promise<FetchResult>;
-    transformRequest(id: string, filepath?: string): Promise<TransformResult | null | undefined>;
+    transformRequest(id: string, filepath?: string, transformMode?: 'web' | 'ssr'): Promise<TransformResult | null | undefined>;
     transformModule(id: string, transformMode?: 'web' | 'ssr'): Promise<{
         code: string | undefined;
     }>;

package/dist/server.mjs

@@ -1,5 +1,6 @@
 import { performance } from 'node:perf_hooks';
 import { existsSync, promises } from 'node:fs';
+import assert from 'node:assert';
 import { join, resolve, relative, normalize } from 'pathe';
 import createDebug from 'debug';
 import { isValidNodeImport } from 'mlly';
@@ -22,8 +23,8 @@ const defaultInline = [
   new RegExp(`\\.(${KNOWN_ASSET_TYPES.join("|")})$`)
 ];
 const depsExternal = [
-  /\.cjs\.js$/,
-  /\.mjs$/
+  /\/node_modules\/.*\.cjs\.js$/,
+  /\/node_modules\/.*\.mjs$/
 ];
 function guessCJSversion(id) {
   if (id.match(ESM_EXT_RE)) {
@@ -215,9 +216,19 @@ class ViteNodeServer {
     if (!options.deps.moduleDirectories.includes("/node_modules/"))
       options.deps.moduleDirectories.push("/node_modules/");
   }
-  fetchPromiseMap = /* @__PURE__ */ new Map();
-  transformPromiseMap = /* @__PURE__ */ new Map();
+  fetchPromiseMap = {
+    ssr: /* @__PURE__ */ new Map(),
+    web: /* @__PURE__ */ new Map()
+  };
+  transformPromiseMap = {
+    ssr: /* @__PURE__ */ new Map(),
+    web: /* @__PURE__ */ new Map()
+  };
   existingOptimizedDeps = /* @__PURE__ */ new Set();
+  fetchCaches = {
+    ssr: /* @__PURE__ */ new Map(),
+    web: /* @__PURE__ */ new Map()
+  };
   fetchCache = /* @__PURE__ */ new Map();
   externalizeCache = /* @__PURE__ */ new Map();
   debugger;
@@ -253,30 +264,39 @@ class ViteNodeServer {
     const ssrTransformResult = (_b = this.server.moduleGraph.getModuleById(source)) == null ? void 0 : _b.ssrTransformResult;
     return (ssrTransformResult == null ? void 0 : ssrTransformResult.map) || null;
   }
+  assertMode(mode) {
+    assert(mode === "web" || mode === "ssr", `"transformMode" can only be "web" or "ssr", received "${mode}".`);
+  }
   async fetchModule(id, transformMode) {
-    id = normalizeModuleId(id);
-    if (!this.fetchPromiseMap.has(id)) {
-      this.fetchPromiseMap.set(
-        id,
-        this._fetchModule(id, transformMode).then((r) => {
+    const moduleId = normalizeModuleId(id);
+    const mode = transformMode || this.getTransformMode(id);
+    this.assertMode(mode);
+    const promiseMap = this.fetchPromiseMap[mode];
+    if (!promiseMap.has(moduleId)) {
+      promiseMap.set(
+        moduleId,
+        this._fetchModule(moduleId, mode).then((r) => {
           return this.options.sourcemap !== true ? { ...r, map: void 0 } : r;
         }).finally(() => {
-          this.fetchPromiseMap.delete(id);
+          promiseMap.delete(moduleId);
         })
       );
     }
-    return this.fetchPromiseMap.get(id);
+    return promiseMap.get(moduleId);
   }
-  async transformRequest(id, filepath = id) {
-    if (!this.transformPromiseMap.has(id)) {
-      this.transformPromiseMap.set(
+  async transformRequest(id, filepath = id, transformMode) {
+    const mode = transformMode || this.getTransformMode(id);
+    this.assertMode(mode);
+    const promiseMap = this.transformPromiseMap[mode];
+    if (!promiseMap.has(id)) {
+      promiseMap.set(
         id,
-        this._transformRequest(id, filepath).finally(() => {
-          this.transformPromiseMap.delete(id);
+        this._transformRequest(id, filepath, mode).finally(() => {
+          promiseMap.delete(id);
         })
       );
     }
-    return this.transformPromiseMap.get(id);
+    return promiseMap.get(id);
   }
   async transformModule(id, transformMode) {
     if (transformMode !== "web")
@@ -315,7 +335,7 @@ class ViteNodeServer {
     const { path: filePath } = toFilePath(id, this.server.config.root);
     const module = this.server.moduleGraph.getModuleById(id);
     const timestamp = module ? module.lastHMRTimestamp : null;
-    const cache = this.fetchCache.get(filePath);
+    const cache = this.fetchCaches[transformMode].get(filePath);
     if (timestamp && cache && cache.timestamp >= timestamp)
       return cache.result;
     const time = Date.now();
@@ -330,11 +350,13 @@ class ViteNodeServer {
       duration = performance.now() - start;
       result = { code: r == null ? void 0 : r.code, map: r == null ? void 0 : r.map };
     }
-    this.fetchCache.set(filePath, {
+    const cacheEntry = {
       duration,
       timestamp: time,
       result
-    });
+    };
+    this.fetchCaches[transformMode].set(filePath, cacheEntry);
+    this.fetchCache.set(filePath, cacheEntry);
     return result;
   }
   async processTransformResult(filepath, result) {
@@ -344,7 +366,7 @@ class ViteNodeServer {
       root: this.server.config.root
     });
   }
-  async _transformRequest(id, filepath, customTransformMode) {
+  async _transformRequest(id, filepath, transformMode) {
     var _a, _b, _c, _d;
     debugRequest(id);
     let result = null;
@@ -353,7 +375,6 @@ class ViteNodeServer {
       if (result)
         return result;
     }
-    const transformMode = customTransformMode ?? this.getTransformMode(id);
     if (transformMode === "web") {
       result = await this.server.transformRequest(id);
       if (result)

package/dist/source-map.d.ts

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

package/dist/{trace-mapping.d-e677e8f4.d.ts → trace-mapping.d-cf594fd7.d.ts}

@@ -51,4 +51,4 @@ declare class TraceMap implements SourceMap {
     constructor(map: SourceMapInput, mapUrl?: string | null);
 }
 
-export { DecodedSourceMap as D, EncodedSourceMap as E, SourceMapInput as S };
+export type { DecodedSourceMap as D, EncodedSourceMap as E, SourceMapInput as S };

package/dist/types.d.ts

@@ -1,2 +1,2 @@
-export { A as Arrayable, f as Awaitable, i as CreateHotContextFunction, D as DebuggerOptions, c as DepsHandlingOptions, g as FetchFunction, F as FetchResult, b as HotContext, j as ModuleCache, M as ModuleCacheMap, N as Nullable, R as RawSourceMap, h as ResolveIdFunction, S as StartOfSourceMap, d as ViteNodeResolveId, k as ViteNodeRunnerOptions, V as ViteNodeServerOptions } from './index-6fb787b2.js';
-export { D as DecodedSourceMap, E as EncodedSourceMap, S as SourceMapInput } from './trace-mapping.d-e677e8f4.js';
+export { A as Arrayable, f as Awaitable, i as CreateHotContextFunction, D as DebuggerOptions, c as DepsHandlingOptions, g as FetchFunction, F as FetchResult, b as HotContext, j as ModuleCache, M as ModuleCacheMap, N as Nullable, R as RawSourceMap, h as ResolveIdFunction, S as StartOfSourceMap, d as ViteNodeResolveId, k as ViteNodeRunnerOptions, V as ViteNodeServerOptions } from './index-e4206afe.js';
+export { D as DecodedSourceMap, E as EncodedSourceMap, S as SourceMapInput } from './trace-mapping.d-cf594fd7.js';

package/dist/utils.d.ts

@@ -1,5 +1,5 @@
-import { N as Nullable, A as Arrayable } from './index-6fb787b2.js';
-import './trace-mapping.d-e677e8f4.js';
+import { N as Nullable, A as Arrayable } from './index-e4206afe.js';
+import './trace-mapping.d-cf594fd7.js';
 
 declare const isWindows: boolean;
 declare function slash(str: string): string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vite-node",
   "type": "module",
-  "version": "1.0.0-beta.0",
+  "version": "1.0.0-beta.2",
   "description": "Vite as Node.js runtime",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",