@tramvai/module-child-app 4.26.9 → 4.29.1

package/lib/browser/loader.browser.js

@@ -9,10 +9,11 @@ class BrowserLoader extends Loader {
     constructor({ logger }) {
         super();
         this.initializedMap = new WeakMap();
+        this.map = new Map();
         this.log = logger('child-app:loader');
     }
+    // eslint-disable-next-line max-statements
     async load(config) {
-        var _a;
         const moduleName = config.name;
         const childApp = await this.get(config);
         if (childApp) {
@@ -23,25 +24,39 @@ class BrowserLoader extends Loader {
             return childApp;
         }
         let container = getModuleFromGlobal(config.client.entry);
+        // case when Child App is loaded, but not initialized.
+        // can be caused when initalization is failed, or still in process.
+        // for second case, we can try to wait initialization.
+        if (container && !childApp && this.map.has(config.key)) {
+            return this.map.get(config.key);
+        }
         if (!container) {
             this.log.debug({
                 event: 'load-fetch',
                 moduleName,
             });
-            // `resolveOnCssFailed: true` - allow to load module without server preloading on the client-side
-            await loadModule(config.client.entry, {
-                cssUrl: (_a = config.css) === null || _a === void 0 ? void 0 : _a.entry,
-                resolveOnCssFailed: true,
-            });
-            container = getModuleFromGlobal(config.client.entry);
-            if (container) {
-                this.log.debug({
-                    event: 'load-success',
-                    moduleName,
+            const promise = (async () => {
+                var _a;
+                // `resolveOnCssFailed: true` - allow to load module without server preloading on the client-side
+                await loadModule(config.client.entry, {
+                    cssUrl: (_a = config.css) === null || _a === void 0 ? void 0 : _a.entry,
+                    resolveOnCssFailed: true,
                 });
-                await this.init(config);
-                return this.get(config);
-            }
+                container = getModuleFromGlobal(config.client.entry);
+                if (container) {
+                    this.log.debug({
+                        event: 'load-success',
+                        moduleName,
+                    });
+                    await this.init(config);
+                    // eslint-disable-next-line @typescript-eslint/no-shadow
+                    const childApp = this.get(config);
+                    this.map.delete(config.key);
+                    return childApp;
+                }
+            })();
+            this.map.set(config.key, promise);
+            return promise;
         }
         this.log.error({
             event: 'load-failed',

package/lib/browser/loader.d.ts

@@ -3,16 +3,17 @@ import type { ChildAppFinalConfig } from '@tramvai/tokens-child-app';
 import type { LOGGER_TOKEN } from '@tramvai/tokens-common';
 import { Loader } from '../shared/loader';
 import type { ModuleFederationContainer } from '../shared/webpack/moduleFederation';
-export declare const getModuleFromGlobal: (entry: string) => ModuleFederationContainer | void;
+export declare const getModuleFromGlobal: (entry: string) => ModuleFederationContainer | undefined;
 export declare class BrowserLoader extends Loader {
     private readonly log;
     private readonly initializedMap;
+    private map;
     constructor({ logger }: {
         logger: typeof LOGGER_TOKEN;
     });
-    load(config: ChildAppFinalConfig): Promise<ChildApp | void>;
+    load(config: ChildAppFinalConfig): Promise<ChildApp | undefined>;
     init(config: ChildAppFinalConfig): Promise<void>;
-    get(config: ChildAppFinalConfig): ChildApp | void;
+    get(config: ChildAppFinalConfig): ChildApp | undefined;
     waitFor(config: ChildAppFinalConfig): Promise<void>;
 }
 //# sourceMappingURL=loader.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-child-app",
-  "version": "4.26.9",
+  "version": "4.29.1",
   "description": "Module for child apps",
   "browser": {
     "./lib/server.js": "./lib/browser.js",
@@ -33,23 +33,23 @@
     "@tinkoff/env-validators": "0.3.1",
     "@tinkoff/module-loader-client": "0.6.3",
     "@tinkoff/module-loader-server": "0.7.2",
-    "@tramvai/module-common": "4.26.9",
+    "@tramvai/module-common": "4.29.1",
     "@tinkoff/url": "0.10.1",
-    "@tramvai/child-app-core": "4.26.9",
+    "@tramvai/child-app-core": "4.29.1",
     "@tramvai/safe-strings": "0.7.2",
-    "@tramvai/tokens-child-app": "4.26.9"
+    "@tramvai/tokens-child-app": "4.29.1"
   },
   "devDependencies": {},
   "peerDependencies": {
     "@tinkoff/dippy": "0.10.8",
-    "@tinkoff/router": "0.4.89",
+    "@tinkoff/router": "0.4.94",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/core": "4.26.9",
-    "@tramvai/state": "4.26.9",
-    "@tramvai/react": "4.26.9",
-    "@tramvai/tokens-common": "4.26.9",
-    "@tramvai/tokens-render": "4.26.9",
-    "@tramvai/tokens-router": "4.26.9",
+    "@tramvai/core": "4.29.1",
+    "@tramvai/state": "4.29.1",
+    "@tramvai/react": "4.29.1",
+    "@tramvai/tokens-common": "4.29.1",
+    "@tramvai/tokens-render": "4.29.1",
+    "@tramvai/tokens-router": "4.29.1",
     "react": ">=16.14.0",
     "react-dom": ">=16.14.0",
     "object-assign": "^4.1.1",