@tramvai/cli 2.48.0 → 2.49.0

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

@@ -1 +1 @@
-{"version":3,"file":"workersPool.js","sourceRoot":"","sources":["../../../../src/library/webpack/utils/workersPool.ts"],"names":[],"mappings":";;;;AAAA,oEAA8C;AAC9C,gEAAyD;AACzD,oDAAoB;AAGpB,4HAA4H;AAC5H,SAAS,YAAY;IACnB,OAAO,CAAC,YAAE,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC;AAC7C,CAAC;AAED,SAAS,wBAAwB;IAC/B,MAAM,IAAI,GAAG,YAAY,EAAE,CAAC;IAE5B,mGAAmG;IACnG,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;AACnC,CAAC;AAED,MAAM,eAAe,GAAG,CAAC,aAA4B,EAAE,EAAE;IACvD,MAAM,EACJ,KAAK,EAAE,EACL,cAAc,EAAE,EAAE,YAAY,EAAE,gBAAgB,EAAE,GACnD,GACF,GAAG,aAAa,CAAC;IAElB,OAAO,gBAAgB,IAAI,EAAE,CAAC;AAChC,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,aAA4B,EAAE,EAAE;IACzD,uBACE,IAAI,EAAE,OAAO,EACb,WAAW,EAAE,aAAa,CAAC,GAAG,KAAK,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,EACvE,OAAO,EAAE,wBAAwB,EAAE,IAChC,eAAe,CAAC,aAAa,CAAC,EACjC;AACJ,CAAC,CAAC;AAEK,MAAM,qBAAqB,GAAG,CAAC,aAA4B,EAAE,EAAE;IACpE,MAAM,MAAM,GAAG,iBAAiB,CAAC,aAAa,CAAC,CAAC;IAEhD,IAAI,CAAE,6BAA6B,CAAC,MAAM,EAAE;QAC1C,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE;YAC1B,cAAc;YACd,mBAAmB;YACnB,0BAA0B;YAC1B,qBAAqB;YACrB,iCAAiC;YACjC,qBAAqB;SACtB,CAAC,CAAC;QACF,6BAA6B,CAAC,MAAM,GAAG,IAAI,CAAC;KAC9C;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAhBW,QAAA,qBAAqB,yBAgBhC;AAEK,MAAM,oBAAoB,GAAG,CAAC,aAA4B,EAAE,EAAE;;IACnE,MAAA,IAAA,qBAAO,EAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC,0CAAE,cAAc,EAAE,CAAC;AAC9D,CAAC,CAAC;AAFW,QAAA,oBAAoB,wBAE/B;AAEF,MAAM,kBAAkB,GAAG,CAAC,aAA4B,EAAE,EAAE;IAC1D,uBACE,IAAI,EAAE,QAAQ,EACd,kBAAkB,EAAE,CAAC,EACrB,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,EACpC,WAAW,EAAE,aAAa,CAAC,GAAG,KAAK,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,IACpE,eAAe,CAAC,aAAa,CAAC,EACjC;AACJ,CAAC,CAAC;AAEK,MAAM,sBAAsB,GAAG,CAAC,aAA4B,EAAE,EAAE;IACrE,MAAM,MAAM,GAAG,kBAAkB,CAAC;IAElC,IAAI,CAAE,8BAA8B,CAAC,MAAM,EAAE;QAC3C,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAC/C,8BAA8B,CAAC,MAAM,GAAG,IAAI,CAAC;KAC/C;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AATW,QAAA,sBAAsB,0BASjC;AAEK,MAAM,qBAAqB,GAAG,CAAC,aAA4B,EAAE,EAAE;;IACpE,MAAA,IAAA,qBAAO,EAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC,0CAAE,cAAc,EAAE,CAAC;AAC/D,CAAC,CAAC;AAFW,QAAA,qBAAqB,yBAEhC"}
+{"version":3,"file":"workersPool.js","sourceRoot":"","sources":["../../../../src/library/webpack/utils/workersPool.ts"],"names":[],"mappings":";;;;AAAA,oEAA8C;AAC9C,gEAAyD;AACzD,oDAAoB;AAGpB,4HAA4H;AAC5H,SAAS,YAAY;IACnB,OAAO,CAAC,YAAE,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC;AAC7C,CAAC;AAED,SAAS,wBAAwB;IAC/B,MAAM,IAAI,GAAG,YAAY,EAAE,CAAC;IAE5B,mGAAmG;IACnG,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;AACnC,CAAC;AAED,MAAM,eAAe,GAAG,CAAC,aAA4B,EAAE,EAAE;IACvD,MAAM,EACJ,KAAK,EAAE,EACL,cAAc,EAAE,EAAE,YAAY,EAAE,gBAAgB,EAAE,GACnD,GACF,GAAG,aAAa,CAAC;IAElB,OAAO,gBAAgB,IAAI,EAAE,CAAC;AAChC,CAAC,CAAC;AAEF,MAAM,sBAAsB,GAAG,CAAC,aAA4B,EAAE,EAAE;IAC9D,uBACE,IAAI,EAAE,YAAY,EAClB,WAAW,EAAE,aAAa,CAAC,GAAG,KAAK,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,EACvE,OAAO,EAAE,wBAAwB,EAAE,IAChC,eAAe,CAAC,aAAa,CAAC,EACjC;AACJ,CAAC,CAAC;AAEK,MAAM,0BAA0B,GAAG,CAAC,aAA4B,EAAE,EAAE;IACzE,MAAM,MAAM,GAAG,sBAAsB,CAAC,aAAa,CAAC,CAAC;IAErD,IAAI,CAAE,kCAAkC,CAAC,MAAM,EAAE;QAC/C,IAAI,aAAa,CAAC,WAAW,CAAC,aAAa,CAAC,MAAM,KAAK,KAAK,EAAE;YAC5D,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC,CAAC;SAC1D;aAAM;YACL,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE;gBAC1B,cAAc;gBACd,mBAAmB;gBACnB,0BAA0B;gBAC1B,qBAAqB;gBACrB,iCAAiC;gBACjC,qBAAqB;aACtB,CAAC,CAAC;SACJ;QACA,kCAAkC,CAAC,MAAM,GAAG,IAAI,CAAC;KACnD;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AApBW,QAAA,0BAA0B,8BAoBrC;AAEK,MAAM,yBAAyB,GAAG,CAAC,aAA4B,EAAE,EAAE;;IACxE,MAAA,IAAA,qBAAO,EAAC,sBAAsB,CAAC,aAAa,CAAC,CAAC,0CAAE,cAAc,EAAE,CAAC;AACnE,CAAC,CAAC;AAFW,QAAA,yBAAyB,6BAEpC;AAEF,MAAM,kBAAkB,GAAG,CAAC,aAA4B,EAAE,EAAE;IAC1D,uBACE,IAAI,EAAE,QAAQ,EACd,kBAAkB,EAAE,CAAC,EACrB,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,EACpC,WAAW,EAAE,aAAa,CAAC,GAAG,KAAK,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,IACpE,eAAe,CAAC,aAAa,CAAC,EACjC;AACJ,CAAC,CAAC;AAEK,MAAM,sBAAsB,GAAG,CAAC,aAA4B,EAAE,EAAE;IACrE,MAAM,MAAM,GAAG,kBAAkB,CAAC;IAElC,IAAI,CAAE,8BAA8B,CAAC,MAAM,EAAE;QAC3C,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAC/C,8BAA8B,CAAC,MAAM,GAAG,IAAI,CAAC;KAC/C;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AATW,QAAA,sBAAsB,0BASjC;AAEK,MAAM,qBAAqB,GAAG,CAAC,aAA4B,EAAE,EAAE;;IACpE,MAAA,IAAA,qBAAO,EAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC,0CAAE,cAAc,EAAE,CAAC;AAC/D,CAAC,CAAC;AAFW,QAAA,qBAAqB,yBAEhC"}

