@zohodesk/react-cli 1.1.11-exp.5 → 1.1.11-exp.7

package/lib/plugins/variableConvertorUtils.js

@@ -12,15 +12,15 @@ var _classHandling = require("./utils/classHandling");
 const ignoreVals = ['--zd_size', '--zd_font_size', '--size', '--size_']; // const avoidProps = [];
 // -- is issue IO --
 
-/*
-issues eg : 
-issues = ['--zd_size', '--zd_font_size', '--size', '--size_'];
-input : 
---zd_size
-output : 
-true
-comment : 
-do not execute when --zd_size comes as prop 
+/*
+issues eg : 
+issues = ['--zd_size', '--zd_font_size', '--size', '--size_'];
+input : 
+--zd_size
+output : 
+true
+comment : 
+do not execute when --zd_size comes as prop 
 */
 
 exports.ignoreVals = ignoreVals;
@@ -63,7 +63,7 @@ function convertToCalc(pxReplacement, value) {
 
 function convertCalcValue(pxReplacement, parsedValue) {
   Object.keys(parsedValue).forEach(key => {
-    if (pxReplacement && parsedValue[key].includes('px')) {
+    if (parsedValue[key].includes('px')) {
       parsedValue[key] = pxReplacement.replace('$$', parsedValue[key].replace('px', ''));
     }
   });
@@ -95,9 +95,7 @@ function variableConverter(rootOriginal, variables, settingsObject) {
           }
 
           const pxReplacement = settingsObject[variables[decl.prop]].replacements.px;
-          let valArr = decl.value.split(' ');
-          valArr = valArr.filter(x => x.trim() !== '');
-          valArr = valArr.map(x => x.replace(/\r|\t|\n/gi, '')); // single values are considered in the above array and converted below
+          const valArr = decl.value.split(' '); // single values are considered in the above array and converted below
 
           valArr.forEach((value, index) => {
             if (value.includes('px')) {

package/lib/postcss-plugins/RTLSplitPlugin.js

@@ -37,11 +37,11 @@ function selectorMinifySameDir(selector, direction) {
   const regex = getRegex(direction);
   return selector.replace(regex, '').trim();
 }
-/**
- * this funtion will remove given rule,
- *  if given selector and it's previous sibiling rule selector  are same
- * current rule properties will move to previous sibiling rule.
- * @param {Rule} rule current rule
+/**
+ * this funtion will remove given rule,
+ *  if given selector and it's previous sibiling rule selector  are same
+ * current rule properties will move to previous sibiling rule.
+ * @param {Rule} rule current rule
  */
 
 
@@ -56,11 +56,11 @@ function mergeIfSameSelector(rule) {
     rule.remove();
   }
 }
-/**
- * this funtion will remove given rule,
- *  if given selector and it's previous sibiling rule selector  are same
- * current rule properties will move to previous sibiling rule.
- * @param {Rule} rule current rule
+/**
+ * this funtion will remove given rule,
+ *  if given selector and it's previous sibiling rule selector  are same
+ * current rule properties will move to previous sibiling rule.
+ * @param {Rule} rule current rule
  */
 
 

package/lib/postcss-plugins/ValueReplacer.js

@@ -26,13 +26,6 @@ root => {
       if (obj.props.indexOf(decl.prop) !== -1) {
         let ks = Object.keys(obj.values).sort((a, b) => b.length - a.length);
         ks.forEach(k => {
-          if (/^\^/gi.test(k)) {
-            if (k.replace('^', '') === decl.value) {
-              decl.value = decl.value.replace(k.replace('^', ''), obj.values[k]);
-              return;
-            }
-          }
-
           decl.value = decl.value.replace(k, obj.values[k]);
         }); //decl.value = obj.values[decl.value];
       }

package/lib/postcss-plugins/__test__/test1Input.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/__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

@@ -4,9 +4,9 @@ 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',

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

@@ -92,13 +92,7 @@ function pxToCalc(value) {
   return arr.join(' ');
 }
 
-const singleConvertor = ({
-  value,
-  changeVal,
-  details,
-  range,
-  allowed
-}) => {
+const singleConvertor = (value, changeVal, details, range) => {
   const {
     path,
     filename,
@@ -112,10 +106,6 @@ const singleConvertor = ({
     }
   }
 
-  if (allowed && allowed.includes(decl.value) && decl.value.toString() !== '0') {
-    return decl.value;
-  }
-
   if (getNumericValue(value) >= range.start && getNumericValue(value) <= range.end || getNumericValue(value) === 0) {
     if (value.trim() === '0px') {
       return '0';
@@ -214,9 +204,6 @@ module.exports = {
             .replace(/\d+/gi, '').replace('var(--zd_size)', 'px').replace('var(--zd_font_size)', 'px').replace('rect(', '').replace(')', '').replace('px,', 'px').replace(',', '').split(' ').filter(x => x !== ''); // unit = unit.replace(unit, unit.replace('-',''))
             // console.log('unit : ');
             // console.log(unit);
-            // if (decl.prop === 'height') {
-            //   console.log(decl.prop, unit, 'case 1');
-            // }
 
             unit.forEach((val, index) => {
               allowed.forEach(alwdVal => {
@@ -236,49 +223,21 @@ module.exports = {
                   unitErrorVal = val;
                 }
               }
-            }); // if (decl.prop === 'height') {
-            //   console.log(decl.prop, unitErrorVal, unitError, unit, 'case 2');
-            // }
-            // console.log(allowed, replacements, range)
+            }); // console.log(allowed, replacements, range)
 
             if (!unitError) {
-              let calcValue = false;
-
-              if (decl.value.includes('calc')) {
-                decl.value = pxToCalc(decl.value);
-                calcValue = true;
-              } // use variable decl.value.split(' ')
-
-
-              if (range && !calcValue) {
+              // use variable decl.value.split(' ')
+              if (range) {
                 // console.log('multiple :', decl.value)
-                const tempVal = decl.value; // if (decl.prop === 'height') {
-                //   console.log(decl.prop, tempVal, decl.value, allowed, 'case 3');
-                // }
-                // if (decl.prop === 'height') {
-                //   console.log('allowed!', decl.prop, decl.value, allowed);
-                // }
-
                 let newVal = '';
-                let splitValues = decl.value.split(' ');
-                splitValues = splitValues.filter(val => val.trim() !== '');
-                splitValues = splitValues.map(val => val.replace(/\r|\t|\n/gi, ''));
-                splitValues.forEach(singleVal => {
-                  newVal += `${singleConvertor({
-                    value: singleVal,
-                    changeVal: settings.replacements.px,
-                    details: {
-                      decl,
-                      filename,
-                      path: fromPath
-                    },
-                    range,
-                    allowed
-                  })} `;
+                decl.value.split(' ').forEach(singleVal => {
+                  newVal += `${singleConvertor(singleVal, settings.replacements.px, {
+                    decl,
+                    filename,
+                    path: fromPath
+                  }, range)} `;
                 });
-                decl.value = newVal; // if (decl.prop === 'height') {
-                //   console.log(decl.prop, tempVal, newVal, 'case 4');
-                // }
+                decl.value = newVal;
               }
             } else {
               if (!decl.value.includes('calc')) {
@@ -317,22 +276,15 @@ module.exports = {
               const valArr = decl.value.split(' ');
               const settings = settingsObject[decl.prop];
               const {
-                range,
-                allowed
+                range
               } = settings;
               const convertedVals = valArr.map(val => {
                 if (val.includes('px')) {
-                  const convertedVal = singleConvertor({
-                    value: val,
-                    changeVal: settings.replacements.px,
-                    details: {
-                      decl,
-                      filename,
-                      path: fromPath
-                    },
-                    range,
-                    allowed
-                  });
+                  const convertedVal = singleConvertor(val, settings.replacements.px, {
+                    decl,
+                    filename,
+                    path: fromPath
+                  }, range);
                   return convertedVal ? convertedVal : val;
                 }
 

package/lib/schemas/index.js

@@ -723,6 +723,15 @@ var _default = {
       cli: 'module_mode'
     },
     disableES5Transpile: true
+  },
+  stats: {
+    enable: {
+      value: false,
+      cli: 'enable_stats'
+    },
+    fileName: undefined,
+    options: undefined,
+    excludeKeys: undefined
   }
 };
 exports.default = _default;

package/lib/sh/pre-commit.sh

@@ -1,34 +1,34 @@
-#!/bin/sh
-
-STAGED_FILES=$(git diff --cached --name-only --diff-filter=ACM | grep -E "\.(js)$") # Get staged files
-
-CURRENT_BRANCH=$(git branch | sed -n -e 's/^\* \(.*\)/\1/p') # Get branch name
-
-echo "Branch Name - $CURRENT_BRANCH"
-
-if [[ "$STAGED_FILES" = "" ]]; then
-  exit 0
-fi
-
-IS_FAILED=false
-FILES=""
-
-for FILE in $STAGED_FILES # Add files with space separation
-do
-	FILES+="$FILE "
-done
-
-npm run lint --prefix ${PREFIX_PATH} $FILES # Run ESLint
-
-if [[ "$?" != 0 ]]; then
-	IS_FAILED=true
-fi
-
-if $IS_FAILED; then
-  echo "\033[41mCOMMIT FAILED:\033[0m Your commit contains files that should pass ESLint but do not. Please fix the ESLint errors and try again.\n"
-  exit 1
-else
-  echo "\033[42mCOMMIT SUCCEEDED\033[0m\n"
-fi
-
-exit $?
+#!/bin/sh
+
+STAGED_FILES=$(git diff --cached --name-only --diff-filter=ACM | grep -E "\.(js)$") # Get staged files
+
+CURRENT_BRANCH=$(git branch | sed -n -e 's/^\* \(.*\)/\1/p') # Get branch name
+
+echo "Branch Name - $CURRENT_BRANCH"
+
+if [[ "$STAGED_FILES" = "" ]]; then
+  exit 0
+fi
+
+IS_FAILED=false
+FILES=""
+
+for FILE in $STAGED_FILES # Add files with space separation
+do
+	FILES+="$FILE "
+done
+
+npm run lint --prefix ${PREFIX_PATH} $FILES # Run ESLint
+
+if [[ "$?" != 0 ]]; then
+	IS_FAILED=true
+fi
+
+if $IS_FAILED; then
+  echo "\033[41mCOMMIT FAILED:\033[0m Your commit contains files that should pass ESLint but do not. Please fix the ESLint errors and try again.\n"
+  exit 1
+else
+  echo "\033[42mCOMMIT SUCCEEDED\033[0m\n"
+fi
+
+exit $?

package/lib/sh/reportPublish.sh

@@ -1,45 +1,45 @@
-#!/bin/bash
-branchName=$2
-url=$1
-zipUrl=$3
-unique=$(date +"%d_%m_%y_Time_%H_%M_%S")
-publishFolder=$branchName"_"$unique
-
-rm -rf ./reports
-rm -rf ./scrTemplate
-rm -rf ./errTemplate
-rm -rf ./css
-rm -rf ./js
-rm -rf ./index.html
-
-curl $zipUrl | tar xz
-
-cp -rf ./reports/css ./css
-cp -rf ./reports/js ./js
-cp -rf ./reports/index.html ./index.html
-if [ -d "./screenShots" ] ; then
-  cp -rf ./scrTemplate/* ./screenShots/
-else
-  mkdir ./screenShots
-  cp -rf ./scrTemplate/* ./screenShots/
-fi
-
-[ ! -f "./result.json" ] && touch result.json && cp -rf ./errTemplate/* ./result.json
-[ ! -d "./commitCoverage" ] && mkdir commitCoverage && cp -rf ./errTemplate/* ./commitCoverage/
-[ ! -d "./unittest" ] && mkdir unittest && cp -rf ./errTemplate/* ./unittest/
-[ ! -d "./coverageTest" ] && mkdir coverageTest && cp -rf ./errTemplate/* ./coverageTest/
-[ ! -d "./coverage" ] && mkdir coverage && cp -rf ./errTemplate/* ./coverage/
-
-tar -czvf $publishFolder.tar.gz coverage screenShots unittest coverageTest commitCoverage ./css ./js ./index.html ./result.json
-
-curl -i -F name=file -F file=@$publishFolder.tar.gz $url"/cgi-bin/upload.py"
-replace=$publishFolder
-reportUrl=$url"/"$replace
-subject="Client Report - React - $publishFolder"
-msg="<p><b>Report URL - <a href='$reportUrl'>Link</a></b></p>
-<p><b>Report Branchname - $branchName</b></p>
-<p><b>Report Unique ID - $unique</b></p>
-<p><b>Report Developer - $6</b></p>"
-#node mailSender.js <from> <pass> <to> <subject> <text>
-BASEDIR=$(dirname "$0")
-node $BASEDIR"/../utils/mailSender" $4 $5 $6 "$subject" "$msg" $7 $8 "$reportUrl"
+#!/bin/bash
+branchName=$2
+url=$1
+zipUrl=$3
+unique=$(date +"%d_%m_%y_Time_%H_%M_%S")
+publishFolder=$branchName"_"$unique
+
+rm -rf ./reports
+rm -rf ./scrTemplate
+rm -rf ./errTemplate
+rm -rf ./css
+rm -rf ./js
+rm -rf ./index.html
+
+curl $zipUrl | tar xz
+
+cp -rf ./reports/css ./css
+cp -rf ./reports/js ./js
+cp -rf ./reports/index.html ./index.html
+if [ -d "./screenShots" ] ; then
+  cp -rf ./scrTemplate/* ./screenShots/
+else
+  mkdir ./screenShots
+  cp -rf ./scrTemplate/* ./screenShots/
+fi
+
+[ ! -f "./result.json" ] && touch result.json && cp -rf ./errTemplate/* ./result.json
+[ ! -d "./commitCoverage" ] && mkdir commitCoverage && cp -rf ./errTemplate/* ./commitCoverage/
+[ ! -d "./unittest" ] && mkdir unittest && cp -rf ./errTemplate/* ./unittest/
+[ ! -d "./coverageTest" ] && mkdir coverageTest && cp -rf ./errTemplate/* ./coverageTest/
+[ ! -d "./coverage" ] && mkdir coverage && cp -rf ./errTemplate/* ./coverage/
+
+tar -czvf $publishFolder.tar.gz coverage screenShots unittest coverageTest commitCoverage ./css ./js ./index.html ./result.json
+
+curl -i -F name=file -F file=@$publishFolder.tar.gz $url"/cgi-bin/upload.py"
+replace=$publishFolder
+reportUrl=$url"/"$replace
+subject="Client Report - React - $publishFolder"
+msg="<p><b>Report URL - <a href='$reportUrl'>Link</a></b></p>
+<p><b>Report Branchname - $branchName</b></p>
+<p><b>Report Unique ID - $unique</b></p>
+<p><b>Report Developer - $6</b></p>"
+#node mailSender.js <from> <pass> <to> <subject> <text>
+BASEDIR=$(dirname "$0")
+node $BASEDIR"/../utils/mailSender" $4 $5 $6 "$subject" "$msg" $7 $8 "$reportUrl"