vitest 0.25.4 → 0.25.6

package/dist/browser.js

@@ -1,7 +1,7 @@
-export { c as createExpect, d as describe, e as expect, i as it, s as suite, t as test } from './chunk-runtime-chain.315721df.js';
-import { e as dist } from './chunk-runtime-test-state.7c288e2d.js';
-export { a as afterAll, d as afterEach, f as assertType, b as beforeAll, c as beforeEach, o as onTestFailed } from './chunk-runtime-test-state.7c288e2d.js';
-export { a as setupGlobalEnv, s as startTests } from './chunk-runtime-setup.80b27439.js';
+export { c as createExpect, d as describe, e as expect, i as it, s as suite, t as test } from './chunk-runtime-chain.dd978482.js';
+import { e as dist } from './chunk-runtime-test-state.0037e2e0.js';
+export { a as afterAll, d as afterEach, f as assertType, b as beforeAll, c as beforeEach, o as onTestFailed } from './chunk-runtime-test-state.0037e2e0.js';
+export { a as setupGlobalEnv, s as startTests } from './chunk-runtime-setup.bd2deed4.js';
 import * as chai from 'chai';
 export { chai };
 export { assert, should } from 'chai';
@@ -13,15 +13,15 @@ import 'tty';
 import 'url';
 import 'local-pkg';
 import './vendor-_commonjsHelpers.addc3445.js';
-import './chunk-runtime-rpc.b368762d.js';
-import './chunk-utils-timers.b81cda77.js';
+import './chunk-runtime-rpc.42aebbb9.js';
+import './chunk-utils-timers.793fd179.js';
 import 'fs';
 import './chunk-utils-source-map.29ff1088.js';
 import './spy.js';
 import 'tinyspy';
 import 'perf_hooks';
 import './chunk-integrations-coverage.befed097.js';
-import './chunk-runtime-error.95c286d7.js';
+import './chunk-runtime-error.616e92ca.js';
 import './vendor-source-map-support.1ce17397.js';
 import 'source-map';
 import './chunk-env-node.67948209.js';

package/dist/{chunk-api-setup.1c8923c4.js → chunk-api-setup.5669c9a4.js}

@@ -1,5 +1,5 @@
 import { promises } from 'fs';
-import { c as createBirpc } from './chunk-vite-node-source-map.61c5ea66.js';
+import { c as createBirpc } from './chunk-vite-node-source-map.2b1f492a.js';
 import require$$0$1 from 'stream';
 import require$$0 from 'zlib';
 import require$$3 from 'net';
@@ -12,7 +12,7 @@ import url from 'url';
 import { A as API_PATH } from './chunk-utils-env.03f840f2.js';
 import 'module';
 import 'vm';
-import './chunk-vite-node-utils.abe05c5c.js';
+import './chunk-vite-node-utils.0e4a6a88.js';
 import 'acorn';
 import 'path';
 import 'assert';

package/dist/{chunk-integrations-globals.789c69e2.js → chunk-integrations-globals.57158eb5.js}

@@ -1,16 +1,16 @@
 import { m as globalApis } from './chunk-utils-env.03f840f2.js';
-import { i as index } from './chunk-runtime-test-state.7c288e2d.js';
+import { i as index } from './chunk-runtime-test-state.0037e2e0.js';
 import 'tty';
 import 'url';
 import 'path';
-import './chunk-runtime-chain.315721df.js';
+import './chunk-runtime-chain.dd978482.js';
 import 'util';
 import 'chai';
 import './chunk-typecheck-constants.ed987901.js';
 import 'local-pkg';
 import './vendor-_commonjsHelpers.addc3445.js';
-import './chunk-runtime-rpc.b368762d.js';
-import './chunk-utils-timers.b81cda77.js';
+import './chunk-runtime-rpc.42aebbb9.js';
+import './chunk-utils-timers.793fd179.js';
 import 'fs';
 import './chunk-utils-source-map.29ff1088.js';
 import './spy.js';

package/dist/{chunk-runtime-chain.315721df.js → chunk-runtime-chain.dd978482.js}

