@tramvai/cli 3.27.4 → 3.30.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/cli",
-  "version": "3.27.4",
+  "version": "3.30.1",
   "description": "Cli инструмент для сборки и запуска приложений",
   "files": [
     "src",
@@ -56,6 +56,7 @@
     "@discoveryjs/json-ext": "^0.5.7",
     "@fastify/compress": "^6.2.0",
     "@fastify/static": "^6.9.0",
+    "@loadable/webpack-plugin": "^5.15.0",
     "@module-federation/node": "^0.15.1",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.10",
     "@sentry/node": "^6.2.5",
@@ -67,11 +68,11 @@
     "@tinkoff/minicss-class-generator": "0.3.1",
     "@tinkoff/package-manager-wrapper": "0.2.2",
     "@tinkoff/request-core": "^0.9.2",
-    "@tinkoff/request-plugin-protocol-http": "^0.11.8",
+    "@tinkoff/request-plugin-protocol-http": "^0.12.1",
     "@tinkoff/utils": "^2.1.3",
     "@tinkoff/webpack-dedupe-plugin": "2.0.2",
     "@tramvai/build": "4.1.1",
-    "@tramvai/react": "3.27.4",
+    "@tramvai/react": "3.30.1",
     "@tramvai/tools-check-versions": "0.5.3",
     "@tramvai/tools-migrate": "0.7.3",
     "ajv": "^8.12.0",

package/schema.json

@@ -918,6 +918,40 @@
                       }
                     },
                     "additionalProperties": false
+                  },
+                  "minifier": {
+                    "cli_overridable": "",
+                    "title": "specify minifer for terser plugin",
+                    "default": "terser",
+                    "anyOf": [
+                      {
+                        "type": "object",
+                        "properties": {
+                          "development": {
+                            "enum": [
+                              "swc",
+                              "terser"
+                            ],
+                            "type": "string"
+                          },
+                          "production": {
+                            "enum": [
+                              "swc",
+                              "terser"
+                            ],
+                            "type": "string"
+                          }
+                        },
+                        "additionalProperties": false
+                      },
+                      {
+                        "enum": [
+                          "swc",
+                          "terser"
+                        ],
+                        "type": "string"
+                      }
+                    ]
                   }
                 },
                 "additionalProperties": false
@@ -1166,23 +1200,23 @@
                               "dotAll": {
                                 "type": "boolean"
                               },
