@zohodesk/client_build_tool 0.0.11-exp.31.0 → 0.0.11-exp.32.0

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

@@ -20,63 +20,103 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
       chunkIdToGroupMapping,
       localeVarName,
       groupAssetUrls,
-      publicPathPrefix,
       publicPathRuntimeExpression
     } = this.options;
     const chunkIdToGroup = chunkIdToGroupMapping || {};
+    const runtimePublicPathResolver = publicPathRuntimeExpression ? `function(){ try { return ${publicPathRuntimeExpression}; } catch (err) { return undefined; } }` : 'function(){ return undefined; }';
     return `
     // I18n Group Loading Runtime
     (function() {
       var loadedGroups = {};
       var chunkIdToGroup = ${JSON.stringify(chunkIdToGroup)};
       var groupAssetUrls = ${JSON.stringify(groupAssetUrls || {})};
-      var cachedI18nBase;
-      var scriptCache = null;
-      var runtimePublicPathPrefixResolver = ${publicPathRuntimeExpression ? `function(){ try { return ${publicPathRuntimeExpression}; } catch (err) { return undefined; } }` : 'function(){ return undefined; }'};
-      var runtimePublicPathPrefix = runtimePublicPathPrefixResolver();
-      if (runtimePublicPathPrefix === undefined || runtimePublicPathPrefix === null || runtimePublicPathPrefix === '') {
-        runtimePublicPathPrefix = ${JSON.stringify(publicPathPrefix || '')};
-      }
-      if (typeof runtimePublicPathPrefix !== 'string') {
-        runtimePublicPathPrefix = runtimePublicPathPrefix != null ? String(runtimePublicPathPrefix) : '';
-      }
+      var runtimePublicPathResolver = ${runtimePublicPathResolver};
+      var cachedDocumentBase;
 
       function ensureTrailingSlash(path) {
         if (!path) return '';
         return path.charAt(path.length - 1) === '/' ? path : path + '/';
       }
 
-      runtimePublicPathPrefix = ensureTrailingSlash(runtimePublicPathPrefix);
+      function normalizeRelativePath(path) {
+        if (!path) return '';
+        return path.charAt(0) === '/' ? path.slice(1) : path;
+      }
+
+      function isFullUrl(value) {
+        if (typeof value !== 'string') {
+          return false;
+        }
+        return value.indexOf('://') !== -1 || value.startsWith('//');
+      }
 
-      function resolveI18nBase() {
-        if (cachedI18nBase !== undefined) {
-          return cachedI18nBase;
+      function getDocumentBase() {
+        if (cachedDocumentBase !== undefined) {
+          return cachedDocumentBase;
         }
 
-        var base = __webpack_require__.p || '';
-        cachedI18nBase = ensureTrailingSlash(base);
-        return cachedI18nBase;
+        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 buildI18nUrl(relativePath) {
-        if (!relativePath) {
-          return runtimePublicPathPrefix || resolveI18nBase();
+      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;
         }
 
-        var normalizedPath = relativePath;
-        if (normalizedPath.charAt(0) === '/') {
-          normalizedPath = normalizedPath.slice(1);
+        return '';
+      }
+
+      function buildI18nUrl(relativePath) {
+        if (!relativePath) {
+          return resolveRuntimePublicPath();
         }
 
-        if (runtimePublicPathPrefix) {
-          return runtimePublicPathPrefix + normalizedPath;
+        if (isFullUrl(relativePath)) {
+          return relativePath;
         }
 
-        var base = resolveI18nBase();
+        var normalizedPath = normalizeRelativePath(relativePath);
+        var base = resolveRuntimePublicPath();
         return base + normalizedPath;
       }
 
-      function loadI18nGroup(groupName, loadReason) {
+      function loadI18nGroup(groupName) {
         if (loadedGroups[groupName]) {
           return Promise.resolve();
         }
@@ -89,8 +129,7 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
           return Promise.resolve();
         }
 
-
-        return new Promise(function(resolve, reject) {
+        return new Promise(function(resolve) {
           var relativePath;
 
           if (groupAssetUrls[groupName] && groupAssetUrls[groupName][locale]) {
@@ -117,9 +156,12 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
             resolve();
           };
 
-          script.onerror = function() {
+          script.onerror = function(err) {
             cleanup();
             loadedGroups[groupName] = true;
+            if (typeof console !== 'undefined' && console.warn) {
+              console.warn('Failed to load i18n group', groupName, 'from', i18nUrl, err);
+            }
             resolve();
           };
 
@@ -140,32 +182,46 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
           var groupName = findGroupByChunkId(chunkId);
 
           if (groupName && !loadedGroups[groupName]) {
-            var i18nPromise = loadI18nGroup(groupName, 'require');
-
-            return i18nPromise.then(function() {
+            return loadI18nGroup(groupName).then(function() {
               return originalEnsureChunk.apply(self, args);
-            }).catch(function(err) {
+            }).catch(function() {
               return originalEnsureChunk.apply(self, args);
             });
-          } else {
-            return originalEnsureChunk.apply(this, arguments);
           }
+
+          return originalEnsureChunk.apply(this, args);
         };
       }
 
-      // Simple URL-based detection for setup pages
+      if (!${_webpack.RuntimeGlobals.ensureChunkHandlers}) {
+        ${_webpack.RuntimeGlobals.ensureChunkHandlers} = {};
+      }
+
+      ${_webpack.RuntimeGlobals.ensureChunkHandlers}.i18nGroup = function(chunkId, promises) {
+        var groupName = findGroupByChunkId(chunkId);
+        if (groupName && !loadedGroups[groupName]) {
+          promises.push(loadI18nGroup(groupName));
+        }
+      };
+
       function detectGroupFromUrl() {
-        if (typeof window === 'undefined') return null;
+        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)) {
+            continue;
+          }
+
           var config = groupConfig[groupName];
-          if (config.urlPatterns && Array.isArray(config.urlPatterns)) {
+          if (config && Array.isArray(config.urlPatterns)) {
             for (var i = 0; i < config.urlPatterns.length; i++) {
               var pattern = config.urlPatterns[i];
-              if (url.includes(pattern)) {
+              if (pattern && url.indexOf(pattern) !== -1) {
                 return groupName;
               }
             }
@@ -179,16 +235,19 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
         try {
           var detectedGroup = detectGroupFromUrl();
           if (detectedGroup && !loadedGroups[detectedGroup]) {
-            loadI18nGroup(detectedGroup, 'url-detection').catch(function(err) {
-              // Silent error handling
+            loadI18nGroup(detectedGroup).catch(function(err) {
+              if (typeof console !== 'undefined' && console.warn) {
+                console.warn('Failed to preload i18n group', detectedGroup, err);
+              }
             });
           }
         } catch (err) {
-          // Silent error handling
+          if (typeof console !== 'undefined' && console.warn) {
+            console.warn('Error during i18n group detection', err);
+          }
         }
       }
 
-      // Check current URL for immediate loading
       checkAndLoadGroupFromUrl();
     })();
     `;

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

