arui-scripts 21.0.5 → 22.0.1

package/.turbo/turbo-test.log

@@ -1,21 +1,21 @@
 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.078 s)
+PASS src/configs/app-configs/__tests__/update-with-presets.tests.ts (21.575 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 (23.705 s)
-PASS src/configs/app-configs/__tests__/update-with-package.tests.ts
 PASS src/configs/app-configs/__tests__/update-with-env.tests.ts
+PASS src/configs/app-configs/__tests__/update-with-package.tests.ts
+PASS src/plugins/postcss-global-variables/utils/__tests__/add-global-variable.tests.ts (22.634 s)
 PASS src/configs/util/__tests__/get-polyfills.tests.ts
 PASS src/configs/util/__tests__/compress-with-dcb.test.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/util/__tests__/find-plugin.tests.ts (26.801 s)
+PASS src/configs/util/__tests__/find-plugin.tests.ts (30.504 s)
 
 Test Suites: 12 passed, 12 total
 Tests:       30 passed, 30 total
 Snapshots:   0 total
-Time:        27.649 s
+Time:        31.39 s
 Ran all test suites.

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # arui-scripts
 
+## 22.0.1
+
+### Patch Changes
+
+-   [#483](https://github.com/core-ds/arui-scripts/pull/483) [`b19bd97`](https://github.com/core-ds/arui-scripts/commit/b19bd97cfc607752f3211968cd83771e7ded2f3c) Thanks [@ngg-dev](https://github.com/ngg-dev)! - Обновление импорта для get-port, так как начиная с версии 6.0.0, данная библиотека полностью переведена на ESM
+
+## 22.0.0
+
+### Major Changes
+
+-   [#470](https://github.com/core-ds/arui-scripts/pull/470) [`6f3178f`](https://github.com/core-ds/arui-scripts/commit/6f3178f9e6e37d4b21d1bcd08a9ad6c469ae59c2) Thanks [@dmitrbrvsk](https://github.com/dmitrbrvsk)! - В **arui-scripts** переведены инструменты сборки на **Rspack 2** и **@rspack/dev-server 2**.
+
+    ## Почему мажорный релиз
+
+    Поднято требование к node.js: для разработки теперь требуется **20.19.0 и выше** или **22.12.0 и выше** (см. поле `engines` в `package.json`). На **node.js 18** и на **20.0–20.18** новая версия не рассчитана, потому что этого требует сам Rspack 2 и dev-server 2.
+
+    ## Что это означает для проектов на arui-scripts
+
+    -   **Обычный сценарий** (настройки из доки, без своих оверрайдов webpack/rspack/devServer): после обновления пакета достаточно **поднять версию node.js** до поддерживаемой версии и прогнать `yarn start` / `yarn build`.
+    -   **Если в проекте есть оверрайды** (`arui-scripts` override с `devServer`, `proxy`, `webpackClient` и тд.): часть старых опций пропала или переименована в Rspack 2 и в dev-server 2. Например, в прокси dev-сервера больше нет `bypass`, вместо него теперь используются фильтры путей и колбэки в `on.*`. Подробнее про это в ссылка ниже.
+
+    ## Ссылки про миграцию
+
+    -   [Rspack: обновление с 1.x на 2.0](https://rspack.rs/guide/migration/rspack_1.x)
+    -   [@rspack/dev-server: с v1 на v2](https://github.com/rstackjs/rspack-dev-server/blob/main/docs/migrate-v1-to-v2.md)
+
 ## 21.0.5
 
 ### Patch Changes

package/build/commands/util/run-client-dev-server.js

@@ -8,13 +8,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runClientDevServer = runClientDevServer;
 const util_1 = require("util");
-const get_port_1 = __importDefault(require("get-port"));
 const core_1 = require("@rspack/core");
 const dev_server_1 = require("@rspack/dev-server");
 const dev_server_2 = require("../../configs/dev-server");
@@ -28,7 +24,8 @@ function runClientDevServer(configuration) {
         const DEFAULT_PORT = dev_server_2.devServerConfig.port;
         const HOST = '0.0.0.0';
         try {
-            const port = yield (0, get_port_1.default)({
+            const { default: getPort } = yield import('get-port');
+            const port = yield getPort({
                 port: +(DEFAULT_PORT || 0),
                 host: HOST,
             });

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

@@ -1,5 +1,5 @@
 import { type DevTool, type Shared } from '@rspack/core';
-import { type RspackDevServer } from '@rspack/dev-server';
+import { type Configuration as DevServerConfiguration } from '@rspack/dev-server';
 import { type PluginOptions as ReactCompilerOptions } from 'babel-plugin-react-compiler';
 /**
  * Конфигурация arui-scripts, которая может быть переопределена приложением
@@ -12,7 +12,7 @@ export type AppConfigs = {
     devServerCors: boolean;
     useServerHMR: boolean;
     presets: string | null;
-    proxy: RspackDevServer['options']['proxy'];
+    proxy: DevServerConfiguration['proxy'];
     clientOnly: boolean;
     buildPath: string;
     assetsPath: string;

package/build/configs/dev-server.js

@@ -8,34 +8,37 @@ const path_1 = __importDefault(require("path"));
 const apply_overrides_1 = require("./util/apply-overrides");
 const app_configs_1 = require("./app-configs");
 const client_env_config_1 = require("./client-env-config");
-const serverProxyConfig = Object.assign({ context: ['/**'], target: `http://127.0.0.1:${app_configs_1.configs.serverPort}`, bypass: (req) => {
-        var _a;
-        const assetsRoot = path_1.default.normalize(`/${app_configs_1.configs.publicPath}`).replace(/\\/g, '/');
-        if ((_a = req === null || req === void 0 ? void 0 : req.url) === null || _a === void 0 ? void 0 : _a.startsWith(assetsRoot)) {
-            return req.url;
+function getServerToClientProxyConfig() {
+    const assetsRoot = path_1.default.normalize(`/${app_configs_1.configs.publicPath}`).replace(/\\/g, '/');
+    return Object.assign({ target: `http://127.0.0.1:${app_configs_1.configs.serverPort}`, 
+        // В @rspack/dev-server v2 (http-proxy-middleware) опции bypass нет. Аналог pathFilter
+        // на бэкенд уходят только запросы, чей path не относится к клиентской статике (префикс publicPath).
+        pathFilter: (pathname) => !pathname.startsWith(assetsRoot) }, ((app_configs_1.configs.devSourceMaps && app_configs_1.configs.devSourceMaps.includes('eval')) ||
+        app_configs_1.configs.devServerCors
+        ? {
+            on: {
+                proxyRes: (proxyRes, req) => {
+                    // Для дев режима, когда мы используем в качестве соурсмапов что-то, основанное на eval - нужно
+                    // разрешить браузеру исполнять наш код, даже когда content-security-policy приложения не позволяет этого делать.
+                    if (app_configs_1.configs.devSourceMaps && app_configs_1.configs.devSourceMaps.includes('eval')) {
+                        const cspHeader = proxyRes.headers['content-security-policy'];
+                        if (typeof cspHeader === 'string' &&
+                            !cspHeader.includes('unsafe-eval')) {
+                            // eslint-disable-next-line no-param-reassign
+                            proxyRes.headers['content-security-policy'] = cspHeader.replace(/script-src/, "script-src 'unsafe-eval'");
+                        }
+                    }
+                    // если включен devServerCors, то нужно принудительно менять статус ответа на 200, чтобы
+                    // браузер не отклонял ответы с CORS
+                    if (app_configs_1.configs.devServerCors && req.method === 'OPTIONS') {
+                        // eslint-disable-next-line no-param-reassign
+                        proxyRes.statusCode = 200;
+                    }
+                },
+            },
         }
-        return null;
-    } }, ((app_configs_1.configs.devSourceMaps && app_configs_1.configs.devSourceMaps.includes('eval')) || app_configs_1.configs.devServerCors
-    ? {
-        onProxyRes: (proxyRes) => {
-            // Для дев режима, когда мы используем в качестве соурсмапов что-то, основанное на eval - нужно
-            // разрешить браузеру исполнять наш код, даже когда content-security-policy приложения не позволяет этого делать.
-            if (app_configs_1.configs.devSourceMaps && app_configs_1.configs.devSourceMaps.includes('eval')) {
-                const cspHeader = proxyRes.headers['content-security-policy'];
-                if (typeof cspHeader === 'string' && !cspHeader.includes('unsafe-eval')) {
-                    // eslint-disable-next-line no-param-reassign
-                    proxyRes.headers['content-security-policy'] = cspHeader.replace(/script-src/, "script-src 'unsafe-eval'");
-                }
-            }
-            // если включен devServerCors, то нужно принудительно менять статус ответа на 200, чтобы
-            // браузер не отклонял ответы с CORS
-            if (app_configs_1.configs.devServerCors && proxyRes.method === 'OPTIONS') {
-                // eslint-disable-next-line no-param-reassign
-                proxyRes.statusCode = 200;
-            }
-        },
-    }
-    : {}));
+        : {}));
+}
 exports.devServerConfig = (0, apply_overrides_1.applyOverrides)('devServer', {
     port: app_configs_1.configs.clientServerPort,
     liveReload: false,
@@ -66,7 +69,7 @@ function getProxyConfig() {
     const proxyConfig = [];
     const userProxyConfig = app_configs_1.configs.proxy;
     if (!app_configs_1.configs.clientOnly) {
-        proxyConfig.push(serverProxyConfig);
+        proxyConfig.push(getServerToClientProxyConfig());
     }
     if (Array.isArray(userProxyConfig)) {
         proxyConfig.unshift(...userProxyConfig);

package/build/configs/webpack.client.d.ts

@@ -7,4 +7,4 @@ import { type Entry } from './util/get-entry';
  * @param configName Имя конфигурации, если не указано, то используется имя по умолчанию
  */
 export declare const createSingleClientWebpackConfig: (mode: "dev" | "prod", entry: Entry, configName?: string) => Configuration;
-export declare const createClientWebpackConfig: (mode: "dev" | "prod") => import("@rspack/core").RspackOptions | import("@rspack/core").RspackOptions[];
+export declare const createClientWebpackConfig: (mode: "dev" | "prod") => import("@rspack/core", { with: { "resolution-mode": "import" } }).RspackOptions | import("@rspack/core", { with: { "resolution-mode": "import" } }).RspackOptions[];

package/build/configs/webpack.client.dev.d.ts

@@ -1 +1 @@
-export declare const config: import("@rspack/core").RspackOptions | import("@rspack/core").RspackOptions[];
+export declare const config: import("@rspack/core", { with: { "resolution-mode": "import" } }).RspackOptions | import("@rspack/core", { with: { "resolution-mode": "import" } }).RspackOptions[];

package/build/configs/webpack.client.js

@@ -41,7 +41,7 @@ const path_1 = __importDefault(require("path"));
 const zlib = __importStar(require("zlib"));
 const react_refresh_typescript_1 = __importDefault(require("react-refresh-typescript"));
 const core_1 = require("@rspack/core");
-const plugin_react_refresh_1 = __importDefault(require("@rspack/plugin-react-refresh"));
+const plugin_react_refresh_1 = require("@rspack/plugin-react-refresh");
 const assets_webpack_plugin_1 = __importDefault(require("assets-webpack-plugin"));
 const case_sensitive_paths_webpack_plugin_1 = __importDefault(require("case-sensitive-paths-webpack-plugin"));
 const compression_webpack_plugin_1 = __importDefault(require("compression-webpack-plugin"));
@@ -168,7 +168,7 @@ const createSingleClientWebpackConfig = (mode, entry, configName) => (Object.ass
             }
             : false, nodeEnv: mode === 'prod' ? 'production' : false, 
         // Оптимизации времени билда, см https://webpack.js.org/guides/build-performance/
-        removeAvailableModules: mode !== 'dev', removeEmptyChunks: mode !== 'dev' }), resolve: {
+        removeEmptyChunks: mode !== 'dev' }), resolve: {
         // This allows you to set a fallback for where Webpack should look for modules.
         // We placed these paths second because we want `node_modules` to "win"
         // if there are any conflicts. This matches Node resolution mechanism.
@@ -316,7 +316,7 @@ const createSingleClientWebpackConfig = (mode, entry, configName) => (Object.ass
                 rootPath: app_configs_1.configs.cwd,
             }),
         // dev plugins:
-        mode === 'dev' && new plugin_react_refresh_1.default(),
+        mode === 'dev' && new plugin_react_refresh_1.ReactRefreshRspackPlugin(),
         // Watcher doesn't work well if you mistype casing in a path so we use
         // a plugin that prints an error when you attempt to do this.
         // See https://github.com/facebookincubator/create-react-app/issues/240

package/build/configs/webpack.client.prod.d.ts

@@ -1 +1 @@
-export declare const webpackClientConfig: import("@rspack/core").RspackOptions | import("@rspack/core").RspackOptions[];
+export declare const webpackClientConfig: import("@rspack/core", { with: { "resolution-mode": "import" } }).RspackOptions | import("@rspack/core", { with: { "resolution-mode": "import" } }).RspackOptions[];

package/build/configs/webpack.server.dev.d.ts

@@ -1 +1 @@
-export declare const webpackServerConfig: import("@rspack/core").RspackOptions;
+export declare const webpackServerConfig: import("@rspack/core", { with: { "resolution-mode": "import" } }).RspackOptions;

package/build/configs/webpack.server.js

@@ -10,6 +10,7 @@ const core_1 = require("@rspack/core");
 const case_sensitive_paths_webpack_plugin_1 = __importDefault(require("case-sensitive-paths-webpack-plugin"));
 const run_script_webpack_plugin_1 = require("run-script-webpack-plugin");
 const webpack_node_externals_1 = __importDefault(require("webpack-node-externals"));
+const get_local_ident_1 = require("../commands/util/get-local-ident");
 const reload_server_plugin_1 = require("../plugins/reload-server-plugin");
 const watch_missing_node_modules_plugin_1 = require("../plugins/watch-missing-node-modules-plugin");
 const create_watch_ignore_regex_1 = require("./util/create-watch-ignore-regex");
@@ -20,7 +21,6 @@ const babel_server_1 = require("./babel-server");
 const postcss_1 = require("./postcss");
 const server_externals_exemptions_1 = require("./server-externals-exemptions");
 const swc_1 = require("./swc");
-const get_local_ident_1 = require("../commands/util/get-local-ident");
 const assetsIgnoreBanner = fs_1.default.readFileSync(require.resolve('./util/node-assets-ignore'), 'utf8');
 const sourceMapSupportBanner = fs_1.default.readFileSync(require.resolve('./util/install-sourcemap-support'), 'utf8');
 // style files regexes

package/build/configs/webpack.server.prod.d.ts

@@ -1 +1 @@
-export declare const webpackServerConfig: import("@rspack/core").RspackOptions;
+export declare const webpackServerConfig: import("@rspack/core", { with: { "resolution-mode": "import" } }).RspackOptions;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arui-scripts",
-  "version": "21.0.5",
+  "version": "22.0.1",
   "main": "./build/index.js",
   "typings": "./build/index.d.ts",
   "license": "MPL-2.0",
@@ -36,12 +36,13 @@
     "@babel/preset-react": "^7.23.3",
     "@babel/preset-typescript": "^7.23.3",
     "@babel/runtime": "^7.26.10",
+    "@module-federation/runtime-tools": "^2.0.0",
     "@pmmmwh/react-refresh-webpack-plugin": "0.6.2",
-    "@rsdoctor/rspack-plugin": "1.5.2",
-    "@rspack/cli": "1.7.6",
-    "@rspack/core": "1.7.3",
-    "@rspack/dev-server": "1.2.1",
-    "@rspack/plugin-react-refresh": "1.4.3",
+    "@rsdoctor/rspack-plugin": "1.5.9",
+    "@rspack/cli": "2.0.0",
+    "@rspack/core": "2.0.0",
+    "@rspack/dev-server": "2.0.0",
+    "@rspack/plugin-react-refresh": "2.0.0",
     "@swc/core": "1.15.1",
     "@swc/jest": "0.2.39",
     "assets-webpack-plugin": "7.1.1",
@@ -99,7 +100,7 @@
     "react-refresh": "0.10.0",
     "react-refresh-typescript": "2.0.2",
     "rimraf": "^2.7.1",
-    "rspack-manifest-plugin": "5.0.3",
+    "rspack-manifest-plugin": "5.2.1",
     "run-script-webpack-plugin": "0.0.11",
     "semver": "^7.5.4",
     "serialize-javascript": "^7.0.5",
@@ -126,7 +127,7 @@
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^29.5.14",
     "@types/lodash.merge": "^4.6.7",
-    "@types/node": "18.19.121",
+    "@types/node": "^20.19.0",
     "@types/postcss-media-query-parser": "0.2.4",
     "@types/semver": "^7.5.0",
     "@types/serialize-javascript": "^5.0.4",
@@ -138,11 +139,12 @@
     "@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",
     "typescript": "6.0.2"
   },
   "engines": {
-    "node": ">=20"
+    "node": "^20.19.0 || >=22.12.0"
   },
   "scripts": {
     "build": "sh bin/build.sh",
@@ -174,7 +176,29 @@
         {
           "tsconfig": "tsconfig-local.json"
         }
+      ],
+      "/node_modules/@rspack/.+\\.(mjs|js)$": [
+        "babel-jest",
+        {
+          "presets": [
+            [
+              "@babel/preset-env",
+              {
+                "targets": {
+                  "node": "20"
+                },
+                "modules": "commonjs"
+              }
+            ]
+          ],
+          "plugins": [
+            "babel-plugin-transform-import-meta"
+          ]
+        }
       ]
-    }
+    },
+    "transformIgnorePatterns": [
+      "/node_modules/(?!@rspack/)"
+    ]
   }
 }