Skip to content

Commit 2cf6141

Browse files
committedDec 23, 2024
Use the shareable Vitest config
1 parent d8545ce commit 2cf6141

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
@@ -7536,6 +7536,7 @@ __metadata:
75367536
"@reduxjs/prettier-config": "workspace:^"
75377537
"@reduxjs/toolkit": "workspace:^"
75387538
"@reduxjs/tsconfig": "workspace:^"
7539+
"@reduxjs/vitest-config": "workspace:^"
75397540
"@types/jscodeshift": "npm:^0.11.11"
75407541
eslint: "npm:^9.17.0"
75417542
execa: "npm:^8.0.1"
@@ -7623,6 +7624,7 @@ __metadata:
76237624
"@reduxjs/eslint-config": "workspace:^"
76247625
"@reduxjs/prettier-config": "workspace:^"
76257626
"@reduxjs/tsconfig": "workspace:^"
7627+
"@reduxjs/vitest-config": "workspace:^"
76267628
"@size-limit/file": "npm:^11.0.1"
76277629
"@size-limit/webpack": "npm:^11.0.1"
76287630
"@testing-library/dom": "npm:^10.4.0"
@@ -7662,7 +7664,6 @@ __metadata:
76627664
tsup: "npm:^8.2.3"
76637665
tsx: "npm:^4.19.0"
76647666
typescript: "npm:^5.5.4"
7665-
vite-tsconfig-paths: "npm:^4.3.1"
76667667
vitest: "npm:^1.6.0"
76677668
yargs: "npm:^15.3.1"
76687669
peerDependencies:
@@ -7682,7 +7683,7 @@ __metadata:
76827683
languageName: unknown
76837684
linkType: soft
76847685

7685-
"@reduxjs/vitest-config@workspace:packages/configs/vitest":
7686+
"@reduxjs/vitest-config@workspace:^, @reduxjs/vitest-config@workspace:packages/configs/vitest":
76867687
version: 0.0.0-use.local
76877688
resolution: "@reduxjs/vitest-config@workspace:packages/configs/vitest"
76887689
dependencies:
@@ -8077,6 +8078,7 @@ __metadata:
80778078
"@reduxjs/prettier-config": "workspace:^"
80788079
"@reduxjs/toolkit": "npm:^1.6.0"
80798080
"@reduxjs/tsconfig": "workspace:^"
8081+
"@reduxjs/vitest-config": "workspace:^"
80808082
"@types/commander": "npm:^2.12.2"
80818083
"@types/glob-to-regexp": "npm:^0.4.0"
80828084
"@types/lodash.camelcase": "npm:^4.3.9"
@@ -8101,7 +8103,6 @@ __metadata:
81018103
ts-node: "npm:^10.9.2"
81028104
tsup: "npm:^8.2.4"
81038105
typescript: "npm:^5.5.4"
8104-
vite-tsconfig-paths: "npm:^5.0.1"
81058106
vitest: "npm:^2.0.5"
81068107
yalc: "npm:^1.0.0-pre.47"
81078108
bin:
@@ -30977,23 +30978,7 @@ __metadata:
3097730978
languageName: node
3097830979
linkType: hard
3097930980

30980-
"vite-tsconfig-paths@npm:^4.3.1":
30981-
version: 4.3.2
30982-
resolution: "vite-tsconfig-paths@npm:4.3.2"
30983-
dependencies:
30984-
debug: "npm:^4.1.1"
30985-
globrex: "npm:^0.1.2"
30986-
tsconfck: "npm:^3.0.3"
30987-
peerDependencies:
30988-
vite: "*"
30989-
peerDependenciesMeta:
30990-
vite:
30991-
optional: true
30992-
checksum: 10/c12e2087fd01ac8a694850c649b79d5b9798cdba0ef9ab4116f669d8ffa1a9a3195c5a14410d3d9a12d2f08cd35ddd74f03d9c7b13a2d590d002055cdaab45c0
30993-
languageName: node
30994-
linkType: hard
30995-
30996-
"vite-tsconfig-paths@npm:^5.0.1, vite-tsconfig-paths@npm:^5.1.4":
30981+
"vite-tsconfig-paths@npm:^5.1.4":
3099730982
version: 5.1.4
3099830983
resolution: "vite-tsconfig-paths@npm:5.1.4"
3099930984
dependencies:

0 commit comments

Comments
 (0)
Failed to load comments.