Skip to content

Commit 7ee8b63

Browse files
committed
Merge branch 'master' of https://github.com/reduxjs/redux-toolkit into configs
2 parents c6fc9d3 + 07614dd commit 7ee8b63

File tree

4 files changed

+93
-132
lines changed

4 files changed

+93
-132
lines changed

packages/rtk-codemods/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"eslint-plugin-node": "^11.1.0",
3737
"eslint-plugin-prettier": "^5.1.3",
3838
"prettier": "^3.2.5",
39-
"vitest": "^1.2.1"
39+
"vitest": "^1.6.0"
4040
},
4141
"engines": {
4242
"node": ">= 16"

packages/rtk-query-codegen-openapi/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"pretty-quick": "^4.0.0",
5353
"rimraf": "^5.0.5",
5454
"ts-node": "^10.9.2",
55-
"vitest": "^1.2.2",
55+
"vitest": "^1.6.0",
5656
"yalc": "^1.0.0-pre.47"
5757
},
5858
"dependencies": {

packages/toolkit/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@
9090
"tsup": "^7.2.0",
9191
"tsx": "^4.12.0",
9292
"typescript": "^5.4.5",
93+
"vite-tsconfig-paths": "^4.3.1",
9394
"vitest": "^1.6.0",
9495
"yargs": "^15.3.1"
9596
},

yarn.lock

+90-130
Original file line numberDiff line numberDiff line change
@@ -5263,6 +5263,13 @@ __metadata:
52635263
languageName: node
52645264
linkType: hard
52655265

5266+
"@eslint/js@npm:8.56.0":
5267+
version: 8.56.0
5268+
resolution: "@eslint/js@npm:8.56.0"
5269+
checksum: 10/97a4b5ccf7e24f4d205a1fb0f21cdcd610348ecf685f6798a48dd41ba443f2c1eedd3050ff5a0b8f30b8cf6501ab512aa9b76e531db15e59c9ebaa41f3162e37
5270+
languageName: node
5271+
linkType: hard
5272+
52665273
"@eslint/js@npm:8.57.0":
52675274
version: 8.57.0
52685275
resolution: "@eslint/js@npm:8.57.0"
@@ -6275,7 +6282,7 @@ __metadata:
62756282
languageName: node
62766283
linkType: hard
62776284

6278-
"@humanwhocodes/config-array@npm:^0.11.14":
6285+
"@humanwhocodes/config-array@npm:^0.11.13, @humanwhocodes/config-array@npm:^0.11.14":
62796286
version: 0.11.14
62806287
resolution: "@humanwhocodes/config-array@npm:0.11.14"
62816288
dependencies:
@@ -7514,7 +7521,7 @@ __metadata:
75147521
prettier: "npm:^3.2.5"
75157522
ts-node: "npm:^10.9.2"
75167523
typescript: "npm:^5.3.3"
7517-
vitest: "npm:^1.2.1"
7524+
vitest: "npm:^1.6.0"
75187525
bin:
75197526
rtk-codemods: ./bin/cli.mjs
75207527
languageName: unknown
@@ -7589,6 +7596,7 @@ __metadata:
75897596
tsup: "npm:^7.2.0"
75907597
tsx: "npm:^4.12.0"
75917598
typescript: "npm:^5.4.5"
7599+
vite-tsconfig-paths: "npm:^4.3.1"
75927600
vitest: "npm:^1.6.0"
75937601
yargs: "npm:^15.3.1"
75947602
peerDependencies:
@@ -7869,7 +7877,7 @@ __metadata:
78697877
swagger2openapi: "npm:^7.0.4"
78707878
ts-node: "npm:^10.9.2"
78717879
typescript: "npm:^5.3.3"
7872-
vitest: "npm:^1.2.2"
7880+
vitest: "npm:^1.6.0"
78737881
yalc: "npm:^1.0.0-pre.47"
78747882
bin:
78757883
rtk-query-codegen-openapi: lib/bin/cli.js
@@ -9923,17 +9931,6 @@ __metadata:
99239931
languageName: node
99249932
linkType: hard
99259933

9926-
"@vitest/expect@npm:1.3.1":
9927-
version: 1.3.1
9928-
resolution: "@vitest/expect@npm:1.3.1"
9929-
dependencies:
9930-
"@vitest/spy": "npm:1.3.1"
9931-
"@vitest/utils": "npm:1.3.1"
9932-
chai: "npm:^4.3.10"
9933-
checksum: 10/7c2818b2080ec107cffcc1566195132695c8e87cba883e878c2f36ac4d8107bb0a1f8d3823ccc0da5989e245ea114b8afffe790512aebcde8537ac8c1bcf3454
9934-
languageName: node
9935-
linkType: hard
9936-
99379934
"@vitest/expect@npm:1.6.0":
99389935
version: 1.6.0
99399936
resolution: "@vitest/expect@npm:1.6.0"
@@ -9945,17 +9942,6 @@ __metadata:
99459942
languageName: node
99469943
linkType: hard
99479944

