@tramvai/cli 2.48.3 → 2.49.0

package/lib/api/benchmark/start.js

@@ -57,17 +57,15 @@ const runRebuild = (di, { times }) => tslib_1.__awaiter(void 0, void 0, void 0,
     };
 });
 const benchmarkStart = (di) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-    // прогоняем один раз, чтобы очистить старые кеши и прогреть код команды
-    yield runStartCommand(di, { times: 1, shouldClearCache: true });
     const { times = 5 } = di.get(tokens_1.COMMAND_PARAMETERS_TOKEN);
-    const cache = yield runStartCommand(di, {
-        times,
-        shouldClearCache: false,
-    });
     const noCache = yield runStartCommand(di, {
-        times,
+        times: Math.max(Math.floor(times / 3), 2),
         shouldClearCache: true,
     });
+    const cache = yield runStartCommand(di, {
+        times: Math.max(Math.floor(times / 2), 2),
+        shouldClearCache: false,
+    });
     const rebuild = yield runRebuild(di, { times });
     return {
         cache: getResultStats(cache),

package/lib/api/benchmark/start.js.map

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

package/lib/api/start/providers/child-app/shared.js

@@ -67,7 +67,7 @@ exports.sharedProviders = [
         useFactory: ({ configManager }) => {
             return () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
                 yield Promise.all([
-                    (0, workersPool_1.closeWorkerPoolBabel)(configManager),
+                    (0, workersPool_1.closeWorkerPoolTranspiler)(configManager),
                     (0, workersPool_1.closeWorkerPoolStyles)(configManager),
                 ]);
             });

package/lib/api/start/providers/child-app/shared.js.map

@@ -1 +1 @@
-{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../../src/api/start/providers/child-app/shared.ts"],"names":[],"mappings":";;;;AACA,yCAAuE;AACvE,kDAK+B;AAG/B,oEAAiE;AACjE,+EAGuD;AACvD,uDAAoD;AACpD,2DAAwD;AACxD,2DAAwD;AAE3C,QAAA,eAAe,GAAwB;IAClD;QACE,OAAO,EAAE,6BAAoB;QAC7B,UAAU,EAAE,CAAC,EACX,WAAW,EACX,UAAU,GAIX,EAAE,EAAE;;YACH,OAAO,IAAI,6BAAa,CAAC,WAAW,kCAC/B,UAAU,KACb,GAAG,EAAE,aAAa,EAClB,IAAI,EAAE,MAAA,UAAU,CAAC,IAAI,mCAAI,IAAI,EAC7B,SAAS,EAAE,QAAQ,IACnB,CAAC;QACL,CAAC;QACD,IAAI,EAAE;YACJ,WAAW,EAAE,2BAAkB;YAC/B,UAAU,EAAE,iCAAwB;SACrC;KACF;IACD;QACE,OAAO,EAAE,4BAAmB;QAC5B,UAAU,EAAE,2BAAY;KACzB;IACD;QACE,OAAO,EAAE,2BAAkB;QAC3B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EACX,YAAY,EACZ,UAAU,GAIX,EAAE,EAAE;YACH,OAAO,SAAe,kBAAkB;;oBACtC,MAAM,EAAE,IAAI,GAAG,WAAW,EAAE,IAAI,GAAG,IAAI,EAAE,GAAG,UAAU,CAAC;oBAEvD,IAAI;wBACF,MAAM,IAAA,2BAAY,EAAC,YAAY,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;qBAC9C;oBAAC,OAAO,KAAK,EAAE;wBACd,IAAK,KAAa,CAAC,IAAI,KAAK,YAAY,EAAE;4BACxC,MAAM,IAAI,KAAK,CACb,YAAY,IAAI,IAAI,IAAI,iEAAiE,CAC1F,CAAC;yBACH;wBAED,MAAM,KAAK,CAAC;qBACb;gBACH,CAAC;aAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;YACjC,UAAU,EAAE,iCAAwB;SACrC;KACF;IACD;QACE,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,YAAY,EAAgD,EAAE,EAAE;YAC7E,OAAO,GAAG,EAAE;gBACV,OAAO,IAAA,uBAAU,EAAC,YAAY,CAAC,CAAC;YAClC,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;SAClC;KACF;IACD;QACE,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,aAAa,EAAkD,EAAE,EAAE;YAChF,OAAO,GAAS,EAAE;gBAChB,MAAM,OAAO,CAAC,GAAG,CAAC;oBAChB,IAAA,kCAAoB,EAAC,aAAa,CAAC;oBACnC,IAAA,mCAAqB,EAAC,aAAa,CAAC;iBACrC,CAAC,CAAC;YACL,CAAC,CAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,aAAa,EAAE,6BAAoB;SACpC;KACF;CACO,CAAC"}
+{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../../src/api/start/providers/child-app/shared.ts"],"names":[],"mappings":";;;;AACA,yCAAuE;AACvE,kDAK+B;AAG/B,oEAAiE;AACjE,+EAGuD;AACvD,uDAAoD;AACpD,2DAAwD;AACxD,2DAAwD;AAE3C,QAAA,eAAe,GAAwB;IAClD;QACE,OAAO,EAAE,6BAAoB;QAC7B,UAAU,EAAE,CAAC,EACX,WAAW,EACX,UAAU,GAIX,EAAE,EAAE;;YACH,OAAO,IAAI,6BAAa,CAAC,WAAW,kCAC/B,UAAU,KACb,GAAG,EAAE,aAAa,EAClB,IAAI,EAAE,MAAA,UAAU,CAAC,IAAI,mCAAI,IAAI,EAC7B,SAAS,EAAE,QAAQ,IACnB,CAAC;QACL,CAAC;QACD,IAAI,EAAE;YACJ,WAAW,EAAE,2BAAkB;YAC/B,UAAU,EAAE,iCAAwB;SACrC;KACF;IACD;QACE,OAAO,EAAE,4BAAmB;QAC5B,UAAU,EAAE,2BAAY;KACzB;IACD;QACE,OAAO,EAAE,2BAAkB;QAC3B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EACX,YAAY,EACZ,UAAU,GAIX,EAAE,EAAE;YACH,OAAO,SAAe,kBAAkB;;oBACtC,MAAM,EAAE,IAAI,GAAG,WAAW,EAAE,IAAI,GAAG,IAAI,EAAE,GAAG,UAAU,CAAC;oBAEvD,IAAI;wBACF,MAAM,IAAA,2BAAY,EAAC,YAAY,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;qBAC9C;oBAAC,OAAO,KAAK,EAAE;wBACd,IAAK,KAAa,CAAC,IAAI,KAAK,YAAY,EAAE;4BACxC,MAAM,IAAI,KAAK,CACb,YAAY,IAAI,IAAI,IAAI,iEAAiE,CAC1F,CAAC;yBACH;wBAED,MAAM,KAAK,CAAC;qBACb;gBACH,CAAC;aAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;YACjC,UAAU,EAAE,iCAAwB;SACrC;KACF;IACD;QACE,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,YAAY,EAAgD,EAAE,EAAE;YAC7E,OAAO,GAAG,EAAE;gBACV,OAAO,IAAA,uBAAU,EAAC,YAAY,CAAC,CAAC;YAClC,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;SAClC;KACF;IACD;QACE,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,aAAa,EAAkD,EAAE,EAAE;YAChF,OAAO,GAAS,EAAE;gBAChB,MAAM,OAAO,CAAC,GAAG,CAAC;oBAChB,IAAA,uCAAyB,EAAC,aAAa,CAAC;oBACxC,IAAA,mCAAqB,EAAC,aAAa,CAAC;iBACrC,CAAC,CAAC;YACL,CAAC,CAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,aAAa,EAAE,6BAAoB;SACpC;KACF;CACO,CAAC"}

package/lib/api/start/providers/module/shared.js

@@ -67,7 +67,7 @@ exports.sharedProviders = [
         useFactory: ({ configManager }) => {
             return () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
                 yield Promise.all([
-                    (0, workersPool_1.closeWorkerPoolBabel)(configManager),
+                    (0, workersPool_1.closeWorkerPoolTranspiler)(configManager),
                     (0, workersPool_1.closeWorkerPoolStyles)(configManager),
                 ]);
             });

package/lib/api/start/providers/module/shared.js.map

@@ -1 +1 @@
-{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../../src/api/start/providers/module/shared.ts"],"names":[],"mappings":";;;;AACA,yCAAuE;AACvE,kDAK+B;AAG/B,oEAAiE;AACjE,+EAGuD;AACvD,uDAAoD;AACpD,2DAAwD;AACxD,2DAAwD;AAE3C,QAAA,eAAe,GAAwB;IAClD;QACE,OAAO,EAAE,6BAAoB;QAC7B,UAAU,EAAE,CAAC,EACX,WAAW,EACX,UAAU,GAIX,EAAE,EAAE;;YACH,OAAO,IAAI,6BAAa,CAAC,WAAW,kCAC/B,UAAU,KACb,GAAG,EAAE,aAAa,EAClB,IAAI,EAAE,MAAA,UAAU,CAAC,IAAI,mCAAI,IAAI,EAC7B,SAAS,EAAE,QAAQ,IACnB,CAAC;QACL,CAAC;QACD,IAAI,EAAE;YACJ,WAAW,EAAE,2BAAkB;YAC/B,UAAU,EAAE,iCAAwB;SACrC;KACF;IACD;QACE,OAAO,EAAE,4BAAmB;QAC5B,UAAU,EAAE,2BAAY;KACzB;IACD;QACE,OAAO,EAAE,2BAAkB;QAC3B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EACX,YAAY,EACZ,UAAU,GAIX,EAAE,EAAE;YACH,OAAO,SAAe,kBAAkB;;oBACtC,MAAM,EAAE,IAAI,GAAG,WAAW,EAAE,IAAI,GAAG,IAAI,EAAE,GAAG,UAAU,CAAC;oBAEvD,IAAI;wBACF,MAAM,IAAA,2BAAY,EAAC,YAAY,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;qBAC9C;oBAAC,OAAO,KAAK,EAAE;wBACd,IAAK,KAAa,CAAC,IAAI,KAAK,YAAY,EAAE;4BACxC,MAAM,IAAI,KAAK,CACb,YAAY,IAAI,IAAI,IAAI,iEAAiE,CAC1F,CAAC;yBACH;wBAED,MAAM,KAAK,CAAC;qBACb;gBACH,CAAC;aAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;YACjC,UAAU,EAAE,iCAAwB;SACrC;KACF;IACD;QACE,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,YAAY,EAAgD,EAAE,EAAE;YAC7E,OAAO,GAAG,EAAE;gBACV,OAAO,IAAA,uBAAU,EAAC,YAAY,CAAC,CAAC;YAClC,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;SAClC;KACF;IACD;QACE,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,aAAa,EAAkD,EAAE,EAAE;YAChF,OAAO,GAAS,EAAE;gBAChB,MAAM,OAAO,CAAC,GAAG,CAAC;oBAChB,IAAA,kCAAoB,EAAC,aAAa,CAAC;oBACnC,IAAA,mCAAqB,EAAC,aAAa,CAAC;iBACrC,CAAC,CAAC;YACL,CAAC,CAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,aAAa,EAAE,6BAAoB;SACpC;KACF;CACO,CAAC"}
+{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../../src/api/start/providers/module/shared.ts"],"names":[],"mappings":";;;;AACA,yCAAuE;AACvE,kDAK+B;AAG/B,oEAAiE;AACjE,+EAGuD;AACvD,uDAAoD;AACpD,2DAAwD;AACxD,2DAAwD;AAE3C,QAAA,eAAe,GAAwB;IAClD;QACE,OAAO,EAAE,6BAAoB;QAC7B,UAAU,EAAE,CAAC,EACX,WAAW,EACX,UAAU,GAIX,EAAE,EAAE;;YACH,OAAO,IAAI,6BAAa,CAAC,WAAW,kCAC/B,UAAU,KACb,GAAG,EAAE,aAAa,EAClB,IAAI,EAAE,MAAA,UAAU,CAAC,IAAI,mCAAI,IAAI,EAC7B,SAAS,EAAE,QAAQ,IACnB,CAAC;QACL,CAAC;QACD,IAAI,EAAE;YACJ,WAAW,EAAE,2BAAkB;YAC/B,UAAU,EAAE,iCAAwB;SACrC;KACF;IACD;QACE,OAAO,EAAE,4BAAmB;QAC5B,UAAU,EAAE,2BAAY;KACzB;IACD;QACE,OAAO,EAAE,2BAAkB;QAC3B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EACX,YAAY,EACZ,UAAU,GAIX,EAAE,EAAE;YACH,OAAO,SAAe,kBAAkB;;oBACtC,MAAM,EAAE,IAAI,GAAG,WAAW,EAAE,IAAI,GAAG,IAAI,EAAE,GAAG,UAAU,CAAC;oBAEvD,IAAI;wBACF,MAAM,IAAA,2BAAY,EAAC,YAAY,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;qBAC9C;oBAAC,OAAO,KAAK,EAAE;wBACd,IAAK,KAAa,CAAC,IAAI,KAAK,YAAY,EAAE;4BACxC,MAAM,IAAI,KAAK,CACb,YAAY,IAAI,IAAI,IAAI,iEAAiE,CAC1F,CAAC;yBACH;wBAED,MAAM,KAAK,CAAC;qBACb;gBACH,CAAC;aAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;YACjC,UAAU,EAAE,iCAAwB;SACrC;KACF;IACD;QACE,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,YAAY,EAAgD,EAAE,EAAE;YAC7E,OAAO,GAAG,EAAE;gBACV,OAAO,IAAA,uBAAU,EAAC,YAAY,CAAC,CAAC;YAClC,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;SAClC;KACF;IACD;QACE,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,aAAa,EAAkD,EAAE,EAAE;YAChF,OAAO,GAAS,EAAE;gBAChB,MAAM,OAAO,CAAC,GAAG,CAAC;oBAChB,IAAA,uCAAyB,EAAC,aAAa,CAAC;oBACxC,IAAA,mCAAqB,EAAC,aAAa,CAAC;iBACrC,CAAC,CAAC;YACL,CAAC,CAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,aAAa,EAAE,6BAAoB;SACpC;KACF;CACO,CAAC"}

package/lib/builder/webpack/providers/shared.js

@@ -58,7 +58,7 @@ exports.sharedProviders = [
         useFactory: ({ configManager }) => {
             return () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
                 yield Promise.all([
-                    (0, workersPool_1.closeWorkerPoolBabel)(configManager),
+                    (0, workersPool_1.closeWorkerPoolTranspiler)(configManager),
                     (0, workersPool_1.closeWorkerPoolStyles)(configManager),
                 ]);
             });

package/lib/builder/webpack/providers/shared.js.map

@@ -1 +1 @@
-{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../src/builder/webpack/providers/shared.ts"],"names":[],"mappings":";;;;AACA,0CAAyC;AACzC,mCAAsC;AACtC,+CAA0D;AAC1D,4EAGoD;AACpD,sCAQmB;AACnB,oEAAiE;AACjE,0DAA2D;AAE9C,QAAA,eAAe,GAAe;IACzC,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,8BAAqB;QAC9B,UAAU,EAAE,CAAC,EAAE,cAAc,EAAE,oBAAoB,EAAE,cAAc,EAAE,EAAE,EAAE;YACvE,MAAM,aAAa,GAAG,cAAc,IAAI,IAAA,uCAAkB,EAAC,cAAc,CAAC,CAAC;YAC3E,MAAM,mBAAmB,GAAG,oBAAoB,IAAI,IAAA,uCAAkB,EAAC,oBAAoB,CAAC,CAAC;YAC7F,MAAM,aAAa,GAAG,cAAc,IAAI,IAAA,uCAAkB,EAAC,cAAc,CAAC,CAAC;YAC3E,OAAO,CAAC,GAAG,EAAE;gBACX,OAAO;oBACL,eAAe,EAAE,aAAa,aAAb,aAAa,uBAAb,aAAa,EAAI;oBAClC,qBAAqB,EAAE,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,EAAI;oBAC9C,eAAe,EAAE,aAAa,aAAb,aAAa,uBAAb,aAAa,EAAI;iBACnC,CAAC;YACJ,CAAC,CAAiC,CAAC;QACrC,CAAC;QACD,IAAI,EAAE;YACJ,cAAc,EAAE,EAAE,KAAK,EAAE,sCAA6B,EAAE,QAAQ,EAAE,IAAI,EAAE;YACxE,oBAAoB,EAAE,EAAE,KAAK,EAAE,6CAAoC,EAAE,QAAQ,EAAE,IAAI,EAAE;YACrF,cAAc,EAAE,EAAE,KAAK,EAAE,sCAA6B,EAAE,QAAQ,EAAE,IAAI,EAAE;SACzE;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,4BAAmB;QAC5B,QAAQ,EAAE,qBAAY;KACvB,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,2BAAkB;QAC3B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,YAAY,EAAE,cAAc,EAAE,oBAAoB,EAAE,cAAc,EAAE,EAAE,EAAE;YACrF,OAAO,GAAG,EAAE;gBACV,cAAc,IAAI,IAAA,iCAAiB,EAAC,cAAc,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;gBAC5E,oBAAoB;oBAClB,IAAA,iCAAiB,EAAC,oBAAoB,EAAE,YAAY,EAAE,cAAc,CAAC,CAAC;gBACxE,cAAc,IAAI,IAAA,iCAAiB,EAAC,cAAc,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;YAC9E,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;YACjC,cAAc,EAAE,EAAE,KAAK,EAAE,sCAA6B,EAAE,QAAQ,EAAE,IAAI,EAAE;YACxE,oBAAoB,EAAE,EAAE,KAAK,EAAE,6CAAoC,EAAE,QAAQ,EAAE,IAAI,EAAE;YACrF,cAAc,EAAE,EAAE,KAAK,EAAE,sCAA6B,EAAE,QAAQ,EAAE,IAAI,EAAE;SACzE;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE;YAChC,OAAO,GAAS,EAAE;gBAChB,MAAM,OAAO,CAAC,GAAG,CAAC;oBAChB,IAAA,kCAAoB,EAAC,aAAa,CAAC;oBACnC,IAAA,mCAAqB,EAAC,aAAa,CAAC;iBACrC,CAAC,CAAC;YACL,CAAC,CAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,aAAa,EAAE,6BAAoB;SACpC;KACF,CAAC;CACH,CAAC"}
+{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../../src/builder/webpack/providers/shared.ts"],"names":[],"mappings":";;;;AACA,0CAAyC;AACzC,mCAAsC;AACtC,+CAA0D;AAC1D,4EAGoD;AACpD,sCAQmB;AACnB,oEAAiE;AACjE,0DAA2D;AAE9C,QAAA,eAAe,GAAe;IACzC,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,8BAAqB;QAC9B,UAAU,EAAE,CAAC,EAAE,cAAc,EAAE,oBAAoB,EAAE,cAAc,EAAE,EAAE,EAAE;YACvE,MAAM,aAAa,GAAG,cAAc,IAAI,IAAA,uCAAkB,EAAC,cAAc,CAAC,CAAC;YAC3E,MAAM,mBAAmB,GAAG,oBAAoB,IAAI,IAAA,uCAAkB,EAAC,oBAAoB,CAAC,CAAC;YAC7F,MAAM,aAAa,GAAG,cAAc,IAAI,IAAA,uCAAkB,EAAC,cAAc,CAAC,CAAC;YAC3E,OAAO,CAAC,GAAG,EAAE;gBACX,OAAO;oBACL,eAAe,EAAE,aAAa,aAAb,aAAa,uBAAb,aAAa,EAAI;oBAClC,qBAAqB,EAAE,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,EAAI;oBAC9C,eAAe,EAAE,aAAa,aAAb,aAAa,uBAAb,aAAa,EAAI;iBACnC,CAAC;YACJ,CAAC,CAAiC,CAAC;QACrC,CAAC;QACD,IAAI,EAAE;YACJ,cAAc,EAAE,EAAE,KAAK,EAAE,sCAA6B,EAAE,QAAQ,EAAE,IAAI,EAAE;YACxE,oBAAoB,EAAE,EAAE,KAAK,EAAE,6CAAoC,EAAE,QAAQ,EAAE,IAAI,EAAE;YACrF,cAAc,EAAE,EAAE,KAAK,EAAE,sCAA6B,EAAE,QAAQ,EAAE,IAAI,EAAE;SACzE;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,4BAAmB;QAC5B,QAAQ,EAAE,qBAAY;KACvB,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,2BAAkB;QAC3B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,YAAY,EAAE,cAAc,EAAE,oBAAoB,EAAE,cAAc,EAAE,EAAE,EAAE;YACrF,OAAO,GAAG,EAAE;gBACV,cAAc,IAAI,IAAA,iCAAiB,EAAC,cAAc,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;gBAC5E,oBAAoB;oBAClB,IAAA,iCAAiB,EAAC,oBAAoB,EAAE,YAAY,EAAE,cAAc,CAAC,CAAC;gBACxE,cAAc,IAAI,IAAA,iCAAiB,EAAC,cAAc,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;YAC9E,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,YAAY,EAAE,4BAAmB;YACjC,cAAc,EAAE,EAAE,KAAK,EAAE,sCAA6B,EAAE,QAAQ,EAAE,IAAI,EAAE;YACxE,oBAAoB,EAAE,EAAE,KAAK,EAAE,6CAAoC,EAAE,QAAQ,EAAE,IAAI,EAAE;YACrF,cAAc,EAAE,EAAE,KAAK,EAAE,sCAA6B,EAAE,QAAQ,EAAE,IAAI,EAAE;SACzE;KACF,CAAC;IACF,IAAA,eAAO,EAAC;QACN,OAAO,EAAE,4BAAmB;QAC5B,KAAK,EAAE,IAAI;QACX,UAAU,EAAE,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE;YAChC,OAAO,GAAS,EAAE;gBAChB,MAAM,OAAO,CAAC,GAAG,CAAC;oBAChB,IAAA,uCAAyB,EAAC,aAAa,CAAC;oBACxC,IAAA,mCAAqB,EAAC,aAAa,CAAC;iBACrC,CAAC,CAAC;YACL,CAAC,CAAA,CAAC;QACJ,CAAC;QACD,IAAI,EAAE;YACJ,aAAa,EAAE,6BAAoB;SACpC;KACF,CAAC;CACH,CAAC"}

package/lib/library/babel/index.d.ts

@@ -1,34 +1,15 @@
-import type { Env } from '../../typings/Env';
-import type { Target } from '../../typings/target';
-interface BabelConfig {
-    env?: Env;
-    target?: Target;
-    modern?: boolean;
-    isServer?: boolean;
-    generateDataQaTag?: boolean;
-    enableFillActionNamePlugin?: boolean;
-    typescript?: boolean;
-    modules?: string | false;
-    loader?: boolean;
-    useESModules?: boolean;
-    removeTypeofWindow?: boolean;
-    alias?: Record<string, any>;
-    tramvai?: boolean;
-    hot?: boolean;
-    excludesPresetEnv?: string[];
-    rootDir?: string;
-}
-export declare const babelConfigFactory: ({ env, target, modern, isServer, modules, generateDataQaTag, enableFillActionNamePlugin, markCreateTokenAsPure, typescript, useESModules, loader, removeTypeofWindow, alias, tramvai, hot, excludesPresetEnv, rootDir, }: BabelConfig) => {
+import type { TranspilerConfig } from '../webpack/utils/transpiler';
+export declare const babelConfigFactory: ({ env, target, modern, isServer, modules, generateDataQaTag, enableFillActionNamePlugin, markCreateTokenAsPure, typescript, loader, removeTypeofWindow, alias, tramvai, hot, excludesPresetEnv, rootDir, }: Partial<TranspilerConfig>) => {
     cwd: string;
     compact: boolean;
     sourceType: "unambiguous";
     presets: (string | (string | {
-        modules: string | false;
+        modules: false | "commonjs" | "es6";
         useBuiltIns: string;
         corejs: string;
         loose: boolean;
         targets: string[];
-        browserslistEnv: Target;
+        browserslistEnv: import("../../typings/target").Target;
         bugfixes: boolean;
         exclude: string[];
     })[] | (string | {
@@ -58,12 +39,12 @@ export declare const babelConfigFactory: ({ env, target, modern, isServer, modul
     compact?: undefined;
     sourceType: "unambiguous";
     presets: (string | (string | {
-        modules: string | false;
+        modules: false | "commonjs" | "es6";
         useBuiltIns: string;
         corejs: string;
         loose: boolean;
         targets: string[];
-        browserslistEnv: Target;
+        browserslistEnv: import("../../typings/target").Target;
         bugfixes: boolean;
         exclude: string[];
     })[] | (string | {

package/lib/library/babel/index.js

@@ -31,8 +31,7 @@ function hasJsxRuntime() {
 const babelConfigFactory = ({ env = 'development', target, modern, isServer = false, modules = false, generateDataQaTag = true, enableFillActionNamePlugin = false, 
 // for testing only!
 // @ts-expect-error
-markCreateTokenAsPure = true, typescript = false, useESModules = !(isServer && env === 'development'), // на сервере в режиме дев node_modules не компилятся поэтому отключаем ESModules,
-loader = true, removeTypeofWindow, alias, tramvai = false, hot = false, excludesPresetEnv, rootDir = process.cwd(), }) => {
+markCreateTokenAsPure = true, typescript = false, loader = true, removeTypeofWindow, alias, tramvai = false, hot = false, excludesPresetEnv, rootDir = process.cwd(), }) => {
     var _a, _b;
     const cfg = envConfig[env] || {};
     let resultTarget = target;
@@ -85,7 +84,8 @@ loader = true, removeTypeofWindow, alias, tramvai = false, hot = false, excludes
             .concat(cfg.presets || [])
             .filter(Boolean),
         plugins: [
-            ['@babel/transform-runtime', { useESModules }],
+            // TODO: useESModules is deprecated and should work automatically - https://babeljs.io/docs/en/babel-plugin-transform-runtime#useesmodules
+            ['@babel/transform-runtime', { useESModules: !(isServer && env === 'development') }],
             path_1.default.resolve(__dirname, './plugins/lazy-component/legacy-universal-replace'),
             path_1.default.resolve(__dirname, './plugins/lazy-component/lazy-component'),
             generateDataQaTag && path_1.default.resolve(__dirname, './plugins/react-element-info-unique'),

package/lib/library/babel/index.js.map

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

package/lib/library/swc/index.d.ts

@@ -1,19 +1,3 @@
 import type { Config } from '@swc/core';
-import type { Env } from '../../typings/Env';
-import type { Target } from '../../typings/target';
-interface SWCConfig {
-    env?: Env;
-    target?: Target;
-    modern?: boolean;
-    isServer?: boolean;
-    typescript?: boolean;
-    modules?: Config['module']['type'] | false;
-    removeTypeofWindow?: boolean;
-    alias?: Record<string, any>;
-    bugfixes?: boolean;
-    tramvai?: boolean;
-    hot?: boolean;
-    rootDir?: string;
-}
-export declare const getSwcOptions: ({ env, target, modern, isServer, modules, typescript, hot, rootDir, tramvai, }: SWCConfig) => Config;
-export {};
+import type { TranspilerConfig } from '../webpack/utils/transpiler';
+export declare const getSwcOptions: (config: TranspilerConfig) => Config;

package/lib/library/swc/index.js

@@ -2,13 +2,33 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSwcOptions = void 0;
 const tslib_1 = require("tslib");
+const empty_1 = tslib_1.__importDefault(require("@tinkoff/utils/is/empty"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const fs_1 = require("fs");
 const browserslist_1 = tslib_1.__importDefault(require("browserslist"));
 const browserslist_config_1 = tslib_1.__importDefault(require("@tinkoff/browserslist-config"));
 const resolve_1 = require("resolve");
 const find_cache_dir_1 = tslib_1.__importDefault(require("find-cache-dir"));
 const TRAMVAI_SWC_TARGET_PATH = '@tramvai/swc-integration/target/wasm32-wasi';
-const getSwcOptions = ({ env = 'development', target, modern, isServer = false, modules = false, typescript = false, hot = false, rootDir = process.cwd(), tramvai = false, }) => {
+const NOT_SUPPORTED_FIELDS = ['alias', 'generateDataQaTag', 'enableFillActionNamePlugin'];
+let warningWasShown = false;
+const getSwcOptions = (config) => {
     var _a, _b;
+    const { env = 'development', target, modern, isServer = false, modules = false, typescript = false, hot = false, removeTypeofWindow, tramvai = false, rootDir = process.cwd(), } = config;
+    if (!warningWasShown) {
+        for (const field of NOT_SUPPORTED_FIELDS) {
+            if (config[field] && !(0, empty_1.default)(config[field])) {
+                console.warn(`@tramvai/swc-integration do not support "${field}" configuration. Consider removing it from tramvai.json`);
+                warningWasShown = true;
+            }
+        }
+        const swcrcPath = path_1.default.resolve(rootDir, '.swcrc');
+        if ((0, fs_1.existsSync)(swcrcPath)) {
+            console.warn(`Found .swcrc config in the app root directory ("${swcrcPath}").
+Having swc config may conflict with @tramvai/cli configuration`);
+            warningWasShown = true;
+        }
+    }
     const resolveWasmFile = (pluginName, type) => {
         return (0, resolve_1.sync)(`${TRAMVAI_SWC_TARGET_PATH}/${type}/${pluginName}.wasm`, {
             basedir: rootDir,
@@ -68,6 +88,8 @@ const getSwcOptions = ({ env = 'development', target, modern, isServer = false,
             parser: {
                 syntax: typescript ? 'typescript' : 'ecmascript',
                 decorators: true,
+                tsx: true,
+                jsx: true,
             },
             transform: {
                 legacyDecorator: true,
@@ -78,11 +100,15 @@ const getSwcOptions = ({ env = 'development', target, modern, isServer = false,
                 },
                 optimizer: {
                     globals: {
+                        // let the webpack replace NODE_ENV as replacement with swc may mess up with tests
+                        envs: [],
                         // @ts-ignore
                         // TODO: there is not typings for typeofs, but the field is mentioned in docs
-                        typeofs: {
-                            window: isServer ? 'undefined' : 'object',
-                        },
+                        typeofs: removeTypeofWindow
+                            ? {
+                                window: isServer ? 'undefined' : 'object',
+                            }
+                            : {},
                     },
                 },
             },
@@ -92,7 +118,7 @@ const getSwcOptions = ({ env = 'development', target, modern, isServer = false,
                     [resolveTramvaiSwcPlugin('create_token_pure'), {}],
                     [resolveTramvaiSwcPlugin('lazy_component'), {}],
                     isServer && [resolveTramvaiSwcPlugin('dynamic_import_to_require'), {}],
-                    tramvai && env === 'development' && [resolveTramvaiSwcPlugin('provider-stack'), {}],
+                    tramvai && env === 'development' && [resolveTramvaiSwcPlugin('provider_stack'), {}],
                 ].filter(Boolean),
             },
         },

package/lib/library/swc/index.js.map

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

package/lib/library/typescript/index.d.ts

@@ -33,7 +33,7 @@ declare const _default: (options: Options) => {
         sourceType: "unambiguous";
         compact?: boolean;
         presets: (string | (string | {
-            modules: string | false;
+            modules: false | "commonjs" | "es6";
             useBuiltIns: string;
             corejs: string;
             loose: boolean;

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

@@ -5,9 +5,8 @@ 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 transpilerConfig = (0, transpiler_1.getTranspilerConfig)(configManager);
     const { transpileOnlyModernLibs } = configManager.build.configurations;
-    const jsRule = (babelCfg) => (rule) => {
+    const jsRule = (transpilerConfig) => (rule) => {
         const cfg = rule
             .test(/\.[cm]?js[x]?$/)
             .oneOf('default')
@@ -15,22 +14,22 @@ exports.default = (configManager) => (config) => {
             .when(process.platform !== 'win32' && !configManager.debug, (cfg) => cfg
             .use('thread')
             .loader('thread-loader')
-            .options((0, workersPool_1.createWorkerPoolBabel)(configManager))
+            .options((0, workersPool_1.createWorkerPoolTranspiler)(configManager))
             .end())
             .use('transpiler');
-        return (0, transpiler_1.addTranspilerLoader)(configManager, cfg, babelCfg);
+        return (0, transpiler_1.addTranspilerLoader)(configManager, cfg, transpilerConfig);
     };
     if (transpileOnlyModernLibs) {
         config.module
             .rule('js:project')
             .exclude.add(/node_modules/)
             .end()
-            .batch(jsRule(transpilerConfig));
+            .batch(jsRule((0, transpiler_1.getTranspilerConfig)(configManager)));
         config.module
             .rule('js:node_modules')
             .include.add(is_modern_lib_1.modernLibsFilter)
             .end()
-            .batch(jsRule(Object.assign(Object.assign({}, transpilerConfig), { hot: false })))
+            .batch(jsRule((0, transpiler_1.getTranspilerConfig)(configManager, { hot: false })))
             .merge({
             // TODO: некоторые пакеты неправильно описывают импорты для es модулей
             // https://github.com/babel/babel/issues/12058
@@ -42,12 +41,12 @@ exports.default = (configManager) => (config) => {
             .rule('js:project')
             .exclude.add(/node_modules/)
             .end()
-            .batch(jsRule(transpilerConfig));
+            .batch(jsRule((0, transpiler_1.getTranspilerConfig)(configManager)));
         config.module
             .rule('js:node_modules')
             .include.add(/node_modules/)
             .end()
-            .batch(jsRule(Object.assign(Object.assign({}, transpilerConfig), { hot: false })))
+            .batch(jsRule((0, transpiler_1.getTranspilerConfig)(configManager, { 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":";;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,YAAY,CAAC,CAAC;QAErB,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"}
+{"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"}

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

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
+const fs_1 = require("fs");
+const tsconfig_paths_webpack_plugin_1 = require("tsconfig-paths-webpack-plugin");
 const constants_1 = require("../../../config/constants");
 exports.default = (configManager) => (config) => {
     const { rootDir, modern, buildType } = configManager;
@@ -11,6 +13,17 @@ exports.default = (configManager) => (config) => {
         'module',
         'main',
     ].filter(Boolean));
+    const tsconfigPath = path_1.default.resolve(rootDir, 'tsconfig.json');
+    if ((0, fs_1.existsSync)(tsconfigPath)) {
+        config.resolve.plugin('tsconfig-paths').use(tsconfig_paths_webpack_plugin_1.TsconfigPathsPlugin, [
+            {
+                configFile: tsconfigPath,
+                extensions: constants_1.extensions,
+                mainFields: config.resolve.mainFields.values(),
+                silent: true,
+            },
+        ]);
+    }
     config.resolve.extensions
         .merge(constants_1.extensions)
         .end()

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

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

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const workersPool_1 = require("../utils/workersPool");
 const transpiler_1 = require("../utils/transpiler");
 exports.default = (configManager) => (config) => {
-    const transpilerConfig = Object.assign(Object.assign({}, (0, transpiler_1.getTranspilerConfig)(configManager)), { typescript: true });
+    const transpilerConfig = (0, transpiler_1.getTranspilerConfig)(configManager, { typescript: true });
     const cfg = config.module
         .rule('ts:project')
         .test(/\.ts[x]?$/)
@@ -11,7 +11,11 @@ exports.default = (configManager) => (config) => {
         .end()
         .oneOf('default')
         // TODO разобраться почему на винде все плохо с thread-loader
-        .when(process.platform !== 'win32', (cfg) => cfg.use('thread').loader('thread-loader').options((0, workersPool_1.createWorkerPoolBabel)(configManager)).end())
+        .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);
 };

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,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,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;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"}

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

@@ -1,17 +1,23 @@
 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) => {
+import type { Env } from '../../../typings/Env';
+import type { Target } from '../../../typings/target';
+export type TranspilerConfig = {
+    env: Env;
+    target: Target;
+    modern: boolean;
     isServer: boolean;
-    env: any;
     generateDataQaTag: boolean;
-    modern: boolean;
+    enableFillActionNamePlugin: boolean;
+    typescript: boolean;
+    modules: 'es6' | 'commonjs' | false;
+    loader: boolean;
+    removeTypeofWindow: boolean;
     alias: Record<string, any>;
     tramvai: boolean;
-    removeTypeofWindow: boolean;
     hot: boolean;
     excludesPresetEnv: string[];
-    enableFillActionNamePlugin: boolean;
     rootDir: string;
-    target: import("../../../typings/target").Target;
 };
+export declare const addTranspilerLoader: (configManager: ConfigManager, rule: Config.Use, transpilerConfig: TranspilerConfig) => Config.Rule;
+export declare const getTranspilerConfig: (configManager: ConfigManager, overrideOptions?: Partial<TranspilerConfig>) => TranspilerConfig;

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

@@ -23,23 +23,14 @@ Please run "tramvai add --dev @tramvai/swc-integration" to fix the problem
     }
 };
 exports.addTranspilerLoader = addTranspilerLoader;
-const getTranspilerConfig = (configManager) => {
-    const { generateDataQaTag, alias, removeTypeofWindow, enableFillActionNamePlugin } = configManager.build.configurations;
+const getTranspilerConfig = (configManager, overrideOptions = {}) => {
+    const { generateDataQaTag, alias, removeTypeofWindow, enableFillActionNamePlugin, excludesPresetEnv, } = configManager.build.configurations;
     const { env, modern } = configManager;
-    return {
-        isServer: configManager.buildType === 'server',
-        env,
+    return Object.assign({ 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,
-    };
+        alias, tramvai: true, removeTypeofWindow, hot: configManager.hotRefresh, excludesPresetEnv,
+        enableFillActionNamePlugin, rootDir: configManager.rootDir, target: configManager.target, loader: true, modules: false, typescript: false }, overrideOptions);
 };
 exports.getTranspilerConfig = getTranspilerConfig;
 //# sourceMappingURL=transpiler.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"transpiler.js","sourceRoot":"","sources":["../../../../src/library/webpack/utils/transpiler.ts"],"names":[],"mappings":";;;;AACA,qCAA0C;AAE1C,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,IAAI;YACF,IAAA,cAAO,EAAC,uCAAuC,EAAE,EAAE,OAAO,EAAE,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC;SACtF;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,IAAI,KAAK,CAAC;;OAEf,CAAC,CAAC;SACJ;QAED,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,IAAA,mBAAa,EAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;KACjF;IAED,IAAI,MAAM,KAAK,OAAO,EAAE;QACtB,OAAO,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,IAAA,eAAW,EAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;KACjF;AACH,CAAC,CAAC;AAtBW,QAAA,mBAAmB,uBAsB9B;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"}
+{"version":3,"file":"transpiler.js","sourceRoot":"","sources":["../../../../src/library/webpack/utils/transpiler.ts"],"names":[],"mappings":";;;;AACA,qCAA0C;AAE1C,mCAA0C;AAC1C,gEAAsC;AAsB/B,MAAM,mBAAmB,GAAG,CACjC,aAA4B,EAC5B,IAAgB,EAChB,gBAAkC,EAClC,EAAE;IACF,MAAM,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC,WAAW,CAAC,aAAa,CAAC;IAE3D,IAAI,MAAM,KAAK,KAAK,EAAE;QACpB,IAAI;YACF,IAAA,cAAO,EAAC,uCAAuC,EAAE,EAAE,OAAO,EAAE,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC;SACtF;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,IAAI,KAAK,CAAC;;OAEf,CAAC,CAAC;SACJ;QAED,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,IAAA,mBAAa,EAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;KACjF;IAED,IAAI,MAAM,KAAK,OAAO,EAAE;QACtB,OAAO,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,IAAA,eAAW,EAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;KACjF;AACH,CAAC,CAAC;AAtBW,QAAA,mBAAmB,uBAsB9B;AAEK,MAAM,mBAAmB,GAAG,CACjC,aAA4B,EAC5B,kBAA6C,EAAE,EAC7B,EAAE;IACpB,MAAM,EACJ,iBAAiB,EACjB,KAAK,EACL,kBAAkB,EAClB,0BAA0B,EAC1B,iBAAiB,GAClB,GAAG,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC;IACvC,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC;IAEtC,uBACE,QAAQ,EAAE,aAAa,CAAC,SAAS,KAAK,QAAQ,EAC9C,GAAG;QACH,iBAAiB;QACjB,MAAM;QACN,KAAK,EACL,OAAO,EAAE,IAAI,EACb,kBAAkB,EAClB,GAAG,EAAE,aAAa,CAAC,UAAU,EAC7B,iBAAiB;QACjB,0BAA0B,EAC1B,OAAO,EAAE,aAAa,CAAC,OAAO,EAC9B,MAAM,EAAE,aAAa,CAAC,MAAM,EAC5B,MAAM,EAAE,IAAI,EACZ,OAAO,EAAE,KAAK,EACd,UAAU,EAAE,KAAK,IACd,eAAe,EAClB;AACJ,CAAC,CAAC;AA/BW,QAAA,mBAAmB,uBA+B9B"}

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

@@ -1,10 +1,10 @@
 import type { ConfigManager } from '../../../config/configManager';
-export declare const createWorkerPoolBabel: (configManager: ConfigManager) => {
+export declare const createWorkerPoolTranspiler: (configManager: ConfigManager) => {
     name: string;
     poolTimeout: number;
     workers: number;
 };
-export declare const closeWorkerPoolBabel: (configManager: ConfigManager) => void;
+export declare const closeWorkerPoolTranspiler: (configManager: ConfigManager) => void;
 export declare const createWorkerPoolStyles: (configManager: ConfigManager) => (configManager: ConfigManager) => {
     name: string;
     workerParallelJobs: number;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.closeWorkerPoolStyles = exports.createWorkerPoolStyles = exports.closeWorkerPoolBabel = exports.createWorkerPoolBabel = void 0;
+exports.closeWorkerPoolStyles = exports.createWorkerPoolStyles = exports.closeWorkerPoolTranspiler = exports.createWorkerPoolTranspiler = void 0;
 const tslib_1 = require("tslib");
 const threadLoader = tslib_1.__importStar(require("thread-loader"));
 const workerPools_1 = require("thread-loader/dist/workerPools");
@@ -18,30 +18,35 @@ const getCustomConfig = (configManager) => {
     const { build: { configurations: { threadLoader: additionalConfig }, }, } = configManager;
     return additionalConfig || {};
 };
-const createBabelConfig = (configManager) => {
-    return Object.assign({ name: 'babel', poolTimeout: configManager.env === 'development' ? Infinity : undefined, workers: calculateNumberOfWorkers() }, getCustomConfig(configManager));
+const createTranspilerConfig = (configManager) => {
+    return Object.assign({ name: 'transpiler', poolTimeout: configManager.env === 'development' ? Infinity : undefined, workers: calculateNumberOfWorkers() }, getCustomConfig(configManager));
 };
-const createWorkerPoolBabel = (configManager) => {
-    const config = createBabelConfig(configManager);
-    if (!exports.createWorkerPoolBabel.warmup) {
-        threadLoader.warmup(config, [
-            'babel-loader',
-            '@babel/preset-env',
-            '@babel/preset-typescript',
-            '@babel/preset-react',
-            '@babel/plugin-transform-runtime',
-            'babel-plugin-lodash',
-        ]);
-        exports.createWorkerPoolBabel.warmup = true;
+const createWorkerPoolTranspiler = (configManager) => {
+    const config = createTranspilerConfig(configManager);
+    if (!exports.createWorkerPoolTranspiler.warmup) {
+        if (configManager.experiments.transpilation.loader === 'swc') {
+            threadLoader.warmup(config, ['swc-loader', '@swc/core']);
+        }
+        else {
+            threadLoader.warmup(config, [
+                'babel-loader',
+                '@babel/preset-env',
+                '@babel/preset-typescript',
+                '@babel/preset-react',
+                '@babel/plugin-transform-runtime',
+                'babel-plugin-lodash',
+            ]);
+        }
+        exports.createWorkerPoolTranspiler.warmup = true;
     }
     return config;
 };
-exports.createWorkerPoolBabel = createWorkerPoolBabel;
-const closeWorkerPoolBabel = (configManager) => {
+exports.createWorkerPoolTranspiler = createWorkerPoolTranspiler;
+const closeWorkerPoolTranspiler = (configManager) => {
     var _a;
-    (_a = (0, workerPools_1.getPool)(createBabelConfig(configManager))) === null || _a === void 0 ? void 0 : _a.disposeWorkers();
+    (_a = (0, workerPools_1.getPool)(createTranspilerConfig(configManager))) === null || _a === void 0 ? void 0 : _a.disposeWorkers();
 };
-exports.closeWorkerPoolBabel = closeWorkerPoolBabel;
+exports.closeWorkerPoolTranspiler = closeWorkerPoolTranspiler;
 const createStylesConfig = (configManager) => {
     return Object.assign({ name: 'styles', workerParallelJobs: 2, workers: Math.max(getCpuNumber(), 2), poolTimeout: configManager.env === 'development' ? Infinity : undefined }, getCustomConfig(configManager));
 };