@zohodesk/client_build_tool 0.0.11-exp.16.0 → 0.0.11-exp.17.0

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

@@ -4,14 +4,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.EFCTemplatePlugin = void 0;
+
 var _fs = require("fs");
+
 var _logger = require("../../../../logger");
+
 var _LocaleChunkAssetsStore = require("./I18nSplitPlugin/LocaleChunkAssetsStore");
+
 var _constants = require("../../../constants");
+
 var _getInitialAssetsFuncTemplate = require("./getInitialAssetsFuncTemplate");
+
 const INITIAL_ASSETS_TEMPLATE = '// <--getInitialAssets-->';
 const PUBLIC_PATH_TEMPLATE = '"<--publicPath-->"';
 const pluginName = 'EFCTemplatePlugin';
+
 class EFCTemplatePlugin {
   constructor(options = {}) {
     const {
@@ -25,18 +32,15 @@ class EFCTemplatePlugin {
     this.options = options;
     this.templateFilePath = (0, _constants.joinWithAppPath)(templateFilePath);
     this.i18nFileNameTemplate = i18nFileNameTemplate;
-    this.publicPath = publicPath;
-
-    // NOTE: this logic may be needed for i18n splitted file name with contenthash cases
+    this.publicPath = publicPath; // NOTE: this logic may be needed for i18n splitted file name with contenthash cases
     // this.i18nManifestFileName = options.i18nManifestFileName;
     // IMPORTANT: here we merging options from package.json  and options via constructor
     // So when debugging consider this as well
     // this.options = Object.assign({}, efcOptions, options);
+
     this.entryPointName = entryPointName || 'efc';
     this.outputFile = outputFile.replace('[version]', version);
-  }
-
-  // NOTE: this logic may be needed for i18n splitted file name with contenthash cases
+  } // NOTE: this logic may be needed for i18n splitted file name with contenthash cases
   // getI18nManifest(compilation) {
   //   const i18nManifestFile =
   //     compilation.assets[this.options.i18nManifestFileName];
@@ -48,11 +52,12 @@ class EFCTemplatePlugin {
   // }
   // eslint-disable-next-line class-methods-use-this
 
+
   templateReplacer(entryPoint, compilation) {
     const {
       enableRTLSplit
-    } = this.options;
-    // const i18nManifest = this.getI18nManifest(compilation);
+    } = this.options; // const i18nManifest = this.getI18nManifest(compilation);
+
     const initialAssetsFuncTemplate = (0, _getInitialAssetsFuncTemplate.getInitialAssetsFuncTemplate)({
       entryPoint,
       compilation,
@@ -65,6 +70,7 @@ class EFCTemplatePlugin {
     const templateStr = (0, _fs.readFileSync)(this.templateFilePath).toString();
     return templateStr.replace(INITIAL_ASSETS_TEMPLATE, initialAssetsFuncTemplate).replace(PUBLIC_PATH_TEMPLATE, this.publicPath);
   }
+
   apply(compiler) {
     const {
       RawSource
@@ -83,13 +89,16 @@ class EFCTemplatePlugin {
           outputFile
         } = this;
         const entryPoint = compilation.entrypoints.get(entryPointName);
+
         if (!entryPoint) {
           return;
         }
+
         if (!(0, _fs.existsSync)(this.templateFilePath)) {
           (0, _logger.errorLogger)(`EFC Template file not exists ${this.templateFilePath}`);
           return;
         }
+
         const source = new RawSource(this.templateReplacer(entryPoint, compilation));
         compilation.emitAsset(outputFile, source);
         (0, _logger.messageLogger)('The EFC embedded code was created successfully..!!!');
@@ -97,5 +106,7 @@ class EFCTemplatePlugin {
       });
     });
   }
+
 }
+
 exports.EFCTemplatePlugin = EFCTemplatePlugin;

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

@@ -4,20 +4,22 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.I18nGroupRuntimeModule = void 0;
+
 var _webpack = require("webpack");
+
 class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
   constructor(options) {
     super('i18n-group-loader');
     this.options = options;
   }
+
   generate() {
     const {
       customGroups,
       localeVarName,
       jsonpFunc
-    } = this.options;
+    } = this.options; // Build chunk-to-group mapping from config
 
-    // Build chunk-to-group mapping from config
     const chunkToGroup = {};
     Object.entries(customGroups || {}).forEach(([groupName, config]) => {
       (config.chunks || []).forEach(chunkName => {
@@ -27,53 +29,73 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
     return `
     // I18n Group Loading Runtime
     (function() {
+      console.log('[I18n Runtime] Initializing i18n group loader with groups:', ${JSON.stringify(chunkToGroup)});
       var loadedGroups = {};
       var chunkToGroup = ${JSON.stringify(chunkToGroup)};
       
+      // Function to load i18n group
+      function loadI18nGroup(groupName) {
+        if (loadedGroups[groupName]) {
+          return Promise.resolve();
+        }
+        
+        var locale = ${localeVarName} || 'en_US';
+        var groupConfig = ${JSON.stringify(customGroups)};
+        var config = groupConfig[groupName];
+        
+        if (!config) {
+          return Promise.resolve();
+        }
+        
+        return new Promise(function(resolve, reject) {
+          var i18nUrl = config.filenameTemplate
+            .replace('[locale]', locale)
+            .replace('i18n-chunk/', __webpack_require__.p + 'i18n-chunk/');
+          
+          console.log('[I18n Runtime] Loading i18n group:', groupName, 'from:', i18nUrl);
+          
+          var script = document.createElement('script');
+          script.src = i18nUrl;
+          script.async = true;
+          
+          script.onload = function() {
+            loadedGroups[groupName] = true;
+            console.log('[I18n Runtime] Successfully loaded i18n group:', groupName);
+            resolve();
+          };
+          
+          script.onerror = function() {
+            console.error('[I18n Runtime] Failed to load i18n group:', groupName);
+            reject(new Error('Failed to load i18n group: ' + groupName));
+          };
+          
+          document.head.appendChild(script);
+        });
+      }
+      
       // Store original webpack chunk loading function
       var originalEnsureChunk = __webpack_require__.e;
       
-      // Override webpack's chunk loading
-      __webpack_require__.e = function(chunkId) {
-        var promise = originalEnsureChunk.apply(this, arguments);
+      // Override webpack's chunk loading if it exists
+      if (originalEnsureChunk) {
+        __webpack_require__.e = function(chunkId) {
+          var promise = originalEnsureChunk.apply(this, arguments);
         
         // Check if this chunk needs an i18n group
         var groupName = chunkToGroup[chunkId];
         if (groupName && !loadedGroups[groupName]) {
-          // Load the i18n group
-          var locale = ${localeVarName} || 'en_US';
-          var groupConfig = ${JSON.stringify(customGroups)};
-          var config = groupConfig[groupName];
-          
-          if (config) {
-            var i18nUrl = config.filenameTemplate
-              .replace('[locale]', locale)
-              .replace('i18n-chunk/', __webpack_require__.p + 'i18n-chunk/');
-            
-            // Create script tag to load i18n chunk
-            var script = document.createElement('script');
-            script.src = i18nUrl;
-            script.async = true;
-            
-            // Mark as loaded when script loads
-            script.onload = function() {
-              loadedGroups[groupName] = true;
-            };
-            
-            document.head.appendChild(script);
-            
-            // If prefetch is enabled, prefetch other locales
-            if (config.prefetch && !config.preload) {
-              var link = document.createElement('link');
-              link.rel = 'prefetch';
-              link.href = i18nUrl;
-              document.head.appendChild(link);
-            }
-          }
+          console.log('[I18n Runtime] Chunk', chunkId, 'requires i18n group:', groupName);
+          // Load the i18n group before the chunk
+          var i18nPromise = loadI18nGroup(groupName);
+          // Chain the promises so i18n loads first
+          promise = Promise.all([promise, i18nPromise]).then(function(results) {
+            return results[0]; // Return the original chunk promise result
+          });
         }
         
-        return promise;
-      };
+          return promise;
+        };
+      }
       
       // Also check for webpackI18nGroup comments in dynamic imports
       if (typeof __webpack_require__.l !== 'undefined') {
@@ -116,5 +138,7 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
     })();
     `;
   }
+
 }
+
 exports.I18nGroupRuntimeModule = I18nGroupRuntimeModule;

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

@@ -1,15 +1,28 @@
 "use strict";
 
 const HtmlWebpackPlugin = require('html-webpack-plugin');
+
 const path = require('path');
+
 const pluginName = 'I18nNumericIndexHtmlInjectorPlugin';
+
 class I18nNumericIndexHtmlInjectorPlugin {
   constructor(options) {
-    this.options = options;
+    this.options = { ...options,
+      injectI18nUrlInIndex: options.injectI18nUrlInIndex !== undefined ? options.injectI18nUrlInIndex : true // Default to true
+
+    };
   }
+
   apply(compiler) {
     compiler.hooks.thisCompilation.tap(pluginName, compilation => {
       HtmlWebpackPlugin.getHooks(compilation).beforeAssetTagGeneration.tapAsync(pluginName, (hookData, cb) => {
+        // Skip HTML injection if injectI18nUrlInIndex is false
+        if (!this.options.injectI18nUrlInIndex) {
+          console.log('[I18nNumericIndexHtmlInjectorPlugin] Skipping HTML injection (injectI18nUrlInIndex is false)');
+          return cb(null, hookData);
+        }
+
         const {
           assets
         } = hookData;
@@ -22,60 +35,65 @@ class I18nNumericIndexHtmlInjectorPlugin {
           singleFile,
           i18nAssetsPublicPathPrefix = ''
         } = this.options;
-        const newI18nAssetUrlsToAdd = [];
+        const newI18nAssetUrlsToAdd = []; // Construct full paths using outputFolder
 
-        // Construct full paths using outputFolder
         const constructFullPath = (template, isSingleFile = false) => {
-          if (!template) return null;
-
-          // Replace locale placeholder
-          let filePath = template.replace(/\[locale\]/g, htmlTemplateLabel);
+          if (!template) return null; // Replace locale placeholder
 
-          // Remove [contenthash] placeholder for HTML injection
+          let filePath = template.replace(/\[locale\]/g, htmlTemplateLabel); // Remove [contenthash] placeholder for HTML injection
           // The actual hash will be determined at build time
-          filePath = filePath.replace(/\.\[contenthash\]/g, '');
 
-          // If template already contains outputFolder or starts with a path separator, use as-is
+          filePath = filePath.replace(/\.\[contenthash\]/g, ''); // If template already contains outputFolder or starts with a path separator, use as-is
+
           if (filePath.includes(outputFolder) || filePath.startsWith('/')) {
             return filePath.replace(/\\/g, '/');
-          }
-
-          // For single-file mode with a simple template like '[locale].js', 
+          } // For single-file mode with a simple template like '[locale].js', 
           // put it directly in outputFolder without subdirectories
+
+
           if (isSingleFile && !filePath.includes('/')) {
             return path.join(outputFolder || 'i18n-chunk', filePath).replace(/\\/g, '/');
-          }
+          } // For other cases, preserve subdirectories
+
 
-          // For other cases, preserve subdirectories
           return path.join(outputFolder || 'i18n-chunk', filePath).replace(/\\/g, '/');
         };
+
         if (singleFile) {
           // In single file mode, use singleFileTemplate
           const singleTemplate = singleFileTemplate || '[locale].js';
           const combinedFilename = constructFullPath(singleTemplate, true);
+
           if (combinedFilename) {
             newI18nAssetUrlsToAdd.push(combinedFilename);
           }
         } else {
           // Add both numeric and dynamic files
           const numericFilename = constructFullPath(numericFilenameTemplate);
+
           if (numericFilename) {
             newI18nAssetUrlsToAdd.push(numericFilename);
           }
+
           const dynamicFilename = constructFullPath(dynamicFilenameTemplate);
+
           if (dynamicFilename) {
             newI18nAssetUrlsToAdd.push(dynamicFilename);
           }
         }
+
         if (newI18nAssetUrlsToAdd.length > 0) {
           // Add i18n assets to the beginning of JS assets for early loading
           assets.js = [...newI18nAssetUrlsToAdd, ...assets.js];
         }
+
         cb(null, hookData);
       });
     });
   }
+
 }
+
 module.exports = {
   I18nNumericIndexHtmlInjectorPlugin
 };