@zohodesk/react-cli 1.1.14-exp.3 → 1.1.14-kubernetes

package/lib/plugins/VariableConversionCollector.js

@@ -9,15 +9,12 @@ var _postcss = _interopRequireDefault(require("postcss"));
 
 var _ErrorHandler = require("../postcss-plugins/variableModificationPlugin/ErrorHandler");
 
-var _fileHandling = require("./utils/fileHandling");
-
-var _variableConvertorUtils = require("./variableConvertorUtils");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 // import { RawSource } from 'webpack-sources';
 const fs = require('fs');
 
+const ignoreVals = ['--zd_size', '--zd_font_size', '--size', '--size_'];
 let variablesRead = {};
 
 const {
@@ -26,7 +23,29 @@ const {
   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']; // const avoidProps = [];
+// -- is issue IO --
+
+/*
+issues eg : 
+issues = ['--zd_size', '--zd_font_size', '--size', '--size_'];
+input : 
+--zd_size
+output : 
+true
+comment : 
+do not execute when --zd_size comes as prop 
+*/
+
+function isIgnoreValuePresent(ignoreVals, prop) {
+  let present = false;
+  ignoreVals.forEach(issue => {
+    if (prop && prop.includes(issue)) {
+      present = true;
+    }
+  });
+  return present;
+} // -- to convert the hyphen values to values --
 
 /*
 input : 
@@ -38,6 +57,49 @@ comment :
 to make the variable object using the output as key and decl.prop such as font-size as value 
 */
 
+
+function extractVariableName(val) {
+  return val.replace(/calc\((.+)\)/gi, '$1').replace(/var\((.+)\)/gi, '$1').replace('-1', '').replace('*', '').replace('\n', '').trim();
+}
+
+function rootConvertor(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 (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;
+          const valArr = decl.value.split(' '); // single values are considered in the above array and converted below
+
+          valArr.forEach((value, index) => {
+            if (value.includes('px')) {
+              const num = value.replace('px', '');
+              valArr[index] = pxReplacement.replace('$$', num);
+            }
+          });
+          currentNode.value = valArr.join(' ');
+        }
+      }
+    });
+  });
+  return rootOriginal;
+}
+
 function createFolderIfNonExistant(path) {
   if (!fs.existsSync(path)) {
     fs.mkdirSync(path, {
@@ -56,12 +118,10 @@ class VariableConversionCollector {
   constructor(options = {}) {
     this.optimize = options.optimize;
     this.filename = options.cssVariableReplacementConfig;
-    this.patterns = options.patterns; // console.log(options.patterns, this.patterns);
-
-    this.initializeFiles();
+    this.fileHandler();
   }
 
-  initializeFiles() {
+  fileHandler() {
     createFolderIfNonExistant('./.cli/logs/');
     createFolderIfNonExistant('./.cli/config/variables/');
     createFolderIfNonExistant('./.cli/config/selectorWeight/');
@@ -71,8 +131,7 @@ class VariableConversionCollector {
 
   apply(compiler) {
     const variables = {};
-    const unassigned = {}; // console.log(windowsModification([this.filename])[0]);
-
+    const unassigned = {};
     const rawdata = fs.readFileSync(this.filename);
     const data = JSON.parse(rawdata);
     const {
@@ -124,13 +183,16 @@ class VariableConversionCollector {
             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 (val && val.includes('--') && !new RegExp(ignoreVals.join('|'), 'gi').test(val) && decl.prop) {
+                    const extractedValue = extractVariableName(val);
 
                     if (!variables[extractedValue]) {
                       variables[extractedValue] = decl.prop;
                     } else {
                       if (new RegExp(supportedProps.join('|'), 'gi').test(decl.prop)) {
+                        // console.log(
+                        //   `${extractedValue} : ${variables[extractedValue]} already exists please check!`
+                        // );
                         if (errorsAllowed.MULTIPLE_OCCURANCES) {
                           const errObj = {
                             decl,
@@ -144,6 +206,7 @@ class VariableConversionCollector {
                       }
                     }
                   } else {
+                    // console.log(decl.prop);
                     if (/^--/gi.test(decl.prop) && val.trim() !== '' && !variables[decl.prop]) {
                       if (!Object.keys(variablesRead.ignore).includes(decl.prop)) {
                         unassigned[decl.prop] = variables[decl.prop];
@@ -175,7 +238,7 @@ class VariableConversionCollector {
             });
           }
         });
-      }); // -- conversion for the root using variableConvertor --
+      }); // -- conversion for the root using rootConvertor --
 
       /* 
       input : 
@@ -193,33 +256,9 @@ class VariableConversionCollector {
       compilation.hooks.optimizeModules.tap('VariableConversionCollector', modules => {
         const mods = modules.filter(x => x.type.includes('css'));
         mods.forEach(module => {
-          const filename = module.issuer.resource;
-          /*
-            input : 
-            filename : 'D:/MyWork/..../desk_client_app/supportapp/src/components/Avatar/Avatar.module.css,
-          
-             patterns.cssVariableReplacement: 
-            // include src folder, include deskapp folder, exclude node modules
-            "cssVariableReplacement": [
-              "src",
-              "deskapp",
-              "!node_modules"
-            ]
-             
-            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();
+          module.content = rootConvertor(rootOriginal, variables, settingsObject).toString();
         });
       });
     });
@@ -253,7 +292,29 @@ class VariableConversionCollector {
         if (a.type < b.type) {
           return -1;
         }
-      });
+      }); // variable constructed now to be written in a json file
+      // const newVars = Object.keys(variables)
+      //   //Filter Object with key contanis "NAME"
+      //   .filter(key => variables[key].includes('--'))
+      //   .reduce(
+      //     (obj, key) =>
+      //       Object.assign(obj, {
+      //         [key]: variables[key]
+      //       }),
+      //     {}
+      //   );
+      // console.log('new variables: ', newVars);
+      // try {
+      //   fs.writeFileSync('./variableMapping.json', JSON.stringify(variables));
+      // } catch (err) {
+      //   console.log(err);
+      // }
+      // fs.writeFile('./variableMapping.json', JSON.stringify(variables), err => {
+      //   if (err) {
+      //     throw err;
+      //   }
+      //   console.log('variable mapping file generated.');
+      // });
 
       if (errorConsoleStatus) {
         const errorHandler = new _ErrorHandler.ErrorHandler();

package/lib/plugins/composeCommonPlugin.js

@@ -0,0 +1,30 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _postcss = _interopRequireDefault(require("postcss"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+class ComposeCommonPlugin {
+  constructor(options = {}) {
+    this.optimize = options.optimize;
+  }
+
+  apply(compiler) {
+    compiler.hooks.compilation.tap('OptimizeJSPlugin', compilation => {
+      compilation.hooks.optimizeModules.tap('OptimizeMods', modules => {
+        modules.forEach(module => {
+          console.log(module);
+        });
+      });
+    });
+  }
+
+}
+
+var _default = ComposeCommonPlugin;
+exports.default = _default;

package/lib/plugins/index.js

@@ -33,12 +33,6 @@ Object.defineProperty(exports, "ManifestPlugin", {
     return _ManifestPlugin.default;
   }
 });
-Object.defineProperty(exports, "MinifyPlugin", {
-  enumerable: true,
-  get: function () {
-    return _MinifyPlugin.default;
-  }
-});
 Object.defineProperty(exports, "ModuleStatsPlugin", {
   enumerable: true,
   get: function () {
@@ -105,6 +99,12 @@ Object.defineProperty(exports, "TPHashMappingPlugin", {
     return _TPHashMappingPlugin.default;
   }
 });
+Object.defineProperty(exports, "UglifyCSSPlugin", {
+  enumerable: true,
+  get: function () {
+    return _UglifyCSSPlugin.default;
+  }
+});
 Object.defineProperty(exports, "UnusedFilesFindPlugin", {
   enumerable: true,
   get: function () {
@@ -126,7 +126,7 @@ var _OptimizeJSPlugin = _interopRequireDefault(require("./OptimizeJSPlugin"));
 
 var _ResourceHintsPlugin = _interopRequireDefault(require("./ResourceHintsPlugin"));
 
-var _MinifyPlugin = _interopRequireDefault(require("./MinifyPlugin"));
+var _UglifyCSSPlugin = _interopRequireDefault(require("./UglifyCSSPlugin"));
 
 var _ManifestPlugin = _interopRequireDefault(require("./ManifestPlugin"));
 

package/lib/postcss-plugins/ExcludePlugin.js

@@ -10,7 +10,7 @@ module.exports = _postcss.default.plugin('postcss-exclude-files', opts => {
   } = opts;
   return (root, result) => {
     const inputFile = root.source.input.file;
-    const isIgnoredFile = opts.ignore.some(file => inputFile.indexOf(file) !== -1);
+    let isIgnoredFile = opts.ignore.some(file => inputFile.indexOf(file) !== -1);
 
     if (!isIgnoredFile) {
       const handler = response => response.messages.forEach(msg => result.messages.push(msg));

package/lib/postcss-plugins/RTLSplitPlugin.js

@@ -18,6 +18,7 @@ const oppositeDir = {
 };
 
 function compareSelector(selector1, selector2) {
+  // console.log({ selector1, selector2 }, selector1 === selector2);
   return selector1 === selector2;
 }
 
@@ -65,6 +66,7 @@ function mergeIfSameSelector(rule) {
 
 
 function removeIfOppsiteDirRule(rule, direction, rootOptions) {
+  // console.log({ rule, type: rule.type });
   const selectors = rule.selector.split(/\s*,\s*/); // NOTE: if we use opposite dir selector as custom override reason,
   //  and compain normal selector with it, In this  case
   //  we just a have to remove that selector only not full rule
@@ -85,10 +87,11 @@ function removeIfOppsiteDirRule(rule, direction, rootOptions) {
 }
 
 function removeIfOppsiteDirKeyframe(rule, direction) {
-  const name = rule.params;
-  const keyFrameDirName = name.slice(name.lastIndexOf('-') + 1);
+  let name = rule.params;
+  let keyFrameDirName = name.slice(name.lastIndexOf('-') + 1);
 
   if (keyFrameDirName === oppositeDir[direction]) {
+    // console.log({ m: 'removed', keyFrameName: rule.params });
     rule.remove();
   }
 }
@@ -106,10 +109,12 @@ function separateSingleDir(root, direction, rootOptions) {
 
 function separateRtlAndLtr(css, rootOptions) {
   // let processor = postcss([]).process(css);
-  const root = postcss.parse(css); // let { root } = processor;
+  let root = postcss.parse(css); // let { root } = processor;
+  // console.log(processor, root);
   // NOTE: I did first rtl then ltr , Because  for ltr I use original root ref
 
-  const rtlRoot = separateSingleDir(root.clone(), 'rtl', rootOptions);
+  const rtlRoot = separateSingleDir(root.clone(), 'rtl', rootOptions); // console.log('############################');
+
   const ltrRoot = separateSingleDir(root, 'ltr', rootOptions);
   return {
     ltrRoot,
@@ -127,6 +132,7 @@ function separateRtlAndLtr(css, rootOptions) {
 //     // root.append(postcss.comment({ text: 'comment' }));
 //     root.append(postcss.comment({ text: 'this  is  spliting part ' }));
 //     root.append(rtlRoot);
+//     //console.log({root, roots:root+""}, root+"")
 //     // Transform CSS AST here
 //   }
 // );

package/lib/postcss-plugins/ValueReplacer.js

@@ -4,22 +4,43 @@ var _postcss = _interopRequireDefault(require("postcss"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+// module.exports = postcss.plugin('postcss-value-replacer', opts => {
+//   const { plugins } = opts;
+//   return (root, result) => {
+//     const inputFile = root.source.input.file;
+//     let isIgnoredFile= opts.ignore.some(file => inputFile.indexOf(file)!==-1);
+//     if (!isIgnoredFile) {
+//       const handler = response =>
+//         response.messages.forEach(msg => result.messages.push(msg));
+//       return postcss(plugins)
+//         .process(root, { from: undefined })
+//         .then(handler);
+//     }
+//   };
+// });
+// export default 
 module.exports = _postcss.default.plugin('postcss-value-replacer', (valueReplacer = {}) => // Work with options here
 root => {
   root.walkDecls(decl => {
     valueReplacer.forEach(obj => {
       if (obj.props.indexOf(decl.prop) !== -1) {
-        const ks = Object.keys(obj.values).sort((a, b) => b.length - a.length);
+        let ks = Object.keys(obj.values).sort((a, b) => b.length - a.length);
         ks.forEach(k => {
-          // if (/^\^.*\$$/gi.test(k)) {
-          if (k.startsWith('^') && k.endsWith('$')) {
-            decl.value = decl.value.replace(new RegExp(k), obj.values[k]);
-          } else {
-            decl.value = decl.value.replace(k, obj.values[k]);
-          }
+          decl.value = decl.value.replace(k, obj.values[k]);
         }); //decl.value = obj.values[decl.value];
       }
     }); //console.log({root, roots:root+""}, root+"")
     // Transform CSS AST here
-  });
+  }); // root.walkDecls(decl => {
+  //   valueReplacer.forEach(obj => {
+  //     if (
+  //       obj.props.indexOf(decl.prop) !== -1 &&
+  //       obj.values[decl.value] !== undefined
+  //     ) {
+  //       decl.value = obj.values[decl.value];
+  //     }
+  //   });
+  //   //console.log({root, roots:root+""}, root+"")
+  //   // Transform CSS AST here
+  // });
 });

package/lib/postcss-plugins/hoverActivePlugin.js

@@ -158,6 +158,7 @@ module.exports = _postcss.default.plugin('postcss-mobile-hover', mediaQueryHover
 
   function mediaCommaQuery(rule, index) {
     if (rule.parent.params !== undefined && !rule.parent.params.includes('hover')) {
+      //console.log(hovMed, actMed);
       let newSelector = '';
       const {
         hovMed,
@@ -231,6 +232,7 @@ module.exports = _postcss.default.plugin('postcss-mobile-hover', mediaQueryHover
   }
 
   function commaQuery(rule, index) {
+    //console.log("comma" , rule.selector.split('\n'));
     let newSelector = '';
     const hovQueries = [];
     rule.selector.split(/\s*,\s*/).forEach(_subrule => {
@@ -286,10 +288,13 @@ module.exports = _postcss.default.plugin('postcss-mobile-hover', mediaQueryHover
   });
   rootOriginal.walkRules(/:hover/i, (rule, index) => {
     // media hover query with ',' ' ' '+'
+    // console.log("media query" , rule.selector)
     if (rule.parent.type === 'atrule' && rule.selector.includes(',')) {
+      //console.log("media comma", rule.selector)
       mediaCommaQuery(rule, index);
     } else {
       // plus, space and other media queries
+      //console.log("media", rule.selector)
       mediaQuery(rule, index);
     } // usual hover query
 
@@ -306,6 +311,7 @@ module.exports = _postcss.default.plugin('postcss-mobile-hover', mediaQueryHover
       if (rule.selector.includes(',')) {
         commaQuery(rule, index);
       } else if (rule.selector.match(/ +|\++/g)) {
+        //console.log("plus or space" , rule.selector);
         if (rule.selector.includes('hover')) {
           hoverRules.push({
             rule,

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

@@ -36,6 +36,7 @@ class ErrorHandler {
 
   errorFunction(errObj) {
     if (errObj.type && this.allowedErrs[errObj.type] && errObj.decl.prop && errObj.decl.value) {
+      console.log(this.allowedErrs[errObj.type]);
       this[errObj.type](errObj);
     }
   }

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

@@ -10,6 +10,8 @@ const {
   ErrorHandler
 } = require('./ErrorHandler');
 
+const errors = [];
+const errorTable = [];
 const errHandler = new ErrorHandler();
 const convertableProps = {
   'font-size': true,
@@ -92,13 +94,7 @@ function pxToCalc(value) {
   return arr.join(' ');
 }
 
-const singleConvertor = ({
-  value,
-  changeVal,
-  details,
-  range,
-  allowed
-}) => {
+const singleConvertor = (value, changeVal, details, range) => {
   const {
     path,
     filename,
@@ -112,15 +108,7 @@ const singleConvertor = ({
     }
   }
 
-  if (allowed && allowed.includes(decl.value) && decl.value.toString() !== '0') {
-    return decl.value;
-  }
-
   if (getNumericValue(value) >= range.start && getNumericValue(value) <= range.end || getNumericValue(value) === 0) {
-    if (value.trim() === '0px') {
-      return '0';
-    }
-
     let retVal = value.replace(/(\d+)px/gi, changeVal.replace('$$', '$1'));
 
     if (/^-var/.test(retVal)) {
@@ -133,7 +121,7 @@ const singleConvertor = ({
   // console.log(value, 'not within range')
 
 
-  const errObj = {
+  let errObj = {
     decl,
     type: 'RANGE_ERROR',
     filename,
@@ -141,8 +129,24 @@ const singleConvertor = ({
     path: path
   };
   errHandler.errorTable.push(errObj);
-  errHandler.errorFunction(errObj);
-  return;
+  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;
+  // } else {
+  //   console.log('++++++++++++++++++++++rect val!', value);
+  // }
 };
 
 module.exports = {
@@ -175,7 +179,6 @@ module.exports = {
     });
     const valRegex = new RegExp(regValStr, 'gi');
     return rootOriginal => {
-      // console.log(rootOriginal.source.input.from, 'passed through variable Plugin');
       rootOriginal.walkRules(rule => {
         // rule.nodes[-1] = {}
         // need map, forEach fine less memory
@@ -186,11 +189,10 @@ module.exports = {
           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(filename.includes('AddFormResponsive.module.css'){
-          // }
+          const filename = fromPath.split(path.sep).pop();
 
           if (prevNode && prevNode.type === 'comment' && prevNode.text.toLowerCase().includes(commentStr)) {
-            const errObj = {
+            let errObj = {
               decl,
               type: 'DECLARATION_IGNORED',
               filename,
@@ -203,7 +205,8 @@ module.exports = {
           }
 
           if (settingsObject[decl.prop] && !decl.value.includes('var(--')) {
-            const settings = settingsObject[decl.prop];
+            const settings = settingsObject[decl.prop]; // console.log(settings)
+
             const {
               allowed,
               range
@@ -214,9 +217,6 @@ module.exports = {
             .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);
-            // if (decl.prop === 'height') {
-            //   console.log(decl.prop, unit, 'case 1');
-            // }
 
             unit.forEach((val, index) => {
               allowed.forEach(alwdVal => {
@@ -236,54 +236,26 @@ module.exports = {
                   unitErrorVal = val;
                 }
               }
-            }); // if (decl.prop === 'height') {
-            //   console.log(decl.prop, unitErrorVal, unitError, unit, 'case 2');
-            // }
-            // console.log(allowed, replacements, range)
+            }); // console.log(allowed, replacements, range)
 
             if (!unitError) {
-              let calcValue = false;
-
-              if (decl.value.includes('calc')) {
-                decl.value = pxToCalc(decl.value);
-                calcValue = true;
-              } // use variable decl.value.split(' ')
-
-
-              if (range && !calcValue) {
+              // use variable decl.value.split(' ')
+              if (range) {
                 // console.log('multiple :', decl.value)
-                const tempVal = decl.value; // if (decl.prop === 'height') {
-                //   console.log(decl.prop, tempVal, decl.value, allowed, 'case 3');
-                // }
-                // if (decl.prop === 'height') {
-                //   console.log('allowed!', decl.prop, decl.value, allowed);
-                // }
-
                 let newVal = '';
-                let splitValues = decl.value.split(' ');
-                splitValues = splitValues.filter(val => val.trim() !== '');
-                splitValues = splitValues.map(val => val.replace(/\r|\t|\n/gi, ''));
-                splitValues.forEach(singleVal => {
-                  newVal += `${singleConvertor({
-                    value: singleVal,
-                    changeVal: settings.replacements.px,
-                    details: {
-                      decl,
-                      filename,
-                      path: fromPath
-                    },
-                    range,
-                    allowed
-                  })} `;
+                decl.value.split(' ').forEach(singleVal => {
+                  newVal += `${singleConvertor(singleVal, settings.replacements.px, {
+                    decl,
+                    filename,
+                    path: fromPath
+                  }, range)} `;
                 });
-                decl.value = newVal; // if (decl.prop === 'height') {
-                //   console.log(decl.prop, tempVal, newVal, 'case 4');
-                // }
+                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`);
-                const errObj = {
+                let errObj = {
                   decl,
                   filename,
                   unitErrorVal: unitErrorVal,
@@ -313,36 +285,8 @@ module.exports = {
               }
             }
           } else {
-            if (settingsObject[decl.prop] && decl.value && decl.value.includes('px') && decl.value.includes('var(--')) {
-              const valArr = decl.value.split(' ');
-              const settings = settingsObject[decl.prop];
-              const {
-                range,
-                allowed
-              } = settings;
-              const convertedVals = valArr.map(val => {
-                if (val.includes('px')) {
-                  const convertedVal = singleConvertor({
-                    value: val,
-                    changeVal: settings.replacements.px,
-                    details: {
-                      decl,
-                      filename,
-                      path: fromPath
-                    },
-                    range,
-                    allowed
-                  });
-                  return convertedVal ? convertedVal : val;
-                }
-
-                return val;
-              });
-              decl.value = convertedVals.join(' ');
-            }
-
             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')) {
-              const errObj = {
+              let errObj = {
                 decl,
                 type: 'VARIABLE_PRESENT',
                 filename,