@zohodesk/react-cli 0.0.1-exp.176.3 → 0.0.1-exp.178.1

package/lib/servers/docsServerCore.js

@@ -29,28 +29,29 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 // import fs from 'fs';
 var _default = isSSTest => {
-  let options = (0, _utils.getOptions)();
-  let {
+  const options = (0, _utils.getOptions)();
+  const httpsOptions = (0, _httpsOptions.httpsOptionsWithUserFriendlyError)(options);
+  const {
     docs: {
       server
     }
   } = options;
-  let {
+  const {
     port,
     branch,
     host,
     domain,
     iphost
   } = server;
-  let appPath = process.cwd();
+  const appPath = process.cwd();
   const app = (0, _express.default)();
   app.use(_express.default.json());
   app.use(_express.default.urlencoded({
     extended: true
   }));
-  let docsConfig = (0, _webpackDocs.default)(isSSTest);
-  let compiler = (0, _webpack.default)(docsConfig);
-  let wdm = (0, _webpackDevMiddleware.default)(compiler, {
+  const docsConfig = (0, _webpackDocs.default)(isSSTest);
+  const compiler = (0, _webpack.default)(docsConfig);
+  const wdm = (0, _webpackDevMiddleware.default)(compiler, {
     logLevel: 'error',
     publicPath: docsConfig.output.publicPath,
     headers: {
@@ -67,7 +68,7 @@ var _default = isSSTest => {
     res.sendFile(_path.default.join(__dirname, '..', '..', 'templates', 'docs', 'index.html'));
   });
   app.use('/author/get', (req, res) => {
-    let {
+    const {
       query: {
         componentName = ''
       }
@@ -84,7 +85,7 @@ var _default = isSSTest => {
 
   if (branch) {
     app.post('/repo/merge', (req, res) => {
-      let {
+      const {
         ref
       } = req.body;
 
@@ -98,7 +99,7 @@ var _default = isSSTest => {
     });
   }
 
-  const httpsServer = _https.default.createServer(_httpsOptions.httpsOptions, app);
+  const httpsServer = _https.default.createServer(httpsOptions, app);
 
   if (!isSSTest) {
     httpsServer.listen(port, err => {
@@ -110,8 +111,8 @@ var _default = isSSTest => {
     });
   }
 
-  let httpPort = Number(port) + 1;
-  let http = app.listen(httpPort, err => {
+  const httpPort = Number(port) + 1;
+  const http = app.listen(httpPort, err => {
     if (err) {
       throw err;
     }

package/lib/servers/httpsOptions.js

@@ -3,16 +3,47 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.httpsOptions = void 0;
+exports.httpsOptions = httpsOptions;
+exports.httpsOptionsWithUserFriendlyError = httpsOptionsWithUserFriendlyError;
 
-var _fs = _interopRequireDefault(require("fs"));
+// import fs from 'fs';
+// import path from 'path';
+// export const httpsOptions = {
+//   key: fs.readFileSync(path.join(__dirname, './cert/Tsicsezwild-22-23.key')),
+//   cert: fs.readFileSync(path.join(__dirname, './cert/Tsicsezwild-22-23.crt'))
+// };
+function httpsOptions(options) {
+  const {
+    httpsCerts
+  } = options.app.server;
 
-var _path = _interopRequireDefault(require("path"));
+  const certificate = require(require.resolve(httpsCerts, {
+    paths: [process.cwd()]
+  })); // TODO: in future we may do some version based check. certificate.version
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const httpsOptions = {
-  key: _fs.default.readFileSync(_path.default.join(__dirname, '../../cert/Tsicsezwild-22-23.key')),
-  cert: _fs.default.readFileSync(_path.default.join(__dirname, '../../cert/Tsicsezwild-22-23.crt'))
-};
-exports.httpsOptions = httpsOptions;
+  return certificate.httpsOptions;
+}
+
+function httpsOptionsWithUserFriendlyError(options) {
+  const {
+    httpsCerts
+  } = options.app.server;
+
+  if (typeof httpsCerts === 'string' && httpsCerts) {
+    try {
+      const certificate = httpsOptions(options);
+      return certificate;
+    } catch (error) {
+      if (error.message.indexOf('Cannot find module') !== -1) {
+        console.error(`You have given react-cli.app.server.httpsCerts as "${httpsCerts}". \n But it seems that file path have some problem.\n we are unable to locate "${httpsCerts}" in "${process.cwd()}"`);
+      } else {
+        console.error(error);
+      }
+
+      process.exit(0);
+    }
+  } else {
+    return null;
+  }
+}

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"