vite-node 2.0.0-beta.9 → 2.0.1

package/dist/server.cjs

@@ -23,7 +23,7 @@ const defaultInline = [
   // special Vite query strings
   /[?&](init|raw|url|inline)\b/,
   // Vite returns a string for assets imports, even if it's inside "node_modules"
-  new RegExp(`\\.(${constants.KNOWN_ASSET_TYPES.join("|")})$`)
+  constants.KNOWN_ASSET_RE
 ];
 const depsExternal = [
   /\/node_modules\/.*\.cjs\.js$/,
@@ -37,8 +37,9 @@ function guessCJSversion(id) {
       id.replace(ESM_EXT_RE, ".cjs.js"),
       id.replace(ESM_EXT_RE, ".js")
     ]) {
-      if (fs.existsSync(i))
+      if (fs.existsSync(i)) {
         return i;
+      }
     }
   }
   if (id.match(ESM_FOLDER_RE)) {
@@ -48,79 +49,98 @@ function guessCJSversion(id) {
       id.replace(ESM_FOLDER_RE, "/lib/$1"),
       id.replace(ESM_FOLDER_RE, "/$1")
     ]) {
-      if (fs.existsSync(i))
+      if (fs.existsSync(i)) {
         return i;
+      }
     }
   }
 }
 async function isValidNodeImport(id) {
   const extension = pathe.extname(id);
-  if (BUILTIN_EXTENSIONS.has(extension))
+  if (BUILTIN_EXTENSIONS.has(extension)) {
     return true;
-  if (extension !== ".js")
+  }
+  if (extension !== ".js") {
     return false;
+  }
   id = id.replace("file:///", "");
   const package_ = await utils.findNearestPackageData(pathe.dirname(id));
-  if (package_.type === "module")
+  if (package_.type === "module") {
     return true;
-  if (/\.(?:\w+-)?esm?(?:-\w+)?\.js$|\/esm?\//.test(id))
+  }
+  if (/\.(?:\w+-)?esm?(?:-\w+)?\.js$|\/esm?\//.test(id)) {
     return false;
+  }
   const code = await fs.promises.readFile(id, "utf8").catch(() => "");
   return !ESM_SYNTAX_RE.test(code);
 }
 const _defaultExternalizeCache = /* @__PURE__ */ new Map();
 async function shouldExternalize(id, options, cache = _defaultExternalizeCache) {
-  if (!cache.has(id))
+  if (!cache.has(id)) {
     cache.set(id, _shouldExternalize(id, options));
+  }
   return cache.get(id);
 }
 async function _shouldExternalize(id, options) {
-  if (utils.isNodeBuiltin(id))
+  if (utils.isNodeBuiltin(id)) {
     return id;
-  if (id.startsWith("data:") || /^(?:https?:)?\/\//.test(id))
+  }
+  if (id.startsWith("data:") || /^(?:https?:)?\/\//.test(id)) {
     return id;
+  }
   id = patchWindowsImportPath(id);
-  if ((options == null ? void 0 : options.cacheDir) && id.includes(options.cacheDir))
+  if ((options == null ? void 0 : options.cacheDir) && id.includes(options.cacheDir)) {
     return id;
+  }
   const moduleDirectories = (options == null ? void 0 : options.moduleDirectories) || ["/node_modules/"];
-  if (matchExternalizePattern(id, moduleDirectories, options == null ? void 0 : options.inline))
+  if (matchExternalizePattern(id, moduleDirectories, options == null ? void 0 : options.inline)) {
     return false;
-  if (matchExternalizePattern(id, moduleDirectories, options == null ? void 0 : options.external))
+  }
+  if (matchExternalizePattern(id, moduleDirectories, options == null ? void 0 : options.external)) {
     return id;
+  }
   const isLibraryModule = moduleDirectories.some((dir) => id.includes(dir));
   const guessCJS = isLibraryModule && (options == null ? void 0 : options.fallbackCJS);
   id = guessCJS ? guessCJSversion(id) || id : id;
-  if (matchExternalizePattern(id, moduleDirectories, defaultInline))
+  if (matchExternalizePattern(id, moduleDirectories, defaultInline)) {
     return false;
-  if (matchExternalizePattern(id, moduleDirectories, depsExternal))
+  }
+  if (matchExternalizePattern(id, moduleDirectories, depsExternal)) {
     return id;
-  if (isLibraryModule && await isValidNodeImport(id))
+  }
+  if (isLibraryModule && await isValidNodeImport(id)) {
     return id;
+  }
   return false;
 }
 function matchExternalizePattern(id, moduleDirectories, patterns) {
-  if (patterns == null)
+  if (patterns == null) {
     return false;
-  if (patterns === true)
+  }
+  if (patterns === true) {
     return true;
+  }
   for (const ex of patterns) {
     if (typeof ex === "string") {
-      if (moduleDirectories.some((dir) => id.includes(pathe.join(dir, ex))))
+      if (moduleDirectories.some((dir) => id.includes(pathe.join(dir, ex)))) {
         return true;
+      }
     } else {
-      if (ex.test(id))
+      if (ex.test(id)) {
         return true;
+      }
     }
   }
   return false;
 }
 function patchWindowsImportPath(path) {
-  if (path.match(/^\w:\\/))
+  if (path.match(/^\w:\\/)) {
     return `file:///${utils.slash(path)}`;
-  else if (path.match(/^\w:\//))
+  } else if (path.match(/^\w:\//)) {
     return `file:///${path}`;
-  else
+  } else {
     return path;
+  }
 }
 
 function hashCode(s) {
@@ -132,13 +152,22 @@ function hashCode(s) {
 class Debugger {
   constructor(root, options) {
     this.options = options;
-    if (options.dumpModules)
-      this.dumpDir = pathe.resolve(root, options.dumpModules === true ? ".vite-node/dump" : options.dumpModules);
+    if (options.dumpModules) {
+      this.dumpDir = pathe.resolve(
+        root,
+        options.dumpModules === true ? ".vite-node/dump" : options.dumpModules
+      );
+    }
     if (this.dumpDir) {
-      if (options.loadDumppedModules)
-        console.info(c.gray(`[vite-node] [debug] load modules from ${this.dumpDir}`));
-      else
-        console.info(c.gray(`[vite-node] [debug] dump modules to ${this.dumpDir}`));
+      if (options.loadDumppedModules) {
+        console.info(
+          c.gray(`[vite-node] [debug] load modules from ${this.dumpDir}`)
+        );
+      } else {
+        console.info(
+          c.gray(`[vite-node] [debug] dump modules to ${this.dumpDir}`)
+        );
+      }
     }
     this.initPromise = this.clearDump();
   }
@@ -146,37 +175,49 @@ class Debugger {
   initPromise;
   externalizeMap = /* @__PURE__ */ new Map();
   async clearDump() {
-    if (!this.dumpDir)
+    if (!this.dumpDir) {
       return;
-    if (!this.options.loadDumppedModules && fs.existsSync(this.dumpDir))
+    }
+    if (!this.options.loadDumppedModules && fs.existsSync(this.dumpDir)) {
       await fs.promises.rm(this.dumpDir, { recursive: true, force: true });
+    }
     await fs.promises.mkdir(this.dumpDir, { recursive: true });
   }
   encodeId(id) {
-    return `${id.replace(/[^\w@\-]/g, "_").replace(/_+/g, "_")}-${hashCode(id)}.js`;
+    return `${id.replace(/[^\w@\-]/g, "_").replace(/_+/g, "_")}-${hashCode(
+      id
+    )}.js`;
   }
   async recordExternalize(id, path) {
-    if (!this.dumpDir)
+    if (!this.dumpDir) {
       return;
+    }
     this.externalizeMap.set(id, path);
     await this.writeInfo();
   }
   async dumpFile(id, result) {
-    if (!result || !this.dumpDir)
+    if (!result || !this.dumpDir) {
       return;
+    }
     await this.initPromise;
     const name = this.encodeId(id);
-    return await fs.promises.writeFile(pathe.join(this.dumpDir, name), `// ${id.replace(/\0/g, "\\0")}
-${result.code}`, "utf-8");
+    return await fs.promises.writeFile(
+      pathe.join(this.dumpDir, name),
+      `// ${id.replace(/\0/g, "\\0")}
+${result.code}`,
+      "utf-8"
+    );
   }
   async loadDump(id) {
-    if (!this.dumpDir)
+    if (!this.dumpDir) {
       return null;
+    }
     await this.initPromise;
     const name = this.encodeId(id);
     const path = pathe.join(this.dumpDir, name);
-    if (!fs.existsSync(path))
+    if (!fs.existsSync(path)) {
       return null;
+    }
     const code = await fs.promises.readFile(path, "utf-8");
     return {
       code: code.replace(/^\/\/.*\n/, ""),
@@ -184,12 +225,17 @@ ${result.code}`, "utf-8");
     };
   }
   async writeInfo() {
-    if (!this.dumpDir)
+    if (!this.dumpDir) {
       return;
-    const info = JSON.stringify({
-      time: (/* @__PURE__ */ new Date()).toLocaleString(),
-      externalize: Object.fromEntries(this.externalizeMap.entries())
-    }, null, 2);
+    }
+    const info = JSON.stringify(
+      {
+        time: (/* @__PURE__ */ new Date()).toLocaleString(),
+        externalize: Object.fromEntries(this.externalizeMap.entries())
+      },
+      null,
+      2
+    );
     return fs.promises.writeFile(pathe.join(this.dumpDir, "info.json"), info, "utf-8");
   }
 }
@@ -202,38 +248,55 @@ class ViteNodeServer {
     var _a, _b, _c;
     const ssrOptions = server.config.ssr;
     options.deps ?? (options.deps = {});
-    options.deps.cacheDir = pathe.relative(server.config.root, options.deps.cacheDir || server.config.cacheDir);
+    options.deps.cacheDir = pathe.relative(
+      server.config.root,
+      options.deps.cacheDir || server.config.cacheDir
+    );
     if (ssrOptions) {
       if (ssrOptions.noExternal === true) {
         (_a = options.deps).inline ?? (_a.inline = true);
       } else if (options.deps.inline !== true) {
         (_b = options.deps).inline ?? (_b.inline = []);
         const inline = options.deps.inline;
-        options.deps.inline.push(...utils.toArray(ssrOptions.noExternal).filter((dep) => !inline.includes(dep)));
+        options.deps.inline.push(
+          ...utils.toArray(ssrOptions.noExternal).filter(
+            (dep) => !inline.includes(dep)
+          )
+        );
       }
     }
     if (process.env.VITE_NODE_DEBUG_DUMP) {
-      options.debug = Object.assign({
-        dumpModules: !!process.env.VITE_NODE_DEBUG_DUMP,
-        loadDumppedModules: process.env.VITE_NODE_DEBUG_DUMP === "load"
-      }, options.debug ?? {});
+      options.debug = Object.assign(
+        {
+          dumpModules: !!process.env.VITE_NODE_DEBUG_DUMP,
+          loadDumppedModules: process.env.VITE_NODE_DEBUG_DUMP === "load"
+        },
+        options.debug ?? {}
+      );
     }
-    if (options.debug)
+    if (options.debug) {
       this.debugger = new Debugger(server.config.root, options.debug);
+    }
     (_c = options.deps).moduleDirectories ?? (_c.moduleDirectories = []);
     const envValue = process.env.VITE_NODE_DEPS_MODULE_DIRECTORIES || process.env.npm_config_VITE_NODE_DEPS_MODULE_DIRECTORIES;
     const customModuleDirectories = envValue == null ? void 0 : envValue.split(",");
-    if (customModuleDirectories)
+    if (customModuleDirectories) {
       options.deps.moduleDirectories.push(...customModuleDirectories);
-    options.deps.moduleDirectories = options.deps.moduleDirectories.map((dir) => {
-      if (!dir.startsWith("/"))
-        dir = `/${dir}`;
-      if (!dir.endsWith("/"))
-        dir += "/";
-      return pathe.normalize(dir);
-    });
-    if (!options.deps.moduleDirectories.includes("/node_modules/"))
+    }
+    options.deps.moduleDirectories = options.deps.moduleDirectories.map(
+      (dir) => {
+        if (!dir.startsWith("/")) {
+          dir = `/${dir}`;
+        }
+        if (!dir.endsWith("/")) {
+          dir += "/";
+        }
+        return pathe.normalize(dir);
+      }
+    );
+    if (!options.deps.moduleDirectories.includes("/node_modules/")) {
       options.deps.moduleDirectories.push("/node_modules/");
+    }
   }
   fetchPromiseMap = {
     ssr: /* @__PURE__ */ new Map(),
@@ -264,8 +327,9 @@ class ViteNodeServer {
     return [...ssrDurations, ...webDurations].reduce((a, b) => a + b, 0);
   }
   async ensureExists(id) {
-    if (this.existingOptimizedDeps.has(id))
+    if (this.existingOptimizedDeps.has(id)) {
       return true;
+    }
     if (fs.existsSync(id)) {
       this.existingOptimizedDeps.add(id);
       return true;
@@ -279,35 +343,28 @@ class ViteNodeServer {
     });
   }
   async resolveId(id, importer, transformMode) {
-    if (importer && !importer.startsWith(utils.withTrailingSlash(this.server.config.root)))
+    if (importer && !importer.startsWith(utils.withTrailingSlash(this.server.config.root))) {
       importer = pathe.resolve(this.server.config.root, importer);
+    }
     const mode = transformMode ?? (importer && this.getTransformMode(importer) || "ssr");
-    return this.server.pluginContainer.resolveId(id, importer, { ssr: mode === "ssr" });
-  }
-  async resolveModule(rawId, resolved) {
-    const id = (resolved == null ? void 0 : resolved.id) || rawId;
-    const external = !pathe.isAbsolute(id) || this.isModuleDirectory(id) ? rawId : null;
-    return {
-      id,
-      fsPath: utils.cleanUrl(id),
-      external
-    };
-  }
-  isModuleDirectory(path) {
-    var _a;
-    const moduleDirectories = ((_a = this.options.deps) == null ? void 0 : _a.moduleDirectories) || ["/node_modules/"];
-    return moduleDirectories.some((dir) => path.includes(dir));
+    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)
+    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;
   }
   assertMode(mode) {
-    assert(mode === "web" || mode === "ssr", `"transformMode" can only be "web" or "ssr", received "${mode}".`);
+    assert(
+      mode === "web" || mode === "ssr",
+      `"transformMode" can only be "web" or "ssr", received "${mode}".`
+    );
   }
   async fetchModule(id, transformMode) {
     const mode = transformMode || this.getTransformMode(id);
@@ -320,9 +377,12 @@ class ViteNodeServer {
     this.assertMode(mode);
     const promiseMap = this.fetchPromiseMap[mode];
     if (!promiseMap.has(moduleId)) {
-      promiseMap.set(moduleId, this._fetchModule(moduleId, mode).finally(() => {
-        promiseMap.delete(moduleId);
-      }));
+      promiseMap.set(
+        moduleId,
+        this._fetchModule(moduleId, mode).finally(() => {
+          promiseMap.delete(moduleId);
+        })
+      );
     }
     return promiseMap.get(moduleId);
   }
@@ -331,15 +391,21 @@ class ViteNodeServer {
     this.assertMode(mode);
     const promiseMap = this.transformPromiseMap[mode];
     if (!promiseMap.has(id)) {
-      promiseMap.set(id, this._transformRequest(id, filepath, mode).finally(() => {
-        promiseMap.delete(id);
-      }));
+      promiseMap.set(
+        id,
+        this._transformRequest(id, filepath, mode).finally(() => {
+          promiseMap.delete(id);
+        })
+      );
     }
     return promiseMap.get(id);
   }
   async transformModule(id, transformMode) {
-    if (transformMode !== "web")
-      throw new Error('`transformModule` only supports `transformMode: "web"`.');
+    if (transformMode !== "web") {
+      throw new Error(
+        '`transformModule` only supports `transformMode: "web"`.'
+      );
+    }
     const normalizedId = utils.normalizeModuleId(id);
     const mod = this.server.moduleGraph.getModuleById(normalizedId);
     const result = (mod == null ? void 0 : mod.transformResult) || await this.server.transformRequest(normalizedId);
@@ -350,26 +416,34 @@ class ViteNodeServer {
   getTransformMode(id) {
     var _a, _b, _c, _d;
     const withoutQuery = id.split("?")[0];
-    if ((_b = (_a = this.options.transformMode) == null ? void 0 : _a.web) == null ? void 0 : _b.some((r) => withoutQuery.match(r)))
+    if ((_b = (_a = this.options.transformMode) == null ? void 0 : _a.web) == null ? void 0 : _b.some((r) => withoutQuery.match(r))) {
       return "web";
-    if ((_d = (_c = this.options.transformMode) == null ? void 0 : _c.ssr) == null ? void 0 : _d.some((r) => withoutQuery.match(r)))
+    }
+    if ((_d = (_c = this.options.transformMode) == null ? void 0 : _c.ssr) == null ? void 0 : _d.some((r) => withoutQuery.match(r))) {
       return "ssr";
-    if (withoutQuery.match(/\.([cm]?[jt]sx?|json)$/))
+    }
+    if (withoutQuery.match(/\.([cm]?[jt]sx?|json)$/)) {
       return "ssr";
+    }
     return "web";
   }
   getChangedModule(id, file) {
     const module = this.server.moduleGraph.getModuleById(id) || this.server.moduleGraph.getModuleById(file);
-    if (module)
+    if (module) {
       return module;
+    }
     const _modules = this.server.moduleGraph.getModulesByFile(file);
-    if (!_modules || !_modules.size)
+    if (!_modules || !_modules.size) {
       return null;
+    }
     const modules = [..._modules];
     let mod = modules[0];
     let latestMax = -1;
     for (const m of _modules) {
-      const timestamp = Math.max(m.lastHMRTimestamp, m.lastInvalidationTimestamp);
+      const timestamp = Math.max(
+        m.lastHMRTimestamp,
+        m.lastInvalidationTimestamp
+      );
       if (timestamp > latestMax) {
         latestMax = timestamp;
         mod = m;
@@ -382,10 +456,13 @@ class ViteNodeServer {
     let result;
     const cacheDir = (_a = this.options.deps) == null ? void 0 : _a.cacheDir;
     if (cacheDir && id.includes(cacheDir)) {
-      if (!id.startsWith(utils.withTrailingSlash(this.server.config.root)))
+      if (!id.startsWith(utils.withTrailingSlash(this.server.config.root))) {
         id = pathe.join(this.server.config.root, id);
+      }
       const timeout = setTimeout(() => {
-        throw new Error(`ViteNodeServer: ${id} not found. This is a bug, please report it.`);
+        throw new Error(
+          `ViteNodeServer: ${id} not found. This is a bug, please report it.`
+        );
       }, 5e3);
       await this.ensureExists(id);
       clearTimeout(timeout);
@@ -393,9 +470,13 @@ class ViteNodeServer {
     const { path: filePath } = utils.toFilePath(id, this.server.config.root);
     const moduleNode = this.getChangedModule(id, filePath);
     const cache = this.fetchCaches[transformMode].get(filePath);
-    const timestamp = moduleNode ? Math.max(moduleNode.lastHMRTimestamp, moduleNode.lastInvalidationTimestamp) : 0;
-    if (cache && (timestamp === 0 || cache.timestamp >= timestamp))
+    const timestamp = moduleNode ? Math.max(
+      moduleNode.lastHMRTimestamp,
+      moduleNode.lastInvalidationTimestamp
+    ) : 0;
+    if (cache && (timestamp === 0 || cache.timestamp >= timestamp)) {
       return cache.result;
+    }
     const time = Date.now();
     const externalize = await this.shouldExternalize(filePath);
     let duration;
@@ -414,10 +495,7 @@ class ViteNodeServer {
       result
     };
     const durations = this.durations[transformMode].get(filePath) || [];
-    this.durations[transformMode].set(
-      filePath,
-      [...durations, duration ?? 0]
-    );
+    this.durations[transformMode].set(filePath, [...durations, duration ?? 0]);
     this.fetchCaches[transformMode].set(filePath, cacheEntry);
     this.fetchCache.set(filePath, cacheEntry);
     return result;
@@ -435,21 +513,25 @@ class ViteNodeServer {
     let result = null;
     if ((_a = this.options.debug) == null ? void 0 : _a.loadDumppedModules) {
       result = await ((_b = this.debugger) == null ? void 0 : _b.loadDump(id)) ?? null;
-      if (result)
+      if (result) {
         return result;
+      }
     }
     if (transformMode === "web") {
       result = await this.server.transformRequest(id);
-      if (result)
+      if (result) {
         result = await this.server.ssrTransform(result.code, result.map, id);
+      }
     } else {
       result = await this.server.transformRequest(id, { ssr: true });
     }
     const sourcemap = this.options.sourcemap ?? "inline";
-    if (sourcemap === "inline" && result && !id.includes("node_modules"))
+    if (sourcemap === "inline" && result && !id.includes("node_modules")) {
       result = await this.processTransformResult(filepath, result);
-    if ((_c = this.options.debug) == null ? void 0 : _c.dumpModules)
+    }
+    if ((_c = this.options.debug) == null ? void 0 : _c.dumpModules) {
       await ((_d = this.debugger) == null ? void 0 : _d.dumpFile(id, result));
+    }
     return 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, d as ViteNodeResolveId, F as FetchResult } from './index-D1EszD4V.js';
+import { D as DebuggerOptions, c as DepsHandlingOptions, V as ViteNodeServerOptions, d as ViteNodeResolveId, F as FetchResult } from './index-CCsqCcr7.js';
 import { E as EncodedSourceMap } from './trace-mapping.d-DLVdEqOp.js';
 
 declare class Debugger {
@@ -43,12 +43,6 @@ declare class ViteNodeServer {
     getTotalDuration(): number;
     private ensureExists;
     resolveId(id: string, importer?: string, transformMode?: 'web' | 'ssr'): Promise<ViteNodeResolveId | null>;
-    resolveModule(rawId: string, resolved: ViteNodeResolveId | null): Promise<{
-        id: string;
-        fsPath: string;
-        external: string | null;
-    }>;
-    private isModuleDirectory;
     getSourceMap(source: string): EncodedSourceMap | null;
     private assertMode;
     fetchModule(id: string, transformMode?: 'web' | 'ssr'): Promise<FetchResult>;