Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sheremet-va merged 3 commits into from
Mar 24, 2026
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb6e5e8
fix: don't resolve setupFiles from parent directory
hi-ogawa Mar 24, 2026
a712b9c
fix: workaround
hi-ogawa Mar 24, 2026
e943170
test: test bare name
hi-ogawa Mar 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions packages/vitest/src/node/config/resolveConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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, '/')] })
Comment on lines 31 to +42
Copy link
Copy Markdown
Collaborator Author

@hi-ogawa hi-ogawa Mar 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was a way more annoying than I thought. My first solution was merely doing:

if (path[0] === '.' || path[0] === '/') {
  return normalize(resolve(root, path))
}
return (...same as before...)

but this broke a following test since it was relying on resolveModule to resolve /(full)/file-setup.js:

vitest/test/config/fixtures/inline-setup-file/vitest.config.js

Lines 3 to 9 in a712b9c

export default defineConfig({
test: {
setupFiles: ['./file-setup'],
server: {
deps: {
// try to force setup file to be external
external: [/file-setup/]

So, I went back to still rely on resolveModule for relative path.

?? resolve(root, path),
)
}
Expand Down
5 changes: 5 additions & 0 deletions test/cli/fixtures/setup-files-resolve/nested-bare/basic.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { test, expect } from "vitest";

test("basic", () => {
expect((globalThis as any).__testSetupResolve).toBe("ok");
});
1 change: 1 addition & 0 deletions test/cli/fixtures/setup-files-resolve/nested-bare/setup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
(globalThis as any).__testSetupResolve = "ok";
7 changes: 7 additions & 0 deletions test/cli/fixtures/setup-files-resolve/nested-bare/vitest.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { defineConfig } from "vitest/config";

export default defineConfig({
test: {
setupFiles: ["setup.ts"],
},
});
5 changes: 5 additions & 0 deletions test/cli/fixtures/setup-files-resolve/nested-no-ext/basic.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { test, expect } from "vitest";

test("basic", () => {
expect((globalThis as any).__testSetupResolve).toBe("ok");
});
1 change: 1 addition & 0 deletions test/cli/fixtures/setup-files-resolve/nested-no-ext/setup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
(globalThis as any).__testSetupResolve = "ok";
7 changes: 7 additions & 0 deletions test/cli/fixtures/setup-files-resolve/nested-no-ext/vitest.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { defineConfig } from "vitest/config";

export default defineConfig({
test: {
setupFiles: ["./setup"],
},
});
5 changes: 5 additions & 0 deletions test/cli/fixtures/setup-files-resolve/nested/basic.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { test, expect } from "vitest";

test("basic", () => {
expect((globalThis as any).__testSetupResolve).toBe("ok");
});
1 change: 1 addition & 0 deletions test/cli/fixtures/setup-files-resolve/nested/setup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
(globalThis as any).__testSetupResolve = "ok";
7 changes: 7 additions & 0 deletions test/cli/fixtures/setup-files-resolve/nested/vitest.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { defineConfig } from "vitest/config";

export default defineConfig({
test: {
setupFiles: ["./setup.ts"],
},
});
1 change: 1 addition & 0 deletions test/cli/fixtures/setup-files-resolve/setup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
(globalThis as any).__testSetupResolve = "not-this";
42 changes: 42 additions & 0 deletions test/cli/test/setup-files.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
}
`)
})
Loading