fix: don't resolve setupFiles from parent directory (#9960)

hi-ogawa · web-flow · commit 7aa93777641f · 2026-03-24T09:27:08.000+01:00
diff --git a/packages/vitest/src/node/config/resolveConfig.ts b/packages/vitest/src/node/config/resolveConfig.ts
@@ -13,7 +13,7 @@ import crypto from 'node:crypto'
 import { pathToFileURL } from 'node:url'
 import { slash, toArray } from '@vitest/utils/helpers'
 import { resolveModule } from 'local-pkg'
-import { normalize, relative, resolve } from 'pathe'
+import { join, normalize, relative, resolve } from 'pathe'
 import c from 'tinyrainbow'
 import { mergeConfig } from 'vite'
 import {
@@ -29,8 +29,17 @@ import { BaseSequencer } from '../sequencers/BaseSequencer'
 import { RandomSequencer } from '../sequencers/RandomSequencer'
 
 function resolvePath(path: string, root: string) {
+  // local-pkg (mlly)'s resolveModule("./file", { paths: ["/some/root"] }) tries
+  // /some/file
+  // /some/file.js
+  // /some/root/file
+  // /some/root/file.js
+  // etc.
+  // but we don't want to resolve files from parent directories,
+  // so we ensure passing "/" suffix such as "/some/root/"
+  // https://github.com/unjs/mlly/blob/401d42983f6f3a9112658d67b0a92ba4fb1d7efa/src/resolve.ts#L104-L110
   return normalize(
-    /* @__PURE__ */ resolveModule(path, { paths: [root] })
+    /* @__PURE__ */ resolveModule(path, { paths: [join(root, '/')] })
     ?? resolve(root, path),
   )
 }
diff --git a/test/cli/fixtures/setup-files-resolve/nested-bare/basic.test.ts b/test/cli/fixtures/setup-files-resolve/nested-bare/basic.test.ts
@@ -0,0 +1,5 @@
+import { test, expect } from "vitest";
+
+test("basic", () => {
+  expect((globalThis as any).__testSetupResolve).toBe("ok");
+});
diff --git a/test/cli/fixtures/setup-files-resolve/nested-bare/setup.ts b/test/cli/fixtures/setup-files-resolve/nested-bare/setup.ts
@@ -0,0 +1 @@
+(globalThis as any).__testSetupResolve = "ok";
diff --git a/test/cli/fixtures/setup-files-resolve/nested-bare/vitest.config.ts b/test/cli/fixtures/setup-files-resolve/nested-bare/vitest.config.ts
@@ -0,0 +1,7 @@
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+  test: {
+    setupFiles: ["setup.ts"],
+  },
+});
diff --git a/test/cli/fixtures/setup-files-resolve/nested-no-ext/basic.test.ts b/test/cli/fixtures/setup-files-resolve/nested-no-ext/basic.test.ts
@@ -0,0 +1,5 @@
+import { test, expect } from "vitest";
+
+test("basic", () => {
+  expect((globalThis as any).__testSetupResolve).toBe("ok");
+});
diff --git a/test/cli/fixtures/setup-files-resolve/nested-no-ext/setup.ts b/test/cli/fixtures/setup-files-resolve/nested-no-ext/setup.ts
@@ -0,0 +1 @@
+(globalThis as any).__testSetupResolve = "ok";
diff --git a/test/cli/fixtures/setup-files-resolve/nested-no-ext/vitest.config.ts b/test/cli/fixtures/setup-files-resolve/nested-no-ext/vitest.config.ts
@@ -0,0 +1,7 @@
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+  test: {
+    setupFiles: ["./setup"],
+  },
+});
diff --git a/test/cli/fixtures/setup-files-resolve/nested/basic.test.ts b/test/cli/fixtures/setup-files-resolve/nested/basic.test.ts
@@ -0,0 +1,5 @@
+import { test, expect } from "vitest";
+
+test("basic", () => {
+  expect((globalThis as any).__testSetupResolve).toBe("ok");
+});
diff --git a/test/cli/fixtures/setup-files-resolve/nested/setup.ts b/test/cli/fixtures/setup-files-resolve/nested/setup.ts
@@ -0,0 +1 @@
+(globalThis as any).__testSetupResolve = "ok";
diff --git a/test/cli/fixtures/setup-files-resolve/nested/vitest.config.ts b/test/cli/fixtures/setup-files-resolve/nested/vitest.config.ts
@@ -0,0 +1,7 @@
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+  test: {
+    setupFiles: ["./setup.ts"],
+  },
+});
diff --git a/test/cli/fixtures/setup-files-resolve/setup.ts b/test/cli/fixtures/setup-files-resolve/setup.ts
@@ -0,0 +1 @@
+(globalThis as any).__testSetupResolve = "not-this";
diff --git a/test/cli/test/setup-files.test.ts b/test/cli/test/setup-files.test.ts
@@ -41,3 +41,45 @@ describe('setup files with forceRerunTrigger', () => {
     expect(stdout).toContain('1 passed')
   })
 })
+
+it('setup files resolution in nested folder', async () => {
+  const result = await runVitest({
+    root: 'fixtures/setup-files-resolve/nested',
+  })
+  expect(result.stderr).toMatchInlineSnapshot(`""`)
+  expect(result.errorTree()).toMatchInlineSnapshot(`
+    {
+      "basic.test.ts": {
+        "basic": "passed",
+      },
+    }
+  `)
+})
+
+it('setup files resolution in nested folder without extension', async () => {
+  const result = await runVitest({
+    root: 'fixtures/setup-files-resolve/nested-no-ext',
+  })
+  expect(result.stderr).toMatchInlineSnapshot(`""`)
+  expect(result.errorTree()).toMatchInlineSnapshot(`
+    {
+      "basic.test.ts": {
+        "basic": "passed",
+      },
+    }
+  `)
+})
+
+it('setup files resolution in nested folder with bare name', async () => {
+  const result = await runVitest({
+    root: 'fixtures/setup-files-resolve/nested-bare',
+  })
+  expect(result.stderr).toMatchInlineSnapshot(`""`)
+  expect(result.errorTree()).toMatchInlineSnapshot(`
+    {
+      "basic.test.ts": {
+        "basic": "passed",
+      },
+    }
+  `)
+})

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+(globalThis as any).__testSetupResolve = "ok";`