@tramvai/cli 5.49.1 → 6.59.0

package/src/models/analytics/utils.ts

@@ -0,0 +1,126 @@
+import { FeaturesProperties, ProjectProperties } from '@tramvai/api/lib/services/analytics';
+import { ConfigEntry } from '../../typings/configEntry/common';
+import { ConfigManager } from '../config';
+import { ApplicationConfigEntry, ChildAppConfigEntry } from '../../api';
+
+const projectCache: { [key: string]: ProjectProperties } = {};
+const featuresCache: { [key: string]: FeaturesProperties } = {};
+
+const safeRequireResolve = (path: string) => {
+  try {
+    return require.resolve(path);
+  } catch (error) {
+    return null;
+  }
+};
+
+export function getProjectProperties({
+  parameters,
+  configManager,
+}: {
+  parameters: { target?: string };
+  configManager: ConfigManager;
+}): ProjectProperties {
+  const projectName = parameters.target ?? 'unknown';
+  let project: ConfigEntry;
+
+  if (projectCache[projectName]) {
+    return projectCache[projectName];
+  }
+
+  try {
+    project = configManager.getProject(projectName);
+  } catch (error) {
+    // do nothing
+  }
+
+  projectCache[projectName] = {
+    name: project.name,
+    type: project?.type ?? 'unknown',
+  };
+
+  return projectCache[projectName];
+}
+
+// eslint-disable-next-line max-statements
+export function getFeaturesProperties({
+  parameters,
+  configManager,
+}: {
+  parameters: { target?: string; experimentalWebpackWorkerThreads?: boolean };
+  configManager: ConfigManager;
+}): FeaturesProperties {
+  const projectName = parameters.target ?? 'unknown';
+  let project: ConfigEntry;
+
+  if (featuresCache[projectName]) {
+    return featuresCache[projectName];
+  }
+
+  try {
+    project = configManager.getProject(projectName);
+  } catch (error) {
+    // do nothing
+  }
+
+  featuresCache[projectName] = {};
+
+  if (project) {
+    if (project.type === 'application') {
+      const applicationProject = project as ApplicationConfigEntry;
+      const transpilationLoader = applicationProject.experiments?.transpilation?.loader;
+
+      featuresCache[projectName].swc =
+        // @ts-expect-error incorrect branded type
+        (transpilationLoader === 'swc' ||
+          transpilationLoader?.development === 'swc' ||
+          transpilationLoader?.production === 'swc') ??
+        false;
+
+      featuresCache[projectName].fileSystemRouting =
+        applicationProject.fileSystemPages?.enabled ?? false;
+
+      featuresCache[projectName].reactCompiler =
+        !!applicationProject.experiments?.reactCompiler ?? false;
+
+      featuresCache[projectName].devTools = !!safeRequireResolve('@tramvai/module-dev-tools');
+
+      featuresCache[projectName].moduleImage = !!safeRequireResolve(
+        '@tramvai-tinkoff/module-image'
+      );
+
+      featuresCache[projectName].modulePwa = !!safeRequireResolve(
+        '@tramvai/module-progressive-web-app'
+      );
+
+      featuresCache[projectName].viewTransitions =
+        !!applicationProject.experiments?.viewTransitions ?? false;
+
+      featuresCache[projectName].transitionsRouterProvider =
+        !!(
+          applicationProject.experiments?.viewTransitions ||
+          applicationProject.experiments?.reactTransitions
+        ) ?? false;
+
+      featuresCache[projectName].experimentalWebpackWorkerThreads =
+        parameters.experimentalWebpackWorkerThreads;
+    }
+
+    if (project.type === 'child-app') {
+      const childAppProject = project as ChildAppConfigEntry;
+      const transpilationLoader = childAppProject.experiments?.transpilation?.loader;
+
+      featuresCache[projectName].swc =
+        // @ts-expect-error incorrect branded type
+        (transpilationLoader === 'swc' ||
+          transpilationLoader?.development === 'swc' ||
+          transpilationLoader?.production === 'swc') ??
+        false;
+
+      featuresCache[projectName].reactCompiler =
+        !!childAppProject.experiments?.reactCompiler ?? false;
+    }
+  }
+
+  return featuresCache[projectName];
+}

package/src/models/command.ts

@@ -23,8 +23,6 @@ type validator<TParams> = (
 ) => Promise<{ name: string; status: string; message?: string }>;
 
 export abstract class Command<TParams = any> {
-  readonly validators?: validator<TParams>[];
-
   abstract readonly name: string;
 
   abstract readonly description: string;
@@ -39,6 +37,8 @@ export abstract class Command<TParams = any> {
 
   help?(): string[];
 
+  validators?(): validator<TParams>[];
+
   protected abstract action(parameters: TParams): Promise<CommandResult>;
 
   protected abstract analyticEventLabel?(parameters: TParams): string;
@@ -65,15 +65,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> {
@@ -81,7 +73,7 @@ export abstract class CLICommand<
       return;
     }
 
-    const result = await Promise.all(this.validators.map((fn) => fn(this.context, parameters)));
+    const result = await Promise.all(this.validators().map((fn) => fn(this.context, parameters)));
 
     result.forEach((item) => {
       if (item.message) {

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 { AnalyticsService } from '@tramvai/api/lib/services/analytics';
 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';
 
 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

@@ -30,7 +30,7 @@ export class Logger {
         event.message,
         event.payload ?? ''
       );
-    } else if (event.type === 'info' || process.env.DEBUG_MODE === 'true') {
+    } else if (event.type === 'info' || process.env.TRAMVAI_LOG_LEVEL === 'debug') {
       console.log(
         chalk.bgMagenta(event.type),
         chalk.magenta(event.event),

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@8914": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@replace@7846": {
+                        "__@replace@8916": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@search@7849": {
+                        "__@search@8919": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@split@7851": {
+                        "__@split@8921": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@matchAll@7853": {
+                        "__@matchAll@8923": {
                           "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@8914": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@replace@7846": {
+                        "__@replace@8916": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@search@7849": {
+                        "__@search@8919": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@split@7851": {
+                        "__@split@8921": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@matchAll@7853": {
+                        "__@matchAll@8923": {
                           "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@8914": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@replace@7846": {
+                        "__@replace@8916": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@search@7849": {
+                        "__@search@8919": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@split@7851": {
+                        "__@split@8921": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@matchAll@7853": {
+                        "__@matchAll@8923": {
                           "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;
   }>;