@zohodesk/react-cli 1.0.2 → 1.0.3-exp.2

package/lib/plugins/VariableConversionCollector.js

@@ -9,6 +9,8 @@ var _postcss = _interopRequireDefault(require("postcss"));
 
 var _ErrorHandler = require("../postcss-plugins/variableModificationPlugin/ErrorHandler");
 
+var _fileHandling = require("./utils/fileHandling");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 // import { RawSource } from 'webpack-sources';
@@ -26,15 +28,15 @@ const {
 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 
+/*
+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) {
@@ -47,14 +49,14 @@ function isIgnoreValuePresent(ignoreVals, prop) {
   return present;
 } // -- to convert the hyphen values to values --
 
-/*
-input : 
-var(--zdt_uploadlist_default_width)
-output : 
---zdt_uploadlist_default_width
-
-comment : 
-to make the variable object using the output as key and decl.prop such as font-size as value 
+/*
+input : 
+var(--zdt_uploadlist_default_width)
+output : 
+--zdt_uploadlist_default_width
+
+comment : 
+to make the variable object using the output as key and decl.prop such as font-size as value 
 */
 
 
@@ -62,7 +64,7 @@ function extractVariableName(val) {
   return val.replace(/calc\((.+)\)/gi, '$1').replace(/var\((.+)\)/gi, '$1').replace('-1', '').replace('*', '').replace('\n', '').trim();
 }
 
-function rootConvertor(rootOriginal, variables, settingsObject) {
+function variableConvertor(rootOriginal, variables, settingsObject) {
   rootOriginal.walkRules(rule => {
     rule.nodes.forEach((decl, index) => {
       const prevNode = rule.nodes[index - 1];
@@ -118,10 +120,13 @@ class VariableConversionCollector {
   constructor(options = {}) {
     this.optimize = options.optimize;
     this.filename = options.cssVariableReplacementConfig;
-    this.fileHandler();
+    this.patterns = options.patterns;
+    this.rootDir = options.patternsRootDir; // console.log(options.patterns, this.patterns);
+
+    this.initializeFiles();
   }
 
-  fileHandler() {
+  initializeFiles() {
     createFolderIfNonExistant('./.cli/logs/');
     createFolderIfNonExistant('./.cli/config/variables/');
     createFolderIfNonExistant('./.cli/config/selectorWeight/');
@@ -131,7 +136,8 @@ class VariableConversionCollector {
 
   apply(compiler) {
     const variables = {};
-    const unassigned = {};
+    const unassigned = {}; // console.log(windowsModification([this.filename])[0]);
+
     const rawdata = fs.readFileSync(this.filename);
     const data = JSON.parse(rawdata);
     const {
@@ -154,13 +160,13 @@ class VariableConversionCollector {
         }
       };
     }
-    /* 
-    purpose of tap : to create a variable object such as:
-    {
-      --zdt_uploadlist_default_width : width,
-      --zdt_uploadlist_default_height : height,
-    }
-    which will help in the conversion further
+    /* 
+    purpose of tap : to create a variable object such as:
+    {
+      --zdt_uploadlist_default_width : width,
+      --zdt_uploadlist_default_height : height,
+    }
+    which will help in the conversion further
     */
 
 
@@ -190,9 +196,6 @@ class VariableConversionCollector {
                       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,
@@ -206,7 +209,6 @@ 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];
@@ -216,19 +218,19 @@ class VariableConversionCollector {
                 });
               });
             });
-            /*
-             current value example: 
-             {
-                --zdt_uploadlist_default_width : --zd_upload_width,
-                --zd_upload_width : width
-             }
-             expected value : 
-             {
-               --zdt_uploadlist_default_width : width,
-               --zd_upload_width : width
-             }
-            
-             conversion is done in the while loop below
+            /*
+             current value example: 
+             {
+                --zdt_uploadlist_default_width : --zd_upload_width,
+                --zd_upload_width : width
+             }
+             expected value : 
+             {
+               --zdt_uploadlist_default_width : width,
+               --zd_upload_width : width
+             }
+            
+             conversion is done in the while loop below
             */
 
             Object.keys(variables).forEach(key => {
@@ -238,36 +240,62 @@ class VariableConversionCollector {
             });
           }
         });
-      }); // -- conversion for the root using rootConvertor --
-
-      /* 
-      input : 
-      .a{
-        padding : 20px 
-      }
-      output :
-      // on settingObject file : 
-      { padding : { replacements : { px : 'zd_size$$' }}} 
-      .a{
-        padding : zd_size20;
-      }
+      }); // -- conversion for the root using variableConvertor --
+
+      /* 
+      input : 
+      .a{
+        padding : 20px 
+      }
+      output :
+      // on settingObject file : 
+      { padding : { replacements : { px : 'zd_size$$' }}} 
+      .a{
+        padding : zd_size20;
+      }
       */
 
       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"
+            ]
+              rootDir : patternsRootDir : 'supportapp'
+            
+            output : 
+            true or false
+          */
+
+          if (!(0, _fileHandling.isFileNameMatchingPluginPattern)({
+            filename,
+            filterArr: this.patterns.cssVariableReplacement,
+            rootDir: this.rootDir
+          })) {
+            return;
+          }
+
           const rootOriginal = _postcss.default.parse(module.content);
 
-          module.content = rootConvertor(rootOriginal, variables, settingsObject).toString();
+          module.content = variableConvertor(rootOriginal, variables, settingsObject).toString();
         });
       });
     });
