@zohodesk/react-cli 1.1.3 → 1.1.4-exp.2

package/lib/loaders/composeLoader.js

@@ -4,12 +4,43 @@ var _path = _interopRequireDefault(require("path"));
 
 var _postcss = _interopRequireDefault(require("postcss"));
 
+var _classHandling = require("../../lib/plugins/utils/classHandling");
+
+var _fileHandling = require("../plugins/utils/fileHandling");
+
+var _utils = require("../utils");
+
+var _ignore = _interopRequireDefault(require("ignore"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const supportedProps = ['margin-top', 'margin-bottom', 'margin-left', 'margin-right', //   'margin',
-'padding-top', 'padding-bottom', 'padding-left', 'padding-right', //   'padding',
-'top', 'bottom', 'left', 'right', 'height', 'width', 'min-height', 'min-width', 'max-height', 'max-width'];
+const supportedProps = ['margin-top', 'margin-bottom', 'margin-left', 'margin-right', 'margin', 'padding-top', 'padding-bottom', 'padding-left', 'padding-right', 'padding', 'top', 'bottom', 'left', 'right', 'height', 'width', 'min-height', 'min-width', 'max-height', 'max-width', 'float', 'overflow', 'position', 'display', 'text-align', 'white-space', 'visibility'];
 const renameProps = {
+  position: {
+    cls: 'posn'
+  },
+  display: {
+    cls: 'disp'
+  },
+  float: {
+    cls: 'flo'
+  },
+  overflow: {
+    cls: 'over'
+  },
+  'text-align': {
+    cls: 'txtAlgn'
+  },
+  'white-space': {
+    cls: 'whSpc'
+  },
+  visibility: {
+    cls: 'vis'
+  },
+  'font-size': {
+    pos: 'fs',
+    neg: 'fs_'
+  },
   'margin-top': {
     pos: 'mt',
     neg: 'mt_'
@@ -96,11 +127,48 @@ function objToClassName(prop, data) {
   return renameProps[prop] ? data < 0 ? renameProps[prop].neg ? `${renameProps[prop].neg}${data * -1}` : `undef${data * -1}` : renameProps[prop].pos ? `${renameProps[prop].pos}${data}` : `undef${data}` : `undef${data}`;
 }
 
+function objtoClassNameString(prop, data) {
+  let temp = data.toString().replace(/-/gi, '');
+  return `${renameProps[prop].cls}_${temp.replace(/\s*/gi, '')}`;
+}
+
+const multipleClassName = {
+  margin: ['margin-top', 'margin-right', 'margin-bottom', 'margin-left'],
+  padding: ['padding-top', 'padding-right', 'padding-bottom', 'padding-left']
+};
+
+function objToClassNameMultiple(prop, data) {
+  data = data.trim().replace(/\s+/gi, ' ');
+  let dataArr = data.split(' ');
+
+  if (dataArr.length === 3) {
+    dataArr[3] = dataArr[1];
+  }
+
+  if (dataArr.length === 2) {
+    dataArr[3] = dataArr[1];
+    dataArr[2] = dataArr[0];
+  }
+
+  if (dataArr.length === 1) {
+    dataArr[3] = dataArr[0];
+    dataArr[2] = dataArr[0];
+    dataArr[1] = dataArr[0];
+  }
+
+  let composeClasses = '';
+  dataArr.forEach((data, index) => composeClasses += `${objToClassName(multipleClassName[prop][index], parseInt(data, 10))} `);
+  composeClasses = composeClasses.substring(0, composeClasses.length - 1);
+  return composeClasses;
+}
+
 const commonFilePath = {
+  margin: 'src/common/css/margin.css',
   'margin-left': 'src/common/css/margin.css',
   'margin-right': 'src/common/css/margin.css',
   'margin-top': 'src/common/css/margin.css',
   'margin-bottom': 'src/common/css/margin.css',
+  padding: 'src/common/css/padding.css',
   'padding-left': 'src/common/css/padding.css',
   'padding-right': 'src/common/css/padding.css',
   'padding-top': 'src/common/css/padding.css',
@@ -114,8 +182,37 @@ const commonFilePath = {
   'min-height': 'src/common/css/height.css',
   'min-width': 'src/common/css/width.css',
   'max-height': 'src/common/css/height.css',
-  'max-width': 'src/common/css/width.css'
-}; // const preNames = {
+  'max-width': 'src/common/css/width.css',
+  fontSize: 'src/common/css/fontSize.css',
+  textProps: 'src/common/css/textProps.css',
+  display: 'src/common/css/textProps.css',
+  float: 'src/common/css/textProps.css',
+  overflow: 'src/common/css/textProps.css',
+  position: 'src/common/css/position.css',
+  'text-align': 'src/common/css/textProps.css',
+  'white-space': 'src/common/css/textProps.css',
+  visibility: 'src/common/css/textProps.css'
+};
+
+function generateComposeString(resourcePath, prop, value) {
+  let composeString = `from "${_path.default.relative(_path.default.parse(resourcePath).dir, // resourcePath
+  commonFilePath[prop]).replace(/\\/gi, '/')}"`;
+  let cls = '';
+
+  if (/^position|^overflow|^display|^float|^text-align|^white-space|^visibility/gi.test(prop)) {
+    console.log(prop, value, 'textvals');
+    cls = objtoClassNameString(prop, value);
+  } else if (/^margin$|^padding$/gi.test(prop)) {
+    // console.log(prop, value, 'margin');
+    cls = objToClassNameMultiple(prop, value);
+  } else {
+    // console.log(prop, value, 'common');
+    cls = objToClassName(prop, parseInt(value));
+  }
+
+  composeString = `${cls} ${composeString}`;
+  return composeString;
+} // const preNames = {
 //   height: 'zd-height-',
 //   'max-height': 'zd-height-',
 //   'min-height': 'zd-height-',
@@ -136,6 +233,7 @@ const commonFilePath = {
 //   'margin-right': 'zd-margin-'
 // };
 
+
 function allowParent(rule) {
   return rule.parent.type === 'root' || rule.parent.type === 'atrule' && rule.parent.name === 'media';
 }
@@ -144,25 +242,53 @@ module.exports = function (source) {
   const {
     resourcePath
   } = this;
+  const options = (0, _utils.getOptions)(); // console.log(options.app.patterns.composeMinification);
+  // const ig = ignore({ allowRelativePaths: true }).add(options.app.patterns.composeMinification);
+  // const newFilename = path.relative(path.parse(process.cwd()).base, resourcePath);
+  // console.log(newFilename, ig.ignores(newFilename));
 
   let root = _postcss.default.parse(source);
 
+  if (!(0, _fileHandling.isFileNameMatchingPluginPattern)({
+    filename: resourcePath,
+    filterArr: options.app.patterns.composeMinification
+  })) {
+    return root.toString();
+  }
+
   root.walkRules(rule => {
     rule.walkDecls(decl => {
+      if (/^-ms|^-webkit|^moz/gi.test(decl.prop)) {
+        return;
+      }
+
       if (!allowParent(rule)) {
         return;
       }
 
+      if ((0, _classHandling.isInsideMediaQuery)(rule)) {
+        console.log('inside media query', rule.selector);
+        return;
+      }
+
+      if (supportedProps.includes(decl.prop) && /^position$|^overflow|^float|^display|^text-align|^white-space|^visibility/gi.test(decl.prop) && !/[,\s+]+|(\w+)\.|:|::|body|(\d+)%|>/gi.test(rule.selector) && commonFilePath[decl.prop] && !decl.value.includes('var(--')) {
+        decl.value = generateComposeString(resourcePath, decl.prop, decl.value);
+        decl.prop = 'composes';
+        return;
+      }
+
       if (supportedProps.includes(decl.prop) && /px$/gi.test(decl.value) && !/^--/gi.test(decl.prop) && commonFilePath[decl.prop] && !decl.value.includes('calc') && !/[,\s+]+|(\w+)\.|:|(\d+)%/gi.test(rule.selector)) {
-        let composeString = `from "${_path.default.relative(_path.default.parse(resourcePath).dir, // resourcePath
-        commonFilePath[decl.prop]).replace(/\\/gi, '/')}"`; // n++ < 10 && console.log(composeString);
-
-        if (!composeString.includes('src')) {
-          const cls = objToClassName(decl.prop, parseInt(decl.value));
-          composeString = `${cls} ${composeString}`;
-          decl.value = composeString;
-          decl.prop = 'composes'; // n < 10 && console.log(rule.selector, decl.prop, decl.value);
-        }
+        // n++ < 10 && console.log(composeString);
+        // if (!composeString.includes('src')) {
+        // if (/px$/gi.test(decl.value)) {
+        decl.value = generateComposeString(resourcePath, decl.prop, decl.value); // }
+        // if (/^position$|^display$|^overflow$|^float$/gi.test(decl.prop)) {
+        //   console.log(decl.prop);
+        // }
+
+        decl.prop = 'composes'; // console.log(decl.prop, decl.value);
+        // n < 10 && console.log(rule.selector, decl.prop, decl.value);
+        // }
       }
     });
   });

package/lib/loaders/workerLoader.js

@@ -16,7 +16,7 @@ var _SingleEntryPlugin = _interopRequireDefault(require("webpack/lib/SingleEntry
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-/* import WebWorkerTemplatePlugin from 'webpack/lib/webworker/WebWorkerTemplatePlugin';
+/* import WebWorkerTemplatePlugin from 'webpack/lib/webworker/WebWorkerTemplatePlugin';
 import ExternalsPlugin from 'webpack/lib/ExternalsPlugin'; */
 const schema = {
   'type': 'object',
@@ -80,14 +80,14 @@ function pitch(request) {
     globalObject: 'self'
   };
   workerContext.compiler = this._compilation.createChildCompiler(`worker-loader ${request}`, workerContext.options);
-  /* 
-  new WebWorkerTemplatePlugin().apply(workerContext.compiler);
-  
-  if (compilerOptions.externals) {
-    new ExternalsPlugin(
-      getExternalsType(compilerOptions),
-      compilerOptions.externals
-    ).apply(workerContext.compiler);
+  /* 
+  new WebWorkerTemplatePlugin().apply(workerContext.compiler);
+  
+  if (compilerOptions.externals) {
+    new ExternalsPlugin(
+      getExternalsType(compilerOptions),
+      compilerOptions.externals
+    ).apply(workerContext.compiler);
   } */
 
   new _SingleEntryPlugin.default(this.context, `!!${request}`, _path.default.parse(this.resourcePath).name).apply(workerContext.compiler);

package/lib/pluginUtils/getDevPlugins.js

@@ -114,11 +114,11 @@ const getDevPlugins = (options, publicPath) => {
   }
 
   const i18nManifestFileName = 'i18n-manifest.json';
-  /**
-   * NOTE:
-   *  this file name ext .i18n.js added
-   *  Because, in service worker they maintain cache as file name based
-   *  So, to make differce we added .i18n.js ext.
+  /**
+   * NOTE:
+   *  this file name ext .i18n.js added
+   *  Because, in service worker they maintain cache as file name based
+   *  So, to make differce we added .i18n.js ext.
    */
 
   const i18nFileNameTemplate = 'i18n-chunk/[locale]/[name].i18n.js';

package/lib/pluginUtils/getProdPlugins.js

@@ -121,11 +121,11 @@ const getProdPlugins = (options, publicPath = '') => {
   }
 
   const i18nManifestFileName = 'i18n-manifest.json';
-  /**
-   * NOTE:
-   *  this file name ext .i18n.js added
-   *  Because, in service worker they maintain cache as file name based
-   *  So, to make differce we added .i18n.js ext.
+  /**
+   * NOTE:
+   *  this file name ext .i18n.js added
+   *  Because, in service worker they maintain cache as file name based
+   *  So, to make differce we added .i18n.js ext.
    */
 
   const i18nFileNameTemplate = 'i18n-chunk/[locale]/[name].[chunkhash].i18n.js';

package/lib/plugins/CustomAttributePlugin.md

@@ -1,35 +1,35 @@
-# CustomAttributePlugin
- In this plugin we added all dynamic chunks tags (like js script tags , css script tags, i18n split script tags) to extra custom attribute
-
-## Options
-
-```json
-{
-  "name": "some",
-  "react-cli": {
-    "app": {
-      "customAttributes": {// this is the all options
-        "enable": false,
-        "attributes": null,
-        "jsAttributes": null,
-        "cssAttributes": null,
-        "i18nAttributes": null
-      }
-  }
-}
-```
-
-### enable   [Boolean]
-this decides is this plugin or feature needs to be enabled of not.
-
-
-### attributes   [Object] 
-It  was object of key value pairs Example Given Option {"data-app-name":"myapp"}  
-Then all dynamically (js script tags , css script tags, i18n split script tags) added tags via webpack 
-
-### jsAttributes   [Object] 
-same as [attributes] but only for js script tags
-### cssAttributes   [Object] 
-same as [attributes] but only for css script tags
-### i18nAttributes   [Object] 
-same as [attributes] but only for i18n split script tags
+# CustomAttributePlugin
+ In this plugin we added all dynamic chunks tags (like js script tags , css script tags, i18n split script tags) to extra custom attribute
+
+## Options
+
+```json
+{
+  "name": "some",
+  "react-cli": {
+    "app": {
+      "customAttributes": {// this is the all options
+        "enable": false,
+        "attributes": null,
+        "jsAttributes": null,
+        "cssAttributes": null,
+        "i18nAttributes": null
+      }
+  }
+}
+```
+
+### enable   [Boolean]
+this decides is this plugin or feature needs to be enabled of not.
+
+
+### attributes   [Object] 
+It  was object of key value pairs Example Given Option {"data-app-name":"myapp"}  
+Then all dynamically (js script tags , css script tags, i18n split script tags) added tags via webpack 
+
+### jsAttributes   [Object] 
+same as [attributes] but only for js script tags
+### cssAttributes   [Object] 
+same as [attributes] but only for css script tags
+### i18nAttributes   [Object] 
+same as [attributes] but only for i18n split script tags

package/lib/plugins/EFCPlugin.md

@@ -1,6 +1,6 @@
-# EFC Plugin
-
-In EFC plugin we are create sdk file for efc related purpose
-
-
-# document will be soon
+# EFC Plugin
+
+In EFC plugin we are create sdk file for efc related purpose
+
+
+# document will be soon

package/lib/plugins/I18NInjectIntoIndexPlugin.js

@@ -115,10 +115,10 @@ class I18NInjectIntoIndexPlugin {
         i18nObj = i18nFiles.reduce((res, next) => {
           const fileName = next.replace(`i18n${_path.default.sep}`, '');
           const splittedFileName = fileName.split('.');
-          /* if (this.isDevelopment) {
-            res[splittedFileName[0]] = `${this.publicPath}/i18n/${fileName}`;
-          } else {
-            res[splittedFileName[0]] = fileName;
+          /* if (this.isDevelopment) {
+            res[splittedFileName[0]] = `${this.publicPath}/i18n/${fileName}`;
+          } else {
+            res[splittedFileName[0]] = fileName;
           } */
 
           res[splittedFileName[0]] = `${this.publicPath}/i18n/${fileName}`;

package/lib/plugins/I18nSplitPlugin/I18nDownlodLogic.js

@@ -13,23 +13,23 @@ var _hashUtils = require("./utils/hashUtils");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-/**
- * this plugin for the download i18n files
- * So, if need to downoad i18n in browser this plugin handle that
- *
- *
- * this plugin works
- * how it works?
- *  this plugin hook the requireEnsure method and we write logic for current compiled file download logic
- *
- * hinds:-
- *  requireEnsure method was loader for all js chunk's ,
- *  which means if we use dynamic import then this function will create script tag for that dynamic resource
- *  so every dynamic js chunk will load by this function,
- *  So we update this function with when  dynamic jschunk call the nour code also execute
- *
- * some thing  missing  in this definetion
- *
+/**
+ * this plugin for the download i18n files
+ * So, if need to downoad i18n in browser this plugin handle that
+ *
+ *
+ * this plugin works
+ * how it works?
+ *  this plugin hook the requireEnsure method and we write logic for current compiled file download logic
+ *
+ * hinds:-
+ *  requireEnsure method was loader for all js chunk's ,
+ *  which means if we use dynamic import then this function will create script tag for that dynamic resource
+ *  so every dynamic js chunk will load by this function,
+ *  So we update this function with when  dynamic jschunk call the nour code also execute
+ *
+ * some thing  missing  in this definetion
+ *
  */
 // import { REGEXP_HASH, REGEXP_CHUNKHASH } from './utils/hashUtils';
 const pluginName = 'DownloadLogicOfI18n'; // const pluginName = 'i18n-plugin';
@@ -126,20 +126,20 @@ class I18nDownlodLogic {
       return _webpack.Template.asString([source, '', '// object to store loaded I18N chunks', 'var installedI18nChunks = {', _webpack.Template.indent(mainChunk.ids.map(id => `${JSON.stringify(id)}: 0`).join(',\n')), '};']);
     });
     mainTemplate.hooks.requireEnsure.tap(pluginName, (source, mainChunk, hash) => {
-      /**
-       * for Information this is tapped in mainTemplate ,
-       * So this hooks argument chunk is main chunk means entry chunk mostly.
-       * if any chunk has i18n then we must write our download  i18n logic,
+      /**
+       * for Information this is tapped in mainTemplate ,
+       * So this hooks argument chunk is main chunk means entry chunk mostly.
+       * if any chunk has i18n then we must write our download  i18n logic,
        */
       const chunkMap = this.getI18nChunkObject(mainChunk);
 
       if (!Object.keys(chunkMap).length) {
         return source;
       }
-      /**
-       *   chunkMaps has
-       *  @property  {Object} hash  [it has key  as chunk id and value as chunkHash ]
-       *  @property  {Object} name  [it has key  as chunk id and value as chunk name ]
+      /**
+       *   chunkMaps has
+       *  @property  {Object} hash  [it has key  as chunk id and value as chunkHash ]
+       *  @property  {Object} name  [it has key  as chunk id and value as chunk name ]
        */
 
 
@@ -176,22 +176,22 @@ class I18nDownlodLogic {
         },
         contentHashType: MODULE_TYPE
       });
-      /** IDEA:
-       *      as my suggestion ignore this `jsop` approch,
-       *      Because json parse is faster then js parse.
-       *      my suggestion  is make ajax or fetch request
+      /** IDEA:
+       *      as my suggestion ignore this `jsop` approch,
+       *      Because json parse is faster then js parse.
+       *      my suggestion  is make ajax or fetch request
        */
 
       const buf = [];
-      /*
-        if (REGEXP_HASH.test(filenameTemplate)) {
-          buf.push(
-            `var hash = ${mainTemplate.renderCurrentHashCode(hash)};`
-          );
-        }
-        if (REGEXP_CHUNKHASH.test(filenameTemplate)) {
-          buf.push(`var chunkHashes = ${JSON.stringify(chunkMaps.hash)};`);
-        }
+      /*
+        if (REGEXP_HASH.test(filenameTemplate)) {
+          buf.push(
+            `var hash = ${mainTemplate.renderCurrentHashCode(hash)};`
+          );
+        }
+        if (REGEXP_CHUNKHASH.test(filenameTemplate)) {
+          buf.push(`var chunkHashes = ${JSON.stringify(chunkMaps.hash)};`);
+        }
         */
 
       if ((0, _hashUtils.hasContentHash)(filenameTemplate)) {

package/lib/plugins/I18nSplitPlugin/I18nFilesEmitter.js

@@ -13,8 +13,8 @@ var _getI18nKeysFormModules = _interopRequireDefault(require("./utils/getI18nKey
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-/**
- * this plugin was creating the chunk specific i18n chunk's.
+/**
+ * this plugin was creating the chunk specific i18n chunk's.
  */
 // this plugin's kick  starter is apply method
 const pluginName = 'I18nFilesEmitter';
@@ -141,40 +141,40 @@ class I18nFilesEmitter {
   }
 
   apply(compiler) {
-    /*
-      compiler.hooks.thisCompilation.tap(pluginName, compilation => {
-        compilation.mainTemplate.hooks.renderManifest.tap(
-          pluginName,
-          (result, { chunk }) => {
-            this.renderChunk(result, compilation, chunk);
-          }
-        );
-           compilation.chunkTemplate.hooks.renderManifest.tap(
-          pluginName,
-          (result, { chunk }) => {
-            this.renderChunk(result, compilation, chunk);
-          }
-        );
-      });
+    /*
+      compiler.hooks.thisCompilation.tap(pluginName, compilation => {
+        compilation.mainTemplate.hooks.renderManifest.tap(
+          pluginName,
+          (result, { chunk }) => {
+            this.renderChunk(result, compilation, chunk);
+          }
+        );
+            compilation.chunkTemplate.hooks.renderManifest.tap(
+          pluginName,
+          (result, { chunk }) => {
+            this.renderChunk(result, compilation, chunk);
+          }
+        );
+      });
       */
     // this below hook was tapped for create asssets(file) for chunk specific i18nChunk Files
     compiler.hooks.emit.tap(pluginName, compilation => {
       this.emitI18nAssert(compilation);
     });
   }
-  /*
-    renderChunk(result, compilation, chunk) {
-      const i18nKeys = getI18nKeysFormModules(chunk.modulesIterable);
-      // TODO: need to discuss with vimal ji can we chose this place for add i18n locale files ????
-      // IDEA:  we chose this place for add i18n locale files ????
-      if (i18nKeys.length > 0) {
-        Object.keys(this.allI18nObject).forEach(locale => {
-          result.push(
-            this.renderI18nLocaleChunk(chunk, locale, i18nKeys, compilation)
-          );
-        });
-      }
-    }
+  /*
+    renderChunk(result, compilation, chunk) {
+      const i18nKeys = getI18nKeysFormModules(chunk.modulesIterable);
+      // TODO: need to discuss with vimal ji can we chose this place for add i18n locale files ????
+      // IDEA:  we chose this place for add i18n locale files ????
+      if (i18nKeys.length > 0) {
+        Object.keys(this.allI18nObject).forEach(locale => {
+          result.push(
+            this.renderI18nLocaleChunk(chunk, locale, i18nKeys, compilation)
+          );
+        });
+      }
+    }
     */
 
 

package/lib/plugins/I18nSplitPlugin/I18nKeysIdentifer.js

@@ -14,14 +14,14 @@ var _NullFactory = _interopRequireDefault(require("webpack/lib/NullFactory"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const pluginName = 'I18nKeysIdentifer';
-/**
- * this plugin search the i18 keys and make it as I18nDependency.
- * how it works?
- *  this plugin get jsResourceI18nKeys in constructor.
- *  we walk throught the js files AST
- *      if any string literal in that AST is in jsResourceI18nKeys then  we consider that string as I18n key
- *  after the walk of AST we get some I18n keys
- *  then we make it as I18nDependency.
+/**
+ * this plugin search the i18 keys and make it as I18nDependency.
+ * how it works?
+ *  this plugin get jsResourceI18nKeys in constructor.
+ *  we walk throught the js files AST
+ *      if any string literal in that AST is in jsResourceI18nKeys then  we consider that string as I18n key
+ *  after the walk of AST we get some I18n keys
+ *  then we make it as I18nDependency.
  */
 
 class I18nKeysIdentifer {