Improve redux-toolkit support - no need for combineReducers

index.d.ts

@@ -1,4 +1,4 @@
-import { Action, AnyAction, Reducer } from 'redux';
+import { Action, AnyAction, Reducer, ReducersMapObject } from 'redux';
 declare const REMEMBER_REHYDRATED = "@@REMEMBER_REHYDRATED";
 declare const REMEMBER_PERSISTED = "@@REMEMBER_PERSISTED";
 type SerializeFunction = (data: any, key: string) => any;
@@ -14,6 +14,6 @@ type Options = {
     persistThrottle: number;
     persistWholeStore: boolean;
 };
-declare const rememberReducer: <S = any, A extends Action<any> = AnyAction>(reducers: Reducer<S, A>) => Reducer<S, A>;
+declare const rememberReducer: <S = any, A extends Action<any> = AnyAction>(reducer: Reducer<S, A> | ReducersMapObject<S, A>) => Reducer<S, A>;
 declare const rememberEnhancer: (driver: Driver, rememberedKeys: string[], { prefix, serialize, unserialize, persistThrottle, persistWholeStore }?: Partial<Options>) => any;
 export { rememberReducer, rememberEnhancer, REMEMBER_REHYDRATED, REMEMBER_PERSISTED };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "redux-remember",
-  "version": "3.1.4",
+  "version": "3.1.5",
   "description": "Saves and loads your redux state from a key-value store of your choice",
   "main": "lib/index.js",
   "module": "es/index.js",

rollup.config.mjs

@@ -12,7 +12,10 @@ const config = {
     sourcemap: true,
     format: 'umd',
     esModule: false,
-    strict: false
+    strict: false,
+    globals: {
+      'redux': 'Redux'
+    }
   },
   external: ['redux'],
   plugins: [

src/index.ts

@@ -8,11 +8,13 @@ import {
   StoreEnhancer,
   Reducer,
   Store,
-  StoreCreator
+  StoreCreator,
+  ReducersMapObject,
+  combineReducers
 } from 'redux';
 
 const rememberReducer = <S = any, A extends Action = AnyAction>(
-  reducers: Reducer<S, A>
+  reducer: Reducer<S, A> | ReducersMapObject<S, A>
 ): Reducer<S, A> => {
   const data: any = {
     state: {}
@@ -26,9 +28,13 @@ const rememberReducer = <S = any, A extends Action = AnyAction>(
       data.state = { ...state };
     }
 
+    const rootReducer = typeof reducer === 'function'
+      ? reducer
+      : combineReducers(reducer) as Reducer<S, A>;
+
     switch (action.type) {
       case REMEMBER_REHYDRATED:
-        data.state = reducers(
+        data.state = rootReducer(
           {
             ...data.state,
             ...(action.payload || {})
@@ -39,7 +45,7 @@ const rememberReducer = <S = any, A extends Action = AnyAction>(
         return data.state;
 
       default:
-        return reducers(
+        return rootReducer(
           state,
           action
         );