@zohodesk/client_build_tool 0.0.11-exp.34.0 → 0.0.11-exp.35.0

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

@@ -22,18 +22,21 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
       groupAssetUrls
     } = this.options;
     const chunkIdToGroup = chunkIdToGroupMapping || {};
+    console.log("kiren");
     return `
     (function() {
-      var loadedGroups = {};
+      var loadedGroups = Object.create(null);
+      var loadingGroups = Object.create(null);
       var chunkIdToGroup = ${JSON.stringify(chunkIdToGroup)};
       var groupAssetUrls = ${JSON.stringify(groupAssetUrls || {})};
+      var groupConfig = ${JSON.stringify(customGroups || {})};
 
       function normalizeRelativePath(path) {
         return path && path.charAt(0) === '/' ? path.slice(1) : path;
       }
 
       function isFullUrl(value) {
-        return typeof value === 'string' && (value.indexOf('://') !== -1 || value.startsWith('//'));
+        return typeof value === 'string' && (value.indexOf('://') !== -1 || value.indexOf('//') === 0);
       }
 
       function buildI18nUrl(relativePath) {
@@ -41,7 +44,13 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
           return relativePath;
         }
         var normalizedPath = normalizeRelativePath(relativePath);
-        return ${_webpack.RuntimeGlobals.publicPath} + normalizedPath;
+        var publicPath = ${_webpack.RuntimeGlobals.publicPath};
+
+        if (typeof publicPath === 'undefined' || publicPath === 'undefined') {
+          publicPath = '';
+        }
+
+        return publicPath + normalizedPath;
       }
 
       function loadI18nGroup(groupName) {
@@ -49,15 +58,22 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
           return Promise.resolve();
         }
 
-        var locale = ${localeVarName} || 'en_US';
-        var groupConfig = ${JSON.stringify(customGroups)};
-        var config = groupConfig[groupName];
+        if (loadingGroups[groupName]) {
+          return loadingGroups[groupName];
+        }
 
+        var config = groupConfig[groupName];
         if (!config) {
           return Promise.resolve();
         }
 
-        return new Promise(function(resolve, reject) {
+        if (typeof document === 'undefined' || !document.head || !document.createElement) {
+          return Promise.resolve();
+        }
+
+        var locale = ${localeVarName} || 'en_US';
+
+        var loadPromise = new Promise(function(resolve, reject) {
           var relativePath;
 
           if (groupAssetUrls[groupName] && groupAssetUrls[groupName][locale]) {
@@ -67,14 +83,24 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
           }
 
           var i18nUrl = buildI18nUrl(relativePath);
-
           var script = document.createElement('script');
+
           script.src = i18nUrl;
           script.async = true;
+
           if (typeof __webpack_require__ !== 'undefined' && __webpack_require__.nc) {
             script.setAttribute('nonce', __webpack_require__.nc);
           }
 
+          var target = document.head || document.getElementsByTagName('head')[0] || document.documentElement;
+
+          if (!target) {
+            loadedGroups[groupName] = true;
+            delete loadingGroups[groupName];
+            resolve();
+            return;
+          }
+
           var cleanup = function() {
             if (script.parentNode) {
               script.parentNode.removeChild(script);
@@ -83,20 +109,27 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
 
           script.onload = function() {
             loadedGroups[groupName] = true;
+            delete loadingGroups[groupName];
             cleanup();
             resolve();
           };
 
           script.onerror = function(err) {
+            delete loadingGroups[groupName];
             cleanup();
-            if (typeof console !== 'undefined' && console.warn) {
-              console.warn('Failed to load i18n group', groupName, 'from', i18nUrl, err);
+            var errorMessage = 'Failed to load i18n group: ' + groupName + ' from ' + i18nUrl;
+            if (err && err.message) {
+              errorMessage += ' (' + err.message + ')';
             }
-            reject(new Error('Failed to load i18n group: ' + groupName));
+            reject(new Error(errorMessage));
           };
 
-          document.head.appendChild(script);
+          target.appendChild(script);
         });
+
+        loadingGroups[groupName] = loadPromise;
+
+        return loadPromise;
       }
 
       function findGroupByChunkId(chunkId) {
@@ -113,13 +146,9 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
           promises.push(loadI18nGroup(groupName));
         }
       };
-      function detectGroupFromUrl() {
-        if (typeof window === 'undefined') {
-          return null;
-        }
 
+      function detectGroupFromUrl() {
         var url = window.location.href;
-        var groupConfig = ${JSON.stringify(customGroups)};
 
         for (var groupName in groupConfig) {
           if (!Object.prototype.hasOwnProperty.call(groupConfig, groupName)) {
@@ -127,12 +156,12 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
           }
 
           var config = groupConfig[groupName];
-          if (config && Array.isArray(config.urlPatterns)) {
-            for (var i = 0; i < config.urlPatterns.length; i++) {
-              var pattern = config.urlPatterns[i];
-              if (pattern && url.indexOf(pattern) !== -1) {
-                return groupName;
-              }
+          if (!config.urlPatterns || !Array.isArray(config.urlPatterns)) {
+            continue;
+          }
+          for (var i = 0; i < config.urlPatterns.length; i++) {
+            if (url.indexOf(config.urlPatterns[i]) !== -1) {
+              return groupName;
             }
           }
         }
@@ -144,20 +173,49 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
         try {
           var detectedGroup = detectGroupFromUrl();
           if (detectedGroup && !loadedGroups[detectedGroup]) {
-            loadI18nGroup(detectedGroup).catch(function(err) {
-              if (typeof console !== 'undefined' && console.warn) {
-                console.warn('Failed to preload i18n group', detectedGroup, err);
-              }
-            });
+            loadI18nGroup(detectedGroup).catch(function() {});
           }
-        } catch (err) {
-          if (typeof console !== 'undefined' && console.warn) {
-            console.warn('Error during i18n group detection', err);
+        } catch (err) {}
+      }
+
+      function safeCheckAndLoadGroupFromUrl() {
+        var publicPath = ${_webpack.RuntimeGlobals.publicPath};
+        if (typeof publicPath === 'undefined' || publicPath === 'undefined') {
+          if (typeof document !== 'undefined' && document.readyState === 'loading') {
+            document.addEventListener('DOMContentLoaded', checkAndLoadGroupFromUrl);
+          } else {
+            setTimeout(checkAndLoadGroupFromUrl, 0);
           }
+        } else {
+          checkAndLoadGroupFromUrl();
         }
       }
 
-      checkAndLoadGroupFromUrl();
+      safeCheckAndLoadGroupFromUrl();
+
+      if (typeof window !== 'undefined' && window.history) {
+        var originalPushState = window.history.pushState;
+        var originalReplaceState = window.history.replaceState;
+
+        if (originalPushState) {
+          window.history.pushState = function() {
+            var result = originalPushState.apply(this, arguments);
+            checkAndLoadGroupFromUrl();
+            return result;
+          };
+        }
+
+        if (originalReplaceState) {
+          window.history.replaceState = function() {
+            var result = originalReplaceState.apply(this, arguments);
+            checkAndLoadGroupFromUrl();
+            return result;
+          };
+        }
+
+        window.addEventListener('popstate', checkAndLoadGroupFromUrl);
+        window.addEventListener('hashchange', checkAndLoadGroupFromUrl);
+      }
     })();
     `;
   }

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

@@ -107,6 +107,7 @@ function loadI18nData(options, compilation) {
     allI18n,
     locales
   } = loadAllLocaleFiles(propertiesPath, compilation, jsResourceBase);
+  console.log("kiren");
   return {
     jsResourceBase,
     allI18n,

package/package.json

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