fix: preserve correct root during resolve config (#10909)

Co-authored-by: Vladimir Sheremet <sleuths.slews0s@icloud.com>

Author: AriPerkkio

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

@@ -56,13 +56,16 @@ function resolvePath(path: string, root: string) {
   )
 }
 
-export function findConfigFile(root: string): string | undefined {
+export function findConfigFile(root: string): string | false {
   for (const configFile of configFiles) {
     const configPath = resolve(root, configFile)
     if (existsSync(configPath)) {
       return configPath
     }
   }
+  // if not found, then there is no config to find.
+  // `false` will stop vite from trying to find it again
+  return false
 }
 
 function parseInspector(inspect: string | undefined | boolean | number) {
@@ -1118,10 +1121,12 @@ export async function resolveConfig(
   // We clone CLI Options and Vite overrides to reuse when a watch mode is triggered.
   const cliOptionsCopy = deepMerge({}, options) as UserConfig
   const viteOverridesCopy = deepMerge({}, viteOverrides) as ViteUserConfig
-  const root = resolve(options.root || process.cwd())
-  const configPath = resolveConfigPath(root, options)
+  const configPath = resolveConfigPath(
+    // try to find the config relative to `--root` or process.cwd()
+    resolve(options.root || process.cwd()),
+    options,
+  )
   options.config = configPath
-  options.root = root
 
   const captures: ConfigResolutionCaptures = {}
   const inlineConfig: InlineConfig = mergeConfig(
@@ -1135,11 +1140,11 @@ export async function resolveConfig(
         CaptureRawTestConfig(captures, cliOptionsCopy.sharedViteServer),
         ...TestConfigPlugin(pluginsHarness, captures, cliOptionsCopy),
         ...ViteConfigPlugin(pluginsHarness),
-        ...VitestCorePlugin(pluginsHarness, options),
+        ...VitestCorePlugin(pluginsHarness),
         ...BrowserLoaderPlugin(captures, pluginsHarness),
       ],
     } satisfies InlineConfig,
-    mergeConfig(viteOverrides, { root }),
+    viteOverrides,
   )
 
   const rootViteConfig = await viteResolveConfig(inlineConfig, 'serve')

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

@@ -5,7 +5,6 @@ import { relative } from 'pathe'
 import * as vite from 'vite'
 import { generateScopedClassName } from '../../integrations/css/css-modules'
 import { createViteLogger, silenceImportViteIgnoreWarning } from '../viteLogger'
-import { VitestOptimizer } from './optimizer'
 import { ModuleRunnerTransform } from './runnerTransform'
 import { getDefaultResolveOptions } from './utils'
 
@@ -163,7 +162,6 @@ export function ViteConfigPlugin(harness: PluginHarness): Plugin[] {
         },
       },
     },
-    VitestOptimizer(),
     ModuleRunnerTransform(),
   ]
 }

packages/vitest/src/node/plugins/index.ts

@@ -1,5 +1,4 @@
 import type { Plugin as VitePlugin } from 'vite'
-import type { CliOptions } from '../cli/cli-api'
 import type { PluginHarness } from '../config/pluginHarness'
 import { resolve } from 'pathe'
 import { configDefaults } from '../../defaults'
@@ -9,9 +8,10 @@ import { MetaEnvReplacerPlugin } from './metaEnvReplacer'
 import { MocksPlugins } from './mocks'
 import { NormalizeURLPlugin } from './normalizeURL'
 import { SsrRunnerFixerPlugin } from './ssrRunnerFixer'
+import { resolveTestCacheDir } from './utils'
 import { VitestCoreResolver } from './vitestResolver'
 
