@tramvai/module-child-app 2.11.0 → 2.20.0

package/README.md

@@ -260,11 +260,13 @@ You may preload using next ways:
 1. Add needed child-apps to the pageComponent or layoutComponent through field `childApps`
 
 ```ts
-const PageComponent = () => {
+import { PageComponent } from '@tramvai/react';
+
+const PageCmp: PageComponent = () => {
   return 'Page';
 };
 
-PageComponent.childApps = [{ name: '[name]' }];
+PageCmp.childApps = [{ name: '[name]' }];
 ```
 
 ### Debug child-app

package/lib/server.browser.js

@@ -6,6 +6,7 @@ export * from '@tramvai/tokens-child-app';
 import { CONTEXT_TOKEN, ACTION_PAGE_RUNNER_TOKEN, LOGGER_TOKEN, DISPATCHER_TOKEN, STORE_TOKEN, DISPATCHER_CONTEXT_TOKEN, STORE_MIDDLEWARE, INITIAL_APP_STATE_TOKEN, COMBINE_REDUCERS, ENV_MANAGER_TOKEN, REGISTER_CLEAR_CACHE_TOKEN, CLEAR_CACHE_TOKEN, ENV_USED_TOKEN } from '@tramvai/tokens-common';
 import { RENDER_SLOTS, EXTEND_RENDER } from '@tramvai/tokens-render';
 import { ROUTER_SPA_ACTIONS_RUN_MODE_TOKEN, PAGE_SERVICE_TOKEN, ROUTER_TOKEN } from '@tramvai/tokens-router';
+import { resolveLazyComponent, useDi } from '@tramvai/react';
 import flatten from '@tinkoff/utils/array/flatten';
 import noop from '@tinkoff/utils/function/noop';
 import { Subscription, ChildDispatcherContext, createEvent, createReducer } from '@tramvai/state';
@@ -13,7 +14,6 @@ import { jsx } from 'react/jsx-runtime';
 import { createContext, useContext, useMemo, useState, useEffect, createElement } from 'react';
 import applyOrReturn from '@tinkoff/utils/function/applyOrReturn';
 import { loadModule } from '@tinkoff/module-loader-client';
