@zohodesk/client_build_tool 0.0.11-exp.24.0 → 0.0.11-exp.26.0

package/lib/shared/bundler/webpack/custom_plugins/I18nNumericIndexPlugin/I18nGroupRuntimeModule.js

@@ -18,29 +18,27 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
   generate() {
     const {
       customGroups,
+      chunkIdToGroupMapping,
       localeVarName,
       jsonpFunc,
       i18nPublicPathVar
-    } = this.options; // Build chunk-to-group mapping from config
-
-    const chunkToGroup = {};
-    const groupToChunks = {};
-    Object.entries(customGroups || {}).forEach(([groupName, config]) => {
-      const chunkNames = config.chunks || [];
-      groupToChunks[groupName] = chunkNames;
-      chunkNames.forEach(chunkName => {
-        chunkToGroup[chunkName] = groupName;
-      });
-    });
+    } = this.options; // Use the pre-computed chunk ID to group mapping
+
+    const chunkIdToGroup = chunkIdToGroupMapping || {};
     return `
     // I18n Group Loading Runtime
     (function() {
       var loadedGroups = {};
-      var chunkNameToGroup = ${JSON.stringify(chunkToGroup)};
-      var groupToChunkNames = ${JSON.stringify(groupToChunks)};
+      var chunkIdToGroup = ${JSON.stringify(chunkIdToGroup)};
       var cachedI18nBase;
       var loadReasonKey = '__i18nGroupLoadReason';
 
+      // Only log if we have actual mappings to track
+      if (Object.keys(chunkIdToGroup).length > 0) {
+        console.log('[i18n-group:runtime] I18n Group Runtime Module loaded');
+        console.log('[i18n-group:runtime] Chunk ID to Group mapping:', chunkIdToGroup);
+      }
+
       function ensureTrailingSlash(path) {
         if (!path) {
           return '';
@@ -189,44 +187,9 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
         });
       }
 
-      function toLower(str) {
-        return typeof str === 'string' ? str.toLowerCase() : str;
-      }
-
       function findGroupByChunkId(chunkId) {
-        var directGroup = chunkNameToGroup[chunkId];
-        if (directGroup) {
-          return directGroup;
-        }
-
-        var stringId = '' + chunkId;
-        if (chunkNameToGroup[stringId]) {
-          return chunkNameToGroup[stringId];
-        }
-
-        if (typeof __webpack_require__ !== 'undefined' && typeof __webpack_require__.u === 'function') {
-          var filename = __webpack_require__.u(chunkId) || '';
-          if (filename) {
-            var loweredFilename = toLower(filename);
-            for (var group in groupToChunkNames) {
-              if (!Object.prototype.hasOwnProperty.call(groupToChunkNames, group)) {
-                continue;
-              }
-              var chunkNames = groupToChunkNames[group] || [];
-              for (var i = 0; i < chunkNames.length; i++) {
-                var candidate = chunkNames[i];
-                if (candidate && loweredFilename.indexOf(toLower(candidate)) !== -1) {
-                  if (typeof console !== 'undefined' && console.log) {
-                    console.log('[i18n-group:match-by-filename]', chunkId, filename, 'matched', candidate, '→', group);
-                  }
-                  return group;
-                }
-              }
-            }
-          }
-        }
-
-        return undefined;
+        // Direct numeric chunk ID lookup
+        return chunkIdToGroup[chunkId];
       }
       
       // Store original webpack chunk loading function
@@ -235,10 +198,21 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
       // Override webpack's chunk loading if it exists
       if (originalEnsureChunk) {
         __webpack_require__.e = function(chunkId) {
-          var promise = originalEnsureChunk.apply(this, arguments);
-          
+          if (typeof console !== 'undefined' && console.log) {
+            console.log('[i18n-group:debug] Chunk loading called for ID:', chunkId);
+          }
+
+          // Capture the arguments for later use
+          var args = arguments;
+          var self = this;
+
           // Check if this chunk needs an i18n group
           var groupName = findGroupByChunkId(chunkId);
+          if (typeof console !== 'undefined' && console.log) {
+            console.log('[i18n-group:debug] Found group for chunk', chunkId, ':', groupName);
+            console.log('[i18n-group:debug] Chunk mapping:', chunkIdToGroup);
+          }
+
           if (groupName && !loadedGroups[groupName]) {
             if (typeof console !== 'undefined' && console.log) {
               var chunkFilename = typeof __webpack_require__ !== 'undefined' && typeof __webpack_require__.u === 'function'
@@ -246,16 +220,25 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
                 : '<no __webpack_require__.u>';
               console.log('[i18n-group:hook]', chunkId, '→', groupName, '| reason:', (__webpack_require__[loadReasonKey] || 'require'), '| file:', chunkFilename);
             }
-            // Load the i18n group before the chunk
+            // Load the i18n group FIRST, then load the chunk
             var loadReason = __webpack_require__[loadReasonKey] || 'require';
             var i18nPromise = loadI18nGroup(groupName, loadReason);
-            // Chain the promises so i18n loads first
-            promise = Promise.all([promise, i18nPromise]).then(function(results) {
-              return results[0]; // Return the original chunk promise result
+            // Chain: i18n loads first, then chunk loads
+            return i18nPromise.then(function() {
+              // Only start loading the actual chunk after i18n is loaded
+              return originalEnsureChunk.apply(self, args);
             });
+          } else {
+            if (typeof console !== 'undefined' && console.log) {
+              if (!groupName) {
+                console.log('[i18n-group:debug] No group found for chunk', chunkId);
+              } else if (loadedGroups[groupName]) {
+                console.log('[i18n-group:debug] Group', groupName, 'already loaded for chunk', chunkId);
+              }
+            }
+            // No i18n needed, just load the chunk normally
+            return originalEnsureChunk.apply(this, arguments);
           }
-          
-          return promise;
         };
       }
       

package/lib/shared/bundler/webpack/custom_plugins/I18nNumericIndexPlugin/I18nNumericIndexPlugin.js

@@ -45,12 +45,25 @@ class I18nNumericIndexPlugin {
     this.detectI18nGroupComments(compiler);
     compiler.hooks.thisCompilation.tap(pluginName, compilation => {
       // Add runtime module for group-based loading
+      console.log('[I18nNumericIndexPlugin] customGroups:', this.options.customGroups);
+
       if (this.options.customGroups) {
         compilation.hooks.additionalTreeRuntimeRequirements.tap(pluginName, (chunk, set) => {
           // Only add to the main/entry chunk to avoid duplication
           if (chunk.name === 'main' || chunk.hasRuntime()) {
+            const chunkMapping = this.getChunkIdToGroupMapping(compilation); // Only log if we have actual mappings or it's the first time
+
+            const hasMapping = Object.keys(chunkMapping).length > 0;
+
+            if (hasMapping || !this._hasLoggedRuntime) {
+              console.log('[I18nNumericIndexPlugin] Adding runtime module to chunk:', chunk.name);
+              console.log('[I18nNumericIndexPlugin] Chunk mapping for runtime:', chunkMapping);
+              this._hasLoggedRuntime = true;
+            }
+
             compilation.addRuntimeModule(chunk, new _I18nGroupRuntimeModule.I18nGroupRuntimeModule({
               customGroups: this.options.customGroups,
+              chunkIdToGroupMapping: chunkMapping,
               localeVarName: this.options.localeVarName,
               jsonpFunc: this.options.jsonpFunc,
               i18nPublicPathVar: this.options.i18nPublicPathVar
@@ -69,37 +82,99 @@ class I18nNumericIndexPlugin {
   }
 
   detectI18nGroupComments(compiler) {
+    console.log('[I18nNumericIndexPlugin] Setting up i18n group comment detection');
     compiler.hooks.normalModuleFactory.tap(pluginName, factory => {
       factory.hooks.parser.for('javascript/auto').tap(pluginName, parser => {
         parser.hooks.importCall.tap(pluginName, expr => {
-          // Check for webpackI18nGroup comment
+          // Only log if comments exist to reduce noise
           const comments = expr.leadingComments || [];
-          comments.forEach(comment => {
-            if (comment.value && comment.value.includes('webpackI18nGroup')) {
-              const match = comment.value.match(/webpackI18nGroup:\s*["']([^"']+)["']/);
 
-              if (match) {
-                const groupName = match[1]; // Store this information for later use
+          if (comments.length > 0) {
+            console.log('[I18nNumericIndexPlugin] Import call with comments detected');
+            console.log('[I18nNumericIndexPlugin] Leading comments count:', comments.length);
+            comments.forEach((comment, index) => {
+              console.log(`[I18nNumericIndexPlugin] Comment ${index}:`, comment.value);
+
+              if (comment.value && comment.value.includes('webpackI18nGroup')) {
+                console.log('[I18nNumericIndexPlugin] Found webpackI18nGroup comment:', comment.value);
+                const match = comment.value.match(/webpackI18nGroup:\s*["']([^"']+)["']/);
+
+                if (match) {
+                  const groupName = match[1];
+                  console.log('[I18nNumericIndexPlugin] Extracted group name:', groupName); // Store this information for later use
 
-                if (!this.detectedGroups) {
-                  this.detectedGroups = {};
-                } // Extract chunk name from webpackChunkName comment
+                  if (!this.detectedGroups) {
+                    this.detectedGroups = {};
+                  } // Extract chunk name from webpackChunkName comment
 
 
-                const chunkNameMatch = comment.value.match(/webpackChunkName:\s*["']([^"']+)["']/);
+                  const chunkNameMatch = comment.value.match(/webpackChunkName:\s*["']([^"']+)["']/);
 
-                if (chunkNameMatch) {
-                  const chunkName = chunkNameMatch[1];
-                  this.detectedGroups[chunkName] = groupName;
+                  if (chunkNameMatch) {
+                    const chunkName = chunkNameMatch[1];
+                    console.log('[I18nNumericIndexPlugin] Mapping chunk:', chunkName, '→', groupName);
+                    this.detectedGroups[chunkName] = groupName;
+                  } else {
+                    console.log('[I18nNumericIndexPlugin] No webpackChunkName found in comment');
+                  }
+                } else {
+                  console.log('[I18nNumericIndexPlugin] webpackI18nGroup pattern did not match');
                 }
               }
-            }
-          });
+            });
+          }
         });
       });
     });
   }
 
+  getChunkIdToGroupMapping(compilation) {
+    const chunkIdToGroup = {}; // Hardcoded chunk name to group mapping based on our setupAsync.js
+
+    const hardcodedMappings = {
+      'SetupHome': 'setup',
+      'preferencePopup': 'setup',
+      'auditloglist': 'setup'
+    };
+    let foundAnyMapping = false;
+    let hasRelevantChunks = false; // Process chunks to get their actual IDs and map to groups
+
+    for (const chunk of compilation.chunks) {
+      const chunkName = chunk.name; // Check if this chunk is relevant to setup
+
+      if (chunkName && (chunkName.toLowerCase().includes('setup') || chunkName.toLowerCase().includes('preference') || chunkName.toLowerCase().includes('audit'))) {
+        hasRelevantChunks = true;
+      } // First try detected groups, then fallback to hardcoded mappings
+
+
+      let groupName = null;
+
+      if (this.detectedGroups && this.detectedGroups[chunkName]) {
+        groupName = this.detectedGroups[chunkName];
+        console.log(`[I18nNumericIndexPlugin] Found detected mapping: ${chunkName} → ${groupName} (ID: ${chunk.id})`);
+        foundAnyMapping = true;
+      } else if (hardcodedMappings[chunkName]) {
+        groupName = hardcodedMappings[chunkName];
+        console.log(`[I18nNumericIndexPlugin] Found hardcoded mapping: ${chunkName} → ${groupName} (ID: ${chunk.id})`);
+        foundAnyMapping = true;
+      }
+
+      if (groupName) {
+        chunkIdToGroup[chunk.id] = groupName;
+      }
+    } // Only log summary if we found mappings or relevant chunks
+
+
+    if (foundAnyMapping || hasRelevantChunks || compilation.chunks.size > 0) {
+      console.log('[I18nNumericIndexPlugin] Building chunk ID to group mapping');
+      console.log('[I18nNumericIndexPlugin] Detected groups:', this.detectedGroups);
+      console.log('[I18nNumericIndexPlugin] Total chunks in compilation:', compilation.chunks.size);
+      console.log('[I18nNumericIndexPlugin] Final chunk ID to group mapping:', chunkIdToGroup);
+    }
+
+    return chunkIdToGroup;
+  }
+
   processI18nFiles(compilation) {
     const {
       jsResourcePath,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/client_build_tool",
-  "version": "0.0.11-exp.24.0",
+  "version": "0.0.11-exp.26.0",
   "description": "A CLI tool to  build  web applications and client libraries",
   "main": "lib/index.js",
   "bin": {