package/lib/schema/autogeneratedSchema.json

@@ -172,7 +172,7 @@
                                             "additionalProperties": false
                                         },
                                         "alias": {
-                                            "title": "Aliases for project imports",
+                                            "title": "`@@deprecated @tramvai/cli now supports baseUrl and paths from the app's tsconfig.json file.\nJust check or add configuration to your tsconfig file and remove alias from tramvai.json`",
                                             "additionalProperties": true,
                                             "type": "object"
                                         },
@@ -976,12 +976,12 @@
                                         },
                                         "modern": {
                                             "title": "Enable development build for modern browsers",
-                                            "default": false,
+                                            "default": true,
                                             "type": "boolean"
                                         },
                                         "hotRefresh": {
                                             "title": "Enable react hot-refresh",
-                                            "default": false,
+                                            "default": true,
                                             "type": "boolean"
                                         },
                                         "hotRefreshOptions": {
@@ -1289,7 +1289,7 @@
                                             "additionalProperties": false
                                         },
                                         "alias": {
-                                            "title": "Aliases for project imports",
+                                            "title": "`@@deprecated @tramvai/cli now supports baseUrl and paths from the app's tsconfig.json file.\nJust check or add configuration to your tsconfig file and remove alias from tramvai.json`",
                                             "additionalProperties": true,
                                             "type": "object"
                                         },
