@tramvai/module-child-app 5.14.9 → 5.15.1

package/lib/browser/render.browser.js

@@ -16,8 +16,9 @@ class RenderManager {
         // for SPA-navigation, if Child App is preloaded first time, it is valid case
         if (!this.preloadManager.isNotPreloadedForSpaNavigation(request)) {
             this.log.warn({
+                event: 'not-preloaded',
                 message: 'Child-app has been used but not preloaded before React render',
-                request,
+                childApp: request,
             });
         }
         const promiseDi = this.preloadManager.preload(request).then(() => {

package/lib/browser/runCommand.browser.js

@@ -12,7 +12,7 @@ const runCommand = async ({ status, forcePreload, runner, preloader, diManager,
             if (status === 'spa') {
                 log.info({
                     message: 'Child App has been preloaded first time, current SPA-transition will not be blocked, Child App `spa` and `afterSpa` lines will be skipped',
-                    config,
+                    childApp: config,
                 });
             }
             return;

package/lib/server/loader.es.js

@@ -74,9 +74,13 @@ class ServerLoader extends Loader {
             const entry = factory();
             this.initializedMap.set(container, entry);
         }
-        catch (err) {
-            this.log.error(err);
-            throw err;
+        catch (error) {
+            this.log.error({
+                event: 'init-mf-failed',
+                error,
+                childApp: { name: config.name, version: config.version, tag: config.tag },
+            });
+            throw error;
         }
     }
     get(config) {

package/lib/server/loader.js

@@ -82,9 +82,13 @@ class ServerLoader extends loader.Loader {
             const entry = factory();
             this.initializedMap.set(container, entry);
         }
-        catch (err) {
-            this.log.error(err);
-            throw err;
+        catch (error) {
+            this.log.error({
+                event: 'init-mf-failed',
+                error,
+                childApp: { name: config.name, version: config.version, tag: config.tag },
+            });
+            throw error;
         }
     }
     get(config) {

package/lib/server/render-slots.es.js

@@ -152,7 +152,11 @@ const registerChildAppRenderSlots = ({ logger, diManager, resolveFullConfig, pre
         catch (error) {
             log.error({
                 event: 'get-slots-failed',
-                config: requestConfig,
+                childApp: {
+                    name: requestConfig.name,
+                    version: requestConfig.version,
+                    tag: requestConfig.tag,
+                },
             });
         }
     });

package/lib/server/render-slots.js

@@ -160,7 +160,11 @@ const registerChildAppRenderSlots = ({ logger, diManager, resolveFullConfig, pre
         catch (error) {
             log.error({
                 event: 'get-slots-failed',
-                config: requestConfig,
+                childApp: {
+                    name: requestConfig.name,
+                    version: requestConfig.version,
+                    tag: requestConfig.tag,
+                },
             });
         }
     });

package/lib/server/render.es.js

@@ -16,8 +16,9 @@ class RenderManager {
             return [this.diManager.getChildDi(config), undefined];
         }
         this.log.warn({
+            event: 'not-preloaded',
             message: 'Child-app has been used but not preloaded before React render',
-            request,
+            childApp: request,
         });
         return [undefined, undefined];
     }

package/lib/server/render.js

@@ -20,8 +20,9 @@ class RenderManager {
             return [this.diManager.getChildDi(config), undefined];
         }
         this.log.warn({
+            event: 'not-preloaded',
             message: 'Child-app has been used but not preloaded before React render',
-            request,
+            childApp: request,
         });
         return [undefined, undefined];
     }

package/lib/server/stateManager.es.js

@@ -36,7 +36,7 @@ class StateManager {
             this.log.error({
                 event: 'get-state-failed',
                 error,
-                config,
+                childApp: { name: config.name, version: config.version, tag: config.tag },
             });
         }
     }

package/lib/server/stateManager.js

@@ -40,7 +40,7 @@ class StateManager {
             this.log.error({
                 event: 'get-state-failed',
                 error,
-                config,
+                childApp: { name: config.name, version: config.version, tag: config.tag },
             });
         }
     }

package/lib/shared/command.browser.js

@@ -28,7 +28,7 @@ class CommandLineRunner {
                     error,
                     type,
                     status,
-                    config,
+                    childApp: { name: config.name, version: config.version, tag: config.tag },
                 });
             }
         }

package/lib/shared/command.es.js

