@tramvai/module-child-app 2.70.1 → 2.72.3

package/lib/shared/singletonDi.es.js

@@ -0,0 +1,95 @@
+import flatten from '@tinkoff/utils/array/flatten';
+import { Container } from '@tinkoff/dippy';
+import { walkOfModules, getModuleParameters } from '@tramvai/core';
+import { CHILD_APP_INTERNAL_CONFIG_TOKEN, IS_CHILD_APP_DI_TOKEN, CHILD_APP_INTERNAL_ACTION_TOKEN, CHILD_APP_INTERNAL_ROOT_DI_BORROW_TOKEN } from '@tramvai/tokens-child-app';
+import { getChildProviders } from './child/singletonProviders.es.js';
+import { commonModuleStubs } from './child/stubs.es.js';
+import { validateChildAppProvider } from './child/validate.es.js';
+
+class SingletonDiManager {
+    constructor({ logger, appDi, loader, }) {
+        this.cache = new Map();
+        this.log = logger('child-app:singleton-di-manager');
+        this.appDi = appDi;
+        this.loader = loader;
+    }
+    getChildDi(config) {
+        const { key, tag } = config;
+        if (this.cache.has(key)) {
+            return this.cache.get(key);
+        }
+        try {
+            const di = this.resolveDi(config);
+            if (di && tag !== 'debug') {
+                this.cache.set(key, di);
+            }
+            return di;
+        }
+        catch (error) {
+            this.log.error({
+                event: 'resolve-di-fail',
+                error,
+                config,
+            });
+        }
+    }
+    forEachChildDi(cb) {
+        this.cache.forEach((di) => {
+            cb(di);
+        });
+    }
+    resolveDi(config) {
+        const children = this.loader.get(config);
+        if (!children) {
+            return;
+        }
+        const di = new Container([
+            {
+                provide: CHILD_APP_INTERNAL_CONFIG_TOKEN,
+                useValue: config,
+            },
+            {
+                provide: IS_CHILD_APP_DI_TOKEN,
+                useValue: true,
+            },
+        ], this.appDi);
+        const { modules = [], providers = [], actions = [] } = children;
+        // add providers on the Singleton Level to make it possible to reuse providers from the root-app Container
+        const childProviders = getChildProviders(this.appDi);
+        childProviders.forEach((provider) => {
+            di.register(provider);
+        });
+        const resolvedModules = walkOfModules(modules);
+        resolvedModules.forEach((mod) => {
+            const moduleParameters = getModuleParameters(mod);
+            moduleParameters.providers.forEach((provider) => {
+                di.register(provider);
+            });
+        });
+        providers.forEach((provider) => {
+            if (process.env.NODE_ENV === 'development') {
+                validateChildAppProvider(provider);
+            }
+            di.register(provider);
+        });
+        di.register({
+            provide: CHILD_APP_INTERNAL_ACTION_TOKEN,
+            multi: true,
+            useValue: actions,
+        });
+        const borrowTokens = di.get({ token: CHILD_APP_INTERNAL_ROOT_DI_BORROW_TOKEN, optional: true });
+        if (borrowTokens) {
+            flatten(borrowTokens).forEach((token) => {
+                di.borrowToken(this.appDi, token);
+            });
+        }
+        commonModuleStubs.forEach((stub) => {
+            if (!di.has(stub.provide)) {
+                di.register(stub);
+            }
+        });
+        return di;
+    }
+}
+
+export { SingletonDiManager };

package/lib/shared/singletonDi.js

@@ -0,0 +1,103 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var flatten = require('@tinkoff/utils/array/flatten');
+var dippy = require('@tinkoff/dippy');
+var core = require('@tramvai/core');
+var tokensChildApp = require('@tramvai/tokens-child-app');
+var singletonProviders = require('./child/singletonProviders.js');
+var stubs = require('./child/stubs.js');
+var validate = require('./child/validate.js');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var flatten__default = /*#__PURE__*/_interopDefaultLegacy(flatten);
+
+class SingletonDiManager {
+    constructor({ logger, appDi, loader, }) {
+        this.cache = new Map();
+        this.log = logger('child-app:singleton-di-manager');
+        this.appDi = appDi;
+        this.loader = loader;
+    }
+    getChildDi(config) {
+        const { key, tag } = config;
+        if (this.cache.has(key)) {
+            return this.cache.get(key);
+        }
+        try {
+            const di = this.resolveDi(config);
+            if (di && tag !== 'debug') {
+                this.cache.set(key, di);
+            }
+            return di;
+        }
+        catch (error) {
+            this.log.error({
+                event: 'resolve-di-fail',
+                error,
+                config,
+            });
+        }
+    }
+    forEachChildDi(cb) {
+        this.cache.forEach((di) => {
+            cb(di);
+        });
+    }
+    resolveDi(config) {
+        const children = this.loader.get(config);
+        if (!children) {
+            return;
+        }
+        const di = new dippy.Container([
+            {
+                provide: tokensChildApp.CHILD_APP_INTERNAL_CONFIG_TOKEN,
+                useValue: config,
+            },
+            {
+                provide: tokensChildApp.IS_CHILD_APP_DI_TOKEN,
+                useValue: true,
+            },
+        ], this.appDi);
+        const { modules = [], providers = [], actions = [] } = children;
+        // add providers on the Singleton Level to make it possible to reuse providers from the root-app Container
+        const childProviders = singletonProviders.getChildProviders(this.appDi);
+        childProviders.forEach((provider) => {
+            di.register(provider);
+        });
+        const resolvedModules = core.walkOfModules(modules);
+        resolvedModules.forEach((mod) => {
+            const moduleParameters = core.getModuleParameters(mod);
+            moduleParameters.providers.forEach((provider) => {
+                di.register(provider);
+            });
+        });
+        providers.forEach((provider) => {
+            if (process.env.NODE_ENV === 'development') {
+                validate.validateChildAppProvider(provider);
+            }
+            di.register(provider);
+        });
+        di.register({
+            provide: tokensChildApp.CHILD_APP_INTERNAL_ACTION_TOKEN,
+            multi: true,
+            useValue: actions,
+        });
+        const borrowTokens = di.get({ token: tokensChildApp.CHILD_APP_INTERNAL_ROOT_DI_BORROW_TOKEN, optional: true });
+        if (borrowTokens) {
+            flatten__default["default"](borrowTokens).forEach((token) => {
+                di.borrowToken(this.appDi, token);
+            });
+        }
+        stubs.commonModuleStubs.forEach((stub) => {
+            if (!di.has(stub.provide)) {
+                di.register(stub);
+            }
+        });
+        return di;
+    }
+}
+
+exports.SingletonDiManager = SingletonDiManager;

