@tramvai/cli 5.53.80 → 6.62.0

package/src/commands/build/command.ts

@@ -1,12 +1,5 @@
 import { CLICommand } from '../../models/command';
-import { checkApplication } from '../../validators/commands/checkBuild';
-import { checkConfigExists } from '../../validators/commands/checkConfigExists';
-import { checkDependencies } from '../../validators/commands/checkDependencies';
-import { runMigrationsAndCheckVersions } from '../../validators/commands/runMigrationsAndCheckVersions';
 import type { BuildCommand as BuildCommandType } from '../../api/build';
-import { checkPwaDependencies } from '../../validators/commands/checkPwaDependencies';
-import { checkSwcDependencies } from '../../validators/commands/checkSwcDependencies';
-import { checkReactCompilerDependencies } from '../../validators/commands/checkReactCompilerDependencies';
 import { getFeaturesProperties, getProjectProperties } from '../../models/analytics/utils';
 
 export type Params = Parameters<BuildCommandType>[0] & {
@@ -69,15 +62,19 @@ class BuildCommand extends CLICommand<Params> {
 
   alias = 'b';
 
-  validators = [
-    checkConfigExists,
-    checkApplication,
-    runMigrationsAndCheckVersions,
-    checkDependencies,
-    checkPwaDependencies,
-    checkSwcDependencies,
-    checkReactCompilerDependencies,
-  ];
+  validators() {
+    return [
+      require('../../validators/commands/checkConfigExists').checkConfigExists,
+      require('../../validators/commands/checkBuild').checkApplication,
+      require('../../validators/commands/runMigrationsAndCheckVersions')
+        .runMigrationsAndCheckVersions,
+      require('../../validators/commands/checkDependencies').checkDependencies,
+      require('../../validators/commands/checkPwaDependencies').checkPwaDependencies,
+      require('../../validators/commands/checkSwcDependencies').checkSwcDependencies,
+      require('../../validators/commands/checkReactCompilerDependencies')
+        .checkReactCompilerDependencies,
+    ];
+  }
 
   async action(parameters: Params) {
     const start = Date.now();

package/src/commands/generate/command.ts

@@ -1,5 +1,4 @@
 import { CLICommand } from '../../models/command';
-import { checkConfigExists } from '../../validators/commands/checkConfigExists';
 
 export type GeneratorName = 'action' | 'reducer' | 'component' | 'page' | 'bundle' | 'module';
 export type Params = {
@@ -21,7 +20,9 @@ class GenerateCommand extends CLICommand<Params> {
 
   alias = 'g';
 
-  validators = [checkConfigExists];
+  validators() {
+    return [require('../../validators/commands/checkConfigExists').checkConfigExists];
+  }
 
   action(parameters: Params) {
     // used require for lazy code execution

package/src/commands/lint/command.ts

@@ -1,5 +1,4 @@
 import { CLICommand } from '../../models/command';
-import { checkApplication } from '../../validators/commands/checkBuild';
 
 class LintCommand extends CLICommand {
   name = 'lint';
@@ -12,7 +11,9 @@ class LintCommand extends CLICommand {
 
   alias = 'l';
 
-  validators = [checkApplication];
+  validators() {
+    return [require('../../validators/commands/checkBuild').checkApplication];
+  }
 
   action() {
     return Promise.resolve({

package/src/commands/new/command.ts

@@ -33,8 +33,6 @@ class NewCommand extends CLICommand<Params> {
 
   alias = 'n';
 
-  validators = [];
-
   action(parameters: Params) {
     // used require for lazy code execution
     return require('./new').default(this.context, parameters);

package/src/commands/new/steps/installDependencies.ts

@@ -62,7 +62,7 @@ const devDependencies = [
   'postcss-nested',
   'husky@^4',
   'lint-staged',
-  'prettier-config-tinkoff',
+  '@tramvai/prettier-config',
   'typescript',
 ];
 
@@ -126,7 +126,7 @@ export async function installDependencies({
 
   // Install cli and core packages into the root of repository if using workspaces for update command to work correctly
   if (workspace !== undefined) {
-    console.log(`${chalk.blue('[DEPENDENCIES]')} Installing root dependencies`);
+    console.log(`${chalk.blue('[DEPENDENCIES]')} Installing root dev dependencies`);
 
     await packageManager.install({
       packageNames: deps(type, { isDev: true, isRoot: true }),
@@ -135,7 +135,7 @@ export async function installDependencies({
       workspace: undefined,
     });
 
-    console.log(`${chalk.blue('[DEPENDENCIES]')} Installing root dev dependencies`);
+    console.log(`${chalk.blue('[DEPENDENCIES]')} Installing root dependencies`);
 
     await packageManager.install({
       packageNames: deps(type, { isDev: false, isRoot: true }),

package/src/commands/new/templates/shared/_prettierrc.js.hbs

@@ -1 +1 @@
-module.exports = require('prettier-config-tinkoff');
+module.exports = require('@tramvai/prettier-config');

package/src/commands/start/command.ts

@@ -1,12 +1,5 @@
 import { CLICommand } from '../../models/command';
-import { checkApplication } from '../../validators/commands/checkBuild';
-import { checkConfigExists } from '../../validators/commands/checkConfigExists';
-import { checkDependencies } from '../../validators/commands/checkDependencies';
-import { runMigrationsAndCheckVersions } from '../../validators/commands/runMigrationsAndCheckVersions';
 import type { StartCommand as StartCommandType } from '../../api/start';
-import { checkPwaDependencies } from '../../validators/commands/checkPwaDependencies';
-import { checkSwcDependencies } from '../../validators/commands/checkSwcDependencies';
-import { checkReactCompilerDependencies } from '../../validators/commands/checkReactCompilerDependencies';
 import { getFeaturesProperties, getProjectProperties } from '../../models/analytics/utils';
 
 export type Params = Parameters<StartCommandType>[0] & {
@@ -124,19 +117,30 @@ export class StartCommand extends CLICommand<Params> {
       value: '[httpsCert]',
       description: 'Path to https certificate',
     },
+    {
+      name: '--experimentalWebpackWorkerThreads',
+      value: '[experimentalWebpackWorkerThreads]',
+      transformer: (value: string) => value !== 'false',
+      description:
+        'Enable new experimental @tramvai/api builder to run webpack compilation in worker threads',
+    },
   ];
 
   alias = 's';
 
-  validators = [
-    checkConfigExists,
-    checkApplication,
-    runMigrationsAndCheckVersions,
-    checkDependencies,
-    checkPwaDependencies,
-    checkSwcDependencies,
-    checkReactCompilerDependencies,
-  ];
+  validators() {
+    return [
+      require('../../validators/commands/checkConfigExists').checkConfigExists,
+      require('../../validators/commands/checkBuild').checkApplication,
+      require('../../validators/commands/runMigrationsAndCheckVersions')
+        .runMigrationsAndCheckVersions,
+      require('../../validators/commands/checkDependencies').checkDependencies,
+      require('../../validators/commands/checkPwaDependencies').checkPwaDependencies,
+      require('../../validators/commands/checkSwcDependencies').checkSwcDependencies,
+      require('../../validators/commands/checkReactCompilerDependencies')
+        .checkReactCompilerDependencies,
+    ];
+  }
 
   async action(parameters) {
     const start = Date.now();

package/src/commands/start-prod/command.ts

@@ -1,10 +1,4 @@
 import { CLICommand } from '../../models/command';
-import { checkConfigExists } from '../../validators/commands/checkConfigExists';
-import { checkApplication } from '../../validators/commands/checkBuild';
-import { runMigrationsAndCheckVersions } from '../../validators/commands/runMigrationsAndCheckVersions';
-import { checkPwaDependencies } from '../../validators/commands/checkPwaDependencies';
-import { checkSwcDependencies } from '../../validators/commands/checkSwcDependencies';
-import { checkReactCompilerDependencies } from '../../validators/commands/checkReactCompilerDependencies';
 
 export interface Params {
   target: string;
@@ -106,14 +100,18 @@ export class StartProdCommand extends CLICommand<Params> {
 
   alias = 'sp';
 
-  validators = [
-    checkConfigExists,
-    checkApplication,
-    runMigrationsAndCheckVersions,
-    checkPwaDependencies,
-    checkSwcDependencies,
-    checkReactCompilerDependencies,
-  ];
+  validators() {
+    return [
+      require('../../validators/commands/checkConfigExists').checkConfigExists,
+      require('../../validators/commands/checkBuild').checkApplication,
+      require('../../validators/commands/runMigrationsAndCheckVersions')
+        .runMigrationsAndCheckVersions,
+      require('../../validators/commands/checkPwaDependencies').checkPwaDependencies,
+      require('../../validators/commands/checkSwcDependencies').checkSwcDependencies,
+      require('../../validators/commands/checkReactCompilerDependencies')
+        .checkReactCompilerDependencies,
+    ];
+  }
 
   action(parameters: Params) {
     // used require for lazy code execution

package/src/commands/static/command.ts

@@ -1,6 +1,4 @@
 import { CLICommand } from '../../models/command';
-import { checkApplication } from '../../validators/commands/checkBuild';
-import { runMigrationsAndCheckVersions } from '../../validators/commands/runMigrationsAndCheckVersions';
 
 export type Params = {
   target: string;
@@ -67,7 +65,13 @@ export class StaticCommand extends CLICommand<Params> {
 
   alias = 'st';
 
-  validators = [checkApplication, runMigrationsAndCheckVersions];
+  validators() {
+    return [
+      require('../../validators/commands/checkBuild').checkApplication,
+      require('../../validators/commands/runMigrationsAndCheckVersions')
+        .runMigrationsAndCheckVersions,
+    ];
+  }
 
   action(parameters: Params) {
     // used require for lazy code execution

package/src/commands/update/command.ts

@@ -1,5 +1,4 @@
 import { CLICommand } from '../../models/command';
-import { checkVersion } from './checkVersionValidator';
 import type { Params } from './update';
 
 class UpdateCommand extends CLICommand {
@@ -22,7 +21,9 @@ class UpdateCommand extends CLICommand {
 
   alias = 'u';
 
-  validators = [checkVersion];
+  validators() {
+    return [require('./checkVersionValidator').checkVersion];
+  }
 
   async action(parameters: Params) {
     // used require for lazy code execution

package/src/external/config.ts

@@ -1,3 +1,4 @@
+// This configuration is virtual and generated in packages/cli/src/library/webpack/blocks/configResolve.ts
 import type { ConfigManager } from '../config/configManager';
 import type { ApplicationConfigEntry } from '../typings/configEntry/application';
 import type { ModuleConfigEntry } from '../typings/configEntry/module';

package/src/library/babel/index.ts

@@ -1,161 +1,4 @@
-import path from 'path';
-import { sync as resolve } from 'resolve';
-import type { TransformOptions } from '@babel/core';
+import { configFactory } from '@tramvai/plugin-babel-transpiler/lib/config-factory';
 
-import { getReactCompilerPlugin } from './plugins/react-compiler';
-import type { TranspilerConfig } from '../webpack/utils/transpiler';
-
-const envConfig = {
-  production: {
-    plugins: [
-      '@babel/plugin-transform-react-constant-elements',
-      [
-        'transform-react-remove-prop-types',
-        {
-          removeImport: true,
-        },
-      ],
-    ],
-  },
-};
-
-function hasJsxRuntime() {
-  try {
-    resolve('react/jsx-runtime', { basedir: process.cwd() });
-    return true;
-  } catch (e) {
-    return false;
-  }
-}
-
-// eslint-disable-next-line complexity
-export const babelConfigFactory = ({
-  env = 'development',
-  isServer = false,
-  modules = false,
-  actualTarget,
-  generateDataQaTag = true,
-  enableFillActionNamePlugin = false,
-  enableFillDeclareActionNamePlugin = false,
-  // for testing only!
-  // @ts-expect-error
-  markCreateTokenAsPure = true,
-  typescript = false,
-  loader = true,
-  removeTypeofWindow,
-  tramvai = false,
-  hot = false,
-  excludesPresetEnv,
-  browsersListTargets,
-  reactCompiler = false,
-  loose = true,
-  externalHelpers = true,
-}: Partial<TranspilerConfig>) => {
-  const cfg = envConfig[env] || {};
-
-  const babelConfig: Record<string, any> = {
-    // по умолчанию sourceType: 'module' и тогда бабель рассматривает все файлы как es-модули, что может
-    // вызвать проблемы в некоторых случаях когда бабель обрабатывает уже скомпиленный в commonjs файл
-    // как модуль добавляя в него es-импорты и вводя этим вебпак в ступор на счет типа файла
-    // unambiguos - режим когда бабель попытается предугадать тип компилируемого файла и уже на этой
-    // основе добавлять соответствующие импорты
-    sourceType: 'unambiguous' as const,
-
-    // Это необходимо для того, чтобы деструктуризация array-like сущностей, например, Set
-    // не приводила к невалидному коду при сборке для старых браузеров:
-    // [...new Set()] => [].concat(new Set())
-    // https://babeljs.io/docs/assumptions#arraylikeisiterable
-    assumptions: {
-      arrayLikeIsIterable: true,
-      iterableIsArray: false,
-    },
-
-    presets: [
-      [
-        '@babel/preset-env',
-        {
-          modules,
-          useBuiltIns: 'entry',
-          // from core-js version depends on what polyfills will be included with `useBuiltIns: 'entry'` option
-          // this logic is here - https://github.com/zloirock/core-js/blob/master/packages/core-js-compat/src/modules-by-versions.mjs
-          corejs: require('core-js/package.json').version,
-          // TODO: will be deprecated in babel@8 - https://babeljs.io/docs/babel-preset-env#loose
-          loose,
-          targets: browsersListTargets,
-          browserslistEnv: actualTarget,
-          bugfixes: true,
-          exclude: excludesPresetEnv,
-        },
-      ],
-      [
-        '@babel/preset-react',
-        {
-          runtime: hasJsxRuntime() ? 'automatic' : 'classic',
-          useSpread: true,
-          development: env === 'development',
-        },
-      ],
-      typescript && '@babel/preset-typescript',
-    ]
-      .concat(cfg.presets || [])
-      .filter(Boolean) as TransformOptions['presets'],
-
-    plugins: [
-      // React compiler must be the first plugin in the chain
-      getReactCompilerPlugin({ isServer, options: reactCompiler }),
-      // TODO: useESModules is deprecated and should work automatically - https://babeljs.io/docs/en/babel-plugin-transform-runtime#useesmodules
-      externalHelpers && [
-        '@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'),
-      enableFillDeclareActionNamePlugin &&
-        path.resolve(__dirname, './plugins/fill-declare-action-name'),
-      generateDataQaTag && path.resolve(__dirname, './plugins/react-element-info-unique'), // Собственный плагин. Необходимо удалить в будущем
-      enableFillActionNamePlugin && path.resolve(__dirname, './plugins/fill-action-name'), // Собственный плагин. Необходимо удалить в будущем
-      markCreateTokenAsPure && path.resolve(__dirname, './plugins/create-token-pure'),
-      '@tinkoff/babel-plugin-lodash/cjs',
-      isServer && 'babel-plugin-dynamic-import-node',
-      [
-        '@babel/plugin-proposal-decorators',
-        {
-          legacy: true,
-        },
-      ],
-      '@babel/plugin-proposal-export-default-from',
-      removeTypeofWindow && [
-        'transform-define',
-        {
-          'typeof window': isServer ? 'undefined' : 'object',
-        },
-      ],
-      tramvai && env === 'development' && path.resolve(__dirname, './plugins/provider-stack'),
-      !isServer &&
-        env === 'development' &&
-        hot && ['react-refresh/babel', { skipEnvCheck: process.env.NODE_ENV === 'test' }],
-    ]
-      .concat(cfg.plugins || [])
-      .filter(Boolean),
-  };
-
-  if (typeof browsersListTargets !== 'undefined') {
-    // to prevent from reading browserslist config for every processed module (sometimes it is not cached in browserslist),
-    // don't know why, but target from preset-env plugin options is ignored from this process
-    babelConfig.targets = browsersListTargets;
-  }
-
-  const loaderConfig = loader
-    ? {
-        cwd: path.resolve(__dirname, '..', '..', '..'),
-        compact: false,
-      }
-    : {};
-
-  return {
-    ...babelConfig,
-    ...loaderConfig,
-  };
-};
-
-export default babelConfigFactory;
+export { configFactory as babelConfigFactory };
+export default configFactory;