Skip to content

Commit 1ac2990

Browse files
committed
Use the shareable Vitest config
1 parent 35745e3 commit 1ac2990

File tree

7 files changed

+15
-54
lines changed

7 files changed

+15
-54
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.13.0",
4142
"jiti": "^2.3.3",
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: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6584,6 +6584,7 @@ __metadata:
65846584
"@reduxjs/prettier-config": "workspace:^"
65856585
"@reduxjs/toolkit": "workspace:^"
65866586
"@reduxjs/tsconfig": "workspace:^"
6587+
"@reduxjs/vitest-config": "workspace:^"
65876588
"@types/jscodeshift": "npm:^0.11.11"
65886589
eslint: "npm:^9.13.0"
65896590
execa: "npm:^8.0.1"
@@ -6671,6 +6672,7 @@ __metadata:
66716672
"@reduxjs/eslint-config": "workspace:^"
66726673
"@reduxjs/prettier-config": "workspace:^"
66736674
"@reduxjs/tsconfig": "workspace:^"
6675+
"@reduxjs/vitest-config": "workspace:^"
66746676
"@size-limit/file": "npm:^11.0.1"
66756677
"@size-limit/webpack": "npm:^11.0.1"
66766678
"@testing-library/react": "npm:^13.3.0"
@@ -6708,7 +6710,6 @@ __metadata:
67086710
tsup: "npm:^8.2.3"
67096711
tsx: "npm:^4.19.0"
67106712
typescript: "npm:^5.5.4"
6711-
vite-tsconfig-paths: "npm:^4.3.1"
67126713
vitest: "npm:^1.6.0"
67136714
yargs: "npm:^15.3.1"
67146715
peerDependencies:
@@ -6728,7 +6729,7 @@ __metadata:
67286729
languageName: unknown
67296730
linkType: soft
67306731

6731-
"@reduxjs/vitest-config@workspace:packages/configs/vitest":
6732+
"@reduxjs/vitest-config@workspace:^, @reduxjs/vitest-config@workspace:packages/configs/vitest":
67326733
version: 0.0.0-use.local
67336734
resolution: "@reduxjs/vitest-config@workspace:packages/configs/vitest"
67346735
dependencies:
@@ -6979,6 +6980,7 @@ __metadata:
69796980
"@reduxjs/prettier-config": "workspace:^"
69806981
"@reduxjs/toolkit": "npm:^1.6.0"
69816982
"@reduxjs/tsconfig": "workspace:^"
6983+
"@reduxjs/vitest-config": "workspace:^"
69826984
"@types/commander": "npm:^2.12.2"
69836985
"@types/glob-to-regexp": "npm:^0.4.0"
69846986
"@types/lodash.camelcase": "npm:^4.3.9"
@@ -7003,7 +7005,6 @@ __metadata:
70037005
ts-node: "npm:^10.9.2"
70047006
tsup: "npm:^8.2.4"
70057007
typescript: "npm:^5.5.4"
7006-
vite-tsconfig-paths: "npm:^5.0.1"
70077008
vitest: "npm:^2.0.5"
70087009
yalc: "npm:^1.0.0-pre.47"
70097010
bin:
@@ -27715,22 +27716,6 @@ __metadata:
2771527716
languageName: node
2771627717
linkType: hard
2771727718

27718-
"vite-tsconfig-paths@npm:^4.3.1":
27719-
version: 4.3.2
27720-
resolution: "vite-tsconfig-paths@npm:4.3.2"
27721-
dependencies:
27722-
debug: "npm:^4.1.1"
27723-
globrex: "npm:^0.1.2"
27724-
tsconfck: "npm:^3.0.3"
27725-
peerDependencies:
27726-
vite: "*"
27727-
peerDependenciesMeta:
27728-
vite:
27729-
optional: true
27730-
checksum: 10/c12e2087fd01ac8a694850c649b79d5b9798cdba0ef9ab4116f669d8ffa1a9a3195c5a14410d3d9a12d2f08cd35ddd74f03d9c7b13a2d590d002055cdaab45c0
27731-
languageName: node
27732-
linkType: hard
27733-
2773427719
"vite-tsconfig-paths@npm:^5.0.1":
2773527720
version: 5.0.1
2773627721
resolution: "vite-tsconfig-paths@npm:5.0.1"

0 commit comments

Comments
 (0)