@common-stack/frontend-stack-react 4.0.2-alpha.9 → 4.0.3-alpha.1

package/lib/config/redux-config.js

@@ -1,4 +1,4 @@
-import'reflect-metadata';import storage from'redux-persist/lib/storage/index.js';import {combineReducers}from'@reduxjs/toolkit';import autoMergeLevel2 from'redux-persist/lib/stateReconciler/autoMergeLevel2.js';import {createEpicMiddleware}from'redux-observable';import {createRouterReducer}from'@common-stack/remix-router-redux';import {persistReducer}from'redux-persist';import {REDUX_PERSIST_KEY}from'@common-stack/client-core';import {createReduxStore as createReduxStore$1}from'./base-redux-config.js';import {logger}from'../utils/index.js';import features from'../modules.js';import {rootEpic}from'./epic-config.js';const epicMiddlewareFunc = (apolloClient, services, container) => createEpicMiddleware({
+import'reflect-metadata';import storage from'redux-persist/lib/storage/index.js';import {combineReducers}from'@reduxjs/toolkit';import autoMergeLevel2 from'redux-persist/lib/stateReconciler/autoMergeLevel2.js';import {createEpicMiddleware}from'redux-observable';import {createRouterReducer}from'@common-stack/remix-router-redux';import {persistReducer}from'redux-persist';import {REDUX_PERSIST_KEY,ClientTypes}from'@common-stack/client-core';import {createReduxStore as createReduxStore$1}from'./base-redux-config.js';import {logger}from'../utils/index.js';import features from'../modules.js';import {rootEpic}from'./epic-config.js';const epicMiddlewareFunc = (apolloClient, services, container) => createEpicMiddleware({
     dependencies: {
         apolloClient,
         routes: features.getConfiguredRoutes(),
@@ -47,12 +47,12 @@ const createReduxStore = (apolloClient, services, container) => {
         });
         logger.debug('Created new Redux store');
     }
-    if (container.isBound('ReduxStore')) {
-        container.rebind('ReduxStore').toDynamicValue(() => store).inRequestScope();
+    if (container.isBound(ClientTypes.ReduxStore)) {
+        container.rebind(ClientTypes.ReduxStore).toDynamicValue(() => store).inRequestScope();
         logger.debug('Rebound ReduxStore in container');
     }
     else {
-        container.bind('ReduxStore').toDynamicValue(() => store).inRequestScope();
+        container.bind(ClientTypes.ReduxStore).toDynamicValue(() => store).inRequestScope();
         logger.debug('Bound ReduxStore in container');
     }
     return { store };

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

@@ -1,29 +1,12 @@
-import*as React from'react';import {Error500}from'@admin-layout/ant-ui';import {useRouteError,isRouteErrorResponse}from'@remix-run/react';import {Navigate}from'react-router-dom';function ErrorBoundary() {
+import*as React from'react';import {Error500}from'@admin-layout/ant-ui';import {useRouteError,isRouteErrorResponse}from'@remix-run/react';function ErrorBoundary() {
     const error = useRouteError();
-    const [hasAccountNotFoundError, setHasAccountNotFoundError] = React.useState(false);
-    const [isLoading, setIsLoading] = React.useState(true);
-    React.useEffect(() => {
-        console.trace(error);
-        if (isRouteErrorResponse(error)) {
-            const data = error?.data;
-            if (data?.graphQLErrors?.length) {
-                const graphqlError = data?.graphQLErrors[0];
-                if (graphqlError.type === 'ACCOUNT_NOT_FOUND') {
-                    setHasAccountNotFoundError(true);
-                }
-            }
-        }
-        setIsLoading(false);
-    }, [error]);
-    if (!isLoading) {
-        if (isRouteErrorResponse(error)) {
-            return hasAccountNotFoundError ? (React.createElement(Navigate, { to: "/verify-user" })) : (React.createElement(Error500, { title: error.statusText, status: error.status, data: error.data }));
-        }
-        else if (error instanceof Error) {
-            return React.createElement(Error500, { title: error.message, status: "500", data: error.stack });
-        }
-        else {
-            return React.createElement(Error500, { title: "Unknown Error", status: "500", data: error });
-        }
+    if (isRouteErrorResponse(error)) {
+        return React.createElement(Error500, { title: `Route Error: ${error.statusText}`, status: error.status, data: error.data });
+    }
+    else if (error instanceof Error) {
+        return React.createElement(Error500, { title: error.message, status: "500", data: error.stack });
+    }
+    else {
+        return React.createElement(Error500, { title: "Unknown Error", status: "500", data: error });
     }
 }export{ErrorBoundary};

package/lib/entries/antui/entry.server.js

@@ -56,7 +56,6 @@ loadContext) {
             defaultNS: config.i18n.defaultNS,
             react: config.i18n.react,
             supportedLngs: config.i18n.supportedLngs,
-            // ...config.i18n, // use the same configuration as in your client side.
             lng, // The locale we detected above
             ns, // The namespaces the routes about to render want to use
             backend: {

package/lib/entries/antui/root.js

@@ -1,4 +1,4 @@
-import'reflect-metadata';import*as React from'react';import {Outlet,json,useLoaderData,Meta,Links,ScrollRestoration,Scripts}from'@remix-run/react';import publicEnv from'@src/frontend-stack-react/config/public-config';import {PluginArea}from'@common-stack/client-react';import {subscribeReduxRouter}from'@common-stack/remix-router-redux';import {ApplicationErrorHandler}from'@admin-layout/ant-ui';import {ConfigProvider}from'antd';import clientModules,{plugins}from'@app/frontend-stack-react/modules.js';import {useChangeLanguage}from'remix-i18next/react';import {useTranslation}from'react-i18next';import {i18nextInstance}from'@app/frontend-stack-react/i18n-localization/i18next.server.js';export{ErrorBoundary}from'@app/frontend-stack-react/entries/antui/components/ErrorBoundary';const loader = async ({ request }) => {
+import'reflect-metadata';import*as React from'react';import {Outlet,json,useLoaderData,Meta,Links,ScrollRestoration,Scripts}from'@remix-run/react';import publicEnv from'@src/config/public-config';import {PluginArea}from'@common-stack/client-react';import {subscribeReduxRouter}from'@common-stack/remix-router-redux';import {ApplicationErrorHandler}from'@admin-layout/ant-ui';import {ConfigProvider}from'antd';import clientModules,{plugins}from'@app/frontend-stack-react/modules.js';import {useChangeLanguage}from'remix-i18next/react';import {useTranslation}from'react-i18next';import {i18nextInstance}from'@app/frontend-stack-react/i18n-localization/i18next.server.js';export{ErrorBoundary}from'@app/frontend-stack-react/entries/antui/components/ErrorBoundary';const loader = async ({ request }) => {
     const locale = await i18nextInstance.getLocale(request);
     return json({
         __ENV__: publicEnv,

package/lib/entries/chakraui/root.d.ts

@@ -13,5 +13,6 @@ export declare let loader: ({ request }: {
 export declare let handle: {
     i18n: string;
 };
+export declare function shouldRevalidate(params: any): boolean;
 export default function App(): React.JSX.Element;
 export { ErrorBoundary };

package/lib/entries/chakraui/root.js

@@ -16,7 +16,6 @@ const Document = withEmotionCache(({ children }, emotionCache) => {
         });
         // reset cache to reapply global styles
         clientStyleData?.reset();
-        subscribeReduxRouter({ store: window.__remixStore, router: window.__remixRouter });
     }, []);
     return (React.createElement(React.Fragment, null,
         React.createElement(Head, null),
@@ -34,9 +33,15 @@ let loader = async ({ request }) => {
 let handle = {
     i18n: 'common',
 };
+function shouldRevalidate(params) {
+    return params.defaultShouldRevalidate && params.currentUrl.pathname !== params.nextUrl.pathname;
+}
 function App() {
     let { locale } = useLoaderData();
     useChangeLanguage(locale);
+    React.useEffect(() => {
+        subscribeReduxRouter({ store: window.__remixStore, router: window.__remixRouter });
+    }, []);
     return (React.createElement(ApplicationErrorHandler, { plugins: plugins },
         React.createElement(Document, null, clientModules.getWrappedRoot(React.createElement(Outlet, null)))));
-}export{Document,Head,App as default,handle,loader};
+}export{Document,Head,App as default,handle,loader,shouldRevalidate};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@common-stack/frontend-stack-react",
-    "version": "4.0.2-alpha.9",
+    "version": "4.0.3-alpha.1",
     "description": "Client Module for react app",
     "homepage": "https://github.com/cdmbase/fullstack-pro#readme",
     "bugs": {
@@ -30,8 +30,9 @@
     },
     "dependencies": {
         "@chakra-ui/react": "^2.8.2",
-        "@common-stack/client-react": "4.0.2-alpha.4",
-        "@common-stack/core": "4.0.2-alpha.1",
+        "@common-stack/client-react": "0.0.1",
+        "@common-stack/core": "0.0.1",
+        "i18next": "^23.10.1",
         "i18next-browser-languagedetector": "^8.0.0",
         "i18next-fs-backend": "^2.3.1",
         "i18next-http-backend": "^2.5.2",
@@ -56,5 +57,5 @@
     "typescript": {
         "definition": "lib/index.d.ts"
     },
-    "gitHead": "189ea955aa9d476a4b39f1786207ab444e435260"
+    "gitHead": "6df975115a069d10e3f62967edcf41e8c427fc14"
 }