@zohodesk/react-cli 1.1.29-exp.1 → 1.1.29-exp.2

package/lib/plugins/CustomAttributePlugin.js

@@ -4,14 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.CustomAttributePlugin = void 0;
-
 var _Template = _interopRequireDefault(require("webpack/lib/Template"));
-
 var _htmlWebpackInjectAttributesPlugin = _interopRequireDefault(require("html-webpack-inject-attributes-plugin"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /* eslint-disable no-use-before-define */
+
 class CustomAttributePlugin {
   constructor(options) {
     this.options = {
@@ -22,34 +19,35 @@ class CustomAttributePlugin {
       i18nAttributes: options.i18nAttributes || options.attributes || {}
     };
   }
-
   addCustomAttributeToDynamicScriptTags(mainTemplate) {
     const {
       jsAttributes,
       cssAttributes,
       i18nAttributes
-    } = this.options; // NOTE: To add custom Attributes to js Script tags
+    } = this.options;
 
+    // NOTE: To add custom Attributes to js Script tags
     mainTemplate.hooks.jsonpScript.tap('CustomAttributePlugin', source => {
       const str = attributeSetTemplate(jsAttributes, 'script');
       return _Template.default.asString([source, ...str]);
-    }); // NOTE: To add custom Attributes to css link tags
+    });
 
+    // NOTE: To add custom Attributes to css link tags
     mainTemplate.hooks.requireEnsure.tap('CustomAttributePlugin', source => {
       const str = attributeSetTemplate(cssAttributes, 'linkTag');
-      const replacedStr = source.replace('head.appendChild(linkTag);', `${str.join('')}head.appendChild(linkTag);`); //   console.log({ s: source, r: replacedStr });
-
+      const replacedStr = source.replace('head.appendChild(linkTag);', `${str.join('')}head.appendChild(linkTag);`);
+      //   console.log({ s: source, r: replacedStr });
       return replacedStr;
-    }); // NOTE: To add custom Attributes to i18n split js Script tags
+    });
 
+    // NOTE: To add custom Attributes to i18n split js Script tags
     mainTemplate.hooks.requireEnsure.tap('CustomAttributePlugin', source => {
       const str = attributeSetTemplate(i18nAttributes, 'scriptTag');
-      const replacedStr = source.replace('document.body.appendChild(scriptTag);', `${str.join('')}document.body.appendChild(scriptTag);`); //   console.log({ s: source, r: replacedStr });
-
+      const replacedStr = source.replace('document.body.appendChild(scriptTag);', `${str.join('')}document.body.appendChild(scriptTag);`);
+      //   console.log({ s: source, r: replacedStr });
       return replacedStr;
     });
   }
-
   apply(compiler) {
     // NOTE: we not using this, Reason currently this option is only need for EFC,
     // So it do not needed.
@@ -66,17 +64,14 @@ class CustomAttributePlugin {
       }
     });
   }
-
 }
-
 exports.CustomAttributePlugin = CustomAttributePlugin;
-
 function attributeSetTemplate(jsAttributes, variableName) {
   let str = [];
   Object.keys(jsAttributes).forEach(key => {
     const val = jsAttributes[key];
     str.push(`${variableName}.setAttribute(${JSON.stringify(key)}, ${JSON.stringify(val)});`);
-  }); //   console.log({ str });
-
+  });
+  //   console.log({ str });
   return str;
 }

package/lib/plugins/CustomScriptLoadingStrategyPlugin.js

@@ -4,13 +4,9 @@ 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 }; }
-
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const pluginName = 'CustomScriptLoadingStrategyPlugin';
-
 class CustomScriptLoadingStrategyPlugin {
   constructor({
     scriptLoadingStategey
@@ -18,69 +14,57 @@ class CustomScriptLoadingStrategyPlugin {
     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 => {
+        }
+        // filesToMatch.forEach(fileName => {
         //   if (!this.matchFileName(tag, fileName)) {
         //     return;
         //   }
@@ -89,11 +73,9 @@ class CustomScriptLoadingStrategyPlugin {
         //     [scriptLoadingStrategy]: true
         //   });
         // });
-
       });
     });
   }