-    /*
-      purpose of tap : to display the errors encountered so far 
-      input : 
-      all css files 
-      output : 
-      all errors that are present in the errTable arr
+    /*
+      purpose of tap : to display the errors encountered so far 
+      input : 
+      all css files 
+      output : 
+      all errors that are present in the errTable arr
     */
 
     compiler.hooks.afterEmit.tap('error-display', () => {
@@ -292,29 +320,7 @@ 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/index.js

@@ -33,6 +33,12 @@ 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 () {
@@ -99,12 +105,6 @@ 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 _UglifyCSSPlugin = _interopRequireDefault(require("./UglifyCSSPlugin"));
+var _MinifyPlugin = _interopRequireDefault(require("./MinifyPlugin"));
 
 var _ManifestPlugin = _interopRequireDefault(require("./ManifestPlugin"));
 

package/lib/plugins/utils/classHandling.js

@@ -0,0 +1,20 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.hasPrevNodeIgnore = hasPrevNodeIgnore;
+exports.isAtRule = isAtRule;
+exports.isInsideMediaQuery = isInsideMediaQuery;
+
+function hasPrevNodeIgnore(index, prevNode, ignoreComment) {
+  return index !== 0 && prevNode && prevNode.type && prevNode.type === 'comment' && prevNode.text.toLowerCase() === 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

@@ -0,0 +1,107 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isFileNameMatchingPattern = isFileNameMatchingPattern;
+exports.isFileNameMatchingPluginPattern = isFileNameMatchingPluginPattern;
+
+var _windowsModification = require("../../loaderUtils/windowsModification");
+
+var _ignore = _interopRequireDefault(require("ignore"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const path = require('path');
+
+let aliasNames = {
+  valueReplacer: 'postcss-value-replacer',
+  selectorReplace: 'postcss-selector-replace-new',
+  hasRTL: 'postcss-rtl',
+  combinerMediaQuery: 'postcss-combine-media-query',
+  hoverActive: 'postcss-mobile-hover',
+  cssVariableReplacement: 'postcss-variable-report',
+  composeMinification: 'postcss-compose-plugin'
+};
+/*
+
+unique scenario
+
+*/
+// export function filterFileCssUniqueness(filename, filterObj) {
+//   let rootDir = 'supportapp';
+//   let include = false;
+//   const regex = `^(.+?)${rootDir}?\\\\`;
+//   const newFilename = windowsModificationFile(filename).replace(
+//     new RegExp(regex, 'gi'),
+//     ''
+//   );
+//   Object.keys(filterObj).forEach(key => {
+//     const ig = ignore().add(filterObj[key]);
+//     if (ig.ignores(newFilename)) {
+//       include = true;
+//     }
+//   });
+//   return include;
+// }
+
+function isFileNameMatchingPattern({
+  filename,
+  filterObject,
+  plugins,
+  rootDir
+}) {
+  const finalPlugins = []; // console.log(rootDir);
+  // const regex = `^(.+?)${rootDir}?\\\\`;
+
+  const newFilename = path.relative(rootDir, filename); //windowsModificationFile(filename).replace(
+  //   new RegExp(regex, 'gi'),
+  //   ''
+  // );
+  // path.relative('supportapp', 'd:\')
+
+  Object.keys(filterObject).forEach(key => {
+    plugins.forEach(x => {
+      // console.log(key, x.postcssPlugin);
+      if (aliasNames[key] === x.postcssPlugin) {
+        const ig = (0, _ignore.default)({
+          allowRelativePaths: true
+        }).add(filterObject[key]);
+
+        if (ig.ignores(newFilename)) {
+          // console.log(newFilename);
+          finalPlugins.push(x);
+        }
+      }
+    });
+  }); // console.log(filename);
+  // console.log(finalPlugins);
+  // console.log('----------------------------------------------------------------------')
+
+  return finalPlugins; // console.log(filename, filterObject);
+}
+
+function isFileNameMatchingPluginPattern({
+  filename,
+  filterArr,
+  rootDir
+}) {
+  let include = true; // console.log(rootDir);
+  // const regex = `^(.+?)${rootDir}?\\\\`;
+  // console.log(plugin);
+
+  const newFilename = path.relative(rootDir, filename); // const newFilename = windowsModificationFile(filename).replace(
+  //   new RegExp(regex, 'gi'),
+  //   ''
+  // );
+
+  const ig = (0, _ignore.default)({
+    allowRelativePaths: true
+  }).add(filterArr);
+
+  if (!ig.ignores(newFilename)) {
+    include = false;
+  }
+
+  return include;
+}

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

@@ -0,0 +1,30 @@
+"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);
+const ignore3 = ignore().add(ignoreArr3);
+files.forEach(file => {
+  // console.log(file);
+  const rootDir = 'supportapp';
+  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));
+    console.log(ignore3.ignores(newFilename));
+    console.log('--------------------------------------------------------------------');
+  }
+});

package/lib/postcss-plugins/EmptyPlugin.js

@@ -0,0 +1,8 @@
+"use strict";
+
+var _postcss = _interopRequireDefault(require("postcss"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+module.exports = _postcss.default.plugin('postcss-empty', () => (root, result) => {// console.log(root.source.input.from, result);
+});

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;
-    let isIgnoredFile = opts.ignore.some(file => inputFile.indexOf(file) !== -1);
+    const 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/IncludePlugin.js

@@ -13,7 +13,6 @@ module.exports = _postcss.default.plugin('postcss-include-files', opts => {
     const includeFile = opts.include.some(file => inputFile.indexOf(file) !== -1);
 
     if (includeFile) {
-      // console.log(inputFile);
       const handler = response => response.messages.forEach(msg => result.messages.push(msg));
 
       return (0, _postcss.default)(plugins).process(root, {

package/lib/postcss-plugins/RTLSplitPlugin.js

@@ -18,7 +18,6 @@ const oppositeDir = {
 };
 
 function compareSelector(selector1, selector2) {
-  // console.log({ selector1, selector2 }, selector1 === selector2);
   return selector1 === selector2;
 }
 
@@ -38,11 +37,11 @@ function selectorMinifySameDir(selector, direction) {
   const regex = getRegex(direction);
   return selector.replace(regex, '').trim();
 }
-/**
- * this funtion will remove given rule,
- *  if given selector and it's previous sibiling rule selector  are same
- * current rule properties will move to previous sibiling rule.
- * @param {Rule} rule current rule
+/**
+ * this funtion will remove given rule,
+ *  if given selector and it's previous sibiling rule selector  are same
+ * current rule properties will move to previous sibiling rule.
+ * @param {Rule} rule current rule
  */
 
 
@@ -57,16 +56,15 @@ function mergeIfSameSelector(rule) {
     rule.remove();
   }
 }
-/**
- * this funtion will remove given rule,
- *  if given selector and it's previous sibiling rule selector  are same
- * current rule properties will move to previous sibiling rule.
- * @param {Rule} rule current rule
+/**
+ * this funtion will remove given rule,
+ *  if given selector and it's previous sibiling rule selector  are same
+ * current rule properties will move to previous sibiling rule.
+ * @param {Rule} rule current 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
@@ -87,11 +85,10 @@ function removeIfOppsiteDirRule(rule, direction, rootOptions) {
 }
 
 function removeIfOppsiteDirKeyframe(rule, direction) {
-  let name = rule.params;
-  let keyFrameDirName = name.slice(name.lastIndexOf('-') + 1);
+  const name = rule.params;
+  const keyFrameDirName = name.slice(name.lastIndexOf('-') + 1);
 
   if (keyFrameDirName === oppositeDir[direction]) {
-    // console.log({ m: 'removed', keyFrameName: rule.params });
     rule.remove();
   }
 }
@@ -109,12 +106,10 @@ function separateSingleDir(root, direction, rootOptions) {
 
 function separateRtlAndLtr(css, rootOptions) {
   // let processor = postcss([]).process(css);
-  let root = postcss.parse(css); // let { root } = processor;
-  // console.log(processor, root);
+  const root = postcss.parse(css); // let { root } = processor;
   // NOTE: I did first rtl then ltr , Because  for ltr I use original root ref
 
-  const rtlRoot = separateSingleDir(root.clone(), 'rtl', rootOptions); // console.log('############################');
-
+  const rtlRoot = separateSingleDir(root.clone(), 'rtl', rootOptions);
   const ltrRoot = separateSingleDir(root, 'ltr', rootOptions);
   return {
     ltrRoot,
@@ -132,7 +127,6 @@ 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

@@ -18,7 +18,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 //     }
 //   };
 // });
-// export default 
+// export default
 module.exports = _postcss.default.plugin('postcss-value-replacer', (valueReplacer = {}) => // Work with options here
 root => {
   root.walkDecls(decl => {
@@ -31,16 +31,5 @@ root => {
       }
     }); //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
-  // });
+  });
 });