@tramvai/cli 2.64.0 → 2.66.0

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

@@ -3,8 +3,9 @@ import TerserPlugin from 'terser-webpack-plugin';
 import CssMinimizer from 'css-minimizer-webpack-plugin';
 import CssoWebpackPlugin from 'csso-webpack-plugin';
 import type { ConfigManager } from '../../../config/configManager';
+import type { CliConfigEntry } from '../../../typings/configEntry/cli';
 
-export default (configManager: ConfigManager) => (config: Config) => {
+export default (configManager: ConfigManager<CliConfigEntry>) => (config: Config) => {
   const { modern, debug, disableProdOptimization } = configManager;
 
   if (disableProdOptimization) {
@@ -33,14 +34,12 @@ export default (configManager: ConfigManager) => (config: Config) => {
     return;
   }
 
-  const {
-    configurations: { terserParallel },
-  } = configManager.build;
+  const { terser } = configManager;
 
   config.plugin('terser').use(TerserPlugin, [
     {
       extractComments: false,
-      parallel: terserParallel,
+      parallel: terser.parallel,
       terserOptions: {
         ecma: modern ? 6 : 5,
         mangle: {
@@ -59,7 +58,7 @@ export default (configManager: ConfigManager) => (config: Config) => {
     },
   ]);
 
-  if (configManager.build.configurations.cssMinimize === 'csso') {
+  if (configManager.cssMinimize === 'csso') {
     config.plugin('csso').use(CssoWebpackPlugin as any, [{ restructure: false }]);
   } else {
     config.plugin('css-minimizer').use(CssMinimizer);

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

@@ -5,7 +5,7 @@ import type { ApplicationConfigEntry } from '../../../typings/configEntry/applic
 
 export const pagesResolve =
   (configManager: ConfigManager<ApplicationConfigEntry>) => (config: Config) => {
-    const { fileSystemPages } = configManager.build.configurations;
+    const { fileSystemPages } = configManager;
 
     config.module
       .rule('file-system-pages')

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

@@ -4,17 +4,16 @@ import PostcssAssetsPlugin from 'postcss-assets-webpack-plugin';
 import type { ConfigManager } from '../../../config/configManager';
 
 import { safeRequire } from '../../../utils/safeRequire';
+import type { CliConfigEntry } from '../../../typings/configEntry/cli';
 
 export const postcssAssetsWebpackRulesFactory =
-  (configManager: ConfigManager) => (config: Config) => {
-    const { postcss: { assetsConfig: postcssAssetsConfigPath = '' } = {} } =
-      configManager.build.configurations;
+  (configManager: ConfigManager<CliConfigEntry>) => (config: Config) => {
+    const {
+      postcss: { assetsConfig: postcssAssetsConfigPath = '' },
+    } = configManager;
 
     const postcssAssetsConfig = postcssAssetsConfigPath
-      ? safeRequire(
-          path.resolve(configManager.rootDir, postcssAssetsConfigPath),
-          process.env.NODE_ENV === 'test'
-        ) ?? {
+      ? safeRequire(path.resolve(configManager.rootDir, postcssAssetsConfigPath)) ?? {
           plugins: [],
         }
       : { plugins: [] };

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

@@ -1,9 +1,10 @@
 import Config from 'webpack-chain';
 import type { ConfigManager } from '../../../config/configManager';
+import type { CliConfigEntry } from '../../../typings/configEntry/cli';
 import js from './js';
 import ts from './ts';
 
-export const serverInline = (configManager: ConfigManager) => (config: Config) => {
+export const serverInline = (configManager: ConfigManager<CliConfigEntry>) => (config: Config) => {
   // создаём клиентский конфиг и отключаем modern режим
   const clientConfigManager = configManager.withSettings({ buildType: 'client', modern: false });
 

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

@@ -2,8 +2,9 @@ import type Config from 'webpack-chain';
 import { createWorkerPoolTranspiler } from '../utils/workersPool';
 import type { ConfigManager } from '../../../config/configManager';
 import { addTranspilerLoader, getTranspilerConfig } from '../utils/transpiler';
+import type { CliConfigEntry } from '../../../typings/configEntry/cli';
 
-export default (configManager: ConfigManager) => (config: Config) => {
+export default (configManager: ConfigManager<CliConfigEntry>) => (config: Config) => {
   const transpilerConfig = getTranspilerConfig(configManager, { typescript: true });
 
   const cfg = config.module

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

@@ -2,7 +2,6 @@ import type Config from 'webpack-chain';
 
 import { StatsWriterPlugin } from 'webpack-stats-plugin';
 import type { ConfigManager } from '../../../../config/configManager';
-import type { ModuleConfigEntry } from '../../../../typings/configEntry/module';
 
 import common from '../common';
 import files from '../../blocks/filesClient';
@@ -12,8 +11,9 @@ import type { LazyLibraryOptions } from '../../plugins/LazyLibraryInitialization
 import { LazyLibraryInitialization } from '../../plugins/LazyLibraryInitialization';
 import { DEFAULT_STATS_FIELDS, DEFAULT_STATS_OPTIONS } from '../../constants/stats';
 import { extractCssPluginFactory } from '../../blocks/extractCssPlugin';
+import type { ChildAppConfigEntry } from '../../../../typings/configEntry/child-app';
 
-export default (configManager: ConfigManager<ModuleConfigEntry>) => (config: Config) => {
+export default (configManager: ConfigManager<ChildAppConfigEntry>) => (config: Config) => {
   const { name, version } = configManager;
   config.name('client');
 
@@ -22,7 +22,7 @@ export default (configManager: ConfigManager<ModuleConfigEntry>) => (config: Con
   config.target(['web', 'es5']);
 
   config.output
-    .path(configManager.getBuildPath())
+    .path(configManager.buildPath)
     .publicPath('auto')
     .library(configManager.name)
     .filename(`[name]_client@${version}.js`)

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

@@ -3,17 +3,17 @@ import WebpackBar from 'webpackbar';
 import webpack from 'webpack';
 import ReactRefreshPlugin from '@pmmmwh/react-refresh-webpack-plugin';
 import type { ConfigManager } from '../../../../config/configManager';
-import type { ModuleConfigEntry } from '../../../../typings/configEntry/module';
 import common from './common';
 import commonDev from '../../common/dev';
 import type { UI_SHOW_PROGRESS_TOKEN } from '../../../../di/tokens';
 import { extendEntry } from '../../utils/extendEntry';
+import type { ChildAppConfigEntry } from '../../../../typings/configEntry/child-app';
 
 export const webpackClientConfig = ({
   configManager,
   showProgress,
 }: {
-  configManager: ConfigManager<ModuleConfigEntry>;
+  configManager: ConfigManager<ChildAppConfigEntry>;
   showProgress: typeof UI_SHOW_PROGRESS_TOKEN | null;
 }) => {
   const config = new Config();
@@ -38,18 +38,18 @@ export const webpackClientConfig = ({
     },
   ]);
 
-  if (configManager.hotRefresh) {
-    const { configurations: { hotRefreshOptions = {} } = {} } = configManager.serve;
+  const { hotRefresh } = configManager;
 
+  if (hotRefresh?.enabled) {
     config.plugin('hot-module').use(webpack.HotModuleReplacementPlugin);
     config.plugin('react-refresh').use(ReactRefreshPlugin, [
       {
-        ...hotRefreshOptions,
+        ...hotRefresh.options,
         overlay:
-          typeof hotRefreshOptions.overlay === 'boolean'
-            ? hotRefreshOptions.overlay
+          typeof hotRefresh.options?.overlay === 'boolean'
+            ? hotRefresh.options.overlay
             : {
-                ...hotRefreshOptions.overlay,
+                ...hotRefresh.options?.overlay,
               },
       },
     ]);

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

@@ -1,14 +1,14 @@
 import Config from 'webpack-chain';
 import type { ConfigManager } from '../../../../config/configManager';
-import type { ModuleConfigEntry } from '../../../../typings/configEntry/module';
 import common from './common';
 import optimize from '../../blocks/optimize';
 import commonProd from '../../common/client/prod';
+import type { ChildAppConfigEntry } from '../../../../typings/configEntry/child-app';
 
 export const webpackClientConfig = ({
   configManager,
 }: {
-  configManager: ConfigManager<ModuleConfigEntry>;
+  configManager: ConfigManager<ChildAppConfigEntry>;
 }) => {
   const config = new Config();
 

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

@@ -4,7 +4,6 @@ import path from 'path';
 import common from '../common/main';
 
 import type { ConfigManager } from '../../../config/configManager';
-import type { ModuleConfigEntry } from '../../../typings/configEntry/module';
 
 import ts from '../blocks/ts';
 import js from '../blocks/js';
@@ -14,8 +13,9 @@ import type { ModuleFederationPluginOptions } from '../types/webpack';
 import { getSharedModules } from './moduleFederationShared';
 import { configToEnv } from '../blocks/configToEnv';
 import sourcemaps from '../blocks/sourcemaps';
+import type { ChildAppConfigEntry } from '../../../typings/configEntry/child-app';
 
-export default (configManager: ConfigManager<ModuleConfigEntry>) => (config: Config) => {
+export default (configManager: ConfigManager<ChildAppConfigEntry>) => (config: Config) => {
   const { name, root, sourceMap } = configManager;
 
   const cssLocalIdentName =

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

@@ -1,14 +1,14 @@
 import type Config from 'webpack-chain';
 
 import type { ConfigManager } from '../../../../config/configManager';
-import type { ModuleConfigEntry } from '../../../../typings/configEntry/module';
 
 import common from '../common';
 import files from '../../blocks/filesServer';
 import RuntimePathPlugin from '../../plugins/RuntimePathPlugin';
 import { extractCssPluginFactory } from '../../blocks/extractCssPlugin';
+import type { ChildAppConfigEntry } from '../../../../typings/configEntry/child-app';
 
-export default (configManager: ConfigManager<ModuleConfigEntry>) => (config: Config) => {
+export default (configManager: ConfigManager<ChildAppConfigEntry>) => (config: Config) => {
   config.name('server');
 
   config.batch(common(configManager));
@@ -16,7 +16,7 @@ export default (configManager: ConfigManager<ModuleConfigEntry>) => (config: Con
   config.target('node');
 
   config.output
-    .path(configManager.getBuildPath())
+    .path(configManager.buildPath)
     .publicPath('')
     .filename(`[name]_server@${configManager.version}.js`)
     .chunkFilename('[name]_server.chunk.[hash].js');

package/src/library/webpack/child-app/server/dev.ts

@@ -1,16 +1,16 @@
 import Config from 'webpack-chain';
 import WebpackBar from 'webpackbar';
 import type { ConfigManager } from '../../../../config/configManager';
-import type { ModuleConfigEntry } from '../../../../typings/configEntry/module';
 import common from './common';
 import commonDev from '../../common/dev';
 import type { UI_SHOW_PROGRESS_TOKEN } from '../../../../di/tokens';
+import type { ChildAppConfigEntry } from '../../../../typings/configEntry/child-app';
 
 export const webpackServerConfig = ({
   configManager,
   showProgress,
 }: {
-  configManager: ConfigManager<ModuleConfigEntry>;
+  configManager: ConfigManager<ChildAppConfigEntry>;
   showProgress: typeof UI_SHOW_PROGRESS_TOKEN | null;
 }) => {
   const config = new Config();

package/src/library/webpack/child-app/server/prod.ts

@@ -1,14 +1,14 @@
 import Config from 'webpack-chain';
 import type { ConfigManager } from '../../../../config/configManager';
-import type { ModuleConfigEntry } from '../../../../typings/configEntry/module';
 import common from './common';
 import optimize from '../../blocks/optimize';
 import commonProd from '../../common/server/prod';
+import type { ChildAppConfigEntry } from '../../../../typings/configEntry/child-app';
 
 export const webpackServerConfig = ({
   configManager,
 }: {
-  configManager: ConfigManager<ModuleConfigEntry>;
+  configManager: ConfigManager<ChildAppConfigEntry>;
 }) => {
   const config = new Config();
 

package/src/library/webpack/common/client/prod.ts

@@ -1,9 +1,10 @@
 import type Config from 'webpack-chain';
 import { DuplicatesPlugin } from 'inspectpack/plugin';
-import { createDedupePlugin } from '../../plugins/DedupePlugin';
+import { createDedupePlugin } from '@tinkoff/webpack-dedupe-plugin';
 import type { ConfigManager } from '../../../../config/configManager';
+import type { CliConfigEntry } from '../../../../typings/configEntry/cli';
 
-export default (configManager: ConfigManager) => (config: Config) => {
+export default (configManager: ConfigManager<CliConfigEntry>) => (config: Config) => {
   config.mode('production');
 
   config.plugin('define').tap((args) => [
@@ -13,10 +14,13 @@ export default (configManager: ConfigManager) => (config: Config) => {
     },
   ]);
 
-  if (configManager.dedupe) {
-    config
-      .plugin('dedupe-plugin')
-      .use(createDedupePlugin(configManager.dedupe, configManager.dedupeIgnore));
+  if (configManager.dedupe.enabled) {
+    config.plugin('dedupe-plugin').use(
+      createDedupePlugin(
+        configManager.dedupe.strategy,
+        configManager.dedupe.ignore?.map((ignore) => new RegExp(`^${ignore}`))
+      )
+    );
   } else {
     config.plugin('duplicates-plugin').use(DuplicatesPlugin, [
       {

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

@@ -7,6 +7,8 @@ import resolve from '../blocks/resolve';
 import ignoreLocales from '../blocks/ignoreLocales';
 import type { ConfigManager } from '../../../config/configManager';
 import { safeRequireResolve } from '../../../utils/safeRequire';
+import type { CliConfigEntry } from '../../../typings/configEntry/cli';
+import { getPostcssConfigPath } from '../blocks/css';
 
 const filterNonExisted = (filePaths: string[]) => {
   return filePaths.filter((filePath) => {
@@ -15,9 +17,8 @@ const filterNonExisted = (filePaths: string[]) => {
 };
 
 // eslint-disable-next-line import/no-default-export
-export default (configManager: ConfigManager) => (config: Config) => {
+export default (configManager: ConfigManager<CliConfigEntry>) => (config: Config) => {
   const env = configManager.env === 'development' ? 'dev' : 'prod';
-  const { postcss: { config: postcssConfig } = {} } = configManager.build.configurations;
 
   config.context(path.resolve(__dirname, '..', '..', '..', '..'));
   config.batch(resolve(configManager));
@@ -62,7 +63,10 @@ export default (configManager: ConfigManager) => (config: Config) => {
         // It may be missing in cases when cli is running programmaticaly
         config: filterNonExisted([path.resolve(configManager.rootDir, 'tramvai.json')]),
         css: filterNonExisted([
-          postcssConfig && safeRequireResolve(path.resolve(configManager.rootDir, postcssConfig)),
+          safeRequireResolve(
+            path.resolve(configManager.rootDir, getPostcssConfigPath(configManager)),
+            true
+          ),
         ]),
       },
     });
@@ -84,7 +88,8 @@ export default (configManager: ConfigManager) => (config: Config) => {
     .plugin('define')
     .use(webpack.DefinePlugin, [
       {
-        ...configManager.build.configurations.definePlugin[env],
+        ...configManager.define.shared,
+        ...configManager.define[configManager.env],
 
         'process.env.APP_ID': JSON.stringify(configManager.name || 'common'),
         'process.env.APP_VERSION': JSON.stringify(process.env.APP_VERSION),

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

@@ -1,8 +1,9 @@
 import type Config from 'webpack-chain';
-import { createDedupePlugin } from '../../plugins/DedupePlugin';
+import { createDedupePlugin } from '@tinkoff/webpack-dedupe-plugin';
 import type { ConfigManager } from '../../../../config/configManager';
+import type { CliConfigEntry } from '../../../../typings/configEntry/cli';
 
-export default (configManager: ConfigManager) => (config: Config) => {
+export default (configManager: ConfigManager<CliConfigEntry>) => (config: Config) => {
   config.mode('production');
 
   config.plugin('define').tap((args) => [
@@ -12,9 +13,12 @@ export default (configManager: ConfigManager) => (config: Config) => {
     },
   ]);
 
-  if (configManager.dedupe) {
-    config
-      .plugin('dedupe-plugin')
-      .use(createDedupePlugin(configManager.dedupe, configManager.dedupeIgnore));
+  if (configManager.dedupe.enabled) {
+    config.plugin('dedupe-plugin').use(
+      createDedupePlugin(
+        configManager.dedupe.strategy,
+        configManager.dedupe.ignore?.map((ignore) => new RegExp(`^${ignore}`))
+      )
+    );
   }
 };

package/src/library/webpack/index.ts

@@ -1,15 +1,14 @@
 import Config from 'webpack-chain';
-import { ConfigManager } from '../../config/configManager';
+import { createConfigManager } from '../../config/configManager';
 import { toWebpackConfig } from './utils/toWebpackConfig';
 import resolve from './blocks/resolve';
 
 const config = new Config();
-const configManager = new ConfigManager(
+const configManager = createConfigManager(
   {
     name: 'platform-cli',
     root: __dirname,
     type: 'package',
-    commands: {},
   },
   {}
 );

package/src/library/webpack/loaders/image-loader/index.ts

@@ -1,9 +1,10 @@
 import sizeOf from 'image-size';
+import type { LoaderContext } from 'webpack';
 
 /**
  * Reuse file-loader logic, but return a object with src and size of image
  */
-export default function (content) {
+export default function (this: LoaderContext<{}>, content: string) {
   const result = require('file-loader').call(this, content);
 
   const dimensions = sizeOf(this.resourcePath);

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

@@ -1,14 +1,24 @@
 import path from 'path';
 import readDir from 'fs-readdir-recursive';
 import fs from 'fs';
+import type { LoaderDefinitionFunction } from 'webpack';
+import type { ApplicationConfigEntry } from '../../../api';
 
 const LAYOUT_FILENAME = '_layout.tsx';
 const ERROR_BOUNDARY_FILENAME = '_error.tsx';
 
-export default function () {
+interface Options {
+  rootDir: string;
+  root: string;
+  extensions: string[];
+  fileSystemPages: ApplicationConfigEntry['fileSystemPages'];
+}
+
+// eslint-disable-next-line func-style
+const pagesResolve: LoaderDefinitionFunction<Options> = function () {
   const { fileSystemPages, rootDir, root, extensions } = this.getOptions();
-  const fsLayouts = [];
-  const fsErrorBoundaries = [];
+  const fsLayouts: string[] = [];
+  const fsErrorBoundaries: string[] = [];
 
   this.cacheable(false);
 
@@ -24,7 +34,7 @@ export default function () {
     this.addContextDependency(pagesDir);
 
     // skip files whose name starts with dot or underscore symbols
-    const pagesFiles = readDir(pagesDir, (name) => name[0] !== '.' && name[0] !== '_');
+    const pagesFiles = readDir(pagesDir, (name: string) => name[0] !== '.' && name[0] !== '_');
     const fsPages = [];
 
     for (const file of pagesFiles) {
@@ -103,4 +113,6 @@ export default function () {
   }`;
 
   return code;
-}
+};
+
+export default pagesResolve;

package/src/library/webpack/loaders/replaceContent.ts

@@ -1,4 +1,11 @@
-export default function () {
+import type { LoaderDefinition } from 'webpack';
+
+interface Options {
+  code: string;
+}
+
+// eslint-disable-next-line func-style
+const replaceContent: LoaderDefinition<Options> = function () {
   const { code } = this.getOptions();
 
   // выставляем флаг, что данный модуль не кешируется т.к. в контенте могут быть данные которые будут меняться от сборки к сборке,
@@ -6,4 +13,6 @@ export default function () {
   this.cacheable(false);
 
   return code;
-}
+};
+
+export default replaceContent;

package/src/library/webpack/module/client/common.ts

@@ -20,7 +20,7 @@ export default (configManager: ConfigManager<ModuleConfigEntry>) => (config: Con
   config.target(['web', 'es5']);
 
   config.output
-    .path(configManager.getBuildPath())
+    .path(configManager.buildPath)
     .publicPath('')
     .library(configManager.name)
     .libraryTarget('lazy')

package/src/library/webpack/module/externals.ts

@@ -14,4 +14,4 @@ export default modules.reduce((acc, name) => {
   };
 
   return acc;
-}, {});
+}, {} as Record<string, {}>);

package/src/library/webpack/module/resolveExternal.ts

@@ -1 +1 @@
-export default (name) => ['__externals', name];
+export default (name: string) => ['__externals', name];

package/src/library/webpack/module/server/common.ts

@@ -15,7 +15,7 @@ export default (configManager: ConfigManager<ModuleConfigEntry>) => (config: Con
   config.target('node');
 
   config.output
-    .path(configManager.getBuildPath())
+    .path(configManager.buildPath)
     .publicPath('')
     .filename('[name]_server.js')
     .chunkFilename('[name]_server.chunk.js')

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

@@ -1,5 +1,6 @@
 import type { Compiler, LibraryOptions } from 'webpack';
 import { library, sources } from 'webpack';
+// @ts-ignore
 // eslint-disable-next-line no-restricted-imports
 import ExportPropertyLibraryPlugin from 'webpack/lib/library/ExportPropertyLibraryPlugin';
 
@@ -35,7 +36,11 @@ export default class LazyModuleInitialization extends library.AbstractLibraryPlu
     };
   }
 
-  render(source: sources.Source, context, { options: { name } }) {
+  render(
+    source: sources.Source,
+    context: unknown,
+    { options: { name } }: { options: { name: string } }
+  ) {
     // оборачиваем код модуля в lazy-обёртку
     return new sources.ConcatSource(
       'window.__externals = window.__externals || {};\n',

package/src/library/webpack/plugins/WebpackBar/utils/index.ts

@@ -1,35 +1,35 @@
 import { sep } from 'path';
 
-export function first(arr) {
+export function first<T>(arr: T[]): T {
   return arr[0];
 }
 
-export function last(arr) {
+export function last<T>(arr: T[]): T | null {
   return arr.length ? arr[arr.length - 1] : null;
 }
 
-export function startCase(str) {
+export function startCase(str: string) {
   return str[0].toUpperCase() + str.substr(1);
 }
 
-export function firstMatch(regex, str) {
+export function firstMatch(regex: RegExp, str: string) {
   const m = regex.exec(str);
   return m ? m[0] : null;
 }
 
-export function hasValue(s) {
+export function hasValue(s: any) {
   return s && s.length;
 }
 
-export function removeAfter(delimiter, str) {
+export function removeAfter(delimiter: string, str: string) {
   return first(str.split(delimiter)) || '';
 }
 
-export function removeBefore(delimiter, str) {
+export function removeBefore(delimiter: string, str: string) {
   return last(str.split(delimiter)) || '';
 }
 
-export function range(len) {
+export function range(len: number) {
   const arr = [];
   for (let i = 0; i < len; i++) {
     arr.push(i);

package/src/library/webpack/plugins/WebpackBar/utils/webpack.ts

@@ -4,7 +4,7 @@ import { nodeModules, NEXT } from './consts';
 
 import { removeAfter, removeBefore, hasValue, firstMatch } from '.';
 
-export const parseRequest = (requestStr) => {
+export const parseRequest = (requestStr: string) => {
   const parts = (requestStr || '').split('!');
 
   const file = path.relative(

package/src/library/webpack/types/webpack.ts

@@ -6,7 +6,7 @@ export type ModuleFederationPluginOptions = ConstructorParameters<
 
 export type ModuleFederationSharedObject = Record<
   string,
-  Exclude<Exclude<ModuleFederationPluginOptions['shared'], any[]>[string], string>
+  Exclude<Exclude<Required<ModuleFederationPluginOptions>['shared'], any[]>[string], string>
 >;
 
-export type SplitChunksOptions = Configuration['optimization']['splitChunks'];
+export type SplitChunksOptions = Required<Required<Configuration>['optimization']>['splitChunks'];

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

@@ -1,9 +1,10 @@
 import type Config from 'webpack-chain';
 import type { ConfigManager } from '../../../config/configManager';
+import type { CliConfigEntry } from '../../../typings/configEntry/cli';
 import { addTranspilerLoader, getTranspilerConfig } from './transpiler';
 
 export const addSvgrLoader = (
-  configManager: ConfigManager,
+  configManager: ConfigManager<CliConfigEntry>,
   config: Config,
   svgoOptions: Record<string, any>
 ) => {
@@ -23,9 +24,9 @@ export const addSvgrLoader = (
   svgrConfig.use('svgr').loader('@svgr/webpack').options({ babel: false, svgo: svgoOptions }).end();
 };
 
-export const getSvgoOptions = (configManager: ConfigManager) => {
+export const getSvgoOptions = (configManager: ConfigManager<CliConfigEntry>) => {
   return {
-    plugins: configManager.build?.configurations?.svgo?.plugins ?? [
+    plugins: configManager.svgo?.plugins ?? [
       {
         cleanupIDs: false,
       },