fix!: replace deprecated ErrorWithDiff with TestError (#8195)

Author: sheremet-va

docs/advanced/runner.md

@@ -238,7 +238,7 @@ export interface TaskResult {
  * Errors that occurred during the task execution. It is possible to have several errors
  * if `expect.soft()` failed multiple times.
  */
- errors?: ErrorWithDiff[]
+ errors?: TestError[]
  /**
  * How long in milliseconds the task took to run.
  */

packages/browser/src/client/tester/rpc.ts

@@ -4,28 +4,21 @@ import { getSafeTimers } from 'vitest/internal/browser'
 const { get } = Reflect
 
 function withSafeTimers(getTimers: typeof getSafeTimers, fn: () => void) {
- const { setTimeout, clearTimeout, setImmediate, clearImmediate }
- = getTimers()
+ const { setTimeout, clearTimeout } = getTimers()
 
  const currentSetTimeout = globalThis.setTimeout
  const currentClearTimeout = globalThis.clearTimeout
- const currentSetImmediate = globalThis.setImmediate
- const currentClearImmediate = globalThis.clearImmediate
 
  try {
  globalThis.setTimeout = setTimeout
  globalThis.clearTimeout = clearTimeout
- globalThis.setImmediate = setImmediate
- globalThis.clearImmediate = clearImmediate
 
  const result = fn()
  return result
  }
  finally {
  globalThis.setTimeout = currentSetTimeout
  globalThis.clearTimeout = currentClearTimeout
- globalThis.setImmediate = currentSetImmediate
- globalThis.clearImmediate = currentClearImmediate
  }
 }
 

packages/browser/src/node/project.ts

@@ -1,6 +1,6 @@
 import type { StackTraceParserOptions } from '@vitest/utils/source-map'
 import type { ViteDevServer } from 'vite'
-import type { ErrorWithDiff, ParsedStack, SerializedConfig } from 'vitest'
+import type { ParsedStack, SerializedConfig, TestError } from 'vitest'
 import type {
  BrowserProvider,
  ProjectBrowser as IProjectBrowser,
@@ -93,7 +93,7 @@ export class ProjectBrowser implements IProjectBrowser {
  }
 
  public parseErrorStacktrace(
- e: ErrorWithDiff,
+ e: TestError,
  options: StackTraceParserOptions = {},
  ): ParsedStack[] {
  return this.parent.parseErrorStacktrace(e, options)

packages/browser/src/node/projectParent.ts

@@ -1,6 +1,6 @@
 import type { StackTraceParserOptions } from '@vitest/utils/source-map'
 import type { HtmlTagDescriptor } from 'vite'
-import type { ErrorWithDiff, ParsedStack } from 'vitest'
+import type { ParsedStack, TestError } from 'vitest'
 import type {
  BrowserCommand,
  BrowserScript,
@@ -159,7 +159,7 @@ export class ParentBrowserProject {
  }
 
  public parseErrorStacktrace(
- e: ErrorWithDiff,
+ e: TestError,
  options: StackTraceParserOptions = {},
  ): ParsedStack[] {
  return parseErrorStacktrace(e, {

packages/browser/src/node/rpc.ts

@@ -1,6 +1,6 @@
 import type { MockerRegistry } from '@vitest/mocker'
 import type { Duplex } from 'node:stream'
-import type { ErrorWithDiff } from 'vitest'
+import type { TestError } from 'vitest'
 import type { BrowserCommandContext, ResolveSnapshotPathHandlerContext, TestProject } from 'vitest/node'
 import type { WebSocket } from 'ws'
 import type { ParentBrowserProject } from './projectParent'
@@ -128,7 +128,7 @@ export function setupBrowserRpc(globalServer: ParentBrowserProject, defaultMocke
  {
  async onUnhandledError(error, type) {
  if (error && typeof error === 'object') {
- const _error = error as ErrorWithDiff
+ const _error = error as TestError
  _error.stacks = globalServer.parseErrorStacktrace(_error)
  }
  vitest.state.catchError(error, type)

packages/runner/src/types/tasks.ts

@@ -1,4 +1,4 @@
-import type { Awaitable, ErrorWithDiff } from '@vitest/utils'
+import type { Awaitable, TestError } from '@vitest/utils'
 import type { FixtureItem } from '../fixture'
 import type { ChainableFunction } from '../utils/chain'
 
@@ -118,7 +118,7 @@ export interface TaskResult {
  * Errors that occurred during the task execution. It is possible to have several errors
  * if `expect.soft()` failed multiple times or `retry` was triggered.
  */
- errors?: ErrorWithDiff[]
+ errors?: TestError[]
  /**
  * How long in milliseconds the task took to run.
  */

packages/ui/client/components/dashboard/ErrorEntry.vue

@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import type { ErrorWithDiff } from '@vitest/utils'
+import type { TestError } from '@vitest/utils'
 
 defineProps<{
- error: ErrorWithDiff
+ error: TestError
 }>()
 </script>
 

packages/ui/client/components/views/ViewEditor.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { Task } from '@vitest/runner'
 import type CodeMirror from 'codemirror'
-import type { ErrorWithDiff, File, TestAnnotation, TestError } from 'vitest'
+import type { File, TestAnnotation, TestError } from 'vitest'
 import { createTooltip, destroyTooltip } from 'floating-vue'
 import { getAttachmentUrl, sanitizeFilePath } from '~/composables/attachments'
 import { client, isReport } from '~/composables/client'
@@ -144,7 +144,7 @@ watch(
  { immediate: true },
 )
 
-function createErrorElement(e: ErrorWithDiff) {
+function createErrorElement(e: TestError) {
  const stacks = (e?.stacks || []).filter(
  i => i.file && i.file === props.file?.filepath,
  )

packages/ui/client/components/views/ViewReportError.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { ErrorWithDiff, ParsedStack } from 'vitest'
+import type { ParsedStack, TestError } from 'vitest'
 import { showLocationSource } from '~/composables/codemirror'
 import { isTestFile, openInEditor } from '~/composables/error'
 import { escapeHtml } from '~/utils/escape'
@@ -8,7 +8,7 @@ const props = defineProps<{
  fileId: string
  root: string
  filename?: string
- error: ErrorWithDiff
+ error: TestError
 }>()
 
 function relative(p: string) {

packages/ui/client/composables/client/state.ts

@@ -1,7 +1,7 @@
-import type { ErrorWithDiff } from '@vitest/utils'
+import type { TestError } from '@vitest/utils'
 import type { Ref } from 'vue'
 import type { RunState } from '../../../types'
 
 export const testRunState: Ref<RunState> = ref('idle')
 export const finished = computed(() => testRunState.value === 'idle')
-export const unhandledErrors: Ref<ErrorWithDiff[]> = ref([])
+export const unhandledErrors: Ref<TestError[]> = ref([])