@zohodesk/react-cli 0.0.1-beta.177 → 0.0.1-beta.178

package/lib/servers/nowatchserver.js

@@ -19,15 +19,16 @@ var _devBuild = require("./devBuild");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 // import webpack from 'webpack';
-let options = (0, _utils.getOptions)(); // let args = process.argv.slice(3);
+const options = (0, _utils.getOptions)(); // let args = process.argv.slice(3);
 
-let {
+const httpsOptions = (0, _httpsOptions.httpsOptionsWithUserFriendlyError)(options);
+const {
   app: {
     context,
     server
   }
 } = options;
-let {
+const {
   host,
   port,
   domain,
@@ -35,9 +36,9 @@ let {
   hasMock,
   mockPort
 } = server;
-let isCompatableHttp2 = Number(process.version.slice(1).split('.')[0]) >= 8;
-let contextURL = disableContextURL ? '' : `/${context}`;
-let serverUrl = (0, _utils.getServerURL)(server, 'htt' + 'ps');
+const isCompatableHttp2 = Number(process.version.slice(1).split('.')[0]) >= 8;
+const contextURL = disableContextURL ? '' : `/${context}`;
+const serverUrl = (0, _utils.getServerURL)(server, 'htt' + 'ps');
 const {
   zipname,
   cssSelectorZipPath,
@@ -83,7 +84,7 @@ app.use('/wms/*', (req, res) => {
   res.sendFile(_path.default.join(__dirname, '..', '..', 'templates', 'wms', 'index.html'));
 });
 
-const httpsServer = _https.default.createServer(_httpsOptions.httpsOptions, app);
+const httpsServer = _https.default.createServer(httpsOptions, app);
 
 const wss = new _ws.default.Server({
   server: httpsServer
@@ -101,7 +102,7 @@ wss.on('connection', ws => {
 });
 app.post('/wmsmockapi', (req, res) => {
   wsPool.forEach(ws => {
-    let {
+    const {
       body
     } = req;
 
@@ -161,7 +162,7 @@ httpsServer.listen(port, err => {
 if (isCompatableHttp2) {
   const http2 = require('http2');
 
-  const http2Server = http2.createSecureServer(_httpsOptions.httpsOptions); // eslint-disable-next-line no-unused-vars
+  const http2Server = http2.createSecureServer(httpsOptions); // eslint-disable-next-line no-unused-vars
 
   http2Server.on('stream', (stream, headers) => {
     stream.respond({
@@ -170,7 +171,7 @@ if (isCompatableHttp2) {
     });
     stream.end('<h1>Hello World! <br>Working with http2</h1>');
   });
-  let http2Port = Number(port) + 1;
+  const http2Port = Number(port) + 1;
   http2Server.listen(http2Port, err => {
     if (err) {
       throw err;
@@ -186,7 +187,7 @@ if (isCompatableHttp2) {
   (0, _utils.log)('Your node version didn\'t adopted http2 support. Kindly update that to 8 LTS or above you can engage the http2');
 }
 
-let httpPort = Number(port) + (isCompatableHttp2 ? 2 : 1);
+const httpPort = Number(port) + (isCompatableHttp2 ? 2 : 1);
 app.listen(httpPort, err => {
   if (err) {
     throw err;

package/lib/servers/server.js

@@ -25,14 +25,15 @@ var _httpsOptions = require("./httpsOptions");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 // import fs from 'fs';
-let options = (0, _utils.getOptions)();
-let {
+const options = (0, _utils.getOptions)();
+const httpsOptions = (0, _httpsOptions.httpsOptionsWithUserFriendlyError)(options);
+const {
   app: {
     context,
     server
   }
 } = options;
-let {
+const {
   host,
   port,
   domain,
@@ -41,9 +42,9 @@ let {
   hasMock,
   mockPort
 } = server;
-let isCompatableHttp2 = Number(process.version.substr(1).split('.')[0]) >= 8;
-let contextURL = disableContextURL ? '' : `/${context}`;
-let serverUrl = (0, _utils.getServerURL)(server, 'htt' + 'ps');
+const isCompatableHttp2 = Number(process.version.substr(1).split('.')[0]) >= 8;
+const contextURL = disableContextURL ? '' : `/${context}`;
+const serverUrl = (0, _utils.getServerURL)(server, 'htt' + 'ps');
 const {
   writeToDisk
 } = options.impactService;
@@ -72,8 +73,8 @@ if (mode === 'prod') {
 } // console.log({ contextURL });
 
 
-let compiler = (0, _webpack.default)(config);
-let webpackServerOptions = {
+const compiler = (0, _webpack.default)(config);
+const webpackServerOptions = {
   logLevel: 'error',
   publicPath: mode === 'prod' ? contextURL === '' ? `${serverUrl}/${contextURL}` : serverUrl + contextURL : config.output.publicPath,
   headers: options.app.enableDevCache ? {
@@ -114,7 +115,7 @@ app.use('/wms/*', (req, res) => {
   res.sendFile(_path.default.join(__dirname, '..', '..', 'templates', 'wms', 'index.html'));
 });
 
-const httpsServer = _https.default.createServer(_httpsOptions.httpsOptions, app);
+const httpsServer = _https.default.createServer(httpsOptions, app);
 
 const wss = new _ws.default.Server({
   server: httpsServer
@@ -132,7 +133,7 @@ wss.on('connection', ws => {
 });
 app.post('/wmsmockapi', (req, res) => {
   wsPool.forEach(ws => {
-    let {
+    const {
       body
     } = req;
 
@@ -167,18 +168,20 @@ if (contextURL) {
   app.use('/*', _express.default.static(context));
 }
 
-httpsServer.listen(port, err => {
-  if (err) {
-    throw err;
-  }
+if (httpsOptions) {
+  httpsServer.listen(port, err => {
+    if (err) {
+      throw err;
+    }
 
-  (0, _utils.log)(`Listening at ${serverUrl}${contextURL}/`);
-});
+    (0, _utils.log)(`Listening at ${serverUrl}${contextURL}/`);
+  });
+}
 
-if (isCompatableHttp2) {
+if (isCompatableHttp2 && httpsOptions) {
   const http2 = require('http2');
 
-  const http2Server = http2.createSecureServer(_httpsOptions.httpsOptions); // eslint-disable-next-line no-unused-vars
+  const http2Server = http2.createSecureServer(httpsOptions); // eslint-disable-next-line no-unused-vars
 
   http2Server.on('stream', (stream, headers) => {
     stream.respond({
@@ -187,7 +190,7 @@ if (isCompatableHttp2) {
     });
     stream.end('<h1>Hello World! <br>Working with http2</h1>');
   });
-  let http2Port = Number(port) + 1;
+  const http2Port = Number(port) + 1;
   http2Server.listen(http2Port, err => {
     if (err) {
       throw err;
@@ -203,7 +206,7 @@ if (isCompatableHttp2) {
   (0, _utils.log)('Your node version didn\'t adopted http2 support. Kindly update that to 8 LTS or above you can engage the http2');
 }
 
-let httpPort = Number(port) + (isCompatableHttp2 ? 2 : 1);
+const httpPort = Number(port) + (isCompatableHttp2 ? 2 : 1);
 app.listen(httpPort, err => {
   if (err) {
     throw err;

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/getFileType.js

@@ -33,7 +33,7 @@ function getFileType(file) {
 }
 
 function isImageFileExt(ext) {
-  return ext === '.gif' || ext === '.png' || ext === '.jpg' || ext === '.jpeg' || ext === '.ico';
+  return ext === '.gif' || ext === '.png' || ext === '.jpg' || ext === '.jpeg' || ext === '.webp' || ext === '.ico';
 }
 
 function isFontFileExt(ext) {
@@ -41,7 +41,7 @@ function isFontFileExt(ext) {
 }
 
 function isVideoFileExt(ext) {
-  return ext === '.mp4';
+  return ext === '.mp4' || ext === '.webm';
 }
 
 function isAudioFileExt(ext) {