@zohodesk/react-cli 1.1.1 → 1.1.2-9.exp.3

package/lib/logger.js

@@ -5,8 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.errorLogger = errorLogger;
 exports.messageLogger = messageLogger;
+exports.verboseLogger = verboseLogger;
 exports.warnLogger = warnLogger;
 
+/* eslint-disable no-console */
 function messageLogger(...args) {
   console.log(...args);
 }
@@ -17,4 +19,9 @@ function errorLogger(...args) {
 
 function warnLogger(...args) {
   console.warn(...args);
+}
+
+function verboseLogger(...args) {
+  // TODO: need to be remove when publish happens
+  process.env.VERBOSE === 'true' && console.log('\x1b[33m [verbose] \x1b[0m', ...args);
 }

package/lib/pluginUtils/configHtmlWebpackPlugins.js

@@ -13,6 +13,10 @@ var _htmlWebpackInjectAttributesPlugin = _interopRequireDefault(require("html-we
 
 var _common = require("../common");
 
+var _utils = require("../utils");
+
+var _CustomScriptLoadingStrategyPlugin = _interopRequireDefault(require("../plugins/CustomScriptLoadingStrategyPlugin"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const defaultHTMLMiniFyOption = {
@@ -26,6 +30,51 @@ const defaultHTMLMiniFyOption = {
   removeStyleLinkTypeAttributes: true,
   useShortDoctype: true
 };
+const defaultScriptLoadingStrategy = 'defer';
+const allowedScriptLoadingStrategies = ['blocking', 'defer', 'async', 'module'];
+
+function isAllowedScriptLoadingStrategyUsed(scriptLoadingStategey) {
+  return allowedScriptLoadingStrategies.includes(scriptLoadingStategey);
+}
+
+function getScriptLoadingStrategyForStringType(scriptLoadingStategey) {
+  if (isAllowedScriptLoadingStrategyUsed(scriptLoadingStategey)) {
+    return scriptLoadingStategey;
+  }
+
+  return defaultScriptLoadingStrategy;
+}
+
+function getScriptLoadingStrategyForObject(scriptLoadingStategey) {
+  if (Object.keys(scriptLoadingStategey).length === 0) {
+    return defaultScriptLoadingStrategy;
+  }
+
+  const isAllowedScriptLoadingStrategy = Object.keys(scriptLoadingStategey).every(key => isAllowedScriptLoadingStrategyUsed(key));
+
+  if (isAllowedScriptLoadingStrategy) {
+    return Object.assign({}, scriptLoadingStategey);
+  }
+
+  console.warn('un supported script loading strategy used', scriptLoadingStategey);
+  return defaultScriptLoadingStrategy;
+}
+
+function getScriptLoadingStrategy(scriptLoadingStategey) {
+  if ((0, _utils.getTypeOf)(scriptLoadingStategey) === 'string') {
+    return {
+      [getScriptLoadingStrategyForStringType(scriptLoadingStategey)]: [/.*/]
+    };
+  }
+
+  if ((0, _utils.getTypeOf)(scriptLoadingStategey) === 'object') {
+    return getScriptLoadingStrategyForObject(scriptLoadingStategey);
+  }
+
+  return {
+    [defaultScriptLoadingStrategy]: [/.*/]
+  };
+}
 
 function configHtmlWebpackPlugins(plugins, {
   enableChunkHash = false,
@@ -33,7 +82,8 @@ function configHtmlWebpackPlugins(plugins, {
   inject,
   crossorigin,
   hasEFC,
-  minify: minifyHtmlOptions = false
+  minify: minifyHtmlOptions = false,
+  customScriptLoadingStrategey = {}
 }) {
   const optionsHtmlWebpack = {
     chunksSortMode: 'none',
@@ -44,7 +94,7 @@ function configHtmlWebpackPlugins(plugins, {
     // ? minifyHtmlOptions
     // : minifyHtmlOptions,,
     templateParameters: _common.templateParameters,
-    scriptLoading: 'defer',
+    scriptLoading: defaultScriptLoadingStrategy,
     inject: inject
   };
 
@@ -56,4 +106,14 @@ function configHtmlWebpackPlugins(plugins, {
   crossorigin && plugins.push(new _htmlWebpackInjectAttributesPlugin.default({
     crossorigin: 'anonymous'
   }));
+
+  if (customScriptLoadingStrategey.enable) {
+    const currentScriptLoadingStrategy = getScriptLoadingStrategy(customScriptLoadingStrategey.options);
+
+    if ((0, _utils.getTypeOf)(currentScriptLoadingStrategy) === 'object') {
+      plugins.push(new _CustomScriptLoadingStrategyPlugin.default({
+        scriptLoadingStategey: currentScriptLoadingStrategy
+      }));
+    }
+  }
 }

package/lib/pluginUtils/getDevPlugins.js

@@ -19,6 +19,8 @@ var _I18nSplitPlugin = _interopRequireDefault(require("../plugins/I18nSplitPlugi
 
 var _RequireVariablePublicPlugin = _interopRequireDefault(require("../plugins/RequireVariablePublicPlugin"));
 
+var _CssOrderControlPlugin = _interopRequireDefault(require("../plugins/CssOrderControlPlugin"));
+
 var _copyWebpackPlugin = _interopRequireDefault(require("copy-webpack-plugin"));
 
 var _webpack = _interopRequireDefault(require("webpack"));
@@ -35,12 +37,17 @@ var _SelectorPlugin = _interopRequireDefault(require("../plugins/SelectorPlugin"
 
 var _configHtmlWebpackPlugins = require("./configHtmlWebpackPlugins");
 
+var _EfcResourceCleanupPlugin = _interopRequireDefault(require("../plugins/EfcResourceCleanupPlugin"));
+
+var _EventsHandlingPlugin = require("../plugins/EventsHandlingPlugin");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 // import { windowsModification } from '../loaderUtils/windowsModification';
 const getDevPlugins = (options, publicPath) => {
   const {
     app: {
+      generateHtml,
       tpFolder,
       folder,
       instrumentScript,
@@ -58,7 +65,8 @@ const getDevPlugins = (options, publicPath) => {
         mode
       },
       htmlTemplate: {
-        inject
+        inject,
+        customScriptLoadingStrategey
       },
       crossorigin
     },
@@ -69,10 +77,12 @@ const getDevPlugins = (options, publicPath) => {
       localeAttr: efcLocaleAttr
     },
     css: {
-      enableRTLSplit
+      enableRTLSplit,
+      cssOrderControler
     },
     i18n,
-    unusedFiles
+    unusedFiles,
+    resourceHints
   } = options;
   const hasEFC = newOptionForEnableEFC || prevOptionForEnableEFC;
   const cssLTRFileNameTempalte = enableRTLSplit ? 'css/[name].ltr.css' : 'css/[name].css';
@@ -94,7 +104,7 @@ const getDevPlugins = (options, publicPath) => {
     filename: cssLTRFileNameTempalte,
     // ignoreOrder: true,
     chunkFilename: cssLTRFileNameTempalte
-  }), new _plugins.ResourceHintsPlugin()];
+  }), new _plugins.ResourceHintsPlugin(resourceHints)];
 
   if (enableRTLSplit) {
     pluginsArr.push(new _RtlCssPlugin.RtlCssPlugin({
@@ -157,13 +167,14 @@ const getDevPlugins = (options, publicPath) => {
     collections: true,
     shorthands: true
   }));
-  (0, _configHtmlWebpackPlugins.configHtmlWebpackPlugins)(pluginsArr, {
+  generateHtml && (0, _configHtmlWebpackPlugins.configHtmlWebpackPlugins)(pluginsArr, {
     enableChunkHash: false,
     folder,
     minify: false,
     inject,
     crossorigin,
-    hasEFC
+    hasEFC,
+    customScriptLoadingStrategey
   });
 
   if (hasEFC) {
@@ -189,7 +200,11 @@ const getDevPlugins = (options, publicPath) => {
     mainChunkName: 'main'
   }));
   instrumentScript && pluginsArr.push(new _plugins.ScriptInstrumentPlugin());
+  cssOrderControler.enable && pluginsArr.push(new _CssOrderControlPlugin.default(cssOrderControler));
   customAttributes.enable && pluginsArr.push(new _CustomAttributePlugin.CustomAttributePlugin(customAttributes));
+  customAttributes.enable && pluginsArr.push(new _EfcResourceCleanupPlugin.default(Object.assign({}, customAttributes, {
+    globalCacheObj: context
+  })));
   hasShadowDOM && pluginsArr.push(new _plugins.ShadowDOMSupportPlugin());
 
   if (devCssFileBountry) {
@@ -211,12 +226,13 @@ const getDevPlugins = (options, publicPath) => {
       exclude: exclude.selectorWeight,
       patterns
     }));
-  } // if (pluginObject.minifier) {
+  }
+
+  pluginsArr.push(new _EventsHandlingPlugin.EventsHandlingPlugin()); // if (pluginObject.minifier) {
   //   // console.log('minifier active');
   //   pluginsArr.push(new MinifierPlugin());
   // }
 
-
   return pluginsArr.filter(Boolean);
 };
 

package/lib/pluginUtils/getProdPlugins.js

@@ -27,14 +27,22 @@ var _VariableConversionCollector = _interopRequireDefault(require("../plugins/Va
 
 var _SelectorPlugin = _interopRequireDefault(require("../plugins/SelectorPlugin"));
 
+var _EventsHandlingPlugin = require("../plugins/EventsHandlingPlugin");
+
 var _plugins = require("../plugins");
 
 var _CustomAttributePlugin = require("../plugins/CustomAttributePlugin");
 
 var _RtlCssPlugin = require("../plugins/RtlSplitPlugin/RtlCssPlugin");
 
+var _CssOrderControlPlugin = _interopRequireDefault(require("../plugins/CssOrderControlPlugin"));
+
 var _configHtmlWebpackPlugins = require("./configHtmlWebpackPlugins");
 
+var _StatsPlugin = _interopRequireDefault(require("../plugins/StatsPlugin"));
+
+var _EfcResourceCleanupPlugin = _interopRequireDefault(require("../plugins/EfcResourceCleanupPlugin"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 // eslint-disable-next-line no-unused-vars
@@ -43,6 +51,7 @@ const getProdPlugins = (options, publicPath = '') => {
     enableChunkHash
   } = options.app;
   const {
+    generateHtml,
     manifestFileName,
     bundleAnalyze,
     optimize,
@@ -74,13 +83,15 @@ const getProdPlugins = (options, publicPath = '') => {
   } = options.app;
   const {
     inject,
-    minify: minifyHtmlOptions
+    minify: minifyHtmlOptions,
+    customScriptLoadingStrategey
   } = htmlTemplate;
   const {
     i18n
   } = options;
   const {
-    enableRTLSplit
+    enableRTLSplit,
+    cssOrderControler
   } = options.css;
   const {
     hasEFC: newOptionForEnableEFC,
@@ -88,6 +99,12 @@ const getProdPlugins = (options, publicPath = '') => {
     templateFilePath,
     localeAttr: efcLocaleAttr
   } = options.efc;
+  const {
+    enable: enableStats,
+    options: statsOptions,
+    excludeKeys: statsOutputExcludeKeys,
+    fileName: statsFileName
+  } = options.stats;
   const hasEFC = newOptionForEnableEFC || prevOptionForEnableEFC;
   const hashTempalate = enableChunkHash ? '.[chunkhash:20]_' : '';
   const cssLTRFileNameTempalte = `css/[name]${hashTempalate}${enableRTLSplit ? '.ltr' : ''}.css`;
@@ -107,7 +124,7 @@ const getProdPlugins = (options, publicPath = '') => {
     // ignoreOrder: true,
     filename: cssLTRFileNameTempalte,
     chunkFilename: cssLTRFileNameTempalte
-  }), new _plugins.ResourceHintsPlugin(), new _plugins.MinifyPlugin()];
+  }), new _plugins.ResourceHintsPlugin(options.resourceHints), new _plugins.MinifyPlugin()];
 
   if (enableRTLSplit) {
     pluginsArr.push(new _RtlCssPlugin.RtlCssPlugin({
@@ -161,11 +178,12 @@ const getProdPlugins = (options, publicPath = '') => {
     to: `./${tpFolder}/`,
     toType: 'dir'
   }]));
-  (0, _configHtmlWebpackPlugins.configHtmlWebpackPlugins)(pluginsArr, {
+  generateHtml && (0, _configHtmlWebpackPlugins.configHtmlWebpackPlugins)(pluginsArr, {
     enableChunkHash,
     folder,
     inject,
     minify: minifyHtmlOptions,
+    customScriptLoadingStrategey,
     crossorigin,
     hasEFC
   });
@@ -227,9 +245,9 @@ const getProdPlugins = (options, publicPath = '') => {
     if (bundleAnalyze) {
       pluginsArr.push(new _webpackBundleAnalyzer.BundleAnalyzerPlugin({
         analyzerMode: 'static',
-        generateStatsFile: true,
+        generateStatsFile: false,
         openAnalyzer: false,
-        statsOptions: {
+        statsOptions: enableStats ? null : {
           source: false,
           normal: true,
           chunks: false,
@@ -287,7 +305,17 @@ const getProdPlugins = (options, publicPath = '') => {
   } // plugins.push(new VariableConversionCollector({}));
 
 
+  cssOrderControler.enable && pluginsArr.push(new _CssOrderControlPlugin.default(cssOrderControler));
   customAttributes.enable && pluginsArr.push(new _CustomAttributePlugin.CustomAttributePlugin(customAttributes));
+  customAttributes.enable && pluginsArr.push(new _EfcResourceCleanupPlugin.default(Object.assign({}, customAttributes, {
+    globalCacheObj: context
+  })));
+  enableStats && pluginsArr.push(new _StatsPlugin.default({
+    statsOptions,
+    statsOutputExcludeKeys,
+    statsFileName
+  }));
+  pluginsArr.push(new _EventsHandlingPlugin.EventsHandlingPlugin());
   return pluginsArr;
 };
 

package/lib/plugins/CssOrderControlPlugin.js

@@ -0,0 +1,36 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+class CssOrderControlPlugin {
+  constructor(options) {
+    this.options = {
+      className: options.className
+    };
+  }
+
+  apply(compiler) {
+    // NOTE: we not using this, Reason currently this option is only need for EFC,
+    // So it do not needed.
+    const className = this.options.className;
+    compiler.hooks.thisCompilation.tap({
+      name: 'CssOrderControlPlugin',
+      stage: 1,
+      fn: compilation => {
+        compilation.mainTemplate.hooks.requireEnsure.tap('CssOrderControlPlugin', source => {
+          // const str = attributeSetTemplate(cssAttributes, 'linkTag');
+          const replacedStr = source.replace('head.appendChild(linkTag);', `var referenceTag = document.getElementById('${className}');
+                   head.insertBefore(linkTag, referenceTag);`); //   console.log({ s: source, r: replacedStr });
+
+          return replacedStr;
+        });
+      }
+    });
+  }
+
+}
+
+exports.default = CssOrderControlPlugin;

package/lib/plugins/CustomScriptLoadingStrategyPlugin.js

@@ -0,0 +1,109 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _htmlWebpackPlugin = _interopRequireDefault(require("html-webpack-plugin"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const pluginName = 'CustomScriptLoadingStrategyPlugin';
+
+class CustomScriptLoadingStrategyPlugin {
+  constructor({
+    scriptLoadingStategey
+  } = {}) {
+    this.scriptLoadingStrategy = scriptLoadingStategey;
+    this.tagNamesToMatch = ['script'];
+  }
+
+  getFileNameFromTagSrc(src) {
+    const fileNameArr = src.split('/');
+    return fileNameArr[fileNameArr.length - 1];
+  }
+
+  addAttributestToTag(tag, attributes) {
+    tag.attributes = Object.assign({}, tag.attributes, attributes);
+  }
+
+  matchFileName(tag, fileName) {
+    return fileName.test(this.getFileNameFromTagSrc(tag.attributes.src));
+  }
+
+  blockingStrategy(tag) {
+    delete tag.attributes.defer;
+    delete tag.attributes.async;
+  }
+
+  deferStrategy(tag) {
+    delete tag.attributes.async;
+  }
+
+  asyncStrategy(tag) {
+    delete tag.attributes.defer;
+  }
+
+  moduleStrategy(tag) {
+    this.deferStrategy(tag);
+  }
+
+  matchStrategy(scriptLoadingStrategy, tag) {
+    if (scriptLoadingStrategy === 'blocking') {
+      this.blockingStrategy(tag);
+    }
+
+    if (scriptLoadingStrategy === 'defer') {
+      this.deferStrategy(tag);
+    }
+
+    if (scriptLoadingStrategy === 'async') {
+      this.asyncStrategy(tag);
+    }
+
+    if (scriptLoadingStrategy === 'module') {
+      this.moduleStrategy(tag);
+    }
+  }
+
+  matchAndApplyCustomLoadingStrategyToScripts(tags) {
+    Object.keys(this.scriptLoadingStrategy).forEach(scriptLoadingStrategy => {
+      const filesToMatch = this.scriptLoadingStrategy[scriptLoadingStrategy];
+      tags.forEach(tag => {
+        if (this.tagNamesToMatch.includes(tag.tagName) && tag.attributes.src) {
+          const isFileMatch = filesToMatch.some(fileName => this.matchFileName(tag, fileName));
+
+          if (isFileMatch) {
+            this.matchStrategy(scriptLoadingStrategy, tag);
+            this.addAttributestToTag(tag, {
+              [scriptLoadingStrategy]: true
+            });
+          }
+        } // filesToMatch.forEach(fileName => {
+        //   if (!this.matchFileName(tag, fileName)) {
+        //     return;
+        //   }
+        //   this.matchStrategy(scriptLoadingStrategy, tag);
+        //   this.addAttributestToTag(tag, fileName, {
+        //     [scriptLoadingStrategy]: true
+        //   });
+        // });
+
+      });
+    });
+  }
+
+  apply(compiler) {
+    compiler.hooks.compilation.tap(pluginName, compilation => {
+      _htmlWebpackPlugin.default.getHooks(compilation).alterAssetTagGroups.tapAsync(pluginName, (data, callback) => {
+        const tags = [...data.bodyTags, ...data.headTags];
+        this.matchAndApplyCustomLoadingStrategyToScripts(tags);
+        callback(null, data);
+      });
+    });
+  }
+
+}
+
+exports.default = CustomScriptLoadingStrategyPlugin;

package/lib/plugins/EfcResourceCleanupPlugin.js

@@ -0,0 +1,43 @@
+"use strict";
+
+const {
+  Template
+} = require('webpack');
+
+const plugInName = 'EFCResourceCleanup';
+module.exports = class EfcResouceCleanupPlugin {
+  constructor(options) {
+    this.options = options;
+  }
+
+  apply(compiler) {
+    compiler.hooks.thisCompilation.tap(plugInName, ({
+      mainTemplate
+    }) => {
+      mainTemplate.hooks.afterStartup.tap(plugInName, source => {
+        const {
+          attributes,
+          globalCacheObj
+        } = this.options;
+        const attributesArr = Object.entries(attributes);
+        const [[attributekey, attributeValue]] = attributesArr;
+        const resourceSelector = `[${attributekey}="${attributeValue}"]`;
+        return Template.asString([source, Template.indent([`     window['${globalCacheObj}Jsonp'].unInstall = function() {
+                  Object.keys(installedModules).forEach(installedModulesKey => installedModules[installedModulesKey] = null);
+                  Object.keys(modules).forEach(moduleKey => modules[moduleKey] = null);
+                 `, `
+                 installedModules = null;
+                 modules = null;
+                 __webpack_require__.m = null;
+                 __webpack_require__.c = null;
+              
+                 `, attributekey && attributeValue ? `    
+          const addedResources = document.querySelectorAll('${resourceSelector}');
+          addedResources.forEach(addedResource => addedResource.remove());
+      }
+          ` : ''])]);
+      });
+    });
+  }
+
+};

package/lib/plugins/EventsHandlingPlugin.js

@@ -0,0 +1,34 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.EventsHandlingPlugin = void 0;
+
+/* eslint-disable no-use-before-define */
+class EventsHandlingPlugin {
+  constructor(options) {}
+
+  apply(compiler) {
+    // NOTE: we not using this, Reason currently this option is only need for EFC,
+    // So it do not needed.
+    compiler.hooks.thisCompilation.tap({
+      name: 'CustomAttributePlugin',
+      stage: 1,
+      fn: compilation => {
+        compilation.mainTemplate.hooks.requireEnsure.tap('CustomAttributePlugin', source => {
+          // const str = attributeSetTemplate(cssAttributes, 'linkTag');
+          const sourceStr = source.replace('linkTag.onerror = function(event) {', 'linkTag.onerror = function(event) { linkTag.onerror = linkTag.onload = null;');
+          const replacedSourceStr = sourceStr.replace('linkTag.onload = resolve', `linkTag.onload = () =>  { 
+          linkTag.onerror = linkTag.onload = null;
+          resolve();
+        };`);
+          return replacedSourceStr;
+        });
+      }
+    });
+  }
+
+}
+
+exports.EventsHandlingPlugin = EventsHandlingPlugin;

package/lib/plugins/I18nSplitPlugin/I18nDownlodLogic.js

@@ -228,8 +228,12 @@ class I18nDownlodLogic {
         if(dataSrc === srcPath || dataSrc === fullsrcPath){ return resolve();}
       }
       var scriptTag = document.createElement("script");
-      scriptTag.onload = resolve;
+      scriptTag.onload = () =>  { 
+        scriptTag.onerror = scriptTag.onload = null;
+        resolve();
+      };
       scriptTag.onerror = function(event) {
+        scriptTag.onerror = scriptTag.onload = null;
         var request = event && event.target && event.target.src || fullsrcPath;
         var err = new Error("Loading I18N chunk " + chunkId + " failed.\\n(" + request + ")");
         err.code = "I18N_CHUNK_LOAD_FAILED";

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

@@ -13,6 +13,8 @@ var _path = require("path");
 
 var _logger = require("../../../logger");
 
+var _unicodeConversion = require("./unicodeConversion");
+
 function isComment(line) {
   return line[0] === '#';
 }
@@ -31,7 +33,8 @@ function getPropertiesAsJSON(filePath) {
 
       const ind = line.indexOf('=');
       const key = line.slice(0, ind).replace(/\\ /g, ' ');
-      const value = line.slice(ind + 1);
+      let value = line.slice(ind + 1);
+      value = (0, _unicodeConversion.convertUnicode)(value);
 
       if (key && value) {
         i18nObj[key] = value;

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

@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.convertUnicode = convertUnicode;
+
+function convertUnicode(str) {
+  const unicodeRegex = /\\u([a-fA-F0-9]{4})/g;
+  const converted = str.replace(unicodeRegex, (match, hex) => {
+    return String.fromCharCode(parseInt(hex, 16));
+  });
+  return converted;
+}

package/lib/plugins/ReportGeneratePlugin.js

@@ -13,6 +13,8 @@ var _redis = _interopRequireDefault(require("redis"));
 
 var _utils = require("../utils");
 
+var _log = require("../utils/log");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 let options = (0, _utils.getOptions)();
@@ -68,10 +70,10 @@ class reportGeneratePlugin {
       let client = _redis.default.createClient(redisPort, redisHost);
 
       client.on('connect', () => {
-        (0, _utils.log)('Redis client connected');
+        (0, _log.log)('Redis client connected');
       });
       client.on('error', err => {
-        (0, _utils.log)(`Something went wrong ${err}`);
+        (0, _log.log)(`Something went wrong ${err}`);
       });
 
       if (_fs.default.existsSync(_path.default.resolve(process.cwd(), 'build', 'stats.json'))) {
@@ -80,7 +82,7 @@ class reportGeneratePlugin {
         statsJSON = JSON.parse(statsJSON);
         let finalObj = {};
         let branchName = branch ? branch : (0, _utils.getCurrentBranch)();
-        (0, _utils.log)(branchName);
+        (0, _log.log)(branchName);
         statsJSON.assets.forEach(assetObj => {
           let nameSplitList = assetObj.name.split('/')[assetObj.name.split('/').length - 1].split('.'); // eslint-disable-line
 
@@ -111,7 +113,7 @@ class reportGeneratePlugin {
             };
             client.get(branchName, (err, reply) => {
               if (err) {
-                (0, _utils.log)(err);
+                (0, _log.log)(err);
               } else {
                 reply = JSON.parse(reply); // eslint-disable-line
 
@@ -147,7 +149,7 @@ class reportGeneratePlugin {
                     throw err;
                   }
 
-                  (0, _utils.log)('Stats Json generated!');
+                  (0, _log.log)('Stats Json generated!');
                 });
               }
             });
@@ -169,7 +171,7 @@ class reportGeneratePlugin {
           }
 
           if (err) {
-            (0, _utils.log)(err);
+            (0, _log.log)(err);
           }
         });
       }