9948-
"@vitest/runner@npm:1.3.1":
9949-
version: 1.3.1
9950-
resolution: "@vitest/runner@npm:1.3.1"
9951-
dependencies:
9952-
"@vitest/utils": "npm:1.3.1"
9953-
p-limit: "npm:^5.0.0"
9954-
pathe: "npm:^1.1.1"
9955-
checksum: 10/dcd452216b83406df49e298da5e49dbc45c542f755a726a132461b94a84c386b6cabcdfce17fc2d31fa66fd5ea4e57be3618c7dc627b17791e2a1a065d919616
9956-
languageName: node
9957-
linkType: hard
9958-
99599945
"@vitest/runner@npm:1.6.0":
99609946
version: 1.6.0
99619947
resolution: "@vitest/runner@npm:1.6.0"
@@ -9967,17 +9953,6 @@ __metadata:
99679953
languageName: node
99689954
linkType: hard
99699955

9970-
"@vitest/snapshot@npm:1.3.1":
9971-
version: 1.3.1
9972-
resolution: "@vitest/snapshot@npm:1.3.1"
9973-
dependencies:
9974-
magic-string: "npm:^0.30.5"
9975-
pathe: "npm:^1.1.1"
9976-
pretty-format: "npm:^29.7.0"
9977-
checksum: 10/2212ae82eb8d458ddaa6c28c7e33b6a8c8897e298b88e458bf83e7f9bf767fd716ed507f3cd41ebbe145d59baa72220e9f494552f92cc22b39241dc32b8ad8e1
9978-
languageName: node
9979-
linkType: hard
9980-
99819956
"@vitest/snapshot@npm:1.6.0":
99829957
version: 1.6.0
99839958
resolution: "@vitest/snapshot@npm:1.6.0"
@@ -9989,15 +9964,6 @@ __metadata:
99899964
languageName: node
99909965
linkType: hard
99919966

9992-
"@vitest/spy@npm:1.3.1":
9993-
version: 1.3.1
9994-
resolution: "@vitest/spy@npm:1.3.1"
9995-
dependencies:
9996-
tinyspy: "npm:^2.2.0"
9997-
checksum: 10/544c8a30fdeb32fb7bf2c2b5816519be943f5ef90668c306b14efdde7676771d0e83cf0e0a5c79fad722be3839432226bcf74173110a032299821e00b67f47e6
9998-
languageName: node
9999-
linkType: hard
10000-
100019967
"@vitest/spy@npm:1.6.0":
100029968
version: 1.6.0
100039969
resolution: "@vitest/spy@npm:1.6.0"
@@ -10007,18 +9973,6 @@ __metadata:
100079973
languageName: node
100089974
linkType: hard
100099975

10010-
"@vitest/utils@npm:1.3.1":
10011-
version: 1.3.1
10012-
resolution: "@vitest/utils@npm:1.3.1"
10013-
dependencies:
10014-
diff-sequences: "npm:^29.6.3"
10015-
estree-walker: "npm:^3.0.3"
10016-
loupe: "npm:^2.3.7"
10017-
pretty-format: "npm:^29.7.0"
10018-
checksum: 10/170c62e6c348562f611d8caddc893e8cba75ed89986e09aa2f0fe6812c96664e8d0f6e329f7a96a4c9cdecf147f4853e4054c3db597b111ec993d3cdd546eddc
10019-
languageName: node
10020-
linkType: hard
10021-
100229976
"@vitest/utils@npm:1.6.0":
100239977
version: 1.6.0
100249978
resolution: "@vitest/utils@npm:1.6.0"
@@ -15280,7 +15234,7 @@ __metadata:
1528015234
languageName: node
1528115235
linkType: hard
1528215236

15283-
"eslint@npm:^8.3.0, eslint@npm:^8.56.0":
15237+
"eslint@npm:^8.3.0":
1528415238
version: 8.57.0
1528515239
resolution: "eslint@npm:8.57.0"
1528615240
dependencies:
@@ -15328,6 +15282,54 @@ __metadata:
1532815282
languageName: node
1532915283
linkType: hard
1533015284

