diff --git a/web/package.json b/web/package.json index 07ec4fa3..969e71ab 100644 --- a/web/package.json +++ b/web/package.json @@ -17,11 +17,11 @@ "react-dom": "^18.2.0", "react-redux": "^8.0.7", "react-router-dom": "7.15.1", - "redux": "^4.2.1", + "redux": "^5.0.1", "redux-axios-middleware": "^4.0.1", "redux-logger": "^3.0.6", "redux-persist": "^6.0.0", - "redux-thunk": "^2.4.2", + "redux-thunk": "^3.1.0", "sass": "^1.99.0" }, "devDependencies": { diff --git a/web/src/store/store.js b/web/src/store/store.js index 17a69cfb..94c8c2cf 100644 --- a/web/src/store/store.js +++ b/web/src/store/store.js @@ -2,7 +2,6 @@ import { configureStore } from '@reduxjs/toolkit' import rootReducer from './reducer'; import storage from 'redux-persist/lib/storage'; import { persistReducer,persistStore } from 'redux-persist'; -import thunk from 'redux-thunk'; import { logger } from 'redux-logger'; @@ -16,7 +15,9 @@ const persistedReducer = persistReducer(persistConfig, rootReducer); export const store = configureStore({ reducer : persistedReducer, - middleware:[thunk,logger] + // redux-thunk v3 removed the default export — thunk is already included by + // configureStore via RTK, so just append logger to the default middleware. + middleware: (getDefaultMiddleware) => getDefaultMiddleware().concat(logger) }); export const persistor = persistStore(store); diff --git a/web/yarn.lock b/web/yarn.lock index be9cb7da..f24e821b 100644 --- a/web/yarn.lock +++ b/web/yarn.lock @@ -1950,6 +1950,11 @@ redux-thunk@^2.4.2: resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.4.2.tgz#b9d05d11994b99f7a91ea223e8b04cf0afa5ef3b" integrity sha512-+P3TjtnP0k/FEjcBL5FZpoovtvrTNT/UXd4/sluaSyrURlSlhLSzEdfsTBW7WsKB6yPvgd7q/iZPICFjW4o57Q== +redux-thunk@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-3.1.0.tgz#94aa6e04977c30e14e892eae84978c1af6058ff3" + integrity sha512-NW2r5T6ksUKXCabzhL9z+h206HQw/NJkcLm1GPImRQ8IzfXwRGqjVhKJGauHirT0DAuyy6hjdnMZaRoAcy0Klw== + redux@^4.2.1: version "4.2.1" resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.1.tgz#c08f4306826c49b5e9dc901dee0452ea8fce6197" @@ -1957,6 +1962,11 @@ redux@^4.2.1: dependencies: "@babel/runtime" "^7.9.2" +redux@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/redux/-/redux-5.0.1.tgz#97fa26881ce5746500125585d5642c77b6e9447b" + integrity sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w== + regexp.prototype.flags@^1.5.1: version "1.5.4" resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz#1ad6c62d44a259007e55b3970e00f746efbcaa19"