@tramvai/module-child-app 7.21.1 → 7.26.8

package/lib/server/preload.es.js

@@ -81,6 +81,7 @@ class PreloadManager {
         const { key } = config;
         if (this.map.has(key)) {
             await this.map.get(key);
+            return;
         }
         await this.hooks.preloadChildApp.callPromise({
             config,

package/lib/server/preload.js

@@ -85,6 +85,7 @@ class PreloadManager {
         const { key } = config;
         if (this.map.has(key)) {
             await this.map.get(key);
+            return;
         }
         await this.hooks.preloadChildApp.callPromise({
             config,

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

@@ -1,6 +1,10 @@
 import { ChunkExtractor } from '@loadable/server';
-import type { LoadableStats } from '../webpack/moduleFederation';
-export declare const extractorProviders: (loadableStats?: LoadableStats) => import("@tramvai/core").Provider<unknown, ChunkExtractor & {
+import { Container } from '@tinkoff/dippy';
+export declare const extractorProviders: (appDi: Container) => import("@tramvai/core").Provider<{
+    config: import("@tramvai/tokens-child-app").ChildAppFinalConfig & {
+        __type?: "base token" | undefined;
+    };
+}, ChunkExtractor & {
     __type?: "base token" | undefined;
 }>[];
 //# sourceMappingURL=extractorProviders.d.ts.map

package/lib/shared/child/extractorProviders.es.js

@@ -1,13 +1,18 @@
 import { provide, Scope } from '@tramvai/core';
-import { CHILD_APP_INTERNAL_CHUNK_EXTRACTOR } from '@tramvai/tokens-child-app';
+import { CHILD_APP_INTERNAL_CHUNK_EXTRACTOR, CHILD_APP_LOADER_TOKEN, CHILD_APP_INTERNAL_CONFIG_TOKEN } from '@tramvai/tokens-child-app';
 import { ChunkExtractor } from '@loadable/server';
 
-const extractorProviders = (loadableStats) => [
+const extractorProviders = (appDi) => [
     provide({
         provide: CHILD_APP_INTERNAL_CHUNK_EXTRACTOR,
         scope: Scope.REQUEST,
-        useFactory: () => {
-            return new ChunkExtractor({ stats: loadableStats ?? {}, entrypoints: [] });
+        useFactory: ({ config }) => {
+            const loader = appDi.get(CHILD_APP_LOADER_TOKEN);
+            const statsLoadable = 'getLoadableStats' in loader ? loader.getLoadableStats(config) : undefined;
+            return new ChunkExtractor({ stats: statsLoadable ?? {}, entrypoints: [] });
+        },
+        deps: {
+            config: CHILD_APP_INTERNAL_CONFIG_TOKEN,
         },
     }),
 ];

package/lib/shared/child/extractorProviders.js

@@ -6,12 +6,17 @@ var core = require('@tramvai/core');
 var tokensChildApp = require('@tramvai/tokens-child-app');
 var server = require('@loadable/server');
 
-const extractorProviders = (loadableStats) => [
+const extractorProviders = (appDi) => [
     core.provide({
         provide: tokensChildApp.CHILD_APP_INTERNAL_CHUNK_EXTRACTOR,
         scope: core.Scope.REQUEST,
-        useFactory: () => {
-            return new server.ChunkExtractor({ stats: loadableStats ?? {}, entrypoints: [] });
+        useFactory: ({ config }) => {
+            const loader = appDi.get(tokensChildApp.CHILD_APP_LOADER_TOKEN);
+            const statsLoadable = 'getLoadableStats' in loader ? loader.getLoadableStats(config) : undefined;
+            return new server.ChunkExtractor({ stats: statsLoadable ?? {}, entrypoints: [] });
+        },
+        deps: {
+            config: tokensChildApp.CHILD_APP_INTERNAL_CONFIG_TOKEN,
         },
     }),
 ];

package/lib/shared/child/singletonProviders.browser.js

@@ -12,7 +12,7 @@ import { getChildProviders as getChildProviders$1 } from '../../browser/child/si
 import { extractorProviders } from './extractorProviders.browser.browser.js';
 import { ChildAppPageService } from '../pageService.browser.js';
 
-const getChildProviders = (appDi, loadableStats, config) => {
+const getChildProviders = (appDi, config) => {
     const logger = appDi.get(LOGGER_TOKEN);
     return [
         provide({

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

@@ -1,6 +1,5 @@
 import type { Container } from '@tinkoff/dippy';
 import type { Provider } from '@tramvai/core';
 import { ChildAppFinalConfig } from '@tramvai/tokens-child-app';
-import type { LoadableStats } from '../webpack/moduleFederation';
-export declare const getChildProviders: (appDi: Container, loadableStats: LoadableStats, config: ChildAppFinalConfig) => Provider[];
+export declare const getChildProviders: (appDi: Container, config: ChildAppFinalConfig) => Provider[];
 //# sourceMappingURL=singletonProviders.d.ts.map

package/lib/shared/child/singletonProviders.es.js

@@ -12,7 +12,7 @@ import { getChildProviders as getChildProviders$1 } from '../../server/child/sin
 import { extractorProviders } from './extractorProviders.es.js';
 import { ChildAppPageService } from '../pageService.es.js';
 
-const getChildProviders = (appDi, loadableStats, config) => {
+const getChildProviders = (appDi, config) => {
     const logger = appDi.get(LOGGER_TOKEN);
     return [
         provide({
@@ -89,7 +89,7 @@ const getChildProviders = (appDi, loadableStats, config) => {
             ],
         }),
         ...getChildProviders$1(),
-        ...extractorProviders(loadableStats),
+        ...extractorProviders(appDi),
         provide({
             provide: DISPATCHER_CONTEXT_TOKEN,
             scope: Scope.REQUEST,

package/lib/shared/child/singletonProviders.js

@@ -21,7 +21,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var flatten__default = /*#__PURE__*/_interopDefaultLegacy(flatten);
 var noop__default = /*#__PURE__*/_interopDefaultLegacy(noop);
 
-const getChildProviders = (appDi, loadableStats, config) => {
+const getChildProviders = (appDi, config) => {
     const logger$1 = appDi.get(tokensCommon.LOGGER_TOKEN);
     return [
         core.provide({
@@ -98,7 +98,7 @@ const getChildProviders = (appDi, loadableStats, config) => {
             ],
         }),
         ...singletonProviders.getChildProviders(),
-        ...extractorProviders.extractorProviders(loadableStats),
+        ...extractorProviders.extractorProviders(appDi),
         core.provide({
             provide: tokensCommon.DISPATCHER_CONTEXT_TOKEN,
             scope: core.Scope.REQUEST,

package/lib/shared/react/ChildAppErrorBoundary/FallbackError.d.ts

@@ -1,5 +1,6 @@
+import React from 'react';
 export declare const FallbackError: {
-    (): import("react/jsx-runtime").JSX.Element;
+    (): React.JSX.Element;
     displayName: string;
 };
 //# sourceMappingURL=FallbackError.d.ts.map

package/lib/shared/react/ChildAppFallbackWrapper.d.ts

@@ -5,6 +5,6 @@ type AnyError = Error & {
 interface Props extends ChildAppReactConfig {
     error?: AnyError;
 }
-export declare const ChildAppFallbackWrapper: ({ name, fallback: Fallback, tag, version, error, }: Props) => import("react/jsx-runtime").JSX.Element | null;
+export declare const ChildAppFallbackWrapper: ({ name, fallback: Fallback, tag, version, error, }: Props) => import("react").JSX.Element | null;
 export {};
 //# sourceMappingURL=ChildAppFallbackWrapper.d.ts.map

package/lib/shared/react/childAppErrorBoundaryWrapper.d.ts

@@ -3,6 +3,6 @@ import type { ChildAppReactConfig } from '@tramvai/tokens-child-app';
 type Props = {
     config: ChildAppReactConfig;
 };
-export declare const ChildAppErrorBoundaryWrapper: (props: PropsWithChildren<Props>) => import("react/jsx-runtime").JSX.Element;
+export declare const ChildAppErrorBoundaryWrapper: (props: PropsWithChildren<Props>) => import("react").JSX.Element;
 export {};
 //# sourceMappingURL=childAppErrorBoundaryWrapper.d.ts.map

package/lib/shared/react/component.d.ts

@@ -1,3 +1,3 @@
 import type { ChildAppReactConfig } from '@tramvai/tokens-child-app';
-export declare const ChildApp: import("react").MemoExoticComponent<(config: ChildAppReactConfig) => import("react/jsx-runtime").JSX.Element>;
+export declare const ChildApp: import("react").MemoExoticComponent<(config: ChildAppReactConfig) => import("react").JSX.Element>;
 //# sourceMappingURL=component.d.ts.map

package/lib/shared/singletonDi.browser.js

@@ -89,9 +89,8 @@ class SingletonDiManager {
                 },
             ], this.appDi);
         }
-        const statsLoadable = 'getLoadableStats' in this.loader ? this.loader.getLoadableStats(config) : undefined;
         // add providers on the Singleton Level to make it possible to reuse providers from the root-app Container
-        const childProviders = getChildProviders(this.appDi, statsLoadable, config);
+        const childProviders = getChildProviders(this.appDi, config);
         childProviders.forEach((provider) => {
             di.register(provider);
         });

package/lib/shared/singletonDi.es.js

@@ -89,9 +89,8 @@ class SingletonDiManager {
                 },
             ], this.appDi);
         }
-        const statsLoadable = 'getLoadableStats' in this.loader ? this.loader.getLoadableStats(config) : undefined;
         // add providers on the Singleton Level to make it possible to reuse providers from the root-app Container
-        const childProviders = getChildProviders(this.appDi, statsLoadable, config);
+        const childProviders = getChildProviders(this.appDi, config);
         childProviders.forEach((provider) => {
             di.register(provider);
         });

package/lib/shared/singletonDi.js

@@ -97,9 +97,8 @@ class SingletonDiManager {
                 },
             ], this.appDi);
         }
-        const statsLoadable = 'getLoadableStats' in this.loader ? this.loader.getLoadableStats(config) : undefined;
         // add providers on the Singleton Level to make it possible to reuse providers from the root-app Container
-        const childProviders = singletonProviders.getChildProviders(this.appDi, statsLoadable, config);
+        const childProviders = singletonProviders.getChildProviders(this.appDi, config);
         childProviders.forEach((provider) => {
             di.register(provider);
         });

package/lib/unused.d.ts

@@ -0,0 +1,5 @@
+import '@tramvai/module-http-client';
+import '@tramvai/module-react-query';
+import '@tramvai/module-render';
+import '@tramvai/react-query';
+//# sourceMappingURL=unused.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-child-app",
-  "version": "7.21.1",
+  "version": "7.26.8",
   "description": "Module for child apps",
   "browser": {
     "./lib/server.es.js": "./lib/browser.js",
@@ -36,27 +36,37 @@
     "@tinkoff/module-loader-client": "0.9.1",
     "@tinkoff/module-loader-server": "0.10.3",
     "@tinkoff/url": "0.13.1",
-    "@tramvai/child-app-core": "7.21.1",
-    "@tramvai/module-common": "7.21.1",
-    "@tramvai/module-router": "7.21.1",
+    "@tramvai/child-app-core": "7.26.8",
+    "@tramvai/module-common": "7.26.8",
+    "@tramvai/module-router": "7.26.8",
     "@tramvai/safe-strings": "0.10.1",
-    "@tramvai/tokens-child-app": "7.21.1"
+    "@tramvai/tokens-child-app": "7.26.8"
   },
   "peerDependencies": {
     "@tinkoff/dippy": "^1.0.0",
-    "@tinkoff/router": "0.7.74",
+    "@tinkoff/router": "0.7.106",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/core": "7.21.1",
-    "@tramvai/react": "7.21.1",
-    "@tramvai/state": "7.21.1",
-    "@tramvai/tokens-common": "7.21.1",
-    "@tramvai/tokens-render": "7.21.1",
-    "@tramvai/tokens-router": "7.21.1",
+    "@tramvai/core": "7.26.8",
+    "@tramvai/react": "7.26.8",
+    "@tramvai/state": "7.26.8",
+    "@tramvai/tokens-common": "7.26.8",
+    "@tramvai/tokens-render": "7.26.8",
+    "@tramvai/tokens-router": "7.26.8",
     "object-assign": "^4.1.1",
     "react": ">=16.14.0",
     "react-dom": ">=16.14.0",
     "semver": "^7.3.8",
     "tslib": "^2.4.0"
   },
+  "devDependencies": {
+    "@tramvai/module-http-client": "7.26.8",
+    "@tramvai/module-react-query": "7.26.8",
+    "@tramvai/module-render": "7.26.8",
+    "@tramvai/module-router": "7.26.8",
+    "@tramvai/module-server": "7.26.8",
+    "@tramvai/react": "7.26.8",
+    "@tramvai/react-query": "7.26.8",
+    "@tramvai/state": "7.26.8"
+  },
   "module": "lib/server.es.js"
 }