arui-scripts 19.0.0 → 19.0.2

package/.turbo/turbo-test.log

@@ -5,19 +5,19 @@ 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/configs/app-configs/__tests__/update-with-presets.tests.ts (26.447 s)
+PASS src/configs/app-configs/__tests__/update-with-presets.tests.ts (26.411 s)
 PASS src/configs/util/__tests__/get-polyfills.tests.ts
+PASS src/plugins/postcss-global-variables/utils/__tests__/add-global-variable.tests.ts (26.868 s)
 PASS src/configs/util/__tests__/apply-overrides.tests.ts
-PASS src/configs/app-configs/__tests__/update-with-env.tests.ts
-PASS src/plugins/postcss-global-variables/utils/__tests__/add-global-variable.tests.ts (27.198 s)
 PASS src/configs/app-configs/__tests__/update-with-package.tests.ts
-PASS src/configs/app-configs/__tests__/validate-settings-keys.tests.ts
+PASS src/configs/app-configs/__tests__/update-with-env.tests.ts
 PASS src/plugins/postcss-global-variables/utils/__tests__/parse-variables.tests.ts
+PASS src/configs/app-configs/__tests__/validate-settings-keys.tests.ts
 PASS src/plugins/postcss-global-variables/utils/__tests__/get-media-query-name.tests.ts
-PASS src/configs/util/__tests__/find-plugin.tests.ts (28.961 s)
+PASS src/configs/util/__tests__/find-plugin.tests.ts (29.062 s)
 
 Test Suites: 10 passed, 10 total
 Tests:       26 passed, 26 total
 Snapshots:   0 total
-Time:        30.115 s
+Time:        29.89 s
 Ran all test suites.

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # [15.3.0](https://github.com/core-ds/arui-scripts/compare/v15.2.0...v15.3.0) (2023-06-30)
 
