From 496bd251ba5cec8274763bb541ca8c71d1eb0c06 Mon Sep 17 00:00:00 2001
From: Vladimir <sleuths.slews0s@icloud.com>
Date: Thu, 3 Oct 2024 14:25:32 +0200
Subject: [PATCH] fix(vitest): deprecate UserConfig in favor of ViteUserConfig
 (#6626)

---
 packages/vitest/src/public/config.ts        | 6 +++++-
 test/config/test/bail.test.ts               | 3 ++-
 test/config/test/failures.test.ts           | 2 +-
 test/config/test/mixed-environments.test.ts | 3 ++-
 test/config/test/override.test.ts           | 2 +-
 test/config/test/shard.test.ts              | 3 ++-
 test/config/test/shuffle-options.test.ts    | 2 +-
 test/config/test/workers-option.test.ts     | 3 ++-
 8 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/packages/vitest/src/public/config.ts b/packages/vitest/src/public/config.ts
index 8b77d9a17b06..cffcb3e4cc63 100644
--- a/packages/vitest/src/public/config.ts
+++ b/packages/vitest/src/public/config.ts
@@ -15,7 +15,11 @@ export { mergeConfig } from 'vite'
 export { extraInlineDeps } from '../constants'
 export type { Plugin } from 'vite'
 
-export type { ConfigEnv, ViteUserConfig as UserConfig }
+export type { ConfigEnv, ViteUserConfig }
+/**
+ * @deprecated Use `ViteUserConfig` instead
+ */
+export type UserConfig = ViteUserConfig
 export type { UserProjectConfigExport, UserProjectConfigFn, UserWorkspaceConfig, WorkspaceProjectConfiguration }
 export type UserConfigFnObject = (env: ConfigEnv) => ViteUserConfig
 export type UserConfigFnPromise = (env: ConfigEnv) => Promise<ViteUserConfig>
diff --git a/test/config/test/bail.test.ts b/test/config/test/bail.test.ts
index 9a8c75e8d8f2..3ee879839ec1 100644
--- a/test/config/test/bail.test.ts
+++ b/test/config/test/bail.test.ts
@@ -1,5 +1,6 @@
-import { type UserConfig, expect, test } from 'vitest'
+import { expect, test } from 'vitest'
 
+import type { UserConfig } from 'vitest/node'
 import { runVitest } from '../../test-utils'
 
 const configs: UserConfig[] = []
diff --git a/test/config/test/failures.test.ts b/test/config/test/failures.test.ts
index 22a08200dbb1..17b0630f8c00 100644
--- a/test/config/test/failures.test.ts
+++ b/test/config/test/failures.test.ts
@@ -1,5 +1,5 @@
 import { beforeEach, expect, test } from 'vitest'
-import type { UserConfig } from 'vitest'
+import type { UserConfig } from 'vitest/node'
 import { version } from 'vitest/package.json'
 
 import { normalize, resolve } from 'pathe'
diff --git a/test/config/test/mixed-environments.test.ts b/test/config/test/mixed-environments.test.ts
index 9962e6e4799f..8fdf23ac60a7 100644
--- a/test/config/test/mixed-environments.test.ts
+++ b/test/config/test/mixed-environments.test.ts
@@ -1,4 +1,5 @@
-import { type UserConfig, expect, test } from 'vitest'
+import { expect, test } from 'vitest'
+import type { UserConfig } from 'vitest/node'
 
 import { runVitest } from '../../test-utils'
 
diff --git a/test/config/test/override.test.ts b/test/config/test/override.test.ts
index e52bc19770de..dc1ae0354ea3 100644
--- a/test/config/test/override.test.ts
+++ b/test/config/test/override.test.ts
@@ -1,4 +1,4 @@
-import type { UserConfig } from 'vitest'
+import type { UserConfig } from 'vitest/node'
 import type { UserConfig as ViteUserConfig } from 'vite'
 import { describe, expect, it } from 'vitest'
 import { createVitest, parseCLI } from 'vitest/node'
diff --git a/test/config/test/shard.test.ts b/test/config/test/shard.test.ts
index e1d26f8836ce..ac1c642c870d 100644
--- a/test/config/test/shard.test.ts
+++ b/test/config/test/shard.test.ts
@@ -1,6 +1,7 @@
-import { type UserConfig, expect, test } from 'vitest'
+import { expect, test } from 'vitest'
 import { basename } from 'pathe'
 
+import type { UserConfig } from 'vitest/node'
 import * as testUtils from '../../test-utils'
 
 function runVitest(config: UserConfig) {
diff --git a/test/config/test/shuffle-options.test.ts b/test/config/test/shuffle-options.test.ts
index c2de8136eb9c..63e5a12c7b10 100644
--- a/test/config/test/shuffle-options.test.ts
+++ b/test/config/test/shuffle-options.test.ts
@@ -1,4 +1,4 @@
-import type { InlineConfig } from 'vitest'
+import type { InlineConfig } from 'vitest/node'
 import { expect, test } from 'vitest'
 import { runVitest } from '../../test-utils'
 
diff --git a/test/config/test/workers-option.test.ts b/test/config/test/workers-option.test.ts
index 099cfca10064..00ce34d0d01c 100644
--- a/test/config/test/workers-option.test.ts
+++ b/test/config/test/workers-option.test.ts
@@ -1,4 +1,5 @@
-import { type UserConfig, describe, expect, test, vi } from 'vitest'
+import { describe, expect, test, vi } from 'vitest'
+import type { UserConfig } from 'vitest/node'
 
 import { getWorkersCountByPercentage } from 'vitest/src/utils/workers.js'
 import * as testUtils from '../../test-utils'