@tramvai/cli 2.48.3 → 2.49.2

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

@@ -3,11 +3,31 @@ import { sync as resolve } from 'resolve';
 import type { ConfigManager } from '../../../config/configManager';
 import { getSwcOptions } from '../../swc';
 import babelConfig from '../../babel';
+import type { Env } from '../../../typings/Env';
+import type { Target } from '../../../typings/target';
+
+export type TranspilerConfig = {
+  env: Env;
+  target: Target;
+  modern: boolean;
+  isServer: boolean;
+  generateDataQaTag: boolean;
+  enableFillActionNamePlugin: boolean;
+  typescript: boolean;
+  modules: 'es6' | 'commonjs' | false;
+  loader: boolean;
+  removeTypeofWindow: boolean;
+  alias: Record<string, any>;
+  tramvai: boolean;
+  hot: boolean;
+  excludesPresetEnv: string[];
+  rootDir: string;
+};
 
 export const addTranspilerLoader = (
   configManager: ConfigManager,
   rule: Config.Use,
-  transpilerConfig: Record<string, any>
+  transpilerConfig: TranspilerConfig
 ) => {
   const { loader } = configManager.experiments.transpilation;
 
@@ -28,9 +48,17 @@ Please run "tramvai add --dev @tramvai/swc-integration" to fix the problem
   }
 };
 
-export const getTranspilerConfig = (configManager: ConfigManager) => {
-  const { generateDataQaTag, alias, removeTypeofWindow, enableFillActionNamePlugin } =
-    configManager.build.configurations;
+export const getTranspilerConfig = (
+  configManager: ConfigManager,
+  overrideOptions: Partial<TranspilerConfig> = {}
+): TranspilerConfig => {
+  const {
+    generateDataQaTag,
+    alias,
+    removeTypeofWindow,
+    enableFillActionNamePlugin,
+    excludesPresetEnv,
+  } = configManager.build.configurations;
   const { env, modern } = configManager;
 
   return {
@@ -42,9 +70,13 @@ export const getTranspilerConfig = (configManager: ConfigManager) => {
     tramvai: true,
     removeTypeofWindow,
     hot: configManager.hotRefresh,
-    excludesPresetEnv: configManager.build.configurations.excludesPresetEnv,
+    excludesPresetEnv,
     enableFillActionNamePlugin,
     rootDir: configManager.rootDir,
     target: configManager.target,
+    loader: true,
+    modules: false,
+    typescript: false,
+    ...overrideOptions,
   };
 };

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

@@ -25,35 +25,39 @@ const getCustomConfig = (configManager: ConfigManager) => {
   return additionalConfig || {};
 };
 
-const createBabelConfig = (configManager: ConfigManager) => {
+const createTranspilerConfig = (configManager: ConfigManager) => {
   return {
-    name: 'babel',
+    name: 'transpiler',
     poolTimeout: configManager.env === 'development' ? Infinity : undefined,
     workers: calculateNumberOfWorkers(),
     ...getCustomConfig(configManager),
   };
 };
 
-export const createWorkerPoolBabel = (configManager: ConfigManager) => {
-  const config = createBabelConfig(configManager);
+export const createWorkerPoolTranspiler = (configManager: ConfigManager) => {
+  const config = createTranspilerConfig(configManager);
 
-  if (!(createWorkerPoolBabel as any).warmup) {
-    threadLoader.warmup(config, [
-      'babel-loader',
-      '@babel/preset-env',
-      '@babel/preset-typescript',
-      '@babel/preset-react',
-      '@babel/plugin-transform-runtime',
-      'babel-plugin-lodash',
-    ]);
-    (createWorkerPoolBabel as any).warmup = true;
+  if (!(createWorkerPoolTranspiler as any).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',
+      ]);
+    }
+    (createWorkerPoolTranspiler as any).warmup = true;
   }
 
   return config;
 };
 
-export const closeWorkerPoolBabel = (configManager: ConfigManager) => {
-  getPool(createBabelConfig(configManager))?.disposeWorkers();
+export const closeWorkerPoolTranspiler = (configManager: ConfigManager) => {
+  getPool(createTranspilerConfig(configManager))?.disposeWorkers();
 };
 
 const createStylesConfig = (configManager: ConfigManager) => {

package/src/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/src/schema/tramvai.spec.ts

@@ -166,8 +166,8 @@ describe('JSON schema для tramvai.json', () => {
                     "express",
                     "core-js",
                   ],
-                  "hotRefresh": false,
-                  "modern": false,
+                  "hotRefresh": true,
+                  "modern": true,
                   "sourceMap": false,
                 },
                 "notifications": {},
@@ -234,8 +234,8 @@ describe('JSON schema для tramvai.json', () => {
                       "cacheUnaffected": true,
                     },
                   },
-                  "hotRefresh": false,
-                  "modern": false,
+                  "hotRefresh": true,
+                  "modern": true,
                   "sourceMap": false,
                 },
                 "notifications": {},

package/src/typings/configEntry/common.ts

@@ -78,12 +78,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;
     /**
@@ -198,7 +198,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>;