@zohodesk/react-cli 0.0.1-beta.99 → 0.0.1-betaa.138.2

package/lib/utils/jsonHelper.js

@@ -1,16 +1,20 @@
-'use strict';
+"use strict";
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-var fs = require('fs');
-var os = require('os');
+exports.setTestInfoStatus = exports.jsonHelper = exports.jsonConcate = exports.getRunnerDetail = exports.fileHandler = void 0;
 
-var _require = require('./'),
-    getCurrentBranch = _require.getCurrentBranch;
+let fs = require('fs');
 
-var getRunnerDetail = exports.getRunnerDetail = function getRunnerDetail() {
-  var defaultObj = {
+let os = require('os');
+
+let {
+  getCurrentBranch
+} = require('./');
+
+let getRunnerDetail = () => {
+  let defaultObj = {
     jobDetails: {
       isRunByLocal: true,
       hostName: os.hostname(),
@@ -21,27 +25,28 @@ var getRunnerDetail = exports.getRunnerDetail = function getRunnerDetail() {
   return defaultObj;
 };
 
-var fileHandler = exports.fileHandler = {
-  readFile: function readFile(path) {
-    var callback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
-
+exports.getRunnerDetail = getRunnerDetail;
+let fileHandler = {
+  readFile: (path, callback = null) => {
     if (fs.existsSync(path)) {
       if (callback === null) {
         return fs.readFileSync(path);
       }
+
       callback(fs.readFileSync(path));
     } else {
       return fileHandler.writeFile(path, getRunnerDetail());
     }
   },
-  writeFile: function writeFile(path, data) {
+  writeFile: (path, data) => {
     fs.writeFileSync(path, JSON.stringify(data));
     return JSON.stringify(data);
   }
 };
+exports.fileHandler = fileHandler;
 
-var jsonConcate = exports.jsonConcate = function jsonConcate(receiverObj, senterObj) {
-  Object.keys(senterObj).map(function (key) {
+let jsonConcate = (receiverObj, senterObj) => {
+  Object.keys(senterObj).map(key => {
     if (Object.prototype.hasOwnProperty.call(receiverObj, key)) {
       if (receiverObj[key].constructor === {}.constructor && senterObj[key].constructor === {}.constructor) {
         jsonConcate(receiverObj[key], senterObj[key]);
@@ -53,29 +58,40 @@ var jsonConcate = exports.jsonConcate = function jsonConcate(receiverObj, senter
     } else {
       receiverObj[key] = senterObj[key];
     }
+
     return key;
   });
   return receiverObj;
 };
 
-var jsonHelper = exports.jsonHelper = function jsonHelper(path, pathArray, value) {
-  var tempObj = {};
+exports.jsonConcate = jsonConcate;
+
+let jsonHelper = (path, pathArray, value) => {
+  let tempObj = {};
+
   if (typeof pathArray === 'string') {
     pathArray = pathArray.split('.'); //eslint-disable-line no-param-reassign
   }
-  pathArray.slice(0).reverse().map(function (key) {
+
+  pathArray.slice(0).reverse().map(key => {
     tempObj = {};
     tempObj[key] = value;
     value = tempObj; // eslint-disable-line no-param-reassign
+
     return key;
   });
-  var overAllObj = jsonConcate(JSON.parse(fileHandler.readFile(path)), tempObj);
+  let overAllObj = jsonConcate(JSON.parse(fileHandler.readFile(path)), tempObj);
   fileHandler.writeFile(path, overAllObj);
 };
 
-var setTestInfoStatus = exports.setTestInfoStatus = function setTestInfoStatus(filepath, status) {
-  var buildObject = JSON.parse(fileHandler.readFile(filepath));
+exports.jsonHelper = jsonHelper;
+
+let setTestInfoStatus = (filepath, status) => {
+  let buildObject = JSON.parse(fileHandler.readFile(filepath));
+
   if (!buildObject.testInfo || buildObject.testInfo.isBuildVerified !== false) {
     jsonHelper(filepath, 'testInfo.isBuildVerified', status);
   }
-};
+};
+
+exports.setTestInfoStatus = setTestInfoStatus;

package/lib/utils/lint/addScripts.js

@@ -0,0 +1,27 @@
+"use strict";
+
+const fs = require('fs');
+
+const {
+  log
+} = require('..');
+
+function addScripts(scripts) {
+  fs.readFile('./package.json', 'utf8', (err, configFileString) => {
+    if (err) log('[LINT SETUP] No package.json in the current directory');else {
+      const configFile = JSON.parse(configFileString); // Still Object destructuring causes issue. 😐
+      // configFile.scripts = {
+      //   ...configFile.scripts,
+      //   ...scripts,
+      // };
+
+      configFile.scripts = Object.assign(configFile.scripts || {}, scripts);
+      const data = JSON.stringify(configFile, undefined, 2);
+      fs.writeFileSync('./package.json', data);
+    }
+  });
+}
+
+module.exports = {
+  addScripts
+};

package/lib/utils/lint/checkExistingConfig.js

@@ -0,0 +1,67 @@
+"use strict";
+
+/* eslint-disable operator-linebreak */
+
+/* eslint-disable implicit-arrow-linebreak */
+const fs = require('fs');
+
+const {
+  log
+} = require('../../../lib/utils');
+
+const {
+  question,
+  rl
+} = require('./question');
+
+const eslintConfigFiles = ['.eslintrc.js', '.eslintrc.cjs', '.eslintrc.yaml', '.eslintrc.yml', '.eslintrc.json', '.eslintrc'];
+const prettierConfigFiles = ['.prettierrc.js', '.prettierrc.json', '.prettierrc', '.prettierrc.yml', '.prettierrc.yaml', '.prettierrc.json5', '.prettierrc.toml', '.prettierrc.cjs', '.prettier.config.js', '.prettier.config.cjs'];
+
+function isConfigExists(fileNames) {
+  return fileNames.find(file => {
+    if (fs.existsSync(file)) return true;
+    return false;
+  });
+}
+
+async function checkConflicts(files) {
+  const conflictFile = isConfigExists(files);
+
+  if (conflictFile) {
+    log(`[LINT SETUP] There's already a config exists as named ${conflictFile}`);
+    const res = await question('[LINT SETUP] Do you want to overwrite? (y/n): '); // TODO: Next cycle: Need to delete the current config file.
+    // if (res === 'y') {
+    //   exec(`rm ${conflictFile}`, (err) => {
+    //     if (err) log(err);
+    //     else {
+    //       log('Deleted ', conflictFile);
+    //     }
+    //   });
+    // }
+
+    return res;
+  }
+
+  return false;
+}
+
+async function promptForPreCommitHook() {
+  const res = await question('[LINT SETUP] Do you need a pre-commit hook for formatting and check lint errors in cached files (newly changed)? (y/n): ');
+  return res;
+}
+
+const getChoices = async () => {
+  const eslint = await checkConflicts(eslintConfigFiles);
+  const prettier = await checkConflicts(prettierConfigFiles);
+  const isESLintAllowed = eslint === false || eslint === 'y';
+  const isPrettierAllowed = prettier === false || prettier === 'y';
+  const isHookInstallEnabled = (await promptForPreCommitHook()) === 'y';
+  rl.close();
+  return [isESLintAllowed, isPrettierAllowed, isHookInstallEnabled];
+};
+
+module.exports = {
+  eslintConfigFiles,
+  prettierConfigFiles,
+  getChoices
+};

package/lib/utils/lint/copyConfigs.js

@@ -0,0 +1,24 @@
+"use strict";
+
+const fs = require('fs');
+
+const {
+  log
+} = require('../../../lib/utils');
+
+async function copyConfigs(file) {
+  // copy the file in react-cli to current working directory
+  fs.readFile(require.resolve(`../../../files/${file}.js`), (err, data) => {
+    if (err) log("[LINT SETUP] There's error in reading the config file", file);else {
+      fs.writeFile(`.${file}.js`, data, writeError => {
+        if (writeError) {
+          log("[LINT SETUP] There's error in writing the config file: ", file, writeError);
+        } else {
+          log('[LINT SETUP] Added config file', file);
+        }
+      });
+    }
+  });
+}
+
+module.exports = copyConfigs;

package/lib/utils/lint/index.js

@@ -0,0 +1,54 @@
+"use strict";
+
+const {
+  eslintPackages,
+  prettierPackages,
+  eslintPrettierConfig,
+  runInstall,
+  installLintStaged
+} = require('./lintSetup');
+
+const {
+  log
+} = require('../../../lib/utils');
+
+const {
+  eslintConfigFiles,
+  prettierConfigFiles,
+  getChoices
+} = require('./checkExistingConfig');
+
+const copyConfigs = require('./copyConfigs');
+
+async function main() {
+  const packages = [];
+  const [isESLintAllowed, isPrettierAllowed, isHookInstallEnabled] = await getChoices();
+
+  if (isESLintAllowed) {
+    copyConfigs('eslintrc', eslintConfigFiles);
+    packages.push(...eslintPackages);
+  }
+
+  if (isPrettierAllowed) {
+    copyConfigs('prettierrc', prettierConfigFiles);
+    packages.push(...prettierPackages);
+  }
+
+  if (isESLintAllowed && isPrettierAllowed) {
+    packages.push(...eslintPrettierConfig);
+  }
+
+  if (packages.length) {
+    const process = runInstall(packages);
+    process.on('close', () => {
+      if (isHookInstallEnabled) {
+        installLintStaged();
+      }
+    });
+  } else if (isHookInstallEnabled) {
+    installLintStaged();
+  }
+}
+
+log('[LINT SETUP] Beginning configuration...');
+main();

package/lib/utils/lint/lintScripts.js

@@ -0,0 +1,11 @@
+"use strict";
+
+const {
+  addScripts
+} = require('./addScripts');
+
+const scripts = {
+  lintSetup: 'react-cli lint-setup && npm run lintExtInstall && echo "If changes not reflected kindly restart your VSCode."',
+  lintExtInstall: 'code --install-extension dbaeumer.vscode-eslint && code --install-extension esbenp.prettier-vscode'
+};
+addScripts(scripts);

package/lib/utils/lint/lintSetup.js

@@ -0,0 +1,31 @@
+"use strict";
+
+const {
+  spawn
+} = require('child_process');
+
+const eslintPackages = ['eslint', 'eslint-config-airbnb', 'eslint-plugin-import', 'eslint-plugin-jsx-a11y', 'eslint-plugin-react', 'eslint-plugin-react-hooks', 'eslint-plugin-css-modules', '@zohodesk/eslint-plugin-react-performance', '@zohodesk/eslint-plugin-zsecurity'];
+const prettierPackages = ['prettier'];
+const eslintPrettierConfig = ['eslint-config-prettier']; // const npmInstall = `npm i --save-dev ${devDependencies.join(' ')}`;
+
+function runInstall(packages) {
+  return spawn('npm', ['i', ...packages, '--save-dev'], {
+    detached: true,
+    stdio: 'inherit'
+  });
+}
+
+function installLintStaged() {
+  spawn('npx', ['mrm', 'lint-staged'], {
+    detached: true,
+    stdio: 'inherit'
+  });
+}
+
+module.exports = {
+  eslintPackages,
+  prettierPackages,
+  eslintPrettierConfig,
+  installLintStaged,
+  runInstall
+};

package/lib/utils/lint/lintStagedPreCommitHook.js

@@ -0,0 +1,7 @@
+"use strict";
+
+const {
+  installLintStaged
+} = require('./lintSetup');
+
+installLintStaged();

package/lib/utils/lint/question.js

@@ -0,0 +1,30 @@
+"use strict";
+
+/* eslint-disable no-await-in-loop */
+
+/* eslint-disable implicit-arrow-linebreak */
+const readline = require('readline');
+
+const rl = readline.createInterface({
+  input: process.stdin,
+  output: process.stdout
+});
+
+const question = qn => new Promise(res => {
+  rl.question(qn, ans => res(ans));
+});
+
+async function main(qn) {
+  let answer;
+
+  while (!['n', 'y'].includes(answer)) {
+    answer = (await question(qn)).toLowerCase();
+  }
+
+  return answer;
+}
+
+module.exports = {
+  question: main,
+  rl
+};

package/lib/utils/lintReporter.js

@@ -1,27 +1,35 @@
-'use strict';
-
-var getOptions = require('./getOptions').default;
-var fs = require('fs');
-var coverageCollector = require('../jest/coverageCollector');
-var path = require('path');
-
-var _require = require('../templates/linterConstant'),
-    htmlTemplate = _require.htmlTemplate,
-    endTag = _require.endTag;
-
-var _getOptions = getOptions(),
-    _getOptions$esLint = _getOptions.esLint,
-    srcBranch = _getOptions$esLint.srcBranch,
-    targetBranch = _getOptions$esLint.targetBranch,
-    serviceName = _getOptions$esLint.serviceName,
-    impactServerDomain = _getOptions$esLint.impactServerDomain,
-    impactRun = _getOptions$esLint.impactRun,
-    reportType = _getOptions$esLint.reportType,
-    reportPath = _getOptions$esLint.reportPath;
+"use strict";
+
+let getOptions = require('./getOptions').default;
+
+let fs = require('fs');
+
+let coverageCollector = require('../jest/coverageCollector');
+
+let path = require('path');
+
+let {
+  htmlTemplate,
+  endTag
+} = require('../templates/linterConstant');
+
+let {
+  esLint: {
+    srcBranch,
+    targetBranch,
+    serviceName,
+    impactServerDomain,
+    impactRun,
+    reportType,
+    reportPath
+  }
+} = getOptions();
 
 function writeFile(filePath, data) {
   filePath = path.join(process.cwd(), filePath); //eslint-disable-line
-  var dirName = path.dirname(filePath);
+
+  let dirName = path.dirname(filePath);
+
   if (!fs.existsSync(dirName)) {
     fs.mkdirSync(dirName);
     fs.writeFileSync(filePath, data);
@@ -30,51 +38,55 @@ function writeFile(filePath, data) {
   }
 }
 
-var formatter = {
-  jsonFormatter: function jsonFormatter(data) {
-    var finalList = [];
-    data.forEach(function (errorFileObj) {
-      var tempMessageList = [];
-      errorFileObj.messages.forEach(function (messageObj) {
+let formatter = {
+  jsonFormatter: data => {
+    let finalList = [];
+    data.forEach(errorFileObj => {
+      let tempMessageList = [];
+      errorFileObj.messages.forEach(messageObj => {
         if (messageObj.ruleId === '@zohodesk/zsecurity/no-protocol-check' || messageObj.ruleId === '@zohodesk/zsecurity/no-unsecure-html') {
           tempMessageList.push(messageObj);
         }
       });
+
       if (tempMessageList.length > 0) {
         finalList.push(errorFileObj);
       }
     });
     return finalList;
   },
-  htmlFormatter: function htmlFormatter(data) {
+  htmlFormatter: data => {
     data = formatter.jsonFormatter(data); //eslint-disable-line
+
     if (data.length > 0) {
-      var liTag = '';
-      data.forEach(function (errorFileObj) {
-        liTag = liTag + '<li class="pkLi"><div class="pkRow"> <div class="pkArrowCont" onclick="toggleWrapper(this)"> <div class="pkArrow"></div></div><div class="pkFileName">File Name :</div><div class="pkUrl">' + errorFileObj.filePath + '</div></div><div class="pkDetails"><div class="pkDetailsHead"> <div class="pkDetailsCol">Line No</div><div class="pkDetailsCol">Type</div><div class="pkDetailsCol">Message</div><div class="pkDetailsCol">Name</div></div><div class="pkDetailsBody">';
-        var messageTag = '';
-        errorFileObj.messages.forEach(function (messageObj) {
-          var errorType = messageObj.severity == 2 ? 'Error' : 'Warning'; //eslint-disable-line
-          messageTag = messageTag + '<div class="pkDetailsRow"><div class="pkDetailsCol">' + messageObj.line + '</div><div class="pkDetailsCol pkError">' + errorType + '</div><div class="pkDetailsCol">' + messageObj.message + '</div><div class="pkDetailsCol">' + messageObj.ruleId + '</div></div>';
+      let liTag = '';
+      data.forEach(errorFileObj => {
+        liTag = `${liTag}<li class="pkLi"><div class="pkRow"> <div class="pkArrowCont" onclick="toggleWrapper(this)"> <div class="pkArrow"></div></div><div class="pkFileName">File Name :</div><div class="pkUrl">${errorFileObj.filePath}</div></div><div class="pkDetails"><div class="pkDetailsHead"> <div class="pkDetailsCol">Line No</div><div class="pkDetailsCol">Type</div><div class="pkDetailsCol">Message</div><div class="pkDetailsCol">Name</div></div><div class="pkDetailsBody">`;
+        let messageTag = '';
+        errorFileObj.messages.forEach(messageObj => {
+          let errorType = messageObj.severity == 2 ? 'Error' : 'Warning'; //eslint-disable-line
+
+          messageTag = `${messageTag}<div class="pkDetailsRow"><div class="pkDetailsCol">${messageObj.line}</div><div class="pkDetailsCol pkError">${errorType}</div><div class="pkDetailsCol">${messageObj.message}</div><div class="pkDetailsCol">${messageObj.ruleId}</div></div>`;
         });
-        liTag = liTag + messageTag + '</div></div></li>';
+        liTag = `${liTag + messageTag}</div></div></li>`;
       });
-
-      return htmlTemplate + '<ul class="pkUl">' + liTag + '</ul>' + endTag;
+      return `${htmlTemplate}<ul class="pkUl">${liTag}</ul>${endTag}`;
     }
-    return htmlTemplate + '<div class="pkEmpty"><div>No test results with found</div></div>' + endTag;
+
+    return `${htmlTemplate}<div class="pkEmpty"><div>No test results with found</div></div>${endTag}`;
   },
-  xmlFormatter: function xmlFormatter(data) {
+  xmlFormatter: data => {
     data = formatter.jsonFormatter(data); //eslint-disable-line
-    var startTag = '<jscheck>';
-    var engTag = '</jscheck>';
-    var bodyContent = '';
-    data.forEach(function (errorFileObj) {
-      var startOfFile = '<file name="' + errorFileObj.filePath + '">';
-      var endOfFile = '</file>';
-      var messageContent = '';
-      errorFileObj.messages.forEach(function (messageObj) {
-        messageContent = messageContent + '<violation fromLine = "' + messageObj.line + '" type ="' + messageObj.ruleId + '" message ="' + messageObj.message + '" ></violation>';
+
+    let startTag = '<jscheck>';
+    let engTag = '</jscheck>';
+    let bodyContent = '';
+    data.forEach(errorFileObj => {
+      let startOfFile = `<file name="${errorFileObj.filePath}">`;
+      let endOfFile = '</file>';
+      let messageContent = '';
+      errorFileObj.messages.forEach(messageObj => {
+        messageContent = `${messageContent}<violation fromLine = "${messageObj.line}" type ="${messageObj.ruleId}" message ="${messageObj.message}" ></violation>`;
       });
       bodyContent = bodyContent + startOfFile + messageContent + endOfFile;
     });
@@ -83,7 +95,8 @@ var formatter = {
 };
 
 function formatSplitter(inputJson) {
-  var outputData = void 0;
+  let outputData;
+
   if (reportType === 'json') {
     outputData = JSON.stringify(formatter.jsonFormatter(inputJson));
   } else if (reportType === 'html') {
@@ -91,12 +104,13 @@ function formatSplitter(inputJson) {
   } else if (reportType === 'xml') {
     outputData = formatter.xmlFormatter(inputJson);
   }
+
   writeFile(reportPath, outputData);
 }
 
 module.exports = function (results) {
-  var erroredFileObjectList = [];
-  results.forEach(function (fileObject) {
+  let erroredFileObjectList = [];
+  results.forEach(fileObject => {
     if (fileObject.errorCount > 0) {
       erroredFileObjectList.push({
         filePath: fileObject.filePath,
@@ -106,14 +120,14 @@ module.exports = function (results) {
       });
     }
   });
+
   if (impactRun) {
-    coverageCollector(srcBranch, targetBranch, serviceName, impactServerDomain).then(function () {
-      var res = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    coverageCollector(srcBranch, targetBranch, serviceName, impactServerDomain).then((res = {}) => {
+      let impactList = [];
 
-      var impactList = [];
       if (res.STATUS) {
         if (res.LIST.length > 0) {
-          erroredFileObjectList.forEach(function (errFileObj) {
+          erroredFileObjectList.forEach(errFileObj => {
             if (res.LIST.indexOf(errFileObj.shortPath) > -1) {
               impactList.push(errFileObj);
             }

package/lib/utils/mailSender.js

@@ -1,14 +1,10 @@
-'use strict';
+"use strict";
 
-var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();
+var _nodemailer = _interopRequireDefault(require("nodemailer"));
 
-var _nodemailer = require('nodemailer');
+var _index = require("./index");
 
-var _nodemailer2 = _interopRequireDefault(_nodemailer);
-
-var _index = require('./index');
-
-var _jsonHelper = require('./jsonHelper');
+var _jsonHelper = require("./jsonHelper");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -17,41 +13,30 @@ if (process.argv.length <= 6) {
   process.exit(-1);
 }
 
-var _process$argv$slice = process.argv.slice(2),
-    _process$argv$slice2 = _slicedToArray(_process$argv$slice, 8),
-    from = _process$argv$slice2[0],
-    pass = _process$argv$slice2[1],
-    to = _process$argv$slice2[2],
-    subject = _process$argv$slice2[3],
-    html = _process$argv$slice2[4],
-    cc = _process$argv$slice2[5],
-    user = _process$argv$slice2[6],
-    reportURL = _process$argv$slice2[7];
+let [from, pass, to, subject, html, cc, user, reportURL] = process.argv.slice(2);
+(0, _jsonHelper.jsonHelper)(`${process.cwd()}/result.json`, 'Report_URL', reportURL);
 
-(0, _jsonHelper.jsonHelper)(process.cwd() + '/result.json', 'Report_URL', reportURL);
-
-var transporter = _nodemailer2.default.createTransport({
+let transporter = _nodemailer.default.createTransport({
   host: 'smtp.tsi.zohocorpin.com',
   port: 25,
   secure: false,
   auth: {
-    user: user,
-    pass: pass
+    user,
+    pass
   }
 });
 
-var mailOptions = {
+let mailOptions = {
   from: from,
   to: to,
   cc: cc,
   subject: subject,
   html: html
 };
-
-transporter.sendMail(mailOptions, function (error, info) {
+transporter.sendMail(mailOptions, (error, info) => {
   if (error) {
     (0, _index.log)(error);
   } else {
-    (0, _index.log)('Email sent: ' + info.response);
+    (0, _index.log)(`Email sent: ${info.response}`);
   }
 });