@zohodesk/react-cli 0.0.1-exp.168.3 → 0.0.1-exp.169.1

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

@@ -0,0 +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
+  }
+  
+}

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

@@ -0,0 +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
+  }
+  
+}

package/lib/postcss-plugins/hoverActivePlugin.js

@@ -4,12 +4,22 @@ var _postcss = _interopRequireDefault(require("postcss"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function previousNodeCheck(nodes, index) {
-  return nodes !== undefined && nodes[index - 1] !== undefined && nodes[index - 1] && nodes[index - 1].text !== undefined;
-}
+/**
+ * we have give support for ignore(exclude) comments
+ * These are the comments' keyword
+ */
+const hoverIgnoreQuery = 'Hover: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)';
+const ruleIgnoreCommentRegex = /(Hover:ignore|Active:ignore|HoverActive:ignore)/g;
+const mediaQueryIgnoreCommentRegex = /(MedHover:ignore|MedActive:ignore|MedHoverActive:ignore)/g;
 
 function isComment(node) {
-  return node !== undefined && node.type === 'comment';
+  return node && node.type === 'comment' && node.text !== undefined;
 }
 
 function isHoverPresent(atrule) {
@@ -25,22 +35,18 @@ function isHoverPresent(atrule) {
 module.exports = _postcss.default.plugin('postcss-mobile-hover', () => rootOriginal => {
   const hoverRules = [];
   let positionsObj = {};
-  const hoverIgnoreQuery = 'Hover:ignore',
-        activeIgnoreQuery = 'Active:ignore',
-        hoverActiveIgnoreQuery = 'HoverActive:ignore';
-  const medHoverIgnoreQuery = 'MedHover:ignore',
-        medActiveIgnoreQuery = 'MedActive:ignore',
-        medHoverActiveIgnoreQuery = 'MedHoverActive:ignore';
-
-  function QueryIgnoreCheck(index, type) {
-    if (previousNodeCheck(rootOriginal.nodes, index)) {
-      return rootOriginal.nodes[index - 1].text === type;
+
+  function isRuleHasIgnoreComment(index, type) {
+    const prevNode = rootOriginal.nodes[index - 1];
+
+    if (isComment(prevNode)) {
+      return prevNode.text === type;
     }
 
     return false;
   }
 
-  function mediaQueryIgnoreCheck(node, type) {
+  function isMediaQueryHasIgnoreComment(node, type) {
     if (isComment(node)) {
       return node.text === type;
     }
@@ -48,34 +54,39 @@ module.exports = _postcss.default.plugin('postcss-mobile-hover', () => rootOrigi
     return false;
   }
 
-  function handleIgnore({
+  function hasIgnoreComment({
     index,
     atrule,
     type
   }) {
-    if (type.match(/(Hover:ignore|Active:ignore|HoverActive:ignore)/g)) {
-      return QueryIgnoreCheck(index, type);
+    if (type.match(mediaQueryIgnoreCommentRegex)) {
+      return isMediaQueryHasIgnoreComment(atrule.nodes[index - 1], type.slice(3));
     }
 
-    if (type.match(/(MedHover:ignore|MedActive:ignore|MedHoverActive:ignore)/g)) {
-      return mediaQueryIgnoreCheck(atrule.nodes[index - 1], type.slice(3));
+    if (type.match(ruleIgnoreCommentRegex)) {
+      return isRuleHasIgnoreComment(index, type);
     }
+
+    return false;
   }
 
-  function returnPositions(parent) {
-    let positions = {
-      hovMed: rootOriginal.nodes[positionsObj[`${parent.params} and all and (min--moz-device-pixel-ratio:0) and (hover: hover), (hover: hover)`] - 1],
-      actMed: rootOriginal.nodes[positionsObj[`${parent.params} and (hover: none)`] - 1]
+  function getPositionsOfHoverAndActiveMedQueries(parent) {
+    const allNodes = rootOriginal.nodes;
+    const hoverMediaQuery = `${parent.params} and all and ${hoverMedQuerySuffix}`;
+    const hoverNoneMediaQuery = `${parent.params} and (hover: none)`;
+    const positions = {
+      hovMed: allNodes[positionsObj[hoverMediaQuery]],
+      actMed: allNodes[positionsObj[hoverNoneMediaQuery]]
     };
     return positions;
   }
 
   function handleMedHoverAndHoverActiveIgnore(atrule, index) {
-    return !handleIgnore({
+    return !hasIgnoreComment({
       atrule,
       index,
       type: medHoverIgnoreQuery
-    }) && !handleIgnore({
+    }) && !hasIgnoreComment({
       atrule,
       index,
       type: medHoverActiveIgnoreQuery
@@ -83,11 +94,11 @@ module.exports = _postcss.default.plugin('postcss-mobile-hover', () => rootOrigi
   }
 
   function handleMedActiveAndHoverActiveIgnore(atrule, index) {
-    return !handleIgnore({
+    return !hasIgnoreComment({
       atrule,
       index,
       type: medActiveIgnoreQuery
-    }) && !handleIgnore({
+    }) && !hasIgnoreComment({
       atrule,
       index,
       type: medHoverActiveIgnoreQuery
@@ -95,33 +106,33 @@ module.exports = _postcss.default.plugin('postcss-mobile-hover', () => rootOrigi
   }
 
   function handleHoverAndHoverActiveIgnore(index) {
-    return !handleIgnore({
+    return !hasIgnoreComment({
       index,
       type: hoverIgnoreQuery
-    }) && !handleIgnore({
+    }) && !hasIgnoreComment({
       index,
       type: hoverActiveIgnoreQuery
     });
   }
 
   function handleActiveAndHoverActiveIgnore(index) {
-    return !handleIgnore({
+    return !hasIgnoreComment({
       index,
       type: activeIgnoreQuery
-    }) && !handleIgnore({
+    }) && !hasIgnoreComment({
       index,
       type: hoverActiveIgnoreQuery
     });
   }
 
   function handleAllIgnoreCases(index) {
-    return !handleIgnore({
+    return !hasIgnoreComment({
       index,
       type: activeIgnoreQuery
-    }) && !handleIgnore({
+    }) && !hasIgnoreComment({
       index,
       type: hoverIgnoreQuery
-    }) && !handleIgnore({
+    }) && !hasIgnoreComment({
       index,
       type: hoverActiveIgnoreQuery
     });
@@ -134,7 +145,7 @@ module.exports = _postcss.default.plugin('postcss-mobile-hover', () => rootOrigi
       let {
         hovMed,
         actMed
-      } = returnPositions(rule.parent);
+      } = getPositionsOfHoverAndActiveMedQueries(rule.parent);
       let hovQueries = [];
       let actQueries = [];
       rule.selector.split(/\s*,\s*/).forEach(_subrule => {
@@ -182,12 +193,11 @@ module.exports = _postcss.default.plugin('postcss-mobile-hover', () => rootOrigi
   }
 
   function mediaQuery(rule, index) {
-    // console.log(rule.parent.params + " and all and (min--moz-device-pixel-ratio:0) and (hover: hover), (hover: hover)");
     if (rule.parent.params !== undefined && !rule.parent.params.includes('hover')) {
       let {
         hovMed,
         actMed
-      } = returnPositions(rule.parent);
+      } = getPositionsOfHoverAndActiveMedQueries(rule.parent);
 
       if (rule.selector.includes('hover') && hovMed !== undefined && rule.parent.type === 'atrule') {
         if (handleMedHoverAndHoverActiveIgnore(rule.parent, index)) {
@@ -238,8 +248,7 @@ module.exports = _postcss.default.plugin('postcss-mobile-hover', () => rootOrigi
 
 
   rootOriginal.walkAtRules(atrule => {
-    //console.log(positions[`${atrule.params} and all and (min--moz-device-pixel-ratio:0) and (hover: hover), (hover: hover)`])
-    const hoverQuery = `${atrule.params} and all and (min--moz-device-pixel-ratio:0) and (hover: hover), (hover: hover)`;
+    const hoverQuery = `${atrule.params} and all and ${hoverMedQuerySuffix}`;
     const activeQuery = `${atrule.params} and (hover: none)`;
 
     if (isHoverPresent(atrule)) {
@@ -258,7 +267,6 @@ module.exports = _postcss.default.plugin('postcss-mobile-hover', () => rootOrigi
     }
   });
   rootOriginal.walkRules(/:hover/i, (rule, index) => {
-    // console.log({ rule, index });
     // media hover query with ',' ' ' '+'
     // console.log("media query" , rule.selector)
     if (rule.parent.type === 'atrule' && rule.selector.includes(',')) {
@@ -300,7 +308,7 @@ module.exports = _postcss.default.plugin('postcss-mobile-hover', () => rootOrigi
     // hover
     const hoverQuery = rootOriginal.append({
       name: 'media',
-      params: 'all and (min--moz-device-pixel-ratio:0) and (hover: hover), (hover: hover)'
+      params: `all and ${hoverMedQuerySuffix}`
     }).last; // Create a media query targetting devices that don't support hover
     // (ie. devices where we should fall back to :active instead)
 

package/lib/schemas/index.js

@@ -71,8 +71,14 @@ var _default = {
     },
     createSDkFile: false,
     nameScope: 'ZOHODESK',
-    version: 'default',
-    outputFile: 'zohodesk-efc-sdk-[version].js',
+    version: {
+      value: 'stable',
+      cli: 'efc_version'
+    },
+    outputFile: {
+      value: 'efc-sdk-[version].js',
+      cli: 'efc_output_file'
+    },
     templateFilePath: '',
     localeAttr: 'data-efc-locale',
     localeDefaultValue: 'en_US',
@@ -272,7 +278,6 @@ var _default = {
     enableChunkHash: false,
     combinerMq: false,
     hoverActive: false,
-    keyframesRedMtn: false,
     folder: 'src',
     disableES5Transpile: false,
     hasRTL: false,

package/lib/servers/getCliPath.js

@@ -9,16 +9,20 @@ var _path = _interopRequireDefault(require("path"));
 
 var _os = require("os");
 
+var _fs = require("fs");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-let appPath = process.cwd();
+const appPath = process.cwd();
 const isNodeModuleUnderAppFolder = __dirname.indexOf(appPath) !== -1;
-let isWindows = (0, _os.platform)().toLowerCase() === 'win32';
+const isWindows = (0, _os.platform)().toLowerCase() === 'win32';
 
 const _getCliPath = !isNodeModuleUnderAppFolder ? libName => _path.default.join(__dirname, '..', '..', 'node_modules', '.bin', libName) : libName => libName;
 
 const suffixExt = isWindows ? '.cmd' : '';
 
 function getCliPath(libName) {
-  return _getCliPath(libName) + suffixExt;
+  const cliPath = _getCliPath(libName + suffixExt);
+
+  return (0, _fs.existsSync)(cliPath) ? cliPath : libName;
 }

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"