vite-node 0.10.3 → 0.11.0

package/dist/{client-e24a0d42.js → client-06b06913.js}

@@ -99,15 +99,11 @@ class ViteNodeRunner {
   async directRequest(id, fsPath, _callstack) {
     const callstack = [..._callstack, utils.normalizeModuleId(id)];
     const request = async (dep) => {
-      var _a, _b;
+      var _a;
       const getStack = () => {
         return `stack:
 ${[...callstack, dep].reverse().map((p) => `- ${p}`).join("\n")}`;
       };
-      if (this.options.resolveId && this.shouldResolveId(dep)) {
-        const resolvedDep = await this.options.resolveId(dep, id);
-        dep = ((_a = resolvedDep == null ? void 0 : resolvedDep.id) == null ? void 0 : _a.replace(this.root, "")) || dep;
-      }
       let debugTimer;
       if (this.debug)
         debugTimer = setTimeout(() => this.debugLog(() => `module ${dep} takes over 2s to load.
@@ -115,7 +111,7 @@ ${getStack()}`), 2e3);
       try {
         if (callstack.includes(utils.normalizeModuleId(dep))) {
           this.debugLog(() => `circular dependency, ${getStack()}`);
-          const depExports = (_b = this.moduleCache.get(dep)) == null ? void 0 : _b.exports;
+          const depExports = (_a = this.moduleCache.get(dep)) == null ? void 0 : _a.exports;
           if (depExports)
             return depExports;
           throw new Error(`[vite-node] Failed to resolve circular dependency, ${getStack()}`);
@@ -127,10 +123,22 @@ ${getStack()}`), 2e3);
           clearTimeout(debugTimer);
       }
     };
+    Object.defineProperty(request, "callstack", { get: () => callstack });
+    const resolveId = async (dep, callstackPosition = 1) => {
+      if (this.options.resolveId && this.shouldResolveId(dep)) {
+        let importer = callstack[callstack.length - callstackPosition];
+        if (importer && importer.startsWith("mock:"))
+          importer = importer.slice(5);
+        const { id: id2 } = await this.options.resolveId(dep, importer) || {};
+        dep = id2 && pathe.isAbsolute(id2) ? `/@fs/${id2}` : id2 || dep;
+      }
+      return dep;
+    };
+    id = await resolveId(id, 2);
     const requestStubs = this.options.requestStubs || DEFAULT_REQUEST_STUBS;
     if (id in requestStubs)
       return requestStubs[id];
-    const { code: transformed, externalize } = await this.options.fetchModule(id);
+    let { code: transformed, externalize } = await this.options.fetchModule(id);
     if (externalize) {
       const mod = await this.interopedImport(externalize);
       this.moduleCache.set(fsPath, { exports: mod });
@@ -152,18 +160,26 @@ ${getStack()}`), 2e3);
         return exports.default;
       }
     };
+    let require;
     const context = this.prepareContext({
       __vite_ssr_import__: request,
       __vite_ssr_dynamic_import__: request,
       __vite_ssr_exports__: exports,
       __vite_ssr_exportAll__: (obj) => exportAll(exports, obj),
       __vite_ssr_import_meta__: { url: url$1 },
-      require: module$1.createRequire(url$1),
+      __vitest_resolve_id__: resolveId,
+      require: (path) => {
+        if (!require)
+          require = module$1.createRequire(url$1);
+        return require(path);
+      },
       exports,
       module: moduleProxy,
       __filename,
       __dirname: pathe.dirname(__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}
 }}`, {
       filename: fsPath,
@@ -176,7 +192,7 @@ ${getStack()}`), 2e3);
     return context;
   }
   shouldResolveId(dep) {
-    if (mlly.isNodeBuiltin(dep) || dep in (this.options.requestStubs || DEFAULT_REQUEST_STUBS))
+    if (mlly.isNodeBuiltin(dep) || dep in (this.options.requestStubs || DEFAULT_REQUEST_STUBS) || dep.startsWith("/@vite"))
       return false;
     return !pathe.isAbsolute(dep) || !pathe.extname(dep);
   }

package/dist/{client-b20a0596.js → client-da5aac97.js}

