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

package/lib/plugins/I18nSplitPlugin/I18nFilesEmitter.js

@@ -4,66 +4,75 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _webpackSources = require("webpack-sources");
-
 var _utils = require("./utils");
-
 var _getI18nKeysFormModules = _interopRequireDefault(require("./utils/getI18nKeysFormModules"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+var _createRegularManifest = require("./utils/createRegularManifest");
+var _createMetaManifest = require("./utils/createMetaManifest");
+var _applyMetaManifest = require("./utils/applyMetaManifest");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * this plugin was creating the chunk specific i18n chunk's.
  */
-// this plugin's kick  starter is apply method
+
 const pluginName = 'I18nFilesEmitter';
 const MODULE_TYPE = 'json/i18n';
-
 const i18ntype = locale => `${MODULE_TYPE}/${locale}`;
-
 class I18nFilesEmitter {
   constructor({
     allI18nObject,
     i18nManifestFileName,
     filenameTemplate,
     locales,
-    jsonpFunc
+    jsonpFunc,
+    i18nMetaManifestFileName,
+    entryPointNames = ['main'],
+    masterChunkFileName = 'master.i18n.js'
   }) {
     this.locales = locales;
     this.allI18nObject = allI18nObject;
-    this.filenameTemplate = filenameTemplate; // this.filenameTemplate =  "i18n-chunk/[locale]/[name].js"
-
+    this.filenameTemplate = filenameTemplate;
     this.jsonpFunc = jsonpFunc;
     this.prevHashes = {};
     this.i18nManifestFileName = i18nManifestFileName;
+    this.i18nMetaManifestFileName = i18nMetaManifestFileName || 'i18n-chunk/metaManifest.json';
+    this.regularManifest = {};
+    this.detailedManifest = {};
+    this.entryPointNames = Array.isArray(entryPointNames) ? entryPointNames : [entryPointNames];
+    this.masterChunkFileName = masterChunkFileName;
+    this.generatedMetaManifest = {
+      modules: {},
+      masterKeys: []
+    };
+    this.extraKeys = new Set();
+    this.movedKeys = new Set();
+    this.entryPointKeys = new Set();
+    this.combinedChunks = {};
+    this.moduleIdMap = new Map();
+    this.moduleToChunks = new Map();
+    this.resourceToModule = new Map();
   }
-
   emitAsset(compilation, filename, source, info) {
-    // NOTE: info support  available since webpack v4.40.0 https://webpack.js.org/api/stats/#asset-objects
     if (!compilation.emitAsset) {
       compilation.assets[filename] = source;
     } else {
       compilation.emitAsset(filename, source, info);
     }
-  } // this method for create object and assign value for i18nkeys
-
-
+  }
   getI18nObjectByLocale(i18nKeys, locale) {
     const data = {};
     i18nKeys.forEach(key => {
-      data[key] = this.allI18nObject[locale][key];
+      if (this.allI18nObject[locale] && this.allI18nObject[locale][key] !== undefined) {
+        data[key] = this.allI18nObject[locale][key];
+      }
     });
     return data;
   }
-
   getTemplateString(i18nKeys, locale) {
-    let i18nObject = this.getI18nObjectByLocale(i18nKeys, locale);
-    return `${this.jsonpFunc}(${(0, _utils.jsonToString)(i18nObject)});`; // return `${this.jsonpFunc}(JSON.parse(${JSON.stringify(jsonToString(i18nObject))}));`;
+    const i18nObject = this.getI18nObjectByLocale(i18nKeys, locale);
+    return `${this.jsonpFunc}(${(0, _utils.jsonToString)(i18nObject)});`;
   }
-
   renderI18nLocaleChunk(chunk, locale, i18nKeys) {
-    // renderI18nLocaleChunk(chunk, locale, i18nKeys, compilation) {
     const filenameTemplate = this.filenameTemplate.replace(/\[locale\]/g, locale);
     const pathOptions = {
       chunk,
@@ -77,7 +86,48 @@ class I18nFilesEmitter {
       hash: chunk.contentHash[i18ntype(locale)]
     };
   }
+  captureModuleIds(compilation) {
+    console.log('Capturing final module IDs from compilation...');
+    this.moduleIdMap.clear();
+    this.resourceToModule.clear();
+    this.moduleToChunks.clear();
+
+    // Process all modules to build our mapping
+    compilation.modules.forEach(module => {
+      // Skip modules without resources
+      if (!module.resource) return;
+      const originalId = module.resource;
+      const finalId = module.id;
 
+      // Map resource path to final module ID
+      this.moduleIdMap.set(originalId, finalId);
+      // Map resource path to module object
+      this.resourceToModule.set(originalId, module);
+
+      // Build chunk membership for each module
+      const chunkIds = Array.from(module.chunksIterable || []).map(chunk => chunk.id).filter(Boolean);
+      if (chunkIds.length > 0) {
+        this.moduleToChunks.set(originalId, chunkIds);
+      }
+    });
+
+    // console.log(`Captured ${this.moduleIdMap.size} module ID mappings`);
+  }
+  gatherModuleDetails(chunk, i18nKeys) {
+    if (!i18nKeys.length) return;
+    const stableModuleIds = Array.from(chunk.modulesIterable).map(module => module.resource).filter(Boolean);
+    const moduleKey = stableModuleIds.length ? stableModuleIds[0] : `chunk_${chunk.id}`;
+    if (!this.detailedManifest[moduleKey]) {
+      this.detailedManifest[moduleKey] = {
+        chunkId: chunk.id,
+        chunkName: chunk.name || `chunk_${chunk.id}`,
+        keysUsed: new Set()
+      };
+    }
+    i18nKeys.forEach(key => {
+      this.detailedManifest[moduleKey].keysUsed.add(key);
+    });
+  }
   emitI18nFilesForChunk(chunk, compilation) {
     const i18nKeys = (0, _getI18nKeysFormModules.default)(chunk.modulesIterable);
     const manifestForChunk = {
@@ -85,16 +135,17 @@ class I18nFilesEmitter {
       hasI18n: false,
       hasChanges: false
     };
-
     if (!i18nKeys.length) {
-      // why  it is not checked as 0
       return manifestForChunk;
     }
-
-    manifestForChunk.hasI18n = true; // const locales  = ['en_US'];
-
+    this.gatherModuleDetails(chunk, i18nKeys);
+    manifestForChunk.hasI18n = true;
+    const isEntryPoint = this.isPartOfEntryPoint(chunk, compilation);
+    if (isEntryPoint) {
+      i18nKeys.forEach(key => this.entryPointKeys.add(key));
+    }
     this.locales.forEach(locale => {
-      const result = this.renderI18nLocaleChunk(chunk, locale, i18nKeys, compilation);
+      const result = this.renderI18nLocaleChunk(chunk, locale, i18nKeys);
       const {
         filenameTemplate,
         pathOptions,
@@ -104,80 +155,146 @@ class I18nFilesEmitter {
       } = result;
       const filePath = compilation.getPath(filenameTemplate, pathOptions);
       manifestForChunk.assets[locale] = filePath;
-
       if (this.prevHashes[identifier] === hash) {
         return;
       }
-
       manifestForChunk.hasChanges = true;
       this.prevHashes[identifier] = hash;
-      this.emitAsset(compilation, filePath, render(), {
+      const renderedContent = render().source();
+      this.emitAsset(compilation, filePath, new _webpackSources.RawSource(renderedContent), {
         locale,
         chunkId: chunk.id,
         chunkName: chunk.name
-      }); // compilation.assets[filePath] = render();
+      });
+      if (!this.combinedChunks[locale]) {
+        this.combinedChunks[locale] = [];
+      }
+      this.combinedChunks[locale].push({
+        path: filePath,
+        content: renderedContent,
+        data: this.getI18nObjectByLocale(i18nKeys, locale),
+        isEntryPoint: isEntryPoint
+      });
     });
     return manifestForChunk;
   }
+  isPartOfEntryPoint(chunk, compilation) {
+    let isEntryChunk = false;
+    this.entryPointNames.forEach(entryName => {
+      const entryPoint = compilation.entrypoints.get(entryName);
+      if (entryPoint && entryPoint.chunks.includes(chunk)) {
+        isEntryChunk = true;
+      }
+    });
+    return isEntryChunk;
+  }
+  createMetaManifestWithFinalIds(compilation) {
+    console.log('Creating meta manifest with final module IDs...');
+    const finalMetaManifest = {
+      modules: {},
+      masterKeys: []
+    };
+    for (const [resourcePath, moduleData] of Object.entries(this.detailedManifest)) {
+      const finalId = this.moduleIdMap.get(resourcePath) || resourcePath;
+      const chunkName = moduleData.chunkName || `chunk_${finalId}`;
+      const keysArray = Array.isArray(moduleData.keysUsed) ? moduleData.keysUsed : Array.from(moduleData.keysUsed);
+      if (keysArray.length > 0) {
+        finalMetaManifest.modules[chunkName] = {
+          id: moduleData.chunkId,
+          finalId: finalId,
+          resourcePath: resourcePath,
+          keys: keysArray
+        };
+      }
+    }
+    this.generatedMetaManifest = finalMetaManifest;
+    console.log(`Created meta manifest with ${Object.keys(finalMetaManifest.modules).length} modules`);
+  }
+  compareWithRemoteManifest(compilation) {
+    (0, _applyMetaManifest.applyMetaManifest)(compilation, this);
+  }
+  emitMasterChunks(compilation) {
+    const combinedKeys = new Set([...this.extraKeys, ...this.movedKeys, ...(this.generatedMetaManifest.masterKeys || [])]);
 
+    // console.log(`Extra and moved keys to add to master chunk: ${combinedKeys.size}`);
+    // console.log(`Entry point keys: ${this.entryPointKeys.size}`);
+
+    // Add entry point keys to the master keys in meta manifest
+    if (this.generatedMetaManifest) {
+      this.generatedMetaManifest.masterKeys = [...this.generatedMetaManifest.masterKeys, ...Array.from(this.entryPointKeys)];
+    }
+
+    // Create a master object that contains all needed keys
+    const allMasterKeys = new Set([...combinedKeys, ...this.entryPointKeys]);
+
+    // console.log(`Creating master chunks with ${allMasterKeys.size} total keys`);
+
+    for (const locale of this.locales) {
+      try {
+        const masterI18nObject = this.getI18nObjectByLocale([...allMasterKeys], locale);
+        console.log(`Master i18n object has ${Object.keys(masterI18nObject).length} keys`);
+        const finalContent = `${this.jsonpFunc}(${(0, _utils.jsonToString)(masterI18nObject)});`;
+        const outputPath = `i18n-chunk/${locale}/${this.masterChunkFileName}`;
+        this.emitAsset(compilation, outputPath, new _webpackSources.RawSource(finalContent), {
+          locale,
+          chunkName: 'master',
+          desc: 'Combined master i18n chunk'
+        });
+        if (!this.regularManifest.master) {
+          this.regularManifest.master = {};
+        }
+        this.regularManifest.master[locale] = outputPath;
+      } catch (error) {
+        console.error(`ERROR processing master chunk for locale ${locale}:`, error.message);
+        try {
+          console.log(`Attempting to emit a fallback master chunk for locale ${locale}`);
+          const fallbackI18nObject = this.getI18nObjectByLocale([...combinedKeys], locale);
+          const fallbackContent = `${this.jsonpFunc}(${(0, _utils.jsonToString)(fallbackI18nObject)});`;
+          const outputPath = `i18n-chunk/${locale}/${this.masterChunkFileName}`;
+          this.emitAsset(compilation, outputPath, new _webpackSources.RawSource(fallbackContent), {
+            locale,
+            chunkName: 'master',
+            desc: 'Fallback master i18n chunk (only moved/extra keys)'
+          });
+          if (!this.regularManifest.master) {
+            this.regularManifest.master = {};
+          }
+          this.regularManifest.master[locale] = outputPath;
+          console.log(`Emitted fallback master chunk for locale ${locale}: ${outputPath}`);
+        } catch (fallbackError) {
+          console.error(`Failed to emit fallback master chunk for locale ${locale}:`, fallbackError.message);
+        }
+      }
+    }
+  }
   emitI18nAssert(compilation) {
-    let manifest = {};
-    let needEmitManifest = false;
+    console.log('Starting I18n asset emission process...');
+    this.captureModuleIds(compilation);
+    this.entryPointKeys = new Set();
     compilation.chunks.forEach(chunk => {
       const manifestForChunk = this.emitI18nFilesForChunk(chunk, compilation);
-
       if (manifestForChunk.hasI18n) {
-        manifest[chunk.id] = manifestForChunk.assets;
-        needEmitManifest = needEmitManifest || manifestForChunk.hasChanges;
+        this.regularManifest[chunk.id] = manifestForChunk.assets;
       }
     });
-
-    if (needEmitManifest) {
-      const manifestSource = new _webpackSources.RawSource(JSON.stringify(manifest));
-      this.emitAsset(compilation, this.i18nManifestFileName, manifestSource, {
-        desc: 'this file is has chunks-locales-assets mapping'
-      });
-    }
+    this.createMetaManifestWithFinalIds(compilation);
+    this.compareWithRemoteManifest(compilation);
+    this.emitMasterChunks(compilation);
+    (0, _createRegularManifest.createRegularManifest)(compilation, this);
+    const metaManifestSource = new _webpackSources.RawSource(JSON.stringify(this.generatedMetaManifest, null, 2));
+    this.emitAsset(compilation, this.i18nMetaManifestFileName, metaManifestSource, {
+      desc: 'Updated meta manifest with master keys'
+    });
+    console.log('Completed I18n asset emission process');
   }
-
   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);
-          }
-        );
-      });
-      */
-    // this below hook was tapped for create asssets(file) for chunk specific i18nChunk Files
-    compiler.hooks.emit.tap(pluginName, compilation => {
+    compiler.hooks.afterCompile.tap(pluginName, compilation => {
+      this.compilation = compilation;
+    });
+    compiler.hooks.emit.tapAsync(pluginName, (compilation, callback) => {
       this.emitI18nAssert(compilation);
+      callback();
     });
   }
-  /*
-    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)
-          );
-        });
-      }
-    }
-    */
-
-
 }
