vite-node 0.24.5 → 0.25.0

package/README.md

@@ -56,6 +56,7 @@ In Vite Node, the server and runner (client) are separated, so you can integrate
 import { createServer } from 'vite'
 import { ViteNodeServer } from 'vite-node/server'
 import { ViteNodeRunner } from 'vite-node/client'
+import { installSourcemapsSupport } from 'vite-node/source-map'
 
 // create vite server
 const server = await createServer({
@@ -70,6 +71,11 @@ await server.pluginContainer.buildStart({})
 // create vite-node server
 const node = new ViteNodeServer(server)
 
+// fixes stacktraces in Errors
+installSourcemapsSupport({
+  getSourceMap: source => node.getSourceMap(source),
+})
+
 // create vite-node runner
 const runner = new ViteNodeRunner({
   root: server.config.root,

package/dist/cli.cjs

@@ -7,6 +7,7 @@ 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');
 require('tty');
 require('perf_hooks');
 require('pathe');
@@ -16,6 +17,7 @@ require('mlly');
 require('url');
 require('module');
 require('vm');
+require('source-map-support');
 
 function toArr(any) {
 	return any == null ? [] : Array.isArray(any) ? any : [any];
@@ -630,7 +632,7 @@ class CAC extends events.EventEmitter {
 
 const cac = (name = "") => new CAC(name);
 
-var version = "0.24.5";
+var version = "0.25.0";
 
 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("--options <options>", "Use specified Vite server options").help();
@@ -655,6 +657,9 @@ async function run(files, options = {}) {
   });
   await server$1.pluginContainer.buildStart({});
   const node = new server.ViteNodeServer(server$1, serverOptions);
+  sourceMap.installSourcemapsSupport({
+    getSourceMap: (source) => node.getSourceMap(source)
+  });
   const runner = new client.ViteNodeRunner({
     root: server$1.config.root,
     base: server$1.config.base,

package/dist/cli.d.ts

@@ -1,4 +1,4 @@
-import { e as ViteNodeServerOptions } from './types-ab8db104.js';
+import { e as ViteNodeServerOptions } from './types-257c4f87.js';
 
 interface CliOptions {
     root?: string;

package/dist/cli.mjs

@@ -5,6 +5,7 @@ import { ViteNodeServer } from './server.mjs';
 import { ViteNodeRunner } from './client.mjs';
 import { toArray } from './utils.mjs';
 import { v as viteNodeHmrPlugin, c as createHotContext, h as handleMessage } from './chunk-hmr.mjs';
+import { installSourcemapsSupport } from './source-map.mjs';
 import 'tty';
 import 'perf_hooks';
 import 'pathe';
@@ -14,6 +15,7 @@ import 'mlly';
 import 'url';
 import 'module';
 import 'vm';
+import 'source-map-support';
 
 function toArr(any) {
 	return any == null ? [] : Array.isArray(any) ? any : [any];
@@ -628,7 +630,7 @@ class CAC extends EventEmitter {
 
 const cac = (name = "") => new CAC(name);
 
-var version = "0.24.5";
+var version = "0.25.0";
 
 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("--options <options>", "Use specified Vite server options").help();
@@ -653,6 +655,9 @@ async function run(files, options = {}) {
   });
   await server.pluginContainer.buildStart({});
   const node = new ViteNodeServer(server, serverOptions);
+  installSourcemapsSupport({
+    getSourceMap: (source) => node.getSourceMap(source)
+  });
   const runner = new ViteNodeRunner({
     root: server.config.root,
     base: server.config.base,

package/dist/client.cjs

@@ -124,6 +124,20 @@ class ModuleCacheMap extends Map {
     }
     return invalidated;
   }
+  getSourceMap(id) {
+    var _a, _b;
+    const fsPath = this.normalizePath(id);
+    const cache = this.get(fsPath);
+    if (cache.map)
+      return cache.map;
+    const mapString = (_b = (_a = cache == null ? void 0 : cache.code) == null ? void 0 : _a.match(/\/\/# sourceMappingURL=data:application\/json;charset=utf-8;base64,(.+)/)) == null ? void 0 : _b[1];
+    if (mapString) {
+      const map = JSON.parse(Buffer.from(mapString, "base64").toString("utf-8"));
+      cache.map = map;
+      return map;
+    }
+    return null;
+  }
 }
 class ViteNodeRunner {
   constructor(options) {
@@ -138,6 +152,9 @@ class ViteNodeRunner {
   async executeId(id) {
     return await this.cachedRequest(id, []);
   }
+  getSourceMap(id) {
+    return this.moduleCache.getSourceMap(id);
+  }
   async cachedRequest(rawId, callstack) {
     const id = utils.normalizeRequestId(rawId, this.options.base);
     const fsPath = utils.toFilePath(id, this.root);
@@ -269,10 +286,13 @@ ${getStack()}`), 2e3);
     debugExecute(__filename);
     if (transformed[0] === "#")
       transformed = transformed.replace(/^\#\!.*/, (s) => " ".repeat(s.length));
-    const fn = vm__default["default"].runInThisContext(`'use strict';async (${Object.keys(context).join(",")})=>{{${transformed}
-}}`, {
+    const codeDefinition = `'use strict';async (${Object.keys(context).join(",")})=>{{`;
+    const code = `${codeDefinition}${transformed}
+}}`;
+    const fn = vm__default["default"].runInThisContext(code, {
       filename: fsPath,
-      lineOffset: 0
+      lineOffset: 0,
+      columnOffset: -codeDefinition.length
     });
     await fn(...Object.values(context));
     return exports;

package/dist/client.d.ts

@@ -1 +1 @@
-export { j as DEFAULT_REQUEST_STUBS, M as ModuleCacheMap, h as ViteNodeRunner } from './types-ab8db104.js';
+export { j as DEFAULT_REQUEST_STUBS, M as ModuleCacheMap, h as ViteNodeRunner } from './types-257c4f87.js';

package/dist/client.mjs

@@ -97,6 +97,20 @@ class ModuleCacheMap extends Map {
     }
     return invalidated;
   }
+  getSourceMap(id) {
+    var _a, _b;
+    const fsPath = this.normalizePath(id);
+    const cache = this.get(fsPath);
+    if (cache.map)
+      return cache.map;
+    const mapString = (_b = (_a = cache == null ? void 0 : cache.code) == null ? void 0 : _a.match(/\/\/# sourceMappingURL=data:application\/json;charset=utf-8;base64,(.+)/)) == null ? void 0 : _b[1];
+    if (mapString) {
+      const map = JSON.parse(Buffer.from(mapString, "base64").toString("utf-8"));
+      cache.map = map;
+      return map;
+    }
+    return null;
+  }
 }
 class ViteNodeRunner {
   constructor(options) {
@@ -111,6 +125,9 @@ class ViteNodeRunner {
   async executeId(id) {
     return await this.cachedRequest(id, []);
   }
+  getSourceMap(id) {
+    return this.moduleCache.getSourceMap(id);
+  }
   async cachedRequest(rawId, callstack) {
     const id = normalizeRequestId(rawId, this.options.base);
     const fsPath = toFilePath(id, this.root);
@@ -242,10 +259,13 @@ ${getStack()}`), 2e3);
     debugExecute(__filename);
     if (transformed[0] === "#")
       transformed = transformed.replace(/^\#\!.*/, (s) => " ".repeat(s.length));
-    const fn = vm.runInThisContext(`'use strict';async (${Object.keys(context).join(",")})=>{{${transformed}
-}}`, {
+    const codeDefinition = `'use strict';async (${Object.keys(context).join(",")})=>{{`;
+    const code = `${codeDefinition}${transformed}
+}}`;
+    const fn = vm.runInThisContext(code, {
       filename: fsPath,
-      lineOffset: 0
+      lineOffset: 0,
+      columnOffset: -codeDefinition.length
     });
     await fn(...Object.values(context));
     return exports;

package/dist/hmr.d.ts

@@ -1,6 +1,6 @@
 import { EventEmitter } from 'events';
 import { HMRPayload, Plugin } from 'vite';
-import { g as CustomEventMap, h as ViteNodeRunner, i as HMRPayload$1, H as HotContext } from './types-ab8db104.js';
+import { g as CustomEventMap, h as ViteNodeRunner, i as HMRPayload$1, H as HotContext } from './types-257c4f87.js';
 
 declare type EventType = string | symbol;
 declare type Handler<T = unknown> = (event: T) => void;

package/dist/index.d.ts

@@ -1 +1 @@
-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-ab8db104.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-257c4f87.js';

package/dist/server.cjs

@@ -211,6 +211,14 @@ class ViteNodeServer {
     const mode = importer && this.getTransformMode(importer) || "ssr";
     return this.server.pluginContainer.resolveId(id, importer, { ssr: mode === "ssr" });
   }
+  getSourceMap(source) {
+    var _a, _b;
+    const fetchResult = (_a = this.fetchCache.get(source)) == null ? void 0 : _a.result;
+    if (fetchResult == null ? void 0 : fetchResult.map)
+      return fetchResult.map;
+    const ssrTransformResult = (_b = this.server.moduleGraph.getModuleById(source)) == null ? void 0 : _b.ssrTransformResult;
+    return (ssrTransformResult == null ? void 0 : ssrTransformResult.map) || null;
+  }
   async fetchModule(id) {
     if (!this.fetchPromiseMap.has(id)) {
       this.fetchPromiseMap.set(

package/dist/server.d.ts

@@ -1,5 +1,5 @@
 import { TransformResult, ViteDevServer } from 'vite';
-import { f as DebuggerOptions, D as DepsHandlingOptions, e as ViteNodeServerOptions, F as FetchResult, d as ViteNodeResolveId } from './types-ab8db104.js';
+import { f as DebuggerOptions, D as DepsHandlingOptions, e as ViteNodeServerOptions, F as FetchResult, d as ViteNodeResolveId, R as RawSourceMap } from './types-257c4f87.js';
 
 declare class Debugger {
     options: DebuggerOptions;
@@ -33,6 +33,7 @@ declare class ViteNodeServer {
     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>;
     transformRequest(id: string): Promise<TransformResult | null | undefined>;
     getTransformMode(id: string): "web" | "ssr";

package/dist/server.mjs

@@ -203,6 +203,14 @@ class ViteNodeServer {
     const mode = importer && this.getTransformMode(importer) || "ssr";
     return this.server.pluginContainer.resolveId(id, importer, { ssr: mode === "ssr" });
   }
+  getSourceMap(source) {
+    var _a, _b;
+    const fetchResult = (_a = this.fetchCache.get(source)) == null ? void 0 : _a.result;
+    if (fetchResult == null ? void 0 : fetchResult.map)
+      return fetchResult.map;
+    const ssrTransformResult = (_b = this.server.moduleGraph.getModuleById(source)) == null ? void 0 : _b.ssrTransformResult;
+    return (ssrTransformResult == null ? void 0 : ssrTransformResult.map) || null;
+  }
   async fetchModule(id) {
     if (!this.fetchPromiseMap.has(id)) {
       this.fetchPromiseMap.set(

package/dist/source-map.cjs

@@ -0,0 +1,24 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var sourceMapSupport = require('source-map-support');
+
+function installSourcemapsSupport(options) {
+  sourceMapSupport.install({
+    environment: "node",
+    handleUncaughtExceptions: false,
+    retrieveSourceMap(source) {
+      const map = options.getSourceMap(source);
+      if (map) {
+        return {
+          url: source,
+          map
+        };
+      }
+      return null;
+    }
+  });
+}
+
+exports.installSourcemapsSupport = installSourcemapsSupport;

package/dist/source-map.d.ts

@@ -0,0 +1,8 @@
+import { R as RawSourceMap } from './types-257c4f87.js';
+
+interface InstallSourceMapSupportOptions {
+    getSourceMap: (source: string) => RawSourceMap | null | undefined;
+}
+declare function installSourcemapsSupport(options: InstallSourceMapSupportOptions): void;
+
+export { installSourcemapsSupport };

package/dist/source-map.mjs

@@ -0,0 +1,20 @@
+import { install } from 'source-map-support';
+
+function installSourcemapsSupport(options) {
+  install({
+    environment: "node",
+    handleUncaughtExceptions: false,
+    retrieveSourceMap(source) {
+      const map = options.getSourceMap(source);
+      if (map) {
+        return {
+          url: source,
+          map
+        };
+      }
+      return null;
+    }
+  });
+}
+
+export { installSourcemapsSupport };

package/dist/{types-ab8db104.d.ts → types-257c4f87.d.ts}

@@ -62,6 +62,7 @@ interface ErrorPayload {
 
 interface CustomEventMap {
   'vite:beforeUpdate': UpdatePayload
+  'vite:afterUpdate': UpdatePayload
   'vite:beforePrune': PrunePayload
   'vite:beforeFullReload': FullReloadPayload
   'vite:error': ErrorPayload
@@ -138,6 +139,10 @@ declare class ModuleCacheMap extends Map<string, ModuleCache> {
      * Invalidate dependency modules of the given modules, down to the bottom-level dependencies
      */
     invalidateSubDepTree(ids: string[] | Set<string>, invalidated?: Set<string>): Set<string>;
+    /**
+     * Return parsed source map based on inlined source map of the module
+     */
+    getSourceMap(id: string): any;
 }
 declare class ViteNodeRunner {
     options: ViteNodeRunnerOptions;
@@ -151,6 +156,7 @@ declare class ViteNodeRunner {
     constructor(options: ViteNodeRunnerOptions);
     executeFile(file: string): Promise<any>;
     executeId(id: string): Promise<any>;
+    getSourceMap(id: string): any;
     /** @internal */
     cachedRequest(rawId: string, callstack: string[]): Promise<any>;
     /** @internal */
@@ -204,6 +210,7 @@ interface ModuleCache {
     promise?: Promise<any>;
     exports?: any;
     code?: string;
+    map?: RawSourceMap;
     /**
      * Module ids that imports this module
      */

package/dist/types.d.ts

@@ -1 +1 @@
-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-ab8db104.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-257c4f87.js';

package/dist/utils.d.ts

@@ -1,5 +1,5 @@
 import { TransformResult } from 'vite';
-import { N as Nullable, A as Arrayable } from './types-ab8db104.js';
+import { N as Nullable, A as Arrayable } from './types-257c4f87.js';
 
 declare const isWindows: boolean;
 declare function slash(str: string): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-node",
-  "version": "0.24.5",
+  "version": "0.25.0",
   "description": "Vite as Node.js runtime",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -39,6 +39,11 @@
       "types": "./dist/hmr.d.ts",
       "require": "./dist/hmr.cjs",
       "import": "./dist/hmr.mjs"
+    },
+    "./source-map": {
+      "types": "./dist/source-map.d.ts",
+      "require": "./dist/source-map.cjs",
+      "import": "./dist/source-map.mjs"
     }
   },
   "main": "./dist/index.mjs",
@@ -67,10 +72,14 @@
     "debug": "^4.3.4",
     "mlly": "^0.5.16",
     "pathe": "^0.2.0",
+    "source-map": "^0.6.1",
+    "source-map-support": "^0.5.21",
     "vite": "^3.0.0"
   },
   "devDependencies": {
     "@types/debug": "^4.1.7",
+    "@types/source-map": "^0.5.7",
+    "@types/source-map-support": "^0.5.6",
     "cac": "^6.7.14",
     "picocolors": "^1.0.0",
     "rollup": "^2.79.1"