@zohodesk/react-cli 1.0.0 → 1.0.1-exp.1

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

@@ -147,6 +147,8 @@ const singleConvertor = (value, changeVal, details, range) => {
   // } else {
   //   console.log('++++++++++++++++++++++rect val!', value);
   // }
+
+  return;
 };
 
 module.exports = {
@@ -189,7 +191,8 @@ module.exports = {
           const fromPath = rootOriginal.source.input.from; // this will be problem for linux and mac use require('path').sep
           // split not need use slice and lastIndexOf less memory
 
-          const filename = fromPath.split(path.sep).pop();
+          const filename = fromPath.split(path.sep).pop(); // if(filename.includes('AddFormResponsive.module.css'){
+          // }
 
           if (prevNode && prevNode.type === 'comment' && prevNode.text.toLowerCase().includes(commentStr)) {
             let errObj = {
@@ -285,6 +288,25 @@ module.exports = {
               }
             }
           } else {
+            if (decl.value && decl.value.includes('px') && decl.value.includes('var(--') && settingsObject[decl.prop]) {
+              let valArr = decl.value.split(' ');
+              let settings = settingsObject[decl.prop];
+              const {
+                range
+              } = settings;
+              valArr.forEach((val, index) => {
+                if (val.includes('px')) {
+                  let convertedVal = singleConvertor(val, settings.replacements.px, {
+                    decl,
+                    filename,
+                    path: fromPath
+                  }, range);
+                  valArr[index] = convertedVal ? convertedVal : val;
+                }
+              });
+              decl.value = valArr.join(' ');
+            }
+
             if (decl.prop && decl.value && !decl.prop.includes('--') && valRegex.test(decl.value) && (settingsObject[decl.prop] || convertableProps[decl.prop]) && decl.value.includes('var') && !decl.value.includes('calc')) {
               let errObj = {
                 decl,

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"

package/lib/utils/buildstats.html

@@ -1,148 +1,148 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=windows-1252" />
-    <style>
-      #file {
-        font-family: 'Trebuchet MS', Arial, Helvetica, sans-serif;
-        border-collapse: collapse;
-        width: 100%;
-      }
-      #redTd {
-        color: red;
-      }
-      #greenTD {
-        color: green;
-      }
-      #file td,
-      #file th {
-        border: 1px solid #ddd;
-        padding: 8px;
-        text-align: center;
-      }
-
-      #file tr:nth-child(even) {
-        background-color: #f2f2f2;
-      }
-
-      #file tr:hover {
-        background-color: #ddd;
-      }
-
-      #file th {
-        padding-top: 12px;
-        padding-bottom: 12px;
-        background-color: #2a2d36;
-        color: white;
-      }
-      #sizeTable {
-        float: left;
-        width: 50%;
-      }
-      #hashTable {
-        display: inline-block;
-        width: 50%;
-      }
-    </style>
-    <script type="text/javascript" src="./buildtrack.js"></script>
-  </head>
-  <body>
-    <div>
-      <div style="float: left;margin-right: 10px;">Branch Name:</div>
-      <h4 id="h4" style="margin: 0px;"></h4>
-    </div>
-    <div id="sizeTable">
-      <div>
-        <h3>Size changes</h3>
-        <h3></h3>
-      </div>
-      <table id="file" class="table table-bordered table-hover table-condensed">
-        <thead>
-          <tr>
-            <th title="Field #1">Name</th>
-            <th title="Field #2">Size / Diff</th>
-            <th title="Field #3">Size / Old</th>
-            <th title="Field #4">Size / New</th>
-          </tr>
-        </thead>
-        <tbody id="sizeTbody"></tbody>
-      </table>
-    </div>
-    <div id="hashTable">
-      <div>
-        <h3>Hash changes</h3>
-        <h3></h3>
-      </div>
-      <table id="file" class="table table-bordered table-hover table-condensed">
-        <thead>
-          <tr>
-            <th style="background-color: #4CAF50;" title="Field #1">Name</th>
-            <th style="background-color: #4CAF50;" title="Field #2">
-              Hash / Old
-            </th>
-            <th style="background-color: #4CAF50;" title="Field #3">
-              Hash / New
-            </th>
-          </tr>
-        </thead>
-        <tbody id="hashTbody"></tbody>
-      </table>
-    </div>
-
-    <script type="text/javascript">
-      function load() {
-        if (statsJson) {
-          var tdStringSize = '';
-          var tdStringHash = '';
-          if (statsJson.increased.length > 0) {
-            statsJson.increased.forEach(fileObj => {
-              let colorTD = '</td><td>';
-              if (fileObj.size.diff.split(' ').length > 2) {
-                colorTD = '</td><td id="greenTd">';
-              } else {
-                colorTD = '</td><td id="redTd">';
-              }
-
-              tdStringSize =
-                tdStringSize +
-                '<tr><td>' +
-                fileObj.name +
-                colorTD +
-                fileObj.size.diff +
-                '</td><td>' +
-                fileObj.size.old +
-                '</td><td>' +
-                fileObj.size.new +
-                '</td><tr>';
-            });
-          } else {
-            tdStringSize = '<tr><td></td><td></td><td></td></tr>';
-          }
-          document.getElementById('sizeTbody').innerHTML = tdStringSize;
-          if (statsJson.hashChanged.length > 0) {
-            statsJson.hashChanged.forEach(fileObj => {
-              tdStringHash =
-                tdStringHash +
-                '<tr><td>' +
-                fileObj.name +
-                '</td><td>' +
-                fileObj.hash.old +
-                '</td><td>' +
-                fileObj.hash.new +
-                '</td><tr>';
-            });
-          } else {
-            tdStringHash = '<tr><td></td><td></td><td></td></tr>';
-          }
-          document.getElementById('hashTbody').innerHTML = tdStringHash;
-          if (statsJson.branchName) {
-            document.getElementById('h4').innerHTML = statsJson.branchName;
-          } else {
-            document.getElementById('h4').innerHTML = 'Not specified';
-          }
-        }
-      }
-      load();
-    </script>
-  </body>
-</html>
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=windows-1252" />
+    <style>
+      #file {
+        font-family: 'Trebuchet MS', Arial, Helvetica, sans-serif;
+        border-collapse: collapse;
+        width: 100%;
+      }
+      #redTd {
+        color: red;
+      }
+      #greenTD {
+        color: green;
+      }
+      #file td,
+      #file th {
+        border: 1px solid #ddd;
+        padding: 8px;
+        text-align: center;
+      }
+
+      #file tr:nth-child(even) {
+        background-color: #f2f2f2;
+      }
+
+      #file tr:hover {
+        background-color: #ddd;
+      }
+
+      #file th {
+        padding-top: 12px;
+        padding-bottom: 12px;
+        background-color: #2a2d36;
+        color: white;
+      }
+      #sizeTable {
+        float: left;
+        width: 50%;
+      }
+      #hashTable {
+        display: inline-block;
+        width: 50%;
+      }
+    </style>
+    <script type="text/javascript" src="./buildtrack.js"></script>
+  </head>
+  <body>
+    <div>
+      <div style="float: left;margin-right: 10px;">Branch Name:</div>
+      <h4 id="h4" style="margin: 0px;"></h4>
+    </div>
+    <div id="sizeTable">
+      <div>
+        <h3>Size changes</h3>
+        <h3></h3>
+      </div>
+      <table id="file" class="table table-bordered table-hover table-condensed">
+        <thead>
+          <tr>
+            <th title="Field #1">Name</th>
+            <th title="Field #2">Size / Diff</th>
+            <th title="Field #3">Size / Old</th>
+            <th title="Field #4">Size / New</th>
+          </tr>
+        </thead>
+        <tbody id="sizeTbody"></tbody>
+      </table>
+    </div>
+    <div id="hashTable">
+      <div>
+        <h3>Hash changes</h3>
+        <h3></h3>
+      </div>
+      <table id="file" class="table table-bordered table-hover table-condensed">
+        <thead>
+          <tr>
+            <th style="background-color: #4CAF50;" title="Field #1">Name</th>
+            <th style="background-color: #4CAF50;" title="Field #2">
+              Hash / Old
+            </th>
+            <th style="background-color: #4CAF50;" title="Field #3">
+              Hash / New
+            </th>
+          </tr>
+        </thead>
+        <tbody id="hashTbody"></tbody>
+      </table>
+    </div>
+
+    <script type="text/javascript">
+      function load() {
+        if (statsJson) {
+          var tdStringSize = '';
+          var tdStringHash = '';
+          if (statsJson.increased.length > 0) {
+            statsJson.increased.forEach(fileObj => {
+              let colorTD = '</td><td>';
+              if (fileObj.size.diff.split(' ').length > 2) {
+                colorTD = '</td><td id="greenTd">';
+              } else {
+                colorTD = '</td><td id="redTd">';
+              }
+
+              tdStringSize =
+                tdStringSize +
+                '<tr><td>' +
+                fileObj.name +
+                colorTD +
+                fileObj.size.diff +
+                '</td><td>' +
+                fileObj.size.old +
+                '</td><td>' +
+                fileObj.size.new +
+                '</td><tr>';
+            });
+          } else {
+            tdStringSize = '<tr><td></td><td></td><td></td></tr>';
+          }
+          document.getElementById('sizeTbody').innerHTML = tdStringSize;
+          if (statsJson.hashChanged.length > 0) {
+            statsJson.hashChanged.forEach(fileObj => {
+              tdStringHash =
+                tdStringHash +
+                '<tr><td>' +
+                fileObj.name +
+                '</td><td>' +
+                fileObj.hash.old +
+                '</td><td>' +
+                fileObj.hash.new +
+                '</td><tr>';
+            });
+          } else {
+            tdStringHash = '<tr><td></td><td></td><td></td></tr>';
+          }
+          document.getElementById('hashTbody').innerHTML = tdStringHash;
+          if (statsJson.branchName) {
+            document.getElementById('h4').innerHTML = statsJson.branchName;
+          } else {
+            document.getElementById('h4').innerHTML = 'Not specified';
+          }
+        }
+      }
+      load();
+    </script>
+  </body>
+</html>

