@common-stack/frontend-stack-react 4.0.1-alpha.36 → 4.0.1-alpha.40

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

@@ -11,19 +11,28 @@ const errorLink = onError(({ graphQLErrors, networkError }) => {
     }
 });
 const createApolloClient = ({ scope, isDev, isDebug, isSSR, getDataIdFromObject, clientState, httpGraphqlURL, httpLocalGraphqlURL, initialState, logger, }) => {
+    logger.debug('Initializing Apollo Client with parameters', {
+        scope,
+        isDev,
+        isDebug,
+        isSSR,
+        httpGraphqlURL,
+        httpLocalGraphqlURL,
+    });
     const isBrowser = scope === 'browser';
     const isServer = scope === 'server';
     const cache = createCache({ getDataIdFromObject, clientState, logger });
     logger.debug('Created new Apollo memory cache');
     const retryLink = new RetryLink({
         attempts: async (count, operation, error) => {
+            logger.debug('Retrying link attempt', { count, operation, error });
             const promises = (clientState.retryLinkAttemptFuncs || []).map((func) => func(count, operation, error));
             try {
                 const result = await Promise.all(promises);
                 return !!result.find((item) => item && isBoolean(item));
             }
             catch (e) {
-                logger.trace('Error occurred in retryLink Attempt condition', e);
+                logger.error('Error occurred in retryLink attempt condition', e);
                 throw e;
             }
         },
@@ -31,6 +40,7 @@ const createApolloClient = ({ scope, isDev, isDebug, isSSR, getDataIdFromObject,
     let link;
     if (isBrowser) {
         const connectionParams = async () => {
+            logger.debug('Getting WebSocket connection parameters');
             const param = {};
             for (const connectionParam of clientState.connectionParams) {
                 const result = await connectionParam();
@@ -42,26 +52,24 @@ const createApolloClient = ({ scope, isDev, isDebug, isSSR, getDataIdFromObject,
             url: httpGraphqlURL.replace(/^http/, 'ws'),
             retryAttempts: 10,
             lazy: true,
-            // reconnect: true,
-            // timeout: 30000,
             shouldRetry: () => true,
             keepAlive: 10000,
             connectionParams,
             on: {
                 connected: (socket) => logger.debug('WebSocket connected'),
                 error: async (error) => {
-                    logger.error(error, '[WS connectionCallback error] %j');
+                    logger.error('WebSocket connection error', error);
                     const promises = (clientState.connectionCallbackFuncs || []).map((func) => func(wsLink, error, {}));
                     try {
                         await Promise.all(promises);
                     }
                     catch (err) {
-                        logger.trace('Error occurred in connectionCallback condition', err);
+                        logger.trace('Error occurred in WebSocket connection callback', err);
                         throw err;
                     }
                 },
-                ping: () => logger.trace('Pinged Server'),
-                pong: () => logger.trace('Pong received'),
+                ping: () => logger.trace('WebSocket ping sent'),
+                pong: () => logger.trace('WebSocket pong received'),
             },
         }));
         link = ApolloLink.split(({ query, operationName }) => {
@@ -73,6 +81,7 @@ const createApolloClient = ({ scope, isDev, isDebug, isSSR, getDataIdFromObject,
         }, wsLink, new HttpLink({ uri: httpGraphqlURL, credentials: 'include', fetch }));
     }
     else if (isServer) {
+        logger.debug('Creating BatchHttpLink for server');
         link = new BatchHttpLink({
             uri: httpLocalGraphqlURL,
             fetch,
@@ -82,9 +91,10 @@ const createApolloClient = ({ scope, isDev, isDebug, isSSR, getDataIdFromObject,
         });
     }
     else {
+        logger.debug('Creating HttpLink for native');
         link = new HttpLink({ uri: httpLocalGraphqlURL, fetch, credentials: 'include' });
     }
-    const links = [errorLink, retryLink, ...(clientState.preLinks || []), link];
+    const links = [errorLink, retryLink, ...(clientState.preLinks || []), link].filter(Boolean);
     const params = {
         queryDeduplication: true,
         typeDefs: schema.concat(clientState.typeDefs || ''),
@@ -94,6 +104,7 @@ const createApolloClient = ({ scope, isDev, isDebug, isSSR, getDataIdFromObject,
         credentials: 'include',
         connectToDevTools: isBrowser && (isDev || isDebug),
     };
+    logger.trace('Apollo client options', params);
     if (isSSR) {
         if (isBrowser) {
             params.ssrForceFetchDelay = 100;

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

@@ -0,0 +1,6 @@
+declare const _default: {
+    supportedLngs: string[];
+    fallbackLng: string;
+    defaultNS: string;
+};
+export default _default;

package/lib/i18n-localization/i18n.js

@@ -0,0 +1,9 @@
+var i18n = {
+    // This is the list of languages your application supports
+    supportedLngs: ["en", "es"],
+    // This is the language you want to use in case
+    // if the user language is not in the supportedLngs
+    fallbackLng: "en",
+    // The default namespace of i18next is "translation", but you can customize it here
+    defaultNS: "common",
+};export{i18n as default};

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

@@ -0,0 +1,2 @@
+declare let i18next: any;
+export default i18next;

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

@@ -0,0 +1,18 @@
+import Backend from'i18next-fs-backend';import {resolve}from'node:path';import {RemixI18Next}from'remix-i18next/server';import i18n from'./i18n.js';new RemixI18Next({
+    detection: {
+        supportedLanguages: i18n.supportedLngs,
+        fallbackLanguage: i18n.fallbackLng,
+    },
+    // This is the configuration for i18next used
+    // when translating messages server-side only
+    i18next: {
+        ...i18n,
+        backend: {
+            loadPath: resolve('./public/cdm-locales/{{lng}}/{{ns}}.json'),
+        },
+    },
+    // The i18next plugins you want RemixI18next to use for `i18n.getFixedT` inside loaders and actions.
+    // E.g. The Backend plugin for loading translations from the file system
+    // Tip: You could pass `resources` to the `i18next` configuration and avoid a backend here
+    plugins: [Backend],
+});

package/lib/i18n-localization/index.d.ts

@@ -0,0 +1,2 @@
+export * from './i18next.server';
+export * from './i18n';

package/lib/index.d.ts

@@ -5,3 +5,4 @@ export * from './backend/middlewares/cors';
 export * from './backend/middlewares/container';
 export * from './backend/middlewares/error';
 export * from './load-context.server';
+export * from './i18n-localization';

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';
+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'./i18n-localization/i18next.server.js';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@common-stack/frontend-stack-react",
-    "version": "4.0.1-alpha.36",
+    "version": "4.0.1-alpha.40",
     "description": "Client Module for react app",
     "homepage": "https://github.com/cdmbase/fullstack-pro#readme",
     "bugs": {
@@ -30,7 +30,11 @@
     },
     "dependencies": {
         "@common-stack/client-react": "4.0.1-alpha.36",
-        "@common-stack/core": "4.0.1-alpha.31"
+        "@common-stack/core": "4.0.1-alpha.31",
+        "i18next-fs-backend": "^2.3.1",
+        "i18next-http-backend": "^2.5.2",
+        "react-i18next": "^14.1.0",
+        "remix-i18next": "^6.1.0"
     },
     "devDependencies": {
         "jest-fetch-mock": "^3.0.3",
@@ -39,10 +43,8 @@
     "peerDependencies": {
         "@apollo/client": ">=3.0.0",
         "@remix-run/react": "^2.9.2",
-        "react": ">=16.8.6",
-        "react-dom": ">=16.8.6",
-        "react-router": ">=6.0.0",
-        "redux": ">=4.0.1"
+        "react": ">=18",
+        "react-dom": ">=18"
     },
     "publishConfig": {
         "access": "public"
@@ -50,5 +52,5 @@
     "typescript": {
         "definition": "lib/index.d.ts"
     },
-    "gitHead": "8bbf23ccf6303d3a3d7720b4469b168b22d23483"
+    "gitHead": "d0bece51592356e7ee1c7fcb3033b36416b2d41b"
 }