vite-node 0.31.1 → 0.31.2

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.31.1";
+var version = "0.31.2";
 
 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();
@@ -87,7 +87,7 @@ async function run(files, options = {}) {
   }
 }
 function parseServerOptions(serverOptions) {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f, _g;
   const inlineOptions = ((_a = serverOptions.deps) == null ? void 0 : _a.inline) === true ? true : utils.toArray((_b = serverOptions.deps) == null ? void 0 : _b.inline);
   return {
     ...serverOptions,
@@ -98,12 +98,13 @@ function parseServerOptions(serverOptions) {
       }) : true,
       external: utils.toArray((_c = serverOptions.deps) == null ? void 0 : _c.external).map((dep) => {
         return dep.startsWith("/") && dep.endsWith("/") ? new RegExp(dep) : dep;
-      })
+      }),
+      moduleDirectories: ((_d = serverOptions.deps) == null ? void 0 : _d.moduleDirectories) ? utils.toArray((_e = serverOptions.deps) == null ? void 0 : _e.moduleDirectories) : void 0
     },
     transformMode: {
       ...serverOptions.transformMode,
-      ssr: utils.toArray((_d = serverOptions.transformMode) == null ? void 0 : _d.ssr).map((dep) => new RegExp(dep)),
-      web: utils.toArray((_e = serverOptions.transformMode) == null ? void 0 : _e.web).map((dep) => new RegExp(dep))
+      ssr: utils.toArray((_f = serverOptions.transformMode) == null ? void 0 : _f.ssr).map((dep) => new RegExp(dep)),
+      web: utils.toArray((_g = serverOptions.transformMode) == null ? void 0 : _g.web).map((dep) => new RegExp(dep))
     }
   };
 }

package/dist/cli.d.ts

@@ -1,4 +1,4 @@
-import { f as ViteNodeServerOptions } from './types-557128db.js';
+import { f as ViteNodeServerOptions } from './types-33f0e4ff.js';
 import 'vite/types/hot';
 import './types.d-7442d07f.js';
 

package/dist/cli.mjs

@@ -17,7 +17,7 @@ import 'node:path';
 import 'node:vm';
 import 'node:events';
 
-var version = "0.31.1";
+var version = "0.31.2";
 
 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();
@@ -80,7 +80,7 @@ async function run(files, options = {}) {
   }
 }
 function parseServerOptions(serverOptions) {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f, _g;
   const inlineOptions = ((_a = serverOptions.deps) == null ? void 0 : _a.inline) === true ? true : toArray((_b = serverOptions.deps) == null ? void 0 : _b.inline);
   return {
     ...serverOptions,
@@ -91,12 +91,13 @@ function parseServerOptions(serverOptions) {
       }) : true,
       external: toArray((_c = serverOptions.deps) == null ? void 0 : _c.external).map((dep) => {
         return dep.startsWith("/") && dep.endsWith("/") ? new RegExp(dep) : dep;
-      })
+      }),
+      moduleDirectories: ((_d = serverOptions.deps) == null ? void 0 : _d.moduleDirectories) ? toArray((_e = serverOptions.deps) == null ? void 0 : _e.moduleDirectories) : void 0
     },
     transformMode: {
       ...serverOptions.transformMode,
-      ssr: toArray((_d = serverOptions.transformMode) == null ? void 0 : _d.ssr).map((dep) => new RegExp(dep)),
-      web: toArray((_e = serverOptions.transformMode) == null ? void 0 : _e.web).map((dep) => new RegExp(dep))
+      ssr: toArray((_f = serverOptions.transformMode) == null ? void 0 : _f.ssr).map((dep) => new RegExp(dep)),
+      web: toArray((_g = serverOptions.transformMode) == null ? void 0 : _g.web).map((dep) => new RegExp(dep))
     }
   };
 }

package/dist/client.cjs

@@ -195,7 +195,7 @@ ${[...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);
-    })) {
+    }) || mod.importers.has(importee)) {
       if (mod.exports)
         return mod.exports;
     }
