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

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/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,18 +18,27 @@ 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 => {
     valueReplacer.forEach(obj => {
       if (obj.props.indexOf(decl.prop) !== -1) {
-        let ks = Object.keys(obj.values).sort((a, b) => b.length - a.length);
+        const ks = Object.keys(obj.values).sort((a, b) => b.length - a.length);
         ks.forEach(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
-  });
+    }); // 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];
+  //     }
+  //   });
+  //   // Transform CSS AST here
+  // });
 });

package/lib/postcss-plugins/__test__/test1Input.css

@@ -1,39 +1,39 @@
-/*Hover_active:ignore*/
-g,a:hover{
-	color : red
-}
-/*Hover:ignore*/
-h:hover{
-background : yellow
-}
-
-/* Hover_active:ignore */
-g,d+e:hover{
-	color : black
-}
-
-g,d e:hover{
-	color : black
-}
-
-@media screen and (max-width:61.25em){
-  /* Hover_active:ignore */
-  a,b,a:hover, b:hover{
-  background-color : blue
-  }
-  a + b,a:hover + b:hover{
-  background-color : blue
-  }
-  a b:hover{
-  background-color : blue
-  }
-  
-  .cc:hover {
-    color: red;
-  }
-
-  c:hover{
-  color : red
-  }
-  
+/*Hover_active:ignore*/
+g,a:hover{
+	color : red
+}
+/*Hover:ignore*/
+h:hover{
+background : yellow
+}
+
+/* Hover_active:ignore */
+g,d+e:hover{
+	color : black
+}
+
+g,d e:hover{
+	color : black
+}
+
+@media screen and (max-width:61.25em){
+  /* Hover_active:ignore */
+  a,b,a:hover, b:hover{
+  background-color : blue
+  }
+  a + b,a:hover + b:hover{
+  background-color : blue
+  }
+  a b:hover{
+  background-color : blue
+  }
+  
+  .cc:hover {
+    color: red;
+  }
+
+  c:hover{
+  color : red
+  }
+  
 }

package/lib/postcss-plugins/__test__/test1Output.css

@@ -1,39 +1,39 @@
-/*Hover_active:ignore*/
-g,a:hover{
-	color : red
-}
-/*Hover:ignore*/
-h:hover{
-background : yellow
-}
-
-/* Hover_active:ignore */
-g,d+e:hover{
-	color : black
-}
-
-g,d e:hover{
-	color : black
-}
-
-@media screen and (max-width:61.25em){
-  /* Hover_active:ignore */
-  a,b,a:hover, b:hover{
-  background-color : blue
-  }
-  a + b,a:hover + b:hover{
-  background-color : blue
-  }
-  a b:hover{
-  background-color : blue
-  }
-  
-  .cc:hover {
-    color: red;
-  }
-
-  c:hover{
-  color : red
-  }
-  
+/*Hover_active:ignore*/
+g,a:hover{
+	color : red
+}
+/*Hover:ignore*/
+h:hover{
+background : yellow
+}
+
+/* Hover_active:ignore */
+g,d+e:hover{
+	color : black
+}
+
+g,d e:hover{
+	color : black
+}
+
+@media screen and (max-width:61.25em){
+  /* Hover_active:ignore */
+  a,b,a:hover, b:hover{
+  background-color : blue
+  }
+  a + b,a:hover + b:hover{
+  background-color : blue
+  }
+  a b:hover{
+  background-color : blue
+  }
+  
+  .cc:hover {
+    color: red;
+  }
+
+  c:hover{
+  color : red
+  }
+  
 }

package/lib/postcss-plugins/hoverActivePlugin.js

@@ -4,9 +4,9 @@ var _postcss = _interopRequireDefault(require("postcss"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-/**
- * we have give support for ignore(exclude) comments
- * These are the comments' keyword
+/**
+ * we have give support for ignore(exclude) comments
+ * These are the comments' keyword
  */
 const hoverIgnoreQuery = 'Hover:ignore',
       activeIgnoreQuery = 'Active:ignore',
@@ -158,7 +158,6 @@ 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,
@@ -232,7 +231,6 @@ 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 => {
@@ -288,13 +286,10 @@ 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
 
@@ -311,7 +306,6 @@ 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/index.js

@@ -127,7 +127,25 @@ const singleConvertor = (value, changeVal, details, range) => {
     path: path
   };
   errHandler.errorTable.push(errObj);
-  errHandler.errorFunction(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;
+  // } else {
+  //   console.log('++++++++++++++++++++++rect val!', value);
+  // }
+
   return;
 };
 
@@ -188,8 +206,7 @@ module.exports = {
           }
 
           if (settingsObject[decl.prop] && !decl.value.includes('var(--')) {
-            const settings = settingsObject[decl.prop]; // console.log(settings)
-
+            const settings = settingsObject[decl.prop];
             const {
               allowed,
               range

package/lib/postcss-plugins/variableModifier.js

@@ -7,19 +7,19 @@ const path = require('path');
 const fs = require('fs');
 
 function populateArray(start, end) {
-  let temp = [];
+  const temp = [];
 
-  for (var i = start; i < end; i++) {
+  for (let i = start; i < end; i++) {
     temp.push(i);
   }
 
   return temp;
 }
 
-let allwdVars = {
+const allwdVars = {
   'font-size': ['px', 'em']
 };
-let numberObject = {
+const numberObject = {
   'font-size': {
     allowed: ['px', 'em'],
     replacements: {
@@ -89,27 +89,21 @@ function hasIgnoreComment(node) {
   return node ? node.type == 'comment' ? node.text == 'Variable:Ignore' ? true : false : false : false;
 }
 
-let errors = [];
+const errors = [];
 module.exports = postcss.plugin('postcss-variable-report', () => rootOriginal => {
-  // console.log('inside postcss plugin')
-  // fs.writeFile('./css_error.log', '\r\nLog File: \r\n\r\n', (err) => {
-  //    if(err)console.log(err);
-  // });
-  // console.log(rootOriginal.source.input.file);
   if (!rootOriginal.source.input.file.includes('css_error')) {
     rootOriginal.walkRules(rule => {
       rule.walkDecls((decl, position) => {
         // case font-size
         if (!hasIgnoreComment(rule.nodes[position - 1])) {
-          // console.log(settings)
-          let unit = decl.value.replace(/[0-9]/g, '');
-          let settings = numberObject[decl.prop];
-          let path = rootOriginal.source.input.from;
+          const unit = decl.value.replace(/[0-9]/g, '');
+          const settings = numberObject[decl.prop];
+          const path = rootOriginal.source.input.from;
           let filename = path.split('\\');
           filename = filename[filename.length - 1];
 
           if (decl.prop === 'font-size' || decl.prop === 'margin-left' || decl.prop === 'margin-right' || decl.prop === 'margin-top' || decl.prop === 'margin-bottom') {
-            let {
+            const {
               allowed,
               replacements,
               available
@@ -118,12 +112,11 @@ module.exports = postcss.plugin('postcss-variable-report', () => rootOriginal =>
             if (!rootOriginal.source.input.from.includes('node_modules')) {
               if (unit != 0) {
                 if (allowed.includes(unit)) {
-                  // console.log(available, parseInt(decl.value))
                   if (available.includes(parseInt(decl.value))) {
                     // replacementValues[unit].push({[decl.value] : replacements[unit].replace('$$', parseInt(decl.value))})
-                    decl.value = replacements[unit].replace('$$', parseInt(decl.value)); //console.log("replacements:")
+                    decl.value = replacements[unit].replace('$$', parseInt(decl.value));
                   } else {
-                    let err = {
+                    const err = {
                       prop: decl.prop,
                       value: decl.value,
                       filename,
@@ -135,7 +128,7 @@ module.exports = postcss.plugin('postcss-variable-report', () => rootOriginal =>
                     errors.push(err);
                   }
                 } else {
-                  let err = {
+                  const err = {
                     prop: decl.prop,
                     value: decl.value,
                     filename,
@@ -149,36 +142,33 @@ module.exports = postcss.plugin('postcss-variable-report', () => rootOriginal =>
               }
             }
           } else if (decl.prop === 'margin') {
-            let {
+            const {
               allowed,
               replacements,
               available
-            } = settings; //console.log(decl.prop + "  " + decl.value)
-
-            let valArr = decl.value.split(' '); //console.log(valArr)
-            //console.log(allowed, replacements, available)
-
+            } = settings;
+            const valArr = decl.value.split(' ');
             let hasError = false;
             let newVal = '';
             valArr.forEach(val => {
-              let unit = val.replace(parseInt(val), '');
-              let numVal = parseInt(val);
+              const unit = val.replace(parseInt(val), '');
+              const numVal = parseInt(val);
 
               if (unit != 0) {
                 if (allowed.includes(unit)) {
                   if (available.includes(numVal)) {
                     if (numVal >= 0) {
                       if (!hasError) {
-                        newVal += replacements[unit].replace('$$', numVal) + " ";
+                        newVal += `${replacements[unit].replace('$$', numVal)} `;
                       }
                     } else {
                       if (!hasError) {
-                        newVal += `calc(${replacements[unit].replace('$$', numVal * -1)} * -1)` + " ";
+                        newVal += `calc(${replacements[unit].replace('$$', numVal * -1)} * -1)` + ' ';
                       }
                     }
                   } else {
                     hasError = true;
-                    let err = {
+                    const err = {
                       prop: decl.prop,
                       value: numVal,
                       filename,
@@ -191,7 +181,7 @@ module.exports = postcss.plugin('postcss-variable-report', () => rootOriginal =>
                   }
                 } else {
                   hasError = true;
-                  let err = {
+                  const err = {
                     prop: decl.prop,
                     value: decl.value,
                     filename,
@@ -211,34 +201,10 @@ module.exports = postcss.plugin('postcss-variable-report', () => rootOriginal =>
           }
         }
       });
-    }); //fs.writeFile('./src/trial.json', JSON.stringify(variables) ,(err) =>{
-    //    if(err)console.log(err);
-    //    else{
-    //        console.log('updated successfully');
-    //    }
-    // })
-    // console.log(errors)
-
-    let errorArr = [];
+    });
+    const errorArr = [];
     errors.forEach(errStr => {
       errorArr.push(` prop: ${errStr.prop} ,\n value : ${errStr.value} ,\n filename : ${errStr.filename} ,\n filepath : ${errStr.filepath} ,\n line : ${errStr.line} ,\n unit : ${errStr.unit} ,\n message : ${errStr.message} \r`);
-    }); //fs.writeFile('./css_error.log','', (err) =>{
-    //    if(err){
-    //        console.log(err);
-    //    }
-    //});
-    // errorArr.forEach(err => {
-    //   let data = `\n{\n${err}\n},\n`;
-    //   //fs.appendFile('./css_error.log',data,(err)=>{
-    //   //    if(err){
-    //   //       console.log(err);
-    //   //    }
-    //   //})
-    // });
-    // fs.writeFileSync('./css_error.log','');
-    //  errorArr.forEach(err => {
-    //    let data = `\n{\n${err}\n},\n`;
-    //    fs.appendFileSync('./css_error.log',data);
-    //  });
+    });
   }
 });