package/lib/shared/store.browser.js

@@ -0,0 +1,13 @@
+import { createEvent, createReducer } from '@tramvai/state';
+
+const setPreloaded = createEvent('child-app set preloaded');
+const initialState = {
+    preloaded: [],
+};
+const ChildAppStore = createReducer('child-app', initialState).on(setPreloaded, (_, preloaded) => {
+    return {
+        preloaded,
+    };
+});
+
+export { ChildAppStore, setPreloaded };

package/lib/shared/store.es.js

@@ -0,0 +1,13 @@
+import { createEvent, createReducer } from '@tramvai/state';
+
+const setPreloaded = createEvent('child-app set preloaded');
+const initialState = {
+    preloaded: [],
+};
+const ChildAppStore = createReducer('child-app', initialState).on(setPreloaded, (_, preloaded) => {
+    return {
+        preloaded,
+    };
+});
+
+export { ChildAppStore, setPreloaded };

package/lib/shared/store.js

@@ -0,0 +1,18 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var state = require('@tramvai/state');
+
+const setPreloaded = state.createEvent('child-app set preloaded');
+const initialState = {
+    preloaded: [],
+};
+const ChildAppStore = state.createReducer('child-app', initialState).on(setPreloaded, (_, preloaded) => {
+    return {
+        preloaded,
+    };
+});
+
+exports.ChildAppStore = ChildAppStore;
+exports.setPreloaded = setPreloaded;

package/lib/shared/webpack/moduleFederation.browser.js

@@ -0,0 +1,49 @@
+const initModuleFederation = async (container, scope = 'default') => {
+    if (container) {
+        await container.init(__webpack_share_scopes__[scope]);
+        return;
+    }
+    await __webpack_init_sharing__('default');
+    // currently module federation has problems with external modules
+    // and unfourtanelly react and react-dom are marked as externals in defaults
+    // fill sharedScope manually here
+    const shareScope = __webpack_share_scopes__[scope];
+    if (!shareScope.react) {
+        shareScope.react = {
+            '*': {
+                get: () => () => require('react'),
+                from: 'tramvai-mf-fix',
+                eager: true,
+                loaded: true,
+            },
+        };
+    }
+    if (!shareScope['react-dom']) {
+        shareScope['react-dom'] = {
+            '*': {
+                get: () => () => require('react-dom'),
+                from: 'tramvai-mf-fix',
+                eager: true,
+                loaded: true,
+            },
+        };
+    }
+    if (process.env.NODE_ENV === 'development') {
+        // explicitly add react/jsx-runtime to support production builds of the child-app in dev mode
+        if (!shareScope['react/jsx-runtime']) {
+            shareScope['react/jsx-runtime'] = {
+                '*': {
+                    get: () => () => require('react/jsx-runtime'),
+                    from: 'tramvai-mf-fix',
+                    eager: true,
+                    loaded: true,
+                },
+            };
+        }
+    }
+};
+const getModuleFederation = async (container, name = 'entry') => {
+    return container.get(name);
+};
+
+export { getModuleFederation, initModuleFederation };

package/lib/shared/webpack/moduleFederation.es.js

