@tramvai/cli 5.24.0 → 5.41.1

package/src/commands/update/update.ts

@@ -4,6 +4,8 @@ import { getLatestPackageVersion } from '../../utils/commands/dependencies/getLa
 import { migrate } from '../../utils/commands/dependencies/migrate';
 import { updatePackageJson } from './updatePackageJson';
 import { checkVersions } from '../../utils/commands/dependencies/checkVersions';
+import moduleVersion from '../../utils/moduleVersion';
+import { findTramvaiVersion } from '../../utils/commands/dependencies/findTramvaiVersion';
 
 export type Params = {
   to: string;
@@ -13,15 +15,36 @@ export default async (
   context: Context,
   { to: version = 'latest' }: Params
 ): Promise<CommandResult> => {
-  const versionNumber = await getLatestPackageVersion('@tramvai/core', version);
+  const targetVersion = await getLatestPackageVersion('@tramvai/cli', version);
+  const currentVersion = await findTramvaiVersion();
+
+  if (!currentVersion) {
+    throw new Error(
+      'Could not resolve tramvai version from package.json. Do you have @tramvai/core installed?'
+    );
+  }
+
+  if (currentVersion === version) {
+    throw new Error(
+      'The installed version is equal to the current version, no update is required.'
+    );
+  }
 
   context.logger.event({
     type: 'info',
     event: 'resolving-version',
-    message: `Tramvai version resolved to ${versionNumber}`,
+    message: `Tramvai version resolved to ${targetVersion}`,
   });
 
-  await updatePackageJson(versionNumber, version === 'prerelease');
+  if (context.packageManager.workspaces) {
+    await Promise.all(
+      context.packageManager.workspaces.map((directory) =>
+        updatePackageJson(targetVersion, currentVersion, version === 'prerelease', directory)
+      )
+    );
+  }
+
+  await updatePackageJson(targetVersion, currentVersion, version === 'prerelease');
 
   context.logger.event({
     type: 'info',

package/src/commands/update/updatePackageJson.spec.ts

@@ -1,8 +1,12 @@
+import { resolve } from 'path';
 import { updatePackageJson } from './updatePackageJson';
 
 const LATEST_TRAMVAI_VERSION = '1.115.6';
 const LATEST_LIB_VERSION = '0.8.23';
 const PRERELEASE_LIB_VERSION = '2.0.1';
+const CURRENT_TRAMVAI_VERSION = '1.93.2';
+
+const packageJsonPath = resolve('package.json');
 
 let mockPackageJson: Record<string, any>;
 const mockFsWrite = jest.fn();
@@ -38,13 +42,13 @@ beforeEach(() => {
 it('should update tramvai deps to latest versions', async () => {
   mockPackageJson = {
     dependencies: {
-      '@tramvai/core': '1.93.2',
-      '@tramvai/module-common': '1.93.2',
+      '@tramvai/core': CURRENT_TRAMVAI_VERSION,
+      '@tramvai/module-common': CURRENT_TRAMVAI_VERSION,
       '@tinkoff/router': '^0.2.3',
       '@tinkoff/url': '0.3.2',
     },
     devDependencies: {
-      '@tramvai/cli': '1.93.2',
+      '@tramvai/cli': CURRENT_TRAMVAI_VERSION,
     },
     peerDependencies: {
       '@tinkoff/dippy': '0.7.10',
@@ -72,11 +76,12 @@ it('should update tramvai deps to latest versions', async () => {
     return {};
   });
 
-  await updatePackageJson(LATEST_TRAMVAI_VERSION);
+  await updatePackageJson(LATEST_TRAMVAI_VERSION, CURRENT_TRAMVAI_VERSION);
 
+  // eslint-disable-next-line jest/no-interpolation-in-snapshots
   expect(mockFsWrite.mock.calls[0]).toMatchInlineSnapshot(`
     [
-      "package.json",
+      "${packageJsonPath}",
       "{
       "dependencies": {
         "@tramvai/core": "1.115.6",
@@ -98,14 +103,14 @@ it('should update tramvai deps to latest versions', async () => {
 it('prerelease should be used for dependant libs', async () => {
   mockPackageJson = {
     dependencies: {
-      '@tramvai/core': '1.93.2',
-      '@tramvai/module-common': '1.93.2',
+      '@tramvai/core': CURRENT_TRAMVAI_VERSION,
+      '@tramvai/module-common': CURRENT_TRAMVAI_VERSION,
       '@tinkoff/router': '^0.2.3',
       '@tinkoff/url': '0.3.2',
       '@tinkoff/pack-polyfills': '1.0.0',
     },
     devDependencies: {
-      '@tramvai/cli': '1.93.2',
+      '@tramvai/cli': CURRENT_TRAMVAI_VERSION,
     },
     peerDependencies: {
       '@tinkoff/dippy': '0.7.10',
@@ -133,11 +138,12 @@ it('prerelease should be used for dependant libs', async () => {
     return {};
   });
 
-  await updatePackageJson(LATEST_TRAMVAI_VERSION, true);
+  await updatePackageJson(LATEST_TRAMVAI_VERSION, CURRENT_TRAMVAI_VERSION, true);
 
+  // eslint-disable-next-line jest/no-interpolation-in-snapshots
   expect(mockFsWrite.mock.calls[0]).toMatchInlineSnapshot(`
     [
-      "package.json",
+      "${packageJsonPath}",
       "{
       "dependencies": {
         "@tramvai/core": "1.115.6",

package/src/commands/update/updatePackageJson.ts

@@ -3,6 +3,7 @@ import fs from 'fs';
 import pMap from 'p-map';
 import type { Ora } from 'ora';
 import ora from 'ora';
+import { resolve } from 'path';
 import { packageHasVersion } from '../../utils/commands/dependencies/packageHasVersion';
 import { getLibPackageVersion } from './dependantLibs';
 import { isDependantLib, isUnifiedVersion } from '../../utils/tramvaiVersions';
@@ -61,21 +62,15 @@ const updateDependencies = (
   );
 };
 
-export const updatePackageJson = async (version: string, prerelease?: boolean) => {
-  const file = fs.readFileSync('package.json');
+export const updatePackageJson = async (
+  version: string,
+  currentVersion: string,
+  prerelease?: boolean,
+  path = '.'
+) => {
+  const packageJsonPath = resolve(path, 'package.json');
+  const file = fs.readFileSync(packageJsonPath);
   const content = JSON.parse(file.toString());
-  const currentVersion = getVersionFromDep(content.dependencies['@tramvai/core']);
-
-  if (!currentVersion) {
-    throw new Error(
-      "Couldn't resolve current tramvai version, do you have '@tramvai/core' package in your dependencies?"
-    );
-  }
-
-  if (currentVersion === version) {
-    console.error('The installed version is equal to the current version, no update is required.');
-    return;
-  }
 
   const spinner = ora(`Updating package.json versions`).start();
 
@@ -90,7 +85,7 @@ export const updatePackageJson = async (version: string, prerelease?: boolean) =
       spinner
     );
 
-    fs.writeFileSync('package.json', JSON.stringify(content, null, 2));
+    fs.writeFileSync(packageJsonPath, JSON.stringify(content, null, 2));
   } finally {
     spinner.stop();
   }

package/src/config/configManager.ts

@@ -25,7 +25,7 @@ export interface Settings<E extends Env> {
   rootDir?: string;
   version?: string;
   buildType?: BuildType;
-  debug?: boolean;
+  debug?: string | boolean;
   verboseWebpack?: boolean;
   trace?: boolean;
   sourceMap?: boolean;

package/src/config/constants.ts

@@ -1,5 +1,3 @@
 export const extensions = ['.mjs', '.js', '.jsx', '.ts', '.tsx'];
 
-export const DEBUG_ARGV = ['--inspect', '-r', 'source-map-support/register'];
-
 export const TRACE_ARGV = ['--trace-warnings', '--trace-uncaught'];

package/src/config/utils.ts

@@ -0,0 +1,18 @@
+export function getDebugArg(debugEnv: boolean | string | undefined) {
+  if (!debugEnv) {
+    return [];
+  }
+
+  const sourceMapsArg = ['-r', 'source-map-support/register'];
+  const baseDebugArgs = ['--inspect', ...sourceMapsArg];
+
+  if (debugEnv === 'wait') {
+    return ['--inspect-wait', ...sourceMapsArg];
+  }
+
+  if (debugEnv === 'break') {
+    return ['--inspect-brk', ...sourceMapsArg];
+  }
+
+  return baseDebugArgs;
+}

package/src/library/swc/__integration__/swc.start.test.ts

@@ -33,6 +33,9 @@ beforeAll(async () => {
     strictErrorHandle: true,
     config: {
       name: 'swc-app',
+      webpack: {
+        devtool: 'eval',
+      },
       type: 'application',
       root: './',
       experiments: {

package/src/library/webpack/application/client/dev.ts

@@ -45,7 +45,7 @@ export const webpackClientConfig = ({
 
   config.mode('development');
 
-  config.devtool(configManager.webpack.devtool ?? 'eval');
+  config.devtool(configManager.webpack.devtool ?? false);
 
   if (configManager.sourceMap) {
     config.batch(sourcemaps(configManager));

package/src/library/webpack/application/client/prod/optimization/splitChunks.ts

@@ -65,6 +65,50 @@ export const resolveFrameworksPaths = (rootDir: string, frameworksList: string[]
   return topLevelFrameworkPaths;
 };
 
+const tramvaiScopes = ['@tramvai/', '@tramvai-tinkoff/'];
+const tinkoffPackages = [
+  '@tinkoff/router',
+  '@tinkoff/logger',
+  '@tinkoff/dippy',
+  '@tinkoff/user-agent',
+  '@tinkoff/module-loader-client',
+  '@tinkoff/meta-tags-generate',
+  '@tinkoff/browser-cookies',
+  '@tinkoff/errors',
+  '@tinkoff/layout-factory',
+  '@tinkoff/url',
+  '@tinkoff/roles',
+  '@tinkoff/hook-runner',
+  '@tinkoff/pubsub',
+  '@tinkoff/browser-timings',
+];
+const tinkoffPackagesSet = new Set(tinkoffPackages);
+
+function isTramvaiPackage(packageName: string | undefined) {
+  if (!packageName) return false;
+
+  return (
+    tramvaiScopes.some((scope) => packageName.startsWith(scope)) ||
+    tinkoffPackagesSet.has(packageName)
+  );
+}
+
+function normalizePath(packagePath: string) {
+  return packagePath.endsWith('/') ? packagePath : `${packagePath}/`;
+}
+
+const tramvaiPackagesPaths = [...tramvaiScopes, ...tinkoffPackages].map((packageName) =>
+  normalizePath(`/node_modules/${packageName}`)
+);
+
+function isTramvaiResource(resource: string | undefined) {
+  if (!resource) return false;
+
+  return tramvaiPackagesPaths.some((tramvaiPackagePath) => resource.includes(tramvaiPackagePath));
+}
+
+type CacheGroup = Exclude<Required<SplitChunksOptions>, boolean>['cacheGroups'][string];
+
 // eslint-disable-next-line max-statements
 export const splitChunksConfig =
   (configManager: ConfigManager<ApplicationConfigEntry>) => (config: Config) => {
@@ -72,13 +116,13 @@ export const splitChunksConfig =
 
     const topLevelFrameworkPaths = resolveFrameworksPaths(rootDir, ['react', 'react-dom']);
 
-    const reactCacheGroup: Exclude<Required<SplitChunksOptions>, boolean>['cacheGroups'][string] = {
+    const reactCacheGroup: CacheGroup = {
       chunks: 'all',
       name: 'react',
       // This regex ignores nested copies of framework libraries so they're bundled with their issuer.
       // test: /(?<!node_modules.*)[\\/]node_modules[\\/](react|react-dom|scheduler|prop-types|use-subscription)[\\/]/,
       test(module: webpack.Module) {
-        const resource = module.nameForCondition && module.nameForCondition();
+        const resource = module.nameForCondition?.();
 
         if (!resource) {
           return false;
@@ -93,6 +137,24 @@ export const splitChunksConfig =
       // Don't let webpack eliminate this chunk (prevents this chunk from becoming a part of the commons chunk)
       enforce: true,
     };
+
+    const tramvaiCacheGroup: CacheGroup = splitChunks.frameworkChunk
+      ? {
+          chunks: 'initial',
+          name: 'tramvai',
+          test(module: webpack.Module) {
+            const resource = module.nameForCondition?.();
+            const packageName = (module as webpack.NormalModule).resourceResolveData
+              ?.descriptionFileData?.name as string | undefined;
+
+            return isTramvaiPackage(packageName) || isTramvaiResource(resource);
+          },
+          priority: 35,
+          // Don't let webpack eliminate this chunk (prevents this chunk from becoming a part of the commons chunk)
+          enforce: true,
+        }
+      : false;
+
     let webpackSplitChunks: SplitChunksOptions = false;
 
     switch (splitChunks.mode) {
@@ -130,6 +192,7 @@ export const splitChunksConfig =
             default: false,
             defaultVendors: false,
             reactCacheGroup,
+            tramvaiCacheGroup,
             shared,
           },
         };
@@ -141,6 +204,7 @@ export const splitChunksConfig =
             default: false,
             defaultVendors: false,
             reactCacheGroup,
+            tramvaiCacheGroup,
             commons: {
               name: 'common-chunk',
               minChunks: splitChunks.commonChunkSplitNumber,

package/src/library/webpack/application/common.ts

@@ -9,6 +9,7 @@ import { ModuleFederationIgnoreEntries } from '../plugins/ModuleFederationIgnore
 import { rootErrorBoundaryFactory } from '../blocks/rootErrorBoundary';
 import type { ModuleFederationFixRangeOptions } from '../plugins/ModuleFederationFixRange';
 import { ModuleFederationFixRange } from '../plugins/ModuleFederationFixRange';
+import { FileStatsPlugin } from '../plugins/FileStats';
 
 export const commonApplication =
   (configManager: ConfigManager<ApplicationConfigEntry>) => (config: Config) => {
@@ -19,6 +20,18 @@ export const commonApplication =
       } as ModuleFederationPluginOptions,
     ]);
 
+    if (configManager.withModulesStats) {
+      config.plugin('stats-modules-plugin').use(FileStatsPlugin, [
+        {
+          filename: 'stats-modules.json',
+          stats: {
+            chunks: true,
+            chunkModules: true,
+          },
+        },
+      ]);
+    }
+
     config
       .plugin('module-federation-ignore-entries')
       .use(ModuleFederationIgnoreEntries, [

package/src/library/webpack/application/server/dev.ts

@@ -36,7 +36,7 @@ export const webpackServerConfig = ({
 
   config.mode('development');
 
-  config.devtool(configManager.webpack.devtool);
+  config.devtool(configManager.webpack.devtool ?? false);
 
   if (configManager.sourceMap) {
     config.batch(sourcemaps(configManager));

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

@@ -25,6 +25,7 @@ const isApplicable = (configManager: ConfigManager<CliConfigEntry>) => {
   return (
     // thread-loader uses child_process.fork under the hood, and sometimes (50/50) work in these processes does not get into inspector.Session profile
     !process.env.TRAMVAI_CPU_PROFILE &&
+    !process.env.TRAMVAI_DEBUG_BUILD &&
     // TODO: check that there is still issue with windows systems and thread-loader
     process.platform !== 'win32' &&
     // swc has inbuilt threads support, see https://swc.rs/blog/perf-swc-vs-babel#real-world-benchmark

package/src/models/config.spec.ts

@@ -116,6 +116,7 @@ it('should populate defaults for config', () => {
           "sourceMap": false,
           "splitChunks": {
             "commonChunkSplitNumber": 3,
+            "frameworkChunk": false,
             "granularChunksMinSize": 20000,
             "granularChunksSplitNumber": 2,
             "mode": "granularChunks",
@@ -126,6 +127,7 @@ it('should populate defaults for config', () => {
           "transpileOnlyModernLibs": true,
           "type": "application",
           "webpack": {},
+          "withModulesStats": false,
         },
         "child-app": {
           "cssMinimize": "css-minimizer",
@@ -366,6 +368,7 @@ it('should populate defaults for overridable options', () => {
           "sourceMap": false,
           "splitChunks": {
             "commonChunkSplitNumber": 3,
+            "frameworkChunk": false,
             "granularChunksMinSize": 20000,
             "granularChunksSplitNumber": 2,
             "mode": "granularChunks",
@@ -385,6 +388,7 @@ it('should populate defaults for overridable options', () => {
           "webpack": {
             "devtool": "eval-source-map",
           },
+          "withModulesStats": false,
         },
         "child-app": {
           "cssMinimize": "css-minimizer",

package/src/models/context.ts

@@ -1,4 +1,4 @@
-import type { PackageManager } from '@tinkoff/package-manager-wrapper';
+import { resolvePackageManager, type PackageManager } from '@tinkoff/package-manager-wrapper';
 import type { Logger } from './logger';
 import type { Command, CommandResult } from './command';
 import type { Task, TaskResult } from './task';
@@ -6,13 +6,14 @@ import type { ConfigManager } from './config';
 import type { Analytics } from './analytics';
 
 export class Context {
+  public packageManager: PackageManager;
+
   constructor(
     public config: ConfigManager,
     public logger: Logger,
     public analytics: Analytics,
     public cliRootDir: string,
     public cliPackageManager: PackageManager,
-    public packageManager: PackageManager,
     public runTask: (name, params?) => Promise<TaskResult>,
     public runCommand: (name, params?) => Promise<CommandResult>,
     public getTasks: () => Task[],

package/src/schema/autogeneratedSchema.json

@@ -116,6 +116,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,
@@ -983,6 +988,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",
@@ -1227,23 +1237,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
                         }
@@ -1275,9 +1285,9 @@
                 "eval",
                 "eval-cheap-module-source-map",
                 "eval-cheap-source-map",
-                "eval-source-map"
-              ],
-              "type": "string"
+                "eval-source-map",
+                false
+              ]
             }
           },
           "additionalProperties": false
@@ -1979,23 +1989,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
                         }
@@ -2027,9 +2037,9 @@
                 "eval",
                 "eval-cheap-module-source-map",
                 "eval-cheap-source-map",
-                "eval-source-map"
-              ],
-              "type": "string"
+                "eval-source-map",
+                false
+              ]
             }
           },
           "additionalProperties": false
@@ -2731,23 +2741,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
                         }
@@ -2779,9 +2789,9 @@
                 "eval",
                 "eval-cheap-module-source-map",
                 "eval-cheap-source-map",
-                "eval-source-map"
-              ],
-              "type": "string"
+                "eval-source-map",
+                false
+              ]
             }
           },
           "additionalProperties": false

package/src/schema/tramvai.spec.ts

@@ -145,6 +145,7 @@ describe('JSON schema для tramvai.json', () => {
             "sourceMap": false,
             "splitChunks": {
               "commonChunkSplitNumber": 3,
+              "frameworkChunk": false,
               "granularChunksMinSize": 20000,
               "granularChunksSplitNumber": 2,
               "mode": "granularChunks",
@@ -155,6 +156,7 @@ describe('JSON schema для tramvai.json', () => {
             "transpileOnlyModernLibs": true,
             "type": "application",
             "webpack": {},
+            "withModulesStats": false,
           },
           "module": {
             "cssMinimize": "css-minimizer",

package/src/typings/configEntry/application.ts

@@ -189,6 +189,11 @@ export interface ApplicationConfigEntry extends CliConfigEntry {
      * @default "granularChunks"
      */
     mode: 'granularChunks' | 'commonChunk' | false;
+    /**
+     * @title Move tramvai packages into a separate chunk
+     * @default false
+     */
+    frameworkChunk: boolean;
     /**
      * @title Move module to shared chunk if used at least as many times in other chunks
      * @default 2
@@ -221,4 +226,10 @@ export interface ApplicationConfigEntry extends CliConfigEntry {
    * @default {}
    */
   experiments: ApplicationExperiments;
+
+  /**
+   * @title Enable generation of stats modules file for polyfill usage analysis
+   * @default false
+   */
+  withModulesStats: boolean;
 }

package/src/typings/configEntry/cli.ts

@@ -251,7 +251,12 @@ export interface CliConfigEntry extends ConfigEntry {
     /**
      * @title Use the specified type of source maps for building in development mode
      */
-    devtool: 'eval' | 'eval-cheap-source-map' | 'eval-cheap-module-source-map' | 'eval-source-map';
+    devtool:
+      | false
+      | 'eval'
+      | 'eval-cheap-source-map'
+      | 'eval-cheap-module-source-map'
+      | 'eval-source-map';
   };
 
   // options that affect only production builds

package/src/typings/webpack-chain/index.d.ts

@@ -434,6 +434,7 @@ declare module 'webpack-chain' {
     }
 
     type DevTool =
+      | boolean
       | 'eval'
       | 'eval-cheap-source-map'
       | 'eval-cheap-module-source-map'

package/src/utils/commands/dependencies/findTramvaiVersion.ts

@@ -10,7 +10,7 @@ const getVersionFromDep = (dep?: string) => {
 export const findTramvaiVersion = async () => {
   const file = fs.readFileSync('package.json');
   const content = JSON.parse(file.toString());
-  const currentVersion = getVersionFromDep(content.dependencies['@tramvai/core']);
+  const currentVersion = getVersionFromDep(content.devDependencies['@tramvai/cli']);
 
   return currentVersion;
 };