Merge branch 'main' into feat-diff-options-inline

packages/utils/src/diff/index.ts

@@ -23,7 +23,7 @@ import { getType } from './getType'
 import { normalizeDiffOptions } from './normalizeDiffOptions'
 import { diffStringsRaw, diffStringsUnified } from './printDiffs'
 
-export type { DiffOptions, SerializedDiffOptions, DiffOptionsColor } from './types'
+export type { DiffOptions, DiffOptionsColor, SerializedDiffOptions } from './types'
 
 export { diffLinesRaw, diffLinesUnified, diffLinesUnified2 }
 export { diffStringsRaw, diffStringsUnified }

packages/vitest/src/node/types/config.ts

@@ -3,6 +3,13 @@ import type { PrettyFormatOptions } from '@vitest/pretty-format'
 import type { SequenceHooks, SequenceSetupFiles } from '@vitest/runner'
 import type { SnapshotStateOptions } from '@vitest/snapshot'
 import type { SerializedDiffOptions } from '@vitest/utils/diff'
+import type { AliasOptions, ConfigEnv, DepOptimizationConfig, ServerOptions, UserConfig as ViteUserConfig } from 'vite'
+import type { ViteNodeServerOptions } from 'vite-node'
+import type { ChaiConfig } from '../../integrations/chai/config'
+import type { EnvironmentOptions } from '../../types/environment'
+import type { Arrayable, ErrorWithDiff, ParsedStack, ProvidedContext } from '../../types/general'
+import type { HappyDOMOptions } from '../../types/happy-dom-options'
+import type { JSDOMOptions } from '../../types/jsdom-options'
 import type {
   BuiltinReporterOptions,
   BuiltinReporters,

test/config/test/diff.test.ts

@@ -10,11 +10,9 @@ test.for([
     root: './fixtures/diff',
     diff: options,
   })
-  const errors = ctx!.state
-    .getFiles()
-    .flatMap(f =>
-      f.tasks.flatMap(t => t.result?.errors ?? []),
-    )
+  const errors = ctx!.state.getFiles().flatMap(f =>
+    f.tasks.flatMap(t => t.result?.errors ?? []),
+  )
   expect(
     errors.map(e => e.diff && stripVTControlCharacters(e.diff)),
   ).matchSnapshot()