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

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;

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

@@ -4,17 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.applyMetaManifest = applyMetaManifest;
-
 var _fs = _interopRequireDefault(require("fs"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function applyMetaManifest(compilation, plugin) {
   const {
     moduleIdMap
   } = plugin;
   const manifestPath = './metaManifest.json';
-
   if (!plugin.detailedManifest || Object.keys(plugin.detailedManifest).length === 0) {
     console.warn('No detailedManifest available, skipping manifest comparison');
     return {
@@ -22,48 +18,53 @@ function applyMetaManifest(compilation, plugin) {
       movedKeys: new Set(),
       error: 'No detailedManifest available'
     };
-  } // Track keys in current build
-
+  }
 
+  // Track keys in current build
   const currentBuildKeys = new Set();
   const currentKeyToModule = new Map();
   const currentModules = new Map();
   const currentKeySets = new Map();
-  const moduleIdToName = new Map(); // Process current build modules with final IDs
+  const moduleIdToName = new Map();
 
+  // Process current build modules with final IDs
   for (const [resourcePath, chunkData] of Object.entries(plugin.detailedManifest)) {
     // Get the final module ID if it exists in our mapping
     const finalModuleId = moduleIdMap.get(resourcePath) || resourcePath;
-    const chunkName = chunkData.chunkName || `chunk_${chunkData.chunkId || "unknown"}`; // Store module name mapping for better logging
+    const chunkName = chunkData.chunkName || `chunk_${chunkData.chunkId || "unknown"}`;
 
+    // Store module name mapping for better logging
     moduleIdToName.set(finalModuleId, chunkName);
-    const keys = Array.isArray(chunkData.keysUsed) ? chunkData.keysUsed : Array.from(chunkData.keysUsed); // Skip empty modules
+    const keys = Array.isArray(chunkData.keysUsed) ? chunkData.keysUsed : Array.from(chunkData.keysUsed);
 
-    if (keys.length === 0) continue; // Sort keys for consistent comparison
+    // Skip empty modules
+    if (keys.length === 0) continue;
 
+    // Sort keys for consistent comparison
     const sortedKeys = [...keys].sort();
-    const keySetString = sortedKeys.join(','); // Store module data using final IDs
+    const keySetString = sortedKeys.join(',');
 
+    // Store module data using final IDs
     currentModules.set(finalModuleId, {
       id: finalModuleId,
       resourcePath: resourcePath,
       chunkId: chunkData.chunkId,
       name: chunkName,
       keys: sortedKeys
-    }); // Store key set for module fingerprinting
+    });
 
-    currentKeySets.set(keySetString, finalModuleId); // Store individual key mappings
+    // Store key set for module fingerprinting
+    currentKeySets.set(keySetString, finalModuleId);
 
+    // Store individual key mappings
     keys.forEach(key => {
       currentBuildKeys.add(key);
       currentKeyToModule.set(key, finalModuleId);
     });
   }
-
   const currentKeyCount = currentBuildKeys.size;
   const currentModuleCount = currentModules.size;
   console.log(`Current build: ${currentKeyCount} keys in ${currentModuleCount} modules`);
-
   try {
     // Read from specified manifest path
     if (!_fs.default.existsSync(manifestPath)) {
@@ -74,11 +75,10 @@ function applyMetaManifest(compilation, plugin) {
         error: `Meta manifest not found at ${manifestPath}`
       };
     }
-
     const fileContent = _fs.default.readFileSync(manifestPath, 'utf8');
+    const remoteMetaManifest = JSON.parse(fileContent);
 
-    const remoteMetaManifest = JSON.parse(fileContent); // Handle non-existent or invalid modules
-
+    // Handle non-existent or invalid modules
     if (!remoteMetaManifest.modules) {
       console.warn('Meta manifest does not contain modules section');
       return {
@@ -86,65 +86,72 @@ function applyMetaManifest(compilation, plugin) {
         movedKeys: new Set(),
         error: 'Meta manifest does not contain modules section'
       };
-    } // Track all keys in remote manifest modules
-
+    }
 
+    // Track all keys in remote manifest modules
     const remoteModuleKeys = new Set();
     const remoteKeyToModule = new Map();
     const remoteModules = new Map();
     const remoteKeySets = new Map();
     const remoteModuleIdToName = new Map();
-    const moduleEquivalenceMap = new Map(); // Process remote manifest modules
+    const moduleEquivalenceMap = new Map();
 
+    // Process remote manifest modules
     for (const [moduleId, moduleData] of Object.entries(remoteMetaManifest.modules)) {
       if (moduleData.keys && Array.isArray(moduleData.keys)) {
         // Store module name for better logging
         const moduleName = moduleId;
-        remoteModuleIdToName.set(moduleId, moduleName); // Skip empty modules
+        remoteModuleIdToName.set(moduleId, moduleName);
 
-        if (moduleData.keys.length === 0) continue; // Sort keys for consistent comparison
+        // Skip empty modules
+        if (moduleData.keys.length === 0) continue;
 
+        // Sort keys for consistent comparison
         const sortedKeys = [...moduleData.keys].sort();
-        const keySetString = sortedKeys.join(','); // Store module data
+        const keySetString = sortedKeys.join(',');
 
+        // Store module data
         remoteModules.set(moduleId, {
           id: moduleData.id || moduleId,
           name: moduleName,
           keys: sortedKeys,
           keyCount: moduleData.keys.length
-        }); // Store key set
+        });
 
-        remoteKeySets.set(keySetString, moduleId); // Store individual key mappings
+        // Store key set
+        remoteKeySets.set(keySetString, moduleId);
 
+        // Store individual key mappings
         moduleData.keys.forEach(key => {
           remoteModuleKeys.add(key);
           remoteKeyToModule.set(key, moduleId);
         });
       }
-    } // Get keys from the master chunk in the remote manifest (if it exists)
-
+    }
 
