vite-node 1.0.0-beta.0 → 1.0.0-beta.1

package/dist/cli.cjs

@@ -20,7 +20,7 @@ require('node:url');
 require('node:vm');
 require('node:events');
 
-var version = "1.0.0-beta.0";
+var version = "1.0.0-beta.1";
 
 const cli = cac("vite-node");
 cli.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").option("-v, --version", "Output the version number").option("-h, --help", "Display help for command");

package/dist/cli.mjs

@@ -18,7 +18,7 @@ import 'node:url';
 import 'node:vm';
 import 'node:events';
 
-var version = "1.0.0-beta.0";
+var version = "1.0.0-beta.1";
 
 const cli = cac("vite-node");
 cli.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").option("-v, --version", "Output the version number").option("-h, --help", "Display help for command");

package/dist/server.cjs

@@ -24,8 +24,8 @@ const defaultInline = [
   new RegExp(`\\.(${constants.KNOWN_ASSET_TYPES.join("|")})$`)
 ];
 const depsExternal = [
-  /\.cjs\.js$/,
-  /\.mjs$/
+  /\/node_modules\/.*\.cjs\.js$/,
+  /\/node_modules\/.*\.mjs$/
 ];
 function guessCJSversion(id) {
   if (id.match(ESM_EXT_RE)) {
@@ -217,9 +217,19 @@ class ViteNodeServer {
     if (!options.deps.moduleDirectories.includes("/node_modules/"))
       options.deps.moduleDirectories.push("/node_modules/");
   }
-  fetchPromiseMap = /* @__PURE__ */ new Map();
-  transformPromiseMap = /* @__PURE__ */ new Map();
+  fetchPromiseMap = {
+    ssr: /* @__PURE__ */ new Map(),
+    web: /* @__PURE__ */ new Map()
+  };
+  transformPromiseMap = {
+    ssr: /* @__PURE__ */ new Map(),
+    web: /* @__PURE__ */ new Map()
+  };
   existingOptimizedDeps = /* @__PURE__ */ new Set();
+  fetchCaches = {
+    ssr: /* @__PURE__ */ new Map(),
+    web: /* @__PURE__ */ new Map()
+  };
   fetchCache = /* @__PURE__ */ new Map();
   externalizeCache = /* @__PURE__ */ new Map();
   debugger;
@@ -256,29 +266,33 @@ class ViteNodeServer {
     return (ssrTransformResult == null ? void 0 : ssrTransformResult.map) || null;
   }
   async fetchModule(id, transformMode) {
-    id = utils.normalizeModuleId(id);
-    if (!this.fetchPromiseMap.has(id)) {
-      this.fetchPromiseMap.set(
-        id,
-        this._fetchModule(id, transformMode).then((r) => {
+    const moduleId = utils.normalizeModuleId(id);
+    const mode = transformMode || this.getTransformMode(id);
+    const promiseMap = this.fetchPromiseMap[mode];
+    if (!promiseMap.has(moduleId)) {
+      promiseMap.set(
+        moduleId,
+        this._fetchModule(moduleId, mode).then((r) => {
           return this.options.sourcemap !== true ? { ...r, map: void 0 } : r;
         }).finally(() => {
-          this.fetchPromiseMap.delete(id);
+          promiseMap.delete(moduleId);
         })
       );
     }
-    return this.fetchPromiseMap.get(id);
+    return promiseMap.get(moduleId);
   }
-  async transformRequest(id, filepath = id) {
-    if (!this.transformPromiseMap.has(id)) {
-      this.transformPromiseMap.set(
+  async transformRequest(id, filepath = id, transformMode) {
+    const mode = transformMode || this.getTransformMode(id);
+    const promiseMap = this.transformPromiseMap[mode];
+    if (!promiseMap.has(id)) {
+      promiseMap.set(
         id,
-        this._transformRequest(id, filepath).finally(() => {
-          this.transformPromiseMap.delete(id);
+        this._transformRequest(id, filepath, mode).finally(() => {
+          promiseMap.delete(id);
         })
       );
     }
-    return this.transformPromiseMap.get(id);
+    return promiseMap.get(id);
   }
   async transformModule(id, transformMode) {
     if (transformMode !== "web")
@@ -317,7 +331,7 @@ class ViteNodeServer {
     const { path: filePath } = utils.toFilePath(id, this.server.config.root);
     const module = this.server.moduleGraph.getModuleById(id);
     const timestamp = module ? module.lastHMRTimestamp : null;
-    const cache = this.fetchCache.get(filePath);
+    const cache = this.fetchCaches[transformMode].get(filePath);
     if (timestamp && cache && cache.timestamp >= timestamp)
       return cache.result;
     const time = Date.now();
@@ -332,11 +346,13 @@ class ViteNodeServer {
       duration = perf_hooks.performance.now() - start;
       result = { code: r == null ? void 0 : r.code, map: r == null ? void 0 : r.map };
     }
-    this.fetchCache.set(filePath, {
+    const cacheEntry = {
       duration,
       timestamp: time,
       result
-    });
+    };
+    this.fetchCaches[transformMode].set(filePath, cacheEntry);
+    this.fetchCache.set(filePath, cacheEntry);
     return result;
   }
   async processTransformResult(filepath, result) {
@@ -346,7 +362,7 @@ class ViteNodeServer {
       root: this.server.config.root
     });
   }
-  async _transformRequest(id, filepath, customTransformMode) {
+  async _transformRequest(id, filepath, transformMode) {
     var _a, _b, _c, _d;
     debugRequest(id);
     let result = null;
@@ -355,7 +371,6 @@ class ViteNodeServer {
       if (result)
         return result;
     }
-    const transformMode = customTransformMode ?? this.getTransformMode(id);
     if (transformMode === "web") {
       result = await this.server.transformRequest(id);
       if (result)

package/dist/server.d.ts

@@ -1,5 +1,5 @@
 import { TransformResult, ViteDevServer } from 'vite';
-import { D as DebuggerOptions, c as DepsHandlingOptions, V as ViteNodeServerOptions, F as FetchResult, d as ViteNodeResolveId } from './index-6fb787b2.js';
+import { D as DebuggerOptions, c as DepsHandlingOptions, V as ViteNodeServerOptions, d as ViteNodeResolveId, F as FetchResult } from './index-6fb787b2.js';
 import { E as EncodedSourceMap } from './trace-mapping.d-e677e8f4.js';
 
 declare class Debugger {
@@ -19,17 +19,22 @@ declare class Debugger {
 declare function guessCJSversion(id: string): string | undefined;
 declare function shouldExternalize(id: string, options?: DepsHandlingOptions, cache?: Map<string, Promise<string | false>>): Promise<string | false>;
 
+interface FetchCache {
+    duration?: number;
+    timestamp: number;
+    result: FetchResult;
+}
 declare class ViteNodeServer {
     server: ViteDevServer;
     options: ViteNodeServerOptions;
     private fetchPromiseMap;
     private transformPromiseMap;
     private existingOptimizedDeps;
-    fetchCache: Map<string, {
-        duration?: number | undefined;
-        timestamp: number;
-        result: FetchResult;
-    }>;
+    fetchCaches: {
+        ssr: Map<string, FetchCache>;
+        web: Map<string, FetchCache>;
+    };
+    fetchCache: Map<string, FetchCache>;
     externalizeCache: Map<string, Promise<string | false>>;
     debugger?: Debugger;
     constructor(server: ViteDevServer, options?: ViteNodeServerOptions);
@@ -38,7 +43,7 @@ declare class ViteNodeServer {
     resolveId(id: string, importer?: string, transformMode?: 'web' | 'ssr'): Promise<ViteNodeResolveId | null>;
     getSourceMap(source: string): EncodedSourceMap | null;
     fetchModule(id: string, transformMode?: 'web' | 'ssr'): Promise<FetchResult>;
-    transformRequest(id: string, filepath?: string): Promise<TransformResult | null | undefined>;
+    transformRequest(id: string, filepath?: string, transformMode?: 'web' | 'ssr'): Promise<TransformResult | null | undefined>;
     transformModule(id: string, transformMode?: 'web' | 'ssr'): Promise<{
         code: string | undefined;
     }>;

package/dist/server.mjs

@@ -22,8 +22,8 @@ const defaultInline = [
   new RegExp(`\\.(${KNOWN_ASSET_TYPES.join("|")})$`)
 ];
 const depsExternal = [
-  /\.cjs\.js$/,
-  /\.mjs$/
+  /\/node_modules\/.*\.cjs\.js$/,
+  /\/node_modules\/.*\.mjs$/
 ];
 function guessCJSversion(id) {
   if (id.match(ESM_EXT_RE)) {
@@ -215,9 +215,19 @@ class ViteNodeServer {
     if (!options.deps.moduleDirectories.includes("/node_modules/"))
       options.deps.moduleDirectories.push("/node_modules/");
   }
-  fetchPromiseMap = /* @__PURE__ */ new Map();
-  transformPromiseMap = /* @__PURE__ */ new Map();
+  fetchPromiseMap = {
+    ssr: /* @__PURE__ */ new Map(),
+    web: /* @__PURE__ */ new Map()
+  };
+  transformPromiseMap = {
+    ssr: /* @__PURE__ */ new Map(),
+    web: /* @__PURE__ */ new Map()
+  };
   existingOptimizedDeps = /* @__PURE__ */ new Set();
+  fetchCaches = {
+    ssr: /* @__PURE__ */ new Map(),
+    web: /* @__PURE__ */ new Map()
+  };
   fetchCache = /* @__PURE__ */ new Map();
   externalizeCache = /* @__PURE__ */ new Map();
   debugger;
@@ -254,29 +264,33 @@ class ViteNodeServer {
     return (ssrTransformResult == null ? void 0 : ssrTransformResult.map) || null;
   }
   async fetchModule(id, transformMode) {
-    id = normalizeModuleId(id);
-    if (!this.fetchPromiseMap.has(id)) {
-      this.fetchPromiseMap.set(
-        id,
-        this._fetchModule(id, transformMode).then((r) => {
+    const moduleId = normalizeModuleId(id);
+    const mode = transformMode || this.getTransformMode(id);
+    const promiseMap = this.fetchPromiseMap[mode];
+    if (!promiseMap.has(moduleId)) {
+      promiseMap.set(
+        moduleId,
+        this._fetchModule(moduleId, mode).then((r) => {
           return this.options.sourcemap !== true ? { ...r, map: void 0 } : r;
         }).finally(() => {
-          this.fetchPromiseMap.delete(id);
+          promiseMap.delete(moduleId);
         })
       );
     }
-    return this.fetchPromiseMap.get(id);
+    return promiseMap.get(moduleId);
   }
-  async transformRequest(id, filepath = id) {
-    if (!this.transformPromiseMap.has(id)) {
-      this.transformPromiseMap.set(
+  async transformRequest(id, filepath = id, transformMode) {
+    const mode = transformMode || this.getTransformMode(id);
+    const promiseMap = this.transformPromiseMap[mode];
+    if (!promiseMap.has(id)) {
+      promiseMap.set(
         id,
-        this._transformRequest(id, filepath).finally(() => {
-          this.transformPromiseMap.delete(id);
+        this._transformRequest(id, filepath, mode).finally(() => {
+          promiseMap.delete(id);
         })
       );
     }
-    return this.transformPromiseMap.get(id);
+    return promiseMap.get(id);
   }
   async transformModule(id, transformMode) {
     if (transformMode !== "web")
@@ -315,7 +329,7 @@ class ViteNodeServer {
     const { path: filePath } = toFilePath(id, this.server.config.root);
     const module = this.server.moduleGraph.getModuleById(id);
     const timestamp = module ? module.lastHMRTimestamp : null;
-    const cache = this.fetchCache.get(filePath);
+    const cache = this.fetchCaches[transformMode].get(filePath);
     if (timestamp && cache && cache.timestamp >= timestamp)
       return cache.result;
     const time = Date.now();
@@ -330,11 +344,13 @@ class ViteNodeServer {
       duration = performance.now() - start;
       result = { code: r == null ? void 0 : r.code, map: r == null ? void 0 : r.map };
     }
-    this.fetchCache.set(filePath, {
+    const cacheEntry = {
       duration,
       timestamp: time,
       result
-    });
+    };
+    this.fetchCaches[transformMode].set(filePath, cacheEntry);
+    this.fetchCache.set(filePath, cacheEntry);
     return result;
   }
   async processTransformResult(filepath, result) {
@@ -344,7 +360,7 @@ class ViteNodeServer {
       root: this.server.config.root
     });
   }
-  async _transformRequest(id, filepath, customTransformMode) {
+  async _transformRequest(id, filepath, transformMode) {
     var _a, _b, _c, _d;
     debugRequest(id);
     let result = null;
@@ -353,7 +369,6 @@ class ViteNodeServer {
       if (result)
         return result;
     }
-    const transformMode = customTransformMode ?? this.getTransformMode(id);
     if (transformMode === "web") {
       result = await this.server.transformRequest(id);
       if (result)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vite-node",
   "type": "module",
-  "version": "1.0.0-beta.0",
+  "version": "1.0.0-beta.1",
   "description": "Vite as Node.js runtime",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",