Skip to content

Commit 9db3055

Browse files
lukaw3dlukaw3d
authored
Merge pull request #2127 from oasisprotocol/mz/reduxBump
Bump redux dependencies
2 parents 69e5d12 + 837c783 commit 9db3055

File tree

5 files changed

+69
-63
lines changed

5 files changed

+69
-63
lines changed

‎.changelog/2127.internal.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Bump Redux dependencies

‎package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
"@oasisprotocol/client-rt": "1.1.0",
7272
"@oasisprotocol/ionic-ledger-hw-transport-ble": "6.0.0",
7373
"@oasisprotocol/ledger": "1.0.0",
74-
"@reduxjs/toolkit": "1.9.7",
74+
"@reduxjs/toolkit": "2.6.0",
7575
"bignumber.js": "9.1.2",
7676
"bip39": "3.1.0",
7777
"body-scroll-lock": "4.0.0-beta.0",
@@ -88,9 +88,9 @@
8888
"react-dom": "18.2.0",
8989
"react-helmet-async": "1.3.0",
9090
"react-i18next": "13.3.1",
91-
"react-redux": "7.2.9",
91+
"react-redux": "9.2.0",
9292
"react-router-dom": "6.16.0",
93-
"redux-saga": "1.2.3",
93+
"redux-saga": "1.3.0",
9494
"redux-state-sync": "3.1.4",
9595
"styled-components": "5.3.11",
9696
"tweetnacl": "1.0.3",
@@ -115,7 +115,7 @@
115115
"@types/lodash": "4.14.202",
116116
"@types/react": "18.2.42",
117117
"@types/react-dom": "18.2.17",
118-
"@types/react-redux": "7.1.32",
118+
"@types/react-redux": "7.1.34",
119119
"@types/react-test-renderer": "18.0.7",
120120
"@types/redux-state-sync": "3.1.9",
121121
"@types/styled-components": "5.1.34",

