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

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

@@ -24,8 +24,11 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
     } = this.options; // Build chunk-to-group mapping from config
 
     const chunkToGroup = {};
+    const groupToChunks = {};
     Object.entries(customGroups || {}).forEach(([groupName, config]) => {
-      (config.chunks || []).forEach(chunkName => {
+      const chunkNames = config.chunks || [];
+      groupToChunks[groupName] = chunkNames;
+      chunkNames.forEach(chunkName => {
         chunkToGroup[chunkName] = groupName;
       });
     });
@@ -33,7 +36,8 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
     // I18n Group Loading Runtime
     (function() {
       var loadedGroups = {};
-      var chunkToGroup = ${JSON.stringify(chunkToGroup)};
+      var chunkNameToGroup = ${JSON.stringify(chunkToGroup)};
+      var groupToChunkNames = ${JSON.stringify(groupToChunks)};
       var cachedI18nBase;
 
       function ensureTrailingSlash(path) {
@@ -155,7 +159,7 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
           var promise = originalEnsureChunk.apply(this, arguments);
         
         // Check if this chunk needs an i18n group
-        var groupName = chunkToGroup[chunkId];
+        var groupName = findGroupByChunkId(chunkId);
         if (groupName && !loadedGroups[groupName]) {
           if (typeof console !== 'undefined' && console.log) {
             console.log('[i18n-group:hook]', chunkId, '→', groupName);
@@ -175,7 +179,7 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
       // Also check for webpackI18nGroup comments in dynamic imports
       function wrapLoadScript(originalLoadScript) {
         return function(url, done, key, chunkId) {
-          var groupName = chunkToGroup[chunkId];
+          var groupName = findGroupByChunkId(chunkId);
           if (groupName && !loadedGroups[groupName]) {
             var locale = ${localeVarName} || 'en_US';
             var groupConfig = ${JSON.stringify(customGroups)};
@@ -186,17 +190,10 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
                 .replace('[locale]', locale);
               var i18nUrl = buildI18nUrl(relativePath);
 
-              if (typeof console !== 'undefined' && console.log) {
-                console.log('[i18n-group:preload]', groupName, i18nUrl);
-              }
-
               var i18nScript = document.createElement('script');
               i18nScript.src = i18nUrl;
               i18nScript.onload = function() {
                 loadedGroups[groupName] = true;
-                if (typeof console !== 'undefined' && console.log) {
-                  console.log('[i18n-group:loaded]', groupName, i18nUrl);
-                }
                 originalLoadScript.call(__webpack_require__, url, done, key, chunkId);
               };
               i18nScript.onerror = function() {
@@ -243,4 +240,48 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
 
 }
 
-exports.I18nGroupRuntimeModule = I18nGroupRuntimeModule;
+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;
+}

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

@@ -15,11 +15,14 @@ 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
+    changeRuntimeChunkChar,
+    mode
   } = options;
   const {
     chunkSplitEnable
@@ -35,19 +38,26 @@ function optimizationConfig(options) {
   const suffix = // chunkSplitEnable ? '_[locale]' : '';
   chunkSplitEnable && chunkFilenameHasContentHash ? '_[locale]' : '';
   const char = changeRuntimeChunkChar;
-  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({
+  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({
       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
 
-    }), (0, _configCSSMinifierPlugin.configCSSMinifierPlugin)(options)].filter(Boolean),
+    }));
+    minimizers.push((0, _configCSSMinifierPlugin.configCSSMinifierPlugin)(options));
+  }
+
+  return {
+    splitChunks: (0, _splitChunksConfig.splitChunksConfig)(options),
+    minimizer: minimizers.filter(Boolean),
     moduleIds: 'named',
     runtimeChunk: {
       name: entrypoint => `runtime${char}${entrypoint.name}${suffix}`

package/package.json

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