@zohodesk/client_build_tool 0.0.11-exp.10 → 0.0.11-exp.11

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

@@ -66,8 +66,7 @@ class I18nNumericIndexPlugin {
   emitChunk(compilation, filename, locale, data, fileType = null) {
     const content = decodeUnicodeEscapes(JSON.stringify(data));
     const fileContent = `${this.options.jsonpFunc}(${content});`;
-    let outputPath = filename.replace(/\[locale\]/g, locale); // Check if template contains [contenthash] placeholder or use legacy includeContentHash flag
-
+    let outputPath = filename.replace(/\[locale\]/g, locale);
     const hasContentHashPlaceholder = filename.includes('[contenthash]');
     const shouldIncludeHash = hasContentHashPlaceholder || this.options.includeContentHash;
 
@@ -75,10 +74,8 @@ class I18nNumericIndexPlugin {
       const contentHash = this.generateContentHash(fileContent, compilation);
 
       if (hasContentHashPlaceholder) {
-        // Replace [contenthash] placeholder with actual hash
         outputPath = outputPath.replace(/\[contenthash\]/g, contentHash);
       } else {
-        // Legacy behavior: append hash before .js extension
         outputPath = outputPath.replace(/\.js$/, `.${contentHash}.js`);
       }
     }
@@ -86,8 +83,7 @@ class I18nNumericIndexPlugin {
     if (this.options.generateManifest) {
       const cleanName = filename.replace(/\[locale\]/g, locale).replace(/\[contenthash\]/g, '').replace(/\.js$/, '.js');
       const cleanNameWithType = fileType ? cleanName.replace(/\.js$/, `.${fileType}.js`) : cleanName;
-      const manifestKey = cleanNameWithType.split('/').pop(); // Extract just the filename for the key
-
+      const manifestKey = cleanNameWithType.split('/').pop();
       this.manifest[manifestKey] = outputPath.split('/').pop();
     }
 

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

@@ -46,10 +46,9 @@ function loadNumericMap(numericMapPath, compilation) {
   }
 }
 
-function loadAllLocaleFiles(propertiesPath, baseFileName, compilation, jsResourceBase) {
+function loadAllLocaleFiles(propertiesPath, compilation, jsResourceBase) {
   const allI18n = {};
-  const locales = []; // Always use the jsResourceBase as en_US base
-
+  const locales = [];
   allI18n['en_US'] = jsResourceBase;
   locales.push('en_US');
 
@@ -87,12 +86,11 @@ function loadAllLocaleFiles(propertiesPath, baseFileName, compilation, jsResourc
 function loadI18nData(options, compilation) {
   const jsResourcePath = path.resolve(compilation.compiler.context, options.jsResourcePath);
   const propertiesPath = path.resolve(compilation.compiler.context, options.propertiesFolderPath);
-  const baseFileName = path.basename(options.jsResourcePath, '.properties');
   const jsResourceBase = loadPropertiesFile(jsResourcePath, compilation, 'JS resources');
   const {
     allI18n,
     locales
-  } = loadAllLocaleFiles(propertiesPath, baseFileName, compilation, jsResourceBase);
+  } = loadAllLocaleFiles(propertiesPath, compilation, jsResourceBase);
   return {
     jsResourceBase,
     allI18n,

package/lib/shared/bundler/webpack/loaderConfigs/i18nIdReplaceLoaderConfig.js

@@ -1,9 +1,5 @@
 "use strict";
 
-const path = require('path');
-
-const fs = require('fs');
-
 const {
   getPropertiesAsJSON
 } = require('../custom_plugins/I18nSplitPlugin/utils/propertiesUtils');

package/lib/shared/bundler/webpack/loaders/i18nIdReplaceLoader.js

@@ -54,8 +54,7 @@ module.exports = function i18nIdReplaceLoader(source, map) {
           numericIdMap = parsedData.originalKeyToNumericId;
         }
       }
-    } catch (err) {// ignore - optional file
-    }
+    } catch (err) {}
   }
 
   if (!numericIdMap) {

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

@@ -17,7 +17,6 @@ function configI18nNumericIndexPlugin(options) {
   }
 
   const i18nOpts = options.i18nIndexing;
-  const cdnConfig = options.cdnMapping || {};
   const requiredOptions = ['jsResourcePath', 'propertiesFolderPath', 'numericMapPath', 'jsonpFunc', 'htmlTemplateLabel', 'localeVarName', 'numericFilenameTemplate', 'dynamicFilenameTemplate'];
   const missingOptions = requiredOptions.filter(opt => !i18nOpts[opt]);
 
@@ -40,17 +39,13 @@ function configI18nNumericIndexPlugin(options) {
 
   if (!i18nOpts.dynamicFilenameTemplate.includes('[locale]')) {
     return null;
-  } // Empty prefix - HtmlWebpackPlugin handles publicPath
-
-
-  const i18nAssetsPublicPathPrefix = ''; // Smart contenthash detection based on template content
+  }
 
+  const i18nAssetsPublicPathPrefix = '';
   const hasContentHashInNumeric = i18nOpts.numericFilenameTemplate.includes('[contenthash]');
   const hasContentHashInDynamic = i18nOpts.dynamicFilenameTemplate.includes('[contenthash]');
-  const hasContentHashInSingle = i18nOpts.singleFileTemplate?.includes('[contenthash]'); // Determine if hashing should be enabled based on template content
-
-  const shouldIncludeContentHash = i18nOpts.singleFile ? hasContentHashInSingle : hasContentHashInNumeric || hasContentHashInDynamic; // Use explicit includeContentHash if provided, otherwise use smart detection
-
+  const hasContentHashInSingle = i18nOpts.singleFileTemplate?.includes('[contenthash]');
+  const shouldIncludeContentHash = i18nOpts.singleFile ? hasContentHashInSingle : hasContentHashInNumeric || hasContentHashInDynamic;
   const finalIncludeContentHash = i18nOpts.includeContentHash !== undefined ? i18nOpts.includeContentHash : shouldIncludeContentHash;
   const numericIndexPluginOptions = {
     enable: i18nOpts.enable,

package/package.json

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