-
 exports.default = I18nFilesEmitter;

package/lib/plugins/I18nSplitPlugin/I18nKeysIdentifer.js

@@ -4,16 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _utils = require("./utils");
-
 var _I18nDependency = require("./I18nDependency");
-
 var _NullFactory = _interopRequireDefault(require("webpack/lib/NullFactory"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const pluginName = 'I18nKeysIdentifer';
+
 /**
  * this plugin search the i18 keys and make it as I18nDependency.
  * how it works?
@@ -23,17 +19,14 @@ const pluginName = 'I18nKeysIdentifer';
  *  after the walk of AST we get some I18n keys
  *  then we make it as I18nDependency.
  */
-
 class I18nKeysIdentifer {
   constructor(jsResourceI18nKeys) {
     this.jsResourceI18nKeys = jsResourceI18nKeys;
   }
-
   defineConfigarationForI18nDependency(compilation) {
     compilation.dependencyFactories.set(_I18nDependency.I18nDependency, new _NullFactory.default());
     compilation.dependencyTemplates.set(_I18nDependency.I18nDependency, new _I18nDependency.I18nDependencyTemplate());
   }
-
   addI18nDependency(module, i18nKeys) {
     const identifier = `i18n ${module.resource}`;
     const dep = new _I18nDependency.I18nDependency({
@@ -42,46 +35,43 @@ class I18nKeysIdentifer {
     }, module.context, 0);
     module.addDependency(dep);
   }
-
   apply(compiler) {
     compiler.hooks.thisCompilation.tap(pluginName, (compilation, params) => {
       // this below  hook was tapped for  we use I18nDependency
       // so we must define module factory for I18nDependency
       // and we must define how  it  import statement look like I18nDependencyTemplate
-      this.defineConfigarationForI18nDependency(compilation); // handler for parser
+      this.defineConfigarationForI18nDependency(compilation);
 
+      // handler for parser
       const handler = parser => {
         parser.hooks.program.tap(pluginName, (ast, commmets) => {
           const {
             module
-          } = parser.state; //
-
+          } = parser.state;
+          //
           if (!(module && /\.jsx?$/.test(module.resource))) {
             return;
-          } // i18n grep proper contract regex
-
-
+          }
+          // i18n grep proper contract regex
           let i18nKeys = (0, _utils.collectI18nKeysfromAST)(ast, this.jsResourceI18nKeys);
-          i18nKeys = i18nKeys.concat( // i18n grep proper contract regex
+          i18nKeys = i18nKeys.concat(
+          // i18n grep proper contract regex
           (0, _utils.collectI18nKeysfromComments)(commmets, this.jsResourceI18nKeys));
-
           if (i18nKeys.length) {
             this.addI18nDependency(module, i18nKeys);
           }
         });
-      }; // this below  hook was tapped for collect I18n Key from files and add as Deppenensy
+      };
 
+      // this below  hook was tapped for collect I18n Key from files and add as Deppenensy
 
       const factory = params.normalModuleFactory;
       factory.hooks.parser.for('javascript/auto').tap(pluginName, handler);
       factory.hooks.parser.for('javascript/dynamic').tap(pluginName, handler);
     });
   }
-
 }
-
 exports.default = I18nKeysIdentifer;
-
 I18nKeysIdentifer.isChunkHasI18n = function (chunk) {
   for (const module of chunk.modulesIterable) {
     for (const dep of module.dependencies) {
@@ -90,6 +80,5 @@ I18nKeysIdentifer.isChunkHasI18n = function (chunk) {
       }
     }
   }
-
   return false;
 };

package/lib/plugins/I18nSplitPlugin/index.js

@@ -4,23 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _utils = require("./utils");
-
 var _webpack = require("webpack");
-
 var _I18nKeysIdentifer = _interopRequireDefault(require("./I18nKeysIdentifer"));
-
 var _I18nFilesEmitter = _interopRequireDefault(require("./I18nFilesEmitter"));
-
 var _I18nDownlodLogic = _interopRequireDefault(require("./I18nDownlodLogic"));
-
 var _getI18nKeysFormModules = _interopRequireDefault(require("./utils/getI18nKeysFormModules"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // #region initial
-
 /**
  * @TODO:
  *  [?] add comment line options for properties file and get all keys form property file do right way to genarate them
@@ -39,16 +30,16 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  *   - 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;
 const {
   createHash
 } = _webpack.util;
 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
@@ -77,15 +68,16 @@ class I18nPlugin {
       propertiesFolder,
       jsonpFunc
     } = this.options;
-    this.publicPath = publicPath; // gethere i18n keys and values
-
+    this.publicPath = publicPath;
+    // gethere i18n keys and values
     this.jsResourceI18nKeys = jsResource ? (0, _utils.getPropertiesAsJSON)(jsResource) : {};
     this.allI18nObject = (0, _utils.getAllI18n)({
       folderPath: propertiesFolder,
       disableDefault,
       jsResourceI18nKeys: this.jsResourceI18nKeys
-    }); // initialize base data's and plugis
+    });
 
+    // initialize base data's and plugis
     this.locales = Object.keys(this.allI18nObject);
     this.i18nKeysIdentifer = new _I18nKeysIdentifer.default(this.jsResourceI18nKeys);
     this.i18nFilesEmitter = new _I18nFilesEmitter.default({
@@ -102,7 +94,6 @@ class I18nPlugin {
       localeVarName
     });
   }
-
   maintainHashForAllI18nAssets(compilation) {
     /**
      * we write chunkHash logic inside of our plugin Because we only add Dependency not Module.
@@ -122,14 +113,13 @@ class I18nPlugin {
         hashDigestLength
       } = outputOptions;
       const i18nKeys = (0, _getI18nKeysFormModules.default)(chunk.modulesIterable);
-
       if (!i18nKeys.length) {
         return;
       }
-
       const {
         contentHash
-      } = chunk; // contentHash = {
+      } = chunk;
+      // contentHash = {
       //   javascript: 'abcd2938',
       //   'css/mini-extract': 'askdijasod'
       // };
@@ -141,19 +131,20 @@ class I18nPlugin {
       });
     });
   }
-
   apply(compiler) {
     this.i18nKeysIdentifer.apply(compiler);
     compiler.hooks.thisCompilation.tap(pluginName, compilation => {
       // this below  hook was tapped for hash for the specific i18nChunk Files and write logic to requireEnsure
-      this.maintainHashForAllI18nAssets(compilation); // const { mainTemplate } = compilation;
+      this.maintainHashForAllI18nAssets(compilation);
+
+      // const { mainTemplate } = compilation;
       // this.addDownloadLogicOfI18nInMainTemplate(mainTemplate);
     });
     this.i18nFilesEmitter.apply(compiler);
     this.i18nDownlodLogic.apply(compiler);
   }
-
 }
+
 /*
         // TODO:  need to reimplement this logic
         // NOTE:  this logic for split all content hash per mani chunk
@@ -180,6 +171,4 @@ class I18nPlugin {
           
         }
         */
-
-
 exports.default = I18nPlugin;