@zohodesk/client_build_tool 0.0.11-exp.22.0 → 0.0.11-exp.24.0

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

@@ -39,6 +39,7 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
       var chunkNameToGroup = ${JSON.stringify(chunkToGroup)};
       var groupToChunkNames = ${JSON.stringify(groupToChunks)};
       var cachedI18nBase;
+      var loadReasonKey = '__i18nGroupLoadReason';
 
       function ensureTrailingSlash(path) {
         if (!path) {
@@ -59,6 +60,34 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
         return '';
       }
 
+      function withLoadReason(reason, fn) {
+        var previous = __webpack_require__[loadReasonKey];
+        __webpack_require__[loadReasonKey] = reason;
+        try {
+          return fn();
+        } finally {
+          __webpack_require__[loadReasonKey] = previous;
+        }
+      }
+
+      if (typeof __webpack_require__.pfc === 'function') {
+        var originalPrefetchChunk = __webpack_require__.pfc;
+        __webpack_require__.pfc = function(prefetchChunkId) {
+          return withLoadReason('prefetch', function() {
+            return originalPrefetchChunk(prefetchChunkId);
+          });
+        };
+      }
+
+      if (typeof __webpack_require__.plc === 'function') {
+        var originalPreloadChunk = __webpack_require__.plc;
+        __webpack_require__.plc = function(preloadChunkId) {
+          return withLoadReason('preload', function() {
+            return originalPreloadChunk(preloadChunkId);
+          });
+        };
+      }
+
       function resolveI18nBase() {
         if (cachedI18nBase !== undefined) {
           return cachedI18nBase;
@@ -104,37 +133,47 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
       }
       
       // Function to load i18n group
-      function loadI18nGroup(groupName) {
+      function loadI18nGroup(groupName, loadReason) {
         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();
         }
-        
+
+        var shouldSkip =
+          (loadReason === 'prefetch' && config.prefetch === false) ||
+          (loadReason === 'preload' && config.preload === false);
+
+        if (shouldSkip) {
+          if (typeof console !== 'undefined' && console.log) {
+            console.log('[i18n-group:skip]', groupName, loadReason, 'prefetch/preload disabled');
+          }
+          return Promise.resolve();
+        }
+
         return new Promise(function(resolve, reject) {
           var relativePath = config.filenameTemplate
             .replace('[locale]', locale);
           var i18nUrl = buildI18nUrl(relativePath);
 
           if (typeof console !== 'undefined' && console.log) {
-            console.log('[i18n-group:load]', groupName, i18nUrl);
+            console.log('[i18n-group:load]', groupName, loadReason || 'require', i18nUrl);
           }
 
-          
           var script = document.createElement('script');
           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);
+              console.log('[i18n-group:loaded]', groupName, loadReason || 'require', i18nUrl);
             }
             resolve();
           };
@@ -149,6 +188,46 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
           document.head.appendChild(script);
         });
       }
+
+      function toLower(str) {
+        return typeof str === 'string' ? str.toLowerCase() : str;
+      }
+
+      function findGroupByChunkId(chunkId) {
+        var directGroup = chunkNameToGroup[chunkId];
+        if (directGroup) {
+          return directGroup;
+        }
+
+        var stringId = '' + chunkId;
+        if (chunkNameToGroup[stringId]) {
+          return chunkNameToGroup[stringId];
+        }
+
+        if (typeof __webpack_require__ !== 'undefined' && typeof __webpack_require__.u === 'function') {
+          var filename = __webpack_require__.u(chunkId) || '';
+          if (filename) {
+            var loweredFilename = toLower(filename);
+            for (var group in groupToChunkNames) {
+              if (!Object.prototype.hasOwnProperty.call(groupToChunkNames, group)) {
+                continue;
+              }
+              var chunkNames = groupToChunkNames[group] || [];
+              for (var i = 0; i < chunkNames.length; i++) {
+                var candidate = chunkNames[i];
+                if (candidate && loweredFilename.indexOf(toLower(candidate)) !== -1) {
+                  if (typeof console !== 'undefined' && console.log) {
+                    console.log('[i18n-group:match-by-filename]', chunkId, filename, 'matched', candidate, '→', group);
+                  }
+                  return group;
+                }
+              }
+            }
+          }
+        }
+
+        return undefined;
+      }
       
       // Store original webpack chunk loading function
       var originalEnsureChunk = __webpack_require__.e;
