arui-scripts 19.0.0 → 19.0.1

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.869 s)
+PASS src/plugins/postcss-global-variables/utils/__tests__/add-global-variable.tests.ts (26.871 s)
 PASS src/configs/util/__tests__/get-polyfills.tests.ts
-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/util/__tests__/apply-overrides.tests.ts
 PASS src/configs/app-configs/__tests__/update-with-package.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/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.164 s)
 
 Test Suites: 10 passed, 10 total
 Tests:       26 passed, 26 total
 Snapshots:   0 total
-Time:        30.115 s
+Time:        30.106 s
 Ran all test suites.

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # [15.3.0](https://github.com/core-ds/arui-scripts/compare/v15.2.0...v15.3.0) (2023-06-30)
 
+## 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/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;
 };