@@ -3,10 +3,10 @@ import * as chai$2 from 'chai';
 import { expect, AssertionError, util } from 'chai';
 import { i as isObject, b as getCallLastIndex, s as slash, g as getWorkerState, c as getNames, d as assertTypes, e as getFullName, o as objectAttr, n as noop, f as isRunningInTest, h as isRunningInBenchmark } from './chunk-typecheck-constants.ed987901.js';
 import { c as commonjsGlobal } from './vendor-_commonjsHelpers.addc3445.js';
-import { r as rpc } from './chunk-runtime-rpc.b368762d.js';
+import { r as rpc } from './chunk-runtime-rpc.42aebbb9.js';
 import fs, { promises } from 'fs';
 import { j as join, d as dirname, p as picocolors } from './chunk-utils-env.03f840f2.js';
-import { p as plugins_1, f as format_1, u as unifiedDiff, a as stringify, m as matcherUtils, s as safeSetTimeout, b as safeClearTimeout } from './chunk-utils-timers.b81cda77.js';
+import { p as plugins_1, f as format_1, u as unifiedDiff, a as stringify, m as matcherUtils, s as safeSetTimeout, b as safeClearTimeout } from './chunk-utils-timers.793fd179.js';
 import { a as posToNumber, n as numberToPos, l as lineSplitRE, p as parseStacktrace } from './chunk-utils-source-map.29ff1088.js';
 import { isMockFunction } from './spy.js';
 

package/dist/{chunk-runtime-error.95c286d7.js → chunk-runtime-error.616e92ca.js}

@@ -1,6 +1,6 @@
 import util$1 from 'util';
 import { util } from 'chai';
-import { a as stringify } from './chunk-utils-timers.b81cda77.js';
+import { a as stringify } from './chunk-utils-timers.793fd179.js';
 import { w as deepClone, x as getType } from './chunk-typecheck-constants.ed987901.js';
 
 const IS_RECORD_SYMBOL = "@@__IMMUTABLE_RECORD__@@";

package/dist/{chunk-runtime-mocker.cdc0ec57.js → chunk-runtime-mocker.bf08ae09.js}

@@ -1,8 +1,8 @@
-import { V as ViteNodeRunner } from './chunk-vite-node-source-map.61c5ea66.js';
+import { V as ViteNodeRunner } from './chunk-vite-node-source-map.2b1f492a.js';
 import { normalizePath } from 'vite';
 import { g as getWorkerState, J as mergeSlashes, s as slash, x as getType, K as getAllMockableProperties } from './chunk-typecheck-constants.ed987901.js';
 import { existsSync, readdirSync } from 'fs';
