@zohodesk/react-cli 1.1.29-exp.2 → 1.1.29-exp.3

package/lib/plugins/VariableConversionCollector.js

@@ -4,23 +4,30 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+
 var _postcss = _interopRequireDefault(require("postcss"));
+
 var _ErrorHandler = require("../postcss-plugins/variableModificationPlugin/ErrorHandler");
+
 var _fileHandling = require("./utils/fileHandling");
+
 var _variableConvertorUtils = require("./variableConvertorUtils");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-// import { RawSource } from 'webpack-sources';
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+// import { RawSource } from 'webpack-sources';
 const fs = require('fs');
+
 let variablesRead = {};
+
 const {
   errors,
   errTable,
   errHandler
 } = require('../postcss-plugins/variableModificationPlugin/index');
-const supportedProps = ['font-size', 'margin', 'margin-top', 'margin-bottom', 'margin-left', 'margin-right', 'padding', 'padding-top', 'padding-bottom', 'padding-left', 'padding-right', '^top', '^right', '^bottom', '^left', '^width', 'min-width', 'max-width', '^height', 'min-height', 'max-height', 'text-indent', 'clip', 'flex-basis', 'row-gap', 'gap', 'column-gap', 'flex'];
 
-// -- to convert the hyphen values to values --
+const supportedProps = ['font-size', 'margin', 'margin-top', 'margin-bottom', 'margin-left', 'margin-right', 'padding', 'padding-top', 'padding-bottom', 'padding-left', 'padding-right', '^top', '^right', '^bottom', '^left', '^width', 'min-width', 'max-width', '^height', 'min-height', 'max-height', 'text-indent', 'clip', 'flex-basis', 'row-gap', 'gap', 'column-gap', 'flex']; // -- to convert the hyphen values to values --
+
 /*
 input : 
 var(--zdt_uploadlist_default_width)
@@ -38,19 +45,22 @@ function createFolderIfNonExistant(path) {
     });
   }
 }
+
 function createFileIfNonExistant(path, content) {
   if (fs.existsSync(path)) {
     fs.writeFileSync(path, content, 'utf-8');
   }
 }
+
 class VariableConversionCollector {
   constructor(options = {}) {
     this.optimize = options.optimize;
     this.filename = options.cssVariableReplacementConfig;
-    this.patterns = options.patterns;
-    // console.log(options.patterns, this.patterns);
+    this.patterns = options.patterns; // console.log(options.patterns, this.patterns);
+
     this.initializeFiles();
   }
+
   initializeFiles() {
     createFolderIfNonExistant('./.cli/logs/');
     createFolderIfNonExistant('./.cli/config/variables/');
@@ -58,10 +68,11 @@ class VariableConversionCollector {
     createFileIfNonExistant('./.cli/logs/unassignedVariables.log', '{}');
     createFileIfNonExistant('./.cli/logs/css_error.log', '{}');
   }
+
   apply(compiler) {
     const variables = {};
-    const unassigned = {};
-    // console.log(windowsModification([this.filename])[0]);
+    const unassigned = {}; // console.log(windowsModification([this.filename])[0]);
+
     const rawdata = fs.readFileSync(this.filename);
     const data = JSON.parse(rawdata);
     const {
@@ -70,8 +81,7 @@ class VariableConversionCollector {
       errorInConsole: errorConsoleStatus,
       errorsAllowed,
       strictMode
-    } = data;
-    // If theres is no setting for default prop in settingsObject, set one.
+    } = data; // If theres is no setting for default prop in settingsObject, set one.
 
     if (!settingsObject.default) {
       settingsObject.default = {
@@ -85,7 +95,6 @@ class VariableConversionCollector {
         }
       };
     }
-
     /* 
     purpose of tap : to create a variable object such as:
     {
@@ -94,24 +103,30 @@ class VariableConversionCollector {
     }
     which will help in the conversion further
     */
