arui-scripts 23.0.0 → 23.0.2

package/.turbo/turbo-test.log

@@ -1,22 +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.435 s)
-PASS src/configs/app-configs/__tests__/update-with-presets.tests.ts (23.475 s)
+PASS src/plugins/postcss-global-variables/utils/__tests__/add-global-variable.tests.ts (23.47 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/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/configs/util/__tests__/compress-with-dcb.test.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 (33.335 s)
+PASS src/configs/__tests__/webpack-client-modules.tests.ts (16.896 s)
+PASS src/configs/util/__tests__/find-plugin.tests.ts (41.681 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: 12 passed, 12 total
-Tests:       30 passed, 30 total
+Test Suites: 13 passed, 13 total
+Tests:       31 passed, 31 total
 Snapshots:   0 total
-Time:        35.323 s
+Time:        43.483 s
 Ran all test suites.

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # arui-scripts
 
+## 23.0.2
+
+### Patch Changes
+
+-   [#512](https://github.com/core-ds/arui-scripts/pull/512) [`e2b0ee1`](https://github.com/core-ds/arui-scripts/commit/e2b0ee1d3376e359a7e466de7a5d3c37ed672684) Thanks [@dmitrbrvsk](https://github.com/dmitrbrvsk)! - Исправлен запуск команды `bundle-analyze`. Теперь явно включаются необходимые поля stats для `webpack-bundle-analyzer`, которые больше не попадают в `stats.toJson()` по умолчанию
+
+## 23.0.1
+
+### Patch Changes
+
+-   [#513](https://github.com/core-ds/arui-scripts/pull/513) [`fb3dcef`](https://github.com/core-ds/arui-scripts/commit/fb3dcef62e38e71da665175d2aef42fa00b95040) Thanks [@evK608](https://github.com/evK608)! - Исправление конфликта runtime-чанков между основной сборкой и отдельной WMF-сборкой при использовании modules.options.useSeparateBuild
+
 ## 23.0.0
 
 ### Major Changes

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

@@ -15,6 +15,17 @@ 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 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
+const bundleAnalyzerStatsOptions = {
+    assets: true,
+    chunks: true,
+    chunkGroups: true,
+    chunkModules: true,
+    entryPoints: true,
+    entrypoints: true,
+    modules: true,
+};
 (() => __awaiter(void 0, void 0, void 0, function* () {
     console.log('Starting bundle analysis...');
     const clientWebpackConfigs = Array.isArray(webpack_client_prod_1.webpackClientConfig)
@@ -23,11 +34,13 @@ const make_tmp_dir_1 = require("../util/make-tmp-dir");
     /* 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());
+        const webpackStatsOptions = Object.assign(Object.assign({}, (typeof webpackConfig.stats === 'object' ? webpackConfig.stats : {})), bundleAnalyzerStatsOptions);
         webpackConfig.plugins = [
             ...(webpackConfig.plugins || []),
             new webpack_bundle_analyzer_1.BundleAnalyzerPlugin({
                 generateStatsFile: true,
                 statsFilename: app_configs_1.configs.statsOutputPath,
+                statsOptions: bundleAnalyzerStatsOptions,
                 analyzerPort: 'auto',
                 analyzerMode: 'server',
                 openAnalyzer: true,
@@ -35,6 +48,7 @@ const make_tmp_dir_1 = require("../util/make-tmp-dir");
             }), // webpack-bundle-analyzer has incorrect types
             new rspack_plugin_1.RsdoctorRspackPlugin({}),
         ];
+        webpackConfig.stats = webpackStatsOptions;
         webpackConfig.output = Object.assign(Object.assign({}, webpackConfig.output), { path: tmpDir });
     }));
     yield Promise.all(promises);

package/build/configs/modules.d.ts

@@ -2,6 +2,7 @@ import * as rspack from '@rspack/core';
 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 getCssPrefixForModule(module: CompatModuleConfig): string | undefined;
 export declare function getExposeLoadersFormCompatModules(): {

package/build/configs/modules.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MODULES_ENTRY_NAME = void 0;
+exports.MODULES_SEPARATE_BUILD_NAME = exports.MODULES_ENTRY_NAME = void 0;
 exports.haveExposedDefaultModules = haveExposedDefaultModules;
 exports.patchMainWebpackConfigForModules = patchMainWebpackConfigForModules;
 exports.getCssPrefixForModule = getCssPrefixForModule;
@@ -49,6 +49,14 @@ function haveExposedDefaultModules() {
     return (_a = app_configs_1.configs.modules) === null || _a === void 0 ? void 0 : _a.exposes;
 }
 exports.MODULES_ENTRY_NAME = 'remoteEntry.js';
+exports.MODULES_SEPARATE_BUILD_NAME = 'wmf';
+function getModuleFederationContainerName() {
+    var _a;
+    return ((_a = app_configs_1.configs.modules) === null || _a === void 0 ? void 0 : _a.name) || app_configs_1.configs.normalizedName;
+}
+function getSeparateBuildRuntimeName() {
+    return `${getModuleFederationContainerName().replace(/\W/g, '_')}_${exports.MODULES_SEPARATE_BUILD_NAME}`;
+}
 function patchMainWebpackConfigForModules(webpackConf, mode) {
     var _a, _b;
     /* eslint-disable no-param-reassign */
@@ -81,14 +89,18 @@ function patchMainWebpackConfigForModules(webpackConf, mode) {
     webpackConf.output.publicPath = haveExposedDefaultModules()
         ? 'auto' // Для того чтобы модули могли подключаться из разных мест, нам необходимо использовать auto. Для корректной работы в IE надо подключaть https://github.com/amiller-gh/currentScript-polyfill
         : app_configs_1.configs.publicPath;
+    if (mode === 'provider') {
+        const uniqueName = getSeparateBuildRuntimeName();
+        webpackConf.output = Object.assign(Object.assign({}, webpackConf.output), { uniqueName, chunkLoadingGlobal: `rspackChunk${uniqueName}` });
+    }
     webpackConf.plugins.push(new rspack.container.ModuleFederationPlugin({
-        name: app_configs_1.configs.modules.name || app_configs_1.configs.normalizedName,
+        name: getModuleFederationContainerName(),
         filename: isProvider && app_configs_1.configs.modules.exposes ? exports.MODULES_ENTRY_NAME : undefined,
         shared: (mode === 'provider' && ((_b = app_configs_1.configs.modules.options) === null || _b === void 0 ? void 0 : _b.separateBuildShared)) ||
             app_configs_1.configs.modules.shared,
         exposes: isProvider ? app_configs_1.configs.modules.exposes : {},
         shareScope: app_configs_1.configs.modules.shareScope,
-    }), new turn_off_split_remote_entry_1.TurnOffSplitRemoteEntry(app_configs_1.configs.modules.name || app_configs_1.configs.normalizedName));
+    }), new turn_off_split_remote_entry_1.TurnOffSplitRemoteEntry(getModuleFederationContainerName()));
     return webpackConf;
     /* eslint-enable no-param-reassign */
 }

package/build/configs/webpack.client.js

@@ -382,7 +382,7 @@ const createClientWebpackConfig = (mode) => {
     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, {}, 'wmf'), 'provider'));
+        baseWebpackConfig.push((0, modules_1.patchMainWebpackConfigForModules)((0, exports.createSingleClientWebpackConfig)(mode, {}, modules_1.MODULES_SEPARATE_BUILD_NAME), 'provider'));
     }
     else {
         baseWebpackConfig[0] = (0, modules_1.patchMainWebpackConfigForModules)(baseWebpackConfig[0], 'both');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arui-scripts",
-  "version": "23.0.0",
+  "version": "23.0.2",
   "main": "./build/index.js",
   "typings": "./build/index.d.ts",
   "exports": {
@@ -116,7 +116,7 @@
     "style-loader": "3.3.3",
     "swc-loader": "^0.2.6",
     "swc-plugin-coverage-instrument": "0.0.32",
-    "tar": "7.5.11",
+    "tar": "7.5.16",
     "terser-webpack-plugin": "5.3.14",
     "ts-checker-rspack-plugin": "^1.3.0",
     "ts-jest": "29.1.0",