@zohodesk/react-cli 1.1.6 → 1.1.8-exp.1

package/lib/plugins/utils/fileHandling.js

@@ -6,15 +6,13 @@ Object.defineProperty(exports, "__esModule", {
 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 = {
+const aliasNames = {
   valueReplacer: 'postcss-value-replacer',
   selectorReplace: 'postcss-selector-replace-new',
   hasRTL: 'postcss-rtl',
@@ -23,10 +21,10 @@ let aliasNames = {
   cssVariableReplacement: 'postcss-variable-report',
   composeMinification: 'postcss-compose-plugin'
 };
-/*
-
-unique scenario
-
+/*
+
+unique scenario
+
 */
 // export function filterFileCssUniqueness(filename, filterObj) {
 //   let rootDir = 'supportapp';
@@ -48,48 +46,43 @@ unique scenario
 function isFileNameMatchingPattern({
   filename,
   filterObject,
-  plugins
+  plugins,
+  order
 }) {
+  const pluginObj = {};
+  plugins.forEach(p => {
+    pluginObj[p.postcssPlugin] = p;
+  });
   const finalPlugins = [];
-  Object.keys(filterObject).forEach(key => {
-    plugins.forEach(x => {
-      if (aliasNames[key] === x.postcssPlugin) {
-        const ig = (0, _ignore.default)({
-          allowRelativePaths: true
-        }).add(filterObject[key]);
-
-        if (ig.ignores(filename)) {
-          finalPlugins.push(x);
-        }
+  order.forEach(key => {
+    const p = pluginObj[aliasNames[key]];
+    const pluginSpecificFilter = filterObject[key];
+
+    if (!pluginSpecificFilter || pluginSpecificFilter.length === 0) {
+      finalPlugins.push(p);
+    } else {
+      // eslint-disable-next-line no-use-before-define
+      const isMatching = isFilePathMatchingPattern(filename, pluginSpecificFilter);
+
+      if (isMatching) {
+        finalPlugins.push(p);
       }
-    });
-  }); // console.log(filename);
+    }
+  });
+  return finalPlugins;
+}
 
-  return finalPlugins; // console.log(filename, filterObject);
+function isFilePathMatchingPattern(filePath, patterns) {
+  const ig = (0, _ignore.default)({
+    allowRelativePaths: true
+  }).add(patterns);
+  return ig.ignores(filePath);
 }
 
 function isFileNameMatchingPluginPattern({
   filename,
-  filterArr // =process.cwd()
-
+  filterArr
 }) {
-  // console.log(rootDir);
-  let include = true; // console.log(rootDir);
-  // const regex = `^(.+?)${rootDir}?\\\\`;
-  // console.log(plugin);
-
-  const newFilename = path.relative(path.parse(process.cwd()).base, 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;
+  const newFilename = path.relative(path.parse(process.cwd()).base, filename);
+  return isFilePathMatchingPattern(newFilename, filterArr);
 }

package/lib/plugins/variableConvertorUtils.js

@@ -12,15 +12,15 @@ var _classHandling = require("./utils/classHandling");
 const ignoreVals = ['--zd_size', '--zd_font_size', '--size', '--size_']; // 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 
 */
 
 exports.ignoreVals = ignoreVals;

package/lib/postcss-plugins/RTLSplitPlugin.js

@@ -37,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
  */
 
 
@@ -56,11 +56,11 @@ 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
  */
 
 

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',

package/lib/schemas/index.js

@@ -36,6 +36,9 @@ var _default = {
       cli: 'stop_nodemon'
     }
   },
+  resourceHints: {
+    allowPrefetchingMultipleChunks: false
+  },
   i18n: {
     chunkSplitEnable: {
       value: false,
@@ -68,17 +71,9 @@ var _default = {
       before: [],
       after: []
     },
-    plugins: {
-      valueReplacer: false,
-      selectorReplace: false,
-      hasRTL: false,
-      hoverActive: false,
-      combinerMediaQuery: false,
-      cssVariableReplacement: false,
-      selectorWeight: false,
-      minifier: false,
-      composeMinification: false
-    },
+    plugins: null,
+    // @type  {Boolean | Array}
+    postCssPluginOrder: null,
     patterns: {
       valueReplacer: [],
       selectorReplace: [],
@@ -95,7 +90,8 @@ var _default = {
       hoverActive: [],
       combinerMediaQuery: [],
       cssVariableReplacement: [],
-      selectorWeight: []
+      selectorWeight: [],
+      hasRTL: []
     },
     cssVariableReplacementConfig: '',
     selectorWeightConfig: {
@@ -267,17 +263,8 @@ var _default = {
       value: true,
       cli: 'enable_smaphook'
     },
-    plugins: {
-      valueReplacer: false,
-      selectorReplace: false,
-      hasRTL: false,
-      hoverActive: false,
-      combinerMediaQuery: false,
-      cssVariableReplacement: false,
-      selectorWeight: false,
-      minifier: false,
-      composeMinification: false
-    },
+    plugins: null,
+    postCssPluginOrder: null,
     patterns: {
       valueReplacer: [],
       selectorReplace: [],
@@ -294,7 +281,8 @@ var _default = {
       hoverActive: [],
       combinerMediaQuery: [],
       cssVariableReplacement: [],
-      selectorWeight: []
+      selectorWeight: [],
+      hasRTL: []
     },
     cssVariableReplacementConfig: '',
     selectorWeightConfig: {
@@ -333,6 +321,7 @@ var _default = {
       inject: true
     },
     removePropTypes: false,
+    customChunksBaseConfig: null,
     customChunks: [{
       name: 'styles',
       pattern: '\\.css$'
@@ -382,18 +371,14 @@ var _default = {
       value: true,
       cli: 'react_live'
     },
+    enableMDParser: {
+      value: true,
+      cli: 'markdown_parser'
+    },
     rtlExclude: [],
     selectorReplace: null,
-    plugins: {
-      rtl: false,
-      hoverActive: false,
-      combinerMediaQuery: false,
-      cssVariableReplacement: false,
-      selectorWeight: false,
-      minifier: false,
-      composeMinification: false,
-      selectorReplace: false
-    },
+    plugins: null,
+    postCssPluginOrder: null,
     patterns: {
       valueReplacer: [],
       selectorReplace: [],
@@ -401,14 +386,16 @@ var _default = {
       combinerMediaQuery: [],
       hasRTL: [],
       cssVariableReplacement: [],
-      selectorWeight: []
+      selectorWeight: [],
+      cssUniqueness: []
     },
     exclude: {
       rtl: [],
       hoverActive: [],
       combinerMediaQuery: [],
       cssVariableReplacement: [],
-      selectorWeight: []
+      selectorWeight: [],
+      hasRTL: []
     },
     cssVariableReplacementConfig: '',
     selectorWeightConfig: {

package/lib/sh/pre-commit.sh

@@ -1,34 +1,34 @@
-#!/bin/sh
-
-STAGED_FILES=$(git diff --cached --name-only --diff-filter=ACM | grep -E "\.(js)$") # Get staged files
-
-CURRENT_BRANCH=$(git branch | sed -n -e 's/^\* \(.*\)/\1/p') # Get branch name
-
-echo "Branch Name - $CURRENT_BRANCH"
-
-if [[ "$STAGED_FILES" = "" ]]; then
-  exit 0
-fi
-
-IS_FAILED=false
-FILES=""
-
-for FILE in $STAGED_FILES # Add files with space separation
-do
-	FILES+="$FILE "
-done
-
-npm run lint --prefix ${PREFIX_PATH} $FILES # Run ESLint
-
-if [[ "$?" != 0 ]]; then
-	IS_FAILED=true
-fi
-
-if $IS_FAILED; then
-  echo "\033[41mCOMMIT FAILED:\033[0m Your commit contains files that should pass ESLint but do not. Please fix the ESLint errors and try again.\n"
-  exit 1
-else
-  echo "\033[42mCOMMIT SUCCEEDED\033[0m\n"
-fi
-
-exit $?
+#!/bin/sh
+
+STAGED_FILES=$(git diff --cached --name-only --diff-filter=ACM | grep -E "\.(js)$") # Get staged files
+
+CURRENT_BRANCH=$(git branch | sed -n -e 's/^\* \(.*\)/\1/p') # Get branch name
+
+echo "Branch Name - $CURRENT_BRANCH"
+
+if [[ "$STAGED_FILES" = "" ]]; then
+  exit 0
+fi
+
+IS_FAILED=false
+FILES=""
+
+for FILE in $STAGED_FILES # Add files with space separation
+do
+	FILES+="$FILE "
+done
+
+npm run lint --prefix ${PREFIX_PATH} $FILES # Run ESLint
+
+if [[ "$?" != 0 ]]; then
+	IS_FAILED=true
+fi
+
+if $IS_FAILED; then
+  echo "\033[41mCOMMIT FAILED:\033[0m Your commit contains files that should pass ESLint but do not. Please fix the ESLint errors and try again.\n"
+  exit 1
+else
+  echo "\033[42mCOMMIT SUCCEEDED\033[0m\n"
+fi
+
+exit $?

package/lib/sh/reportPublish.sh

@@ -1,45 +1,45 @@
-#!/bin/bash
-branchName=$2
-url=$1
-zipUrl=$3
-unique=$(date +"%d_%m_%y_Time_%H_%M_%S")
-publishFolder=$branchName"_"$unique
-
-rm -rf ./reports
-rm -rf ./scrTemplate
-rm -rf ./errTemplate
-rm -rf ./css
-rm -rf ./js
-rm -rf ./index.html
-
-curl $zipUrl | tar xz
-
-cp -rf ./reports/css ./css
-cp -rf ./reports/js ./js
-cp -rf ./reports/index.html ./index.html
-if [ -d "./screenShots" ] ; then
-  cp -rf ./scrTemplate/* ./screenShots/
-else
-  mkdir ./screenShots
-  cp -rf ./scrTemplate/* ./screenShots/
-fi
-
-[ ! -f "./result.json" ] && touch result.json && cp -rf ./errTemplate/* ./result.json
-[ ! -d "./commitCoverage" ] && mkdir commitCoverage && cp -rf ./errTemplate/* ./commitCoverage/
-[ ! -d "./unittest" ] && mkdir unittest && cp -rf ./errTemplate/* ./unittest/
-[ ! -d "./coverageTest" ] && mkdir coverageTest && cp -rf ./errTemplate/* ./coverageTest/
-[ ! -d "./coverage" ] && mkdir coverage && cp -rf ./errTemplate/* ./coverage/
-
-tar -czvf $publishFolder.tar.gz coverage screenShots unittest coverageTest commitCoverage ./css ./js ./index.html ./result.json
-
-curl -i -F name=file -F file=@$publishFolder.tar.gz $url"/cgi-bin/upload.py"
-replace=$publishFolder
-reportUrl=$url"/"$replace
-subject="Client Report - React - $publishFolder"
-msg="<p><b>Report URL - <a href='$reportUrl'>Link</a></b></p>
-<p><b>Report Branchname - $branchName</b></p>
-<p><b>Report Unique ID - $unique</b></p>
-<p><b>Report Developer - $6</b></p>"
-#node mailSender.js <from> <pass> <to> <subject> <text>
-BASEDIR=$(dirname "$0")
-node $BASEDIR"/../utils/mailSender" $4 $5 $6 "$subject" "$msg" $7 $8 "$reportUrl"
+#!/bin/bash
+branchName=$2
+url=$1
+zipUrl=$3
+unique=$(date +"%d_%m_%y_Time_%H_%M_%S")
+publishFolder=$branchName"_"$unique
+
+rm -rf ./reports
+rm -rf ./scrTemplate
+rm -rf ./errTemplate
+rm -rf ./css
+rm -rf ./js
+rm -rf ./index.html
+
+curl $zipUrl | tar xz
+
+cp -rf ./reports/css ./css
+cp -rf ./reports/js ./js
+cp -rf ./reports/index.html ./index.html
+if [ -d "./screenShots" ] ; then
+  cp -rf ./scrTemplate/* ./screenShots/
+else
+  mkdir ./screenShots
+  cp -rf ./scrTemplate/* ./screenShots/
+fi
+
+[ ! -f "./result.json" ] && touch result.json && cp -rf ./errTemplate/* ./result.json
+[ ! -d "./commitCoverage" ] && mkdir commitCoverage && cp -rf ./errTemplate/* ./commitCoverage/
+[ ! -d "./unittest" ] && mkdir unittest && cp -rf ./errTemplate/* ./unittest/
+[ ! -d "./coverageTest" ] && mkdir coverageTest && cp -rf ./errTemplate/* ./coverageTest/
+[ ! -d "./coverage" ] && mkdir coverage && cp -rf ./errTemplate/* ./coverage/
+
+tar -czvf $publishFolder.tar.gz coverage screenShots unittest coverageTest commitCoverage ./css ./js ./index.html ./result.json
+
+curl -i -F name=file -F file=@$publishFolder.tar.gz $url"/cgi-bin/upload.py"
+replace=$publishFolder
+reportUrl=$url"/"$replace
+subject="Client Report - React - $publishFolder"
+msg="<p><b>Report URL - <a href='$reportUrl'>Link</a></b></p>
+<p><b>Report Branchname - $branchName</b></p>
+<p><b>Report Unique ID - $unique</b></p>
+<p><b>Report Developer - $6</b></p>"
+#node mailSender.js <from> <pass> <to> <subject> <text>
+BASEDIR=$(dirname "$0")
+node $BASEDIR"/../utils/mailSender" $4 $5 $6 "$subject" "$msg" $7 $8 "$reportUrl"