Add some module resolutions in vitest plugin

Author: webpro

fixtures/plugins/vitest/vitest.config.ts

@@ -3,7 +3,7 @@ import { defineConfig } from 'vitest/config';
 export default defineConfig({
   test: {
     environment: 'happy-dom',
-    setupFiles: ['./setup.js', './src/setupTests.ts'],
+    setupFiles: ['setup.js', './src/setupTests.ts'],
     coverage: {
       reporter: ['html', 'lcov'],
       provider: 'istanbul',

src/plugins/vite/index.ts

@@ -20,7 +20,7 @@ const findViteDependencies: GenericPluginCallback = async (configFilePath, optio
 
   if (!localConfig) return [];
 
-  return findVitestDependencies(localConfig, options);
+  return findVitestDependencies(configFilePath, localConfig, options);
 };
 
 export const findDependencies = timerify(findViteDependencies);

src/plugins/vitest/index.ts

@@ -1,6 +1,7 @@
 import { compact } from '../../util/array.js';
+import { dirname, join } from '../../util/path.js';
 import { timerify } from '../../util/Performance.js';
-import { hasDependency, load } from '../../util/plugin.js';
+import { hasDependency, load, tryResolve } from '../../util/plugin.js';
 import { toEntryPattern } from '../../util/protocols.js';
 import { getEnvPackageName, getExternalReporters } from './helpers.js';
 import type { ViteConfigOrFn, VitestWorkspaceConfig, ViteConfig, MODE, COMMAND } from './types.js';
@@ -24,7 +25,11 @@ export const CONFIG_FILE_PATTERNS = ['vitest.config.ts', 'vitest.{workspace,proj
 /** @public */
 export const ENTRY_FILE_PATTERNS = ['**/*.{test,spec}.?(c|m)[jt]s?(x)'];
 
-const findConfigDependencies = (localConfig: ViteConfig, options: GenericPluginCallbackOptions) => {
+const findConfigDependencies = (
+  configFilePath: string,
+  localConfig: ViteConfig,
+  options: GenericPluginCallbackOptions
+) => {
   const { isProduction, config } = options;
   const testConfig = localConfig.test;
 
@@ -35,28 +40,33 @@ const findConfigDependencies = (localConfig: ViteConfig, options: GenericPluginC
   const environments = testConfig.environment ? [getEnvPackageName(testConfig.environment)] : [];
   const reporters = getExternalReporters(testConfig.reporters);
   const coverage = testConfig.coverage ? [`@vitest/coverage-${testConfig.coverage.provider ?? 'v8'}`] : [];
-  const setupFiles = testConfig.setupFiles ? [testConfig.setupFiles].flat() : [];
-  const globalSetup = testConfig.globalSetup ? [testConfig.globalSetup].flat() : [];
+  const toPath = (v: string) => tryResolve(join(dirname(configFilePath), v), configFilePath) ?? v;
+  const setupFiles = (testConfig.setupFiles ? [testConfig.setupFiles].flat() : []).map(toPath);
+  const globalSetup = (testConfig.globalSetup ? [testConfig.globalSetup].flat() : []).map(toPath);
   return [...entryPatterns, ...environments, ...reporters, ...coverage, ...setupFiles, ...globalSetup];
 };
 
-export const findVitestDependencies = async (localConfig: ViteConfigOrFn, options: GenericPluginCallbackOptions) => {
+export const findVitestDependencies = async (
+  configFilePath: string,
+  localConfig: ViteConfigOrFn,
+  options: GenericPluginCallbackOptions
+) => {
   if (!localConfig) return [];
 
   if (typeof localConfig === 'function') {
     const dependencies = new Set<string>();
     for (const command of ['dev', 'serve', 'build'] as COMMAND[]) {
       for (const mode of ['development', 'production'] as MODE[]) {
         const config = await localConfig({ command, mode, ssrBuild: undefined });
-        findConfigDependencies(config, options).forEach(dependency => dependencies.add(dependency));
+        findConfigDependencies(configFilePath, config, options).forEach(dependency => dependencies.add(dependency));
       }
     }
     return Array.from(dependencies);
   }
 
   if (!localConfig.test) return [];
 
-  return findConfigDependencies(localConfig, options);
+  return findConfigDependencies(configFilePath, localConfig, options);
 };
 
 const findVitestWorkspaceDependencies: GenericPluginCallback = async (configFilePath, options) => {
@@ -65,7 +75,9 @@ const findVitestWorkspaceDependencies: GenericPluginCallback = async (configFile
   const dependencies = new Set<string>();
   for (const config of [localConfig].flat()) {
     if (config && typeof config !== 'string') {
-      (await findVitestDependencies(config, options)).forEach(dependency => dependencies.add(dependency));
+      (await findVitestDependencies(configFilePath, config, options)).forEach(dependency =>
+        dependencies.add(dependency)
+      );
     }
   }
   return compact(dependencies);

src/util/plugin.ts

@@ -1,4 +1,5 @@
 export { _load as load, _loadFile as loadFile } from './loader.js';
+export { _tryResolve as tryResolve } from './require.js';
 import { arrayify } from './array.js';
 import type { RawPluginConfiguration } from '../types/config.js';
 

test/plugins/vitest.test.ts

@@ -17,8 +17,8 @@ test('Find dependencies in vitest configuration (vitest)', async () => {
     'entry:**/*.{test,spec}.?(c|m)[jt]s?(x)',
     'happy-dom',
     '@vitest/coverage-istanbul',
-    './setup.js',
-    './src/setupTests.ts',
+    'setup.js',
+    join(cwd, 'src/setupTests.ts'),
   ]);
 });
 
@@ -49,13 +49,12 @@ test('Find dependencies in vitest configuration', async () => {
   assert(issues.unlisted['vitest.workspace.ts']['@edge-runtime/vm']);
   assert(issues.unlisted['vitest.config.ts']['happy-dom']);
   assert(issues.unlisted['vitest.config.ts']['@vitest/coverage-istanbul']);
-  assert(issues.unresolved['vitest.config.ts']['./setup.js']);
+  assert(issues.unlisted['vitest.config.ts']['setup.js']);
 
   assert.deepEqual(counters, {
     ...baseCounters,
     files: 2,
-    unlisted: 3,
-    unresolved: 1,
+    unlisted: 4,
     processed: 6,
     total: 6,
   });