@zohodesk/client_build_tool 0.0.11-exp.19.0 → 0.0.11-exp.21.0

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

@@ -10,9 +10,8 @@ var _webpack = require("webpack");
 class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
   constructor(options) {
     super('i18n-group-loader');
-    this.options = {
-      i18nPublicPathVar: 'window.__I18N_CDN__',
-      ...options
+    this.options = { ...options,
+      i18nPublicPathVar: options.i18nPublicPathVar || '(typeof window !== "undefined" && window.__I18N_CDN__)'
     };
   }
 
@@ -77,9 +76,15 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
 
         if (!base) {
           base = __webpack_require__.p || '';
+          if (base && base.indexOf('/smap/') !== -1 && base.slice(-6) === '/smap/') {
+            base = base.slice(0, -6) + '/';
+          }
         }
 
         cachedI18nBase = ensureTrailingSlash(base);
+        if (typeof console !== 'undefined' && console.log) {
+          console.log('[i18n-group:base]', cachedI18nBase || '<empty>');
+        }
         return cachedI18nBase;
       }
 
@@ -113,8 +118,8 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
             .replace('[locale]', locale);
           var i18nUrl = buildI18nUrl(relativePath);
 
-          if (typeof console !== 'undefined' && console.debug) {
-            console.debug('[i18n-group:load]', groupName, i18nUrl);
+          if (typeof console !== 'undefined' && console.log) {
+            console.log('[i18n-group:load]', groupName, i18nUrl);
           }
 
           
@@ -122,12 +127,18 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
           script.src = i18nUrl;
           script.async = true;
           
-          script.onload = function() {
-            loadedGroups[groupName] = true;
+         script.onload = function() {
+           loadedGroups[groupName] = true;
+            if (typeof console !== 'undefined' && console.log) {
+              console.log('[i18n-group:loaded]', groupName, i18nUrl);
+            }
             resolve();
           };
-          
+
           script.onerror = function() {
+            if (typeof console !== 'undefined' && console.error) {
+              console.error('[i18n-group:error]', groupName, i18nUrl);
+            }
             reject(new Error('Failed to load i18n group: ' + groupName));
           };
           
@@ -146,6 +157,9 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
         // Check if this chunk needs an i18n group
         var groupName = chunkToGroup[chunkId];
         if (groupName && !loadedGroups[groupName]) {
+          if (typeof console !== 'undefined' && console.log) {
+            console.log('[i18n-group:hook]', chunkId, '→', groupName);
+          }
           // Load the i18n group before the chunk
           var i18nPromise = loadI18nGroup(groupName);
           // Chain the promises so i18n loads first
@@ -159,47 +173,70 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
       }
       
       // Also check for webpackI18nGroup comments in dynamic imports
-      if (typeof __webpack_require__.l !== 'undefined') {
-        var originalLoadScript = __webpack_require__.l;
-        __webpack_require__.l = function(url, done, key, chunkId) {
-          // Check if chunk has i18n group
+      function wrapLoadScript(originalLoadScript) {
+        return function(url, done, key, chunkId) {
           var groupName = chunkToGroup[chunkId];
           if (groupName && !loadedGroups[groupName]) {
-            // Load i18n before main chunk
             var locale = ${localeVarName} || 'en_US';
             var groupConfig = ${JSON.stringify(customGroups)};
             var config = groupConfig[groupName];
-            
+
             if (config) {
               var relativePath = config.filenameTemplate
                 .replace('[locale]', locale);
               var i18nUrl = buildI18nUrl(relativePath);
 
-              if (typeof console !== 'undefined' && console.debug) {
-                console.debug('[i18n-group:preload]', groupName, i18nUrl);
+              if (typeof console !== 'undefined' && console.log) {
+                console.log('[i18n-group:preload]', groupName, i18nUrl);
               }
-              
-              // Load i18n first, then the chunk
+
               var i18nScript = document.createElement('script');
               i18nScript.src = i18nUrl;
               i18nScript.onload = function() {
                 loadedGroups[groupName] = true;
-                // Now load the original chunk
+                if (typeof console !== 'undefined' && console.log) {
+                  console.log('[i18n-group:loaded]', groupName, i18nUrl);
+                }
                 originalLoadScript.call(__webpack_require__, url, done, key, chunkId);
               };
               i18nScript.onerror = function() {
-                // Continue even if i18n fails
+                if (typeof console !== 'undefined' && console.error) {
+                  console.error('[i18n-group:error]', groupName, i18nUrl);
+                }
                 originalLoadScript.call(__webpack_require__, url, done, key, chunkId);
               };
               document.head.appendChild(i18nScript);
               return;
             }
           }
-          
-          // Default behavior
+
           return originalLoadScript.call(__webpack_require__, url, done, key, chunkId);
         };
       }
+
+      function installLoadScriptHook(loadScript) {
+        Object.defineProperty(__webpack_require__, 'l', {
+          configurable: true,
+          enumerable: true,
+          writable: true,
+          value: wrapLoadScript(loadScript)
+        });
+      }
+
+      if (typeof __webpack_require__.l === 'function') {
+        installLoadScriptHook(__webpack_require__.l);
+      } else {
+        Object.defineProperty(__webpack_require__, 'l', {
+          configurable: true,
+          enumerable: true,
+          set: function(newLoader) {
+            installLoadScriptHook(newLoader);
+          },
+          get: function() {
+            return undefined;
+          }
+        });
+      }
     })();
     `;
   }

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

@@ -52,7 +52,8 @@ class I18nNumericIndexPlugin {
             compilation.addRuntimeModule(chunk, new _I18nGroupRuntimeModule.I18nGroupRuntimeModule({
               customGroups: this.options.customGroups,
               localeVarName: this.options.localeVarName,
-              jsonpFunc: this.options.jsonpFunc
+              jsonpFunc: this.options.jsonpFunc,
+              i18nPublicPathVar: this.options.i18nPublicPathVar
             }));
           }
         });

package/package.json

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