vite-node 0.2.5 → 0.3.0

package/client.d.ts

@@ -1,9 +1,20 @@
+interface StartOfSourceMap {
+    file?: string;
+    sourceRoot?: string;
+}
+interface RawSourceMap extends StartOfSourceMap {
+    version: string;
+    sources: string[];
+    names: string[];
+    sourcesContent?: string[];
+    mappings: string;
+}
 interface FetchResult {
     code?: string;
     externalize?: string;
+    map?: RawSourceMap;
 }
 declare type FetchFunction = (id: string) => Promise<FetchResult>;
-declare type ResolveIdFunction = (id: string, importer?: string) => Promise<ViteNodeResolveId | null>;
 interface ModuleCache {
     promise?: Promise<any>;
     exports?: any;
@@ -11,20 +22,12 @@ interface ModuleCache {
 }
 interface ViteNodeRunnerOptions {
     fetchModule: FetchFunction;
-    resolveId: ResolveIdFunction;
     root: string;
     base?: string;
     moduleCache?: Map<string, ModuleCache>;
     interopDefault?: boolean;
     requestStubs?: Record<string, any>;
 }
-interface ViteNodeResolveId {
-    external?: boolean | 'absolute' | 'relative';
-    id: string;
-    meta?: Record<string, any> | null;
-    moduleSideEffects?: boolean | 'no-treeshake' | null;
-    syntheticNamedExports?: boolean | string | null;
-}
 
 declare const DEFAULT_REQUEST_STUBS: {
     '/@vite/client': {

package/dist/cli.cjs

@@ -68,15 +68,13 @@ async function withInlineSourcemap(result) {
 const ESM_EXT_RE = /\.(es|esm|esm-browser|esm-bundler|es6|module)\.js$/;
 const ESM_FOLDER_RE = /\/esm\/(.*\.js)$/;
 const defaultInline = [
-  /\/vitest\/dist\//,
-  /vitest-virtual-\w+\/dist/,
   /virtual:/,
   /\.ts$/,
   ESM_EXT_RE,
   ESM_FOLDER_RE
 ];
 const depsExternal = [
-  /\.cjs.js$/,
+  /\.cjs\.js$/,
   /\.mjs$/
 ];
 function guessCJSversion(id) {
@@ -148,6 +146,25 @@ function patchWindowsImportPath(path) {
     return path;
 }
 
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 class ViteNodeServer {
   constructor(server, options = {}) {
     this.server = server;
@@ -164,7 +181,9 @@ class ViteNodeServer {
   }
   async fetchModule(id) {
     if (!this.fetchPromiseMap.has(id)) {
-      this.fetchPromiseMap.set(id, this._fetchModule(id).finally(() => {
+      this.fetchPromiseMap.set(id, this._fetchModule(id).then((r) => {
+        return this.options.sourcemap !== true ? __spreadProps(__spreadValues({}, r), { map: void 0 }) : r;
+      }).finally(() => {
         this.fetchPromiseMap.delete(id);
       }));
     }
@@ -190,25 +209,24 @@ class ViteNodeServer {
     return "web";
   }
   async _fetchModule(id) {
-    var _a;
     let result;
-    const timestamp = (_a = this.server.moduleGraph.getModuleById(id)) == null ? void 0 : _a.lastHMRTimestamp;
-    const cache = this.fetchCache.get(id);
+    const filePath = toFilePath(id, this.server.config.root);
+    const module = this.server.moduleGraph.getModuleById(id);
+    const timestamp = (module == null ? void 0 : module.lastHMRTimestamp) || Date.now();
+    const cache = this.fetchCache.get(filePath);
     if (timestamp && cache && cache.timestamp >= timestamp)
       return cache.result;
-    const externalize = await this.shouldExternalize(toFilePath(id, this.server.config.root));
+    const externalize = await this.shouldExternalize(filePath);
     if (externalize) {
       result = { externalize };
     } else {
       const r = await this._transformRequest(id);
-      result = { code: r == null ? void 0 : r.code };
-    }
-    if (timestamp) {
-      this.fetchCache.set(id, {
-        timestamp,
-        result
-      });
+      result = { code: r == null ? void 0 : r.code, map: r == null ? void 0 : r.map };
     }
+    this.fetchCache.set(filePath, {
+      timestamp,
+      result
+    });
     return result;
   }
   async _transformRequest(id) {
@@ -220,7 +238,8 @@ class ViteNodeServer {
     } else {
       result = await this.server.transformRequest(id, { ssr: true });
     }
-    if (this.options.sourcemap !== false && result && !id.includes("node_modules"))
+    const sourcemap = this.options.sourcemap ?? "inline";
+    if (sourcemap === "inline" && result && !id.includes("node_modules"))
       withInlineSourcemap(result);
     return result;
   }
@@ -437,9 +456,6 @@ async function run(options = {}) {
     base: server.config.base,
     fetchModule(id) {
       return node.fetchModule(id);
-    },
-    resolveId(id, importer) {
-      return node.resolveId(id, importer);
     }
   });
   for (const file of files)

package/dist/cli.js

@@ -43,15 +43,13 @@ async function withInlineSourcemap(result) {
 const ESM_EXT_RE = /\.(es|esm|esm-browser|esm-bundler|es6|module)\.js$/;
 const ESM_FOLDER_RE = /\/esm\/(.*\.js)$/;
 const defaultInline = [
-  /\/vitest\/dist\//,
-  /vitest-virtual-\w+\/dist/,
   /virtual:/,
   /\.ts$/,
   ESM_EXT_RE,
   ESM_FOLDER_RE
 ];
 const depsExternal = [
-  /\.cjs.js$/,
+  /\.cjs\.js$/,
   /\.mjs$/
 ];
 function guessCJSversion(id) {
@@ -123,6 +121,25 @@ function patchWindowsImportPath(path) {
     return path;
 }
 
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 class ViteNodeServer {
   constructor(server, options = {}) {
     this.server = server;
@@ -139,7 +156,9 @@ class ViteNodeServer {
   }
   async fetchModule(id) {
     if (!this.fetchPromiseMap.has(id)) {
-      this.fetchPromiseMap.set(id, this._fetchModule(id).finally(() => {
+      this.fetchPromiseMap.set(id, this._fetchModule(id).then((r) => {
+        return this.options.sourcemap !== true ? __spreadProps(__spreadValues({}, r), { map: void 0 }) : r;
+      }).finally(() => {
         this.fetchPromiseMap.delete(id);
       }));
     }
@@ -165,25 +184,24 @@ class ViteNodeServer {
     return "web";
   }
   async _fetchModule(id) {
-    var _a;
     let result;
-    const timestamp = (_a = this.server.moduleGraph.getModuleById(id)) == null ? void 0 : _a.lastHMRTimestamp;
-    const cache = this.fetchCache.get(id);
+    const filePath = toFilePath(id, this.server.config.root);
+    const module = this.server.moduleGraph.getModuleById(id);
+    const timestamp = (module == null ? void 0 : module.lastHMRTimestamp) || Date.now();
+    const cache = this.fetchCache.get(filePath);
     if (timestamp && cache && cache.timestamp >= timestamp)
       return cache.result;
-    const externalize = await this.shouldExternalize(toFilePath(id, this.server.config.root));
+    const externalize = await this.shouldExternalize(filePath);
     if (externalize) {
       result = { externalize };
     } else {
       const r = await this._transformRequest(id);
-      result = { code: r == null ? void 0 : r.code };
-    }
-    if (timestamp) {
-      this.fetchCache.set(id, {
-        timestamp,
-        result
-      });
+      result = { code: r == null ? void 0 : r.code, map: r == null ? void 0 : r.map };
     }
+    this.fetchCache.set(filePath, {
+      timestamp,
+      result
+    });
     return result;
   }
   async _transformRequest(id) {
@@ -195,7 +213,8 @@ class ViteNodeServer {
     } else {
       result = await this.server.transformRequest(id, { ssr: true });
     }
-    if (this.options.sourcemap !== false && result && !id.includes("node_modules"))
+    const sourcemap = this.options.sourcemap ?? "inline";
+    if (sourcemap === "inline" && result && !id.includes("node_modules"))
       withInlineSourcemap(result);
     return result;
   }
@@ -412,9 +431,6 @@ async function run(options = {}) {
     base: server.config.base,
     fetchModule(id) {
       return node.fetchModule(id);
-    },
-    resolveId(id, importer) {
-      return node.resolveId(id, importer);
     }
   });
   for (const file of files)

package/dist/server.cjs

@@ -34,15 +34,13 @@ async function withInlineSourcemap(result) {
 const ESM_EXT_RE = /\.(es|esm|esm-browser|esm-bundler|es6|module)\.js$/;
 const ESM_FOLDER_RE = /\/esm\/(.*\.js)$/;
 const defaultInline = [
-  /\/vitest\/dist\//,
-  /vitest-virtual-\w+\/dist/,
   /virtual:/,
   /\.ts$/,
   ESM_EXT_RE,
   ESM_FOLDER_RE
 ];
 const depsExternal = [
-  /\.cjs.js$/,
+  /\.cjs\.js$/,
   /\.mjs$/
 ];
 function guessCJSversion(id) {
@@ -114,6 +112,25 @@ function patchWindowsImportPath(path) {
     return path;
 }
 
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 class ViteNodeServer {
   constructor(server, options = {}) {
     this.server = server;
@@ -130,7 +147,9 @@ class ViteNodeServer {
   }
   async fetchModule(id) {
     if (!this.fetchPromiseMap.has(id)) {
-      this.fetchPromiseMap.set(id, this._fetchModule(id).finally(() => {
+      this.fetchPromiseMap.set(id, this._fetchModule(id).then((r) => {
+        return this.options.sourcemap !== true ? __spreadProps(__spreadValues({}, r), { map: void 0 }) : r;
+      }).finally(() => {
         this.fetchPromiseMap.delete(id);
       }));
     }
@@ -156,25 +175,24 @@ class ViteNodeServer {
     return "web";
   }
   async _fetchModule(id) {
-    var _a;
     let result;
-    const timestamp = (_a = this.server.moduleGraph.getModuleById(id)) == null ? void 0 : _a.lastHMRTimestamp;
-    const cache = this.fetchCache.get(id);
+    const filePath = toFilePath(id, this.server.config.root);
+    const module = this.server.moduleGraph.getModuleById(id);
+    const timestamp = (module == null ? void 0 : module.lastHMRTimestamp) || Date.now();
+    const cache = this.fetchCache.get(filePath);
     if (timestamp && cache && cache.timestamp >= timestamp)
       return cache.result;
-    const externalize = await this.shouldExternalize(toFilePath(id, this.server.config.root));
+    const externalize = await this.shouldExternalize(filePath);
     if (externalize) {
       result = { externalize };
     } else {
       const r = await this._transformRequest(id);
-      result = { code: r == null ? void 0 : r.code };
-    }
-    if (timestamp) {
-      this.fetchCache.set(id, {
-        timestamp,
-        result
-      });
+      result = { code: r == null ? void 0 : r.code, map: r == null ? void 0 : r.map };
     }
+    this.fetchCache.set(filePath, {
+      timestamp,
+      result
+    });
     return result;
   }
   async _transformRequest(id) {
@@ -186,7 +204,8 @@ class ViteNodeServer {
     } else {
       result = await this.server.transformRequest(id, { ssr: true });
     }
-    if (this.options.sourcemap !== false && result && !id.includes("node_modules"))
+    const sourcemap = this.options.sourcemap ?? "inline";
+    if (sourcemap === "inline" && result && !id.includes("node_modules"))
       withInlineSourcemap(result);
     return result;
   }

package/dist/server.js

@@ -30,15 +30,13 @@ async function withInlineSourcemap(result) {
 const ESM_EXT_RE = /\.(es|esm|esm-browser|esm-bundler|es6|module)\.js$/;
 const ESM_FOLDER_RE = /\/esm\/(.*\.js)$/;
 const defaultInline = [
-  /\/vitest\/dist\//,
-  /vitest-virtual-\w+\/dist/,
   /virtual:/,
   /\.ts$/,
   ESM_EXT_RE,
   ESM_FOLDER_RE
 ];
 const depsExternal = [
-  /\.cjs.js$/,
+  /\.cjs\.js$/,
   /\.mjs$/
 ];
 function guessCJSversion(id) {
@@ -110,6 +108,25 @@ function patchWindowsImportPath(path) {
     return path;
 }
 
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 class ViteNodeServer {
   constructor(server, options = {}) {
     this.server = server;
@@ -126,7 +143,9 @@ class ViteNodeServer {
   }
   async fetchModule(id) {
     if (!this.fetchPromiseMap.has(id)) {
-      this.fetchPromiseMap.set(id, this._fetchModule(id).finally(() => {
+      this.fetchPromiseMap.set(id, this._fetchModule(id).then((r) => {
+        return this.options.sourcemap !== true ? __spreadProps(__spreadValues({}, r), { map: void 0 }) : r;
+      }).finally(() => {
         this.fetchPromiseMap.delete(id);
       }));
     }
@@ -152,25 +171,24 @@ class ViteNodeServer {
     return "web";
   }
   async _fetchModule(id) {
-    var _a;
     let result;
-    const timestamp = (_a = this.server.moduleGraph.getModuleById(id)) == null ? void 0 : _a.lastHMRTimestamp;
-    const cache = this.fetchCache.get(id);
+    const filePath = toFilePath(id, this.server.config.root);
+    const module = this.server.moduleGraph.getModuleById(id);
+    const timestamp = (module == null ? void 0 : module.lastHMRTimestamp) || Date.now();
+    const cache = this.fetchCache.get(filePath);
     if (timestamp && cache && cache.timestamp >= timestamp)
       return cache.result;
-    const externalize = await this.shouldExternalize(toFilePath(id, this.server.config.root));
+    const externalize = await this.shouldExternalize(filePath);
     if (externalize) {
       result = { externalize };
     } else {
       const r = await this._transformRequest(id);
-      result = { code: r == null ? void 0 : r.code };
-    }
-    if (timestamp) {
-      this.fetchCache.set(id, {
-        timestamp,
-        result
-      });
+      result = { code: r == null ? void 0 : r.code, map: r == null ? void 0 : r.map };
     }
+    this.fetchCache.set(filePath, {
+      timestamp,
+      result
+    });
     return result;
   }
   async _transformRequest(id) {
@@ -182,7 +200,8 @@ class ViteNodeServer {
     } else {
       result = await this.server.transformRequest(id, { ssr: true });
     }
-    if (this.options.sourcemap !== false && result && !id.includes("node_modules"))
+    const sourcemap = this.options.sourcemap ?? "inline";
+    if (sourcemap === "inline" && result && !id.includes("node_modules"))
       withInlineSourcemap(result);
     return result;
   }

package/index.d.ts

@@ -7,12 +7,23 @@ interface DepsHandlingOptions {
      */
     fallbackCJS?: boolean;
 }
+interface StartOfSourceMap {
+    file?: string;
+    sourceRoot?: string;
+}
+interface RawSourceMap extends StartOfSourceMap {
+    version: string;
+    sources: string[];
+    names: string[];
+    sourcesContent?: string[];
+    mappings: string;
+}
 interface FetchResult {
     code?: string;
     externalize?: string;
+    map?: RawSourceMap;
 }
 declare type FetchFunction = (id: string) => Promise<FetchResult>;
-declare type ResolveIdFunction = (id: string, importer?: string) => Promise<ViteNodeResolveId | null>;
 interface ModuleCache {
     promise?: Promise<any>;
     exports?: any;
@@ -20,7 +31,6 @@ interface ModuleCache {
 }
 interface ViteNodeRunnerOptions {
     fetchModule: FetchFunction;
-    resolveId: ResolveIdFunction;
     root: string;
     base?: string;
     moduleCache?: Map<string, ModuleCache>;
@@ -37,9 +47,9 @@ interface ViteNodeResolveId {
 interface ViteNodeServerOptions {
     /**
      * Inject inline sourcemap to modules
-     * @default true
+     * @default 'inline'
      */
-    sourcemap?: boolean;
+    sourcemap?: 'inline' | boolean;
     /**
      * Deps handling
      */
@@ -53,4 +63,4 @@ interface ViteNodeServerOptions {
     };
 }
 
-export { DepsHandlingOptions, FetchFunction, FetchResult, ModuleCache, ResolveIdFunction, ViteNodeResolveId, ViteNodeRunnerOptions, ViteNodeServerOptions };
+export { DepsHandlingOptions, FetchFunction, FetchResult, ModuleCache, RawSourceMap, StartOfSourceMap, ViteNodeResolveId, ViteNodeRunnerOptions, ViteNodeServerOptions };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-node",
-  "version": "0.2.5",
+  "version": "0.3.0",
   "description": "Vite as Node.js runtime",
   "homepage": "https://github.com/vitest-dev/vitest#readme",
   "bugs": {
@@ -51,13 +51,13 @@
   "dependencies": {
     "kolorist": "^1.5.1",
     "minimist": "^1.2.5",
-    "mlly": "^0.4.1",
+    "mlly": "^0.4.2",
     "pathe": "^0.2.0",
     "vite": "^2.7.13"
   },
   "devDependencies": {
     "@types/minimist": "^1.2.2",
-    "rollup": "^2.66.1"
+    "rollup": "^2.67.1"
   },
   "engines": {
     "node": ">=14.14.0"

package/server.d.ts

@@ -1,10 +1,5 @@
 import { ViteDevServer, TransformResult } from 'vite';
 
-interface FetchResult {
-    code?: string;
-    externalize?: string;
-}
-
 interface DepsHandlingOptions {
     external?: (string | RegExp)[];
     inline?: (string | RegExp)[];
@@ -14,6 +9,22 @@ interface DepsHandlingOptions {
      */
     fallbackCJS?: boolean;
 }
+interface StartOfSourceMap {
+    file?: string;
+    sourceRoot?: string;
+}
+interface RawSourceMap extends StartOfSourceMap {
+    version: string;
+    sources: string[];
+    names: string[];
+    sourcesContent?: string[];
+    mappings: string;
+}
+interface FetchResult {
+    code?: string;
+    externalize?: string;
+    map?: RawSourceMap;
+}
 interface ViteNodeResolveId {
     external?: boolean | 'absolute' | 'relative';
     id: string;
@@ -24,9 +35,9 @@ interface ViteNodeResolveId {
 interface ViteNodeServerOptions {
     /**
      * Inject inline sourcemap to modules
-     * @default true
+     * @default 'inline'
      */
-    sourcemap?: boolean;
+    sourcemap?: 'inline' | boolean;
     /**
      * Deps handling
      */
@@ -48,7 +59,10 @@ declare class ViteNodeServer {
     options: ViteNodeServerOptions;
     private fetchPromiseMap;
     private transformPromiseMap;
-    private fetchCache;
+    fetchCache: Map<string, {
+        timestamp: number;
+        result: FetchResult;
+    }>;
     constructor(server: ViteDevServer, options?: ViteNodeServerOptions);
     shouldExternalize(id: string): Promise<string | false>;
     resolveId(id: string, importer?: string): Promise<ViteNodeResolveId | null>;