@tramvai/cli 2.112.0 → 2.117.2

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

@@ -6,52 +6,30 @@ const transpiler_1 = require("../utils/transpiler");
 // eslint-disable-next-line import/no-default-export
 exports.default = (configManager) => (config) => {
     const { transpileOnlyModernLibs } = configManager;
-    const jsRule = (transpilerConfig) => (rule) => {
-        const cfg = rule
-            .test(/\.[cm]?js[x]?$/)
-            .oneOf('default')
-            // TODO разобраться почему на винде все плохо с thread-loader
-            .when(process.platform !== 'win32' && !configManager.debug, (cfg) => cfg
-            .use('thread')
-            .loader('thread-loader')
-            .options((0, workersPool_1.createWorkerPoolTranspiler)(configManager))
-            .end())
-            .use('transpiler');
-        return (0, transpiler_1.addTranspilerLoader)(configManager, cfg, transpilerConfig);
-    };
-    if (transpileOnlyModernLibs) {
-        config.module
-            .rule('js:project')
-            .exclude.add(/node_modules/)
-            .end()
-            .batch(jsRule((0, transpiler_1.getTranspilerConfig)(configManager)));
-        config.module
-            .rule('js:node_modules')
-            .include.add(is_modern_lib_1.modernLibsFilter)
-            .end()
-            .batch(jsRule((0, transpiler_1.getTranspilerConfig)(configManager, { hot: false })))
-            .merge({
-            // TODO: некоторые пакеты неправильно описывают импорты для es модулей
-            // https://github.com/babel/babel/issues/12058
-            resolve: { fullySpecified: false },
-        });
-    }
-    else {
-        config.module
-            .rule('js:project')
-            .exclude.add(/node_modules/)
-            .end()
-            .batch(jsRule((0, transpiler_1.getTranspilerConfig)(configManager)));
-        config.module
-            .rule('js:node_modules')
-            .include.add(/node_modules/)
-            .end()
-            .batch(jsRule((0, transpiler_1.getTranspilerConfig)(configManager, { hot: false })))
-            .merge({
-            // TODO: некоторые пакеты неправильно описывают импорты для es модулей
-            // https://github.com/babel/babel/issues/12058
-            resolve: { fullySpecified: false },
-        });
-    }
+    const rule = config.module
+        .rule('js')
+        .test(/\.[cm]?js[x]?$/)
+        // TODO: разобраться почему на винде все плохо с thread-loader
+        .when(process.platform !== 'win32' && !configManager.debug, (cfg) => cfg
+        .use('thread')
+        .loader('thread-loader')
+        .options((0, workersPool_1.createWorkerPoolTranspiler)(configManager))
+        .end());
+    rule
+        .oneOf('project')
+        .exclude.add(/node_modules/)
+        .end()
+        .use('transpiler')
+        .batch((0, transpiler_1.addTranspilerLoader)(configManager, (0, transpiler_1.getTranspilerConfig)(configManager)));
+    rule
+        .oneOf('node_module')
+        .when(transpileOnlyModernLibs, (cfg) => cfg.include.add(is_modern_lib_1.modernLibsFilter))
+        .merge({
+        // true value forces to use file extensions for importing mjs modules
+        // but we want to use mjs if it exists anyway
+        resolve: { fullySpecified: false },
+    })
+        .use('transpiler')
+        .batch((0, transpiler_1.addTranspilerLoader)(configManager, (0, transpiler_1.getTranspilerConfig)(configManager, { hot: false })));
 };
 //# sourceMappingURL=js.js.map

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;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"}
+{"version":3,"file":"js.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/js.ts"],"names":[],"mappings":";;AACA,0DAA0D;AAC1D,sDAAkE;AAElE,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,IAAI,GAAG,MAAM,CAAC,MAAM;SACvB,IAAI,CAAC,IAAI,CAAC;SACV,IAAI,CAAC,gBAAgB,CAAC;QACvB,8DAA8D;SAC7D,IAAI,CAAC,OAAO,CAAC,QAAQ,KAAK,OAAO,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE,CAClE,GAAG;SACA,GAAG,CAAC,QAAQ,CAAC;SACb,MAAM,CAAC,eAAe,CAAC;SACvB,OAAO,CAAC,IAAA,wCAA0B,EAAC,aAAa,CAAC,CAAC;SAClD,GAAG,EAAE,CACT,CAAC;IAEJ,IAAI;SACD,KAAK,CAAC,SAAS,CAAC;SAChB,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;SAC3B,GAAG,EAAE;SACL,GAAG,CAAC,YAAY,CAAC;SACjB,KAAK,CAAC,IAAA,gCAAmB,EAAC,aAAa,EAAE,IAAA,gCAAmB,EAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IAEjF,IAAI;SACD,KAAK,CAAC,aAAa,CAAC;SACpB,IAAI,CAAC,uBAAuB,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,gCAAgB,CAAC,CAAC;SACzE,KAAK,CAAC;QACL,qEAAqE;QACrE,6CAA6C;QAC7C,OAAO,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE;KACnC,CAAC;SACD,GAAG,CAAC,YAAY,CAAC;SACjB,KAAK,CAAC,IAAA,gCAAmB,EAAC,aAAa,EAAE,IAAA,gCAAmB,EAAC,aAAa,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;AACnG,CAAC,CAAC"}

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;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"}
+{"version":3,"file":"pagesResolve.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/pagesResolve.ts"],"names":[],"mappings":";;;;AAAA,wDAAwB;AAMjB,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;KACxB,CAAC;SACxB,GAAG,EAAE;QACN,gDAAgD;SAC/C,OAAO,CAAC,KAAK,CAAC,CAAC;AACpB,CAAC,CAAC;AArBS,QAAA,YAAY,gBAqBrB"}

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

