@tramvai/cli 2.110.0 → 2.111.1

package/lib/builder/webpack/tokens.d.ts

@@ -104,6 +104,7 @@ export declare const CLIENT_CONFIG_MANAGER_TOKEN: {
     };
     shared: {
         defaultTramvaiDependencies?: boolean;
+        flexibleTramvaiVersions: boolean;
         deps: (string | {
             name: string;
             singleton: boolean;
@@ -219,6 +220,7 @@ export declare const CLIENT_MODERN_CONFIG_MANAGER_TOKEN: {
     };
     shared: {
         defaultTramvaiDependencies?: boolean;
+        flexibleTramvaiVersions: boolean;
         deps: (string | {
             name: string;
             singleton: boolean;
@@ -334,6 +336,7 @@ export declare const SERVER_CONFIG_MANAGER_TOKEN: {
     };
     shared: {
         defaultTramvaiDependencies?: boolean;
+        flexibleTramvaiVersions: boolean;
         deps: (string | {
             name: string;
             singleton: boolean;

package/lib/commands/update/dependantLibs.d.ts

@@ -1,2 +1 @@
-export declare const isDependantLib: (name: string) => boolean;
 export declare const getLibPackageVersion: (name: string, unifiedVersion: string) => Promise<string | undefined>;

package/lib/commands/update/dependantLibs.js

@@ -1,33 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLibPackageVersion = exports.isDependantLib = void 0;
+exports.getLibPackageVersion = void 0;
 const tslib_1 = require("tslib");
 const latest_version_1 = tslib_1.__importDefault(require("latest-version"));
 const package_json_1 = tslib_1.__importDefault(require("package-json"));
-// map of packages that is not in unified versioning
-// but we still want to update it
-// actual version to update will be calculated from the some of the @tramvai/module
-const DEPENDANT_LIBS_MAP = new Map([
-    ['@tinkoff/logger', '@tramvai/module-log'],
-    ['@tinkoff/dippy', '@tramvai/core'],
-    ['@tinkoff/router', '@tramvai/module-router'],
-    ['@tinkoff/url', '@tramvai/module-common'],
-    ['@tinkoff/errors', '@tramvai/module-common'],
-    ['@tinkoff/roles', '@tramvai/module-authenticate'],
-    ['@tinkoff/pubsub', '@tramvai/module-common'],
-    ['@tinkoff/hook-runner', '@tramvai/module-common'],
-    ['@tinkoff/htmlpagebuilder', '@tramvai/module-render'],
-    ['@tinkoff/browser-timings', '@tramvai/module-metrics'],
-    ['@tinkoff/meta-tags-generate', '@tramvai/module-render'],
-    ['@tinkoff/pack-polyfills', ''],
-    ['@tinkoff/browserslist-config', '@tramvai/cli'],
-]);
-const isDependantLib = (name) => {
-    return DEPENDANT_LIBS_MAP.has(name);
-};
-exports.isDependantLib = isDependantLib;
+const tramvaiVersions_1 = require("../../utils/tramvaiVersions");
 const getLibPackageVersion = (name, unifiedVersion) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-    const unifiedModule = DEPENDANT_LIBS_MAP.get(name);
+    const unifiedModule = tramvaiVersions_1.DEPENDANT_LIBS_MAP.get(name);
     if (!unifiedModule) {
         return (0, latest_version_1.default)(name);
     }

package/lib/commands/update/dependantLibs.js.map

@@ -1 +1 @@
-{"version":3,"file":"dependantLibs.js","sourceRoot":"","sources":["../../../src/commands/update/dependantLibs.ts"],"names":[],"mappings":";;;;AAAA,4EAAqD;AACrD,wEAA0C;AAE1C,oDAAoD;AACpD,iCAAiC;AACjC,mFAAmF;AACnF,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC;IACjC,CAAC,iBAAiB,EAAE,qBAAqB,CAAC;IAC1C,CAAC,gBAAgB,EAAE,eAAe,CAAC;IACnC,CAAC,iBAAiB,EAAE,wBAAwB,CAAC;IAC7C,CAAC,cAAc,EAAE,wBAAwB,CAAC;IAC1C,CAAC,iBAAiB,EAAE,wBAAwB,CAAC;IAC7C,CAAC,gBAAgB,EAAE,8BAA8B,CAAC;IAClD,CAAC,iBAAiB,EAAE,wBAAwB,CAAC;IAC7C,CAAC,sBAAsB,EAAE,wBAAwB,CAAC;IAClD,CAAC,0BAA0B,EAAE,wBAAwB,CAAC;IACtD,CAAC,0BAA0B,EAAE,yBAAyB,CAAC;IACvD,CAAC,6BAA6B,EAAE,wBAAwB,CAAC;IACzD,CAAC,yBAAyB,EAAE,EAAE,CAAC;IAC/B,CAAC,8BAA8B,EAAE,cAAc,CAAC;CACjD,CAAC,CAAC;AAEI,MAAM,cAAc,GAAG,CAAC,IAAY,EAAE,EAAE;IAC7C,OAAO,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AACtC,CAAC,CAAC;AAFW,QAAA,cAAc,kBAEzB;AAEK,MAAM,oBAAoB,GAAG,CAClC,IAAY,EACZ,cAAsB,EACO,EAAE;IAC/B,MAAM,aAAa,GAAG,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAEnD,IAAI,CAAC,aAAa,EAAE;QAClB,OAAO,IAAA,wBAAuB,EAAC,IAAI,CAAC,CAAC;KACtC;IAED,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,IAAA,sBAAc,EAAC,aAAa,EAAE,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAC;IAE1F,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;QACvB,OAAO,CAAC,IAAI,CACV,6CAA6C,IAAI;6CACV,CACxC,CAAC;QAEF,OAAO;KACR;IAED,OAAO,YAAY,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC,CAAA,CAAC;AAtBW,QAAA,oBAAoB,wBAsB/B"}
+{"version":3,"file":"dependantLibs.js","sourceRoot":"","sources":["../../../src/commands/update/dependantLibs.ts"],"names":[],"mappings":";;;;AAAA,4EAAqD;AACrD,wEAA0C;AAC1C,iEAAiE;AAE1D,MAAM,oBAAoB,GAAG,CAClC,IAAY,EACZ,cAAsB,EACO,EAAE;IAC/B,MAAM,aAAa,GAAG,oCAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAEnD,IAAI,CAAC,aAAa,EAAE;QAClB,OAAO,IAAA,wBAAuB,EAAC,IAAI,CAAC,CAAC;KACtC;IAED,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,IAAA,sBAAc,EAAC,aAAa,EAAE,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAC;IAE1F,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;QACvB,OAAO,CAAC,IAAI,CACV,6CAA6C,IAAI;6CACV,CACxC,CAAC;QAEF,OAAO;KACR;IAED,OAAO,YAAY,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC,CAAA,CAAC;AAtBW,QAAA,oBAAoB,wBAsB/B"}

package/lib/commands/update/updatePackageJson.js

@@ -8,9 +8,7 @@ const p_map_1 = tslib_1.__importDefault(require("p-map"));
 const ora_1 = tslib_1.__importDefault(require("ora"));
 const packageHasVersion_1 = require("../../utils/commands/dependencies/packageHasVersion");
 const dependantLibs_1 = require("./dependantLibs");
-const isUnifiedVersion = (name) => {
-    return name.startsWith('@tramvai');
-};
+const tramvaiVersions_1 = require("../../utils/tramvaiVersions");
 const getVersionFromDep = (dep) => {
     var _a, _b;
     if (dep) {
@@ -20,10 +18,10 @@ const getVersionFromDep = (dep) => {
 const updateDependencies = (dependencies = {}, targetVersion, currentVersion, spinner) => {
     return (0, p_map_1.default)(Object.keys(dependencies), (dep) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
         let nextVersion;
-        if (isUnifiedVersion(dep) && getVersionFromDep(dependencies[dep]) === currentVersion) {
+        if ((0, tramvaiVersions_1.isUnifiedVersion)(dep) && getVersionFromDep(dependencies[dep]) === currentVersion) {
             nextVersion = targetVersion;
         }
-        else if ((0, dependantLibs_1.isDependantLib)(dep)) {
+        else if ((0, tramvaiVersions_1.isDependantLib)(dep)) {
             const libVersion = yield (0, dependantLibs_1.getLibPackageVersion)(dep, targetVersion);
             nextVersion = libVersion;
         }

package/lib/commands/update/updatePackageJson.js.map

@@ -1 +1 @@
-{"version":3,"file":"updatePackageJson.js","sourceRoot":"","sources":["../../../src/commands/update/updatePackageJson.ts"],"names":[],"mappings":";;;;AAAA,mCAA2C;AAC3C,oDAAoB;AACpB,0DAAyB;AAEzB,sDAAsB;AACtB,2FAAwF;AACxF,mDAAuE;AAEvE,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAE,EAAE;IACxC,OAAO,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;AACrC,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,GAAY,EAAE,EAAE;;IACzC,IAAI,GAAG,EAAE;QACP,OAAO,CAAA,MAAA,IAAA,cAAK,EAAC,GAAG,CAAC,0CAAE,OAAO,MAAI,MAAA,IAAA,mBAAU,EAAC,GAAG,CAAC,0CAAE,OAAO,CAAA,CAAC;KACxD;AACH,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CACzB,eAAuC,EAAE,EACzC,aAAqB,EACrB,cAAsB,EACtB,OAAY,EACZ,EAAE;IACF,OAAO,IAAA,eAAI,EACT,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,EACzB,CAAO,GAAG,EAAE,EAAE;QACZ,IAAI,WAA+B,CAAC;QAEpC,IAAI,gBAAgB,CAAC,GAAG,CAAC,IAAI,iBAAiB,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,KAAK,cAAc,EAAE;YACpF,WAAW,GAAG,aAAa,CAAC;SAC7B;aAAM,IAAI,IAAA,8BAAc,EAAC,GAAG,CAAC,EAAE;YAC9B,MAAM,UAAU,GAAG,MAAM,IAAA,oCAAoB,EAAC,GAAG,EAAE,aAAa,CAAC,CAAC;YAClE,WAAW,GAAG,UAAU,CAAC;SAC1B;QAED,IAAI,WAAW,EAAE;YACf,MAAM,aAAa,GAAG,MAAM,IAAA,qCAAiB,EAAC,GAAG,EAAE,WAAW,CAAC,CAAC;YAEhE,kFAAkF;YAClF,gFAAgF;YAChF,OAAO,CAAC,KAAK,EAAE,CAAC;YAEhB,IAAI,aAAa,EAAE;gBACjB,OAAO,CAAC,GAAG,CAAC,KAAK,GAAG,IAAI,WAAW,EAAE,CAAC,CAAC;gBACvC,6CAA6C;gBAC7C,YAAY,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC;aACjC;iBAAM;gBACL,OAAO,CAAC,IAAI,CACV,oBAAoB,GAAG,OAAO,WAAW;;gGAE2C,CACrF,CAAC;aACH;YAED,+CAA+C;YAC/C,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SAC7B;IACH,CAAC,CAAA,EACD;QACE,WAAW,EAAE,EAAE;KAChB,CACF,CAAC;AACJ,CAAC,CAAC;AAEK,MAAM,iBAAiB,GAAG,CAAO,OAAe,EAAE,EAAE;IACzD,MAAM,IAAI,GAAG,YAAE,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;IAC7C,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC5C,MAAM,cAAc,GAAG,iBAAiB,CAAC,OAAO,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,CAAC;IAEhF,IAAI,CAAC,cAAc,EAAE;QACnB,MAAM,IAAI,KAAK,CACb,qGAAqG,CACtG,CAAC;KACH;IAED,IAAI,cAAc,KAAK,OAAO,EAAE;QAC9B,OAAO,CAAC,KAAK,CAAC,+EAA+E,CAAC,CAAC;QAC/F,OAAO;KACR;IAED,MAAM,OAAO,GAAG,IAAA,aAAG,EAAC,gCAAgC,CAAC,CAAC,KAAK,EAAE,CAAC;IAE9D,IAAI;QACF,MAAM,kBAAkB,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;QACjF,MAAM,kBAAkB,CAAC,OAAO,CAAC,eAAe,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;QACpF,MAAM,kBAAkB,CAAC,OAAO,CAAC,gBAAgB,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;QAErF,YAAE,CAAC,aAAa,CAAC,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;KACpE;YAAS;QACR,OAAO,CAAC,IAAI,EAAE,CAAC;KAChB;AACH,CAAC,CAAA,CAAC;AA3BW,QAAA,iBAAiB,qBA2B5B"}
+{"version":3,"file":"updatePackageJson.js","sourceRoot":"","sources":["../../../src/commands/update/updatePackageJson.ts"],"names":[],"mappings":"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"}

package/lib/di/tokens/config.d.ts

@@ -114,6 +114,7 @@ export declare const CONFIG_MANAGER_TOKEN: {
     };
     shared: {
         defaultTramvaiDependencies?: boolean;
+        flexibleTramvaiVersions: boolean;
         deps: (string | {
             name: string;
             singleton: boolean;

package/lib/library/webpack/application/client/common.js

@@ -18,8 +18,9 @@ const pagesResolve_1 = require("../../blocks/pagesResolve");
 const configToEnv_1 = require("../../blocks/configToEnv");
 const stats_1 = require("../../constants/stats");
 const client_1 = require("../../blocks/pwa/client");
+const ModuleFederationFixRange_1 = require("../../plugins/ModuleFederationFixRange");
 exports.default = (configManager) => (config) => {
-    const { polyfill, fileSystemPages } = configManager;
+    const { polyfill, fileSystemPages, shared } = configManager;
     const portal = path_1.default.resolve(configManager.rootDir, `packages/${process.env.APP_ID}/portal.js`);
     const polyfillPath = path_1.default.resolve(configManager.rootDir, polyfill !== null && polyfill !== void 0 ? polyfill : 'src/polyfill');
     const portalExists = fs_1.default.existsSync(portal);
@@ -45,6 +46,11 @@ exports.default = (configManager) => (config) => {
         .end()
         .when(portalExists, (cfg) => cfg.entry('portal').add(portal))
         .when(polyfillExists, (cfg) => cfg.entry('polyfill').add(polyfillPath));
+    config.plugin('module-federation-validate-duplicates').use(ModuleFederationFixRange_1.ModuleFederationFixRange, [
+        {
+            flexibleTramvaiVersions: shared.flexibleTramvaiVersions,
+        },
+    ]);
     config
         .plugin('stats-plugin')
         .use(webpack_stats_plugin_1.StatsWriterPlugin, [

package/lib/library/webpack/application/client/common.js.map

@@ -1 +1 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../src/library/webpack/application/client/common.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../src/library/webpack/application/client/common.ts"],"names":[],"mappings":"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"}

package/lib/library/webpack/application/server/prod.js

@@ -20,6 +20,29 @@ const webpackServerConfig = ({ configManager, }) => {
         config.optimization.set('moduleIds', 'named');
         // prevent modules from concatenation in single module to easier debug
         config.optimization.set('concatenateModules', false);
+        config.plugin('terser').use(terser_webpack_plugin_1.default, [
+            {
+                extractComments: false,
+                terserOptions: {
+                    ecma: 5,
+                    mangle: false,
+                    // сохраняем имена функций, чтобы легче было найти ошибку в трамвае
+                    keep_fnames: true,
+                    compress: {
+                        passes: 2,
+                        drop_debugger: !debug,
+                        dead_code: true,
+                    },
+                    output: {
+                        comments: true,
+                        semicolons: false,
+                        preserve_annotations: true,
+                        indent_start: 2,
+                        beautify: true,
+                    },
+                },
+            },
+        ]);
     }
     else {
         config.plugin('terser').use(terser_webpack_plugin_1.default, [
@@ -31,6 +54,7 @@ const webpackServerConfig = ({ configManager, }) => {
                     // сохраняем имена функций, чтобы легче было найти ошибку в трамвае
                     keep_fnames: true,
                     compress: {
+                        passes: 2,
                         drop_debugger: !debug,
                         dead_code: true,
                     },

package/lib/library/webpack/application/server/prod.js.map

@@ -1 +1 @@
-{"version":3,"file":"prod.js","sourceRoot":"","sources":["../../../../../src/library/webpack/application/server/prod.ts"],"names":[],"mappings":";;;;AAAA,0EAAmC;AACnC,0FAAiD;AAKjD,gGAAgE;AAChE,8DAA8B;AAC9B,iFAAiD;AACjD,4EAAkD;AAE3C,MAAM,mBAAmB,GAAG,CAAC,EAClC,aAAa,GAGd,EAAE,EAAE;IACH,MAAM,MAAM,GAAG,IAAI,uBAAM,EAAE,CAAC;IAC5B,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,aAAa,CAAC;IAE3C,MAAM,CAAC,KAAK,CAAC,IAAA,gBAAM,EAAC,aAAa,CAAC,CAAC,CAAC;IACpC,MAAM,CAAC,KAAK,CAAC,IAAA,cAAU,EAAC,aAAa,CAAC,CAAC,CAAC;IAExC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAElB,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAE1E,IAAI,aAAa,CAAC,uBAAuB,EAAE;QACzC,8DAA8D;QAC9D,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAC9C,sEAAsE;QACtE,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;KACtD;SAAM;QACL,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,+BAAY,EAAE;YACxC;gBACE,eAAe,EAAE,KAAK;gBACtB,aAAa,EAAE;oBACb,IAAI,EAAE,CAAC;oBACP,MAAM,EAAE,KAAK;oBACb,mEAAmE;oBACnE,WAAW,EAAE,IAAI;oBACjB,QAAQ,EAAE;wBACR,aAAa,EAAE,CAAC,KAAK;wBACrB,SAAS,EAAE,IAAI;qBAChB;oBACD,MAAM,EAAE;wBACN,QAAQ,EAAE,KAAK;qBAChB;iBACF;aACF;SACF,CAAC,CAAC;KACJ;IAED,4IAA4I;IAC5I,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,2BAAiB,EAAE;QACnD;YACE,UAAU,EAAE,2BAA2B;SACxC;KACF,CAAC,CAAC;IAEH,IAAI,SAAS,EAAE;QACb,MAAM,CAAC,KAAK,CAAC,IAAA,oBAAU,EAAC,aAAa,CAAC,CAAC,CAAC;KACzC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AArDW,QAAA,mBAAmB,uBAqD9B"}
+{"version":3,"file":"prod.js","sourceRoot":"","sources":["../../../../../src/library/webpack/application/server/prod.ts"],"names":[],"mappings":";;;;AAAA,0EAAmC;AACnC,0FAAiD;AAKjD,gGAAgE;AAChE,8DAA8B;AAC9B,iFAAiD;AACjD,4EAAkD;AAE3C,MAAM,mBAAmB,GAAG,CAAC,EAClC,aAAa,GAGd,EAAE,EAAE;IACH,MAAM,MAAM,GAAG,IAAI,uBAAM,EAAE,CAAC;IAC5B,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,aAAa,CAAC;IAE3C,MAAM,CAAC,KAAK,CAAC,IAAA,gBAAM,EAAC,aAAa,CAAC,CAAC,CAAC;IACpC,MAAM,CAAC,KAAK,CAAC,IAAA,cAAU,EAAC,aAAa,CAAC,CAAC,CAAC;IAExC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAElB,MAAM,CAAC,SAAS,CAAC,aAAa,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAE1E,IAAI,aAAa,CAAC,uBAAuB,EAAE;QACzC,8DAA8D;QAC9D,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAC9C,sEAAsE;QACtE,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;QAErD,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,+BAAY,EAAE;YACxC;gBACE,eAAe,EAAE,KAAK;gBACtB,aAAa,EAAE;oBACb,IAAI,EAAE,CAAC;oBACP,MAAM,EAAE,KAAK;oBACb,mEAAmE;oBACnE,WAAW,EAAE,IAAI;oBACjB,QAAQ,EAAE;wBACR,MAAM,EAAE,CAAC;wBACT,aAAa,EAAE,CAAC,KAAK;wBACrB,SAAS,EAAE,IAAI;qBAChB;oBACD,MAAM,EAAE;wBACN,QAAQ,EAAE,IAAI;wBACd,UAAU,EAAE,KAAK;wBACjB,oBAAoB,EAAE,IAAI;wBAC1B,YAAY,EAAE,CAAC;wBACf,QAAQ,EAAE,IAAI;qBACf;iBACF;aACF;SACF,CAAC,CAAC;KACJ;SAAM;QACL,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,+BAAY,EAAE;YACxC;gBACE,eAAe,EAAE,KAAK;gBACtB,aAAa,EAAE;oBACb,IAAI,EAAE,CAAC;oBACP,MAAM,EAAE,KAAK;oBACb,mEAAmE;oBACnE,WAAW,EAAE,IAAI;oBACjB,QAAQ,EAAE;wBACR,MAAM,EAAE,CAAC;wBACT,aAAa,EAAE,CAAC,KAAK;wBACrB,SAAS,EAAE,IAAI;qBAChB;oBACD,MAAM,EAAE;wBACN,QAAQ,EAAE,KAAK;qBAChB;iBACF;aACF;SACF,CAAC,CAAC;KACJ;IAED,4IAA4I;IAC5I,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,2BAAiB,EAAE;QACnD;YACE,UAAU,EAAE,2BAA2B;SACxC;KACF,CAAC,CAAC;IAEH,IAAI,SAAS,EAAE;QACb,MAAM,CAAC,KAAK,CAAC,IAAA,oBAAU,EAAC,aAAa,CAAC,CAAC,CAAC;KACzC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AA9EW,QAAA,mBAAmB,uBA8E9B"}

package/lib/library/webpack/blocks/optimize.js

@@ -24,6 +24,10 @@ exports.default = (configManager) => (config) => {
                         indent_start: 2,
                         beautify: true,
                     },
+                    compress: {
+                        passes: 2,
+                        drop_debugger: !debug,
+                    },
                 },
             },
         ]);

package/lib/library/webpack/blocks/optimize.js.map

@@ -1 +1 @@
-{"version":3,"file":"optimize.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/optimize.ts"],"names":[],"mappings":";;;AACA,0FAAiD;AACjD,wGAAwD;AACxD,sFAAoD;AAIpD,kBAAe,CAAC,aAA4C,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAClF,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,uBAAuB,EAAE,GAAG,aAAa,CAAC;IAEjE,IAAI,uBAAuB,EAAE;QAC3B,8DAA8D;QAC9D,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAC9C,sEAAsE;QACtE,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;QAErD,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,+BAAY,EAAE;YACxC;gBACE,eAAe,EAAE,KAAK;gBACtB,aAAa,EAAE;oBACb,IAAI,EAAE,CAAC;oBACP,MAAM,EAAE,KAAK;oBACb,MAAM,EAAE;wBACN,QAAQ,EAAE,IAAI;wBACd,UAAU,EAAE,KAAK;wBACjB,oBAAoB,EAAE,IAAI;wBAC1B,YAAY,EAAE,CAAC;wBACf,QAAQ,EAAE,IAAI;qBACf;iBACF;aACF;SACF,CAAC,CAAC;QAEH,OAAO;KACR;IAED,MAAM,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC;IAEjC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,+BAAY,EAAE;QACxC;YACE,eAAe,EAAE,KAAK;YACtB,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,aAAa,EAAE;gBACb,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBACpB,MAAM,EAAE;oBACN,sDAAsD;oBACtD,2EAA2E;oBAC3E,QAAQ,EAAE,CAAC,aAAa,CAAC;iBAC1B;gBACD,MAAM,EAAE;oBACN,QAAQ,EAAE,KAAK;iBAChB;gBACD,QAAQ,EAAE;oBACR,MAAM,EAAE,CAAC;oBACT,aAAa,EAAE,CAAC,KAAK;iBACtB;aACF;SACF;KACF,CAAC,CAAC;IAEH,IAAI,aAAa,CAAC,WAAW,KAAK,MAAM,EAAE;QACxC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,6BAAwB,EAAE,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;KAC/E;SAAM;QACL,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,sCAAY,CAAC,CAAC;KAClD;AACH,CAAC,CAAC"}
+{"version":3,"file":"optimize.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/optimize.ts"],"names":[],"mappings":";;;AACA,0FAAiD;AACjD,wGAAwD;AACxD,sFAAoD;AAIpD,kBAAe,CAAC,aAA4C,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAClF,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,uBAAuB,EAAE,GAAG,aAAa,CAAC;IAEjE,IAAI,uBAAuB,EAAE;QAC3B,8DAA8D;QAC9D,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAC9C,sEAAsE;QACtE,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;QAErD,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,+BAAY,EAAE;YACxC;gBACE,eAAe,EAAE,KAAK;gBACtB,aAAa,EAAE;oBACb,IAAI,EAAE,CAAC;oBACP,MAAM,EAAE,KAAK;oBACb,MAAM,EAAE;wBACN,QAAQ,EAAE,IAAI;wBACd,UAAU,EAAE,KAAK;wBACjB,oBAAoB,EAAE,IAAI;wBAC1B,YAAY,EAAE,CAAC;wBACf,QAAQ,EAAE,IAAI;qBACf;oBACD,QAAQ,EAAE;wBACR,MAAM,EAAE,CAAC;wBACT,aAAa,EAAE,CAAC,KAAK;qBACtB;iBACF;aACF;SACF,CAAC,CAAC;QAEH,OAAO;KACR;IAED,MAAM,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC;IAEjC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,+BAAY,EAAE;QACxC;YACE,eAAe,EAAE,KAAK;YACtB,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,aAAa,EAAE;gBACb,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBACpB,MAAM,EAAE;oBACN,sDAAsD;oBACtD,2EAA2E;oBAC3E,QAAQ,EAAE,CAAC,aAAa,CAAC;iBAC1B;gBACD,MAAM,EAAE;oBACN,QAAQ,EAAE,KAAK;iBAChB;gBACD,QAAQ,EAAE;oBACR,MAAM,EAAE,CAAC;oBACT,aAAa,EAAE,CAAC,KAAK;iBACtB;aACF;SACF;KACF,CAAC,CAAC;IAEH,IAAI,aAAa,CAAC,WAAW,KAAK,MAAM,EAAE;QACxC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,6BAAwB,EAAE,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;KAC/E;SAAM;QACL,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,sCAAY,CAAC,CAAC;KAClD;AACH,CAAC,CAAC"}

package/lib/library/webpack/child-app/client/common.js

@@ -6,8 +6,9 @@ const common_1 = tslib_1.__importDefault(require("../common"));
 const filesClient_1 = tslib_1.__importDefault(require("../../blocks/filesClient"));
 const nodeClient_1 = tslib_1.__importDefault(require("../../blocks/nodeClient"));
 const postcssAssets_1 = tslib_1.__importDefault(require("../../blocks/postcssAssets"));
+const ModuleFederationFixRange_1 = require("../../plugins/ModuleFederationFixRange");
 exports.default = (configManager) => (config) => {
-    const { name, version } = configManager;
+    const { name, version, shared } = configManager;
     config.name('client');
     config.batch((0, common_1.default)(configManager));
     config.target(['web', 'es5']);
@@ -23,6 +24,11 @@ exports.default = (configManager) => (config) => {
             filename: `${name}_stats@${version}.json`,
         },
     ]);
+    config.plugin('module-federation-validate-duplicates').use(ModuleFederationFixRange_1.ModuleFederationFixRange, [
+        {
+            flexibleTramvaiVersions: shared.flexibleTramvaiVersions,
+        },
+    ]);
     config.batch((0, filesClient_1.default)(configManager)).batch((0, nodeClient_1.default)(configManager));
 };
 //# sourceMappingURL=common.js.map

package/lib/library/webpack/child-app/client/common.js.map

@@ -1 +1 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../src/library/webpack/child-app/client/common.ts"],"names":[],"mappings":";;;AACA,kDAAiE;AAIjE,+DAA+B;AAC/B,mFAA6C;AAC7C,iFAAiD;AACjD,uFAAuD;AAGvD,kBAAe,CAAC,aAAiD,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IACvF,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC;IACxC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAEtB,MAAM,CAAC,KAAK,CAAC,IAAA,gBAAM,EAAC,aAAa,CAAC,CAAC,CAAC;IAEpC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;IAE9B,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC;SAC7B,UAAU,CAAC,MAAM,CAAC;SAClB,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC;SAC3B,QAAQ,CAAC,iBAAiB,OAAO,KAAK,CAAC;SACvC,aAAa,CAAC,sCAAsC,CAAC,CAAC;IAEzD,MAAM,CAAC,KAAK,CAAC,IAAA,uBAAa,EAAC,aAAa,CAAC,CAAC,CAAC;IAE3C,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,6BAAsB,EAAE;QACxD;YACE,QAAQ,EAAE,GAAG,IAAI,UAAU,OAAO,OAAO;SAC1C;KACF,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK,CAAC,IAAA,qBAAK,EAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,IAAA,oBAAU,EAAC,aAAa,CAAC,CAAC,CAAC;AACtE,CAAC,CAAC"}
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../src/library/webpack/child-app/client/common.ts"],"names":[],"mappings":";;;AACA,kDAAiE;AAIjE,+DAA+B;AAC/B,mFAA6C;AAC7C,iFAAiD;AACjD,uFAAuD;AAGvD,qFAAkF;AAElF,kBAAe,CAAC,aAAiD,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IACvF,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC;IAChD,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAEtB,MAAM,CAAC,KAAK,CAAC,IAAA,gBAAM,EAAC,aAAa,CAAC,CAAC,CAAC;IAEpC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;IAE9B,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC;SAC7B,UAAU,CAAC,MAAM,CAAC;SAClB,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC;SAC3B,QAAQ,CAAC,iBAAiB,OAAO,KAAK,CAAC;SACvC,aAAa,CAAC,sCAAsC,CAAC,CAAC;IAEzD,MAAM,CAAC,KAAK,CAAC,IAAA,uBAAa,EAAC,aAAa,CAAC,CAAC,CAAC;IAE3C,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,6BAAsB,EAAE;QACxD;YACE,QAAQ,EAAE,GAAG,IAAI,UAAU,OAAO,OAAO;SAC1C;KACF,CAAC,CAAC;IAEH,MAAM,CAAC,MAAM,CAAC,uCAAuC,CAAC,CAAC,GAAG,CAAC,mDAAwB,EAAE;QACnF;YACE,uBAAuB,EAAE,MAAM,CAAC,uBAAuB;SACrB;KACrC,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK,CAAC,IAAA,qBAAK,EAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,IAAA,oBAAU,EAAC,aAAa,CAAC,CAAC,CAAC;AACtE,CAAC,CAAC"}

package/lib/library/webpack/child-app/moduleFederationShared.js

@@ -13,21 +13,21 @@ const getSharedModules = (configManager) => {
     var _a;
     const { rootDir, type, shared: { deps, defaultTramvaiDependencies }, } = configManager;
     const isChild = type === 'child-app';
-    let defaultDependenicesList = defaultTramvaiDependencies ? DEFAULT_DEPENDENCIES_LIST : [];
+    let defaultDependenciesList = defaultTramvaiDependencies ? DEFAULT_DEPENDENCIES_LIST : [];
     if (typeof defaultTramvaiDependencies === 'undefined') {
         if (type === 'child-app') {
-            defaultDependenicesList = DEFAULT_DEPENDENCIES_LIST;
+            defaultDependenciesList = DEFAULT_DEPENDENCIES_LIST;
         }
         else if (type === 'application') {
             const packageJson = (0, safeRequire_1.safeRequire)(path_1.default.resolve(rootDir, 'package.json'), true);
             // add default dependencies only if child-app is in use to minimize bundle size for apps
             // without child-apps
             if ((_a = packageJson === null || packageJson === void 0 ? void 0 : packageJson.dependencies) === null || _a === void 0 ? void 0 : _a['@tramvai/module-child-app']) {
-                defaultDependenicesList = DEFAULT_DEPENDENCIES_LIST;
+                defaultDependenciesList = DEFAULT_DEPENDENCIES_LIST;
             }
         }
     }
-    return Object.assign(Object.assign({}, defaultDependenicesList.concat(deps).reduce((acc, dep) => {
+    return Object.assign(Object.assign({}, defaultDependenciesList.concat(deps).reduce((acc, dep) => {
         const { name, singleton = false } = typeof dep === 'string' ? { name: dep } : dep;
         acc[name] = {
             import: name,

package/lib/library/webpack/plugins/ModuleFederationFixRange.d.ts

@@ -0,0 +1,23 @@
+import type webpack from 'webpack';
+import type { Compiler, NormalModule } from 'webpack';
+type SemverRange = [number, number, number, number];
+interface SharedModuleOptions {
+    shareKey: string;
+    requiredVersion?: SemverRange;
+    importResolved: string;
+    singleton?: boolean;
+}
+interface SharedModule extends NormalModule {
+    options?: SharedModuleOptions;
+}
+export interface ModuleFederationFixRangeOptions {
+    flexibleTramvaiVersions: boolean;
+}
+export declare class ModuleFederationFixRange implements webpack.WebpackPluginInstance {
+    private flexibleTramvaiVersions;
+    private sharedModules;
+    constructor({ flexibleTramvaiVersions }: ModuleFederationFixRangeOptions);
+    apply(compiler: Compiler): void;
+    fixVersionRange(module: SharedModule): void;
+}
+export {};

package/lib/library/webpack/plugins/ModuleFederationFixRange.js

@@ -0,0 +1,125 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ModuleFederationFixRange = void 0;
+const tslib_1 = require("tslib");
+const resolve_1 = require("resolve");
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+// eslint-disable-next-line no-restricted-imports
+const semver_1 = require("webpack/lib/util/semver");
+const tramvaiVersions_1 = require("../../../utils/tramvaiVersions");
+const PLUGIN_NAME = 'ModuleFederationValidateDuplicates';
+const resolvePackageVersion = (name, basedir) => {
+    try {
+        const packageJsonPath = (0, resolve_1.sync)(`${name}/package.json`, {
+            basedir,
+        });
+        const packageJson = require(packageJsonPath);
+        return packageJson.version;
+    }
+    catch (error) {
+        console.warn(`ModuleFederation: could not infer version for package "${name}"`);
+    }
+};
+class ModuleFederationFixRange {
+    constructor({ flexibleTramvaiVersions }) {
+        // { name: { importResolved: { number }} }
+        this.sharedModules = new Map();
+        this.flexibleTramvaiVersions = flexibleTramvaiVersions !== null && flexibleTramvaiVersions !== void 0 ? flexibleTramvaiVersions : false;
+    }
+    apply(compiler) {
+        compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (_, { normalModuleFactory }) => {
+            normalModuleFactory.hooks.factorize.intercept({
+                register: (tap) => {
+                    if (tap.name === 'ConsumeSharedPlugin') {
+                        const originalFn = tap.fn;
+                        // eslint-disable-next-line no-param-reassign
+                        tap.fn = (...args) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                            const module = yield originalFn(...args);
+                            if (module === null || module === void 0 ? void 0 : module.options) {
+                                this.fixVersionRange(module);
+                            }
+                            return module;
+                        });
+                    }
+                    return tap;
+                },
+            });
+        });
+        compiler.hooks.done.tap(PLUGIN_NAME, () => {
+            const duplicates = [];
+            const criticalDuplicates = [];
+            for (const [name, shared] of this.sharedModules) {
+                if (shared.size > 1) {
+                    duplicates.push({
+                        name,
+                        paths: [...shared.keys()],
+                    });
+                }
+                for (const [path, versions] of shared) {
+                    if (versions.size > 1) {
+                        criticalDuplicates.push({ name, path });
+                    }
+                }
+            }
+            // reset sharedModules info after compilation has ended
+            this.sharedModules = new Map();
+            if (duplicates.length) {
+                console.warn(`⚠️  ModuleFederation: Found duplicates for next shared modules:
+${duplicates
+                    .map(({ name, paths }) => {
+                    return `\t${chalk_1.default.yellowBright(name)}: ${paths.join(', ')}`;
+                })
+                    .join('\n')}
+        `);
+            }
+            if (criticalDuplicates.length) {
+                console.error(`❗ ModuleFederation: Found duplicates for shared modules with different major versions that are resolved to the same path:
+${criticalDuplicates
+                    .map(({ name, path }) => {
+                    return `\t${chalk_1.default.red(name)}: ${path}`;
+                })
+                    .join('\n')}`);
+                throw new Error('ModuleFederation: Different major versions have resolved to the same path for shared modules, please review errors above');
+            }
+        });
+    }
+    fixVersionRange(module) {
+        const { options, options: { shareKey: name, singleton, importResolved }, context, } = module;
+        let { requiredVersion } = options;
+        // ignore singletons as the actual version won't change anything
+        // and usually it is just a react and co libraries
+        if (!requiredVersion && context && !singleton) {
+            const version = resolvePackageVersion(name, context);
+            if (version) {
+                requiredVersion = (0, semver_1.parseRange)(version);
+            }
+        }
+        if (!requiredVersion) {
+            return;
+        }
+        if (requiredVersion && this.flexibleTramvaiVersions) {
+            const isTramvai = (0, tramvaiVersions_1.isUnifiedVersion)(name) || (0, tramvaiVersions_1.isDependantLib)(name);
+            if (isTramvai && requiredVersion[0] > 2) {
+                // 1 is used for `^` range modifier
+                // see https://github.com/webpack/webpack/blob/56363993156e06a1230c9759eba277a22e6b6604/lib/util/semver.js#LL235C20-L235C20
+                requiredVersion[0] = 1;
+            }
+        }
+        // change version in webpack module
+        options.requiredVersion = requiredVersion;
+        let shared = this.sharedModules.get(name);
+        if (!shared) {
+            shared = new Map();
+            this.sharedModules.set(name, shared);
+        }
+        let versions = shared.get(importResolved);
+        if (!versions) {
+            versions = new Set();
+            shared.set(importResolved, versions);
+        }
+        // save major version of the semver array
+        versions.add(requiredVersion[1]);
+    }
+}
+exports.ModuleFederationFixRange = ModuleFederationFixRange;
+//# sourceMappingURL=ModuleFederationFixRange.js.map

package/lib/library/webpack/plugins/ModuleFederationFixRange.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ModuleFederationFixRange.js","sourceRoot":"","sources":["../../../../src/library/webpack/plugins/ModuleFederationFixRange.ts"],"names":[],"mappings":"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"}

package/lib/schema/autogeneratedSchema.json

@@ -1225,7 +1225,13 @@
                     "properties": {
                         "defaultTramvaiDependencies": {
                             "title": "Should default dependencies list be added to shared list",
-                            "description": "It includes the list of commonly used dependencies in the child-apps\nBy default, it is enabled in application in case of",
+                            "description": "It includes the list of commonly used dependencies in the child-apps\nBy default, it is enabled in application in case of tramvai/module-child-app is specified in package.json\nand for child-apps",
+                            "type": "boolean"
+                        },
+                        "flexibleTramvaiVersions": {
+                            "title": "add caret range specifier for tramvai dependencies",
+                            "description": "minimal versions are inferred from package.json",
+                            "default": true,
                             "type": "boolean"
                         },
                         "deps": {
@@ -1746,7 +1752,13 @@
                     "properties": {
                         "defaultTramvaiDependencies": {
                             "title": "Should default dependencies list be added to shared list",
-                            "description": "It includes the list of commonly used dependencies in the child-apps\nBy default, it is enabled in application in case of",
+                            "description": "It includes the list of commonly used dependencies in the child-apps\nBy default, it is enabled in application in case of tramvai/module-child-app is specified in package.json\nand for child-apps",
+                            "type": "boolean"
+                        },
+                        "flexibleTramvaiVersions": {
+                            "title": "add caret range specifier for tramvai dependencies",
+                            "description": "minimal versions are inferred from package.json",
+                            "default": true,
                             "type": "boolean"
                         },
                         "deps": {
@@ -2267,7 +2279,13 @@
                     "properties": {
                         "defaultTramvaiDependencies": {
                             "title": "Should default dependencies list be added to shared list",
-                            "description": "It includes the list of commonly used dependencies in the child-apps\nBy default, it is enabled in application in case of",
+                            "description": "It includes the list of commonly used dependencies in the child-apps\nBy default, it is enabled in application in case of tramvai/module-child-app is specified in package.json\nand for child-apps",
+                            "type": "boolean"
+                        },
+                        "flexibleTramvaiVersions": {
+                            "title": "add caret range specifier for tramvai dependencies",
+                            "description": "minimal versions are inferred from package.json",
+                            "default": true,
                             "type": "boolean"
                         },
                         "deps": {

package/lib/typings/configEntry/cli.d.ts

@@ -269,10 +269,16 @@ export interface CliConfigEntry extends ConfigEntry {
         /**
          * @title Should default dependencies list be added to shared list
          * @description It includes the list of commonly used dependencies in the child-apps
-         * By default, it is enabled in application in case of @tramvai/module-child-app is specified in package.json
+         * By default, it is enabled in application in case of tramvai/module-child-app is specified in package.json
          * and for child-apps
          */
         defaultTramvaiDependencies?: boolean;
+        /**
+         * @title add caret range specifier for tramvai dependencies
+         * @description minimal versions are inferred from package.json
+         * @default true
+         */
+        flexibleTramvaiVersions: boolean;
         /**
          * @title list of the dependencies that will be shared
          * @default []

package/lib/utils/tramvaiVersions.d.ts

@@ -0,0 +1,3 @@
+export declare const DEPENDANT_LIBS_MAP: Map<string, string>;
+export declare const isUnifiedVersion: (name: string) => boolean;
+export declare const isDependantLib: (name: string) => boolean;

package/lib/utils/tramvaiVersions.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isDependantLib = exports.isUnifiedVersion = exports.DEPENDANT_LIBS_MAP = void 0;
+// map of packages that is not in unified versioning
+// but we still want to update it
+// actual version to update will be calculated from the some of the @tramvai/module
+exports.DEPENDANT_LIBS_MAP = new Map([
+    ['@tinkoff/logger', '@tramvai/module-log'],
+    ['@tinkoff/dippy', '@tramvai/core'],
+    ['@tinkoff/router', '@tramvai/module-router'],
+    ['@tinkoff/url', '@tramvai/module-common'],
+    ['@tinkoff/errors', '@tramvai/module-common'],
+    ['@tinkoff/roles', '@tramvai/module-authenticate'],
+    ['@tinkoff/pubsub', '@tramvai/module-common'],
+    ['@tinkoff/hook-runner', '@tramvai/module-common'],
+    ['@tinkoff/htmlpagebuilder', '@tramvai/module-render'],
+    ['@tinkoff/browser-timings', '@tramvai/module-metrics'],
+    ['@tinkoff/meta-tags-generate', '@tramvai/module-render'],
+    ['@tinkoff/pack-polyfills', ''],
+    ['@tinkoff/browserslist-config', '@tramvai/cli'],
+]);
+const isUnifiedVersion = (name) => {
+    return name.startsWith('@tramvai');
+};
+exports.isUnifiedVersion = isUnifiedVersion;
+const isDependantLib = (name) => {
+    return exports.DEPENDANT_LIBS_MAP.has(name);
+};
+exports.isDependantLib = isDependantLib;
+//# sourceMappingURL=tramvaiVersions.js.map

package/lib/utils/tramvaiVersions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tramvaiVersions.js","sourceRoot":"","sources":["../../src/utils/tramvaiVersions.ts"],"names":[],"mappings":";;;AAAA,oDAAoD;AACpD,iCAAiC;AACjC,mFAAmF;AACtE,QAAA,kBAAkB,GAAG,IAAI,GAAG,CAAC;IACxC,CAAC,iBAAiB,EAAE,qBAAqB,CAAC;IAC1C,CAAC,gBAAgB,EAAE,eAAe,CAAC;IACnC,CAAC,iBAAiB,EAAE,wBAAwB,CAAC;IAC7C,CAAC,cAAc,EAAE,wBAAwB,CAAC;IAC1C,CAAC,iBAAiB,EAAE,wBAAwB,CAAC;IAC7C,CAAC,gBAAgB,EAAE,8BAA8B,CAAC;IAClD,CAAC,iBAAiB,EAAE,wBAAwB,CAAC;IAC7C,CAAC,sBAAsB,EAAE,wBAAwB,CAAC;IAClD,CAAC,0BAA0B,EAAE,wBAAwB,CAAC;IACtD,CAAC,0BAA0B,EAAE,yBAAyB,CAAC;IACvD,CAAC,6BAA6B,EAAE,wBAAwB,CAAC;IACzD,CAAC,yBAAyB,EAAE,EAAE,CAAC;IAC/B,CAAC,8BAA8B,EAAE,cAAc,CAAC;CACjD,CAAC,CAAC;AAEI,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAE,EAAE;IAC/C,OAAO,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;AACrC,CAAC,CAAC;AAFW,QAAA,gBAAgB,oBAE3B;AAEK,MAAM,cAAc,GAAG,CAAC,IAAY,EAAE,EAAE;IAC7C,OAAO,0BAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AACtC,CAAC,CAAC;AAFW,QAAA,cAAc,kBAEzB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/cli",
-  "version": "2.110.0",
+  "version": "2.111.1",
   "description": "Cli инструмент для сборки и запуска приложений",
   "files": [
     "src",
@@ -56,7 +56,7 @@
     "@discoveryjs/json-ext": "^0.5.7",
     "@fastify/compress": "^6.2.0",
     "@fastify/static": "^6.9.0",
-    "@module-federation/node": "^0.11.1",
+    "@module-federation/node": "^0.15.1",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.10",
     "@sentry/node": "^6.2.5",
     "@svgr/webpack": "^6.5.1",
@@ -71,7 +71,7 @@
     "@tinkoff/utils": "^2.1.3",
     "@tinkoff/webpack-dedupe-plugin": "1.0.5",
     "@tramvai/build": "3.1.3",
-    "@tramvai/react": "2.110.0",
+    "@tramvai/react": "2.111.1",
     "@tramvai/tools-check-versions": "0.4.14",
     "@tramvai/tools-migrate": "0.6.18",
     "ajv": "^6.12.6",
@@ -148,7 +148,7 @@
     "stoppable": "^1.1.0",
     "svgo": "^1.3.2",
     "svgo-loader": "^2.2.2",
-    "terser-webpack-plugin": "^5.3.7",
+    "terser-webpack-plugin": "^5.3.9",
     "text-table": "^0.2.0",
     "thread-loader": "^3.0.4",
     "tsconfig-paths-webpack-plugin": "^4.0.1",
@@ -157,11 +157,11 @@
     "v8-compile-cache": "^2.3.0",
     "validate-npm-package-name": "^3.0.0",
     "wait-on": "^5.3.0",
-    "webpack": "5.76.0",
+    "webpack": "5.85.0",
     "webpack-build-notifier": "^2.3.0",
-    "webpack-bundle-analyzer": "^4.8.0",
+    "webpack-bundle-analyzer": "^4.9.0",
     "webpack-chain": "^6.5.1",
-    "webpack-dev-middleware": "^6.0.1",
+    "webpack-dev-middleware": "^6.1.1",
     "webpack-hot-middleware": "^2.25.3",
     "webpack-stats-plugin": "^1.1.1",
     "webpackbar": "^5.0.2",
@@ -169,7 +169,7 @@
     "wrap-ansi": "^7.0.0"
   },
   "devDependencies": {
-    "@swc/core": "^1.3.36",
+    "@swc/core": "1.3.62",
     "@tramvai/tools-generate-schema": "0.1.4",
     "@types/compression": "^1.7.2",
     "@types/express": "^4.17.13",