@@ -1571,12 +1571,12 @@
                                         },
                                         "modern": {
                                             "title": "Enable development build for modern browsers",
-                                            "default": false,
+                                            "default": true,
                                             "type": "boolean"
                                         },
                                         "hotRefresh": {
                                             "title": "Enable react hot-refresh",
-                                            "default": false,
+                                            "default": true,
                                             "type": "boolean"
                                         },
                                         "hotRefreshOptions": {
@@ -1864,7 +1864,7 @@
                                             "additionalProperties": false
                                         },
                                         "alias": {
-                                            "title": "Aliases for project imports",
+                                            "title": "`@@deprecated @tramvai/cli now supports baseUrl and paths from the app's tsconfig.json file.\nJust check or add configuration to your tsconfig file and remove alias from tramvai.json`",
                                             "additionalProperties": true,
                                             "type": "object"
                                         },
@@ -2146,12 +2146,12 @@
                                         },
                                         "modern": {
                                             "title": "Enable development build for modern browsers",
-                                            "default": false,
+                                            "default": true,
                                             "type": "boolean"
                                         },
                                         "hotRefresh": {
                                             "title": "Enable react hot-refresh",
-                                            "default": false,
+                                            "default": true,
                                             "type": "boolean"
                                         },
                                         "hotRefreshOptions": {

package/lib/typings/configEntry/common.d.ts

@@ -74,12 +74,12 @@ interface ServeConfig {
         sourceMap?: boolean;
         /**
          * @title Enable development build for modern browsers
-         * @default false
+         * @default true
          */
         modern?: boolean;
         /**
          * @title Enable react hot-refresh
-         * @default false
+         * @default true
          */
         hotRefresh?: boolean;
         /**
@@ -193,7 +193,9 @@ interface BuildConfig {
             assetsConfig?: string;
         };
         /**
-         * @title Aliases for project imports
+         * @title `@@deprecated @tramvai/cli now supports baseUrl and paths from the app's tsconfig.json file.
+         * Just check or add configuration to your tsconfig file and remove alias from tramvai.json`
+         * @deprecated
          * @additionalProperties true
          */
         alias?: Record<string, any>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/cli",
-  "version": "2.48.0",
+  "version": "2.49.0",
   "description": "Cli инструмент для сборки и запуска приложений",
   "files": [
     "src",
@@ -62,16 +62,16 @@
     "@tinkoff/browserslist-config": "0.2.4",
     "@tinkoff/dippy": "0.8.9",
     "@tinkoff/is-modern-lib": "2.0.4",
-    "@tinkoff/logger": "0.10.54",
+    "@tinkoff/logger": "0.10.55",
     "@tinkoff/minicss-class-generator": "0.2.4",
     "@tinkoff/package-manager-wrapper": "0.1.4",
     "@tinkoff/request-core": "^0.9.2",
     "@tinkoff/request-plugin-protocol-http": "^0.11.6",
     "@tinkoff/utils": "^2.1.3",
     "@tramvai/build": "3.0.6",
-    "@tramvai/react": "2.48.0",
-    "@tramvai/tools-check-versions": "0.4.5",
-    "@tramvai/tools-migrate": "0.6.6",
+    "@tramvai/react": "2.49.0",
+    "@tramvai/tools-check-versions": "0.4.6",
+    "@tramvai/tools-migrate": "0.6.7",
     "ajv": "^6.12.6",
     "ansi-escapes": "^4.3.2",
     "autoprefixer": "^10.4.8",
@@ -143,6 +143,7 @@
     "terser-webpack-plugin": "^5.3.5",
     "text-table": "^0.2.0",
     "thread-loader": "^3.0.4",
+    "tsconfig-paths-webpack-plugin": "^4.0.0",
     "universal-analytics": "^0.4.23",
     "utility-types": "^3.10.0",
     "v8-compile-cache": "^2.3.0",

package/schema.json

@@ -193,7 +193,7 @@
                             "additionalProperties": false
                           },
                           "alias": {
-                            "title": "Aliases for project imports",
+                            "title": "`@@deprecated @tramvai/cli now supports baseUrl and paths from the app's tsconfig.json file.\nJust check or add configuration to your tsconfig file and remove alias from tramvai.json`",
                             "additionalProperties": true,
                             "type": "object"
                           },
@@ -997,12 +997,12 @@
                           },
                           "modern": {
                             "title": "Enable development build for modern browsers",
-                            "default": false,
+                            "default": true,
                             "type": "boolean"
                           },
                           "hotRefresh": {
                             "title": "Enable react hot-refresh",
-                            "default": false,
+                            "default": true,
                             "type": "boolean"
                           },
                           "hotRefreshOptions": {
@@ -1318,7 +1318,7 @@
                               "additionalProperties": false
                             },
                             "alias": {
-                              "title": "Aliases for project imports",
+                              "title": "`@@deprecated @tramvai/cli now supports baseUrl and paths from the app's tsconfig.json file.\nJust check or add configuration to your tsconfig file and remove alias from tramvai.json`",
                               "additionalProperties": true,
                               "type": "object"
                             },
@@ -1600,12 +1600,12 @@
                             },
                             "modern": {
                               "title": "Enable development build for modern browsers",
-                              "default": false,
+                              "default": true,
                               "type": "boolean"
                             },
                             "hotRefresh": {
                               "title": "Enable react hot-refresh",
-                              "default": false,
+                              "default": true,
                               "type": "boolean"
                             },
                             "hotRefreshOptions": {
@@ -1901,7 +1901,7 @@
                                 "additionalProperties": false
                               },
                               "alias": {
-                                "title": "Aliases for project imports",
+                                "title": "`@@deprecated @tramvai/cli now supports baseUrl and paths from the app's tsconfig.json file.\nJust check or add configuration to your tsconfig file and remove alias from tramvai.json`",
                                 "additionalProperties": true,
                                 "type": "object"
                               },
