npm - @zohodesk/react-cli - Versions diffs - 1.1.14-kubernetes → 1.1.15-exp.1 - Mend

@zohodesk/react-cli 1.1.14-kubernetes → 1.1.15-exp.1

Files changed (510) hide show

package/lib/sh/reportPublish.sh CHANGED Viewed

@@ -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"

package/lib/utils/buildstats.html CHANGED Viewed

@@ -1,148 +1,148 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=windows-1252" />
-    <style>
-      #file {
-        font-family: 'Trebuchet MS', Arial, Helvetica, sans-serif;
-        border-collapse: collapse;
-        width: 100%;
-      }
-      #redTd {
-        color: red;
-      }
-      #greenTD {
-        color: green;
-      }
-      #file td,
-      #file th {
-        border: 1px solid #ddd;
-        padding: 8px;
-        text-align: center;
-      }
-      #file tr:nth-child(even) {
-        background-color: #f2f2f2;
-      }
-      #file tr:hover {
-        background-color: #ddd;
-      }
-      #file th {
-        padding-top: 12px;
-        padding-bottom: 12px;
-        background-color: #2a2d36;
-        color: white;
-      }
-      #sizeTable {
-        float: left;
-        width: 50%;
-      }
-      #hashTable {
-        display: inline-block;
-        width: 50%;
-      }
-    </style>
-    <script type="text/javascript" src="./buildtrack.js"></script>
-  </head>
-  <body>
-    <div>
-      <div style="float: left;margin-right: 10px;">Branch Name:</div>
-      <h4 id="h4" style="margin: 0px;"></h4>
-    </div>
-    <div id="sizeTable">
-      <div>
-        <h3>Size changes</h3>
-        <h3></h3>
-      </div>
-      <table id="file" class="table table-bordered table-hover table-condensed">
-        <thead>
-          <tr>
-            <th title="Field #1">Name</th>
-            <th title="Field #2">Size / Diff</th>
-            <th title="Field #3">Size / Old</th>
-            <th title="Field #4">Size / New</th>
-          </tr>
-        </thead>
-        <tbody id="sizeTbody"></tbody>
-      </table>
-    </div>
-    <div id="hashTable">
-      <div>
-        <h3>Hash changes</h3>
-        <h3></h3>
-      </div>
-      <table id="file" class="table table-bordered table-hover table-condensed">
-        <thead>
-          <tr>
-            <th style="background-color: #4CAF50;" title="Field #1">Name</th>
-            <th style="background-color: #4CAF50;" title="Field #2">
-              Hash / Old
-            </th>
-            <th style="background-color: #4CAF50;" title="Field #3">
-              Hash / New
-            </th>
-          </tr>
-        </thead>
-        <tbody id="hashTbody"></tbody>
-      </table>
-    </div>
-    <script type="text/javascript">
-      function load() {
-        if (statsJson) {
-          var tdStringSize = '';
-          var tdStringHash = '';
-          if (statsJson.increased.length > 0) {
-            statsJson.increased.forEach(fileObj => {
-              let colorTD = '</td><td>';
-              if (fileObj.size.diff.split(' ').length > 2) {
-                colorTD = '</td><td id="greenTd">';
-              } else {
-                colorTD = '</td><td id="redTd">';
-              }
-              tdStringSize =
-                tdStringSize +
-                '<tr><td>' +
-                fileObj.name +
-                colorTD +
-                fileObj.size.diff +
-                '</td><td>' +
-                fileObj.size.old +
-                '</td><td>' +
-                fileObj.size.new +
-                '</td><tr>';
-            });
-          } else {
-            tdStringSize = '<tr><td></td><td></td><td></td></tr>';
-          }
-          document.getElementById('sizeTbody').innerHTML = tdStringSize;
-          if (statsJson.hashChanged.length > 0) {
-            statsJson.hashChanged.forEach(fileObj => {
-              tdStringHash =
-                tdStringHash +
-                '<tr><td>' +
-                fileObj.name +
-                '</td><td>' +
-                fileObj.hash.old +
-                '</td><td>' +
-                fileObj.hash.new +
-                '</td><tr>';
-            });
-          } else {
-            tdStringHash = '<tr><td></td><td></td><td></td></tr>';
-          }
-          document.getElementById('hashTbody').innerHTML = tdStringHash;
-          if (statsJson.branchName) {
-            document.getElementById('h4').innerHTML = statsJson.branchName;
-          } else {
-            document.getElementById('h4').innerHTML = 'Not specified';
-          }
-        }
-      }
-      load();
-    </script>
-  </body>
-</html>
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=windows-1252" />
+    <style>
+      #file {
+        font-family: 'Trebuchet MS', Arial, Helvetica, sans-serif;
+        border-collapse: collapse;
+        width: 100%;
+      }
+      #redTd {
+        color: red;
+      }
+      #greenTD {
+        color: green;
+      }
+      #file td,
+      #file th {
+        border: 1px solid #ddd;
+        padding: 8px;
+        text-align: center;
+      }
+      #file tr:nth-child(even) {
+        background-color: #f2f2f2;
+      }
+      #file tr:hover {
+        background-color: #ddd;
+      }
+      #file th {
+        padding-top: 12px;
+        padding-bottom: 12px;
+        background-color: #2a2d36;
+        color: white;
+      }
+      #sizeTable {
+        float: left;
+        width: 50%;
+      }
+      #hashTable {
+        display: inline-block;
+        width: 50%;
+      }
+    </style>
+    <script type="text/javascript" src="./buildtrack.js"></script>
+  </head>
+  <body>
+    <div>
+      <div style="float: left;margin-right: 10px;">Branch Name:</div>
+      <h4 id="h4" style="margin: 0px;"></h4>
+    </div>
+    <div id="sizeTable">
+      <div>
+        <h3>Size changes</h3>
+        <h3></h3>
+      </div>
+      <table id="file" class="table table-bordered table-hover table-condensed">
+        <thead>
+          <tr>
+            <th title="Field #1">Name</th>
+            <th title="Field #2">Size / Diff</th>
+            <th title="Field #3">Size / Old</th>
+            <th title="Field #4">Size / New</th>
+          </tr>
+        </thead>
+        <tbody id="sizeTbody"></tbody>
+      </table>
+    </div>
+    <div id="hashTable">
+      <div>
+        <h3>Hash changes</h3>
+        <h3></h3>
+      </div>
+      <table id="file" class="table table-bordered table-hover table-condensed">
+        <thead>
+          <tr>
+            <th style="background-color: #4CAF50;" title="Field #1">Name</th>
+            <th style="background-color: #4CAF50;" title="Field #2">
+              Hash / Old
+            </th>
+            <th style="background-color: #4CAF50;" title="Field #3">
+              Hash / New
+            </th>
+          </tr>
+        </thead>
+        <tbody id="hashTbody"></tbody>
+      </table>
+    </div>
+    <script type="text/javascript">
+      function load() {
+        if (statsJson) {
+          var tdStringSize = '';
+          var tdStringHash = '';
+          if (statsJson.increased.length > 0) {
+            statsJson.increased.forEach(fileObj => {
+              let colorTD = '</td><td>';
+              if (fileObj.size.diff.split(' ').length > 2) {
+                colorTD = '</td><td id="greenTd">';
+              } else {
+                colorTD = '</td><td id="redTd">';
+              }
+              tdStringSize =
+                tdStringSize +
+                '<tr><td>' +
+                fileObj.name +
+                colorTD +
+                fileObj.size.diff +
+                '</td><td>' +
+                fileObj.size.old +
+                '</td><td>' +
+                fileObj.size.new +
+                '</td><tr>';
+            });
+          } else {
+            tdStringSize = '<tr><td></td><td></td><td></td></tr>';
+          }
+          document.getElementById('sizeTbody').innerHTML = tdStringSize;
+          if (statsJson.hashChanged.length > 0) {
+            statsJson.hashChanged.forEach(fileObj => {
+              tdStringHash =
+                tdStringHash +
+                '<tr><td>' +
+                fileObj.name +
+                '</td><td>' +
+                fileObj.hash.old +
+                '</td><td>' +
+                fileObj.hash.new +
+                '</td><tr>';
+            });
+          } else {
+            tdStringHash = '<tr><td></td><td></td><td></td></tr>';
+          }
+          document.getElementById('hashTbody').innerHTML = tdStringHash;
+          if (statsJson.branchName) {
+            document.getElementById('h4').innerHTML = statsJson.branchName;
+          } else {
+            document.getElementById('h4').innerHTML = 'Not specified';
+          }
+        }
+      }
+      load();
+    </script>
+  </body>
+</html>

