@zohodesk/react-cli 0.0.1-exp.169.2 → 0.0.1-exp.175.1

package/lib/postcss-plugins/__test__/test1Output.css

@@ -1,39 +1,39 @@
-/*Hover_active:ignore*/
-g,a:hover{
-	color : red
-}
-/*Hover:ignore*/
-h:hover{
-background : yellow
-}
-
-/* Hover_active:ignore */
-g,d+e:hover{
-	color : black
-}
-
-g,d e:hover{
-	color : black
-}
-
-@media screen and (max-width:61.25em){
-  /* Hover_active:ignore */
-  a,b,a:hover, b:hover{
-  background-color : blue
-  }
-  a + b,a:hover + b:hover{
-  background-color : blue
-  }
-  a b:hover{
-  background-color : blue
-  }
-  
-  .cc:hover {
-    color: red;
-  }
-
-  c:hover{
-  color : red
-  }
-  
+/*Hover_active:ignore*/
+g,a:hover{
+	color : red
+}
+/*Hover:ignore*/
+h:hover{
+background : yellow
+}
+
+/* Hover_active:ignore */
+g,d+e:hover{
+	color : black
+}
+
+g,d e:hover{
+	color : black
+}
+
+@media screen and (max-width:61.25em){
+  /* Hover_active:ignore */
+  a,b,a:hover, b:hover{
+  background-color : blue
+  }
+  a + b,a:hover + b:hover{
+  background-color : blue
+  }
+  a b:hover{
+  background-color : blue
+  }
+  
+  .cc:hover {
+    color: red;
+  }
+
+  c:hover{
+  color : red
+  }
+  
 }

package/lib/postcss-plugins/hoverActivePlugin.js

@@ -1,27 +1,24 @@
 "use strict";
 
 var _postcss = _interopRequireDefault(require("postcss"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-/**
- * we have give support for ignore(exclude) comments
- * These are the comments' keyword
+/**
+ * we have give support for ignore(exclude) comments
+ * These are the comments' keyword
  */
 const hoverIgnoreQuery = 'Hover:ignore',
-      activeIgnoreQuery = 'Active:ignore',
-      hoverActiveIgnoreQuery = 'HoverActive:ignore';
+  activeIgnoreQuery = 'Active:ignore',
+  hoverActiveIgnoreQuery = 'HoverActive:ignore';
 const medHoverIgnoreQuery = 'MedHover:ignore',
-      medActiveIgnoreQuery = 'MedActive:ignore',
-      medHoverActiveIgnoreQuery = 'MedHoverActive:ignore';
-const hoverMedQuerySuffix = '(min--moz-device-pixel-ratio:0) and (hover: hover), (hover: hover)';
+  medActiveIgnoreQuery = 'MedActive:ignore',
+  medHoverActiveIgnoreQuery = 'MedHoverActive:ignore';
+let hoverMedQuerySuffix = '';
+let hoverNoneMedQuerySuffix = '';
 const ruleIgnoreCommentRegex = /(Hover:ignore|Active:ignore|HoverActive:ignore)/g;
 const mediaQueryIgnoreCommentRegex = /(MedHover:ignore|MedActive:ignore|MedHoverActive:ignore)/g;
-
 function isComment(node) {
   return node && node.type === 'comment' && node.text !== undefined;
 }
-
 function isHoverPresent(atrule) {
   let hoverPresent = false;
   atrule.walkRules(rule => {
@@ -31,29 +28,38 @@ function isHoverPresent(atrule) {
   });
   return hoverPresent;
 }
-
-module.exports = _postcss.default.plugin('postcss-mobile-hover', opts => rootOriginal => {
+function checkForUsualClass(root, sel) {
+  let present = false;
+  sel.split(',').forEach(value => {
+    if (value.includes('hover')) {
+      const valueNoHover = value.replace(':hover', '').trim();
+      root.walkRules(rule => {
+        if (rule.selector === valueNoHover) {
+          present = true;
+        }
+      });
+    }
+  });
+  return present;
+}
+module.exports = _postcss.default.plugin('postcss-mobile-hover', mediaQueryHoverActiveString => rootOriginal => {
   const hoverRules = [];
-  let positionsObj = {};
-
+  const positionsObj = {};
+  hoverMedQuerySuffix = mediaQueryHoverActiveString.hover;
+  hoverNoneMedQuerySuffix = mediaQueryHoverActiveString.none;
   function isRuleHasIgnoreComment(index, type) {
     const prevNode = rootOriginal.nodes[index - 1];
-
     if (isComment(prevNode)) {
       return prevNode.text === type;
     }
-
     return false;
   }
-
   function isMediaQueryHasIgnoreComment(node, type) {
     if (isComment(node)) {
       return node.text === type;
     }
-
     return false;
   }
-
   function hasIgnoreComment({
     index,
     atrule,
@@ -62,25 +68,21 @@ module.exports = _postcss.default.plugin('postcss-mobile-hover', opts => rootOri
     if (type.match(mediaQueryIgnoreCommentRegex)) {
       return isMediaQueryHasIgnoreComment(atrule.nodes[index - 1], type.slice(3));
     }
-
     if (type.match(ruleIgnoreCommentRegex)) {
       return isRuleHasIgnoreComment(index, type);
     }
-
     return false;
   }
-
   function getPositionsOfHoverAndActiveMedQueries(parent) {
     const allNodes = rootOriginal.nodes;
-    const hoverMediaQuery = `${parent.params} and all and ${hoverMedQuerySuffix}`;
-    const hoverNoneMediaQuery = `${parent.params} and (hover: none)`;
+    const hoverMediaQuery = `${parent.params} and ${hoverMedQuerySuffix}`;
+    const hoverNoneMediaQuery = `${parent.params} and ${hoverNoneMedQuerySuffix}`;
     const positions = {
       hovMed: allNodes[positionsObj[hoverMediaQuery]],
       actMed: allNodes[positionsObj[hoverNoneMediaQuery]]
     };
     return positions;
   }
-
   function handleMedHoverAndHoverActiveIgnore(atrule, index) {
     return !hasIgnoreComment({
       atrule,
@@ -92,7 +94,6 @@ module.exports = _postcss.default.plugin('postcss-mobile-hover', opts => rootOri
       type: medHoverActiveIgnoreQuery
     });
   }
-
   function handleMedActiveAndHoverActiveIgnore(atrule, index) {
     return !hasIgnoreComment({
       atrule,
@@ -104,7 +105,6 @@ module.exports = _postcss.default.plugin('postcss-mobile-hover', opts => rootOri
       type: medHoverActiveIgnoreQuery
     });
   }
-
   function handleHoverAndHoverActiveIgnore(index) {
     return !hasIgnoreComment({
       index,
@@ -114,7 +114,6 @@ module.exports = _postcss.default.plugin('postcss-mobile-hover', opts => rootOri
       type: hoverActiveIgnoreQuery
     });
   }
-
   function handleActiveAndHoverActiveIgnore(index) {
     return !hasIgnoreComment({
       index,
@@ -124,7 +123,6 @@ module.exports = _postcss.default.plugin('postcss-mobile-hover', opts => rootOri
       type: hoverActiveIgnoreQuery
     });
   }
-
   function handleAllIgnoreCases(index) {
     return !hasIgnoreComment({
       index,
@@ -137,29 +135,24 @@ module.exports = _postcss.default.plugin('postcss-mobile-hover', opts => rootOri
       type: hoverActiveIgnoreQuery
     });
   }
-
   function mediaCommaQuery(rule, index) {
     if (rule.parent.params !== undefined && !rule.parent.params.includes('hover')) {
       //console.log(hovMed, actMed);
       let newSelector = '';
-      let {
+      const {
         hovMed,
         actMed
       } = getPositionsOfHoverAndActiveMedQueries(rule.parent);
-      let hovQueries = [];
-      let actQueries = [];
+      const hovQueries = [];
+      const actQueries = [];
       rule.selector.split(/\s*,\s*/).forEach(_subrule => {
-        let subrule = _subrule.trim();
-
-        let clone = rule.clone();
-
+        const subrule = _subrule.trim();
+        const clone = rule.clone();
         if (subrule.includes('hover')) {
           clone.selector = subrule;
-
           if (handleMedHoverAndHoverActiveIgnore(rule.parent, index)) {
             hovQueries.push(subrule);
           }
-
           if (handleMedActiveAndHoverActiveIgnore(rule.parent, index)) {
             actQueries.push(subrule);
           }
@@ -167,43 +160,36 @@ module.exports = _postcss.default.plugin('postcss-mobile-hover', opts => rootOri
           newSelector += `${subrule}, `;
         }
       });
-
       if (hovQueries.length > 0) {
-        let clone = rule.clone();
+        const clone = rule.clone();
         clone.selector = hovQueries.join(',');
         hovMed.append(clone);
       }
-
       if (actQueries.length > 0) {
-        let clone = rule.clone();
+        const clone = rule.clone();
         clone.selector = actQueries.join(',');
         actMed.append(clone.clone({
           selector: clone.selector.replace(/:hover/gi, ':active')
         }));
       }
-
       if (handleMedHoverAndHoverActiveIgnore(rule.parent, index)) {
         rule.selector = newSelector.substring(0, newSelector.length - 2);
       }
-
       if (rule.selector === '') {
         rule.remove();
       }
     }
   }
-
   function mediaQuery(rule, index) {
     if (rule.parent.params !== undefined && !rule.parent.params.includes('hover')) {
-      let {
+      const {
         hovMed,
         actMed
       } = getPositionsOfHoverAndActiveMedQueries(rule.parent);
-
       if (rule.selector.includes('hover') && hovMed !== undefined && rule.parent.type === 'atrule') {
         if (handleMedHoverAndHoverActiveIgnore(rule.parent, index)) {
           hovMed.append(rule);
         }
-
         if (handleMedActiveAndHoverActiveIgnore(rule.parent, index)) {
           actMed.append(rule.clone({
             selector: rule.selector.replace(/:hover/gi, ':active')
@@ -212,14 +198,12 @@ module.exports = _postcss.default.plugin('postcss-mobile-hover', opts => rootOri
       }
     }
   }
-
   function commaQuery(rule, index) {
     //console.log("comma" , rule.selector.split('\n'));
     let newSelector = '';
-    let hovQueries = [];
+    const hovQueries = [];
     rule.selector.split(/\s*,\s*/).forEach(_subrule => {
-      let subrule = _subrule.trim();
-
+      const subrule = _subrule.trim();
       if (subrule.includes('hover')) {
         // hoverRules.push({ rule: clone, index });
         hovQueries.push(subrule);
@@ -227,30 +211,28 @@ module.exports = _postcss.default.plugin('postcss-mobile-hover', opts => rootOri
         newSelector += `${subrule}, `;
       }
     });
-
     if (hovQueries.length > 0) {
-      let clone = rule.clone();
+      const clone = rule.clone();
       clone.selector = hovQueries.join(',');
       hoverRules.push({
         rule: clone,
         index
       });
     }
-
     if (handleHoverAndHoverActiveIgnore(index)) {
-      rule.selector = newSelector.substring(0, newSelector.length - 2).trim();
+      if (checkForUsualClass(rootOriginal, rule.selector)) {
+        rule.selector = newSelector.substring(0, newSelector.length - 2).trim();
+      }
     }
-
     if (rule.selector === '') {
       rule.remove();
     }
-  } // Start by identifying all :hover rules
-
+  }
 
+  // Start by identifying all :hover rules
   rootOriginal.walkAtRules(atrule => {
-    const hoverQuery = `${atrule.params} and all and ${hoverMedQuerySuffix}`;
-    const activeQuery = `${atrule.params} and (hover: none)`;
-
+    const hoverQuery = `${atrule.params} and ${hoverMedQuerySuffix}`;
+    const activeQuery = `${atrule.params} and ${hoverNoneMedQuerySuffix}`;
     if (isHoverPresent(atrule)) {
       if (!positionsObj[hoverQuery] && !positionsObj[activeQuery]) {
         rootOriginal.append({
@@ -276,17 +258,17 @@ module.exports = _postcss.default.plugin('postcss-mobile-hover', opts => rootOri
       // plus, space and other media queries
       //console.log("media", rule.selector)
       mediaQuery(rule, index);
-    } // usual hover query
-
+    }
 
+    // usual hover query
     if (!rule.selector.match(/,+| +|\++/g) && rule.parent !== undefined && rule.parent.name === undefined) {
       hoverRules.push({
         rule,
         index
       });
-    } //usual hover query with ',' ' ' '+'
-
+    }
 
+    //usual hover query with ',' ' ' '+'
     if (rule.selector.match(/,+| +|\++/g) && rule.parent.name === undefined) {
       if (rule.selector.includes(',')) {
         commaQuery(rule, index);
@@ -296,70 +278,76 @@ module.exports = _postcss.default.plugin('postcss-mobile-hover', opts => rootOri
           hoverRules.push({
             rule,
             index
-          }); //rule.remove();
+          });
+          //rule.remove();
         }
       }
     }
-  }); // If there are any :hover rules in the input, then create media queries
+  });
+  // If there are any :hover rules in the input, then create media queries
   // to automatically translate it into :active on touch-based devices
-
   if (hoverRules.length > 0) {
     // Create a media query targetting devices that actually support
     // hover
     const hoverQuery = rootOriginal.append({
       name: 'media',
-      params: `all and ${hoverMedQuerySuffix}`
-    }).last; // Create a media query targetting devices that don't support hover
+      params: `${hoverMedQuerySuffix}`
+    }).last;
+    // Create a media query targetting devices that don't support hover
     // (ie. devices where we should fall back to :active instead)
-
     const activeQuery = rootOriginal.append({
       name: 'media',
-      params: '(hover: none)'
-    }).last; // Loop through the hover rules and apply them to each of the media
+      params: `${hoverNoneMedQuerySuffix}`
+    }).last;
+
+    // Loop through the hover rules and apply them to each of the media
     // queries
     // eslint-disable-next-line no-labels
-
     outerLoop: for (const hoverRule of hoverRules) {
       // determine if the rule has been nested inside another media
       // query; in that case bail out as we have no way of reliably
       // nesting these queries
       let parentRule = hoverRule.rule.parent;
-
       while (parentRule) {
         if (parentRule.type === 'atrule' && parentRule.name === 'media') {
           // eslint-disable-next-line no-labels
           continue outerLoop;
         }
-
         parentRule = parentRule.parent;
-      } // Push a clone of the :hover rule 'as is' to queries where we
+      }
+
+      // Push a clone of the :hover rule 'as is' to queries where we
       // expect the user's device to support hover
       // ieQuery.append(hoverRule.clone());
 
-
       if (handleHoverAndHoverActiveIgnore(hoverRule.index)) {
         hoverQuery.append(hoverRule.rule.clone());
-      } // Push a clone of the :hover rule, where we transform the
+      }
+
+      // Push a clone of the :hover rule, where we transform the
       // selector to :active to the query targetting devices that
       // don't support hover
-
-
       if (handleActiveAndHoverActiveIgnore(hoverRule.index)) {
         activeQuery.append(hoverRule.rule.clone({
           selector: hoverRule.rule.selector.replace(/:hover/gi, ':active')
         }));
-      } // remove legacy rule from output
-
+      }
 
+      // remove legacy rule from output
       if (handleAllIgnoreCases(hoverRule.index)) {
         hoverRule.rule.remove();
       }
     }
   }
 
-  rootOriginal.walkAtRules(atrule => {
-    if (atrule !== undefined && atrule.nodes !== undefined && atrule.nodes.length === 0 || atrule.nodes === undefined) {
-      atrule.remove();
-    }
-  });
+  // rootOriginal.walkAtRules(atrule => {
+  //   if (
+  //     (atrule !== undefined &&
+  //       atrule.nodes !== undefined &&
+  //       atrule.nodes.length === 0) ||
+  //     atrule.nodes === undefined
+  //   ) {
+  //     atrule.remove();
+  //   }
+  // });
 });

package/lib/postcss-plugins/variableModificationPlugin/ErrorHandler.js

@@ -0,0 +1,31 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ErrorHandler = void 0;
+class ErrorHandler {
+  constructor(allowedErrs) {
+    this.errors = [];
+    this.allowedErrs = allowedErrs;
+  }
+  addError(errstr) {
+    this.errors.push(`{\n${errstr}\n}\n`);
+  }
+  errorFunction(errStr, type) {
+    const {
+      addError,
+      allowedErrs
+    } = this;
+    if (type === 'DECLARATION_IGNORED' && allowedErrs.DECLARATION_IGNORED) {
+      addError(errStr);
+    } else if (type === 'UNIT_ERROR' && allowedErrs.UNIT_ERROR) {
+      addError(errStr);
+    } else if (type === 'RANGE_ERROR' && allowedErrs.RANGE_ERROR) {
+      addError(errStr);
+    } else if (type === 'VARIABLE_PRESENT' && allowedErrs.VARIABLE_PRESENT) {
+      addError(errStr);
+    }
+  }
+}
+exports.ErrorHandler = ErrorHandler;