@tramvai/cli 2.24.3 → 2.26.0

package/src/library/babel/plugins/lazy-component/properties/chunkName.ts

@@ -158,11 +158,8 @@ export const chunkNameMethod: PropertyFactory = ({ types: t }) => {
       return t.stringLiteral(webpackChunkName);
     }
 
-    let chunkNameNode:
-      | CallExpression
-      | TemplateLiteral
-      | StringLiteral
-      | BinaryExpression = generateChunkNameNode(importPath, getChunkNamePrefix(webpackChunkName));
+    let chunkNameNode: CallExpression | TemplateLiteral | StringLiteral | BinaryExpression =
+      generateChunkNameNode(importPath, getChunkNamePrefix(webpackChunkName));
 
     if (t.isTemplateLiteral(chunkNameNode)) {
       webpackChunkName = chunkNameFromTemplateLiteral(chunkNameNode);

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

@@ -55,81 +55,80 @@ const resolveFrameworksPaths = (rootDir: string, frameworksList: string[]) => {
 };
 
 // eslint-disable-next-line max-statements
-export const splitChunksConfig = (configManager: ConfigManager<ApplicationConfigEntry>) => (
-  config: Config
-) => {
-  const {
-    rootDir,
-    build: { configurations },
-  } = configManager;
-
-  const topLevelFrameworkPaths = resolveFrameworksPaths(rootDir, ['react', 'react-dom']);
-
-  const reachCacheGroup: Exclude<SplitChunksOptions, boolean>['cacheGroups'][string] = {
-    chunks: 'all',
-    name: 'react',
-    // This regex ignores nested copies of framework libraries so they're bundled with their issuer.
-    // test: /(?<!node_modules.*)[\\/]node_modules[\\/](react|react-dom|scheduler|prop-types|use-subscription)[\\/]/,
-    test(module: webpack.Module) {
-      const resource = module.nameForCondition && module.nameForCondition();
-
-      if (!resource) {
-        return false;
-      }
+export const splitChunksConfig =
+  (configManager: ConfigManager<ApplicationConfigEntry>) => (config: Config) => {
+    const {
+      rootDir,
+      build: { configurations },
+    } = configManager;
 
-      return topLevelFrameworkPaths.some((packagePath) => resource.startsWith(packagePath));
-    },
-    priority: 40,
-    // Don't let webpack eliminate this chunk (prevents this chunk from becoming a part of the commons chunk)
-    enforce: true,
-  };
-  let splitChunks: SplitChunksOptions = false;
+    const topLevelFrameworkPaths = resolveFrameworksPaths(rootDir, ['react', 'react-dom']);
 
-  if (configurations.granularChunks) {
-    splitChunks = {
+    const reachCacheGroup: Exclude<SplitChunksOptions, boolean>['cacheGroups'][string] = {
       chunks: 'all',
-      maxInitialRequests: 10,
-      maxAsyncRequests: 20,
-      cacheGroups: {
-        default: false,
-        defaultVendors: false,
-        reachCacheGroup,
-        shared: {
-          chunks: 'async',
-          minChunks: configurations.granularChunksSplitNumber,
-          minSize: configurations.granularChunksMinSize,
-          reuseExistingChunk: true,
-          name(module, chunks) {
-            return crypto
-              .createHash('sha1')
-              .update(
-                chunks.reduce((acc: string, chunk: webpack.Chunk) => {
-                  return acc + chunk.name;
-                }, '')
-              )
-              .digest('hex');
-          },
-        },
+      name: 'react',
+      // This regex ignores nested copies of framework libraries so they're bundled with their issuer.
+      // test: /(?<!node_modules.*)[\\/]node_modules[\\/](react|react-dom|scheduler|prop-types|use-subscription)[\\/]/,
+      test(module: webpack.Module) {
+        const resource = module.nameForCondition && module.nameForCondition();
+
+        if (!resource) {
+          return false;
+        }
+
+        return topLevelFrameworkPaths.some((packagePath) => resource.startsWith(packagePath));
       },
+      priority: 40,
+      // Don't let webpack eliminate this chunk (prevents this chunk from becoming a part of the commons chunk)
+      enforce: true,
     };
-  } else if (configurations.commonChunk) {
-    splitChunks = {
-      cacheGroups: {
-        default: false,
-        defaultVendors: false,
-        reachCacheGroup,
-        commons: {
-          name: 'common-chunk',
-          minChunks: configurations.commonChunkSplitNumber,
+    let splitChunks: SplitChunksOptions = false;
+
+    if (configurations.granularChunks) {
+      splitChunks = {
+        chunks: 'all',
+        maxInitialRequests: 10,
+        maxAsyncRequests: 20,
+        cacheGroups: {
+          default: false,
+          defaultVendors: false,
+          reachCacheGroup,
+          shared: {
+            chunks: 'async',
+            minChunks: configurations.granularChunksSplitNumber,
+            minSize: configurations.granularChunksMinSize,
+            reuseExistingChunk: true,
+            name(module, chunks) {
+              return crypto
+                .createHash('sha1')
+                .update(
+                  chunks.reduce((acc: string, chunk: webpack.Chunk) => {
+                    return acc + chunk.name;
+                  }, '')
+                )
+                .digest('hex');
+            },
+          },
         },
-      },
-    };
-  }
+      };
+    } else if (configurations.commonChunk) {
+      splitChunks = {
+        cacheGroups: {
+          default: false,
+          defaultVendors: false,
+          reachCacheGroup,
+          commons: {
+            name: 'common-chunk',
+            minChunks: configurations.commonChunkSplitNumber,
+          },
+        },
+      };
+    }
 
-  config.optimization
-    .splitChunks(splitChunks)
-    // namedChunks должно быть включено, чтобы webpack-flush-chunks смог определить имена чанков от которых зависит чанк бандла после обработчки через splitChunks
-    .set('chunkIds', 'named');
+    config.optimization
+      .splitChunks(splitChunks)
+      // namedChunks должно быть включено, чтобы webpack-flush-chunks смог определить имена чанков от которых зависит чанк бандла после обработчки через splitChunks
+      .set('chunkIds', 'named');
 
-  return config;
-};
+    return config;
+  };

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

@@ -7,19 +7,18 @@ import type { ApplicationConfigEntry } from '../../../typings/configEntry/applic
 import type { ModuleFederationIgnoreEntriesOptions } from '../plugins/ModuleFederationIgnoreEntries';
 import { ModuleFederationIgnoreEntries } from '../plugins/ModuleFederationIgnoreEntries';
 
-export const commonApplication = (configManager: ConfigManager<ApplicationConfigEntry>) => (
-  config: Config
-) => {
-  config.plugin('module-federation').use(container.ModuleFederationPlugin, [
-    {
-      name: 'host',
-      shared: getSharedModules(configManager),
-    } as ModuleFederationPluginOptions,
-  ]);
-
-  config
-    .plugin('module-federation-ignore-entries')
-    .use(ModuleFederationIgnoreEntries, [
-      { entries: ['polyfill'] } as ModuleFederationIgnoreEntriesOptions,
+export const commonApplication =
+  (configManager: ConfigManager<ApplicationConfigEntry>) => (config: Config) => {
+    config.plugin('module-federation').use(container.ModuleFederationPlugin, [
+      {
+        name: 'host',
+        shared: getSharedModules(configManager),
+      } as ModuleFederationPluginOptions,
     ]);
-};
+
+    config
+      .plugin('module-federation-ignore-entries')
+      .use(ModuleFederationIgnoreEntries, [
+        { entries: ['polyfill'] } as ModuleFederationIgnoreEntriesOptions,
+      ]);
+  };

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

@@ -7,13 +7,15 @@ interface Options {
   onlyBundles?: string[];
 }
 
-export const commonApplicationDev = ({ entry, onlyBundles }: Options) => (config: Config) => {
-  if (onlyBundles) {
-    config.plugin('only-bundles').use(IgnorePlugin, [
-      {
-        resourceRegExp: new RegExp(`bundles/(?!${onlyBundles.join('|')})`),
-        contextRegExp: new RegExp(`${dirname(entry)}$`),
-      },
-    ]);
-  }
-};
+export const commonApplicationDev =
+  ({ entry, onlyBundles }: Options) =>
+  (config: Config) => {
+    if (onlyBundles) {
+      config.plugin('only-bundles').use(IgnorePlugin, [
+        {
+          resourceRegExp: new RegExp(`bundles/(?!${onlyBundles.join('|')})`),
+          contextRegExp: new RegExp(`${dirname(entry)}$`),
+        },
+      ]);
+    }
+  };

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

@@ -13,69 +13,70 @@ interface Options {
   localIdentName?: string;
 }
 
-export const cssWebpackRulesFactory = (configManager: ConfigManager, options: Options = {}) => (
-  config: Config
-) => {
-  const {
-    postcss: {
-      config: postcssConfig = '',
-      cssLocalIdentName = null,
-      cssLocalIdentNameDev = cssLocalIdentName ?? cssLocalIdentNameDevDefault,
-      cssLocalIdentNameProd = cssLocalIdentName ?? cssLocalIdentNameProdDefault,
-    } = {},
-  } = configManager.build.configurations;
-  const { env, sourceMap } = configManager;
-  const localIdentName =
-    options.localIdentName ?? (env === 'production' ? cssLocalIdentNameProd : cssLocalIdentNameDev);
+export const cssWebpackRulesFactory =
+  (configManager: ConfigManager, options: Options = {}) =>
+  (config: Config) => {
+    const {
+      postcss: {
+        config: postcssConfig = '',
+        cssLocalIdentName = null,
+        cssLocalIdentNameDev = cssLocalIdentName ?? cssLocalIdentNameDevDefault,
+        cssLocalIdentNameProd = cssLocalIdentName ?? cssLocalIdentNameProdDefault,
+      } = {},
+    } = configManager.build.configurations;
+    const { env, sourceMap } = configManager;
+    const localIdentName =
+      options.localIdentName ??
+      (env === 'production' ? cssLocalIdentNameProd : cssLocalIdentNameDev);
 
-  const configCssLoader = (cfg) => {
-    cfg.use('extract-css').loader(ExtractCssChunks.loader).options({ esModule: false });
+    const configCssLoader = (cfg) => {
+      cfg.use('extract-css').loader(ExtractCssChunks.loader).options({ esModule: false });
 
-    const cssModulesOptions: Record<string, any> = {
-      localIdentName,
-    };
+      const cssModulesOptions: Record<string, any> = {
+        localIdentName,
+      };
 
-    // TODO: можно будет избавиться от проверки и сотавить всё в minicss-плагине, когда зарелизят эти изменения
-    // https://github.com/webpack-contrib/css-loader/blob/master/src/utils.js#L310
-    if (/\[minicss]/.test(localIdentName)) {
-      cssModulesOptions.getLocalIdent = createGenerator();
-    }
+      // TODO: можно будет избавиться от проверки и сотавить всё в minicss-плагине, когда зарелизят эти изменения
+      // https://github.com/webpack-contrib/css-loader/blob/master/src/utils.js#L310
+      if (/\[minicss]/.test(localIdentName)) {
+        cssModulesOptions.getLocalIdent = createGenerator();
+      }
 
-    cfg.use('css').loader('css-loader').options({
-      modules: cssModulesOptions,
-      sourceMap,
-      importLoaders: 1,
-      esModule: false,
-    });
-  };
+      cfg.use('css').loader('css-loader').options({
+        modules: cssModulesOptions,
+        sourceMap,
+        importLoaders: 1,
+        esModule: false,
+      });
+    };
 
-  const postcssCfg = postcssConfig
-    ? safeRequire(
-        path.resolve(configManager.rootDir, postcssConfig),
-        process.env.NODE_ENV === 'test'
-      ) ?? {}
-    : {};
+    const postcssCfg = postcssConfig
+      ? safeRequire(
+          path.resolve(configManager.rootDir, postcssConfig),
+          process.env.NODE_ENV === 'test'
+        ) ?? {}
+      : {};
 
-  config.module
-    .rule('css')
-    .test(/\.css$/)
-    .batch(configCssLoader)
-    .use('postcss')
-    .loader('postcss-loader')
-    .options({
-      sourceMap,
-      postcssOptions: (...args) => ({
-        ...postcssCfg,
-        plugins: [
-          require('postcss-modules-tilda'),
-          require('postcss-modules-values-replace')({ importsAsModuleRequests: true }),
-          // TODO: придумать как прокинуть настройки browserslist в autoprefixer - сейчас autoprefixer добавляется в самом приложении и из
-          // конфига нет возможности задавать динамический env в зависимости от сборки. Подсунуть в сам autoprefixer после его инициализации тоже
-          // тоже не получится - https://github.com/postcss/autoprefixer/blob/10.3.1/lib/autoprefixer.js#L108
-          ...(applyOrReturn(args, postcssCfg.plugins) || []),
-        ],
-      }),
-    });
-};
+    config.module
+      .rule('css')
+      .test(/\.css$/)
+      .batch(configCssLoader)
+      .use('postcss')
+      .loader('postcss-loader')
+      .options({
+        sourceMap,
+        postcssOptions: (...args) => ({
+          ...postcssCfg,
+          plugins: [
+            require('postcss-modules-tilda'),
+            require('postcss-modules-values-replace')({ importsAsModuleRequests: true }),
+            // TODO: придумать как прокинуть настройки browserslist в autoprefixer - сейчас autoprefixer добавляется в самом приложении и из
+            // конфига нет возможности задавать динамический env в зависимости от сборки. Подсунуть в сам autoprefixer после его инициализации тоже
+            // тоже не получится - https://github.com/postcss/autoprefixer/blob/10.3.1/lib/autoprefixer.js#L108
+            ...(applyOrReturn(args, postcssCfg.plugins) || []),
+          ],
+        }),
+      });
+  };
 
 export default cssWebpackRulesFactory;

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

@@ -7,24 +7,24 @@ interface Options {
   chunkFilename?: string;
 }
 
-export const extractCssPluginFactory = (configManager: ConfigManager, options: Options = {}) => (
-  config: Config
-) => {
-  const { filename = '[name].css', chunkFilename = '[name].chunk.css' } = options;
+export const extractCssPluginFactory =
+  (configManager: ConfigManager, options: Options = {}) =>
+  (config: Config) => {
+    const { filename = '[name].css', chunkFilename = '[name].chunk.css' } = options;
 
-  const pluginOptions = {
-    filename,
-    chunkFilename,
-    ignoreOrder: true,
-    experimentalUseImportModule: !!configManager.experiments.minicss?.useImportModule,
-  };
+    const pluginOptions = {
+      filename,
+      chunkFilename,
+      ignoreOrder: true,
+      experimentalUseImportModule: !!configManager.experiments.minicss?.useImportModule,
+    };
 
-  if (filename === null) {
-    delete pluginOptions.filename;
-  }
-  if (chunkFilename === null) {
-    delete pluginOptions.chunkFilename;
-  }
+    if (filename === null) {
+      delete pluginOptions.filename;
+    }
+    if (chunkFilename === null) {
+      delete pluginOptions.chunkFilename;
+    }
 
-  config.plugin('extract-css').use(ExtractCssPlugin, [pluginOptions]);
-};
+    config.plugin('extract-css').use(ExtractCssPlugin, [pluginOptions]);
+  };

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

@@ -3,26 +3,25 @@ import type Config from 'webpack-chain';
 import type { ConfigManager } from '../../../config/configManager';
 import type { ApplicationConfigEntry } from '../../../typings/configEntry/application';
 
-export const pagesResolve = (configManager: ConfigManager<ApplicationConfigEntry>) => (
-  config: Config
-) => {
-  const { fileSystemPages } = configManager.build.configurations;
+export const pagesResolve =
+  (configManager: ConfigManager<ApplicationConfigEntry>) => (config: Config) => {
+    const { fileSystemPages } = configManager.build.configurations;
 
-  config.module
-    .rule('file-system-pages')
-    // [\\/]cli вместо @tramvai[\\/]cli, т.к. после слияния репозиториев tramvai и tramvai-cli,
-    // webpack резолвит симлинк с фактическим путем до packages/cli
-    // @todo: найти более надежный вариант, т.к. есть шанс, что будет импортироваться одноименный модуль
-    .test(/[\\/]cli[\\/]lib[\\/]external[\\/]pages.js$/)
-    .use('replace')
-    .loader(path.resolve(__dirname, '../loaders/pagesResolve'))
-    .options({
-      fileSystemPages,
-      rootDir: configManager.rootDir,
-      root: configManager.root,
-      extensions: config.resolve.extensions.values(),
-    })
-    .end()
-    // babel-loader is required to process this file
-    .enforce('pre');
-};
+    config.module
+      .rule('file-system-pages')
+      // [\\/]cli вместо @tramvai[\\/]cli, т.к. после слияния репозиториев tramvai и tramvai-cli,
+      // webpack резолвит симлинк с фактическим путем до packages/cli
+      // @todo: найти более надежный вариант, т.к. есть шанс, что будет импортироваться одноименный модуль
+      .test(/[\\/]cli[\\/]lib[\\/]external[\\/]pages.js$/)
+      .use('replace')
+      .loader(path.resolve(__dirname, '../loaders/pagesResolve'))
+      .options({
+        fileSystemPages,
+        rootDir: configManager.rootDir,
+        root: configManager.root,
+        extensions: config.resolve.extensions.values(),
+      })
+      .end()
+      // babel-loader is required to process this file
+      .enforce('pre');
+  };

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

@@ -5,31 +5,29 @@ import type { ConfigManager } from '../../../config/configManager';
 
 import { safeRequire } from '../../../utils/safeRequire';
 
-export const postcssAssetsWebpackRulesFactory = (configManager: ConfigManager) => (
-  config: Config
-) => {
-  const {
-    postcss: { assetsConfig: postcssAssetsConfigPath = '' } = {},
-  } = configManager.build.configurations;
+export const postcssAssetsWebpackRulesFactory =
+  (configManager: ConfigManager) => (config: Config) => {
+    const { postcss: { assetsConfig: postcssAssetsConfigPath = '' } = {} } =
+      configManager.build.configurations;
 
-  const postcssAssetsConfig = postcssAssetsConfigPath
-    ? safeRequire(
-        path.resolve(configManager.rootDir, postcssAssetsConfigPath),
-        process.env.NODE_ENV === 'test'
-      ) ?? {
-        plugins: [],
-      }
-    : { plugins: [] };
+    const postcssAssetsConfig = postcssAssetsConfigPath
+      ? safeRequire(
+          path.resolve(configManager.rootDir, postcssAssetsConfigPath),
+          process.env.NODE_ENV === 'test'
+        ) ?? {
+          plugins: [],
+        }
+      : { plugins: [] };
 
-  if (postcssAssetsConfig.plugins.length) {
-    config.plugin('postcss-assets').use(PostcssAssetsPlugin, [
-      {
-        test: /\.css$/,
-        log: false,
-        plugins: postcssAssetsConfig.plugins,
-      },
-    ]);
-  }
-};
+    if (postcssAssetsConfig.plugins.length) {
+      config.plugin('postcss-assets').use(PostcssAssetsPlugin, [
+        {
+          test: /\.css$/,
+          log: false,
+          plugins: postcssAssetsConfig.plugins,
+        },
+      ]);
+    }
+  };
 
 export default postcssAssetsWebpackRulesFactory;

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

@@ -5,12 +5,8 @@ import type { ConfigManager } from '../../../config/configManager';
 import { getSwcOptions } from '../../swc';
 
 export default (configManager: ConfigManager) => (config: Config) => {
-  const {
-    generateDataQaTag,
-    alias,
-    removeTypeofWindow,
-    enableFillActionNamePlugin,
-  } = configManager.build.configurations;
+  const { generateDataQaTag, alias, removeTypeofWindow, enableFillActionNamePlugin } =
+    configManager.build.configurations;
   const { loader } = configManager.experiments.transpilation;
   const { env, modern } = configManager;
   const loaderConfig = {

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

@@ -1,7 +1,8 @@
 // возникает когда в либе require используется как выражение или сохраняется в переменной
 // в большинстве случаев ворнинг возникает на код вида:
 // const nodeRequire = typeof __non_webpack_require__ === 'undefined' ? require : __non_webpack_require__;
-export const REQUIRE_EXPRESSION = /Critical dependency: require function is used in a way in which dependencies cannot be statically extracted/;
+export const REQUIRE_EXPRESSION =
+  /Critical dependency: require function is used in a way in which dependencies cannot be statically extracted/;
 
 // возкникает когда невозможно статически проанализировать выражение, переданное в require и определить
 // какой код надо добавить в бандл

package/src/models/task.ts

@@ -28,7 +28,7 @@ export abstract class Task {
 
   abstract readonly command: string;
 
-  abstract readonly arguments: string[] = [];
+  abstract readonly arguments: string[];
 
   async run(
     parameters: { arguments?: string[]; options?: Record<string, any> } = {}