@common-stack/frontend-stack-react 8.5.1-alpha.4 → 8.6.1-alpha.1

package/lib/backend/middlewares/container.js

@@ -1,4 +1,4 @@
-import {v4}from'uuid';import {ClientTypes,getGlobalVariable}from'@common-stack/core';import {merge}from'lodash-es';import {ScopedContainer}from'@common-stack/client-core/lib/connector/ScopedContainer.js';import {createReduxStore}from'../../config/redux-config.js';import {logger}from'@cdm-logger/server';import {UtilityClass}from'../../utils/index.js';import features from'../../modules.js';import {createApolloClient}from'../../config/base-apollo-client.js';import {config}from'../../config/env-config.server.js';const TYPES = {
+import {v4}from'uuid';import {ClientTypes,getGlobalVariable}from'@common-stack/core';import {merge}from'lodash-es';import {ScopedContainer}from'@common-stack/client-core';import {createReduxStore}from'../../config/redux-config.js';import {logger}from'@cdm-logger/server';import {UtilityClass}from'../../utils/index.js';import features from'../../modules.js';import {createApolloClient}from'../../config/base-apollo-client.js';import {config}from'../../config/env-config.server.js';const TYPES = {
     HttpRequest: Symbol.for('HttpRequest'),
 };
 const utility = new UtilityClass(features);
@@ -43,13 +43,20 @@ const containerMiddleware = async (req, res, next) => {
             return apolloClient;
         })
             .inRequestScope();
+        // Bind ApolloClient so loaders/epics that resolve it directly (not via factory) work
+        if (container.isBound(ClientTypes.ApolloClient)) {
+            container.rebind(ClientTypes.ApolloClient).toConstantValue(apolloClient);
+        }
+        else {
+            container.bind(ClientTypes.ApolloClient).toConstantValue(apolloClient);
+        }
         const services = merge({}, ...features.createServiceFunc.map((serviceFunc) => serviceFunc(container)));
         const resolvers = features.getApolloResolvers(() => services);
         apolloClient.setResolvers(resolvers);
         const { store } = createReduxStore(apolloClient, services, container);
         req.container = container;
         req.apolloClient = container.get(ClientTypes.ApolloClientFactory)();