-
   apply(compiler) {
     compiler.hooks.compilation.tap(pluginName, compilation => {
       _htmlWebpackPlugin.default.getHooks(compilation).alterAssetTagGroups.tapAsync(pluginName, (data, callback) => {
@@ -103,7 +85,5 @@ class CustomScriptLoadingStrategyPlugin {
       });
     });
   }
-
 }
-
 exports.default = CustomScriptLoadingStrategyPlugin;

package/lib/plugins/EFCPlugin.js

@@ -4,26 +4,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _webpackSources = require("webpack-sources");
-
 var _utils = require("../utils");
-
 var _path = _interopRequireDefault(require("path"));
-
 var _getI18nFileUrlPathTemplate = require("./I18nSplitPlugin/utils/getI18nFileUrlPathTemplate");
-
 var _I18nKeysIdentifer = _interopRequireDefault(require("./I18nSplitPlugin/I18nKeysIdentifer"));
-
 var _replaceCssDirTemplate = require("./RtlSplitPlugin/replaceCssDirTemplate");
-
 var _EFCTemplatePlugin = _interopRequireDefault(require("./EFCTemplatePlugin"));
-
 var _logger = require("../logger");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // import { getShortI18nAssets } from './I18nSplitPlugin/utils/hashUtils';
+
 const cliOptions = (0, _utils.getOptions)();
 const {
   app: {
@@ -41,17 +32,18 @@ const {
   createSDkFile,
   cdnStatement
 } = efcOptios;
-
 class EFCPlugin {
   constructor(options = {}) {
     this.isDevelopment = options.isDevelopment;
     this.templateFilePath = options.templateFilePath;
     this.serverUrl = options.serverUrl;
-    this.i18nFileNameTemplate = options.i18nFileNameTemplate; // NOTE: this logic may be needed for i18n splited file name with contenthash cases
+    this.i18nFileNameTemplate = options.i18nFileNameTemplate;
+
+    // NOTE: this logic may be needed for i18n splited file name with contenthash cases
     // this.i18nManifestFileName = options.i18nManifestFileName;
+
     // IMPORTANT: here we mergeing optionds  from  pacakge.json  and options via constructor
     // So when debugging consider this as well
-
     this.options = Object.assign({}, efcOptios, options);
     this.options.entryPointName = options.entryPointName || 'efc';
     this.options.outputFile = efcOptios.outputFile.replace('[version]', efcOptios.version);
@@ -60,7 +52,8 @@ class EFCPlugin {
     const cssDirAttr = this.options.cssDirAttr || 'data-efc-dir';
     const localeDefaultValue = this.options.localeDefaultValue || 'en_US';
     const cssDirDefaultValue = this.options.cssDirDefaultValue || 'ltr';
-    this.options.localeStatement = options.localeStatement || // Statment 1:   return langEle && langEle.getAttribute('${localeAttr}') || 'en_US';
+    this.options.localeStatement = options.localeStatement ||
+    // Statment 1:   return langEle && langEle.getAttribute('${localeAttr}') || 'en_US';
     // Statment 2:   return langEle ? langEle.getAttribute('${localeAttr}') : 'en_US';
     // We are using statement1 not statment2,
     // Because even that attribute doesn't have value, We need default value
@@ -72,7 +65,9 @@ class EFCPlugin {
         let dirEle = document.querySelector('[${cssDirAttr}]');
         return dirEle && dirEle.getAttribute('${cssDirAttr}') || '${cssDirDefaultValue}';
       })();`;
-  } // NOTE: this logic may be needed for i18n splited file name with contenthash cases
+  }
+
+  // NOTE: this logic may be needed for i18n splited file name with contenthash cases
   // getI18nManifest(compilation) {
   //   const i18nManifestFile =
   //     compilation.assets[this.options.i18nManifestFileName];
@@ -83,12 +78,11 @@ class EFCPlugin {
   //   return {};
   // }
 
-
   getI18nAssetsStr(entryPoint, compilation) {
     if (!chunkSplitEnable) {
       let i18nAsstes = {};
-      const i18nFiles = Object.keys(compilation.assets).filter(assert => assert.indexOf(`i18n${_path.default.sep}`) !== -1); //hook for i18n url contains i18n/ may cause problem
-
+      const i18nFiles = Object.keys(compilation.assets).filter(assert => assert.indexOf(`i18n${_path.default.sep}`) !== -1);
+      //hook for i18n url contains i18n/ may cause problem
       i18nAsstes = i18nFiles.reduce((res, i18nFilePath) => {
         const fileName = i18nFilePath.replace(`i18n${_path.default.sep}`, '');
         const splittedFileName = fileName.split('.');
@@ -97,11 +91,9 @@ class EFCPlugin {
       }, {});
       return `[${JSON.stringify(i18nAsstes)}[lang]]`;
     }
-
     const initalI18nAssets = entryPoint.chunks.filter(chunk => _I18nKeysIdentifer.default.isChunkHasI18n(chunk)).map(chunk => (0, _getI18nFileUrlPathTemplate.getI18nFileUrlPathTemplate)(compilation, chunk, this.i18nFileNameTemplate, '@locale@'));
     return `${JSON.stringify(initalI18nAssets)}.map(urlpath => urlpath.replace(/@locale@/g, lang))`;
   }
-
   createFileContent(compilation) {
     const {
       entryPointName,
@@ -113,18 +105,19 @@ class EFCPlugin {
     const {
       serverUrl
     } = this;
-    const cssDirTemplate = '@dir@'; // const i18nManifest = this.getI18nManifest(compilation);
-
-    const entryPoint = compilation.entrypoints.get(entryPointName); // const chunk = compilation.namedChunks.get(entryPointName);
-
+    const cssDirTemplate = '@dir@';
+    // const i18nManifest = this.getI18nManifest(compilation);
+    const entryPoint = compilation.entrypoints.get(entryPointName);
+    // const chunk = compilation.namedChunks.get(entryPointName);
     const [jsPath, cssPath,,, i18nJsPath] = !this.isDevelopment ? publicPaths : [];
     const initialFiles = entryPoint.getFiles();
-    const filteredInitialFiles = initialFiles.filter(file => /\.(css|js)$/.test(file)); // const i18nAssets = getShortI18nAssets(
+    const filteredInitialFiles = initialFiles.filter(file => /\.(css|js)$/.test(file));
+
+    // const i18nAssets = getShortI18nAssets(
     //   entryPoint.chunks,
     //   i18nManifest,
     //   i18nJsPath
     // );
-
     const initalI18nAssets = this.getI18nAssetsStr(entryPoint, compilation, i18nJsPath);
     return `(() => {
   const lang = ${localeStatement};
@@ -203,12 +196,10 @@ class EFCPlugin {
   })();
 `;
   }
-
   apply(compiler) {
     if (!createSDkFile) {
       return;
     }
-
     if (this.templateFilePath) {
       new _EFCTemplatePlugin.default({
         templateFilePath: this.templateFilePath,
@@ -218,24 +209,19 @@ class EFCPlugin {
       }).apply(compiler);
       return;
     }
-
     compiler.hooks.emit.tap('EFCPlugin', compilation => {
       const {
         entryPointName,
         outputFile
       } = this.options;
       const entryPoint = compilation.entrypoints.get(entryPointName);
-
       if (!entryPoint) {
         return;
       }
-
       const source = new _webpackSources.RawSource(this.createFileContent(compilation));
       compilation.assets[outputFile] = source;
       (0, _logger.messageLogger)('The EFC embedded code was created successfully..!!!');
     });
   }
-
 }
-
 exports.default = EFCPlugin;

package/lib/plugins/EFCTemplatePlugin.js

@@ -4,26 +4,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _webpackSources = require("webpack-sources");
-
 var _utils = require("../utils");
-
 var _path = _interopRequireDefault(require("path"));
-
 var _fs = require("fs");
-
 var _getI18nFileUrlPathTemplate = require("./I18nSplitPlugin/utils/getI18nFileUrlPathTemplate");
-
 var _I18nKeysIdentifer = _interopRequireDefault(require("./I18nSplitPlugin/I18nKeysIdentifer"));
-
 var _replaceCssDirTemplate = require("./RtlSplitPlugin/replaceCssDirTemplate");
-
 var _logger = require("../logger");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // import { getShortI18nAssets } from './I18nSplitPlugin/utils/hashUtils';
+
 const cliOptions = (0, _utils.getOptions)();
 const {
   i18n: {
@@ -36,7 +27,9 @@ const {
 } = cliOptions;
 const {
   createSDkFile
-} = efcOptios; // for smap relate changes
+} = efcOptios;
+
+// for smap relate changes
 // CdnChangePlugin
 // SourceMapHookPlugin
 
@@ -44,15 +37,20 @@ class EFCTemplatePlugin {
   constructor(options = {}) {
     this.templateFilePath = _path.default.join(process.cwd(), options.templateFilePath);
     this.i18nFileNameTemplate = options.i18nFileNameTemplate;
-    this.publicPath = options.publicPath; // NOTE: this logic may be needed for i18n splited file name with contenthash cases
+    this.publicPath = options.publicPath;
+
+    // NOTE: this logic may be needed for i18n splited file name with contenthash cases
     // this.i18nManifestFileName = options.i18nManifestFileName;
+
     // IMPORTANT: here we mergeing optionds  from  pacakge.json  and options via constructor
     // So when debugging consider this as well
     // this.options = Object.assign({}, efcOptios, options);
 
     this.entryPointName = options.entryPointName || 'efc';
     this.outputFile = efcOptios.outputFile.replace('[version]', efcOptios.version);
-  } // NOTE: this logic may be needed for i18n splited file name with contenthash cases
+  }
+
+  // NOTE: this logic may be needed for i18n splited file name with contenthash cases
   // getI18nManifest(compilation) {
   //   const i18nManifestFile =
   //     compilation.assets[this.options.i18nManifestFileName];
@@ -63,13 +61,12 @@ class EFCTemplatePlugin {
   //   return {};
   // }
 
-
   getI18nAssetsStr(entryPoint, compilation) {
     // NOTE: we have used lang variable inside
     if (!chunkSplitEnable) {
       let i18nAsstes = {};
-      const i18nFiles = Object.keys(compilation.assets).filter(assert => assert.indexOf(`i18n${_path.default.sep}`) !== -1); //hook for i18n url contains i18n/ may cause problem
-
+      const i18nFiles = Object.keys(compilation.assets).filter(assert => assert.indexOf(`i18n${_path.default.sep}`) !== -1);
+      //hook for i18n url contains i18n/ may cause problem
       i18nAsstes = i18nFiles.reduce((res, i18nFilePath) => {
         const fileName = i18nFilePath.replace(`i18n${_path.default.sep}`, '');
         const splittedFileName = fileName.split('.');
@@ -78,28 +75,27 @@ class EFCTemplatePlugin {
       }, {});
       return `[${JSON.stringify(i18nAsstes)}[lang]]`;
     }
-
     const initalI18nAssets = entryPoint.chunks.filter(chunk => _I18nKeysIdentifer.default.isChunkHasI18n(chunk)).map(chunk => (0, _getI18nFileUrlPathTemplate.getI18nFileUrlPathTemplate)(compilation, chunk, this.i18nFileNameTemplate, '@locale@'));
     return `${JSON.stringify(initalI18nAssets)}.map(urlpath => urlpath.replace(/@locale@/g, lang))`;
   }
-
   templateReplacer(entryPoint, compilation) {
-    const cssDirTemplate = '@dir@'; // const i18nManifest = this.getI18nManifest(compilation);
+    const cssDirTemplate = '@dir@';
+    // const i18nManifest = this.getI18nManifest(compilation);
 
     const initialFiles = entryPoint.getFiles();
     const filteredInitialFiles = initialFiles.filter(file => /\.(css|js)$/.test(file));
     const initialJsFiles = filteredInitialFiles.filter(file => /\.js$/.test(file));
     let initialCssFiles = filteredInitialFiles.filter(file => /\.css$/.test(file));
-
     if (enableRTLSplit) {
       initialCssFiles = initialCssFiles.map(filePath => (0, _replaceCssDirTemplate.replaceCssDirTemplate)(filePath, cssDirTemplate));
-    } // const i18nAssets = getShortI18nAssets(
+    }
+
+    // const i18nAssets = getShortI18nAssets(
     //   entryPoint.chunks,
     //   i18nManifest,
     //   '' // i18nJsPath
     // );
 
-
     const initalI18nAssets = this.getI18nAssetsStr(entryPoint, compilation, '' // i18nJsPath
     );
     const templateStr = (0, _fs.readFileSync)(this.templateFilePath).toString();
@@ -116,34 +112,27 @@ class EFCTemplatePlugin {
           return  [];
         }`).replace('((\'@dir@\'))', '\'@dir@\'').replace('((\'publicPath\'))', this.publicPath).replace('((\'@locale@\'))', '\'@locale@\'');
   }
-
   apply(compiler) {
     if (!createSDkFile) {
       return;
     }
-
     compiler.hooks.emit.tap('EFCTemplatePlugin', compilation => {
       const {
         entryPointName,
         outputFile
       } = this;
       const entryPoint = compilation.entrypoints.get(entryPointName);
-
       if (!entryPoint) {
         return;
       }
-
       if (!(0, _fs.existsSync)(this.templateFilePath)) {
         console.error(`EFC Template file not exists ${this.templateFilePath}`);
         return;
       }
-
       const source = new _webpackSources.RawSource(this.templateReplacer(entryPoint, compilation));
       compilation.assets[outputFile] = source;
       (0, _logger.messageLogger)('The EFC embedded code was created successfully..!!!');
     });
   }
-
 }
-
 exports.default = EFCTemplatePlugin;

package/lib/plugins/EfcResourceCleanupPlugin.js

@@ -3,13 +3,11 @@
 const {
   Template
 } = require('webpack');
-
 const plugInName = 'EFCResourceCleanup';
 module.exports = class EfcResouceCleanupPlugin {
   constructor(options) {
     this.options = options;
   }
-
   apply(compiler) {
     compiler.hooks.thisCompilation.tap(plugInName, ({
       mainTemplate
@@ -39,5 +37,4 @@ module.exports = class EfcResouceCleanupPlugin {
       });
     });
   }
-
 };

package/lib/plugins/EventsHandlingPlugin.js

@@ -4,14 +4,14 @@ 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,
@@ -28,7 +28,5 @@ class EventsHandlingPlugin {
       }
     });
   }
