@tramvai/module-child-app 4.26.4 → 4.26.7

package/lib/browser/preload.browser.js

@@ -9,6 +9,7 @@ class PreloadManager {
         this.pageHasLoaded = false;
         this.currentlyPreloaded = new Map();
         this.hasPreloadBefore = new Set();
+        this.notPreloadedForCurrentSpaNavigation = new Set();
         this.hasInitialized = false;
         this.map = new Map();
         this.loader = loader;
@@ -18,7 +19,7 @@ class PreloadManager {
         this.resolveExternalConfig = resolveExternalConfig;
         this.diManager = diManager;
     }
-    async preload(request, route, onlyPrefetch = false) {
+    async preload(request, route) {
         await this.init();
         const config = this.resolveExternalConfig(request);
         if (!config) {
@@ -41,10 +42,8 @@ class PreloadManager {
                     try {
                         await this.loader.load(config);
                         await this.resolveComponent(config, route);
-                        if (!onlyPrefetch) {
-                            await this.run('customer', config);
-                            await this.run('clear', config);
-                        }
+                        await this.run('customer', config);
+                        await this.run('clear', config);
                     }
                     catch (error) {
                         if (process.env.NODE_ENV === 'development') {
@@ -63,7 +62,22 @@ class PreloadManager {
         }
     }
     async prefetch(request, route) {
-        return this.preload(request, route, true);
+        await this.init();
+        const config = this.resolveExternalConfig(request);
+        if (!config) {
+            return;
+        }
+        if (!this.isPreloaded(config)) {
+            try {
+                await this.loader.load(config);
+                await this.resolveComponent(config, route);
+            }
+            catch (error) {
+                if (process.env.NODE_ENV === 'development') {
+                    console.error('Child App prefetch error', error);
+                }
+            }
+        }
     }
     isPreloaded(request) {
         const config = this.resolveExternalConfig(request);
@@ -102,6 +116,7 @@ class PreloadManager {
     async clearPreloaded() {
         if (this.pageHasLoaded) {
             this.currentlyPreloaded.clear();
+            this.notPreloadedForCurrentSpaNavigation.clear();
             this.map.clear();
             return;
         }
@@ -111,12 +126,27 @@ class PreloadManager {
             promises.push(this.run('clear', config));
         });
         this.currentlyPreloaded.clear();
+        this.notPreloadedForCurrentSpaNavigation.clear();
         this.map.clear();
         await Promise.all(promises);
     }
     getPreloadedList() {
         return Array.from(this.currentlyPreloaded.values());
     }
+    saveNotPreloadedForSpaNavigation(request) {
+        const config = this.resolveExternalConfig(request);
+        if (!config) {
+            return;
+        }
+        this.notPreloadedForCurrentSpaNavigation.add(config.key);
+    }
+    isNotPreloadedForSpaNavigation(request) {
+        const config = this.resolveExternalConfig(request);
+        if (!config) {
+            return false;
+        }
+        return this.notPreloadedForCurrentSpaNavigation.has(config.key);
+    }
     initServerPreloaded() {
         if (!this.hasInitialized) {
             const { preloaded } = this.store.getState(ChildAppStore);

package/lib/browser/preload.d.ts

@@ -12,6 +12,7 @@ export declare class PreloadManager implements ChildAppPreloadManager {
     private pageHasLoaded;
     private currentlyPreloaded;
     private hasPreloadBefore;
+    private notPreloadedForCurrentSpaNavigation;
     private hasInitialized;
     private map;
     constructor({ loader, runner, resolutionConfigManager, resolveExternalConfig, store, diManager, }: {
@@ -22,13 +23,15 @@ export declare class PreloadManager implements ChildAppPreloadManager {
         store: typeof STORE_TOKEN;
         diManager: typeof CHILD_APP_DI_MANAGER_TOKEN;
     });
-    preload(request: ChildAppRequestConfig, route?: Route, onlyPrefetch?: boolean): Promise<void>;
+    preload(request: ChildAppRequestConfig, route?: Route): Promise<void>;
     prefetch(request: ChildAppRequestConfig, route?: Route): Promise<void>;
     isPreloaded(request: ChildAppRequestConfig): boolean;
     runPreloaded(): Promise<void>;
     pageRender(): void;
     clearPreloaded(): Promise<void>;
     getPreloadedList(): ChildAppFinalConfig[];
+    saveNotPreloadedForSpaNavigation(request: ChildAppRequestConfig): void;
+    isNotPreloadedForSpaNavigation(request: ChildAppRequestConfig): boolean;
     private initServerPreloaded;
     private init;
     private run;

package/lib/browser/runCommand.browser.js

@@ -5,6 +5,11 @@ const runCommand = async ({ status, forcePreload, runner, preloader, diManager,
             // need to wait while actual child-app is loaded in case it wasn't preloaded before
             await preloader.preload(config, pageService.getCurrentRoute());
         }
+        // if Child Apps was not preloaded, prevent running `spa` and `afterSpa` lines for it,
+        // because it trigger actions or resolveUserDeps/resolvePageDeps commands second execution on the same navigation
+        if (preloader.isNotPreloadedForSpaNavigation(config)) {
+            return;
+        }
         return runner.run('client', status, config);
     })).catch((error) => {
         const log = logger('child-app:run-preloaded');

package/lib/server/preload.d.ts

@@ -26,5 +26,7 @@ export declare class PreloadManager implements ChildAppPreloadManager {
     clearPreloaded(): Promise<void>;
     getPreloadedList(): ChildAppFinalConfig[];
     private run;
+    saveNotPreloadedForSpaNavigation(request: ChildAppRequestConfig): void;
+    isNotPreloadedForSpaNavigation(request: ChildAppRequestConfig): boolean;
 }
 //# sourceMappingURL=preload.d.ts.map

package/lib/server/preload.es.js

@@ -48,7 +48,7 @@ class PreloadManager {
         }
     }
     async prefetch(request, route) {
-        return this.preload(request, route);
+        // do nothing at server-side
     }
     isPreloaded(request) {
         const config = this.resolveFullConfig(request);
@@ -85,6 +85,13 @@ class PreloadManager {
         await this.runner.run('server', status, config);
         await this.stateManager.registerChildApp(config);
     }
+    saveNotPreloadedForSpaNavigation(request) {
+        // do nothing at server-side
+    }
+    isNotPreloadedForSpaNavigation(request) {
+        // do nothing at server-side
+        return false;
+    }
 }
 
 export { PreloadManager };

package/lib/server/preload.js

@@ -52,7 +52,7 @@ class PreloadManager {
         }
     }
     async prefetch(request, route) {
-        return this.preload(request, route);
+        // do nothing at server-side
     }
     isPreloaded(request) {
         const config = this.resolveFullConfig(request);
@@ -89,6 +89,13 @@ class PreloadManager {
         await this.runner.run('server', status, config);
         await this.stateManager.registerChildApp(config);
     }
+    saveNotPreloadedForSpaNavigation(request) {
+        // do nothing at server-side
+    }
+    isNotPreloadedForSpaNavigation(request) {
+        // do nothing at server-side
+        return false;
+    }
 }
 
 exports.PreloadManager = PreloadManager;

package/lib/shared/pagePreload.browser.js

@@ -3,7 +3,7 @@ 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';
 
-const pagePreload = async ({ pageService, preloadManager, }, route) => {
+const pagePreload = async ({ pageService, preloadManager, }, mode, isSpaNavigation = false, route) => {
     const components = await Promise.all([
         resolveLazyComponent(pageService.resolveComponentFromConfig('layout', route)),
         resolveLazyComponent(pageService.resolveComponentFromConfig('nestedLayout', route)),
@@ -11,9 +11,16 @@ const pagePreload = async ({ pageService, preloadManager, }, route) => {
     ]);
     await Promise.all(components.map(async (component) => {
         if (component === null || component === void 0 ? void 0 : component.childApps) {
-            await Promise.all(component.childApps.map((request) => preloadManager.prefetch(request, route).catch(() => {
-                // actual error will be logged internally
-            })));
+            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
+                });
+            }));
         }
     }));
 };
@@ -22,7 +29,7 @@ const pagePreloadProviders = [
         provide: LINK_PREFETCH_HANDLER_TOKEN,
         useFactory: (deps) => {
             return function prefetchChildApps(route) {
-                return pagePreload(deps, route);
+                return pagePreload(deps, 'prefetch', false, route);
             };
         },
         multi: true,
@@ -36,7 +43,7 @@ const pagePreloadProviders = [
         useFactory: (deps) => {
             let isSpaNavigation = false;
             return function preloadChildApps() {
-                const promise = pagePreload(deps);
+                const promise = pagePreload(deps, 'preload', isSpaNavigation);
                 if (!isSpaNavigation) {
                     isSpaNavigation = true;
                     return promise;

package/lib/shared/pagePreload.es.js

@@ -3,7 +3,7 @@ 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';
 
-const pagePreload = async ({ pageService, preloadManager, }, route) => {
+const pagePreload = async ({ pageService, preloadManager, }, mode, isSpaNavigation = false, route) => {
     const components = await Promise.all([
         resolveLazyComponent(pageService.resolveComponentFromConfig('layout', route)),
         resolveLazyComponent(pageService.resolveComponentFromConfig('nestedLayout', route)),
@@ -11,9 +11,16 @@ const pagePreload = async ({ pageService, preloadManager, }, route) => {
     ]);
     await Promise.all(components.map(async (component) => {
         if (component === null || component === void 0 ? void 0 : component.childApps) {
-            await Promise.all(component.childApps.map((request) => preloadManager.prefetch(request, route).catch(() => {
-                // actual error will be logged internally
-            })));
+            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
+                });
+            }));
         }
     }));
 };
@@ -22,7 +29,7 @@ const pagePreloadProviders = [
         provide: LINK_PREFETCH_HANDLER_TOKEN,
         useFactory: (deps) => {
             return function prefetchChildApps(route) {
-                return pagePreload(deps, route);
+                return pagePreload(deps, 'prefetch', false, route);
             };
         },
         multi: true,
@@ -36,7 +43,7 @@ const pagePreloadProviders = [
         useFactory: (deps) => {
             let isSpaNavigation = false;
             return function preloadChildApps() {
-                const promise = pagePreload(deps);
+                const promise = pagePreload(deps, 'preload', isSpaNavigation);
                 if (!isSpaNavigation) {
                     isSpaNavigation = true;
                     return promise;

package/lib/shared/pagePreload.js

@@ -7,7 +7,7 @@ var react = require('@tramvai/react');
 var tokensChildApp = require('@tramvai/tokens-child-app');
 var tokensRouter = require('@tramvai/tokens-router');
 
-const pagePreload = async ({ pageService, preloadManager, }, route) => {
+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)),
@@ -15,9 +15,16 @@ const pagePreload = async ({ pageService, preloadManager, }, route) => {
     ]);
     await Promise.all(components.map(async (component) => {
         if (component === null || component === void 0 ? void 0 : component.childApps) {
-            await Promise.all(component.childApps.map((request) => preloadManager.prefetch(request, route).catch(() => {
-                // actual error will be logged internally
-            })));
+            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
+                });
+            }));
         }
     }));
 };
@@ -26,7 +33,7 @@ const pagePreloadProviders = [
         provide: tokensRouter.LINK_PREFETCH_HANDLER_TOKEN,
         useFactory: (deps) => {
             return function prefetchChildApps(route) {
-                return pagePreload(deps, route);
+                return pagePreload(deps, 'prefetch', false, route);
             };
         },
         multi: true,
@@ -40,7 +47,7 @@ const pagePreloadProviders = [
         useFactory: (deps) => {
             let isSpaNavigation = false;
             return function preloadChildApps() {
-                const promise = pagePreload(deps);
+                const promise = pagePreload(deps, 'preload', isSpaNavigation);
                 if (!isSpaNavigation) {
                     isSpaNavigation = true;
                     return promise;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-child-app",
-  "version": "4.26.4",
+  "version": "4.26.7",
   "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.4",
+    "@tramvai/module-common": "4.26.7",
     "@tinkoff/url": "0.10.1",
-    "@tramvai/child-app-core": "4.26.4",
+    "@tramvai/child-app-core": "4.26.7",
     "@tramvai/safe-strings": "0.7.2",
-    "@tramvai/tokens-child-app": "4.26.4"
+    "@tramvai/tokens-child-app": "4.26.7"
   },
   "devDependencies": {},
   "peerDependencies": {
     "@tinkoff/dippy": "0.10.8",
-    "@tinkoff/router": "0.4.84",
+    "@tinkoff/router": "0.4.87",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/core": "4.26.4",
-    "@tramvai/state": "4.26.4",
-    "@tramvai/react": "4.26.4",
-    "@tramvai/tokens-common": "4.26.4",
-    "@tramvai/tokens-render": "4.26.4",
-    "@tramvai/tokens-router": "4.26.4",
+    "@tramvai/core": "4.26.7",
+    "@tramvai/state": "4.26.7",
+    "@tramvai/react": "4.26.7",
+    "@tramvai/tokens-common": "4.26.7",
+    "@tramvai/tokens-render": "4.26.7",
+    "@tramvai/tokens-router": "4.26.7",
     "react": ">=16.14.0",
     "react-dom": ">=16.14.0",
     "object-assign": "^4.1.1",