@vitest/runner 3.0.1 → 3.0.2

package/dist/index.js

@@ -16,6 +16,7 @@ class PendingError extends Error {
   taskId;
 }
 
+const now$2 = Date.now;
 const collectorContext = {
   tasks: [],
   currentSuite: null
@@ -36,19 +37,42 @@ function withTimeout(fn, timeout, isHook = false) {
   }
   const { setTimeout, clearTimeout } = getSafeTimers();
   return function runWithTimeout(...args) {
-    return Promise.race([
-      new Promise((resolve, reject) => {
-        var _a;
-        const timer = setTimeout(() => {
-          clearTimeout(timer);
-          reject(new Error(makeTimeoutMsg(isHook, timeout)));
-        }, timeout);
-        (_a = timer.unref) == null ? undefined : _a.call(timer);
-      }),
-      Promise.resolve(fn(...args)).then((result) => {
-        return new Promise((resolve) => setTimeout(resolve, 0, result));
-      })
-    ]);
+    const startTime = now$2();
+    return new Promise((resolve_, reject_) => {
+      var _a;
+      const timer = setTimeout(() => {
+        clearTimeout(timer);
+        reject(new Error(makeTimeoutMsg(isHook, timeout)));
+      }, timeout);
+      (_a = timer.unref) == null ? undefined : _a.call(timer);
+      function resolve(result) {
+        clearTimeout(timer);
+        resolve_(result);
+      }
+      function reject(error) {
+        clearTimeout(timer);
+        reject_(error);
+      }
+      try {
+        const result = fn(...args);
+        if (typeof result === "object" && result != null && typeof result.then === "function") {
+          result.then(
+            (result2) => {
+              if (now$2() - startTime >= timeout) {
+                reject(new Error(makeTimeoutMsg(isHook, timeout)));
+              } else {
+                resolve(result2);
+              }
+            },
+            reject
+          );
+        } else {
+          resolve(result);
+        }
+      } catch (error) {
+        reject(error);
+      }
+    });
   };
 }
 function createTestContext(test, runner) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/runner",
   "type": "module",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "Vitest test runner",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -39,7 +39,7 @@
   ],
   "dependencies": {
     "pathe": "^2.0.1",
-    "@vitest/utils": "3.0.1"
+    "@vitest/utils": "3.0.2"
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",