@tramvai/cli 5.9.2 → 5.14.9

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

@@ -1 +1 @@
-{"version":3,"file":"filesClient.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/filesClient.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AAExB,kEAAiC;AAEjC,0CAA+D;AAGxD,MAAM,8BAA8B,GACzC,CAAC,aAA4C,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;;IACnE,MAAM,WAAW,GAAG,IAAA,sBAAc,EAAC,aAAa,CAAC,CAAC;IAElD,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,MAAM,CAAC;SACZ,IAAI,CAAC,WAAW,CAAC;SACjB,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAExB,IAAA,qBAAa,EAAC,aAAa,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;IAElD,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,KAAK,CAAC;SACX,IAAI,CAAC,QAAQ,CAAC;SACd,GAAG,CAAC,eAAe,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC;SACtC,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC;SAC7B,GAAG,CAAC,WAAW,EAAE;QAChB,QAAQ,EAAE,CAAC,QAAQ,EAAE,EAAE;YACrB,6DAA6D;YAC7D,sFAAsF;YACtF,OAAO,GAAG,mBAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC;QACtF,CAAC;KACF,CAAC;SACD,GAAG,CAAC,KAAK,CAAC;SACV,MAAM,CAAC,aAAa,CAAC;SACrB,OAAO,CAAC,WAAW,CAAC,CAAC;IAExB,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,eAAe,CAAC;SACrB,IAAI,CAAC,yBAAyB,CAAC;SAC/B,GAAG,CAAC,MAAM,CAAC;SACX,MAAM,CAAC,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,yBAAyB,CAAC,CAAC;SAC1D,GAAG,EAAE,CAAC;IAET,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,OAAO,CAAC;SACb,IAAI,CAAC,oBAAoB,CAAC;SAC1B,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAEjC,IAAI,MAAA,aAAa,CAAC,iBAAiB,0CAAE,OAAO,EAAE;QAC5C,MAAM,CAAC,MAAM;aACV,IAAI,CAAC,oBAAoB,CAAC;aAC1B,IAAI,CAAC,wBAAwB,CAAC;aAC9B,GAAG,CAAC,OAAO,CAAC;aACZ,MAAM,CAAC,sBAAsB,CAAC;aAC9B,OAAO,mBAAO,MAAA,aAAa,CAAC,iBAAiB,0CAAE,OAAe,EAAG;aACjE,GAAG,EAAE;aACL,OAAO,CAAC,KAAK,CAAC,CAAC;KACnB;AACH,CAAC,CAAC;AAjDS,QAAA,8BAA8B,kCAiDvC;AAEJ,kBAAe,sCAA8B,CAAC"}
+{"version":3,"file":"filesClient.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/filesClient.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AAExB,kEAAiC;AAEjC,0CAA+D;AAGxD,MAAM,8BAA8B,GACzC,CAAC,aAA4C,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IACnE,MAAM,WAAW,GAAG,IAAA,sBAAc,EAAC,aAAa,CAAC,CAAC;IAElD,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,MAAM,CAAC;SACZ,IAAI,CAAC,WAAW,CAAC;SACjB,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAExB,IAAA,qBAAa,EAAC,aAAa,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;IAElD,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,KAAK,CAAC;SACX,IAAI,CAAC,QAAQ,CAAC;SACd,GAAG,CAAC,eAAe,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC;SACtC,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC;SAC7B,GAAG,CAAC,WAAW,EAAE;QAChB,QAAQ,EAAE,CAAC,QAAQ,EAAE,EAAE;YACrB,6DAA6D;YAC7D,sFAAsF;YACtF,OAAO,GAAG,mBAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC;QACtF,CAAC;KACF,CAAC;SACD,GAAG,CAAC,KAAK,CAAC;SACV,MAAM,CAAC,aAAa,CAAC;SACrB,OAAO,CAAC,WAAW,CAAC,CAAC;IAExB,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,eAAe,CAAC;SACrB,IAAI,CAAC,yBAAyB,CAAC;SAC/B,GAAG,CAAC,MAAM,CAAC;SACX,MAAM,CAAC,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,yBAAyB,CAAC,CAAC;SAC1D,GAAG,EAAE,CAAC;IAET,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,OAAO,CAAC;SACb,IAAI,CAAC,oBAAoB,CAAC;SAC1B,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IAEjC,IAAI,aAAa,CAAC,iBAAiB,EAAE,OAAO,EAAE;QAC5C,MAAM,CAAC,MAAM;aACV,IAAI,CAAC,oBAAoB,CAAC;aAC1B,IAAI,CAAC,wBAAwB,CAAC;aAC9B,GAAG,CAAC,OAAO,CAAC;aACZ,MAAM,CAAC,sBAAsB,CAAC;aAC9B,OAAO,CAAC,EAAE,GAAI,aAAa,CAAC,iBAAiB,EAAE,OAAe,EAAE,CAAC;aACjE,GAAG,EAAE;aACL,OAAO,CAAC,KAAK,CAAC,CAAC;KACnB;AACH,CAAC,CAAC;AAjDS,QAAA,8BAA8B,kCAiDvC;AAEJ,kBAAe,sCAA8B,CAAC"}

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

