vite-node 0.25.4 → 0.25.6

package/dist/cli.cjs

@@ -632,7 +632,7 @@ class CAC extends events.EventEmitter {
 
 const cac = (name = "") => new CAC(name);
 
-var version = "0.25.4";
+var version = "0.25.6";
 
 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();

package/dist/cli.mjs

@@ -630,7 +630,7 @@ class CAC extends EventEmitter {
 
 const cac = (name = "") => new CAC(name);
 
-var version = "0.25.4";
+var version = "0.25.6";
 
 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();

package/dist/client.cjs

@@ -176,10 +176,10 @@ class ViteNodeRunner {
   }
   async directRequest(id, fsPath, _callstack) {
     const callstack = [..._callstack, fsPath];
-    const mod = this.moduleCache.get(fsPath);
-    const request = async (dep) => {
+    let mod = this.moduleCache.get(fsPath);
+    const request = async (dep2) => {
       var _a;
-      const depFsPath = utils.toFilePath(utils.normalizeRequestId(dep, this.options.base), this.root);
+      const depFsPath = utils.toFilePath(utils.normalizeRequestId(dep2, this.options.base), this.root);
       const getStack = () => {
         return `stack:
 ${[...callstack, depFsPath].reverse().map((p) => `- ${p}`).join("\n")}`;
@@ -195,28 +195,42 @@ ${getStack()}`), 2e3);
             return depExports;
           throw new Error(`[vite-node] Failed to resolve circular dependency, ${getStack()}`);
         }
-        return await this.cachedRequest(dep, callstack);
+        return await this.cachedRequest(dep2, callstack);
       } finally {
         if (debugTimer)
           clearTimeout(debugTimer);
       }
     };
     Object.defineProperty(request, "callstack", { get: () => callstack });
-    const resolveId = async (dep, callstackPosition = 1) => {
-      if (this.options.resolveId && this.shouldResolveId(dep)) {
+    const resolveId = async (dep2, callstackPosition = 1) => {
+      if (this.options.resolveId && this.shouldResolveId(dep2)) {
         let importer = callstack[callstack.length - callstackPosition];
+        if (importer && !dep2.startsWith("."))
+          importer = void 0;
         if (importer && importer.startsWith("mock:"))
           importer = importer.slice(5);
-        const { id: id2 } = await this.options.resolveId(dep, importer) || {};
-        dep = id2 && pathe.isAbsolute(id2) ? utils.mergeSlashes(`/@fs/${id2}`) : id2 || dep;
+        const resolved = await this.options.resolveId(utils.normalizeRequestId(dep2), importer);
+        return [dep2, resolved == null ? void 0 : resolved.id];
       }
-      return dep;
+      return [dep2, void 0];
     };
-    id = await resolveId(id, 2);
+    const [dep, resolvedId] = await resolveId(id, 2);
     const requestStubs = this.options.requestStubs || DEFAULT_REQUEST_STUBS;
     if (id in requestStubs)
       return requestStubs[id];
-    let { code: transformed, externalize } = await this.options.fetchModule(id);
+    let { code: transformed, externalize } = await this.options.fetchModule(resolvedId || dep);
+    if (resolvedId && !fsPath.includes("?") && fsPath !== resolvedId) {
+      if (this.moduleCache.has(resolvedId)) {
+        mod = this.moduleCache.get(resolvedId);
+        this.moduleCache.set(fsPath, mod);
+        if (mod.promise)
+          return mod.promise;
+        if (mod.exports)
+          return mod.exports;
+      } else {
+        this.moduleCache.set(resolvedId, mod);
+      }
+    }
     if (externalize) {
       debugNative(externalize);
       const exports2 = await this.interopedImport(externalize);
@@ -225,7 +239,8 @@ ${getStack()}`), 2e3);
     }
     if (transformed == null)
       throw new Error(`[vite-node] Failed to load ${id}`);
-    const url$1 = url.pathToFileURL(fsPath).href;
+    const file = utils.cleanUrl(resolvedId || fsPath);
+    const url$1 = url.pathToFileURL(file).href;
     const meta = { url: url$1 };
     const exports = /* @__PURE__ */ Object.create(null);
     Object.defineProperty(exports, Symbol.toStringTag, {
@@ -234,9 +249,6 @@ ${getStack()}`), 2e3);
       configurable: false
     });
     const cjsExports = new Proxy(exports, {
-      get(_, p, receiver) {
-        return Reflect.get(exports, p, receiver);
-      },
       set(_, p, value) {
         if (!Reflect.has(exports, "default"))
           exports.default = {};
@@ -250,7 +262,7 @@ ${getStack()}`), 2e3);
         return true;
       }
     });
