@tramvai/cli 5.24.0 → 5.41.1

package/schema.json

@@ -138,6 +138,11 @@
                       "granularChunks"
                     ]
                   },
+                  "frameworkChunk": {
+                    "title": "Move tramvai packages into a separate chunk",
+                    "default": false,
+                    "type": "boolean"
+                  },
                   "granularChunksSplitNumber": {
                     "title": "Move module to shared chunk if used at least as many times in other chunks",
                     "default": 2,
@@ -1005,6 +1010,11 @@
                 },
                 "additionalProperties": false
               },
+              "withModulesStats": {
+                "title": "Enable generation of stats modules file for polyfill usage analysis",
+                "default": false,
+                "type": "boolean"
+              },
               "sourceMap": {
                 "cli_overridable": "",
                 "title": "Enable source maps",
@@ -1249,23 +1259,23 @@
                               "dotAll": {
                                 "type": "boolean"
                               },
-                              "__@match@7341": {
+                              "__@match@7843": {
                                 "type": "object",
                                 "additionalProperties": false
                               },
-                              "__@replace@7343": {
+                              "__@replace@7845": {
                                 "type": "object",
                                 "additionalProperties": false
                               },
-                              "__@search@7346": {
+                              "__@search@7848": {
                                 "type": "object",
                                 "additionalProperties": false
                               },
-                              "__@split@7348": {
+                              "__@split@7850": {
                                 "type": "object",
                                 "additionalProperties": false
                               },
-                              "__@matchAll@7350": {
+                              "__@matchAll@7852": {
                                 "type": "object",
                                 "additionalProperties": false
                               }
@@ -1297,9 +1307,9 @@
                       "eval",
                       "eval-cheap-module-source-map",
                       "eval-cheap-source-map",
-                      "eval-source-map"
-                    ],
-                    "type": "string"
+                      "eval-source-map",
+                      false
+                    ]
                   }
                 },
                 "additionalProperties": false
@@ -2010,23 +2020,23 @@
                                 "dotAll": {
                                   "type": "boolean"
                                 },
-                                "__@match@7341": {
+                                "__@match@7843": {
                                   "type": "object",
                                   "additionalProperties": false
                                 },
-                                "__@replace@7343": {
+                                "__@replace@7845": {
                                   "type": "object",
                                   "additionalProperties": false
                                 },
-                                "__@search@7346": {
+                                "__@search@7848": {
                                   "type": "object",
                                   "additionalProperties": false
                                 },
-                                "__@split@7348": {
+                                "__@split@7850": {
                                   "type": "object",
                                   "additionalProperties": false
                                 },
-                                "__@matchAll@7350": {
+                                "__@matchAll@7852": {
                                   "type": "object",
                                   "additionalProperties": false
                                 }
@@ -2058,9 +2068,9 @@
                         "eval",
                         "eval-cheap-module-source-map",
                         "eval-cheap-source-map",
-                        "eval-source-map"
-                      ],
-                      "type": "string"
+                        "eval-source-map",
+                        false
+                      ]
                     }
                   },
                   "additionalProperties": false
@@ -2771,23 +2781,23 @@
                                   "dotAll": {
                                     "type": "boolean"
                                   },
-                                  "__@match@7341": {
+                                  "__@match@7843": {
                                     "type": "object",
                                     "additionalProperties": false
                                   },
-                                  "__@replace@7343": {
+                                  "__@replace@7845": {
                                     "type": "object",
                                     "additionalProperties": false
                                   },
-                                  "__@search@7346": {
+                                  "__@search@7848": {
                                     "type": "object",
                                     "additionalProperties": false
                                   },
-                                  "__@split@7348": {
+                                  "__@split@7850": {
                                     "type": "object",
                                     "additionalProperties": false
                                   },
-                                  "__@matchAll@7350": {
+                                  "__@matchAll@7852": {
                                     "type": "object",
                                     "additionalProperties": false
                                   }
@@ -2819,9 +2829,9 @@
                           "eval",
                           "eval-cheap-module-source-map",
                           "eval-cheap-source-map",
-                          "eval-source-map"
-                        ],
-                        "type": "string"
+                          "eval-source-map",
+                          false
+                        ]
                       }
                     },
                     "additionalProperties": false

package/src/api/build/index.ts

@@ -23,6 +23,7 @@ export type Params = WithConfig<{
   env?: Record<string, string>;
   fileCache?: boolean;
   withBuildStats?: boolean;
+  withModulesStats?: boolean;
 
   // `package` target parameters
   watchMode?: boolean;

package/src/api/start-prod/providers/application.ts

@@ -12,7 +12,7 @@ import {
 } from '../../../di/tokens';
 import type { ApplicationConfigEntry } from '../../../typings/configEntry/application';
 import { CLOSE_HANDLER_TOKEN, SERVER_PROCESS_TOKEN } from '../tokens';
-import { DEBUG_ARGV } from '../../../config/constants';
+import { getDebugArg } from '../../../config/utils';
 import { safeRequire } from '../../../utils/safeRequire';
 import type { ConfigManager } from '../../../config/configManager';
 import { createConfigManager } from '../../../config/configManager';
@@ -62,7 +62,7 @@ export const applicationsProviders: readonly Provider[] = [
       const { debug, port, assetsPrefix, https } = serverConfigManager;
       const root = serverConfigManager.buildPath;
       return fork(path.resolve(root, 'server.js'), [], {
-        execArgv: debug ? DEBUG_ARGV : [],
+        execArgv: getDebugArg(debug),
         cwd: root,
         env: {
           ...safeRequire(path.resolve(process.cwd(), 'env.development'), true),

package/src/builder/webpack/devServer/pool/process/pool.ts

@@ -2,7 +2,8 @@ import path from 'path';
 import type { Worker } from 'cluster';
 import cluster from 'cluster';
 import type { WorkerBridgeFactory } from '../base/types';
-import { DEBUG_ARGV, TRACE_ARGV } from '../../../../../config/constants';
+import { TRACE_ARGV } from '../../../../../config/constants';
+import { getDebugArg } from '../../../../../config/utils';
 import { SERVER_CONFIG_MANAGER_TOKEN } from '../../../tokens';
 import {
   STDOUT_TOKEN,
@@ -24,7 +25,7 @@ export const ProcessWorkerBridge: WorkerBridgeFactory<Worker> = (di) => {
         // указываем другой файл для работы cluster.fork
         exec: path.resolve(__dirname, './worker.js'),
         execArgv: ([] as string[]).concat(
-          configManager.debug ? DEBUG_ARGV : [],
+          getDebugArg(configManager.debug),
           configManager.trace ? TRACE_ARGV : []
         ),
         // устанавливаем в качестве дебага дефолтный порт мастера, т.к. у нас и так один процесс может работать

package/src/builder/webpack/devServer/pool/thread/pool.ts

@@ -1,7 +1,8 @@
 import path from 'path';
 import { Worker } from 'worker_threads';
 import type { WorkerBridgeFactory } from '../base/types';
-import { DEBUG_ARGV, TRACE_ARGV } from '../../../../../config/constants';
+import { TRACE_ARGV } from '../../../../../config/constants';
+import { getDebugArg } from '../../../../../config/utils';
 import { SERVER_CONFIG_MANAGER_TOKEN } from '../../../tokens';
 import { COMMAND_PARAMETERS_TOKEN, CONFIG_ROOT_DIR_TOKEN } from '../../../../../di/tokens';
 
@@ -27,7 +28,7 @@ export const ThreadWorkerBridge: WorkerBridgeFactory<Worker> = (di) => {
 
       const worker = new Worker(path.resolve(__dirname, './worker.js'), {
         execArgv: [].concat(
-          configManager.debug ? DEBUG_ARGV : [],
+          getDebugArg(configManager.debug),
           configManager.trace ? TRACE_ARGV : []
         ),
         env: {

package/src/builder/webpack/devServer/server.ts

@@ -1,5 +1,7 @@
 import noop from '@tinkoff/utils/function/noop';
 import eachObj from '@tinkoff/utils/object/each';
+import chokidar from 'chokidar';
+import chalk from 'chalk';
 import path from 'path';
 import type webpack from 'webpack';
 import type Config from 'webpack-chain';
@@ -72,6 +74,7 @@ export const serverRunner = ({
     }
 
     const fs = serverCompiler.outputFileSystem as any;
+
     // ThreadWorkerPool is experimental
     // it doesn't work well when running integration tests in tramvai repo
     // mostly because of the some problems with `babel-plugin-lodash`
@@ -85,6 +88,7 @@ export const serverRunner = ({
         ? ThreadWorkerBridge
         : ProcessWorkerBridge
     );
+
     let worker: Worker | null;
     let serverInvalidated = true;
     let workerPort: number | null;
@@ -260,14 +264,14 @@ export const serverRunner = ({
       }
     });
 
-    compiler.hooks.done.tap(HOOK_NAME, async (stats) => {
+    async function runWorker(stats?: any) {
       if (serverInvalidated) {
         workerPort = null;
         workerPortPromise = null;
 
         serverInvalidated = false;
 
-        if (stats.hasErrors()) {
+        if (stats?.hasErrors()) {
           // всплыли ошибки при сборке - просто игнорим калбек чтобы не падать ниже и дать возможность выполнить пересборку
           return;
         }
@@ -313,6 +317,38 @@ export const serverRunner = ({
 
         await send(worker, 'script', { filename: realFilename, script });
       }
+    }
+
+    // отключаем watch за при выключенном rebuild
+    if (!configManager.noServerRebuild) {
+      const watchedFileName = 'env.development.js';
+      try {
+        const envPath = path.resolve(process.cwd(), watchedFileName);
+        const watchHandler = (_changedFilePath) => {
+          console.log(chalk.yellow(`${envPath} changed, restart server...`));
+          serverInvalidated = true;
+          runWorker();
+        };
+
+        const watcher = chokidar.watch(envPath);
+        watcher.on('change', watchHandler);
+
+        di.register({
+          provide: CLOSE_HANDLER_TOKEN,
+          multi: true,
+          useValue: () => {
+            watcher.close();
+          },
+        });
+      } catch (err) {
+        console.error(
+          `Something went wrong while watching for changes in ${watchedFileName}: ${err}`
+        );
+      }
+    }
+
+    compiler.hooks.done.tap(HOOK_NAME, async (stats) => {
+      runWorker(stats);
     });
   };
 };

package/src/cli/CLI.ts

@@ -49,8 +49,7 @@ export class CLI {
     config: ConfigManager,
     analytics: Analytics,
     cliRootDir: string,
-    cliPackageManager: PackageManager,
-    packageManager: PackageManager
+    cliPackageManager: PackageManager
   ) {
     this.context = new Context(
       config,
@@ -58,7 +57,6 @@ export class CLI {
       analytics,
       cliRootDir,
       cliPackageManager,
-      packageManager,
       this.runTask,
       this.runCommand,
       this.getTasks,

package/src/cli/index.ts

@@ -77,7 +77,6 @@ export async function cliInitialized(cliArgs = process.argv) {
     });
 
     const configManager = new ConfigManager({ config, syncConfigFile: syncJsonFile });
-    const packageManager = resolvePackageManager({ rootDir: process.cwd() });
 
     const cliRootDir = path.resolve(__dirname, '../', '../');
     const cliPackageManager = new NpmPackageManager({
@@ -91,8 +90,7 @@ export async function cliInitialized(cliArgs = process.argv) {
       configManager,
       analytic,
       cliRootDir,
-      cliPackageManager,
-      packageManager
+      cliPackageManager
     );
 
     return await cliInstance.run(cliArgs);

package/src/commands/add/add.ts

@@ -3,13 +3,18 @@ import type { CommandResult } from '../../models/command';
 import { migrate } from '../../utils/commands/dependencies/migrate';
 import { findTramvaiVersion } from '../../utils/commands/dependencies/findTramvaiVersion';
 import { checkVersions } from '../../utils/commands/dependencies/checkVersions';
+import { getWorkspaceRootByAppName } from '../../utils/commands/dependencies/getWorkspaceRootByAppName';
 
 export type Params = {
-  packageName: string;
+  packageNames: string | string[];
   dev?: boolean;
+  app?: string;
 };
 
-export default async (context: Context, { packageName, dev }: Params): Promise<CommandResult> => {
+export default async (
+  context: Context,
+  { packageNames, dev, app }: Params
+): Promise<CommandResult> => {
   const version = await findTramvaiVersion();
 
   if (!version) {
@@ -18,10 +23,19 @@ export default async (context: Context, { packageName, dev }: Params): Promise<C
     );
   }
 
+  const workspace = app ? getWorkspaceRootByAppName(context, app) : undefined;
+
+  if (workspace && !context.packageManager.isWorkspaceExists(workspace)) {
+    throw new Error(
+      `Workspace ${workspace} for app ${app} is not exists. Check your package.json and tramvai.json`
+    );
+  }
+
   await context.packageManager.install({
-    name: packageName,
+    packageNames,
     version,
     devDependency: dev,
+    workspace,
     stdio: 'inherit',
   });
 

package/src/commands/add/checkPackageValidator.ts

@@ -1,8 +1,12 @@
 import latestVersion from 'latest-version';
 import type { Params } from './add';
 
-export const checkPackage = async (_, { packageName }: Params) => {
-  await latestVersion(packageName);
+export const checkPackage = async (_, { packageNames }: Params) => {
+  if (Array.isArray(packageNames)) {
+    await Promise.all(packageNames.map((packageName) => latestVersion(packageName)));
+  } else {
+    await latestVersion(packageNames);
+  }
 
   return {
     name: 'checkPackage',

package/src/commands/add/command.ts

@@ -7,13 +7,18 @@ class AddCommand extends CLICommand {
 
   description = 'Tramvai package install command';
 
-  command = 'add <packageName>';
+  command = 'add <packageNames...>';
 
   options = [
     {
       name: '-D, --dev',
       description: 'Save package to devDependencies',
     },
+    {
+      name: '-a, --app',
+      value: '[app]',
+      description: 'Install package in app-specific workspace',
+    },
   ];
 
   alias = '';

package/src/commands/new/new.ts

@@ -1,6 +1,7 @@
 import path from 'path';
 import chalk from 'chalk';
 import inquirer from 'inquirer';
+import { packageManagerFactory } from '@tinkoff/package-manager-wrapper';
 import type { Context } from '../../models/context';
 import type { CommandResult } from '../../models/command';
 import type { Params } from './typings';
@@ -64,41 +65,53 @@ export default async function createNew(context: Context, params: Params): Promi
   const templateDir = getPathToTemplate(type, template);
   const sharedDir = getPathToShared();
   const blockDir = getPathToBlock(type);
-  const isNpm = packageManager === 'npm';
-  const isYarn = packageManager === 'yarn';
-  const isJest = testingFramework === 'jest';
-
+  const isMonorepo = template === 'monorepo';
+  const baseDir = type === 'app' ? 'apps' : 'child-apps';
   const blockDirectoryName = {
-    monorepo: path.join(type === 'app' ? 'apps' : 'child-apps', name),
+    monorepo: path.join(baseDir, name),
     multirepo: 'src',
   }[template];
 
-  await renderTemplate(templateDir, directoryName, { configEntry, isJest, isNpm, isYarn });
-  await renderTemplate(sharedDir, directoryName, { configEntry, isJest, isNpm, isYarn });
-  await renderTemplate(blockDir, path.join(directoryName, blockDirectoryName), {
+  const templateData = {
     configEntry,
-    isJest,
-    isNpm,
-    isYarn,
-  });
+    isJest: testingFramework === 'jest',
+    isNpm: packageManager === 'npm',
+    isYarn: packageManager === 'yarn',
+    workspaceBaseDir: isMonorepo ? baseDir : undefined,
+  };
+
+  await renderTemplate(templateDir, directoryName, templateData);
+  await renderTemplate(sharedDir, directoryName, templateData);
+  await renderTemplate(blockDir, path.join(directoryName, blockDirectoryName), templateData);
   if (template === 'monorepo') {
     const monorepoBlockDir = getPathToMonorepoBlock();
 
-    await renderTemplate(monorepoBlockDir, path.join(directoryName, blockDirectoryName), {
-      configEntry,
-      isJest,
-    });
+    await renderTemplate(
+      monorepoBlockDir,
+      path.join(directoryName, blockDirectoryName),
+      templateData
+    );
   }
 
   if (testingFramework !== 'none') {
-    await renderTemplate(getPathToTestingFramework(type, testingFramework), directoryName, {
-      configEntry,
-      isJest,
-    });
+    await renderTemplate(
+      getPathToTestingFramework(type, testingFramework),
+      directoryName,
+      templateData
+    );
   }
 
   await initializationGit(directoryName);
-  await installDependencies({ localDir: directoryName, type, packageManager, testingFramework });
+  await installDependencies({
+    localDir: directoryName,
+    type,
+    packageManager: packageManagerFactory(
+      { rootDir: path.resolve(process.cwd(), directoryName) },
+      packageManager
+    ),
+    testingFramework,
+    workspace: isMonorepo ? blockDirectoryName : undefined,
+  });
 
   console.log(
     `\n\n Project ${name} has been successfully created. To run the project, enter in the terminal`,

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

@@ -1,7 +1,5 @@
-import type { Options } from 'execa';
-import execa from 'execa';
 import chalk from 'chalk';
-import type { PackageManagers } from '../questions/packageManager';
+import type { InstallOptions, PackageManager } from '@tinkoff/package-manager-wrapper';
 import type { TestingFrameworks } from '../questions/testingFramework';
 import type { Type } from '../questions/type';
 
@@ -57,7 +55,6 @@ const devDependencies = [
   '@tinkoff/eslint-config',
   '@tinkoff/eslint-config-react',
   '@tinkoff/eslint-plugin-tramvai',
-  '@tramvai/cli',
   '@types/react',
   'postcss-custom-media',
   'postcss-custom-properties',
@@ -69,56 +66,107 @@ const devDependencies = [
   'typescript',
 ];
 
-const packagesInstallCommands: Record<PackageManagers, { deps: string[]; devDeps: string[] }> = {
-  npm: {
-    deps: ['install', '--save', '--package-lock', '--legacy-peer-deps'],
-    devDeps: ['install', '--save-dev', '--legacy-peer-deps'],
-  },
-  yarn: {
-    deps: ['add'],
-    devDeps: ['add', '--dev'],
-  },
-  pnpm: {
-    deps: ['add'],
-    devDeps: ['add', '--save-dev'],
-  },
+const rootDependencies = {
+  devDependencies: ['@tramvai/cli'],
+  dependencies: [],
 };
 
+function getBaseDeps(type: Type, isDev: boolean) {
+  const depsMap = DEPS[type];
+  const jestDeps = depsMap.jestDevDependencies;
+  const baseDeps = isDev ? devDependencies : depsMap.dependencies;
+  const rootDeps = rootDependencies[isDev ? 'devDependencies' : 'dependencies'];
+
+  return { rootDeps, baseDeps, jestDeps };
+}
+
+function getDeps(type: Type, options?: { isDev?: boolean; isRoot?: boolean }) {
+  const { rootDeps, baseDeps } = getBaseDeps(type, options?.isDev);
+
+  return [...rootDeps, ...baseDeps];
+}
+
+function getDepsWorkspace(type: Type, options?: { isDev?: boolean; isRoot?: boolean }) {
+  const { rootDeps, baseDeps } = getBaseDeps(type, options?.isDev);
+
+  if (options?.isRoot) {
+    return rootDeps;
+  }
+
+  return baseDeps;
+}
+
+function jestDeps(type: Type) {
+  return getBaseDeps(type, true).jestDeps;
+}
+
 export async function installDependencies({
   localDir,
   type,
   packageManager,
   testingFramework,
+  workspace,
 }: {
   localDir: string;
   type: Type;
-  packageManager: PackageManagers;
+  packageManager: PackageManager;
   testingFramework: TestingFrameworks;
+  workspace?: string;
 }) {
-  const installCommands = packagesInstallCommands[packageManager];
-  const options: Options = {
+  const deps = workspace ? getDepsWorkspace : getDeps;
+
+  const options: InstallOptions = {
     cwd: localDir,
     env: {
       SKIP_TRAMVAI_MIGRATIONS: 'true',
     },
     stdio: 'inherit',
+    workspace,
   };
 
+  // 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`);
+
+    await packageManager.install({
+      packageNames: deps(type, { isDev: true, isRoot: true }),
+      devDependency: true,
+      ...options,
+      workspace: undefined,
+    });
+
+    console.log(`${chalk.blue('[DEPENDENCIES]')} Installing root dev dependencies`);
+
+    await packageManager.install({
+      packageNames: deps(type, { isDev: false, isRoot: true }),
+      devDependency: false,
+      ...options,
+      workspace: undefined,
+    });
+  }
+
   console.log(`${chalk.blue('[DEPENDENCIES]')} Installing app dependencies`);
 
-  await execa(packageManager, [...installCommands.deps, ...DEPS[type].dependencies], options);
+  await packageManager.install({
+    packageNames: deps(type),
+    ...options,
+  });
 
   console.log(`${chalk.blue('[DEPENDENCIES]')} Installing dev dependencies`);
 
-  await execa(packageManager, [...installCommands.devDeps, ...devDependencies], options);
+  await packageManager.install({
+    packageNames: deps(type, { isDev: true }),
+    devDependency: true,
+    ...options,
+  });
 
   if (testingFramework === 'jest') {
     console.log(`${chalk.blue('[DEPENDENCIES]')} Installing jest dependencies`);
 
-    await execa(
-      packageManager,
-      [...installCommands.devDeps, ...DEPS[type].jestDevDependencies],
-      options
-    );
+    await packageManager.install({
+      packageNames: jestDeps(type),
+      devDependency: true,
+      ...options,
+    });
   }
 }

package/src/commands/new/templates/monorepo-block/package.json.hbs

@@ -0,0 +1,5 @@
+{
+  "name": "{{configEntry.name}}",
+  "version": "0.0.0-stub",
+  "private": true
+}

package/src/commands/new/templates/shared/package.json.hbs

@@ -22,5 +22,6 @@
     "*.{js,jsx,ts,tsx}": [
       "eslint --fix"
     ]
-  }
+  }{{#if workspaceBaseDir}},
+  "workspaces": ["{{workspaceBaseDir}}/*"]{{/if}}
 }