Skip to content

Commit 9b35efd

Browse files
committed
Use the shareable Vitest config
1 parent be3d388 commit 9b35efd

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.10.0",
4142
"jiti": "^2.0.0-beta.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: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6352,6 +6352,7 @@ __metadata:
63526352
"@reduxjs/prettier-config": "workspace:^"
63536353
"@reduxjs/toolkit": "workspace:^"
63546354
"@reduxjs/tsconfig": "workspace:^"
6355+
"@reduxjs/vitest-config": "workspace:^"
63556356
"@types/jscodeshift": "npm:^0.11.11"
63566357
eslint: "npm:^9.10.0"
63576358
execa: "npm:^8.0.1"
@@ -6439,6 +6440,7 @@ __metadata:
64396440
"@reduxjs/eslint-config": "workspace:^"
64406441
"@reduxjs/prettier-config": "workspace:^"
64416442
"@reduxjs/tsconfig": "workspace:^"
6443+
"@reduxjs/vitest-config": "workspace:^"
64426444
"@size-limit/file": "npm:^11.0.1"
64436445
"@size-limit/webpack": "npm:^11.0.1"
64446446
"@testing-library/react": "npm:^13.3.0"
@@ -6476,7 +6478,6 @@ __metadata:
64766478
tsup: "npm:^8.2.3"
64776479
tsx: "npm:^4.19.0"
64786480
typescript: "npm:^5.5.4"
6479-
vite-tsconfig-paths: "npm:^4.3.1"
64806481
vitest: "npm:^1.6.0"
64816482
yargs: "npm:^15.3.1"
64826483
peerDependencies:
@@ -6496,7 +6497,7 @@ __metadata:
64966497
languageName: unknown
64976498
linkType: soft
64986499

6499-
"@reduxjs/vitest-config@workspace:packages/configs/vitest":
6500+
"@reduxjs/vitest-config@workspace:^, @reduxjs/vitest-config@workspace:packages/configs/vitest":
65006501
version: 0.0.0-use.local
65016502
resolution: "@reduxjs/vitest-config@workspace:packages/configs/vitest"
65026503
dependencies:
@@ -6748,6 +6749,7 @@ __metadata:
67486749
"@reduxjs/prettier-config": "workspace:^"
67496750
"@reduxjs/toolkit": "npm:^1.6.0"
67506751
"@reduxjs/tsconfig": "workspace:^"
6752+
"@reduxjs/vitest-config": "workspace:^"
67516753
"@types/commander": "npm:^2.12.2"
67526754
"@types/glob-to-regexp": "npm:^0.4.0"
67536755
"@types/lodash.camelcase": "npm:^4.3.9"
@@ -6772,7 +6774,6 @@ __metadata:
67726774
ts-node: "npm:^10.9.2"
67736775
tsup: "npm:^8.2.4"
67746776
typescript: "npm:^5.5.4"
6775-
vite-tsconfig-paths: "npm:^5.0.1"
67766777
vitest: "npm:^2.0.5"
67776778
yalc: "npm:^1.0.0-pre.47"
67786779
bin:
@@ -25986,7 +25987,7 @@ __metadata:
2598625987
languageName: node
2598725988
linkType: hard
2598825989

25989-
"tsconfck@npm:^3.0.1, tsconfck@npm:^3.0.3":
25990+
"tsconfck@npm:^3.0.3":
2599025991
version: 3.1.1
2599125992
resolution: "tsconfck@npm:3.1.1"
2599225993
peerDependencies:
@@ -27068,22 +27069,6 @@ __metadata:
2706827069
languageName: node
2706927070
linkType: hard
2707027071

27071-
"vite-tsconfig-paths@npm:^4.3.1":
27072-
version: 4.3.1
27073-
resolution: "vite-tsconfig-paths@npm:4.3.1"
27074-
dependencies:
27075-
debug: "npm:^4.1.1"
27076-
globrex: "npm:^0.1.2"
27077-
tsconfck: "npm:^3.0.1"
27078-
peerDependencies:
27079-
vite: "*"
27080-
peerDependenciesMeta:
27081-
vite:
27082-
optional: true
27083-
checksum: 10/1432f80750f5cbe181c265eb9fc2e9fff8b25a2858f176dc0a02311e3e826333526ee9c16bb0aaaa8555a417ea944d68a2e8225181215cd9502370f913eb3f79
27084-
languageName: node
27085-
linkType: hard
27086-
2708727072
"vite-tsconfig-paths@npm:^5.0.1":
2708827073
version: 5.0.1
2708927074
resolution: "vite-tsconfig-paths@npm:5.0.1"

0 commit comments

Comments
 (0)