@zohodesk/react-cli 0.0.1-beta.174 → 0.0.1-beta.176

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

@@ -8,30 +8,51 @@ exports.ErrorHandler = void 0;
 class ErrorHandler {
   constructor(allowedErrs) {
     this.errors = [];
+    this.errorTable = [];
     this.allowedErrs = allowedErrs;
+    Object.assign(this, {
+      DECLARATION_IGNORED: errObj => this.addError(` prop: ${errObj.decl.prop} ,\n value : ${errObj.decl.value} ,\n filename : ${errObj.filename} ,\n filepath : ${errObj.path} ,\n line : ${errObj.decl.source.start.line} ,\n message : Declaration Ignored`),
+      DECIMAL_CHECK: errObj => this.addError(` prop: ${errObj.decl.prop} ,\n value : ${errObj.decl.value} ,\n filename : ${errObj.filename} ,\n filepath : ${errObj.path} ,\n line : ${errObj.decl.source.start.line} ,\n unit : ${errObj.unitErrorVal} ,\n message : ${errObj.message}`),
+      DECIMAL_REJECT: errObj => this.addError(` prop: ${errObj.decl.prop} ,\n value : ${errObj.decl.value} ,\n filename : ${errObj.filename} ,\n filepath : ${errObj.path} ,\n line : ${errObj.decl.source.start.line} ,\n unit : ${errObj.unitErrorVal} ,\n message : ${errObj.message}`),
+      UNIT_ERROR: errObj => this.addError(` prop: ${errObj.decl.prop} ,\n value : ${errObj.decl.value} ,\n filename : ${errObj.filename} ,\n filepath : ${errObj.path} ,\n line : ${errObj.decl.source.start.line} ,\n unit : ${errObj.unitErrorVal} ,\n message : ${errObj.message}`),
+      RANGE_ERROR: errObj => this.addError(` prop: ${errObj.decl.prop} ,\n value : ${errObj.decl.value} ,\n filename : ${errObj.filename} ,\n filepath : ${errObj.path} ,\n line : ${errObj.decl.source.start.line} ,\n message : ${errObj.message}\r`),
+      VARIABLE_PRESENT: errObj => this.addError(` prop: ${errObj.decl.prop} ,\n value : ${errObj.decl.value} ,\n filename : ${errObj.filename} ,\n filepath : ${errObj.path} ,\n line : ${errObj.decl.source.start.line} ,\n message : ${errObj.message}`)
+    });
+  }
+
+  setAllowedErrs(allErrs) {
+    this.allowedErrs = allErrs;
+    ['DECLARATION_IGNORED', 'DECIMAL_CHECK', 'DECIMAL_REJECT', 'UNIT_ERROR', 'RANGE_ERROR', 'VARIABLE_PRESENT'].forEach(err => {
+      if (!this.allowedErrs[err]) {
+        this[err] = () => null;
+      }
+    });
   }
 
   addError(errstr) {
     this.errors.push(`{\n${errstr}\n}\n`);
   }
 
-  errorFunction(errStr, type) {
-    const {
-      addError,
-      allowedErrs
-    } = this;
-
-    if (type === 'DECLARATION_IGNORED' && allowedErrs.DECLARATION_IGNORED) {
-      addError(errStr);
-    } else if (type === 'UNIT_ERROR' && allowedErrs.UNIT_ERROR) {
-      addError(errStr);
-    } else if (type === 'RANGE_ERROR' && allowedErrs.RANGE_ERROR) {
-      addError(errStr);
-    } else if (type === 'VARIABLE_PRESENT' && allowedErrs.VARIABLE_PRESENT) {
-      addError(errStr);
+  errorFunction(errObj) {
+    if (errObj.type && this.allowedErrs[errObj.type] && errObj.decl.prop && errObj.decl.value) {
+      this[errObj.type](errObj);
     }
   }
 
+  printError(errObj) {
+    console.log('{');
+    Object.keys(errObj).sort().forEach(key => {
+      if (key !== 'decl') {
+        console.log(`${key} : ${errObj[key]}`);
+      } else {
+        console.log(`prop : ${errObj.decl.prop}`);
+        console.log(`value : ${errObj.decl.value}`);
+        console.log(`linenum : ${errObj.decl.source.start.line}`);
+      }
+    });
+    console.log('}\n');
+  }
+
 }
 
 exports.ErrorHandler = ErrorHandler;

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

@@ -6,8 +6,13 @@ const fs = require('fs');
 
 const path = require('path');
 
+const {
+  ErrorHandler
+} = require('./ErrorHandler');
+
 const errors = [];
-let allowedErrs = {};
+const errorTable = [];
+const errHandler = new ErrorHandler();
 const convertableProps = {
   'font-size': true,
   margin: true,
@@ -29,19 +34,37 @@ const convertableProps = {
   top: true,
   bottom: true,
   left: true,
-  right: true
+  right: true,
+  'text-indent': true,
+  clip: true,
+  'flex-basis': true,
+  'row-gap': true,
+  gap: true,
+  'column-gap': true,
+  flex: true
 };
 const constantValues = {
   inherit: true,
   initial: true,
   auto: true,
   'fit-content': true,
-  unset: true
+  unset: true,
+  cover: true,
+  contain: true,
+  top: true,
+  bottom: true,
+  left: true,
+  center: true,
+  right: true
 };
 
 function getNumericValue(value) {
   if (value.includes('var')) {
     return parseInt(value.replace(/var\(--zd_size(\d+)\)/gi, '$1').replace(/var\(--zd_font_size(\d+)\)/gi, '$1'));
+  }
+
+  if (value.includes('rect')) {
+    return parseInt(value.replace('rect(', '').replace(')', '').replace(',', ''));
   } // Not need for this dum loop
   // allowed.forEach(alwdUnit => {
   //   if (value.includes(alwdUnit)) {
@@ -71,22 +94,6 @@ function pxToCalc(value) {
   return arr.join(' ');
 }
 
-const addError = errstr => {
-  errors.push(`{\n${errstr}\n}\n`);
-};
-
-const errorFunction = (errStr, type) => {
-  if (type === 'DECLARATION_IGNORED' && allowedErrs.DECLARATION_IGNORED) {
-    addError(errStr);
-  } else if (type === 'UNIT_ERROR' && allowedErrs.UNIT_ERROR) {
-    addError(errStr);
-  } else if (type === 'RANGE_ERROR' && allowedErrs.RANGE_ERROR) {
-    addError(errStr);
-  } else if (type === 'VARIABLE_PRESENT' && allowedErrs.VARIABLE_PRESENT) {
-    addError(errStr);
-  }
-};
-
 const singleConvertor = (value, changeVal, details, range) => {
   const {
     path,
@@ -94,6 +101,13 @@ const singleConvertor = (value, changeVal, details, range) => {
     decl
   } = details;
 
+  if (decl.prop === 'background-position') {
+    if (isNaN(parseInt(value))) {
+      // console.log(`${value} skipped`);
+      return;
+    }
+  }
+
   if (getNumericValue(value) >= range.start && getNumericValue(value) <= range.end || getNumericValue(value) === 0) {
     let retVal = value.replace(/(\d+)px/gi, changeVal.replace('$$', '$1'));
 
@@ -102,146 +116,191 @@ const singleConvertor = (value, changeVal, details, range) => {
     }
 
     return retVal;
-  } // if(unitErrorVal && unitErrorVal != '0' ){
+  } // if (!value.includes('rect')) {
+  // if(unitErrorVal && unitErrorVal != '0' ){
   // console.log(value, 'not within range')
 
 
-  errorFunction(` prop: ${decl.prop} ,\n value : ${decl.value} ,\n filename : ${filename} ,\n filepath : ${path} ,\n line : ${decl.source.start.line} ,\n message : value (${value}) (${typeof value}) not within range (${range.start},${range.end})\r`, 'RANGE_ERROR'); // }
+  let errObj = {
+    decl,
+    type: 'RANGE_ERROR',
+    filename,
+    message: `value (${value}) (${typeof value}) not within range (${range.start},${range.end})\r`,
+    path: path
+  };
+  errHandler.errorTable.push(errObj);
+  errHandler.errorFunction(errObj); // errorFunction(
+  //   {
+  //     decl,
+  //     type: 'RANGE_ERROR',
+  //     filename,
+  //     message: `value (${value}) (${typeof value}) not within range (${
+  //       range.start
+  //     },${range.end})\r`,
+  //     path: path
+  //   },
+  //   'RANGE_ERROR'
+  // );
+  // }
   // addError(` prop: ${decl.prop} ,\n value : ${decl.value} ,\n filename : ${filename} ,\n filepath : ${path} ,\n line : ${decl.source.start.line} ,\n message : value (${value}) not within range (${range.start},${range.end})\r`)
-
-  return value;
+  //   return value;
+  // } else {
+  //   console.log('++++++++++++++++++++++rect val!', value);
+  // }
 };
 
-module.exports = postcss.plugin('postcss-variable-report', cssVariableReplacementConfig => {
-  const rawdata = fs.readFileSync(cssVariableReplacementConfig);
-  const data = JSON.parse(rawdata);
-  const {
-    errorsAllowed,
-    settings: settingsObject,
-    errorLog: errorLogStatus,
-    errorInConsole: errorConsoleStatus
-  } = data; // const keys = Object.keys(settingsObject);
-
-  allowedErrs = errorsAllowed;
-  const replacementArray = [];
-  Object.keys(settingsObject).forEach(key => {
-    Object.values(settingsObject[key].replacements).forEach(val => {
-      if (!replacementArray.includes(val)) {
-        replacementArray.push(val);
+module.exports = {
+  plugin: postcss.plugin('postcss-variable-report', cssVariableReplacementConfig => {
+    const rawdata = fs.readFileSync(cssVariableReplacementConfig);
+    const data = JSON.parse(rawdata);
+    const {
+      errorsAllowed,
+      settings: settingsObject // errorLog: errorLogStatus,
+      // errorInConsole: errorConsoleStatus
+
+    } = data; // const keys = Object.keys(settingsObject);
+
+    errHandler.setAllowedErrs(errorsAllowed);
+    const replacementArray = [];
+    Object.keys(settingsObject).forEach(key => {
+      Object.values(settingsObject[key].replacements).forEach(val => {
+        if (!replacementArray.includes(val)) {
+          replacementArray.push(val);
+        }
+      });
+    });
+    let regValStr = '';
+    replacementArray.forEach((val, index) => {
+      if (index !== replacementArray.length - 1) {
+        regValStr += `${val.replace('$$', '\\d+').replace('(', '\\(').replace(')', '\\)')}|`;
+      } else {
+        regValStr += `${val.replace('$$', '\\d+').replace('(', '\\(').replace(')', '\\)')}`;
       }
     });
-  });
-  let regValStr = '';
-  replacementArray.forEach((val, index) => {
-    if (index !== replacementArray.length - 1) {
-      regValStr += `${val.replace('$$', '\\d+').replace('(', '\\(').replace(')', '\\)')}|`;
-    } else {
-      regValStr += `${val.replace('$$', '\\d+').replace('(', '\\(').replace(')', '\\)')}`;
-    }
-  });
-  const valRegex = new RegExp(regValStr, 'gi');
-  return rootOriginal => {
-    rootOriginal.walkRules(rule => {
-      // rule.nodes[-1] = {}
-      // need map, forEach fine less memory
-      rule.nodes.forEach((decl, position) => {
-        // case font-size
-        const commentStr = 'variable:ignore';
-        const prevNode = rule.nodes[position - 1];
-        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();
-
-        if (prevNode && prevNode.type === 'comment' && prevNode.text.toLowerCase().includes(commentStr)) {
-          const errStr = ` prop: ${decl.prop} ,\n value : ${decl.value} ,\n filename : ${filename} ,\n filepath : ${fromPath} ,\n line : ${decl.source.start.line} ,\n message : Declaration Ignored \r`;
-          errorFunction(errStr, 'DECLARATION_IGNORED');
-          return;
-        }
+    const valRegex = new RegExp(regValStr, 'gi');
+    return rootOriginal => {
+      rootOriginal.walkRules(rule => {
+        // rule.nodes[-1] = {}
+        // need map, forEach fine less memory
+        rule.nodes.forEach((decl, position) => {
+          // case font-size
+          const commentStr = 'variable:ignore';
+          const prevNode = rule.nodes[position - 1];
+          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
 
-        if (settingsObject[decl.prop] && !decl.value.includes('var(--')) {
-          const settings = settingsObject[decl.prop]; // console.log(settings)
-
-          const {
-            allowed,
-            range
-          } = settings; // suggestion filter  !decl.value.includes('calc')
-          // Reason below some of logic happen based on this
-
-          const unit = decl.value.toString() // no need round braket since you do not need group for less memory
-          .replace(/\d+/gi, '').replace('var(--zd_size)', 'px').replace('var(--zd_font_size)', 'px').split(' ').filter(x => x !== ''); // unit = unit.replace(unit, unit.replace('-',''))
-          // console.log('unit : ');
-          // console.log(unit);
-
-          unit.forEach((val, index) => {
-            allowed.forEach(alwdVal => {
-              if (val.includes(alwdVal)) {
-                // ## for what purpose
-                unit[index] = val.replace(`-${alwdVal}`, `${alwdVal}`).replace(`-.${alwdVal}`, `${alwdVal}`);
-              }
+          const filename = fromPath.split(path.sep).pop();
+
+          if (prevNode && prevNode.type === 'comment' && prevNode.text.toLowerCase().includes(commentStr)) {
+            let errObj = {
+              decl,
+              type: 'DECLARATION_IGNORED',
+              filename,
+              message: 'Declaration Ignored',
+              path: fromPath
+            };
+            errHandler.errorTable.push(errObj);
+            errHandler.DECLARATION_IGNORED(errObj);
+            return;
+          }
+
+          if (settingsObject[decl.prop] && !decl.value.includes('var(--')) {
+            const settings = settingsObject[decl.prop]; // console.log(settings)
+
+            const {
+              allowed,
+              range
+            } = settings; // suggestion filter  !decl.value.includes('calc')
+            // Reason below some of logic happen based on this
+
+            const unit = decl.value.toString() // no need round braket since you do not need group for less memory
+            .replace(/\d+/gi, '').replace('var(--zd_size)', 'px').replace('var(--zd_font_size)', 'px').replace('rect(', '').replace(')', '').replace('px,', 'px').replace(',', '').split(' ').filter(x => x !== ''); // unit = unit.replace(unit, unit.replace('-',''))
+            // console.log('unit : ');
+            // console.log(unit);
+
+            unit.forEach((val, index) => {
+              allowed.forEach(alwdVal => {
+                if (val.includes(alwdVal)) {
+                  // ## for what purpose
+                  unit[index] = val // .replace(new RegExp('(\\d+).(\\d+)(\\w+)', 'gi'), '$3')
+                  .replace(`-${alwdVal}`, `${alwdVal}`).replace(`-.${alwdVal}`, `${alwdVal}`).replace(`${alwdVal},`, `${alwdVal}`);
+                }
+              });
             });
-          });
-          let unitError = false;
-          let unitErrorVal = '';
-          unit.forEach(val => {
-            if (!val.includes('calc')) {
-              if (!allowed.includes(val.toString())) {
-                unitError = true;
-                unitErrorVal = val;
+            let unitError = false;
+            let unitErrorVal = '';
+            unit.forEach(val => {
+              if (!val.includes('calc') && decl.prop !== 'clip') {
+                if (!allowed.includes(val.toString())) {
+                  unitError = true;
+                  unitErrorVal = val;
+                }
               }
-            }
-          }); // console.log(allowed, replacements, range)
-
-          if (!unitError) {
-            // use variable decl.value.split(' ')
-            if (range) {
-              // console.log('multiple :', decl.value)
-              let newVal = '';
-              decl.value.split(' ').forEach(singleVal => {
-                newVal += `${singleConvertor(singleVal, settings.replacements.px, {
+            }); // console.log(allowed, replacements, range)
+
+            if (!unitError) {
+              // use variable decl.value.split(' ')
+              if (range) {
+                // console.log('multiple :', decl.value)
+                let newVal = '';
+                decl.value.split(' ').forEach(singleVal => {
+                  newVal += `${singleConvertor(singleVal, settings.replacements.px, {
+                    decl,
+                    filename,
+                    path: fromPath
+                  }, range)} `;
+                });
+                decl.value = newVal;
+              }
+            } else {
+              if (!decl.value.includes('calc')) {
+                // addError(` prop: ${decl.prop} ,\n value : ${decl.value} ,\n filename : ${filename} ,\n filepath : ${path} ,\n line : ${decl.source.start.line} ,\n unit : ${unitErrorVal} ,\n message : ${unitErrorVal} (Unit) Not Allowed \r`);
+                let errObj = {
                   decl,
                   filename,
+                  unitErrorVal: unitErrorVal,
                   path: fromPath
-                }, range)} `;
-              });
-              decl.value = newVal;
+                };
+
+                if (unitErrorVal.trim() === '.') {
+                  errObj.type = 'DECIMAL_CHECK';
+                  errObj.message = `${unitErrorVal} (Decimal Value) Please check`;
+                  errHandler.errorTable.push(errObj);
+                  errHandler.DECIMAL_CHECK(errObj);
+                } else if (unitErrorVal.includes('.') && !unitErrorVal.includes('%')) {
+                  errObj.type = 'DECIMAL_REJECT';
+                  errObj.message = `${unitErrorVal} (Decimal Value) Not Allowed \r`;
+                  errHandler.errorTable.push(errObj);
+                  errHandler.DECIMAL_REJECT(errObj);
+                } else {
+                  if (!unitErrorVal.includes('%')) {
+                    errObj.type = 'UNIT_ERROR';
+                    errObj.message = `${unitErrorVal} (Unit) Not Allowed`;
+                    errHandler.errorTable.push(errObj);
+                    errHandler.UNIT_ERROR(errObj);
+                  }
+                }
+              } else {
+                decl.value = pxToCalc(decl.value);
+              }
             }
           } else {
-            if (!decl.value.includes('calc')) {
-              // addError(` prop: ${decl.prop} ,\n value : ${decl.value} ,\n filename : ${filename} ,\n filepath : ${path} ,\n line : ${decl.source.start.line} ,\n unit : ${unitErrorVal} ,\n message : ${unitErrorVal} (Unit) Not Allowed \r`);
-              errorFunction(` prop: ${decl.prop} ,\n value : ${decl.value} ,\n filename : ${filename} ,\n filepath : ${fromPath} ,\n line : ${decl.source.start.line} ,\n unit : ${unitErrorVal} ,\n message : ${unitErrorVal} (Unit) Not Allowed \r`, 'UNIT_ERROR');
-            } else {
-              decl.value = pxToCalc(decl.value);
+            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,
+                type: 'VARIABLE_PRESENT',
+                filename,
+                message: `value (${decl.value}) has var in it, kindly check`,
+                path: fromPath
+              };
+              errHandler.errorTable.push(errObj);
+              errHandler.VARIABLE_PRESENT(errObj);
             }
           }
-        } else {
-          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')) {
-            errorFunction(` prop: ${decl.prop} ,\n value : ${decl.value} ,\n filename : ${filename} ,\n filepath : ${fromPath} ,\n line : ${decl.source.start.line} ,\n message : value (${decl.value}) has var in it, kindly check`, 'VARIABLE_PRESENT');
-          }
-        }
-      });
-    }); // console.log(filename)
-    // console.log('Done!')
-    // console.log('----------------------------------------------------------------------------------------------------------------------')
-
-    if (errorLogStatus) {
-      fs.writeFileSync('./css_error.log', '');
-
-      if (errors.length > 0) {
-        errors.forEach(err => {
-          fs.appendFileSync('./css_error.log', err);
-        }); // console.log('----------------------------------------------------------------------------------------------------------------------')
-      }
-    }
-
-    if (errorConsoleStatus) {
-      if (errors.length > 0) {
-        errors.forEach(err => {
-          // fs.appendFileSync('./css_error.log', err);
-          console.log(err);
         });
-        console.log('----------------------------------------------------------------------------------------------------------------------');
-      }
-    }
-  };
-});
+      });
+    };
+  }),
+  errors: errHandler.errors,
+  errTable: errHandler.errorTable
+};

package/lib/schemas/index.js

@@ -217,15 +217,22 @@ var _default = {
       hasRTL: false,
       hoverActive: false,
       combinerMediaQuery: false,
-      cssVariableReplacement: false
+      cssVariableReplacement: false,
+      selectorWeight: false
     },
     exclude: {
       rtl: [],
       hoverActive: [],
       combinerMediaQuery: [],
-      cssVariableReplacement: []
+      cssVariableReplacement: [],
+      selectorWeight: []
     },
     cssVariableReplacementConfig: '',
+    selectorWeightConfig: {
+      defaultSelector: '',
+      customFileDetails: '',
+      excludeStrings: []
+    },
     seperateCssModules: {
       value: false,
       cli: 'sep_cssmodules'
@@ -253,6 +260,7 @@ var _default = {
       replaceText: '//<!--AssetsFromBuild -->'
     },
     htmlTemplate: {
+      minify: null,
       inject: true
     },
     removePropTypes: false,
@@ -306,15 +314,22 @@ var _default = {
       hasRTL: false,
       hoverActive: false,
       combinerMediaQuery: false,
-      cssVariableReplacement: false
+      cssVariableReplacement: false,
+      selectorWeight: false
     },
     exclude: {
       rtl: [],
       hoverActive: [],
       combinerMediaQuery: [],
-      cssVariableReplacement: []
+      cssVariableReplacement: [],
+      selectorWeight: []
     },
     cssVariableReplacementConfig: '',
+    selectorWeightConfig: {
+      defaultSelector: '',
+      customFileDetails: '',
+      excludeStrings: []
+    },
     cssHashSelectors: {
       filenames: [],
       packages: []
@@ -343,7 +358,6 @@ var _default = {
       cli: 'branch_name'
     },
     impactServerDomain: {
-      //value: 'ht' + 'tp://desk-qa-impact.tsi.zohocorpin.com:8080',
       value: 'ht' + 'tp://desk-automation.csez.zohocorpin.com:8080',
       cli: 'impact_server_domain'
     },
@@ -366,7 +380,6 @@ var _default = {
       cli: 'service_name'
     },
     impactServerDomain: {
-      //value: 'ht' + 'tp://desk-qa-impact.tsi.zohocorpin.com:8080',
       value: 'ht' + 'tp://desk-automation.csez.zohocorpin.com:8080',
       cli: 'impact_server_domain'
     },
@@ -404,7 +417,7 @@ var _default = {
       cli: 'path_to_sub_projs'
     },
     tokenGit: {
-      value: 'YbByNJ3yURAm92Lhx4vW',
+      value: '',
       cli: 'git_token'
     },
     changesOnly: {
@@ -585,7 +598,6 @@ var _default = {
     },
     impactServerDomain: {
       value: 'ht' + 'tp://desk-automation.csez.zohocorpin.com:8080',
-      //value: 'ht' + 'tp://desk-qa-impact.tsi.zohocorpin.com:8080',
       cli: 'impact_server_domain'
     },
     impactRun: {

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 $?