package/lib/utils/cssClassNameGenerate.js CHANGED Viewed

@@ -9,13 +9,15 @@ var _os = _interopRequireDefault(require("os"));
 var _path = _interopRequireDefault(require("path"));
+var _fileHandling = require("../plugins/utils/fileHandling");
 var _getHash = _interopRequireDefault(require("./getHash"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-let isWindows = _os.default.platform().toLowerCase() === 'win32';
+const isWindows = _os.default.platform().toLowerCase() === 'win32';
-let isSelectorPackage = (resourcePath, packages) => {
+const isSelectorPackage = (resourcePath, packages) => {
   if (!resourcePath.includes('node_modules')) {
     return false;
   }
@@ -36,38 +38,93 @@ let isSelectorPackage = (resourcePath, packages) => {
   return isValid;
 };
+function patternBasedClass({
+  customClassNamePrefix,
+  context,
+  relativePath,
+  localName
+}) {
+  let newName = null;
+  customClassNamePrefix.forEach(obj => {
+    if (obj.enable) {
+      if (obj.patterns && obj.prefix && (0, _fileHandling.isFileNameMatchingPluginPattern)({
+        filename: context.resourcePath,
+        filterArr: obj.patterns
+      })) {
+        const h = (0, _getHash.default)(`${relativePath}-${localName}`, 10);
+        newName = `${obj.prefix}${h}`;
+      }
+    }
+  });
+  return newName;
+}
 var _default = (unique = true, {
   filenames,
   packages
-}, classNamePrefix) => (context, localIdentName, localName) => {
-  // NOTE:  in build macine we use date as folder path.
+}, classNamePrefix, customClassNamePrefix, patterns) => (context, localIdentName, localName) => {
+  // console.log(patterns, context.resourcePath);
+  // NOTE:  in build machine we use date as folder path.
   // So every time we create new build there is path will alway different
-  // in order to minmaze that problem we try in relative path;
+  // in order to minimize that problem we try in relative path;
   // console.log('context.resourcePath', context.resourcePath, context);
   // let contextResourcePath = context.resourcePath;
-  let relativePath = _path.default.relative(context.rootContext, context.resourcePath);
+  const filePaths = context.resourcePath.split(_path.default.sep);
+  const fileName = filePaths[filePaths.length - 1];
+  const [fileNameWithoutExt] = fileName.split('.');
+  const cleanFileName = fileNameWithoutExt.replace(/-/g, '_').toLowerCase();
+  const relativePath = _path.default.relative(context.rootContext, context.resourcePath); // console.log('customClassNamePrefix', customClassNamePrefix);
+  /*
+    input :
+    context.resourcePath : 'D:/MyWork/..../desk_client_app/supportapp/src/components/Avatar/Avatar.module.css,
+      patterns.cssVariableReplacement:
+    // include src folder, include deskapp folder, exclude node modules
+    "cssUniqueness": [
+      "src",
+      "deskapp",
+      "!node_modules"
+    ]
+      output :
+    true or false
+  */
   if (context.resourcePath.endsWith('.plain.css')) {
     return localName;
   }
+  if (!(0, _fileHandling.isFileNameMatchingPluginPattern)({
+    filename: context.resourcePath,
+    filterArr: patterns.cssUniqueness
+  })) {
+    return `${classNamePrefix}-${cleanFileName}-${localName}`;
+  }
   /* old production mode start without breaking so added. may be removed in future*/
   if (unique) {
-    let h = (0, _getHash.default)(`${relativePath}-${localName}`, 10);
+    const h = (0, _getHash.default)(`${relativePath}-${localName}`, 10);
     return `${classNamePrefix}${h}`;
   }
-  /* old production mode end*/
+  const patternClass = patternBasedClass({
+    customClassNamePrefix,
+    context,
+    relativePath,
+    localName
+  });
-  let filePaths = context.resourcePath.split(_path.default.sep);
-  let fileName = filePaths[filePaths.length - 1];
-  let [fileNameWithoutExt] = fileName.split('.');
-  let cleanFileName = fileNameWithoutExt.replace(/-/g, '_').toLowerCase(); //css file has casesensitive selector issue so can't toLowerCase
+  if (patternClass) {
+    return patternClass;
+  } //css file has case sensitive selector issue so can't toLowerCase
   //let local = localName.toLowerCase()
   if (isSelectorPackage(context.resourcePath, packages) || filenames.indexOf(cleanFileName) !== -1) {
-    let h = (0, _getHash.default)(`${relativePath}-${localName}`, 10);
+    const h = (0, _getHash.default)(`${relativePath}-${localName}`, 10);
     return `${classNamePrefix}${h}`;
   }

package/lib/utils/deprecationSupport.js ADDED Viewed

@@ -0,0 +1,134 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.deprecationSupport = deprecationSupport;
+var _path = _interopRequireDefault(require("path"));
+var deprecationHandlers = _interopRequireWildcard(require("../deprecationLogger"));
+var _windowsModification = require("../loaderUtils/windowsModification");
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+let {
+  deprecateMessage,
+  deprecateOption,
+  deprecationLoggerEnd
+} = deprecationHandlers;
+function modifyCssArr(arr) {
+  return arr.map(x => {
+    const includeCss = !x.startsWith('!');
+    const modifier = includeCss ? '/*.css' : '';
+    const filePath = x.replace(/^!/, ''); // Remove the "!" symbol if present
+    return (0, _windowsModification.windowsModificationFile)(_path.default.join(includeCss ? '**' : '!**', filePath, '**', modifier));
+  });
+}
+const defaultPostCssPluginOptions = {
+  valueReplacer: null,
+  hasRTL: false,
+  selectorReplace: null,
+  hoverActive: false,
+  combinerMediaQuery: false,
+  cssVariableReplacement: false,
+  selectorWeight: false,
+  minifier: false,
+  composeMinification: false
+};
+function deprecationSupport(options, disableDeprecationWarning) {
+  if (disableDeprecationWarning) {
+    /* eslint-disable no-empty-function */
+    deprecateMessage = () => {};
+    deprecateOption = () => {};
+    deprecationLoggerEnd = () => {};
+    /* eslint-enable no-empty-function */
+  }
+  options.app.plugins = options.app.plugins || defaultPostCssPluginOptions;
+  options.docs.plugins = options.docs.plugins || defaultPostCssPluginOptions;
+  options.css.plugins = options.css.plugins || defaultPostCssPluginOptions; // if (selectn(options, ".app.hasRTL") === true) {
+  if (options.app.hasRTL === true) {
+    deprecateOption('app.hasRTL', 'app.plugins.hasRTL');
+    options.app.plugins.hasRTL = true;
+  }
+  if (options.docs.hasRTL === true) {
+    deprecateOption('docs.hasRTL', 'docs.plugins.hasRTL');
+    options.docs.plugins.hasRTL = true;
+  }
+  if (options.app.selectorReplace !== null && options.app.plugins && (options.app.plugins.selectorReplace === null || options.app.plugins.selectorReplace === undefined)) {
+    deprecateMessage('when you use app.selectorReplace mention enable or disable app.plugins.selectorReplace by setting value to true or false');
+    options.app.plugins.selectorReplace = true;
+  }
+  if (options.docs.selectorReplace !== null && options.docs.plugins && (options.docs.plugins.selectorReplace === null || options.docs.plugins.selectorReplace === undefined)) {
+    deprecateMessage('when you use docs.selectorReplace mention enable or disable docs.plugins.selectorReplace by setting value to true or false');
+    options.docs.plugins.selectorReplace = true;
+  }
+  if (options.css.valueReplacer !== null && options.css.plugins && (options.app.plugins.valueReplacer === null || options.app.plugins.valueReplacer === undefined)) {
+    deprecateMessage('when you use app.valueReplacer mention enable or disable app.plugins.valueReplacer by setting value to true or false');
+    options.app.plugins.valueReplacer = true;
+  }
+  if (!options.app.patterns) {
+    options.app.patterns = {};
+  }
+  function handleRTL(rtlExclude, rtl, hasRTL, type) {
+    if (rtlExclude && rtlExclude.length > 0) {
+      options[type].patterns.hasRTL = modifyCssArr(rtlExclude);
+      deprecateOption(`${type}.rtlExclude`, `${type}.patterns.hasRTL`);
+    }
+    if (rtl && rtl.length > 0) {
+      options[type].patterns.hasRTL = modifyCssArr(rtl);
+      deprecateOption(`${type}.exclude.rtl`, `${type}.patterns.hasRTL`);
+    }
+    if (hasRTL && hasRTL.length > 0) {
+      options[type].patterns.hasRTL = modifyCssArr(hasRTL);
+      deprecateOption(`${type}.exclude.hasRTL`, `${type}.patterns.hasRTL`);
+    }
+  }
+  function addExcludesToPattern(patterns, exclude, type) {
+    Object.keys(defaultPostCssPluginOptions).forEach(key => {
+      if (!exclude[key] || exclude[key].length === 0) {
+        return;
+      }
+      if (patterns[key].length === 0) {
+        deprecateOption(`${type}.exclude.${key}`, `${type}.patterns.${key}`);
+        let tempArr = exclude[key];
+        tempArr = tempArr.map(x => _path.default.join('!**', x, '**')); // Since patterns[key] is empty we need to wildcard for allow all others.
+        tempArr.unshift('*');
+        patterns[key] = tempArr;
+      } else if (exclude[key].length > 0 && patterns[key].length > 0) {
+        deprecateOption(`${type}.exclude.${key}`, `${type}.patterns.${key}`, ` And Since you have used ${type}.patterns.${key} we won't use ${type}.exclude.${key}. So please make appropriate changes`);
+      }
+    });
+  }
+  handleRTL(options.app.rtlExclude, options.app.exclude.rtl, options.app.exclude.hasRTL, 'app');
+  handleRTL(options.docs.rtlExclude, options.docs.exclude.rtl, options.docs.exclude.hasRTL, 'docs');
+  addExcludesToPattern(options.app.patterns, options.app.exclude, 'app');
+  addExcludesToPattern(options.docs.patterns, options.docs.exclude, 'docs');
+  deprecationLoggerEnd();
+}