arui-scripts 23.0.2 → 23.1.0

package/.turbo/turbo-test.log

@@ -1,23 +1,23 @@
 ts-jest[versions] (WARN) Version 6.0.2 of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=4.3.0 <6.0.0-0). Please do not report issues in ts-jest if you are using unsupported versions.
 ts-jest[versions] (WARN) Version 6.0.2 of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=4.3.0 <6.0.0-0). Please do not report issues in ts-jest if you are using unsupported versions.
 ts-jest[versions] (WARN) Version 6.0.2 of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=4.3.0 <6.0.0-0). Please do not report issues in ts-jest if you are using unsupported versions.
-PASS src/plugins/postcss-global-variables/utils/__tests__/add-global-variable.tests.ts (23.47 s)
+PASS src/configs/app-configs/__tests__/update-with-presets.tests.ts (23.818 s)
 PASS src/configs/util/__tests__/create-watch-ignore-regex.tests.ts
 PASS src/configs/util/__tests__/apply-overrides.tests.ts
-PASS src/configs/app-configs/__tests__/update-with-presets.tests.ts (24.053 s)
 PASS src/configs/app-configs/__tests__/update-with-env.tests.ts
+PASS src/plugins/postcss-global-variables/utils/__tests__/add-global-variable.tests.ts (24.667 s)
 PASS src/configs/app-configs/__tests__/update-with-package.tests.ts
 PASS src/configs/util/__tests__/compress-with-dcb.test.ts
 PASS src/configs/util/__tests__/get-polyfills.tests.ts
 PASS src/plugins/postcss-global-variables/utils/__tests__/parse-variables.tests.ts
 PASS src/plugins/postcss-global-variables/utils/__tests__/get-media-query-name.tests.ts
 PASS src/configs/app-configs/__tests__/validate-settings-keys.tests.ts
-PASS src/configs/__tests__/webpack-client-modules.tests.ts (16.896 s)
-PASS src/configs/util/__tests__/find-plugin.tests.ts (41.681 s)
+PASS src/configs/__tests__/webpack-client-modules.tests.ts (15.828 s)
+PASS src/configs/util/__tests__/find-plugin.tests.ts (41.64 s)
 A worker process has failed to exit gracefully and has been force exited. This is likely caused by tests leaking due to improper teardown. Try running with --detectOpenHandles to find leaks. Active timers can also cause this, ensure that .unref() was called on them.
 
 Test Suites: 13 passed, 13 total
 Tests:       31 passed, 31 total
 Snapshots:   0 total
-Time:        43.483 s
+Time:        43.267 s
 Ran all test suites.

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # arui-scripts
 