@@ -28,7 +28,7 @@ class CommandLineRunner {
                     error,
                     type,
                     status,
-                    config,
+                    childApp: { name: config.name, version: config.version, tag: config.tag },
                 });
             }
         }

package/lib/shared/command.js

@@ -32,7 +32,7 @@ class CommandLineRunner {
                     error,
                     type,
                     status,
-                    config,
+                    childApp: { name: config.name, version: config.version, tag: config.tag },
                 });
             }
         }

package/lib/shared/pagePreload.browser.js

@@ -1,30 +1,46 @@
 import { provide, commandLineListTokens } from '@tramvai/core';
 import { resolveLazyComponent } from '@tramvai/react';
-import { CHILD_APP_PRELOAD_MANAGER_TOKEN } from '@tramvai/tokens-child-app';
-import { LINK_PREFETCH_HANDLER_TOKEN, PAGE_SERVICE_TOKEN } from '@tramvai/tokens-router';
+import { CHILD_APP_PRELOAD_SOURCE_LIST_TOKEN, CHILD_APP_PRELOAD_MANAGER_TOKEN } from '@tramvai/tokens-child-app';
+import { PAGE_SERVICE_TOKEN, LINK_PREFETCH_HANDLER_TOKEN } from '@tramvai/tokens-router';
 
