vite-node 0.28.5 → 0.29.1

package/dist/cli.cjs

@@ -9,14 +9,13 @@ var utils = require('./utils.cjs');
 var sourceMap = require('./source-map.cjs');
 var hmr = require('./chunk-hmr.cjs');
 require('perf_hooks');
+require('fs');
 require('pathe');
 require('debug');
-require('fs');
 require('mlly');
 require('node:url');
-require('source-map-support');
-require('module');
 require('path');
+require('module');
 require('vm');
 require('node:events');
 
@@ -25,10 +24,10 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var cac__default = /*#__PURE__*/_interopDefaultLegacy(cac);
 var c__default = /*#__PURE__*/_interopDefaultLegacy(c);
 
-var version = "0.28.5";
+var version = "0.29.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("-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();
+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();
 cli.command("[...files]").allowUnknownOptions().action(run);
 cli.parse();
 async function run(files, options = {}) {
@@ -50,6 +49,7 @@ async function run(files, options = {}) {
     logLevel: "error",
     configFile: options.config,
     root: options.root,
+    mode: options.mode,
     plugins: [
       options.watch && hmr.viteNodeHmrPlugin()
     ]

package/dist/cli.d.ts

@@ -1,9 +1,11 @@
-import { e as ViteNodeServerOptions } from './types-63205a44.js';
+import { e as ViteNodeServerOptions } from './types-e288fc62.js';
+import './types.d-1e7e3fdf.js';
 
 interface CliOptions {
     root?: string;
     script?: boolean;
     config?: string;
+    mode?: string;
     watch?: boolean;
     options?: ViteNodeServerOptionsCLI;
     '--'?: string[];

package/dist/cli.mjs

@@ -7,21 +7,20 @@ import { toArray } from './utils.mjs';
 import { installSourcemapsSupport } from './source-map.mjs';
 import { v as viteNodeHmrPlugin, c as createHotContext, h as handleMessage } from './chunk-hmr.mjs';
 import 'node:perf_hooks';
+import 'node:fs';
 import 'pathe';
 import 'debug';
-import 'node:fs';
 import 'mlly';
 import 'node:url';
-import 'source-map-support';
-import 'node:module';
 import 'node:path';
+import 'node:module';
 import 'node:vm';
 import 'node:events';
 
-var version = "0.28.5";
+var version = "0.29.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("-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();
+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();
 cli.command("[...files]").allowUnknownOptions().action(run);
 cli.parse();
 async function run(files, options = {}) {
@@ -43,6 +42,7 @@ async function run(files, options = {}) {
     logLevel: "error",
     configFile: options.config,
     root: options.root,
+    mode: options.mode,
     plugins: [
       options.watch && viteNodeHmrPlugin()
     ]

package/dist/client.cjs

@@ -12,7 +12,6 @@ var createDebug = require('debug');
 var utils = require('./utils.cjs');
 var sourceMap = require('./source-map.cjs');
 require('fs');
-require('source-map-support');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -163,9 +162,6 @@ class ViteNodeRunner {
     const [id, url] = await this.resolveUrl(rawId);
     return await this.cachedRequest(id, url, []);
   }
-  getSourceMap(id) {
-    return this.moduleCache.getSourceMap(id);
-  }
   async cachedRequest(id, fsPath, callstack) {
     const importee = callstack[callstack.length - 1];
     const mod = this.moduleCache.get(fsPath);
@@ -188,16 +184,16 @@ class ViteNodeRunner {
   shouldResolveId(id, _importee) {
     return !utils.isInternalRequest(id) && !mlly.isNodeBuiltin(id);
   }
-  async _resolveUrl(id, importee) {
-    if (importee && id.startsWith(utils.VALID_ID_PREFIX))
-      importee = void 0;
+  async _resolveUrl(id, importer) {
+    if (importer && id.startsWith(utils.VALID_ID_PREFIX))
+      importer = void 0;
     id = utils.normalizeRequestId(id, this.options.base);
     if (!this.shouldResolveId(id))
       return [id, id];
     const { path, exists } = utils.toFilePath(id, this.root);
     if (!this.options.resolveId || exists)
       return [id, path];
-    const resolved = await this.options.resolveId(id, importee);
+    const resolved = await this.options.resolveId(id, importer);
     const resolvedId = resolved ? utils.normalizeRequestId(resolved.id, this.options.base) : id;
     const fsPath = resolved ? resolvedId : path;
     return [resolvedId, fsPath];

package/dist/client.d.ts

@@ -1 +1,2 @@
-export { j as DEFAULT_REQUEST_STUBS, M as ModuleCacheMap, h as ViteNodeRunner } from './types-63205a44.js';
+import './types.d-1e7e3fdf.js';
+export { j as DEFAULT_REQUEST_STUBS, M as ModuleCacheMap, h as ViteNodeRunner } from './types-e288fc62.js';

package/dist/client.mjs

@@ -8,7 +8,6 @@ import createDebug from 'debug';
 import { normalizeModuleId, slash, isInternalRequest, VALID_ID_PREFIX, normalizeRequestId, toFilePath, cleanUrl, isPrimitive } from './utils.mjs';
 import { extractSourceMap } from './source-map.mjs';
 import 'node:fs';
-import 'source-map-support';
 
 const { setTimeout, clearTimeout } = globalThis;
 const debugExecute = createDebug("vite-node:client:execute");
@@ -136,9 +135,6 @@ class ViteNodeRunner {
     const [id, url] = await this.resolveUrl(rawId);
     return await this.cachedRequest(id, url, []);
   }
-  getSourceMap(id) {
-    return this.moduleCache.getSourceMap(id);
-  }
   async cachedRequest(id, fsPath, callstack) {
     const importee = callstack[callstack.length - 1];
     const mod = this.moduleCache.get(fsPath);
@@ -161,16 +157,16 @@ class ViteNodeRunner {
   shouldResolveId(id, _importee) {
     return !isInternalRequest(id) && !isNodeBuiltin(id);
   }
-  async _resolveUrl(id, importee) {
-    if (importee && id.startsWith(VALID_ID_PREFIX))
-      importee = void 0;
+  async _resolveUrl(id, importer) {
+    if (importer && id.startsWith(VALID_ID_PREFIX))
+      importer = void 0;
     id = normalizeRequestId(id, this.options.base);
     if (!this.shouldResolveId(id))
       return [id, id];
     const { path, exists } = toFilePath(id, this.root);
     if (!this.options.resolveId || exists)
       return [id, path];
-    const resolved = await this.options.resolveId(id, importee);
+    const resolved = await this.options.resolveId(id, importer);
     const resolvedId = resolved ? normalizeRequestId(resolved.id, this.options.base) : id;
     const fsPath = resolved ? resolvedId : path;
     return [resolvedId, fsPath];

package/dist/hmr.d.ts

@@ -1,6 +1,7 @@
 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-63205a44.js';
+import { g as CustomEventMap, h as ViteNodeRunner, i as HMRPayload$1, H as HotContext } from './types-e288fc62.js';
+import './types.d-1e7e3fdf.js';
 
 type EventType = string | symbol;
 type Handler<T = unknown> = (event: T) => void;

package/dist/index.d.ts

@@ -1 +1,2 @@
-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-63205a44.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-e288fc62.js';
+export { D as DecodedSourceMap, E as EncodedSourceMap } from './types.d-1e7e3fdf.js';

package/dist/server.cjs

@@ -3,15 +3,15 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var perf_hooks = require('perf_hooks');
+var fs = require('fs');
 var pathe = require('pathe');
 var createDebug = require('debug');
-var fs = require('fs');
 var mlly = require('mlly');
 var utils = require('./utils.cjs');
 var c = require('picocolors');
 var sourceMap = require('./source-map.cjs');
 require('node:url');
-require('source-map-support');
+require('path');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -92,6 +92,8 @@ async function _shouldExternalize(id, options) {
   if (id.startsWith("data:"))
     return id;
   id = patchWindowsImportPath(id);
+  if ((options == null ? void 0 : options.cacheDir) && id.includes(options.cacheDir))
+    return id;
   if (matchExternalizePattern(id, options == null ? void 0 : options.inline))
     return false;
   if (matchExternalizePattern(id, options == null ? void 0 : options.external))
@@ -209,12 +211,14 @@ class ViteNodeServer {
     this.options = options;
     this.fetchPromiseMap = /* @__PURE__ */ new Map();
     this.transformPromiseMap = /* @__PURE__ */ new Map();
+    this.existingOptimizedDeps = /* @__PURE__ */ new Set();
     this.fetchCache = /* @__PURE__ */ new Map();
     this.externalizeCache = /* @__PURE__ */ new Map();
     var _a, _b;
     const ssrOptions = server.config.ssr;
+    options.deps ?? (options.deps = {});
+    options.deps.cacheDir = pathe.relative(server.config.root, server.config.cacheDir);
     if (ssrOptions) {
-      options.deps ?? (options.deps = {});
       if (ssrOptions.noExternal === true) {
         (_a = options.deps).inline ?? (_a.inline = true);
       } else if (options.deps.inline !== true) {
@@ -234,10 +238,25 @@ class ViteNodeServer {
   shouldExternalize(id) {
     return shouldExternalize(id, this.options.deps, this.externalizeCache);
   }
-  async resolveId(id, importer) {
+  async ensureExists(id) {
+    if (this.existingOptimizedDeps.has(id))
+      return true;
+    if (fs.existsSync(id)) {
+      this.existingOptimizedDeps.add(id);
+      return true;
+    }
+    return new Promise((resolve2) => {
+      setTimeout(() => {
+        this.ensureExists(id).then(() => {
+          resolve2(true);
+        });
+      });
+    });
+  }
+  async resolveId(id, importer, transformMode) {
     if (importer && !importer.startsWith(this.server.config.root))
       importer = pathe.resolve(this.server.config.root, importer);
-    const mode = importer && this.getTransformMode(importer) || "ssr";
+    const mode = transformMode ?? (importer && this.getTransformMode(importer) || "ssr");
     return this.server.pluginContainer.resolveId(id, importer, { ssr: mode === "ssr" });
   }
   getSourceMap(source) {
@@ -248,12 +267,12 @@ class ViteNodeServer {
     const ssrTransformResult = (_b = this.server.moduleGraph.getModuleById(source)) == null ? void 0 : _b.ssrTransformResult;
     return (ssrTransformResult == null ? void 0 : ssrTransformResult.map) || null;
   }
-  async fetchModule(id) {
+  async fetchModule(id, transformMode) {
     id = utils.normalizeModuleId(id);
     if (!this.fetchPromiseMap.has(id)) {
       this.fetchPromiseMap.set(
         id,
-        this._fetchModule(id).then((r) => {
+        this._fetchModule(id, transformMode).then((r) => {
           return this.options.sourcemap !== true ? { ...r, map: void 0 } : r;
         }).finally(() => {
           this.fetchPromiseMap.delete(id);
@@ -284,9 +303,19 @@ class ViteNodeServer {
       return "ssr";
     return "web";
   }
-  async _fetchModule(id) {
-    var _a;
+  async _fetchModule(id, transformMode) {
+    var _a, _b;
     let result;
+    const cacheDir = (_a = this.options.deps) == null ? void 0 : _a.cacheDir;
+    if (cacheDir && id.includes(cacheDir)) {
+      if (!id.startsWith(this.server.config.root))
+        id = pathe.join(this.server.config.root, id);
+      const timeout = setTimeout(() => {
+        throw new Error(`ViteNodeServer: ${id} not found. This is a bug, please report it.`);
+      }, 5e3);
+      await this.ensureExists(id);
+      clearTimeout(timeout);
+    }
     const { path: filePath } = utils.toFilePath(id, this.server.config.root);
     const module = this.server.moduleGraph.getModuleById(id);
     const timestamp = module ? module.lastHMRTimestamp : null;
@@ -298,10 +327,10 @@ class ViteNodeServer {
     let duration;
     if (externalize) {
       result = { externalize };
-      (_a = this.debugger) == null ? void 0 : _a.recordExternalize(id, externalize);
+      (_b = this.debugger) == null ? void 0 : _b.recordExternalize(id, externalize);
     } else {
       const start = perf_hooks.performance.now();
-      const r = await this._transformRequest(id);
+      const r = await this._transformRequest(id, transformMode);
       duration = perf_hooks.performance.now() - start;
       result = { code: r == null ? void 0 : r.code, map: r == null ? void 0 : r.map };
     }
@@ -312,7 +341,7 @@ class ViteNodeServer {
     });
     return result;
   }
-  async _transformRequest(id) {
+  async _transformRequest(id, customTransformMode) {
     var _a, _b, _c, _d;
     debugRequest(id);
     let result = null;
@@ -321,7 +350,8 @@ class ViteNodeServer {
       if (result)
         return result;
     }
-    if (this.getTransformMode(id) === "web") {
+    const transformMode = customTransformMode ?? this.getTransformMode(id);
+    if (transformMode === "web") {
       result = await this.server.transformRequest(id);
       if (result)
         result = await this.server.ssrTransform(result.code, result.map, id);

package/dist/server.d.ts

@@ -1,5 +1,6 @@
 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-63205a44.js';
+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-e288fc62.js';
 
 declare class Debugger {
     options: DebuggerOptions;
@@ -23,6 +24,7 @@ declare class ViteNodeServer {
     options: ViteNodeServerOptions;
     private fetchPromiseMap;
     private transformPromiseMap;
+    private existingOptimizedDeps;
     fetchCache: Map<string, {
         duration?: number | undefined;
         timestamp: number;
@@ -32,9 +34,10 @@ declare class ViteNodeServer {
     debugger?: Debugger;
     constructor(server: ViteDevServer, options?: ViteNodeServerOptions);
     shouldExternalize(id: string): Promise<string | false>;
-    resolveId(id: string, importer?: string): Promise<ViteNodeResolveId | null>;
-    getSourceMap(source: string): RawSourceMap | null;
-    fetchModule(id: string): Promise<FetchResult>;
+    private ensureExists;
+    resolveId(id: string, importer?: string, transformMode?: 'web' | 'ssr'): Promise<ViteNodeResolveId | null>;
+    getSourceMap(source: string): EncodedSourceMap | null;
+    fetchModule(id: string, transformMode?: 'web' | 'ssr'): Promise<FetchResult>;
     transformRequest(id: string): Promise<TransformResult | null | undefined>;
     getTransformMode(id: string): "web" | "ssr";
     private _fetchModule;

package/dist/server.mjs

@@ -1,13 +1,13 @@
 import { performance } from 'node:perf_hooks';
-import { resolve, join } from 'pathe';
-import createDebug from 'debug';
 import { existsSync, promises } from 'node:fs';
+import { resolve, join, relative } from 'pathe';
+import createDebug from 'debug';
 import { isNodeBuiltin, isValidNodeImport } from 'mlly';
 import { slash, toArray, normalizeModuleId, toFilePath } from './utils.mjs';
 import c from 'picocolors';
 import { withInlineSourcemap } from './source-map.mjs';
 import 'node:url';
-import 'source-map-support';
+import 'node:path';
 
 const KNOWN_ASSET_TYPES = [
   "png",
@@ -83,6 +83,8 @@ async function _shouldExternalize(id, options) {
   if (id.startsWith("data:"))
     return id;
   id = patchWindowsImportPath(id);
+  if ((options == null ? void 0 : options.cacheDir) && id.includes(options.cacheDir))
+    return id;
   if (matchExternalizePattern(id, options == null ? void 0 : options.inline))
     return false;
   if (matchExternalizePattern(id, options == null ? void 0 : options.external))
@@ -200,12 +202,14 @@ class ViteNodeServer {
     this.options = options;
     this.fetchPromiseMap = /* @__PURE__ */ new Map();
     this.transformPromiseMap = /* @__PURE__ */ new Map();
+    this.existingOptimizedDeps = /* @__PURE__ */ new Set();
     this.fetchCache = /* @__PURE__ */ new Map();
     this.externalizeCache = /* @__PURE__ */ new Map();
     var _a, _b;
     const ssrOptions = server.config.ssr;
+    options.deps ?? (options.deps = {});
+    options.deps.cacheDir = relative(server.config.root, server.config.cacheDir);
     if (ssrOptions) {
-      options.deps ?? (options.deps = {});
       if (ssrOptions.noExternal === true) {
         (_a = options.deps).inline ?? (_a.inline = true);
       } else if (options.deps.inline !== true) {
@@ -225,10 +229,25 @@ class ViteNodeServer {
   shouldExternalize(id) {
     return shouldExternalize(id, this.options.deps, this.externalizeCache);
   }
-  async resolveId(id, importer) {
+  async ensureExists(id) {
+    if (this.existingOptimizedDeps.has(id))
+      return true;
+    if (existsSync(id)) {
+      this.existingOptimizedDeps.add(id);
+      return true;
+    }
+    return new Promise((resolve2) => {
+      setTimeout(() => {
+        this.ensureExists(id).then(() => {
+          resolve2(true);
+        });
+      });
+    });
+  }
+  async resolveId(id, importer, transformMode) {
     if (importer && !importer.startsWith(this.server.config.root))
       importer = resolve(this.server.config.root, importer);
-    const mode = importer && this.getTransformMode(importer) || "ssr";
+    const mode = transformMode ?? (importer && this.getTransformMode(importer) || "ssr");
     return this.server.pluginContainer.resolveId(id, importer, { ssr: mode === "ssr" });
   }
   getSourceMap(source) {
@@ -239,12 +258,12 @@ class ViteNodeServer {
     const ssrTransformResult = (_b = this.server.moduleGraph.getModuleById(source)) == null ? void 0 : _b.ssrTransformResult;
     return (ssrTransformResult == null ? void 0 : ssrTransformResult.map) || null;
   }
-  async fetchModule(id) {
+  async fetchModule(id, transformMode) {
     id = normalizeModuleId(id);
     if (!this.fetchPromiseMap.has(id)) {
       this.fetchPromiseMap.set(
         id,
-        this._fetchModule(id).then((r) => {
+        this._fetchModule(id, transformMode).then((r) => {
           return this.options.sourcemap !== true ? { ...r, map: void 0 } : r;
         }).finally(() => {
           this.fetchPromiseMap.delete(id);
@@ -275,9 +294,19 @@ class ViteNodeServer {
       return "ssr";
     return "web";
   }
-  async _fetchModule(id) {
-    var _a;
+  async _fetchModule(id, transformMode) {
+    var _a, _b;
     let result;
+    const cacheDir = (_a = this.options.deps) == null ? void 0 : _a.cacheDir;
+    if (cacheDir && id.includes(cacheDir)) {
+      if (!id.startsWith(this.server.config.root))
+        id = join(this.server.config.root, id);
+      const timeout = setTimeout(() => {
+        throw new Error(`ViteNodeServer: ${id} not found. This is a bug, please report it.`);
+      }, 5e3);
+      await this.ensureExists(id);
+      clearTimeout(timeout);
+    }
     const { path: filePath } = toFilePath(id, this.server.config.root);
     const module = this.server.moduleGraph.getModuleById(id);
     const timestamp = module ? module.lastHMRTimestamp : null;
@@ -289,10 +318,10 @@ class ViteNodeServer {
     let duration;
     if (externalize) {
       result = { externalize };
-      (_a = this.debugger) == null ? void 0 : _a.recordExternalize(id, externalize);
+      (_b = this.debugger) == null ? void 0 : _b.recordExternalize(id, externalize);
     } else {
       const start = performance.now();
-      const r = await this._transformRequest(id);
+      const r = await this._transformRequest(id, transformMode);
       duration = performance.now() - start;
       result = { code: r == null ? void 0 : r.code, map: r == null ? void 0 : r.map };
     }
@@ -303,7 +332,7 @@ class ViteNodeServer {
     });
     return result;
   }
-  async _transformRequest(id) {
+  async _transformRequest(id, customTransformMode) {
     var _a, _b, _c, _d;
     debugRequest(id);
     let result = null;
@@ -312,7 +341,8 @@ class ViteNodeServer {
       if (result)
         return result;
     }
-    if (this.getTransformMode(id) === "web") {
+    const transformMode = customTransformMode ?? this.getTransformMode(id);
+    if (transformMode === "web") {
       result = await this.server.transformRequest(id);
       if (result)
         result = await this.server.ssrTransform(result.code, result.map, id);