@tramvai/module-child-app 1.70.0 → 1.71.1

package/README.md

@@ -108,7 +108,6 @@ Loading of child-app is happens only after preloading child-app with `CHILD_APP_
 - Calling `PreloadManager.preload(...)` loads a child-app code, executes and marks it as executable to CommandLineRunner
 - Result of `PreloadManager.preload(...)` must be awaited as it is important to synchronize child-app commands lines execution with a root-app `CommandLinerRunner`
 - Preloads after root-app `resolvePageDeps` are useless as they wont change page render and wont be used by root-app.
-- If child-app was not preloaded at all but still is used on render then the child-app is still preloaded automatically, but it will lead to additional React render and may significantly increase response latency.
 
 #### Client
 

package/lib/browser/preload.d.ts

@@ -6,10 +6,10 @@ export declare class PreloadManager implements ChildAppPreloadManager {
     private store;
     private resolutionConfigManager;
     private resolveExternalConfig;
+    private pageHasRendered;
     private pageHasLoaded;
     private map;
     private serverPreloaded;
-    private preloadMap;
     private hasInitialized;
     constructor({ loader, runner, resolutionConfigManager, resolveExternalConfig, store, }: {
         loader: ChildAppLoader;
@@ -21,6 +21,7 @@ export declare class PreloadManager implements ChildAppPreloadManager {
     preload(request: ChildAppRequestConfig): Promise<void>;
     isPreloaded(request: ChildAppRequestConfig): boolean;
     runPreloaded(): Promise<void>;
+    pageRender(): void;
     clearPreloaded(): Promise<void>;
     getPreloadedList(): ChildAppRequestConfig[];
     private initServerPreloaded;

package/lib/server/preload.d.ts

@@ -18,6 +18,7 @@ export declare class PreloadManager implements ChildAppPreloadManager {
     preload(request: ChildAppRequestConfig): Promise<void>;
     isPreloaded(request: ChildAppRequestConfig): boolean;
     runPreloaded(): Promise<void>;
+    pageRender(): void;
     clearPreloaded(): Promise<void>;
     getPreloadedList(): ChildAppRequestConfig[];
     private run;

package/lib/server/render.d.ts

@@ -1,11 +1,6 @@
-import type { CUSTOM_RENDER } from '@tramvai/tokens-render';
 import type { Container } from '@tinkoff/dippy';
 import type { ChildAppDiManager, ChildAppPreloadManager, ChildAppRenderManager, ChildAppRequestConfig, CHILD_APP_RESOLVE_CONFIG_TOKEN } from '@tramvai/tokens-child-app';
 import type { LOGGER_TOKEN } from '@tramvai/tokens-common';
-export declare const customRender: ({ renderManager, diManager, }: {
-    renderManager: ChildAppRenderManager;
-    diManager: ChildAppDiManager;
-}) => typeof CUSTOM_RENDER;
 export declare class RenderManager implements ChildAppRenderManager {
     private readonly preloadManager;
     private readonly diManager;

package/lib/server/stateManager.d.ts

@@ -1,5 +1,10 @@
 import type { ChildAppDiManager, ChildAppStateManager, ChildAppFinalConfig } from '@tramvai/tokens-child-app';
-import type { LOGGER_TOKEN } from '@tramvai/tokens-common';
+import type { LOGGER_TOKEN, STORE_TOKEN } from '@tramvai/tokens-common';
+import type { EXTEND_RENDER } from '@tramvai/tokens-render';
+export declare const executeRootStateSubscriptions: ({ store, diManager, }: {
+    store: typeof STORE_TOKEN;
+    diManager: ChildAppDiManager;
+}) => typeof EXTEND_RENDER[number];
 export declare class StateManager implements ChildAppStateManager {
     private readonly log;
     private readonly diManager;

package/lib/server.browser.js

@@ -14,7 +14,7 @@ import { loadModule } from '@tinkoff/module-loader-client';
 import noop from '@tinkoff/utils/function/noop';
 import { useDi } from '@tramvai/react';
 
-const getChildProviders$3 = (appDi) => {
+const getChildProviders$1 = (appDi) => {
     const context = appDi.get(CONTEXT_TOKEN);
     return [
         {
@@ -56,7 +56,7 @@ const getChildProviders$3 = (appDi) => {
     ];
 };
 
-const getChildProviders$2 = (appDi) => {
+const getChildProviders = (appDi) => {
     const logger = appDi.get(LOGGER_TOKEN);
     return [
         provide({
@@ -70,7 +70,7 @@ const getChildProviders$2 = (appDi) => {
             multi: true,
             useValue: [],
         }),
-        ...getChildProviders$3(appDi),
+        ...getChildProviders$1(appDi),
     ];
 };
 
@@ -137,7 +137,7 @@ class SingletonDiManager {
             },
         ], this.appDi);
         const { modules = [], providers = [], actions = [] } = children;
-        const childProviders = getChildProviders$2(this.appDi);
+        const childProviders = getChildProviders(this.appDi);
         childProviders.forEach((provider) => {
             di.register(provider);
         });
@@ -171,14 +171,6 @@ class SingletonDiManager {
     }
 }
 
-const getChildProviders$1 = (_) => {
-    return [];
-};
-
-const getChildProviders = (appDi) => {
-    return getChildProviders$1();
-};
-
 class DiManager {
     constructor({ appDi, loader, singletonDiManager, }) {
         this.cache = new Map();
@@ -209,12 +201,7 @@ class DiManager {
         if (!singletonDi) {
             return;
         }
-        const di = new ChildContainer(singletonDi, this.appDi);
-        const childProviders = getChildProviders(this.appDi);
-        childProviders.forEach((provider) => {
-            di.register(provider);
-        });
-        return di;
+        return new ChildContainer(singletonDi, this.appDi);
     }
 }
 
@@ -301,6 +288,19 @@ const initModuleFederation = async (container, scope = 'default') => {
             },
         };
     }
+    if (process.env.NODE_ENV === 'development') {
+        // explicitly add react/jsx-runtime to support production builds of the child-app in dev mode
+        if (!shareScope['react/jsx-runtime']) {
+            shareScope['react/jsx-runtime'] = {
+                '*': {
+                    get: () => () => require('react/jsx-runtime'),
+                    from: 'tramvai-mf-fix',
+                    eager: true,
+                    loaded: true,
+                },
+            };
+        }
+    }
 };
 const getModuleFederation = async (container, name = 'entry') => {
     return container.get(name);
@@ -496,6 +496,18 @@ const sharedProviders = [
             preloadManager: CHILD_APP_PRELOAD_MANAGER_TOKEN,
         },
     }),
+    provide({
+        provide: commandLineListTokens$1.generatePage,
+        multi: true,
+        useFactory: ({ preloadManager }) => {
+            return function childAppPageRender() {
+                preloadManager.pageRender();
+            };
+        },
+        deps: {
+            preloadManager: CHILD_APP_PRELOAD_MANAGER_TOKEN,
+        },
+    }),
     provide({
         provide: commandLineListTokens$1.clear,
         multi: true,
@@ -570,6 +582,7 @@ class BrowserLoader extends Loader {
         this.log = logger('child-app:loader');
     }
     async load(config) {
+        var _a;
         const moduleName = config.name;
         const childApp = await this.get(config);
         if (childApp) {
@@ -585,7 +598,7 @@ class BrowserLoader extends Loader {
                 event: 'load-fetch',
                 moduleName,
             });
-            await loadModule(config.client.entry);
+            await loadModule(config.client.entry, { cssUrl: (_a = config.css) === null || _a === void 0 ? void 0 : _a.entry });
             container = getModuleFromGlobal(config.client.entry);
             if (container) {
                 this.log.debug({
@@ -620,10 +633,10 @@ class BrowserLoader extends Loader {
 
 class PreloadManager {
     constructor({ loader, runner, resolutionConfigManager, resolveExternalConfig, store, }) {
+        this.pageHasRendered = false;
         this.pageHasLoaded = false;
         this.map = new Map();
         this.serverPreloaded = new Map();
-        this.preloadMap = new Map();
         this.hasInitialized = false;
         this.loader = loader;
         this.runner = runner;
@@ -635,9 +648,11 @@ class PreloadManager {
         await this.init();
         const config = this.resolveExternalConfig(request);
         const { key } = config;
-        this.preloadMap.set(key, config);
-        if (!this.map.has(key)) {
-            if (this.pageHasLoaded) {
+        if (!this.isPreloaded(config)) {
+            // in case React render yet has not been executed do not load any external child-app app as
+            // as it will lead to markup mismatch on markup hydration
+            if (this.pageHasRendered) {
+                // but in case render has happened load child-app as soon as possible
                 const promise = (async () => {
                     try {
                         await this.loader.load(config);
@@ -648,6 +663,7 @@ class PreloadManager {
                     return config;
                 })();
                 this.map.set(key, promise);
+                await promise;
             }
         }
     }
@@ -676,31 +692,20 @@ class PreloadManager {
         }
         await Promise.all(promises);
     }
+    pageRender() {
+        this.pageHasRendered = true;
+    }
     async clearPreloaded() {
         this.pageHasLoaded = true;
         const promises = [];
-        this.preloadMap.forEach((config) => {
-            promises.push((async () => {
-                if (this.serverPreloaded.has(config.key)) {
-                    promises.push(this.run('clear', config));
-                }
-                else {
-                    const promise = this.loader
-                        .load(config)
-                        .catch(noop)
-                        .then(() => config);
-                    this.map.set(config.key, promise);
-                    await promise;
-                    await this.run('customer', config);
-                    await this.run('clear', config);
-                }
-            })());
+        this.serverPreloaded.forEach((config) => {
+            promises.push(this.run('clear', config));
         });
         this.serverPreloaded.clear();
         await Promise.all(promises);
     }
     getPreloadedList() {
-        return [...this.preloadMap.values()];
+        return [...this.serverPreloaded.values()];
     }
     initServerPreloaded() {
         if (!this.hasInitialized) {

package/lib/server.es.js

@@ -1,10 +1,10 @@
 import { __decorate } from 'tslib';
 import { provide, COMMAND_LINE_RUNNER_TOKEN, walkOfModules, getModuleParameters, commandLineListTokens as commandLineListTokens$1, Module } from '@tramvai/core';
 import { Container, ChildContainer, Scope, DI_TOKEN } from '@tinkoff/dippy';
-import { commandLineListTokens, CHILD_APP_INTERNAL_ACTION_TOKEN, CHILD_APP_INTERNAL_CONFIG_TOKEN, IS_CHILD_APP_DI_TOKEN, CHILD_APP_INTERNAL_ROOT_DI_BORROW_TOKEN, CHILD_APP_INTERNAL_BEFORE_RENDER_TOKEN, CHILD_APP_INTERNAL_ROOT_STATE_SUBSCRIPTION_TOKEN, CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN, CHILD_APP_RESOLUTION_CONFIGS_TOKEN, CHILD_APP_RESOLVE_CONFIG_TOKEN, CHILD_APP_RESOLVE_BASE_URL_TOKEN, CHILD_APP_SINGLETON_DI_MANAGER_TOKEN, CHILD_APP_LOADER_TOKEN, CHILD_APP_DI_MANAGER_TOKEN, CHILD_APP_COMMAND_LINE_RUNNER_TOKEN, CHILD_APP_PRELOAD_MANAGER_TOKEN, CHILD_APP_RENDER_MANAGER_TOKEN, CHILD_APP_STATE_MANAGER_TOKEN, CHILD_APP_INTERNAL_RENDER_TOKEN } from '@tramvai/tokens-child-app';
+import { commandLineListTokens, CHILD_APP_INTERNAL_ACTION_TOKEN, CHILD_APP_INTERNAL_CONFIG_TOKEN, IS_CHILD_APP_DI_TOKEN, CHILD_APP_INTERNAL_ROOT_DI_BORROW_TOKEN, CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN, CHILD_APP_RESOLUTION_CONFIGS_TOKEN, CHILD_APP_RESOLVE_CONFIG_TOKEN, CHILD_APP_RESOLVE_BASE_URL_TOKEN, CHILD_APP_SINGLETON_DI_MANAGER_TOKEN, CHILD_APP_LOADER_TOKEN, CHILD_APP_DI_MANAGER_TOKEN, CHILD_APP_COMMAND_LINE_RUNNER_TOKEN, CHILD_APP_PRELOAD_MANAGER_TOKEN, CHILD_APP_RENDER_MANAGER_TOKEN, CHILD_APP_INTERNAL_ROOT_STATE_SUBSCRIPTION_TOKEN, CHILD_APP_STATE_MANAGER_TOKEN, CHILD_APP_INTERNAL_RENDER_TOKEN } from '@tramvai/tokens-child-app';
 export * from '@tramvai/tokens-child-app';
 import { ACTION_PAGE_RUNNER_TOKEN, LOGGER_TOKEN, DISPATCHER_TOKEN, STORE_TOKEN, CONTEXT_TOKEN, COMBINE_REDUCERS, ENV_MANAGER_TOKEN, REGISTER_CLEAR_CACHE_TOKEN, CLEAR_CACHE_TOKEN, ENV_USED_TOKEN, CREATE_CACHE_TOKEN } from '@tramvai/tokens-common';
-import { RENDER_SLOTS, EXTEND_RENDER, ResourceType, ResourceSlot, RESOURCES_REGISTRY, CUSTOM_RENDER } from '@tramvai/tokens-render';
+import { RENDER_SLOTS, EXTEND_RENDER, ResourceType, ResourceSlot, RESOURCES_REGISTRY } from '@tramvai/tokens-render';
 import { PAGE_SERVICE_TOKEN } from '@tramvai/tokens-router';
 import flatten from '@tinkoff/utils/array/flatten';
 import { createEvent, createReducer } from '@tramvai/state';
@@ -14,10 +14,9 @@ import { combineValidators, isUrl, endsWith } from '@tinkoff/env-validators';
 import { safeDehydrate } from '@tramvai/safe-strings';
 import { ServerLoader as ServerLoader$1 } from '@tinkoff/module-loader-server';
 import noop from '@tinkoff/utils/function/noop';
-import { renderToString } from 'react-dom/server';
 import { useDi } from '@tramvai/react';
 
-const getChildProviders$3 = (appDi) => {
+const getChildProviders$1 = (appDi) => {
     return [
         provide({
             provide: commandLineListTokens.resolvePageDeps,
@@ -35,7 +34,7 @@ const getChildProviders$3 = (appDi) => {
     ];
 };
 
-const getChildProviders$2 = (appDi) => {
+const getChildProviders = (appDi) => {
     const logger = appDi.get(LOGGER_TOKEN);
     return [
         provide({
@@ -49,7 +48,7 @@ const getChildProviders$2 = (appDi) => {
             multi: true,
             useValue: [],
         }),
-        ...getChildProviders$3(),
+        ...getChildProviders$1(),
     ];
 };
 
@@ -116,7 +115,7 @@ class SingletonDiManager {
             },
         ], this.appDi);
         const { modules = [], providers = [], actions = [] } = children;
-        const childProviders = getChildProviders$2(this.appDi);
+        const childProviders = getChildProviders(this.appDi);
         childProviders.forEach((provider) => {
             di.register(provider);
         });
@@ -150,34 +149,6 @@ class SingletonDiManager {
     }
 }
 
-const getChildProviders$1 = (appDi) => {
-    const store = appDi.get(STORE_TOKEN);
-    return [
-        {
-            provide: CHILD_APP_INTERNAL_BEFORE_RENDER_TOKEN,
-            multi: true,
-            useFactory: ({ subscriptions, }) => {
-                return function resolveRootStateForChild() {
-                    if (!subscriptions) {
-                        return;
-                    }
-                    const state = store.getState();
-                    return Promise.all(subscriptions.map((sub) => {
-                        return sub.listener(state);
-                    }));
-                };
-            },
-            deps: {
-                subscriptions: { token: CHILD_APP_INTERNAL_ROOT_STATE_SUBSCRIPTION_TOKEN, optional: true },
-            },
-        },
-    ];
-};
-
-const getChildProviders = (appDi) => {
-    return getChildProviders$1(appDi);
-};
-
 class DiManager {
     constructor({ appDi, loader, singletonDiManager, }) {
         this.cache = new Map();
@@ -208,12 +179,7 @@ class DiManager {
         if (!singletonDi) {
             return;
         }
-        const di = new ChildContainer(singletonDi, this.appDi);
-        const childProviders = getChildProviders(this.appDi);
-        childProviders.forEach((provider) => {
-            di.register(provider);
-        });
-        return di;
+        return new ChildContainer(singletonDi, this.appDi);
     }
 }
 
@@ -300,6 +266,19 @@ const initModuleFederation = async (container, scope = 'default') => {
             },
         };
     }
+    if (process.env.NODE_ENV === 'development') {
+        // explicitly add react/jsx-runtime to support production builds of the child-app in dev mode
+        if (!shareScope['react/jsx-runtime']) {
+            shareScope['react/jsx-runtime'] = {
+                '*': {
+                    get: () => () => require('react/jsx-runtime'),
+                    from: 'tramvai-mf-fix',
+                    eager: true,
+                    loaded: true,
+                },
+            };
+        }
+    }
 };
 const getModuleFederation = async (container, name = 'entry') => {
     return container.get(name);
@@ -495,6 +474,18 @@ const sharedProviders = [
             preloadManager: CHILD_APP_PRELOAD_MANAGER_TOKEN,
         },
     }),
+    provide({
+        provide: commandLineListTokens$1.generatePage,
+        multi: true,
+        useFactory: ({ preloadManager }) => {
+            return function childAppPageRender() {
+                preloadManager.pageRender();
+            };
+        },
+        deps: {
+            preloadManager: CHILD_APP_PRELOAD_MANAGER_TOKEN,
+        },
+    }),
     provide({
         provide: commandLineListTokens$1.clear,
         multi: true,
@@ -628,7 +619,6 @@ class PreloadManager {
                 return this.run('customer', config);
             }
         })
-            .catch(noop)
             .then(() => config);
         this.map.set(key, promise);
         this.preloadMap.set(config.key, config);
@@ -651,6 +641,7 @@ class PreloadManager {
         });
         await Promise.all(promises);
     }
+    pageRender() { }
     async clearPreloaded() {
         const promises = [];
         this.map.forEach((childAppPromise) => {
@@ -673,6 +664,21 @@ class PreloadManager {
     }
 }
 
+const executeRootStateSubscriptions = ({ store, diManager, }) => {
+    return (render) => {
+        const state = store.getState();
+        diManager.forEachChildDi((di) => {
+            const subscriptions = di.get({
+                token: CHILD_APP_INTERNAL_ROOT_STATE_SUBSCRIPTION_TOKEN,
+                optional: true,
+            });
+            subscriptions === null || subscriptions === void 0 ? void 0 : subscriptions.forEach((sub) => {
+                sub.listener(state);
+            });
+        });
+        return render;
+    };
+};
 class StateManager {
     constructor({ logger, diManager, }) {
         this.state = Object.create(null);
@@ -703,31 +709,6 @@ class StateManager {
     }
 }
 
-const LOAD_TIMEOUT = 500;
-const customRender = ({ renderManager, diManager, }) => {
-    return async (content) => {
-        const promises = [];
-        diManager.forEachChildDi((di) => {
-            const beforeAppRender = di.get(CHILD_APP_INTERNAL_BEFORE_RENDER_TOKEN);
-            if (beforeAppRender) {
-                promises.push(Promise.all(beforeAppRender.map((fn) => fn())));
-            }
-        });
-        await Promise.all(promises);
-        let render = renderToString(content);
-        let timeouted = false;
-        await Promise.race([
-            new Promise((resolve) => setTimeout(resolve, LOAD_TIMEOUT)),
-            (async () => {
-                while ((await renderManager.flush()) && !timeouted) {
-                    render = renderToString(content);
-                }
-            })(),
-        ]);
-        timeouted = true;
-        return render;
-    };
-};
 class RenderManager {
     constructor({ logger, preloadManager, diManager, resolveFullConfig, }) {
         this.hasRenderedSet = new Set();
@@ -894,10 +875,12 @@ const serverProviders = [
         },
     }),
     provide({
-        provide: CUSTOM_RENDER,
-        useFactory: customRender,
+        provide: EXTEND_RENDER,
+        multi: true,
+        // execute subscription right before render to get the last actual data
+        useFactory: executeRootStateSubscriptions,
         deps: {
-            renderManager: CHILD_APP_RENDER_MANAGER_TOKEN,
+            store: STORE_TOKEN,
             diManager: CHILD_APP_DI_MANAGER_TOKEN,
         },
     }),

package/lib/server.js

@@ -17,7 +17,6 @@ var envValidators = require('@tinkoff/env-validators');
 var safeStrings = require('@tramvai/safe-strings');
 var moduleLoaderServer = require('@tinkoff/module-loader-server');
 var noop = require('@tinkoff/utils/function/noop');
-var server = require('react-dom/server');
 var react = require('@tramvai/react');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -27,7 +26,7 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var applyOrReturn__default = /*#__PURE__*/_interopDefaultLegacy(applyOrReturn);
 var noop__default = /*#__PURE__*/_interopDefaultLegacy(noop);
 
-const getChildProviders$3 = (appDi) => {
+const getChildProviders$1 = (appDi) => {
     return [
         core.provide({
             provide: tokensChildApp.commandLineListTokens.resolvePageDeps,
@@ -45,7 +44,7 @@ const getChildProviders$3 = (appDi) => {
     ];
 };
 
-const getChildProviders$2 = (appDi) => {
+const getChildProviders = (appDi) => {
     const logger = appDi.get(tokensCommon.LOGGER_TOKEN);
     return [
         core.provide({
@@ -59,7 +58,7 @@ const getChildProviders$2 = (appDi) => {
             multi: true,
             useValue: [],
         }),
-        ...getChildProviders$3(),
+        ...getChildProviders$1(),
     ];
 };
 
@@ -126,7 +125,7 @@ class SingletonDiManager {
             },
         ], this.appDi);
         const { modules = [], providers = [], actions = [] } = children;
-        const childProviders = getChildProviders$2(this.appDi);
+        const childProviders = getChildProviders(this.appDi);
         childProviders.forEach((provider) => {
             di.register(provider);
         });
@@ -160,34 +159,6 @@ class SingletonDiManager {
     }
 }
 
-const getChildProviders$1 = (appDi) => {
-    const store = appDi.get(tokensCommon.STORE_TOKEN);
-    return [
-        {
-            provide: tokensChildApp.CHILD_APP_INTERNAL_BEFORE_RENDER_TOKEN,
-            multi: true,
-            useFactory: ({ subscriptions, }) => {
-                return function resolveRootStateForChild() {
-                    if (!subscriptions) {
-                        return;
-                    }
-                    const state = store.getState();
-                    return Promise.all(subscriptions.map((sub) => {
-                        return sub.listener(state);
-                    }));
-                };
-            },
-            deps: {
-                subscriptions: { token: tokensChildApp.CHILD_APP_INTERNAL_ROOT_STATE_SUBSCRIPTION_TOKEN, optional: true },
-            },
-        },
-    ];
-};
-
-const getChildProviders = (appDi) => {
-    return getChildProviders$1(appDi);
-};
-
 class DiManager {
     constructor({ appDi, loader, singletonDiManager, }) {
         this.cache = new Map();
@@ -218,12 +189,7 @@ class DiManager {
         if (!singletonDi) {
             return;
         }
-        const di = new dippy.ChildContainer(singletonDi, this.appDi);
-        const childProviders = getChildProviders(this.appDi);
-        childProviders.forEach((provider) => {
-            di.register(provider);
-        });
-        return di;
+        return new dippy.ChildContainer(singletonDi, this.appDi);
     }
 }
 
@@ -310,6 +276,19 @@ const initModuleFederation = async (container, scope = 'default') => {
             },
         };
     }
+    if (process.env.NODE_ENV === 'development') {
+        // explicitly add react/jsx-runtime to support production builds of the child-app in dev mode
+        if (!shareScope['react/jsx-runtime']) {
+            shareScope['react/jsx-runtime'] = {
+                '*': {
+                    get: () => () => require('react/jsx-runtime'),
+                    from: 'tramvai-mf-fix',
+                    eager: true,
+                    loaded: true,
+                },
+            };
+        }
+    }
 };
 const getModuleFederation = async (container, name = 'entry') => {
     return container.get(name);
@@ -505,6 +484,18 @@ const sharedProviders = [
             preloadManager: tokensChildApp.CHILD_APP_PRELOAD_MANAGER_TOKEN,
         },
     }),
+    core.provide({
+        provide: core.commandLineListTokens.generatePage,
+        multi: true,
+        useFactory: ({ preloadManager }) => {
+            return function childAppPageRender() {
+                preloadManager.pageRender();
+            };
+        },
+        deps: {
+            preloadManager: tokensChildApp.CHILD_APP_PRELOAD_MANAGER_TOKEN,
+        },
+    }),
     core.provide({
         provide: core.commandLineListTokens.clear,
         multi: true,
@@ -638,7 +629,6 @@ class PreloadManager {
                 return this.run('customer', config);
             }
         })
-            .catch(noop__default["default"])
             .then(() => config);
         this.map.set(key, promise);
         this.preloadMap.set(config.key, config);
@@ -661,6 +651,7 @@ class PreloadManager {
         });
         await Promise.all(promises);
     }
+    pageRender() { }
     async clearPreloaded() {
         const promises = [];
         this.map.forEach((childAppPromise) => {
@@ -683,6 +674,21 @@ class PreloadManager {
     }
 }
 
+const executeRootStateSubscriptions = ({ store, diManager, }) => {
+    return (render) => {
+        const state = store.getState();
+        diManager.forEachChildDi((di) => {
+            const subscriptions = di.get({
+                token: tokensChildApp.CHILD_APP_INTERNAL_ROOT_STATE_SUBSCRIPTION_TOKEN,
+                optional: true,
+            });
+            subscriptions === null || subscriptions === void 0 ? void 0 : subscriptions.forEach((sub) => {
+                sub.listener(state);
+            });
+        });
+        return render;
+    };
+};
 class StateManager {
     constructor({ logger, diManager, }) {
         this.state = Object.create(null);
@@ -713,31 +719,6 @@ class StateManager {
     }
 }
 
-const LOAD_TIMEOUT = 500;
-const customRender = ({ renderManager, diManager, }) => {
-    return async (content) => {
-        const promises = [];
-        diManager.forEachChildDi((di) => {
-            const beforeAppRender = di.get(tokensChildApp.CHILD_APP_INTERNAL_BEFORE_RENDER_TOKEN);
-            if (beforeAppRender) {
-                promises.push(Promise.all(beforeAppRender.map((fn) => fn())));
-            }
-        });
-        await Promise.all(promises);
-        let render = server.renderToString(content);
-        let timeouted = false;
-        await Promise.race([
-            new Promise((resolve) => setTimeout(resolve, LOAD_TIMEOUT)),
-            (async () => {
-                while ((await renderManager.flush()) && !timeouted) {
-                    render = server.renderToString(content);
-                }
-            })(),
-        ]);
-        timeouted = true;
-        return render;
-    };
-};
 class RenderManager {
     constructor({ logger, preloadManager, diManager, resolveFullConfig, }) {
         this.hasRenderedSet = new Set();
@@ -904,10 +885,12 @@ const serverProviders = [
         },
     }),
     core.provide({
-        provide: tokensRender.CUSTOM_RENDER,
-        useFactory: customRender,
+        provide: tokensRender.EXTEND_RENDER,
+        multi: true,
+        // execute subscription right before render to get the last actual data
+        useFactory: executeRootStateSubscriptions,
         deps: {
-            renderManager: tokensChildApp.CHILD_APP_RENDER_MANAGER_TOKEN,
+            store: tokensCommon.STORE_TOKEN,
             diManager: tokensChildApp.CHILD_APP_DI_MANAGER_TOKEN,
         },
     }),

package/package.json

@@ -1,11 +1,10 @@
 {
   "name": "@tramvai/module-child-app",
-  "version": "1.70.0",
+  "version": "1.71.1",
   "description": "Module for child apps",
   "browser": {
     "./lib/server.js": "./lib/browser.js",
     "./lib/server/child/singletonProviders.js": "./lib/browser/child/singletonProviders.js",
-    "./lib/server/child/providers.js": "./lib/browser/child/providers.js",
     "./lib/server.es.js": "./lib/server.browser.js"
   },
   "main": "lib/server.js",
@@ -31,20 +30,20 @@
     "@tinkoff/env-validators": "0.0.3",
     "@tinkoff/module-loader-client": "0.3.25",
     "@tinkoff/module-loader-server": "0.4.41",
-    "@tramvai/child-app-core": "1.70.0",
+    "@tramvai/child-app-core": "1.71.1",
     "@tramvai/safe-strings": "0.4.3",
-    "@tramvai/tokens-child-app": "1.70.0"
+    "@tramvai/tokens-child-app": "1.71.1"
   },
   "devDependencies": {},
   "peerDependencies": {
     "@tinkoff/dippy": "0.7.38",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/core": "1.70.0",
-    "@tramvai/state": "1.70.0",
-    "@tramvai/react": "1.70.0",
-    "@tramvai/tokens-common": "1.70.0",
-    "@tramvai/tokens-render": "1.70.0",
-    "@tramvai/tokens-router": "1.70.0",
+    "@tramvai/core": "1.71.1",
+    "@tramvai/state": "1.71.1",
+    "@tramvai/react": "1.71.1",
+    "@tramvai/tokens-common": "1.71.1",
+    "@tramvai/tokens-render": "1.71.1",
+    "@tramvai/tokens-router": "1.71.1",
     "react": ">=16.8.0",
     "react-dom": ">=16.8.0",
     "object-assign": "^4.1.1",

package/lib/browser/child/providers.d.ts

@@ -1,3 +0,0 @@
-import type { Container } from '@tinkoff/dippy';
-import type { Provider } from '@tramvai/core';
-export declare const getChildProviders: (_: Container) => Provider[];

package/lib/server/child/providers.d.ts

@@ -1,3 +0,0 @@
-import type { Container } from '@tinkoff/dippy';
-import type { Provider } from '@tramvai/core';
-export declare const getChildProviders: (appDi: Container) => Provider[];

package/lib/shared/child/providers.d.ts

@@ -1,3 +0,0 @@
-import type { Container } from '@tinkoff/dippy';
-import type { Provider } from '@tramvai/core';
-export declare const getChildProviders: (appDi: Container) => Provider[];