@tramvai/cli 6.68.4 → 6.77.2

package/schema.json

@@ -933,6 +933,69 @@
                             "type": "string"
                           }
                         ]
+                      },
+                      "include": {
+                        "cli_overridable": "",
+                        "title": "customize transpiling of node_modules in prod/dev environments",
+                        "default": "only-modern",
+                        "anyOf": [
+                          {
+                            "type": "array",
+                            "items": {
+                              "type": "string"
+                            }
+                          },
+                          {
+                            "type": "object",
+                            "properties": {
+                              "development": {
+                                "anyOf": [
+                                  {
+                                    "type": "array",
+                                    "items": {
+                                      "type": "string"
+                                    }
+                                  },
+                                  {
+                                    "enum": [
+                                      "all",
+                                      "none",
+                                      "only-modern"
+                                    ],
+                                    "type": "string"
+                                  }
+                                ]
+                              },
+                              "production": {
+                                "anyOf": [
+                                  {
+                                    "type": "array",
+                                    "items": {
+                                      "type": "string"
+                                    }
+                                  },
+                                  {
+                                    "enum": [
+                                      "all",
+                                      "none",
+                                      "only-modern"
+                                    ],
+                                    "type": "string"
+                                  }
+                                ]
+                              }
+                            },
+                            "additionalProperties": false
+                          },
+                          {
+                            "enum": [
+                              "all",
+                              "none",
+                              "only-modern"
+                            ],
+                            "type": "string"
+                          }
+                        ]
                       }
                     },
                     "additionalProperties": false
@@ -1311,23 +1374,23 @@
                               "dotAll": {
                                 "type": "boolean"
                               },