-    Object.assign(mod, { code: transformed, exports, evaluated: false });
+    Object.assign(mod, { code: transformed, exports });
     const __filename = url.fileURLToPath(url$1);
     const moduleProxy = {
       set exports(value) {
@@ -292,7 +304,7 @@ ${getStack()}`), 2e3);
     const code = `${codeDefinition}${transformed}
 }}`;
     const fn = vm__default["default"].runInThisContext(code, {
-      filename: fsPath,
+      filename: __filename,
       lineOffset: 0,
       columnOffset: -codeDefinition.length
     });

package/dist/client.mjs

@@ -4,7 +4,7 @@ import vm from 'vm';
 import { resolve, dirname, isAbsolute, extname } from 'pathe';
 import { isNodeBuiltin } from 'mlly';
 import createDebug from 'debug';
-import { normalizeModuleId, slash, normalizeRequestId, toFilePath, isPrimitive, mergeSlashes } from './utils.mjs';
+import { normalizeModuleId, slash, normalizeRequestId, toFilePath, cleanUrl, isPrimitive } from './utils.mjs';
 import { extractSourceMap } from './source-map.mjs';
 import 'fs';
 import 'source-map-support';
@@ -149,10 +149,10 @@ class ViteNodeRunner {
   }
   async directRequest(id, fsPath, _callstack) {
     const callstack = [..._callstack, fsPath];
-    const mod = this.moduleCache.get(fsPath);
-    const request = async (dep) => {
+    let mod = this.moduleCache.get(fsPath);
+    const request = async (dep2) => {
       var _a;
-      const depFsPath = toFilePath(normalizeRequestId(dep, this.options.base), this.root);
+      const depFsPath = toFilePath(normalizeRequestId(dep2, this.options.base), this.root);
       const getStack = () => {
         return `stack:
 ${[...callstack, depFsPath].reverse().map((p) => `- ${p}`).join("\n")}`;
@@ -168,28 +168,42 @@ ${getStack()}`), 2e3);
             return depExports;
           throw new Error(`[vite-node] Failed to resolve circular dependency, ${getStack()}`);
         }
-        return await this.cachedRequest(dep, callstack);
+        return await this.cachedRequest(dep2, callstack);
       } finally {
         if (debugTimer)
           clearTimeout(debugTimer);
       }
     };
     Object.defineProperty(request, "callstack", { get: () => callstack });