+
+
     if (fs.existsSync('./.cli/config/variables/variableMapping.json')) {
       variablesRead = JSON.parse(fs.readFileSync('./.cli/config/variables/variableMapping.json', 'utf-8'));
       Object.keys(variablesRead.changes).forEach(key => {
         variables[key] = variablesRead.changes[key];
       });
     }
+
     compiler.hooks.compilation.tap('VariableConversionCollector', compilation => {
       compilation.hooks.optimizeModules.tap('VariableConversionCollector', modules => {
         const mods = modules.filter(x => x.type.includes('css'));
         mods.forEach(module => {
           const rootOriginal = _postcss.default.parse(module.content);
+
           const filename = module.issuer.resource;
+
           if (!filename.includes('node_modules')) {
             rootOriginal.walkRules(rule => {
               rule.walkDecls(decl => {
                 decl.value.split(' ').forEach(val => {
                   if (val && val.includes('--') && !new RegExp(_variableConvertorUtils.ignoreVals.join('|'), 'gi').test(val) && decl.prop) {
                     const extractedValue = (0, _variableConvertorUtils.extractVariableName)(val);
+
                     if (!variables[extractedValue]) {
                       variables[extractedValue] = decl.prop;
                     } else {
@@ -152,6 +167,7 @@ class VariableConversionCollector {
             
              conversion is done in the while loop below
             */
+
             Object.keys(variables).forEach(key => {
               while (variables[variables[key]]) {
                 variables[key] = variables[variables[key]];
@@ -159,9 +175,7 @@ class VariableConversionCollector {
             });
           }
         });
-      });
-
-      // -- conversion for the root using variableConvertor --
+      }); // -- conversion for the root using variableConvertor --
 
       /* 
       input : 
@@ -175,6 +189,7 @@ class VariableConversionCollector {
         padding : zd_size20;
       }
       */
+
       compilation.hooks.optimizeModules.tap('VariableConversionCollector', modules => {
         const mods = modules.filter(x => x.type.includes('css'));
         mods.forEach(module => {
@@ -194,13 +209,16 @@ class VariableConversionCollector {
             output : 
             true or false
           */
+
           if (!(0, _fileHandling.isFileNameMatchingPluginPattern)({
             filename,
             filterArr: this.patterns.cssVariableReplacement
           })) {
             return;
           }
+
           const rootOriginal = _postcss.default.parse(module.content);
+
           module.content = (0, _variableConvertorUtils.variableConverter)(rootOriginal, variables, settingsObject).toString();
         });
       });
@@ -212,6 +230,7 @@ class VariableConversionCollector {
       output : 
       all errors that are present in the errTable arr
     */
+
     compiler.hooks.afterEmit.tap('error-display', () => {
       if (Object.keys(unassigned).length > 0 && strictMode) {
         console.log();
@@ -225,14 +244,17 @@ class VariableConversionCollector {
         fs.writeFileSync('./.cli/logs/unassignedVariables.log', str, 'utf-8');
         throw new Error('^^^ Variables above have not been assigned! ^^^');
       }
+
       const avlTypes = new Set([]);
       const srtArr = errTable.sort((a, b) => {
         avlTypes.add(a.type);
         avlTypes.add(b.type);
+
         if (a.type < b.type) {
           return -1;
         }
       });
+
       if (errorConsoleStatus) {
         const errorHandler = new _ErrorHandler.ErrorHandler();
         avlTypes.forEach(type => {
@@ -247,9 +269,11 @@ class VariableConversionCollector {
           console.log('---------------------------------------------------------------------------------------------------------------------------');
         });
       }
+
       if (errorLogStatus) {
         fs.writeFileSync('./.cli/logs/css_error.log', '');
         console.log('writing to logFile...');
+
         if (errors.length > 0) {
           errors.forEach((err, index) => {
             if (errTable[index].decl.prop && errTable[index].decl.value) {
@@ -260,5 +284,8 @@ class VariableConversionCollector {
       }
     });
   }
+
 }
-var _default = exports.default = VariableConversionCollector;
+
+var _default = VariableConversionCollector;
+exports.default = _default;

package/lib/plugins/index.js

@@ -111,22 +111,41 @@ Object.defineProperty(exports, "UnusedFilesFindPlugin", {
     return _UnusedFilesFindPlugin.default;
   }
 });
+
 var _ModuleStatsPlugin = _interopRequireDefault(require("./ModuleStatsPlugin"));
+
 var _SourceMapHookPlugin = _interopRequireDefault(require("./SourceMapHookPlugin"));
+
 var _UnusedFilesFindPlugin = _interopRequireDefault(require("./UnusedFilesFindPlugin"));
+
 var _ScriptInstrumentPlugin = _interopRequireDefault(require("./ScriptInstrumentPlugin"));
+
 var _PublicPathChangePlugin = _interopRequireDefault(require("./PublicPathChangePlugin"));
+
 var _OptimizeJSPlugin = _interopRequireDefault(require("./OptimizeJSPlugin"));
+
 var _ResourceHintsPlugin = _interopRequireDefault(require("./ResourceHintsPlugin"));
+
 var _MinifyPlugin = _interopRequireDefault(require("./MinifyPlugin"));
+
 var _ManifestPlugin = _interopRequireDefault(require("./ManifestPlugin"));
+
 var _CleanupStatsPlugin = _interopRequireDefault(require("./CleanupStatsPlugin"));
+
 var _EFCPlugin = _interopRequireDefault(require("./EFCPlugin"));
+
 var _PublicPathCallbackPlugin = _interopRequireDefault(require("./PublicPathCallbackPlugin"));
+
 var _I18NInjectIntoIndexPlugin = _interopRequireDefault(require("./I18NInjectIntoIndexPlugin"));
+
 var _ReportGeneratePlugin = _interopRequireDefault(require("./ReportGeneratePlugin"));
+
 var _ShadowDOMSupportPlugin = _interopRequireDefault(require("./ShadowDOMSupportPlugin"));
+
 var _ServiceWorkerPlugin = _interopRequireDefault(require("./ServiceWorkerPlugin"));
+
 var _TPHashMappingPlugin = _interopRequireDefault(require("./TPHashMappingPlugin"));
+
 var _CdnChangePlugin = _interopRequireDefault(require("./CdnChangePlugin"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/plugins/libraryImpactPlugin.js

@@ -4,12 +4,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+
 var _path = _interopRequireDefault(require("path"));
+
 var _fs = _interopRequireDefault(require("fs"));
+
 var _webpackSources = require("webpack-sources");
+
 var _jsonHelper = require("../utils/jsonHelper");
+
 var _utils = require("../utils");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 let resultFileName = `${process.cwd()}/result.json`;
 let options = (0, _utils.getOptions)();
 let {
@@ -24,21 +31,27 @@ let {
 (0, _jsonHelper.jsonHelper)(resultFileName, 'tests.libraryImpactOnSource.compareBranch', referBranch);
 (0, _jsonHelper.jsonHelper)(resultFileName, 'tests.libraryImpactOnSource.TestBranch', currentBranch);
 (0, _jsonHelper.jsonHelper)(resultFileName, 'tests.libraryImpactOnSource.isExecuted', true);
+
 let isValidModule = name => {
   if (name.includes('node_modules') && (name.includes(`@zohodesk${_path.default.sep}components`) || name.includes(`@zohodesk${_path.default.sep}dot`) || name.includes(`@zohodesk${_path.default.sep}icons`) || name.includes(`@zohodesk${_path.default.sep}svg`)) && !name.endsWith('docs.js')) {
     return true;
   }
+
   return !name.includes('index.js') && !name.endsWith('.css') && !name.endsWith('.png') && !name.includes('node_modules') && name.includes('src');
 };
+
 let getModuleName = modulePath => {
   let [name] = _path.default.parse(modulePath).name.split('.');
+
   if (modulePath.includes(`@zohodesk${_path.default.sep}components`)) {
     name = `@zohodesk/components/${name}`;
   } else if (modulePath.includes(`@zohodesk${_path.default.sep}dot`)) {
     name = `@zohodesk/dot/${name}`;
   }
+
   return name;
 };
+
 class LibraryImpactPlugin {
   constructor(options = {}) {
     this.options = options;
@@ -47,10 +60,12 @@ class LibraryImpactPlugin {
     this.bottomHtml = '</div> <script type="text/javascript"> const details = document.querySelectorAll("details"); details.forEach((targetDetail) => { targetDetail.addEventListener("click", () => { // Close all the details that are not targetDetail. details.forEach((detail) => { if (detail !== targetDetail) { detail.removeAttribute("open"); } }); }); }); </script></body></html>';
     this.resultJson = {};
   }
+
   apply(compiler) {
     let loggedInfo = false;
     compiler.hooks.beforeCompile.tap('LibraryImpactPlugin', () => {
       (0, _jsonHelper.jsonHelper)(resultFileName, 'tests.libraryImpactOnSource.startTime', Date.now());
+
       if (!loggedInfo) {
         (0, _utils.log)('\x1b[33m%s\x1b[0m', '************************************************************ \n ');
         (0, _utils.log)('\x1b[5m\x1b[44m%s\x1b[0m', 'Finding Impacted Source Files Please Wait ...');
@@ -63,11 +78,13 @@ class LibraryImpactPlugin {
       let {
         modules
       } = stats;
+
       for (let module of modules) {
         let {
           name,
           reasons
         } = module;
+
         if (isValidModule(name)) {
           let references = new Set();
           let referencedby = new Set();
@@ -76,6 +93,7 @@ class LibraryImpactPlugin {
           compilation.modules.forEach(module => {
             module.reasons.forEach(reason => {
               let exportedValue = reason.dependency;
+
               if (exportedValue.type === 'harmony export imported specifier') {
                 if (exportedValue.module.userRequest.includes(name.replace('.', ''))) {
                   docsName = exportedValue.name;
@@ -84,29 +102,35 @@ class LibraryImpactPlugin {
             });
           });
           let currentModuleName = name;
+
           if (Array.isArray(reasons)) {
             for (let reason of reasons) {
               let {
                 moduleName
               } = reason;
+
               if (isValidModule(moduleName)) {
                 let reasonedModuleName = moduleName;
                 referencedby.add(reasonedModuleName);
               }
             }
           }
+
           for (let subModule of modules) {
             let {
               name: subModuleName,
               reasons
             } = subModule;
+
             if (isValidModule(subModuleName)) {
               let currentModuleName = subModuleName;
+
               if (Array.isArray(reasons)) {
                 for (let reason of reasons) {
                   let {
                     moduleName: reasonedModuleName
                   } = reason;
+
                   if (name === reasonedModuleName) {
                     references.add(currentModuleName);
                   }
@@ -114,6 +138,7 @@ class LibraryImpactPlugin {
               }
             }
           }
+
           results[currentModuleName] = {
             name: currentModuleName,
             references: Array.from(references),
@@ -123,9 +148,11 @@ class LibraryImpactPlugin {
           };
         }
       }
+
       (0, _utils.getDependenciesImpactList)(currentBranch, referBranch, tokenGit, serviceName).then(impactedList => {
         this.resultJson = (0, _utils.getLibraryConflict)(JSON.stringify(results), impactedList, changesOnly);
         (0, _jsonHelper.jsonHelper)(resultFileName, 'tests.libraryImpactOnSource.result', this.resultJson);
+
         if (this.resultJson.result.status) {
           (0, _utils.log)(this.resultJson.response);
           this.resultJson.response.forEach(fileObject => {
@@ -140,12 +167,15 @@ class LibraryImpactPlugin {
           (0, _utils.log)(this.resultJson.result.message);
           this.topHtml = this.topHtml + '<div style="font-size: xxx-large; text-align: center; padding-top: 50px;"> ' + this.resultJson.result.message + '</div>';
         }
+
         if (!_fs.default.existsSync('./coverageTest')) {
           _fs.default.mkdirSync('./coverageTest');
+
           _fs.default.writeFileSync('./coverageTest/impactLibrary.html', this.topHtml + this.bottomHtml, 'utf8');
         } else {
           _fs.default.writeFileSync('./coverageTest/impactLibrary.html', this.topHtml + this.bottomHtml, 'utf8');
         }
+
         (0, _jsonHelper.jsonHelper)(resultFileName, 'tests.libraryImpactOnSource.endTime', Date.now());
       });
     });
@@ -154,5 +184,7 @@ class LibraryImpactPlugin {
       (0, _utils.log)('Compilation finished!!!');
     });
   }
+
 }
+
 exports.default = LibraryImpactPlugin;

package/lib/plugins/utils/classHandling.js

@@ -9,21 +9,27 @@ exports.isComment = isComment;
 exports.isCommentContentSame = isCommentContentSame;
 exports.isInsideMediaQuery = isInsideMediaQuery;
 exports.isThisComment = isThisComment;
+
 function isComment(node) {
   return node && node.type && node.type === 'comment';
 }
+
 function isCommentContentSame(node, content) {
   return node.text.toLowerCase() === content;
 }
+
 function isThisComment(node, ignoreComment) {
   return isComment(node) && isCommentContentSame(node, ignoreComment);
 }
+
 function hasPrevNodeIgnore(index, prevNode, ignoreComment) {
   return index !== 0 && isThisComment(prevNode, ignoreComment);
 }
+
 function isAtRule(rule) {
   return rule.parent && rule.parent.type === 'atrule';
 }
+
 function isInsideMediaQuery(rule) {
   return isAtRule(rule) && rule.parent && rule.parent.name === 'media' ? true : false;
 }

package/lib/plugins/utils/fileHandling.js

@@ -5,9 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.isFileNameMatchingPattern = isFileNameMatchingPattern;
 exports.isFileNameMatchingPluginPattern = isFileNameMatchingPluginPattern;
+
 var _ignore = _interopRequireDefault(require("ignore"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 const path = require('path');
+
 const aliasNames = {
   valueReplacer: 'postcss-value-replacer',
   selectorReplace: 'postcss-selector-replace-new',
@@ -17,7 +21,6 @@ const aliasNames = {
   cssVariableReplacement: 'postcss-variable-report',
   composeMinification: 'postcss-compose-plugin'
 };
-
 /*
 
 unique scenario
@@ -39,6 +42,7 @@ unique scenario
 //   });
 //   return include;
 // }
+
 function isFileNameMatchingPattern({
   filename,
   filterObject,
@@ -51,29 +55,34 @@ function isFileNameMatchingPattern({
   });
   const finalPlugins = order.filter(key => {
     const pluginSpecificFilter = filterObject[key];
+
     if (!pluginSpecificFilter || pluginSpecificFilter.length === 0) {
       return true;
-    }
-    // eslint-disable-next-line no-use-before-define
+    } // eslint-disable-next-line no-use-before-define
+
+
     const isMatching = isFilePathMatchingPattern(filename, pluginSpecificFilter);
     return isMatching;
   }).map(key => {
     const p = pluginObj[aliasNames[key]];
     return p;
-  });
-  // if unknown key given in plugins and pattern loop will run but post-css plugin won't be available and will be undefined in array
+  }); // if unknown key given in plugins and pattern loop will run but post-css plugin won't be available and will be undefined in array
   // So we do filter as safety measure.
+
   return finalPlugins.filter(Boolean);
 }
+
 function isFilePathMatchingPattern(filePath, patterns) {
   if (patterns.length === 0) {
     return true;
   }
+
   const ig = (0, _ignore.default)({
     allowRelativePaths: true
   }).add(patterns);
   return ig.ignores(filePath);
 }
+
 function isFileNameMatchingPluginPattern({
   filename,
   filterArr

package/lib/plugins/utils/tests/fileHandling.test.js

@@ -1,12 +1,15 @@
 "use strict";
 
 const ignore = require('ignore');
+
 const ignoreArr1 = ['src', '!src\\components', 'src\\Accessibility'];
 const ignoreArr2 = ['src\\', '!node_modules\\'];
 const ignoreArr3 = ['*'];
+
 const {
   windowsModificationFile
 } = require('../../../../lib/loaderUtils/windowsModification');
+
 const files = ['D:\\MyWork\\React Build\\desk_client_app\\jsapps\\supportapp\\src\\components\\Accessibility\\Accessibility.module.css', 'D:\\MyWork\\React Build\\desk_client_app\\jsapps\\supportapp\\src\\components\\Avatar\\Avatar.module.css', 'D:/MyWork/React Build/desk_client_app/jsapps/supportapp/src/components/Accessibility/Accessibility.module.css', 'D:/MyWork/React Build/desk_client_app/jsapps/supportapp/src/components/Accessibility/AccessibilityNavigation.module.css', 'desk_client_app\\jsapps\\supportapp\\src\\components\\Test.module.css', 'desk_client_app\\jsapps\\supportapp\\src\\components\\Accessibility\\Accessibility.module.css', 'desk_client_app/jsapps/supportapp/src/components/Accessibility/Accessibility.module.css', 'src\\components\\Accessibility\\Accessibility.module.css', 'src/components/Accessibility/Accessibility.module.css', 'Accessibility.module.css', ''];
 const ignore1 = ignore().add(ignoreArr1);
 const ignore2 = ignore().add(ignoreArr2);
@@ -17,6 +20,7 @@ files.forEach(file => {
   const regex = `^(.+?)${rootDir}?\\\\`;
   const newFilename = windowsModificationFile(file).replace(new RegExp(regex, 'gi'), '');
   console.log(newFilename);
+
   if (newFilename.trim() !== '') {
     console.log(ignore1.ignores(newFilename));
     console.log(ignore2.ignores(newFilename));

package/lib/plugins/variableConvertorUtils.js

@@ -6,11 +6,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.extractVariableName = extractVariableName;
 exports.ignoreVals = void 0;
 exports.variableConverter = variableConverter;
+
 var _classHandling = require("./utils/classHandling");
-const ignoreVals = exports.ignoreVals = ['--zd_size', '--zd_font_size', '--size', '--size_'];
 
-// const avoidProps = [];
+const ignoreVals = ['--zd_size', '--zd_font_size', '--size', '--size_']; // const avoidProps = [];
 // -- is issue IO --
+
 /*
 issues eg : 
 issues = ['--zd_size', '--zd_font_size', '--size', '--size_'];
@@ -21,12 +22,15 @@ true
 comment : 
 do not execute when --zd_size comes as prop 
 */
+
+exports.ignoreVals = ignoreVals;
+
 function extractVariableName(val) {
   return val.replace(/calc\((.+)\)/gi, '$1').replace(/var\((.+)\)/gi, '$1').replace('-1', '').replace('*', '').replace('\n', '').trim();
 }
+
 function isIgnoreValuePresent(ignoreVals, prop) {
-  return ignoreVals.some(ignoreVal => prop && prop.includes(ignoreVal));
-  // let present = false;
+  return ignoreVals.some(ignoreVal => prop && prop.includes(ignoreVal)); // let present = false;
   // return ignoreVals.forEach(issue => {
   //   if (prop && prop.includes(issue)) {
   //     present = true;
@@ -34,26 +38,29 @@ function isIgnoreValuePresent(ignoreVals, prop) {
   // });
   // return present;
 }
+
 function parseCalcValue(calcValue) {
   // Remove "calc(" and ")" from the string
-  const value = calcValue.replace(/calc\(/gi, '').replace(/\)/gi, '').trim();
-  // Split the string by "*" or "/"
-  const parts = value.split(/[\\/*]/);
-  // Parse the first part as a number
-  const num1 = parts[0].trim();
-  // Parse the second part as a number
+  const value = calcValue.replace(/calc\(/gi, '').replace(/\)/gi, '').trim(); // Split the string by "*" or "/"
+
+  const parts = value.split(/[\\/*]/); // Parse the first part as a number
+
+  const num1 = parts[0].trim(); // Parse the second part as a number
+
   const num2 = parts[1].trim();
   return {
     valOne: num1,
     valTwo: num2
   };
 }
+
 function convertToCalc(pxReplacement, value) {
   const parsedValue = parseFloat(value, 10);
   const sign = parsedValue < 0 ? '-' : '';
   const varName = `${parsedValue < 0 ? parsedValue * -1 : parsedValue}`;
   return `calc( ${pxReplacement.replace('$$', varName)} * ${sign}1 )`;
 }
+
 function convertCalcValue(pxReplacement, parsedValue) {
   Object.keys(parsedValue).forEach(key => {
     if (pxReplacement && parsedValue[key].includes('px')) {
@@ -62,32 +69,36 @@ function convertCalcValue(pxReplacement, parsedValue) {
   });
   return parsedValue;
 }
+
 function variableConverter(rootOriginal, variables, settingsObject) {
   rootOriginal.walkRules(rule => {
     rule.nodes.forEach((decl, index) => {
       const prevNode = rule.nodes[index - 1];
       const currentNode = rule.nodes[index];
+
       if (decl.prop && decl.prop.includes('--')) {
-        if ((0, _classHandling.isThisComment)(prevNode, 'variable:ignore')
-        // prevNode &&
+        if ((0, _classHandling.isThisComment)(prevNode, 'variable:ignore') // prevNode &&
         // prevNode.type === 'comment' &&
         // prevNode.text.toLowerCase() === 'variable:ignore'
         ) {
           return;
         }
+
         if (isIgnoreValuePresent(ignoreVals, decl.prop)) {
           return;
         }
+
         if (settingsObject[variables[decl.prop]]) {
           /* if there is no value for property, set it to default so that undefined doesn't get called as key */
           if (!variables[decl.prop]) {
             variables[decl.prop] = 'default';
           }
+
           const pxReplacement = settingsObject[variables[decl.prop]].replacements.px;
           let valArr = decl.value.split(' ');
           valArr = valArr.filter(x => x.trim() !== '');
-          valArr = valArr.map(x => x.replace(/\r|\t|\n/gi, ''));
-          // single values are considered in the above array and converted below
+          valArr = valArr.map(x => x.replace(/\r|\t|\n/gi, '')); // single values are considered in the above array and converted below
+
           valArr.forEach((value, index) => {
             if (value.includes('px')) {
               if (value.includes('calc')) {
@@ -95,15 +106,19 @@ function variableConverter(rootOriginal, variables, settingsObject) {
                 valArr[index] = `calc( ${res.valOne.trim()} * ${res.valTwo.trim()} )`;
                 return;
               }
+
               if (/-(\d+)/gi.test(value)) {
                 valArr[index] = convertToCalc(pxReplacement, value);
                 return;
               }
+
               const num = value.replace('px', '');
+
               if (value) {
                 valArr[index] = pxReplacement.replace('$$', num);
               }
             }
+
             if (value.includes('px')) {
               const num = value.replace('px', '');
               valArr[index] = pxReplacement.replace('$$', num);