Changeset e29cc2e for trip-planner-front/node_modules/postcss-merge-longhand/dist

Timestamp:

11/25/21 22:08:24 (3 years ago)

Author:

Ema <ema_spirova@…>

Branches:

master

Children:

8d391a1

Parents:

59329aa

Message:

primeNG components

Location:

trip-planner-front/node_modules/postcss-merge-longhand/dist/lib

Files:

• canMerge.js (modified) (1 diff)
• colornames.js (added)
• decl/borders.js (modified) (1 diff)
• validateWsc.js (modified) (3 diffs)

trip-planner-front/node_modules/postcss-merge-longhand/dist/lib/canMerge.js

@@ -13 +13 @@
 
 const unimportant = node => !node.important;
+/* Cannot be combined with other values in shorthand 
+  https://www.w3.org/TR/css-cascade-5/#shorthand */
 
-const hasInherit = node => node.value.toLowerCase() === 'inherit';
 
-const hasInitial = node => node.value.toLowerCase() === 'initial';
-
-const hasUnset = node => node.value.toLowerCase() === 'unset';
+const cssWideKeywords = ['inherit', 'initial', 'unset', 'revert'];
 
 var _default = (props, includeCustomProps = true) => {
-  if (props.some(hasInherit) && !props.every(hasInherit)) {
-    return false;
-  }
+  const uniqueProps = new Set(props.map(node => node.value.toLowerCase()));
 
-  if (props.some(hasInitial) && !props.every(hasInitial)) {
-    return false;
-  }
-
-  if (props.some(hasUnset) && !props.every(hasUnset)) {
-    return false;
+  if (uniqueProps.size > 1) {
+    for (const unmergeable of cssWideKeywords) {
+      if (uniqueProps.has(unmergeable)) {
+        return false;
+      }
+    }
   }
 

trip-planner-front/node_modules/postcss-merge-longhand/dist/lib/decl/borders.js

@@ -113 +113 @@
   const diff = diffingProps(values, nextValues);
 
-  if (diff.length > 1) {
+  if (diff.length !== 1) {
     return;
   }

trip-planner-front/node_modules/postcss-merge-longhand/dist/lib/validateWsc.js

@@ -9 +9 @@
 exports.isValidWsc = isValidWsc;
 
-var _cssColorNames = _interopRequireDefault(require("css-color-names"));
+var _colornames = _interopRequireDefault(require("./colornames.js"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -15 +15 @@
 const widths = ['thin', 'medium', 'thick'];
 const styles = ['none', 'hidden', 'dotted', 'dashed', 'solid', 'double', 'groove', 'ridge', 'inset', 'outset'];
-const colors = Object.keys(_cssColorNames.default);
 
 function isStyle(value) {
@@ -52 +51 @@
   }
 
-  return !!~colors.indexOf(value);
+  return !!~_colornames.default.indexOf(value);
 }