Skip to content

Commit b78b7eb

Browse files
committed
Use the shareable Vitest config
1 parent cd4c2d7 commit b78b7eb

File tree

7 files changed

+16
-55
lines changed

7 files changed

+16
-55
lines changed

packages/rtk-codemods/package.json

+1
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.17.0",
4142
"jiti": "^2.4.2",
+2-6
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

+1-1
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
},
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

+1-1
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/dom": "^10.4.0",
@@ -92,7 +93,6 @@
9293
"tsup": "^8.2.3",
9394
"tsx": "^4.19.0",
9495
"typescript": "^5.5.4",
95-
"vite-tsconfig-paths": "^4.3.1",
9696
"vitest": "^1.6.0",
9797
"yargs": "^15.3.1"
9898
},

packages/toolkit/vitest.config.mts

+2-13
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

+5-20
Original file line numberDiff line numberDiff line change
@@ -7566,6 +7566,7 @@ __metadata:
75667566
"@reduxjs/prettier-config": "workspace:^"
75677567
"@reduxjs/toolkit": "workspace:^"
75687568
"@reduxjs/tsconfig": "workspace:^"
7569+
"@reduxjs/vitest-config": "workspace:^"
75697570
"@types/jscodeshift": "npm:^0.11.11"
75707571
eslint: "npm:^9.17.0"
75717572
execa: "npm:^8.0.1"
@@ -7653,6 +7654,7 @@ __metadata:
76537654
"@reduxjs/eslint-config": "workspace:^"
76547655
"@reduxjs/prettier-config": "workspace:^"
76557656
"@reduxjs/tsconfig": "workspace:^"
7657+
"@reduxjs/vitest-config": "workspace:^"
76567658
"@size-limit/file": "npm:^11.0.1"
76577659
"@size-limit/webpack": "npm:^11.0.1"
76587660
"@testing-library/dom": "npm:^10.4.0"
@@ -7692,7 +7694,6 @@ __metadata:
76927694
tsup: "npm:^8.2.3"
76937695
tsx: "npm:^4.19.0"
76947696
typescript: "npm:^5.5.4"
7695-
vite-tsconfig-paths: "npm:^4.3.1"
76967697
vitest: "npm:^1.6.0"
76977698
yargs: "npm:^15.3.1"
76987699
peerDependencies:
@@ -7712,7 +7713,7 @@ __metadata:
77127713
languageName: unknown
77137714
linkType: soft
77147715

7715-
"@reduxjs/vitest-config@workspace:packages/configs/vitest":
7716+
"@reduxjs/vitest-config@workspace:^, @reduxjs/vitest-config@workspace:packages/configs/vitest":
77167717
version: 0.0.0-use.local
77177718
resolution: "@reduxjs/vitest-config@workspace:packages/configs/vitest"
77187719
dependencies:
@@ -8107,6 +8108,7 @@ __metadata:
81078108
"@reduxjs/prettier-config": "workspace:^"
81088109
"@reduxjs/toolkit": "npm:^1.6.0"
81098110
"@reduxjs/tsconfig": "workspace:^"
8111+
"@reduxjs/vitest-config": "workspace:^"
81108112
"@types/commander": "npm:^2.12.2"
81118113
"@types/glob-to-regexp": "npm:^0.4.0"
81128114
"@types/lodash.camelcase": "npm:^4.3.9"
@@ -8131,7 +8133,6 @@ __metadata:
81318133
ts-node: "npm:^10.9.2"
81328134
tsup: "npm:^8.2.4"
81338135
typescript: "npm:^5.5.4"
8134-
vite-tsconfig-paths: "npm:^5.0.1"
81358136
vitest: "npm:^2.0.5"
81368137
yalc: "npm:^1.0.0-pre.47"
81378138
bin:
@@ -31069,23 +31070,7 @@ __metadata:
3106931070
languageName: node
3107031071
linkType: hard
3107131072

31072-
"vite-tsconfig-paths@npm:^4.3.1":
31073-
version: 4.3.2
31074-
resolution: "vite-tsconfig-paths@npm:4.3.2"
31075-
dependencies:
31076-
debug: "npm:^4.1.1"
31077-
globrex: "npm:^0.1.2"
31078-
tsconfck: "npm:^3.0.3"
31079-
peerDependencies:
31080-
vite: "*"
31081-
peerDependenciesMeta:
31082-
vite:
31083-
optional: true
31084-
checksum: 10/c12e2087fd01ac8a694850c649b79d5b9798cdba0ef9ab4116f669d8ffa1a9a3195c5a14410d3d9a12d2f08cd35ddd74f03d9c7b13a2d590d002055cdaab45c0
31085-
languageName: node
31086-
linkType: hard
31087-
31088-
"vite-tsconfig-paths@npm:^5.0.1, vite-tsconfig-paths@npm:^5.1.4":
31073+
"vite-tsconfig-paths@npm:^5.1.4":
3108931074
version: 5.1.4
3109031075
resolution: "vite-tsconfig-paths@npm:5.1.4"
3109131076
dependencies:

0 commit comments

Comments
 (0)