‎src/app/state/persist/syncTabs.ts‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
1-
import {
2-
AnyAction,
3-
configureStore,
4-
ConfigureStoreOptions,
5-
Dispatch,
6-
EnhancedStore,
7-
Middleware,
8-
} from '@reduxjs/toolkit'
1+
import { AnyAction, configureStore, ConfigureStoreOptions, EnhancedStore, Middleware } from '@reduxjs/toolkit'
92
import { isSyncingTabsSupported, needsSyncingTabs } from 'app/state/persist'
103
import {
114
createStateSyncMiddleware,
@@ -179,7 +172,7 @@ const stateSyncConfig: StateSyncConfig = {
179172
/** Wrap configureStore with redux-state-sync if native BroadcastChannel is supported. */
180173
export function configureStoreWithSyncTabs(
181174
options: ConfigureStoreOptions<RootState>,
182-
): EnhancedStore<RootState, AnyAction, Middleware<unknown, RootState, Dispatch<AnyAction>>[]> {
175+
): EnhancedStore<RootState, AnyAction> {
183176
if (typeof options.middleware !== 'function') throw new Error('Unsupported type of options.middleware')
184177
if (typeof options.reducer !== 'function') throw new Error('Unsupported type of options.reducer')
185178
if (!needsSyncingTabs) {
@@ -196,7 +189,9 @@ export function configureStoreWithSyncTabs(
196189
...options,
197190
reducer: withReduxStateSync(options.reducer, receiveInitialTabSyncState),
198191
middleware: getDefaultMiddleware =>
199-
optionsMiddleware(getDefaultMiddleware).concat(createStateSyncMiddleware(stateSyncConfig)),
192+
optionsMiddleware(getDefaultMiddleware).concat(
193+
createStateSyncMiddleware(stateSyncConfig) as Middleware<object, RootState>,
194+
),
200195
})
201196

202197
initStateWithPrevTab(store)

‎src/store/configureStore.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export function configureAppStore(state?: Partial<RootState>) {
2828
devTools:
2929
/* istanbul ignore next line */
3030
process.env.NODE_ENV !== 'production',
31-
preloadedState: state,
31+
preloadedState: state as RootState | undefined,
3232
})
3333

3434
sagaMiddleware.run(rootSagas)

‎yarn.lock‎

Lines changed: 58 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1093,7 +1093,7 @@
10931093
resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310"
10941094
integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
10951095

1096-
"@babel/runtime@^7.12.5", "@babel/runtime@^7.14.6", "@babel/runtime@^7.15.4", "@babel/runtime@^7.16.3", "@babel/runtime@^7.19.4", "@babel/runtime@^7.22.5", "@babel/runtime@^7.23.2", "@babel/runtime@^7.6.2", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
1096+
"@babel/runtime@^7.12.5", "@babel/runtime@^7.14.6", "@babel/runtime@^7.16.3", "@babel/runtime@^7.19.4", "@babel/runtime@^7.22.5", "@babel/runtime@^7.23.2", "@babel/runtime@^7.6.2", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
10971097
version "7.23.2"
10981098
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.2.tgz#062b0ac103261d68a966c4c7baf2ae3e62ec3885"
10991099
integrity sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==
@@ -2695,18 +2695,17 @@
26952695
resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
26962696
integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=
26972697

2698-
"@redux-saga/core@^1.2.3":
2699-
version "1.2.3"
2700-
resolved "https://registry.yarnpkg.com/@redux-saga/core/-/core-1.2.3.tgz#882ed9ac58b5f42c6abb23349542315b871de305"
2701-
integrity sha512-U1JO6ncFBAklFTwoQ3mjAeQZ6QGutsJzwNBjgVLSWDpZTRhobUzuVDS1qH3SKGJD8fvqoaYOjp6XJ3gCmeZWgA==
2698+
"@redux-saga/core@^1.3.0":
2699+
version "1.3.0"
2700+
resolved "https://registry.yarnpkg.com/@redux-saga/core/-/core-1.3.0.tgz#2ce08b73d407fc6ea9e7f7d83d2e97d981a3a8b8"
2701+
integrity sha512-L+i+qIGuyWn7CIg7k1MteHGfttKPmxwZR5E7OsGikCL2LzYA0RERlaUY00Y3P3ZV2EYgrsYlBrGs6cJP5OKKqA==
27022702
dependencies:
27032703
"@babel/runtime" "^7.6.3"
27042704
"@redux-saga/deferred" "^1.2.1"
27052705
"@redux-saga/delay-p" "^1.2.1"
27062706
"@redux-saga/is" "^1.1.3"
27072707
"@redux-saga/symbols" "^1.1.3"
27082708
"@redux-saga/types" "^1.2.1"
2709-
redux "^4.0.4"
27102709
typescript-tuple "^2.2.1"
27112710

27122711
"@redux-saga/deferred@^1.2.1":
@@ -2739,15 +2738,15 @@
27392738
resolved "https://registry.yarnpkg.com/@redux-saga/types/-/types-1.2.1.tgz#9403f51c17cae37edf870c6bc0c81c1ece5ccef8"
27402739
integrity sha512-1dgmkh+3so0+LlBWRhGA33ua4MYr7tUOj+a9Si28vUi0IUFNbff1T3sgpeDJI/LaC75bBYnQ0A3wXjn0OrRNBA==
27412740

2742-
"@reduxjs/toolkit@1.9.7":
2743-
version "1.9.7"
2744-
resolved "https://registry.yarnpkg.com/@reduxjs/toolkit/-/toolkit-1.9.7.tgz#7fc07c0b0ebec52043f8cb43510cf346405f78a6"
2745-
integrity sha512-t7v8ZPxhhKgOKtU+uyJT13lu4vL7az5aFi4IdoDs/eS548edn2M8Ik9h8fxgvMjGoAUVFSt6ZC1P5cWmQ014QQ==
2741+
"@reduxjs/toolkit@2.6.0":
2742+
version "2.6.0"
2743+
resolved "https://registry.yarnpkg.com/@reduxjs/toolkit/-/toolkit-2.6.0.tgz#fb4fdd0971162a1f18a6c52899fdfd9c77674e67"
2744+
integrity sha512-mWJCYpewLRyTuuzRSEC/IwIBBkYg2dKtQas8mty5MaV2iXzcmicS3gW554FDeOvLnY3x13NIk8MB1e8wHO7rqQ==
27462745
dependencies:
2747-
immer "^9.0.21"
2748-
redux "^4.2.1"
2749-
redux-thunk "^2.4.2"
2750-
reselect "^4.1.8"
2746+
immer "^10.0.3"
2747+
redux "^5.0.1"
2748+
redux-thunk "^3.1.0"
2749+
reselect "^5.1.0"
27512750

27522751
"@remix-run/[email protected]":
27532752
version "1.9.0"
@@ -3102,10 +3101,10 @@
31023101
dependencies:
31033102
"@types/react" "*"
31043103

3105-
"@types/[email protected].32", "@types/react-redux@^7.1.20":
3106-
version "7.1.32"
3107-
resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.32.tgz#bf162289e0c69e44a649dfcadb30f7f7c4cb00e4"
3108-
integrity sha512-YJYV0M27cyHHJIacaRsZRx5OETzK8KWjEGnix7UH3ngItYo4It0MUBzU6WNwqnwhbrPw5wx9KXluuoTZ85Gg7A==
3104+
"@types/[email protected].34":
3105+
version "7.1.34"
3106+
resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.34.tgz#83613e1957c481521e6776beeac4fd506d11bd0e"
3107+
integrity sha512-GdFaVjEbYv4Fthm2ZLvj1VSCedV7TqE5y1kNwnjSdBOTXuRSgowux6J8TAct15T3CKBr63UMk+2CO7ilRhyrAQ==
31093108
dependencies:
31103109
"@types/hoist-non-react-statics" "^3.3.0"
31113110
"@types/react" "*"
@@ -3187,6 +3186,11 @@
31873186
resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397"
31883187
integrity sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==
31893188

3189+
"@types/use-sync-external-store@^0.0.6":
3190+
version "0.0.6"
3191+
resolved "https://registry.yarnpkg.com/@types/use-sync-external-store/-/use-sync-external-store-0.0.6.tgz#60be8d21baab8c305132eb9cb912ed497852aadc"
3192+
integrity sha512-zFDAD+tlpf2r4asuHEj0XH6pY6i0g5NeAHPn+15wk3BV6JA69eERFXC1gyGThDkVa1zCyKr5jox1+2LbV/AMLg==
3193+
31903194
"@types/[email protected]":
31913195
version "1.0.7"
31923196
resolved "https://registry.yarnpkg.com/@types/valid-url/-/valid-url-1.0.7.tgz#f99e3d89dea90f34a7cc695a6f152728abfb245a"
@@ -6016,7 +6020,7 @@ hmac-drbg@^1.0.1:
60166020
minimalistic-assert "^1.0.0"
60176021
minimalistic-crypto-utils "^1.0.1"
60186022

6019-
hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.2.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
6023+
hoist-non-react-statics@^3.0.0, hoist-non-react-statics@^3.2.0, hoist-non-react-statics@^3.3.0:
60206024
version "3.3.2"
60216025
resolved "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz"
60226026
integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
@@ -6165,10 +6169,10 @@ ignore@^5.2.0, ignore@^5.2.4, ignore@~5.3.0:
61656169
resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.0.tgz#67418ae40d34d6999c95ff56016759c718c82f78"
61666170
integrity sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==
61676171

6168-
immer@^9.0.21:
6169-
version "9.0.21"
6170-
resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.21.tgz#1e025ea31a40f24fb064f1fef23e931496330176"
6171-
integrity sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA==
6172+
immer@^10.0.3:
6173+
version "10.1.1"
6174+
resolved "https://registry.yarnpkg.com/immer/-/immer-10.1.1.tgz#206f344ea372d8ea176891545ee53ccc062db7bc"
6175+
integrity sha512-s2MPrmjovJcoMaHtx6K11Ra7oD05NT97w1IC5zpMkT6Atjr7H8LjaDd81iIxUYpMKSRRNMJE703M1Fhr/TctHw==
61726176

61736177
import-fresh@^3.2.1:
61746178
version "3.3.0"
@@ -8517,22 +8521,18 @@ react-is@^16.13.1, react-is@^16.7.0:
85178521
resolved "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz"
85188522
integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
85198523

8520-
react-is@^17.0.1, react-is@^17.0.2:
8524+
react-is@^17.0.1:
85218525
version "17.0.2"
85228526
resolved "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz"
85238527
integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
85248528

8525-
react-redux@7.2.9:
8526-
version "7.2.9"
8527-
resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.9.tgz#09488fbb9416a4efe3735b7235055442b042481d"
8528-
integrity sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==
8529+
react-redux@9.2.0:
8530+
version "9.2.0"
8531+
resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-9.2.0.tgz#96c3ab23fb9a3af2cb4654be4b51c989e32366f5"
8532+
integrity sha512-ROY9fvHhwOD9ySfrF0wmvu//bKCQ6AeZZq1nJNtbDC+kk5DuSuNX/n6YWYF/SYy7bSba4D4FSz8DJeKY/S/r+g==
85298533
dependencies:
8530-
"@babel/runtime" "^7.15.4"
8531-
"@types/react-redux" "^7.1.20"
8532-
hoist-non-react-statics "^3.3.2"
8533-
loose-envify "^1.4.0"
8534-
prop-types "^15.7.2"
8535-
react-is "^17.0.2"
8534+
"@types/use-sync-external-store" "^0.0.6"
8535+
use-sync-external-store "^1.4.0"
85368536

85378537
react-refresh@^0.9.0:
85388538
version "0.9.0"
@@ -8617,12 +8617,12 @@ [email protected]:
86178617
lodash.isequal "^4.5.0"
86188618
lodash.ismatch "^4.4.0"
86198619

8620-
redux-saga@1.2.3:
8621-
version "1.2.3"
8622-
resolved "https://registry.yarnpkg.com/redux-saga/-/redux-saga-1.2.3.tgz#7362f78a0235868daf1210f8862a95906ac018a1"
8623-
integrity sha512-HDe0wTR5nhd8Xr5xjGzoyTbdAw6rjy1GDplFt3JKtKN8/MnkQSRqK/n6aQQhpw5NI4ekDVOaW+w4sdxPBaCoTQ==
8620+
redux-saga@1.3.0:
8621+
version "1.3.0"
8622+
resolved "https://registry.yarnpkg.com/redux-saga/-/redux-saga-1.3.0.tgz#a59ada7c28010189355356b99738c9fcb7ade30e"
8623+
integrity sha512-J9RvCeAZXSTAibFY0kGw6Iy4EdyDNW7k6Q+liwX+bsck7QVsU78zz8vpBRweEfANxnnlG/xGGeOvf6r8UXzNJQ==
86248624
dependencies:
8625-
"@redux-saga/core" "^1.2.3"
8625+
"@redux-saga/core" "^1.3.0"
86268626

86278627
[email protected]:
86288628
version "3.1.4"
@@ -8631,18 +8631,23 @@ [email protected]:
86318631
dependencies:
86328632
broadcast-channel "^3.1.0"
86338633

8634-
redux-thunk@^2.4.2:
8635-
version "2.4.2"
8636-
resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.4.2.tgz#b9d05d11994b99f7a91ea223e8b04cf0afa5ef3b"
8637-
integrity sha512-+P3TjtnP0k/FEjcBL5FZpoovtvrTNT/UXd4/sluaSyrURlSlhLSzEdfsTBW7WsKB6yPvgd7q/iZPICFjW4o57Q==
8634+
redux-thunk@^3.1.0:
8635+
version "3.1.0"
8636+
resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-3.1.0.tgz#94aa6e04977c30e14e892eae84978c1af6058ff3"
8637+
integrity sha512-NW2r5T6ksUKXCabzhL9z+h206HQw/NJkcLm1GPImRQ8IzfXwRGqjVhKJGauHirT0DAuyy6hjdnMZaRoAcy0Klw==
86388638

8639-
redux@^4.0.0, redux@^4.0.1, redux@^4.0.4, redux@^4.2.1:
8639+
redux@^4.0.0, redux@^4.0.1:
86408640
version "4.2.1"
86418641
resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.1.tgz#c08f4306826c49b5e9dc901dee0452ea8fce6197"
86428642
integrity sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==
86438643
dependencies:
86448644
"@babel/runtime" "^7.9.2"
86458645

8646+
redux@^5.0.1:
8647+
version "5.0.1"
8648+
resolved "https://registry.yarnpkg.com/redux/-/redux-5.0.1.tgz#97fa26881ce5746500125585d5642c77b6e9447b"
8649+
integrity sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w==
8650+
86468651
reflect.getprototypeof@^1.0.4:
86478652
version "1.0.4"
86488653
resolved "https://registry.yarnpkg.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.4.tgz#aaccbf41aca3821b87bb71d9dcbc7ad0ba50a3f3"
@@ -8751,10 +8756,10 @@ requires-port@^1.0.0:
87518756
resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
87528757
integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
87538758

8754-
reselect@^4.1.8:
8755-
version "4.1.8"
8756-
resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.8.tgz#3f5dc671ea168dccdeb3e141236f69f02eaec524"
8757-
integrity sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ==
8759+
reselect@^5.1.0:
8760+
version "5.1.1"
8761+
resolved "https://registry.yarnpkg.com/reselect/-/reselect-5.1.1.tgz#c766b1eb5d558291e5e550298adb0becc24bb72e"
8762+
integrity sha512-K/BG6eIky/SBpzfHZv/dd+9JBFiS4SWV7FIujVyJRux6e45+73RaUHXLmIR1f7WOMaQ0U1km6qwklRQxpJJY0w==
87588763

87598764
resolve-cwd@^3.0.0:
87608765
version "3.0.0"
@@ -9768,6 +9773,11 @@ url-parse@^1.5.3:
97689773
querystringify "^2.1.1"
97699774
requires-port "^1.0.0"
97709775

9776+
use-sync-external-store@^1.4.0:
9777+
version "1.4.0"
9778+
resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.4.0.tgz#adbc795d8eeb47029963016cefdf89dc799fcebc"
9779+
integrity sha512-9WXSPC5fMv61vaupRkCKCxsPxBocVnwakBEkMIHHpkTTg6icbJtg6jzgtLDm4bl3cSHAca52rYWih0k4K3PfHw==
9780+
97719781
util-deprecate@^1.0.1, util-deprecate@~1.0.1:
97729782
version "1.0.2"
97739783
resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"

0 commit comments

Comments
 (0)