support redux 5.0

salvoravida · Dec 14, 2023 · cb621ed · cb621ed
1 parent 2bf677a
commit cb621ed
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -69,7 +69,7 @@
       "prettier": "^3.1.1",
       "react": "^18.2.0",
       "react-dom": "^18.2.0",
-      "redux": "^4.2.1",
+      "redux": "^5.0.0",
       "rimraf": "^5.0.5",
       "ts-jest": "^29.1.1",
       "ts-node": "^10.9.2",

diff --git a/src/actions.ts b/src/actions.ts
@@ -1,4 +1,5 @@
 import type { Location, Action, History } from 'history';
+import type { AnyAction } from 'redux';
 
 export const CALL_HISTORY_METHOD = '@@router/CALL_HISTORY_METHOD';
 export const LOCATION_CHANGE = '@@router/LOCATION_CHANGE';
@@ -23,7 +24,7 @@ export interface LocationActionPayload<A = unknown[]> {
    args?: A;
 }
 
-export interface CallHistoryMethodAction<A = unknown[]> {
+export interface CallHistoryMethodAction<A = unknown[]> extends AnyAction {
    type: typeof CALL_HISTORY_METHOD;
    payload: LocationActionPayload<A>;
 }

diff --git a/src/middleware.ts b/src/middleware.ts
@@ -26,11 +26,13 @@ function appendBasename(location: string | Location, basename: string): string |
 export const createRouterMiddleware =
    ({ history, showHistoryAction, basename }: CreateRouterMiddlewareArgs): Middleware =>
    () =>
+   // @ts-ignore
    (next: Dispatch) =>
    (action: ReduxAction) => {
       if (action.type !== CALL_HISTORY_METHOD) {
          return next(action);
       }
+      // @ts-ignore
       const method = action.payload.method as HistoryMethods;
       // @ts-ignore
       const args = action.payload.args as Parameters<History[HistoryMethods]>;

diff --git a/src/reducer.ts b/src/reducer.ts
@@ -28,7 +28,10 @@ export const createRouterReducer = ({
 
    return (state = initialState, { type, payload } = {} as AnyAction) => {
       if (type === LOCATION_CHANGE) {
-         const { location, action } = payload || {};
+         const { location, action } = (payload || {}) as {
+            location?: Location | null;
+            action?: Action | null;
+         };
          const previousLocations = numLocationToTrack // @ts-ignore
             ? [{ location, action }, ...state.previousLocations.slice(0, numLocationToTrack)]
             : undefined;

diff --git a/yarn.lock b/yarn.lock
@@ -419,7 +419,7 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.12.5", "@babel/runtime@^7.9.2":
+"@babel/runtime@^7.12.5":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.0.tgz#e27b977f2e2088ba24748bf99b5e1dece64e4f0b"
   integrity sha512-Nht8L0O8YCktmsDV6FqFue7vQLRx3Hb0B37lS5y0jDRqRxlBG4wIJHnf9/bgSE2UyipKFA01YtS+npRdTWBUyw==
@@ -4386,12 +4386,10 @@ react@^18.2.0:
   dependencies:
     loose-envify "^1.1.0"
 
-redux@^4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.1.tgz#c08f4306826c49b5e9dc901dee0452ea8fce6197"
-  integrity sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==
-  dependencies:
-    "@babel/runtime" "^7.9.2"
+redux@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/redux/-/redux-5.0.0.tgz#29572e29a439e094ff8fec46883fc45053f6736d"
+  integrity sha512-blLIYmYetpZMET6Q6uCY7Jtl/Im5OBldy+vNPauA8vvsdqyt66oep4EUpAMWNHauTC6xa9JuRPhRB72rY82QGA==
 
 reflect.getprototypeof@^1.0.4:
   version "1.0.4"