Skip to content

Commit eae9bda

Browse files
authored
Merge pull request #3746 from reduxjs/feature/3745-ci-examples
2 parents 36e1a85 + 44d4805 commit eae9bda

File tree

13 files changed

+251
-512
lines changed

13 files changed

+251
-512
lines changed

docs/rtk-query/usage/persistence-and-rehydration.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export const api = createApi({
5252
// highlight-start
5353
extractRehydrationInfo(action, { reducerPath }) {
5454
if (isHydrateAction(action)) {
55-
if (action.key === 'key used with redux-persist') {
55+
if ((action as any).key === 'key used with redux-persist') {
5656
// when persisting the api reducer
5757
return action.payload
5858
}

examples/publish-ci/cra4/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
"version": "0.1.0",
44
"private": true,
55
"dependencies": {
6-
"@reduxjs/toolkit": "^1.9.3",
6+
"@reduxjs/toolkit": "^2.0.0-beta.2",
77
"msw": "^0.49.2",
88
"react": "^18.2.0",
99
"react-dom": "^18.2.0",
10-
"react-redux": "^8.0.5",
10+
"react-redux": "^9.0.0-alpha.1",
1111
"react-scripts": "^4",
1212
"web-vitals": "^2.1.4"
1313
},

examples/publish-ci/cra4/yarn.lock

Lines changed: 40 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1474,7 +1474,7 @@ __metadata:
14741474
languageName: node
14751475
linkType: hard
14761476

1477-
"@babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2":
1477+
"@babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2":
14781478
version: 7.21.0
14791479
resolution: "@babel/runtime@npm:7.21.0"
14801480
dependencies:
@@ -2101,23 +2101,23 @@ __metadata:
21012101
languageName: node
21022102
linkType: hard
21032103

2104-
"@reduxjs/toolkit@npm:^1.9.3":
2105-
version: 1.9.3
2106-
resolution: "@reduxjs/toolkit@npm:1.9.3"
2104+
"@reduxjs/toolkit@npm:^2.0.0-beta.2":
2105+
version: 2.0.0-beta.2
2106+
resolution: "@reduxjs/toolkit@npm:2.0.0-beta.2"
21072107
dependencies:
2108-
immer: ^9.0.16
2109-
redux: ^4.2.0
2110-
redux-thunk: ^2.4.2
2111-
reselect: ^4.1.7
2108+
immer: ^10.0.2
2109+
redux: ^5.0.0-beta.0
2110+
redux-thunk: ^3.0.0-beta.0
2111+
reselect: ^5.0.0-alpha.2
21122112
peerDependencies:
21132113
react: ^16.9.0 || ^17.0.0 || ^18
2114-
react-redux: ^7.2.1 || ^8.0.2
2114+
react-redux: ^7.2.1 || ^8.0.2 || ^9.0.0-alpha.1
21152115
peerDependenciesMeta:
21162116
react:
21172117
optional: true
21182118
react-redux:
21192119
optional: true
2120-
checksum: d965fc6197fd420e4b8eb714015aa908d4ea214e6e10889cf4521e64ac4f8e0a7de29ee4e8da63b291acc40ac330dd31682334090d54838add73c746dc590650
2120+
checksum: 340b515190ba23785464aab85141e49e57a924cde8a335a8df789f1b212cb59fb35e7d8e241bbac9f6e27d17c5236d440aca6f7a7bb2fa36228e0c111c7ec768
21212121
languageName: node
21222122
linkType: hard
21232123

@@ -2504,16 +2504,6 @@ __metadata:
25042504
languageName: node
25052505
linkType: hard
25062506

2507-
"@types/hoist-non-react-statics@npm:^3.3.1":
2508-
version: 3.3.1
2509-
resolution: "@types/hoist-non-react-statics@npm:3.3.1"
2510-
dependencies:
2511-
"@types/react": "*"
2512-
hoist-non-react-statics: ^3.3.0
2513-
checksum: 2c0778570d9a01d05afabc781b32163f28409bb98f7245c38d5eaf082416fdb73034003f5825eb5e21313044e8d2d9e1f3fe2831e345d3d1b1d20bcd12270719
2514-
languageName: node
2515-
linkType: hard
2516-
25172507
"@types/html-minifier-terser@npm:^5.0.0":
25182508
version: 5.1.2
25192509
resolution: "@types/html-minifier-terser@npm:5.1.2"
@@ -8088,15 +8078,6 @@ __metadata:
80888078
languageName: node
80898079
linkType: hard
80908080

8091-
"hoist-non-react-statics@npm:^3.3.0, hoist-non-react-statics@npm:^3.3.2":
8092-
version: 3.3.2
8093-
resolution: "hoist-non-react-statics@npm:3.3.2"
8094-
dependencies:
8095-
react-is: ^16.7.0
8096-
checksum: b1538270429b13901ee586aa44f4cc3ecd8831c061d06cb8322e50ea17b3f5ce4d0e2e66394761e6c8e152cd8c34fb3b4b690116c6ce2bd45b18c746516cb9e8
8097-
languageName: node
8098-
linkType: hard
8099-
81008081
"hoopy@npm:^0.1.4":
81018082
version: 0.1.4
81028083
resolution: "hoopy@npm:0.1.4"
@@ -8410,10 +8391,10 @@ __metadata:
84108391
languageName: node
84118392
linkType: hard
84128393

8413-
"immer@npm:^9.0.16":
8414-
version: 9.0.19
8415-
resolution: "immer@npm:9.0.19"
8416-
checksum: f02ee53989989c287cd548a3d817fccf0bfe56db919755ee94a72ea3ae78a00363fba93ee6c010fe54a664380c29c53d44ed4091c6a86cae60957ad2cfabc010
8394+
"immer@npm:^10.0.2":
8395+
version: 10.0.2
8396+
resolution: "immer@npm:10.0.2"
8397+
checksum: 525a3b14210d02ae420c3b9f6ca14f7e9bcf625611d1356e773e7739f14c7c8de50dac442e6c7de3a6e24a782f7b792b6b8666bc0b3f00269d21a95f8f68ca84
84178398
languageName: node
84188399
linkType: hard
84198400

@@ -13239,7 +13220,7 @@ __metadata:
1323913220
languageName: node
1324013221
linkType: hard
1324113222

13242-
"react-is@npm:^16.13.1, react-is@npm:^16.7.0":
13223+
"react-is@npm:^16.13.1":
1324313224
version: 16.13.1
1324413225
resolution: "react-is@npm:16.13.1"
1324513226
checksum: f7a19ac3496de32ca9ae12aa030f00f14a3d45374f1ceca0af707c831b2a6098ef0d6bdae51bd437b0a306d7f01d4677fcc8de7c0d331eb47ad0f46130e53c5f
@@ -13260,23 +13241,20 @@ __metadata:
1326013241
languageName: node
1326113242
linkType: hard
1326213243

13263-
"react-redux@npm:^8.0.5":
13264-
version: 8.0.5
13265-
resolution: "react-redux@npm:8.0.5"
13244+
"react-redux@npm:^9.0.0-alpha.1":
13245+
version: 9.0.0-alpha.1
13246+
resolution: "react-redux@npm:9.0.0-alpha.1"
1326613247
dependencies:
13267-
"@babel/runtime": ^7.12.1
13268-
"@types/hoist-non-react-statics": ^3.3.1
1326913248
"@types/use-sync-external-store": ^0.0.3
13270-
hoist-non-react-statics: ^3.3.2
1327113249
react-is: ^18.0.0
1327213250
use-sync-external-store: ^1.0.0
1327313251
peerDependencies:
13274-
"@types/react": ^16.8 || ^17.0 || ^18.0
13275-
"@types/react-dom": ^16.8 || ^17.0 || ^18.0
13276-
react: ^16.8 || ^17.0 || ^18.0
13277-
react-dom: ^16.8 || ^17.0 || ^18.0
13278-
react-native: ">=0.59"
13279-
redux: ^4
13252+
"@types/react": ^18.0
13253+
"@types/react-dom": ^18.0
13254+
react: ^18.0
13255+
react-dom: ^18.0
13256+
react-native: ">=0.71"
13257+
redux: ^5.0.0-beta.0
1328013258
peerDependenciesMeta:
1328113259
"@types/react":
1328213260
optional: true
@@ -13288,7 +13266,7 @@ __metadata:
1328813266
optional: true
1328913267
redux:
1329013268
optional: true
13291-
checksum: a108f4f7ead6ac005e656d46051474a2bbdb31ede481bbbb3d8d779c1a35e1940b8655577cc5021313411864d305f67fc719aa48d6e5ed8288cf9cbe8b7042e4
13269+
checksum: ee4edbf417d0f16297e8bc6d039129f915f4d9330ec160ab4135e859a8ec7f11f943cfc26a2d336ec2395c2549c7e8e6d7a4f341febd5404ed0221fb5cbfc17a
1329213270
languageName: node
1329313271
linkType: hard
1329413272

@@ -13474,21 +13452,19 @@ __metadata:
1347413452
languageName: node
1347513453
linkType: hard
1347613454

13477-
"redux-thunk@npm:^2.4.2":
13478-
version: 2.4.2
13479-
resolution: "redux-thunk@npm:2.4.2"
13455+
"redux-thunk@npm:^3.0.0-beta.0":
13456+
version: 3.0.0-beta.0
13457+
resolution: "redux-thunk@npm:3.0.0-beta.0"
1348013458
peerDependencies:
13481-
redux: ^4
13482-
checksum: c7f757f6c383b8ec26152c113e20087818d18ed3edf438aaad43539e9a6b77b427ade755c9595c4a163b6ad3063adf3497e5fe6a36c68884eb1f1cfb6f049a5c
13459+
redux: ^4 || ^5.0.0-beta.0
13460+
checksum: 1609e18a9fb56ab7403d760999996b50e136fcf7411ec9d809e9a4afa4187bf0ab545652c05ffbfca2e0397e59e6baf2ae0d35631a30bf8ba20af1205e98e0fe
1348313461
languageName: node
1348413462
linkType: hard
1348513463

13486-
"redux@npm:^4.2.0":
13487-
version: 4.2.1
13488-
resolution: "redux@npm:4.2.1"
13489-
dependencies:
13490-
"@babel/runtime": ^7.9.2
13491-
checksum: f63b9060c3a1d930ae775252bb6e579b42415aee7a23c4114e21a0b4ba7ec12f0ec76936c00f546893f06e139819f0e2855e0d55ebfce34ca9c026241a6950dd
13464+
"redux@npm:^5.0.0-beta.0":
13465+
version: 5.0.0-beta.0
13466+
resolution: "redux@npm:5.0.0-beta.0"
13467+
checksum: 11df373e219f2f515ee1bda1a19a1ba5de02d8d5c874800ec353179dcd106eddd54432946fd0ab37c47f99f8fe53f820a6404c14da7f039a46022187e9469d2d
1349213468
languageName: node
1349313469
linkType: hard
1349413470

@@ -13679,10 +13655,10 @@ __metadata:
1367913655
languageName: node
1368013656
linkType: hard
1368113657

13682-
"reselect@npm:^4.1.7":
13683-
version: 4.1.7
13684-
resolution: "reselect@npm:4.1.7"
13685-
checksum: 738d8e2b8f0dca154ad29de6a209c9fbca2d70ae6788fd85df87f2c74b95a65bbf2d16d43a9e2faff39de34d17a29d706ba08a6b2ee5660c09589edbd19af7e1
13658+
"reselect@npm:^5.0.0-alpha.2":
13659+
version: 5.0.0-alpha.2
13660+
resolution: "reselect@npm:5.0.0-alpha.2"
13661+
checksum: c47b66999800e1297721cbc4b2464b520fade9823c598d578759c9fba3eb6be03b184e13c20f30820cc18fe2688fc9fb4475f83e59d8f2347aa0d591e465637d
1368613662
languageName: node
1368713663
linkType: hard
1368813664

@@ -13978,7 +13954,7 @@ __metadata:
1397813954
resolution: "rtk-esm-cra@workspace:."
1397913955
dependencies:
1398013956
"@playwright/test": ^1.31.1
13981-
"@reduxjs/toolkit": ^1.9.3
13957+
"@reduxjs/toolkit": ^2.0.0-beta.2
1398213958
"@testing-library/jest-dom": ^5.16.5
1398313959
"@testing-library/react": ^13.4.0
1398413960
"@testing-library/user-event": ^14.4.3
@@ -13991,7 +13967,7 @@ __metadata:
1399113967
prettier: ^2.8.4
1399213968
react: ^18.2.0
1399313969
react-dom: ^18.2.0
13994-
react-redux: ^8.0.5
13970+
react-redux: ^9.0.0-alpha.1
1399513971
react-scripts: ^4
1399613972
serve: ^14.2.0
1399713973
typescript: ^4.9.4

examples/publish-ci/cra5/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
"version": "0.1.0",
44
"private": true,
55
"dependencies": {
6-
"@reduxjs/toolkit": "^1.9.3",
6+
"@reduxjs/toolkit": "^2.0.0-beta.2",
77
"msw": "^0.49.2",
88
"react": "^18.2.0",
99
"react-dom": "^18.2.0",
10-
"react-redux": "^8.0.5",
10+
"react-redux": "^9.0.0-alpha.1",
1111
"react-scripts": "5",
1212
"web-vitals": "^2.1.4"
1313
},

0 commit comments

Comments
 (0)