Skip to content

Commit d4171ac

Browse files
committed
Use the shareable Vitest config
1 parent faf8de2 commit d4171ac

File tree

7 files changed

+16
-55
lines changed

7 files changed

+16
-55
lines changed

packages/rtk-codemods/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
"@reduxjs/prettier-config": "workspace:^",
3737
"@reduxjs/toolkit": "workspace:^",
3838
"@reduxjs/tsconfig": "workspace:^",
39+
"@reduxjs/vitest-config": "workspace:^",
3940
"@types/jscodeshift": "^0.11.11",
4041
"eslint": "^9.14.0",
4142
"jiti": "^2.4.0",
Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
import { defineConfig } from 'vitest/config'
1+
import { createVitestConfig } from '@reduxjs/vitest-config'
22

3-
export default defineConfig({
4-
test: {
5-
globals: true
6-
}
7-
})
3+
export default createVitestConfig()

packages/rtk-query-codegen-openapi/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
"@reduxjs/prettier-config": "workspace:^",
5656
"@reduxjs/toolkit": "^1.6.0",
5757
"@reduxjs/tsconfig": "workspace:^",
58+
"@reduxjs/vitest-config": "workspace:^",
5859
"@types/commander": "^2.12.2",
5960
"@types/glob-to-regexp": "^0.4.0",
6061
"@types/lodash.camelcase": "^4.3.9",
@@ -72,7 +73,6 @@
7273
"rimraf": "^5.0.5",
7374
"ts-node": "^10.9.2",
7475
"tsup": "^8.2.4",
75-
"vite-tsconfig-paths": "^5.0.1",
7676
"vitest": "^2.0.5",
7777
"yalc": "^1.0.0-pre.47"
7878
},
Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,13 @@
1-
import path from 'node:path';
2-
import { fileURLToPath } from 'node:url';
3-
import tsconfigPaths from 'vite-tsconfig-paths';
4-
import { defineConfig } from 'vitest/config';
1+
import { createVitestConfig } from '@reduxjs/vitest-config';
52