-    const resolveId = async (dep, callstackPosition = 1) => {
-      if (this.options.resolveId && this.shouldResolveId(dep)) {
+    const resolveId = async (dep2, callstackPosition = 1) => {
+      if (this.options.resolveId && this.shouldResolveId(dep2)) {
         let importer = callstack[callstack.length - callstackPosition];
+        if (importer && !dep2.startsWith("."))
+          importer = void 0;
         if (importer && importer.startsWith("mock:"))
           importer = importer.slice(5);
-        const { id: id2 } = await this.options.resolveId(dep, importer) || {};
-        dep = id2 && isAbsolute(id2) ? mergeSlashes(`/@fs/${id2}`) : id2 || dep;
+        const resolved = await this.options.resolveId(normalizeRequestId(dep2), importer);
+        return [dep2, resolved == null ? void 0 : resolved.id];
       }
-      return dep;
+      return [dep2, void 0];
     };
-    id = await resolveId(id, 2);
+    const [dep, resolvedId] = await resolveId(id, 2);
     const requestStubs = this.options.requestStubs || DEFAULT_REQUEST_STUBS;
     if (id in requestStubs)
       return requestStubs[id];
-    let { code: transformed, externalize } = await this.options.fetchModule(id);
+    let { code: transformed, externalize } = await this.options.fetchModule(resolvedId || dep);
+    if (resolvedId && !fsPath.includes("?") && fsPath !== resolvedId) {
+      if (this.moduleCache.has(resolvedId)) {
+        mod = this.moduleCache.get(resolvedId);
+        this.moduleCache.set(fsPath, mod);
+        if (mod.promise)
+          return mod.promise;
+        if (mod.exports)
+          return mod.exports;
+      } else {
+        this.moduleCache.set(resolvedId, mod);
+      }
+    }
     if (externalize) {
       debugNative(externalize);
       const exports2 = await this.interopedImport(externalize);
@@ -198,7 +212,8 @@ ${getStack()}`), 2e3);
     }
     if (transformed == null)
       throw new Error(`[vite-node] Failed to load ${id}`);
-    const url = pathToFileURL(fsPath).href;
+    const file = cleanUrl(resolvedId || fsPath);
+    const url = pathToFileURL(file).href;
     const meta = { url };
     const exports = /* @__PURE__ */ Object.create(null);
     Object.defineProperty(exports, Symbol.toStringTag, {
@@ -207,9 +222,6 @@ ${getStack()}`), 2e3);
       configurable: false
     });
     const cjsExports = new Proxy(exports, {
-      get(_, p, receiver) {
-        return Reflect.get(exports, p, receiver);
-      },
       set(_, p, value) {
         if (!Reflect.has(exports, "default"))
           exports.default = {};
@@ -223,7 +235,7 @@ ${getStack()}`), 2e3);
         return true;
       }
     });
-    Object.assign(mod, { code: transformed, exports, evaluated: false });
+    Object.assign(mod, { code: transformed, exports });
     const __filename = fileURLToPath(url);
     const moduleProxy = {
       set exports(value) {
@@ -265,7 +277,7 @@ ${getStack()}`), 2e3);
     const code = `${codeDefinition}${transformed}
 }}`;
     const fn = vm.runInThisContext(code, {
-      filename: fsPath,
+      filename: __filename,
       lineOffset: 0,
       columnOffset: -codeDefinition.length
     });

package/dist/server.cjs

@@ -175,7 +175,6 @@ ${result.code}`, "utf-8");
 }
 
 const debugRequest = createDebug__default["default"]("vite-node:server:request");
-const RealDate = Date;
 class ViteNodeServer {
   constructor(server, options = {}) {
     this.server = server;
@@ -222,6 +221,7 @@ class ViteNodeServer {
     return (ssrTransformResult == null ? void 0 : ssrTransformResult.map) || null;
   }
   async fetchModule(id) {
+    id = utils.normalizeModuleId(id);
     if (!this.fetchPromiseMap.has(id)) {
       this.fetchPromiseMap.set(
         id,
@@ -261,10 +261,11 @@ class ViteNodeServer {
     let result;
     const filePath = utils.toFilePath(id, this.server.config.root);
     const module = this.server.moduleGraph.getModuleById(id);
-    const timestamp = (module == null ? void 0 : module.lastHMRTimestamp) || RealDate.now();
+    const timestamp = module ? module.lastHMRTimestamp : null;
     const cache = this.fetchCache.get(filePath);
-    if (timestamp && cache && cache.timestamp >= timestamp)
+    if (timestamp !== null && cache && cache.timestamp >= timestamp)
       return cache.result;
+    const time = Date.now();
     const externalize = await this.shouldExternalize(filePath);
     let duration;
     if (externalize) {
@@ -278,7 +279,7 @@ class ViteNodeServer {
     }
     this.fetchCache.set(filePath, {
       duration,
-      timestamp,
+      timestamp: time,
       result
     });
     return result;

package/dist/server.mjs

@@ -3,7 +3,7 @@ import { resolve, join } from 'pathe';
 import createDebug from 'debug';
 import { existsSync, promises } from 'fs';
 import { isNodeBuiltin, isValidNodeImport } from 'mlly';
-import { slash, toArray, toFilePath } from './utils.mjs';
+import { slash, toArray, normalizeModuleId, toFilePath } from './utils.mjs';
 import { p as picocolors } from './chunk-picocolors.mjs';
 import { withInlineSourcemap } from './source-map.mjs';
 import 'url';
@@ -167,7 +167,6 @@ ${result.code}`, "utf-8");
 }
 
 const debugRequest = createDebug("vite-node:server:request");