+## 23.1.0
+
+### Minor Changes
+
+-   [#537](https://github.com/core-ds/arui-scripts/pull/537) [`a1666b0`](https://github.com/core-ds/arui-scripts/commit/a1666b047e991acd2147dfd22197e31785be8fbf) Thanks [@dmitrbrvsk](https://github.com/dmitrbrvsk)! - переименование webpack-ключей оверрайдов в rspack с обратной совместимостью
+
 ## 23.0.2
 
 ### Patch Changes

package/build/commands/build/client.js

@@ -13,17 +13,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk_1 = __importDefault(require("chalk"));
-const build_wrapper_1 = __importDefault(require("./build-wrapper"));
+const rspack_client_prod_1 = require("../../configs/rspack.client.prod");
 const client_assets_sizes_1 = require("../util/client-assets-sizes");
-const webpack_client_prod_1 = require("../../configs/webpack.client.prod");
 const load_browserslist_1 = require("../util/load-browserslist");
 const print_build_error_1 = require("../util/print-build-error");
+const build_wrapper_1 = __importDefault(require("./build-wrapper"));
 (0, load_browserslist_1.loadBrowserslist)();
 console.log(chalk_1.default.magenta('Building client...'));
 function main() {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            const { stats, warnings } = yield (0, build_wrapper_1.default)(webpack_client_prod_1.webpackClientConfig);
+            const { stats, warnings } = yield (0, build_wrapper_1.default)(rspack_client_prod_1.webpackClientConfig);
             if (warnings.length) {
                 console.log(chalk_1.default.yellow('Client compiled with warnings.\n'));
                 console.log(warnings.join('\n\n'));
@@ -37,11 +37,11 @@ function main() {
                 console.log(chalk_1.default.bold(`Sizes for "${webpackConfig.name || 'main'}"`));
                 (0, client_assets_sizes_1.printAssetsSizes)(stats);
             }
-            if (Array.isArray(webpack_client_prod_1.webpackClientConfig)) {
-                webpack_client_prod_1.webpackClientConfig.forEach((conf, index) => printOutputSizes(conf, stats.stats[index]));
+            if (Array.isArray(rspack_client_prod_1.webpackClientConfig)) {
+                rspack_client_prod_1.webpackClientConfig.forEach((conf, index) => printOutputSizes(conf, stats.stats[index]));
             }
             else {
-                printOutputSizes(webpack_client_prod_1.webpackClientConfig, stats);
+                printOutputSizes(rspack_client_prod_1.webpackClientConfig, stats);
             }
         }
         catch (err) {

package/build/commands/build/server.js

@@ -5,12 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk_1 = __importDefault(require("chalk"));
 const build_wrapper_1 = __importDefault(require("./build-wrapper"));
-const webpack_server_prod_1 = require("../../configs/webpack.server.prod");
+const rspack_server_prod_1 = require("../../configs/rspack.server.prod");
 const supporting_node_1 = require("../../configs/supporting-node");
 const print_build_error_1 = require("../util/print-build-error");
 process.env.BROWSERSLIST = supporting_node_1.supportingNode.join(',');
 console.log(chalk_1.default.magenta('Building server...'));
-(0, build_wrapper_1.default)(webpack_server_prod_1.webpackServerConfig)
+(0, build_wrapper_1.default)(rspack_server_prod_1.webpackServerConfig)
     .then(({ warnings }) => {
     if (warnings.length) {
         console.log(chalk_1.default.yellow('Server compiled with warnings.\n'));

package/build/commands/bundle-analyze/index.js

@@ -13,7 +13,7 @@ const rspack_plugin_1 = require("@rsdoctor/rspack-plugin");
 const core_1 = require("@rspack/core");
 const webpack_bundle_analyzer_1 = require("webpack-bundle-analyzer");
 const app_configs_1 = require("../../configs/app-configs");
-const webpack_client_prod_1 = require("../../configs/webpack.client.prod");
+const rspack_client_prod_1 = require("../../configs/rspack.client.prod");
 const make_tmp_dir_1 = require("../util/make-tmp-dir");
 // В rspack по умолчанию больше не включаются эти поля, но для webpack-bundle-analyzer они нужны
 // https://rspack.rs/guide/migration/rspack_1.x#changed-default-parameters-of-statstojson
@@ -28,9 +28,9 @@ const bundleAnalyzerStatsOptions = {
 };
 (() => __awaiter(void 0, void 0, void 0, function* () {
     console.log('Starting bundle analysis...');
-    const clientWebpackConfigs = Array.isArray(webpack_client_prod_1.webpackClientConfig)
-        ? webpack_client_prod_1.webpackClientConfig
-        : [webpack_client_prod_1.webpackClientConfig];
+    const clientWebpackConfigs = Array.isArray(rspack_client_prod_1.webpackClientConfig)
+        ? rspack_client_prod_1.webpackClientConfig
+        : [rspack_client_prod_1.webpackClientConfig];
     /* eslint-disable no-param-reassign */
     const promises = clientWebpackConfigs.map((webpackConfig, i) => __awaiter(void 0, void 0, void 0, function* () {
         const tmpDir = yield (0, make_tmp_dir_1.makeTmpDir)(i.toString());

package/build/commands/start/client.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const webpack_client_dev_1 = require("../../configs/webpack.client.dev");
+const rspack_client_dev_1 = require("../../configs/rspack.client.dev");
 const load_browserslist_1 = require("../util/load-browserslist");
 const run_client_dev_server_1 = require("../util/run-client-dev-server");
 (0, load_browserslist_1.loadBrowserslist)();
-(0, run_client_dev_server_1.runClientDevServer)(webpack_client_dev_1.config);
+(0, run_client_dev_server_1.runClientDevServer)(rspack_client_dev_1.config);

package/build/commands/start/index.js

@@ -7,7 +7,7 @@ const compilersCommands = [require.resolve('./client')];
 if (!app_configs_1.configs.clientOnly) {
     compilersCommands.push(require.resolve('./server'));
 }
-if (app_configs_1.configs.tsconfig && app_configs_1.configs.disableDevWebpackTypecheck) {
+if (app_configs_1.configs.tsconfig && app_configs_1.configs.disableDevRspackTypecheck) {
     compilersCommands.push((0, tsc_1.getTscWatchCommand)(app_configs_1.configs.tsconfig));
 }
 (0, run_compilers_1.runCompilers)(compilersCommands);

package/build/commands/start/server.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const rspack_server_dev_1 = require("../../configs/rspack.server.dev");
 const supporting_node_1 = require("../../configs/supporting-node");
-const webpack_server_dev_1 = require("../../configs/webpack.server.dev");
 const run_server_watch_compiler_1 = require("../util/run-server-watch-compiler");
 process.env.BROWSERSLIST = supporting_node_1.supportingNode.join(',');
-(0, run_server_watch_compiler_1.runServerWatchCompiler)(webpack_server_dev_1.webpackServerConfig);
+(0, run_server_watch_compiler_1.runServerWatchCompiler)(rspack_server_dev_1.webpackServerConfig);

package/build/commands/start-prod/client.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const webpack_client_prod_1 = require("../../configs/webpack.client.prod");
+const rspack_client_prod_1 = require("../../configs/rspack.client.prod");
 const load_browserslist_1 = require("../util/load-browserslist");
 const run_client_dev_server_1 = require("../util/run-client-dev-server");
 (0, load_browserslist_1.loadBrowserslist)();
-(0, run_client_dev_server_1.runClientDevServer)(webpack_client_prod_1.webpackClientConfig);
+(0, run_client_dev_server_1.runClientDevServer)(rspack_client_prod_1.webpackClientConfig);

package/build/commands/start-prod/index.js

@@ -7,7 +7,7 @@ const compilersCommands = [require.resolve('./client')];
 if (!app_configs_1.configs.clientOnly) {
     compilersCommands.push(require.resolve('./server'));
 }
-if (app_configs_1.configs.tsconfig && app_configs_1.configs.disableDevWebpackTypecheck) {
+if (app_configs_1.configs.tsconfig && app_configs_1.configs.disableDevRspackTypecheck) {
     compilersCommands.push((0, tsc_1.getTscWatchCommand)(app_configs_1.configs.tsconfig));
 }
 (0, run_compilers_1.runCompilers)(compilersCommands);

package/build/commands/start-prod/server.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const rspack_server_prod_1 = require("../../configs/rspack.server.prod");
 const supporting_node_1 = require("../../configs/supporting-node");
-const webpack_server_prod_1 = require("../../configs/webpack.server.prod");
 const run_server_watch_compiler_1 = require("../util/run-server-watch-compiler");
 process.env.BROWSERSLIST = supporting_node_1.supportingNode.join(',');
-(0, run_server_watch_compiler_1.runServerWatchCompiler)(webpack_server_prod_1.webpackServerConfig);
+(0, run_server_watch_compiler_1.runServerWatchCompiler)(rspack_server_prod_1.webpackServerConfig);

package/build/configs/app-configs/get-defaults.js

@@ -56,7 +56,7 @@ function getDefaultAppConfig() {
         codeLoader: 'swc',
         experimentalReactCompiler: 'disabled',
         installServerSourceMaps: false,
-        disableDevWebpackTypecheck: true,
+        disableDevRspackTypecheck: true,
         jestCodeTransformer: 'swc',
         collectCoverage: process.env.NODE_ENV === 'cypress' || process.env.USE_ISTANBUL === 'enabled',
         // image processing

package/build/configs/app-configs/types.d.ts

@@ -44,7 +44,9 @@ export type AppConfigs = {
     codeLoader: 'babel' | 'tsc' | 'swc';
     experimentalReactCompiler: 'disabled' | ReactCompilerOptions;
     installServerSourceMaps: boolean;
-    disableDevWebpackTypecheck: boolean;
+    disableDevRspackTypecheck: boolean;
+    /** @deprecated используйте `disableDevRspackTypecheck` */
+    disableDevWebpackTypecheck?: boolean;
     jestCodeTransformer: 'babel' | 'tsc' | 'swc';
     collectCoverage: boolean;
     dataUrlMaxSize?: number;

package/build/configs/app-configs/warn-about-deprecations.js

@@ -7,6 +7,11 @@ function warnAboutDeprecations(config) {
         // eslint-disable-next-line no-param-reassign
         config.proxy = convertObjectProxyConfigurationToArray(config.proxy);
     }
+    if (config.disableDevWebpackTypecheck !== undefined) {
+        console.warn('Настройка `disableDevWebpackTypecheck` устарела, используйте `disableDevRspackTypecheck`. ', 'Поддержка `disableDevWebpackTypecheck` будет скоро удалена.');
+        // eslint-disable-next-line no-param-reassign
+        config.disableDevRspackTypecheck = config.disableDevWebpackTypecheck;
+    }
 }
 function convertObjectProxyConfigurationToArray(proxyConfiguration) {
     const arrayProxy = [];

package/build/configs/modules.d.ts

@@ -3,7 +3,9 @@ import { type CompatModuleConfig } from './app-configs/types';
 export declare function haveExposedDefaultModules(): Record<string, string> | undefined;
 export declare const MODULES_ENTRY_NAME = "remoteEntry.js";
 export declare const MODULES_SEPARATE_BUILD_NAME = "wmf";
-export declare function patchMainWebpackConfigForModules(webpackConf: rspack.Configuration, mode: 'consumer' | 'provider' | 'both'): rspack.RspackOptions;
+export declare function patchMainRspackConfigForModules(webpackConf: rspack.Configuration, mode: 'consumer' | 'provider' | 'both'): rspack.RspackOptions;
+/** @deprecated используйте `patchMainRspackConfigForModules` */
+export declare const patchMainWebpackConfigForModules: typeof patchMainRspackConfigForModules;
 export declare function getCssPrefixForModule(module: CompatModuleConfig): string | undefined;
 export declare function getExposeLoadersFormCompatModules(): {
     test: string;

package/build/configs/modules.js

@@ -33,9 +33,9 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MODULES_SEPARATE_BUILD_NAME = exports.MODULES_ENTRY_NAME = void 0;
+exports.patchMainWebpackConfigForModules = exports.MODULES_SEPARATE_BUILD_NAME = exports.MODULES_ENTRY_NAME = void 0;
 exports.haveExposedDefaultModules = haveExposedDefaultModules;
-exports.patchMainWebpackConfigForModules = patchMainWebpackConfigForModules;
+exports.patchMainRspackConfigForModules = patchMainRspackConfigForModules;
 exports.getCssPrefixForModule = getCssPrefixForModule;
 exports.getExposeLoadersFormCompatModules = getExposeLoadersFormCompatModules;
 exports.patchWebpackConfigForCompat = patchWebpackConfigForCompat;
@@ -57,7 +57,7 @@ function getModuleFederationContainerName() {
 function getSeparateBuildRuntimeName() {
     return `${getModuleFederationContainerName().replace(/\W/g, '_')}_${exports.MODULES_SEPARATE_BUILD_NAME}`;
 }
-function patchMainWebpackConfigForModules(webpackConf, mode) {
+function patchMainRspackConfigForModules(webpackConf, mode) {
     var _a, _b;
     /* eslint-disable no-param-reassign */
     const isConsumer = mode === 'consumer' || mode === 'both';
@@ -104,6 +104,8 @@ function patchMainWebpackConfigForModules(webpackConf, mode) {
     return webpackConf;
     /* eslint-enable no-param-reassign */
 }
+/** @deprecated используйте `patchMainRspackConfigForModules` */
+exports.patchMainWebpackConfigForModules = patchMainRspackConfigForModules;
 function getCssPrefixForModule(module) {
     if (module.cssPrefix) {
         return module.cssPrefix;

package/build/configs/{webpack.client.dev.js → rspack.client.dev.js}

@@ -4,9 +4,9 @@ exports.config = void 0;
 const apply_overrides_1 = require("./util/apply-overrides");
 const find_loader_1 = require("./util/find-loader");
 const find_plugin_1 = require("./util/find-plugin");
-const webpack_client_1 = require("./webpack.client");
-exports.config = (0, apply_overrides_1.applyOverrides)(['webpack', 'webpackClient', 'webpackDev', 'webpackClientDev'], (0, webpack_client_1.createClientWebpackConfig)('dev'), {
-    createSingleClientWebpackConfig: webpack_client_1.createSingleClientWebpackConfig.bind(null, 'dev'),
+const rspack_client_1 = require("./rspack.client");
+exports.config = (0, apply_overrides_1.applyOverrides)(['rspack', 'rspackClient', 'rspackDev', 'rspackClientDev'], (0, rspack_client_1.createClientWebpackConfig)('dev'), {
+    createSingleClientWebpackConfig: rspack_client_1.createSingleClientWebpackConfig.bind(null, 'dev'),
     findLoader: find_loader_1.findLoader,
     findPlugin: (0, find_plugin_1.createFindPluginFunction)(),
 });

package/build/configs/{webpack.client.js → rspack.client.js}

@@ -294,7 +294,7 @@ const createSingleClientWebpackConfig = (mode, entry, configName) => (Object.ass
                 insert: (0, arui_runtime_1.getInsertCssRuntimeMethod)(),
             };
         })()),
-        (mode === 'prod' || !app_configs_1.configs.disableDevWebpackTypecheck) &&
+        (mode === 'prod' || !app_configs_1.configs.disableDevRspackTypecheck) &&
             app_configs_1.configs.tsconfig !== null &&
             app_configs_1.configs.codeLoader !== 'tsc' &&
             new ts_checker_rspack_plugin_1.TsCheckerRspackPlugin(),
@@ -381,11 +381,11 @@ const createClientWebpackConfig = (mode) => {
     var _a, _b, _c;
     const baseWebpackConfig = [(0, exports.createSingleClientWebpackConfig)(mode, app_configs_1.configs.clientEntry)];
     if ((_b = (_a = app_configs_1.configs.modules) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.useSeparateBuild) {
-        baseWebpackConfig[0] = (0, modules_1.patchMainWebpackConfigForModules)(baseWebpackConfig[0], 'consumer');
-        baseWebpackConfig.push((0, modules_1.patchMainWebpackConfigForModules)((0, exports.createSingleClientWebpackConfig)(mode, {}, modules_1.MODULES_SEPARATE_BUILD_NAME), 'provider'));
+        baseWebpackConfig[0] = (0, modules_1.patchMainRspackConfigForModules)(baseWebpackConfig[0], 'consumer');
+        baseWebpackConfig.push((0, modules_1.patchMainRspackConfigForModules)((0, exports.createSingleClientWebpackConfig)(mode, {}, modules_1.MODULES_SEPARATE_BUILD_NAME), 'provider'));
     }
     else {
-        baseWebpackConfig[0] = (0, modules_1.patchMainWebpackConfigForModules)(baseWebpackConfig[0], 'both');
+        baseWebpackConfig[0] = (0, modules_1.patchMainRspackConfigForModules)(baseWebpackConfig[0], 'both');
     }
     const exposedCompatModules = (_c = app_configs_1.configs.compatModules) === null || _c === void 0 ? void 0 : _c.exposes;
     if (!exposedCompatModules || Object.keys(exposedCompatModules).length === 0) {

package/build/configs/{webpack.client.prod.js → rspack.client.prod.js}

@@ -4,9 +4,9 @@ exports.webpackClientConfig = void 0;
 const apply_overrides_1 = require("./util/apply-overrides");
 const find_loader_1 = require("./util/find-loader");
 const find_plugin_1 = require("./util/find-plugin");
-const webpack_client_1 = require("./webpack.client");
-exports.webpackClientConfig = (0, apply_overrides_1.applyOverrides)(['webpack', 'webpackClient', 'webpackProd', 'webpackClientProd'], (0, webpack_client_1.createClientWebpackConfig)('prod'), {
-    createSingleClientWebpackConfig: webpack_client_1.createSingleClientWebpackConfig.bind(null, 'prod'),
+const rspack_client_1 = require("./rspack.client");
+exports.webpackClientConfig = (0, apply_overrides_1.applyOverrides)(['rspack', 'rspackClient', 'rspackProd', 'rspackClientProd'], (0, rspack_client_1.createClientWebpackConfig)('prod'), {
+    createSingleClientWebpackConfig: rspack_client_1.createSingleClientWebpackConfig.bind(null, 'prod'),
     findLoader: find_loader_1.findLoader,
     findPlugin: (0, find_plugin_1.createFindPluginFunction)(),
 });

package/build/configs/{webpack.server.dev.js → rspack.server.dev.js}

@@ -4,5 +4,5 @@ exports.webpackServerConfig = void 0;
 const apply_overrides_1 = require("./util/apply-overrides");
 const find_loader_1 = require("./util/find-loader");
 const find_plugin_1 = require("./util/find-plugin");
-const webpack_server_1 = require("./webpack.server");
-exports.webpackServerConfig = (0, apply_overrides_1.applyOverrides)(['webpack', 'webpackServer', 'webpackDev', 'webpackServerDev'], (0, webpack_server_1.createServerConfig)('dev'), { findLoader: find_loader_1.findLoader, findPlugin: (0, find_plugin_1.createFindPluginFunction)() });
+const rspack_server_1 = require("./rspack.server");
+exports.webpackServerConfig = (0, apply_overrides_1.applyOverrides)(['rspack', 'rspackServer', 'rspackDev', 'rspackServerDev'], (0, rspack_server_1.createServerConfig)('dev'), { findLoader: find_loader_1.findLoader, findPlugin: (0, find_plugin_1.createFindPluginFunction)() });

package/build/configs/{webpack.server.prod.js → rspack.server.prod.js}

@@ -4,5 +4,5 @@ exports.webpackServerConfig = void 0;
 const apply_overrides_1 = require("./util/apply-overrides");
 const find_loader_1 = require("./util/find-loader");
 const find_plugin_1 = require("./util/find-plugin");
-const webpack_server_1 = require("./webpack.server");
-exports.webpackServerConfig = (0, apply_overrides_1.applyOverrides)(['webpack', 'webpackServer', 'webpackProd', 'webpackServerProd'], (0, webpack_server_1.createServerConfig)('prod'), { findLoader: find_loader_1.findLoader, findPlugin: (0, find_plugin_1.createFindPluginFunction)() });
+const rspack_server_1 = require("./rspack.server");
+exports.webpackServerConfig = (0, apply_overrides_1.applyOverrides)(['rspack', 'rspackServer', 'rspackProd', 'rspackServerProd'], (0, rspack_server_1.createServerConfig)('prod'), { findLoader: find_loader_1.findLoader, findPlugin: (0, find_plugin_1.createFindPluginFunction)() });

package/build/configs/util/apply-overrides.d.ts

@@ -2,19 +2,19 @@ import type * as rspack from '@rspack/core';
 import { type Configuration as RspackDevServerConfiguration } from '@rspack/dev-server';
 import { type Options as SwcOptions } from '@swc/core';
 import { type AppContextWithConfigs } from '../app-configs/types';
-import { type createSingleClientWebpackConfig } from '../webpack.client';
+import { type createSingleClientWebpackConfig } from '../rspack.client';
 import { type findLoader } from './find-loader';
 import { type createFindPluginFunction } from './find-plugin';
 type Overrides = {
-    webpack: rspack.Configuration | rspack.Configuration[];
-    webpackClient: rspack.Configuration | rspack.Configuration[];
-    webpackDev: rspack.Configuration | rspack.Configuration[];
-    webpackClientDev: rspack.Configuration | rspack.Configuration[];
-    webpackServer: rspack.Configuration;
-    webpackServerDev: rspack.Configuration;
-    webpackProd: rspack.Configuration;
-    webpackClientProd: rspack.Configuration | rspack.Configuration[];
-    webpackServerProd: rspack.Configuration;
+    rspack: rspack.Configuration | rspack.Configuration[];
+    rspackClient: rspack.Configuration | rspack.Configuration[];
+    rspackDev: rspack.Configuration | rspack.Configuration[];
+    rspackClientDev: rspack.Configuration | rspack.Configuration[];
+    rspackServer: rspack.Configuration;
+    rspackServerDev: rspack.Configuration;
+    rspackProd: rspack.Configuration;
+    rspackClientProd: rspack.Configuration | rspack.Configuration[];
+    rspackServerProd: rspack.Configuration;
     devServer: RspackDevServerConfiguration;
     stats: rspack.RspackOptionsNormalized['stats'];
     babel: any;
@@ -37,14 +37,26 @@ type Overrides = {
     serverExternalsExemptions: Array<string | RegExp>;
     html: string;
 };
+declare const DEPRECATED_OVERRIDE_KEYS: {
+    readonly webpack: "rspack";
+    readonly webpackClient: "rspackClient";
+    readonly webpackDev: "rspackDev";
+    readonly webpackClientDev: "rspackClientDev";
+    readonly webpackServer: "rspackServer";
+    readonly webpackServerDev: "rspackServerDev";
+    readonly webpackProd: "rspackProd";
+    readonly webpackClientProd: "rspackClientProd";
+    readonly webpackServerProd: "rspackServerProd";
+};
+type DeprecatedOverrideKey = keyof typeof DEPRECATED_OVERRIDE_KEYS;
 type OmitFirstArg<F> = F extends (x: any, ...args: infer P) => infer R ? (...args: P) => R : never;
 type BoundCreateSingleClientWebpackConfig = OmitFirstArg<typeof createSingleClientWebpackConfig>;
-type ClientWebpackAdditionalArgs = {
+type ClientRspackAdditionalArgs = {
     createSingleClientWebpackConfig: BoundCreateSingleClientWebpackConfig;
     findLoader: typeof findLoader;
     findPlugin: ReturnType<typeof createFindPluginFunction<'client'>>;
 };
-type ServerWebpackAdditionalArgs = {
+type ServerRspackAdditionalArgs = {
     findLoader: typeof findLoader;
     findPlugin: ReturnType<typeof createFindPluginFunction<'server'>>;
 };
@@ -52,20 +64,38 @@ type ServerWebpackAdditionalArgs = {
  * Дополнительные аргументы, которые будут переданы в функцию оверрайда
  */
 type OverridesAdditionalArgs = {
-    webpack: ClientWebpackAdditionalArgs;
-    webpackClient: ClientWebpackAdditionalArgs;
-    webpackDev: ClientWebpackAdditionalArgs;
-    webpackClientDev: ClientWebpackAdditionalArgs;
-    webpackProd: ClientWebpackAdditionalArgs;
-    webpackClientProd: ClientWebpackAdditionalArgs;
-    webpackServer: ServerWebpackAdditionalArgs;
-    webpackServerDev: ServerWebpackAdditionalArgs;
-    webpackServerProd: ServerWebpackAdditionalArgs;
+    rspack: ClientRspackAdditionalArgs;
+    rspackClient: ClientRspackAdditionalArgs;
+    rspackDev: ClientRspackAdditionalArgs;
+    rspackClientDev: ClientRspackAdditionalArgs;
+    rspackProd: ClientRspackAdditionalArgs;
+    rspackClientProd: ClientRspackAdditionalArgs;
+    rspackServer: ServerRspackAdditionalArgs;
+    rspackServerDev: ServerRspackAdditionalArgs;
+    rspackServerProd: ServerRspackAdditionalArgs;
+    /** @deprecated используйте rspack */
+    webpack: ClientRspackAdditionalArgs;
+    /** @deprecated используйте rspackClient */
+    webpackClient: ClientRspackAdditionalArgs;
+    /** @deprecated используйте rspackDev */
+    webpackDev: ClientRspackAdditionalArgs;
+    /** @deprecated используйте rspackClientDev */
+    webpackClientDev: ClientRspackAdditionalArgs;
+    /** @deprecated используйте rspackProd */
+    webpackProd: ClientRspackAdditionalArgs;
+    /** @deprecated используйте rspackClientProd */
+    webpackClientProd: ClientRspackAdditionalArgs;
+    /** @deprecated используйте rspackServer */
+    webpackServer: ServerRspackAdditionalArgs;
+    /** @deprecated используйте rspackServerDev */
+    webpackServerDev: ServerRspackAdditionalArgs;
+    /** @deprecated используйте rspackServerProd */
+    webpackServerProd: ServerRspackAdditionalArgs;
 };
-type OverrideFunction<K extends keyof Overrides, AdditionalArgs = K extends keyof OverridesAdditionalArgs ? OverridesAdditionalArgs[K] : undefined> = (config: Overrides[K], appConfig: AppContextWithConfigs, additionalArgs: AdditionalArgs) => Overrides[K];
+type OverrideFunction<K extends keyof Overrides> = (config: Overrides[K], appConfig: AppContextWithConfigs, additionalArgs: K extends keyof OverridesAdditionalArgs ? OverridesAdditionalArgs[K] : undefined) => Overrides[K];
 export type OverrideFile = {
     [K in keyof Overrides]?: OverrideFunction<K>;
-};
+} & Partial<Record<DeprecatedOverrideKey, OverrideFunction<'rspack'>>>;
 /**
  *
  * @param {String|String[]} overridesKey Ключи оверрайда

package/build/configs/util/apply-overrides.js

@@ -2,6 +2,40 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.applyOverrides = applyOverrides;
 const app_configs_1 = require("../app-configs");
+// Маппинг устаревших webpack-ключей оверрайдов на актуальные ключи для rspack
+// Поддержка webpack-ключей будет скоро удалена.
+const DEPRECATED_OVERRIDE_KEYS = {
+    webpack: 'rspack',
+    webpackClient: 'rspackClient',
+    webpackDev: 'rspackDev',
+    webpackClientDev: 'rspackClientDev',
+    webpackServer: 'rspackServer',
+    webpackServerDev: 'rspackServerDev',
+    webpackProd: 'rspackProd',
+    webpackClientProd: 'rspackClientProd',
+    webpackServerProd: 'rspackServerProd',
+};
+/**
+ * Переносит устаревшие webpack-ключи оверрайдов на актуальные rspack-ключи и
+ * предупреждает о необходимости миграции. Если заданы оба ключа — приоритет у
+ * нового, устаревший игнорируется.
+ */
+function normalizeDeprecatedOverrideKeys(override) {
+    const result = Object.assign({}, override);
+    Object.keys(DEPRECATED_OVERRIDE_KEYS).forEach((deprecatedKey) => {
+        if (!Object.prototype.hasOwnProperty.call(result, deprecatedKey)) {
+            return;
+        }
+        const newKey = DEPRECATED_OVERRIDE_KEYS[deprecatedKey];
+        console.warn(`[arui-scripts] Ключ оверрайда "${deprecatedKey}" устарел, используйте "${newKey}". ` +
+            `Поддержка "${deprecatedKey}" будет скоре удалена.`);
+        if (!Object.prototype.hasOwnProperty.call(result, newKey)) {
+            result[newKey] = result[deprecatedKey];
+        }
+        delete result[deprecatedKey];
+    });
+    return result;
+}
 let overrides = [];
 overrides = app_configs_1.configs.overridesPath.map((path) => {
     try {
@@ -10,9 +44,9 @@ overrides = app_configs_1.configs.overridesPath.map((path) => {
         // eslint-disable-next-line no-underscore-dangle
         if (requireResult.__esModule) {
             // ts-node импортирует esModules, из них надо вытягивать default именно так
-            return requireResult.default;
+            return normalizeDeprecatedOverrideKeys(requireResult.default);
         }
-        return requireResult;
+        return normalizeDeprecatedOverrideKeys(requireResult);
     }
     catch (e) {
         console.error(`Unable to process override file "${path}"`);
@@ -40,6 +74,8 @@ function applyOverrides(overridesKey, config, args) {
                     throw new TypeError(`Override ${key} must be a function`);
                 }
                 // eslint-disable-next-line no-param-reassign
+                // @ts-expect-error Union type conflict between rspack and deprecated webpack keys - resolved at runtime
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any,no-param-reassign
                 config = overrideFn(config, app_configs_1.configs, args);
             }
         });

package/build/configs/util/find-plugin.d.ts

@@ -5,10 +5,10 @@ import type AssetsPlugin from 'assets-webpack-plugin';
 import type CaseSensitivePathsPlugin from 'case-sensitive-paths-webpack-plugin';
 import type CompressionPlugin from 'compression-webpack-plugin';
 import type MiniCssExtractPlugin from 'mini-css-extract-plugin';
+import { type RspackManifestPlugin } from 'rspack-manifest-plugin';
 import { type RunScriptWebpackPlugin } from 'run-script-webpack-plugin';
 import { type TsCheckerRspackPluginOptions } from 'ts-checker-rspack-plugin/lib/plugin-options';
 import { type WebpackDeduplicationPlugin } from 'webpack-deduplication-plugin';
-import { type WebpackManifestPlugin } from 'webpack-manifest-plugin';
 type PluginsListClient = {
     AssetsWebpackPlugin: {
         options: AssetsPlugin.Options;
@@ -45,7 +45,7 @@ type PluginsListClient = {
         };
     };
     WebpackManifestPlugin: {
-        options: ConstructorParameters<typeof WebpackManifestPlugin>[number];
+        options: ConstructorParameters<typeof RspackManifestPlugin>[number];
     };
     CompressionPlugin: {
         options: ConstructorParameters<typeof CompressionPlugin>[number];

package/build/index.d.ts

@@ -3,4 +3,4 @@ export type { AppConfigs, CompatModuleConfig, PackageSettings } from './configs/
 export { prepareFilesForDocker } from './commands/util/docker-build';
 export { getBuildParamsFromArgs } from './commands/util/docker-build';
 export { getDockerBuildCommand } from './commands/util/docker-build';
-export { patchMainWebpackConfigForModules } from './configs/modules';
+export { patchMainRspackConfigForModules, patchMainWebpackConfigForModules, } from './configs/modules';

package/build/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.patchMainWebpackConfigForModules = exports.getDockerBuildCommand = exports.getBuildParamsFromArgs = exports.prepareFilesForDocker = void 0;
+exports.patchMainWebpackConfigForModules = exports.patchMainRspackConfigForModules = exports.getDockerBuildCommand = exports.getBuildParamsFromArgs = exports.prepareFilesForDocker = void 0;
 var docker_build_1 = require("./commands/util/docker-build");
 Object.defineProperty(exports, "prepareFilesForDocker", { enumerable: true, get: function () { return docker_build_1.prepareFilesForDocker; } });
 var docker_build_2 = require("./commands/util/docker-build");
@@ -8,4 +8,5 @@ Object.defineProperty(exports, "getBuildParamsFromArgs", { enumerable: true, get
 var docker_build_3 = require("./commands/util/docker-build");
 Object.defineProperty(exports, "getDockerBuildCommand", { enumerable: true, get: function () { return docker_build_3.getDockerBuildCommand; } });
 var modules_1 = require("./configs/modules");
+Object.defineProperty(exports, "patchMainRspackConfigForModules", { enumerable: true, get: function () { return modules_1.patchMainRspackConfigForModules; } });
 Object.defineProperty(exports, "patchMainWebpackConfigForModules", { enumerable: true, get: function () { return modules_1.patchMainWebpackConfigForModules; } });

package/build/plugins/reload-server-plugin.d.ts

@@ -1,5 +1,5 @@
 import { type Worker } from 'cluster';
-import { type Compiler } from 'webpack';
+import { type Compiler } from '@rspack/core';
 export declare class ReloadServerPlugin {
     workers: Worker[];
     done: null | (() => void);

package/build/plugins/watch-missing-node-modules-plugin.d.ts

@@ -1,4 +1,4 @@
-import { type Compiler } from 'webpack';
+import { type Compiler } from '@rspack/core';
 export declare class WatchMissingNodeModulesPlugin {
     nodeModulesPath: string;
     constructor(nodeModulesPath: string);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arui-scripts",
-  "version": "23.0.2",
+  "version": "23.1.0",
   "main": "./build/index.js",
   "typings": "./build/index.d.ts",
   "exports": {
@@ -83,7 +83,6 @@
     "mini-css-extract-plugin": "2.7.6",
     "mini-svg-data-uri": "^1.4.4",
     "null-loader": "0.1.1",
-    "pnp-webpack-plugin": "1.7.0",
     "postcss": "^8.5.10",
     "postcss-calc": "^9.0.0",
     "postcss-color-function": "^4.0.0",
@@ -126,7 +125,6 @@
     "vitest": "^4.1.5",
     "webpack-bundle-analyzer": "4.10.2",
     "webpack-deduplication-plugin": "^0.0.8",
-    "webpack-manifest-plugin": "3.2.0",
     "webpack-node-externals": "3.0.0"
   },
   "devDependencies": {
@@ -141,12 +139,8 @@
     "@types/semver": "^7.5.0",
     "@types/serialize-javascript": "^5.0.4",
     "@types/shelljs": "^0.8.12",
-    "@types/start-server-webpack-plugin": "2.2.2",
     "@types/tar": "^4.0.5",
-    "@types/webpack": "^5.28.5",
     "@types/webpack-bundle-analyzer": "4.7.0",
-    "@types/webpack-dev-server": "4.7.2",
-    "@types/webpack-manifest-plugin": "3.0.5",
     "@types/webpack-node-externals": "^3.0.0",
     "babel-plugin-transform-import-meta": "^2.3.3",
     "type-fest": "2.19.0",