package/lib/utils/resultSchema.json

@@ -1,73 +1,73 @@
-{
-  "jobDetails": {
-    "isTriggeredFromGit": true,
-    "isCIPassed": true,
-    "developerName": "GITLAB_USER_NAME",
-    "jobID": "CI_PIPELINE_ID",
-    "branchName": "CI_COMMIT_REF_NAME",
-    "commitMessage": "CI_COMMIT_MESSAGE",
-    "jobURL": "CI_JOB_URL",
-    "isByManual": "CI_JOB_MANUAL",
-    "commitID": "CI_COMMIT_SHA",
-    "executionTime": "Date.now()-Date.now()",
-    "hostName": "kathir-zt252"
-  },
-  "tests": {
-    "unitCase": {
-      "startTime": "123455",
-      "endTime": "123446",
-      "isExecuted": true,
-      "numberOfSuccess": "",
-      "numberOfFails": "",
-      "numberOfCases": "",
-      "numberOfSuites": "",
-      "fileDetail": {
-        "fileName": "sample.spec.js",
-        "caseDetail": {
-          "failedCaseLists": [],
-          "passedCaseList": []
-        }
-      },
-      "coverageDetail": {
-        "codeCoveragePercentage": "",
-        "fileCoveragePercentage": ""
-      }
-    },
-    "modifiedFileUnitCase": {
-      "hasChanges": "true",
-      "startTime": "123455",
-      "endTime": "123446",
-      "isExecuted": true,
-      "isPassed": true,
-      "numberOfSuccess": "",
-      "numberOfFails": "",
-      "numberOfCases": "",
-      "numberOfSuites": "",
-      "fileDetail": {
-        "fileName": "sample.spec.js",
-        "caseDetail": {
-          "failedCaseLists": [],
-          "passedCaseList": []
-        }
-      },
-      "coverageDetail": {
-        "codeCoveragePercentage": "",
-        "fileCoveragePercentage": ""
-      }
-    },
-    "screenshotTest": {
-      "message": "some",
-      "startTime": "123455",
-      "endTime": "123446",
-      "isThisExecuted": true,
-      "compareBranch": "master",
-      "isPassed": true,
-      "result": {
-        "numberOfComponents": 200,
-        "numberOfDiffFiles": 20,
-        "improperDocsList": [],
-        "erroredComponents": []
-      }
-    }
-  }
-}
+{
+  "jobDetails": {
+    "isTriggeredFromGit": true,
+    "isCIPassed": true,
+    "developerName": "GITLAB_USER_NAME",
+    "jobID": "CI_PIPELINE_ID",
+    "branchName": "CI_COMMIT_REF_NAME",
+    "commitMessage": "CI_COMMIT_MESSAGE",
+    "jobURL": "CI_JOB_URL",
+    "isByManual": "CI_JOB_MANUAL",
+    "commitID": "CI_COMMIT_SHA",
+    "executionTime": "Date.now()-Date.now()",
+    "hostName": "kathir-zt252"
+  },
+  "tests": {
+    "unitCase": {
+      "startTime": "123455",
+      "endTime": "123446",
+      "isExecuted": true,
+      "numberOfSuccess": "",
+      "numberOfFails": "",
+      "numberOfCases": "",
+      "numberOfSuites": "",
+      "fileDetail": {
+        "fileName": "sample.spec.js",
+        "caseDetail": {
+          "failedCaseLists": [],
+          "passedCaseList": []
+        }
+      },
+      "coverageDetail": {
+        "codeCoveragePercentage": "",
+        "fileCoveragePercentage": ""
+      }
+    },
+    "modifiedFileUnitCase": {
+      "hasChanges": "true",
+      "startTime": "123455",
+      "endTime": "123446",
+      "isExecuted": true,
+      "isPassed": true,
+      "numberOfSuccess": "",
+      "numberOfFails": "",
+      "numberOfCases": "",
+      "numberOfSuites": "",
+      "fileDetail": {
+        "fileName": "sample.spec.js",
+        "caseDetail": {
+          "failedCaseLists": [],
+          "passedCaseList": []
+        }
+      },
+      "coverageDetail": {
+        "codeCoveragePercentage": "",
+        "fileCoveragePercentage": ""
+      }
+    },
+    "screenshotTest": {
+      "message": "some",
+      "startTime": "123455",
+      "endTime": "123446",
+      "isThisExecuted": true,
+      "compareBranch": "master",
+      "isPassed": true,
+      "result": {
+        "numberOfComponents": 200,
+        "numberOfDiffFiles": 20,
+        "improperDocsList": [],
+        "erroredComponents": []
+      }
+    }
+  }
+}