@@ -2183,12 +2183,12 @@
                               },
                               "modern": {
                                 "title": "Enable development build for modern browsers",
-                                "default": false,
+                                "default": true,
                                 "type": "boolean"
                               },
                               "hotRefresh": {
                                 "title": "Enable react hot-refresh",
-                                "default": false,
+                                "default": true,
                                 "type": "boolean"
                               },
                               "hotRefreshOptions": {

package/src/api/benchmark/start.ts

@@ -101,21 +101,18 @@ const runRebuild = async (di: Container, { times }: { times: number }): Promise<
 };
 
 export const benchmarkStart = async (di: Container): Promise<StartResult> => {
-  // прогоняем один раз, чтобы очистить старые кеши и прогреть код команды
-  await runStartCommand(di, { times: 1, shouldClearCache: true });
-
   const { times = 5 } = di.get(COMMAND_PARAMETERS_TOKEN) as Params;
 
-  const cache = await runStartCommand(di, {
-    times,
-    shouldClearCache: false,
-  });
-
   const noCache = await runStartCommand(di, {
-    times,
+    times: Math.max(Math.floor(times / 3), 2),
     shouldClearCache: true,
   });
 
+  const cache = await runStartCommand(di, {
+    times: Math.max(Math.floor(times / 2), 2),
+    shouldClearCache: false,
+  });
+
   const rebuild = await runRebuild(di, { times });
 
   return {

package/src/api/start/providers/child-app/shared.ts

@@ -10,7 +10,7 @@ import type { ChildAppConfigEntry } from '../../../../typings/configEntry/child-
 import type { Params } from '../../index';
 import { ConfigManager } from '../../../../config/configManager';
 import {
-  closeWorkerPoolBabel,
+  closeWorkerPoolTranspiler,
   closeWorkerPoolStyles,
 } from '../../../../library/webpack/utils/workersPool';
 import { stopServer } from '../../utils/stopServer';
@@ -92,7 +92,7 @@ export const sharedProviders: readonly Provider[] = [
     useFactory: ({ configManager }: { configManager: typeof CONFIG_MANAGER_TOKEN }) => {
       return async () => {
         await Promise.all([
-          closeWorkerPoolBabel(configManager),
+          closeWorkerPoolTranspiler(configManager),
           closeWorkerPoolStyles(configManager),
         ]);
       };

package/src/api/start/providers/module/shared.ts

@@ -10,7 +10,7 @@ import type { ModuleConfigEntry } from '../../../../typings/configEntry/module';
 import type { Params } from '../../index';
 import { ConfigManager } from '../../../../config/configManager';
 import {
-  closeWorkerPoolBabel,
+  closeWorkerPoolTranspiler,
   closeWorkerPoolStyles,
 } from '../../../../library/webpack/utils/workersPool';
 import { stopServer } from '../../utils/stopServer';
@@ -92,7 +92,7 @@ export const sharedProviders: readonly Provider[] = [
     useFactory: ({ configManager }: { configManager: typeof CONFIG_MANAGER_TOKEN }) => {
       return async () => {
         await Promise.all([
-          closeWorkerPoolBabel(configManager),
+          closeWorkerPoolTranspiler(configManager),
           closeWorkerPoolStyles(configManager),
         ]);
       };

package/src/builder/webpack/providers/shared.ts

@@ -3,7 +3,7 @@ import { provide } from '@tinkoff/dippy';
 import { EventEmitter } from 'events';
 import { CONFIG_MANAGER_TOKEN } from '../../../di/tokens';
 import {
-  closeWorkerPoolBabel,
+  closeWorkerPoolTranspiler,
   closeWorkerPoolStyles,
 } from '../../../library/webpack/utils/workersPool';
 import {
@@ -67,7 +67,7 @@ export const sharedProviders: Provider[] = [
     useFactory: ({ configManager }) => {
       return async () => {
         await Promise.all([
-          closeWorkerPoolBabel(configManager),
+          closeWorkerPoolTranspiler(configManager),
           closeWorkerPoolStyles(configManager),
         ]);
       };

package/src/commands/new/templates/app/multirepo/tramvai.json.hbs

@@ -17,15 +17,6 @@
             "postcss": {
               "config": "src/postcss"
             },
-            "alias": {
-              "~shared": "./src/shared",
-              "~entities": "./src/entities",
-              "~features": "./src/features",
-              "~widgets": "./src/widgets",
-              "~pages": "./src/pages",
-              "~processes": "./src/processes",
-              "~app": "./src/app"
-            },
             "fileSystemPages": {
               "enable": true
             }

package/src/commands/new/templates/child-app/multirepo/tramvai.json.hbs

@@ -11,15 +11,6 @@
             "postcss": {
               "config": "src/postcss"
             },
-            "alias": {
-              "~shared": "./src/shared",
-              "~entities": "./src/entities",
-              "~features": "./src/features",
-              "~widgets": "./src/widgets",
-              "~pages": "./src/pages",
-              "~processes": "./src/processes",
-              "~app": "./src/app"
-            }
           }
         }
       }

package/src/library/babel/index.ts

@@ -2,8 +2,7 @@ import path from 'path';
 import browserslist from 'browserslist';
 import envTargets from '@tinkoff/browserslist-config';
 import { sync as resolve } from 'resolve';
-import type { Env } from '../../typings/Env';
-import type { Target } from '../../typings/target';
+import type { TranspilerConfig } from '../webpack/utils/transpiler';
 
 const envConfig = {
   production: {
@@ -19,25 +18,6 @@ const envConfig = {
   },
 };
 
-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;
-}
-
 function hasJsxRuntime() {
   try {
     resolve('react/jsx-runtime', { basedir: process.cwd() });
@@ -59,7 +39,6 @@ export const babelConfigFactory = ({
   // @ts-expect-error
   markCreateTokenAsPure = true,
   typescript = false,
-  useESModules = !(isServer && env === 'development'), // на сервере в режиме дев node_modules не компилятся поэтому отключаем ESModules,
   loader = true,
   removeTypeofWindow,
   alias,
@@ -67,7 +46,7 @@ export const babelConfigFactory = ({
   hot = false,
   excludesPresetEnv,
   rootDir = process.cwd(),
-}: BabelConfig) => {
+}: Partial<TranspilerConfig>) => {
   const cfg = envConfig[env] || {};
   let resultTarget = target;
 
@@ -126,7 +105,8 @@ export const babelConfigFactory = ({
       .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.resolve(__dirname, './plugins/lazy-component/legacy-universal-replace'), // TODO: удалить плагин после того как отпадёт необходимость поддерживать легаси
       path.resolve(__dirname, './plugins/lazy-component/lazy-component'),
       generateDataQaTag && path.resolve(__dirname, './plugins/react-element-info-unique'), // Собственный плагин. Необходимо удалить в будущем

package/src/library/swc/index.ts

@@ -1,39 +1,55 @@
+import isEmpty from '@tinkoff/utils/is/empty';
+import path from 'path';
+import { existsSync } from 'fs';
 import browserslist from 'browserslist';
 import envTargets from '@tinkoff/browserslist-config';
 import { sync as resolve } from 'resolve';
 import findCacheDir from 'find-cache-dir';
 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; // https://babeljs.io/docs/en/babel-preset-env#bugfixes
-  tramvai?: boolean;
-  hot?: boolean;
-  rootDir?: string;
-}
+import type { TranspilerConfig } from '../webpack/utils/transpiler';
 
 const TRAMVAI_SWC_TARGET_PATH = '@tramvai/swc-integration/target/wasm32-wasi';
 
-export const getSwcOptions = ({
-  env = 'development',
-  target,
-  modern,
-  isServer = false,
-  modules = false,
-  typescript = false,
-  hot = false,
-  rootDir = process.cwd(),
-  tramvai = false,
-}: SWCConfig): Config => {
+const NOT_SUPPORTED_FIELDS = ['alias', 'generateDataQaTag', 'enableFillActionNamePlugin'];
+let warningWasShown = false;
+
+export const getSwcOptions = (config: TranspilerConfig): Config => {
+  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] && !isEmpty(config[field])) {
+        console.warn(
+          `@tramvai/swc-integration do not support "${field}" configuration. Consider removing it from tramvai.json`
+        );
+
+        warningWasShown = true;
+      }
+    }
+
+    const swcrcPath = path.resolve(rootDir, '.swcrc');
+
+    if (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: string, type: 'debug' | 'release') => {
     return resolve(`${TRAMVAI_SWC_TARGET_PATH}/${type}/${pluginName}.wasm`, {
       basedir: rootDir,
@@ -99,6 +115,8 @@ export const getSwcOptions = ({
       parser: {
         syntax: typescript ? 'typescript' : 'ecmascript',
         decorators: true,
+        tsx: true,
+        jsx: true,
       },
       transform: {
         legacyDecorator: true,
@@ -109,11 +127,15 @@ export const getSwcOptions = ({
         },
         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',
+                }
+              : {},
           },
         },
       },
@@ -123,7 +145,7 @@ export const getSwcOptions = ({
           [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) as Array<[string, Record<string, any>]>,
       },
     },

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

@@ -1,16 +1,15 @@
 import type Config from 'webpack-chain';
 import { modernLibsFilter } from '@tinkoff/is-modern-lib';
-import type babelConfig from '../../babel';
-import { createWorkerPoolBabel } from '../utils/workersPool';
+import { createWorkerPoolTranspiler } from '../utils/workersPool';
 import type { ConfigManager } from '../../../config/configManager';
+import type { TranspilerConfig } from '../utils/transpiler';
 import { getTranspilerConfig, addTranspilerLoader } from '../utils/transpiler';
 
 // eslint-disable-next-line import/no-default-export
 export default (configManager: ConfigManager) => (config: Config) => {
-  const transpilerConfig = getTranspilerConfig(configManager);
   const { transpileOnlyModernLibs } = configManager.build.configurations;
 
-  const jsRule = (babelCfg: Parameters<typeof babelConfig>[0]) => (rule: Config.Rule) => {
+  const jsRule = (transpilerConfig: TranspilerConfig) => (rule: Config.Rule) => {
     const cfg = rule
       .test(/\.[cm]?js[x]?$/)
       .oneOf('default')
@@ -19,12 +18,12 @@ export default (configManager: ConfigManager) => (config: Config) => {
         cfg
           .use('thread')
           .loader('thread-loader')
-          .options(createWorkerPoolBabel(configManager))
+          .options(createWorkerPoolTranspiler(configManager))
           .end()
       )
       .use('transpiler');
 
-    return addTranspilerLoader(configManager, cfg, babelCfg);
+    return addTranspilerLoader(configManager, cfg, transpilerConfig);
   };
 
   if (transpileOnlyModernLibs) {
@@ -32,13 +31,13 @@ export default (configManager: ConfigManager) => (config: Config) => {
       .rule('js:project')
       .exclude.add(/node_modules/)
       .end()
-      .batch(jsRule(transpilerConfig));
+      .batch(jsRule(getTranspilerConfig(configManager)));
 
     config.module
       .rule('js:node_modules')
       .include.add(modernLibsFilter)
       .end()
-      .batch(jsRule({ ...transpilerConfig, hot: false }))
+      .batch(jsRule(getTranspilerConfig(configManager, { hot: false })))
       .merge({
         // TODO: некоторые пакеты неправильно описывают импорты для es модулей
         // https://github.com/babel/babel/issues/12058
@@ -49,13 +48,13 @@ export default (configManager: ConfigManager) => (config: Config) => {
       .rule('js:project')
       .exclude.add(/node_modules/)
       .end()
-      .batch(jsRule(transpilerConfig));
+      .batch(jsRule(getTranspilerConfig(configManager)));
 
     config.module
       .rule('js:node_modules')
       .include.add(/node_modules/)
       .end()
-      .batch(jsRule({ ...transpilerConfig, hot: false }))
+      .batch(jsRule(getTranspilerConfig(configManager, { hot: false })))
       .merge({
         // TODO: некоторые пакеты неправильно описывают импорты для es модулей
         // https://github.com/babel/babel/issues/12058

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

@@ -1,5 +1,7 @@
 import type Config from 'webpack-chain';
 import path from 'path';
+import { existsSync } from 'fs';
+import { TsconfigPathsPlugin } from 'tsconfig-paths-webpack-plugin';
 import type { ConfigManager } from '../../../config/configManager';
 import { extensions } from '../../../config/constants';
 
@@ -15,6 +17,19 @@ export default (configManager: ConfigManager) => (config: Config) => {
     ].filter(Boolean)
   );
 
+  const tsconfigPath = path.resolve(rootDir, 'tsconfig.json');
+
+  if (existsSync(tsconfigPath)) {
+    config.resolve.plugin('tsconfig-paths').use(TsconfigPathsPlugin, [
+      {
+        configFile: tsconfigPath,
+        extensions,
+        mainFields: config.resolve.mainFields.values(),
+        silent: true,
+      },
+    ] as ConstructorParameters<typeof TsconfigPathsPlugin>);
+  }
+
   config.resolve.extensions
     .merge(extensions)
     .end()

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

@@ -1,10 +1,10 @@
 import type Config from 'webpack-chain';
-import { createWorkerPoolBabel } from '../utils/workersPool';
+import { createWorkerPoolTranspiler } from '../utils/workersPool';
 import type { ConfigManager } from '../../../config/configManager';
 import { addTranspilerLoader, getTranspilerConfig } from '../utils/transpiler';
 
 export default (configManager: ConfigManager) => (config: Config) => {
-  const transpilerConfig = { ...getTranspilerConfig(configManager), typescript: true };
+  const transpilerConfig = getTranspilerConfig(configManager, { typescript: true });
 
   const cfg = config.module
     .rule('ts:project')
@@ -14,7 +14,11 @@ export default (configManager: ConfigManager) => (config: Config) => {
     .oneOf('default')
     // TODO разобраться почему на винде все плохо с thread-loader
     .when(process.platform !== 'win32', (cfg) =>
-      cfg.use('thread').loader('thread-loader').options(createWorkerPoolBabel(configManager)).end()
+      cfg
+        .use('thread')
+        .loader('thread-loader')
+        .options(createWorkerPoolTranspiler(configManager))
+        .end()
     )
     .use('transpiler');