vite-node 0.31.4 → 0.32.1

package/dist/cli.cjs

@@ -6,8 +6,8 @@ var vite = require('vite');
 var server = require('./server.cjs');
 var client = require('./client.cjs');
 var utils = require('./utils.cjs');
-var hmr = require('./chunk-hmr.cjs');
 var sourceMap = require('./source-map.cjs');
+var hmr = require('./chunk-hmr.cjs');
 require('perf_hooks');
 require('fs');
 require('pathe');
@@ -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.4";
+var version = "0.32.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,4 +1,4 @@
-import { f as ViteNodeServerOptions } from './types-33f0e4ff.js';
+import { f as ViteNodeServerOptions } from './types-516036fa.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.4";
+var version = "0.32.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

@@ -86,7 +86,7 @@ class ModuleCacheMap extends Map {
   update(fsPath, mod) {
     fsPath = this.normalizePath(fsPath);
     if (!super.has(fsPath))
-      super.set(fsPath, mod);
+      this.setByModuleId(fsPath, mod);
     else
       Object.assign(super.get(fsPath), mod);
     return this;
@@ -99,8 +99,15 @@ class ModuleCacheMap extends Map {
   }
   getByModuleId(modulePath) {
     if (!super.has(modulePath))
-      super.set(modulePath, {});
-    return super.get(modulePath);
+      this.setByModuleId(modulePath, {});
+    const mod = super.get(modulePath);
+    if (!mod.imports) {
+      Object.assign(mod, {
+        imports: /* @__PURE__ */ new Set(),
+        importers: /* @__PURE__ */ new Set()
+      });
+    }
+    return mod;
   }
   get(fsPath) {
     return this.getByModuleId(this.normalizePath(fsPath));
@@ -112,12 +119,13 @@ class ModuleCacheMap extends Map {
     return this.deleteByModuleId(this.normalizePath(fsPath));
   }
   invalidateModule(mod) {
-    var _a;
+    var _a, _b;
     delete mod.evaluated;
     delete mod.resolving;
     delete mod.promise;
     delete mod.exports;
     (_a = mod.importers) == null ? void 0 : _a.clear();
+    (_b = mod.imports) == null ? void 0 : _b.clear();
     return true;
   }
   /**
@@ -188,16 +196,12 @@ class ViteNodeRunner {
   async cachedRequest(id, fsPath, callstack) {
     const importee = callstack[callstack.length - 1];
     const mod = this.moduleCache.get(fsPath);
-    if (!mod.importers)
-      mod.importers = /* @__PURE__ */ new Set();
+    const { imports, importers } = mod;
     if (importee)
-      mod.importers.add(importee);
+      importers.add(importee);
     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 (callstack.includes(fsPath) || Array.from(imports.values()).some((i) => importers.has(i))) {
       if (mod.exports)
         return mod.exports;
     }
@@ -218,21 +222,20 @@ ${getStack()}`), 2e3);
     }
   }
   shouldResolveId(id, _importee) {
-    return !utils.isInternalRequest(id) && !utils.isNodeBuiltin(id);
+    return !utils.isInternalRequest(id) && !utils.isNodeBuiltin(id) && !id.startsWith("data:");
   }
   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);
+    const dep = utils.normalizeRequestId(id, this.options.base);
+    if (!this.shouldResolveId(dep))
+      return [dep, dep];
+    const { path, exists } = utils.toFilePath(dep, this.root);
     if (!this.options.resolveId || exists)
-      return [id, path];
-    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];
+      return [dep, path];
+    const resolved = await this.options.resolveId(dep, importer);
+    const resolvedId = resolved ? utils.normalizeRequestId(resolved.id, this.options.base) : dep;
+    return [resolvedId, resolvedId];
   }
   async resolveUrl(id, importee) {
     const resolveKey = `resolve:${id}`;
@@ -253,7 +256,10 @@ ${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(String(dep), fsPath);
+      const depMod = this.moduleCache.getByModuleId(depFsPath);
+      depMod.importers.add(moduleId);
+      mod.imports.add(depFsPath);
       return this.dependencyRequest(id2, depFsPath, callstack);
     };
     const requestStubs = this.options.requestStubs || DEFAULT_REQUEST_STUBS;
@@ -285,7 +291,7 @@ ${getStack()}`), 2e3);
       },
       getPrototypeOf: () => Object.prototype,
       set: (_, p, value) => {
-        if (p === "default" && this.shouldInterop(modulePath, { default: value })) {
+        if (p === "default" && this.shouldInterop(modulePath, { default: value }) && cjsExports !== value) {
           exportAll(cjsExports, value);
           exports.default = value;
           return true;

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-33f0e4ff.js';
+export { i as DEFAULT_REQUEST_STUBS, M as ModuleCacheMap, h as ViteNodeRunner } from './types-516036fa.js';
 import 'vite/types/hot';

package/dist/client.mjs

@@ -59,7 +59,7 @@ class ModuleCacheMap extends Map {
   update(fsPath, mod) {
     fsPath = this.normalizePath(fsPath);
     if (!super.has(fsPath))
-      super.set(fsPath, mod);
+      this.setByModuleId(fsPath, mod);
     else
       Object.assign(super.get(fsPath), mod);
     return this;
@@ -72,8 +72,15 @@ class ModuleCacheMap extends Map {
   }
   getByModuleId(modulePath) {
     if (!super.has(modulePath))
-      super.set(modulePath, {});
-    return super.get(modulePath);
+      this.setByModuleId(modulePath, {});
+    const mod = super.get(modulePath);
+    if (!mod.imports) {
+      Object.assign(mod, {
+        imports: /* @__PURE__ */ new Set(),
+        importers: /* @__PURE__ */ new Set()
+      });
+    }
+    return mod;
   }
   get(fsPath) {
     return this.getByModuleId(this.normalizePath(fsPath));
@@ -85,12 +92,13 @@ class ModuleCacheMap extends Map {
     return this.deleteByModuleId(this.normalizePath(fsPath));
   }
   invalidateModule(mod) {
-    var _a;
+    var _a, _b;
     delete mod.evaluated;
     delete mod.resolving;
     delete mod.promise;
     delete mod.exports;
     (_a = mod.importers) == null ? void 0 : _a.clear();
+    (_b = mod.imports) == null ? void 0 : _b.clear();
     return true;
   }
   /**
@@ -161,16 +169,12 @@ class ViteNodeRunner {
   async cachedRequest(id, fsPath, callstack) {
     const importee = callstack[callstack.length - 1];
     const mod = this.moduleCache.get(fsPath);
-    if (!mod.importers)
-      mod.importers = /* @__PURE__ */ new Set();
+    const { imports, importers } = mod;
     if (importee)
-      mod.importers.add(importee);
+      importers.add(importee);
     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 (callstack.includes(fsPath) || Array.from(imports.values()).some((i) => importers.has(i))) {
       if (mod.exports)
         return mod.exports;
     }
@@ -191,21 +195,20 @@ ${getStack()}`), 2e3);
     }
   }
   shouldResolveId(id, _importee) {
-    return !isInternalRequest(id) && !isNodeBuiltin(id);
+    return !isInternalRequest(id) && !isNodeBuiltin(id) && !id.startsWith("data:");
   }
   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);
+    const dep = normalizeRequestId(id, this.options.base);
+    if (!this.shouldResolveId(dep))
+      return [dep, dep];
+    const { path, exists } = toFilePath(dep, this.root);
     if (!this.options.resolveId || exists)
-      return [id, path];
-    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];
+      return [dep, path];
+    const resolved = await this.options.resolveId(dep, importer);
+    const resolvedId = resolved ? normalizeRequestId(resolved.id, this.options.base) : dep;
+    return [resolvedId, resolvedId];
   }
   async resolveUrl(id, importee) {
     const resolveKey = `resolve:${id}`;
@@ -226,7 +229,10 @@ ${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(String(dep), fsPath);
+      const depMod = this.moduleCache.getByModuleId(depFsPath);
+      depMod.importers.add(moduleId);
+      mod.imports.add(depFsPath);
       return this.dependencyRequest(id2, depFsPath, callstack);
     };
     const requestStubs = this.options.requestStubs || DEFAULT_REQUEST_STUBS;
@@ -258,7 +264,7 @@ ${getStack()}`), 2e3);
       },
       getPrototypeOf: () => Object.prototype,
       set: (_, p, value) => {
-        if (p === "default" && this.shouldInterop(modulePath, { default: value })) {
+        if (p === "default" && this.shouldInterop(modulePath, { default: value }) && cjsExports !== value) {
           exportAll(cjsExports, value);
           exports.default = value;
           return true;

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-33f0e4ff.js';
+import { h as ViteNodeRunner, H as HotContext } from './types-516036fa.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-33f0e4ff.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-516036fa.js';
 export { D as DecodedSourceMap, E as EncodedSourceMap } from './types.d-7442d07f.js';
 import 'vite/types/hot';

package/dist/server.cjs

@@ -21,6 +21,7 @@ var c__default = /*#__PURE__*/_interopDefaultLegacy(c);
 
 const KNOWN_ASSET_TYPES = [
   // images
+  "apng",
   "png",
   "jpe?g",
   "jfif",

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

package/dist/server.mjs

@@ -12,6 +12,7 @@ import 'node:path';
 
 const KNOWN_ASSET_TYPES = [
   // images
+  "apng",
   "png",
   "jpe?g",
   "jfif",

package/dist/{types-33f0e4ff.d.ts → types-516036fa.d.ts}

@@ -7,11 +7,11 @@ declare class ModuleCacheMap extends Map<string, ModuleCache> {
     /**
      * Assign partial data to the map
      */
-    update(fsPath: string, mod: Partial<ModuleCache>): this;
+    update(fsPath: string, mod: ModuleCache): this;
     setByModuleId(modulePath: string, mod: ModuleCache): this;
     set(fsPath: string, mod: ModuleCache): this;
-    getByModuleId(modulePath: string): ModuleCache;
-    get(fsPath: string): ModuleCache;
+    getByModuleId(modulePath: string): ModuleCache & Required<Pick<ModuleCache, "imports" | "importers">>;
+    get(fsPath: string): ModuleCache & Required<Pick<ModuleCache, "imports" | "importers">>;
     deleteByModuleId(modulePath: string): boolean;
     delete(fsPath: string): boolean;
     invalidateModule(mod: ModuleCache): boolean;
@@ -115,6 +115,7 @@ interface ModuleCache {
      * Module ids that imports this module
      */
     importers?: Set<string>;
+    imports?: Set<string>;
 }
 interface ViteNodeRunnerOptions {
     root: string;

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-33f0e4ff.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-516036fa.js';

package/dist/utils.d.ts

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

package/package.json

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