+    // Get keys from the master chunk in the remote manifest (if it exists)
     const remoteMasterKeys = new Set();
-
     if (remoteMetaManifest.masterKeys && Array.isArray(remoteMetaManifest.masterKeys)) {
       remoteMetaManifest.masterKeys.forEach(key => {
         remoteMasterKeys.add(key);
       });
-    } // Get all unique keys from the remote manifest (modules + master)
-
+    }
 
+    // Get all unique keys from the remote manifest (modules + master)
     const remoteAllKeys = new Set([...remoteModuleKeys, ...remoteMasterKeys]);
     const remoteKeyCount = remoteAllKeys.size;
     const remoteModuleCount = remoteModules.size;
     const remoteMasterKeyCount = remoteMasterKeys.size;
-    console.log(`Remote manifest: ${remoteKeyCount} keys in ${remoteModuleCount} modules, ${remoteMasterKeyCount} master keys`); // Find intersection and differences for keys
+    console.log(`Remote manifest: ${remoteKeyCount} keys in ${remoteModuleCount} modules, ${remoteMasterKeyCount} master keys`);
 
+    // Find intersection and differences for keys
     const inBothSets = new Set([...currentBuildKeys].filter(key => remoteAllKeys.has(key)));
     const missingKeys = new Set([...remoteAllKeys].filter(key => !currentBuildKeys.has(key)));
     const extraKeys = new Set([...currentBuildKeys].filter(key => !remoteAllKeys.has(key)));
-    console.log(`Key comparison: ${inBothSets.size} shared keys, ${missingKeys.size} missing, ${extraKeys.size} new`); // Enhanced multi-level module equivalence mapping
-    // 1. First pass: Match by module name
+    console.log(`Key comparison: ${inBothSets.size} shared keys, ${missingKeys.size} missing, ${extraKeys.size} new`);
 
+    // Enhanced multi-level module equivalence mapping
+    // 1. First pass: Match by module name
     for (const [remoteId, remoteModule] of remoteModules.entries()) {
       if (remoteModule.name) {
         // Find a current module with matching name
@@ -155,11 +162,10 @@ function applyMetaManifest(compilation, plugin) {
           }
         }
       }
-    } // 2. Second pass: Match by resource path
-
+    }
 
+    // 2. Second pass: Match by resource path
     const unmatchedRemote = [...remoteModules.keys()].filter(id => !moduleEquivalenceMap.has(id));
-
     for (const remoteId of unmatchedRemote) {
       for (const [resourcePath, currentModuleId] of moduleIdMap.entries()) {
         if (resourcePath.includes(remoteId)) {
@@ -167,38 +173,35 @@ function applyMetaManifest(compilation, plugin) {
           break;
         }
       }
-    } // 3. Third pass: Match by key set fingerprint
-
+    }
 
+    // 3. Third pass: Match by key set fingerprint
     const stillUnmatchedRemote = [...remoteModules.keys()].filter(id => !moduleEquivalenceMap.has(id));