-const RealDate = Date;
 class ViteNodeServer {
   constructor(server, options = {}) {
     this.server = server;
@@ -214,6 +213,7 @@ class ViteNodeServer {
     return (ssrTransformResult == null ? void 0 : ssrTransformResult.map) || null;
   }
   async fetchModule(id) {
+    id = normalizeModuleId(id);
     if (!this.fetchPromiseMap.has(id)) {
       this.fetchPromiseMap.set(
         id,
@@ -253,10 +253,11 @@ class ViteNodeServer {
     let result;
     const filePath = toFilePath(id, this.server.config.root);
     const module = this.server.moduleGraph.getModuleById(id);
-    const timestamp = (module == null ? void 0 : module.lastHMRTimestamp) || RealDate.now();
+    const timestamp = module ? module.lastHMRTimestamp : null;
     const cache = this.fetchCache.get(filePath);
-    if (timestamp && cache && cache.timestamp >= timestamp)
+    if (timestamp !== null && cache && cache.timestamp >= timestamp)
       return cache.result;
+    const time = Date.now();
     const externalize = await this.shouldExternalize(filePath);
     let duration;
     if (externalize) {
@@ -270,7 +271,7 @@ class ViteNodeServer {
     }
     this.fetchCache.set(filePath, {
       duration,
-      timestamp,
+      timestamp: time,
       result
     });
     return result;

package/dist/source-map.cjs

@@ -6,18 +6,22 @@ var sourceMapSupport = require('source-map-support');
 
 let SOURCEMAPPING_URL = "sourceMa";
 SOURCEMAPPING_URL += "ppingURL";
-const VITE_NODE_SOURCEMAPPING_URL = `${SOURCEMAPPING_URL}=data:application/json;charset=utf-8;source=vite-node`;
+const VITE_NODE_SOURCEMAPPING_SOURCE = "//# sourceMappingSource=vite-node";
+const VITE_NODE_SOURCEMAPPING_URL = `${SOURCEMAPPING_URL}=data:application/json;charset=utf-8`;
 const VITE_NODE_SOURCEMAPPING_REGEXP = new RegExp(`//# ${VITE_NODE_SOURCEMAPPING_URL};base64,(.+)`);
-const OTHER_SOURCE_MAP_REGEXP = new RegExp(`//# ${SOURCEMAPPING_URL}=data:application/json[^,]+base64,(.+)`);
 async function withInlineSourcemap(result) {
-  const { code, map } = result;
-  if (!map || code.includes(VITE_NODE_SOURCEMAPPING_URL))
+  const map = result.map;
+  let code = result.code;
+  if (!map || code.includes(VITE_NODE_SOURCEMAPPING_SOURCE))
     return result;
-  if (OTHER_SOURCE_MAP_REGEXP.test(code))
-    result.code = code.replace(OTHER_SOURCE_MAP_REGEXP, "");
-  result.code = `${code}
+  const OTHER_SOURCE_MAP_REGEXP = new RegExp(`//# ${SOURCEMAPPING_URL}=data:application/json[^,]+base64,(.+)`, "g");
+  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");
+  result.code = `${code.trimEnd()}
 
-//# ${VITE_NODE_SOURCEMAPPING_URL};base64,${Buffer.from(JSON.stringify(map), "utf-8").toString("base64")}
+${VITE_NODE_SOURCEMAPPING_SOURCE}
+//# ${VITE_NODE_SOURCEMAPPING_URL};base64,${sourceMap}
 `;
   return result;
 }

package/dist/source-map.mjs

@@ -2,18 +2,22 @@ import { install } from 'source-map-support';
 
 let SOURCEMAPPING_URL = "sourceMa";
 SOURCEMAPPING_URL += "ppingURL";
-const VITE_NODE_SOURCEMAPPING_URL = `${SOURCEMAPPING_URL}=data:application/json;charset=utf-8;source=vite-node`;
+const VITE_NODE_SOURCEMAPPING_SOURCE = "//# sourceMappingSource=vite-node";
+const VITE_NODE_SOURCEMAPPING_URL = `${SOURCEMAPPING_URL}=data:application/json;charset=utf-8`;
 const VITE_NODE_SOURCEMAPPING_REGEXP = new RegExp(`//# ${VITE_NODE_SOURCEMAPPING_URL};base64,(.+)`);
-const OTHER_SOURCE_MAP_REGEXP = new RegExp(`//# ${SOURCEMAPPING_URL}=data:application/json[^,]+base64,(.+)`);
 async function withInlineSourcemap(result) {
-  const { code, map } = result;
-  if (!map || code.includes(VITE_NODE_SOURCEMAPPING_URL))
+  const map = result.map;
+  let code = result.code;
+  if (!map || code.includes(VITE_NODE_SOURCEMAPPING_SOURCE))
     return result;
-  if (OTHER_SOURCE_MAP_REGEXP.test(code))
-    result.code = code.replace(OTHER_SOURCE_MAP_REGEXP, "");
-  result.code = `${code}
+  const OTHER_SOURCE_MAP_REGEXP = new RegExp(`//# ${SOURCEMAPPING_URL}=data:application/json[^,]+base64,(.+)`, "g");
+  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");
+  result.code = `${code.trimEnd()}
 
-//# ${VITE_NODE_SOURCEMAPPING_URL};base64,${Buffer.from(JSON.stringify(map), "utf-8").toString("base64")}
+${VITE_NODE_SOURCEMAPPING_SOURCE}
+//# ${VITE_NODE_SOURCEMAPPING_URL};base64,${sourceMap}
 `;
   return result;
 }

package/dist/utils.cjs

@@ -19,6 +19,9 @@ function normalizeRequestId(id, base) {
     id = `/${id.slice(base.length)}`;
   return id.replace(/^\/@id\/__x00__/, "\0").replace(/^\/@id\//, "").replace(/^__vite-browser-external:/, "").replace(/^(node|file):/, "").replace(/^\/+/, "/").replace(/\?v=\w+/, "?").replace(/&v=\w+/, "").replace(/\?t=\w+/, "?").replace(/&t=\w+/, "").replace(/\?import/, "?").replace(/&import/, "").replace(/\?&/, "?").replace(/\?+$/, "");
 }
+const queryRE = /\?.*$/s;
+const hashRE = /#.*$/s;
+const cleanUrl = (url) => url.replace(hashRE, "").replace(queryRE, "");
 function normalizeModuleId(id) {
   return id.replace(/\\/g, "/").replace(/^\/@fs\//, "/").replace(/^file:\//, "/").replace(/^\/+/, "/");
 }
@@ -59,12 +62,15 @@ function toArray(array) {
   return [array];
 }
 
+exports.cleanUrl = cleanUrl;
+exports.hashRE = hashRE;
 exports.isPrimitive = isPrimitive;
 exports.isWindows = isWindows;
 exports.mergeSlashes = mergeSlashes;
 exports.normalizeModuleId = normalizeModuleId;
 exports.normalizeRequestId = normalizeRequestId;
 exports.pathFromRoot = pathFromRoot;
+exports.queryRE = queryRE;
 exports.slash = slash;
 exports.toArray = toArray;
 exports.toFilePath = toFilePath;

package/dist/utils.d.ts

@@ -4,6 +4,9 @@ declare const isWindows: boolean;
 declare function slash(str: string): string;
 declare function mergeSlashes(str: string): string;
 declare function normalizeRequestId(id: string, base?: string): string;
+declare const queryRE: RegExp;
+declare const hashRE: RegExp;
+declare const cleanUrl: (url: string) => string;
 declare function normalizeModuleId(id: string): string;
 declare function isPrimitive(v: any): boolean;
 declare function pathFromRoot(root: string, filename: string): string;
@@ -15,4 +18,4 @@ declare function toFilePath(id: string, root: string): string;
  */
 declare function toArray<T>(array?: Nullable<Arrayable<T>>): Array<T>;
 
-export { isPrimitive, isWindows, mergeSlashes, normalizeModuleId, normalizeRequestId, pathFromRoot, slash, toArray, toFilePath };
+export { cleanUrl, hashRE, isPrimitive, isWindows, mergeSlashes, normalizeModuleId, normalizeRequestId, pathFromRoot, queryRE, slash, toArray, toFilePath };

package/dist/utils.mjs

@@ -15,6 +15,9 @@ function normalizeRequestId(id, base) {
     id = `/${id.slice(base.length)}`;
   return id.replace(/^\/@id\/__x00__/, "\0").replace(/^\/@id\//, "").replace(/^__vite-browser-external:/, "").replace(/^(node|file):/, "").replace(/^\/+/, "/").replace(/\?v=\w+/, "?").replace(/&v=\w+/, "").replace(/\?t=\w+/, "?").replace(/&t=\w+/, "").replace(/\?import/, "?").replace(/&import/, "").replace(/\?&/, "?").replace(/\?+$/, "");
 }
+const queryRE = /\?.*$/s;
+const hashRE = /#.*$/s;
+const cleanUrl = (url) => url.replace(hashRE, "").replace(queryRE, "");
 function normalizeModuleId(id) {
   return id.replace(/\\/g, "/").replace(/^\/@fs\//, "/").replace(/^file:\//, "/").replace(/^\/+/, "/");
 }
@@ -55,4 +58,4 @@ function toArray(array) {
   return [array];
 }
 
-export { isPrimitive, isWindows, mergeSlashes, normalizeModuleId, normalizeRequestId, pathFromRoot, slash, toArray, toFilePath };
+export { cleanUrl, hashRE, isPrimitive, isWindows, mergeSlashes, normalizeModuleId, normalizeRequestId, pathFromRoot, queryRE, slash, toArray, toFilePath };

package/package.json

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