@@ -15,7 +15,7 @@ const pwaBlock =
     var _a, _b, _c, _d, _e, _f, _g;
     const { experiments: { pwa }, rootDir, root, output, env, modern, sourceMap, assetsPrefix, } = configManager;
     config.batch((0, shared_1.pwaSharedBlock)(configManager));
-    if (!(0, safeRequire_1.safeRequireResolve)('@tramvai/module-progressive-web-app') &&
+    if (!(0, safeRequire_1.safeRequireResolve)('@tramvai/module-progressive-web-app', true) &&
         (((_a = pwa.workbox) === null || _a === void 0 ? void 0 : _a.enabled) || ((_b = pwa.webmanifest) === null || _b === void 0 ? void 0 : _b.enabled))) {
         throw Error('PWA functional requires @tramvai/module-progressive-web-app installed');
     }

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

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

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

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

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

@@ -1,25 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.serverInline = void 0;
-const tslib_1 = require("tslib");
-const webpack_chain_1 = tslib_1.__importDefault(require("webpack-chain"));
-const js_1 = tslib_1.__importDefault(require("./js"));
-const ts_1 = tslib_1.__importDefault(require("./ts"));
+const transpiler_1 = require("../utils/transpiler");
 const serverInline = (configManager) => (config) => {
     // создаём клиентский конфиг и отключаем modern режим
     const clientConfigManager = configManager.withSettings({ buildType: 'client', modern: false });
-    const clientConfig = new webpack_chain_1.default().batch((0, js_1.default)(clientConfigManager)).batch((0, ts_1.default)(clientConfigManager));
-    const addInlineHandler = (type, extension) => {
+    const addInlineHandler = (type) => {
         config.module
             .rule(type)
             .oneOf('inline')
-            .before('default')
-            .test(new RegExp(`\\.inline(\\.es)?\\.${extension}$`))
-            .uses.merge(clientConfig.module.rule(type).oneOfs.get('default').uses.entries());
+            .before('project')
+            .test(new RegExp(`\\.inline(\\.es)?\\.${type}$`))
+            .use('transpiler')
+            .batch((0, transpiler_1.addTranspilerLoader)(clientConfigManager, (0, transpiler_1.getTranspilerConfig)(clientConfigManager, { typescript: type === 'ts' })));
     };
-    addInlineHandler('js:project', 'js');
-    addInlineHandler('js:node_modules', 'js');
-    addInlineHandler('ts:project', 'ts');
+    addInlineHandler('js');
+    addInlineHandler('ts');
 };
 exports.serverInline = serverInline;
 //# sourceMappingURL=serverInline.js.map

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;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"}
+{"version":3,"file":"serverInline.js","sourceRoot":"","sources":["../../../../src/library/webpack/blocks/serverInline.ts"],"names":[],"mappings":";;;AAGA,oDAA+E;AAExE,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,gBAAgB,GAAG,CAAC,IAAY,EAAE,EAAE;QACxC,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,IAAI,GAAG,CAAC,CAAC;aAChD,GAAG,CAAC,YAAY,CAAC;aACjB,KAAK,CACJ,IAAA,gCAAmB,EACjB,mBAAmB,EACnB,IAAA,gCAAmB,EAAC,mBAAmB,EAAE,EAAE,UAAU,EAAE,IAAI,KAAK,IAAI,EAAE,CAAC,CACxE,CACF,CAAC;IACN,CAAC,CAAC;IAEF,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACvB,gBAAgB,CAAC,IAAI,CAAC,CAAC;AACzB,CAAC,CAAC;AArBW,QAAA,YAAY,gBAqBvB"}

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

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

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

@@ -4,19 +4,19 @@ const workersPool_1 = require("../utils/workersPool");
 const transpiler_1 = require("../utils/transpiler");
 exports.default = (configManager) => (config) => {
     const transpilerConfig = (0, transpiler_1.getTranspilerConfig)(configManager, { typescript: true });
-    const cfg = config.module
-        .rule('ts:project')
+    config.module
+        .rule('ts')
         .test(/\.ts[x]?$/)
         .exclude.add(/node_modules/)
         .end()
-        .oneOf('default')
-        // TODO разобраться почему на винде все плохо с thread-loader
+        // TODO: разобраться почему на винде все плохо с thread-loader
         .when(process.platform !== 'win32', (cfg) => cfg
         .use('thread')
         .loader('thread-loader')
         .options((0, workersPool_1.createWorkerPoolTranspiler)(configManager))
         .end())
-        .use('transpiler');
-    return (0, transpiler_1.addTranspilerLoader)(configManager, cfg, transpilerConfig);
+        .oneOf('project')
+        .use('transpiler')
+        .batch((0, transpiler_1.addTranspilerLoader)(configManager, 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,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"}
+{"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,CAAC,MAAM;SACV,IAAI,CAAC,IAAI,CAAC;SACV,IAAI,CAAC,WAAW,CAAC;SACjB,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;SAC3B,GAAG,EAAE;QACN,8DAA8D;SAC7D,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,KAAK,CAAC,SAAS,CAAC;SAChB,GAAG,CAAC,YAAY,CAAC;SACjB,KAAK,CAAC,IAAA,gCAAmB,EAAC,aAAa,EAAE,gBAAgB,CAAC,CAAC,CAAC;AACjE,CAAC,CAAC"}

package/lib/library/webpack/loaders/pagesResolve.d.ts

@@ -1,10 +1,10 @@
 import type { LoaderDefinitionFunction } from 'webpack';
 import type { ApplicationConfigEntry } from '../../../api';
-interface Options {
+export interface PagesResolveOptions {
     rootDir: string;
     root: string;
     extensions: string[];
     fileSystemPages: ApplicationConfigEntry['fileSystemPages'];
 }
-declare const pagesResolve: LoaderDefinitionFunction<Options>;
+declare const pagesResolve: LoaderDefinitionFunction<PagesResolveOptions>;
 export default pagesResolve;

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

@@ -14,12 +14,13 @@ const removeExtension = (filename) => {
 // eslint-disable-next-line func-style
 const pagesResolve = function () {
     const { fileSystemPages, rootDir, root, extensions } = this.getOptions();
+    const extensionsRegexp = new RegExp(`\\.(${extensions.map((ext) => ext.slice(1)).join('|')})$`);
     const fsLayouts = [];
     const fsErrorBoundaries = [];
     const fsWildcards = [];
     this.cacheable(false);
     // eslint-disable-next-line max-statements
-    const filesToPages = ({ pagesRootDirectory, isRoutes = false, }) => {
+    const filesToPages = ({ pagesRootDirectory, isRoutes = false, test, }) => {
         const pagesDir = path_1.default.resolve(rootDir, root, pagesRootDirectory);
         this.addContextDependency(pagesDir);
         // skip service files
@@ -27,8 +28,9 @@ const pagesResolve = function () {
         const fsPages = [];
         for (const file of pagesFiles) {
             const extname = path_1.default.extname(file);
-            const name = file.replace(new RegExp(`\\${extname}$`), '').replace(/\\/g, '/');
-            if (extensions.indexOf(extname) !== -1) {
+            const normalizedFile = file.replace(/\\/g, '/');
+            if (test.test(normalizedFile)) {
+                const name = normalizedFile.replace(new RegExp(`\\${extname}$`), '');
                 const pageComponentName = `@/${pagesRootDirectory}/${name}`;
                 const pageComponentPath = path_1.default.resolve(pagesDir, name).replace(/\\/g, '\\\\');
                 const chunkname = pageComponentName.replace(/\//g, '_');
@@ -68,11 +70,15 @@ const pagesResolve = function () {
         ? filesToPages({
             pagesRootDirectory: fileSystemPages.routesDir,
             isRoutes: true,
+            test: new RegExp(`index${extensionsRegexp.source}`),
         })
         : [];
     const fsPages = fileSystemPages.pagesDir
         ? filesToPages({
             pagesRootDirectory: fileSystemPages.pagesDir,
+            test: fileSystemPages.componentsPattern
+                ? new RegExp(fileSystemPages.componentsPattern)
+                : extensionsRegexp,
         })
         : [];
     const code = `import { lazy } from '@tramvai/react';

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

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

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

@@ -18,6 +18,6 @@ export declare class ModuleFederationFixRange implements webpack.WebpackPluginIn
     private sharedModules;
     constructor({ flexibleTramvaiVersions }: ModuleFederationFixRangeOptions);
     apply(compiler: Compiler): void;
-    fixVersionRange(module: SharedModule): void;
+    fixVersionRange(sharedModule: SharedModule, resolvedVersion?: string): void;
 }
 export {};

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

@@ -2,24 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModuleFederationFixRange = void 0;
 const tslib_1 = require("tslib");
-const resolve_1 = require("resolve");
-const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const webpack_1 = require("webpack");
 // eslint-disable-next-line no-restricted-imports
 const semver_1 = require("webpack/lib/util/semver");
 const tramvaiVersions_1 = require("../../../utils/tramvaiVersions");
 const PLUGIN_NAME = 'ModuleFederationValidateDuplicates';
-const resolvePackageVersion = (name, basedir) => {
-    try {
-        const packageJsonPath = (0, resolve_1.sync)(`${name}/package.json`, {
-            basedir,
-        });
-        const packageJson = require(packageJsonPath);
-        return packageJson.version;
-    }
-    catch (error) {
-        console.warn(`ModuleFederation: could not infer version for package "${name}"`);
-    }
-};
 class ModuleFederationFixRange {
     constructor({ flexibleTramvaiVersions }) {
         // { name: { importResolved: { number }} }
@@ -27,7 +14,7 @@ class ModuleFederationFixRange {
         this.flexibleTramvaiVersions = flexibleTramvaiVersions !== null && flexibleTramvaiVersions !== void 0 ? flexibleTramvaiVersions : false;
     }
     apply(compiler) {
-        compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (_, { normalModuleFactory }) => {
+        compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation, { normalModuleFactory }) => {
             normalModuleFactory.hooks.factorize.intercept({
                 register: (tap) => {
                     if (tap.name === 'ConsumeSharedPlugin') {
@@ -36,7 +23,19 @@ class ModuleFederationFixRange {
                         tap.fn = (...args) => tslib_1.__awaiter(this, void 0, void 0, function* () {
                             const module = yield originalFn(...args);
                             if (module === null || module === void 0 ? void 0 : module.options) {
-                                this.fixVersionRange(module);
+                                const { shareKey: name, importResolved } = module.options;
+                                let shared = this.sharedModules.get(name);
+                                if (!shared) {
+                                    shared = new Map();
+                                    this.sharedModules.set(name, shared);
+                                }
+                                let modules = shared.get(importResolved);
+                                if (!modules) {
+                                    modules = new Set();
+                                    shared.set(importResolved, modules);
+                                }
+                                // save major version of the semver array
+                                modules.add(module);
                             }
                             return module;
                         });
@@ -44,54 +43,69 @@ class ModuleFederationFixRange {
                     return tap;
                 },
             });
-        });
-        compiler.hooks.done.tap(PLUGIN_NAME, () => {
-            const duplicates = [];
-            const criticalDuplicates = [];
-            for (const [name, shared] of this.sharedModules) {
-                if (shared.size > 1) {
-                    duplicates.push({
-                        name,
-                        paths: [...shared.keys()],
-                    });
-                }
-                for (const [path, versions] of shared) {
-                    if (versions.size > 1) {
-                        criticalDuplicates.push({ name, path });
+            // eslint-disable-next-line max-statements
+            compilation.hooks.optimizeDependencies.tap(PLUGIN_NAME, () => {
+                var _a, _b, _c;
+                for (const [name, sharedModulesByName] of this.sharedModules.entries()) {
+                    const hasDuplicates = sharedModulesByName.size > 1;
+                    for (const [importResolved, sharedModulesByPath] of sharedModulesByName.entries()) {
+                        if (hasDuplicates) {
+                            const error = new webpack_1.WebpackError(`This file is a duplicate for a module "${name}" that resolved to different path`);
+                            error.file = importResolved;
+                            compilation.warnings.push(error);
+                        }
+                        let validModule;
+                        let validVersion;
+                        const invalidModules = new Set();
+                        for (const sharedModule of sharedModulesByPath) {
+                            const connections = compilation.moduleGraph.getOutgoingConnections(sharedModule);
+                            for (const { module } of connections) {
+                                const resolvedVersion = (_b = (_a = module.resourceResolveData) === null || _a === void 0 ? void 0 : _a.descriptionFileData) === null || _b === void 0 ? void 0 : _b.version;
+                                this.fixVersionRange(sharedModule, resolvedVersion);
+                                const requiredVersion = (_c = sharedModule === null || sharedModule === void 0 ? void 0 : sharedModule.options) === null || _c === void 0 ? void 0 : _c.requiredVersion;
+                                if (requiredVersion && resolvedVersion) {
+                                    if ((0, semver_1.satisfy)(requiredVersion, resolvedVersion)) {
+                                        validModule = sharedModule;
+                                        validVersion = resolvedVersion;
+                                    }
+                                    else {
+                                        invalidModules.add(sharedModule);
+                                    }
+                                }
+                                // there should by only one outgoing module for ConsumeSharedModule
+                                break;
+                            }
+                        }
+                        if (invalidModules.size > 0 && validModule) {
+                            for (const sharedModule of invalidModules) {
+                                const error = new webpack_1.WebpackError(`Shared module has been actually resolved to ${validVersion} instead of the expected`);
+                                error.module = sharedModule;
+                                compilation.warnings.push(error);
+                                // replace invalid module with valid version (invalid anyway are resolved to wrong version)
+                                // to prevent any issues with shared dependencies
+                                compilation.moduleGraph.moveModuleConnections(sharedModule, validModule, (connection) => {
+                                    // ignore any outgoing connections as we want to ignore that module entirely and all its dependencies
+                                    return connection.originModule !== sharedModule;
+                                });
+                            }
+                        }
                     }
                 }
-            }
-            // reset sharedModules info after compilation has ended
-            this.sharedModules = new Map();
-            if (duplicates.length) {
-                console.warn(`⚠️  ModuleFederation: Found duplicates for next shared modules:
-${duplicates
-                    .map(({ name, paths }) => {
-                    return `\t${chalk_1.default.yellowBright(name)}: ${paths.join(', ')}`;
-                })
-                    .join('\n')}
-        `);
-            }
-            if (criticalDuplicates.length) {
-                console.error(`❗ ModuleFederation: Found duplicates for shared modules with different major versions that are resolved to the same path:
-${criticalDuplicates
-                    .map(({ name, path }) => {
-                    return `\t${chalk_1.default.red(name)}: ${path}`;
-                })
-                    .join('\n')}`);
-                throw new Error('ModuleFederation: Different major versions have resolved to the same path for shared modules, please review errors above');
-            }
+                // reset sharedModules info after validation
+                this.sharedModules = new Map();
+            });
         });
     }
-    fixVersionRange(module) {
-        const { options, options: { shareKey: name, singleton, importResolved }, context, } = module;
+    fixVersionRange(sharedModule, resolvedVersion) {
+        const { options, options: { shareKey: name, singleton }, context, } = sharedModule;
         let { requiredVersion } = options;
+        // if version was not resolved automatically then get the version
+        // from actual module
         // ignore singletons as the actual version won't change anything
         // and usually it is just a react and co libraries
         if (!requiredVersion && context && !singleton) {
-            const version = resolvePackageVersion(name, context);
-            if (version) {
-                requiredVersion = (0, semver_1.parseRange)(version);
+            if (resolvedVersion) {
+                requiredVersion = (0, semver_1.parseRange)(resolvedVersion);
             }
         }
         if (!requiredVersion) {
@@ -107,18 +121,6 @@ ${criticalDuplicates
         }
         // change version in webpack module
         options.requiredVersion = requiredVersion;
-        let shared = this.sharedModules.get(name);
-        if (!shared) {
-            shared = new Map();
-            this.sharedModules.set(name, shared);
-        }
-        let versions = shared.get(importResolved);
-        if (!versions) {
-            versions = new Set();
-            shared.set(importResolved, versions);
-        }
-        // save major version of the semver array
-        versions.add(requiredVersion[1]);
     }
 }
 exports.ModuleFederationFixRange = ModuleFederationFixRange;

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

@@ -1 +1 @@
-{"version":3,"file":"ModuleFederationFixRange.js","sourceRoot":"","sources":["../../../../src/library/webpack/plugins/ModuleFederationFixRange.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ModuleFederationFixRange.js","sourceRoot":"","sources":["../../../../src/library/webpack/plugins/ModuleFederationFixRange.ts"],"names":[],"mappings":";;;;AAEA,qCAAuC;AACvC,iDAAiD;AACjD,oDAA8D;AAC9D,oEAAkF;AAElF,MAAM,WAAW,GAAG,oCAAoC,CAAC;AAmBzD,MAAa,wBAAwB;IAKnC,YAAY,EAAE,uBAAuB,EAAmC;QAHxE,0CAA0C;QAClC,kBAAa,GAAgD,IAAI,GAAG,EAAE,CAAC;QAG7E,IAAI,CAAC,uBAAuB,GAAG,uBAAuB,aAAvB,uBAAuB,cAAvB,uBAAuB,GAAI,KAAK,CAAC;IAClE,CAAC;IAED,KAAK,CAAC,QAAkB;QACtB,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,EAAE,mBAAmB,EAAE,EAAE,EAAE;YACvF,mBAAmB,CAAC,KAAK,CAAC,SAAS,CAAC,SAAS,CAAC;gBAC5C,QAAQ,EAAE,CAAC,GAAG,EAAE,EAAE;oBAChB,IAAI,GAAG,CAAC,IAAI,KAAK,qBAAqB,EAAE;wBACtC,MAAM,UAAU,GAAG,GAAG,CAAC,EAAE,CAAC;wBAC1B,6CAA6C;wBAC7C,GAAG,CAAC,EAAE,GAAG,CAAO,GAAG,IAAI,EAAE,EAAE;4BACzB,MAAM,MAAM,GAA6B,MAAM,UAAU,CAAC,GAAG,IAAI,CAAC,CAAC;4BAEnE,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,EAAE;gCACnB,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,cAAc,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC;gCAE1D,IAAI,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gCAE1C,IAAI,CAAC,MAAM,EAAE;oCACX,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;oCACnB,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;iCACtC;gCAED,IAAI,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;gCAEzC,IAAI,CAAC,OAAO,EAAE;oCACZ,OAAO,GAAG,IAAI,GAAG,EAAE,CAAC;oCACpB,MAAM,CAAC,GAAG,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;iCACrC;gCAED,yCAAyC;gCACzC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;6BACrB;4BAED,OAAO,MAAM,CAAC;wBAChB,CAAC,CAAA,CAAC;qBACH;oBAED,OAAO,GAAG,CAAC;gBACb,CAAC;aACF,CAAC,CAAC;YAEH,0CAA0C;YAC1C,WAAW,CAAC,KAAK,CAAC,oBAAoB,CAAC,GAAG,CAAC,WAAW,EAAE,GAAG,EAAE;;gBAC3D,KAAK,MAAM,CAAC,IAAI,EAAE,mBAAmB,CAAC,IAAI,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,EAAE;oBACtE,MAAM,aAAa,GAAG,mBAAmB,CAAC,IAAI,GAAG,CAAC,CAAC;oBAEnD,KAAK,MAAM,CAAC,cAAc,EAAE,mBAAmB,CAAC,IAAI,mBAAmB,CAAC,OAAO,EAAE,EAAE;wBACjF,IAAI,aAAa,EAAE;4BACjB,MAAM,KAAK,GAAG,IAAI,sBAAY,CAC5B,0CAA0C,IAAI,mCAAmC,CAClF,CAAC;4BACF,KAAK,CAAC,IAAI,GAAG,cAAc,CAAC;4BAC5B,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;yBAClC;wBAED,IAAI,WAAyB,CAAC;wBAC9B,IAAI,YAAoB,CAAC;wBACzB,MAAM,cAAc,GAAG,IAAI,GAAG,EAAgB,CAAC;wBAE/C,KAAK,MAAM,YAAY,IAAI,mBAAmB,EAAE;4BAC9C,MAAM,WAAW,GAAG,WAAW,CAAC,WAAW,CAAC,sBAAsB,CAAC,YAAY,CAAC,CAAC;4BAEjF,KAAK,MAAM,EAAE,MAAM,EAAE,IAAI,WAAW,EAAE;gCACpC,MAAM,eAAe,GAAG,MAAA,MAAA,MAAM,CAAC,mBAAmB,0CAAE,mBAAmB,0CAAE,OAAO,CAAC;gCACjF,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC;gCAEpD,MAAM,eAAe,GAAG,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,OAAO,0CAAE,eAAe,CAAC;gCAE/D,IAAI,eAAe,IAAI,eAAe,EAAE;oCACtC,IAAI,IAAA,gBAAO,EAAC,eAAe,EAAE,eAAe,CAAC,EAAE;wCAC7C,WAAW,GAAG,YAAY,CAAC;wCAC3B,YAAY,GAAG,eAAe,CAAC;qCAChC;yCAAM;wCACL,cAAc,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;qCAClC;iCACF;gCACD,mEAAmE;gCACnE,MAAM;6BACP;yBACF;wBAED,IAAI,cAAc,CAAC,IAAI,GAAG,CAAC,IAAI,WAAW,EAAE;4BAC1C,KAAK,MAAM,YAAY,IAAI,cAAc,EAAE;gCACzC,MAAM,KAAK,GAAG,IAAI,sBAAY,CAC5B,+CAA+C,YAAY,0BAA0B,CACtF,CAAC;gCACF,KAAK,CAAC,MAAM,GAAG,YAAY,CAAC;gCAC5B,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gCAEjC,2FAA2F;gCAC3F,iDAAiD;gCACjD,WAAW,CAAC,WAAW,CAAC,qBAAqB,CAC3C,YAAY,EACZ,WAAW,EACX,CAAC,UAAU,EAAE,EAAE;oCACb,qGAAqG;oCACrG,OAAO,UAAU,CAAC,YAAY,KAAK,YAAY,CAAC;gCAClD,CAAC,CACF,CAAC;6BACH;yBACF;qBACF;iBACF;gBAED,4CAA4C;gBAC5C,IAAI,CAAC,aAAa,GAAG,IAAI,GAAG,EAAE,CAAC;YACjC,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED,eAAe,CAAC,YAA0B,EAAE,eAAwB;QAClE,MAAM,EACJ,OAAO,EACP,OAAO,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,EACtC,OAAO,GACR,GAAG,YAAY,CAAC;QACjB,IAAI,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC;QAElC,iEAAiE;QACjE,qBAAqB;QACrB,gEAAgE;QAChE,kDAAkD;QAClD,IAAI,CAAC,eAAe,IAAI,OAAO,IAAI,CAAC,SAAS,EAAE;YAC7C,IAAI,eAAe,EAAE;gBACnB,eAAe,GAAG,IAAA,mBAAU,EAAC,eAAe,CAAC,CAAC;aAC/C;SACF;QAED,IAAI,CAAC,eAAe,EAAE;YACpB,OAAO;SACR;QAED,IAAI,eAAe,IAAI,IAAI,CAAC,uBAAuB,EAAE;YACnD,MAAM,SAAS,GAAG,IAAA,kCAAgB,EAAC,IAAI,CAAC,IAAI,IAAA,gCAAc,EAAC,IAAI,CAAC,CAAC;YAEjE,IAAI,SAAS,IAAI,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE;gBACvC,mCAAmC;gBACnC,2HAA2H;gBAC3H,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;aACxB;SACF;QAED,mCAAmC;QACnC,OAAO,CAAC,eAAe,GAAG,eAAe,CAAC;IAC5C,CAAC;CACF;AAxJD,4DAwJC"}

package/lib/library/webpack/plugins/WebpackBar/utils/log-update.js

@@ -55,6 +55,7 @@ class LogUpdate {
                     return stream.write(data, ...args);
                 }
                 this._onData(data);
+                return stream.write[originalWrite].call(stream, data, ...args);
             };
             // Backup original write fn
             write[originalWrite] = stream.write;
@@ -73,7 +74,12 @@ class LogUpdate {
         this.listening = false;
     }
     _onData(data) {
-        this.extraLines += data;
+        const str = String(data);
+        const lines = str.split('\n').length - 1;
+        if (lines > 0) {
+            this.prevLineCount += lines;
+            this.extraLines += data;
+        }
     }
     render(lines) {
         if (this.finished) {

package/lib/library/webpack/plugins/WebpackBar/utils/log-update.js.map

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

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

@@ -9,8 +9,10 @@ const addSvgrLoader = (configManager, config, svgoOptions) => {
         .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 }));
+        .set('resourceQuery', /react/)
+        .use('svgr-transpiler')
+        .batch((0, transpiler_1.addTranspilerLoader)(configManager, Object.assign(Object.assign({}, transpilerConfig), { typescript: true })))
+        .end();
     svgrConfig.use('svgr').loader('@svgr/webpack').options({ babel: false, svgo: svgoOptions }).end();
 };
 exports.addSvgrLoader = addSvgrLoader;

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

@@ -1 +1 @@
-{"version":3,"file":"files.js","sourceRoot":"","sources":["../../../../src/library/webpack/utils/files.ts"],"names":[],"mappings":";;;AAGA,6CAAwE;AAEjE,MAAM,aAAa,GAAG,CAC3B,aAA4C,EAC5C,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,aAA4C,EAAE,EAAE;;IAC7E,OAAO;QACL,OAAO,EAAE,MAAA,MAAA,aAAa,CAAC,IAAI,0CAAE,OAAO,mCAAI;YACtC;gBACE,UAAU,EAAE,KAAK;aAClB;YACD;gBACE,cAAc,EAAE,KAAK;aACtB;SACF;KACF,CAAC;AACJ,CAAC,CAAC;AAXW,QAAA,cAAc,kBAWzB"}
+{"version":3,"file":"files.js","sourceRoot":"","sources":["../../../../src/library/webpack/utils/files.ts"],"names":[],"mappings":";;;AAGA,6CAAwE;AAEjE,MAAM,aAAa,GAAG,CAC3B,aAA4C,EAC5C,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;SAC7B,GAAG,CAAC,iBAAiB,CAAC;SACtB,KAAK,CACJ,IAAA,gCAAmB,EAAC,aAAa,kCAC5B,gBAAgB,KACnB,UAAU,EAAE,IAAI,IAChB,CACH;SACA,GAAG,EAAE,CAAC;IAET,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;AAtBW,QAAA,aAAa,iBAsBxB;AAEK,MAAM,cAAc,GAAG,CAAC,aAA4C,EAAE,EAAE;;IAC7E,OAAO;QACL,OAAO,EAAE,MAAA,MAAA,aAAa,CAAC,IAAI,0CAAE,OAAO,mCAAI;YACtC;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

@@ -20,5 +20,5 @@ export type TranspilerConfig = {
     excludesPresetEnv: string[];
     rootDir: string;
 };
-export declare const addTranspilerLoader: (configManager: ConfigManager<CliConfigEntry>, rule: Config.Use, transpilerConfig: TranspilerConfig) => Config.Rule;
+export declare const addTranspilerLoader: (configManager: ConfigManager<CliConfigEntry>, transpilerConfig: TranspilerConfig) => (rule: Config.Use) => Config.Rule;
 export declare const getTranspilerConfig: (configManager: ConfigManager<CliConfigEntry>, overrideOptions?: Partial<TranspilerConfig>) => TranspilerConfig;

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

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const resolve_1 = require("resolve");
 const swc_1 = require("../../swc");
 const babel_1 = tslib_1.__importDefault(require("../../babel"));
-const addTranspilerLoader = (configManager, rule, transpilerConfig) => {
+const addTranspilerLoader = (configManager, transpilerConfig) => (rule) => {
     const { loader } = configManager.experiments.transpilation;
     if (loader === 'swc') {
         try {