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

package/lib/schemas/defaultConfigValues.js

@@ -199,8 +199,7 @@ var _default = {
     emitFiles: true,
     injectI18nUrlInIndex: true,
     customGroups: null,
-    chunkToGroupMapping: {},
-    groupPublicPathRuntimeExpression: 'window.__SMAP_PATH__'
+    chunkToGroupMapping: {}
   },
   publicFolders: {
     dev: ['...'],

package/lib/schemas/defaultConfigValuesOnly.js

@@ -116,8 +116,7 @@ var _default = {
     emitFiles: true,
     injectI18nUrlInIndex: true,
     customGroups: null,
-    chunkToGroupMapping: {},
-    groupPublicPathRuntimeExpression: 'window.__SMAP_PATH__'
+    chunkToGroupMapping: {}
   },
   publicFolders: {
     dev: ['...'],

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

@@ -19,101 +19,38 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
       customGroups,
       chunkIdToGroupMapping,
       localeVarName,
-      groupAssetUrls,
-      publicPathRuntimeExpression
+      groupAssetUrls
     } = this.options;
     const chunkIdToGroup = chunkIdToGroupMapping || {};
-    const runtimePublicPathResolver = publicPathRuntimeExpression ? `function(){ try { return ${publicPathRuntimeExpression}; } catch (err) { return undefined; } }` : 'function(){ return undefined; }';
+    console.log("kiren");
     return `
-    // I18n Group Loading Runtime
     (function() {
-      var loadedGroups = {};
+      var loadedGroups = Object.create(null);
+      var loadingGroups = Object.create(null);
       var chunkIdToGroup = ${JSON.stringify(chunkIdToGroup)};
       var groupAssetUrls = ${JSON.stringify(groupAssetUrls || {})};
-      var runtimePublicPathResolver = ${runtimePublicPathResolver};
-      var cachedDocumentBase;
-
-      function ensureTrailingSlash(path) {
-        if (!path) return '';
-        return path.charAt(path.length - 1) === '/' ? path : path + '/';
-      }
+      var groupConfig = ${JSON.stringify(customGroups || {})};
 
       function normalizeRelativePath(path) {
-        if (!path) return '';
-        return path.charAt(0) === '/' ? path.slice(1) : path;
+        return path && path.charAt(0) === '/' ? path.slice(1) : path;
       }
 
       function isFullUrl(value) {
-        if (typeof value !== 'string') {
-          return false;
-        }
-        return value.indexOf('://') !== -1 || value.startsWith('//');
-      }
-
-      function getDocumentBase() {
-        if (cachedDocumentBase !== undefined) {
-          return cachedDocumentBase;
-        }
-
-        if (typeof document === 'undefined') {
-          cachedDocumentBase = '';
-          return cachedDocumentBase;
-        }
-
-        var script = document.currentScript;
-        if (!script) {
-          var scripts = document.getElementsByTagName('script');
-          if (scripts.length) {
-            script = scripts[scripts.length - 1];
-          }
-        }
-
-        if (script && script.src) {
-          var scriptUrl = script.src.replace(/[?#].*$/, '');
-          var lastSlash = scriptUrl.lastIndexOf('/');
-          var withoutFile = lastSlash >= 0 ? scriptUrl.slice(0, lastSlash + 1) : '';
-          var normalized = withoutFile.endsWith('js/')
-            ? withoutFile.slice(0, withoutFile.length - 3)
-            : withoutFile;
-          cachedDocumentBase = ensureTrailingSlash(normalized);
-        } else {
-          cachedDocumentBase = '';
-        }
-
-        return cachedDocumentBase;
-      }
-
-      function resolveRuntimePublicPath() {
-        var dynamicBase = runtimePublicPathResolver();
-        if (dynamicBase != null && dynamicBase !== '') {
-          return ensureTrailingSlash(String(dynamicBase));
-        }
-
-        var webpackPublicPath = ${_webpack.RuntimeGlobals.publicPath};
-        if (typeof webpackPublicPath === 'string' && webpackPublicPath) {
-          return ensureTrailingSlash(webpackPublicPath);
-        }
-
-        var documentBase = getDocumentBase();
-        if (documentBase) {
-          return documentBase;
-        }
-
-        return '';
+        return typeof value === 'string' && (value.indexOf('://') !== -1 || value.indexOf('//') === 0);
       }
 
       function buildI18nUrl(relativePath) {
-        if (!relativePath) {
-          return resolveRuntimePublicPath();
-        }
-
         if (isFullUrl(relativePath)) {
           return relativePath;
         }
-
         var normalizedPath = normalizeRelativePath(relativePath);
-        var base = resolveRuntimePublicPath();
-        return base + normalizedPath;
+        var publicPath = ${_webpack.RuntimeGlobals.publicPath};
+
+        if (typeof publicPath === 'undefined' || publicPath === 'undefined') {
+          publicPath = '';
+        }
+
+        return publicPath + normalizedPath;
       }
 
       function loadI18nGroup(groupName) {
@@ -121,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]) {
@@ -139,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);
@@ -155,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) {
@@ -187,12 +148,7 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
       };
 
       function detectGroupFromUrl() {
-        if (typeof window === 'undefined') {
-          return null;
-        }
-
         var url = window.location.href;
-        var groupConfig = ${JSON.stringify(customGroups)};
 
         for (var groupName in groupConfig) {
           if (!Object.prototype.hasOwnProperty.call(groupConfig, groupName)) {
@@ -200,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;
             }
           }
         }
@@ -217,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/I18nNumericIndexHtmlInjectorPlugin.js

@@ -23,16 +23,12 @@ class I18nNumericIndexHtmlInjectorPlugin {
   }
 
   apply(compiler) {
-    console.log(`[I18nNumericIndexHtmlInjectorPlugin] Plugin loaded - v1.0.0`);
     compiler.hooks.thisCompilation.tap(pluginName, compilation => {
-      _htmlWebpackPlugin.default.getHooks(compilation).beforeAssetTagGeneration.tapAsync(pluginName, (hookData, cb) => {
+      _htmlWebpackPlugin.default.getHooks(compilation).alterAssetTagGroups.tapAsync(pluginName, (data, cb) => {
         if (!this.options.injectI18nUrlInIndex) {
-          return cb(null, hookData);
+          return cb(null, data);
         }
 
-        const {
-          assets
-        } = hookData;
         const {
           outputFolder = 'i18n-chunk',
           numericFilenameTemplate,
@@ -42,7 +38,7 @@ class I18nNumericIndexHtmlInjectorPlugin {
           singleFile,
           i18nAssetsPublicPathPrefix = ''
         } = this.options;
-        const newI18nAssetUrlsToAdd = [];
+        const i18nScriptTags = [];
         const emittedAssetNames = compilation.getAssets().map(asset => asset.name);
         const recordedAssets = compilation[assetStoreKey] || [];
 
@@ -83,27 +79,48 @@ class I18nNumericIndexHtmlInjectorPlugin {
           const combinedFilename = resolveAssetPath(singleFileTemplate, 'single');
 
           if (combinedFilename) {
-            newI18nAssetUrlsToAdd.push(combinedFilename);
+            i18nScriptTags.push({
+              tagName: 'script',
+              voidTag: false,
+              attributes: {
+                src: combinedFilename,
+                nonce: '{{--CSP-nonce}}'
+              }
+            });
           }
         } else {
           const numericFilename = resolveAssetPath(numericFilenameTemplate, 'numeric');
 
           if (numericFilename) {
-            newI18nAssetUrlsToAdd.push(numericFilename);
+            i18nScriptTags.push({
+              tagName: 'script',
+              voidTag: false,
+              attributes: {
+                src: numericFilename,
+                nonce: '{{--CSP-nonce}}'
+              }
+            });
           }
 
           const dynamicFilename = resolveAssetPath(dynamicFilenameTemplate, 'dynamic');
 
           if (dynamicFilename) {
-            newI18nAssetUrlsToAdd.push(dynamicFilename);
+            i18nScriptTags.push({
+              tagName: 'script',
+              voidTag: false,
+              attributes: {
+                src: dynamicFilename,
+                nonce: '{{--CSP-nonce}}'
+              }
+            });
           }
         }
 
-        if (newI18nAssetUrlsToAdd.length > 0) {
-          assets.js = [...newI18nAssetUrlsToAdd, ...assets.js];
+        if (i18nScriptTags.length > 0) {
+          data.headTags = [...i18nScriptTags, ...data.headTags];
         }
 
-        return cb(null, hookData);
+        cb(null, data);
       });
     });
   }

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

@@ -53,8 +53,7 @@ class I18nNumericIndexPlugin {
       outputFolder: options.outputFolder || 'i18n-chunk',
       manifestPath: options.manifestPath || null,
       emitFiles: options.emitFiles !== undefined ? options.emitFiles : true,
-      chunkToGroupMapping: options.chunkToGroupMapping || {},
-      groupPublicPathRuntimeExpression: options.groupPublicPathRuntimeExpression || ''
+      chunkToGroupMapping: options.chunkToGroupMapping || {}
     };
     this.numericMap = {};
     this.customGroups = {};
@@ -67,7 +66,6 @@ class I18nNumericIndexPlugin {
   }
 
   apply(compiler) {
-    console.log(`[I18nNumericIndexPlugin] Plugin loaded - v1.0.0`);
     this.detectI18nGroupComments(compiler);
     compiler.hooks.thisCompilation.tap(pluginName, compilation => {
       this.groupAssetUrls = {};
@@ -86,10 +84,7 @@ class I18nNumericIndexPlugin {
               customGroups: this.options.customGroups,
               chunkIdToGroupMapping: chunkMapping,
               localeVarName: this.options.localeVarName,
-              jsonpFunc: this.options.jsonpFunc,
-              groupAssetUrls: this.groupAssetUrls,
-              includeContentHash: this.options.includeContentHash,
-              publicPathRuntimeExpression: this.options.groupPublicPathRuntimeExpression
+              groupAssetUrls: this.groupAssetUrls
             }));
           }
         });
@@ -177,9 +172,7 @@ class I18nNumericIndexPlugin {
           }
         }
       });
-    } catch (err) {
-      console.warn(`[I18nNumericIndexPlugin] Failed to read properties folder: ${err.message}`);
-    }
+    } catch (err) {}
 
     return locales;
   }
@@ -208,7 +201,6 @@ class I18nNumericIndexPlugin {
           ...this.normalizeObjectValues(localeProperties)
         };
       } catch (err) {
-        console.warn(`[I18nNumericIndexPlugin] Failed to load locale ${locale}: ${err.message}`);
         return;
       }
     }
@@ -291,12 +283,20 @@ class I18nNumericIndexPlugin {
     }
 
     compilation.fileDependencies.add(_path.default.resolve(jsResourcePath));
-    compilation.fileDependencies.add(_path.default.resolve(propertiesFolderPath));
 
     if (numericMapPath) {
       compilation.fileDependencies.add(_path.default.resolve(numericMapPath));
-    } // Reset caches for incremental builds
+    }
 
+    try {
+      const propertiesFiles = _fs.default.readdirSync(propertiesFolderPath);
+
+      propertiesFiles.forEach(file => {
+        if (file.endsWith('.properties')) {
+          compilation.fileDependencies.add(_path.default.resolve(propertiesFolderPath, file));
+        }
+      });
+    } catch (err) {}
 
     this.numericMap = {};
     this.manifest = {};
@@ -322,10 +322,9 @@ class I18nNumericIndexPlugin {
     }
 
     const availableLocales = this.getAvailableLocales(propertiesFolderPath);
-    console.log(`[I18nNumericIndexPlugin] Processing ${availableLocales.length} locales:`, availableLocales.join(', '));
     availableLocales.forEach(locale => {
       this.processLocale(locale, jsResourceKeys, propertiesFolderPath, compilation);
-    }); // Generate manifest file if enabled
+    });
 
     if (this.options.generateManifest && Object.keys(this.manifest).length > 0) {
       const manifestPath = this.options.manifestPath || _path.default.join(this.options.outputFolder, 'manifest.json');
@@ -431,7 +430,7 @@ class I18nNumericIndexPlugin {
     }
 
     const content = this.generateChunkContent(data, jsonpFunc, groupName);
-    let outputPath = this.constructFilePath(filenameTemplate, locale); // Handle [contenthash] placeholder in template
+    let outputPath = this.constructFilePath(filenameTemplate, locale);
 
     if (outputPath.includes('[contenthash]')) {
       const contentHash = this.generateContentHash(content, compilation);
@@ -439,8 +438,7 @@ class I18nNumericIndexPlugin {
     } else if (this.options.includeContentHash) {
       const contentHash = this.generateContentHash(content, compilation);
       outputPath = outputPath.replace(/\.js$/, `.${contentHash}.js`);
-    } // Track in manifest if enabled
-
+    }
 
     if (this.options.generateManifest) {
       const manifestKey = this.options.singleFile ? `${locale}.js` : outputPath;

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/lib/shared/bundler/webpack/pluginConfigs/configI18nNumericIndexPlugin.js

@@ -21,12 +21,6 @@ function configI18nNumericIndexPlugin(options) {
   }
 
   const i18nOpts = options.i18nIndexing;
-  const cdnMapping = options.cdnMapping || {};
-  const cdnVariableName = cdnMapping.variableName || 'window.__SMAP_PATH__';
-  const {
-    groupPublicPathRuntimeExpression: configuredRuntimeExpression
-  } = i18nOpts;
-  const groupPublicPathRuntimeExpression = configuredRuntimeExpression !== undefined ? configuredRuntimeExpression : cdnVariableName;
 
   try {
     const result = (0, _i18nOptionsValidator.validateI18nIndexingOptions)(i18nOpts);
@@ -86,8 +80,7 @@ function configI18nNumericIndexPlugin(options) {
     manifestPath: i18nOpts.manifestPath || null,
     customGroups: i18nOpts.customGroups || null,
     chunkToGroupMapping: i18nOpts.chunkToGroupMapping || {},
-    emitFiles,
-    groupPublicPathRuntimeExpression
+    emitFiles
   };
   const htmlInjectorOptions = { ...sharedOptions,
     htmlTemplateLabel: i18nOpts.htmlTemplateLabel,

package/package.json

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