arui-scripts 15.6.0 → 15.6.2

package/build/configs/app-configs/update-with-config-file.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateWithConfigFile = void 0;
 const path_1 = __importDefault(require("path"));
+const lodash_merge_1 = __importDefault(require("lodash.merge"));
 const resolve_1 = require("../util/resolve");
 const validate_settings_keys_1 = require("./validate-settings-keys");
 function updateWithConfigFile(config, context) {
@@ -16,7 +17,7 @@ function updateWithConfigFile(config, context) {
             appSettings = appSettings.default;
         }
         (0, validate_settings_keys_1.validateSettingsKeys)(config, appSettings, appConfigPath);
-        return Object.assign(Object.assign({}, config), appSettings);
+        return (0, lodash_merge_1.default)(config, appSettings);
     }
     return config;
 }

package/build/configs/app-configs/update-with-env.js

@@ -1,6 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateWithEnv = void 0;
+const lodash_merge_1 = __importDefault(require("lodash.merge"));
 const validate_settings_keys_1 = require("./validate-settings-keys");
 function updateWithEnv(config) {
     if (!process.env.ARUI_SCRIPTS_CONFIG) {
@@ -10,7 +14,7 @@ function updateWithEnv(config) {
         console.warn('Используйте ARUI_SCRIPTS_CONFIG только для отладки');
         const envSettings = JSON.parse(process.env.ARUI_SCRIPTS_CONFIG);
         (0, validate_settings_keys_1.validateSettingsKeys)(config, envSettings, 'ENV');
-        return Object.assign(Object.assign({}, config), envSettings);
+        return (0, lodash_merge_1.default)(config, envSettings);
     }
     catch (e) {
         console.error(e);

package/build/configs/app-configs/update-with-package.js

@@ -1,10 +1,14 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateWithPackage = void 0;
+const lodash_merge_1 = __importDefault(require("lodash.merge"));
 const validate_settings_keys_1 = require("./validate-settings-keys");
 function updateWithPackage(config, context) {
     const packageSettings = context.appPackage.aruiScripts || {};
     (0, validate_settings_keys_1.validateSettingsKeys)(config, packageSettings, 'package.json');
-    return Object.assign(Object.assign({}, config), packageSettings);
+    return (0, lodash_merge_1.default)(config, packageSettings);
 }
 exports.updateWithPackage = updateWithPackage;

package/build/configs/app-configs/update-with-presets.js

@@ -1,8 +1,12 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateWithPresets = void 0;
 const resolve_1 = require("../util/resolve");
 const validate_settings_keys_1 = require("./validate-settings-keys");
+const lodash_merge_1 = __importDefault(require("lodash.merge"));
 function updateWithPresets(config, context) {
     if (!config.presets) {
         return config;
@@ -16,7 +20,7 @@ function updateWithPresets(config, context) {
             presetsSettings = presetsSettings.default;
         }
         (0, validate_settings_keys_1.validateSettingsKeys)(config, presetsSettings, presetsConfigPath);
-        config = Object.assign(Object.assign({}, config), presetsSettings);
+        config = (0, lodash_merge_1.default)(config, presetsSettings);
     }
     if (presetsOverridesPath) {
         context.overridesPath.unshift(presetsOverridesPath);

package/build/configs/modules.js

@@ -78,15 +78,21 @@ function addPrefixCssRule(rule, prefix) {
     if (!postCssLoader || typeof postCssLoader !== 'object' || !postCssLoader.options || typeof postCssLoader.options !== 'object') {
         return;
     }
-    function transform(incomingPrefix, selector, prefixedSelector) {
+    function transform(incomingPrefix, selector, prefixedSelector, file, rule) {
         if (selector === ':root') {
+            // :root фактически должен заменяться на название класса модуля
             return incomingPrefix;
         }
+        if (rule.parent.parent && rule.parent.type !== 'atrule') {
+            // если у селектора родителем явлеется не root - значит он часть нестинга и его не надо префиксить
+            // исключение - если родитель @-правило, типа @media
+            return selector;
+        }
         return prefixedSelector;
     }
     postCssLoader.options.postcssOptions.plugins = [
         ...postCssLoader.options.postcssOptions.plugins,
-        (0, postcss_prefix_selector_1.default)({ prefix, transform }),
+        (0, postcss_prefix_selector_1.default)({ prefix, transform: transform }),
     ];
 }
 function patchWebpackConfigForCompat(module, webpackConf) {