@tramvai/cli 2.63.0 → 2.65.9

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

@@ -1,29 +1,30 @@
 import type Config from 'webpack-chain';
+import type { PluginOptions } from 'mini-css-extract-plugin';
 import ExtractCssPlugin from 'mini-css-extract-plugin';
 import type { ConfigManager } from '../../../config/configManager';
+import type { CliConfigEntry } from '../../../typings/configEntry/cli';
 
 interface Options {
-  filename?: string;
-  chunkFilename?: string;
+  filename?: string | null;
+  chunkFilename?: string | null;
 }
 
 export const extractCssPluginFactory =
-  (configManager: ConfigManager, options: Options = {}) =>
+  (configManager: ConfigManager<CliConfigEntry>, options: Options = {}) =>
   (config: Config) => {
     const { filename = '[name].css', chunkFilename = '[name].chunk.css' } = options;
 
-    const pluginOptions = {
-      filename,
-      chunkFilename,
+    const pluginOptions: PluginOptions = {
       ignoreOrder: true,
       experimentalUseImportModule: !!configManager.experiments.minicss?.useImportModule,
     };
 
-    if (filename === null) {
-      delete pluginOptions.filename;
+    if (filename !== null) {
+      pluginOptions.filename = filename;
     }
-    if (chunkFilename === null) {
-      delete pluginOptions.chunkFilename;
+
+    if (chunkFilename !== null) {
+      pluginOptions.chunkFilename = chunkFilename;
     }
 
     config.plugin('extract-css').use(ExtractCssPlugin, [pluginOptions]);

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

@@ -3,55 +3,57 @@ import type Config from 'webpack-chain';
 import SparkMD5 from 'spark-md5';
 import type { ConfigManager } from '../../../config/configManager';
 import { addSvgrLoader, getSvgoOptions } from '../utils/files';
+import type { CliConfigEntry } from '../../../typings/configEntry/cli';
+
+export const filesClientWebpackRulesFactory =
+  (configManager: ConfigManager<CliConfigEntry>) => (config: Config) => {
+    const svgoOptions = getSvgoOptions(configManager);
+
+    config.module
+      .rule('woff')
+      .test(/\.woff2?$/)
+      .set('type', 'asset');
+
+    addSvgrLoader(configManager, config, svgoOptions);
+
+    config.module
+      .rule('svg')
+      .test(/\.svg$/)
+      .set('resourceQuery', { not: /react/ })
+      .set('type', 'asset/resource')
+      .set('generator', {
+        filename: (pathInfo) => {
+          // hash computation exactly how it is working in react-ui-kit
+          // TODO: it leads to high coherence with ui-kit, better change it to some other method
+          return `${SparkMD5.hash(pathInfo.module.originalSource().source().toString())}.svg`;
+        },
+      })
+      .use('svg')
+      .loader('svgo-loader')
+      .options(svgoOptions);
+
+    config.module
+      .rule('tramvai-image')
+      .test(/\.(png|jpe?g|gif|webp)$/)
+      .use('file')
+      .loader(path.resolve(__dirname, '../loaders/image-loader'))
+      .end();
 
-export const filesClientWebackRulesFactory = (configManager: ConfigManager) => (config: Config) => {
-  const svgoOptions = getSvgoOptions(configManager);
-
-  config.module
-    .rule('woff')
-    .test(/\.woff2?$/)
-    .set('type', 'asset');
-
-  addSvgrLoader(configManager, config, svgoOptions);
-
-  config.module
-    .rule('svg')
-    .test(/\.svg$/)
-    .set('resourceQuery', { not: /react/ })
-    .set('type', 'asset/resource')
-    .set('generator', {
-      filename: (pathInfo) => {
-        // hash computation exactly how it is working in react-ui-kit
-        // TODO: it leads to high coherence with ui-kit, better change it to some other method
-        return `${SparkMD5.hash(pathInfo.module.originalSource().source().toString())}.svg`;
-      },
-    })
-    .use('svg')
-    .loader('svgo-loader')
-    .options(svgoOptions);
-
-  config.module
-    .rule('tramvai-image')
-    .test(/\.(png|jpe?g|gif|webp)$/)
-    .use('file')
-    .loader(path.resolve(__dirname, '../loaders/image-loader'))
-    .end();
-
-  config.module
-    .rule('video')
-    .test(/\.(mp4|webm|avif)$/)
-    .set('type', 'asset/resource');
-
-  if (configManager.build?.configurations?.imageOptimization?.enabled) {
     config.module
-      .rule('image-optimization')
-      .test(/\.(gif|png|jpe?g|svg)$/)
-      .use('image')
-      .loader('image-webpack-loader')
-      .options({ ...configManager.build?.configurations?.imageOptimization?.options })
-      .end()
-      .enforce('pre');
-  }
-};
-
-export default filesClientWebackRulesFactory;
+      .rule('video')
+      .test(/\.(mp4|webm|avif)$/)
+      .set('type', 'asset/resource');
+
+    if (configManager.imageOptimization?.enabled) {
+      config.module
+        .rule('image-optimization')
+        .test(/\.(gif|png|jpe?g|svg)$/)
+        .use('image')
+        .loader('image-webpack-loader')
+        .options({ ...(configManager.imageOptimization?.options as any) })
+        .end()
+        .enforce('pre');
+    }
+  };
+
+export default filesClientWebpackRulesFactory;

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

@@ -1,9 +1,10 @@
 import path from 'path';
 import type Config from 'webpack-chain';
 import type { ConfigManager } from '../../../config/configManager';
+import type { CliConfigEntry } from '../../../typings/configEntry/cli';
 import { addSvgrLoader, getSvgoOptions } from '../utils/files';
 
-export default (configManager: ConfigManager) => (config: Config) => {
+export default (configManager: ConfigManager<CliConfigEntry>) => (config: Config) => {
   const svgoOptions = getSvgoOptions(configManager);
 
   config.module
@@ -43,13 +44,13 @@ export default (configManager: ConfigManager) => (config: Config) => {
       emit: false,
     });
 
-  if (configManager.build?.configurations?.imageOptimization?.enabled) {
+  if (configManager.imageOptimization?.enabled) {
     config.module
       .rule('image-optimization')
       .test(/\.(gif|png|jpe?g|svg)$/)
       .use('image')
       .loader('image-webpack-loader')
-      .options({ ...configManager.build?.configurations?.imageOptimization?.options })
+      .options({ ...(configManager.imageOptimization?.options as Record<string, any>) })
       .end()
       .enforce('pre');
   }

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

@@ -4,10 +4,11 @@ import { createWorkerPoolTranspiler } from '../utils/workersPool';
 import type { ConfigManager } from '../../../config/configManager';
 import type { TranspilerConfig } from '../utils/transpiler';
 import { getTranspilerConfig, addTranspilerLoader } from '../utils/transpiler';
+import type { CliConfigEntry } from '../../../typings/configEntry/cli';
 
 // eslint-disable-next-line import/no-default-export
-export default (configManager: ConfigManager) => (config: Config) => {
-  const { transpileOnlyModernLibs } = configManager.build.configurations;
+export default (configManager: ConfigManager<CliConfigEntry>) => (config: Config) => {
+  const { transpileOnlyModernLibs } = configManager;
 
   const jsRule = (transpilerConfig: TranspilerConfig) => (rule: Config.Rule) => {
     const cfg = rule

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

@@ -1,13 +1,14 @@
 import webpack from 'webpack';
 import type Config from 'webpack-chain';
 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) => {
   // webpack 5 больше не добавляет полифиллы для node-библиотек
   // поэтому если они всё же где-то используются на клиенте их надо добавить явно
   config.resolve.alias.set('path', 'path-browserify').set('vm', false);
 
-  const browserifyPolyfills = configManager.build.configurations.webpackResolveAlias;
+  const browserifyPolyfills = configManager.webpack.resolveAlias;
   if (browserifyPolyfills) {
     Object.entries(browserifyPolyfills).forEach(([key, value]) => {
       config.resolve.alias.set(key, value);
@@ -17,7 +18,7 @@ export default (configManager: ConfigManager) => (config: Config) => {
   config.plugin('provide').use(webpack.ProvidePlugin, [
     {
       process: 'process',
-      ...configManager.build.configurations.webpackProvide,
+      ...(configManager.webpack.provide as Record<string, any>),
     },
   ]);
 };

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);