-export function VitestCorePlugin(harness: PluginHarness, options: CliOptions = {}): VitePlugin[] {
+export function VitestCorePlugin(harness: PluginHarness): VitePlugin[] {
   return [
     {
       name: 'vitest:config:append',
@@ -22,11 +22,12 @@ export function VitestCorePlugin(harness: PluginHarness, options: CliOptions = {
       config: {
         order: 'post',
         handler(viteConfig) {
-          const root = resolve(options.root || viteConfig.test?.root || viteConfig.root || process.cwd())
+          const root = resolve(viteConfig.test?.root || viteConfig.root || process.cwd())
 
           return {
             base: '/',
             root,
+            cacheDir: resolveTestCacheDir(root, viteConfig.test || {}, viteConfig.cacheDir),
             build: {
               // Vitest doesn't use outputDir, but this value affects what folders are watched
               // https://github.com/vitejs/vite/pull/16453

packages/vitest/src/node/plugins/optimizer.ts

@@ -17,8 +17,9 @@ import { escapeRegExp } from '../../utils/base'
 import { resolveApiServerConfig } from '../config/resolveConfig'
 import { deleteDefineConfig } from './utils'
 
-// `name` must stay unique per project, `projects` would redefine the whole workspace
-const NON_INHERITED_OPTIONS = ['name', 'projects'] as const
+// `name` must stay unique per project, `projects` would redefine the whole
+// workspace, and `root` would re-root the project onto the declaring config
+const NON_INHERITED_OPTIONS = ['name', 'projects', 'root'] as const
 
 // the root `globalSetup` already runs once per test run; a non-root
 // config (a shared config or a container) keeps it because nothing else runs it

packages/vitest/src/node/plugins/testConfig.ts

@@ -2,11 +2,28 @@ import type {
   DepOptimizationOptions,
   UserConfig as ViteConfig,
 } from 'vite'
-import type { DepsOptimizationOptions } from '../types/config'
+import type { DepsOptimizationOptions, UserConfig } from '../types/config'
 import { dirname } from 'pathe'
 import { searchForWorkspaceRoot, version as viteVersion } from 'vite'
 import * as vite from 'vite'
 import { rootDir } from '../../paths'
+import { VitestCache } from '../cache'
+
+export function resolveTestCacheDir(
+  root: string,
+  testConfig: UserConfig,
+  viteCacheDir: string | undefined,
+): string {
+  const name = testConfig.name
+  const label = typeof name === 'string' ? name : (name?.label || '')
+  return VitestCache.resolveCacheDir(
+    root,
+    testConfig.cache != null && testConfig.cache !== false
+      ? testConfig.cache.dir
+      : viteCacheDir,
+    label,
+  )
+}
 
 export function resolveOptimizerConfig(
   testOptions_: DepsOptimizationOptions | undefined,

packages/vitest/src/node/plugins/utils.ts

@@ -1,7 +1,7 @@
 import type * as vite from 'vite'
 import type { UserConfig as ViteConfig, Plugin as VitePlugin } from 'vite'
 import type { PluginHarness } from '../config/pluginHarness'
-import type { ResolvedConfig, TestProjectInlineConfiguration } from '../types/config'
+import { resolve } from 'pathe'
 import { API_TOKEN_FILE } from '../config/apiToken'
 import { ViteConfigPlugin } from './config'
 import { CoverageTransform } from './coverageTransform'
@@ -10,17 +10,12 @@ import { MetaEnvReplacerPlugin } from './metaEnvReplacer'
 import { MocksPlugins } from './mocks'
 import { NormalizeURLPlugin } from './normalizeURL'
 import { SsrRunnerFixerPlugin } from './ssrRunnerFixer'
+import { resolveTestCacheDir } from './utils'
 import { VitestProjectResolver } from './vitestResolver'
 
-interface WorkspaceOptions extends TestProjectInlineConfiguration {
-  root?: string
-}
-
 export function WorkspaceVitestPlugin(
   harness: PluginHarness,
   globalViteConfig: vite.ResolvedConfig,
-  globalConfig: ResolvedConfig,
-  options: WorkspaceOptions,
 ): VitePlugin[] {
   return [
     {
@@ -31,11 +26,16 @@ export function WorkspaceVitestPlugin(
       },
       config(viteConfig) {
         const testConfig = viteConfig.test || {}
-        const root = options.root || testConfig.root || viteConfig.root
+        const root = testConfig.root || viteConfig.root
 
         const config: ViteConfig = {
           base: '/',
           root,
+          cacheDir: resolveTestCacheDir(
+            resolve(root || process.cwd()),
+            testConfig,
+            viteConfig.cacheDir,
+          ),
           server: {
             open: false,
             fs: {

packages/vitest/src/node/plugins/workspace.ts

@@ -329,16 +329,17 @@ async function resolveDeclaredProjectEntries(
       : options.extends !== false
         ? (parentViteConfig.configFile || false)
         : false
-    // if `root` is configured, resolve it relative to the declaring config's
-    // root (like other options); if `root` is not specified, inline configs
-    // use the same root as the declaring config
-    const rawRoot = options.test?.root ?? options.root
-    const root = rawRoot
-      ? resolve(configRoot, rawRoot)
-      : configRoot
+    // `test.root` overrides the top level `root`, so the entry carries a
+    // single resolved root; both are resolved relative to the declaring
+    // config's root (like other options), and inline configs without a
+    // root use the same root as the declaring config
+    const { root: testRoot, ...test } = options.test ?? {}
+    const customRoot = testRoot ?? options.root
+    const root = customRoot ? resolve(configRoot, customRoot) : configRoot
 
     promises.push(concurrent(() => resolveSingleProjectEntry(context, {
       ...options,
+      test,
       root,
       configFile,
     }, index)))
@@ -733,12 +734,7 @@ async function resolveSingleProjectEntry(
         isInlineEntry ? { options, extendsTrueRootConfig } : undefined,
       ),
       ...(options.plugins || []),
-      ...WorkspaceVitestPlugin(
-        harness,
-        parentViteConfig,
-        rootConfig,
-        options,
-      ),
+      ...WorkspaceVitestPlugin(harness, parentViteConfig),
       ...BrowserLoaderPlugin(captures, harness),
     ],
   }

packages/vitest/src/node/projects/resolveProjects.ts

@@ -0,0 +1,5 @@
+import { expect, test } from 'vitest'
+
+test('example test', () => {
+  expect(1 + 1).toBe(2)
+})

test/e2e/fixtures/global-setup-root/nested/example.test.ts

@@ -0,0 +1,3 @@
+export function setup() {
+  // File should load without errors
+}