@common-stack/mobile-stack-react 6.0.6-alpha.15 → 6.0.6-alpha.17

package/lib/config/base-redux-config.d.ts

@@ -1,22 +1,24 @@
-import { Middleware, Action, ReducersMapObject } from 'redux';
+import { Middleware, StoreEnhancer } from 'redux';
 import { EpicMiddleware, Epic } from 'redux-observable';
 import { PersistConfig } from 'redux-persist';
 interface IReduxStore<S = any> {
     scope: 'browser' | 'server' | 'native' | 'ElectronMain';
     isDebug: boolean;
     isDev: boolean;
-    reducers: ReducersMapObject<S>;
-    rootEpic?: Epic<any, Action<any>, void, any>;
-    epicMiddleware?: EpicMiddleware<any, Action<any>>;
+    reducers: any;
+    enhancers?: StoreEnhancer[];
+    rootEpic: Epic<any, any, any, any>;
+    epicMiddleware?: EpicMiddleware<any, any, S, any>;
     preMiddleware?: Middleware[];
     postMiddleware?: Middleware[];
     middleware?: Middleware[];
-    initialState: any;
-    persistConfig?: PersistConfig<S, any>;
+    initialState?: any;
+    persistConfig?: PersistConfig<any>;
+    reduxConfig?: any;
 }
 /**
  * Add any reducers required for this app dirctly in to
  * `combineReducers`
  */
-export declare const createReduxStore: ({ scope, isDebug, isDev, reducers, rootEpic, epicMiddleware, preMiddleware, postMiddleware, middleware, initialState, persistConfig, }: IReduxStore<any>) => import("redux").Store<any, import("redux").UnknownAction, unknown>;
+export declare const createReduxStore: ({ scope, isDebug, isDev, reducers, rootEpic, enhancers, epicMiddleware, preMiddleware, postMiddleware, middleware, initialState, persistConfig, reduxConfig, }: IReduxStore<any>) => import("redux").Store<any, import("redux").UnknownAction, unknown>;
 export {};

package/lib/config/base-redux-config.js

@@ -1,4 +1,4 @@
-import {combineReducers,createStore,applyMiddleware,compose}from'redux';import {persistReducer}from'redux-persist';import thunkMiddleware from'redux-thunk';// version 11/12/2021
+import {combineReducers,configureStore}from'@reduxjs/toolkit';import {persistReducer,FLUSH,REHYDRATE,PAUSE,PERSIST,PURGE,REGISTER}from'redux-persist';// version 11/12/2021
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/no-var-requires */
@@ -8,44 +8,42 @@ import {combineReducers,createStore,applyMiddleware,compose}from'redux';import {
  * Add any reducers required for this app dirctly in to
  * `combineReducers`
  */
-const createReduxStore = ({ scope, isDebug, isDev, reducers, rootEpic, epicMiddleware, preMiddleware, postMiddleware, middleware, initialState = {}, persistConfig, }) => {
+const createReduxStore = ({ scope, isDebug, isDev, reducers, rootEpic, enhancers = [], epicMiddleware, preMiddleware = [], postMiddleware = [], middleware = [], initialState, persistConfig, reduxConfig, }) => {
     const isBrowser = scope === 'browser';
     const isElectronMain = scope === 'ElectronMain';
+    const rootReducer = combineReducers(reducers);
+    const persistedReducer = persistConfig && isBrowser ? persistReducer(persistConfig, rootReducer) : rootReducer;
     /**
      * Add middleware that required for this app.
      */
-    const middlewares = [thunkMiddleware];
-    // add epicMiddleware
-    if (epicMiddleware) {
-        middlewares.push(epicMiddleware);
-    }
-    if (preMiddleware) {
-        middlewares.unshift(...preMiddleware);
-    }
     // Add redux logger during development only
-    if ((isDev || isDebug) && isBrowser) {
-        const { createLogger } = require('redux-logger');
-        middlewares.push(createLogger({
-            level: 'info',
-            collapsed: true,
-        }));
-    }
-    if (middleware) {
-        middlewares.push(...middleware);
-    }
-    if (postMiddleware) {
-        middlewares.push(...postMiddleware);
-    }
-    const enhancers = () => [applyMiddleware(...middlewares)];
-    const composeEnhancers = ((isDev || isDebug) && isBrowser && window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__) || compose;
-    const rootReducer = combineReducers(reducers);
-    const persistedReducer = persistConfig ? persistReducer(persistConfig, rootReducer) : rootReducer;
-    const store = createStore(persistedReducer, initialState, composeEnhancers(...enhancers()));
-    if (isBrowser || isElectronMain) {
-        // no SSR for now
-        if (epicMiddleware) {
-            epicMiddleware.run(rootEpic);
-        }
+    const middlewares = [
+        ...preMiddleware,
+        ...(epicMiddleware ? [epicMiddleware] : []),
+        ...middleware,
+        ...postMiddleware,
+    ];
+    const store = configureStore({
+        reducer: persistedReducer,
+        middleware: (getDefaultMiddleware) => getDefaultMiddleware({
+            serializableCheck: {
+                ignoredActions: [
+                    FLUSH,
+                    REHYDRATE,
+                    PAUSE,
+                    PERSIST,
+                    PURGE,
+                    REGISTER,
+                    ...(reduxConfig?.ignoredActions || []),
+                ],
+            },
+        }).concat(...middlewares),
+        devTools: isDev || isDebug,
+        preloadedState: initialState,
+        enhancers: (getDefaultEnhancers) => getDefaultEnhancers().concat(...enhancers),
+    });
+    if ((isBrowser || isElectronMain) && epicMiddleware && rootEpic) {
+        epicMiddleware.run(rootEpic);
     }
     return store;
 };export{createReduxStore};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@common-stack/mobile-stack-react",
-    "version": "6.0.6-alpha.15",
+    "version": "6.0.6-alpha.17",
     "description": "Client Module for mobile app",
     "homepage": "https://github.com/cdmbase/fullstack-pro#readme",
     "bugs": {
@@ -32,7 +32,7 @@
         "@apollo/client": "^3.9.0",
         "@cdm-logger/client": "^9.0.3",
         "@common-stack/client-core": "6.0.6-alpha.5",
-        "@common-stack/client-react": "6.0.6-alpha.5",
+        "@common-stack/client-react": "6.0.6-alpha.17",
         "@common-stack/components-pro": "6.0.6-alpha.5",
         "@common-stack/core": "6.0.6-alpha.5",
         "@expo/vector-icons": "~13.0.0",
@@ -131,5 +131,5 @@
     "typescript": {
         "definition": "lib/index.d.ts"
     },
-    "gitHead": "8d0ce9ee36430bbba3ee482516532d8c2482cf12"
+    "gitHead": "1b4f4ebc9bf60f1d86ed9510e97f4cde1efab181"
 }