@tramvai/cli 2.64.0 → 2.66.0

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

@@ -3,6 +3,7 @@ import { provide } from '@tinkoff/dippy';
 import chalk from 'chalk';
 import rimraf from 'rimraf';
 import webpack from 'webpack';
+import type { ConfigManager } from '../../../../api';
 import {
   CLI_PACKAGE_MANAGER,
   CLI_ROOT_DIR_TOKEN,
@@ -78,7 +79,7 @@ export const analyzeSharedProviders: Provider[] = [
     multi: true,
     useFactory: ({ configManager }) => {
       return function clearBuildDir() {
-        return rimraf.sync(`${configManager.getBuildPath()}/**`, {});
+        return rimraf.sync(`${configManager.buildPath}/**`, {});
       };
     },
     deps: {
@@ -90,7 +91,7 @@ export const analyzeSharedProviders: Provider[] = [
     multi: true,
     useFactory: ({ configManager, rootDir, packageManager }) => {
       return async function prepareImageOptimization() {
-        if (configManager.build?.configurations?.imageOptimization?.enabled) {
+        if (configManager.imageOptimization?.enabled) {
           await npmRequire({
             cliRootDir: rootDir,
             packageManager,

package/src/builder/webpack/providers/build/application/server.ts

@@ -1,6 +1,8 @@
 import type { Provider } from '@tinkoff/dippy';
 import { provide } from '@tinkoff/dippy';
+import type { ConfigManager } from '../../../../../config/configManager';
 import { CONFIG_MANAGER_TOKEN } from '../../../../../di/tokens';
+import type { ApplicationConfigEntry } from '../../../../../typings/configEntry/application';
 import { CLOSE_HANDLER_TOKEN } from '../../../tokens';
 import { copyStatsJsonFileToServerDirectory } from '../../../utils/copyStatsJsonFile';
 
@@ -10,7 +12,9 @@ export const buildApplicationServerProviders: Provider[] = [
     multi: true,
     useFactory: ({ configManager }) => {
       return async function copyStatsFiles() {
-        return copyStatsJsonFileToServerDirectory(configManager);
+        return copyStatsJsonFileToServerDirectory(
+          configManager as ConfigManager<ApplicationConfigEntry>
+        );
       };
     },
     deps: {

package/src/builder/webpack/providers/build/client.ts

@@ -47,7 +47,7 @@ export const buildClientProviders: Provider[] = [
     multi: true,
     useFactory: ({ configManager }) => {
       return function clearBuildDir() {
-        return rimraf.sync(`${configManager.getBuildPath()}/**`, {});
+        return rimraf.sync(`${configManager.buildPath}/**`, {});
       };
     },
     deps: {
@@ -59,7 +59,7 @@ export const buildClientProviders: Provider[] = [
     multi: true,
     useFactory: ({ configManager, rootDir, packageManager }) => {
       return async function prepareImageOptimization() {
-        if (configManager.build?.configurations?.imageOptimization?.enabled) {
+        if (configManager.imageOptimization?.enabled) {
           await npmRequire({
             cliRootDir: rootDir,
             packageManager,

package/src/builder/webpack/providers/build/server.ts

@@ -29,7 +29,7 @@ export const buildServerProviders: Provider[] = [
     multi: true,
     useFactory: ({ configManager }) => {
       return function clearBuildDir() {
-        return rimraf.sync(`${configManager.getBuildPath()}/**`, {});
+        return rimraf.sync(`${configManager.buildPath}/**`, {});
       };
     },
     deps: {

package/src/builder/webpack/tokens.ts

@@ -5,14 +5,15 @@ import type { EventEmitter } from 'events';
 import type { ConfigManager } from '../../config/configManager';
 import type { GetBuildStats } from '../../typings/build/Builder';
 import type { AnalyzePlugin } from './types';
+import type { CliConfigEntry } from '../../typings/configEntry/cli';
 
-export const CLIENT_CONFIG_MANAGER_TOKEN = createToken<ConfigManager>(
+export const CLIENT_CONFIG_MANAGER_TOKEN = createToken<ConfigManager<CliConfigEntry>>(
   'builder-webpack clientConfigManager'
 );
-export const CLIENT_MODERN_CONFIG_MANAGER_TOKEN = createToken<ConfigManager>(
+export const CLIENT_MODERN_CONFIG_MANAGER_TOKEN = createToken<ConfigManager<CliConfigEntry>>(
   'builder-webpack clientModernConfigManager'
 );
-export const SERVER_CONFIG_MANAGER_TOKEN = createToken<ConfigManager>(
+export const SERVER_CONFIG_MANAGER_TOKEN = createToken<ConfigManager<CliConfigEntry>>(
   'builder-webpack serverConfigManager'
 );
 export const WEBPACK_CLIENT_CONFIG_TOKEN = createToken<Config>('builder-webpack clientConfig');

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

@@ -1,6 +1,7 @@
 import * as fs from 'fs-extra';
 import path from 'path';
 import type { ConfigManager } from '../../../config/configManager';
+import type { ApplicationConfigEntry } from '../../../typings/configEntry/application';
 
 export function copyBuildFile({
   config,
@@ -8,16 +9,14 @@ export function copyBuildFile({
   fromType,
   fileName,
 }: {
-  config: ConfigManager;
+  config: ConfigManager<ApplicationConfigEntry>;
   fromType: 'client' | 'server';
   inputPath?: string;
   fileName: string;
 }) {
   const inputPathBase =
-    inputPath ||
-    (fromType === 'client' ? config.build.options.outputClient : config.build.options.outputServer);
-  const outputPathBase =
-    fromType === 'client' ? config.build.options.outputServer : config.build.options.outputClient;
+    inputPath || (fromType === 'client' ? config.output.client : config.output.server);
+  const outputPathBase = fromType === 'client' ? config.output.server : config.output.client;
 
   return fs.copy(
     path.resolve(config.rootDir, inputPathBase, fileName),

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

@@ -2,12 +2,15 @@ import fs from 'fs';
 import path from 'path';
 import { copyBuildFile } from './copyBuildFile';
 import type { ConfigManager } from '../../../config/configManager';
+import type { ApplicationConfigEntry } from '../../../typings/configEntry/application';
 
-export const copyStatsJsonFileToServerDirectory = async (clientConfigManager: ConfigManager) => {
+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.build.options.outputClient;
+  const statsJsonFileDirectoryPath = clientConfigManager.output.client;
 
   const statsJsonFilePath = path.resolve(
     clientConfigManager.rootDir,

package/src/cli/CLI.ts

@@ -14,21 +14,21 @@ export class CLI {
 
   commands: Command[];
 
-  runTask = (name, params) => {
+  runTask = (name: string, params: any) => {
     const task = this.tasks.find((item) => item.name === name);
 
     if (!task) {
-      console.error('Не найдена задача: ', name, params);
+      throw new Error(`Task ${name} not found`);
     }
 
     return task.run(params);
   };
 
-  runCommand = (name, params) => {
+  runCommand = (name: string, params: any) => {
     const command = this.commands.find((item) => item.name === name);
 
     if (!command) {
-      console.error('Не найдена команда: ', name, params);
+      throw new Error(`Command ${name} not found`);
     }
 
     return command.run(params);
@@ -69,11 +69,11 @@ export class CLI {
     this.commands = commandsMap.map((CommandItem) => new CommandItem(this.context));
   }
 
-  async run(argv) {
+  async run(argv: any) {
     return this.createCommandLineUI(argv);
   }
 
-  protected createCommandLineUI(argv): Promise<CommandResult> {
+  protected createCommandLineUI(argv: any): Promise<CommandResult> {
     return new Promise((resolve) => {
       commander(this.commands, resolve)(argv);
     });

package/src/cli/index.ts

@@ -95,7 +95,7 @@ export async function cliInitialized(cliArgs = process.argv) {
     );
 
     return await cliInstance.run(cliArgs);
-  } catch (e) {
+  } catch (e: any) {
     logger.event({
       type: 'error',
       event: 'GLOBAL:ERROR',

package/src/commands/analyze/command.ts

@@ -31,7 +31,7 @@ class AnalyzeCommand extends CLICommand<Params> {
     {
       name: '--fileCache',
       value: '[fileCache]',
-      transformer: (value) => value !== 'false',
+      transformer: (value: string) => value !== 'false',
       description: 'Enable/disable persistent file cache for used cli builder',
     },
   ];

package/src/commands/benchmark/command.ts

@@ -20,7 +20,7 @@ export class BenchmarkCommand extends CLICommand<Params> {
     {
       name: '--rs, --resolveSymlinks',
       value: '[resolveSymlinks]',
-      transformer: (value) => value !== 'false',
+      transformer: (value: string) => value !== 'false',
       description:
         'Pass value to `resolve.symlinks` in webpack (https://webpack.js.org/configuration/resolve/#resolve-symlinks)`',
     },

package/src/commands/build/command.ts

@@ -27,7 +27,7 @@ class BuildCommand extends CLICommand<Params> {
     {
       name: '--rs, --resolveSymlinks',
       value: '[resolveSymlinks]',
-      transformer: (value) => value !== 'false',
+      transformer: (value: string) => value !== 'false',
       description:
         'Pass value to `resolve.symlinks` in webpack (https://webpack.js.org/configuration/resolve/#resolve-symlinks)`',
     },
@@ -54,7 +54,7 @@ class BuildCommand extends CLICommand<Params> {
     {
       name: '--fileCache',
       value: '[fileCache]',
-      transformer: (value) => value !== 'false',
+      transformer: (value: string) => value !== 'false',
       description: 'Enable/disable persistent file cache for used cli builder',
     },
     {

package/src/commands/new/new.ts

@@ -42,7 +42,6 @@ export default async function createNew(context: Context, params: Params): Promi
     type: 'application',
     name,
     root: directoryName,
-    commands: {},
   };
 
   const {

package/src/commands/new/questions/packageManager.ts

@@ -2,7 +2,7 @@ type PackageManagers = 'npm' | 'yarn';
 
 const choices = ['npm', 'yarn'];
 
-const packageManagerQuestion = (answer) => ({
+const packageManagerQuestion = (answer: string) => ({
   type: 'list' as const,
   name: 'packageManager' as const,
   message: 'Choose a package manager for the project',

package/src/commands/new/questions/template.ts

@@ -13,7 +13,7 @@ const choices = [
   },
 ];
 
-const templateQuestion = (answer) => ({
+const templateQuestion = (answer: string) => ({
   type: 'list' as const,
   name: 'template' as const,
   message: 'Choose a template for your project',

package/src/commands/new/questions/testingFramework.ts

@@ -2,7 +2,7 @@ type TestingFrameworks = 'none' | 'jest';
 
 const choices = ['none', 'jest'];
 
-const testingFrameworkQuestion = (answer) => ({
+const testingFrameworkQuestion = (answer: string) => ({
   type: 'list' as const,
   name: 'testingFramework' as const,
   message: 'Choose a test framework for your project',

package/src/commands/new/questions/type.ts

@@ -13,7 +13,7 @@ const choices = [
   },
 ];
 
-const typeQuestion = (answer) => ({
+const typeQuestion = (answer: string) => ({
   type: 'list' as const,
   name: 'type' as const,
   message: 'Choose a type for your project',

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

@@ -1,7 +1,7 @@
 import execa from 'execa';
 import chalk from 'chalk';
 
-export async function initializationGit(localDir) {
+export async function initializationGit(localDir: string) {
   console.log(`${chalk.blue('[GIT]')} Initializing git`);
 
   await execa('git', ['init'], { cwd: localDir, stdio: 'inherit' });

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

@@ -5,38 +5,12 @@
       "name": "{{configEntry.name}}",
       "root": "apps/{{configEntry.name}}",
       "type": "application",
-      "commands": {
-        "build": {
-          "options": {
-            "server": "apps/{{configEntry.name}}/index.ts"
-          },
-          "configurations": {
-            "sourceMap": true,
-            "modern": true,
-            "granularChunks": true,
-            "postcss": {
-              "config": "apps/{{configEntry.name}}/postcss"
-            },
-            "alias": {
-              "~shared": "./apps/{{configEntry.name}}/shared",
-              "~entities": "./apps/{{configEntry.name}}/entities",
-              "~features": "./apps/{{configEntry.name}}/features",
-              "~widgets": "./apps/{{configEntry.name}}/widgets",
-              "~pages": "./apps/{{configEntry.name}}/pages",
-              "~processes": "./apps/{{configEntry.name}}/processes",
-              "~app": "./apps/{{configEntry.name}}/app"
-            },
-            "fileSystemPages": {
-              "enable": true
-            }
-          }
-        },
-        "serve": {
-          "configurations": {
-            "hotRefresh": true,
-            "modern": true
-          }
-        }
+      "sourceMap": true,
+      "postcss": {
+        "config": "apps/{{configEntry.name}}/postcss"
+      },
+      "fileSystemPages": {
+        "enabled": true
       }
     }
   }

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

@@ -5,29 +5,12 @@
       "name": "{{configEntry.name}}",
       "root": "src",
       "type": "application",
-      "commands": {
-        "build": {
-          "options": {
-            "server": "src/index.ts"
-          },
-          "configurations": {
-            "sourceMap": true,
-            "modern": true,
-            "granularChunks": true,
-            "postcss": {
-              "config": "src/postcss"
-            },
-            "fileSystemPages": {
-              "enable": true
-            }
-          }
-        },
-        "serve": {
-          "configurations": {
-            "hotRefresh": true,
-            "modern": true
-          }
-        }
+      "sourceMap": true,
+      "postcss": {
+        "config": "src/postcss"
+      },
+      "fileSystemPages": {
+        "enabled": true
       }
     }
   }

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

@@ -5,24 +5,9 @@
       "name": "{{configEntry.name}}",
       "root": "child-apps/{{configEntry.name}}",
       "type": "child-app",
-      "commands": {
-        "build": {
-          "configurations": {
-            "postcss": {
-              "config": "apps/{{configEntry.name}}/postcss"
-            },
-            "alias": {
-              "~shared": "./apps/{{configEntry.name}}/shared",
-              "~entities": "./apps/{{configEntry.name}}/entities",
-              "~features": "./apps/{{configEntry.name}}/features",
-              "~widgets": "./apps/{{configEntry.name}}/widgets",
-              "~pages": "./apps/{{configEntry.name}}/pages",
-              "~processes": "./apps/{{configEntry.name}}/processes",
-              "~app": "./apps/{{configEntry.name}}/app"
-            }
-          }
-        }
-      }
+      "postcss": {
+        "config": "apps/{{configEntry.name}}/postcss"
+      },
     }
   }
 }

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

@@ -5,15 +5,9 @@
       "name": "{{configEntry.name}}",
       "root": "src",
       "type": "child-app",
-      "commands": {
-        "build": {
-          "configurations": {
-            "postcss": {
-              "config": "src/postcss"
-            },
-          }
-        }
-      }
+      "postcss": {
+        "config": "src/postcss"
+      },
     }
   }
 }

package/src/commands/start/command.ts

@@ -83,7 +83,7 @@ export class StartCommand extends CLICommand<Params> {
     {
       name: '--rs, --resolveSymlinks',
       value: '[resolveSymlinks]',
-      transformer: (value) => value !== 'false',
+      transformer: (value: string) => value !== 'false',
       description:
         'Pass value to `resolve.symlinks` in webpack (https://webpack.js.org/configuration/resolve/#resolve-symlinks)`',
     },
@@ -102,7 +102,7 @@ export class StartCommand extends CLICommand<Params> {
     {
       name: '--fileCache',
       value: '[fileCache]',
-      transformer: (value) => value !== 'false',
+      transformer: (value: string) => value !== 'false',
       description: 'Enable/disable persistent file cache for used cli builder',
     },
     {

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

@@ -34,7 +34,7 @@ export class StartProdCommand extends CLICommand<Params> {
     {
       name: '--rs, --resolveSymlinks',
       value: '[resolveSymlinks]',
-      transformer: (value) => value !== 'false',
+      transformer: (value: string) => value !== 'false',
       description:
         'Pass value to `resolve.symlinks` in webpack (https://webpack.js.org/configuration/resolve/#resolve-symlinks)`',
     },
@@ -76,7 +76,7 @@ export class StartProdCommand extends CLICommand<Params> {
     {
       name: '--fileCache',
       value: '[fileCache]',
-      transformer: (value) => value !== 'false',
+      transformer: (value: string) => value !== 'false',
       description: 'Enable/disable persistent file cache for used cli builder',
     },
     {

package/src/commands/static/application.ts

@@ -11,7 +11,7 @@ import { webpackServerConfig } from '../../library/webpack/application/server/pr
 import type { CommandResult } from '../../models/command';
 import type { ApplicationConfigEntry } from '../../typings/configEntry/application';
 import type { Params } from './command';
-import { ConfigManager } from '../../config/configManager';
+import { createConfigManager } from '../../config/configManager';
 import { request } from './request';
 import { generateStatic } from './generate';
 import { toWebpackConfig } from '../../library/webpack/utils/toWebpackConfig';
@@ -27,7 +27,7 @@ export const staticApp = async (
   configEntry: ApplicationConfigEntry,
   options: Params
 ): Promise<CommandResult> => {
-  const clientConfigManager = new ConfigManager(configEntry, {
+  const clientConfigManager = createConfigManager(configEntry, {
     env: 'production',
     ...options,
     buildType: 'client',
@@ -46,17 +46,8 @@ export const staticApp = async (
     });
   }
 
-  const {
-    name,
-    host,
-    port,
-    staticPort,
-    staticHost,
-    build: {
-      options: { outputClient },
-    },
-  } = serverConfigManager;
-  const root = serverConfigManager.getBuildPath();
+  const { name, host, port, staticPort, staticHost, output } = serverConfigManager;
+  const root = serverConfigManager.buildPath;
 
   context.logger.event({
     type: 'debug',
@@ -76,7 +67,7 @@ export const staticApp = async (
       PORT_SERVER: `${port}`,
       ASSETS_PREFIX:
         process.env.ASSETS_PREFIX ??
-        `http://${staticHost}:${staticPort}/${outputClient.replace(/\/$/, '')}/`,
+        `http://${staticHost}:${staticPort}/${output.client.replace(/\/$/, '')}/`,
     },
   });
 

package/src/commands/static/command.ts

@@ -44,7 +44,7 @@ export class StaticCommand extends CLICommand<Params> {
     {
       name: '--fileCache',
       value: '[fileCache]',
-      transformer: (value) => value !== 'false',
+      transformer: (value: string) => value !== 'false',
       description: 'Enable/disable persistent file cache for used cli builder',
     },
     {

package/src/commands/static/generate.ts

@@ -17,8 +17,8 @@ export const generateStatic = async (
   const q = new PQueue(MAX_CONCURRENT);
   const promises = [];
 
-  const { host, port, rootDir, build } = configManager;
-  const staticPath = resolve(rootDir, build.options.outputStatic);
+  const { host, port, rootDir, output } = configManager;
+  const staticPath = resolve(rootDir, output.static);
   const serverPath = `http://${host}:${port}`;
 
   for (const path of paths) {

package/src/commands/static/server.ts

@@ -3,8 +3,11 @@ import express from 'express';
 import compression from 'compression';
 import zlib from 'zlib';
 import type { ConfigManager } from '../../config/configManager';
+import type { ApplicationConfigEntry } from '../../typings/configEntry/application';
 
-export const startServer = (configManager: ConfigManager): Promise<Server> => {
+export const startServer = (
+  configManager: ConfigManager<ApplicationConfigEntry>
+): Promise<Server> => {
   const { port } = configManager;
   const app = express();
 
@@ -22,7 +25,7 @@ export const startServer = (configManager: ConfigManager): Promise<Server> => {
     next();
   });
 
-  app.use('/', express.static(configManager.build.options.outputStatic));
+  app.use('/', express.static(configManager.output.static));
 
   return new Promise((resolve) => {
     const server = app.listen(port, () => {

package/src/commands/static/staticServer.ts

@@ -3,8 +3,11 @@ import express from 'express';
 import compression from 'compression';
 import zlib from 'zlib';
 import type { ConfigManager } from '../../config/configManager';
+import type { ApplicationConfigEntry } from '../../typings/configEntry/application';
 
-export const startStaticServer = (configManager: ConfigManager): Promise<Server> => {
+export const startStaticServer = (
+  configManager: ConfigManager<ApplicationConfigEntry>
+): Promise<Server> => {
   const { staticHost, staticPort } = configManager;
   const app = express();
 
@@ -23,8 +26,8 @@ export const startStaticServer = (configManager: ConfigManager): Promise<Server>
   });
 
   app.use(
-    `/${configManager.build.options.outputClient.replace(/\/$/, '')}/`,
-    express.static(configManager.getBuildPath())
+    `/${configManager.output.client.replace(/\/$/, '')}/`,
+    express.static(configManager.buildPath)
   );
 
   return new Promise((resolve) => {

package/src/commands/update/updatePackageJson.ts

@@ -8,14 +8,14 @@ const isUnifiedVersion = (name: string) => {
   return name.startsWith('@tramvai');
 };
 
-const getVersionFromDep = (dep) => parse(dep)?.version || minVersion(dep)?.version;
+const getVersionFromDep = (dep: string) => parse(dep)?.version || minVersion(dep)?.version;
 
 const updateEntry = async (
   deps: Record<string, any>,
   dep: string,
   { currentVersion, version }: { currentVersion: string; version: string }
 ) => {
-  let nextVersion: string;
+  let nextVersion: string | undefined;
 
   if (isUnifiedVersion(dep) && getVersionFromDep(deps[dep]) === currentVersion) {
     nextVersion = version;
@@ -66,6 +66,10 @@ export const updatePackageJson = async (version: string) => {
   const content = JSON.parse(file.toString());
   const currentVersion = getVersionFromDep(content.dependencies['@tramvai/core']);
 
+  if (!currentVersion) {
+    throw new Error("Couldn't resolve current tramvai version");
+  }
+
   if (currentVersion === version) {
     console.error('The installed version is equal to the current version, no update is required.');
     process.exit(0);