+## 19.0.2
+
+### Patch Changes
+
+-   [#304](https://github.com/core-ds/arui-scripts/pull/304) [`f97f2ba`](https://github.com/core-ds/arui-scripts/commit/f97f2ba9fd22473e2a3725dfc3699c6b0577ed15) Thanks [@heymdall-legal](https://github.com/heymdall-legal)! - Исправлена проблема с загрузкой WMF модулей в prod сборке
+
+## 19.0.1
+
+### Patch Changes
+
+-   [#303](https://github.com/core-ds/arui-scripts/pull/303) [`342c717`](https://github.com/core-ds/arui-scripts/commit/342c7171017056214e0ecc3cd7c866f7cce64e88) Thanks [@Echzio](https://github.com/Echzio)! - исправление парсинга postcss, в котором неправильно парсились @media
+
+-   [#301](https://github.com/core-ds/arui-scripts/pull/301) [`77bbf31`](https://github.com/core-ds/arui-scripts/commit/77bbf3108257192d056ebf779bc737800b60375c) Thanks [@heymdall-legal](https://github.com/heymdall-legal)! - Исправлена проблема при обработке маленьких svg (меньше, чем [config.dataUrlMaxSize](https://github.com/core-ds/arui-scripts/blob/master/packages/arui-scripts/docs/settings.md#dataurlmaxsize)): теперь они корректно преобразуются в data-url
+
 ## 19.0.0
 
 ### Major Changes

package/build/configs/modules.js

@@ -22,9 +22,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MODULES_ENTRY_NAME = void 0;
 exports.haveExposedDefaultModules = haveExposedDefaultModules;
@@ -36,32 +33,38 @@ exports.patchWebpackConfigForCompat = patchWebpackConfigForCompat;
 /* eslint-disable no-param-reassign */
 const rspack = __importStar(require("@rspack/core"));
 const postcss_prefix_selector_1 = require("../plugins/postcss-prefix-selector");
+const turn_off_split_remote_entry_1 = require("../plugins/turn-off-split-remote-entry");
 const find_loader_1 = require("./util/find-loader");
-const app_configs_1 = __importDefault(require("./app-configs"));
+const app_configs_1 = require("./app-configs");
 function haveExposedDefaultModules() {
     var _a;
-    return (_a = app_configs_1.default.modules) === null || _a === void 0 ? void 0 : _a.exposes;
+    return (_a = app_configs_1.configs.modules) === null || _a === void 0 ? void 0 : _a.exposes;
 }
 exports.MODULES_ENTRY_NAME = 'remoteEntry.js';
 function patchMainWebpackConfigForModules(webpackConf) {
+    var _a;
+    if (!((_a = webpackConf.module) === null || _a === void 0 ? void 0 : _a.rules) || !webpackConf.plugins) {
+        // делаем TS счастливым, на самом деле module и plugins у нас будут всегда
+        return webpackConf;
+    }
     // Добавляем expose loader для библиотек, которые мы хотим вынести в глобальную область видимости
     webpackConf.module.rules.unshift(...getExposeLoadersFormCompatModules());
-    if (!app_configs_1.default.modules || !webpackConf.output || !webpackConf.plugins) {
+    if (!app_configs_1.configs.modules || !webpackConf.output || !webpackConf.plugins) {
         return webpackConf;
     }
-    const { cssPrefix } = app_configs_1.default.modules.options || {};
+    const { cssPrefix } = app_configs_1.configs.modules.options || {};
     if (cssPrefix) {
         addCssPrefix(webpackConf, cssPrefix);
     }
     webpackConf.output.publicPath = haveExposedDefaultModules()
         ? 'auto' // Для того чтобы модули могли подключаться из разных мест, нам необходимо использовать auto. Для корректной работы в IE надо подключaть https://github.com/amiller-gh/currentScript-polyfill
-        : app_configs_1.default.publicPath;
+        : app_configs_1.configs.publicPath;
     webpackConf.plugins.push(new rspack.container.ModuleFederationPlugin({
-        name: app_configs_1.default.modules.name || app_configs_1.default.normalizedName,
-        filename: app_configs_1.default.modules.exposes ? exports.MODULES_ENTRY_NAME : undefined,
-        shared: app_configs_1.default.modules.shared,
-        exposes: app_configs_1.default.modules.exposes,
-    }));
+        name: app_configs_1.configs.modules.name || app_configs_1.configs.normalizedName,
+        filename: app_configs_1.configs.modules.exposes ? exports.MODULES_ENTRY_NAME : undefined,
+        shared: app_configs_1.configs.modules.shared,
+        exposes: app_configs_1.configs.modules.exposes,
+    }), new turn_off_split_remote_entry_1.TurnOffSplitRemoteEntry(app_configs_1.configs.modules.name || app_configs_1.configs.normalizedName));
     return webpackConf;
 }
 function getCssPrefixForModule(module) {
@@ -75,7 +78,7 @@ function getCssPrefixForModule(module) {
 }
 function getExposeLoadersFormCompatModules() {
     var _a;
-    const shared = (_a = app_configs_1.default.compatModules) === null || _a === void 0 ? void 0 : _a.shared;
+    const shared = (_a = app_configs_1.configs.compatModules) === null || _a === void 0 ? void 0 : _a.shared;
     if (!shared) {
         return [];
     }

package/build/configs/webpack.client.js

@@ -260,7 +260,7 @@ const createSingleClientWebpackConfig = (mode, entry, configName) => (Object.ass
                         test: /\.svg/,
                         type: 'asset',
                         generator: {
-                            dataUrl: (content) => (0, mini_svg_data_uri_1.default)(content.toString()),
+                            dataUrl: (file) => (0, mini_svg_data_uri_1.default)(file.content.toString()),
                         },
                         parser: {
                             dataUrlCondition: {

package/build/plugins/postcss-global-variables/utils/utils.js

@@ -9,6 +9,8 @@ exports.addGlobalVariable = addGlobalVariable;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const postcss_1 = require("postcss");
+// eslint-disable-next-line import/no-extraneous-dependencies
+const postcss_media_query_parser_1 = __importDefault(require("postcss-media-query-parser"));
 const getMediaQueryName = (rule) => rule.params.split(' ')[0];
 exports.getMediaQueryName = getMediaQueryName;
 function parseImport(root, postcssHelpers, filePath) {
@@ -64,13 +66,25 @@ const insertParsedCss = (root, parsedVariables, parsedCustomMedia) => {
         addGlobalVariable(decl.value, rootRule, parsedVariables);
     });
     root.walkAtRules('media', (rule) => {
-        const mediaFullName = (0, exports.getMediaQueryName)(rule);
-        if (mediaFullName.startsWith('(--')) {
-            const mediaName = mediaFullName.slice(1, -1);
-            if (parsedCustomMedia[mediaName]) {
-                root.append(parsedCustomMedia[mediaName]);
+        var _a;
+        // парсим параметры
+        const mediaParsed = (0, postcss_media_query_parser_1.default)(rule.params);
+        // регулярка для (--desktop), (--mobile), (--desktop-m) и тд
+        const parseRule = /--\w+-?\w+/gi;
+        (_a = mediaParsed.nodes) === null || _a === void 0 ? void 0 : _a.forEach(({ value }) => {
+            // value приходит в виде (--desktop); not screen and (--mobile) и тд
+            if (parseRule.test(value)) {
+                // берем все вхождения --desktop, --mobile
+                const mediaName = value.match(parseRule);
+                // итерируемся по [--desktop, --mobile]
+                mediaName === null || mediaName === void 0 ? void 0 : mediaName.forEach((rule) => {
+                    // подставляем значения если у нас есть под это custom-media
+                    if (parsedCustomMedia[rule]) {
+                        root.append(parsedCustomMedia[rule]);
+                    }
+                });
             }
-        }
+        });
     });
     return rootRule;
 };

package/build/plugins/turn-off-split-remote-entry.d.ts

@@ -0,0 +1,11 @@
+import { Compiler, RspackPluginInstance } from '@rspack/core';
+/**
+ * Force remote entry not be affected by user's chunkSplit strategy,
+ * Otherwise, the remote chunk will not be loaded correctly.
+ * @see https://github.com/web-infra-dev/rsbuild/discussions/1461#discussioncomment-8329790
+ */
+export declare class TurnOffSplitRemoteEntry implements RspackPluginInstance {
+    name: string;
+    constructor(wmfContainerName: string);
+    apply(compiler: Compiler): void;
+}

package/build/plugins/turn-off-split-remote-entry.js

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TurnOffSplitRemoteEntry = void 0;
+const util_1 = require("util");
+/**
+ * Force remote entry not be affected by user's chunkSplit strategy,
+ * Otherwise, the remote chunk will not be loaded correctly.
+ * @see https://github.com/web-infra-dev/rsbuild/discussions/1461#discussioncomment-8329790
+ */
+class TurnOffSplitRemoteEntry {
+    constructor(wmfContainerName) {
+        this.name = wmfContainerName;
+    }
+    apply(compiler) {
+        const { splitChunks } = compiler.options.optimization;
+        if (!splitChunks) {
+            return;
+        }
+        /* eslint-disable no-param-reassign */
+        const applyPatch = (cacheGroup) => {
+            if (typeof cacheGroup !== 'object' || util_1.types.isRegExp(cacheGroup)) {
+                return;
+            }
+            // cacheGroup.chunks will inherit splitChunks.chunks
+            // so we only need to modify the chunks that are set separately.
+            const { chunks } = cacheGroup;
+            if (!chunks || chunks === 'async') {
+                return;
+            }
+            if (typeof chunks === 'function') {
+                const prevChunks = chunks;
+                cacheGroup.chunks = (chunk) => {
+                    if (chunk.name && chunk.name === this.name) {
+                        return false;
+                    }
+                    return prevChunks(chunk);
+                };
+                return;
+            }
+            if (chunks === 'all') {
+                cacheGroup.chunks = (chunk) => {
+                    if (chunk.name && chunk.name === this.name) {
+                        return false;
+                    }
+                    return true;
+                };
+                return;
+            }
+            if (chunks === 'initial') {
+                cacheGroup.chunks = (chunk) => {
+                    if (chunk.name && chunk.name === this.name) {
+                        return false;
+                    }
+                    return chunk.isOnlyInitial();
+                };
+            }
+        };
+        /* eslint-enable no-param-reassign */
+        // patch splitChunk.chunks
+        applyPatch(splitChunks);
+        const { cacheGroups } = splitChunks;
+        if (!cacheGroups) {
+            return;
+        }
+        // patch splitChunk.cacheGroups[key].chunks
+        for (const cacheGroupKey of Object.keys(cacheGroups)) {
+            applyPatch(cacheGroups[cacheGroupKey]);
+        }
+    }
+}
+exports.TurnOffSplitRemoteEntry = TurnOffSplitRemoteEntry;