@tramvai/cli 2.33.3 → 2.34.0

package/lib/api/index.d.ts

@@ -15,6 +15,7 @@ export { lessWebpackRulesFactory } from '../library/webpack/blocks/less';
 export { postcssAssetsWebpackRulesFactory } from '../library/webpack/blocks/postcssAssets';
 export { extractCssPluginFactory } from '../library/webpack/blocks/extractCssPlugin';
 export { configToEnv } from '../library/webpack/blocks/configToEnv';
+export * from '../typings/public';
 export declare const start: StartCommand;
 export declare const build: BuildCommand;
 export declare const benchmark: BenchmarkCommand;

package/lib/api/index.js

@@ -28,6 +28,7 @@ var extractCssPlugin_1 = require("../library/webpack/blocks/extractCssPlugin");
 Object.defineProperty(exports, "extractCssPluginFactory", { enumerable: true, get: function () { return extractCssPlugin_1.extractCssPluginFactory; } });
 var configToEnv_1 = require("../library/webpack/blocks/configToEnv");
 Object.defineProperty(exports, "configToEnv", { enumerable: true, get: function () { return configToEnv_1.configToEnv; } });
+tslib_1.__exportStar(require("../typings/public"), exports);
 const app = (0, createApp_1.createApp)({
     commands: {
         start: () => Promise.resolve().then(() => tslib_1.__importStar(require('./start'))),

package/lib/api/index.js.map

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

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

@@ -4,15 +4,19 @@ exports.filesClientWebackRulesFactory = 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, _g, _h, _j, _k;
+    var _a, _b, _c, _d, _e, _f;
+    const svgoOptions = (0, files_1.getSvgoOptions)(configManager);
     config.module
         .rule('woff')
         .test(/\.woff2?$/)
         .set('type', 'asset');
+    (0, files_1.addSvgrLoader)(configManager, config, svgoOptions);
     config.module
         .rule('svg')
         .test(/\.svg$/)
+        .set('resourceQuery', { not: /react/ })
         .set('type', 'asset/resource')
         .set('generator', {
         filename: (pathInfo) => {
@@ -23,16 +27,7 @@ const filesClientWebackRulesFactory = (configManager) => (config) => {
     })
         .use('svg')
         .loader('svgo-loader')
-        .options({
-        plugins: (_d = (_c = (_b = (_a = configManager.build) === null || _a === void 0 ? void 0 : _a.configurations) === null || _b === void 0 ? void 0 : _b.svgo) === null || _c === void 0 ? void 0 : _c.plugins) !== null && _d !== void 0 ? _d : [
-            {
-                cleanupIDs: false,
-            },
-            {
-                collapseGroups: false,
-            },
-        ],
-    });
+        .options(svgoOptions);
     config.module
         .rule('tramvai-image')
         .test(/\.(png|jpe?g|gif|webp)$/)
@@ -43,13 +38,13 @@ const filesClientWebackRulesFactory = (configManager) => (config) => {
         .rule('video')
         .test(/\.(mp4|webm|avif)$/)
         .set('type', 'asset/resource');
-    if ((_g = (_f = (_e = configManager.build) === null || _e === void 0 ? void 0 : _e.configurations) === null || _f === void 0 ? void 0 : _f.imageOptimization) === null || _g === void 0 ? void 0 : _g.enabled) {
+    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) {
         config.module
             .rule('image-optimization')
             .test(/\.(gif|png|jpe?g|svg)$/)
             .use('image')
             .loader('image-webpack-loader')
-            .options(Object.assign({}, (_k = (_j = (_h = configManager.build) === null || _h === void 0 ? void 0 : _h.configurations) === null || _j === void 0 ? void 0 : _j.imageOptimization) === null || _k === void 0 ? void 0 : _k.options))
+            .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))
             .end()
             .enforce('pre');
     }

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;AAG1B,MAAM,6BAA6B,GAAG,CAAC,aAA4B,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;;IAChG,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,MAAM,CAAC;SACZ,IAAI,CAAC,WAAW,CAAC;SACjB,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAExB,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,KAAK,CAAC;SACX,IAAI,CAAC,QAAQ,CAAC;SACd,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;QACP,OAAO,EAAE,MAAA,MAAA,MAAA,MAAA,aAAa,CAAC,KAAK,0CAAE,cAAc,0CAAE,IAAI,0CAAE,OAAO,mCAAI;YAC7D;gBACE,UAAU,EAAE,KAAK;aAClB;YACD;gBACE,cAAc,EAAE,KAAK;aACtB;SACF;KACF,CAAC,CAAC;IAEL,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;AApDW,QAAA,6BAA6B,iCAoDxC;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;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"}

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

@@ -2,8 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 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, _g, _h, _j, _k;
+    var _a, _b, _c, _d, _e, _f;
+    const svgoOptions = (0, files_1.getSvgoOptions)(configManager);
     config.module
         .rule('woff')
         .test(/\.woff2?$/)
@@ -11,22 +13,15 @@ exports.default = (configManager) => (config) => {
         .set('generator', {
         emit: false,
     });
+    (0, files_1.addSvgrLoader)(configManager, config, svgoOptions);
     config.module
         .rule('svg')
         .test(/\.svg$/)
+        .set('resourceQuery', { not: /react/ })
         .set('type', 'asset/source')
         .use('svg')
         .loader('svgo-loader')
-        .options({
-        plugins: (_d = (_c = (_b = (_a = configManager.build) === null || _a === void 0 ? void 0 : _a.configurations) === null || _b === void 0 ? void 0 : _b.svgo) === null || _c === void 0 ? void 0 : _c.plugins) !== null && _d !== void 0 ? _d : [
-            {
-                cleanupIDs: false,
-            },
-            {
-                collapseGroups: false,
-            },
-        ],
-    });
+        .options(svgoOptions);
     config.module
         .rule('tramvai-image')
         .test(/\.(png|jpe?g|gif|webp)$/)
@@ -43,13 +38,13 @@ exports.default = (configManager) => (config) => {
         .set('generator', {
         emit: false,
     });
-    if ((_g = (_f = (_e = configManager.build) === null || _e === void 0 ? void 0 : _e.configurations) === null || _f === void 0 ? void 0 : _f.imageOptimization) === null || _g === void 0 ? void 0 : _g.enabled) {
+    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) {
         config.module
             .rule('image-optimization')
             .test(/\.(gif|png|jpe?g|svg)$/)
             .use('image')
             .loader('image-webpack-loader')
-            .options(Object.assign({}, (_k = (_j = (_h = configManager.build) === null || _h === void 0 ? void 0 : _h.configurations) === null || _j === void 0 ? void 0 : _j.imageOptimization) === null || _k === void 0 ? void 0 : _k.options))
+            .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))
             .end()
             .enforce('pre');
     }

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

@@ -1 +1 @@
-{"version":3,"file":"filesServer.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/filesServer.ts"],"names":[],"mappings":";;;AAAA,wDAAwB;AAIxB,kBAAe,CAAC,aAA4B,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;;IAClE,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,MAAM,CAAC,MAAM;SACV,IAAI,CAAC,KAAK,CAAC;SACX,IAAI,CAAC,QAAQ,CAAC;SACd,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC;SAC3B,GAAG,CAAC,KAAK,CAAC;SACV,MAAM,CAAC,aAAa,CAAC;SACrB,OAAO,CAAC;QACP,OAAO,EAAE,MAAA,MAAA,MAAA,MAAA,aAAa,CAAC,KAAK,0CAAE,cAAc,0CAAE,IAAI,0CAAE,OAAO,mCAAI;YAC7D;gBACE,UAAU,EAAE,KAAK;aAClB;YACD;gBACE,cAAc,EAAE,KAAK;aACtB;SACF;KACF,CAAC,CAAC;IAEL,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;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"}

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

@@ -1,30 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const is_modern_lib_1 = require("@tinkoff/is-modern-lib");
-const babel_1 = tslib_1.__importDefault(require("../../babel"));
-const swc_1 = require("../../swc");
 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 { generateDataQaTag, alias, removeTypeofWindow, enableFillActionNamePlugin, transpileOnlyModernLibs, } = configManager.build.configurations;
-    const { env, modern } = configManager;
-    const commonBabelConfig = {
-        isServer: configManager.buildType === 'server',
-        env,
-        generateDataQaTag,
-        modern,
-        alias,
-        tramvai: true,
-        hot: configManager.hotRefresh,
-        excludesPresetEnv: configManager.build.configurations.excludesPresetEnv,
-        removeTypeofWindow,
-        enableFillActionNamePlugin,
-        rootDir: configManager.rootDir,
-        target: configManager.target,
-    };
+    const transpilerConfig = (0, transpiler_1.getTranspilerConfig)(configManager);
+    const { transpileOnlyModernLibs } = configManager.build.configurations;
     const jsRule = (babelCfg) => (rule) => {
-        const { loader } = configManager.experiments.transpilation;
         const cfg = rule
             .test(/\.[cm]?js[x]?$/)
             .oneOf('default')
@@ -35,24 +18,19 @@ exports.default = (configManager) => (config) => {
             .options((0, workersPool_1.createWorkerPoolBabel)(configManager))
             .end())
             .use('babel');
-        if (loader === 'swc') {
-            return cfg.loader('swc-loader').options((0, swc_1.getSwcOptions)(babelCfg)).end();
-        }
-        if (loader === 'babel') {
-            return cfg.loader('babel-loader').options((0, babel_1.default)(babelCfg)).end();
-        }
+        return (0, transpiler_1.addTranspilerLoader)(configManager, cfg, babelCfg);
     };
     if (transpileOnlyModernLibs) {
         config.module
             .rule('js:project')
             .exclude.add(/node_modules/)
             .end()
-            .batch(jsRule(commonBabelConfig));
+            .batch(jsRule(transpilerConfig));
         config.module
             .rule('js:node_modules')
             .include.add(is_modern_lib_1.modernLibsFilter)
             .end()
-            .batch(jsRule(Object.assign(Object.assign({}, commonBabelConfig), { hot: false })))
+            .batch(jsRule(Object.assign(Object.assign({}, transpilerConfig), { hot: false })))
             .merge({
             // TODO: некоторые пакеты неправильно описывают импорты для es модулей
             // https://github.com/babel/babel/issues/12058
@@ -64,12 +42,12 @@ exports.default = (configManager) => (config) => {
             .rule('js:project')
             .exclude.add(/node_modules/)
             .end()
-            .batch(jsRule(commonBabelConfig));
+            .batch(jsRule(transpilerConfig));
         config.module
             .rule('js:node_modules')
             .include.add(/node_modules/)
             .end()
-            .batch(jsRule(Object.assign(Object.assign({}, commonBabelConfig), { hot: false })))
+            .batch(jsRule(Object.assign(Object.assign({}, transpilerConfig), { hot: false })))
             .merge({
             // TODO: некоторые пакеты неправильно описывают импорты для es модулей
             // https://github.com/babel/babel/issues/12058

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":"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"}
+{"version":3,"file":"js.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/js.ts"],"names":[],"mappings":";;AACA,0DAA0D;AAE1D,sDAA6D;AAE7D,oDAA+E;AAE/E,oDAAoD;AACpD,kBAAe,CAAC,aAA4B,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAClE,MAAM,gBAAgB,GAAG,IAAA,gCAAmB,EAAC,aAAa,CAAC,CAAC;IAC5D,MAAM,EAAE,uBAAuB,EAAE,GAAG,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC;IAEvE,MAAM,MAAM,GAAG,CAAC,QAA2C,EAAE,EAAE,CAAC,CAAC,IAAiB,EAAE,EAAE;QACpF,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,mCAAqB,EAAC,aAAa,CAAC,CAAC;aAC7C,GAAG,EAAE,CACT;aACA,GAAG,CAAC,OAAO,CAAC,CAAC;QAEhB,OAAO,IAAA,gCAAmB,EAAC,aAAa,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;IAC3D,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,gBAAgB,CAAC,CAAC,CAAC;QAEnC,MAAM,CAAC,MAAM;aACV,IAAI,CAAC,iBAAiB,CAAC;aACvB,OAAO,CAAC,GAAG,CAAC,gCAAgB,CAAC;aAC7B,GAAG,EAAE;aACL,KAAK,CAAC,MAAM,iCAAM,gBAAgB,KAAE,GAAG,EAAE,KAAK,IAAG,CAAC;aAClD,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,gBAAgB,CAAC,CAAC,CAAC;QAEnC,MAAM,CAAC,MAAM;aACV,IAAI,CAAC,iBAAiB,CAAC;aACvB,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;aAC3B,GAAG,EAAE;aACL,KAAK,CAAC,MAAM,iCAAM,gBAAgB,KAAE,GAAG,EAAE,KAAK,IAAG,CAAC;aAClD,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/ts.js

@@ -1,28 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const babel_1 = tslib_1.__importDefault(require("../../babel"));
 const workersPool_1 = require("../utils/workersPool");
-const swc_1 = require("../../swc");
+const transpiler_1 = require("../utils/transpiler");
 exports.default = (configManager) => (config) => {
-    const { generateDataQaTag, alias, removeTypeofWindow, enableFillActionNamePlugin } = configManager.build.configurations;
-    const { loader } = configManager.experiments.transpilation;
-    const { env, modern } = configManager;
-    const loaderConfig = {
-        isServer: configManager.buildType === 'server',
-        env,
-        generateDataQaTag,
-        typescript: true,
-        modern,
-        alias,
-        tramvai: true,
-        removeTypeofWindow,
-        hot: configManager.hotRefresh,
-        excludesPresetEnv: configManager.build.configurations.excludesPresetEnv,
-        enableFillActionNamePlugin,
-        rootDir: configManager.rootDir,
-        target: configManager.target,
-    };
+    const transpilerConfig = Object.assign(Object.assign({}, (0, transpiler_1.getTranspilerConfig)(configManager)), { typescript: true });
     const cfg = config.module
         .rule('ts:project')
         .test(/\.ts[x]?$/)
@@ -32,11 +13,6 @@ exports.default = (configManager) => (config) => {
         // TODO разобраться почему на винде все плохо с thread-loader
         .when(process.platform !== 'win32', (cfg) => cfg.use('thread').loader('thread-loader').options((0, workersPool_1.createWorkerPoolBabel)(configManager)).end())
         .use('babel');
-    if (loader === 'swc') {
-        return cfg.loader('swc-loader').options((0, swc_1.getSwcOptions)(loaderConfig)).end();
-    }
-    if (loader === 'babel') {
-        return cfg.loader('babel-loader').options((0, babel_1.default)(loaderConfig)).end();
-    }
+    return (0, transpiler_1.addTranspilerLoader)(configManager, cfg, transpilerConfig);
 };
 //# sourceMappingURL=ts.js.map

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,gEAAsC;AACtC,sDAA6D;AAE7D,mCAA0C;AAE1C,kBAAe,CAAC,aAA4B,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAClE,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,GAChF,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC;IACrC,MAAM,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC,WAAW,CAAC,aAAa,CAAC;IAC3D,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC;IACtC,MAAM,YAAY,GAAG;QACnB,QAAQ,EAAE,aAAa,CAAC,SAAS,KAAK,QAAQ;QAC9C,GAAG;QACH,iBAAiB;QACjB,UAAU,EAAE,IAAI;QAChB,MAAM;QACN,KAAK;QACL,OAAO,EAAE,IAAI;QACb,kBAAkB;QAClB,GAAG,EAAE,aAAa,CAAC,UAAU;QAC7B,iBAAiB,EAAE,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC,iBAAiB;QACvE,0BAA0B;QAC1B,OAAO,EAAE,aAAa,CAAC,OAAO;QAC9B,MAAM,EAAE,aAAa,CAAC,MAAM;KAC7B,CAAC;IAEF,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,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,IAAA,mCAAqB,EAAC,aAAa,CAAC,CAAC,CAAC,GAAG,EAAE,CAC9F;SACA,GAAG,CAAC,OAAO,CAAC,CAAC;IAEhB,IAAI,MAAM,KAAK,KAAK,EAAE;QACpB,OAAO,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,IAAA,mBAAa,EAAC,YAAY,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;KAC5E;IAED,IAAI,MAAM,KAAK,OAAO,EAAE;QACtB,OAAO,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,IAAA,eAAW,EAAC,YAAY,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;KAC5E;AACH,CAAC,CAAC"}
+{"version":3,"file":"ts.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/ts.ts"],"names":[],"mappings":";;AACA,sDAA6D;AAE7D,oDAA+E;AAE/E,kBAAe,CAAC,aAA4B,EAAE,EAAE,CAAC,CAAC,MAAc,EAAE,EAAE;IAClE,MAAM,gBAAgB,mCAAQ,IAAA,gCAAmB,EAAC,aAAa,CAAC,KAAE,UAAU,EAAE,IAAI,GAAE,CAAC;IAErF,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,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,IAAA,mCAAqB,EAAC,aAAa,CAAC,CAAC,CAAC,GAAG,EAAE,CAC9F;SACA,GAAG,CAAC,OAAO,CAAC,CAAC;IAEhB,OAAO,IAAA,gCAAmB,EAAC,aAAa,EAAE,GAAG,EAAE,gBAAgB,CAAC,CAAC;AACnE,CAAC,CAAC"}

package/lib/library/webpack/utils/files.d.ts

@@ -0,0 +1,6 @@
+import type Config from 'webpack-chain';
+import type { ConfigManager } from '../../../config/configManager';
+export declare const addSvgrLoader: (configManager: ConfigManager, config: Config, svgoOptions: Record<string, any>) => void;
+export declare const getSvgoOptions: (configManager: ConfigManager) => {
+    plugins: Record<string, any>[];
+};

package/lib/library/webpack/utils/files.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSvgoOptions = exports.addSvgrLoader = void 0;
+const transpiler_1 = require("./transpiler");
+const addSvgrLoader = (configManager, config, svgoOptions) => {
+    const transpilerConfig = (0, transpiler_1.getTranspilerConfig)(configManager);
+    // based on https://github.com/facebook/create-react-app/issues/11213#issuecomment-883466601
+    const svgrConfig = config.module
+        .rule('svgr')
+        .test(/\.svg$/)
+        // @todo: `issuer: /\.tsx?$/` нужен или нет?
+        .set('resourceQuery', /react/);
+    (0, transpiler_1.addTranspilerLoader)(configManager, svgrConfig.use('svgr-transpiler'), Object.assign(Object.assign({}, transpilerConfig), { typescript: true }));
+    svgrConfig.use('svgr').loader('@svgr/webpack').options({ babel: false, svgo: svgoOptions }).end();
+};
+exports.addSvgrLoader = addSvgrLoader;
+const getSvgoOptions = (configManager) => {
+    var _a, _b, _c, _d;
+    return {
+        plugins: (_d = (_c = (_b = (_a = configManager.build) === null || _a === void 0 ? void 0 : _a.configurations) === null || _b === void 0 ? void 0 : _b.svgo) === null || _c === void 0 ? void 0 : _c.plugins) !== null && _d !== void 0 ? _d : [
+            {
+                cleanupIDs: false,
+            },
+            {
+                collapseGroups: false,
+            },
+        ],
+    };
+};
+exports.getSvgoOptions = getSvgoOptions;
+//# sourceMappingURL=files.js.map

package/lib/library/webpack/utils/files.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"files.js","sourceRoot":"","sources":["../../../../src/library/webpack/utils/files.ts"],"names":[],"mappings":";;;AAEA,6CAAwE;AAEjE,MAAM,aAAa,GAAG,CAC3B,aAA4B,EAC5B,MAAc,EACd,WAAgC,EAChC,EAAE;IACF,MAAM,gBAAgB,GAAG,IAAA,gCAAmB,EAAC,aAAa,CAAC,CAAC;IAC5D,4FAA4F;IAC5F,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM;SAC7B,IAAI,CAAC,MAAM,CAAC;SACZ,IAAI,CAAC,QAAQ,CAAC;QACf,4CAA4C;SAC3C,GAAG,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IAEjC,IAAA,gCAAmB,EAAC,aAAa,EAAE,UAAU,CAAC,GAAG,CAAC,iBAAiB,CAAC,kCAC/D,gBAAgB,KACnB,UAAU,EAAE,IAAI,IAChB,CAAC;IAEH,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC;AACpG,CAAC,CAAC;AAnBW,QAAA,aAAa,iBAmBxB;AAEK,MAAM,cAAc,GAAG,CAAC,aAA4B,EAAE,EAAE;;IAC7D,OAAO;QACL,OAAO,EAAE,MAAA,MAAA,MAAA,MAAA,aAAa,CAAC,KAAK,0CAAE,cAAc,0CAAE,IAAI,0CAAE,OAAO,mCAAI;YAC7D;gBACE,UAAU,EAAE,KAAK;aAClB;YACD;gBACE,cAAc,EAAE,KAAK;aACtB;SACF;KACF,CAAC;AACJ,CAAC,CAAC;AAXW,QAAA,cAAc,kBAWzB"}

package/lib/library/webpack/utils/transpiler.d.ts

@@ -0,0 +1,17 @@
+import type Config from 'webpack-chain';
+import type { ConfigManager } from '../../../config/configManager';
+export declare const addTranspilerLoader: (configManager: ConfigManager, rule: Config.Use, transpilerConfig: Record<string, any>) => Config.Rule;
+export declare const getTranspilerConfig: (configManager: ConfigManager) => {
+    isServer: boolean;
+    env: any;
+    generateDataQaTag: boolean;
+    modern: boolean;
+    alias: Record<string, any>;
+    tramvai: boolean;
+    removeTypeofWindow: boolean;
+    hot: boolean;
+    excludesPresetEnv: string[];
+    enableFillActionNamePlugin: boolean;
+    rootDir: string;
+    target: import("../../../typings/target").Target;
+};

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

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getTranspilerConfig = exports.addTranspilerLoader = void 0;
+const tslib_1 = require("tslib");
+const swc_1 = require("../../swc");
+const babel_1 = tslib_1.__importDefault(require("../../babel"));
+const addTranspilerLoader = (configManager, rule, transpilerConfig) => {
+    const { loader } = configManager.experiments.transpilation;
+    if (loader === 'swc') {
+        return rule.loader('swc-loader').options((0, swc_1.getSwcOptions)(transpilerConfig)).end();
+    }
+    if (loader === 'babel') {
+        return rule.loader('babel-loader').options((0, babel_1.default)(transpilerConfig)).end();
+    }
+};
+exports.addTranspilerLoader = addTranspilerLoader;
+const getTranspilerConfig = (configManager) => {
+    const { generateDataQaTag, alias, removeTypeofWindow, enableFillActionNamePlugin } = configManager.build.configurations;
+    const { env, modern } = configManager;
+    return {
+        isServer: configManager.buildType === 'server',
+        env,
+        generateDataQaTag,
+        modern,
+        alias,
+        tramvai: true,
+        removeTypeofWindow,
+        hot: configManager.hotRefresh,
+        excludesPresetEnv: configManager.build.configurations.excludesPresetEnv,
+        enableFillActionNamePlugin,
+        rootDir: configManager.rootDir,
+        target: configManager.target,
+    };
+};
+exports.getTranspilerConfig = getTranspilerConfig;
+//# sourceMappingURL=transpiler.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"transpiler.js","sourceRoot":"","sources":["../../../../src/library/webpack/utils/transpiler.ts"],"names":[],"mappings":";;;;AAEA,mCAA0C;AAC1C,gEAAsC;AAE/B,MAAM,mBAAmB,GAAG,CACjC,aAA4B,EAC5B,IAAgB,EAChB,gBAAqC,EACrC,EAAE;IACF,MAAM,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC,WAAW,CAAC,aAAa,CAAC;IAE3D,IAAI,MAAM,KAAK,KAAK,EAAE;QACpB,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,eAAW,EAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;KACjF;AACH,CAAC,CAAC;AAdW,QAAA,mBAAmB,uBAc9B;AAEK,MAAM,mBAAmB,GAAG,CAAC,aAA4B,EAAE,EAAE;IAClE,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,kBAAkB,EAAE,0BAA0B,EAAE,GAChF,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC;IACrC,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC;IAEtC,OAAO;QACL,QAAQ,EAAE,aAAa,CAAC,SAAS,KAAK,QAAQ;QAC9C,GAAG;QACH,iBAAiB;QACjB,MAAM;QACN,KAAK;QACL,OAAO,EAAE,IAAI;QACb,kBAAkB;QAClB,GAAG,EAAE,aAAa,CAAC,UAAU;QAC7B,iBAAiB,EAAE,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC,iBAAiB;QACvE,0BAA0B;QAC1B,OAAO,EAAE,aAAa,CAAC,OAAO;QAC9B,MAAM,EAAE,aAAa,CAAC,MAAM;KAC7B,CAAC;AACJ,CAAC,CAAC;AAnBW,QAAA,mBAAmB,uBAmB9B"}

package/lib/typings/public.d.ts

@@ -0,0 +1,7 @@
+import type { ComponentType, SVGProps } from 'react';
+export interface ImageObject {
+    src: string;
+    width: number;
+    height: number;
+}
+export declare type SvgComponent = ComponentType<SVGProps<SVGElement>>;

package/lib/typings/public.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=public.js.map

package/lib/typings/public.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"public.js","sourceRoot":"","sources":["../../src/typings/public.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/cli",
-  "version": "2.33.3",
+  "version": "2.34.0",
   "description": "Cli инструмент для сборки и запуска приложений",
   "files": [
     "src",
@@ -28,6 +28,7 @@
     "url": "git@github.com:Tinkoff/tramvai.git"
   },
   "main": "lib/api/index.js",
+  "typings": "lib/api/index.d.ts",
   "dependencies": {
     "@babel/cli": "^7.18.10",
     "@babel/core": "^7.18.10",
@@ -57,6 +58,7 @@
     "@fastify/static": "^6.5.0",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.7",
     "@sentry/node": "^6.2.5",
+    "@svgr/webpack": "^6.4.0",
     "@tinkoff/browserslist-config": "0.2.4",
     "@tinkoff/dippy": "0.8.8",
     "@tinkoff/is-modern-lib": "2.0.4",
@@ -67,7 +69,7 @@
     "@tinkoff/request-plugin-protocol-http": "^0.11.6",
     "@tinkoff/utils": "^2.1.3",
     "@tramvai/build": "3.0.6",
-    "@tramvai/react": "2.33.3",
+    "@tramvai/react": "2.34.0",
     "@tramvai/tools-check-versions": "0.4.5",
     "@tramvai/tools-migrate": "0.6.6",
     "ajv": "^6.12.6",

package/src/api/index.ts

@@ -26,6 +26,7 @@ export { lessWebpackRulesFactory } from '../library/webpack/blocks/less';
 export { postcssAssetsWebpackRulesFactory } from '../library/webpack/blocks/postcssAssets';
 export { extractCssPluginFactory } from '../library/webpack/blocks/extractCssPlugin';
 export { configToEnv } from '../library/webpack/blocks/configToEnv';
+export * from '../typings/public';
 
 const app = createApp({
   commands: {

package/src/commands/new/templates/shared/typings.d.ts.hbs

@@ -1,3 +1,5 @@
+import type { ImageObject, SvgComponent } from '@tramvai/cli';
+
 declare module '*.css' {
   interface IClassNames {
     [className: string]: string;
@@ -5,3 +7,34 @@ declare module '*.css' {
   const classNames: IClassNames;
   export = classNames;
 }
+
+declare module '*.woff2' {
+  export = string;
+}
+
+type ImageString = string;
+
+declare module '*.png' {
+  export default ImageString;
+  export const image: ImageObject;
+}
+declare module '*.jpg' {
+  export default ImageString;
+  export const image: ImageObject;
+}
+declare module '*.jpeg' {
+  export default ImageString;
+  export const image: ImageObject;
+}
+
+declare module '*.svg' {
+  export = string;
+}
+declare module '*.svg?react' {
+  /**
+   * React component transformed with https://react-svgr.com/
+   */
+  const Svg: SvgComponent;
+
+  export = Svg;
+}

package/src/library/webpack/blocks/filesClient.ts

@@ -2,16 +2,22 @@ import path from 'path';
 import type Config from 'webpack-chain';
 import SparkMD5 from 'spark-md5';
 import type { ConfigManager } from '../../../config/configManager';
+import { addSvgrLoader, getSvgoOptions } from '../utils/files';
 
 export const filesClientWebackRulesFactory = (configManager: ConfigManager) => (config: Config) => {
+  const svgoOptions = getSvgoOptions(configManager);
+
   config.module
     .rule('woff')
     .test(/\.woff2?$/)
     .set('type', 'asset');
 
+  addSvgrLoader(configManager, config, svgoOptions);
+
   config.module
     .rule('svg')
     .test(/\.svg$/)
+    .set('resourceQuery', { not: /react/ })
     .set('type', 'asset/resource')
     .set('generator', {
       filename: (pathInfo) => {
@@ -22,16 +28,7 @@ export const filesClientWebackRulesFactory = (configManager: ConfigManager) => (
     })
     .use('svg')
     .loader('svgo-loader')
-    .options({
-      plugins: configManager.build?.configurations?.svgo?.plugins ?? [
-        {
-          cleanupIDs: false,
-        },
-        {
-          collapseGroups: false,
-        },
-      ],
-    });
+    .options(svgoOptions);
 
   config.module
     .rule('tramvai-image')

package/src/library/webpack/blocks/filesServer.ts

@@ -1,8 +1,11 @@
 import path from 'path';
 import type Config from 'webpack-chain';
 import type { ConfigManager } from '../../../config/configManager';
+import { addSvgrLoader, getSvgoOptions } from '../utils/files';
 
 export default (configManager: ConfigManager) => (config: Config) => {
+  const svgoOptions = getSvgoOptions(configManager);
+
   config.module
     .rule('woff')
     .test(/\.woff2?$/)
@@ -11,22 +14,16 @@ export default (configManager: ConfigManager) => (config: Config) => {
       emit: false,
     });
 
+  addSvgrLoader(configManager, config, svgoOptions);
+
   config.module
     .rule('svg')
     .test(/\.svg$/)
+    .set('resourceQuery', { not: /react/ })
     .set('type', 'asset/source')
     .use('svg')
     .loader('svgo-loader')
-    .options({
-      plugins: configManager.build?.configurations?.svgo?.plugins ?? [
-        {
-          cleanupIDs: false,
-        },
-        {
-          collapseGroups: false,
-        },
-      ],
-    });
+    .options(svgoOptions);
 
   config.module
     .rule('tramvai-image')

package/src/library/webpack/blocks/js.ts

@@ -1,38 +1,16 @@
 import type Config from 'webpack-chain';
 import { modernLibsFilter } from '@tinkoff/is-modern-lib';
-import babelConfig from '../../babel';
-import { getSwcOptions } from '../../swc';
+import type babelConfig from '../../babel';
 import { createWorkerPoolBabel } from '../utils/workersPool';
 import type { ConfigManager } from '../../../config/configManager';
+import { getTranspilerConfig, addTranspilerLoader } from '../utils/transpiler';
 
 // eslint-disable-next-line import/no-default-export
 export default (configManager: ConfigManager) => (config: Config) => {
-  const {
-    generateDataQaTag,
-    alias,
-    removeTypeofWindow,
-    enableFillActionNamePlugin,
-    transpileOnlyModernLibs,
-  } = configManager.build.configurations;
-  const { env, modern } = configManager;
-  const commonBabelConfig = {
-    isServer: configManager.buildType === 'server',
-    env,
-    generateDataQaTag,
-    modern,
-    alias,
-    tramvai: true,
-    hot: configManager.hotRefresh,
-    excludesPresetEnv: configManager.build.configurations.excludesPresetEnv,
-    removeTypeofWindow,
-    enableFillActionNamePlugin,
-    rootDir: configManager.rootDir,
-    target: configManager.target,
-  };
+  const transpilerConfig = getTranspilerConfig(configManager);
+  const { transpileOnlyModernLibs } = configManager.build.configurations;
 
   const jsRule = (babelCfg: Parameters<typeof babelConfig>[0]) => (rule: Config.Rule) => {
-    const { loader } = configManager.experiments.transpilation;
-
     const cfg = rule
       .test(/\.[cm]?js[x]?$/)
       .oneOf('default')
@@ -46,13 +24,7 @@ export default (configManager: ConfigManager) => (config: Config) => {
       )
       .use('babel');
 
-    if (loader === 'swc') {
-      return cfg.loader('swc-loader').options(getSwcOptions(babelCfg)).end();
-    }
-
-    if (loader === 'babel') {
-      return cfg.loader('babel-loader').options(babelConfig(babelCfg)).end();
-    }
+    return addTranspilerLoader(configManager, cfg, babelCfg);
   };
 
   if (transpileOnlyModernLibs) {
@@ -60,13 +32,13 @@ export default (configManager: ConfigManager) => (config: Config) => {
       .rule('js:project')
       .exclude.add(/node_modules/)
       .end()
-      .batch(jsRule(commonBabelConfig));
+      .batch(jsRule(transpilerConfig));
 
     config.module
       .rule('js:node_modules')
       .include.add(modernLibsFilter)
       .end()
-      .batch(jsRule({ ...commonBabelConfig, hot: false }))
+      .batch(jsRule({ ...transpilerConfig, hot: false }))
       .merge({
         // TODO: некоторые пакеты неправильно описывают импорты для es модулей
         // https://github.com/babel/babel/issues/12058
@@ -77,13 +49,13 @@ export default (configManager: ConfigManager) => (config: Config) => {
       .rule('js:project')
       .exclude.add(/node_modules/)
       .end()
-      .batch(jsRule(commonBabelConfig));
+      .batch(jsRule(transpilerConfig));
 
     config.module
       .rule('js:node_modules')
       .include.add(/node_modules/)
       .end()
-      .batch(jsRule({ ...commonBabelConfig, hot: false }))
+      .batch(jsRule({ ...transpilerConfig, hot: false }))
       .merge({
         // TODO: некоторые пакеты неправильно описывают импорты для es модулей
         // https://github.com/babel/babel/issues/12058

package/src/library/webpack/blocks/ts.ts

@@ -1,29 +1,10 @@
 import type Config from 'webpack-chain';
-import babelConfig from '../../babel';
 import { createWorkerPoolBabel } from '../utils/workersPool';
 import type { ConfigManager } from '../../../config/configManager';
-import { getSwcOptions } from '../../swc';
+import { addTranspilerLoader, getTranspilerConfig } from '../utils/transpiler';
 
 export default (configManager: ConfigManager) => (config: Config) => {
-  const { generateDataQaTag, alias, removeTypeofWindow, enableFillActionNamePlugin } =
-    configManager.build.configurations;
-  const { loader } = configManager.experiments.transpilation;
-  const { env, modern } = configManager;
-  const loaderConfig = {
-    isServer: configManager.buildType === 'server',
-    env,
-    generateDataQaTag,
-    typescript: true,
-    modern,
-    alias,
-    tramvai: true,
-    removeTypeofWindow,
-    hot: configManager.hotRefresh,
-    excludesPresetEnv: configManager.build.configurations.excludesPresetEnv,
-    enableFillActionNamePlugin,
-    rootDir: configManager.rootDir,
-    target: configManager.target,
-  };
+  const transpilerConfig = { ...getTranspilerConfig(configManager), typescript: true };
 
   const cfg = config.module
     .rule('ts:project')
@@ -37,11 +18,5 @@ export default (configManager: ConfigManager) => (config: Config) => {
     )
     .use('babel');
 
-  if (loader === 'swc') {
-    return cfg.loader('swc-loader').options(getSwcOptions(loaderConfig)).end();
-  }
-
-  if (loader === 'babel') {
-    return cfg.loader('babel-loader').options(babelConfig(loaderConfig)).end();
-  }
+  return addTranspilerLoader(configManager, cfg, transpilerConfig);
 };

package/src/library/webpack/utils/files.ts

@@ -0,0 +1,37 @@
+import type Config from 'webpack-chain';
+import type { ConfigManager } from '../../../config/configManager';
+import { addTranspilerLoader, getTranspilerConfig } from './transpiler';
+
+export const addSvgrLoader = (
+  configManager: ConfigManager,
+  config: Config,
+  svgoOptions: Record<string, any>
+) => {
+  const transpilerConfig = getTranspilerConfig(configManager);
+  // based on https://github.com/facebook/create-react-app/issues/11213#issuecomment-883466601
+  const svgrConfig = config.module
+    .rule('svgr')
+    .test(/\.svg$/)
+    // @todo: `issuer: /\.tsx?$/` нужен или нет?
+    .set('resourceQuery', /react/);
+
+  addTranspilerLoader(configManager, svgrConfig.use('svgr-transpiler'), {
+    ...transpilerConfig,
+    typescript: true,
+  });
+
+  svgrConfig.use('svgr').loader('@svgr/webpack').options({ babel: false, svgo: svgoOptions }).end();
+};
+
+export const getSvgoOptions = (configManager: ConfigManager) => {
+  return {
+    plugins: configManager.build?.configurations?.svgo?.plugins ?? [
+      {
+        cleanupIDs: false,
+      },
+      {
+        collapseGroups: false,
+      },
+    ],
+  };
+};

package/src/library/webpack/utils/transpiler.ts

@@ -0,0 +1,41 @@
+import type Config from 'webpack-chain';
+import type { ConfigManager } from '../../../config/configManager';
+import { getSwcOptions } from '../../swc';
+import babelConfig from '../../babel';
+
+export const addTranspilerLoader = (
+  configManager: ConfigManager,
+  rule: Config.Use,
+  transpilerConfig: Record<string, any>
+) => {
+  const { loader } = configManager.experiments.transpilation;
+
+  if (loader === 'swc') {
+    return rule.loader('swc-loader').options(getSwcOptions(transpilerConfig)).end();
+  }
+
+  if (loader === 'babel') {
+    return rule.loader('babel-loader').options(babelConfig(transpilerConfig)).end();
+  }
+};
+
+export const getTranspilerConfig = (configManager: ConfigManager) => {
+  const { generateDataQaTag, alias, removeTypeofWindow, enableFillActionNamePlugin } =
+    configManager.build.configurations;
+  const { env, modern } = configManager;
+
+  return {
+    isServer: configManager.buildType === 'server',
+    env,
+    generateDataQaTag,
+    modern,
+    alias,
+    tramvai: true,
+    removeTypeofWindow,
+    hot: configManager.hotRefresh,
+    excludesPresetEnv: configManager.build.configurations.excludesPresetEnv,
+    enableFillActionNamePlugin,
+    rootDir: configManager.rootDir,
+    target: configManager.target,
+  };
+};

package/src/typings/public.ts

@@ -0,0 +1,9 @@
+import type { ComponentType, SVGProps } from 'react';
+
+export interface ImageObject {
+  src: string;
+  width: number;
+  height: number;
+}
+
+export type SvgComponent = ComponentType<SVGProps<SVGElement>>;