-
     for (const remoteId of stillUnmatchedRemote) {
       const remoteModule = remoteModules.get(remoteId);
       const keySetString = remoteModule.keys.join(',');
-
       if (currentKeySets.has(keySetString)) {
         moduleEquivalenceMap.set(remoteId, currentKeySets.get(keySetString));
       }
-    } // Find moved keys based on enhanced module equivalence map
-
+    }
 
+    // Find moved keys based on enhanced module equivalence map
     const trulyMovedKeys = new Set();
     const keyMovementDetails = new Map();
-
     for (const key of inBothSets) {
       // Skip keys that are in the master chunk
       if (remoteMasterKeys.has(key)) {
         continue;
       }
-
       const remoteModuleId = remoteKeyToModule.get(key);
-      const currentModuleId = currentKeyToModule.get(key); // Normalize module names for comparison
+      const currentModuleId = currentKeyToModule.get(key);
 
+      // Normalize module names for comparison
       const remoteModuleName = remoteModuleIdToName.get(remoteModuleId) || remoteModuleId;
-      const currentModuleName = moduleIdToName.get(currentModuleId) || currentModuleId; // Only consider a key moved if it's actually in a different module
+      const currentModuleName = moduleIdToName.get(currentModuleId) || currentModuleId;
 
+      // Only consider a key moved if it's actually in a different module
       const moduleNameComparison = remoteModuleName !== currentModuleName;
-
       if (moduleNameComparison) {
         trulyMovedKeys.add(key);
         keyMovementDetails.set(key, {
@@ -209,9 +212,9 @@ function applyMetaManifest(compilation, plugin) {
           type: 'module_change'
         });
       }
-    } // Get keys from unmatched modules that exist in the current build
-
+    }
 
