Revert "refactor: typing ExecuteOptions"

hi-ogawa · hi-ogawa · commit 8baf1cbd2ae3 · 2024-10-03T15:52:12.000+09:00
This reverts commit 2447160.
diff --git a/packages/vitest/src/public/execute.ts b/packages/vitest/src/public/execute.ts
@@ -1 +1 @@
-export { VitestExecutor, ExecuteOptions } from '../runtime/execute'
+export { VitestExecutor } from '../runtime/execute'
diff --git a/packages/web-worker/src/runner.ts b/packages/web-worker/src/runner.ts
@@ -1,8 +1,7 @@
-import type { ExecuteOptions } from 'vitest/execute'
 import { VitestExecutor } from 'vitest/execute'
 
 export class InlineWorkerRunner extends VitestExecutor {
-  constructor(options: ExecuteOptions, private context: any) {
+  constructor(options: any, private context: any) {
     // share the same mocker as main executor
     const mocker = (globalThis as any).__vitest_mocker__
     super(options)
diff --git a/packages/web-worker/src/shared-worker.ts b/packages/web-worker/src/shared-worker.ts
@@ -135,7 +135,7 @@ export function createSharedWorkerConstructor(): typeof SharedWorker {
 
           return runner.executeFile(fsPath).then(() => {
             // worker should be new every time, invalidate its sub dependency
-            runnerOptions.moduleCache!.invalidateSubDepTree([
+            runnerOptions.moduleCache.invalidateSubDepTree([
               fsPath,
               runner.mocker.getMockPath(fsPath),
             ])
diff --git a/packages/web-worker/src/utils.ts b/packages/web-worker/src/utils.ts
@@ -2,7 +2,6 @@ import { readFileSync as _readFileSync } from 'node:fs'
 import type { WorkerGlobalState } from 'vitest'
 import ponyfillStructuredClone from '@ungap/structured-clone'
 import createDebug from 'debug'
-import type { ExecuteOptions } from 'vitest/execute'
 import type { CloneOption } from './types'
 
 // keep the reference in case it was mocked
@@ -80,7 +79,7 @@ export function createMessageEvent(
   }
 }
 
-export function getRunnerOptions(): ExecuteOptions {
+export function getRunnerOptions(): any {
   const state = getWorkerState()
   const { config, rpc, moduleCache } = state
 
diff --git a/packages/web-worker/src/worker.ts b/packages/web-worker/src/worker.ts
@@ -132,7 +132,7 @@ export function createWorkerConstructor(
 
           return runner.executeFile(fsPath).then(() => {
             // worker should be new every time, invalidate its sub dependency
-            runnerOptions.moduleCache!.invalidateSubDepTree([
+            runnerOptions.moduleCache.invalidateSubDepTree([
               fsPath,
               runner.mocker.getMockPath(fsPath),
             ])

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-export { VitestExecutor, ExecuteOptions } from '../runtime/execute'`
	`1`	`+export { VitestExecutor } from '../runtime/execute'`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@ import { readFileSync as _readFileSync } from 'node:fs'`
`2`	`2`	`import type { WorkerGlobalState } from 'vitest'`
`3`	`3`	`import ponyfillStructuredClone from '@ungap/structured-clone'`
`4`	`4`	`import createDebug from 'debug'`
`5`		`-import type { ExecuteOptions } from 'vitest/execute'`
`6`	`5`	`import type { CloneOption } from './types'`
`7`	`6`
`8`	`7`	`// keep the reference in case it was mocked`
`@@ -80,7 +79,7 @@ export function createMessageEvent(`
`80`	`79`	`}`
`81`	`80`	`}`
`82`	`81`
`83`		`-export function getRunnerOptions(): ExecuteOptions {`
	`82`	`+export function getRunnerOptions(): any {`
`84`	`83`	`const state = getWorkerState()`
`85`	`84`	`const { config, rpc, moduleCache } = state`
`86`	`85`