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

package/lib/plugins/I18nSplitPlugin/index.js

@@ -21,23 +21,23 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 // #region initial
 
-/**
- * @TODO:
- *  [?] add comment line options for properties file and get all keys form property file do right way to genarate them
- *  [?] need to discuss with collectI18n Keys with js comment need to conform "what is the comment? "
+/**
+ * @TODO:
+ *  [?] add comment line options for properties file and get all keys form property file do right way to genarate them
+ *  [?] need to discuss with collectI18n Keys with js comment need to conform "what is the comment? "
  */
 
-/**
- * Notes: this plugin has done below works
- *  1. collect I18n Keys from js files and make it as Depenencies
- *  2. we create file(asset) for chunk specific i18nChunk Files
- *  3. create hash for the specific i18nChunk Files
- *  4. write logic to requireEnsure method for dowlod I18n chunk download dynamicaly
- *  5. create manifest.json file which has the mapping of  chunk-locales-i18nChunkFile
- *       for the external referrece.
- * Hints :-
- *   - file  means your machine files
- *   - asset means that also  file but that will create by webpack after build
+/**
+ * Notes: this plugin has done below works
+ *  1. collect I18n Keys from js files and make it as Depenencies
+ *  2. we create file(asset) for chunk specific i18nChunk Files
+ *  3. create hash for the specific i18nChunk Files
+ *  4. write logic to requireEnsure method for dowlod I18n chunk download dynamicaly
+ *  5. create manifest.json file which has the mapping of  chunk-locales-i18nChunkFile
+ *       for the external referrece.
+ * Hints :-
+ *   - file  means your machine files
+ *   - asset means that also  file but that will create by webpack after build
  */
 // const getI18nLocales = require('./utils/getI18nLocales');
 // const { ConcatSource, SourceMapSource, OriginalSource } = sources;
@@ -49,16 +49,16 @@ const MODULE_TYPE = 'json/i18n';
 const i18ntype = locale => `${MODULE_TYPE}/${locale}`;
 
 const pluginName = 'i18n-plugin';