-                              "__@match@6855": {
+                              "__@match@6864": {
                                 "type": "object",
                                 "additionalProperties": false
                               },
-                              "__@replace@6857": {
+                              "__@replace@6866": {
                                 "type": "object",
                                 "additionalProperties": false
                               },
-                              "__@search@6860": {
+                              "__@search@6869": {
                                 "type": "object",
                                 "additionalProperties": false
                               },
-                              "__@split@6862": {
+                              "__@split@6871": {
                                 "type": "object",
                                 "additionalProperties": false
                               },
-                              "__@matchAll@6864": {
+                              "__@matchAll@6873": {
                                 "type": "object",
                                 "additionalProperties": false
                               }
@@ -1658,6 +1692,40 @@
                         }
                       },
                       "additionalProperties": false
+                    },
+                    "minifier": {
+                      "cli_overridable": "",
+                      "title": "specify minifer for terser plugin",
+                      "default": "terser",
+                      "anyOf": [
+                        {
+                          "type": "object",
+                          "properties": {
+                            "development": {
+                              "enum": [
+                                "swc",
+                                "terser"
+                              ],
+                              "type": "string"
+                            },
+                            "production": {
+                              "enum": [
+                                "swc",
+                                "terser"
+                              ],
+                              "type": "string"
+                            }
+                          },
+                          "additionalProperties": false
+                        },
+                        {
+                          "enum": [
+                            "swc",
+                            "terser"
+                          ],
+                          "type": "string"
+                        }
+                      ]
                     }
                   },
                   "additionalProperties": false
@@ -1844,23 +1912,23 @@
                                 "dotAll": {
                                   "type": "boolean"
                                 },
-                                "__@match@6855": {
+                                "__@match@6864": {
                                   "type": "object",
                                   "additionalProperties": false
                                 },
-                                "__@replace@6857": {
+                                "__@replace@6866": {
                                   "type": "object",
                                   "additionalProperties": false
                                 },
-                                "__@search@6860": {
+                                "__@search@6869": {
                                   "type": "object",
                                   "additionalProperties": false
                                 },
-                                "__@split@6862": {
+                                "__@split@6871": {
                                   "type": "object",
                                   "additionalProperties": false
                                 },
-                                "__@matchAll@6864": {
+                                "__@matchAll@6873": {
                                   "type": "object",
                                   "additionalProperties": false
                                 }
@@ -2336,6 +2404,40 @@
                           }
                         },
                         "additionalProperties": false
+                      },
+                      "minifier": {
+                        "cli_overridable": "",
+                        "title": "specify minifer for terser plugin",
+                        "default": "terser",
+                        "anyOf": [
+                          {
+                            "type": "object",
+                            "properties": {
+                              "development": {
+                                "enum": [
+                                  "swc",
+                                  "terser"
+                                ],
+                                "type": "string"
+                              },
+                              "production": {
+                                "enum": [
+                                  "swc",
+                                  "terser"
+                                ],
+                                "type": "string"
+                              }
+                            },
+                            "additionalProperties": false
+                          },
+                          {
+                            "enum": [
+                              "swc",
+                              "terser"
+                            ],
+                            "type": "string"
+                          }
+                        ]
                       }
                     },
                     "additionalProperties": false
@@ -2522,23 +2624,23 @@
                                   "dotAll": {
                                     "type": "boolean"
                                   },
-                                  "__@match@6855": {
+                                  "__@match@6864": {
                                     "type": "object",
                                     "additionalProperties": false
                                   },
-                                  "__@replace@6857": {
+                                  "__@replace@6866": {
                                     "type": "object",
                                     "additionalProperties": false
                                   },
-                                  "__@search@6860": {
+                                  "__@search@6869": {
                                     "type": "object",
                                     "additionalProperties": false
                                   },
-                                  "__@split@6862": {
+                                  "__@split@6871": {
                                     "type": "object",
                                     "additionalProperties": false
                                   },
-                                  "__@matchAll@6864": {
+                                  "__@matchAll@6873": {
                                     "type": "object",
                                     "additionalProperties": false
                                   }

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

@@ -9,7 +9,7 @@ import type { ApplicationConfigEntry } from '../../../../../../typings/configEnt
 import type { SplitChunksOptions } from '../../../../types/webpack';
 
 // based on [nextjs code](https://github.com/vercel/next.js/blob/aaeb349ce3e8c4c3435a43a29af4379266818e7b/packages/next/build/webpack-config.ts#L707)
-const resolveFrameworksPaths = (rootDir: string, frameworksList: string[]) => {
+export const resolveFrameworksPaths = (rootDir: string, frameworksList: string[]) => {
   const topLevelFrameworkPaths: string[] = [];
   const visitedFrameworkPackages = new Set<string>();
 

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

@@ -56,6 +56,10 @@ export const webpackServerConfig = ({
   } else {
     config.plugin('terser').use(TerserPlugin, [
       {
+        minify:
+          configManager.experiments.minifier === 'swc'
+            ? TerserPlugin.swcMinify
+            : TerserPlugin.terserMinify,
         extractComments: false,
         terserOptions: {
           ecma: 5, // на сервере в страницу встраивается код, который может подключаться через import и terser его соптимизирует в es6

package/src/library/webpack/blocks/optimize.ts

@@ -50,6 +50,10 @@ export default (configManager: ConfigManager<CliConfigEntry>) => (config: Config
   config.plugin('terser').use(TerserPlugin, [
     {
       extractComments: false,
+      minify:
+        configManager.experiments.minifier === 'swc'
+          ? TerserPlugin.swcMinify
+          : TerserPlugin.terserMinify,
       parallel: terser.parallel,
       terserOptions: {
         ...tramvaiReactProfileTerserOptions,

package/src/library/webpack/child-app/client/common.ts

@@ -1,5 +1,6 @@
 import type Config from 'webpack-chain';
 import { ChunkCorrelationPlugin } from '@module-federation/node';
+import LoadablePlugin from '@loadable/webpack-plugin';
 
 import type { ConfigManager } from '../../../../config/configManager';
 
@@ -33,5 +34,12 @@ export default (configManager: ConfigManager<ChildAppConfigEntry>) => (config: C
     },
   ]);
 
+  config.plugin('loadable-stats-plugin').use(LoadablePlugin, [
+    {
+      writeToDisk: true,
+      filename: `${name}_stats_loadable@${version}.json`,
+    },
+  ]);
+
   config.batch(files(configManager)).batch(nodeClient(configManager));
 };

package/src/library/webpack/child-app/common.ts

@@ -1,5 +1,7 @@
 import type Config from 'webpack-chain';
+import type webpack from 'webpack';
 import path from 'path';
+import crypto from 'crypto';
 import { UniversalFederationPlugin } from '@module-federation/node';
 import common from '../common/main';
 
@@ -9,7 +11,7 @@ import ts from '../blocks/ts';
 import js from '../blocks/js';
 import css from '../blocks/css';
 import nodeClient from '../blocks/nodeClient';
-import type { UniversalFederationPluginOptions } from '../types/webpack';
+import type { SplitChunksOptions, UniversalFederationPluginOptions } from '../types/webpack';
 import { getSharedModules } from './moduleFederationShared';
 import { configToEnv } from '../blocks/configToEnv';
 import sourcemaps from '../blocks/sourcemaps';
@@ -17,15 +19,20 @@ import type { ChildAppConfigEntry } from '../../../typings/configEntry/child-app
 import { extractCssPluginFactory } from '../blocks/extractCssPlugin';
 import type { ModuleFederationFixRangeOptions } from '../plugins/ModuleFederationFixRange';
 import { ModuleFederationFixRange } from '../plugins/ModuleFederationFixRange';
+import { resolveFrameworksPaths } from '../application/client/prod/optimization/splitChunks';
 
+// eslint-disable-next-line max-statements
 export default (configManager: ConfigManager<ChildAppConfigEntry>) => (config: Config) => {
-  const { name, root, sourceMap, buildType, shared } = configManager;
+  const { name, root, rootDir, sourceMap, buildType, shared, env, hotRefresh, target } =
+    configManager;
 
   const cssLocalIdentName =
     configManager.env === 'production'
       ? `${name}__[minicss]`
       : `${name}__[name]__[local]_[hash:base64:5]`;
-  const entry = path.resolve(configManager.rootDir, root);
+  const entry = path.resolve(configManager.rootDir, root, 'index.ts');
+
+  const sharedModules = getSharedModules(configManager);
 
   // use empty module instead of original one as I haven't figured out how to prevent webpack from initializing entry module on loading
   // it should be initialized only as remote in ModuleFederation and not as standalone module
@@ -60,7 +67,7 @@ export default (configManager: ConfigManager<ChildAppConfigEntry>) => (config: C
   config.optimization.set('chunkIds', 'named');
 
   // define split chunks to put all of the css into single entry file
-  config.optimization.splitChunks({
+  const webpackSplitChunks: SplitChunksOptions = {
     cacheGroups: {
       default: false,
       defaultVendors: false,
@@ -69,9 +76,62 @@ export default (configManager: ConfigManager<ChildAppConfigEntry>) => (config: C
         type: 'css/mini-extract',
         chunks: 'async',
         enforce: true,
+        priority: 50,
       },
     },
-  });
+  };
+
+  // granular code splitting only for client builds
+  if (target !== 'node') {
+    // get resolved paths for shared modules and their dependencies
+    const sharedModulesPaths = resolveFrameworksPaths(
+      path.resolve(rootDir, root),
+      Object.keys(sharedModules)
+    );
+
+    const granular: Record<string, any> = {
+      // we don't want to include MF shared deps
+      test(mod: webpack.Module) {
+        const resource = mod.nameForCondition && mod.nameForCondition();
+
+        if (!resource) {
+          return false;
+        }
+
+        return sharedModulesPaths.every((packagePath) => !resource.startsWith(packagePath));
+      },
+      chunks: 'async',
+      // in some cases this group has priority over styles group, idk why, so decide to specify modules type explicitly
+      type: 'javascript/auto',
+      minChunks: 2,
+      minSize: 20000,
+      reuseExistingChunk: true,
+      maxInitialRequests: 10,
+      maxAsyncRequests: 20,
+      priority: 20,
+    };
+
+    // too slow for development, default names is fast, but have one problem -
+    // we can find shared chunk filenames only in `chunks` stats property, not in `assetsByChunkName`
+    // https://github.com/webpack/webpack/issues/14433#issuecomment-938468513
+    if (env === 'production') {
+      granular.name = (module: webpack.Module, chunks: webpack.Chunk[] = []) => {
+        return crypto
+          .createHash('sha1')
+          .update(
+            chunks.reduce((acc: string, chunk: webpack.Chunk) => {
+              return acc + chunk.name;
+            }, '')
+          )
+          .digest('hex')
+          .substring(0, 16);
+      };
+    }
+
+    webpackSplitChunks.cacheGroups.granular = granular;
+  }
+
+  config.optimization.splitChunks(webpackSplitChunks);
 
   config.plugin('module-federation').use(UniversalFederationPlugin, [
     {
@@ -100,7 +160,7 @@ export default (configManager: ConfigManager<ChildAppConfigEntry>) => (config: C
           .split(path.win32.sep)
           .join(path.posix.sep),
       },
-      shared: getSharedModules(configManager),
+      shared: sharedModules,
     } as UniversalFederationPluginOptions,
   ]);
 

package/src/library/webpack/plugins/ModuleFederationFixRange.ts

@@ -166,7 +166,8 @@ export class ModuleFederationFixRange implements webpack.WebpackPluginInstance {
     if (requiredVersion && this.flexibleTramvaiVersions) {
       const isTramvai = isUnifiedVersion(name) || isDependantLib(name);
 
-      if (isTramvai && requiredVersion[0] > 2) {
+      // exclude local stub versions, because `^0.0.0-stub` will have lowest priority and unexpected versions can be used
+      if (isTramvai && requiredVersion[0] > 2 && resolvedVersion !== '0.0.0-stub') {
         // 1 is used for `^` range modifier
         // see https://github.com/webpack/webpack/blob/56363993156e06a1230c9759eba277a22e6b6604/lib/util/semver.js#LL235C20-L235C20
         requiredVersion[0] = 1;

package/src/models/config.spec.ts

@@ -41,6 +41,7 @@ it('should populate defaults for config', () => {
             "minicss": {
               "useImportModule": true,
             },
+            "minifier": "terser",
             "pwa": {
               "icon": {
                 "dest": "pwa-icons",
@@ -140,6 +141,7 @@ it('should populate defaults for config', () => {
             "minicss": {
               "useImportModule": true,
             },
+            "minifier": "terser",
             "transpilation": {
               "loader": "babel",
             },
@@ -278,6 +280,7 @@ it('should populate defaults for overridable options', () => {
             "minicss": {
               "useImportModule": true,
             },
+            "minifier": "terser",
             "pwa": {
               "icon": {
                 "dest": "pwa-icons",
@@ -395,6 +398,7 @@ it('should populate defaults for overridable options', () => {
             "minicss": {
               "useImportModule": true,
             },
+            "minifier": "terser",
             "transpilation": {
               "loader": {
                 "development": "babel",

package/src/schema/autogeneratedSchema.json

@@ -896,6 +896,40 @@
                 }
               },
               "additionalProperties": false
+            },
+            "minifier": {
+              "cli_overridable": "",
+              "title": "specify minifer for terser plugin",
+              "default": "terser",
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "development": {
+                      "enum": [
+                        "swc",
+                        "terser"
+                      ],
+                      "type": "string"
+                    },
+                    "production": {
+                      "enum": [
+                        "swc",
+                        "terser"
+                      ],
+                      "type": "string"
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "enum": [
+                    "swc",
+                    "terser"
+                  ],
+                  "type": "string"
+                }
+              ]
             }
           },
           "additionalProperties": false
@@ -1144,23 +1178,23 @@
                         "dotAll": {
                           "type": "boolean"
                         },
-                        "__@match@6855": {
+                        "__@match@6864": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@replace@6857": {
+                        "__@replace@6866": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@search@6860": {
+                        "__@search@6869": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@split@6862": {
+                        "__@split@6871": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@matchAll@6864": {
+                        "__@matchAll@6873": {
                           "type": "object",
                           "additionalProperties": false
                         }
@@ -1627,6 +1661,40 @@
                 }
               },
               "additionalProperties": false
+            },
+            "minifier": {
+              "cli_overridable": "",
+              "title": "specify minifer for terser plugin",
+              "default": "terser",
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "development": {
+                      "enum": [
+                        "swc",
+                        "terser"
+                      ],
+                      "type": "string"
+                    },
+                    "production": {
+                      "enum": [
+                        "swc",
+                        "terser"
+                      ],
+                      "type": "string"
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "enum": [
+                    "swc",
+                    "terser"
+                  ],
+                  "type": "string"
+                }
+              ]
             }
           },
           "additionalProperties": false
@@ -1813,23 +1881,23 @@
                         "dotAll": {
                           "type": "boolean"
                         },
-                        "__@match@6855": {
+                        "__@match@6864": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@replace@6857": {
+                        "__@replace@6866": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@search@6860": {
+                        "__@search@6869": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@split@6862": {
+                        "__@split@6871": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@matchAll@6864": {
+                        "__@matchAll@6873": {
                           "type": "object",
                           "additionalProperties": false
                         }
@@ -2296,6 +2364,40 @@
                 }
               },
               "additionalProperties": false
+            },
+            "minifier": {
+              "cli_overridable": "",
+              "title": "specify minifer for terser plugin",
+              "default": "terser",
+              "anyOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "development": {
+                      "enum": [
+                        "swc",
+                        "terser"
+                      ],
+                      "type": "string"
+                    },
+                    "production": {
+                      "enum": [
+                        "swc",
+                        "terser"
+                      ],
+                      "type": "string"
+                    }
+                  },
+                  "additionalProperties": false
+                },
+                {
+                  "enum": [
+                    "swc",
+                    "terser"
+                  ],
+                  "type": "string"
+                }
+              ]
             }
           },
           "additionalProperties": false
@@ -2482,23 +2584,23 @@
                         "dotAll": {
                           "type": "boolean"
                         },
-                        "__@match@6855": {
+                        "__@match@6864": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@replace@6857": {
+                        "__@replace@6866": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@search@6860": {
+                        "__@search@6869": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@split@6862": {
+                        "__@split@6871": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@matchAll@6864": {
+                        "__@matchAll@6873": {
                           "type": "object",
                           "additionalProperties": false
                         }