npm - @tramvai/cli - Versions diffs - 5.53.80 → 6.62.0 - Mend

@tramvai/cli 5.53.80 → 6.62.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (401) hide show

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

@@ -5,6 +5,7 @@ const path_1 = tslib_1.__importDefault(require("path"));
 const fs_1 = tslib_1.__importDefault(require("fs"));
 const webpack_stats_plugin_1 = require("webpack-stats-plugin");
 const webpack_subresource_integrity_1 = require("webpack-subresource-integrity");
+const plugin_webpack_builder_1 = require("@tramvai/plugin-webpack-builder");
 const safeRequire_1 = require("../../../../utils/safeRequire");
 const main_1 = tslib_1.__importDefault(require("../../common/main"));
 const common_1 = require("../common");
@@ -18,12 +19,8 @@ const nodeClient_1 = tslib_1.__importDefault(require("../../blocks/nodeClient"))
 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 PolyfillCondition_1 = tslib_1.__importDefault(require("../../plugins/PolyfillCondition"));
-const AssetsIntegritiesPlugin_1 = tslib_1.__importDefault(require("../../plugins/AssetsIntegritiesPlugin"));
-const PurifyStatsPlugin_1 = require("../../plugins/PurifyStatsPlugin");
 exports.default = (configManager) => (config) => {
-    const { polyfill, modernPolyfill, fileSystemPages, env, integrity, experiments: { runtimeChunk }, } = configManager;
+    const { polyfill, modernPolyfill, fileSystemPages, env, integrity, experiments: { runtimeChunk, pwa }, } = configManager;
     const portal = path_1.default.resolve(configManager.rootDir, `packages/${process.env.APP_ID}/portal.js`);
     const portalExists = fs_1.default.existsSync(portal);
     const polyfillPath = (0, safeRequire_1.safeRequireResolve)(polyfill ?? './src/polyfill', configManager.rootDir, typeof polyfill === 'undefined');
@@ -41,9 +38,13 @@ exports.default = (configManager) => (config) => {
         .batch((0, css_1.default)(configManager))
         .batch((0, nodeClient_1.default)(configManager))
         .batch((0, postcssAssets_1.default)(configManager))
-        .batch((0, client_1.pwaBlock)(configManager))
         .when(fileSystemPages.enabled, (cfg) => cfg.batch((0, pagesResolve_1.pagesResolve)(configManager)));
     config.optimization.set('runtimeChunk', runtimeChunk);
+    // move require of pwa build part under if for performance
+    if (pwa.workbox?.enabled || pwa.webmanifest?.enabled) {
+        const { pwaBlock } = require('../../blocks/pwa/client');
+        config.batch(pwaBlock(configManager));
+    }
     config
         .entry('platform')
         .add(path_1.default.resolve(configManager.rootDir, `${configManager.root}/index`))
@@ -69,7 +70,7 @@ exports.default = (configManager) => (config) => {
     ])
         .end()
         .plugin('polyfill-condition-plugin')
-        .use(PolyfillCondition_1.default, [{ filename: statsFileName }])
+        .use(plugin_webpack_builder_1.PolyfillConditionPlugin, [{ filename: statsFileName }])
         .end()
         .plugin('define')
         .tap((args) => [
@@ -101,12 +102,12 @@ exports.default = (configManager) => (config) => {
             .end()
             // Plugin for transform integrity-plugin result into single integrities field in stats.json
             .plugin('assets-integrity-plugin')
-            .use(AssetsIntegritiesPlugin_1.default, [{ fileName: statsFileName }])
+            .use(plugin_webpack_builder_1.AssetsIntegritiesPlugin, [{ fileName: statsFileName }])
             .end();
     }
     config
         .plugin('assets-purify-plugin')
-        .use((0, PurifyStatsPlugin_1.purifyStatsPluginFactory)('application'), [{ fileName: statsFileName }])
+        .use(plugin_webpack_builder_1.PurifyStatsPlugin, [{ fileName: statsFileName, target: 'application' }])
         .end();
     return config;
 };

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

	@@ -1 +1 @@
1	- {"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../src/library/webpack/application/client/common.ts"],"names":[],"mappings":";;;AAAA,wDAAwB;AACxB,oDAAoB;AAEpB,+DAAyD;AACzD,iFAA2E;~~AAI3E~~,+DAAmE;AAEnE,qEAAuC;AACvC,sCAA8C;AAC9C,mFAA6C;AAC7C,iEAAiC;AACjC,iEAAiC;AACjC,qEAAqC;AACrC,mEAAmC;AACnC,uFAAuD;AACvD,iFAAiD;AACjD,4DAAyD;AACzD,0DAAuD;AACvD,iDAO+B;~~AAC~~/B,~~oDAAmD;AACnD,gGAAsE;AACtE,4GAA4E;AAE5E,uEAA2E;AAE3E,~~kBAAe,CAAC,aAAoD,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAC1F,MAAM,EACJ,QAAQ,EACR,cAAc,EACd,eAAe,EACf,GAAG,EACH,SAAS,EACT,WAAW,EAAE,EAAE,YAAY,EAAE,~~GAC9B~~,GAAG,aAAa,CAAC;IAElB,MAAM,MAAM,GAAG,cAAI,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,EAAE,YAAY,OAAO,CAAC,GAAG,CAAC,MAAM,YAAY,CAAC,CAAC;IAC/F,MAAM,YAAY,GAAG,YAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAE3C,MAAM,YAAY,GAAG,IAAA,gCAAkB,EACrC,QAAQ,IAAI,gBAAgB,EAC5B,aAAa,CAAC,OAAO,EACrB,OAAO,QAAQ,KAAK,WAAW,CAChC,CAAC;IACF,MAAM,kBAAkB,GAAG,IAAA,gCAAkB,EAC3C,cAAc,IAAI,uBAAuB,EACzC,aAAa,CAAC,OAAO,EACrB,OAAO,cAAc,KAAK,WAAW,CACtC,CAAC;IAEF,MAAM;SACH,IAAI,CAAC,QAAQ,CAAC;SACd,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC;SACf,KAAK,CAAC,IAAA,cAAM,EAAC,aAAa,CAAC,CAAC;SAC5B,KAAK,CAAC,IAAA,0BAAiB,EAAC,aAAa,CAAC,CAAC;SACvC,KAAK,CAAC,IAAA,yBAAW,EAAC,aAAa,CAAC,CAAC;SACjC,KAAK,CAAC,IAAA,qBAAK,EAAC,aAAa,CAAC,CAAC;SAC3B,KAAK,CAAC,IAAA,YAAE,EAAC,aAAa,CAAC,CAAC;SACxB,KAAK,CAAC,IAAA,YAAE,EAAC,aAAa,CAAC,CAAC;SACxB,KAAK,CAAC,IAAA,cAAI,EAAC,aAAa,CAAC,CAAC;SAC1B,KAAK,CAAC,IAAA,aAAG,EAAC,aAAa,CAAC,CAAC;SACzB,KAAK,CAAC,IAAA,oBAAU,EAAC,aAAa,CAAC,CAAC;SAChC,KAAK,CAAC,IAAA,uBAAa,EAAC,aAAa,CAAC,CAAC;SACnC,~~KAAK,CAAC,IAAA,iBAAQ,EAAC,aAAa,CAAC,CAAC;SAC9B,~~IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,IAAA,2BAAY,EAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IAElF,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;~~IAEtD~~,MAAM;SACH,KAAK,CAAC,UAAU,CAAC;SACjB,GAAG,CAAC,cAAI,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,EAAE,GAAG,aAAa,CAAC,IAAI,QAAQ,CAAC,CAAC;SACvE,GAAG,EAAE;SACL,IAAI,CAAC,YAAY,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;SAC5D,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;SAC7E,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CACzC,GAAG,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,GAAG,CAAC,kBAAkB,CAAC,CACrD,CAAC;IAEJ,MAAM,aAAa,GAAG,YAAY,CAAC;IAEnC,MAAM;SACH,MAAM,CAAC,cAAc,CAAC;SACtB,GAAG,CAAC,wCAAiB,EAAE;QACtB;YACE,QAAQ,EAAE,aAAa;YACvB,KAAK,EAAE;gBACL,GAAG,CAAC,GAAG,KAAK,aAAa,CAAC,CAAC,CAAC,yBAAiB,CAAC,CAAC,CAAC,6BAAqB,CAAC;gBACtE,GAAG,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC,CAAC,mCAA2B,CAAC,CAAC,CAAC,EAAE,CAAC;aACrE;YACD,MAAM,EAAE;gBACN,GAAG,CAAC,GAAG,KAAK,aAAa,CAAC,CAAC,CAAC,wBAAgB,CAAC,CAAC,CAAC,4BAAoB,CAAC;gBACpE,GAAG,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC,CAAC,kCAA0B,CAAC,CAAC,CAAC,EAAE,CAAC;aACpE;SACF;KACF,CAAC;SACD,GAAG,EAAE;SACL,MAAM,CAAC,2BAA2B,CAAC;SACnC,GAAG,CAAC,~~2BAAuB~~,EAAE,CAAC,EAAE,QAAQ,EAAE,aAAa,EAAE,CAAC,CAAC;SAC3D,GAAG,EAAE;SACL,MAAM,CAAC,QAAQ,CAAC;SAChB,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;QACb;YACE,GAAG,IAAI,CAAC,CAAC,CAAC;YACV,qBAAqB,EAAE,IAAI;YAC3B,oBAAoB,EAAE,KAAK;SAC5B;KACF,CAAC,CAAC;IAEL,IAAI,SAAS,EAAE;QACb,MAAM,uBAAuB,GAAqB;YAChD,OAAO,EAAE,MAAM;YACf,aAAa,EAAE,CAAC,QAAQ,CAAC;YACzB,WAAW,EAAE,OAAO;SACrB,CAAC;QAEF,IAAI,gBAAgB,CAAC;QACrB,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE;YACjC,gBAAgB,GAAG;gBACjB,GAAG,uBAAuB;gBAC1B,GAAG,SAAS;aACb,CAAC;SACH;aAAM;YACL,gBAAgB,GAAG,uBAAuB,CAAC;SAC5C;QAED,MAAM;aACH,MAAM,CAAC,kBAAkB,CAAC;aAC1B,GAAG,CAAC,0DAA0B,EAAE,CAAC,gBAAgB,CAAC,CAAC;aACnD,GAAG,EAAE;YACN,2FAA2F;aAC1F,MAAM,CAAC,yBAAyB,CAAC;aACjC,GAAG,CAAC,~~iCAAuB~~,EAAE,CAAC,EAAE,QAAQ,EAAE,aAAa,EAAE,CAAC,CAAC;aAC3D,GAAG,EAAE,CAAC;KACV;IAED,MAAM;SACH,MAAM,CAAC,sBAAsB,CAAC;SAC9B,GAAG,CAAC,~~IAAA~~,~~4CAAwB~~,~~EAAC~~,~~aAAa~~,~~CAAC~~,EAAE,~~CAAC~~,EAAE,~~QAAQ~~,EAAE,aAAa,EAAE,CAAC,CAAC;~~SAC3E~~,GAAG,EAAE,CAAC;IAET,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}
1	+ {"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/common.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../src/library/webpack/application/common.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;~~AAIxC~~,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAC;~~AAQvF~~,eAAO,MAAM,iBAAiB,kBACZ,cAAc,sBAAsB,CAAC,cAAc,MAAM,SAiCxE,CAAC"}
1	+ {"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../src/library/webpack/application/common.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAYxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAC;AAIvF,eAAO,MAAM,iBAAiB,kBACZ,cAAc,sBAAsB,CAAC,cAAc,MAAM,SAiCxE,CAAC"}

package/lib/library/webpack/application/common.js CHANGED Viewed

@@ -2,10 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.commonApplication = void 0;
 const webpack_1 = require("webpack");
+const plugin_webpack_builder_1 = require("@tramvai/plugin-webpack-builder");
 const moduleFederationShared_1 = require("../child-app/moduleFederationShared");
-const ModuleFederationIgnoreEntries_1 = require("../plugins/ModuleFederationIgnoreEntries");
 const rootErrorBoundary_1 = require("../blocks/rootErrorBoundary");
-const ModuleFederationFixRange_1 = require("../plugins/ModuleFederationFixRange");
 const FileStats_1 = require("../plugins/FileStats");
 const commonApplication = (configManager) => (config) => {
     config.plugin('module-federation').use(webpack_1.container.ModuleFederationPlugin, [
@@ -27,10 +26,10 @@ const commonApplication = (configManager) => (config) => {
     }
     config
         .plugin('module-federation-ignore-entries')
-        .use(ModuleFederationIgnoreEntries_1.ModuleFederationIgnoreEntries, [
+        .use(plugin_webpack_builder_1.ModuleFederationIgnoreEntries, [
         { entries: ['polyfill', 'modern.polyfill'] },
     ]);
-    config.plugin('module-federation-validate-duplicates').use(ModuleFederationFixRange_1.ModuleFederationFixRange, [
+    config.plugin('module-federation-validate-duplicates').use(plugin_webpack_builder_1.ModuleFederationFixRange, [
         {
             flexibleTramvaiVersions: configManager.shared.flexibleTramvaiVersions,
         },

package/lib/library/webpack/application/common.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../src/library/webpack/application/common.ts"],"names":[],"mappings":";;;AACA,qCAAoC;~~AACpC~~,~~gFAAuE~~;~~AAKvE~~,~~4FAAyF~~;~~AACzF~~,mEAAuE;~~AAEvE~~,~~kFAA+E;AAC/E,~~oDAAuD;AAEhD,MAAM,iBAAiB,GAC5B,CAAC,aAAoD,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAC3E,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,GAAG,CAAC,mBAAS,CAAC,sBAAsB,EAAE;QACvE;YACE,IAAI,EAAE,MAAM;YACZ,MAAM,EAAE,IAAA,yCAAgB,EAAC,aAAa,CAAC;SACP;KACnC,CAAC,CAAC;IAEH,IAAI,aAAa,CAAC,gBAAgB,EAAE;QAClC,MAAM,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC,GAAG,CAAC,2BAAe,EAAE;YACzD;gBACE,QAAQ,EAAE,oBAAoB;gBAC9B,KAAK,EAAE;oBACL,MAAM,EAAE,IAAI;oBACZ,YAAY,EAAE,IAAI;iBACnB;aACF;SACF,CAAC,CAAC;KACJ;IAED,MAAM;SACH,MAAM,CAAC,kCAAkC,CAAC;SAC1C,GAAG,CAAC,~~6DAA6B~~,EAAE;QAClC,EAAE,OAAO,EAAE,CAAC,UAAU,EAAE,iBAAiB,CAAC,EAA0C;KACrF,CAAC,CAAC;IAEL,MAAM,CAAC,MAAM,CAAC,uCAAuC,CAAC,CAAC,GAAG,CAAC,~~mDAAwB~~,EAAE;QACnF;YACE,uBAAuB,EAAE,aAAa,CAAC,MAAM,CAAC,uBAAuB;SACnC;KACrC,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK,CAAC,IAAA,4CAAwB,EAAC,aAAa,CAAC,CAAC,CAAC;AACxD,CAAC,CAAC;AAlCS,QAAA,iBAAiB,qBAkC1B"}
1	+ {"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../src/library/webpack/application/common.ts"],"names":[],"mappings":";;;AACA,qCAAoC;AAEpC,4EAKyC;AAEzC,gFAAuE;AAIvE,mEAAuE;AACvE,oDAAuD;AAEhD,MAAM,iBAAiB,GAC5B,CAAC,aAAoD,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAC3E,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,GAAG,CAAC,mBAAS,CAAC,sBAAsB,EAAE;QACvE;YACE,IAAI,EAAE,MAAM;YACZ,MAAM,EAAE,IAAA,yCAAgB,EAAC,aAAa,CAAC;SACP;KACnC,CAAC,CAAC;IAEH,IAAI,aAAa,CAAC,gBAAgB,EAAE;QAClC,MAAM,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC,GAAG,CAAC,2BAAe,EAAE;YACzD;gBACE,QAAQ,EAAE,oBAAoB;gBAC9B,KAAK,EAAE;oBACL,MAAM,EAAE,IAAI;oBACZ,YAAY,EAAE,IAAI;iBACnB;aACF;SACF,CAAC,CAAC;KACJ;IAED,MAAM;SACH,MAAM,CAAC,kCAAkC,CAAC;SAC1C,GAAG,CAAC,sDAA6B,EAAE;QAClC,EAAE,OAAO,EAAE,CAAC,UAAU,EAAE,iBAAiB,CAAC,EAA0C;KACrF,CAAC,CAAC;IAEL,MAAM,CAAC,MAAM,CAAC,uCAAuC,CAAC,CAAC,GAAG,CAAC,iDAAwB,EAAE;QACnF;YACE,uBAAuB,EAAE,aAAa,CAAC,MAAM,CAAC,uBAAuB;SACnC;KACrC,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK,CAAC,IAAA,4CAAwB,EAAC,aAAa,CAAC,CAAC,CAAC;AACxD,CAAC,CAAC;AAlCS,QAAA,iBAAiB,qBAkC1B"}

package/lib/library/webpack/blocks/pwa/client.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../../../src/library/webpack/blocks/pwa/client.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;~~AAGxC~~,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6CAA6C,CAAC;~~AAM1F~~,eAAO,MAAM,QAAQ,kBAEH,cAAc,sBAAsB,CAAC,cAAc,MAAM,~~SA2IxE~~,CAAC"}
1	+ {"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../../../src/library/webpack/blocks/pwa/client.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAMxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6CAA6C,CAAC;AAI1F,eAAO,MAAM,QAAQ,kBAEH,cAAc,sBAAsB,CAAC,cAAc,MAAM,SAuFxE,CAAC"}

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

@@ -5,9 +5,8 @@ const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
 const workbox_webpack_plugin_1 = require("workbox-webpack-plugin");
 const fs_1 = tslib_1.__importDefault(require("fs"));
+const plugin_webpack_pwa_1 = require("@tramvai/plugin-webpack-pwa");
 const safeRequire_1 = require("../../../../utils/safeRequire");
-const PwaIconsPlugin_1 = require("../../plugins/PwaIconsPlugin");
-const WebManifestPlugin_1 = require("../../plugins/WebManifestPlugin");
 const shared_1 = require("./shared");
 const pwaBlock =
 // eslint-disable-next-line max-statements
@@ -24,62 +23,14 @@ const pwaBlock =
         if (!fs_1.default.existsSync(swSrc)) {
             throw Error(`PWA workbox enabled but Service Worker source file not found by path ${swSrc}`);
         }
-        // @todo: static HTML caching ??? full offline mode for tramvai static ???
-        const workboxOptions = {
+        const workboxPlugin = new workbox_webpack_plugin_1.InjectManifest((0, plugin_webpack_pwa_1.getWorkboxOptions)({
             swSrc,
             swDest,
-            exclude: [/hmr\.js$/, /\.map$/, /\.hot-update\./],
-            maximumFileSizeToCacheInBytes: env === 'production' ? 5 * 1024 * 1024 : 10 * 1024 * 1024,
-            chunks: pwa.workbox.chunks,
-            excludeChunks: pwa.workbox.excludeChunks,
-            additionalManifestEntries: [
-            // @todo CSR fallback or all static pages?
-            // do not forget about revision and possible conflict with modifyURLPrefix
-            ],
-            manifestTransforms: [
-                (manifest, compilation) => {
-                    return {
-                        // we need to have a relative webmanifest url for precaching
-                        manifest: manifest.map((asset) => {
-                            const assetName = asset.url.replace(assetsPrefix, '');
-                            // in development build `publicPath` is localhost, in production is empty string
-                            const publicPath = compilation.outputOptions?.publicPath || assetsPrefix;
-                            const assetInfo = compilation.assetsInfo.get(asset.url.replace(publicPath, ''));
-                            if (assetInfo?._webmanifestFilename) {
-                                return {
-                                    ...asset,
-                                    url: `${pwa.sw.scope}${assetName}`,
-                                };
-                            }
-                            return asset;
-                        }),
-                    };
-                },
-            ],
-        };
-        if (pwa.workbox.include) {
-            workboxOptions.include = pwa.workbox.include.map((expr) => new RegExp(expr));
-        }
-        if (pwa.workbox.exclude) {
-            workboxOptions.exclude = [
-                ...workboxOptions.exclude,
-                ...pwa.workbox.exclude.map((expr) => new RegExp(expr)),
-            ];
-        }
-        if (pwa.workbox.additionalManifestEntries) {
-            workboxOptions.additionalManifestEntries = [
-                ...workboxOptions.additionalManifestEntries,
-                ...pwa.workbox.additionalManifestEntries,
-            ];
-        }
-        if (env === 'production') {
-            workboxOptions.dontCacheBustURLsMatching = /\/\w+?\.[\w\d]+?\.(js|css|gif|png|jpe?g|svg)$/;
-            workboxOptions.modifyURLPrefix = {
-                '': assetsPrefix,
-            };
-        }
-        // @todo: break hmr on client when sw.ts is changed - infinity loop !!!
-        const workboxPlugin = new workbox_webpack_plugin_1.InjectManifest(workboxOptions);
+            workbox: pwa.workbox,
+            mode: env,
+            scope: pwa.sw.scope,
+            assetsPrefix: assetsPrefix,
+        }));
         // https://github.com/GoogleChrome/workbox/issues/1790#issuecomment-1241356293
         if (env === 'development') {
             Object.defineProperty(workboxPlugin, 'alreadyCalled', {
@@ -103,7 +54,7 @@ const pwaBlock =
         config.plugin('workbox').use(workboxPlugin);
     }
     if (pwa.webmanifest?.enabled) {
-        const webmanifestPlugin = new WebManifestPlugin_1.WebManifestPlugin({
+        const webmanifestPlugin = new plugin_webpack_pwa_1.WebManifestPlugin({
             manifest: pwa.webmanifest,
             icon: pwa.icon,
             assetsPrefix,
@@ -112,7 +63,7 @@ const pwaBlock =
     }
     if (pwa.icon?.src) {
         const iconSrc = path_1.default.join(rootDir, root, pwa.icon.src);
-        const pwaIconsPlugin = new PwaIconsPlugin_1.PwaIconsPlugin({
+        const pwaIconsPlugin = new plugin_webpack_pwa_1.PwaIconsPlugin({
             ...pwa.icon,
             src: iconSrc,
             mode: configManager.env,

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

	@@ -1 +1 @@
1	- {"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../../src/library/webpack/blocks/pwa/client.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AAExB,mEAAwD;AACxD,oDAAoB;~~AAGpB~~,+DAAmE;AACnE,~~iEAA8D;AAC9D,uEAAoE;AACpE,~~qCAA0C;AAEnC,MAAM,QAAQ;AACnB,0CAA0C;AAC1C,CAAC,aAAoD,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAC3E,MAAM,EACJ,WAAW,EAAE,EAAE,GAAG,EAAE,EACpB,OAAO,EACP,IAAI,EACJ,MAAM,EACN,GAAG,EACH,SAAS,EACT,YAAY,GACb,GAAG,aAAa,CAAC;IAElB,MAAM,CAAC,KAAK,CAAC,IAAA,uBAAc,EAAC,aAAa,CAAC,CAAC,CAAC;IAE5C,IACE,CAAC,IAAA,gCAAkB,EAAC,qCAAqC,EAAE,OAAO,EAAE,IAAI,CAAC;QACzE,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,IAAI,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,EAClD;QACA,MAAM,KAAK,CAAC,uEAAuE,CAAC,CAAC;KACtF;IAED,IAAI,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE;QACxB,MAAM,KAAK,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QACpD,MAAM,MAAM,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAE/D,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;YACzB,MAAM,KAAK,CACT,wEAAwE,KAAK,EAAE,CAChF,CAAC;SACH;QAED,~~0EAA0E;QAC1E,~~MAAM,~~cAAc~~,~~GAA6B;YAC/C,KAAK;YACL,MAAM;YACN,OAAO,EAAE,CAAC,UAAU,EAAE,QAAQ,EAAE,gBAAgB,CAAC;YACjD,6BAA6B,EAAE,~~GAAG,~~KAAK,YAAY,CAAC,CAAC,CAAC,CAAC,GAAG,~~IAAI,~~GAAG~~,~~IAAI~~,~~CAAC~~,~~CAAC~~,~~CAAC,EAAE,GAAG,IAAI,GAAG,IAAI~~;~~YACxF~~,MAAM,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM;YAC1B,aAAa,EAAE,GAAG,CAAC,OAAO,CAAC,aAAa;YACxC,yBAAyB,EAAE;YACzB,0CAA0C;YAC1C,0EAA0E;aAC3E;YACD,kBAAkB,EAAE;gBAClB,CAAC,QAAQ,EAAE,WAAgB,EAAE,EAAE;oBAC7B,OAAO;wBACL,4DAA4D;wBAC5D,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK~~,EAAE,EAAE~~;~~4BAC/B~~,MAAM,~~SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,~~OAAO,~~CAAC,YAAY,~~EAAE,~~EAAE,CAAC,CAAC;4BACtD,gFAAgF;4BAChF,MAAM,UAAU,~~GAAG,~~WAAW,~~CAAC,~~aAAa,EAAE,UAAU,IAAI,YAAY,CAAC;4BACzE,MAAM,SAAS,GAAG,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,~~OAAO~~,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC~~;~~4BAEhF~~,IAAI,~~SAAS,~~EAAE,~~oBAAoB,EAAE;gCACnC,OAAO;oCACL,~~GAAG~~,KAAK~~;~~oCACR~~,~~GAAG,EAAE,GAAG,GAAG,CAAC,EAAE,CAAC,~~KAAK,~~GAAG,SAAS,~~EAAE~~;iCACnC~~,~~CAAC;6BACH;4BACD,OAAO,KAAK,CAAC;wBACf,CAAC,CAAC;qBACH,CAAC;gBACJ,CAAC;aACF;SACF,CAAC;QAEF,IAAI,~~GAAG,CAAC,~~OAAO,CAAC,OAAO,~~EAAE~~;YACvB~~,~~cAAc,~~CAAC,~~OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC~~;~~SAC9E;QACD~~,IAAI,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE;YACvB,cAAc,CAAC,OAAO,GAAG;gBACvB,GAAG,cAAc,CAAC,OAAO;gBACzB,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC;aACvD,CAAC;SACH;QACD,IAAI,GAAG,CAAC,OAAO,CAAC,yBAAyB,EAAE;YACzC,cAAc,CAAC,yBAAyB,GAAG;gBACzC,GAAG,cAAc,CAAC,yBAAyB;gBAC3C,GAAG,GAAG,CAAC,OAAO,CAAC,yBAAyB;aACzC,CAAC;SACH;QAED,IAAI,GAAG,KAAK,YAAY,EAAE~~;YACxB~~,~~cAAc,CAAC,yBAAyB,GAAG,+CAA+C,CAAC~~;~~YAE3F~~,~~cAAc,~~CAAC,~~eAAe~~,~~GAAG;gBAC/B,EAAE,EAAE,YAAY;aACjB,~~CAAC;~~SACH;QAED~~,~~uEAAuE;QAEvE,MAAM,aAAa,GAAG,IAAI,uCAAc,CAAC,cAAc,CAAC,CAAC;QAEzD,~~8EAA8E;QAC9E,IAAI,GAAG,KAAK,aAAa,EAAE;YACzB,MAAM,CAAC,cAAc,CAAC,aAAa,EAAE,eAAe,EAAE;gBACpD,GAAG;oBACD,OAAO,KAAK,CAAC;gBACf,CAAC;gBACD,GAAG,KAAI,CAAC;aACT,CAAC,CAAC;SACJ;QAED,qCAAqC;QACrC,wEAAwE;QACxE,IAAI,SAAS,EAAE;YACb,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,kBAAkB,EAAE,SAAS,CAAC,CAAC;SAClD;QAED,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;YACpC;gBACE,GAAG,IAAI,CAAC,CAAC,CAAC;gBACV,2BAA2B,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC;aAC1D;SACF,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;KAC7C;IAED,IAAI,GAAG,CAAC,WAAW,EAAE,OAAO,EAAE;QAC5B,MAAM,iBAAiB,GAAG,IAAI,~~qCAAiB~~,CAAC;YAC9C,QAAQ,EAAE,GAAG,CAAC,WAAW;YACzB,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,YAAY;SACb,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;KACrD;IAED,IAAI,GAAG,CAAC,IAAI,EAAE,GAAG,EAAE;QACjB,MAAM,OAAO,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACvD,MAAM,cAAc,GAAG,IAAI~~,+BAAc~~,CAAC;YACxC,GAAG,GAAG,CAAC,IAAI;YACX,GAAG,EAAE,OAAO;YACZ,IAAI,EAAE,aAAa,CAAC,GAAG;SACxB,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;KAChD;AACH,CAAC,CAAC;~~AA7IS~~,QAAA,QAAQ,~~YA6IjB~~"}
1	+ {"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/resolve.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/resolve.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;wCAGpC,aAAa,cAAc,MAAM;AAAhE,~~wBA8CE~~"}
1	+ {"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/resolve.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;wCAGpC,aAAa,cAAc,MAAM;AAAhE,wBA+CE"}

package/lib/library/webpack/blocks/resolve.js CHANGED Viewed

@@ -37,6 +37,7 @@ exports.default = (configManager) => (config) => {
         // использует @tinkoff/platform-legacy, что тоже не вариант тянуть в платформу
         .set('offersContext', path_1.default.resolve(rootDir, 'packages/offers/dependencies'))
         .set('appointmentContext', path_1.default.resolve(rootDir, 'apps/accounts/packages/appointment/dependencies'))
+        .set('@tramvai/api/virtual/file-system-pages', '@tramvai/cli/lib/external/pages')
         .end()
         .modules.add('node_modules')
         .add(path_1.default.resolve(__dirname, '..', '..', '..', '..', 'node_modules'))

package/lib/library/webpack/blocks/resolve.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/resolve.ts"],"names":[],"mappings":";;;AACA,wDAAwB;AACxB,2BAAgC;AAChC,iFAAoE;AAEpE,yDAAuD;AAEvD,kBAAe,CAAC,aAA4B,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAClE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,aAAa,CAAC;IAEnD,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAC7B;QACE,GAAG,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACjE,SAAS,KAAK,QAAQ,IAAI,SAAS;QACnC,QAAQ;QACR,MAAM;KACP,CAAC,MAAM,CAAC,OAAO,CAAC,CAClB,CAAC;IAEF,MAAM,YAAY,GAAG,cAAI,CAAC,OAAO,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;IAC5D,MAAM,eAAe,GAAG,cAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,eAAe,CAAC,CAAC;IACrE,MAAM,kBAAkB,GAAG,IAAA,eAAU,EAAC,YAAY,CAAC,CAAC;IACpD,MAAM,qBAAqB,GAAG,IAAA,eAAU,EAAC,eAAe,CAAC,CAAC;IAE1D,IAAI,kBAAkB,IAAI,qBAAqB,EAAE;QAC/C,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,GAAG,CAAC,mDAAmB,EAAE;YAC/D;gBACE,UAAU,EAAE,qBAAqB,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,YAAY;gBAClE,UAAU,EAAV,sBAAU;gBACV,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE;gBAC9C,MAAM,EAAE,IAAI;aACb;SACmD,CAAC,CAAC;KACzD;IAED,MAAM,CAAC,OAAO,CAAC,UAAU;SACtB,KAAK,CAAC,sBAAU,CAAC;SACjB,GAAG,EAAE;SACL,KAAK,CAAC,+DAA+D;SACrE,GAAG,CAAC,8BAA8B,EAAE,cAAI,CAAC,OAAO,CAAC,OAAO,EAAE,0BAA0B,CAAC,CAAC;SACtF,GAAG,CAAC,8BAA8B,EAAE,cAAI,CAAC,OAAO,CAAC,OAAO,EAAE,0BAA0B,CAAC,CAAC;QACvF,4FAA4F;QAC5F,8EAA8E;SAC7E,GAAG,CAAC,eAAe,EAAE,cAAI,CAAC,OAAO,CAAC,OAAO,EAAE,8BAA8B,CAAC,CAAC;SAC3E,GAAG,CACF,oBAAoB,EACpB,cAAI,CAAC,OAAO,CAAC,OAAO,EAAE,iDAAiD,CAAC,CACzE;SACA,GAAG,EAAE;SACL,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;SAC3B,GAAG,CAAC,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;SACpE,GAAG,EAAE;SACL,GAAG,EAAE,CAAC;AACX,CAAC,CAAC"}
1	+ {"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/resolve.ts"],"names":[],"mappings":";;;AACA,wDAAwB;AACxB,2BAAgC;AAChC,iFAAoE;AAEpE,yDAAuD;AAEvD,kBAAe,CAAC,aAA4B,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAClE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,aAAa,CAAC;IAEnD,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAC7B;QACE,GAAG,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACjE,SAAS,KAAK,QAAQ,IAAI,SAAS;QACnC,QAAQ;QACR,MAAM;KACP,CAAC,MAAM,CAAC,OAAO,CAAC,CAClB,CAAC;IAEF,MAAM,YAAY,GAAG,cAAI,CAAC,OAAO,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;IAC5D,MAAM,eAAe,GAAG,cAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,eAAe,CAAC,CAAC;IACrE,MAAM,kBAAkB,GAAG,IAAA,eAAU,EAAC,YAAY,CAAC,CAAC;IACpD,MAAM,qBAAqB,GAAG,IAAA,eAAU,EAAC,eAAe,CAAC,CAAC;IAE1D,IAAI,kBAAkB,IAAI,qBAAqB,EAAE;QAC/C,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,GAAG,CAAC,mDAAmB,EAAE;YAC/D;gBACE,UAAU,EAAE,qBAAqB,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,YAAY;gBAClE,UAAU,EAAV,sBAAU;gBACV,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE;gBAC9C,MAAM,EAAE,IAAI;aACb;SACmD,CAAC,CAAC;KACzD;IAED,MAAM,CAAC,OAAO,CAAC,UAAU;SACtB,KAAK,CAAC,sBAAU,CAAC;SACjB,GAAG,EAAE;SACL,KAAK,CAAC,+DAA+D;SACrE,GAAG,CAAC,8BAA8B,EAAE,cAAI,CAAC,OAAO,CAAC,OAAO,EAAE,0BAA0B,CAAC,CAAC;SACtF,GAAG,CAAC,8BAA8B,EAAE,cAAI,CAAC,OAAO,CAAC,OAAO,EAAE,0BAA0B,CAAC,CAAC;QACvF,4FAA4F;QAC5F,8EAA8E;SAC7E,GAAG,CAAC,eAAe,EAAE,cAAI,CAAC,OAAO,CAAC,OAAO,EAAE,8BAA8B,CAAC,CAAC;SAC3E,GAAG,CACF,oBAAoB,EACpB,cAAI,CAAC,OAAO,CAAC,OAAO,EAAE,iDAAiD,CAAC,CACzE;SACA,GAAG,CAAC,wCAAwC,EAAE,iCAAiC,CAAC;SAChF,GAAG,EAAE;SACL,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;SAC3B,GAAG,CAAC,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;SACpE,GAAG,EAAE;SACL,GAAG,EAAE,CAAC;AACX,CAAC,CAAC"}

package/lib/library/webpack/child-app/client/common.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../../src/library/webpack/child-app/client/common.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;~~AAIxC~~,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAMtE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;~~wCAatD~~,cAAc,mBAAmB,CAAC,cAAc,MAAM;AAArF,wBAuCE"}
1	+ {"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../../src/library/webpack/child-app/client/common.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAKxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAMtE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;wCAYtD,cAAc,mBAAmB,CAAC,cAAc,MAAM;AAArF,wBAuCE"}

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

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const node_1 = require("@module-federation/node");
 const webpack_plugin_1 = tslib_1.__importDefault(require("@loadable/webpack-plugin"));
+const plugin_webpack_builder_1 = require("@tramvai/plugin-webpack-builder");
 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 PurifyStatsPlugin_1 = require("../../plugins/PurifyStatsPlugin");
 const IDENTIFIER_NAME_REPLACE_REGEX = /^([^a-zA-Z$_])/;
 const IDENTIFIER_ALPHA_NUMERIC_NAME_REPLACE_REGEX = /[^a-zA-Z0-9$]+/g;
 // https://github.com/webpack/webpack/blob/da41ad1845947139375fb557107fa8bd2f6f8f27/lib/Template.js#L108
@@ -45,7 +45,7 @@ exports.default = (configManager) => (config) => {
     ]);
     config
         .plugin('assets-purify-plugin')
-        .use((0, PurifyStatsPlugin_1.purifyStatsPluginFactory)('child-app'), [{ fileName: statsFileName }]);
+        .use(plugin_webpack_builder_1.PurifyStatsPlugin, [{ fileName: statsFileName, target: 'child-app' }]);
     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 CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../src/library/webpack/child-app/client/common.ts"],"names":[],"mappings":";;;AACA,kDAAiE;AACjE,sFAAsD;~~AAItD~~,+DAA+B;AAC/B,mFAA6C;AAC7C,iFAAiD;AACjD,uFAAuD;~~AAEvD~~,~~uEAA2E;AAE3E,~~MAAM,6BAA6B,GAAG,gBAAgB,CAAC;AACvD,MAAM,2CAA2C,GAAG,iBAAiB,CAAC;AAEtE,wGAAwG;AACxG,SAAS,YAAY,CAAC,GAAW;IAC/B,OAAO,GAAG;SACP,OAAO,CAAC,6BAA6B,EAAE,KAAK,CAAC;SAC7C,OAAO,CAAC,2CAA2C,EAAE,GAAG,CAAC,CAAC;AAC/D,CAAC;AAED,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,CAAC,CAAC,CAAC;IAEvB,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;SACrD,kBAAkB,CAAC,WAAW,CAAC,CAAC;IAEnC,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,aAAa,GAAG,GAAG,IAAI,mBAAmB,OAAO,OAAO,CAAC;IAC/D,MAAM,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAC,GAAG,CAAC,wBAAc,EAAE;QACzD;YACE,QAAQ,EAAE,aAAa;YACvB,WAAW,EAAE,IAAI;YACjB,6GAA6G;YAC7G,kBAAkB,EAAE,YAAY,CAAC,uCAAuC,IAAI,IAAI,OAAO,IAAI,CAAC;SAC7F;KACF,CAAC,CAAC;IAEH,MAAM;SACH,MAAM,CAAC,sBAAsB,CAAC;SAC9B,GAAG,CAAC,~~IAAA~~,~~4CAAwB~~,~~EAAC~~,~~WAAW~~,~~CAAC~~,EAAE,~~CAAC~~,EAAE,~~QAAQ~~,EAAE,~~aAAa~~,EAAE,CAAC,CAAC,CAAC;~~IAE7E~~,MAAM,CAAC,KAAK,CAAC,IAAA,qBAAK,EAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,IAAA,oBAAU,EAAC,aAAa,CAAC,CAAC,CAAC;AACtE,CAAC,CAAC"}
1	+ {"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../src/library/webpack/child-app/client/common.ts"],"names":[],"mappings":";;;AACA,kDAAiE;AACjE,sFAAsD;AACtD,4EAAoE;AAIpE,+DAA+B;AAC/B,mFAA6C;AAC7C,iFAAiD;AACjD,uFAAuD;AAGvD,MAAM,6BAA6B,GAAG,gBAAgB,CAAC;AACvD,MAAM,2CAA2C,GAAG,iBAAiB,CAAC;AAEtE,wGAAwG;AACxG,SAAS,YAAY,CAAC,GAAW;IAC/B,OAAO,GAAG;SACP,OAAO,CAAC,6BAA6B,EAAE,KAAK,CAAC;SAC7C,OAAO,CAAC,2CAA2C,EAAE,GAAG,CAAC,CAAC;AAC/D,CAAC;AAED,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,CAAC,CAAC,CAAC;IAEvB,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;SACrD,kBAAkB,CAAC,WAAW,CAAC,CAAC;IAEnC,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,aAAa,GAAG,GAAG,IAAI,mBAAmB,OAAO,OAAO,CAAC;IAC/D,MAAM,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAC,GAAG,CAAC,wBAAc,EAAE;QACzD;YACE,QAAQ,EAAE,aAAa;YACvB,WAAW,EAAE,IAAI;YACjB,6GAA6G;YAC7G,kBAAkB,EAAE,YAAY,CAAC,uCAAuC,IAAI,IAAI,OAAO,IAAI,CAAC;SAC7F;KACF,CAAC,CAAC;IAEH,MAAM;SACH,MAAM,CAAC,sBAAsB,CAAC;SAC9B,GAAG,CAAC,0CAAiB,EAAE,CAAC,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;IAE9E,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/common.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../src/library/webpack/child-app/common.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;~~AAOxC~~,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;~~AASnE~~,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;~~wCAQnD~~,cAAc,mBAAmB,CAAC,cAAc,MAAM;AAArF,wBAgJE"}
1	+ {"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../../src/library/webpack/child-app/common.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAaxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAQnE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;wCAKnD,cAAc,mBAAmB,CAAC,cAAc,MAAM;AAArF,wBAgJE"}

package/lib/library/webpack/child-app/common.js CHANGED Viewed

@@ -4,6 +4,7 @@ const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
 const crypto_1 = tslib_1.__importDefault(require("crypto"));
 const node_1 = require("@module-federation/node");
+const plugin_webpack_builder_1 = require("@tramvai/plugin-webpack-builder");
 const main_1 = tslib_1.__importDefault(require("../common/main"));
 const ts_1 = tslib_1.__importDefault(require("../blocks/ts"));
 const js_1 = tslib_1.__importDefault(require("../blocks/js"));
@@ -12,9 +13,7 @@ const nodeClient_1 = tslib_1.__importDefault(require("../blocks/nodeClient"));
 const moduleFederationShared_1 = require("./moduleFederationShared");
 const configToEnv_1 = require("../blocks/configToEnv");
 const extractCssPlugin_1 = require("../blocks/extractCssPlugin");
-const ModuleFederationFixRange_1 = require("../plugins/ModuleFederationFixRange");
 const splitChunks_1 = require("../application/client/prod/optimization/splitChunks");
-const AutoPublicPathPlugin_1 = require("../plugins/AutoPublicPathPlugin");
 // eslint-disable-next-line max-statements
 exports.default = (configManager) => (config) => {
     const { name, root, rootDir, buildType, shared, env, target } = configManager;
@@ -123,8 +122,8 @@ exports.default = (configManager) => (config) => {
             shared: sharedModules,
         },
     ]);
-    config.plugin('patch-auto-public-path').use(AutoPublicPathPlugin_1.PatchAutoPublicPathPlugin);
-    config.plugin('module-federation-validate-duplicates').use(ModuleFederationFixRange_1.ModuleFederationFixRange, [
+    config.plugin('patch-auto-public-path').use(plugin_webpack_builder_1.PatchAutoPublicPathPlugin);
+    config.plugin('module-federation-validate-duplicates').use(plugin_webpack_builder_1.ModuleFederationFixRange, [
         {
             flexibleTramvaiVersions: shared.flexibleTramvaiVersions,
         },

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

	@@ -1 +1 @@
1	- {"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../src/library/webpack/child-app/common.ts"],"names":[],"mappings":";;;AAEA,wDAAwB;AACxB,4DAA4B;~~AAC5B~~,kDAAoE;AACpE,kEAAoC;~~AAIpC~~,8DAA8B;AAC9B,8DAA8B;AAC9B,gEAAgC;AAChC,8EAA8C;AAE9C,qEAA4D;AAC5D,uDAAoD;AAEpD,iEAAqE;~~AAErE~~,~~kFAA+E;AAC/E,~~qFAA6F;~~AAC7F~~,~~0EAA4E;AAE5E,~~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~~gDAAyB~~,CAAC,CAAC;IAEvE,MAAM,CAAC,MAAM,CAAC,uCAAuC,CAAC,CAAC,GAAG,CAAC,~~mDAAwB~~,EAAE;QACnF;YACE,uBAAuB,EAAE,MAAM,CAAC,uBAAuB;SACrB;KACrC,CAAC,CAAC;AACL,CAAC,CAAC"}
1	+ {"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../src/library/webpack/child-app/common.ts"],"names":[],"mappings":"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"}

package/lib/library/webpack/utils/threadLoader.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"threadLoader.d.ts","sourceRoot":"","sources":["../../../../src/library/webpack/utils/threadLoader.ts"],"names":[],"mappings":"~~AAEA~~,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;~~AAuCvE~~,eAAO,MAAM,gBAAgB,kBAAmB,cAAc,cAAc,CAAC,SAe5E,CAAC;AAEF,eAAO,MAAM,eAAe,kBAAmB,cAAc,cAAc,CAAC,SAE3E,CAAC;AAEF,eAAO,MAAM,iBAAiB,kBACZ,cAAc,cAAc,CAAC,cAAc,OAAO,IAAI,SAIrE,CAAC"}
1	+ {"version":3,"file":"threadLoader.d.ts","sourceRoot":"","sources":["../../../../src/library/webpack/utils/threadLoader.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AA2DvE,eAAO,MAAM,gBAAgB,kBAAmB,cAAc,cAAc,CAAC,SAe5E,CAAC;AAEF,eAAO,MAAM,eAAe,kBAAmB,cAAc,cAAc,CAAC,SAE3E,CAAC;AAEF,eAAO,MAAM,iBAAiB,kBACZ,cAAc,cAAc,CAAC,cAAc,OAAO,IAAI,SAIrE,CAAC"}

package/lib/library/webpack/utils/threadLoader.js CHANGED Viewed

@@ -2,12 +2,28 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applyThreadLoader = exports.closeWorkerPool = exports.warmupWorkerPool = void 0;
 const tslib_1 = require("tslib");
+const os_1 = tslib_1.__importDefault(require("os"));
 const threadLoader = tslib_1.__importStar(require("thread-loader"));
 const workerPools_1 = require("thread-loader/dist/workerPools");
 const getCustomConfig = (configManager) => {
     const { threadLoader: additionalConfig } = configManager;
     return additionalConfig || {};
 };
+function calculateNumberOfWorkers() {
+    if (typeof process.env.TRAMVAI_THREAD_LOADER_WORKERS === 'string' &&
+        !Number.isNaN(Number(process.env.TRAMVAI_THREAD_LOADER_WORKERS))) {
+        return Number(process.env.TRAMVAI_THREAD_LOADER_WORKERS);
+    }
+    // There are situations when this call will return undefined so
+    // we are fallback here to 1.
+    // More info on: https://github.com/nodejs/node/issues/19022
+    const cpus = os_1.default.cpus() || {
+        length: 1,
+    };
+    // for transpilation use a half of the available CPUs per different webpack worker,
+    // also leave at least 1 CPUs free (for process itself)
+    return Math.max(1, cpus.length - 1);
+}
 const createWorkerPoolConfig = (configManager) => {
     return {
         poolTimeout: configManager.env === 'development' ? Infinity : undefined,
@@ -16,12 +32,13 @@ const createWorkerPoolConfig = (configManager) => {
         poolRespawn: configManager.env === 'development',
         ...getCustomConfig(configManager),
         name: 'tramvai-worker-pool',
+        workers: calculateNumberOfWorkers(),
     };
 };
 const isApplicable = (configManager) => {
-    return (
-    // thread-loader uses child_process.fork under the hood, and sometimes (50/50) work in these processes does not get into inspector.Session profile
-    !process.env.TRAMVAI_CPU_PROFILE &&
+    return (process.env.TRAMVAI_DISABLE_THREAD_LOADER !== 'true' &&
+        // thread-loader uses child_process.fork under the hood, and sometimes (50/50) work in these processes does not get into inspector.Session profile
+        !process.env.TRAMVAI_CPU_PROFILE &&
         !process.env.TRAMVAI_DEBUG_BUILD &&
         // TODO: check that there is still issue with windows systems and thread-loader
         process.platform !== 'win32' &&

package/lib/library/webpack/utils/threadLoader.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"threadLoader.js","sourceRoot":"","sources":["../../../../src/library/webpack/utils/threadLoader.ts"],"names":[],"mappings":";;;;AAAA,oEAA8C;AAC9C,gEAAyD;AAKzD,MAAM,eAAe,GAAG,CAAC,aAA4C,EAAO,EAAE;IAC5E,MAAM,EAAE,YAAY,EAAE,gBAAgB,EAAE,GAAG,aAAa,CAAC;IAEzD,OAAO,gBAAgB,IAAI,EAAE,CAAC;AAChC,CAAC,CAAC;AAEF,MAAM,sBAAsB,GAAG,CAAC,aAA4C,EAAE,EAAE;IAC9E,OAAO;QACL,WAAW,EAAE,aAAa,CAAC,GAAG,KAAK,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;QACvE,2EAA2E;QAC3E,2CAA2C;QAC3C,WAAW,EAAE,aAAa,CAAC,GAAG,KAAK,aAAa;QAChD,GAAG,eAAe,CAAC,aAAa,CAAC;QACjC,IAAI,EAAE,qBAAqB;~~KAC5B~~,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,aAA4C,EAAE,EAAE;IACpE,OAAO;~~IACL~~,kJAAkJ;~~IAClJ~~,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB;QAChC,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB;QAChC,+EAA+E;QAC/E,OAAO,CAAC,QAAQ,KAAK,OAAO;QAC5B,kGAAkG;QAClG,aAAa,CAAC,WAAW,CAAC,aAAa,CAAC,MAAM,KAAK,KAAK,CACzD,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,aAA4C,EAAE,EAAE;IACxE,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE;QAChC,OAAO;KACR;IAED,OAAO,sBAAsB,CAAC,aAAa,CAAC,CAAC;AAC/C,CAAC,CAAC;AAEK,MAAM,gBAAgB,GAAG,CAAC,aAA4C,EAAE,EAAE;IAC/E,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE;QAChC,OAAO;KACR;IAED,MAAM,MAAM,GAAG,sBAAsB,CAAC,aAAa,CAAC,CAAC;IAErD,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE;QAC1B,cAAc;QACd,mBAAmB;QACnB,0BAA0B;QAC1B,qBAAqB;QACrB,iCAAiC;QACjC,kCAAkC;KACnC,CAAC,CAAC;AACL,CAAC,CAAC;AAfW,QAAA,gBAAgB,oBAe3B;AAEK,MAAM,eAAe,GAAG,CAAC,aAA4C,EAAE,EAAE;IAC9E,IAAA,qBAAO,EAAC,sBAAsB,CAAC,aAAa,CAAC,CAAC,EAAE,cAAc,EAAE,CAAC;AACnE,CAAC,CAAC;AAFW,QAAA,eAAe,mBAE1B;AAEK,MAAM,iBAAiB,GAC5B,CAAC,aAA4C,EAAE,EAAE,CAAC,CAAC,MAAmB,EAAE,EAAE;IACxE,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAC/C,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC,CACnF,CAAC;AACJ,CAAC,CAAC;AALS,QAAA,iBAAiB,qBAK1B"}
1	+ {"version":3,"file":"threadLoader.js","sourceRoot":"","sources":["../../../../src/library/webpack/utils/threadLoader.ts"],"names":[],"mappings":";;;;AAAA,oDAAoB;AACpB,oEAA8C;AAC9C,gEAAyD;AAKzD,MAAM,eAAe,GAAG,CAAC,aAA4C,EAAO,EAAE;IAC5E,MAAM,EAAE,YAAY,EAAE,gBAAgB,EAAE,GAAG,aAAa,CAAC;IAEzD,OAAO,gBAAgB,IAAI,EAAE,CAAC;AAChC,CAAC,CAAC;AAEF,SAAS,wBAAwB;IAC/B,IACE,OAAO,OAAO,CAAC,GAAG,CAAC,6BAA6B,KAAK,QAAQ;QAC7D,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC,EAChE;QACA,OAAO,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;KAC1D;IACD,+DAA+D;IAC/D,6BAA6B;IAC7B,4DAA4D;IAC5D,MAAM,IAAI,GAAG,YAAE,CAAC,IAAI,EAAE,IAAI;QACxB,MAAM,EAAE,CAAC;KACV,CAAC;IACF,mFAAmF;IACnF,uDAAuD;IACvD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AACtC,CAAC;AAED,MAAM,sBAAsB,GAAG,CAAC,aAA4C,EAAE,EAAE;IAC9E,OAAO;QACL,WAAW,EAAE,aAAa,CAAC,GAAG,KAAK,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;QACvE,2EAA2E;QAC3E,2CAA2C;QAC3C,WAAW,EAAE,aAAa,CAAC,GAAG,KAAK,aAAa;QAChD,GAAG,eAAe,CAAC,aAAa,CAAC;QACjC,IAAI,EAAE,qBAAqB;QAC3B,OAAO,EAAE,wBAAwB,EAAE;KACpC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,aAA4C,EAAE,EAAE;IACpE,OAAO,CACL,OAAO,CAAC,GAAG,CAAC,6BAA6B,KAAK,MAAM;QACpD,kJAAkJ;QAClJ,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB;QAChC,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB;QAChC,+EAA+E;QAC/E,OAAO,CAAC,QAAQ,KAAK,OAAO;QAC5B,kGAAkG;QAClG,aAAa,CAAC,WAAW,CAAC,aAAa,CAAC,MAAM,KAAK,KAAK,CACzD,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,aAA4C,EAAE,EAAE;IACxE,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE;QAChC,OAAO;KACR;IAED,OAAO,sBAAsB,CAAC,aAAa,CAAC,CAAC;AAC/C,CAAC,CAAC;AAEK,MAAM,gBAAgB,GAAG,CAAC,aAA4C,EAAE,EAAE;IAC/E,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE;QAChC,OAAO;KACR;IAED,MAAM,MAAM,GAAG,sBAAsB,CAAC,aAAa,CAAC,CAAC;IAErD,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE;QAC1B,cAAc;QACd,mBAAmB;QACnB,0BAA0B;QAC1B,qBAAqB;QACrB,iCAAiC;QACjC,kCAAkC;KACnC,CAAC,CAAC;AACL,CAAC,CAAC;AAfW,QAAA,gBAAgB,oBAe3B;AAEK,MAAM,eAAe,GAAG,CAAC,aAA4C,EAAE,EAAE;IAC9E,IAAA,qBAAO,EAAC,sBAAsB,CAAC,aAAa,CAAC,CAAC,EAAE,cAAc,EAAE,CAAC;AACnE,CAAC,CAAC;AAFW,QAAA,eAAe,mBAE1B;AAEK,MAAM,iBAAiB,GAC5B,CAAC,aAA4C,EAAE,EAAE,CAAC,CAAC,MAAmB,EAAE,EAAE;IACxE,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAC/C,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC,CACnF,CAAC;AACJ,CAAC,CAAC;AALS,QAAA,iBAAiB,qBAK1B"}

package/lib/library/webpack/utils/transpiler.js CHANGED Viewed

@@ -18,7 +18,7 @@ const addTranspilerLoader = (configManager, transpilerConfig) => (rule) => {
 Please run "npx tramvai add --dev @tramvai/swc-integration" to fix the problem
       `);
         }
-        return rule.loader('swc-loader').options((0, swc_1.getSwcOptions)(transpilerConfig)).end();
+        return rule.loader('swc-loader').options((0, swc_1.swcConfigFactory)(transpilerConfig)).end();
     }
     if (loader === 'babel') {
         return rule.loader('babel-loader').options((0, babel_1.babelConfigFactory)(transpilerConfig)).end();

package/lib/library/webpack/utils/transpiler.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"transpiler.js","sourceRoot":"","sources":["../../../../src/library/webpack/utils/transpiler.ts"],"names":[],"mappings":";;;;AACA,qCAA0C;AAC1C,+FAAsD;AACtD,wEAAwC;AAExC,~~mCAA0C~~;~~AAC1C~~,uCAAiD;AAqC1C,MAAM,mBAAmB,GAC9B,CAAC,aAA4C,EAAE,gBAAkC,EAAE,EAAE,CACrF,CAAC,IAAgB,EAAE,EAAE;IACnB,MAAM,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC,WAAW,CAAC,aAAa,CAAC;IAE3D,IAAI,MAAM,KAAK,KAAK,EAAE;QACpB,IAAI;YACF,IAAA,cAAO,EAAC,uCAAuC,EAAE,EAAE,OAAO,EAAE,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC;SACtF;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,IAAI,KAAK,CAAC;;OAEjB,CAAC,CAAC;SACF;QAED,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,IAAA,~~mBAAa~~,EAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;~~KACjF~~;IAED,IAAI,MAAM,KAAK,OAAO,EAAE;QACtB,OAAO,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,IAAA,0BAAkB,EAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;KACxF;AACH,CAAC,CAAC;AApBS,QAAA,mBAAmB,uBAoB5B;AAEG,MAAM,mBAAmB,GAAG,CACjC,aAA4C,EAC5C,kBAA6C,EAAE,EAC7B,EAAE;IACpB,MAAM,EACJ,iBAAiB,EACjB,KAAK,EACL,MAAM,EACN,OAAO,EACP,0BAA0B,EAC1B,iBAAiB,EACjB,WAAW,EAAE,EAAE,iCAAiC,EAAE,aAAa,EAAE,GAClE,GAAG,aAAa,CAAC;IAClB,MAAM,EAAE,GAAG,EAAE,GAAG,aAAa,CAAC;IAC9B,MAAM,QAAQ,GAAG,aAAa,CAAC,SAAS,KAAK,QAAQ,CAAC;IAEtD,IAAI,KAAK,EAAE;QACT,OAAO,CAAC,IAAI,CAAC;yFACwE,CAAC,CAAC;KACxF;IAED,IAAI,YAAY,GAAG,MAAM,CAAC;IAE1B,IAAI,CAAC,MAAM,EAAE;QACX,IAAI,QAAQ,EAAE;YACZ,YAAY,GAAG,MAAM,CAAC;SACvB;KACF;IAED,MAAM,qBAAqB,GAAG,sBAAY,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAE/D,0HAA0H;IAC1H,MAAM,iBAAiB,GACrB,qBAAqB,EAAE,CAAC,YAAY,CAAC,IAAI,6BAAU,CAAC,YAAY,CAAC,IAAI,6BAAU,CAAC,QAAQ,CAAC;IAE3F,MAAM,mBAAmB,GAAG,IAAA,sBAAY,EAAC,iBAAiB,EAAE;QAC1D,eAAe,EAAE,IAAI;QACrB,GAAG,EAAE,YAAY;KAClB,CAAC,CAAC;IAEH,OAAO;QACL,QAAQ;QACR,GAAG;QACH,iBAAiB;QACjB,OAAO,EAAE,IAAI;QACb,kBAAkB,EAAE,IAAI;QACxB,GAAG,EAAE,CAAC,CAAC,aAAa,CAAC,UAAU,CAAC,OAAO;QACvC,iBAAiB;QACjB,0BAA0B;QAC1B,OAAO,EAAE,aAAa,CAAC,OAAO;QAC9B,MAAM;QACN,YAAY;QACZ,mBAAmB;QACnB,MAAM,EAAE,IAAI;QACZ,OAAO,EAAE,KAAK;QACd,UAAU,EAAE,KAAK;QACjB,iCAAiC;QACjC,aAAa;QACb,GAAG,eAAe;KACnB,CAAC;AACJ,CAAC,CAAC;AA5DW,QAAA,mBAAmB,uBA4D9B"}
1	+ {"version":3,"file":"transpiler.js","sourceRoot":"","sources":["../../../../src/library/webpack/utils/transpiler.ts"],"names":[],"mappings":";;;;AACA,qCAA0C;AAC1C,+FAAsD;AACtD,wEAAwC;AAExC,mCAA6C;AAC7C,uCAAiD;AAqC1C,MAAM,mBAAmB,GAC9B,CAAC,aAA4C,EAAE,gBAAkC,EAAE,EAAE,CACrF,CAAC,IAAgB,EAAE,EAAE;IACnB,MAAM,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC,WAAW,CAAC,aAAa,CAAC;IAE3D,IAAI,MAAM,KAAK,KAAK,EAAE;QACpB,IAAI;YACF,IAAA,cAAO,EAAC,uCAAuC,EAAE,EAAE,OAAO,EAAE,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC;SACtF;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,IAAI,KAAK,CAAC;;OAEjB,CAAC,CAAC;SACF;QAED,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,IAAA,sBAAgB,EAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;KACpF;IAED,IAAI,MAAM,KAAK,OAAO,EAAE;QACtB,OAAO,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,IAAA,0BAAkB,EAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;KACxF;AACH,CAAC,CAAC;AApBS,QAAA,mBAAmB,uBAoB5B;AAEG,MAAM,mBAAmB,GAAG,CACjC,aAA4C,EAC5C,kBAA6C,EAAE,EAC7B,EAAE;IACpB,MAAM,EACJ,iBAAiB,EACjB,KAAK,EACL,MAAM,EACN,OAAO,EACP,0BAA0B,EAC1B,iBAAiB,EACjB,WAAW,EAAE,EAAE,iCAAiC,EAAE,aAAa,EAAE,GAClE,GAAG,aAAa,CAAC;IAClB,MAAM,EAAE,GAAG,EAAE,GAAG,aAAa,CAAC;IAC9B,MAAM,QAAQ,GAAG,aAAa,CAAC,SAAS,KAAK,QAAQ,CAAC;IAEtD,IAAI,KAAK,EAAE;QACT,OAAO,CAAC,IAAI,CAAC;yFACwE,CAAC,CAAC;KACxF;IAED,IAAI,YAAY,GAAG,MAAM,CAAC;IAE1B,IAAI,CAAC,MAAM,EAAE;QACX,IAAI,QAAQ,EAAE;YACZ,YAAY,GAAG,MAAM,CAAC;SACvB;KACF;IAED,MAAM,qBAAqB,GAAG,sBAAY,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAE/D,0HAA0H;IAC1H,MAAM,iBAAiB,GACrB,qBAAqB,EAAE,CAAC,YAAY,CAAC,IAAI,6BAAU,CAAC,YAAY,CAAC,IAAI,6BAAU,CAAC,QAAQ,CAAC;IAE3F,MAAM,mBAAmB,GAAG,IAAA,sBAAY,EAAC,iBAAiB,EAAE;QAC1D,eAAe,EAAE,IAAI;QACrB,GAAG,EAAE,YAAY;KAClB,CAAC,CAAC;IAEH,OAAO;QACL,QAAQ;QACR,GAAG;QACH,iBAAiB;QACjB,OAAO,EAAE,IAAI;QACb,kBAAkB,EAAE,IAAI;QACxB,GAAG,EAAE,CAAC,CAAC,aAAa,CAAC,UAAU,CAAC,OAAO;QACvC,iBAAiB;QACjB,0BAA0B;QAC1B,OAAO,EAAE,aAAa,CAAC,OAAO;QAC9B,MAAM;QACN,YAAY;QACZ,mBAAmB;QACnB,MAAM,EAAE,IAAI;QACZ,OAAO,EAAE,KAAK;QACd,UAAU,EAAE,KAAK;QACjB,iCAAiC;QACjC,aAAa;QACb,GAAG,eAAe;KACnB,CAAC;AACJ,CAAC,CAAC;AA5DW,QAAA,mBAAmB,uBA4D9B"}

package/lib/models/analytics/utils.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { FeaturesProperties, ProjectProperties } from './analytics';
+import { FeaturesProperties, ProjectProperties } from '@tramvai/api/lib/services/analytics';
 import { ConfigManager } from '../config';
 export declare function getProjectProperties({ parameters, configManager, }: {
     parameters: {
@@ -9,6 +9,7 @@ export declare function getProjectProperties({ parameters, configManager, }: {
 export declare function getFeaturesProperties({ parameters, configManager, }: {
     parameters: {
         target?: string;
+        experimentalWebpackWorkerThreads?: boolean;
     };
     configManager: ConfigManager;
 }): FeaturesProperties;

package/lib/models/analytics/utils.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/models/analytics/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,~~aAAa~~,CAAC;~~AAEpE~~,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAc1C,wBAAgB,oBAAoB,CAAC,EACnC,UAAU,EACV,aAAa,GACd,EAAE;IACD,UAAU,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAChC,aAAa,EAAE,aAAa,CAAC;CAC9B,GAAG,iBAAiB,CAoBpB;~~AAED~~,wBAAgB,qBAAqB,CAAC,EACpC,UAAU,EACV,aAAa,GACd,EAAE;IACD,UAAU,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;~~IAChC~~,aAAa,EAAE,aAAa,CAAC;CAC9B,GAAG,kBAAkB,~~CAuErB~~"}
1	+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/models/analytics/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AAE5F,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAc1C,wBAAgB,oBAAoB,CAAC,EACnC,UAAU,EACV,aAAa,GACd,EAAE;IACD,UAAU,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAChC,aAAa,EAAE,aAAa,CAAC;CAC9B,GAAG,iBAAiB,CAoBpB;AAGD,wBAAgB,qBAAqB,CAAC,EACpC,UAAU,EACV,aAAa,GACd,EAAE;IACD,UAAU,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,gCAAgC,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;IAC5E,aAAa,EAAE,aAAa,CAAC;CAC9B,GAAG,kBAAkB,CA0ErB"}

package/lib/models/analytics/utils.js CHANGED Viewed

@@ -30,6 +30,7 @@ function getProjectProperties({ parameters, configManager, }) {
     return projectCache[projectName];
 }
 exports.getProjectProperties = getProjectProperties;
+// eslint-disable-next-line max-statements
 function getFeaturesProperties({ parameters, configManager, }) {
     const projectName = parameters.target ?? 'unknown';
     let project;
@@ -65,6 +66,8 @@ function getFeaturesProperties({ parameters, configManager, }) {
             featuresCache[projectName].transitionsRouterProvider =
                 !!(applicationProject.experiments?.viewTransitions ||
                     applicationProject.experiments?.reactTransitions) ?? false;
+            featuresCache[projectName].experimentalWebpackWorkerThreads =
+                parameters.experimentalWebpackWorkerThreads;
         }
         if (project.type === 'child-app') {
             const childAppProject = project;

package/lib/models/analytics/utils.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/models/analytics/utils.ts"],"names":[],"mappings":"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~~SACd~~;QAED,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW,EAAE;YAChC,MAAM,eAAe,GAAG,OAA8B,CAAC;YACvD,MAAM,mBAAmB,GAAG,eAAe,CAAC,WAAW,EAAE,aAAa,EAAE,MAAM,CAAC;YAE/E,aAAa,CAAC,WAAW,CAAC,CAAC,GAAG;gBAC5B,0CAA0C;gBAC1C,CAAC,mBAAmB,KAAK,KAAK;oBAC5B,mBAAmB,EAAE,WAAW,KAAK,KAAK;oBAC1C,mBAAmB,EAAE,UAAU,KAAK,KAAK,CAAC;oBAC5C,KAAK,CAAC;YAER,aAAa,CAAC,WAAW,CAAC,CAAC,aAAa;gBACtC,CAAC,CAAC,eAAe,CAAC,WAAW,EAAE,aAAa,IAAI,KAAK,CAAC;SACzD;KACF;IAED,OAAO,aAAa,CAAC,WAAW,CAAC,CAAC;AACpC,CAAC;~~AA7ED~~,~~sDA6EC~~"}
1	+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/models/analytics/utils.ts"],"names":[],"mappings":"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"}

package/lib/models/command.d.ts CHANGED Viewed

@@ -18,7 +18,6 @@ type validator<TParams> = (context: Context, parameters: TParams) => Promise<{
     message?: string;
 }>;
 export declare abstract class Command<TParams = any> {
-    readonly validators?: validator<TParams>[];
     abstract readonly name: string;
     abstract readonly description: string;
     abstract readonly command: string;
@@ -26,6 +25,7 @@ export declare abstract class Command<TParams = any> {
     abstract readonly alias: string;
     abstract run(parameters: TParams): Promise<CommandResult>;
     help?(): string[];
+    validators?(): validator<TParams>[];
     protected abstract action(parameters: TParams): Promise<CommandResult>;
     protected abstract analyticEventLabel?(parameters: TParams): string;
     protected abstract analyticCommandUsageLabel?(parameters: TParams): string;

package/lib/models/command.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/models/command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEzC,MAAM,MAAM,kBAAkB,GAAG,KAAK,OAAO,EAAE,OAAO,KAAK,UAAU,CAAC;AAEtE,MAAM,MAAM,UAAU,GAAG,kBAAkB,EAAE,CAAC;AAE9C,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,MAAM;IACrB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,YAAY,CAAC,EAAE,GAAG,CAAC;IAC5B,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC,GAAG,GAAG,OAAA,KAAK,GAAG,CAAC;CACxC;AAED,KAAK,SAAS,CAAC,OAAO,IAAI,CACxB,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,OAAO,KAChB,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAEjE,8BAAsB,OAAO,CAAC,OAAO,GAAG,GAAG;IACzC,QAAQ,CAAC,~~UAAU,CAAC,EAAE,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;IAE3C,~~QAAQ,CAAC,~~QAAQ,CAAC,~~IAAI,EAAE,MAAM,CAAC;IAE/B,QAAQ,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAEtC,QAAQ,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAElC,QAAQ,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAEpC,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAEhC,QAAQ,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC;IAEzD,IAAI,CAAC,IAAI,MAAM,EAAE;IAEjB,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC;IAEtE,SAAS,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,UAAU,EAAE,OAAO,GAAG,MAAM;IAEnE,SAAS,CAAC,QAAQ,CAAC,yBAAyB,CAAC,CAAC,UAAU,EAAE,OAAO,GAAG,MAAM;CAC3E;AAED,8BAAsB,UAAU,CAC9B,OAAO,SAAS;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,GAAG,CACzC,SAAQ,OAAO,CAAC,OAAO,CAAC;IACxB,OAAO,EAAE,OAAO,CAAC;gBAEL,OAAO,EAAE,OAAO;IAMtB,GAAG,CAAC,UAAU,EAAE,OAAO;~~cAYb~~,SAAS,CAAC,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAsB7D,SAAS,CAAC,yBAAyB,CAAC,EAAE,MAAM,EAAE,EAAE,OAAO;IAIvD,SAAS,CAAC,kBAAkB,CAAC,UAAU,EAAE,OAAO;CAGjD"}
1	+ {"version":3,"file":"command.d.ts","sourceRoot":"","sources":["../../src/models/command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEzC,MAAM,MAAM,kBAAkB,GAAG,KAAK,OAAO,EAAE,OAAO,KAAK,UAAU,CAAC;AAEtE,MAAM,MAAM,UAAU,GAAG,kBAAkB,EAAE,CAAC;AAE9C,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,MAAM;IACrB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,YAAY,CAAC,EAAE,GAAG,CAAC;IAC5B,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC,GAAG,GAAG,OAAA,KAAK,GAAG,CAAC;CACxC;AAED,KAAK,SAAS,CAAC,OAAO,IAAI,CACxB,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,OAAO,KAChB,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAEjE,8BAAsB,OAAO,CAAC,OAAO,GAAG,GAAG;IACzC,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAE/B,QAAQ,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAEtC,QAAQ,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAElC,QAAQ,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAEpC,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAEhC,QAAQ,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC;IAEzD,IAAI,CAAC,IAAI,MAAM,EAAE;IAEjB,UAAU,CAAC,IAAI,SAAS,CAAC,OAAO,CAAC,EAAE;IAEnC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC;IAEtE,SAAS,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,UAAU,EAAE,OAAO,GAAG,MAAM;IAEnE,SAAS,CAAC,QAAQ,CAAC,yBAAyB,CAAC,CAAC,UAAU,EAAE,OAAO,GAAG,MAAM;CAC3E;AAED,8BAAsB,UAAU,CAC9B,OAAO,SAAS;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,GAAG,CACzC,SAAQ,OAAO,CAAC,OAAO,CAAC;IACxB,OAAO,EAAE,OAAO,CAAC;gBAEL,OAAO,EAAE,OAAO;IAMtB,GAAG,CAAC,UAAU,EAAE,OAAO;cAWb,SAAS,CAAC,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAsB7D,SAAS,CAAC,yBAAyB,CAAC,EAAE,MAAM,EAAE,EAAE,OAAO;IAIvD,SAAS,CAAC,kBAAkB,CAAC,UAAU,EAAE,OAAO;CAGjD"}

package/lib/models/command.js CHANGED Viewed

@@ -22,7 +22,7 @@ class CLICommand extends Command {
         if (!this.validators) {
             return;
         }
-        const result = await Promise.all(this.validators.map((fn) => fn(this.context, parameters)));
+        const result = await Promise.all(this.validators().map((fn) => fn(this.context, parameters)));
         result.forEach((item) => {
             if (item.message) {
                 this.context.logger.event({

package/lib/models/command.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"command.js","sourceRoot":"","sources":["../../src/models/command.ts"],"names":[],"mappings":";;;AAwBA,MAAsB,OAAO;CAsB5B;AAtBD,0BAsBC;AAED,MAAsB,UAEpB,SAAQ,OAAgB;IAGxB,YAAY,OAAgB;QAC1B,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,UAAmB;QAC3B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;YACxB,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,eAAe,IAAI,CAAC,IAAI,EAAE;YACjC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC;SACpC,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;~~QAEjC~~,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACjC,CAAC;IAES,KAAK,CAAC,SAAS,CAAC,UAAmB;QAC3C,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,OAAO;SACR;QAED,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;~~QAE5F~~,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACtB,IAAI,IAAI,CAAC,OAAO,EAAE;gBAChB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;oBACxB,IAAI,EAAE,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM;oBACjF,KAAK,EAAE,0BAA0B;oBACjC,OAAO,EAAE,IAAI,CAAC,OAAO;iBACtB,CAAC,CAAC;gBAEH,IAAI,IAAI,CAAC,MAAM,KAAK,OAAO,EAAE;oBAC3B,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;iBACxD;aACF;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAES,yBAAyB,CAAC,EAAE,MAAM,EAAW;QACrD,OAAO,MAAM,CAAC;IAChB,CAAC;IAES,kBAAkB,CAAC,UAAmB;QAC9C,OAAO,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IACpC,CAAC;CACF;~~AApDD~~,~~gCAoDC~~"}
1	+ {"version":3,"file":"command.js","sourceRoot":"","sources":["../../src/models/command.ts"],"names":[],"mappings":";;;AAwBA,MAAsB,OAAO;CAsB5B;AAtBD,0BAsBC;AAED,MAAsB,UAEpB,SAAQ,OAAgB;IAGxB,YAAY,OAAgB;QAC1B,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,UAAmB;QAC3B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;YACxB,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,eAAe,IAAI,CAAC,IAAI,EAAE;YACjC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC;SACpC,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QACjC,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACjC,CAAC;IAES,KAAK,CAAC,SAAS,CAAC,UAAmB;QAC3C,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,OAAO;SACR;QAED,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;QAE9F,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACtB,IAAI,IAAI,CAAC,OAAO,EAAE;gBAChB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;oBACxB,IAAI,EAAE,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM;oBACjF,KAAK,EAAE,0BAA0B;oBACjC,OAAO,EAAE,IAAI,CAAC,OAAO;iBACtB,CAAC,CAAC;gBAEH,IAAI,IAAI,CAAC,MAAM,KAAK,OAAO,EAAE;oBAC3B,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;iBACxD;aACF;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAES,yBAAyB,CAAC,EAAE,MAAM,EAAW;QACrD,OAAO,MAAM,CAAC;IAChB,CAAC;IAES,kBAAkB,CAAC,UAAmB;QAC9C,OAAO,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IACpC,CAAC;CACF;AAnDD,gCAmDC"}

package/lib/models/context.d.ts CHANGED Viewed

@@ -1,9 +1,9 @@
 import { type PackageManager } from '@tinkoff/package-manager-wrapper';
+import { AnalyticsService } from '@tramvai/api/lib/services/analytics';
 import type { Logger } from './logger';
 import type { Command, CommandResult } from './command';
 import type { Task, TaskResult } from './task';
 import type { ConfigManager } from './config';
-import { AnalyticsService } from './analytics/analytics';
 export declare class Context {
     config: ConfigManager;
     logger: Logger;

package/lib/models/context.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/models/context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AACxD,OAAO,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;~~AAC9C~~,~~OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,~~qBAAa,OAAO;IAET,MAAM,EAAE,aAAa;IACrB,MAAM,EAAE,MAAM;IACd,UAAU,EAAE,MAAM;IAClB,iBAAiB,EAAE,cAAc;IACjC,cAAc,EAAE,cAAc;IAC9B,SAAS,EAAE,gBAAgB;IAC3B,OAAO,EAAE,CAAC,IAAI,KAAA,EAAE,MAAM,CAAC,KAAA,KAAK,OAAO,CAAC,UAAU,CAAC;IAC/C,UAAU,EAAE,CAAC,IAAI,KAAA,EAAE,MAAM,CAAC,KAAA,KAAK,OAAO,CAAC,aAAa,CAAC;IACrD,QAAQ,EAAE,MAAM,IAAI,EAAE;IACtB,WAAW,EAAE,MAAM,OAAO,EAAE;gBAT5B,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,cAAc,EACjC,cAAc,EAAE,cAAc,EAC9B,SAAS,EAAE,gBAAgB,EAC3B,OAAO,EAAE,CAAC,IAAI,KAAA,EAAE,MAAM,CAAC,KAAA,KAAK,OAAO,CAAC,UAAU,CAAC,EAC/C,UAAU,EAAE,CAAC,IAAI,KAAA,EAAE,MAAM,CAAC,KAAA,KAAK,OAAO,CAAC,aAAa,CAAC,EACrD,QAAQ,EAAE,MAAM,IAAI,EAAE,EACtB,WAAW,EAAE,MAAM,OAAO,EAAE;CAEtC"}
1	+ {"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/models/context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AACvE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AACxD,OAAO,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAE9C,qBAAa,OAAO;IAET,MAAM,EAAE,aAAa;IACrB,MAAM,EAAE,MAAM;IACd,UAAU,EAAE,MAAM;IAClB,iBAAiB,EAAE,cAAc;IACjC,cAAc,EAAE,cAAc;IAC9B,SAAS,EAAE,gBAAgB;IAC3B,OAAO,EAAE,CAAC,IAAI,KAAA,EAAE,MAAM,CAAC,KAAA,KAAK,OAAO,CAAC,UAAU,CAAC;IAC/C,UAAU,EAAE,CAAC,IAAI,KAAA,EAAE,MAAM,CAAC,KAAA,KAAK,OAAO,CAAC,aAAa,CAAC;IACrD,QAAQ,EAAE,MAAM,IAAI,EAAE;IACtB,WAAW,EAAE,MAAM,OAAO,EAAE;gBAT5B,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,cAAc,EACjC,cAAc,EAAE,cAAc,EAC9B,SAAS,EAAE,gBAAgB,EAC3B,OAAO,EAAE,CAAC,IAAI,KAAA,EAAE,MAAM,CAAC,KAAA,KAAK,OAAO,CAAC,UAAU,CAAC,EAC/C,UAAU,EAAE,CAAC,IAAI,KAAA,EAAE,MAAM,CAAC,KAAA,KAAK,OAAO,CAAC,aAAa,CAAC,EACrD,QAAQ,EAAE,MAAM,IAAI,EAAE,EACtB,WAAW,EAAE,MAAM,OAAO,EAAE;CAEtC"}

package/lib/models/logger.d.ts CHANGED Viewed

@@ -7,5 +7,4 @@ export interface LogEvent {
 export declare class Logger {
     event(event: LogEvent): void;
 }
-export declare const logger: Logger;
 //# sourceMappingURL=logger.d.ts.map

package/lib/models/logger.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/models/logger.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,SAAS,GAAG,OAAO,GAAG,SAAS,GAAG,MAAM,GAAG,OAAO,CAAC;IACzD,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,GAAG,CAAC;CACf;AAED,qBAAa,MAAM;IACjB,KAAK,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI;CA+B7B~~;AAED,eAAO,MAAM,MAAM,QAAe,CAAC~~"}
1	+ {"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/models/logger.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,SAAS,GAAG,OAAO,GAAG,SAAS,GAAG,MAAM,GAAG,OAAO,CAAC;IACzD,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,GAAG,CAAC;CACf;AAED,qBAAa,MAAM;IACjB,KAAK,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI;CA+B7B"}