From 0d0f35f6930c98e034bcf61a53ce21d3b63fdec2 Mon Sep 17 00:00:00 2001
From: Vladimir <sleuths.slews0s@icloud.com>
Date: Mon, 28 Aug 2023 11:32:22 +0200
Subject: [PATCH] fix(vitest): "vi" doesn't rely on context (#4031)

---
 packages/vitest/src/integrations/vi.ts | 47 +++++++++++++-------------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/packages/vitest/src/integrations/vi.ts b/packages/vitest/src/integrations/vi.ts
index 5b5114cada71..cfac7728d788 100644
--- a/packages/vitest/src/integrations/vi.ts
+++ b/packages/vitest/src/integrations/vi.ts
@@ -200,7 +200,7 @@ function createVitest(): VitestUtils {
     return stack?.file || ''
   }
 
-  return {
+  const utils: VitestUtils = {
     useFakeTimers(config?: FakeTimerInstallOpts) {
       if (config) {
         _timers.configure(config)
@@ -210,58 +210,58 @@ function createVitest(): VitestUtils {
         _timers.configure(workerState.config.fakeTimers)
       }
       _timers.useFakeTimers()
-      return this
+      return utils
     },
 
     useRealTimers() {
       _timers.useRealTimers()
       _mockedDate = null
-      return this
+      return utils
     },
 
     runOnlyPendingTimers() {
       _timers.runOnlyPendingTimers()
-      return this
+      return utils
     },
 
     async runOnlyPendingTimersAsync() {
       await _timers.runOnlyPendingTimersAsync()
-      return this
+      return utils
     },
 
     runAllTimers() {
       _timers.runAllTimers()
-      return this
+      return utils
     },
 
     async runAllTimersAsync() {
       await _timers.runAllTimersAsync()
-      return this
+      return utils
     },
 
     runAllTicks() {
       _timers.runAllTicks()
-      return this
+      return utils
     },
 
     advanceTimersByTime(ms: number) {
       _timers.advanceTimersByTime(ms)
-      return this
+      return utils
     },
 
     async advanceTimersByTimeAsync(ms: number) {
       await _timers.advanceTimersByTimeAsync(ms)
-      return this
+      return utils
     },
 
     advanceTimersToNextTimer() {
       _timers.advanceTimersToNextTimer()
-      return this
+      return utils
     },
 
     async advanceTimersToNextTimerAsync() {
       await _timers.advanceTimersToNextTimerAsync()
-      return this
+      return utils
     },
 
     getTimerCount() {
@@ -272,7 +272,7 @@ function createVitest(): VitestUtils {
       const date = time instanceof Date ? time : new Date(time)
       _mockedDate = date
       _timers.setSystemTime(date)
-      return this
+      return utils
     },
 
     getMockedSystemTime() {
@@ -285,7 +285,7 @@ function createVitest(): VitestUtils {
 
     clearAllTimers() {
       _timers.clearAllTimers()
-      return this
+      return utils
     },
 
     // mocks
@@ -337,17 +337,17 @@ function createVitest(): VitestUtils {
 
     clearAllMocks() {
       spies.forEach(spy => spy.mockClear())
-      return this
+      return utils
     },
 
     resetAllMocks() {
       spies.forEach(spy => spy.mockReset())
-      return this
+      return utils
     },
 
     restoreAllMocks() {
       spies.forEach(spy => spy.mockRestore())
-      return this
+      return utils
     },
 
     stubGlobal(name: string | symbol | number, value: any) {
@@ -359,14 +359,14 @@ function createVitest(): VitestUtils {
         configurable: true,
         enumerable: true,
       })
-      return this
+      return utils
     },
 
     stubEnv(name: string, value: string) {
       if (!_stubsEnv.has(name))
         _stubsEnv.set(name, process.env[name])
       process.env[name] = value
-      return this
+      return utils
     },
 
     unstubAllGlobals() {
@@ -377,7 +377,7 @@ function createVitest(): VitestUtils {
           Object.defineProperty(globalThis, name, original)
       })
       _stubsGlobal.clear()
-      return this
+      return utils
     },
 
     unstubAllEnvs() {
@@ -388,13 +388,13 @@ function createVitest(): VitestUtils {
           process.env[name] = original
       })
       _stubsEnv.clear()
-      return this
+      return utils
     },
 
     resetModules() {
       const state = getWorkerState()
       resetModules(state.moduleCache)
-      return this
+      return utils
     },
 
     async dynamicImportSettled() {
@@ -414,8 +414,9 @@ function createVitest(): VitestUtils {
         Object.assign(state.config, _config)
       }
     },
-
   }
+
+  return utils
 }
 
 export const vitest = createVitest()