@tramvai/cli 5.49.1 → 6.59.0

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

@@ -9,7 +9,6 @@ import {
   GET_BUILD_STATS_TOKEN,
   INIT_HANDLER_TOKEN,
   WEBPACK_CLIENT_COMPILER_TOKEN,
-  WEBPACK_CLIENT_MODERN_COMPILER_TOKEN,
   WEBPACK_SERVER_COMPILER_TOKEN,
 } from '../tokens';
 import { calculateBuildTime } from '../utils/calculateBuildTime';
@@ -19,7 +18,7 @@ import { maxMemoryRss } from '../utils/maxMemoryRss';
 export const sharedProviders: Provider[] = [
   provide({
     provide: GET_BUILD_STATS_TOKEN,
-    useFactory: ({ withBuildStats, clientCompiler, clientModernCompiler, serverCompiler }) => {
+    useFactory: ({ withBuildStats, clientCompiler, serverCompiler }) => {
       if (!withBuildStats) {
         return () => {
           return {};
@@ -27,14 +26,12 @@ export const sharedProviders: Provider[] = [
       }
 
       const getClientTime = clientCompiler && calculateBuildTime(clientCompiler);
-      const getClientModernTime = clientModernCompiler && calculateBuildTime(clientModernCompiler);
       const getServerTime = serverCompiler && calculateBuildTime(serverCompiler);
 
       const getMaxMemoryRss = maxMemoryRss();
       return () => {
         return {
           clientBuildTime: getClientTime?.(),
-          clientModernBuildTime: getClientModernTime?.(),
           serverBuildTime: getServerTime?.(),
           maxMemoryRss: getMaxMemoryRss?.(),
         };
@@ -43,7 +40,6 @@ export const sharedProviders: Provider[] = [
     deps: {
       withBuildStats: { token: WITH_BUILD_STATS_TOKEN, optional: true },
       clientCompiler: { token: WEBPACK_CLIENT_COMPILER_TOKEN, optional: true },
-      clientModernCompiler: { token: WEBPACK_CLIENT_MODERN_COMPILER_TOKEN, optional: true },
       serverCompiler: { token: WEBPACK_SERVER_COMPILER_TOKEN, optional: true },
     },
   }),
@@ -54,18 +50,15 @@ export const sharedProviders: Provider[] = [
   provide({
     provide: INIT_HANDLER_TOKEN,
     multi: true,
-    useFactory: ({ eventEmitter, clientCompiler, clientModernCompiler, serverCompiler }) => {
+    useFactory: ({ eventEmitter, clientCompiler, serverCompiler }) => {
       return () => {
         clientCompiler && emitWebpackEvents(clientCompiler, eventEmitter, 'client');
-        clientModernCompiler &&
-          emitWebpackEvents(clientModernCompiler, eventEmitter, 'clientModern');
         serverCompiler && emitWebpackEvents(serverCompiler, eventEmitter, 'server');
       };
     },
     deps: {
       eventEmitter: EVENT_EMITTER_TOKEN,
       clientCompiler: { token: WEBPACK_CLIENT_COMPILER_TOKEN, optional: true },
-      clientModernCompiler: { token: WEBPACK_CLIENT_MODERN_COMPILER_TOKEN, optional: true },
       serverCompiler: { token: WEBPACK_SERVER_COMPILER_TOKEN, optional: true },
     },
   }),

package/src/builder/webpack/tokens.ts

@@ -10,17 +10,11 @@ import type { CliConfigEntry } from '../../typings/configEntry/cli';
 export const CLIENT_CONFIG_MANAGER_TOKEN = createToken<ConfigManager<CliConfigEntry>>(
   'builder-webpack clientConfigManager'
 );
-export const CLIENT_MODERN_CONFIG_MANAGER_TOKEN = createToken<ConfigManager<CliConfigEntry>>(
-  'builder-webpack clientModernConfigManager'
-);
 export const SERVER_CONFIG_MANAGER_TOKEN = createToken<ConfigManager<CliConfigEntry>>(
   'builder-webpack serverConfigManager'
 );
 export const WEBPACK_CLIENT_CONFIG_TOKEN = createToken<Config>('builder-webpack clientConfig');
 
-export const WEBPACK_CLIENT_MODERN_CONFIG_TOKEN = createToken<Config>(
-  'builder-webpack clientModernConfig'
-);
 export const WEBPACK_SERVER_CONFIG_TOKEN = createToken<Config>('builder-webpack serverConfig');
 
 export const WEBPACK_COMPILER_TOKEN = createToken<MultiCompiler>('builder-webpack webpackCompiler');
@@ -29,9 +23,6 @@ export const WEBPACK_CLIENT_COMPILER_TOKEN = createToken<Compiler>(
   'builder-webpack webpackClientCompiler'
 );
 
-export const WEBPACK_CLIENT_MODERN_COMPILER_TOKEN = createToken<Compiler>(
-  'builder-webpack webpackClientModernCompiler'
-);
 export const WEBPACK_SERVER_COMPILER_TOKEN = createToken<Compiler>(
   'builder-webpack webpackServerCompiler'
 );

package/src/builder/webpack/utils/copyStatsJsonFile.ts

@@ -8,7 +8,6 @@ export const copyStatsJsonFileToServerDirectory = async (
   clientConfigManager: ConfigManager<ApplicationConfigEntry>
 ) => {
   const STATS_JSON_FILE_NAME = 'stats.json';
-  const STATS_JSON_FILE_NAME_MODERN = 'stats.modern.json';
 
   const statsJsonFileDirectoryPath = clientConfigManager.output.client;
 
@@ -18,14 +17,7 @@ export const copyStatsJsonFileToServerDirectory = async (
     STATS_JSON_FILE_NAME
   );
 
-  const statsJsonFilePathModern = path.resolve(
-    clientConfigManager.rootDir,
-    statsJsonFileDirectoryPath,
-    STATS_JSON_FILE_NAME_MODERN
-  );
-
   const isExistStatsJsonFilePath = fs.existsSync(statsJsonFilePath);
-  const isExistStatsJsonFilePathModern = fs.existsSync(statsJsonFilePathModern);
 
   // TODO: Необходимо вынести все локальные константы обозначающие тип сборки
   // ('client' | 'server' | 'all') в отдельный enum и переиспользовать по всему коду @tramvai/cli
@@ -41,13 +33,4 @@ export const copyStatsJsonFileToServerDirectory = async (
       fileName: STATS_JSON_FILE_NAME,
     });
   }
-
-  if (isExistStatsJsonFilePathModern && clientConfigManager.modern) {
-    await copyBuildFile({
-      config: clientConfigManager,
-      inputPath: statsJsonFileDirectoryPath,
-      fromType: FROM_BUILD_DIRECTORY_TYPE,
-      fileName: STATS_JSON_FILE_NAME_MODERN,
-    });
-  }
 };

package/src/cli/CLI.ts

@@ -1,11 +1,11 @@
 import type { PackageManager } from '@tinkoff/package-manager-wrapper';
+import { AnalyticsService } from '@tramvai/api/lib/services/analytics';
 import { commander } from '../ui/commander';
 import { Context } from '../models/context';
 import type { Command, CommandMap, CommandResult } from '../models/command';
 import type { Logger } from '../models/logger';
 import type { Task, TaskMap } from '../models/task';
 import type { ConfigManager } from '../models/config';
-import type { Analytics } from '../models/analytics';
 
 export class CLI {
   context: Context;
@@ -47,16 +47,18 @@ export class CLI {
     tasksMap: TaskMap,
     logger: Logger,
     config: ConfigManager,
-    analytics: Analytics,
     cliRootDir: string,
-    cliPackageManager: PackageManager
+    cliPackageManager: PackageManager,
+    packageManager: PackageManager,
+    analytics: AnalyticsService
   ) {
     this.context = new Context(
       config,
       logger,
-      analytics,
       cliRootDir,
       cliPackageManager,
+      packageManager,
+      analytics,
       this.runTask,
       this.runCommand,
       this.getTasks,

package/src/cli/bin-init.ts

@@ -1,9 +1,7 @@
 import resolve from 'resolve';
 import { clearExecArgv } from '../utils/clearExecArgv';
-import { initSentry } from '../utils/sentry';
 
 clearExecArgv();
-initSentry();
 
 resolve(
   '@tramvai/cli/lib/cli',

package/src/cli/index.ts

@@ -1,10 +1,12 @@
 import path from 'path';
 import { resolvePackageManager, NpmPackageManager } from '@tinkoff/package-manager-wrapper';
+import {
+  AnalyticsService,
+  resolveDependenciesProperties,
+} from '@tramvai/api/lib/services/analytics';
 import { CLI } from './CLI';
-import { Analytics } from '../models/analytics';
 import { Logger } from '../models/logger';
 import { ConfigManager } from '../models/config';
-import { initSentry } from '../utils/sentry';
 
 import type { CommandMap } from '../models/command';
 
@@ -53,14 +55,9 @@ const defaultPackageInfo = { name: 'init app', version: '0.0.1' };
 
 export async function cliInitialized(cliArgs = process.argv) {
   const logger = new Logger();
-  const sentry = initSentry();
+  let analytics: AnalyticsService;
 
   try {
-    const commandContext = {
-      command: cliArgs[2] || '',
-      argv: cliArgs,
-    };
-    sentry.setContext('command', commandContext);
     const commandsMap = await loadCommands();
     const tasksMap = await loadTasks();
 
@@ -70,41 +67,62 @@ export async function cliInitialized(cliArgs = process.argv) {
     }>('package.json');
     const { content: config } = getTramvaiConfig();
 
-    const analytic = new Analytics({
-      packageInfo,
-      trackingCode: 'UA-122261674-1',
-      enabled: process.env.TRAMVAI_ENABLE_ANALYTICS === 'true',
+    const configManager = new ConfigManager({ config, syncConfigFile: syncJsonFile });
+    const packageManager = resolvePackageManager({ rootDir: process.cwd() });
+
+    analytics = new AnalyticsService({
+      logger,
+      packageManager,
+      enabled: configManager.config?.analytics?.enabled,
+      endpoint: configManager.config?.analytics?.endpoint,
+      system: configManager.config?.analytics?.system,
     });
 
-    const configManager = new ConfigManager({ config, syncConfigFile: syncJsonFile });
+    await analytics.init();
 
     const cliRootDir = path.resolve(__dirname, '../', '../');
     const cliPackageManager = new NpmPackageManager({
       rootDir: cliRootDir,
     });
 
+    await analytics.send({
+      event: 'cli:init',
+      message: '@tramvai/cli initialized',
+      level: 'INFO',
+      arguments: cliArgs.slice(2),
+      uptime: performance.now(),
+      dependencies: resolveDependenciesProperties(),
+    });
+
     const cliInstance = new CLI(
       commandsMap,
       tasksMap,
       logger,
       configManager,
-      analytic,
       cliRootDir,
-      cliPackageManager
+      cliPackageManager,
+      packageManager,
+      analytics
     );
 
     return await cliInstance.run(cliArgs);
   } catch (e: any) {
+    await analytics?.send({
+      event: 'cli:error',
+      message: '@tramvai/cli run failed',
+      level: 'ERROR',
+      arguments: cliArgs.slice(2),
+      error: e,
+      uptime: performance.now(),
+    });
+
     logger.event({
       type: 'error',
       event: 'GLOBAL:ERROR',
       message: e.message || e,
       payload: e.details || e.stack,
     });
-    sentry.captureException(e);
 
     throw e;
-  } finally {
-    await sentry.close();
   }
 }

package/src/cli/runCLI.ts

@@ -1,8 +1,11 @@
 import exit from 'exit';
-
 import { fixYarnSettingsOverride } from '../utils/fixYarnSettingsOverride';
 import { handleErrors } from '../utils/handleErrors';
-import { enableCpuProfile } from '../utils/cpu-profile';
+
+declare global {
+  // eslint-disable-next-line no-var, vars-on-top
+  var __TRAMVAI_EXIT_HANDLERS__: Array<() => Promise<any>>;
+}
 
 // to use V8's code cache to speed up instantiation time
 // eslint-disable-next-line @typescript-eslint/no-unused-expressions
@@ -12,17 +15,34 @@ handleErrors();
 fixYarnSettingsOverride();
 
 if (process.env.TRAMVAI_CPU_PROFILE) {
+  const { enableCpuProfile } = require('../utils/cpu-profile');
   enableCpuProfile('tramvai-cli');
 }
 
 export default (pathCli: string) => {
   const cli = require(pathCli).cliInitialized;
 
+  async function runExitHandlersAndQuit(code: number) {
+    if (global.__TRAMVAI_EXIT_HANDLERS__) {
+      const handlers = [...global.__TRAMVAI_EXIT_HANDLERS__];
+      const promise = Promise.allSettled(handlers.map((handler) => handler()));
+
+      // prevent multiple calls to exit handlers, wait the same handlers if they are already running
+      global.__TRAMVAI_EXIT_HANDLERS__ = [() => promise];
+
+      await promise;
+    }
+    exit(code);
+  }
+
+  process.on('SIGINT', async () => runExitHandlersAndQuit(0));
+  process.on('SIGTERM', async () => runExitHandlersAndQuit(0));
+
   return cli()
-    .then(() => {
-      exit(0);
+    .then(async () => {
+      await runExitHandlersAndQuit(0);
     })
-    .catch(() => {
-      exit(1);
+    .catch(async () => {
+      await runExitHandlersAndQuit(1);
     });
 };

package/src/commands/add/command.ts

@@ -1,5 +1,4 @@
 import { CLICommand } from '../../models/command';
-import { checkPackage } from './checkPackageValidator';
 import type { Params } from './add';
 
 class AddCommand extends CLICommand {
@@ -23,7 +22,9 @@ class AddCommand extends CLICommand {
 
   alias = '';
 
-  validators = [checkPackage];
+  validators() {
+    return [require('./checkPackageValidator').checkPackage];
+  }
 
   async action(parameters: Params) {
     // used require for lazy code execution

package/src/commands/analyze/command.ts

@@ -1,10 +1,4 @@
 import { CLICommand } from '../../models/command';
-import { checkApplication } from '../../validators/commands/checkBuild';
-import { checkConfigExists } from '../../validators/commands/checkConfigExists';
-import { checkPwaDependencies } from '../../validators/commands/checkPwaDependencies';
-import { runMigrationsAndCheckVersions } from '../../validators/commands/runMigrationsAndCheckVersions';
-import { checkSwcDependencies } from '../../validators/commands/checkSwcDependencies';
-import { checkReactCompilerDependencies } from '../../validators/commands/checkReactCompilerDependencies';
 
 export type Params = {
   target: string;
@@ -46,14 +40,18 @@ class AnalyzeCommand extends CLICommand<Params> {
 
   alias = 'a';
 
-  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/benchmark/command.ts

@@ -1,8 +1,4 @@
 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 { Params as StartParams } from '../start/command';
 
 export type Params = StartParams & {
@@ -45,12 +41,15 @@ export class BenchmarkCommand extends CLICommand<Params> {
 
   alias = 'bench';
 
-  validators = [
-    checkConfigExists,
-    checkApplication,
-    runMigrationsAndCheckVersions,
-    checkDependencies,
-  ];
+  validators() {
+    return [
+      require('../../validators/commands/checkConfigExists').checkConfigExists,
+      require('../../validators/commands/checkBuild').checkApplication,
+      require('../../validators/commands/runMigrationsAndCheckVersions')
+        .runMigrationsAndCheckVersions,
+      require('../../validators/commands/checkDependencies').checkDependencies,
+    ];
+  }
 
   action(parameters) {
     // used require for lazy code execution

package/src/commands/build/build.ts

@@ -5,6 +5,8 @@ import { app } from '../index';
 export default async (context: Context, parameters): Promise<CommandResult> => {
   await app.run('build', parameters);
 
+  // todo builder.getBuildStats and send analytics event "cli:command:build:stats"
+
   return Promise.resolve({
     status: 'ok',
   });

package/src/commands/build/command.ts

@@ -1,12 +1,6 @@
 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] & {
   target: string;
@@ -59,17 +53,6 @@ class BuildCommand extends CLICommand<Params> {
       transformer: (value: string) => value !== 'false',
       description: 'Enable/disable persistent file cache for used cli builder',
     },
-    {
-      name: '--modern',
-      value: '[modern]',
-      description: 'modern compilation code with es2015+',
-    },
-    {
-      name: '--onlyModern',
-      value: '[onlyModern]',
-      transformer: (value: string) => value !== 'false',
-      description: 'Emit only modern build from client compilation',
-    },
     {
       name: '--verboseWebpack',
       value: '[verboseWebpack]',
@@ -79,19 +62,65 @@ 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();
+
+    await this.context.analytics.send({
+      event: 'cli:command:start',
+      message: '@tramvai/cli production build started',
+      level: 'INFO',
+      command: 'build',
+      parameters,
+      project: getProjectProperties({ parameters, configManager: this.context.config }),
+      features: getFeaturesProperties({ parameters, configManager: this.context.config }),
+    });
 
-  action(parameters: Params) {
     // used require for lazy code execution
-    return require('./build').default(this.context, parameters);
+    return require('./build')
+      .default(this.context, parameters)
+      .then(async (result) => {
+        await this.context.analytics.send({
+          event: 'cli:command:end',
+          message: '@tramvai/cli production build finished',
+          level: 'INFO',
+          command: 'build',
+          parameters,
+          duration: Date.now() - start,
+          project: getProjectProperties({ parameters, configManager: this.context.config }),
+          memoryUsage: this.context.analytics.memoryMonitor.read(),
+        });
+
+        return result;
+      })
+      .catch(async (error) => {
+        await this.context.analytics.send({
+          event: 'cli:command:error',
+          message: '@tramvai/cli production build failed',
+          level: 'ERROR',
+          command: 'build',
+          parameters,
+          duration: Date.now() - start,
+          error,
+          project: getProjectProperties({ parameters, configManager: this.context.config }),
+          memoryUsage: this.context.analytics.memoryMonitor.read(),
+        });
+
+        throw error;
+      });
   }
 }
 

package/src/commands/createApp.ts

@@ -2,7 +2,6 @@ import type { Provider } from '@tinkoff/dippy';
 import { createChildContainer } from '@tinkoff/dippy';
 import { initRootContainer } from '../di/root';
 import {
-  analyticsProviders,
   builderProviders,
   commandsProviders,
   configProviders,
@@ -20,7 +19,6 @@ export const createApp = ({
   providers: Provider[];
 }): typeof COMMAND_RUNNER_TOKEN => {
   const rootContainer = initRootContainer([
-    ...analyticsProviders,
     ...stdProviders,
     ...configProviders,
     ...commandsProviders,

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);