@@ -251,7 +251,7 @@ ${getStack()}`), 2e3);
     const callstack = [..._callstack, moduleId];
     const mod = this.moduleCache.getByModuleId(moduleId);
     const request = async (dep) => {
-      const [id2, depFsPath] = await this.resolveUrl(dep, fsPath);
+      const [id2, depFsPath] = await this.resolveUrl(`${dep}`, fsPath);
       return this.dependencyRequest(id2, depFsPath, callstack);
     };
     const requestStubs = this.options.requestStubs || DEFAULT_REQUEST_STUBS;

package/dist/client.d.ts

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

package/dist/client.mjs

@@ -168,7 +168,7 @@ ${[...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);
-    })) {
+    }) || mod.importers.has(importee)) {
       if (mod.exports)
         return mod.exports;
     }
@@ -224,7 +224,7 @@ ${getStack()}`), 2e3);
     const callstack = [..._callstack, moduleId];
     const mod = this.moduleCache.getByModuleId(moduleId);
     const request = async (dep) => {
-      const [id2, depFsPath] = await this.resolveUrl(dep, fsPath);
+      const [id2, depFsPath] = await this.resolveUrl(`${dep}`, fsPath);
       return this.dependencyRequest(id2, depFsPath, callstack);
     };
     const requestStubs = this.options.requestStubs || DEFAULT_REQUEST_STUBS;

package/dist/hmr.d.ts

@@ -1,6 +1,6 @@
 import { EventEmitter } from 'node:events';
 import { HMRPayload as HMRPayload$1, Plugin } from 'vite';
-import { h as ViteNodeRunner, H as HotContext } from './types-557128db.js';
+import { h as ViteNodeRunner, H as HotContext } from './types-33f0e4ff.js';
 import 'vite/types/hot';
 import './types.d-7442d07f.js';
 

package/dist/index.d.ts

@@ -1,3 +1,3 @@
-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 { 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-33f0e4ff.js';
 export { D as DecodedSourceMap, E as EncodedSourceMap } from './types.d-7442d07f.js';
 import 'vite/types/hot';

package/dist/server.cjs

@@ -101,30 +101,30 @@ async function _shouldExternalize(id, options) {
   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))
+  const moduleDirectories = (options == null ? void 0 : options.moduleDirectories) || ["/node_modules/"];
+  if (matchExternalizePattern(id, moduleDirectories, options == null ? void 0 : options.inline))
     return false;
-  if (matchExternalizePattern(id, options == null ? void 0 : options.external))
+  if (matchExternalizePattern(id, moduleDirectories, options == null ? void 0 : options.external))
     return id;
-  const isNodeModule = id.includes("/node_modules/");
-  const guessCJS = isNodeModule && (options == null ? void 0 : options.fallbackCJS);
+  const isLibraryModule = moduleDirectories.some((dir) => id.includes(dir));
+  const guessCJS = isLibraryModule && (options == null ? void 0 : options.fallbackCJS);
   id = guessCJS ? guessCJSversion(id) || id : id;
-  if (matchExternalizePattern(id, defaultInline))
+  if (matchExternalizePattern(id, moduleDirectories, defaultInline))
     return false;
-  if (matchExternalizePattern(id, depsExternal))
+  if (matchExternalizePattern(id, moduleDirectories, depsExternal))
     return id;
-  const isDist = id.includes("/dist/");
-  if ((isNodeModule || isDist) && await mlly.isValidNodeImport(id))
+  if (isLibraryModule && await mlly.isValidNodeImport(id))
     return id;
   return false;
 }