15285+
"eslint@npm:^8.56.0":
15286+
version: 8.56.0
15287+
resolution: "eslint@npm:8.56.0"
15288+
dependencies:
15289+
"@eslint-community/eslint-utils": "npm:^4.2.0"
15290+
"@eslint-community/regexpp": "npm:^4.6.1"
15291+
"@eslint/eslintrc": "npm:^2.1.4"
15292+
"@eslint/js": "npm:8.56.0"
15293+
"@humanwhocodes/config-array": "npm:^0.11.13"
15294+
"@humanwhocodes/module-importer": "npm:^1.0.1"
15295+
"@nodelib/fs.walk": "npm:^1.2.8"
15296+
"@ungap/structured-clone": "npm:^1.2.0"
15297+
ajv: "npm:^6.12.4"
15298+
chalk: "npm:^4.0.0"
15299+
cross-spawn: "npm:^7.0.2"
15300+
debug: "npm:^4.3.2"
15301+
doctrine: "npm:^3.0.0"
15302+
escape-string-regexp: "npm:^4.0.0"
15303+
eslint-scope: "npm:^7.2.2"
15304+
eslint-visitor-keys: "npm:^3.4.3"
15305+
espree: "npm:^9.6.1"
15306+
esquery: "npm:^1.4.2"
15307+
esutils: "npm:^2.0.2"
15308+
fast-deep-equal: "npm:^3.1.3"
15309+
file-entry-cache: "npm:^6.0.1"
15310+
find-up: "npm:^5.0.0"
15311+
glob-parent: "npm:^6.0.2"
15312+
globals: "npm:^13.19.0"
15313+
graphemer: "npm:^1.4.0"
15314+
ignore: "npm:^5.2.0"
15315+
imurmurhash: "npm:^0.1.4"
15316+
is-glob: "npm:^4.0.0"
15317+
is-path-inside: "npm:^3.0.3"
15318+
js-yaml: "npm:^4.1.0"
15319+
json-stable-stringify-without-jsonify: "npm:^1.0.1"
15320+
levn: "npm:^0.4.1"
15321+
lodash.merge: "npm:^4.6.2"
15322+
minimatch: "npm:^3.1.2"
15323+
natural-compare: "npm:^1.4.0"
15324+
optionator: "npm:^0.9.3"
15325+
strip-ansi: "npm:^6.0.1"
15326+
text-table: "npm:^0.2.0"
15327+
bin:
15328+
eslint: bin/eslint.js
15329+
checksum: 10/ef6193c6e4cef20774b985a5cc2fd4bf6d3c4decd423117cbc4a0196617861745db291217ad3c537bc3a160650cca965bc818f55e1f3e446af1fcb293f9940a5
15330+
languageName: node
15331+
linkType: hard
15332+
1533115333
"eslint@npm:^9.3.0":
1533215334
version: 9.3.0
1533315335
resolution: "eslint@npm:9.3.0"
@@ -28099,13 +28101,6 @@ __metadata:
2809928101
languageName: node
2810028102
linkType: hard
2810128103

28102-
"tinypool@npm:^0.8.2":
28103-
version: 0.8.2
28104-
resolution: "tinypool@npm:0.8.2"
28105-
checksum: 10/5e2cdddc1caf437e3b8d8c56c1c66dffcb46008be4b2e37d457b0921699c6b79930dd8d652e4890c5e1e24688489259da83fd853bc0ce348d8a0375dedefc2ba
28106-
languageName: node
28107-
linkType: hard
28108-
2810928104
"tinypool@npm:^0.8.3":
2811028105
version: 0.8.3
2811128106
resolution: "tinypool@npm:0.8.3"
@@ -28409,6 +28404,20 @@ __metadata:
2840928404
languageName: node
2841028405
linkType: hard
2841128406

28407+
"tsconfck@npm:^3.0.1":
28408+
version: 3.0.2
28409+
resolution: "tsconfck@npm:3.0.2"
28410+
peerDependencies:
28411+
typescript: ^5.0.0
28412+
peerDependenciesMeta:
28413+
typescript:
28414+
optional: true
28415+
bin:
28416+
tsconfck: bin/tsconfck.js
28417+
checksum: 10/bd0666cde64d576701b6b74b45795b76f002ea3c44279ce373426b075f56b47b4a34ee51083a4df7844b0077e2af4cb752a6c6ef246a80339a44351d6367c98c
28418+
languageName: node
28419+
linkType: hard
28420+
2841228421
"tsconfck@npm:^3.0.3":
2841328422
version: 3.0.3
2841428423
resolution: "tsconfck@npm:3.0.3"
@@ -29514,21 +29523,6 @@ __metadata:
2951429523
languageName: node
2951529524
linkType: hard
2951629525