-const pagePreload = async ({ pageService, preloadManager, }, mode, isSpaNavigation = false, route) => {
-    const components = await Promise.all([
-        resolveLazyComponent(pageService.resolveComponentFromConfig('layout', route)),
-        resolveLazyComponent(pageService.resolveComponentFromConfig('nestedLayout', route)),
-        resolveLazyComponent(pageService.resolveComponentFromConfig('page', route)),
-    ]);
-    await Promise.all(components.map(async (component) => {
-        if (component?.childApps) {
-            await Promise.all(component.childApps.map((request) => {
-                // for first preload on SPA-navigation, we need to prevent double action execution,
-                // and need to mark this Child App as not preloaded, to prevent running `spa` and `afterSpa` commands for it
-                if (mode === 'preload' && isSpaNavigation && !preloadManager.isPreloaded(request)) {
-                    preloadManager.saveNotPreloadedForSpaNavigation(request);
-                }
-                return preloadManager[mode](request, route).catch(() => {
-                    // actual error will be logged internally
-                });
-            }));
+const pagePreload = async ({ preloadManager, preloadSourceList, }, mode, isSpaNavigation = false, route) => {
+    const childApps = (await Promise.all(preloadSourceList.map((source) => {
+        return source({ route });
+    }))).reduce((acc, source) => acc.concat(source), []);
+    await Promise.all(childApps.map((request) => {
+        // for first preload on SPA-navigation, we need to prevent double action execution,
+        // and need to mark this Child App as not preloaded, to prevent running `spa` and `afterSpa` commands for it
+        if (mode === 'preload' && isSpaNavigation && !preloadManager.isPreloaded(request)) {
+            preloadManager.saveNotPreloadedForSpaNavigation(request);
         }
+        return preloadManager[mode](request, route).catch(() => {
+            // actual error will be logged internally
+        });
     }));
 };
 const pagePreloadProviders = [
+    provide({
+        provide: CHILD_APP_PRELOAD_SOURCE_LIST_TOKEN,
+        useFactory: ({ pageService }) => {
+            return async function resolveChildAppsFromRouteComponents({ route }) {
+                const childApps = [];
+                const components = await Promise.all([
+                    resolveLazyComponent(pageService.resolveComponentFromConfig('layout', route)),
+                    resolveLazyComponent(pageService.resolveComponentFromConfig('nestedLayout', route)),
+                    resolveLazyComponent(pageService.resolveComponentFromConfig('page', route)),
+                ]);
+                components.forEach((component) => {
+                    if (component?.childApps) {
+                        childApps.push(...component.childApps);
+                    }
+                });
+                return childApps;
+            };
+        },
+        deps: {
+            pageService: PAGE_SERVICE_TOKEN,
+        },
+    }),
     provide({
         provide: LINK_PREFETCH_HANDLER_TOKEN,
         useFactory: (deps) => {
@@ -34,8 +50,8 @@ const pagePreloadProviders = [
         },
         multi: true,
         deps: {
-            pageService: PAGE_SERVICE_TOKEN,
             preloadManager: CHILD_APP_PRELOAD_MANAGER_TOKEN,
+            preloadSourceList: CHILD_APP_PRELOAD_SOURCE_LIST_TOKEN,
         },
     }),
     provide({
@@ -52,8 +68,8 @@ const pagePreloadProviders = [
         },
         multi: true,
         deps: {
-            pageService: PAGE_SERVICE_TOKEN,
             preloadManager: CHILD_APP_PRELOAD_MANAGER_TOKEN,
+            preloadSourceList: CHILD_APP_PRELOAD_SOURCE_LIST_TOKEN,
         },
     }),
 ];

package/lib/shared/pagePreload.es.js

@@ -1,30 +1,46 @@
 import { provide, commandLineListTokens } from '@tramvai/core';
 import { resolveLazyComponent } from '@tramvai/react';
-import { CHILD_APP_PRELOAD_MANAGER_TOKEN } from '@tramvai/tokens-child-app';
-import { LINK_PREFETCH_HANDLER_TOKEN, PAGE_SERVICE_TOKEN } from '@tramvai/tokens-router';
+import { CHILD_APP_PRELOAD_SOURCE_LIST_TOKEN, CHILD_APP_PRELOAD_MANAGER_TOKEN } from '@tramvai/tokens-child-app';
+import { PAGE_SERVICE_TOKEN, LINK_PREFETCH_HANDLER_TOKEN } from '@tramvai/tokens-router';
 
-const pagePreload = async ({ pageService, preloadManager, }, mode, isSpaNavigation = false, route) => {
-    const components = await Promise.all([
-        resolveLazyComponent(pageService.resolveComponentFromConfig('layout', route)),
-        resolveLazyComponent(pageService.resolveComponentFromConfig('nestedLayout', route)),
-        resolveLazyComponent(pageService.resolveComponentFromConfig('page', route)),
-    ]);
-    await Promise.all(components.map(async (component) => {
-        if (component?.childApps) {
-            await Promise.all(component.childApps.map((request) => {
-                // for first preload on SPA-navigation, we need to prevent double action execution,
-                // and need to mark this Child App as not preloaded, to prevent running `spa` and `afterSpa` commands for it
-                if (mode === 'preload' && isSpaNavigation && !preloadManager.isPreloaded(request)) {
-                    preloadManager.saveNotPreloadedForSpaNavigation(request);
-                }
-                return preloadManager[mode](request, route).catch(() => {
-                    // actual error will be logged internally
-                });
-            }));
+const pagePreload = async ({ preloadManager, preloadSourceList, }, mode, isSpaNavigation = false, route) => {
+    const childApps = (await Promise.all(preloadSourceList.map((source) => {
+        return source({ route });
+    }))).reduce((acc, source) => acc.concat(source), []);
+    await Promise.all(childApps.map((request) => {
+        // for first preload on SPA-navigation, we need to prevent double action execution,
+        // and need to mark this Child App as not preloaded, to prevent running `spa` and `afterSpa` commands for it
+        if (mode === 'preload' && isSpaNavigation && !preloadManager.isPreloaded(request)) {
+            preloadManager.saveNotPreloadedForSpaNavigation(request);
         }
+        return preloadManager[mode](request, route).catch(() => {
+            // actual error will be logged internally
+        });
     }));
 };
 const pagePreloadProviders = [
+    provide({
+        provide: CHILD_APP_PRELOAD_SOURCE_LIST_TOKEN,
+        useFactory: ({ pageService }) => {
+            return async function resolveChildAppsFromRouteComponents({ route }) {
+                const childApps = [];
+                const components = await Promise.all([
+                    resolveLazyComponent(pageService.resolveComponentFromConfig('layout', route)),
+                    resolveLazyComponent(pageService.resolveComponentFromConfig('nestedLayout', route)),
+                    resolveLazyComponent(pageService.resolveComponentFromConfig('page', route)),
+                ]);
+                components.forEach((component) => {
+                    if (component?.childApps) {
+                        childApps.push(...component.childApps);
+                    }
+                });
+                return childApps;
+            };
+        },
+        deps: {
+            pageService: PAGE_SERVICE_TOKEN,
+        },
+    }),
     provide({
         provide: LINK_PREFETCH_HANDLER_TOKEN,
         useFactory: (deps) => {
@@ -34,8 +50,8 @@ const pagePreloadProviders = [
         },
         multi: true,
         deps: {
-            pageService: PAGE_SERVICE_TOKEN,
             preloadManager: CHILD_APP_PRELOAD_MANAGER_TOKEN,
+            preloadSourceList: CHILD_APP_PRELOAD_SOURCE_LIST_TOKEN,
         },
     }),
     provide({
@@ -52,8 +68,8 @@ const pagePreloadProviders = [
         },
         multi: true,
         deps: {
-            pageService: PAGE_SERVICE_TOKEN,
             preloadManager: CHILD_APP_PRELOAD_MANAGER_TOKEN,
+            preloadSourceList: CHILD_APP_PRELOAD_SOURCE_LIST_TOKEN,
         },
     }),
 ];

package/lib/shared/pagePreload.js

@@ -7,28 +7,44 @@ var react = require('@tramvai/react');
 var tokensChildApp = require('@tramvai/tokens-child-app');
 var tokensRouter = require('@tramvai/tokens-router');
 
-const pagePreload = async ({ pageService, preloadManager, }, mode, isSpaNavigation = false, route) => {
-    const components = await Promise.all([
-        react.resolveLazyComponent(pageService.resolveComponentFromConfig('layout', route)),
-        react.resolveLazyComponent(pageService.resolveComponentFromConfig('nestedLayout', route)),
-        react.resolveLazyComponent(pageService.resolveComponentFromConfig('page', route)),
-    ]);
-    await Promise.all(components.map(async (component) => {
-        if (component?.childApps) {
-            await Promise.all(component.childApps.map((request) => {
-                // for first preload on SPA-navigation, we need to prevent double action execution,
-                // and need to mark this Child App as not preloaded, to prevent running `spa` and `afterSpa` commands for it
-                if (mode === 'preload' && isSpaNavigation && !preloadManager.isPreloaded(request)) {
-                    preloadManager.saveNotPreloadedForSpaNavigation(request);
-                }
-                return preloadManager[mode](request, route).catch(() => {
-                    // actual error will be logged internally
-                });
-            }));
+const pagePreload = async ({ preloadManager, preloadSourceList, }, mode, isSpaNavigation = false, route) => {
+    const childApps = (await Promise.all(preloadSourceList.map((source) => {
+        return source({ route });
+    }))).reduce((acc, source) => acc.concat(source), []);
+    await Promise.all(childApps.map((request) => {
+        // for first preload on SPA-navigation, we need to prevent double action execution,
+        // and need to mark this Child App as not preloaded, to prevent running `spa` and `afterSpa` commands for it
+        if (mode === 'preload' && isSpaNavigation && !preloadManager.isPreloaded(request)) {
+            preloadManager.saveNotPreloadedForSpaNavigation(request);
         }
+        return preloadManager[mode](request, route).catch(() => {
+            // actual error will be logged internally
+        });
     }));
 };
 const pagePreloadProviders = [
+    core.provide({
+        provide: tokensChildApp.CHILD_APP_PRELOAD_SOURCE_LIST_TOKEN,
+        useFactory: ({ pageService }) => {
+            return async function resolveChildAppsFromRouteComponents({ route }) {
+                const childApps = [];
+                const components = await Promise.all([
+                    react.resolveLazyComponent(pageService.resolveComponentFromConfig('layout', route)),
+                    react.resolveLazyComponent(pageService.resolveComponentFromConfig('nestedLayout', route)),
+                    react.resolveLazyComponent(pageService.resolveComponentFromConfig('page', route)),
+                ]);
+                components.forEach((component) => {
+                    if (component?.childApps) {
+                        childApps.push(...component.childApps);
+                    }
+                });
+                return childApps;
+            };
+        },
+        deps: {
+            pageService: tokensRouter.PAGE_SERVICE_TOKEN,
+        },
+    }),
     core.provide({
         provide: tokensRouter.LINK_PREFETCH_HANDLER_TOKEN,
         useFactory: (deps) => {
@@ -38,8 +54,8 @@ const pagePreloadProviders = [
         },
         multi: true,
         deps: {
-            pageService: tokensRouter.PAGE_SERVICE_TOKEN,
             preloadManager: tokensChildApp.CHILD_APP_PRELOAD_MANAGER_TOKEN,
+            preloadSourceList: tokensChildApp.CHILD_APP_PRELOAD_SOURCE_LIST_TOKEN,
         },
     }),
     core.provide({
@@ -56,8 +72,8 @@ const pagePreloadProviders = [
         },
         multi: true,
         deps: {
-            pageService: tokensRouter.PAGE_SERVICE_TOKEN,
             preloadManager: tokensChildApp.CHILD_APP_PRELOAD_MANAGER_TOKEN,
+            preloadSourceList: tokensChildApp.CHILD_APP_PRELOAD_SOURCE_LIST_TOKEN,
         },
     }),
 ];

package/lib/shared/providers.browser.js

@@ -60,7 +60,11 @@ const sharedProviders = [
                 const req = { name, tag, version: request.version };
                 const config = resolutionConfigManager.resolve(req);
                 if (!config) {
-                    log.error(`Child-app "${name}" with tag "${tag}" has not found`);
+                    log.error({
+                        event: 'config-not-found',
+                        message: `Child-app "${name}" with tag "${tag}" has not found`,
+                        childApp: req,
+                    });
                     return;
                 }
                 const { version, baseUrl: configBaseUrl, client, server, css, withoutCss } = config;

package/lib/shared/providers.es.js

@@ -60,7 +60,11 @@ const sharedProviders = [
                 const req = { name, tag, version: request.version };
                 const config = resolutionConfigManager.resolve(req);
                 if (!config) {
-                    log.error(`Child-app "${name}" with tag "${tag}" has not found`);
+                    log.error({
+                        event: 'config-not-found',
+                        message: `Child-app "${name}" with tag "${tag}" has not found`,
+                        childApp: req,
+                    });
                     return;
                 }
                 const { version, baseUrl: configBaseUrl, client, server, css, withoutCss } = config;

package/lib/shared/providers.js

@@ -64,7 +64,11 @@ const sharedProviders = [
                 const req = { name, tag, version: request.version };
                 const config = resolutionConfigManager.resolve(req);
                 if (!config) {
-                    log.error(`Child-app "${name}" with tag "${tag}" has not found`);
+                    log.error({
+                        event: 'config-not-found',
+                        message: `Child-app "${name}" with tag "${tag}" has not found`,
+                        childApp: req,
+                    });
                     return;
                 }
                 const { version, baseUrl: configBaseUrl, client, server, css, withoutCss } = config;

package/lib/shared/react/component.browser.js

@@ -8,7 +8,8 @@ import { RenderContext } from './render-context.browser.js';
 import { Extractor } from './extractor.browser.browser.js';
 import { ChildAppErrorBoundary } from './childAppErrorBoundary.browser.js';
 
-const FailedChildAppFallback = ({ config: { name, version, tag, fallback: Fallback }, }) => {
+const FailedChildAppFallback = ({ config }) => {
+    const { name, version, tag, fallback: Fallback } = config;
     const logger = useDi(LOGGER_TOKEN);
     const log = logger('child-app:render');
     // On client-side hydration errors will be handled in `hydrateRoot` `onRecoverableError` property,
@@ -23,9 +24,7 @@ const FailedChildAppFallback = ({ config: { name, version, tag, fallback: Fallba
         log.error({
             event: 'failed-render',
             message: 'child-app failed to render, will try to recover during hydration',
-            name,
-            version,
-            tag,
+            childApp: { name, version, tag },
         });
     }
     return Fallback ? jsx(Fallback, {}) : null;
@@ -57,10 +56,8 @@ const ChildAppWrapper = ({ name, version, tag, props, fallback: Fallback, }) =>
     if (!di) {
         log.error({
             event: 'not-found',
-            name,
-            version,
-            tag,
             message: 'child-app was not initialized',
+            childApp: { name, version, tag },
         });
         if (process.env.__TRAMVAI_CONCURRENT_FEATURES || typeof window !== 'undefined') {
             throw new Error(`Child-app was not initialized, check the loading error for child-app "${name}"`);
@@ -73,9 +70,7 @@ const ChildAppWrapper = ({ name, version, tag, props, fallback: Fallback, }) =>
             log.error({
                 event: 'empty-render',
                 message: 'Child-app does not provide render token',
-                name,
-                version,
-                tag,
+                childApp: { name, version, tag },
             });
             return null;
         }
@@ -85,10 +80,12 @@ const ChildAppWrapper = ({ name, version, tag, props, fallback: Fallback, }) =>
         log.error({
             event: 'get-render',
             message: 'Cannot get render token from child-app',
+            childApp: {
+                name,
+                version,
+                tag,
+            },
             error,
-            name,
-            version,
-            tag,
         });
         return null;
     }

package/lib/shared/react/component.es.js

@@ -8,7 +8,8 @@ import { RenderContext } from './render-context.es.js';
 import { Extractor } from './extractor.es.js';
 import { ChildAppErrorBoundary } from './childAppErrorBoundary.es.js';
 
-const FailedChildAppFallback = ({ config: { name, version, tag, fallback: Fallback }, }) => {
+const FailedChildAppFallback = ({ config }) => {
+    const { name, version, tag, fallback: Fallback } = config;
     const logger = useDi(LOGGER_TOKEN);
     const log = logger('child-app:render');
     // On client-side hydration errors will be handled in `hydrateRoot` `onRecoverableError` property,
@@ -23,9 +24,7 @@ const FailedChildAppFallback = ({ config: { name, version, tag, fallback: Fallba
         log.error({
             event: 'failed-render',
             message: 'child-app failed to render, will try to recover during hydration',
-            name,
-            version,
-            tag,
+            childApp: { name, version, tag },
         });
     }
     return Fallback ? jsx(Fallback, {}) : null;
@@ -57,10 +56,8 @@ const ChildAppWrapper = ({ name, version, tag, props, fallback: Fallback, }) =>
     if (!di) {
         log.error({
             event: 'not-found',
-            name,
-            version,
-            tag,
             message: 'child-app was not initialized',
+            childApp: { name, version, tag },
         });
         if (process.env.__TRAMVAI_CONCURRENT_FEATURES || typeof window !== 'undefined') {
             throw new Error(`Child-app was not initialized, check the loading error for child-app "${name}"`);
@@ -73,9 +70,7 @@ const ChildAppWrapper = ({ name, version, tag, props, fallback: Fallback, }) =>
             log.error({
                 event: 'empty-render',
                 message: 'Child-app does not provide render token',
-                name,
-                version,
-                tag,
+                childApp: { name, version, tag },
             });
             return null;
         }
@@ -85,10 +80,12 @@ const ChildAppWrapper = ({ name, version, tag, props, fallback: Fallback, }) =>
         log.error({
             event: 'get-render',
             message: 'Cannot get render token from child-app',
+            childApp: {
+                name,
+                version,
+                tag,
+            },
             error,
-            name,
-            version,
-            tag,
         });
         return null;
     }

package/lib/shared/react/component.js

@@ -16,7 +16,8 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var noop__default = /*#__PURE__*/_interopDefaultLegacy(noop);
 
-const FailedChildAppFallback = ({ config: { name, version, tag, fallback: Fallback }, }) => {
+const FailedChildAppFallback = ({ config }) => {
+    const { name, version, tag, fallback: Fallback } = config;
     const logger = react$1.useDi(tokensCommon.LOGGER_TOKEN);
     const log = logger('child-app:render');
     // On client-side hydration errors will be handled in `hydrateRoot` `onRecoverableError` property,
@@ -31,9 +32,7 @@ const FailedChildAppFallback = ({ config: { name, version, tag, fallback: Fallba
         log.error({
             event: 'failed-render',
             message: 'child-app failed to render, will try to recover during hydration',
-            name,
-            version,
-            tag,
+            childApp: { name, version, tag },
         });
     }
     return Fallback ? jsxRuntime.jsx(Fallback, {}) : null;
@@ -65,10 +64,8 @@ const ChildAppWrapper = ({ name, version, tag, props, fallback: Fallback, }) =>
     if (!di) {
         log.error({
             event: 'not-found',
-            name,
-            version,
-            tag,
             message: 'child-app was not initialized',
+            childApp: { name, version, tag },
         });
         if (process.env.__TRAMVAI_CONCURRENT_FEATURES || typeof window !== 'undefined') {
             throw new Error(`Child-app was not initialized, check the loading error for child-app "${name}"`);
@@ -81,9 +78,7 @@ const ChildAppWrapper = ({ name, version, tag, props, fallback: Fallback, }) =>
             log.error({
                 event: 'empty-render',
                 message: 'Child-app does not provide render token',
-                name,
-                version,
-                tag,
+                childApp: { name, version, tag },
             });
             return null;
         }
@@ -93,10 +88,12 @@ const ChildAppWrapper = ({ name, version, tag, props, fallback: Fallback, }) =>
         log.error({
             event: 'get-render',
             message: 'Cannot get render token from child-app',
+            childApp: {
+                name,
+                version,
+                tag,
+            },
             error,
-            name,
-            version,
-            tag,
         });
         return null;
     }

package/lib/shared/resolutionConfigManager.browser.js

@@ -22,7 +22,11 @@ class ChildAppResolutionConfigManager {
                     return applyOrReturn([], rawConfig);
                 })
                     .catch((error) => {
-                    this.log.error(error, 'Failed while resolving resolution config');
+                    this.log.error({
+                        event: 'config-resolve-failed',
+                        message: 'Failed while resolving resolution config',
+                        error,
+                    });
                 });
             }));
             flatten(configs).forEach((config) => {

package/lib/shared/resolutionConfigManager.es.js

@@ -22,7 +22,11 @@ class ChildAppResolutionConfigManager {
                     return applyOrReturn([], rawConfig);
                 })
                     .catch((error) => {
-                    this.log.error(error, 'Failed while resolving resolution config');
+                    this.log.error({
+                        event: 'config-resolve-failed',
+                        message: 'Failed while resolving resolution config',
+                        error,
+                    });
                 });
             }));
             flatten(configs).forEach((config) => {

package/lib/shared/resolutionConfigManager.js

@@ -31,7 +31,11 @@ class ChildAppResolutionConfigManager {
                     return applyOrReturn__default["default"]([], rawConfig);
                 })
                     .catch((error) => {
-                    this.log.error(error, 'Failed while resolving resolution config');
+                    this.log.error({
+                        event: 'config-resolve-failed',
+                        message: 'Failed while resolving resolution config',
+                        error,
+                    });
                 });
             }));
             flatten__default["default"](configs).forEach((config) => {

package/lib/shared/singletonDi.browser.js

@@ -31,7 +31,7 @@ class SingletonDiManager {
             this.log.error({
                 event: 'resolve-di-fail',
                 error,
-                config,
+                childApp: { name: config.name, version: config.version, tag: config.tag },
             });
         }
     }

package/lib/shared/singletonDi.es.js

@@ -31,7 +31,7 @@ class SingletonDiManager {
             this.log.error({
                 event: 'resolve-di-fail',
                 error,
-                config,
+                childApp: { name: config.name, version: config.version, tag: config.tag },
             });
         }
     }

package/lib/shared/singletonDi.js

@@ -39,7 +39,7 @@ class SingletonDiManager {
             this.log.error({
                 event: 'resolve-di-fail',
                 error,
-                config,
+                childApp: { name: config.name, version: config.version, tag: config.tag },
             });
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-child-app",
-  "version": "5.14.9",
+  "version": "5.15.1",
   "description": "Module for child apps",
   "browser": {
     "./lib/server.js": "./lib/browser.js",
@@ -32,24 +32,24 @@
     "@loadable/server": "^5.15.0",
     "@tinkoff/env-validators": "0.4.2",
     "@tinkoff/module-loader-client": "0.7.3",
-    "@tinkoff/module-loader-server": "0.8.3",
-    "@tramvai/module-common": "5.14.9",
+    "@tinkoff/module-loader-server": "0.8.4",
+    "@tramvai/module-common": "5.15.1",
     "@tinkoff/url": "0.11.2",
-    "@tramvai/child-app-core": "5.14.9",
+    "@tramvai/child-app-core": "5.15.1",
     "@tramvai/safe-strings": "0.8.4",
-    "@tramvai/tokens-child-app": "5.14.9"
+    "@tramvai/tokens-child-app": "5.15.1"
   },
   "devDependencies": {},
   "peerDependencies": {
     "@tinkoff/dippy": "0.11.3",
-    "@tinkoff/router": "0.5.46",
+    "@tinkoff/router": "0.5.49",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/core": "5.14.9",
-    "@tramvai/state": "5.14.9",
-    "@tramvai/react": "5.14.9",
-    "@tramvai/tokens-common": "5.14.9",
-    "@tramvai/tokens-render": "5.14.9",
-    "@tramvai/tokens-router": "5.14.9",
+    "@tramvai/core": "5.15.1",
+    "@tramvai/state": "5.15.1",
+    "@tramvai/react": "5.15.1",
+    "@tramvai/tokens-common": "5.15.1",
+    "@tramvai/tokens-render": "5.15.1",
+    "@tramvai/tokens-router": "5.15.1",
     "react": ">=16.14.0",
     "react-dom": ">=16.14.0",
     "object-assign": "^4.1.1",