@common-stack/frontend-stack-react 4.0.1-alpha.44 → 4.0.1-alpha.62

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

@@ -14,10 +14,11 @@ interface IReduxStore<S = any> {
     middleware?: Middleware[];
     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, enhancers, epicMiddleware, preMiddleware, postMiddleware, middleware, initialState, persistConfig, }: IReduxStore<any>) => import("@reduxjs/toolkit").Store<any, import("@reduxjs/toolkit").UnknownAction, unknown>;
+export declare const createReduxStore: ({ scope, isDebug, isDev, reducers, rootEpic, enhancers, epicMiddleware, preMiddleware, postMiddleware, middleware, initialState, persistConfig, reduxConfig, }: IReduxStore<any>) => import("@reduxjs/toolkit").Store<any, import("@reduxjs/toolkit").UnknownAction, unknown>;
 export {};

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

@@ -4,12 +4,11 @@ import {combineReducers,configureStore}from'@reduxjs/toolkit';import {persistRed
 /* eslint-disable @typescript-eslint/no-var-requires */
 /* eslint-disable global-require */
 /* eslint-disable no-underscore-dangle */
-const REGISTER_CONTRIBUTIONS = 'contribution/REGISTER_CONTRIBUTIONS';
 /**
  * Add any reducers required for this app dirctly in to
  * `combineReducers`
  */
-const createReduxStore = ({ scope, isDebug, isDev, reducers, rootEpic, enhancers = [], 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);
@@ -28,7 +27,7 @@ const createReduxStore = ({ scope, isDebug, isDev, reducers, rootEpic, enhancers
         reducer: persistedReducer,
         middleware: (getDefaultMiddleware) => getDefaultMiddleware({
             serializableCheck: {
-                ignoredActions: [FLUSH, REHYDRATE, PAUSE, PERSIST, PURGE, REGISTER, REGISTER_CONTRIBUTIONS],
+                ignoredActions: [FLUSH, REHYDRATE, PAUSE, PERSIST, PURGE, REGISTER, ...(reduxConfig?.ignoredActions || [])],
             },
         }).concat(...middlewares),
         devTools: isDev || isDebug,

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

@@ -1,25 +1,21 @@
-import "reflect-metadata";
-export declare const epicMiddlewareFunc: (apolloClient: any, services: any, container: any) => import("redux-observable").EpicMiddleware<import("redux").Action<any>, import("redux").Action<any>, void, {
+import 'reflect-metadata';
+import { EpicMiddleware } from 'redux-observable';
+import { PersistConfig } from 'redux-persist';
+import { logger } from '../utils';
+import modules from '../modules';
+interface Dependencies {
     apolloClient: any;
-    routes: any;
+    routes: ReturnType<typeof modules.getConfiguredRoutes>;
     services: any;
     container: any;
-    logger: import("@cdm-logger/core/lib/interface").ILogger;
+    logger: typeof logger;
     config: {
         loadRoot: boolean;
     };
-}>;
-export declare const persistConfig: {
-    key: string;
-    storage: any;
-    stateReconciler: any;
-    transforms: any[];
-    blacklist: string[];
-};
-/**
- * Add any reducers required for this app dirctly in to
- * `combineReducers`
- */
+}
+export declare const epicMiddlewareFunc: (apolloClient: any, services: any, container: any) => EpicMiddleware<any, any, any, Dependencies>;
+export declare const persistConfig: PersistConfig<any>;
 export declare const createReduxStore: (apolloClient: any, services: any, container: any) => {
     store: any;
 };
+export {};

package/lib/config/redux-config.js

@@ -17,36 +17,27 @@ const persistConfig = {
     transforms: features.reduxPersistStateTransformers,
     blacklist: ['router']
 };
-/**
- * Add any reducers required for this app dirctly in to
- * `combineReducers`
- */
 const createReduxStore = (apolloClient, services, container) => {
     const reducers = {
         router: createRouterReducer({}),
         ...features.reducers,
     };
     let store;
-    // @ts-ignore
-    if (import.meta.hot && import.meta.hot.data && import.meta.hot.data.store) {
-        // console.log('Restoring Redux store:', JSON.stringify(import.meta.hot.data.store.getState()));
-        // @ts-ignore
+    if (import.meta.hot?.data?.store) {
+        logger.debug('Restoring Redux store from hot reload data');
         store = import.meta.hot.data.store;
-        // replace the reducers always as we don't have ablity to find
-        // new reducer added through our `modules`
         store.replaceReducer(persistReducer(persistConfig, combineReducers(reducers)));
     }
     else {
         let initialState = {};
         let middlewares = [];
-        if (__CLIENT__ && typeof window !== 'undefined') {
-            initialState = { ...window.__PRELOADED_STATE__ }; // #952 TODO we need cookie to have id_token for SSR to work properly
-            delete window.__PRELOADED_STATE__; // Delete it once we have it stored in a variable
-            // it doesn't work, since __remixRouter is not created yet.
-            // middlewares = [createRouterMiddleware({ router: window.__remixRouter } as any)]; 
+        if (typeof window !== 'undefined') {
+            initialState = { ...window.__PRELOADED_STATE__ };
+            delete window.__PRELOADED_STATE__;
+            logger.debug('Loaded initial state from window.__PRELOADED_STATE__');
         }
         store = createReduxStore$1({
-            scope: __CLIENT__ && typeof window !== 'undefined' ? 'browser' : 'server',
+            scope: typeof window !== 'undefined' ? 'browser' : 'server',
             isDebug: true,
             isDev: process.env.NODE_ENV === 'development',
             initialState,
@@ -55,19 +46,17 @@ const createReduxStore = (apolloClient, services, container) => {
             epicMiddleware: epicMiddlewareFunc(apolloClient, services, container),
             rootEpic: rootEpic,
             reducers,
+            reduxConfig: features.getReduxConfig(),
         });
+        logger.debug('Created new Redux store');
     }
     if (container.isBound('ReduxStore')) {
-        container
-            .rebind('ReduxStore')
-            .toDynamicValue(() => store)
-            .inRequestScope();
+        container.rebind('ReduxStore').toDynamicValue(() => store).inRequestScope();
+        logger.debug('Rebound ReduxStore in container');
     }
     else {
-        container
-            .bind('ReduxStore')
-            .toDynamicValue(() => store)
-            .inRequestScope();
+        container.bind('ReduxStore').toDynamicValue(() => store).inRequestScope();
+        logger.debug('Bound ReduxStore in container');
     }
     return { store };
 };export{createReduxStore,epicMiddlewareFunc,persistConfig};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@common-stack/frontend-stack-react",
-    "version": "4.0.1-alpha.44",
+    "version": "4.0.1-alpha.62",
     "description": "Client Module for react app",
     "homepage": "https://github.com/cdmbase/fullstack-pro#readme",
     "bugs": {
@@ -29,7 +29,7 @@
         "watch": "npm run build:lib:watch"
     },
     "dependencies": {
-        "@common-stack/client-react": "4.0.1-alpha.44",
+        "@common-stack/client-react": "4.0.1-alpha.47",
         "@common-stack/core": "4.0.1-alpha.31",
         "i18next-fs-backend": "^2.3.1",
         "i18next-http-backend": "^2.5.2",
@@ -52,5 +52,5 @@
     "typescript": {
         "definition": "lib/index.d.ts"
     },
-    "gitHead": "45991179199ddbfdce3aba94060944e3715eadd2"
+    "gitHead": "3f1e953bc526483d683bd1ffa480348c21f7182a"
 }