29517-
"vite-node@npm:1.3.1":
29518-
version: 1.3.1
29519-
resolution: "vite-node@npm:1.3.1"
29520-
dependencies:
29521-
cac: "npm:^6.7.14"
29522-
debug: "npm:^4.3.4"
29523-
pathe: "npm:^1.1.1"
29524-
picocolors: "npm:^1.0.0"
29525-
vite: "npm:^5.0.0"
29526-
bin:
29527-
vite-node: vite-node.mjs
29528-
checksum: 10/d6ca8cd5b84768f9a0f12d4327a6aca5200001bd9111991df89ad742e059566a95f8298047af7144ca128120fc67cbd7d37b3fda9700ab07f8fc130d2ad58665
29529-
languageName: node
29530-
linkType: hard
29531-
2953229526
"vite-node@npm:1.6.0":
2953329527
version: 1.6.0
2953429528
resolution: "vite-node@npm:1.6.0"
@@ -29544,6 +29538,22 @@ __metadata:
2954429538
languageName: node
2954529539
linkType: hard
2954629540

29541+
"vite-tsconfig-paths@npm:^4.3.1":
29542+
version: 4.3.1
29543+
resolution: "vite-tsconfig-paths@npm:4.3.1"
29544+
dependencies:
29545+
debug: "npm:^4.1.1"
29546+
globrex: "npm:^0.1.2"
29547+
tsconfck: "npm:^3.0.1"
29548+
peerDependencies:
29549+
vite: "*"
29550+
peerDependenciesMeta:
29551+
vite:
29552+
optional: true
29553+
checksum: 10/1432f80750f5cbe181c265eb9fc2e9fff8b25a2858f176dc0a02311e3e826333526ee9c16bb0aaaa8555a417ea944d68a2e8225181215cd9502370f913eb3f79
29554+
languageName: node
29555+
linkType: hard
29556+
2954729557
"vite-tsconfig-paths@npm:^4.3.2":
2954829558
version: 4.3.2
2954929559
resolution: "vite-tsconfig-paths@npm:4.3.2"
@@ -29600,56 +29610,6 @@ __metadata:
2960029610
languageName: node
2960129611
linkType: hard
2960229612

29603-
"vitest@npm:^1.2.1, vitest@npm:^1.2.2":
29604-
version: 1.3.1
29605-
resolution: "vitest@npm:1.3.1"
29606-
dependencies:
29607-
"@vitest/expect": "npm:1.3.1"
29608-
"@vitest/runner": "npm:1.3.1"
29609-
"@vitest/snapshot": "npm:1.3.1"
29610-
"@vitest/spy": "npm:1.3.1"
29611-
"@vitest/utils": "npm:1.3.1"
29612-
acorn-walk: "npm:^8.3.2"
29613-
chai: "npm:^4.3.10"
29614-
debug: "npm:^4.3.4"
29615-
execa: "npm:^8.0.1"
29616-
local-pkg: "npm:^0.5.0"
29617-
magic-string: "npm:^0.30.5"
29618-
pathe: "npm:^1.1.1"
29619-
picocolors: "npm:^1.0.0"
29620-
std-env: "npm:^3.5.0"
29621-
strip-literal: "npm:^2.0.0"
29622-
tinybench: "npm:^2.5.1"
29623-
tinypool: "npm:^0.8.2"
29624-
vite: "npm:^5.0.0"
29625-
vite-node: "npm:1.3.1"
29626-
why-is-node-running: "npm:^2.2.2"
29627-
peerDependencies:
29628-
"@edge-runtime/vm": "*"
29629-
"@types/node": ^18.0.0 || >=20.0.0
29630-
"@vitest/browser": 1.3.1
29631-
"@vitest/ui": 1.3.1
29632-
happy-dom: "*"
29633-
jsdom: "*"
29634-
peerDependenciesMeta:
29635-
"@edge-runtime/vm":
29636-
optional: true
29637-
"@types/node":
29638-
optional: true
29639-
"@vitest/browser":
29640-
optional: true
29641-
"@vitest/ui":
29642-
optional: true
29643-
happy-dom:
29644-
optional: true
29645-
jsdom:
29646-
optional: true
29647-
bin:
29648-
vitest: vitest.mjs
29649-
checksum: 10/41a8405d65b3b3a48b97b020fae50bdc928a8ebb55b4d24e8867e1ba23d298ea810b37ca6530ab87f6b51d3dc1ada1e067e7bc252a99d8f5439ca4ce6831d1f6
29650-
languageName: node
29651-
linkType: hard
29652-
2965329613
"vitest@npm:^1.6.0":
2965429614
version: 1.6.0
2965529615
resolution: "vitest@npm:1.6.0"

0 commit comments

Comments
 (0)