@zohodesk/client_build_tool 0.0.11-exp.7 → 0.0.11-exp.9

package/lib/schemas/defaultConfigValues.js

@@ -181,6 +181,7 @@ var _default = {
     numericMapPath: './deskapp/properties/i18n-numeric-map.json',
     numericFilenameTemplate: 'i18n-chunk/[locale]/numeric.i18n.js',
     dynamicFilenameTemplate: 'i18n-chunk/[locale]/dynamic.i18n.js',
+    singleFileTemplate: 'i18n/[locale].js',
     jsonpFunc: 'window.loadI18nChunk',
     htmlTemplateLabel: '{{--user-locale}}',
     localeVarName: 'window.userLangCode',

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

@@ -26,6 +26,7 @@ class I18nNumericIndexPlugin {
   constructor(options = {}) {
     this.options = { ...options,
       singleFile: options.singleFile || false,
+      singleFileTemplate: options.singleFileTemplate,
       includeContentHash: options.includeContentHash || false,
       generateManifest: options.generateManifest || false
     };
@@ -65,11 +66,21 @@ 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);
+    let outputPath = filename.replace(/\[locale\]/g, locale); // Check if template contains [contenthash] placeholder or use legacy includeContentHash flag
 
-    if (this.options.includeContentHash) {
+    const hasContentHashPlaceholder = filename.includes('[contenthash]');
+    const shouldIncludeHash = hasContentHashPlaceholder || this.options.includeContentHash;
+
+    if (shouldIncludeHash) {
       const contentHash = this.generateContentHash(fileContent, compilation);
-      outputPath = outputPath.replace(/\.js$/, `.${contentHash}.js`);
+
+      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`);
+      }
     }
 
     if (this.options.generateManifest) {
@@ -131,7 +142,7 @@ class I18nNumericIndexPlugin {
             };
 
             if (Object.keys(combinedData).length > 0) {
-              const filename = this.options.numericFilenameTemplate || this.options.dynamicFilenameTemplate;
+              const filename = this.options.singleFileTemplate || this.options.numericFilenameTemplate || this.options.dynamicFilenameTemplate;
               this.emitChunk(compilation, filename, locale, combinedData);
             }
           } else {

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

@@ -46,20 +46,15 @@ function loadNumericMap(numericMapPath, compilation) {
   }
 }
 
-function loadAllLocaleFiles(propertiesPath, baseFileName, compilation) {
+function loadAllLocaleFiles(propertiesPath, baseFileName, compilation, jsResourceBase) {
   const allI18n = {};
-  const locales = [];
+  const locales = []; // Always use the jsResourceBase as en_US base
+
+  allI18n['en_US'] = jsResourceBase;
+  locales.push('en_US');
 
   try {
     const files = fs.readdirSync(propertiesPath);
-    files.forEach(file => {
-      if (file === baseFileName + '.properties') {
-        const filePath = path.join(propertiesPath, file);
-        const baseData = loadPropertiesFile(filePath, compilation, 'JSResources base');
-        allI18n['en_US'] = baseData;
-        locales.push('en_US');
-      }
-    });
     files.forEach(file => {
       if (!file.endsWith('.properties')) return;
       const match = file.match(/^ApplicationResources_([a-z]{2}_[A-Z]{2})\.properties$/);
@@ -68,7 +63,7 @@ function loadAllLocaleFiles(propertiesPath, baseFileName, compilation) {
         const locale = match[1];
         const filePath = path.join(propertiesPath, file);
         const localeData = loadPropertiesFile(filePath, compilation, `locale ${locale}`);
-        allI18n[locale] = { ...allI18n['en_US'],
+        allI18n[locale] = { ...jsResourceBase,
           ...localeData
         };
 
@@ -97,7 +92,7 @@ function loadI18nData(options, compilation) {
   const {
     allI18n,
     locales
-  } = loadAllLocaleFiles(propertiesPath, baseFileName, compilation);
+  } = loadAllLocaleFiles(propertiesPath, baseFileName, compilation, jsResourceBase);
   return {
     jsResourceBase,
     allI18n,

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

@@ -43,7 +43,15 @@ function configI18nNumericIndexPlugin(options) {
   } // Empty prefix - HtmlWebpackPlugin handles publicPath
 
 
-  const i18nAssetsPublicPathPrefix = '';
+  const i18nAssetsPublicPathPrefix = ''; // Smart contenthash detection based on template content
+
+  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 finalIncludeContentHash = i18nOpts.includeContentHash !== undefined ? i18nOpts.includeContentHash : shouldIncludeContentHash;
   const numericIndexPluginOptions = {
     enable: i18nOpts.enable,
     jsResourcePath: i18nOpts.jsResourcePath,
@@ -53,9 +61,10 @@ function configI18nNumericIndexPlugin(options) {
     allI18nObject,
     numericFilenameTemplate: i18nOpts.numericFilenameTemplate,
     dynamicFilenameTemplate: i18nOpts.dynamicFilenameTemplate,
+    singleFileTemplate: i18nOpts.singleFileTemplate,
     jsonpFunc: i18nOpts.jsonpFunc,
     singleFile: i18nOpts.singleFile || false,
-    includeContentHash: i18nOpts.includeContentHash || false,
+    includeContentHash: finalIncludeContentHash,
     generateManifest: i18nOpts.generateManifest || false
   };
   const htmlInjectorOptions = {

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@zohodesk/client_build_tool",
-  "version": "0.0.11-exp.6.kiren",
+  "version": "0.0.11-exp.7",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@zohodesk/client_build_tool",
-      "version": "0.0.11-exp.6.kiren",
+      "version": "0.0.11-exp.7",
       "license": "ISC",
       "dependencies": {
         "@babel/cli": "7.17.10",
@@ -9577,8 +9577,7 @@
     "@webpack-cli/configtest": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.2.0.tgz",
-      "integrity": "sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==",
-      "requires": {}
+      "integrity": "sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg=="
     },
     "@webpack-cli/info": {
       "version": "1.5.0",
@@ -9591,8 +9590,7 @@
     "@webpack-cli/serve": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.7.0.tgz",
-      "integrity": "sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==",
-      "requires": {}
+      "integrity": "sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q=="
     },
     "@xtuc/ieee754": {
       "version": "1.2.0",
@@ -9679,8 +9677,7 @@
     "acorn-import-assertions": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
-      "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
-      "requires": {}
+      "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw=="
     },
     "acorn-walk": {
       "version": "8.2.0",
@@ -9727,8 +9724,7 @@
     "ajv-keywords": {
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "requires": {}
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="
     },
     "ansi-regex": {
       "version": "5.0.1",
@@ -10260,8 +10256,7 @@
     "css-declaration-sorter": {
       "version": "6.3.1",
       "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.3.1.tgz",
-      "integrity": "sha512-fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w==",
-      "requires": {}
+      "integrity": "sha512-fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w=="
     },
     "css-loader": {
       "version": "6.7.1",
@@ -10429,8 +10424,7 @@
     "cssnano-utils": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz",
-      "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==",
-      "requires": {}
+      "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA=="
     },
     "csso": {
       "version": "4.2.0",
@@ -11128,8 +11122,7 @@
     "icss-utils": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
-      "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
-      "requires": {}
+      "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA=="
     },
     "ignore": {
       "version": "5.2.4",
@@ -11945,26 +11938,22 @@
     "postcss-discard-comments": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz",
-      "integrity": "sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==",
-      "requires": {}
+      "integrity": "sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ=="
     },
     "postcss-discard-duplicates": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz",
-      "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==",
-      "requires": {}
+      "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw=="
     },
     "postcss-discard-empty": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz",
-      "integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==",
-      "requires": {}
+      "integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A=="
     },
     "postcss-discard-overridden": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz",
-      "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==",
-      "requires": {}
+      "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw=="
     },
     "postcss-loader": {
       "version": "7.0.2",
@@ -12045,8 +12034,7 @@
     "postcss-modules-extract-imports": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
-      "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
-      "requires": {}
+      "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw=="
     },
     "postcss-modules-local-by-default": {
       "version": "4.0.0",
@@ -12077,8 +12065,7 @@
     "postcss-normalize-charset": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz",
-      "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==",
-      "requires": {}
+      "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg=="
     },
     "postcss-normalize-display-values": {
       "version": "5.1.0",
@@ -13294,8 +13281,7 @@
         "ws": {
           "version": "7.5.9",
           "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
-          "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
-          "requires": {}
+          "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q=="
         }
       }
     },

package/package.json

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