-function matchExternalizePattern(id, patterns) {
+function matchExternalizePattern(id, moduleDirectories, patterns) {
   if (patterns == null)
     return false;
   if (patterns === true)
     return true;
   for (const ex of patterns) {
     if (typeof ex === "string") {
-      if (id.includes(`/node_modules/${ex}/`))
+      if (moduleDirectories.some((dir) => id.includes(pathe.join(dir, id))))
         return true;
     } else {
       if (ex.test(id))
@@ -221,7 +221,7 @@ class ViteNodeServer {
     this.existingOptimizedDeps = /* @__PURE__ */ new Set();
     this.fetchCache = /* @__PURE__ */ new Map();
     this.externalizeCache = /* @__PURE__ */ new Map();
-    var _a, _b;
+    var _a, _b, _c, _d;
     const ssrOptions = server.config.ssr;
     options.deps ?? (options.deps = {});
     options.deps.cacheDir = pathe.relative(server.config.root, server.config.cacheDir);
@@ -241,6 +241,10 @@ class ViteNodeServer {
     }
     if (options.debug)
       this.debugger = new Debugger(server.config.root, options.debug);
+    (_c = options.deps).moduleDirectories ?? (_c.moduleDirectories = []);
+    const customModuleDirectories = (_d = process.env.VITE_NODE_DEPS_MODULE_DIRECTORIES) == null ? void 0 : _d.split(",");
+    if (customModuleDirectories)
+      options.deps.moduleDirectories.push(...customModuleDirectories);
   }
   shouldExternalize(id) {
     return shouldExternalize(id, this.options.deps, this.externalizeCache);

package/dist/server.d.ts

@@ -1,6 +1,6 @@
 import { TransformResult, ViteDevServer } from 'vite';
 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 { g as DebuggerOptions, D as DepsHandlingOptions, f as ViteNodeServerOptions, F as FetchResult, e as ViteNodeResolveId } from './types-33f0e4ff.js';
 import 'vite/types/hot';
 
 declare class Debugger {

package/dist/server.mjs

@@ -1,6 +1,6 @@
 import { performance } from 'node:perf_hooks';
 import { existsSync, promises } from 'node:fs';
-import { resolve, join, relative } from 'pathe';
+import { join, resolve, relative } from 'pathe';
 import createDebug from 'debug';
 import { isNodeBuiltin, isValidNodeImport } from 'mlly';
 import { slash, toArray, normalizeModuleId, toFilePath } from './utils.mjs';
@@ -92,30 +92,30 @@ async function _shouldExternalize(id, options) {
   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))
+  const moduleDirectories = (options == null ? void 0 : options.moduleDirectories) || ["/node_modules/"];
+  if (matchExternalizePattern(id, moduleDirectories, options == null ? void 0 : options.inline))
     return false;
-  if (matchExternalizePattern(id, options == null ? void 0 : options.external))
+  if (matchExternalizePattern(id, moduleDirectories, options == null ? void 0 : options.external))
     return id;
-  const isNodeModule = id.includes("/node_modules/");
-  const guessCJS = isNodeModule && (options == null ? void 0 : options.fallbackCJS);
+  const isLibraryModule = moduleDirectories.some((dir) => id.includes(dir));
+  const guessCJS = isLibraryModule && (options == null ? void 0 : options.fallbackCJS);
   id = guessCJS ? guessCJSversion(id) || id : id;
-  if (matchExternalizePattern(id, defaultInline))
+  if (matchExternalizePattern(id, moduleDirectories, defaultInline))
     return false;
-  if (matchExternalizePattern(id, depsExternal))
+  if (matchExternalizePattern(id, moduleDirectories, depsExternal))
     return id;
-  const isDist = id.includes("/dist/");
-  if ((isNodeModule || isDist) && await isValidNodeImport(id))
+  if (isLibraryModule && await isValidNodeImport(id))
     return id;
   return false;
 }
-function matchExternalizePattern(id, patterns) {
+function matchExternalizePattern(id, moduleDirectories, patterns) {
   if (patterns == null)
     return false;
   if (patterns === true)
     return true;
   for (const ex of patterns) {
     if (typeof ex === "string") {
-      if (id.includes(`/node_modules/${ex}/`))
+      if (moduleDirectories.some((dir) => id.includes(join(dir, id))))
         return true;
     } else {
       if (ex.test(id))
@@ -212,7 +212,7 @@ class ViteNodeServer {
     this.existingOptimizedDeps = /* @__PURE__ */ new Set();
     this.fetchCache = /* @__PURE__ */ new Map();
     this.externalizeCache = /* @__PURE__ */ new Map();
-    var _a, _b;
+    var _a, _b, _c, _d;
     const ssrOptions = server.config.ssr;
     options.deps ?? (options.deps = {});
     options.deps.cacheDir = relative(server.config.root, server.config.cacheDir);
@@ -232,6 +232,10 @@ class ViteNodeServer {
     }
     if (options.debug)
       this.debugger = new Debugger(server.config.root, options.debug);
+    (_c = options.deps).moduleDirectories ?? (_c.moduleDirectories = []);
+    const customModuleDirectories = (_d = process.env.VITE_NODE_DEPS_MODULE_DIRECTORIES) == null ? void 0 : _d.split(",");
+    if (customModuleDirectories)
+      options.deps.moduleDirectories.push(...customModuleDirectories);
   }
   shouldExternalize(id) {
     return shouldExternalize(id, this.options.deps, this.externalizeCache);

package/dist/source-map.cjs

@@ -880,7 +880,7 @@ function withInlineSourcemap(result, options) {
     }
     return source;
   });
-  const OTHER_SOURCE_MAP_REGEXP = new RegExp(`//# ${SOURCEMAPPING_URL}=data:application/json[^,]+base64,(.+)`, "g");
+  const OTHER_SOURCE_MAP_REGEXP = new RegExp(`//# ${SOURCEMAPPING_URL}=data:application/json[^,]+base64,([A-Za-z0-9+/=]+)$`, "gm");
   while (OTHER_SOURCE_MAP_REGEXP.test(code))
     code = code.replace(OTHER_SOURCE_MAP_REGEXP, "");
   const sourceMap = Buffer.from(JSON.stringify(map), "utf-8").toString("base64");

package/dist/source-map.mjs

@@ -871,7 +871,7 @@ function withInlineSourcemap(result, options) {
     }
     return source;
   });
-  const OTHER_SOURCE_MAP_REGEXP = new RegExp(`//# ${SOURCEMAPPING_URL}=data:application/json[^,]+base64,(.+)`, "g");
+  const OTHER_SOURCE_MAP_REGEXP = new RegExp(`//# ${SOURCEMAPPING_URL}=data:application/json[^,]+base64,([A-Za-z0-9+/=]+)$`, "gm");
   while (OTHER_SOURCE_MAP_REGEXP.test(code))
     code = code.replace(OTHER_SOURCE_MAP_REGEXP, "");
   const sourceMap = Buffer.from(JSON.stringify(map), "utf-8").toString("base64");

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

@@ -67,6 +67,15 @@ type Awaitable<T> = T | PromiseLike<T>;
 interface DepsHandlingOptions {
     external?: (string | RegExp)[];
     inline?: (string | RegExp)[] | true;
+    /**
+     * A list of directories that are considered to hold Node.js modules
+     * Have to include "/" at the start and end of the path
+     *
+     * Vite-Node checks the whole absolute path of the import, so make sure you don't include
+     * unwanted files accidentally
+     * @default ['/node_modules/']
+     */
+    moduleDirectories?: string[];
     cacheDir?: string;
     /**
      * Try to guess the CJS version of a package when it's invalid ESM

package/dist/types.d.ts

@@ -1,3 +1,3 @@
 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';
+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-33f0e4ff.js';

package/dist/utils.d.ts

@@ -1,4 +1,4 @@
-import { N as Nullable, A as Arrayable } from './types-557128db.js';
+import { N as Nullable, A as Arrayable } from './types-33f0e4ff.js';
 import 'vite/types/hot';
 import './types.d-7442d07f.js';
 

package/package.json

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