arui-scripts 20.6.0 → 20.6.2

package/.turbo/turbo-test.log

@@ -5,20 +5,21 @@ ts-jest[versions] (WARN) Version 29.7.0 of jest installed has not been tested wi
 ts-jest[versions] (WARN) Version 5.6.3 of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=4.3.0 <5.0.0-0). Please do not report issues in ts-jest if you are using unsupported versions.
 ts-jest[versions] (WARN) Version 5.6.3 of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=4.3.0 <5.0.0-0). Please do not report issues in ts-jest if you are using unsupported versions.
 ts-jest[versions] (WARN) Version 5.6.3 of typescript installed has not been tested with ts-jest. If you're experiencing issues, consider using a supported version (>=4.3.0 <5.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 (29.372 s)
+PASS src/configs/app-configs/__tests__/update-with-presets.tests.ts (27.797 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-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 (28.43 s)
 PASS src/configs/util/__tests__/compress-with-dcb.test.ts
-PASS src/configs/app-configs/__tests__/update-with-presets.tests.ts (30.134 s)
 PASS src/configs/util/__tests__/get-polyfills.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/plugins/postcss-global-variables/utils/__tests__/parse-variables.tests.ts
-PASS src/configs/util/__tests__/find-plugin.tests.ts (32.384 s)
+PASS src/configs/app-configs/__tests__/validate-settings-keys.tests.ts
+PASS src/configs/util/__tests__/find-plugin.tests.ts (30.525 s)
 
-Test Suites: 11 passed, 11 total
-Tests:       25 passed, 25 total
+Test Suites: 12 passed, 12 total
+Tests:       30 passed, 30 total
 Snapshots:   0 total
-Time:        33.462 s
+Time:        31.46 s
 Ran all test suites.

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # [15.3.0](https://github.com/core-ds/arui-scripts/compare/v15.2.0...v15.3.0) (2023-06-30)
 
+## 20.6.2
+
+### Patch Changes
+
+-   [#388](https://github.com/core-ds/arui-scripts/pull/388) [`92c0100`](https://github.com/core-ds/arui-scripts/commit/92c01002e08e110eb642b244c3956c67e913c527) Thanks [@heymdall-legal](https://github.com/heymdall-legal)! - Исправлена работа с watchIgnorePattern - он мог срабатывать для файлов, которые в названии содержат имена билд-директорий
+
+## 20.6.1
+
+### Patch Changes
+
+-   [#385](https://github.com/core-ds/arui-scripts/pull/385) [`f2cc71b`](https://github.com/core-ds/arui-scripts/commit/f2cc71b89520e6a18295543de2bde655f7004f06) Thanks [@heymdall-legal](https://github.com/heymdall-legal)! - Добавлена возможность указывать отдельную конфигурацию shared для wmf при использовании отдельной wmf сборки
+
 ## 20.6.0
 
 ### Minor Changes

package/build/commands/util/run-server-watch-compiler.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.runServerWatchCompiler = runServerWatchCompiler;
 const core_1 = require("@rspack/core");
 const app_configs_1 = require("../../configs/app-configs");
+const create_watch_ignore_regex_1 = require("../../configs/util/create-watch-ignore-regex");
 const print_compiler_output_1 = require("../start/print-compiler-output");
 function runServerWatchCompiler(config) {
     const serverCompiler = (0, core_1.rspack)(config);
@@ -11,6 +12,6 @@ function runServerWatchCompiler(config) {
     serverCompiler.hooks.done.tap('server', (stats) => (0, print_compiler_output_1.printCompilerOutput)('Server', stats));
     serverCompiler.watch({
         aggregateTimeout: 50, // Делаем это значение меньше чем у клиента, чтобы сервер пересобирался быстрее
-        ignored: new RegExp(app_configs_1.configs.watchIgnorePath.join('|')),
+        ignored: (0, create_watch_ignore_regex_1.createWatchIgnoreRegex)(app_configs_1.configs.watchIgnorePath),
     }, () => { });
 }

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

@@ -90,6 +90,7 @@ export type AppConfigs = {
 export type ModuleConfigBase = {
     cssPrefix?: false | string;
     useSeparateBuild?: boolean;
+    separateBuildShared?: Shared;
 };
 type CompatModuleConfigBase = {
     cssPrefix?: false | string;

package/build/configs/modules.js

@@ -40,7 +40,7 @@ function haveExposedDefaultModules() {
 }
 exports.MODULES_ENTRY_NAME = 'remoteEntry.js';
 function patchMainWebpackConfigForModules(webpackConf, mode) {
-    var _a;
+    var _a, _b;
     /* eslint-disable no-param-reassign */
     const isConsumer = mode === 'consumer' || mode === 'both';
     const isProvider = mode === 'provider' || mode === 'both';
@@ -74,7 +74,8 @@ function patchMainWebpackConfigForModules(webpackConf, mode) {
     webpackConf.plugins.push(new rspack.container.ModuleFederationPlugin({
         name: app_configs_1.configs.modules.name || app_configs_1.configs.normalizedName,
         filename: isProvider && app_configs_1.configs.modules.exposes ? exports.MODULES_ENTRY_NAME : undefined,
-        shared: app_configs_1.configs.modules.shared,
+        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));

package/build/configs/util/create-watch-ignore-regex.d.ts

@@ -0,0 +1 @@
+export declare function createWatchIgnoreRegex(paths: string[]): RegExp;

package/build/configs/util/create-watch-ignore-regex.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createWatchIgnoreRegex = createWatchIgnoreRegex;
+function createWatchIgnoreRegex(paths) {
+    if (paths.length === 0) {
+        return /(?!)/; // никогда не будет матчится
+    }
+    const patterns = paths.map((p) => {
+        const escaped = escapeRegExp(p);
+        return `(^|[\\\\/])${escaped}([\\\\/]|$)`;
+    });
+    return new RegExp(patterns.join('|'));
+}
+function escapeRegExp(str) {
+    return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}

package/build/configs/webpack.client.js

@@ -46,6 +46,7 @@ const html_template_1 = require("../templates/html.template");
 const minimizers_1 = require("./config-extras/minimizers");
 const check_node_version_1 = require("./util/check-node-version");
 const compression_plugins_for_dictionaries_1 = require("./util/compression-plugins-for-dictionaries");
+const create_watch_ignore_regex_1 = require("./util/create-watch-ignore-regex");
 const get_entry_1 = require("./util/get-entry");
 const app_configs_1 = require("./app-configs");
 const babel_client_1 = require("./babel-client");
@@ -358,7 +359,7 @@ const createSingleClientWebpackConfig = (mode, entry, configName) => (Object.ass
         .filter(Boolean), 
     // Без этого комиляция трирегилась на изменение в node_modules и приводила к утечке памяти
     watchOptions: {
-        ignored: new RegExp(app_configs_1.configs.watchIgnorePath.join('|')),
+        ignored: (0, create_watch_ignore_regex_1.createWatchIgnoreRegex)(app_configs_1.configs.watchIgnorePath),
         aggregateTimeout: 100,
     }, 
     // Выключаем performance hints, т.к. размеры бандлов контролируются не в рамках arui-scripts

package/build/configs/webpack.server.js

@@ -13,6 +13,7 @@ const run_script_webpack_plugin_1 = require("run-script-webpack-plugin");
 const webpack_node_externals_1 = __importDefault(require("webpack-node-externals"));
 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");
 const get_entry_1 = require("./util/get-entry");
 const app_configs_1 = require("./app-configs");
 const babel_dependencies_1 = require("./babel-dependencies");
@@ -176,7 +177,7 @@ const createServerConfig = (mode) => ({
     ].filter(Boolean),
     // Без этого комиляция трирегилась на изменение в node_modules и приводила к утечке памяти
     watchOptions: {
-        ignored: new RegExp(app_configs_1.configs.watchIgnorePath.join('|')),
+        ignored: (0, create_watch_ignore_regex_1.createWatchIgnoreRegex)(app_configs_1.configs.watchIgnorePath),
         aggregateTimeout: 100,
     },
     performance: {