Skip to content

Commit 15b4fd6

Browse files
authored
fix(vitest): only consider cwd when using glob (fix #3802) (#3949)
1 parent 7b740a2 commit 15b4fd6

File tree

7 files changed

+32
-2
lines changed

7 files changed

+32
-2
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,4 @@ docs/public/user-avatars
2727
docs/public/sponsors
2828
.eslintcache
2929
docs/.vitepress/cache/
30+
!test/cwd/**/.cache

packages/vitest/src/node/workspace.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,13 +145,13 @@ export class WorkspaceProject {
145145

146146
async globFiles(include: string[], exclude: string[], cwd: string) {
147147
const globOptions: fg.Options = {
148-
absolute: true,
149148
dot: true,
150149
cwd,
151150
ignore: exclude,
152151
}
153152

154-
return fg(include, globOptions)
153+
const files = await fg(include, globOptions)
154+
return files.map(file => resolve(cwd, file))
155155
}
156156

157157
async isTargetFile(id: string, source?: string): Promise<boolean> {

pnpm-lock.yaml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import { expect, test } from 'vitest'
2+
3+
test('should not run', () => {
4+
expect(1).toBe(2)
5+
})
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import { expect, test } from 'vitest'
2+
3+
test('should run', () => {
4+
expect(1).toBe(1)
5+
})

test/cwd/package.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"name": "@vitest/test-cwd",
3+
"private": true,
4+
"scripts": {
5+
"test": "cd $(pwd)/.cache/projects/test && vitest run"
6+
},
7+
"devDependencies": {
8+
"vitest": "workspace:*"
9+
}
10+
}

test/cwd/vitest.config.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import { defineConfig } from 'vitest/config'
2+
3+
export default defineConfig({})

0 commit comments

Comments
 (0)