@common-stack/frontend-stack-react 4.0.2-alpha.8 → 4.0.3-alpha.0

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

@@ -1,4 +1,4 @@
-import*as React from'react';import {PassThrough,Transform}from'node:stream';import {createReadableStreamFromReadable}from'@remix-run/node';import {RemixServer}from'@remix-run/react';import {isbot}from'isbot';import {ApolloProvider}from'@apollo/client/index.js';import {SlotFillProvider}from'@common-stack/components-pro';import {InversifyProvider}from'@common-stack/client-react';import {renderToPipeableStream}from'react-dom/server';import {Provider}from'react-redux';import {LOCATION_CHANGE}from'@common-stack/remix-router-redux';import serialize from'serialize-javascript';import {createCache,StyleProvider,extractStyle}from'@ant-design/cssinjs';import {CacheProvider}from'@emotion/react';import {renderStylesToNodeStream}from'@emotion/server';import {createInstance}from'i18next';import {initReactI18next,I18nextProvider}from'react-i18next';import Backend from'i18next-fs-backend';import {resolve}from'node:path';import i18next from'@app/frontend-stack-react/i18n-localization/i18next.server';import config from'@app/cde-webconfig.json';import createEmotionCache from'@app/frontend-stack-react/entries/common/createEmotionCache';/**
+import*as React from'react';import {PassThrough,Transform}from'node:stream';import {createReadableStreamFromReadable}from'@remix-run/node';import {RemixServer}from'@remix-run/react';import {isbot}from'isbot';import {ApolloProvider}from'@apollo/client/index.js';import {SlotFillProvider}from'@common-stack/components-pro';import {InversifyProvider}from'@common-stack/client-react';import {renderToPipeableStream}from'react-dom/server';import {Provider}from'react-redux';import {LOCATION_CHANGE}from'@common-stack/remix-router-redux';import serialize from'serialize-javascript';import {createCache,StyleProvider,extractStyle}from'@ant-design/cssinjs';import {CacheProvider}from'@emotion/react';import {renderStylesToNodeStream}from'@emotion/server';import {createInstance}from'i18next';import {initReactI18next,I18nextProvider}from'react-i18next';import Backend from'i18next-fs-backend';import {resolve}from'node:path';import {i18nextInstance}from'@app/frontend-stack-react/i18n-localization/i18next.server.js';import config from'@app/cde-webconfig.json';import createEmotionCache from'@app/frontend-stack-react/entries/common/createEmotionCache';/**
  * By default, Remix will handle generating the HTTP Response for you.
  * You are free to delete this file if you'd like to, but if you ever want it revealed again, you can run `npx remix reveal` ✨
  * For more information, see https://remix.run/file-conventions/entry.server
@@ -43,8 +43,8 @@ async function handleRequest(request, responseStatusCode, responseHeaders, remix
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 loadContext) {
     const instance = createInstance();
-    const lng = await i18next.getLocale(request);
-    const ns = i18next.getRouteNamespaces(remixContext);
+    const lng = await i18nextInstance.getLocale(request);
+    const ns = i18nextInstance.getRouteNamespaces(remixContext);
     // First, we create a new instance of i18next so every request will have a
     // completely unique instance and not share any state.
     if (config.i18n.enabled) {
@@ -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,5 +1,5 @@
-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 i18next from'@app/frontend-stack-react/i18n-localization/i18next.server';export{ErrorBoundary}from'@app/frontend-stack-react/entries/antui/components/ErrorBoundary';const loader = async ({ request }) => {
-    const locale = await i18next.getLocale(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,
         locale,

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

@@ -1,4 +1,4 @@
-import React__default from'react';import {PassThrough}from'node:stream';import {createReadableStreamFromReadable}from'@remix-run/node';import {RemixServer}from'@remix-run/react';import {isbot}from'isbot';import {ApolloProvider}from'@apollo/client/index.js';import {SlotFillProvider}from'@common-stack/components-pro';import {InversifyProvider}from'@common-stack/client-react';import {renderToPipeableStream,renderToString}from'react-dom/server';import {Provider}from'react-redux';import {LOCATION_CHANGE}from'@common-stack/remix-router-redux';import serialize from'serialize-javascript';import {CacheProvider}from'@emotion/react';import createEmotionServer from'@emotion/server/create-instance';import Backend from'i18next-fs-backend';import {renderHeadToString}from'remix-island';import {initReactI18next,I18nextProvider}from'react-i18next';import {createInstance}from'i18next';import {resolve}from'node:path';import {defaultCache}from'@app/frontend-stack-react/entries/common/createEmotionCache';import config from'@app/cde-webconfig.json';import {Head}from'./root.js';import {ServerStyleContext}from'@app/frontend-stack-react/entries/chakraui/context.js';import i18next from'@app/frontend-stack-react/i18n-localization/i18next.server.js';/**
+import React__default from'react';import {PassThrough}from'node:stream';import {createReadableStreamFromReadable}from'@remix-run/node';import {RemixServer}from'@remix-run/react';import {isbot}from'isbot';import {ApolloProvider}from'@apollo/client/index.js';import {SlotFillProvider}from'@common-stack/components-pro';import {InversifyProvider}from'@common-stack/client-react';import {renderToPipeableStream,renderToString}from'react-dom/server';import {Provider}from'react-redux';import {LOCATION_CHANGE}from'@common-stack/remix-router-redux';import serialize from'serialize-javascript';import {CacheProvider}from'@emotion/react';import createEmotionServer from'@emotion/server/create-instance';import Backend from'i18next-fs-backend';import {renderHeadToString}from'remix-island';import publicEnv from'@src/config/public-config';import {initReactI18next,I18nextProvider}from'react-i18next';import {createInstance}from'i18next';import {resolve}from'node:path';import {defaultCache}from'@app/frontend-stack-react/entries/common/createEmotionCache.js';import config from'@app/cde-webconfig.json';import {Head}from'./root.js';import {ServerStyleContext}from'@app/frontend-stack-react/entries/chakraui/context.js';import {i18nextInstance}from'@app/frontend-stack-react/i18n-localization/i18next.server.js';/**
  * By default, Remix will handle generating the HTTP Response for you.
  * You are free to delete this file if you'd like to, but if you ever want it revealed again, you can run `npx remix reveal` ✨
  * For more information, see https://remix.run/file-conventions/entry.server
@@ -58,9 +58,9 @@ function handleBotRequest(request, responseStatusCode, responseHeaders, remixCon
 async function handleBrowserRequest(request, responseStatusCode, responseHeaders, remixContext, loadContext) {
     const instance = createInstance();
     // Then we could detect locale from the request
-    const lng = await i18next.getLocale(request);
+    const lng = await i18nextInstance.getLocale(request);
     // And here we detect what namespaces the routes about to render want to use
-    const ns = i18next.getRouteNamespaces(remixContext);
+    const ns = i18nextInstance.getRouteNamespaces(remixContext);
     const slotFillContext = { fills: {} };
     const { modules: clientModules, container, apolloClient: client, store, } = loadContext;
     // First, we create a new instance of i18next so every request will have a

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

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { ErrorBoundary } from '@app/frontend-stack-react/entries/chakraui/components/ErrorBoundary';
+import { ErrorBoundary } from '@app/frontend-stack-react/entries/chakraui/components/ErrorBoundary.js';
 interface DocumentProps {
     children: React.ReactNode;
 }
@@ -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

@@ -1,4 +1,4 @@
-import*as React from'react';import {useContext}from'react';import {Meta,Links,ScrollRestoration,Scripts,useLoaderData,Outlet}from'@remix-run/react';import {json}from'@remix-run/node';import {PluginArea}from'@common-stack/client-react';import {subscribeReduxRouter}from'@common-stack/remix-router-redux';import {ApplicationErrorHandler}from'@admin-layout/chakra-ui';import clientModules,{plugins}from'@app/frontend-stack-react/modules.js';import {createHead}from'remix-island';import {ServerStyleContext,ClientStyleContext}from'./context.js';import {withEmotionCache}from'@emotion/react';import {useChangeLanguage}from'remix-i18next/react';import i18next from'@app/frontend-stack-react/i18n-localization/i18next.server';export{ErrorBoundary}from'@app/frontend-stack-react/entries/chakraui/components/ErrorBoundary';// @ts-nocheck
+import*as React from'react';import {useContext}from'react';import {Meta,Links,ScrollRestoration,Scripts,useLoaderData,Outlet}from'@remix-run/react';import {json}from'@remix-run/node';import {PluginArea}from'@common-stack/client-react';import {subscribeReduxRouter}from'@common-stack/remix-router-redux';import {ApplicationErrorHandler}from'@admin-layout/chakra-ui';import clientModules,{plugins}from'@app/frontend-stack-react/modules.js';import {createHead}from'remix-island';import {ServerStyleContext,ClientStyleContext}from'./context.js';import {withEmotionCache}from'@emotion/react';import {useChangeLanguage}from'remix-i18next/react';import {i18nextInstance}from'@app/frontend-stack-react/i18n-localization/i18next.server.js';export{ErrorBoundary}from'@app/frontend-stack-react/entries/chakraui/components/ErrorBoundary.js';// @ts-nocheck
 const Head = createHead(() => (React.createElement(React.Fragment, null,
     React.createElement(Meta, null),
     React.createElement(Links, null))));
@@ -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),
@@ -28,15 +27,21 @@ const Document = withEmotionCache(({ children }, emotionCache) => {
         React.createElement(Scripts, null)));
 });
 let loader = async ({ request }) => {
-    let locale = await i18next.getLocale(request);
+    let locale = await i18nextInstance.getLocale(request);
     return json({ locale });
 };
 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/lib/entries/common/AntStyles.js

@@ -0,0 +1,3 @@
+import*as React from'react';import {createCache,extractStyle,StyleProvider}from'@ant-design/cssinjs';const antdCache = createCache();
+const styleSheet = extractStyle(antdCache);
+const AntSytles = ({ children }) => (React.createElement(StyleProvider, { cache: antdCache }, children));export{AntSytles,styleSheet};

package/lib/entries/common/createEmotionCache.js

@@ -0,0 +1,4 @@
+import createCache from'@emotion/cache';const defaultCache = createEmotionCache();
+function createEmotionCache() {
+    return createCache({ key: 'css', prepend: true });
+}export{createEmotionCache as default,defaultCache};

package/lib/entries/common/index.d.ts

@@ -0,0 +1,3 @@
+export * from './AntStyles';
+export * from './createEmotionCache';
+export * from './utils';

package/lib/entries/common/index.js

@@ -0,0 +1 @@
+export{AntSytles,styleSheet}from'./AntStyles.js';export{defaultCache}from'./createEmotionCache.js';export{jsonToString}from'./utils.js';

package/lib/entries/common/utils.js

@@ -0,0 +1,12 @@
+import {isEmpty}from'lodash-es';function jsonToString(json) {
+    if (isEmpty(json)) {
+        return '';
+    }
+    if (Array.isArray(json)) {
+        let arr = json.map((a) => jsonToString(a));
+        return arr.join(' ');
+    }
+    const str = JSON.stringify(json);
+    const arr = str.split(',');
+    return Array.isArray(arr) ? arr.join(' ') : str;
+}export{jsonToString};

package/lib/entries/index.d.ts

@@ -4,3 +4,4 @@ export * as ar from './antui/root';
 export * as cc from './chakraui/entry.client';
 export * as cs from './chakraui/entry.server';
 export * as cr from './chakraui/root';
+export * as common from './common';

package/lib/i18n-localization/i18next.server.d.ts

@@ -1,2 +1,2 @@
 declare const i18nextInstance: any;
-export default i18nextInstance;
+export { i18nextInstance };

package/lib/i18n-localization/i18next.server.js

@@ -9,4 +9,4 @@ const i18nConfig = {
     },
     backend: Backend,
 };
-new RemixI18Next(i18nConfig);
+const i18nextInstance = new RemixI18Next(i18nConfig);export{i18nextInstance};

package/lib/index.js

@@ -1 +1 @@
-export{UtilityClass,logger}from'./utils/index.js';export{createClientContainer}from'./config/client.service.js';export{createReduxStore,epicMiddlewareFunc,persistConfig}from'./config/redux-config.js';export{clientLoaderWithMiddleware}from'./tools/clientLoaderWithMiddleware.js';export{loaderWithMiddleware}from'./tools/loaderWithMiddleware.js';export{corsMiddleware}from'./backend/middlewares/cors.js';export{TYPES,containerMiddleware}from'./backend/middlewares/container.js';export{errorMiddleware}from'./backend/middlewares/error.js';export{loadContext}from'./load-context.server.js';import*as entry_client from'./entries/antui/entry.client.js';export{entry_client as ac };import*as entry_server from'./entries/antui/entry.server.js';export{entry_server as as };import*as root from'./entries/antui/root.js';export{root as ar };import*as entry_client$1 from'./entries/chakraui/entry.client.js';export{entry_client$1 as cc };import*as entry_server$1 from'./entries/chakraui/entry.server.js';export{entry_server$1 as cs };import*as root$1 from'./entries/chakraui/root.js';export{root$1 as cr };import'./i18n-localization/i18next.server.js';import*as index from'./entries/antui/components/index.js';export{index as au };import*as index$1 from'./entries/chakraui/components/index.js';export{index$1 as cu };
+export{UtilityClass,logger}from'./utils/index.js';export{createClientContainer}from'./config/client.service.js';export{createReduxStore,epicMiddlewareFunc,persistConfig}from'./config/redux-config.js';export{clientLoaderWithMiddleware}from'./tools/clientLoaderWithMiddleware.js';export{loaderWithMiddleware}from'./tools/loaderWithMiddleware.js';export{corsMiddleware}from'./backend/middlewares/cors.js';export{TYPES,containerMiddleware}from'./backend/middlewares/container.js';export{errorMiddleware}from'./backend/middlewares/error.js';export{loadContext}from'./load-context.server.js';import*as entry_client from'./entries/antui/entry.client.js';export{entry_client as ac };import*as entry_server from'./entries/antui/entry.server.js';export{entry_server as as };import*as root from'./entries/antui/root.js';export{root as ar };import*as entry_client$1 from'./entries/chakraui/entry.client.js';export{entry_client$1 as cc };import*as entry_server$1 from'./entries/chakraui/entry.server.js';export{entry_server$1 as cs };import*as root$1 from'./entries/chakraui/root.js';export{root$1 as cr };import*as index$2 from'./entries/common/index.js';export{index$2 as common };export{i18nextInstance}from'./i18n-localization/i18next.server.js';import*as index from'./entries/antui/components/index.js';export{index as au };import*as index$1 from'./entries/chakraui/components/index.js';export{index$1 as cu };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@common-stack/frontend-stack-react",
-    "version": "4.0.2-alpha.8",
+    "version": "4.0.3-alpha.0",
     "description": "Client Module for react app",
     "homepage": "https://github.com/cdmbase/fullstack-pro#readme",
     "bugs": {
@@ -30,8 +30,8 @@
     },
     "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": "4.0.3-alpha.0",
+        "@common-stack/core": "4.0.3-alpha.0",
         "i18next-browser-languagedetector": "^8.0.0",
         "i18next-fs-backend": "^2.3.1",
         "i18next-http-backend": "^2.5.2",
@@ -56,5 +56,5 @@
     "typescript": {
         "definition": "lib/index.d.ts"
     },
-    "gitHead": "87b8e7a1217a41bb53d37273fd3859621da66f23"
+    "gitHead": "c411ebacd422102c481ba0633079b2f843601f78"
 }