-
 }
-
 exports.EventsHandlingPlugin = EventsHandlingPlugin;

package/lib/plugins/I18NInjectIntoIndexPlugin.js

@@ -4,34 +4,22 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _htmlWebpackPlugin = _interopRequireDefault(require("html-webpack-plugin"));
-
 var _utils = require("../utils");
-
 var _urlConcat = require("../utils/urlConcat");
-
 var _path = _interopRequireDefault(require("path"));
-
 var _webpackSources = require("webpack-sources");
-
 var _hashUtils = require("./I18nSplitPlugin/utils/hashUtils");
-
 var _getI18nFileUrlPathTemplate = require("./I18nSplitPlugin/utils/getI18nFileUrlPathTemplate");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 let i18nObj = null;
 const options = (0, _utils.getOptions)();
-
 function newAssign(target, data) {
   return Object.assign({}, target, data);
 }
-
 const {
   i18n
 } = options;
-
 class I18NInjectIntoIndexPlugin {
   constructor(options) {
     this.isDevelopment = options.isDevelopment;
@@ -41,38 +29,33 @@ class I18NInjectIntoIndexPlugin {
     this.i18nManifestFileName = options.i18nManifestFileName;
     this.entryPointName = options.mainChunkName;
   }
-
   getI18nFileUrlPath(chunk, compilation) {
     const urlpath = (0, _getI18nFileUrlPathTemplate.getI18nFileUrlPathTemplate)(compilation, chunk, this.i18nFileNameTemplate, this.templateLabel);
     return (0, _urlConcat.urlConcat)(this.publicPath, urlpath);
   }
-
   getI18nManifest(compilation) {
     const i18nManifestFile = compilation.assets[this.i18nManifestFileName];
-
     if (!i18nManifestFile) {
       return {};
     }
-
     const manifest = JSON.parse(i18nManifestFile.source());
     return manifest;
   }
-
   injectI18nURLsToHTML(compilation) {
     _htmlWebpackPlugin.default.getHooks(compilation).beforeAssetTagGeneration.tapAsync('I18NInjectIntoIndexPlugin', (data, cb) => {
       const {
         assets
-      } = data; // Manipulate the content
+      } = data;
+      // Manipulate the content
       // const i18nManifest = this.getI18nManifest(compilation);
       //  const entryPoint = compilation.entrypoints.get(this.entryPointName);
-
       const i18nScriptURLs = [];
-      i18nScriptURLs.push("desk-i18n-manifest.js");
-      i18nScriptURLs.push("master.i18n.js");
-      i18nScriptURLs.push("masterchunk.i18n.js"); // .map(url => getI18nScriptTagObj(url));
+      i18nScriptURLs.push("i18n-chunk/desk-i18n-manifest.js");
+      i18nScriptURLs.push(`i18n-chunk/${this.templateLabel}/master.i18n.js`);
+
+      // .map(url => getI18nScriptTagObj(url));
       // .join('');
       // Tell webpack to move on
-
       cb(null, newAssign(data, {
         assets: newAssign(assets, {
           js: i18nScriptURLs.concat(assets.js)
@@ -80,7 +63,6 @@ class I18NInjectIntoIndexPlugin {
       }));
     });
   }
-
   withI18nSpitHandling(compiler) {
     compiler.hooks.make.tap('I18NInjectIntoIndexPlugin', compilation => {
       // let cdns = Object.keys(this.publicPaths);
@@ -88,19 +70,17 @@ class I18NInjectIntoIndexPlugin {
         this.injectI18nURLsToHTML(compilation);
         return;
       }
-
       _htmlWebpackPlugin.default.getHooks(compilation).beforeEmit.tapAsync('I18NInjectIntoIndexPlugin', (data, cb) => {
         // Manipulate the content
         const i18nManifest = this.getI18nManifest(compilation);
         const entryPoint = compilation.entrypoints.get(this.entryPointName);
         const i18nAssets = (0, _hashUtils.getShortI18nAssets)(entryPoint.chunks, i18nManifest, this.publicPath);
-        data.html = data.html.replace(new RegExp('<!--I18nInfoToServer(.*?)I18nInfoToServer-->', 'g'), (match, arg) => match.replace(arg, JSON.stringify(i18nAssets))); // Tell webpack to move on
-
+        data.html = data.html.replace(new RegExp('<!--I18nInfoToServer(.*?)I18nInfoToServer-->', 'g'), (match, arg) => match.replace(arg, JSON.stringify(i18nAssets)));
+        // Tell webpack to move on
         cb(null, data);
       });
     });
   }
-
   apply(compiler) {
     if (i18n.chunkSplitEnable) {
       this.withI18nSpitHandling(compiler);
@@ -108,13 +88,12 @@ class I18NInjectIntoIndexPlugin {
       this.withoutI18nSpitHandling(compiler);
     }
   }
-
   withoutI18nSpitHandling(compiler) {
     compiler.hooks.emit.tap('I18NInjectIntoIndexPlugin', compilation => {
       // let cdns = Object.keys(this.publicPaths);
       if (i18nObj === null) {
-        const i18nFiles = Object.keys(compilation.assets).filter(assert => assert.indexOf(`i18n${_path.default.sep}`) !== -1); //hook for i18n url contains i18n/ may cause problem
-
+        const i18nFiles = Object.keys(compilation.assets).filter(assert => assert.indexOf(`i18n${_path.default.sep}`) !== -1);
+        //hook for i18n url contains i18n/ may cause problem
         i18nObj = i18nFiles.reduce((res, next) => {
           const fileName = next.replace(`i18n${_path.default.sep}`, '');
           const splittedFileName = fileName.split('.');
@@ -123,21 +102,16 @@ class I18NInjectIntoIndexPlugin {
           } else {
             res[splittedFileName[0]] = fileName;
           } */
-
           res[splittedFileName[0]] = `${this.publicPath}/i18n/${fileName}`;
           return res;
         }, {});
       }
-
       const [indexFile] = Object.keys(compilation.assets).filter(filename => /\.html$/g.test(filename));
-
       if (indexFile) {
         const source = compilation.assets[indexFile].source();
         compilation.assets[indexFile] = new _webpackSources.RawSource(source.replace(new RegExp('<!--I18nInfoToServer(.*)I18nInfoToServer-->', 'g'), (match, arg) => match.replace(arg, JSON.stringify(i18nObj))));
       }
     });
   }
-
 }
-
 exports.default = I18NInjectIntoIndexPlugin;