@@ -15,7 +15,7 @@ var _propertiesUtils = require("../I18nSplitPlugin/utils/propertiesUtils");
 
 var _I18nGroupRuntimeModule = require("./I18nGroupRuntimeModule");
 
-var _i18nDataLoader = require("./utils/i18nDataLoader.js");
+var _i18nDataLoader = require("./utils/i18nDataLoader");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -54,7 +54,6 @@ class I18nNumericIndexPlugin {
       manifestPath: options.manifestPath || null,
       emitFiles: options.emitFiles !== undefined ? options.emitFiles : true,
       chunkToGroupMapping: options.chunkToGroupMapping || {},
-      groupPublicPathPrefix: options.groupPublicPathPrefix || '',
       groupPublicPathRuntimeExpression: options.groupPublicPathRuntimeExpression || ''
     };
     this.numericMap = {};
@@ -81,6 +80,7 @@ class I18nNumericIndexPlugin {
           if (chunk.name === 'main' || chunk.hasRuntime()) {
             this.ensureAssetsPrepared(compilation);
             const chunkMapping = this.getChunkIdToGroupMapping(compilation);
+            set.add(_webpack.RuntimeGlobals.publicPath);
             compilation.addRuntimeModule(chunk, new _I18nGroupRuntimeModule.I18nGroupRuntimeModule({
               customGroups: this.options.customGroups,
               chunkIdToGroupMapping: chunkMapping,
@@ -88,7 +88,6 @@ class I18nNumericIndexPlugin {
               jsonpFunc: this.options.jsonpFunc,
               groupAssetUrls: this.groupAssetUrls,
               includeContentHash: this.options.includeContentHash,
-              publicPathPrefix: this.options.groupPublicPathPrefix,
               publicPathRuntimeExpression: this.options.groupPublicPathRuntimeExpression
             }));
           }

package/lib/shared/bundler/webpack/pluginConfigs/configI18nNumericIndexPlugin.js

@@ -11,7 +11,7 @@ var _I18nNumericIndexHtmlInjectorPlugin = require("../custom_plugins/I18nNumeric
 
 var _readI18nValues = require("../custom_plugins/I18nSplitPlugin/readI18nValues");
 
-var _i18nOptionsValidator = require("../common/i18nOptionsValidator.js");
+var _i18nOptionsValidator = require("../common/i18nOptionsValidator");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -21,8 +21,12 @@ function configI18nNumericIndexPlugin(options) {
   }
 
   const i18nOpts = options.i18nIndexing;
-  const groupPublicPathPrefix = i18nOpts.groupPublicPathPrefix || '';
-  const groupPublicPathRuntimeExpression = i18nOpts.groupPublicPathRuntimeExpression !== undefined ? i18nOpts.groupPublicPathRuntimeExpression : 'window.__SMAP_PATH__';
+  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);
@@ -83,7 +87,6 @@ function configI18nNumericIndexPlugin(options) {
     customGroups: i18nOpts.customGroups || null,
     chunkToGroupMapping: i18nOpts.chunkToGroupMapping || {},
     emitFiles,
-    groupPublicPathPrefix,
     groupPublicPathRuntimeExpression
   };
   const htmlInjectorOptions = { ...sharedOptions,
@@ -91,5 +94,6 @@ function configI18nNumericIndexPlugin(options) {
     i18nAssetsPublicPathPrefix: '',
     injectI18nUrlInIndex: injectHtml
   };
-  return [new _I18nNumericIndexPlugin.default(numericIndexPluginOptions), new _I18nNumericIndexHtmlInjectorPlugin.I18nNumericIndexHtmlInjectorPlugin(htmlInjectorOptions)];
+  const plugins = [new _I18nNumericIndexPlugin.default(numericIndexPluginOptions), new _I18nNumericIndexHtmlInjectorPlugin.I18nNumericIndexHtmlInjectorPlugin(htmlInjectorOptions)];
+  return plugins;
 }

package/package.json

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