-/**
- * @typedef I18nPluginOptions
- * @property {String} filenameTemplate this was template for i18n chunk
- * @property {String} jsResource this was path for jsResource i18n file
- * @property {String} propertiesFolder this was path for propertiesFolder i18n file
- * @property {Boolean} disableDefault this option for disable defulat value  for i18n keys, means if the language file does not have some key we don't give jsResource value
- * @property {String} i18nManifestFileName this was ouput path for i18n manifest.
- * @property {String} jsonpFunc this was function name, we will  call  that function everytime i18n chunk download.
- * @property {String} localeVarName this was variable name, we will call that function everytime i18n chunk download.
- * 
+/**
+ * @typedef I18nPluginOptions
+ * @property {String} filenameTemplate this was template for i18n chunk
+ * @property {String} jsResource this was path for jsResource i18n file
+ * @property {String} propertiesFolder this was path for propertiesFolder i18n file
+ * @property {Boolean} disableDefault this option for disable defulat value  for i18n keys, means if the language file does not have some key we don't give jsResource value
+ * @property {String} i18nManifestFileName this was ouput path for i18n manifest.
+ * @property {String} jsonpFunc this was function name, we will  call  that function everytime i18n chunk download.
+ * @property {String} localeVarName this was variable name, we will call that function everytime i18n chunk download.
+ * 
  */
 
 class I18nPlugin {
@@ -104,13 +104,13 @@ class I18nPlugin {
   }
 
   maintainHashForAllI18nAssets(compilation) {
-    /**
-     * we write chunkHash logic inside of our plugin Because we only add Dependency not Module.
-     *  So we need to update chunkHash for our assets
-     *  and we not able tell with just Modules.
-     *  Because, if we add Module for the Depenentcy then that module must has some hash.
-     *  But our I18n Hash is no module specific it was chunk specific,
-     *  that's why we do the stuf in the chunkHash hook.
+    /**
+     * we write chunkHash logic inside of our plugin Because we only add Dependency not Module.
+     *  So we need to update chunkHash for our assets
+     *  and we not able tell with just Modules.
+     *  Because, if we add Module for the Depenentcy then that module must has some hash.
+     *  But our I18n Hash is no module specific it was chunk specific,
+     *  that's why we do the stuf in the chunkHash hook.
      */
     compilation.hooks.chunkHash.tap(pluginName, (chunk, chunkHash) => {
       const {
@@ -154,31 +154,31 @@ class I18nPlugin {
   }
 
 }
-/*
-        // TODO:  need to reimplement this logic
-        // NOTE:  this logic for split all content hash per mani chunk
-        // like add chunk content hash to  main locale i18n file
-
-        // let isEntry = chunk.name === this.options.mainChunkName;
-        // if (chunk.name === 'main' && chunk.hasEntryModule()) {
-        if (isEntry) {
-          const hashSource = new ConcatSource();
-        const dummyChunk = new chunk.constructor();
-          hashSource.add('// it wil be I18N file hash');
-          const templateHooks = compilation.chunkTemplate.hooks;
-          let c = templateHooks.render.call(
-            templateHooks.module.call(
-              hashSource,
-              dummyChunk,
-              compilation.moduleTemplate.javascript,
-              compilation.dependencyTemplates
-            ),
-            dummyChunk,
-            compilation.moduleTemplate.javascript,
-            compilation.dependencyTemplates
-          );
-          console.log('entry, ', c, hashSource.toString());
-        }
+/*
+        // TODO:  need to reimplement this logic
+        // NOTE:  this logic for split all content hash per mani chunk
+        // like add chunk content hash to  main locale i18n file
+
+        // let isEntry = chunk.name === this.options.mainChunkName;
+        // if (chunk.name === 'main' && chunk.hasEntryModule()) {
+        if (isEntry) {
+          const hashSource = new ConcatSource();
+        const dummyChunk = new chunk.constructor();
+          hashSource.add('// it wil be I18N file hash');
+          const templateHooks = compilation.chunkTemplate.hooks;
+          let c = templateHooks.render.call(
+            templateHooks.module.call(
+              hashSource,
+              dummyChunk,
+              compilation.moduleTemplate.javascript,
+              compilation.dependencyTemplates
+            ),
+            dummyChunk,
+            compilation.moduleTemplate.javascript,
+            compilation.dependencyTemplates
+          );
+          
+        }
         */
 
 

package/lib/plugins/I18nSplitPlugin/utils/propertiesUtils.js

@@ -11,6 +11,8 @@ var _fs = require("fs");
 
 var _path = require("path");
 
+var _logger = require("../../../logger");
+
 function isComment(line) {
   return line[0] === '#';
 }
@@ -18,7 +20,7 @@ function isComment(line) {
 function getPropertiesAsJSON(filePath) {
   try {
     const data = (0, _fs.readFileSync)(filePath);
-    let source = data.toString();
+    const source = data.toString();
     const i18nObj = {};
     source.split(/\r?\n\r?/).forEach(fline => {
       const line = fline.trim();
@@ -42,7 +44,7 @@ function getPropertiesAsJSON(filePath) {
 }
 
 function getLang(file) {
-  let underScoreIndex = file.indexOf('_');
+  const underScoreIndex = file.indexOf('_');
   let language = 'en_US';
 
   if (underScoreIndex !== -1) {
@@ -68,26 +70,24 @@ function getAllI18n({
       const filePath = (0, _path.join)(context, file);
 
       if (exclude.test(filePath) || !include.test(filePath)) {
-        // console.log('exclude', filePath);
         return;
-      } // console.log('include', filePath);
-
+      }
 
       const i18n = getPropertiesAsJSON(filePath);
       allLangI18n[getLang(file)] = disableDefault ? i18n : Object.assign({}, jsResourceI18nKeys, i18n);
     });
     return allLangI18n;
   } catch (err) {
-    // console.log(err);
+    (0, _logger.errorLogger)(err);
     return {};
   }
 }
 
 function jsonToString(json, keySeperator) {
   let str = '{';
-  let keys = Object.keys(json);
+  const keys = Object.keys(json);
   keys.forEach((key, i) => {
-    let value = json[key];
+    const value = json[key];
 
     if (!value) {
       return;

package/lib/plugins/{UglifyCSSPlugin.js → MinifyPlugin.js}

@@ -11,9 +11,9 @@ var _uglifycss = _interopRequireDefault(require("uglifycss"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-class UglifyCSSPlugin {
+class MinifierPlugin {
   apply(compiler) {
-    compiler.hooks.emit.tap('UglifyCSSPlugin', compilation => {
+    compiler.hooks.emit.tap('MinifierPlugin', compilation => {
       Object.keys(compilation.assets).forEach(filename => {
         if (/\.css$/.test(filename)) {
           try {
@@ -36,4 +36,4 @@ class UglifyCSSPlugin {
 
 }
 
-exports.default = UglifyCSSPlugin;
+exports.default = MinifierPlugin;

package/lib/plugins/ResourceHintsPlugin.js

@@ -33,25 +33,25 @@ class ResourceHintsPlugin {
         }
 
         return Template.asString([source, '', `${mainTemplate.requireFn}.getChunkId = function getChunkId(chunkId) {`, Template.indent((needsMap ? [`chunkId = ${JSON.stringify(nameIdMap)}[chunkId]||chunkId;`] : []).concat(['return chunkId;'])), '}', `// Prefetch a chunk (${pluginName})`, `${mainTemplate.requireFn}.pfc = function prefetchChunk(chunkId) {`, Template.indent([`chunkId = ${mainTemplate.requireFn}.getChunkId(chunkId)`, `${mainTemplate.requireFn}.e(chunkId);`]), '};',
-        /*
-          (needsMap
-            ? [`chunkId = ${JSON.stringify(nameIdMap)}[chunkId]||chunkId;`]
-            : []
-          ).concat([
-            'var promises = [];',
-            'if(installedChunks[chunkId] === undefined) {',
-            Template.indent([
-              'installedChunks[chunkId] = null;',
-              /* mainTemplate.hooks.linkPrefetch.call('', chunk, hash),
+        /*
+          (needsMap
+            ? [`chunkId = ${JSON.stringify(nameIdMap)}[chunkId]||chunkId;`]
+            : []
+          ).concat([
+            'var promises = [];',
+            'if(installedChunks[chunkId] === undefined) {',
+            Template.indent([
+              'installedChunks[chunkId] = null;',
+              /* mainTemplate.hooks.linkPrefetch.call('', chunk, hash),
               'document.head.appendChild(link);', */
 
-        /*
-              mainTemplate.hooks.requireEnsure.call('', chunk, hash)
-            ]),
-            '}'
-          ])
-        ),
-        '}',
+        /*
+              mainTemplate.hooks.requireEnsure.call('', chunk, hash)
+            ]),
+            '}'
+          ])
+        ),
+        '}',
         */
         `// Preload a chunk (${pluginName})`, `${mainTemplate.requireFn}.plc = function preloadChunk(chunkId) {`, Template.indent([`chunkId = ${mainTemplate.requireFn}.getChunkId(chunkId)`, 'if(installedChunks[chunkId] === undefined) {', Template.indent(['installedChunks[chunkId] = null;', mainTemplate.hooks.linkPreload.call('', chunk, hash), 'document.head.appendChild(link);', `${mainTemplate.requireFn}.e(chunkId);` // 'var head = document.getElementsByTagName(\'head\')[0];',
         // mainTemplate.hooks.jsonpScript.call('', chunk, hash),

package/lib/plugins/RtlSplitPlugin/RtlCssPlugin.js

@@ -24,12 +24,12 @@ const isCss = filename => _path.default.extname(filename) === '.css'; // this  p
 
 class RtlCssPlugin {
   constructor(options = {}) {
-    /**
-     * @typedef {Object} Options
-     * @property  {String} filename [not used]
-     * @property  {String} dirVarName
-     * @property  {Boolean} sourcemap
-     * @property  {Object} config
+    /**
+     * @typedef {Object} Options
+     * @property  {String} filename [not used]
+     * @property  {String} dirVarName
+     * @property  {Boolean} sourcemap
+     * @property  {Object} config
      */
     this.options = {
       filename: options.filename || '[name].rtl.css',

package/lib/plugins/RtlSplitPlugin/RtrSplit.md

@@ -1,30 +1,30 @@
-# RTL Split 
-
-we are doing in build time generating  rtl related css code  by using @zohodesk/postcss-rt npm.
-It was automated, That postcss plugin create rtl reacted css and put them into same file, with css selector [dir=rtl] and ltr realted css with [dir=ltr].
-Here is problem mostly no one need rtl and ltr related css at the same time in browser, 
-we are try to split them  by [dir] and load which type of css is needed.
-For this purpose  we created RTL Split Plugin 
-
-
-# To Try it  out  rtl-ltr split
-### how to use this feature?
-
-  to use this feature use have give the below oprtions
-  `package.json`
-  ```json
-  {
-    /// ...some things
-    "react-cli": {
-      //  ...some things
-      "css": {
-        "enableRTLSplit": true,
-        "templateLabel": "{{--dir}}",// this is for html template css file path dir template
-        "disableMiniFiySelector": false,
-        "dirVarName": "document.dir" // this will be used for download css based on dir  
-      },
-      //  ...some things
-    }
-  }
-  ```
-
+# RTL Split 
+
+we are doing in build time generating  rtl related css code  by using @zohodesk/postcss-rt npm.
+It was automated, That postcss plugin create rtl reacted css and put them into same file, with css selector [dir=rtl] and ltr realted css with [dir=ltr].
+Here is problem mostly no one need rtl and ltr related css at the same time in browser, 
+we are try to split them  by [dir] and load which type of css is needed.
+For this purpose  we created RTL Split Plugin 
+
+
+# To Try it  out  rtl-ltr split
+### how to use this feature?
+
+  to use this feature use have give the below oprtions
+  `package.json`
+  ```json
+  {
+    /// ...some things
+    "react-cli": {
+      //  ...some things
+      "css": {
+        "enableRTLSplit": true,
+        "templateLabel": "{{--dir}}",// this is for html template css file path dir template
+        "disableMiniFiySelector": false,
+        "dirVarName": "document.dir" // this will be used for download css based on dir  
+      },
+      //  ...some things
+    }
+  }
+  ```
+

package/lib/plugins/SelectorPlugin.js

@@ -9,33 +9,26 @@ var _postcss = _interopRequireDefault(require("postcss"));
 
 var _fs = _interopRequireDefault(require("fs"));
 
+var _classHandling = require("./utils/classHandling");
+
+var _fileHandling = require("./utils/fileHandling");
+
 var _windowsModification = require("../loaderUtils/windowsModification");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function checkFilename(filename, data) {
-  let keyMatch = undefined;
-  Object.keys(data).forEach(key => {
-    if (filename.includes(key)) {
-      keyMatch = key;
-    }
-  });
-  return keyMatch;
-}
-
-function rootConvertor(rootOriginal, defaultSelector, data, filename, excludeStrings) {
+function selectorWeightPrefixAdder(rootOriginal, selector, excludeStrings) {
   rootOriginal.walkRules((rule, index) => {
-    const prevNode = rootOriginal.nodes[index - 1];
+    const prevNode = rootOriginal.nodes[index - 1] ? rootOriginal.nodes[index - 1] : {};
 
-    if (index !== 0 && prevNode.type && prevNode.type === 'comment' && prevNode.text.toLowerCase() === 'updateselector:ignore') {
+    if ((0, _classHandling.hasPrevNodeIgnore)(index, prevNode, 'updateselector:ignore')) {
       return;
     }
 
-    if (rule.parent && rule.parent.type === 'atrule') {
-      if (rule.parent.name !== 'media') {
-        return;
-      }
-    }
+    if (!(0, _classHandling.isInsideMediaQuery)(rule)) {
+      return;
+    } // console.log(rule.selector.split(','));
+
 
     const selectorArr = rule.selector.split(',');
     selectorArr.forEach((singleSelectorStr, index) => {
@@ -45,41 +38,33 @@ function rootConvertor(rootOriginal, defaultSelector, data, filename, excludeStr
 
       if (singleSelectorStr.includes(']')) {
         if (singleSelectorStr.slice(singleSelectorStr.lastIndexOf(']') + 2).trim() === '') {
-          return;
-        } // console.log(
-        //   rule.slice(rule.lastIndexOf(']') + 2).trim(),
-        //   rule.slice(rule.lastIndexOf(']') + 2).trim() !== ''
-        // );
-
+          if (singleSelectorStr.slice(singleSelectorStr.lastIndexOf(']') + 2).trim() === '') {
+            return;
+          } // str = [dir=ltr] .zd-listpagination-wrapper:hover .zd-listpagination-upArw
+          // str.slice(0, str.lastIndexOf(']') + 1) -- [dir=ltr]
+          // str.slice(str.lastIndexOf(']') + 2).trim() -- .zd-listpagination-wrapper:hover .zd-listpagination-upArw
+          // ${str.slice(0, str.lastIndexOf(']') + 1).trim()} .selector ${str.slice(str.lastIndexOf(']') + 2).trim()} -- [dir=ltr] .selector .zd-listpagination-wrapper:hover .zd-listpagination-upArw
 
-        selectorArr[index] = `${singleSelectorStr.slice(0, singleSelectorStr.lastIndexOf(']') + 1).trim()} ${defaultSelector}${singleSelectorStr.slice(singleSelectorStr.lastIndexOf(']') + 2).trim()}`; // console.log(ruleArr[index]);
 
-        return;
+          selectorArr[index] = `${singleSelectorStr.slice(0, singleSelectorStr.lastIndexOf(']') + 1).trim()} ${selector}${singleSelectorStr.slice(singleSelectorStr.lastIndexOf(']') + 2).trim()}`;
+          return;
+        }
       }
 
-      const keyMatch = checkFilename(filename, data);
-      selectorArr[index] = data[keyMatch] ? `${data[keyMatch].defaultSelector}${singleSelectorStr}` : `${defaultSelector}${singleSelectorStr}`;
+      selectorArr[index] = `${selector}${singleSelectorStr}`;
     });
-    rule.selector = selectorArr.join(',\n'); // console.log(`${rule.selector} converted`);
+    rule.selector = selectorArr.join(',\n');
   });
   return rootOriginal;
 }
 
-function ignoreFile(excludeArr, filename) {
-  let ignore = false;
-  excludeArr.forEach(exclStr => {
-    if (filename.includes(exclStr)) {
-      ignore = true;
-    }
-  });
-  return ignore;
-}
-
 class SelectorPlugin {
   constructor(options = {}) {
     this.optimize = options.optimize;
     this.selectorWeightConfig = options.selectorWeightConfig;
     this.exclude = options.exclude;
+    this.patterns = options.patterns;
+    this.rootDir = options.patternsRootDir;
   }
 
   apply(compiler) {
@@ -99,16 +84,49 @@ class SelectorPlugin {
         mods.forEach(module => {
           const rootOriginal = _postcss.default.parse(module.content);
 
-          const filename = module.issuer.resource; // if (!filename.includes('node_modules')) {
-
-          if (ignoreFile(this.exclude, filename)) {
+          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
+              "selectorWeight": [
+                "src",
+                "deskapp",
+                "!node_modules"
+              ]
+                rootDir : patternsRootDir : 'supportapp'
+              
+              output : 
+              true or false
+            */
+
+          if (!(0, _fileHandling.isFileNameMatchingPluginPattern)({
+            filename,
+            filterArr: this.patterns.selectorWeight,
+            rootDir: this.rootDir
+          })) {
             return;
-          } // console.log(filename);
-
-
-          module.content = //new RawSource(
-          rootConvertor(rootOriginal, defaultSelector, data, filename, excludeStrings).toString(); // );
-          // }
+          }
+          /*
+           
+          filename : Deskapp.module.css ?
+            data : 
+          {
+              "DeskApp.module.css": {"defaultSelector" : ".desk_app_ui "}
+          }
+              selectorWeightConfig : 
+            defaultSelector : .zoho_desk_ui
+          
+          case filename = 'DeskApp.module.css' ? 
+          data[filename].defaultSelector = '.desk_app_ui' 
+            case filename is different ?
+          defaultSelector = '.zoho_desk_ui'
+            */
+
+
+          module.content = selectorWeightPrefixAdder(rootOriginal, data[filename] ? data[filename].defaultSelector : defaultSelector, excludeStrings).toString();
         });
       });
     });

package/lib/plugins/ServiceWorkerPlugin.js

@@ -51,11 +51,11 @@ class ServiceWorkerPlugin {
         if (err) {
           throw new Error(err);
         } else {
-          /* const extractedChunks = compilation.chunks.filter(chunk => {
-            if ('canBeInitial' in chunk) {
-              return chunk.canBeInitial();
-            }
-            return chunk.isInitial();
+          /* const extractedChunks = compilation.chunks.filter(chunk => {
+            if ('canBeInitial' in chunk) {
+              return chunk.canBeInitial();
+            }
+            return chunk.isInitial();
           }); */
           // let [js, css, , , i18nPublicPath] = this.publicPaths;
           // let initialChunkUrls = [];
@@ -64,10 +64,10 @@ class ServiceWorkerPlugin {
           let entrypoint = compilation.entrypoints.get('main');
           let initialChunkUrls = entrypoint.getFiles();
           const cssDirTemplate = '@dir@';
-          /**
-           * NOTE:
-           *  if chunkSplitEnable is false means,
-           *    serviceWorker will get i18n files path for html
+          /**
+           * NOTE:
+           *  if chunkSplitEnable is false means,
+           *    serviceWorker will get i18n files path for html
            */
 
           let initalI18nAssets = chunkSplitEnable ? entrypoint.chunks.filter(chunk => _I18nKeysIdentifer.default.isChunkHasI18n(chunk)).map(chunk => (0, _getI18nFileUrlPathTemplate.getI18nFileUrlPathTemplate)(compilation, chunk, this.i18nFileNameTemplate, '@locale@')) : [];

package/lib/plugins/TPHashMappingPlugin.js

@@ -15,10 +15,10 @@ var _crypto = _interopRequireDefault(require("crypto"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-/**
- * Plugin that generates hash for the provided list of third party files
- * Map the provided key with the file hash and add it to the list of exisiting global constants.
- * Plugin in turn uses the defineplugin to generate global constants. 
+/**
+ * Plugin that generates hash for the provided list of third party files
+ * Map the provided key with the file hash and add it to the list of exisiting global constants.
+ * Plugin in turn uses the defineplugin to generate global constants. 
  */
 class TPHashMappingPlugin {
   constructor(options) {