@@ -4,7 +4,6 @@ const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
 const files_1 = require("../utils/files");
 exports.default = (configManager) => (config) => {
-    var _a, _b;
     const svgoOptions = (0, files_1.getSvgoOptions)(configManager);
     config.module
         .rule('woff')
@@ -38,13 +37,13 @@ exports.default = (configManager) => (config) => {
         .set('generator', {
         emit: false,
     });
-    if ((_a = configManager.imageOptimization) === null || _a === void 0 ? void 0 : _a.enabled) {
+    if (configManager.imageOptimization?.enabled) {
         config.module
             .rule('image-optimization')
             .test(/\.(gif|png|jpe?g|svg)$/)
             .use('image')
             .loader('image-webpack-loader')
-            .options(Object.assign({}, (_b = configManager.imageOptimization) === null || _b === void 0 ? void 0 : _b.options))
+            .options({ ...configManager.imageOptimization?.options })
             .end()
             .enforce('pre');
     }

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

@@ -1 +1 @@
-{"version":3,"file":"filesServer.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/filesServer.ts"],"names":[],"mappings":";;;AAAA,wDAAwB;AAIxB,0CAA+D;AAE/D,kBAAe,CAAC,aAA4C,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;;IAClF,MAAM,WAAW,GAAG,IAAA,sBAAc,EAAC,aAAa,CAAC,CAAC;IAElD,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,MAAM,CAAC;SACZ,IAAI,CAAC,WAAW,CAAC;SACjB,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC;SACpB,GAAG,CAAC,WAAW,EAAE;QAChB,IAAI,EAAE,KAAK;KACZ,CAAC,CAAC;IAEL,IAAA,qBAAa,EAAC,aAAa,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;IAElD,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,KAAK,CAAC;SACX,IAAI,CAAC,QAAQ,CAAC;SACd,GAAG,CAAC,eAAe,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC;SACtC,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC;SAC3B,GAAG,CAAC,KAAK,CAAC;SACV,MAAM,CAAC,aAAa,CAAC;SACrB,OAAO,CAAC,WAAW,CAAC,CAAC;IAExB,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,eAAe,CAAC;SACrB,IAAI,CAAC,yBAAyB,CAAC;SAC/B,GAAG,CAAC,MAAM,CAAC;SACX,MAAM,CAAC,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,yBAAyB,CAAC,CAAC;SAC1D,OAAO,CAAC;QACP,QAAQ,EAAE,KAAK;KAChB,CAAC;SACD,GAAG,EAAE,CAAC;IAET,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,OAAO,CAAC;SACb,IAAI,CAAC,oBAAoB,CAAC;SAC1B,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC;SAC7B,GAAG,CAAC,WAAW,EAAE;QAChB,IAAI,EAAE,KAAK;KACZ,CAAC,CAAC;IAEL,IAAI,MAAA,aAAa,CAAC,iBAAiB,0CAAE,OAAO,EAAE;QAC5C,MAAM,CAAC,MAAM;aACV,IAAI,CAAC,oBAAoB,CAAC;aAC1B,IAAI,CAAC,wBAAwB,CAAC;aAC9B,GAAG,CAAC,OAAO,CAAC;aACZ,MAAM,CAAC,sBAAsB,CAAC;aAC9B,OAAO,mBAAO,MAAA,aAAa,CAAC,iBAAiB,0CAAE,OAA+B,EAAG;aACjF,GAAG,EAAE;aACL,OAAO,CAAC,KAAK,CAAC,CAAC;KACnB;AACH,CAAC,CAAC"}
+{"version":3,"file":"filesServer.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/filesServer.ts"],"names":[],"mappings":";;;AAAA,wDAAwB;AAIxB,0CAA+D;AAE/D,kBAAe,CAAC,aAA4C,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAClF,MAAM,WAAW,GAAG,IAAA,sBAAc,EAAC,aAAa,CAAC,CAAC;IAElD,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,MAAM,CAAC;SACZ,IAAI,CAAC,WAAW,CAAC;SACjB,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC;SACpB,GAAG,CAAC,WAAW,EAAE;QAChB,IAAI,EAAE,KAAK;KACZ,CAAC,CAAC;IAEL,IAAA,qBAAa,EAAC,aAAa,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;IAElD,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,KAAK,CAAC;SACX,IAAI,CAAC,QAAQ,CAAC;SACd,GAAG,CAAC,eAAe,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC;SACtC,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC;SAC3B,GAAG,CAAC,KAAK,CAAC;SACV,MAAM,CAAC,aAAa,CAAC;SACrB,OAAO,CAAC,WAAW,CAAC,CAAC;IAExB,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,eAAe,CAAC;SACrB,IAAI,CAAC,yBAAyB,CAAC;SAC/B,GAAG,CAAC,MAAM,CAAC;SACX,MAAM,CAAC,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,yBAAyB,CAAC,CAAC;SAC1D,OAAO,CAAC;QACP,QAAQ,EAAE,KAAK;KAChB,CAAC;SACD,GAAG,EAAE,CAAC;IAET,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,OAAO,CAAC;SACb,IAAI,CAAC,oBAAoB,CAAC;SAC1B,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC;SAC7B,GAAG,CAAC,WAAW,EAAE;QAChB,IAAI,EAAE,KAAK;KACZ,CAAC,CAAC;IAEL,IAAI,aAAa,CAAC,iBAAiB,EAAE,OAAO,EAAE;QAC5C,MAAM,CAAC,MAAM;aACV,IAAI,CAAC,oBAAoB,CAAC;aAC1B,IAAI,CAAC,wBAAwB,CAAC;aAC9B,GAAG,CAAC,OAAO,CAAC;aACZ,MAAM,CAAC,sBAAsB,CAAC;aAC9B,OAAO,CAAC,EAAE,GAAI,aAAa,CAAC,iBAAiB,EAAE,OAA+B,EAAE,CAAC;aACjF,GAAG,EAAE;aACL,OAAO,CAAC,KAAK,CAAC,CAAC;KACnB;AACH,CAAC,CAAC"}

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

@@ -13,7 +13,10 @@ exports.default = (configManager) => (config) => {
         });
     }
     config.plugin('provide').use(webpack_1.default.ProvidePlugin, [
-        Object.assign({ process: 'process' }, configManager.webpack.provide),
+        {
+            process: 'process',
+            ...configManager.webpack.provide,
+        },
     ]);
 };
 //# sourceMappingURL=nodeClient.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"nodeClient.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/nodeClient.ts"],"names":[],"mappings":";;;AAAA,8DAA8B;AAK9B,kBAAe,CAAC,aAA4C,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAClF,6DAA6D;IAC7D,+EAA+E;IAC/E,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAErE,MAAM,mBAAmB,GAAG,aAAa,CAAC,OAAO,CAAC,YAAY,CAAC;IAC/D,IAAI,mBAAmB,EAAE;QACvB,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YAC3D,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;KACJ;IAED,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,iBAAO,CAAC,aAAa,EAAE;wBAEhD,OAAO,EAAE,SAAS,IACd,aAAa,CAAC,OAAO,CAAC,OAA+B;KAE5D,CAAC,CAAC;AACL,CAAC,CAAC"}
+{"version":3,"file":"nodeClient.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/nodeClient.ts"],"names":[],"mappings":";;;AAAA,8DAA8B;AAK9B,kBAAe,CAAC,aAA4C,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAClF,6DAA6D;IAC7D,+EAA+E;IAC/E,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAErE,MAAM,mBAAmB,GAAG,aAAa,CAAC,OAAO,CAAC,YAAY,CAAC;IAC/D,IAAI,mBAAmB,EAAE;QACvB,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YAC3D,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;KACJ;IAED,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,iBAAO,CAAC,aAAa,EAAE;QAClD;YACE,OAAO,EAAE,SAAS;YAClB,GAAI,aAAa,CAAC,OAAO,CAAC,OAA+B;SAC1D;KACF,CAAC,CAAC;AACL,CAAC,CAAC"}

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

@@ -22,10 +22,23 @@ exports.default = (configManager) => (config) => {
             {
                 minify: minifier,
                 extractComments: false,
-                terserOptions: Object.assign(Object.assign({}, tramvaiReactProfileTerserOptions), { ecma: 6, mangle: false, output: Object.assign(Object.assign({ comments: true, semicolons: false, preserve_annotations: true }, (minifierValueFromConfig === 'swc' ? {} : { indent_start: 2 })), { beautify: true }), compress: {
+                terserOptions: {
+                    ...tramvaiReactProfileTerserOptions,
+                    ecma: 6,
+                    mangle: false,
+                    output: {
+                        comments: true,
+                        semicolons: false,
+                        preserve_annotations: true,
+                        // currently doesn't support by swc
+                        ...(minifierValueFromConfig === 'swc' ? {} : { indent_start: 2 }),
+                        beautify: true,
+                    },
+                    compress: {
                         passes: 2,
                         drop_debugger: !debug,
-                    } }),
+                    },
+                },
             },
         ]);
         return;
