Skip to content

Commit 3e9d3a6

Browse files
committed
Use the shareable Vitest config
1 parent 78c4728 commit 3e9d3a6

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.20.1",
4142
"jiti": "^2.4.2",
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/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

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
@@ -7590,6 +7590,7 @@ __metadata:
75907590
"@reduxjs/prettier-config": "workspace:^"
75917591
"@reduxjs/toolkit": "workspace:^"
75927592
"@reduxjs/tsconfig": "workspace:^"
7593+
"@reduxjs/vitest-config": "workspace:^"
75937594
"@types/jscodeshift": "npm:^0.11.11"
75947595
eslint: "npm:^9.20.1"
75957596
execa: "npm:^8.0.1"
@@ -7677,6 +7678,7 @@ __metadata:
76777678
"@reduxjs/eslint-config": "workspace:^"
76787679
"@reduxjs/prettier-config": "workspace:^"
76797680
"@reduxjs/tsconfig": "workspace:^"
7681+
"@reduxjs/vitest-config": "workspace:^"
76807682
"@size-limit/file": "npm:^11.0.1"
76817683
"@size-limit/webpack": "npm:^11.0.1"
76827684
"@testing-library/dom": "npm:^10.4.0"
@@ -7716,7 +7718,6 @@ __metadata:
77167718
tsup: "npm:^8.2.3"
77177719
tsx: "npm:^4.19.0"
77187720
typescript: "npm:^5.5.4"
7719-
vite-tsconfig-paths: "npm:^4.3.1"
77207721
vitest: "npm:^1.6.0"
77217722
yargs: "npm:^15.3.1"
77227723
peerDependencies:
@@ -7736,7 +7737,7 @@ __metadata:
77367737
languageName: unknown
77377738
linkType: soft
77387739

7739-
"@reduxjs/vitest-config@workspace:packages/configs/vitest":
7740+
"@reduxjs/vitest-config@workspace:^, @reduxjs/vitest-config@workspace:packages/configs/vitest":
77407741
version: 0.0.0-use.local
77417742
resolution: "@reduxjs/vitest-config@workspace:packages/configs/vitest"
77427743
dependencies:
@@ -8131,6 +8132,7 @@ __metadata:
81318132
"@reduxjs/prettier-config": "workspace:^"
81328133
"@reduxjs/toolkit": "npm:^1.6.0"
81338134
"@reduxjs/tsconfig": "workspace:^"
8135+
"@reduxjs/vitest-config": "workspace:^"
81348136
"@types/commander": "npm:^2.12.2"
81358137
"@types/glob-to-regexp": "npm:^0.4.0"
81368138
"@types/lodash.camelcase": "npm:^4.3.9"
@@ -8155,7 +8157,6 @@ __metadata:
81558157
ts-node: "npm:^10.9.2"
81568158
tsup: "npm:^8.2.4"
81578159
typescript: "npm:^5.5.4"
8158-
vite-tsconfig-paths: "npm:^5.0.1"
81598160
vitest: "npm:^2.0.5"
81608161
yalc: "npm:^1.0.0-pre.47"
81618162
bin:
@@ -31235,23 +31236,7 @@ __metadata:
3123531236
languageName: node
3123631237
linkType: hard
3123731238

31238-
"vite-tsconfig-paths@npm:^4.3.1":
31239-
version: 4.3.2
31240-
resolution: "vite-tsconfig-paths@npm:4.3.2"
31241-
dependencies:
31242-
debug: "npm:^4.1.1"
31243-
globrex: "npm:^0.1.2"
31244-
tsconfck: "npm:^3.0.3"
31245-
peerDependencies:
31246-
vite: "*"
31247-
peerDependenciesMeta:
31248-
vite:
31249-
optional: true
31250-
checksum: 10/c12e2087fd01ac8a694850c649b79d5b9798cdba0ef9ab4116f669d8ffa1a9a3195c5a14410d3d9a12d2f08cd35ddd74f03d9c7b13a2d590d002055cdaab45c0
31251-
languageName: node
31252-
linkType: hard
31253-
31254-
"vite-tsconfig-paths@npm:^5.0.1, vite-tsconfig-paths@npm:^5.1.4":
31239+
"vite-tsconfig-paths@npm:^5.1.4":
3125531240
version: 5.1.4
3125631241
resolution: "vite-tsconfig-paths@npm:5.1.4"
3125731242
dependencies:

0 commit comments

Comments
 (0)