@@ -0,0 +1,49 @@
+const initModuleFederation = async (container, scope = 'default') => {
+    if (container) {
+        await container.init(__webpack_share_scopes__[scope]);
+        return;
+    }
+    await __webpack_init_sharing__('default');
+    // currently module federation has problems with external modules
+    // and unfourtanelly react and react-dom are marked as externals in defaults
+    // fill sharedScope manually here
+    const shareScope = __webpack_share_scopes__[scope];
+    if (!shareScope.react) {
+        shareScope.react = {
+            '*': {
+                get: () => () => require('react'),
+                from: 'tramvai-mf-fix',
+                eager: true,
+                loaded: true,
+            },
+        };
+    }
+    if (!shareScope['react-dom']) {
+        shareScope['react-dom'] = {
+            '*': {
+                get: () => () => require('react-dom'),
+                from: 'tramvai-mf-fix',
+                eager: true,
+                loaded: true,
+            },
+        };
+    }
+    if (process.env.NODE_ENV === 'development') {
+        // explicitly add react/jsx-runtime to support production builds of the child-app in dev mode
+        if (!shareScope['react/jsx-runtime']) {
+            shareScope['react/jsx-runtime'] = {
+                '*': {
+                    get: () => () => require('react/jsx-runtime'),
+                    from: 'tramvai-mf-fix',
+                    eager: true,
+                    loaded: true,
+                },
+            };
+        }
+    }
+};
+const getModuleFederation = async (container, name = 'entry') => {
+    return container.get(name);
+};
+
+export { getModuleFederation, initModuleFederation };

package/lib/shared/webpack/moduleFederation.js

@@ -0,0 +1,54 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const initModuleFederation = async (container, scope = 'default') => {
+    if (container) {
+        await container.init(__webpack_share_scopes__[scope]);
+        return;
+    }
+    await __webpack_init_sharing__('default');
+    // currently module federation has problems with external modules
+    // and unfourtanelly react and react-dom are marked as externals in defaults
+    // fill sharedScope manually here
+    const shareScope = __webpack_share_scopes__[scope];
+    if (!shareScope.react) {
+        shareScope.react = {
+            '*': {
+                get: () => () => require('react'),
+                from: 'tramvai-mf-fix',
+                eager: true,
+                loaded: true,
+            },
+        };
+    }
+    if (!shareScope['react-dom']) {
+        shareScope['react-dom'] = {
+            '*': {
+                get: () => () => require('react-dom'),
+                from: 'tramvai-mf-fix',
+                eager: true,
+                loaded: true,
+            },
+        };
+    }
+    if (process.env.NODE_ENV === 'development') {
+        // explicitly add react/jsx-runtime to support production builds of the child-app in dev mode
+        if (!shareScope['react/jsx-runtime']) {
+            shareScope['react/jsx-runtime'] = {
+                '*': {
+                    get: () => () => require('react/jsx-runtime'),
+                    from: 'tramvai-mf-fix',
+                    eager: true,
+                    loaded: true,
+                },
+            };
+        }
+    }
+};
+const getModuleFederation = async (container, name = 'entry') => {
+    return container.get(name);
+};
+
+exports.getModuleFederation = getModuleFederation;
+exports.initModuleFederation = initModuleFederation;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-child-app",
-  "version": "2.70.1",
+  "version": "2.72.3",
   "description": "Module for child apps",
   "browser": {
     "./lib/server.js": "./lib/browser.js",
@@ -20,32 +20,31 @@
     "url": "git@github.com:Tinkoff/tramvai.git"
   },
   "scripts": {
-    "build": "tramvai-build --for-publish",
-    "watch": "tsc -w",
-    "build-for-publish": "true"
+    "build": "tramvai-build --forPublish --preserveModules",
+    "watch": "tsc -w"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@tinkoff/env-validators": "0.1.4",
-    "@tinkoff/module-loader-client": "0.4.4",
-    "@tinkoff/module-loader-server": "0.5.6",
-    "@tramvai/child-app-core": "2.70.1",
-    "@tramvai/module-router": "2.70.1",
-    "@tramvai/safe-strings": "0.5.6",
-    "@tramvai/tokens-child-app": "2.70.1"
+    "@tinkoff/env-validators": "0.1.5",
+    "@tinkoff/module-loader-client": "0.4.5",
+    "@tinkoff/module-loader-server": "0.5.7",
+    "@tramvai/child-app-core": "2.72.3",
+    "@tramvai/module-router": "2.72.3",
+    "@tramvai/safe-strings": "0.5.7",
+    "@tramvai/tokens-child-app": "2.72.3"
   },
   "devDependencies": {},
   "peerDependencies": {
-    "@tinkoff/dippy": "0.8.12",
+    "@tinkoff/dippy": "0.8.13",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/core": "2.70.1",
-    "@tramvai/state": "2.70.1",
-    "@tramvai/react": "2.70.1",
-    "@tramvai/tokens-common": "2.70.1",
-    "@tramvai/tokens-render": "2.70.1",
-    "@tramvai/tokens-router": "2.70.1",
+    "@tramvai/core": "2.72.3",
+    "@tramvai/state": "2.72.3",
+    "@tramvai/react": "2.72.3",
+    "@tramvai/tokens-common": "2.72.3",
+    "@tramvai/tokens-render": "2.72.3",
+    "@tramvai/tokens-router": "2.72.3",
     "react": ">=16.14.0",
     "react-dom": ">=16.14.0",
     "object-assign": "^4.1.1",