@common-stack/frontend-stack-react 6.0.6-alpha.0 → 6.0.6-alpha.106

package/lib/backend/middlewares/container.js

@@ -64,7 +64,7 @@ const containerMiddleware = async (req, res, next) => {
                 logger.debug(`Successfully cleaned up - ID: ${requestId}`);
             }
             catch (error) {
-                logger.error(`Error during container cleanup - ID: ${requestId}`, error);
+                logger.error(error, 'Error during container cleanup - ID: [%s]', requestId);
             }
         });
         next();

package/lib/backend/middlewares/error.js

@@ -4,7 +4,7 @@ const stripCircular = (from, seen) => {
     const to = Array.isArray(from) ? [] : {};
     seen = seen || [];
     seen.push(from);
-    Object.getOwnPropertyNames(from).forEach(key => {
+    Object.getOwnPropertyNames(from).forEach((key) => {
         if (!from[key] || (typeof from[key] !== 'object' && !Array.isArray(from[key]))) {
             to[key] = from[key];
         }

package/lib/config/base-apollo-cache.js

@@ -14,7 +14,7 @@ const initializeCache = ({ cache, initialState, clientState, logger }) => {
             logger.debug('Cache restored with initial state');
         }
         catch (err) {
-            logger.error('Error restoring cache', err);
+            logger.error(err, 'Error restoring cache');
         }
     }
     else {
@@ -28,7 +28,7 @@ const initializeCache = ({ cache, initialState, clientState, logger }) => {
                 }
             }
             catch (err) {
-                logger.error('Error writing to cache', err);
+                logger.error(err, 'Error writing to cache');
             }
         });
     }

package/lib/config/base-apollo-client.js

@@ -32,7 +32,7 @@ const createApolloClient = ({ scope, isDev, isDebug, isSSR, getDataIdFromObject,
                 return !!result.find((item) => item && isBoolean(item));
             }
             catch (e) {
-                logger.error('Error occurred in retryLink attempt condition', e);
+                logger.error(e, 'Error occurred in retryLink attempt condition');
                 throw e;
             }
         },
@@ -42,9 +42,10 @@ const createApolloClient = ({ scope, isDev, isDebug, isSSR, getDataIdFromObject,
         const connectionParams = async () => {
             logger.debug('Getting WebSocket connection parameters');
             const param = {};
-            for (const connectionParam of clientState.connectionParams) {
+            const promises = await Promise.all(clientState.connectionParams);
+            for (const connectionParam of promises) {
                 const result = await connectionParam();
-                merge(param, await result());
+                merge(param, result);
             }
             return param;
         };
@@ -116,4 +117,15 @@ const createApolloClient = ({ scope, isDev, isDebug, isSSR, getDataIdFromObject,
     logger.debug('Created new Apollo client');
     initializeCache({ cache, initialState, clientState, logger });
     return { apolloClient, cache };
-};export{createApolloClient};
+};
+if (__DEV__) {
+    // Dynamically import dev messages only in a non-production environment
+    import('@apollo/client/dev')
+        .then(({ loadErrorMessages, loadDevMessages }) => {
+        loadDevMessages();
+        loadErrorMessages();
+    })
+        .catch((error) => {
+        console.error('Failed to load Apollo client dev messages', error);
+    });
+}export{createApolloClient};

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

@@ -20,5 +20,5 @@ interface IReduxStore<S = 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, reduxConfig, }: 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("redux").Store<any, import("redux").UnknownAction, unknown>;
 export {};

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

@@ -1,3 +1,3 @@
 import { BehaviorSubject } from 'rxjs';
-export declare const epic$: BehaviorSubject<any>;
-export declare const rootEpic: (action$: any, ...rest: any[]) => import("rxjs").Observable<unknown>;
+export declare const epic$: BehaviorSubject<import("redux-observable").Epic<unknown, unknown, void, any>>;
+export declare const rootEpic: (action$: any, state$: any, dependencies: any) => import("rxjs").Observable<unknown>;

package/lib/config/epic-config.js

@@ -1,6 +1,6 @@
-import {combineEpics,ofType}from'redux-observable';import {BehaviorSubject}from'rxjs';import {mergeMap,takeUntil}from'rxjs/operators/index.js';import features from'../modules.js';const epic$ = new BehaviorSubject(combineEpics(...features.epics));
+import {combineEpics,ofType}from'redux-observable';import {BehaviorSubject,mergeMap,takeUntil}from'rxjs';import features from'../modules.js';const epic$ = new BehaviorSubject(combineEpics(...features.epics));
 // Since we're using mergeMap, by default any new
 // epic that comes in will be merged into the previous
 // one, unless an EPIC_END action is dispatched first,
 // which would cause the old one(s) to be unsubscribed
-const rootEpic = (action$, ...rest) => epic$.pipe(mergeMap((epic) => epic(action$, ...rest).pipe(takeUntil(action$.pipe(ofType('EPIC_END'))))));export{epic$,rootEpic};
+const rootEpic = (action$, state$, dependencies) => epic$.pipe(mergeMap((epic) => epic(action$, state$, dependencies).pipe(takeUntil(action$.pipe(ofType('EPIC_END'))))));export{epic$,rootEpic};

package/lib/entries/antui/components/ErrorBoundary.js

@@ -1,12 +1,21 @@
-import*as React from'react';import {Error500}from'@admin-layout/ant-ui';import {useRouteError,isRouteErrorResponse}from'@remix-run/react';function ErrorBoundary() {
+import*as React from'react';import {useRouteError,isRouteErrorResponse}from'@remix-run/react';function ErrorBoundary() {
     const error = useRouteError();
     if (isRouteErrorResponse(error)) {
-        return React.createElement(Error500, { title: `Route Error: ${error.statusText}`, status: error.status, data: error.data });
+        return (React.createElement("div", null,
+            React.createElement("h1", null,
+                error.status,
+                " ",
+                error.statusText),
+            React.createElement("p", null, error.data)));
     }
     else if (error instanceof Error) {
-        return React.createElement(Error500, { title: error.message, status: "500", data: error.stack });
+        return (React.createElement("div", null,
+            React.createElement("h1", null, "Error"),
+            React.createElement("p", null, error.message),
+            React.createElement("p", null, "The stack trace is:"),
+            React.createElement("pre", null, error.stack)));
     }
     else {
-        return React.createElement(Error500, { title: "Unknown Error", status: "500", data: error });
+        return React.createElement("h1", null, "Unknown Error");
     }
 }export{ErrorBoundary};

package/lib/entries/chakraui/components/ErrorBoundary.js

@@ -1,15 +1,24 @@
-import*as React from'react';import {useRouteError,isRouteErrorResponse}from'@remix-run/react';import Error500 from'./Error500.js';function ErrorBoundary() {
+import*as React from'react';import {useRouteError,isRouteErrorResponse}from'@remix-run/react';function ErrorBoundary() {
     const error = useRouteError();
     React.useEffect(() => {
         console.trace(error);
     }, [error]);
     if (isRouteErrorResponse(error)) {
-        return React.createElement(Error500, { title: error.statusText, status: error.status, data: error.data });
+        return (React.createElement("div", null,
+            React.createElement("h1", null,
+                error.status,
+                " ",
+                error.statusText),
+            React.createElement("p", null, error.data)));
     }
     else if (error instanceof Error) {
-        return React.createElement(Error500, { title: error.message, status: "500", data: error.stack });
+        return (React.createElement("div", null,
+            React.createElement("h1", null, "Error"),
+            React.createElement("p", null, error.message),
+            React.createElement("p", null, "The stack trace is:"),
+            React.createElement("pre", null, error.stack)));
     }
     else {
-        return React.createElement(Error500, { title: "Unknown Error", status: "500", data: error });
+        return React.createElement("h1", null, "Unknown Error");
     }
 }export{ErrorBoundary};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@common-stack/frontend-stack-react",
-    "version": "6.0.6-alpha.0",
+    "version": "6.0.6-alpha.106",
     "description": "Client Module for react app",
     "homepage": "https://github.com/cdmbase/fullstack-pro#readme",
     "bugs": {
@@ -32,18 +32,19 @@
         "@apollo/client": "^3.9.0",
         "@cdm-logger/client": "^9.0.3",
         "@cdm-logger/server": "^9.0.3",
-        "@cdmbase/redux-data-router": "^1.0.10",
-        "@common-stack/client-core": "5.0.6-alpha.3",
-        "@common-stack/client-react": "6.0.6-alpha.0",
-        "@common-stack/components-pro": "5.0.6-alpha.7",
-        "@common-stack/core": "5.0.6-alpha.3",
-        "@common-stack/remix-router-redux": "5.0.6-alpha.7",
-        "@common-stack/server-core": "6.0.6-alpha.0",
+        "@common-stack/cache-api-server": "6.0.6-alpha.106",
+        "@common-stack/client-core": "6.0.6-alpha.106",
+        "@common-stack/client-react": "6.0.6-alpha.106",
+        "@common-stack/components-pro": "6.0.6-alpha.91",
+        "@common-stack/core": "6.0.6-alpha.106",
+        "@common-stack/remix-router-redux": "6.0.6-alpha.91",
+        "@common-stack/server-core": "6.0.6-alpha.106",
         "@reduxjs/toolkit": "^2.2.6",
-        "@remix-run/express": "^2.8.1",
-        "@remix-run/node": "^2.8.1",
-        "@remix-run/react": "^2.8.1",
+        "@remix-run/express": "~2.10.1",
+        "@remix-run/node": "~2.10.1",
+        "@remix-run/react": "~2.10.1",
         "@sentry/browser": "~5.11.2",
+        "@xstate/react": "^5.0.0",
         "cors": "^2.8.5",
         "cross-fetch": "^4.0.0",
         "dotenv": "^8.2.0",
@@ -56,7 +57,7 @@
         "i18next-browser-languagedetector": "^8.0.0",
         "i18next-fs-backend": "^2.3.1",
         "i18next-http-backend": "^2.5.2",
-        "inversify": "^6.0.2",
+        "inversify": "~6.0.2",
         "ioredis": "^5.4.1",
         "isbot": "^4.1.0",
         "isomorphic-fetch": "^2.2.1",
@@ -65,15 +66,17 @@
         "react-dom": "18.2.0",
         "react-i18next": "^14.1.0",
         "react-redux": "^9.1.1",
-        "redux-observable": "^1.2.0",
+        "redux-observable": "^3.0.0-rc.2",
         "redux-persist": "^6.0.0",
         "redux-persist-transform-filter": "^0.0.20",
         "reflect-metadata": "^0.1.13",
         "remix-i18next": "~6.1.0",
         "remix-island": "^0.2.0",
+        "rxjs": "^7.8.1",
         "serialize-javascript": "^6.0.0",
         "ts-deepmerge": "^7.0.0",
-        "ts-invariant": "^0.10.3"
+        "ts-invariant": "^0.10.3",
+        "xstate": "^5.19.0"
     },
     "devDependencies": {
         "@admin-layout/ant-ui": "^7.3.7-alpha.4",
@@ -87,9 +90,9 @@
     },
     "peerDependencies": {
         "@apollo/client": ">=3.0.0",
-        "@remix-run/react": "^2.9.2",
         "react": ">=18",
-        "react-dom": ">=18"
+        "react-dom": ">=18",
+        "redux": ">=5.0.0"
     },
     "publishConfig": {
         "access": "public"
@@ -97,5 +100,5 @@
     "typescript": {
         "definition": "lib/index.d.ts"
     },
-    "gitHead": "b0d198e30e60e102b7abc06e8b20cd7df6251dfa"
+    "gitHead": "f5c81f6a5a14f3d4ce27c54e9c467c2371179692"
 }

package/lib/entries/chakraui/components/Error500.js

@@ -1,14 +0,0 @@
-import*as React from'react';import {Box,VStack,Heading,Text,Code,Button}from'@chakra-ui/react';const Error500 = ({ title, status, data }) => {
-    const handleReload = () => {
-        window.location.reload();
-    };
-    return (React.createElement(Box, { display: "flex", alignItems: "center", justifyContent: "center", height: "100vh" },
-        React.createElement(VStack, { spacing: 4, textAlign: "center" },
-            React.createElement(Heading, { as: "h1", size: "xl" },
-                "Error ",
-                status),
-            React.createElement(Text, null, title),
-            data && (React.createElement(Box, { maxW: "md", mx: "auto", overflow: "auto" },
-                React.createElement(Code, { p: 4, display: "block", whiteSpace: "pre", textAlign: "left" }, typeof data === 'string' ? data : JSON.stringify(data, null, 2)))),
-            React.createElement(Button, { colorScheme: "teal", onClick: handleReload }, "Reload"))));
-};export{Error500 as default};