@@ -75,15 +75,11 @@ class ViteNodeRunner {
   async directRequest(id, fsPath, _callstack) {
     const callstack = [..._callstack, normalizeModuleId(id)];
     const request = async (dep) => {
-      var _a, _b;
+      var _a;
       const getStack = () => {
         return `stack:
 ${[...callstack, dep].reverse().map((p) => `- ${p}`).join("\n")}`;
       };
-      if (this.options.resolveId && this.shouldResolveId(dep)) {
-        const resolvedDep = await this.options.resolveId(dep, id);
-        dep = ((_a = resolvedDep == null ? void 0 : resolvedDep.id) == null ? void 0 : _a.replace(this.root, "")) || dep;
-      }
       let debugTimer;
       if (this.debug)
         debugTimer = setTimeout(() => this.debugLog(() => `module ${dep} takes over 2s to load.
@@ -91,7 +87,7 @@ ${getStack()}`), 2e3);
       try {
         if (callstack.includes(normalizeModuleId(dep))) {
           this.debugLog(() => `circular dependency, ${getStack()}`);
-          const depExports = (_b = this.moduleCache.get(dep)) == null ? void 0 : _b.exports;
+          const depExports = (_a = this.moduleCache.get(dep)) == null ? void 0 : _a.exports;
           if (depExports)
             return depExports;
           throw new Error(`[vite-node] Failed to resolve circular dependency, ${getStack()}`);
@@ -103,10 +99,22 @@ ${getStack()}`), 2e3);
           clearTimeout(debugTimer);
       }
     };
+    Object.defineProperty(request, "callstack", { get: () => callstack });
+    const resolveId = async (dep, callstackPosition = 1) => {
+      if (this.options.resolveId && this.shouldResolveId(dep)) {
+        let importer = callstack[callstack.length - callstackPosition];
+        if (importer && importer.startsWith("mock:"))
+          importer = importer.slice(5);
+        const { id: id2 } = await this.options.resolveId(dep, importer) || {};
+        dep = id2 && isAbsolute(id2) ? `/@fs/${id2}` : id2 || dep;
+      }
+      return dep;
+    };
+    id = await resolveId(id, 2);
     const requestStubs = this.options.requestStubs || DEFAULT_REQUEST_STUBS;
     if (id in requestStubs)
       return requestStubs[id];
-    const { code: transformed, externalize } = await this.options.fetchModule(id);
+    let { code: transformed, externalize } = await this.options.fetchModule(id);
     if (externalize) {
       const mod = await this.interopedImport(externalize);
       this.moduleCache.set(fsPath, { exports: mod });
@@ -128,18 +136,26 @@ ${getStack()}`), 2e3);
         return exports.default;
       }
     };
+    let require;
     const context = this.prepareContext({
       __vite_ssr_import__: request,
       __vite_ssr_dynamic_import__: request,
       __vite_ssr_exports__: exports,
       __vite_ssr_exportAll__: (obj) => exportAll(exports, obj),
       __vite_ssr_import_meta__: { url },
-      require: createRequire(url),
+      __vitest_resolve_id__: resolveId,
+      require: (path) => {
+        if (!require)
+          require = createRequire(url);
+        return require(path);
+      },
       exports,
       module: moduleProxy,
       __filename,
       __dirname: dirname(__filename)
     });
+    if (transformed[0] === "#")
+      transformed = transformed.replace(/^\#\!.*/, (s) => " ".repeat(s.length));
     const fn = vm.runInThisContext(`'use strict';async (${Object.keys(context).join(",")})=>{{${transformed}
 }}`, {
       filename: fsPath,
@@ -152,7 +168,7 @@ ${getStack()}`), 2e3);
     return context;
   }
   shouldResolveId(dep) {
-    if (isNodeBuiltin(dep) || dep in (this.options.requestStubs || DEFAULT_REQUEST_STUBS))
+    if (isNodeBuiltin(dep) || dep in (this.options.requestStubs || DEFAULT_REQUEST_STUBS) || dep.startsWith("/@vite"))
       return false;
     return !isAbsolute(dep) || !extname(dep);
   }

package/dist/client.cjs

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var client = require('./client-e24a0d42.js');
+var client = require('./client-06b06913.js');
 require('module');
 require('url');
 require('vm');

package/dist/client.js

@@ -1,4 +1,4 @@
-export { D as DEFAULT_REQUEST_STUBS, M as ModuleCacheMap, V as ViteNodeRunner } from './client-b20a0596.js';
+export { D as DEFAULT_REQUEST_STUBS, M as ModuleCacheMap, V as ViteNodeRunner } from './client-da5aac97.js';
 import 'module';
 import 'url';
 import 'vm';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vite-node",
   "type": "module",
-  "version": "0.10.3",
+  "version": "0.11.0",
   "description": "Vite as Node.js runtime",
   "homepage": "https://github.com/vitest-dev/vitest/blob/main/packages/vite-node#readme",
   "bugs": {
@@ -58,14 +58,13 @@
   },
   "dependencies": {
     "kolorist": "^1.5.1",
-    "minimist": "^1.2.6",
     "mlly": "^0.5.2",
     "pathe": "^0.2.0",
     "vite": "^2.9.7"
   },
   "devDependencies": {
-    "@types/minimist": "^1.2.2",
-    "rollup": "^2.71.1"
+    "cac": "^6.7.12",
+    "rollup": "^2.72.1"
   },
   "engines": {
     "node": ">=v14.16.0"