@tramvai/cli 2.64.0 → 2.66.0

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

@@ -14,12 +14,11 @@ const sourcemaps_1 = tslib_1.__importDefault(require("../../blocks/sourcemaps"))
 const fancy_1 = tslib_1.__importDefault(require("../../plugins/WebpackBar/reporters/fancy"));
 const webpackServerConfig = ({ configManager, showProgress, }) => {
     var _a;
-    const { options: { server = '' } = {} } = configManager.build;
     const config = new webpack_chain_1.default();
     config.batch((0, common_1.default)(configManager));
     config.batch((0, dev_1.default)());
     config.batch((0, dev_2.commonApplicationDev)({
-        entry: path_1.default.resolve(configManager.rootDir, server),
+        entry: path_1.default.resolve(configManager.rootDir, `${configManager.root}/index`),
         onlyBundles: configManager.onlyBundles,
     }));
     config.batch((0, configResolve_1.default)(configManager));
@@ -32,9 +31,7 @@ const webpackServerConfig = ({ configManager, showProgress, }) => {
             ignored: /.*/,
         });
     }
-    config.externals((configManager.build.configurations.externals || [])
-        .concat(configManager.serve.configurations.externals || [])
-        .map((s) => new RegExp(`^${s}`)));
+    config.externals(['react$', 'react-dom', 'prop-types', 'fastify', 'core-js', ...configManager.externals].map((s) => new RegExp(`^${s}`)));
     config.optimization.set('emitOnErrors', false);
     if (showProgress) {
         config.plugin('progress').use(webpackbar_1.default, [
@@ -55,7 +52,7 @@ const webpackServerConfig = ({ configManager, showProgress, }) => {
     ]);
     config.plugin('runtime-path').use(RuntimePathPlugin_1.default, [
         {
-            publicPath: (_a = process.env.ASSETS_PREFIX) !== null && _a !== void 0 ? _a : `"http://${configManager.staticHost}:${configManager.staticPort}/${configManager.build.options.outputClient.replace(/\/$/, '')}/"`,
+            publicPath: (_a = process.env.ASSETS_PREFIX) !== null && _a !== void 0 ? _a : `"http://${configManager.staticHost}:${configManager.staticPort}/${configManager.output.client.replace(/\/$/, '')}/"`,
         },
     ]);
     return config;

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

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

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

@@ -10,12 +10,11 @@ const sourcemaps_1 = tslib_1.__importDefault(require("../../blocks/sourcemaps"))
 const prod_1 = tslib_1.__importDefault(require("../../common/server/prod"));
 const webpackServerConfig = ({ configManager, }) => {
     const config = new webpack_chain_1.default();
-    const { debug } = configManager;
-    const { configurations: { sourceMapServer }, } = configManager.build;
+    const { debug, sourceMap } = configManager;
     config.batch((0, common_1.default)(configManager));
     config.batch((0, prod_1.default)(configManager));
     config.bail(true);
-    config.externals((configManager.build.configurations.externals || []).map((s) => new RegExp(`^${s}`)));
+    config.externals(configManager.externals.map((s) => new RegExp(`^${s}`)));
     if (configManager.disableProdOptimization) {
         // with this option for id of module path to file will be used
         config.optimization.set('moduleIds', 'named');
@@ -48,7 +47,7 @@ const webpackServerConfig = ({ configManager, }) => {
             publicPath: 'process.env.ASSETS_PREFIX',
         },
     ]);
-    if (sourceMapServer || debug) {
+    if (sourceMap || debug) {
         config.batch((0, sourcemaps_1.default)(configManager));
     }
     return config;

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

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

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

@@ -5,7 +5,7 @@ const path_1 = tslib_1.__importDefault(require("path"));
 const fs_readdir_recursive_1 = tslib_1.__importDefault(require("fs-readdir-recursive"));
 // eslint-disable-next-line import/no-default-export
 exports.default = (configManager) => (config) => {
-    const dir = path_1.default.resolve(configManager.rootDir, configManager.build.options.serverApiDir);
+    const dir = path_1.default.resolve(configManager.rootDir, configManager.serverApiDir);
     const files = (0, fs_readdir_recursive_1.default)(dir);
     if (!files.length) {
         return;

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

@@ -1 +1 @@
-{"version":3,"file":"apiResolve.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/apiResolve.ts"],"names":[],"mappings":";;;AAAA,wDAAwB;AAExB,wFAA2C;AAI3C,oDAAoD;AACpD,kBAAe,CAAC,aAAoD,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAC1F,MAAM,GAAG,GAAG,cAAI,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,EAAE,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAC1F,MAAM,KAAK,GAAG,IAAA,8BAAO,EAAC,GAAG,CAAC,CAAC;IAE3B,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;QACjB,OAAO;KACR;IAED,MAAM,OAAO,GAAG,EAAE,CAAC;IAEnB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,MAAM,OAAO,GAAG,cAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACnC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,KAAK,OAAO,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAE/E,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YAC1C,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,eAAe,cAAI,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;SACzF;KACF;IAED,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,cAAc,CAAC;QACrB,2FAA2F;QAC3F,+DAA+D;QAC/D,oGAAoG;SACnG,IAAI,CAAC,2CAA2C,CAAC;SACjD,GAAG,CAAC,SAAS,CAAC;SACd,MAAM,CAAC,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,2BAA2B,CAAC,CAAC;SAC5D,OAAO,CAAC;QACP,IAAI,EAAE;IACR,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC;EACrB;KACG,CAAC;SACD,GAAG,EAAE;SACL,OAAO,CAAC,MAAM,CAAC,CAAC;AACrB,CAAC,CAAC"}
+{"version":3,"file":"apiResolve.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/apiResolve.ts"],"names":[],"mappings":";;;AAAA,wDAAwB;AAExB,wFAA2C;AAI3C,oDAAoD;AACpD,kBAAe,CAAC,aAAoD,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAC1F,MAAM,GAAG,GAAG,cAAI,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,EAAE,aAAa,CAAC,YAAY,CAAC,CAAC;IAC5E,MAAM,KAAK,GAAG,IAAA,8BAAO,EAAC,GAAG,CAAC,CAAC;IAE3B,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;QACjB,OAAO;KACR;IAED,MAAM,OAAO,GAAG,EAAE,CAAC;IAEnB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,MAAM,OAAO,GAAG,cAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACnC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,KAAK,OAAO,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAE/E,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YAC1C,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,eAAe,cAAI,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;SACzF;KACF;IAED,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,cAAc,CAAC;QACrB,2FAA2F;QAC3F,+DAA+D;QAC/D,oGAAoG;SACnG,IAAI,CAAC,2CAA2C,CAAC;SACjD,GAAG,CAAC,SAAS,CAAC;SACd,MAAM,CAAC,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,2BAA2B,CAAC,CAAC;SAC5D,OAAO,CAAC;QACP,IAAI,EAAE;IACR,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC;EACrB;KACG,CAAC;SACD,GAAG,EAAE;SACL,OAAO,CAAC,MAAM,CAAC,CAAC;AACrB,CAAC,CAAC"}

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

@@ -14,9 +14,9 @@ exports.default = (configManager) => (config) => {
         .loader(path_1.default.resolve(__dirname, '../loaders/replaceContent'))
         .options({
         code: `
-  import { ConfigManager } from '@tramvai/cli/lib/config/configManager';
+  import { createConfigManager } from '@tramvai/cli/lib/config/configManager';
 
-  const appConfig = ConfigManager.rehydrate(${JSON.stringify(configManager.dehydrate())});
+  const appConfig = createConfigManager(...${JSON.stringify(configManager.dehydrate())});
   const moduleConfig = appConfig;
 
   export { appConfig, moduleConfig };

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

@@ -1 +1 @@
-{"version":3,"file":"configResolve.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/configResolve.ts"],"names":[],"mappings":";;;AAAA,wDAAwB;AAIxB,oDAAoD;AACpD,kBAAe,CAAC,aAA4B,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAClE,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,iBAAiB,CAAC;QACxB,2FAA2F;QAC3F,+DAA+D;QAC/D,oGAAoG;SACnG,IAAI,CAAC,8CAA8C,CAAC;SACpD,GAAG,CAAC,SAAS,CAAC;SACd,MAAM,CAAC,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,2BAA2B,CAAC,CAAC;SAC5D,OAAO,CAAC;QACP,IAAI,EAAE;;;8CAGkC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC;;;;;CAKtF;KACI,CAAC;SACD,GAAG,EAAE;SACL,OAAO,CAAC,MAAM,CAAC,CAAC;AACrB,CAAC,CAAC"}
+{"version":3,"file":"configResolve.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/configResolve.ts"],"names":[],"mappings":";;;AAAA,wDAAwB;AAIxB,oDAAoD;AACpD,kBAAe,CAAC,aAA4B,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAClE,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,iBAAiB,CAAC;QACxB,2FAA2F;QAC3F,+DAA+D;QAC/D,oGAAoG;SACnG,IAAI,CAAC,8CAA8C,CAAC;SACpD,GAAG,CAAC,SAAS,CAAC;SACd,MAAM,CAAC,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,2BAA2B,CAAC,CAAC;SAC5D,OAAO,CAAC;QACP,IAAI,EAAE;;;6CAGiC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC;;;;;CAKrF;KACI,CAAC;SACD,GAAG,EAAE;SACL,OAAO,CAAC,MAAM,CAAC,CAAC;AACrB,CAAC,CAAC"}

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

@@ -1,11 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.configToEnv = void 0;
+const validate_1 = require("../../../config/validate");
 const shouldUseReactRoot_1 = require("../../../utils/shouldUseReactRoot");
 const configToEnv = (configManager) => (config) => {
-    const { fileSystemPages } = configManager.build.configurations;
+    const { fileSystemPages } = (0, validate_1.isApplication)(configManager)
+        ? configManager
+        : { fileSystemPages: { enabled: false, routesDir: false, pagesDir: false } };
     config.plugin('define').tap((args) => [
-        Object.assign(Object.assign({}, args[0]), { 'process.env.__TRAMVAI_EXPERIMENTAL_ENABLE_FILE_SYSTEM_PAGES': JSON.stringify(fileSystemPages.enable), 'process.env.__TRAMVAI_EXPERIMENTAL_FILE_SYSTEM_ROUTES_DIR': JSON.stringify(fileSystemPages.routesDir), 'process.env.__TRAMVAI_EXPERIMENTAL_FILE_SYSTEM_PAGES_DIR': JSON.stringify(fileSystemPages.pagesDir), 'process.env.__TRAMVAI_CONCURRENT_FEATURES': JSON.stringify((0, shouldUseReactRoot_1.shouldUseReactRoot)()), 'process.env.__TRAMVAI_FORCE_CLIENT_SIDE_RENDERING': JSON.stringify(configManager.csr) }),
+        Object.assign(Object.assign({}, args[0]), { 'process.env.__TRAMVAI_EXPERIMENTAL_ENABLE_FILE_SYSTEM_PAGES': JSON.stringify(fileSystemPages.enabled), 'process.env.__TRAMVAI_EXPERIMENTAL_FILE_SYSTEM_ROUTES_DIR': JSON.stringify(fileSystemPages.routesDir), 'process.env.__TRAMVAI_EXPERIMENTAL_FILE_SYSTEM_PAGES_DIR': JSON.stringify(fileSystemPages.pagesDir), 'process.env.__TRAMVAI_CONCURRENT_FEATURES': JSON.stringify((0, shouldUseReactRoot_1.shouldUseReactRoot)()), 'process.env.__TRAMVAI_FORCE_CLIENT_SIDE_RENDERING': JSON.stringify(configManager.csr) }),
     ]);
 };
 exports.configToEnv = configToEnv;

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

@@ -1 +1 @@
-{"version":3,"file":"configToEnv.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/configToEnv.ts"],"names":[],"mappings":";;;AAGA,0EAAuE;AAEhE,MAAM,WAAW,GAAG,CAAC,aAAyC,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAC3F,MAAM,EAAE,eAAe,EAAE,GAAG,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC;IAE/D,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;wCAE/B,IAAI,CAAC,CAAC,CAAC,KACV,6DAA6D,EAAE,IAAI,CAAC,SAAS,CAC3E,eAAe,CAAC,MAAM,CACvB,EACD,2DAA2D,EAAE,IAAI,CAAC,SAAS,CACzE,eAAe,CAAC,SAAS,CAC1B,EACD,0DAA0D,EAAE,IAAI,CAAC,SAAS,CACxE,eAAe,CAAC,QAAQ,CACzB,EACD,2CAA2C,EAAE,IAAI,CAAC,SAAS,CAAC,IAAA,uCAAkB,GAAE,CAAC,EACjF,mDAAmD,EAAE,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,GAAG,CAAC;KAEzF,CAAC,CAAC;AACL,CAAC,CAAC;AAnBW,QAAA,WAAW,eAmBtB"}
+{"version":3,"file":"configToEnv.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/configToEnv.ts"],"names":[],"mappings":";;;AAEA,uDAAyD;AAEzD,0EAAuE;AAEhE,MAAM,WAAW,GAAG,CAAC,aAAyC,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAC3F,MAAM,EAAE,eAAe,EAAE,GAAG,IAAA,wBAAa,EAAC,aAAa,CAAC;QACtD,CAAC,CAAC,aAAa;QACf,CAAC,CAAC,EAAE,eAAe,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,CAAC;IAE/E,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;wCAE/B,IAAI,CAAC,CAAC,CAAC,KACV,6DAA6D,EAAE,IAAI,CAAC,SAAS,CAC3E,eAAe,CAAC,OAAO,CACxB,EACD,2DAA2D,EAAE,IAAI,CAAC,SAAS,CACzE,eAAe,CAAC,SAAS,CAC1B,EACD,0DAA0D,EAAE,IAAI,CAAC,SAAS,CACxE,eAAe,CAAC,QAAQ,CACzB,EACD,2CAA2C,EAAE,IAAI,CAAC,SAAS,CAAC,IAAA,uCAAkB,GAAE,CAAC,EACjF,mDAAmD,EAAE,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,GAAG,CAAC;KAEzF,CAAC,CAAC;AACL,CAAC,CAAC;AArBW,QAAA,WAAW,eAqBtB"}

package/lib/library/webpack/blocks/css.d.ts

@@ -1,7 +1,9 @@
 import type Config from 'webpack-chain';
 import type { ConfigManager } from '../../../config/configManager';
+import type { CliConfigEntry } from '../../../typings/configEntry/cli';
+export declare const getPostcssConfigPath: (configManager: ConfigManager<CliConfigEntry>) => string;
 interface Options {
     localIdentName?: string;
 }
-export declare const cssWebpackRulesFactory: (configManager: ConfigManager, options?: Options) => (config: Config) => void;
+export declare const cssWebpackRulesFactory: (configManager: ConfigManager<CliConfigEntry>, options?: Options) => (config: Config) => void;
 export default cssWebpackRulesFactory;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cssWebpackRulesFactory = void 0;
+exports.cssWebpackRulesFactory = exports.getPostcssConfigPath = void 0;
 const tslib_1 = require("tslib");
 const applyOrReturn_1 = tslib_1.__importDefault(require("@tinkoff/utils/function/applyOrReturn"));
 const path_1 = tslib_1.__importDefault(require("path"));
@@ -9,16 +9,26 @@ const minicss_class_generator_1 = require("@tinkoff/minicss-class-generator");
 const safeRequire_1 = require("../../../utils/safeRequire");
 const cssLocalIdentNameDevDefault = '[name]__[local]_[minicss]';
 const cssLocalIdentNameProdDefault = '[minicss]';
+const getPostcssConfigPath = (configManager) => {
+    var _a;
+    return (_a = configManager.postcss.config) !== null && _a !== void 0 ? _a : 'postcss.config';
+};
+exports.getPostcssConfigPath = getPostcssConfigPath;
 const cssWebpackRulesFactory = (configManager, options = {}) => (config) => {
     var _a, _b;
-    const { postcss: { config: postcssConfig = '', cssLocalIdentName = null, cssLocalIdentNameDev = cssLocalIdentName !== null && cssLocalIdentName !== void 0 ? cssLocalIdentName : cssLocalIdentNameDevDefault, cssLocalIdentNameProd = cssLocalIdentName !== null && cssLocalIdentName !== void 0 ? cssLocalIdentName : cssLocalIdentNameProdDefault, } = {}, } = configManager.build.configurations;
     const { env, sourceMap } = configManager;
-    const localIdentName = (_a = options.localIdentName) !== null && _a !== void 0 ? _a : (env === 'production' ? cssLocalIdentNameProd : cssLocalIdentNameDev);
+    const { postcss: { config: postcssConfig, cssLocalIdentName = env === 'production'
+        ? cssLocalIdentNameProdDefault
+        : cssLocalIdentNameDevDefault, cssModulePattern, }, } = configManager;
+    const localIdentName = (_a = options.localIdentName) !== null && _a !== void 0 ? _a : cssLocalIdentName;
     const configCssLoader = (cfg) => {
         cfg.use('extract-css').loader(mini_css_extract_plugin_1.default.loader).options({ esModule: false });
         const cssModulesOptions = {
             localIdentName,
         };
+        if (cssModulePattern) {
+            cssModulesOptions.auto = new RegExp(cssModulePattern);
+        }
         // TODO: можно будет избавиться от проверки и сотавить всё в minicss-плагине, когда зарелизят эти изменения
         // https://github.com/webpack-contrib/css-loader/blob/master/src/utils.js#L310
         if (/\[minicss]/.test(localIdentName)) {
@@ -31,9 +41,10 @@ const cssWebpackRulesFactory = (configManager, options = {}) => (config) => {
             esModule: false,
         });
     };
-    const postcssCfg = postcssConfig
-        ? (_b = (0, safeRequire_1.safeRequire)(path_1.default.resolve(configManager.rootDir, postcssConfig), process.env.NODE_ENV === 'test')) !== null && _b !== void 0 ? _b : {}
-        : {};
+    const postcssCfg = (_b = (0, safeRequire_1.safeRequire)(path_1.default.resolve(configManager.rootDir, (0, exports.getPostcssConfigPath)(configManager)), 
+    // ignore missed file if users haven't provided any value
+    // in case the path was provided it should exist
+    typeof postcssConfig === 'undefined')) !== null && _b !== void 0 ? _b : {};
     config.module
         .rule('css')
         .test(/\.css$/)

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

@@ -1 +1 @@
-{"version":3,"file":"css.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/css.ts"],"names":[],"mappings":";;;;AAAA,kGAAkE;AAClE,wDAAwB;AAExB,8FAAuD;AACvD,8EAAmE;AACnE,4DAAyD;AAGzD,MAAM,2BAA2B,GAAG,2BAA2B,CAAC;AAChE,MAAM,4BAA4B,GAAG,WAAW,CAAC;AAM1C,MAAM,sBAAsB,GACjC,CAAC,aAA4B,EAAE,UAAmB,EAAE,EAAE,EAAE,CACxD,CAAC,MAAc,EAAE,EAAE;;IACjB,MAAM,EACJ,OAAO,EAAE,EACP,MAAM,EAAE,aAAa,GAAG,EAAE,EAC1B,iBAAiB,GAAG,IAAI,EACxB,oBAAoB,GAAG,iBAAiB,aAAjB,iBAAiB,cAAjB,iBAAiB,GAAI,2BAA2B,EACvE,qBAAqB,GAAG,iBAAiB,aAAjB,iBAAiB,cAAjB,iBAAiB,GAAI,4BAA4B,GAC1E,GAAG,EAAE,GACP,GAAG,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC;IACvC,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,aAAa,CAAC;IACzC,MAAM,cAAc,GAClB,MAAA,OAAO,CAAC,cAAc,mCACtB,CAAC,GAAG,KAAK,YAAY,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC;IAExE,MAAM,eAAe,GAAG,CAAC,GAAG,EAAE,EAAE;QAC9B,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,iCAAgB,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;QAEpF,MAAM,iBAAiB,GAAwB;YAC7C,cAAc;SACf,CAAC;QAEF,2GAA2G;QAC3G,8EAA8E;QAC9E,IAAI,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE;YACrC,iBAAiB,CAAC,aAAa,GAAG,IAAA,yCAAe,GAAE,CAAC;SACrD;QAED,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC;YAC1C,OAAO,EAAE,iBAAiB;YAC1B,SAAS;YACT,aAAa,EAAE,CAAC;YAChB,QAAQ,EAAE,KAAK;SAChB,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,MAAM,UAAU,GAAG,aAAa;QAC9B,CAAC,CAAC,MAAA,IAAA,yBAAW,EACT,cAAI,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,EAAE,aAAa,CAAC,EAClD,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,CAChC,mCAAI,EAAE;QACT,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,KAAK,CAAC;SACX,IAAI,CAAC,QAAQ,CAAC;SACd,KAAK,CAAC,eAAe,CAAC;SACtB,GAAG,CAAC,SAAS,CAAC;SACd,MAAM,CAAC,gBAAgB,CAAC;SACxB,OAAO,CAAC;QACP,SAAS;QACT,cAAc,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,iCACxB,UAAU,KACb,OAAO,EAAE;gBACP,OAAO,CAAC,uBAAuB,CAAC;gBAChC,OAAO,CAAC,gCAAgC,CAAC,CAAC,EAAE,uBAAuB,EAAE,IAAI,EAAE,CAAC;gBAC5E,gIAAgI;gBAChI,uIAAuI;gBACvI,mGAAmG;gBACnG,GAAG,CAAC,IAAA,uBAAa,EAAC,IAAI,EAAE,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;aACnD,IACD;KACH,CAAC,CAAC;AACP,CAAC,CAAC;AAhES,QAAA,sBAAsB,0BAgE/B;AAEJ,kBAAe,8BAAsB,CAAC"}
+{"version":3,"file":"css.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/css.ts"],"names":[],"mappings":";;;;AAAA,kGAAkE;AAClE,wDAAwB;AAExB,8FAAuD;AACvD,8EAAmE;AACnE,4DAAyD;AAIzD,MAAM,2BAA2B,GAAG,2BAA2B,CAAC;AAChE,MAAM,4BAA4B,GAAG,WAAW,CAAC;AAE1C,MAAM,oBAAoB,GAAG,CAAC,aAA4C,EAAE,EAAE;;IACnF,OAAO,MAAA,aAAa,CAAC,OAAO,CAAC,MAAM,mCAAI,gBAAgB,CAAC;AAC1D,CAAC,CAAC;AAFW,QAAA,oBAAoB,wBAE/B;AAMK,MAAM,sBAAsB,GACjC,CAAC,aAA4C,EAAE,UAAmB,EAAE,EAAE,EAAE,CACxE,CAAC,MAAc,EAAE,EAAE;;IACjB,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,aAAa,CAAC;IACzC,MAAM,EACJ,OAAO,EAAE,EACP,MAAM,EAAE,aAAa,EACrB,iBAAiB,GAAG,GAAG,KAAK,YAAY;QACtC,CAAC,CAAC,4BAA4B;QAC9B,CAAC,CAAC,2BAA2B,EAC/B,gBAAgB,GACjB,GACF,GAAG,aAAa,CAAC;IAClB,MAAM,cAAc,GAAG,MAAA,OAAO,CAAC,cAAc,mCAAI,iBAAiB,CAAC;IAEnE,MAAM,eAAe,GAAG,CAAC,GAAG,EAAE,EAAE;QAC9B,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,iCAAgB,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;QAEpF,MAAM,iBAAiB,GAAwB;YAC7C,cAAc;SACf,CAAC;QAEF,IAAI,gBAAgB,EAAE;YACpB,iBAAiB,CAAC,IAAI,GAAG,IAAI,MAAM,CAAC,gBAAgB,CAAC,CAAC;SACvD;QAED,2GAA2G;QAC3G,8EAA8E;QAC9E,IAAI,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE;YACrC,iBAAiB,CAAC,aAAa,GAAG,IAAA,yCAAe,GAAE,CAAC;SACrD;QAED,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC;YAC1C,OAAO,EAAE,iBAAiB;YAC1B,SAAS;YACT,aAAa,EAAE,CAAC;YAChB,QAAQ,EAAE,KAAK;SAChB,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,MAAM,UAAU,GACd,MAAA,IAAA,yBAAW,EACT,cAAI,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,EAAE,IAAA,4BAAoB,EAAC,aAAa,CAAC,CAAC;IACxE,yDAAyD;IACzD,gDAAgD;IAChD,OAAO,aAAa,KAAK,WAAW,CACrC,mCAAI,EAAE,CAAC;IAEV,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,KAAK,CAAC;SACX,IAAI,CAAC,QAAQ,CAAC;SACd,KAAK,CAAC,eAAe,CAAC;SACtB,GAAG,CAAC,SAAS,CAAC;SACd,MAAM,CAAC,gBAAgB,CAAC;SACxB,OAAO,CAAC;QACP,SAAS;QACT,cAAc,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,iCACxB,UAAU,KACb,OAAO,EAAE;gBACP,OAAO,CAAC,uBAAuB,CAAC;gBAChC,OAAO,CAAC,gCAAgC,CAAC,CAAC,EAAE,uBAAuB,EAAE,IAAI,EAAE,CAAC;gBAC5E,gIAAgI;gBAChI,uIAAuI;gBACvI,mGAAmG;gBACnG,GAAG,CAAC,IAAA,uBAAa,EAAC,IAAI,EAAE,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;aACnD,IACD;KACH,CAAC,CAAC;AACP,CAAC,CAAC;AApES,QAAA,sBAAsB,0BAoE/B;AAEJ,kBAAe,8BAAsB,CAAC"}

package/lib/library/webpack/blocks/extractCssPlugin.d.ts

@@ -1,8 +1,9 @@
 import type Config from 'webpack-chain';
 import type { ConfigManager } from '../../../config/configManager';
+import type { CliConfigEntry } from '../../../typings/configEntry/cli';
 interface Options {
-    filename?: string;
-    chunkFilename?: string;
+    filename?: string | null;
+    chunkFilename?: string | null;
 }
-export declare const extractCssPluginFactory: (configManager: ConfigManager, options?: Options) => (config: Config) => void;
+export declare const extractCssPluginFactory: (configManager: ConfigManager<CliConfigEntry>, options?: Options) => (config: Config) => void;
 export {};

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

@@ -7,16 +7,14 @@ const extractCssPluginFactory = (configManager, options = {}) => (config) => {
     var _a;
     const { filename = '[name].css', chunkFilename = '[name].chunk.css' } = options;
     const pluginOptions = {
-        filename,
-        chunkFilename,
         ignoreOrder: true,
         experimentalUseImportModule: !!((_a = configManager.experiments.minicss) === null || _a === void 0 ? void 0 : _a.useImportModule),
     };
-    if (filename === null) {
-        delete pluginOptions.filename;
+    if (filename !== null) {
+        pluginOptions.filename = filename;
     }
-    if (chunkFilename === null) {
-        delete pluginOptions.chunkFilename;
+    if (chunkFilename !== null) {
+        pluginOptions.chunkFilename = chunkFilename;
     }
     config.plugin('extract-css').use(mini_css_extract_plugin_1.default, [pluginOptions]);
 };

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

@@ -1 +1 @@
-{"version":3,"file":"extractCssPlugin.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/extractCssPlugin.ts"],"names":[],"mappings":";;;;AACA,8FAAuD;AAQhD,MAAM,uBAAuB,GAClC,CAAC,aAA4B,EAAE,UAAmB,EAAE,EAAE,EAAE,CACxD,CAAC,MAAc,EAAE,EAAE;;IACjB,MAAM,EAAE,QAAQ,GAAG,YAAY,EAAE,aAAa,GAAG,kBAAkB,EAAE,GAAG,OAAO,CAAC;IAEhF,MAAM,aAAa,GAAG;QACpB,QAAQ;QACR,aAAa;QACb,WAAW,EAAE,IAAI;QACjB,2BAA2B,EAAE,CAAC,CAAC,CAAA,MAAA,aAAa,CAAC,WAAW,CAAC,OAAO,0CAAE,eAAe,CAAA;KAClF,CAAC;IAEF,IAAI,QAAQ,KAAK,IAAI,EAAE;QACrB,OAAO,aAAa,CAAC,QAAQ,CAAC;KAC/B;IACD,IAAI,aAAa,KAAK,IAAI,EAAE;QAC1B,OAAO,aAAa,CAAC,aAAa,CAAC;KACpC;IAED,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,iCAAgB,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC;AACtE,CAAC,CAAC;AApBS,QAAA,uBAAuB,2BAoBhC"}
+{"version":3,"file":"extractCssPlugin.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/extractCssPlugin.ts"],"names":[],"mappings":";;;;AAEA,8FAAuD;AAShD,MAAM,uBAAuB,GAClC,CAAC,aAA4C,EAAE,UAAmB,EAAE,EAAE,EAAE,CACxE,CAAC,MAAc,EAAE,EAAE;;IACjB,MAAM,EAAE,QAAQ,GAAG,YAAY,EAAE,aAAa,GAAG,kBAAkB,EAAE,GAAG,OAAO,CAAC;IAEhF,MAAM,aAAa,GAAkB;QACnC,WAAW,EAAE,IAAI;QACjB,2BAA2B,EAAE,CAAC,CAAC,CAAA,MAAA,aAAa,CAAC,WAAW,CAAC,OAAO,0CAAE,eAAe,CAAA;KAClF,CAAC;IAEF,IAAI,QAAQ,KAAK,IAAI,EAAE;QACrB,aAAa,CAAC,QAAQ,GAAG,QAAQ,CAAC;KACnC;IAED,IAAI,aAAa,KAAK,IAAI,EAAE;QAC1B,aAAa,CAAC,aAAa,GAAG,aAAa,CAAC;KAC7C;IAED,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,iCAAgB,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC;AACtE,CAAC,CAAC;AAnBS,QAAA,uBAAuB,2BAmBhC"}

package/lib/library/webpack/blocks/filesClient.d.ts

@@ -1,4 +1,5 @@
 import type Config from 'webpack-chain';
 import type { ConfigManager } from '../../../config/configManager';
-export declare const filesClientWebackRulesFactory: (configManager: ConfigManager) => (config: Config) => void;
-export default filesClientWebackRulesFactory;
+import type { CliConfigEntry } from '../../../typings/configEntry/cli';
+export declare const filesClientWebpackRulesFactory: (configManager: ConfigManager<CliConfigEntry>) => (config: Config) => void;
+export default filesClientWebpackRulesFactory;

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

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.filesClientWebackRulesFactory = void 0;
+exports.filesClientWebpackRulesFactory = void 0;
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
 const spark_md5_1 = tslib_1.__importDefault(require("spark-md5"));
 const files_1 = require("../utils/files");
-const filesClientWebackRulesFactory = (configManager) => (config) => {
-    var _a, _b, _c, _d, _e, _f;
+const filesClientWebpackRulesFactory = (configManager) => (config) => {
+    var _a, _b;
     const svgoOptions = (0, files_1.getSvgoOptions)(configManager);
     config.module
         .rule('woff')
@@ -38,17 +38,17 @@ const filesClientWebackRulesFactory = (configManager) => (config) => {
         .rule('video')
         .test(/\.(mp4|webm|avif)$/)
         .set('type', 'asset/resource');
-    if ((_c = (_b = (_a = configManager.build) === null || _a === void 0 ? void 0 : _a.configurations) === null || _b === void 0 ? void 0 : _b.imageOptimization) === null || _c === void 0 ? void 0 : _c.enabled) {
+    if ((_a = configManager.imageOptimization) === null || _a === void 0 ? void 0 : _a.enabled) {
         config.module
             .rule('image-optimization')
             .test(/\.(gif|png|jpe?g|svg)$/)
             .use('image')
             .loader('image-webpack-loader')
-            .options(Object.assign({}, (_f = (_e = (_d = configManager.build) === null || _d === void 0 ? void 0 : _d.configurations) === null || _e === void 0 ? void 0 : _e.imageOptimization) === null || _f === void 0 ? void 0 : _f.options))
+            .options(Object.assign({}, (_b = configManager.imageOptimization) === null || _b === void 0 ? void 0 : _b.options))
             .end()
             .enforce('pre');
     }
 };
-exports.filesClientWebackRulesFactory = filesClientWebackRulesFactory;
-exports.default = exports.filesClientWebackRulesFactory;
+exports.filesClientWebpackRulesFactory = filesClientWebpackRulesFactory;
+exports.default = exports.filesClientWebpackRulesFactory;
 //# sourceMappingURL=filesClient.js.map

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;AAExD,MAAM,6BAA6B,GAAG,CAAC,aAA4B,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;;IAChG,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,MAAA,MAAA,aAAa,CAAC,KAAK,0CAAE,cAAc,0CAAE,iBAAiB,0CAAE,OAAO,EAAE;QACnE,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,mBAAM,MAAA,MAAA,MAAA,aAAa,CAAC,KAAK,0CAAE,cAAc,0CAAE,iBAAiB,0CAAE,OAAO,EAAG;aAC/E,GAAG,EAAE;aACL,OAAO,CAAC,KAAK,CAAC,CAAC;KACnB;AACH,CAAC,CAAC;AAhDW,QAAA,6BAA6B,iCAgDxC;AAEF,kBAAe,qCAA6B,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,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"}

package/lib/library/webpack/blocks/filesServer.d.ts

@@ -1,4 +1,5 @@
 import type Config from 'webpack-chain';
 import type { ConfigManager } from '../../../config/configManager';
-declare const _default: (configManager: ConfigManager) => (config: Config) => void;
+import type { CliConfigEntry } from '../../../typings/configEntry/cli';
+declare const _default: (configManager: ConfigManager<CliConfigEntry>) => (config: Config) => void;
 export default _default;

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

@@ -4,7 +4,7 @@ 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, _c, _d, _e, _f;
+    var _a, _b;
     const svgoOptions = (0, files_1.getSvgoOptions)(configManager);
     config.module
         .rule('woff')
@@ -38,13 +38,13 @@ exports.default = (configManager) => (config) => {
         .set('generator', {
         emit: false,
     });
-    if ((_c = (_b = (_a = configManager.build) === null || _a === void 0 ? void 0 : _a.configurations) === null || _b === void 0 ? void 0 : _b.imageOptimization) === null || _c === void 0 ? void 0 : _c.enabled) {
+    if ((_a = configManager.imageOptimization) === null || _a === void 0 ? void 0 : _a.enabled) {
         config.module
             .rule('image-optimization')
             .test(/\.(gif|png|jpe?g|svg)$/)
             .use('image')
             .loader('image-webpack-loader')
-            .options(Object.assign({}, (_f = (_e = (_d = configManager.build) === null || _d === void 0 ? void 0 : _d.configurations) === null || _e === void 0 ? void 0 : _e.imageOptimization) === null || _f === void 0 ? void 0 : _f.options))
+            .options(Object.assign({}, (_b = configManager.imageOptimization) === null || _b === void 0 ? void 0 : _b.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;AAGxB,0CAA+D;AAE/D,kBAAe,CAAC,aAA4B,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;;IAClE,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,MAAA,MAAA,aAAa,CAAC,KAAK,0CAAE,cAAc,0CAAE,iBAAiB,0CAAE,OAAO,EAAE;QACnE,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,mBAAM,MAAA,MAAA,MAAA,aAAa,CAAC,KAAK,0CAAE,cAAc,0CAAE,iBAAiB,0CAAE,OAAO,EAAG;aAC/E,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,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"}

package/lib/library/webpack/blocks/js.d.ts

@@ -1,4 +1,5 @@
 import type Config from 'webpack-chain';
 import type { ConfigManager } from '../../../config/configManager';
-declare const _default: (configManager: ConfigManager) => (config: Config) => void;
+import type { CliConfigEntry } from '../../../typings/configEntry/cli';
+declare const _default: (configManager: ConfigManager<CliConfigEntry>) => (config: Config) => void;
 export default _default;

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

@@ -5,7 +5,7 @@ const workersPool_1 = require("../utils/workersPool");
 const transpiler_1 = require("../utils/transpiler");
 // eslint-disable-next-line import/no-default-export
 exports.default = (configManager) => (config) => {
-    const { transpileOnlyModernLibs } = configManager.build.configurations;
+    const { transpileOnlyModernLibs } = configManager;
     const jsRule = (transpilerConfig) => (rule) => {
         const cfg = rule
             .test(/\.[cm]?js[x]?$/)

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

@@ -1 +1 @@
-{"version":3,"file":"js.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/js.ts"],"names":[],"mappings":";;AACA,0DAA0D;AAC1D,sDAAkE;AAGlE,oDAA+E;AAE/E,oDAAoD;AACpD,kBAAe,CAAC,aAA4B,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAClE,MAAM,EAAE,uBAAuB,EAAE,GAAG,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC;IAEvE,MAAM,MAAM,GAAG,CAAC,gBAAkC,EAAE,EAAE,CAAC,CAAC,IAAiB,EAAE,EAAE;QAC3E,MAAM,GAAG,GAAG,IAAI;aACb,IAAI,CAAC,gBAAgB,CAAC;aACtB,KAAK,CAAC,SAAS,CAAC;YACjB,6DAA6D;aAC5D,IAAI,CAAC,OAAO,CAAC,QAAQ,KAAK,OAAO,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE,CAClE,GAAG;aACA,GAAG,CAAC,QAAQ,CAAC;aACb,MAAM,CAAC,eAAe,CAAC;aACvB,OAAO,CAAC,IAAA,wCAA0B,EAAC,aAAa,CAAC,CAAC;aAClD,GAAG,EAAE,CACT;aACA,GAAG,CAAC,YAAY,CAAC,CAAC;QAErB,OAAO,IAAA,gCAAmB,EAAC,aAAa,EAAE,GAAG,EAAE,gBAAgB,CAAC,CAAC;IACnE,CAAC,CAAC;IAEF,IAAI,uBAAuB,EAAE;QAC3B,MAAM,CAAC,MAAM;aACV,IAAI,CAAC,YAAY,CAAC;aAClB,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;aAC3B,GAAG,EAAE;aACL,KAAK,CAAC,MAAM,CAAC,IAAA,gCAAmB,EAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QAErD,MAAM,CAAC,MAAM;aACV,IAAI,CAAC,iBAAiB,CAAC;aACvB,OAAO,CAAC,GAAG,CAAC,gCAAgB,CAAC;aAC7B,GAAG,EAAE;aACL,KAAK,CAAC,MAAM,CAAC,IAAA,gCAAmB,EAAC,aAAa,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;aACjE,KAAK,CAAC;YACL,sEAAsE;YACtE,8CAA8C;YAC9C,OAAO,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE;SACnC,CAAC,CAAC;KACN;SAAM;QACL,MAAM,CAAC,MAAM;aACV,IAAI,CAAC,YAAY,CAAC;aAClB,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;aAC3B,GAAG,EAAE;aACL,KAAK,CAAC,MAAM,CAAC,IAAA,gCAAmB,EAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QAErD,MAAM,CAAC,MAAM;aACV,IAAI,CAAC,iBAAiB,CAAC;aACvB,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;aAC3B,GAAG,EAAE;aACL,KAAK,CAAC,MAAM,CAAC,IAAA,gCAAmB,EAAC,aAAa,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;aACjE,KAAK,CAAC;YACL,sEAAsE;YACtE,8CAA8C;YAC9C,OAAO,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE;SACnC,CAAC,CAAC;KACN;AACH,CAAC,CAAC"}
+{"version":3,"file":"js.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/js.ts"],"names":[],"mappings":";;AACA,0DAA0D;AAC1D,sDAAkE;AAGlE,oDAA+E;AAG/E,oDAAoD;AACpD,kBAAe,CAAC,aAA4C,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAClF,MAAM,EAAE,uBAAuB,EAAE,GAAG,aAAa,CAAC;IAElD,MAAM,MAAM,GAAG,CAAC,gBAAkC,EAAE,EAAE,CAAC,CAAC,IAAiB,EAAE,EAAE;QAC3E,MAAM,GAAG,GAAG,IAAI;aACb,IAAI,CAAC,gBAAgB,CAAC;aACtB,KAAK,CAAC,SAAS,CAAC;YACjB,6DAA6D;aAC5D,IAAI,CAAC,OAAO,CAAC,QAAQ,KAAK,OAAO,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE,CAClE,GAAG;aACA,GAAG,CAAC,QAAQ,CAAC;aACb,MAAM,CAAC,eAAe,CAAC;aACvB,OAAO,CAAC,IAAA,wCAA0B,EAAC,aAAa,CAAC,CAAC;aAClD,GAAG,EAAE,CACT;aACA,GAAG,CAAC,YAAY,CAAC,CAAC;QAErB,OAAO,IAAA,gCAAmB,EAAC,aAAa,EAAE,GAAG,EAAE,gBAAgB,CAAC,CAAC;IACnE,CAAC,CAAC;IAEF,IAAI,uBAAuB,EAAE;QAC3B,MAAM,CAAC,MAAM;aACV,IAAI,CAAC,YAAY,CAAC;aAClB,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;aAC3B,GAAG,EAAE;aACL,KAAK,CAAC,MAAM,CAAC,IAAA,gCAAmB,EAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QAErD,MAAM,CAAC,MAAM;aACV,IAAI,CAAC,iBAAiB,CAAC;aACvB,OAAO,CAAC,GAAG,CAAC,gCAAgB,CAAC;aAC7B,GAAG,EAAE;aACL,KAAK,CAAC,MAAM,CAAC,IAAA,gCAAmB,EAAC,aAAa,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;aACjE,KAAK,CAAC;YACL,sEAAsE;YACtE,8CAA8C;YAC9C,OAAO,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE;SACnC,CAAC,CAAC;KACN;SAAM;QACL,MAAM,CAAC,MAAM;aACV,IAAI,CAAC,YAAY,CAAC;aAClB,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;aAC3B,GAAG,EAAE;aACL,KAAK,CAAC,MAAM,CAAC,IAAA,gCAAmB,EAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QAErD,MAAM,CAAC,MAAM;aACV,IAAI,CAAC,iBAAiB,CAAC;aACvB,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;aAC3B,GAAG,EAAE;aACL,KAAK,CAAC,MAAM,CAAC,IAAA,gCAAmB,EAAC,aAAa,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;aACjE,KAAK,CAAC;YACL,sEAAsE;YACtE,8CAA8C;YAC9C,OAAO,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE;SACnC,CAAC,CAAC;KACN;AACH,CAAC,CAAC"}

package/lib/library/webpack/blocks/nodeClient.d.ts

@@ -1,4 +1,5 @@
 import type Config from 'webpack-chain';
 import type { ConfigManager } from '../../../config/configManager';
-declare const _default: (configManager: ConfigManager) => (config: Config) => void;
+import type { CliConfigEntry } from '../../../typings/configEntry/cli';
+declare const _default: (configManager: ConfigManager<CliConfigEntry>) => (config: Config) => void;
 export default _default;

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

@@ -6,14 +6,14 @@ exports.default = (configManager) => (config) => {
     // webpack 5 больше не добавляет полифиллы для node-библиотек
     // поэтому если они всё же где-то используются на клиенте их надо добавить явно
     config.resolve.alias.set('path', 'path-browserify').set('vm', false);
-    const browserifyPolyfills = configManager.build.configurations.webpackResolveAlias;
+    const browserifyPolyfills = configManager.webpack.resolveAlias;
     if (browserifyPolyfills) {
         Object.entries(browserifyPolyfills).forEach(([key, value]) => {
             config.resolve.alias.set(key, value);
         });
     }
     config.plugin('provide').use(webpack_1.default.ProvidePlugin, [
-        Object.assign({ process: 'process' }, configManager.build.configurations.webpackProvide),
+        Object.assign({ 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;AAI9B,kBAAe,CAAC,aAA4B,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAClE,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,KAAK,CAAC,cAAc,CAAC,mBAAmB,CAAC;IACnF,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,IACf,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC,cAAc;KAEvD,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;wBAEhD,OAAO,EAAE,SAAS,IACd,aAAa,CAAC,OAAO,CAAC,OAA+B;KAE5D,CAAC,CAAC;AACL,CAAC,CAAC"}

package/lib/library/webpack/blocks/optimize.d.ts

@@ -1,4 +1,5 @@
 import type Config from 'webpack-chain';
 import type { ConfigManager } from '../../../config/configManager';
-declare const _default: (configManager: ConfigManager) => (config: Config) => void;
+import type { CliConfigEntry } from '../../../typings/configEntry/cli';
+declare const _default: (configManager: ConfigManager<CliConfigEntry>) => (config: Config) => void;
 export default _default;

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

@@ -29,11 +29,11 @@ exports.default = (configManager) => (config) => {
         ]);
         return;
     }
-    const { configurations: { terserParallel }, } = configManager.build;
+    const { terser } = configManager;
     config.plugin('terser').use(terser_webpack_plugin_1.default, [
         {
             extractComments: false,
-            parallel: terserParallel,
+            parallel: terser.parallel,
             terserOptions: {
                 ecma: modern ? 6 : 5,
                 mangle: {
@@ -51,7 +51,7 @@ exports.default = (configManager) => (config) => {
             },
         },
     ]);
-    if (configManager.build.configurations.cssMinimize === 'csso') {
+    if (configManager.cssMinimize === 'csso') {
         config.plugin('csso').use(csso_webpack_plugin_1.default, [{ restructure: false }]);
     }
     else {

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

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

@@ -4,7 +4,7 @@ exports.pagesResolve = void 0;
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
 const pagesResolve = (configManager) => (config) => {
-    const { fileSystemPages } = configManager.build.configurations;
+    const { fileSystemPages } = configManager;
     config.module
         .rule('file-system-pages')
         // [\\/]cli вместо @tramvai[\\/]cli, т.к. после слияния репозиториев tramvai и tramvai-cli,

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

@@ -1 +1 @@
-{"version":3,"file":"pagesResolve.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/pagesResolve.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AAKjB,MAAM,YAAY,GACvB,CAAC,aAAoD,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAC3E,MAAM,EAAE,eAAe,EAAE,GAAG,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC;IAE/D,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,mBAAmB,CAAC;QAC1B,2FAA2F;QAC3F,+DAA+D;QAC/D,oGAAoG;SACnG,IAAI,CAAC,6CAA6C,CAAC;SACnD,GAAG,CAAC,SAAS,CAAC;SACd,MAAM,CAAC,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,yBAAyB,CAAC,CAAC;SAC1D,OAAO,CAAC;QACP,eAAe;QACf,OAAO,EAAE,aAAa,CAAC,OAAO;QAC9B,IAAI,EAAE,aAAa,CAAC,IAAI;QACxB,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE;KAC/C,CAAC;SACD,GAAG,EAAE;QACN,gDAAgD;SAC/C,OAAO,CAAC,KAAK,CAAC,CAAC;AACpB,CAAC,CAAC;AArBS,QAAA,YAAY,gBAqBrB"}
+{"version":3,"file":"pagesResolve.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/pagesResolve.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AAKjB,MAAM,YAAY,GACvB,CAAC,aAAoD,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAC3E,MAAM,EAAE,eAAe,EAAE,GAAG,aAAa,CAAC;IAE1C,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,mBAAmB,CAAC;QAC1B,2FAA2F;QAC3F,+DAA+D;QAC/D,oGAAoG;SACnG,IAAI,CAAC,6CAA6C,CAAC;SACnD,GAAG,CAAC,SAAS,CAAC;SACd,MAAM,CAAC,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,yBAAyB,CAAC,CAAC;SAC1D,OAAO,CAAC;QACP,eAAe;QACf,OAAO,EAAE,aAAa,CAAC,OAAO;QAC9B,IAAI,EAAE,aAAa,CAAC,IAAI;QACxB,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE;KAC/C,CAAC;SACD,GAAG,EAAE;QACN,gDAAgD;SAC/C,OAAO,CAAC,KAAK,CAAC,CAAC;AACpB,CAAC,CAAC;AArBS,QAAA,YAAY,gBAqBrB"}

package/lib/library/webpack/blocks/postcssAssets.d.ts

@@ -1,4 +1,5 @@
 import type Config from 'webpack-chain';
 import type { ConfigManager } from '../../../config/configManager';
-export declare const postcssAssetsWebpackRulesFactory: (configManager: ConfigManager) => (config: Config) => void;
+import type { CliConfigEntry } from '../../../typings/configEntry/cli';
+export declare const postcssAssetsWebpackRulesFactory: (configManager: ConfigManager<CliConfigEntry>) => (config: Config) => void;
 export default postcssAssetsWebpackRulesFactory;

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

@@ -7,9 +7,9 @@ const postcss_assets_webpack_plugin_1 = tslib_1.__importDefault(require("postcss
 const safeRequire_1 = require("../../../utils/safeRequire");
 const postcssAssetsWebpackRulesFactory = (configManager) => (config) => {
     var _a;
-    const { postcss: { assetsConfig: postcssAssetsConfigPath = '' } = {} } = configManager.build.configurations;
+    const { postcss: { assetsConfig: postcssAssetsConfigPath = '' }, } = configManager;
     const postcssAssetsConfig = postcssAssetsConfigPath
-        ? (_a = (0, safeRequire_1.safeRequire)(path_1.default.resolve(configManager.rootDir, postcssAssetsConfigPath), process.env.NODE_ENV === 'test')) !== null && _a !== void 0 ? _a : {
+        ? (_a = (0, safeRequire_1.safeRequire)(path_1.default.resolve(configManager.rootDir, postcssAssetsConfigPath))) !== null && _a !== void 0 ? _a : {
             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;AAElD,MAAM,gCAAgC,GAC3C,CAAC,aAA4B,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;;IACnD,MAAM,EAAE,OAAO,EAAE,EAAE,YAAY,EAAE,uBAAuB,GAAG,EAAE,EAAE,GAAG,EAAE,EAAE,GACpE,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC;IAErC,MAAM,mBAAmB,GAAG,uBAAuB;QACjD,CAAC,CAAC,MAAA,IAAA,yBAAW,EACT,cAAI,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,EAAE,uBAAuB,CAAC,EAC5D,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM,CAChC,mCAAI;YACH,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;AAvBS,QAAA,gCAAgC,oCAuBzC;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,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"}

package/lib/library/webpack/blocks/serverInline.d.ts

@@ -1,3 +1,4 @@
 import Config from 'webpack-chain';
 import type { ConfigManager } from '../../../config/configManager';
-export declare const serverInline: (configManager: ConfigManager) => (config: Config) => void;
+import type { CliConfigEntry } from '../../../typings/configEntry/cli';
+export declare const serverInline: (configManager: ConfigManager<CliConfigEntry>) => (config: Config) => void;

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

@@ -1 +1 @@
-{"version":3,"file":"serverInline.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/serverInline.ts"],"names":[],"mappings":";;;;AAAA,0EAAmC;AAEnC,sDAAsB;AACtB,sDAAsB;AAEf,MAAM,YAAY,GAAG,CAAC,aAA4B,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAC/E,qDAAqD;IACrD,MAAM,mBAAmB,GAAG,aAAa,CAAC,YAAY,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IAE/F,MAAM,YAAY,GAAG,IAAI,uBAAM,EAAE,CAAC,KAAK,CAAC,IAAA,YAAE,EAAC,mBAAmB,CAAC,CAAC,CAAC,KAAK,CAAC,IAAA,YAAE,EAAC,mBAAmB,CAAC,CAAC,CAAC;IAEhG,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAE,SAAiB,EAAE,EAAE;QAC3D,MAAM,CAAC,MAAM;aACV,IAAI,CAAC,IAAI,CAAC;aACV,KAAK,CAAC,QAAQ,CAAC;aACf,MAAM,CAAC,SAAS,CAAC;aACjB,IAAI,CAAC,IAAI,MAAM,CAAC,uBAAuB,SAAS,GAAG,CAAC,CAAC;aACrD,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;IACrF,CAAC,CAAC;IAEF,gBAAgB,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;IACrC,gBAAgB,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;IAC1C,gBAAgB,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;AACvC,CAAC,CAAC;AAlBW,QAAA,YAAY,gBAkBvB"}
+{"version":3,"file":"serverInline.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/serverInline.ts"],"names":[],"mappings":";;;;AAAA,0EAAmC;AAGnC,sDAAsB;AACtB,sDAAsB;AAEf,MAAM,YAAY,GAAG,CAAC,aAA4C,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAC/F,qDAAqD;IACrD,MAAM,mBAAmB,GAAG,aAAa,CAAC,YAAY,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IAE/F,MAAM,YAAY,GAAG,IAAI,uBAAM,EAAE,CAAC,KAAK,CAAC,IAAA,YAAE,EAAC,mBAAmB,CAAC,CAAC,CAAC,KAAK,CAAC,IAAA,YAAE,EAAC,mBAAmB,CAAC,CAAC,CAAC;IAEhG,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAE,SAAiB,EAAE,EAAE;QAC3D,MAAM,CAAC,MAAM;aACV,IAAI,CAAC,IAAI,CAAC;aACV,KAAK,CAAC,QAAQ,CAAC;aACf,MAAM,CAAC,SAAS,CAAC;aACjB,IAAI,CAAC,IAAI,MAAM,CAAC,uBAAuB,SAAS,GAAG,CAAC,CAAC;aACrD,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;IACrF,CAAC,CAAC;IAEF,gBAAgB,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;IACrC,gBAAgB,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;IAC1C,gBAAgB,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;AACvC,CAAC,CAAC;AAlBW,QAAA,YAAY,gBAkBvB"}

package/lib/library/webpack/blocks/ts.d.ts

@@ -1,4 +1,5 @@
 import type Config from 'webpack-chain';
 import type { ConfigManager } from '../../../config/configManager';
-declare const _default: (configManager: ConfigManager) => (config: Config) => Config.Rule;
+import type { CliConfigEntry } from '../../../typings/configEntry/cli';
+declare const _default: (configManager: ConfigManager<CliConfigEntry>) => (config: Config) => Config.Rule;
 export default _default;

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

@@ -1 +1 @@
-{"version":3,"file":"ts.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/ts.ts"],"names":[],"mappings":";;AACA,sDAAkE;AAElE,oDAA+E;AAE/E,kBAAe,CAAC,aAA4B,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAClE,MAAM,gBAAgB,GAAG,IAAA,gCAAmB,EAAC,aAAa,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;IAElF,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM;SACtB,IAAI,CAAC,YAAY,CAAC;SAClB,IAAI,CAAC,WAAW,CAAC;SACjB,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;SAC3B,GAAG,EAAE;SACL,KAAK,CAAC,SAAS,CAAC;QACjB,6DAA6D;SAC5D,IAAI,CAAC,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAC1C,GAAG;SACA,GAAG,CAAC,QAAQ,CAAC;SACb,MAAM,CAAC,eAAe,CAAC;SACvB,OAAO,CAAC,IAAA,wCAA0B,EAAC,aAAa,CAAC,CAAC;SAClD,GAAG,EAAE,CACT;SACA,GAAG,CAAC,YAAY,CAAC,CAAC;IAErB,OAAO,IAAA,gCAAmB,EAAC,aAAa,EAAE,GAAG,EAAE,gBAAgB,CAAC,CAAC;AACnE,CAAC,CAAC"}
+{"version":3,"file":"ts.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/ts.ts"],"names":[],"mappings":";;AACA,sDAAkE;AAElE,oDAA+E;AAG/E,kBAAe,CAAC,aAA4C,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAClF,MAAM,gBAAgB,GAAG,IAAA,gCAAmB,EAAC,aAAa,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;IAElF,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM;SACtB,IAAI,CAAC,YAAY,CAAC;SAClB,IAAI,CAAC,WAAW,CAAC;SACjB,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;SAC3B,GAAG,EAAE;SACL,KAAK,CAAC,SAAS,CAAC;QACjB,6DAA6D;SAC5D,IAAI,CAAC,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAC1C,GAAG;SACA,GAAG,CAAC,QAAQ,CAAC;SACb,MAAM,CAAC,eAAe,CAAC;SACvB,OAAO,CAAC,IAAA,wCAA0B,EAAC,aAAa,CAAC,CAAC;SAClD,GAAG,EAAE,CACT;SACA,GAAG,CAAC,YAAY,CAAC,CAAC;IAErB,OAAO,IAAA,gCAAmB,EAAC,aAAa,EAAE,GAAG,EAAE,gBAAgB,CAAC,CAAC;AACnE,CAAC,CAAC"}

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

@@ -1,5 +1,5 @@
 import type Config from 'webpack-chain';
 import type { ConfigManager } from '../../../../config/configManager';
-import type { ModuleConfigEntry } from '../../../../typings/configEntry/module';
-declare const _default: (configManager: ConfigManager<ModuleConfigEntry>) => (config: Config) => void;
+import type { ChildAppConfigEntry } from '../../../../typings/configEntry/child-app';
+declare const _default: (configManager: ConfigManager<ChildAppConfigEntry>) => (config: Config) => void;
 export default _default;