-        req.logger = logger;
+        // logger removed from req to avoid hydration issues — use container.get(ClientTypes.Logger) instead
         req.store = store;
         req.services = services;
         if (typeof res.on === 'function') {

package/lib/config/client.service.d.ts

@@ -5,5 +5,4 @@ export declare const createClientContainer: (req?: any, res?: any) => {
     container: Container;
     apolloClient: ApolloClient<NormalizedCacheObject>;
     serviceFunc: () => any;
-    logger: import("@cdm-logger/core/lib/interface").ILogger;
 };

package/lib/config/client.service.js

@@ -1,4 +1,4 @@
-import'reflect-metadata';import {ClientTypes}from'@common-stack/client-core';import {ScopedContainer}from'@common-stack/client-core/lib/connector/ScopedContainer.js';import {merge}from'lodash-es';import features from'../modules.js';import {UtilityClass,logger}from'../utils/index.js';import {createApolloClient}from'./base-apollo-client.js';import {config}from'./browser-env-config.js';import {getGlobalVariable}from'@common-stack/core';const utility = new UtilityClass(features);
+import'reflect-metadata';import {ScopedContainer,ClientTypes,attachDeprecatedLogger}from'@common-stack/client-core';import {merge}from'lodash-es';import features from'../modules.js';import {UtilityClass,logger}from'../utils/index.js';import {createApolloClient}from'./base-apollo-client.js';import {config}from'./browser-env-config.js';import {getGlobalVariable}from'@common-stack/core';const utility = new UtilityClass(features);
 ScopedContainer.registerGlobalDependencies((container) => {
     container.bind(ClientTypes.Logger).toConstantValue(logger);
     container.bind(ClientTypes.UtilityClass).toConstantValue(utility);
@@ -54,8 +54,11 @@ const createClientContainer = (req, res) => {
         container: container,
         apolloClient,
         serviceFunc,
-        logger,
+        // logger is attached as a non-enumerable deprecated getter — see below
     };
+    // Backward compat: old code using clientService.logger still works but
+    // prints a deprecation warning. Non-enumerable so it won't serialize/hydrate.
+    attachDeprecatedLogger(clientService, container);
     // @ts-ignore
     if (import.meta.hot) {
         //@ts-ignore

package/lib/load-context.server.js

@@ -1,9 +1,11 @@
-import'reflect-metadata';import {logger}from'@cdm-logger/server';import features from'./modules.js';import {getRedisClient}from'./config/redis-config.server.js';/* eslint-disable @typescript-eslint/ban-ts-comment */
+import'reflect-metadata';import {attachDeprecatedLogger}from'@common-stack/client-core';import {logger}from'@cdm-logger/server';import features from'./modules.js';import {getRedisClient}from'./config/redis-config.server.js';/* eslint-disable @typescript-eslint/ban-ts-comment */
 const routeConfig = features.getConfiguredRoutes();
 const redisClient = getRedisClient(logger);
 const loadContext = async (req, res) => {
-    const { container, store, apolloClient, services, logger } = req;
-    return {
+    const { container, store, apolloClient, services } = req;
+    // logger is attached as a non-enumerable deprecated getter below.
+    // It won't be serialized (no hydration issues) but old code using context.logger still works.
+    const context = {
         modules: features,
         routeConfig,
         store,
@@ -11,6 +13,7 @@ const loadContext = async (req, res) => {
         apolloClient,
         services,
         redisClient,
-        logger,
     };
+    attachDeprecatedLogger(context, container);
+    return context;
 };export{loadContext};

package/lib/tools/clientLoaderWithMiddleware.js

@@ -1,5 +1,19 @@
-async function clientLoaderWithMiddleware(params, middlewareOptions = {}, middlewareStack) {
+import {ClientTypes,attachDeprecatedLogger}from'@common-stack/client-core';async function clientLoaderWithMiddleware(params, middlewareOptions = {}, middlewareStack) {
     const loaderData = middlewareOptions;
+    // Resolve logger once and pass through loaderData so middlewares don't need repeated container.get() calls
+    if (!loaderData.logger && params?.context?.container) {
+        try {
+            loaderData.logger = params.context.container.get(ClientTypes.Logger);
+        }
+        catch {
+            // logger not bound — middlewares will fall back to container.get()
+        }
+    }
+    // Backward compat: attach a non-enumerable deprecated logger getter to the context
+    // so existing middleware code accessing context.logger still works with a warning.
+    if (params?.context && params.context.container && !Object.getOwnPropertyDescriptor(params.context, 'logger')) {
+        attachDeprecatedLogger(params.context, params.context.container);
+    }
     const executeMiddlewares = async (index) => {
         if (index < middlewareStack.length) {
             const { func } = middlewareStack[index];

package/lib/tools/loaderWithMiddleware.js

@@ -1,4 +1,4 @@
-/**
+import {ClientTypes}from'@common-stack/client-core';/**
  * Executes the middleware stack in sequence
  * @param params - The loader context
  * @param middlewareOptions - The middleware options
@@ -6,9 +6,12 @@
  * @returns The middleware options
  */
 async function loaderWithMiddleware(params, middlewareOptions, middlewareStack) {
-    const { logger } = params.context;
+    // logger removed from context to avoid hydration issues — use container.get(ClientTypes.Logger) instead
+    const logger = params.context.container.get(ClientTypes.Logger);
     logger.debug('middlewares [%j]', middlewareStack);
     const loaderData = middlewareOptions ? middlewareOptions : {};
+    // Pass logger through loaderData so middlewares don't need repeated container.get() calls
+    loaderData.logger = logger;
     const executeMiddlewares = async (index) => {
         if (index < middlewareStack.length) {
             const middleware = middlewareStack[index];

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@common-stack/frontend-stack-react",
-    "version": "8.5.1-alpha.4",
+    "version": "8.6.1-alpha.1",
     "description": "Client Module for react app",
     "homepage": "https://github.com/cdmbase/fullstack-pro#readme",
     "bugs": {
@@ -33,9 +33,9 @@
         "@cdm-logger/client": "^9.0.17",
         "@cdm-logger/server": "^9.0.17",
         "@common-stack/cache-api-server": "8.4.1-alpha.0",
-        "@common-stack/client-core": "8.5.1-alpha.4",
-        "@common-stack/client-react": "8.5.1-alpha.4",
-        "@common-stack/components-pro": "8.5.1-alpha.4",
+        "@common-stack/client-core": "8.6.1-alpha.0",
+        "@common-stack/client-react": "8.6.1-alpha.0",
+        "@common-stack/components-pro": "8.6.1-alpha.0",
         "@common-stack/core": "8.4.1-alpha.0",
         "@common-stack/remix-router-redux": "8.3.1-alpha.4",
         "@common-stack/server-core": "8.4.1-alpha.0",
@@ -106,7 +106,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "c996b74a8a8a03181b38ecea628e4c2a37488ff6",
+    "gitHead": "f62eae13ecab9c0e79d9296cf56e17ac9d9f9a9b",
     "typescript": {
         "definition": "lib/index.d.ts"
     }