@@ -157,21 +236,25 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
       if (originalEnsureChunk) {
         __webpack_require__.e = function(chunkId) {
           var promise = originalEnsureChunk.apply(this, arguments);
-        
-        // Check if this chunk needs an i18n group
-        var groupName = findGroupByChunkId(chunkId);
-        if (groupName && !loadedGroups[groupName]) {
-          if (typeof console !== 'undefined' && console.log) {
-            console.log('[i18n-group:hook]', chunkId, '→', groupName);
+          
+          // Check if this chunk needs an i18n group
+          var groupName = findGroupByChunkId(chunkId);
+          if (groupName && !loadedGroups[groupName]) {
+            if (typeof console !== 'undefined' && console.log) {
+              var chunkFilename = typeof __webpack_require__ !== 'undefined' && typeof __webpack_require__.u === 'function'
+                ? __webpack_require__.u(chunkId)
+                : '<no __webpack_require__.u>';
+              console.log('[i18n-group:hook]', chunkId, '→', groupName, '| reason:', (__webpack_require__[loadReasonKey] || 'require'), '| file:', chunkFilename);
+            }
+            // Load the i18n group before the chunk
+            var loadReason = __webpack_require__[loadReasonKey] || 'require';
+            var i18nPromise = loadI18nGroup(groupName, loadReason);
+            // Chain the promises so i18n loads first
+            promise = Promise.all([promise, i18nPromise]).then(function(results) {
+              return results[0]; // Return the original chunk promise result
+            });
           }
-          // 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;
         };
       }
@@ -190,6 +273,13 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
                 .replace('[locale]', locale);
               var i18nUrl = buildI18nUrl(relativePath);
 
+              if (config.prefetch === false) {
+                if (typeof console !== 'undefined' && console.log) {
+                  console.log('[i18n-group:skip-prefetch-loader]', groupName, chunkId, i18nUrl);
+                }
+                return originalLoadScript.call(__webpack_require__, url, done, key, chunkId);
+              }
+
               var i18nScript = document.createElement('script');
               i18nScript.src = i18nUrl;
               i18nScript.onload = function() {
@@ -212,6 +302,20 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
       }
 
       function installLoadScriptHook(loadScript) {
+        if (typeof loadScript !== 'function') {
+          Object.defineProperty(__webpack_require__, 'l', {
+            configurable: true,
+            enumerable: true,
+            get: function() {
+              return loadScript;
+            },
+            set: function(newLoader) {
+              installLoadScriptHook(newLoader);
+            }
+          });
+          return;
+        }
+
         Object.defineProperty(__webpack_require__, 'l', {
           configurable: true,
           enumerable: true,
@@ -240,48 +344,4 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
 
 }
 
-exports.I18nGroupRuntimeModule = I18nGroupRuntimeModule;
-
-function toLower(str) {
-  return typeof str === 'string' ? str.toLowerCase() : str;
-}
-
-function findGroupByChunkId(chunkId) {
-  var directGroup = chunkNameToGroup[chunkId];
-
-  if (directGroup) {
-    return directGroup;
-  }
-
-  var stringId = '' + chunkId;
-
-  if (chunkNameToGroup[stringId]) {
-    return chunkNameToGroup[stringId];
-  }
-
-  if (typeof __webpack_require__ !== 'undefined' && typeof __webpack_require__.u === 'function') {
-    var filename = __webpack_require__.u(chunkId) || '';
-
-    if (filename) {
-      var loweredFilename = toLower(filename);
-
-      for (var group in groupToChunkNames) {
-        if (!Object.prototype.hasOwnProperty.call(groupToChunkNames, group)) {
-          continue;
-        }
-
-        var chunkNames = groupToChunkNames[group] || [];
-
-        for (var i = 0; i < chunkNames.length; i++) {
-          var candidate = chunkNames[i];
-
-          if (candidate && loweredFilename.indexOf(toLower(candidate)) !== -1) {
-            return group;
-          }
-        }
-      }
-    }
-  }
-
-  return undefined;
-}
+exports.I18nGroupRuntimeModule = I18nGroupRuntimeModule;

package/lib/shared/bundler/webpack/optimizationConfig.js

@@ -15,18 +15,18 @@ var _configCSSMinifierPlugin = require("./pluginConfigs/configCSSMinifierPlugin"
 
 var _splitChunksConfig = require("./splitChunksConfig");
 
-var _modeUtils = require("./common/modeUtils");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function optimizationConfig(options) {
   const {
-    changeRuntimeChunkChar,
-    mode
+    changeRuntimeChunkChar
   } = options;
   const {
     chunkSplitEnable
-  } = options.i18nChunkSplit;
+  } = options.i18nChunkSplit; // TEMP: Test console logs for minification verification
+
+  console.log('MINIFY_TEST: optimizationConfig called in mode:', options.mode);
+  console.log('MINIFY_TEST: TerserPlugin and CSS minification active');
   const i18nChunkFilename = (0, _nameTemplates.nameTemplates)('i18njs', options);
   const chunkFilenameHasContentHash = (0, _hashUtils.hasContentHash)(i18nChunkFilename);
   /**
@@ -38,26 +38,19 @@ function optimizationConfig(options) {
   const suffix = // chunkSplitEnable ? '_[locale]' : '';
   chunkSplitEnable && chunkFilenameHasContentHash ? '_[locale]' : '';
   const char = changeRuntimeChunkChar;
-  const excludeList = options.optimization.jsExcludePath; // TEMP: Disable minification in production mode for testing
-
-  const shouldMinify = !(0, _modeUtils.isProductionMode)(mode);
-  const minimizers = [];
-
-  if (shouldMinify) {
-    minimizers.push(excludeList !== '' ? new _terserWebpackPlugin.default({
+  const excludeList = options.optimization.jsExcludePath;
+  return {
+    splitChunks: (0, _splitChunksConfig.splitChunksConfig)(options),
+    minimizer: [// For webpack@5 you can use the `...` syntax to extend existing minimizers (i.e. `terser-webpack-plugin`), uncomment the next line
+    // '...',
+    excludeList !== '' ? new _terserWebpackPlugin.default({
       exclude: excludeList,
       extractComments: false // Do not extract comments to .LICENSE.txt files
 
     }) : new _terserWebpackPlugin.default({
       extractComments: false // Do not extract comments to .LICENSE.txt files
 
-    }));
-    minimizers.push((0, _configCSSMinifierPlugin.configCSSMinifierPlugin)(options));
-  }
-
-  return {
-    splitChunks: (0, _splitChunksConfig.splitChunksConfig)(options),
-    minimizer: minimizers.filter(Boolean),
+    }), (0, _configCSSMinifierPlugin.configCSSMinifierPlugin)(options)].filter(Boolean),
     moduleIds: 'named',
     runtimeChunk: {
       name: entrypoint => `runtime${char}${entrypoint.name}${suffix}`

package/lib/shared/bundler/webpack/plugins.js

@@ -55,6 +55,9 @@ var _configCustomScriptLoadingStrategyPlugin = require("./pluginConfigs/configCu
 function plugins(options) {
   const {
     webpackPlugins
-  } = options;
+  } = options; // TEMP: Test console logs for minification verification
+
+  console.log('MINIFY_TEST: plugins function called with options:', options.mode);
+  console.log('MINIFY_TEST: This message should be visible if minification is disabled');
   return [(0, _configEnvVariables.configEnvVariables)(options), (0, _configCustomAttributesPlugin.configCustomAttributesPlugin)(options), (0, _configTPHashMappingPlugin.configTPHashMappingPlugin)(options), (0, _configCopyPublicFolders.configCopyPublicFolders)(options), (0, _configIgnorePlugin.configIgnorePlugin)(options), (0, _configMiniCSSExtractPlugin.configMiniCSSExtractPlugin)(options), (0, _configSelectorWeightPlugin.configSelectorWeightPlugin)(options), (0, _configVariableConversionPlugin.configVariableConversionPlugin)(options), (0, _configI18nSplitPlugin.configI18nSplitPlugin)(options), ...((0, _configI18nNumericIndexPlugin.configI18nNumericIndexPlugin)(options) || []), (0, _configRtlCssPlugin.configRtlCssPlugin)(options), (0, _configHtmlWebpackPlugin.configHtmlWebpackPlugin)(options), (0, _configCustomScriptLoadingStrategyPlugin.configCustomScriptLoadingStrategyPlugin)(options), (0, _configCdnChangePlugin.configCdnChangePlugin)(options), (0, _configServiceWorkerPlugin.configServiceWorkerPlugin)(options), (0, _configEFCTemplatePlugin.configEFCTemplatePlugin)(options), (0, _configResourceHintsPlugin.configResourceHintsPlugin)(options), (0, _configBundleAnalyzer.configBundleAnalyzer)(options), (0, _configManifestJsonPlugin.configManifestJsonPlugin)(options), (0, _configSourceMapPlugin.configSourceMapPlugin)(options), (0, _configProgressPlugin.configProgressPlugin)(options), (0, _configBundleIntegrityReport.configBundleIntegrityReport)(options), (0, _configRuntimeResourceCleanup.configRuntimeResourceCleanup)(options), ...webpackPlugins].filter(Boolean);
 }

package/package.json

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