Skip to content

Commit 40092bb

Browse files
committed
fix(vitest): use setup file if present
1 parent 65d088d commit 40092bb

File tree

6 files changed

+2096
-2036
lines changed

6 files changed

+2096
-2036
lines changed

.yarn/releases/yarn-3.2.4.cjs

Lines changed: 0 additions & 801 deletions
This file was deleted.

.yarn/releases/yarn-3.8.1.cjs

Lines changed: 875 additions & 0 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ plugins:
44
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
55
spec: "@yarnpkg/plugin-interactive-tools"
66

7-
yarnPath: .yarn/releases/yarn-3.2.4.cjs
7+
yarnPath: .yarn/releases/yarn-3.8.1.cjs

package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,26 +43,26 @@
4343
]
4444
},
4545
"devDependencies": {
46-
"@commitlint/cli": "^18.4.3",
47-
"@commitlint/config-conventional": "^18.4.3",
46+
"@commitlint/cli": "^19.3.0",
47+
"@commitlint/config-conventional": "^19.2.2",
4848
"@semantic-release/changelog": "^6.0.3",
4949
"@semantic-release/commit-analyzer": "^11.1.0",
5050
"@semantic-release/exec": "^6.0.3",
5151
"@semantic-release/git": "^10.0.1",
5252
"@semantic-release/release-notes-generator": "^12.1.0",
53-
"@types/jest": "^29.5.11",
54-
"@types/node": "^20.10.4",
55-
"@typescript-eslint/eslint-plugin": "^6.14.0",
56-
"@typescript-eslint/parser": "^6.14.0",
57-
"coconfig": "^1.4.1",
53+
"@types/jest": "^29.5.12",
54+
"@types/node": "^20.12.7",
55+
"@typescript-eslint/eslint-plugin": "^6.21.0",
56+
"@typescript-eslint/parser": "^6.21.0",
57+
"coconfig": "^1.5.2",
5858
"eslint": "^8.56.0",
5959
"eslint-config-prettier": "^9.1.0",
6060
"eslint-plugin-import": "^2.29.1",
6161
"pinst": "^3.0.0",
62-
"semantic-release": "^22.0.12",
62+
"semantic-release": "^23.0.8",
6363
"ts-node": "^10.9.2",
64-
"typescript": "^5.3.3",
65-
"vitest": "^1.0.4"
64+
"typescript": "^5.4.5",
65+
"vitest": "^1.5.2"
6666
},
67-
"packageManager": "yarn@3.2.4"
67+
"packageManager": "yarn@3.8.1"
6868
}

src/vitest.ts

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,25 @@
1+
import fs from 'fs';
2+
import path from 'path';
3+
14
export function vitestConfig() {
25
// eslint-disable-next-line @typescript-eslint/no-var-requires
36
const { configDefaults, defineConfig } = require('vitest/config');
47

5-
return defineConfig({
8+
const config: typeof configDefaults = {
69
test: {
710
watch: false,
811
exclude: ['.trunk', '**/build/**', ...configDefaults.exclude],
912
},
1013
resolve: {
11-
alias: [
12-
// This is a bit odd because it's relative to CWD, not the
13-
// vitest.config.ts file, but we don't know that path.
14-
{ find: '@', replacement: 'src' },
15-
],
14+
alias: {
15+
'@': path.resolve('./src'),
16+
},
1617
},
17-
});
18+
};
19+
20+
if (fs.existsSync('__tests__/vitest.setup.ts')) {
21+
config.test.globalSetup = '__tests__/vitest.setup.ts';
22+
}
23+
24+
return defineConfig(config);
1825
}

0 commit comments

Comments
 (0)