+    // Get keys from unmatched modules that exist in the current build
     const unmatchedRemoteModules = [...remoteModules.keys()].filter(id => !moduleEquivalenceMap.has(id));
     unmatchedRemoteModules.forEach(moduleId => {
       const module = remoteModules.get(moduleId);
@@ -220,8 +223,9 @@ function applyMetaManifest(compilation, plugin) {
         // Only add the key if it exists in the current build
         if (currentBuildKeys.has(key)) {
           const currentModuleId = currentKeyToModule.get(key);
-          const currentModuleName = moduleIdToName.get(currentModuleId) || currentModuleId; // Only add if actually in a different module
+          const currentModuleName = moduleIdToName.get(currentModuleId) || currentModuleId;
 
+          // Only add if actually in a different module
           if (moduleName !== currentModuleName) {
             trulyMovedKeys.add(key);
             keyMovementDetails.set(key, {
@@ -236,32 +240,34 @@ function applyMetaManifest(compilation, plugin) {
       });
     });
     const movedKeyCount = trulyMovedKeys.size;
-    console.log(`Found ${extraKeys.size} new keys and ${movedKeyCount} moved keys`); // Add extra and moved keys to the plugin's tracking for master chunk inclusion
+    console.log(`Found ${extraKeys.size} new keys and ${movedKeyCount} moved keys`);
 
+    // Add extra and moved keys to the plugin's tracking for master chunk inclusion
     plugin.extraKeys = extraKeys;
-    plugin.movedKeys = trulyMovedKeys; // Store key counts for reference
+    plugin.movedKeys = trulyMovedKeys;
 
+    // Store key counts for reference
     plugin.keyStats = {
       current: currentKeyCount,
       remote: remoteKeyCount,
       extra: extraKeys.size,
       moved: movedKeyCount
-    }; // Update master keys in the generated meta manifest
+    };
 
+    // Update master keys in the generated meta manifest
     if (plugin.generatedMetaManifest) {
       // Only include extra (new) and moved keys in the master keys
       const masterKeys = [...Array.from(extraKeys), ...Array.from(trulyMovedKeys)];
       plugin.generatedMetaManifest.masterKeys = masterKeys;
     }
-
     return {
       extraKeys,
       movedKeys: trulyMovedKeys,
       keyStats: plugin.keyStats
     };
   } catch (error) {
-    console.error(`Error during manifest comparison: ${error.message}`); // Return empty sets for keys if there was an error
-
+    console.error(`Error during manifest comparison: ${error.message}`);
+    // Return empty sets for keys if there was an error
     plugin.extraKeys = new Set();
     plugin.movedKeys = new Set();
     return {

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

@@ -5,11 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.collectI18nKeysfromAST = collectI18nKeysfromAST;
 exports.collectI18nKeysfromComments = collectI18nKeysfromComments;
-
 const {
   walk
 } = require('estree-walker');
-
 function collectI18nKeysfromAST(ast, allI18n) {
   let i18nKeys = {};
   walk(ast, {
@@ -23,42 +21,34 @@ function collectI18nKeysfromAST(ast, allI18n) {
   });
   return Object.keys(i18nKeys);
 }
-
 const prefixI18nComment = 'I18N';
 const prefixI18nComment1 = 'dynamic-i18n-key';
-
 function getI18nKeysFromComment(comment) {
   let commentString = comment.value.trim();
   let i18nKeyStr;
-
   if (commentString.startsWith(prefixI18nComment)) {
     i18nKeyStr = commentString.slice(prefixI18nComment.length).trim();
   } else if (commentString.startsWith(prefixI18nComment1)) {
     i18nKeyStr = commentString.slice(prefixI18nComment1.length).trim();
   }
-
   if (!i18nKeyStr) {
     return [];
   }
-
   const i18nKeys = i18nKeyStr.split(',');
   return i18nKeys;
-} // export function fromComments(comments, allI18n) {
-
+}
 
+// export function fromComments(comments, allI18n) {
 function collectI18nKeysfromComments(comments, allI18n) {
   // TODO: need to implement
   let i18nKeys = {};
-
   for (let comment of comments) {
     let keys = getI18nKeysFromComment(comment);
-
     for (let key of keys) {
       if (key && allI18n[key]) {
         i18nKeys[key] = allI18n[key];
       }
     }
   }
-
   return Object.keys(i18nKeys);
 }

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

@@ -4,59 +4,41 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createMetaManifest = createMetaManifest;
-
 var _webpackSources = require("webpack-sources");
-
 function createMetaManifest(compilation, plugin, skipEmit = false) {
   const {
     detailedManifest
-  } = plugin; // Use the plugin's filename property
-
+  } = plugin;
   const i18nMetaManifestFileName = plugin.i18nMetaManifestFileName;
-
   if (!skipEmit) {
     console.log('Generating meta manifest:', i18nMetaManifestFileName);
-  } // Initialize a streamlined meta manifest structure
-
-
+  }
   const finalMetaManifest = {
     modules: {}
-  }; // Process each chunk's keys into the modules section
-
+  };
   for (const [chunkId, chunkData] of Object.entries(detailedManifest)) {
     const chunkName = chunkData.chunkName || `chunk_${chunkId}`;
-    const keysArray = Array.isArray(chunkData.keysUsed) ? chunkData.keysUsed : Array.from(chunkData.keysUsed); // Only add modules that have i18n keys
-
+    const keysArray = Array.isArray(chunkData.keysUsed) ? chunkData.keysUsed : Array.from(chunkData.keysUsed);
     if (keysArray.length > 0) {
       finalMetaManifest.modules[chunkName] = {
         id: chunkId,
         keys: keysArray
       };
     }
-  } // Only include new or moved keys in the masterKeys section
-
-
+  }
   if (plugin.extraKeys && plugin.movedKeys) {
-    // Combine extra (new) and moved keys
-    const masterKeysSet = new Set([...(Array.from(plugin.extraKeys) || []), ...(Array.from(plugin.movedKeys) || [])]); // Convert back to array for the manifest
-
-    finalMetaManifest.masterKeys = Array.from(masterKeysSet); // Log the keys being added to master chunk
-
+    const masterKeysSet = new Set([...(Array.from(plugin.extraKeys) || []), ...(Array.from(plugin.movedKeys) || [])]);
+    finalMetaManifest.masterKeys = Array.from(masterKeysSet);
     if (finalMetaManifest.masterKeys.length > 0) {
-      console.log(`Extra and moved keys to add to master chunk: ${finalMetaManifest.masterKeys.length}`); // Print each key for clarity
-
+      console.log(`Extra and moved keys to add to master chunk: ${finalMetaManifest.masterKeys.length}`);
       finalMetaManifest.masterKeys.forEach(key => {
         console.log(`  - ${key}`);
       });
     }
-  } // Store the generated manifest for potential further use
-
-
-  plugin.generatedMetaManifest = finalMetaManifest; // Only emit if not skipped
-
+  }
+  plugin.generatedMetaManifest = finalMetaManifest;
   if (!skipEmit) {
     const metaManifestSource = new _webpackSources.RawSource(JSON.stringify(finalMetaManifest, null, 2));
-
     if (!compilation.emitAsset) {
       compilation.assets[i18nMetaManifestFileName] = metaManifestSource;
     } else {
@@ -65,6 +47,5 @@ function createMetaManifest(compilation, plugin, skipEmit = false) {
       });
     }
   }
-
   return finalMetaManifest;
 }