@tramvai/cli 5.50.0 → 5.53.78

package/src/models/command.ts

@@ -66,14 +66,7 @@ export abstract class CLICommand<
 
     await this.validator(parameters);
 
-    const trackAfter = this.context.analytics.trackAfter({
-      name: this.name,
-      parameters: this.analyticEventLabel(parameters),
-      label: this.analyticCommandUsageLabel(parameters),
-      category: 'command',
-    });
-
-    return trackAfter(this.action(parameters));
+    return this.action(parameters);
   }
 
   protected async validator(parameters: TParams): Promise<void> {

package/src/models/config.spec.ts

@@ -73,6 +73,7 @@ it('should populate defaults for config', () => {
             },
             "reactCompiler": false,
             "reactTransitions": false,
+            "runtimeChunk": false,
             "serverRunner": "thread",
             "transpilation": {
               "loader": "babel",
@@ -97,7 +98,7 @@ it('should populate defaults for config', () => {
               "overlay": false,
             },
           },
-          "modern": true,
+          "integrity": false,
           "name": "test-app",
           "notifications": {},
           "output": {
@@ -165,6 +166,7 @@ it('should populate defaults for config', () => {
               "overlay": false,
             },
           },
+          "integrity": false,
           "name": "test-child-app",
           "notifications": {},
           "output": "dist/child-app",
@@ -320,6 +322,7 @@ it('should populate defaults for overridable options', () => {
             },
             "reactCompiler": false,
             "reactTransitions": false,
+            "runtimeChunk": false,
             "serverRunner": "thread",
             "transpilation": {
               "loader": {
@@ -349,7 +352,7 @@ it('should populate defaults for overridable options', () => {
               "overlay": false,
             },
           },
-          "modern": true,
+          "integrity": false,
           "name": "test-app",
           "notifications": {},
           "output": {
@@ -433,6 +436,7 @@ it('should populate defaults for overridable options', () => {
               "overlay": false,
             },
           },
+          "integrity": false,
           "name": "test-child-app",
           "notifications": {},
           "output": "dist/child-app",

package/src/models/context.ts

@@ -1,19 +1,18 @@
-import { resolvePackageManager, type PackageManager } from '@tinkoff/package-manager-wrapper';
+import { type PackageManager } from '@tinkoff/package-manager-wrapper';
 import type { Logger } from './logger';
 import type { Command, CommandResult } from './command';
 import type { Task, TaskResult } from './task';
 import type { ConfigManager } from './config';
-import type { Analytics } from './analytics';
+import { AnalyticsService } from './analytics/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 analytics: AnalyticsService,
     public runTask: (name, params?) => Promise<TaskResult>,
     public runCommand: (name, params?) => Promise<CommandResult>,
     public getTasks: () => Task[],

package/src/models/logger.ts

@@ -40,3 +40,5 @@ export class Logger {
     }
   }
 }
+
+export const logger = new Logger();

package/src/models/task.ts

@@ -36,14 +36,8 @@ export abstract class Task {
     });
     const args = [...this.arguments, ...(parameters.arguments || [])];
     const options = { ...this.options, ...parameters.options };
-    const trackAfter = this.context.analytics.trackAfter({
-      name: this.name,
-      category: 'task',
-      parameters: args,
-      label: this.analyticTaskUsageLabel(args),
-    });
 
-    return trackAfter(this.execute(this.command, args, options))
+    return this.execute(this.command, args, options)
       .then((result) => ({
         status: 'ok',
         code: result.exitCode,

package/src/schema/autogeneratedSchema.json

@@ -22,6 +22,10 @@
           "title": "Path to polyfill file. By default, looks for the `src/polyfill`",
           "type": "string"
         },
+        "modernPolyfill": {
+          "title": "Path to modern polyfill file. By default, looks for the `src/modern-polyfill`",
+          "type": "string"
+        },
         "serverApiDir": {
           "title": "Path to folder with papi handlers",
           "default": "src/api",
@@ -50,11 +54,6 @@
           },
           "additionalProperties": false
         },
-        "modern": {
-          "title": "Enable build for modern browsers",
-          "default": true,
-          "type": "boolean"
-        },
         "fileSystemPages": {
           "title": "File-System Routing feature",
           "default": {},
@@ -786,6 +785,16 @@
               "default": false,
               "type": "boolean"
             },
+            "runtimeChunk": {
+              "title": "Webpack Runtime Chunk settings",
+              "default": false,
+              "enum": [
+                false,
+                "multiple",
+                "single",
+                true
+              ]
+            },
             "webpack": {
               "title": "experiments configuration for [webpack](https://webpack.js.org/configuration/experiments/)",
               "default": {},
@@ -826,6 +835,10 @@
                 "topLevelAwait": {
                   "description": "Allow using top-level-await in EcmaScript Modules.",
                   "type": "boolean"
+                },
+                "deferImport": {
+                  "description": "Enable experimental tc39 proposal https://github.com/tc39/proposal-defer-import-eval. This allows to defer execution of a module until it's first use.",
+                  "type": "boolean"
                 }
               },
               "additionalProperties": false
@@ -1015,6 +1028,46 @@
             }
           ]
         },
+        "integrity": {
+          "title": "Integrity generation options",
+          "default": false,
+          "anyOf": [
+            {
+              "type": "object",
+              "properties": {
+                "enabled": {
+                  "enum": [
+                    "auto",
+                    false,
+                    true
+                  ]
+                },
+                "hashFuncNames": {
+                  "type": "array",
+                  "items": {
+                    "enum": [
+                      "sha256",
+                      "sha384",
+                      "sha512"
+                    ],
+                    "type": "string"
+                  }
+                },
+                "hashLoading": {
+                  "enum": [
+                    "eager",
+                    "lazy"
+                  ],
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "type": "boolean"
+            }
+          ]
+        },
         "excludesPresetEnv": {
           "title": "List of modules to exclude from `@babel/preset-env` and `swc-loader`",
           "type": "array",
@@ -1236,23 +1289,23 @@
                         "dotAll": {
                           "type": "boolean"
                         },
-                        "__@match@7844": {
+                        "__@match@8074": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@replace@7846": {
+                        "__@replace@8076": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@search@7849": {
+                        "__@search@8079": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@split@7851": {
+                        "__@split@8081": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@matchAll@7853": {
+                        "__@matchAll@8083": {
                           "type": "object",
                           "additionalProperties": false
                         }
@@ -1599,6 +1652,46 @@
             }
           ]
         },
+        "integrity": {
+          "title": "Integrity generation options",
+          "default": false,
+          "anyOf": [
+            {
+              "type": "object",
+              "properties": {
+                "enabled": {
+                  "enum": [
+                    "auto",
+                    false,
+                    true
+                  ]
+                },
+                "hashFuncNames": {
+                  "type": "array",
+                  "items": {
+                    "enum": [
+                      "sha256",
+                      "sha384",
+                      "sha512"
+                    ],
+                    "type": "string"
+                  }
+                },
+                "hashLoading": {
+                  "enum": [
+                    "eager",
+                    "lazy"
+                  ],
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "type": "boolean"
+            }
+          ]
+        },
         "experiments": {
           "title": "Change different experimental cli settings",
           "default": {},
@@ -1644,6 +1737,10 @@
                 "topLevelAwait": {
                   "description": "Allow using top-level-await in EcmaScript Modules.",
                   "type": "boolean"
+                },
+                "deferImport": {
+                  "description": "Enable experimental tc39 proposal https://github.com/tc39/proposal-defer-import-eval. This allows to defer execution of a module until it's first use.",
+                  "type": "boolean"
                 }
               },
               "additionalProperties": false
@@ -1987,23 +2084,23 @@
                         "dotAll": {
                           "type": "boolean"
                         },
-                        "__@match@7844": {
+                        "__@match@8074": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@replace@7846": {
+                        "__@replace@8076": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@search@7849": {
+                        "__@search@8079": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@split@7851": {
+                        "__@split@8081": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@matchAll@7853": {
+                        "__@matchAll@8083": {
                           "type": "object",
                           "additionalProperties": false
                         }
@@ -2350,6 +2447,46 @@
             }
           ]
         },
+        "integrity": {
+          "title": "Integrity generation options",
+          "default": false,
+          "anyOf": [
+            {
+              "type": "object",
+              "properties": {
+                "enabled": {
+                  "enum": [
+                    "auto",
+                    false,
+                    true
+                  ]
+                },
+                "hashFuncNames": {
+                  "type": "array",
+                  "items": {
+                    "enum": [
+                      "sha256",
+                      "sha384",
+                      "sha512"
+                    ],
+                    "type": "string"
+                  }
+                },
+                "hashLoading": {
+                  "enum": [
+                    "eager",
+                    "lazy"
+                  ],
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            {
+              "type": "boolean"
+            }
+          ]
+        },
         "experiments": {
           "title": "Change different experimental cli settings",
           "default": {},
@@ -2395,6 +2532,10 @@
                 "topLevelAwait": {
                   "description": "Allow using top-level-await in EcmaScript Modules.",
                   "type": "boolean"
+                },
+                "deferImport": {
+                  "description": "Enable experimental tc39 proposal https://github.com/tc39/proposal-defer-import-eval. This allows to defer execution of a module until it's first use.",
+                  "type": "boolean"
                 }
               },
               "additionalProperties": false
@@ -2738,23 +2879,23 @@
                         "dotAll": {
                           "type": "boolean"
                         },
-                        "__@match@7844": {
+                        "__@match@8074": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@replace@7846": {
+                        "__@replace@8076": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@search@7849": {
+                        "__@search@8079": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@split@7851": {
+                        "__@split@8081": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@matchAll@7853": {
+                        "__@matchAll@8083": {
                           "type": "object",
                           "additionalProperties": false
                         }

package/src/schema/topLevelSchema.js

@@ -68,6 +68,20 @@ module.exports = (autogeneratedSchema) => {
           },
         },
       },
+      analytics: {
+        type: 'object',
+        additionalProperties: false,
+        properties: {
+          enabled: {
+            title: 'enable @tramvai/cli monitoring',
+            type: 'boolean',
+          },
+          endpoint: {
+            title: '@tramvai/cli monitoring collector endpoint',
+            type: 'string',
+          },
+        },
+      },
     },
   };
 };

package/src/schema/tramvai.spec.ts

@@ -102,6 +102,7 @@ describe('JSON schema для tramvai.json', () => {
               },
               "reactCompiler": false,
               "reactTransitions": false,
+              "runtimeChunk": false,
               "serverRunner": "thread",
               "transpilation": {
                 "loader": "babel",
@@ -126,7 +127,7 @@ describe('JSON schema для tramvai.json', () => {
                 "overlay": false,
               },
             },
-            "modern": true,
+            "integrity": false,
             "name": "test-app",
             "notifications": {},
             "output": {
@@ -194,6 +195,7 @@ describe('JSON schema для tramvai.json', () => {
                 "overlay": false,
               },
             },
+            "integrity": false,
             "name": "test-module",
             "notifications": {},
             "output": "dist/modules",

package/src/typings/build/Builder.ts

@@ -4,7 +4,6 @@ export interface BuilderCustomOptions {
 
 export interface BuilderOptions {
   shouldBuildClient: boolean;
-  onlyModern?: boolean;
   shouldBuildServer: boolean;
 }
 
@@ -29,23 +28,19 @@ interface BuilderStartOptions {
   strictError: boolean;
 }
 
-interface BuilderBuildOptions {
-  modern: boolean;
-}
+interface BuilderBuildOptions {}
 
 interface BuilderAnalyzeOptions {
-  modern?: boolean;
   plugin?: string;
 }
 
 export type GetBuildStats = () => {
   clientBuildTime?: number;
-  clientModernBuildTime?: number;
   serverBuildTime?: number;
   maxMemoryRss?: number;
 };
 
-export type BuildType = 'client' | 'server' | 'clientModern';
+export type BuildType = 'client' | 'server';
 
 export interface BuilderEvents {
   invalid: [];
@@ -60,7 +55,7 @@ export interface Builder<Name extends string> {
     invalidate: () => Promise<void>;
     getBuildStats: GetBuildStats;
   }>;
-  build(options: BuilderBuildOptions): Promise<{
+  build(options?: BuilderBuildOptions): Promise<{
     getBuildStats: GetBuildStats;
   }>;
 

package/src/typings/configEntry/application.ts

@@ -110,6 +110,13 @@ export interface ApplicationExperiments extends Experiments {
    * @default false
    */
   reactTransitions?: boolean;
+
+  /**
+   * @title Webpack Runtime Chunk settings
+   * @see https://webpack.js.org/configuration/optimization/#optimizationruntimechunk
+   * @default false
+   */
+  runtimeChunk?: 'single' | 'multiple' | boolean;
 }
 
 export interface ApplicationConfigEntry extends CliConfigEntry {
@@ -118,6 +125,10 @@ export interface ApplicationConfigEntry extends CliConfigEntry {
    * @title Path to polyfill file. By default, looks for the `src/polyfill`
    */
   polyfill?: string;
+  /**
+   * @title Path to modern polyfill file. By default, looks for the `src/modern-polyfill`
+   */
+  modernPolyfill?: string;
   /**
    * @title Path to folder with papi handlers
    * @default "src/api"
@@ -144,11 +155,6 @@ export interface ApplicationConfigEntry extends CliConfigEntry {
      */
     static: string;
   };
-  /**
-   * @title Enable build for modern browsers
-   * @default true
-   */
-  modern?: boolean;
 
   /**
    * @title File-System Routing feature
@@ -226,7 +232,6 @@ export interface ApplicationConfigEntry extends CliConfigEntry {
    * @default {}
    */
   experiments: ApplicationExperiments;
-
   /**
    * @title Enable generation of stats modules file for polyfill usage analysis
    * @default false

package/src/typings/configEntry/cli.ts

@@ -36,6 +36,15 @@ export type ReactCompilerOptions = {
   panicThreshold?: 'ALL_ERRORS' | 'CRITICAL_ERRORS' | 'NONE';
 };
 
+/**
+ * @see https://github.com/waysact/webpack-subresource-integrity/tree/main/webpack-subresource-integrity#options
+ */
+export interface IntegrityOptions {
+  enabled: boolean | 'auto';
+  hashFuncNames: ('sha256' | 'sha384' | 'sha512')[];
+  hashLoading: 'eager' | 'lazy';
+}
+
 export type WebpackExperiments = Omit<
   Configuration['experiments'],
   'buildHttp' | 'lazyCompilation' | 'css'
@@ -136,6 +145,11 @@ export interface CliConfigEntry extends ConfigEntry {
    * @default false
    */
   sourceMap: OverridableOption<boolean>;
+  /**
+   * @title Integrity generation options
+   * @default false
+   */
+  integrity: boolean | IntegrityOptions;
   /**
    * @title Change different experimental cli settings
    * @default {}

package/src/typings/projectType.ts

@@ -17,4 +17,9 @@ export type Config = {
   projectsConfig?: any;
   $schema?: string;
   projects: { [name: string]: ConfigEntry };
+  analytics?: {
+    enabled?: boolean;
+    endpoint?: string;
+    system?: string;
+  };
 };

package/src/typings/target.ts

@@ -1 +1 @@
-export type Target = 'modern' | 'node' | 'defaults';
+export type Target = 'node' | 'defaults';

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

@@ -1,16 +1,9 @@
-import { parse, minVersion } from 'semver';
-import fs from 'fs';
-
-const getVersionFromDep = (dep?: string) => {
-  if (dep) {
-    return parse(dep)?.version || minVersion(dep)?.version;
-  }
-};
+import fs from 'fs/promises';
 
 export const findTramvaiVersion = async () => {
-  const file = fs.readFileSync('package.json');
-  const content = JSON.parse(file.toString());
-  const currentVersion = getVersionFromDep(content.devDependencies['@tramvai/cli']);
+  const file = await fs.readFile('package.json', { encoding: 'utf-8' });
+
+  const content = JSON.parse(file);
 
-  return currentVersion;
+  return content.devDependencies['@tramvai/cli'] ?? content.dependencies['@tramvai/cli'];
 };

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

@@ -1,14 +1,22 @@
 import ora from 'ora';
 import latestVersion from 'latest-version';
 
-export const getLatestPackageVersion = async (packageName: string, version = 'latest') => {
-  const spinner = ora(`Resolving the highest version satifying to ${version}`).start();
+export const getLatestPackageVersion = async (
+  packageName: string,
+  version = 'latest',
+  silent = false
+) => {
+  const spinner = silent
+    ? null
+    : ora(`Resolving the highest version satifying to ${version}`).start();
 
   try {
     const result = await latestVersion(packageName, { version });
 
     return result;
   } finally {
-    spinner.stop();
+    if (spinner) {
+      spinner.stop();
+    }
   }
 };

package/src/utils/cpu-profile.ts

@@ -1,6 +1,11 @@
 import { Session } from 'inspector';
 import fs from 'fs';
 
+declare global {
+  // eslint-disable-next-line no-var, vars-on-top
+  var __TRAMVAI_EXIT_HANDLERS__: Array<() => Promise<any>>;
+}
+
 // reference - https://github.com/vercel/next.js/blob/canary/packages/next/src/server/lib/cpu-profile.ts
 export function enableCpuProfile(key: string) {
   const session = new Session();
@@ -30,7 +35,13 @@ export function enableCpuProfile(key: string) {
     });
   }
 
-  process.on('SIGINT', saveProfile);
-  process.on('SIGTERM', saveProfile);
-  process.on('exit', saveProfile);
+  // CLI will wait for this handlers before exiting
+  // @reference `packages/cli/src/cli/runCLI.ts`
+  if (!global.__TRAMVAI_EXIT_HANDLERS__) {
+    global.__TRAMVAI_EXIT_HANDLERS__ = [];
+  }
+
+  global.__TRAMVAI_EXIT_HANDLERS__.push(async () => {
+    saveProfile();
+  });
 }