-import { n as normalizeRequestId, p as pathFromRoot, i as isNodeBuiltin } from './chunk-vite-node-utils.abe05c5c.js';
+import { c as normalizeRequestId, p as pathFromRoot, i as isNodeBuiltin } from './chunk-vite-node-utils.0e4a6a88.js';
 import { p as picocolors, d as dirname, j as join, c as basename, l as extname, b as resolve, e as distDir } from './chunk-utils-env.03f840f2.js';
 
 class RefTracker {
@@ -318,14 +318,18 @@ class VitestRunner extends ViteNodeRunner {
   prepareContext(context) {
     const request = context.__vite_ssr_import__;
     const resolveId = context.__vitest_resolve_id__;
+    const resolveUrl = async (dep) => {
+      const [id, resolvedId] = await resolveId(dep);
+      return resolvedId || id;
+    };
     const mocker = new VitestMocker(this.options, this.moduleCache, request);
     const workerState = getWorkerState();
     if (workerState.filepath && normalizePath(workerState.filepath) === normalizePath(context.__filename)) {
       Object.defineProperty(context.__vite_ssr_import_meta__, "vitest", { get: () => globalThis.__vitest_index__ });
     }
     return Object.assign(context, {
-      __vite_ssr_import__: async (dep) => mocker.requestWithMock(await resolveId(dep)),
-      __vite_ssr_dynamic_import__: async (dep) => mocker.requestWithMock(await resolveId(dep)),
+      __vite_ssr_import__: async (dep) => mocker.requestWithMock(await resolveUrl(dep)),
+      __vite_ssr_dynamic_import__: async (dep) => mocker.requestWithMock(await resolveUrl(dep)),
       __vitest_mocker__: mocker
     });
   }

package/dist/{chunk-runtime-rpc.b368762d.js → chunk-runtime-rpc.42aebbb9.js}

@@ -1,5 +1,5 @@
 import { g as getWorkerState } from './chunk-typecheck-constants.ed987901.js';
-import { s as safeSetTimeout } from './chunk-utils-timers.b81cda77.js';
+import { s as safeSetTimeout } from './chunk-utils-timers.793fd179.js';
 
 const safeRandom = Math.random;
 function withSafeTimers(fn) {

package/dist/{chunk-runtime-setup.80b27439.js → chunk-runtime-setup.bd2deed4.js}

@@ -1,14 +1,14 @@
 import { performance } from 'perf_hooks';
 import { s as someTasksAreOnly, i as interpretTaskModes, t as takeCoverageInsideWorker, p as pLimit } from './chunk-integrations-coverage.befed097.js';
-import { r as resetRunOnceCounter, i as index, v as vi, s as setCurrentTest } from './chunk-runtime-test-state.7c288e2d.js';
+import { r as resetRunOnceCounter, i as index, v as vi, s as setCurrentTest } from './chunk-runtime-test-state.0037e2e0.js';
 import { g as getWorkerState, R as RealDate, t as toArray, k as relativePath, h as isRunningInBenchmark, p as partitionSuiteChildren, l as shuffle, q as hasTests, u as hasFailed, v as createDefer, e as getFullName } from './chunk-typecheck-constants.ed987901.js';
-import { f as clearCollectorContext, h as defaultSuite, j as setHooks, k as getHooks, l as collectorContext, m as getBenchOptions, n as getFn, o as setState, G as GLOBAL_EXPECT, p as getState } from './chunk-runtime-chain.315721df.js';
-import { r as rpc } from './chunk-runtime-rpc.b368762d.js';
-import { p as processError } from './chunk-runtime-error.95c286d7.js';
+import { f as clearCollectorContext, h as defaultSuite, j as setHooks, k as getHooks, l as collectorContext, m as getBenchOptions, n as getFn, o as setState, G as GLOBAL_EXPECT, p as getState } from './chunk-runtime-chain.dd978482.js';
+import { r as rpc } from './chunk-runtime-rpc.42aebbb9.js';
+import { p as processError } from './chunk-runtime-error.616e92ca.js';
 import { s as sourceMapSupport } from './vendor-source-map-support.1ce17397.js';
 import { e as environments } from './chunk-env-node.67948209.js';
 import { i as isNode, a as isBrowser } from './chunk-utils-env.03f840f2.js';
-import { b as safeClearTimeout, s as safeSetTimeout } from './chunk-utils-timers.b81cda77.js';
+import { b as safeClearTimeout, s as safeSetTimeout } from './chunk-utils-timers.793fd179.js';
 
 function installSourcemapsSupport(options) {
   sourceMapSupport.exports.install({
@@ -46,7 +46,7 @@ async function setupGlobalEnv(config) {
     await setupConsoleLogSpy();
   }
   if (config.globals)
-    (await import('./chunk-integrations-globals.789c69e2.js')).registerApiGlobally();
+    (await import('./chunk-integrations-globals.57158eb5.js')).registerApiGlobally();
 }
 function setupDefines(defines) {
   for (const key in defines)
@@ -346,7 +346,7 @@ const callCleanupHooks = async (cleanups) => {
 async function runTest(test) {
   var _a, _b, _c;
   if (test.mode !== "run") {
-    const { getSnapshotClient } = await import('./chunk-runtime-chain.315721df.js').then(function (n) { return n.r; });
+    const { getSnapshotClient } = await import('./chunk-runtime-chain.dd978482.js').then(function (n) { return n.r; });
     getSnapshotClient().skipTestSnapshots(test);
     return;
   }
@@ -363,7 +363,7 @@ async function runTest(test) {
   clearModuleMocks();
   setCurrentTest(test);
   if (isNode) {
-    const { getSnapshotClient } = await import('./chunk-runtime-chain.315721df.js').then(function (n) { return n.r; });
+    const { getSnapshotClient } = await import('./chunk-runtime-chain.dd978482.js').then(function (n) { return n.r; });
     await getSnapshotClient().setTest(test);
   }
   const workerState = getWorkerState();
@@ -426,7 +426,7 @@ async function runTest(test) {
     console.error(test.result.error.message, test.result.error.stackStr);
   setCurrentTest(void 0);
   if (isNode) {
-    const { getSnapshotClient } = await import('./chunk-runtime-chain.315721df.js').then(function (n) { return n.r; });
+    const { getSnapshotClient } = await import('./chunk-runtime-chain.dd978482.js').then(function (n) { return n.r; });
     getSnapshotClient().clearTest();
   }
   test.result.duration = now() - start;
@@ -632,7 +632,7 @@ async function startTestsBrowser(paths, config) {
 async function startTestsNode(paths, config) {
   const files = await collectTests(paths, config);
   rpc().onCollected(files);
-  const { getSnapshotClient } = await import('./chunk-runtime-chain.315721df.js').then(function (n) { return n.r; });
+  const { getSnapshotClient } = await import('./chunk-runtime-chain.dd978482.js').then(function (n) { return n.r; });
   getSnapshotClient().clear();
   await runFiles(files, config);
   const coverage = await takeCoverageInsideWorker(config.coverage);

package/dist/{chunk-runtime-test-state.7c288e2d.js → chunk-runtime-test-state.0037e2e0.js}

@@ -1,10 +1,10 @@
-import { g as getCurrentSuite, w as withTimeout, a as getDefaultHookTimeout, s as suite, t as test, d as describe, i as it, b as bench, c as createExpect, e as globalExpect } from './chunk-runtime-chain.315721df.js';
+import { g as getCurrentSuite, w as withTimeout, a as getDefaultHookTimeout, s as suite, t as test, d as describe, i as it, b as bench, c as createExpect, e as globalExpect } from './chunk-runtime-chain.dd978482.js';
 import { g as getWorkerState, R as RealDate, r as resetDate, m as mockDate, a as resetModules } from './chunk-typecheck-constants.ed987901.js';
 import { p as parseStacktrace } from './chunk-utils-source-map.29ff1088.js';
 import { c as commonjsGlobal } from './vendor-_commonjsHelpers.addc3445.js';
 import util from 'util';
 import { spyOn, fn, isMockFunction, spies } from './spy.js';
-import { s as safeSetTimeout } from './chunk-utils-timers.b81cda77.js';
+import { s as safeSetTimeout } from './chunk-utils-timers.793fd179.js';
 import * as chai from 'chai';
 import { assert, should } from 'chai';
 

package/dist/{chunk-vite-node-externalize.ddcbafa3.js → chunk-vite-node-externalize.328ed604.js}

@@ -12,10 +12,10 @@ import util$2 from 'util';
 import require$$0$1 from 'stream';
 import require$$2 from 'events';
 import { c as commonjsGlobal } from './vendor-_commonjsHelpers.addc3445.js';
-import { w as withInlineSourcemap, c as createBirpc, V as ViteNodeRunner } from './chunk-vite-node-source-map.61c5ea66.js';
+import { w as withInlineSourcemap, c as createBirpc, V as ViteNodeRunner } from './chunk-vite-node-source-map.2b1f492a.js';
 import { performance } from 'perf_hooks';
 import createDebug from 'debug';
-import { i as isNodeBuiltin, a as isValidNodeImport, s as slash$1, t as toArray, b as toFilePath } from './chunk-vite-node-utils.abe05c5c.js';
+import { i as isNodeBuiltin, a as isValidNodeImport, s as slash$1, t as toArray, n as normalizeModuleId, b as toFilePath } from './chunk-vite-node-utils.0e4a6a88.js';
 import { writeFile, rm } from 'fs/promises';
 import { e as execa } from './vendor-index.737c3cff.js';
 import { SourceMapConsumer } from 'source-map';
@@ -24,7 +24,7 @@ import { parse as parse$4 } from 'acorn';
 import { ancestor } from 'acorn-walk';
 import { MessageChannel } from 'worker_threads';
 import { Tinypool } from 'tinypool';
-import { c as stripAnsi, d as safeSetInterval, e as safeClearInterval, g as cliTruncate, s as safeSetTimeout, h as stringWidth, i as ansiStyles, j as sliceAnsi, a as stringify$5, u as unifiedDiff, b as safeClearTimeout } from './chunk-utils-timers.b81cda77.js';
+import { c as stripAnsi, d as safeSetInterval, e as safeClearInterval, g as cliTruncate, s as safeSetTimeout, h as stringWidth, i as ansiStyles, j as sliceAnsi, a as stringify$5, u as unifiedDiff, b as safeClearTimeout } from './chunk-utils-timers.793fd179.js';
 import { p as parseStacktrace, a as posToNumber, l as lineSplitRE } from './chunk-utils-source-map.29ff1088.js';
 import { resolveModule } from 'local-pkg';
 import { createHash } from 'crypto';
@@ -35,7 +35,7 @@ import { stripLiteral } from 'strip-literal';
 import require$$0$2 from 'readline';
 import { p as prompts } from './vendor-index.9f20a9be.js';
 
-var version$1 = "0.25.4";
+var version$1 = "0.25.6";
 
 class EndError extends Error {
 	constructor(value) {
@@ -6937,7 +6937,6 @@ ${result.code}`, "utf-8");
 }
 
 const debugRequest = createDebug("vite-node:server:request");
-const RealDate = Date;
 class ViteNodeServer {
   constructor(server, options = {}) {
     this.server = server;
@@ -6984,6 +6983,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,
@@ -7023,10 +7023,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) {
@@ -7040,7 +7041,7 @@ class ViteNodeServer {
     }
     this.fetchCache.set(filePath, {
       duration,
-      timestamp,
+      timestamp: time,
       result
     });
     return result;
@@ -10206,7 +10207,7 @@ createLogUpdate(process$1.stdout);
 
 createLogUpdate(process$1.stderr);
 
-var version = "0.25.4";
+var version = "0.25.6";
 
 function fileFromParsedStack(stack) {
   var _a, _b;
@@ -10568,8 +10569,7 @@ class Vitest {
     this.cache.results.setConfig(resolved.root, resolved.cache);
     try {
       await this.cache.results.readFromCache();
-    } catch (err) {
-      this.logger.error(`[vitest] Error, while trying to parse cache in ${this.cache.results.getCachePath()}:`, err);
+    } catch {
     }
   }
   async initCoverageProvider() {
@@ -10732,6 +10732,7 @@ class Vitest {
     return runningTests;
   }
   async runFiles(paths) {
+    paths = Array.from(new Set(paths));
     await this.runningPromise;
     this.state.startCollectingPaths();
     this.runningPromise = (async () => {
@@ -10796,6 +10797,9 @@ class Vitest {
     }
   }
   async scheduleRerun(triggerId) {
+    const mod = this.server.moduleGraph.getModuleById(triggerId);
+    if (mod)
+      mod.lastHMRTimestamp = Date.now();
     const currentCount = this.restartsCount;
     safeClearTimeout(this._rerunTimer);
     await this.runningPromise;
@@ -11382,7 +11386,7 @@ async function VitestPlugin(options = {}, ctx = new Vitest("test")) {
         try {
           await ctx.setServer(options, server);
           if (options.api && options.watch)
-            (await import('./chunk-api-setup.1c8923c4.js')).setup(ctx);
+            (await import('./chunk-api-setup.5669c9a4.js')).setup(ctx);
         } catch (err) {
           ctx.logger.printError(err, true);
           process.exit(1);

package/dist/{chunk-vite-node-source-map.61c5ea66.js → chunk-vite-node-source-map.2b1f492a.js}

@@ -2,24 +2,28 @@ import { createRequire } from 'module';
 import { pathToFileURL, fileURLToPath } from 'url';
 import vm from 'vm';
 import { b as resolve, d as dirname, g as isAbsolute, l as extname } from './chunk-utils-env.03f840f2.js';
-import { s as slash, n as normalizeRequestId, b as toFilePath, c as isPrimitive, i as isNodeBuiltin, d as normalizeModuleId, m as mergeSlashes } from './chunk-vite-node-utils.abe05c5c.js';
+import { s as slash, c as normalizeRequestId, b as toFilePath, d as cleanUrl, e as isPrimitive, i as isNodeBuiltin, n as normalizeModuleId } from './chunk-vite-node-utils.0e4a6a88.js';
 import createDebug from 'debug';
 import './vendor-source-map-support.1ce17397.js';
 
 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;
 }
@@ -171,10 +175,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")}`;
@@ -190,28 +194,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);
@@ -220,7 +238,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, {
@@ -229,9 +248,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 = {};
@@ -245,7 +261,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) {
@@ -287,7 +303,7 @@ ${getStack()}`), 2e3);
     const code = `${codeDefinition}${transformed}
 }}`;
     const fn = vm.runInThisContext(code, {
-      filename: fsPath,
+      filename: __filename,
       lineOffset: 0,
       columnOffset: -codeDefinition.length
     });

package/dist/{chunk-vite-node-utils.abe05c5c.js → chunk-vite-node-utils.0e4a6a88.js}

@@ -1334,14 +1334,14 @@ const isWindows = process.platform === "win32";
 function slash(str) {
   return str.replace(/\\/g, "/");
 }
-function mergeSlashes(str) {
-  return str.replace(/\/\//g, "/");
-}
 function normalizeRequestId(id, base) {
   if (base && id.startsWith(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(/^\/+/, "/");
 }
@@ -1382,4 +1382,4 @@ function toArray(array) {
   return [array];
 }
 
-export { isValidNodeImport as a, toFilePath as b, isPrimitive as c, normalizeModuleId as d, hasCJSSyntax as h, isNodeBuiltin as i, mergeSlashes as m, normalizeRequestId as n, pathFromRoot as p, slash as s, toArray as t };
+export { isValidNodeImport as a, toFilePath as b, normalizeRequestId as c, cleanUrl as d, isPrimitive as e, hasCJSSyntax as h, isNodeBuiltin as i, normalizeModuleId as n, pathFromRoot as p, slash as s, toArray as t };

package/dist/cli.js

@@ -1,6 +1,6 @@
 import { p as picocolors, n as normalize } from './chunk-utils-env.03f840f2.js';
 import { EventEmitter } from 'events';
-import { v as version, s as startVitest, d as divider } from './chunk-vite-node-externalize.ddcbafa3.js';
+import { v as version, s as startVitest, d as divider } from './chunk-vite-node-externalize.328ed604.js';
 import 'tty';
 import 'url';
 import 'path';
@@ -16,10 +16,10 @@ import 'os';
 import 'util';
 import 'stream';
 import './vendor-_commonjsHelpers.addc3445.js';
-import './chunk-vite-node-source-map.61c5ea66.js';
+import './chunk-vite-node-source-map.2b1f492a.js';
 import 'module';
 import 'vm';
-import './chunk-vite-node-utils.abe05c5c.js';
+import './chunk-vite-node-utils.0e4a6a88.js';
 import 'acorn';
 import 'assert';
 import 'debug';
@@ -34,7 +34,7 @@ import './vendor-index.e1d4cf84.js';
 import 'acorn-walk';
 import 'worker_threads';
 import 'tinypool';
-import './chunk-utils-timers.b81cda77.js';
+import './chunk-utils-timers.793fd179.js';
 import './chunk-utils-source-map.29ff1088.js';
 import 'crypto';
 import './vendor-index.9c919048.js';

package/dist/entry.js

@@ -1,26 +1,26 @@
 import { promises } from 'fs';
 import { g as getWorkerState, a as resetModules } from './chunk-typecheck-constants.ed987901.js';
-import { v as vi } from './chunk-runtime-test-state.7c288e2d.js';
+import { v as vi } from './chunk-runtime-test-state.0037e2e0.js';
 import { a as envs } from './chunk-env-node.67948209.js';
-import { a as setupGlobalEnv, s as startTests, w as withEnv } from './chunk-runtime-setup.80b27439.js';
+import { a as setupGlobalEnv, s as startTests, w as withEnv } from './chunk-runtime-setup.bd2deed4.js';
 import 'path';
 import './chunk-utils-env.03f840f2.js';
 import 'tty';
 import 'url';
 import 'local-pkg';
-import './chunk-runtime-chain.315721df.js';
+import './chunk-runtime-chain.dd978482.js';
 import 'util';
 import 'chai';
 import './vendor-_commonjsHelpers.addc3445.js';
-import './chunk-runtime-rpc.b368762d.js';
-import './chunk-utils-timers.b81cda77.js';
+import './chunk-runtime-rpc.42aebbb9.js';
+import './chunk-utils-timers.793fd179.js';
 import './chunk-utils-source-map.29ff1088.js';
 import './spy.js';
 import 'tinyspy';
 import 'console';
 import 'perf_hooks';
 import './chunk-integrations-coverage.befed097.js';
-import './chunk-runtime-error.95c286d7.js';
+import './chunk-runtime-error.616e92ca.js';
 import './vendor-source-map-support.1ce17397.js';
 import 'source-map';
 

package/dist/index.js

@@ -1,6 +1,6 @@
-export { b as bench, c as createExpect, d as describe, e as expect, i as it, s as suite, t as test } from './chunk-runtime-chain.315721df.js';
-import { e as dist } from './chunk-runtime-test-state.7c288e2d.js';
-export { a as afterAll, d as afterEach, f as assertType, b as beforeAll, c as beforeEach, k as getRunningMode, h as isFirstRun, l as isWatchMode, o as onTestFailed, g as runOnce, v as vi, j as vitest, w as withCallback } from './chunk-runtime-test-state.7c288e2d.js';
+export { b as bench, c as createExpect, d as describe, e as expect, i as it, s as suite, t as test } from './chunk-runtime-chain.dd978482.js';
+import { e as dist } from './chunk-runtime-test-state.0037e2e0.js';
+export { a as afterAll, d as afterEach, f as assertType, b as beforeAll, c as beforeEach, k as getRunningMode, h as isFirstRun, l as isWatchMode, o as onTestFailed, g as runOnce, v as vi, j as vitest, w as withCallback } from './chunk-runtime-test-state.0037e2e0.js';
 import * as chai from 'chai';
 export { chai };
 export { assert, should } from 'chai';
@@ -12,8 +12,8 @@ import 'tty';
 import 'url';
 import 'local-pkg';
 import './vendor-_commonjsHelpers.addc3445.js';
-import './chunk-runtime-rpc.b368762d.js';
-import './chunk-utils-timers.b81cda77.js';
+import './chunk-runtime-rpc.42aebbb9.js';
+import './chunk-utils-timers.793fd179.js';
 import 'fs';
 import './chunk-utils-source-map.29ff1088.js';
 import './spy.js';

package/dist/loader.js

@@ -1,6 +1,6 @@
 import { pathToFileURL } from 'url';
 import { readFile } from 'fs/promises';
-import { i as isNodeBuiltin, d as normalizeModuleId, h as hasCJSSyntax } from './chunk-vite-node-utils.abe05c5c.js';
+import { i as isNodeBuiltin, n as normalizeModuleId, h as hasCJSSyntax } from './chunk-vite-node-utils.0e4a6a88.js';
 import { g as getWorkerState } from './chunk-typecheck-constants.ed987901.js';
 import 'fs';
 import './chunk-utils-env.03f840f2.js';

package/dist/node.js

@@ -1,5 +1,5 @@
-export { B as BaseSequencer, V as VitestPlugin, c as createVitest, s as startVitest } from './chunk-vite-node-externalize.ddcbafa3.js';
-export { V as VitestRunner } from './chunk-runtime-mocker.cdc0ec57.js';
+export { B as BaseSequencer, V as VitestPlugin, c as createVitest, s as startVitest } from './chunk-vite-node-externalize.328ed604.js';
+export { V as VitestRunner } from './chunk-runtime-mocker.bf08ae09.js';
 import './chunk-utils-env.03f840f2.js';
 import 'tty';
 import 'url';
@@ -17,10 +17,10 @@ import 'util';
 import 'stream';
 import 'events';
 import './vendor-_commonjsHelpers.addc3445.js';
-import './chunk-vite-node-source-map.61c5ea66.js';
+import './chunk-vite-node-source-map.2b1f492a.js';
 import 'module';
 import 'vm';
-import './chunk-vite-node-utils.abe05c5c.js';
+import './chunk-vite-node-utils.0e4a6a88.js';
 import 'acorn';
 import 'assert';
 import 'debug';
@@ -35,7 +35,7 @@ import './vendor-index.e1d4cf84.js';
 import 'acorn-walk';
 import 'worker_threads';
 import 'tinypool';
-import './chunk-utils-timers.b81cda77.js';
+import './chunk-utils-timers.793fd179.js';
 import './chunk-utils-source-map.29ff1088.js';
 import 'crypto';
 import './vendor-index.9c919048.js';

package/dist/suite.js

@@ -1,15 +1,15 @@
 import 'util';
 import 'chai';
 import './chunk-typecheck-constants.ed987901.js';
-export { b as bench, f as clearCollectorContext, q as createSuiteHooks, h as defaultSuite, d as describe, g as getCurrentSuite, i as it, s as suite, t as test } from './chunk-runtime-chain.315721df.js';
+export { b as bench, f as clearCollectorContext, q as createSuiteHooks, h as defaultSuite, d as describe, g as getCurrentSuite, i as it, s as suite, t as test } from './chunk-runtime-chain.dd978482.js';
 import 'path';
 import './chunk-utils-env.03f840f2.js';
 import 'tty';
 import 'url';
 import 'local-pkg';
 import './vendor-_commonjsHelpers.addc3445.js';
-import './chunk-runtime-rpc.b368762d.js';
-import './chunk-utils-timers.b81cda77.js';
+import './chunk-runtime-rpc.42aebbb9.js';
+import './chunk-utils-timers.793fd179.js';
 import 'fs';
 import './chunk-utils-source-map.29ff1088.js';
 import './spy.js';

package/dist/worker.js

@@ -1,16 +1,16 @@
 import { b as resolve, e as distDir } from './chunk-utils-env.03f840f2.js';
-import { c as createBirpc, M as ModuleCacheMap } from './chunk-vite-node-source-map.61c5ea66.js';
+import { c as createBirpc, M as ModuleCacheMap } from './chunk-vite-node-source-map.2b1f492a.js';
 import { workerId } from 'tinypool';
 import { g as getWorkerState } from './chunk-typecheck-constants.ed987901.js';
-import { e as executeInViteNode } from './chunk-runtime-mocker.cdc0ec57.js';
-import { r as rpc } from './chunk-runtime-rpc.b368762d.js';
-import { p as processError } from './chunk-runtime-error.95c286d7.js';
+import { e as executeInViteNode } from './chunk-runtime-mocker.bf08ae09.js';
+import { r as rpc } from './chunk-runtime-rpc.42aebbb9.js';
+import { p as processError } from './chunk-runtime-error.616e92ca.js';
 import 'tty';
 import 'url';
 import 'path';
 import 'module';
 import 'vm';
-import './chunk-vite-node-utils.abe05c5c.js';
+import './chunk-vite-node-utils.0e4a6a88.js';
 import 'fs';
 import 'acorn';
 import 'assert';
@@ -20,7 +20,7 @@ import './vendor-source-map-support.1ce17397.js';
 import 'source-map';
 import 'local-pkg';
 import 'vite';
-import './chunk-utils-timers.b81cda77.js';
+import './chunk-utils-timers.793fd179.js';
 import 'chai';
 
 let _viteNode;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vitest",
   "type": "module",
-  "version": "0.25.4",
+  "version": "0.25.6",
   "description": "A blazing fast unit test framework powered by Vite",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -125,7 +125,7 @@
     "@types/natural-compare": "^1.4.1",
     "@types/prompts": "^2.4.1",
     "@types/sinonjs__fake-timers": "^8.1.2",
-    "@vitest/ui": "0.25.4",
+    "@vitest/ui": "0.25.6",
     "birpc": "^0.2.3",
     "cac": "^6.7.14",
     "chai-subset": "^1.6.0",
@@ -148,13 +148,13 @@
     "p-limit": "^4.0.0",
     "pathe": "^0.2.0",
     "picocolors": "^1.0.0",
-    "pkg-types": "^0.3.6",
+    "pkg-types": "^1.0.1",
     "pretty-format": "^27.5.1",
     "prompts": "^2.4.2",
     "rollup": "^2.79.1",
     "strip-ansi": "^7.0.1",
     "typescript": "^4.8.4",
-    "vite-node": "0.25.4",
+    "vite-node": "0.25.6",
     "ws": "^8.11.0"
   },
   "scripts": {