6-
// No __dirname under Node ESM
7-
const __filename = fileURLToPath(import.meta.url);
8-
const __dirname = path.dirname(__filename);
9-
10-
export default defineConfig({
11-
plugins: [tsconfigPaths({ projects: ['./tsconfig.json'] })],
3+
export default createVitestConfig({
124
test: {
135
alias: process.env.TEST_DIST
146
? {
15-
'@rtk-query/codegen-openapi': path.join(__dirname, '../..', 'node_modules/@rtk-query/codegen-openapi'),
7+
'@rtk-query/codegen-openapi': new URL('../../node_modules/@rtk-query/codegen-openapi', import.meta.url)
8+
.pathname,
169
}
1710
: undefined,
18-
testTimeout: 10_000,
19-
pool: 'forks',
20-
globals: true,
2111
setupFiles: ['./test/vitest.setup.ts'],
2212
},
2313
});

packages/toolkit/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
"@reduxjs/eslint-config": "workspace:^",
5858
"@reduxjs/prettier-config": "workspace:^",
5959
"@reduxjs/tsconfig": "workspace:^",
60+
"@reduxjs/vitest-config": "workspace:^",
6061
"@size-limit/file": "^11.0.1",
6162
"@size-limit/webpack": "^11.0.1",
6263
"@testing-library/react": "^13.3.0",
@@ -90,7 +91,6 @@
9091
"tsup": "^8.2.3",
9192
"tsx": "^4.19.0",
9293
"typescript": "^5.5.4",
93-
"vite-tsconfig-paths": "^4.3.1",
9494
"vitest": "^1.6.0",
9595
"yargs": "^15.3.1"
9696
},

packages/toolkit/vitest.config.mts

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
1-
import path from 'node:path'
2-
import { fileURLToPath } from 'node:url'
3-
import tsconfigPaths from 'vite-tsconfig-paths'
4-
import { defineConfig } from 'vitest/config'
1+
import { createVitestConfig } from '@reduxjs/vitest-config'
52

6-
// No __dirname under Node ESM
7-
const __filename = fileURLToPath(import.meta.url)
8-
const __dirname = path.dirname(__filename)
9-
10-
export default defineConfig({
11-
plugins: [tsconfigPaths({ root: __dirname })],
3+
export default createVitestConfig({
124
test: {
135
alias: process.env.TEST_DIST
146
? {
@@ -18,10 +10,7 @@ export default defineConfig({
1810
).pathname,
1911
}
2012
: undefined,
21-
globals: true,
2213
environment: 'jsdom',
23-
setupFiles: ['./vitest.setup.ts'],
24-
include: ['./src/**/*.(spec|test).[jt]s?(x)'],
2514
server: { deps: { inline: ['redux', '@reduxjs/toolkit'] } },
2615
},
2716
})

yarn.lock

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7019,6 +7019,7 @@ __metadata:
70197019
"@reduxjs/prettier-config": "workspace:^"
70207020
"@reduxjs/toolkit": "workspace:^"
70217021
"@reduxjs/tsconfig": "workspace:^"
7022+
"@reduxjs/vitest-config": "workspace:^"
70227023
"@types/jscodeshift": "npm:^0.11.11"
70237024
eslint: "npm:^9.14.0"
70247025
execa: "npm:^8.0.1"
@@ -7106,6 +7107,7 @@ __metadata:
71067107
"@reduxjs/eslint-config": "workspace:^"
71077108
"@reduxjs/prettier-config": "workspace:^"
71087109
"@reduxjs/tsconfig": "workspace:^"
7110+
"@reduxjs/vitest-config": "workspace:^"
71097111
"@size-limit/file": "npm:^11.0.1"
71107112
"@size-limit/webpack": "npm:^11.0.1"
71117113
"@testing-library/react": "npm:^13.3.0"
@@ -7143,7 +7145,6 @@ __metadata:
71437145
tsup: "npm:^8.2.3"
71447146
tsx: "npm:^4.19.0"
71457147
typescript: "npm:^5.5.4"
7146-
vite-tsconfig-paths: "npm:^4.3.1"
71477148
vitest: "npm:^1.6.0"
71487149
yargs: "npm:^15.3.1"
71497150
peerDependencies:
@@ -7163,7 +7164,7 @@ __metadata:
71637164
languageName: unknown
71647165
linkType: soft
71657166

7166-
"@reduxjs/vitest-config@workspace:packages/configs/vitest":
7167+
"@reduxjs/vitest-config@workspace:^, @reduxjs/vitest-config@workspace:packages/configs/vitest":
71677168
version: 0.0.0-use.local
71687169
resolution: "@reduxjs/vitest-config@workspace:packages/configs/vitest"
71697170
dependencies:
@@ -7428,6 +7429,7 @@ __metadata:
74287429
"@reduxjs/prettier-config": "workspace:^"
74297430
"@reduxjs/toolkit": "npm:^1.6.0"
74307431
"@reduxjs/tsconfig": "workspace:^"
7432+
"@reduxjs/vitest-config": "workspace:^"
74317433
"@types/commander": "npm:^2.12.2"
74327434
"@types/glob-to-regexp": "npm:^0.4.0"
74337435
"@types/lodash.camelcase": "npm:^4.3.9"
@@ -7452,7 +7454,6 @@ __metadata:
74527454
ts-node: "npm:^10.9.2"
74537455
tsup: "npm:^8.2.4"
74547456
typescript: "npm:^5.5.4"
7455-
vite-tsconfig-paths: "npm:^5.0.1"
74567457
vitest: "npm:^2.0.5"
74577458
yalc: "npm:^1.0.0-pre.47"
74587459
bin:
@@ -30549,23 +30550,7 @@ __metadata:
3054930550
languageName: node
3055030551
linkType: hard
3055130552

30552-
"vite-tsconfig-paths@npm:^4.3.1":
30553-
version: 4.3.2
30554-
resolution: "vite-tsconfig-paths@npm:4.3.2"
30555-
dependencies:
30556-
debug: "npm:^4.1.1"
30557-
globrex: "npm:^0.1.2"
30558-
tsconfck: "npm:^3.0.3"
30559-
peerDependencies:
30560-
vite: "*"
30561-
peerDependenciesMeta:
30562-
vite:
30563-
optional: true
30564-
checksum: 10/c12e2087fd01ac8a694850c649b79d5b9798cdba0ef9ab4116f669d8ffa1a9a3195c5a14410d3d9a12d2f08cd35ddd74f03d9c7b13a2d590d002055cdaab45c0
30565-
languageName: node
30566-
linkType: hard
30567-
30568-
"vite-tsconfig-paths@npm:^5.0.1, vite-tsconfig-paths@npm:^5.1.0":
30553+
"vite-tsconfig-paths@npm:^5.1.0":
3056930554
version: 5.1.0
3057030555
resolution: "vite-tsconfig-paths@npm:5.1.0"
3057130556
dependencies:

0 commit comments

Comments
 (0)