@@ -36,16 +49,22 @@ exports.default = (configManager) => (config) => {
             extractComments: false,
             minify: minifier,
             parallel: terser.parallel,
-            terserOptions: Object.assign(Object.assign({}, tramvaiReactProfileTerserOptions), { ecma: modern ? 6 : 5, mangle: {
+            terserOptions: {
+                ...tramvaiReactProfileTerserOptions,
+                ecma: modern ? 6 : 5,
+                mangle: {
                     // https://github.com/node-fetch/node-fetch/issues/667
                     // иначе AbortSignal минифицируется и на сервере падает ошибка в node-fetch
                     reserved: ['AbortSignal'],
-                }, output: {
+                },
+                output: {
                     comments: false,
-                }, compress: {
+                },
+                compress: {
                     passes: 2,
                     drop_debugger: !debug,
-                } }),
+                },
+            },
         },
     ]);
     if (configManager.cssMinimize === 'csso') {

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,MAAM,4BAA4B,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC;IACzE,MAAM,gCAAgC,GAAG;QACvC,WAAW,EAAE,4BAA4B;QACzC,eAAe,EAAE,4BAA4B;KAC9C,CAAC;IAEF,MAAM,uBAAuB,GAAG,aAAa,CAAC,WAAW,CAAC,QAAQ,CAAC;IACnE,MAAM,QAAQ,GACZ,uBAAuB,KAAK,KAAK,CAAC,CAAC,CAAC,+BAAY,CAAC,SAAS,CAAC,CAAC,CAAC,+BAAY,CAAC,YAAY,CAAC;IAEzF,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,MAAM,EAAE,QAAQ;gBAChB,eAAe,EAAE,KAAK;gBACtB,aAAa,kCACR,gCAAgC,KACnC,IAAI,EAAE,CAAC,EACP,MAAM,EAAE,KAAK,EACb,MAAM,gCACJ,QAAQ,EAAE,IAAI,EACd,UAAU,EAAE,KAAK,EACjB,oBAAoB,EAAE,IAAI,IAEvB,CAAC,uBAAuB,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC,KACjE,QAAQ,EAAE,IAAI,KAEhB,QAAQ,EAAE;wBACR,MAAM,EAAE,CAAC;wBACT,aAAa,EAAE,CAAC,KAAK;qBACtB,GACF;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,MAAM,EAAE,QAAQ;YAChB,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,aAAa,kCACR,gCAAgC,KACnC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EACpB,MAAM,EAAE;oBACN,sDAAsD;oBACtD,2EAA2E;oBAC3E,QAAQ,EAAE,CAAC,aAAa,CAAC;iBAC1B,EACD,MAAM,EAAE;oBACN,QAAQ,EAAE,KAAK;iBAChB,EACD,QAAQ,EAAE;oBACR,MAAM,EAAE,CAAC;oBACT,aAAa,EAAE,CAAC,KAAK;iBACtB,GACF;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,MAAM,4BAA4B,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC;IACzE,MAAM,gCAAgC,GAAG;QACvC,WAAW,EAAE,4BAA4B;QACzC,eAAe,EAAE,4BAA4B;KAC9C,CAAC;IAEF,MAAM,uBAAuB,GAAG,aAAa,CAAC,WAAW,CAAC,QAAQ,CAAC;IACnE,MAAM,QAAQ,GACZ,uBAAuB,KAAK,KAAK,CAAC,CAAC,CAAC,+BAAY,CAAC,SAAS,CAAC,CAAC,CAAC,+BAAY,CAAC,YAAY,CAAC;IAEzF,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,MAAM,EAAE,QAAQ;gBAChB,eAAe,EAAE,KAAK;gBACtB,aAAa,EAAE;oBACb,GAAG,gCAAgC;oBACnC,IAAI,EAAE,CAAC;oBACP,MAAM,EAAE,KAAK;oBACb,MAAM,EAAE;wBACN,QAAQ,EAAE,IAAI;wBACd,UAAU,EAAE,KAAK;wBACjB,oBAAoB,EAAE,IAAI;wBAC1B,mCAAmC;wBACnC,GAAG,CAAC,uBAAuB,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;wBACjE,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,MAAM,EAAE,QAAQ;YAChB,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,aAAa,EAAE;gBACb,GAAG,gCAAgC;gBACnC,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/blocks/postcssAssets.js

@@ -6,10 +6,9 @@ const path_1 = tslib_1.__importDefault(require("path"));
 const postcss_assets_webpack_plugin_1 = tslib_1.__importDefault(require("postcss-assets-webpack-plugin"));
 const safeRequire_1 = require("../../../utils/safeRequire");
 const postcssAssetsWebpackRulesFactory = (configManager) => (config) => {
-    var _a;
     const { postcss: { assetsConfig: postcssAssetsConfigPath = '' }, } = configManager;
     const postcssAssetsConfig = postcssAssetsConfigPath
-        ? (_a = (0, safeRequire_1.safeRequire)(path_1.default.resolve(configManager.rootDir, postcssAssetsConfigPath))) !== null && _a !== void 0 ? _a : {
+        ? (0, safeRequire_1.safeRequire)(path_1.default.resolve(configManager.rootDir, postcssAssetsConfigPath)) ?? {
             plugins: [],
         }
         : { plugins: [] };

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

@@ -1 +1 @@
-{"version":3,"file":"postcssAssets.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/postcssAssets.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AAExB,0GAAgE;AAGhE,4DAAyD;AAGlD,MAAM,gCAAgC,GAC3C,CAAC,aAA4C,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;;IACnE,MAAM,EACJ,OAAO,EAAE,EAAE,YAAY,EAAE,uBAAuB,GAAG,EAAE,EAAE,GACxD,GAAG,aAAa,CAAC;IAElB,MAAM,mBAAmB,GAAG,uBAAuB;QACjD,CAAC,CAAC,MAAA,IAAA,yBAAW,EAAC,cAAI,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,EAAE,uBAAuB,CAAC,CAAC,mCAAI;YAC3E,OAAO,EAAE,EAAE;SACZ;QACH,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;IAEpB,IAAI,mBAAmB,CAAC,OAAO,CAAC,MAAM,EAAE;QACtC,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,GAAG,CAAC,uCAAmB,EAAE;YACvD;gBACE,IAAI,EAAE,QAAQ;gBACd,GAAG,EAAE,KAAK;gBACV,OAAO,EAAE,mBAAmB,CAAC,OAAO;aACrC;SACF,CAAC,CAAC;KACJ;AACH,CAAC,CAAC;AArBS,QAAA,gCAAgC,oCAqBzC;AAEJ,kBAAe,wCAAgC,CAAC"}
+{"version":3,"file":"postcssAssets.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/postcssAssets.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AAExB,0GAAgE;AAGhE,4DAAyD;AAGlD,MAAM,gCAAgC,GAC3C,CAAC,aAA4C,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IACnE,MAAM,EACJ,OAAO,EAAE,EAAE,YAAY,EAAE,uBAAuB,GAAG,EAAE,EAAE,GACxD,GAAG,aAAa,CAAC;IAElB,MAAM,mBAAmB,GAAG,uBAAuB;QACjD,CAAC,CAAC,IAAA,yBAAW,EAAC,cAAI,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,EAAE,uBAAuB,CAAC,CAAC,IAAI;YAC3E,OAAO,EAAE,EAAE;SACZ;QACH,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;IAEpB,IAAI,mBAAmB,CAAC,OAAO,CAAC,MAAM,EAAE;QACtC,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,GAAG,CAAC,uCAAmB,EAAE;YACvD;gBACE,IAAI,EAAE,QAAQ;gBACd,GAAG,EAAE,KAAK;gBACV,OAAO,EAAE,mBAAmB,CAAC,OAAO;aACrC;SACF,CAAC,CAAC;KACJ;AACH,CAAC,CAAC;AArBS,QAAA,gCAAgC,oCAqBzC;AAEJ,kBAAe,wCAAgC,CAAC"}

package/lib/library/webpack/blocks/pwa/client.js

@@ -12,16 +12,15 @@ const shared_1 = require("./shared");
 const pwaBlock = 
 // eslint-disable-next-line max-statements
 (configManager) => (config) => {
-    var _a, _b, _c, _d, _e, _f, _g;
     const { experiments: { pwa }, rootDir, root, output, env, modern, sourceMap, assetsPrefix, } = configManager;
     config.batch((0, shared_1.pwaSharedBlock)(configManager));
     if (!(0, safeRequire_1.safeRequireResolve)('@tramvai/module-progressive-web-app', true) &&
-        (((_a = pwa.workbox) === null || _a === void 0 ? void 0 : _a.enabled) || ((_b = pwa.webmanifest) === null || _b === void 0 ? void 0 : _b.enabled))) {
+        (pwa.workbox?.enabled || pwa.webmanifest?.enabled)) {
         throw Error('PWA functional requires @tramvai/module-progressive-web-app installed');
     }
-    if ((_c = pwa.workbox) === null || _c === void 0 ? void 0 : _c.enabled) {
-        const swSrc = path_1.default.join(rootDir, root, (_d = pwa.sw) === null || _d === void 0 ? void 0 : _d.src);
-        const swDest = path_1.default.join(rootDir, output.client, (_e = pwa.sw) === null || _e === void 0 ? void 0 : _e.dest);
+    if (pwa.workbox?.enabled) {
+        const swSrc = path_1.default.join(rootDir, root, pwa.sw?.src);
+        const swDest = path_1.default.join(rootDir, output.client, pwa.sw?.dest);
         if (!fs_1.default.existsSync(swSrc)) {
             throw Error(`PWA workbox enabled but Service Worker source file not found by path ${swSrc}`);
         }
@@ -42,13 +41,15 @@ const pwaBlock =
                     return {
                         // we need to have a relative webmanifest url for precaching
                         manifest: manifest.map((asset) => {
-                            var _a;
                             const assetName = asset.url.replace(assetsPrefix, '');
                             // in development build `publicPath` is localhost, in production is empty string
-                            const publicPath = ((_a = compilation.outputOptions) === null || _a === void 0 ? void 0 : _a.publicPath) || assetsPrefix;
+                            const publicPath = compilation.outputOptions?.publicPath || assetsPrefix;
                             const assetInfo = compilation.assetsInfo.get(asset.url.replace(publicPath, ''));
-                            if (assetInfo === null || assetInfo === void 0 ? void 0 : assetInfo._webmanifestFilename) {
-                                return Object.assign(Object.assign({}, asset), { url: `${pwa.sw.scope}${assetName}` });
+                            if (assetInfo?._webmanifestFilename) {
+                                return {
+                                    ...asset,
+                                    url: `${pwa.sw.scope}${assetName}`,
+                                };
                             }
                             return asset;
                         }),
@@ -97,11 +98,14 @@ const pwaBlock =
             config.output.set('devtoolNamespace', 'tramvai');
         }
         config.plugin('define').tap((args) => [
-            Object.assign(Object.assign({}, args[0]), { 'process.env.ASSETS_PREFIX': JSON.stringify(assetsPrefix) }),
+            {
+                ...args[0],
+                'process.env.ASSETS_PREFIX': JSON.stringify(assetsPrefix),
+            },
         ]);
         config.plugin('workbox').use(workboxPlugin);
     }
-    if ((_f = pwa.webmanifest) === null || _f === void 0 ? void 0 : _f.enabled) {
+    if (pwa.webmanifest?.enabled) {
         const webmanifestPlugin = new WebManifestPlugin_1.WebManifestPlugin({
             manifest: pwa.webmanifest,
             icon: pwa.icon,
@@ -109,9 +113,13 @@ const pwaBlock =
         });
         config.plugin('webmanifest').use(webmanifestPlugin);
     }
-    if ((_g = pwa.icon) === null || _g === void 0 ? void 0 : _g.src) {
+    if (pwa.icon?.src) {
         const iconSrc = path_1.default.join(rootDir, root, pwa.icon.src);
-        const pwaIconsPlugin = new PwaIconsPlugin_1.PwaIconsPlugin(Object.assign(Object.assign({}, pwa.icon), { src: iconSrc, mode: configManager.env }));
+        const pwaIconsPlugin = new PwaIconsPlugin_1.PwaIconsPlugin({
+            ...pwa.icon,
+            src: iconSrc,
+            mode: configManager.env,
+        });
         config.plugin('pwa-icons').use(pwaIconsPlugin);
     }
 };

package/lib/library/webpack/blocks/pwa/client.js.map

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

package/lib/library/webpack/blocks/pwa/shared.js

@@ -5,16 +5,21 @@ const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
 const pwaSharedBlock = (configManager) => (config) => {
     const { experiments: { pwa }, rootDir, root, modern, } = configManager;
-    config.plugin('define').tap((args) => {
-        var _a, _b, _c, _d, _e, _f, _g;
-        return [
-            Object.assign(Object.assign({}, args[0]), { 'process.env.TRAMVAI_PWA_WORKBOX_ENABLED': JSON.stringify((_a = pwa.workbox) === null || _a === void 0 ? void 0 : _a.enabled), 
-                // @todo duplicated logic with path.join
-                'process.env.TRAMVAI_PWA_SW_SRC': JSON.stringify(path_1.default.join(rootDir, root, (_b = pwa.sw) === null || _b === void 0 ? void 0 : _b.src)), 'process.env.TRAMVAI_PWA_SW_DEST': JSON.stringify((_c = pwa.sw) === null || _c === void 0 ? void 0 : _c.dest), 'process.env.TRAMVAI_PWA_SW_SCOPE': JSON.stringify((_d = pwa.sw) === null || _d === void 0 ? void 0 : _d.scope), 'process.env.TRAMVAI_PWA_MANIFEST_ENABLED': JSON.stringify((_e = pwa.webmanifest) === null || _e === void 0 ? void 0 : _e.enabled), 'process.env.TRAMVAI_PWA_MANIFEST_DEST': JSON.stringify((_f = pwa.webmanifest) === null || _f === void 0 ? void 0 : _f.dest), 'process.env.TRAMVAI_PWA_META': `'${JSON.stringify((_g = pwa === null || pwa === void 0 ? void 0 : pwa.meta) !== null && _g !== void 0 ? _g : {})}'`, 
-                // allows to detect that sw.modern.js is exists or not
-                'process.env.TRAMVAI_MODERN_BUILD': JSON.stringify(modern) }),
-        ];
-    });
+    config.plugin('define').tap((args) => [
+        {
+            ...args[0],
+            'process.env.TRAMVAI_PWA_WORKBOX_ENABLED': JSON.stringify(pwa.workbox?.enabled),
+            // @todo duplicated logic with path.join
+            'process.env.TRAMVAI_PWA_SW_SRC': JSON.stringify(path_1.default.join(rootDir, root, pwa.sw?.src)),
+            'process.env.TRAMVAI_PWA_SW_DEST': JSON.stringify(pwa.sw?.dest),
+            'process.env.TRAMVAI_PWA_SW_SCOPE': JSON.stringify(pwa.sw?.scope),
+            'process.env.TRAMVAI_PWA_MANIFEST_ENABLED': JSON.stringify(pwa.webmanifest?.enabled),
+            'process.env.TRAMVAI_PWA_MANIFEST_DEST': JSON.stringify(pwa.webmanifest?.dest),
+            'process.env.TRAMVAI_PWA_META': `'${JSON.stringify(pwa?.meta ?? {})}'`,
+            // allows to detect that sw.modern.js is exists or not
+            'process.env.TRAMVAI_MODERN_BUILD': JSON.stringify(modern),
+        },
+    ]);
 };
 exports.pwaSharedBlock = pwaSharedBlock;
 //# sourceMappingURL=shared.js.map

package/lib/library/webpack/blocks/pwa/shared.js.map

@@ -1 +1 @@
-{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../../src/library/webpack/blocks/pwa/shared.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AAKjB,MAAM,cAAc,GACzB,CAAC,aAAoD,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAC3E,MAAM,EACJ,WAAW,EAAE,EAAE,GAAG,EAAE,EACpB,OAAO,EACP,IAAI,EACJ,MAAM,GACP,GAAG,aAAa,CAAC;IAElB,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;;QAAC,OAAA;4CAE/B,IAAI,CAAC,CAAC,CAAC,KACV,yCAAyC,EAAE,IAAI,CAAC,SAAS,CAAC,MAAA,GAAG,CAAC,OAAO,0CAAE,OAAO,CAAC;gBAC/E,wCAAwC;gBACxC,gCAAgC,EAAE,IAAI,CAAC,SAAS,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,MAAA,GAAG,CAAC,EAAE,0CAAE,GAAG,CAAC,CAAC,EACvF,iCAAiC,EAAE,IAAI,CAAC,SAAS,CAAC,MAAA,GAAG,CAAC,EAAE,0CAAE,IAAI,CAAC,EAC/D,kCAAkC,EAAE,IAAI,CAAC,SAAS,CAAC,MAAA,GAAG,CAAC,EAAE,0CAAE,KAAK,CAAC,EACjE,0CAA0C,EAAE,IAAI,CAAC,SAAS,CAAC,MAAA,GAAG,CAAC,WAAW,0CAAE,OAAO,CAAC,EACpF,uCAAuC,EAAE,IAAI,CAAC,SAAS,CAAC,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,EAC9E,8BAA8B,EAAE,IAAI,IAAI,CAAC,SAAS,CAAC,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,mCAAI,EAAE,CAAC,GAAG;gBACtE,sDAAsD;gBACtD,kCAAkC,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;SAE7D,CAAA;KAAA,CAAC,CAAC;AACL,CAAC,CAAC;AAxBS,QAAA,cAAc,kBAwBvB"}
+{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../../src/library/webpack/blocks/pwa/shared.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AAKjB,MAAM,cAAc,GACzB,CAAC,aAAoD,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAC3E,MAAM,EACJ,WAAW,EAAE,EAAE,GAAG,EAAE,EACpB,OAAO,EACP,IAAI,EACJ,MAAM,GACP,GAAG,aAAa,CAAC;IAElB,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;QACpC;YACE,GAAG,IAAI,CAAC,CAAC,CAAC;YACV,yCAAyC,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC;YAC/E,wCAAwC;YACxC,gCAAgC,EAAE,IAAI,CAAC,SAAS,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;YACvF,iCAAiC,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC;YAC/D,kCAAkC,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,EAAE,KAAK,CAAC;YACjE,0CAA0C,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC;YACpF,uCAAuC,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC;YAC9E,8BAA8B,EAAE,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,IAAI,EAAE,CAAC,GAAG;YACtE,sDAAsD;YACtD,kCAAkC,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;SAC3D;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AAxBS,QAAA,cAAc,kBAwBvB"}

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

@@ -11,7 +11,6 @@ const dev_1 = tslib_1.__importDefault(require("../../common/dev"));
 const extendEntry_1 = require("../../utils/extendEntry");
 const fancy_1 = tslib_1.__importDefault(require("../../plugins/WebpackBar/reporters/fancy"));
 const webpackClientConfig = ({ configManager, showProgress, }) => {
-    var _a, _b;
     const config = new webpack_chain_1.default();
     config.batch((0, common_1.default)(configManager));
     config.batch((0, dev_1.default)(configManager));
@@ -25,15 +24,23 @@ const webpackClientConfig = ({ configManager, showProgress, }) => {
         ]);
     }
     config.plugin('define').tap((args) => [
-        Object.assign(Object.assign({}, args[0]), { 'process.env.NODE_ENV': '"development"' }),
+        {
+            ...args[0],
+            'process.env.NODE_ENV': '"development"',
+        },
     ]);
     const { hotRefresh } = configManager;
-    if (hotRefresh === null || hotRefresh === void 0 ? void 0 : hotRefresh.enabled) {
+    if (hotRefresh?.enabled) {
         config.plugin('hot-module').use(webpack_1.default.HotModuleReplacementPlugin);
         config.plugin('react-refresh').use(react_refresh_webpack_plugin_1.default, [
-            Object.assign(Object.assign({}, hotRefresh.options), { overlay: typeof ((_a = hotRefresh.options) === null || _a === void 0 ? void 0 : _a.overlay) === 'boolean'
+            {
+                ...hotRefresh.options,
+                overlay: typeof hotRefresh.options?.overlay === 'boolean'
                     ? hotRefresh.options.overlay
-                    : Object.assign({}, (_b = hotRefresh.options) === null || _b === void 0 ? void 0 : _b.overlay) }),
+                    : {
+                        ...hotRefresh.options?.overlay,
+                    },
+            },
         ]);
         (0, extendEntry_1.extendEntry)(config.entry(configManager.name), {
             import: [

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

@@ -1 +1 @@
-{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../../../../src/library/webpack/child-app/client/dev.ts"],"names":[],"mappings":";;;;AAAA,0EAAmC;AACnC,oEAAoC;AACpC,8DAA8B;AAC9B,gHAAsE;AAEtE,8DAA8B;AAC9B,mEAAyC;AAEzC,yDAAsD;AAEtD,6FAAqE;AAE9D,MAAM,mBAAmB,GAAG,CAAC,EAClC,aAAa,EACb,YAAY,GAIb,EAAE,EAAE;;IACH,MAAM,MAAM,GAAG,IAAI,uBAAM,EAAE,CAAC;IAE5B,MAAM,CAAC,KAAK,CAAC,IAAA,gBAAM,EAAC,aAAa,CAAC,CAAC,CAAC;IACpC,MAAM,CAAC,KAAK,CAAC,IAAA,aAAS,EAAC,aAAa,CAAC,CAAC,CAAC;IAEvC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAE3B,IAAI,YAAY,EAAE;QAChB,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,oBAAU,EAAE;YACxC;gBACE,IAAI,EAAE,kBAAkB;gBACxB,SAAS,EAAE,CAAC,IAAI,eAAa,EAAE,CAAC;aACjC;SACF,CAAC,CAAC;KACJ;IAED,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;wCAE/B,IAAI,CAAC,CAAC,CAAC,KACV,sBAAsB,EAAE,eAAe;KAE1C,CAAC,CAAC;IAEH,MAAM,EAAE,UAAU,EAAE,GAAG,aAAa,CAAC;IAErC,IAAI,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,OAAO,EAAE;QACvB,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,iBAAO,CAAC,0BAA0B,CAAC,CAAC;QACpE,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,sCAAkB,EAAE;4CAEhD,UAAU,CAAC,OAAO,KACrB,OAAO,EACL,OAAO,CAAA,MAAA,UAAU,CAAC,OAAO,0CAAE,OAAO,CAAA,KAAK,SAAS;oBAC9C,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO;oBAC5B,CAAC,mBACM,MAAA,UAAU,CAAC,OAAO,0CAAE,OAAO,CAC/B;SAEV,CAAC,CAAC;QAEH,IAAA,yBAAW,EAAC,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE;YAC5C,MAAM,EAAE;gBACN,qFAAqF;aACtF;SACF,CAAC,CAAC;KACJ;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAtDW,QAAA,mBAAmB,uBAsD9B"}
+{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../../../../src/library/webpack/child-app/client/dev.ts"],"names":[],"mappings":";;;;AAAA,0EAAmC;AACnC,oEAAoC;AACpC,8DAA8B;AAC9B,gHAAsE;AAEtE,8DAA8B;AAC9B,mEAAyC;AAEzC,yDAAsD;AAEtD,6FAAqE;AAE9D,MAAM,mBAAmB,GAAG,CAAC,EAClC,aAAa,EACb,YAAY,GAIb,EAAE,EAAE;IACH,MAAM,MAAM,GAAG,IAAI,uBAAM,EAAE,CAAC;IAE5B,MAAM,CAAC,KAAK,CAAC,IAAA,gBAAM,EAAC,aAAa,CAAC,CAAC,CAAC;IACpC,MAAM,CAAC,KAAK,CAAC,IAAA,aAAS,EAAC,aAAa,CAAC,CAAC,CAAC;IAEvC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAE3B,IAAI,YAAY,EAAE;QAChB,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,oBAAU,EAAE;YACxC;gBACE,IAAI,EAAE,kBAAkB;gBACxB,SAAS,EAAE,CAAC,IAAI,eAAa,EAAE,CAAC;aACjC;SACF,CAAC,CAAC;KACJ;IAED,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;QACpC;YACE,GAAG,IAAI,CAAC,CAAC,CAAC;YACV,sBAAsB,EAAE,eAAe;SACxC;KACF,CAAC,CAAC;IAEH,MAAM,EAAE,UAAU,EAAE,GAAG,aAAa,CAAC;IAErC,IAAI,UAAU,EAAE,OAAO,EAAE;QACvB,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,iBAAO,CAAC,0BAA0B,CAAC,CAAC;QACpE,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,sCAAkB,EAAE;YACrD;gBACE,GAAG,UAAU,CAAC,OAAO;gBACrB,OAAO,EACL,OAAO,UAAU,CAAC,OAAO,EAAE,OAAO,KAAK,SAAS;oBAC9C,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO;oBAC5B,CAAC,CAAC;wBACE,GAAG,UAAU,CAAC,OAAO,EAAE,OAAO;qBAC/B;aACR;SACF,CAAC,CAAC;QAEH,IAAA,yBAAW,EAAC,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE;YAC5C,MAAM,EAAE;gBACN,qFAAqF;aACtF;SACF,CAAC,CAAC;KACJ;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAtDW,QAAA,mBAAmB,uBAsD9B"}

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

@@ -11,7 +11,6 @@ const DEFAULT_DEPENDENCIES_LIST = [
     '@tramvai/core',
 ];
 const getSharedModules = (configManager) => {
-    var _a;
     const { rootDir, type, shared: { deps, defaultTramvaiDependencies }, } = configManager;
     const isChild = type === 'child-app';
     const packageJson = (0, safeRequire_1.safeRequire)(path_1.default.resolve(rootDir, 'package.json'), true);
@@ -23,34 +22,35 @@ const getSharedModules = (configManager) => {
         else if (type === 'application') {
             // 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']) {
+            if (packageJson?.dependencies?.['@tramvai/module-child-app']) {
                 defaultDependenciesList = DEFAULT_DEPENDENCIES_LIST;
             }
         }
     }
-    return Object.assign(Object.assign({}, defaultDependenciesList.concat(deps).reduce((acc, dep) => {
-        var _a, _b;
-        const { name, singleton = false } = typeof dep === 'string' ? { name: dep } : dep;
-        acc[name] = {
-            import: name,
-            eager: !isChild,
-            singleton,
-        };
-        if (configManager.experiments.autoResolveSharedRequiredVersions) {
-            const isTramvai = (0, tramvaiVersions_1.isUnifiedVersion)(name) || (0, tramvaiVersions_1.isDependantLib)(name);
-            const version = (_a = packageJson.dependencies[name]) !== null && _a !== void 0 ? _a : (_b = require(`${name}/package.json`)) === null || _b === void 0 ? void 0 : _b.version;
-            if (isTramvai && version && version !== '0.0.0-stub') {
-                acc[name].requiredVersion = version[0].match(/[0-9]/)
-                    ? `^${version}`
-                    : // TODO: what about `>`. `<`, `*`, `=`?
-                        version.replace(/~/, '^');
-            }
-            else if (version) {
-                acc[name].requiredVersion = version;
+    return {
+        ...defaultDependenciesList.concat(deps).reduce((acc, dep) => {
+            const { name, singleton = false } = typeof dep === 'string' ? { name: dep } : dep;
+            acc[name] = {
+                import: name,
+                eager: !isChild,
+                singleton,
+            };
+            if (configManager.experiments.autoResolveSharedRequiredVersions) {
+                const isTramvai = (0, tramvaiVersions_1.isUnifiedVersion)(name) || (0, tramvaiVersions_1.isDependantLib)(name);
+                const version = packageJson.dependencies[name] ?? require(`${name}/package.json`)?.version;
+                if (isTramvai && version && version !== '0.0.0-stub') {
+                    acc[name].requiredVersion = version[0].match(/[0-9]/)
+                        ? `^${version}`
+                        : // TODO: what about `>`. `<`, `*`, `=`?
+                            version.replace(/~/, '^');
+                }
+                else if (version) {
+                    acc[name].requiredVersion = version;
+                }
             }
-        }
-        return acc;
-    }, {})), { react: {
+            return acc;
+        }, {}),
+        react: {
             // singleton to be sure the only one version of library is used
             singleton: true,
             // to load this library as soon as possible
@@ -59,22 +59,26 @@ const getSharedModules = (configManager) => {
             // for root-app just import module as usual
             import: isChild ? false : 'react',
             requiredVersion: false,
-        }, 'react-dom': {
+        },
+        'react-dom': {
             singleton: true,
             eager: !isChild,
             import: isChild ? false : 'react-dom',
             requiredVersion: false,
-        }, 'react/jsx-runtime': {
+        },
+        'react/jsx-runtime': {
             singleton: true,
             eager: !isChild,
             import: isChild ? false : 'react/jsx-runtime',
             requiredVersion: false,
-        }, 'react/jsx-dev-runtime': {
+        },
+        'react/jsx-dev-runtime': {
             singleton: true,
             eager: !isChild,
             import: isChild ? false : 'react/jsx-dev-runtime',
             requiredVersion: false,
-        } });
+        },
+    };
 };
 exports.getSharedModules = getSharedModules;
 //# sourceMappingURL=moduleFederationShared.js.map

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

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

package/lib/library/webpack/child-app/server/dev.js

@@ -22,7 +22,10 @@ const webpackServerConfig = ({ configManager, showProgress, }) => {
         ]);
     }
     config.plugin('define').tap((args) => [
-        Object.assign(Object.assign({}, args[0]), { 'process.env.NODE_ENV': '"development"' }),
+        {
+            ...args[0],
+            'process.env.NODE_ENV': '"development"',
+        },
     ]);
     return config;
 };

package/lib/library/webpack/child-app/server/dev.js.map

@@ -1 +1 @@
-{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../../../../src/library/webpack/child-app/server/dev.ts"],"names":[],"mappings":";;;;AAAA,0EAAmC;AACnC,oEAAoC;AAEpC,8DAA8B;AAC9B,mEAAyC;AAGzC,6FAAqE;AAE9D,MAAM,mBAAmB,GAAG,CAAC,EAClC,aAAa,EACb,YAAY,GAIb,EAAE,EAAE;IACH,MAAM,MAAM,GAAG,IAAI,uBAAM,EAAE,CAAC;IAE5B,MAAM,CAAC,KAAK,CAAC,IAAA,gBAAM,EAAC,aAAa,CAAC,CAAC,CAAC;IACpC,MAAM,CAAC,KAAK,CAAC,IAAA,aAAS,EAAC,aAAa,CAAC,CAAC,CAAC;IAEvC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAE3B,IAAI,YAAY,EAAE;QAChB,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,oBAAU,EAAE;YACxC;gBACE,IAAI,EAAE,kBAAkB;gBACxB,KAAK,EAAE,QAAQ;gBACf,SAAS,EAAE,CAAC,IAAI,eAAa,EAAE,CAAC;aACjC;SACF,CAAC,CAAC;KACJ;IAED,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;wCAE/B,IAAI,CAAC,CAAC,CAAC,KACV,sBAAsB,EAAE,eAAe;KAE1C,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAhCW,QAAA,mBAAmB,uBAgC9B"}
+{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../../../../src/library/webpack/child-app/server/dev.ts"],"names":[],"mappings":";;;;AAAA,0EAAmC;AACnC,oEAAoC;AAEpC,8DAA8B;AAC9B,mEAAyC;AAGzC,6FAAqE;AAE9D,MAAM,mBAAmB,GAAG,CAAC,EAClC,aAAa,EACb,YAAY,GAIb,EAAE,EAAE;IACH,MAAM,MAAM,GAAG,IAAI,uBAAM,EAAE,CAAC;IAE5B,MAAM,CAAC,KAAK,CAAC,IAAA,gBAAM,EAAC,aAAa,CAAC,CAAC,CAAC;IACpC,MAAM,CAAC,KAAK,CAAC,IAAA,aAAS,EAAC,aAAa,CAAC,CAAC,CAAC;IAEvC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAE3B,IAAI,YAAY,EAAE;QAChB,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,oBAAU,EAAE;YACxC;gBACE,IAAI,EAAE,kBAAkB;gBACxB,KAAK,EAAE,QAAQ;gBACf,SAAS,EAAE,CAAC,IAAI,eAAa,EAAE,CAAC;aACjC;SACF,CAAC,CAAC;KACJ;IAED,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;QACpC;YACE,GAAG,IAAI,CAAC,CAAC,CAAC;YACV,sBAAsB,EAAE,eAAe;SACxC;KACF,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAhCW,QAAA,mBAAmB,uBAgC9B"}

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

@@ -16,7 +16,10 @@ For further details refer to doc - https://tramvai.dev/docs/mistakes/duplicate-d
 exports.default = (configManager) => (config) => {
     config.mode('production');
     config.plugin('define').tap((args) => [
-        Object.assign(Object.assign({}, args[0]), { 'process.env.NODE_ENV': JSON.stringify('production') }),
+        {
+            ...args[0],
+            'process.env.NODE_ENV': JSON.stringify('production'),
+        },
     ]);
     if (configManager.dedupe.enabled) {
         config.batch((0, dedupe_1.dedupe)(configManager, {

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

@@ -1 +1 @@
-{"version":3,"file":"prod.js","sourceRoot":"","sources":["../../../../../src/library/webpack/common/client/prod.ts"],"names":[],"mappings":";;;AAAA,gFAAgD;AAEhD,0DAA0B;AAC1B,+CAAsD;AAItD,gDAA6C;AAE7C,MAAM,YAAY,GAAG,IAAA,cAAI,EAAsC,CAAC,OAAO,EAAE,EAAE;IACzE,IAAI,OAAO,CAAC,IAAI,GAAG,CAAC,EAAE;QACpB,OAAO,CAAC,IAAI,CAAC,GAAG,eAAK,CAAC,IAAI,CAAC,gDAAgD,CAAC;;;KAG3E,CAAC,CAAC;KACJ;AACH,CAAC,CAAC,CAAC;AAEH,kBAAe,CAAC,aAA4C,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAClF,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAE1B,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;wCAE/B,IAAI,CAAC,CAAC,CAAC,KACV,sBAAsB,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC;KAEvD,CAAC,CAAC;IAEH,IAAI,aAAa,CAAC,MAAM,CAAC,OAAO,EAAE;QAChC,MAAM,CAAC,KAAK,CACV,IAAA,eAAM,EAAC,aAAa,EAAE;YACpB,QAAQ,EAAE,CAAC,aAAa,CAAC,MAAM;YAC/B,YAAY;SACb,CAAC,CACH,CAAC;KACH;SAAM;QACL,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,GAAG,CAAC,yBAAgB,EAAE;YACvD;gBACE,OAAO,EAAE,IAAI;gBACb,+BAA+B;gBAC/B,+EAA+E;gBAC/E,WAAW,EAAE,CAAC,MAAc,EAAE,EAAE;oBAC9B,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACvB,CAAC;aACF;SACF,CAAC,CAAC;KACJ;AACH,CAAC,CAAC"}
+{"version":3,"file":"prod.js","sourceRoot":"","sources":["../../../../../src/library/webpack/common/client/prod.ts"],"names":[],"mappings":";;;AAAA,gFAAgD;AAEhD,0DAA0B;AAC1B,+CAAsD;AAItD,gDAA6C;AAE7C,MAAM,YAAY,GAAG,IAAA,cAAI,EAAsC,CAAC,OAAO,EAAE,EAAE;IACzE,IAAI,OAAO,CAAC,IAAI,GAAG,CAAC,EAAE;QACpB,OAAO,CAAC,IAAI,CAAC,GAAG,eAAK,CAAC,IAAI,CAAC,gDAAgD,CAAC;;;KAG3E,CAAC,CAAC;KACJ;AACH,CAAC,CAAC,CAAC;AAEH,kBAAe,CAAC,aAA4C,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAClF,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAE1B,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;QACpC;YACE,GAAG,IAAI,CAAC,CAAC,CAAC;YACV,sBAAsB,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC;SACrD;KACF,CAAC,CAAC;IAEH,IAAI,aAAa,CAAC,MAAM,CAAC,OAAO,EAAE;QAChC,MAAM,CAAC,KAAK,CACV,IAAA,eAAM,EAAC,aAAa,EAAE;YACpB,QAAQ,EAAE,CAAC,aAAa,CAAC,MAAM;YAC/B,YAAY;SACb,CAAC,CACH,CAAC;KACH;SAAM;QACL,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,GAAG,CAAC,yBAAgB,EAAE;YACvD;gBACE,OAAO,EAAE,IAAI;gBACb,+BAA+B;gBAC/B,+EAA+E;gBAC/E,WAAW,EAAE,CAAC,MAAc,EAAE,EAAE;oBAC9B,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACvB,CAAC;aACF;SACF,CAAC,CAAC;KACJ;AACH,CAAC,CAAC"}

package/lib/library/webpack/common/dev.js

@@ -20,12 +20,19 @@ const stderrWithWarningFilters = new stream_1.Writable({
 stderrWithWarningFilters.on('error', (error) => console.error('[infrastructureLogging] stream error', error));
 exports.default = (configManager) => (config) => {
     config.plugin('case-sensitive-path').use(case_sensitive_paths_webpack_plugin_1.default);
-    config.stats(Object.assign({ preset: 'errors-warnings', 
+    config.stats({
+        preset: 'errors-warnings',
         // отключает уведомление об успешной компиляции, его уже выводит webpackbar
-        warningsCount: false }, (configManager.verboseWebpack ? stats_1.WEBPACK_DEBUG_STATS_OPTIONS : {})));
-    config.set('infrastructureLogging', Object.assign(Object.assign({ level: 'warn' }, (configManager.verboseWebpack ? { level: 'verbose', debug: true } : {})), (configManager.verboseWebpack || configManager.debug
-        ? {}
-        : { stream: stderrWithWarningFilters })));
+        warningsCount: false,
+        ...(configManager.verboseWebpack ? stats_1.WEBPACK_DEBUG_STATS_OPTIONS : {}),
+    });
+    config.set('infrastructureLogging', {
+        level: 'warn',
+        ...(configManager.verboseWebpack ? { level: 'verbose', debug: true } : {}),
+        ...(configManager.verboseWebpack || configManager.debug
+            ? {}
+            : { stream: stderrWithWarningFilters }),
+    });
     config.output.pathinfo(false);
     config.module.set('unsafeCache', true);
     if (configManager.dedupe.enabledDev) {

package/lib/library/webpack/common/dev.js.map

@@ -1 +1 @@
-{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../../../src/library/webpack/common/dev.ts"],"names":[],"mappings":";;;AAAA,mCAAkC;AAElC,sHAA2E;AAE3E,8CAAiE;AACjE,6CAA0C;AAC1C,4DAAyD;AAEzD,MAAM,OAAO,GAAG,+BAAc,CAAC,GAAG,CAChC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CACd,CAAC,IAAI,EAAE,EAAE,CACP,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CACvB,CAAC;AAEF,MAAM,wBAAwB,GAAG,IAAI,iBAAQ,CAAC;IAC5C,KAAK,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ;QAC7B,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;QAElC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE;YAC9C,QAAQ,EAAE,CAAC;YACX,OAAO;SACR;QAED,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAClD,CAAC;CACF,CAAC,CAAC;AAEH,wBAAwB,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAC7C,OAAO,CAAC,KAAK,CAAC,sCAAsC,EAAE,KAAK,CAAC,CAC7D,CAAC;AAEF,kBAAe,CAAC,aAA4C,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAClF,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC,GAAG,CAAC,6CAAwB,CAAC,CAAC;IAEnE,MAAM,CAAC,KAAK,iBACV,MAAM,EAAE,iBAAiB;QACzB,2EAA2E;QAC3E,aAAa,EAAE,KAAK,IACjB,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC,CAAC,mCAA2B,CAAC,CAAC,CAAC,EAAE,CAAC,EACpE,CAAC;IAEH,MAAM,CAAC,GAAG,CAAC,uBAAuB,gCAChC,KAAK,EAAE,MAAM,IACV,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,GACvE,CAAC,aAAa,CAAC,cAAc,IAAI,aAAa,CAAC,KAAK;QACrD,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,EAAE,MAAM,EAAE,wBAAwB,EAAE,CAAC,EACzC,CAAC;IAEH,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAE9B,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;IAEvC,IAAI,aAAa,CAAC,MAAM,CAAC,UAAU,EAAE;QACnC,MAAM,CAAC,KAAK,CAAC,IAAA,eAAM,EAAC,aAAa,CAAC,CAAC,CAAC;KACrC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}
+{"version":3,"file":"dev.js","sourceRoot":"","sources":["../../../../src/library/webpack/common/dev.ts"],"names":[],"mappings":";;;AAAA,mCAAkC;AAElC,sHAA2E;AAE3E,8CAAiE;AACjE,6CAA0C;AAC1C,4DAAyD;AAEzD,MAAM,OAAO,GAAG,+BAAc,CAAC,GAAG,CAChC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CACd,CAAC,IAAI,EAAE,EAAE,CACP,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CACvB,CAAC;AAEF,MAAM,wBAAwB,GAAG,IAAI,iBAAQ,CAAC;IAC5C,KAAK,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ;QAC7B,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;QAElC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE;YAC9C,QAAQ,EAAE,CAAC;YACX,OAAO;SACR;QAED,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAClD,CAAC;CACF,CAAC,CAAC;AAEH,wBAAwB,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAC7C,OAAO,CAAC,KAAK,CAAC,sCAAsC,EAAE,KAAK,CAAC,CAC7D,CAAC;AAEF,kBAAe,CAAC,aAA4C,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAClF,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC,GAAG,CAAC,6CAAwB,CAAC,CAAC;IAEnE,MAAM,CAAC,KAAK,CAAC;QACX,MAAM,EAAE,iBAAiB;QACzB,2EAA2E;QAC3E,aAAa,EAAE,KAAK;QACpB,GAAG,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC,CAAC,mCAA2B,CAAC,CAAC,CAAC,EAAE,CAAC;KACrE,CAAC,CAAC;IAEH,MAAM,CAAC,GAAG,CAAC,uBAAuB,EAAE;QAClC,KAAK,EAAE,MAAM;QACb,GAAG,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1E,GAAG,CAAC,aAAa,CAAC,cAAc,IAAI,aAAa,CAAC,KAAK;YACrD,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,EAAE,MAAM,EAAE,wBAAwB,EAAE,CAAC;KAC1C,CAAC,CAAC;IAEH,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAE9B,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;IAEvC,IAAI,aAAa,CAAC,MAAM,CAAC,UAAU,EAAE;QACnC,MAAM,CAAC,KAAK,CAAC,IAAA,eAAM,EAAC,aAAa,CAAC,CAAC,CAAC;KACrC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}

package/lib/library/webpack/common/main.js

@@ -27,7 +27,6 @@ const getConfigCacheNameAdditionalFlags = (configManager) => {
 };
 // eslint-disable-next-line import/no-default-export
 exports.default = (configManager) => (config) => {
-    var _a;
     const env = configManager.env === 'development' ? 'dev' : 'prod';
     // uniqueName are used for various webpack internals
     // currently, we use that value in the ModuleFederation glue code
@@ -83,7 +82,7 @@ exports.default = (configManager) => (config) => {
         // если же потребуется включить эту опцию, то надо будет выставить `path.resolve(configManager.rootDir, 'node_modules')` чтобы правильно работал tramvai-debug
         managedPaths: [],
     });
-    config.set('experiments', (_a = configManager.experiments.webpack) !== null && _a !== void 0 ? _a : {});
+    config.set('experiments', configManager.experiments.webpack ?? {});
     config
         .mode('development')
         .optimization.minimize(false)
@@ -91,9 +90,16 @@ exports.default = (configManager) => (config) => {
         .end()
         .plugin('define')
         .use(webpack_1.default.DefinePlugin, [
-        Object.assign(Object.assign(Object.assign({}, configManager.define.shared), configManager.define[configManager.env]), { 'process.env.APP_ID': JSON.stringify(configManager.name || 'common'), 'process.env.APP_VERSION': process.env.APP_VERSION
+        {
+            ...configManager.define.shared,
+            ...configManager.define[configManager.env],
+            'process.env.APP_ID': JSON.stringify(configManager.name || 'common'),
+            'process.env.APP_VERSION': process.env.APP_VERSION
                 ? JSON.stringify(process.env.APP_VERSION)
-                : undefined, 'process.env.ENABLE_DEVTOOLS': process.env.ENABLE_DEVTOOLS || configManager.env === 'development', 'process.env.DISABLE_EXTERNAL_SCRIPTS': process.env.DISABLE_EXTERNAL_SCRIPTS || false }),
+                : undefined,
+            'process.env.ENABLE_DEVTOOLS': process.env.ENABLE_DEVTOOLS || configManager.env === 'development',
+            'process.env.DISABLE_EXTERNAL_SCRIPTS': process.env.DISABLE_EXTERNAL_SCRIPTS || false,
+        },
     ]);
     // TODO: remove after dropping support for node@14
     if (configManager.buildType === 'server') {

package/lib/library/webpack/common/main.js.map

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