-                              "__@match@8920": {
+                              "__@match@9310": {
                                 "type": "object",
                                 "additionalProperties": false
                               },
-                              "__@replace@8922": {
+                              "__@replace@9312": {
                                 "type": "object",
                                 "additionalProperties": false
                               },
-                              "__@search@8925": {
+                              "__@search@9315": {
                                 "type": "object",
                                 "additionalProperties": false
                               },
-                              "__@split@8927": {
+                              "__@split@9317": {
                                 "type": "object",
                                 "additionalProperties": false
                               },
-                              "__@matchAll@8929": {
+                              "__@matchAll@9319": {
                                 "type": "object",
                                 "additionalProperties": false
                               }
@@ -1844,6 +1907,69 @@
                               "type": "string"
                             }
                           ]
+                        },
+                        "include": {
+                          "cli_overridable": "",
+                          "title": "customize transpiling of node_modules in prod/dev environments",
+                          "default": "only-modern",
+                          "anyOf": [
+                            {
+                              "type": "array",
+                              "items": {
+                                "type": "string"
+                              }
+                            },
+                            {
+                              "type": "object",
+                              "properties": {
+                                "development": {
+                                  "anyOf": [
+                                    {
+                                      "type": "array",
+                                      "items": {
+                                        "type": "string"
+                                      }
+                                    },
+                                    {
+                                      "enum": [
+                                        "all",
+                                        "none",
+                                        "only-modern"
+                                      ],
+                                      "type": "string"
+                                    }
+                                  ]
+                                },
+                                "production": {
+                                  "anyOf": [
+                                    {
+                                      "type": "array",
+                                      "items": {
+                                        "type": "string"
+                                      }
+                                    },
+                                    {
+                                      "enum": [
+                                        "all",
+                                        "none",
+                                        "only-modern"
+                                      ],
+                                      "type": "string"
+                                    }
+                                  ]
+                                }
+                              },
+                              "additionalProperties": false
+                            },
+                            {
+                              "enum": [
+                                "all",
+                                "none",
+                                "only-modern"
+                              ],
+                              "type": "string"
+                            }
+                          ]
                         }
                       },
                       "additionalProperties": false
@@ -2115,23 +2241,23 @@
                                 "dotAll": {
                                   "type": "boolean"
                                 },
-                                "__@match@8920": {
+                                "__@match@9310": {
                                   "type": "object",
                                   "additionalProperties": false
                                 },
-                                "__@replace@8922": {
+                                "__@replace@9312": {
                                   "type": "object",
                                   "additionalProperties": false
                                 },
-                                "__@search@8925": {
+                                "__@search@9315": {
                                   "type": "object",
                                   "additionalProperties": false
                                 },
-                                "__@split@8927": {
+                                "__@split@9317": {
                                   "type": "object",
                                   "additionalProperties": false
                                 },
-                                "__@matchAll@8929": {
+                                "__@matchAll@9319": {
                                   "type": "object",
                                   "additionalProperties": false
                                 }
@@ -2648,6 +2774,69 @@
                                 "type": "string"
                               }
                             ]
+                          },
+                          "include": {
+                            "cli_overridable": "",
+                            "title": "customize transpiling of node_modules in prod/dev environments",
+                            "default": "only-modern",
+                            "anyOf": [
+                              {
+                                "type": "array",
+                                "items": {
+                                  "type": "string"
+                                }
+                              },
+                              {
+                                "type": "object",
+                                "properties": {
+                                  "development": {
+                                    "anyOf": [
+                                      {
+                                        "type": "array",
+                                        "items": {
+                                          "type": "string"
+                                        }
+                                      },
+                                      {
+                                        "enum": [
+                                          "all",
+                                          "none",
+                                          "only-modern"
+                                        ],
+                                        "type": "string"
+                                      }
+                                    ]
+                                  },
+                                  "production": {
+                                    "anyOf": [
+                                      {
+                                        "type": "array",
+                                        "items": {
+                                          "type": "string"
+                                        }
+                                      },
+                                      {
+                                        "enum": [
+                                          "all",
+                                          "none",
+                                          "only-modern"
+                                        ],
+                                        "type": "string"
+                                      }
+                                    ]
+                                  }
+                                },
+                                "additionalProperties": false
+                              },
+                              {
+                                "enum": [
+                                  "all",
+                                  "none",
+                                  "only-modern"
+                                ],
+                                "type": "string"
+                              }
+                            ]
                           }
                         },
                         "additionalProperties": false
@@ -2919,23 +3108,23 @@
                                   "dotAll": {
                                     "type": "boolean"
                                   },
-                                  "__@match@8920": {
+                                  "__@match@9310": {
                                     "type": "object",
                                     "additionalProperties": false
                                   },
-                                  "__@replace@8922": {
+                                  "__@replace@9312": {
                                     "type": "object",
                                     "additionalProperties": false
                                   },
-                                  "__@search@8925": {
+                                  "__@search@9315": {
                                     "type": "object",
                                     "additionalProperties": false
                                   },
-                                  "__@split@8927": {
+                                  "__@split@9317": {
                                     "type": "object",
                                     "additionalProperties": false
                                   },
-                                  "__@matchAll@8929": {
+                                  "__@matchAll@9319": {
                                     "type": "object",
                                     "additionalProperties": false
                                   }

package/src/api/analyze/index.ts

@@ -1,8 +1,5 @@
 import type { Provider } from '@tinkoff/dippy';
 import { createCommand } from '../../commands/createCommand';
-import { ABSTRACT_BUILDER_FACTORY_TOKEN, COMMAND_PARAMETERS_TOKEN } from '../../di/tokens';
-import { registerProviders } from '../../utils/di';
-import { sharedProviders } from './providers/shared';
 
 export interface Params {
   target: string;
@@ -17,18 +14,8 @@ export type AnalyzeCommand = (params: Params, providers?: Provider[]) => Promise
 export default createCommand({
   name: 'analyze',
   command: async (di): Promise<void> => {
-    const { plugin } = di.get(COMMAND_PARAMETERS_TOKEN) as Params;
-
-    registerProviders(di, sharedProviders);
-
-    const builderFactory = di.get(ABSTRACT_BUILDER_FACTORY_TOKEN);
-    const builder = await builderFactory.createBuilder('webpack', {
-      options: {
-        shouldBuildClient: true,
-        shouldBuildServer: false,
-      },
-    });
-
-    await builder.analyze({ plugin });
+    throw new Error(
+      'tramvai analyze is deprecated, please use `tramvai start|build --analyze=pluginName`\n'
+    );
   },
 });

package/src/api/index.ts

@@ -33,8 +33,8 @@ const app = createApp({
   commands: {
     start: () => import('./start'),
     build: () => import('./build'),
-    benchmark: () => import('./benchmark'),
     analyze: () => import('./analyze'),
+    benchmark: () => import('./benchmark'),
     'start-prod': () => import('./start-prod'),
   },
   providers: [

package/src/api/start/application.experimental.ts

@@ -26,6 +26,7 @@ export const startApplicationExperimental = async (di: Container): Result => {
     mode: 'development',
     benchmark: options.benchmark,
     buildType: options.buildType,
+    analyze: options.analyze,
     port: options.port,
     host: options.host,
     staticPort: options.staticPort,
@@ -276,6 +277,19 @@ function mapTramvaiJsonToNewTsConfig({ rootDir }: { rootDir: string }) {
         }
         mappedProject.webpack.devtool = applicationProject.webpack.devtool;
       }
+      if (applicationProject.experiments?.transpilation) {
+        const applicationProjectInclude = applicationProject.experiments.transpilation.include;
+        mappedProject.transpilation = {
+          include: {
+            development:
+              typeof applicationProjectInclude === 'string' ||
+              Array.isArray(applicationProjectInclude)
+                ? applicationProjectInclude
+                : // @ts-ignore
+                  applicationProjectInclude.development,
+          },
+        };
+      }
       if (applicationProject.experiments?.pwa) {
         mappedProject.pwa = {
           workbox: {

package/src/api/start/index.ts

@@ -24,6 +24,7 @@ export type Params = WithConfig<{
   noClientRebuild?: boolean;
   resolveSymlinks?: boolean;
   showConfig?: boolean;
+  analyze?: false | 'bundle' | 'whybundled' | 'statoscope' | 'rsdoctor';
   benchmark?: boolean;
   withBuildStats?: boolean;
   // @todo: not working?

package/src/builder/webpack/analyzePlugins/rsdoctor.ts

@@ -1,4 +1,4 @@
-import { RsdoctorWebpackPlugin } from '@rsdoctor/webpack-plugin';
+import type { RsdoctorWebpackPlugin } from '@rsdoctor/webpack-plugin';
 import { AnalyzePlugin } from '../types';
 
 type options = ConstructorParameters<typeof RsdoctorWebpackPlugin<[]>>;
@@ -7,8 +7,11 @@ export class RsdoctorAnalyzePlugin extends AnalyzePlugin {
 
   options: options = [];
 
-  plugin = RsdoctorWebpackPlugin;
-
   // rsdoctor поднимает dev server
   afterBuild = () => new Promise(() => null);
+
+  get plugin() {
+    // eslint-disable-next-line import/no-unresolved
+    return require('@rsdoctor/webpack-plugin').RsdoctorWebpackMultiplePlugin;
+  }
 }

package/src/builder/webpack/index.ts

@@ -27,7 +27,6 @@ import { buildClientProviders } from './providers/build/client';
 import { buildServerProviders } from './providers/build/server';
 import { CONFIG_MANAGER_TOKEN } from '../../di/tokens';
 import { buildApplicationServerProviders } from './providers/build/application/server';
-import { analyzeSharedProviders } from './providers/analyze/shared';
 
 const BUILDER_NAME = 'webpack';
 
@@ -53,6 +52,14 @@ export const webpackProviders: Provider[] = [
                 ...(shouldBuildServer ? startServerProviders : []),
               ]);
 
+              const configManager = di.get(CONFIG_MANAGER_TOKEN);
+              if (configManager.analyze) {
+                di.register({
+                  provide: WEBPACK_ANALYZE_PLUGIN_NAME_TOKEN,
+                  useValue: configManager.analyze,
+                });
+              }
+
               await runHandlers(di.get({ token: INIT_HANDLER_TOKEN, optional: true, multi: true }));
 
               const getBuildStats = di.get(GET_BUILD_STATS_TOKEN);
@@ -89,9 +96,13 @@ export const webpackProviders: Provider[] = [
                 ...(shouldBuildServer ? buildServerProviders : []),
               ]);
 
-              await runHandlers(di.get({ token: INIT_HANDLER_TOKEN, optional: true, multi: true }));
-
               const configManager = di.get(CONFIG_MANAGER_TOKEN);
+              if (configManager.analyze) {
+                di.register({
+                  provide: WEBPACK_ANALYZE_PLUGIN_NAME_TOKEN,
+                  useValue: configManager.analyze,
+                });
+              }
 
               if (configManager.type === 'application') {
                 registerProviders(di, [
@@ -99,6 +110,8 @@ export const webpackProviders: Provider[] = [
                 ]);
               }
 
+              await runHandlers(di.get({ token: INIT_HANDLER_TOKEN, optional: true, multi: true }));
+
               const getBuildStats = di.get(GET_BUILD_STATS_TOKEN);
 
               await runHandlers(
@@ -113,24 +126,6 @@ export const webpackProviders: Provider[] = [
                 getBuildStats,
               };
             },
-            async analyze({ plugin }) {
-              di.register({
-                provide: WEBPACK_ANALYZE_PLUGIN_NAME_TOKEN,
-                useValue: plugin || 'bundle',
-              });
-
-              registerProviders(di, analyzeSharedProviders);
-
-              await runHandlers(di.get({ token: INIT_HANDLER_TOKEN, optional: true, multi: true }));
-
-              await runHandlers(
-                di.get({ token: PROCESS_HANDLER_TOKEN, optional: true, multi: true })
-              );
-
-              await runHandlers(
-                di.get({ token: CLOSE_HANDLER_TOKEN, optional: true, multi: true })
-              );
-            },
             on(event, callback) {
               di.get(EVENT_EMITTER_TOKEN).on(event, callback);
             },

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

@@ -6,6 +6,7 @@ import {
   CLIENT_CONFIG_MANAGER_TOKEN,
   CLOSE_HANDLER_TOKEN,
   PROCESS_HANDLER_TOKEN,
+  WEBPACK_ANALYZE_PLUGIN_TOKEN,
   WEBPACK_CLIENT_COMPILER_TOKEN,
   WEBPACK_CLIENT_CONFIG_TOKEN,
 } from '../../tokens';
@@ -27,12 +28,16 @@ export const buildClientProviders: Provider[] = [
   }),
   provide({
     provide: WEBPACK_CLIENT_COMPILER_TOKEN,
-    useFactory: ({ webpackConfig, di }) => {
-      return createCompiler(toWebpackConfig(webpackConfig), di);
+    useFactory: ({ webpackConfig, di, analyzePlugin }) => {
+      return createCompiler(
+        toWebpackConfig(analyzePlugin ? analyzePlugin.patchConfig(webpackConfig) : webpackConfig),
+        di
+      );
     },
     deps: {
       webpackConfig: WEBPACK_CLIENT_CONFIG_TOKEN,
       di: DI_TOKEN,
+      analyzePlugin: { token: WEBPACK_ANALYZE_PLUGIN_TOKEN, optional: true },
     },
   }),
   provide({

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

@@ -8,6 +8,7 @@ import {
   INIT_HANDLER_TOKEN,
   PROCESS_HANDLER_TOKEN,
   SERVER_CONFIG_MANAGER_TOKEN,
+  WEBPACK_ANALYZE_PLUGIN_TOKEN,
   WEBPACK_SERVER_COMPILER_TOKEN,
   WEBPACK_SERVER_CONFIG_TOKEN,
 } from '../../tokens';
@@ -18,12 +19,16 @@ import { createCompiler } from '../../utils/compiler';
 export const buildServerProviders: Provider[] = [
   provide({
     provide: WEBPACK_SERVER_COMPILER_TOKEN,
-    useFactory: ({ webpackConfig, di }) => {
-      return createCompiler(toWebpackConfig(webpackConfig), di);
+    useFactory: ({ webpackConfig, di, analyzePlugin }) => {
+      return createCompiler(
+        toWebpackConfig(analyzePlugin ? analyzePlugin.patchConfig(webpackConfig) : webpackConfig),
+        di
+      );
     },
     deps: {
       webpackConfig: WEBPACK_SERVER_CONFIG_TOKEN,
       di: DI_TOKEN,
+      analyzePlugin: { token: WEBPACK_ANALYZE_PLUGIN_TOKEN, optional: true },
     },
   }),
   provide({

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

@@ -11,8 +11,26 @@ import {
   INIT_HANDLER_TOKEN,
   WEBPACK_CLIENT_COMPILER_TOKEN,
   WEBPACK_SERVER_COMPILER_TOKEN,
+  WEBPACK_ANALYZE_PLUGIN_NAME_TOKEN,
+  WEBPACK_ANALYZE_PLUGIN_TOKEN,
 } from '../tokens';
 import { emitWebpackEvents } from '../utils/webpackEvents';
+import { BundleAnalyzePlugin } from '../analyzePlugins/bundle';
+import { StatoscopeAnalyzePlugin } from '../analyzePlugins/statoscope';
+import { WhyBundledAnalyzePlugin } from '../analyzePlugins/whyBundled';
+import { RsdoctorAnalyzePlugin } from '../analyzePlugins/rsdoctor';
+import type { AnalyzePlugin } from '../types';
+
+interface Type<T> extends Function {
+  new (...args: any[]): T;
+}
+
+const pluginMap: Record<string, Type<AnalyzePlugin>> = {
+  bundle: BundleAnalyzePlugin,
+  whybundled: WhyBundledAnalyzePlugin,
+  statoscope: StatoscopeAnalyzePlugin,
+  rsdoctor: RsdoctorAnalyzePlugin,
+};
 
 export const sharedProviders: Provider[] = [
   provide({
@@ -46,6 +64,27 @@ export const sharedProviders: Provider[] = [
       serverCompiler: { token: WEBPACK_SERVER_COMPILER_TOKEN, optional: true },
     },
   }),
+  provide({
+    provide: WEBPACK_ANALYZE_PLUGIN_TOKEN,
+    useFactory: ({ pluginName }) => {
+      if (!pluginName) {
+        return;
+      }
+
+      const PluginClass = pluginMap[pluginName];
+
+      if (!PluginClass) {
+        throw new Error(
+          'Set correct value for --analytics cli option, <bundle|whybundled|statoscope|rsdoctor>\n'
+        );
+      }
+
+      return new PluginClass();
+    },
+    deps: {
+      pluginName: WEBPACK_ANALYZE_PLUGIN_NAME_TOKEN,
+    },
+  }),
   provide({
     provide: EVENT_EMITTER_TOKEN,
     useClass: EventEmitter,
@@ -80,13 +119,18 @@ export const sharedProviders: Provider[] = [
   provide({
     provide: CLOSE_HANDLER_TOKEN,
     multi: true,
-    useFactory: ({ configManager }) => {
+    useFactory: ({ configManager, analyzePlugin }) => {
       return async () => {
         await closeWorkerPool(configManager);
+
+        if (analyzePlugin) {
+          return analyzePlugin.afterBuild();
+        }
       };
     },
     deps: {
       configManager: CONFIG_MANAGER_TOKEN,
+      analyzePlugin: { token: WEBPACK_ANALYZE_PLUGIN_TOKEN, optional: true },
     },
   }),
 ];

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

@@ -9,6 +9,7 @@ import {
   WEBPACK_COMPILER_TOKEN,
   WEBPACK_SERVER_COMPILER_TOKEN,
   WEBPACK_SERVER_CONFIG_TOKEN,
+  WEBPACK_ANALYZE_PLUGIN_TOKEN,
 } from '../../tokens';
 import { createDevServer } from '../../devServer/setup';
 import { CONFIG_MANAGER_TOKEN, STATIC_SERVER_TOKEN } from '../../../../di/tokens';
@@ -16,8 +17,11 @@ import { CONFIG_MANAGER_TOKEN, STATIC_SERVER_TOKEN } from '../../../../di/tokens
 export const startSharedProviders: Provider[] = [
   provide({
     provide: WEBPACK_COMPILER_TOKEN,
-    useFactory: ({ clientConfig, serverConfig }) => {
-      const configs = [clientConfig, serverConfig].filter(Boolean).map(toWebpackConfig);
+    useFactory: ({ clientConfig, serverConfig, analyzePlugin }) => {
+      const configs = [clientConfig, serverConfig]
+        .filter(Boolean)
+        .map((config) => (analyzePlugin ? analyzePlugin.patchConfig(config) : config))
+        .map(toWebpackConfig);
       const multiCompiler = webpack(configs);
       const { inputFileSystem } = multiCompiler.compilers[0];
 
@@ -51,6 +55,7 @@ export const startSharedProviders: Provider[] = [
     deps: {
       clientConfig: { token: WEBPACK_CLIENT_CONFIG_TOKEN, optional: true },
       serverConfig: { token: WEBPACK_SERVER_CONFIG_TOKEN, optional: true },
+      analyzePlugin: { token: WEBPACK_ANALYZE_PLUGIN_TOKEN, optional: true },
     },
   }),
   provide({

package/src/cli/index.ts

@@ -14,8 +14,8 @@ import buildCommand from '../commands/build/command';
 import { StartCommand } from '../commands/start/command';
 import lintCommand from '../commands/lint/command';
 import taskCommand from '../commands/task/command';
-import analyze from '../commands/analyze/command';
 import generate from '../commands/generate/command';
+import analyze from '../commands/analyze/command';
 import newCommand from '../commands/new/command';
 import updateCommand from '../commands/update/command';
 import addCommand from '../commands/add/command';
@@ -29,15 +29,16 @@ import type { TaskMap } from '../models/task';
 import { getRootFile } from '../utils/getRootFile';
 import { getTramvaiConfig } from '../utils/getTramvaiConfig';
 import { syncJsonFile } from '../utils/syncJsonFile';
+import AnalyzeCommand from '../commands/analyze/command';
 
 async function loadCommands(): Promise<CommandMap> {
   return [
     buildCommand,
+    AnalyzeCommand,
     StartProdCommand,
     StartCommand,
     lintCommand,
     taskCommand,
-    analyze,
     generate,
     newCommand,
     updateCommand,

package/src/commands/analyze/command.ts

@@ -2,7 +2,7 @@ import { CLICommand } from '../../models/command';
 
 export type Params = {
   target: string;
-  plugin?: 'bundle' | 'whybundled' | 'statoscope';
+  plugin?: 'bundle' | 'whybundled' | 'statoscope' | 'rsdoctor';
   showConfig?: boolean;
 };