-import { useDi } from '@tramvai/react';
 
 const getChildProviders$2 = (appDi) => {
     const context = appDi.get(CONTEXT_TOKEN);
@@ -383,15 +383,6 @@ const getModuleFederation = async (container, name = 'entry') => {
     return container.get(name);
 };
 
-const resolveComponent = async (componentOrLoader) => {
-    if (!componentOrLoader) {
-        return;
-    }
-    return 'load' in componentOrLoader && typeof componentOrLoader.load === 'function'
-        ? (await componentOrLoader.load()).default
-        : componentOrLoader;
-};
-
 class ChildAppResolutionConfigManager {
     constructor({ configs, }) {
         this.hasInitialized = false;
@@ -446,7 +437,7 @@ const sharedProviders = [
     provide({
         provide: commandLineListTokens$1.init,
         multi: true,
-        useValue: initModuleFederation,
+        useValue: () => initModuleFederation(),
     }),
     provide({
         provide: CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN,
@@ -561,8 +552,8 @@ const sharedProviders = [
             return async function preloadChildAppByComponent() {
                 var _a, _b, _c, _d;
                 const [layoutComponent, pageComponent] = await Promise.all([
-                    resolveComponent(pageService.resolveComponentFromConfig('layout')),
-                    resolveComponent(pageService.resolveComponentFromConfig('page')),
+                    resolveLazyComponent(pageService.resolveComponentFromConfig('layout')),
+                    resolveLazyComponent(pageService.resolveComponentFromConfig('page')),
                 ]);
                 await Promise.all([
                     ...((_b = (_a = layoutComponent === null || layoutComponent === void 0 ? void 0 : layoutComponent.childApps) === null || _a === void 0 ? void 0 : _a.map((request) => preloadManager.preload(request))) !== null && _b !== void 0 ? _b : []),

package/lib/server.es.js

@@ -6,6 +6,7 @@ export * from '@tramvai/tokens-child-app';
 import { ACTION_PAGE_RUNNER_TOKEN, LOGGER_TOKEN, DISPATCHER_TOKEN, STORE_TOKEN, CONTEXT_TOKEN, DISPATCHER_CONTEXT_TOKEN, STORE_MIDDLEWARE, INITIAL_APP_STATE_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 } from '@tramvai/tokens-render';
 import { PAGE_SERVICE_TOKEN } from '@tramvai/tokens-router';
+import { resolveLazyComponent, useDi } from '@tramvai/react';
 import flatten from '@tinkoff/utils/array/flatten';
 import { ChildDispatcherContext, createEvent, createReducer } from '@tramvai/state';
 import { jsx } from 'react/jsx-runtime';
@@ -15,7 +16,6 @@ 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 { useDi } from '@tramvai/react';
 
 const getChildProviders$2 = (appDi) => {
     return [
@@ -321,15 +321,6 @@ const getModuleFederation = async (container, name = 'entry') => {
     return container.get(name);
 };
 
-const resolveComponent = async (componentOrLoader) => {
-    if (!componentOrLoader) {
-        return;
-    }
-    return 'load' in componentOrLoader && typeof componentOrLoader.load === 'function'
-        ? (await componentOrLoader.load()).default
-        : componentOrLoader;
-};
-
 class ChildAppResolutionConfigManager {
     constructor({ configs, }) {
         this.hasInitialized = false;
@@ -384,7 +375,7 @@ const sharedProviders = [
     provide({
         provide: commandLineListTokens$1.init,
         multi: true,
-        useValue: initModuleFederation,
+        useValue: () => initModuleFederation(),
     }),
     provide({
         provide: CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN,
@@ -499,8 +490,8 @@ const sharedProviders = [
             return async function preloadChildAppByComponent() {
                 var _a, _b, _c, _d;
                 const [layoutComponent, pageComponent] = await Promise.all([
-                    resolveComponent(pageService.resolveComponentFromConfig('layout')),
-                    resolveComponent(pageService.resolveComponentFromConfig('page')),
+                    resolveLazyComponent(pageService.resolveComponentFromConfig('layout')),
+                    resolveLazyComponent(pageService.resolveComponentFromConfig('page')),
                 ]);
                 await Promise.all([
                     ...((_b = (_a = layoutComponent === null || layoutComponent === void 0 ? void 0 : layoutComponent.childApps) === null || _a === void 0 ? void 0 : _a.map((request) => preloadManager.preload(request))) !== null && _b !== void 0 ? _b : []),

package/lib/server.js

@@ -9,6 +9,7 @@ var tokensChildApp = require('@tramvai/tokens-child-app');
 var tokensCommon = require('@tramvai/tokens-common');
 var tokensRender = require('@tramvai/tokens-render');
 var tokensRouter = require('@tramvai/tokens-router');
+var react$1 = require('@tramvai/react');
 var flatten = require('@tinkoff/utils/array/flatten');
 var state = require('@tramvai/state');
 var jsxRuntime = require('react/jsx-runtime');
@@ -18,7 +19,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 react$1 = require('@tramvai/react');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -330,15 +330,6 @@ const getModuleFederation = async (container, name = 'entry') => {
     return container.get(name);
 };
 
-const resolveComponent = async (componentOrLoader) => {
-    if (!componentOrLoader) {
-        return;
-    }
-    return 'load' in componentOrLoader && typeof componentOrLoader.load === 'function'
-        ? (await componentOrLoader.load()).default
-        : componentOrLoader;
-};
-
 class ChildAppResolutionConfigManager {
     constructor({ configs, }) {
         this.hasInitialized = false;
@@ -393,7 +384,7 @@ const sharedProviders = [
     core.provide({
         provide: core.commandLineListTokens.init,
         multi: true,
-        useValue: initModuleFederation,
+        useValue: () => initModuleFederation(),
     }),
     core.provide({
         provide: tokensChildApp.CHILD_APP_RESOLUTION_CONFIG_MANAGER_TOKEN,
@@ -508,8 +499,8 @@ const sharedProviders = [
             return async function preloadChildAppByComponent() {
                 var _a, _b, _c, _d;
                 const [layoutComponent, pageComponent] = await Promise.all([
-                    resolveComponent(pageService.resolveComponentFromConfig('layout')),
-                    resolveComponent(pageService.resolveComponentFromConfig('page')),
+                    react$1.resolveLazyComponent(pageService.resolveComponentFromConfig('layout')),
+                    react$1.resolveLazyComponent(pageService.resolveComponentFromConfig('page')),
                 ]);
                 await Promise.all([
                     ...((_b = (_a = layoutComponent === null || layoutComponent === void 0 ? void 0 : layoutComponent.childApps) === null || _a === void 0 ? void 0 : _a.map((request) => preloadManager.preload(request))) !== null && _b !== void 0 ? _b : []),

package/lib/shared/providers.d.ts

@@ -1,7 +1,10 @@
 import type { Provider } from '@tinkoff/dippy';
 import type { ChildAppRequestConfig } from '@tramvai/tokens-child-app';
-declare module '@tramvai/tokens-common' {
-    interface RegistryComponentExtend {
+declare module '@tramvai/react' {
+    interface PageComponentOptions {
+        childApps?: ChildAppRequestConfig[];
+    }
+    interface LayoutComponentOptions {
         childApps?: ChildAppRequestConfig[];
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-child-app",
-  "version": "2.11.0",
+  "version": "2.20.0",
   "description": "Module for child apps",
   "browser": {
     "./lib/server.js": "./lib/browser.js",
@@ -28,23 +28,23 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@tinkoff/env-validators": "0.0.5",
-    "@tinkoff/module-loader-client": "0.3.28",
-    "@tinkoff/module-loader-server": "0.4.46",
-    "@tramvai/child-app-core": "2.11.0",
-    "@tramvai/safe-strings": "0.4.5",
-    "@tramvai/tokens-child-app": "2.11.0"
+    "@tinkoff/env-validators": "0.1.2",
+    "@tinkoff/module-loader-client": "0.4.2",
+    "@tinkoff/module-loader-server": "0.5.2",
+    "@tramvai/child-app-core": "2.20.0",
+    "@tramvai/safe-strings": "0.5.2",
+    "@tramvai/tokens-child-app": "2.20.0"
   },
   "devDependencies": {},
   "peerDependencies": {
-    "@tinkoff/dippy": "0.7.45",
+    "@tinkoff/dippy": "0.8.2",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/core": "2.11.0",
-    "@tramvai/state": "2.11.0",
-    "@tramvai/react": "2.11.0",
-    "@tramvai/tokens-common": "2.11.0",
-    "@tramvai/tokens-render": "2.11.0",
-    "@tramvai/tokens-router": "2.11.0",
+    "@tramvai/core": "2.20.0",
+    "@tramvai/state": "2.20.0",
+    "@tramvai/react": "2.20.0",
+    "@tramvai/tokens-common": "2.20.0",
+    "@tramvai/tokens-render": "2.20.0",
+    "@tramvai/tokens-router": "2.20.0",
     "react": ">=16.14.0",
     "react-dom": ">=16.14.0",
     "object-assign": "^4.1.1",

package/lib/shared/utils/resolveComponent.d.ts

@@ -1,6 +0,0 @@
-import type { Component } from '@tramvai/tokens-common';
-export declare const resolveComponent: <T extends Component>(componentOrLoader: T | {
-    load: () => Promise<{
-        default: T;
-    }>;
-}) => Promise<T>;