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

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

@@ -129,7 +129,7 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
           return Promise.resolve();
         }
 
-        return new Promise(function(resolve) {
+        return new Promise(function(resolve, reject) {
           var relativePath;
 
           if (groupAssetUrls[groupName] && groupAssetUrls[groupName][locale]) {
@@ -143,6 +143,9 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
           var script = document.createElement('script');
           script.src = i18nUrl;
           script.async = true;
+          if (typeof __webpack_require__ !== 'undefined' && __webpack_require__.nc) {
+            script.setAttribute('nonce', __webpack_require__.nc);
+          }
 
           var cleanup = function() {
             if (script.parentNode) {
@@ -158,11 +161,10 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
 
           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();
+            reject(new Error('Failed to load i18n group: ' + groupName));
           };
 
           document.head.appendChild(script);
@@ -173,26 +175,6 @@ class I18nGroupRuntimeModule extends _webpack.RuntimeModule {
         return chunkIdToGroup[chunkId];
       }
 
-      var originalEnsureChunk = __webpack_require__.e;
-
-      if (originalEnsureChunk) {
-        __webpack_require__.e = function(chunkId) {
-          var args = arguments;
-          var self = this;
-          var groupName = findGroupByChunkId(chunkId);
-
-          if (groupName && !loadedGroups[groupName]) {
-            return loadI18nGroup(groupName).then(function() {
-              return originalEnsureChunk.apply(self, args);
-            }).catch(function() {
-              return originalEnsureChunk.apply(self, args);
-            });
-          }
-
-          return originalEnsureChunk.apply(this, args);
-        };
-      }
-
       if (!${_webpack.RuntimeGlobals.ensureChunkHandlers}) {
         ${_webpack.RuntimeGlobals.ensureChunkHandlers} = {};
       }

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

@@ -12,7 +12,7 @@ var _path = _interopRequireDefault(require("path"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const pluginName = 'I18nNumericIndexHtmlInjectorPlugin';
-const assetStoreKey = Symbol.for('I18nNumericIndexPluginAssets');
+const assetStoreKey = Symbol.for('I18nNumericIndexPluginAssets_v1');
 
 class I18nNumericIndexHtmlInjectorPlugin {
   constructor(options) {
@@ -23,6 +23,7 @@ class I18nNumericIndexHtmlInjectorPlugin {
   }
 
   apply(compiler) {
+    console.log(`[I18nNumericIndexHtmlInjectorPlugin] Plugin loaded - v1.0.0`);
     compiler.hooks.thisCompilation.tap(pluginName, compilation => {
       _htmlWebpackPlugin.default.getHooks(compilation).beforeAssetTagGeneration.tapAsync(pluginName, (hookData, cb) => {
         if (!this.options.injectI18nUrlInIndex) {
@@ -65,8 +66,10 @@ class I18nNumericIndexHtmlInjectorPlugin {
           }
 
           if (fullPath.includes('[contenthash]')) {
-            const pattern = fullPath.replace('[contenthash]', '*');
-            const matchingAsset = emittedAssetNames.find(name => name.startsWith(pattern.split('*')[0]) && name.endsWith(pattern.split('*')[1]));
+            const escapedPath = fullPath.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+            const pattern = escapedPath.replace('\\[contenthash\\]', '[a-f0-9]{8,}');
+            const regex = new RegExp('^' + pattern + '$');
+            const matchingAsset = emittedAssetNames.find(name => regex.test(name));
 
             if (matchingAsset) {
               return i18nAssetsPublicPathPrefix + matchingAsset;

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

@@ -22,7 +22,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 const {
   RawSource
 } = _webpack.sources;
-const assetStoreKey = Symbol.for('I18nNumericIndexPluginAssets');
+const assetStoreKey = Symbol.for('I18nNumericIndexPluginAssets_v1');
 const pluginName = 'I18nNumericIndexPlugin';
 
 function buildChunkMappingFromGroups(customGroups) {
@@ -67,6 +67,7 @@ class I18nNumericIndexPlugin {
   }
 
   apply(compiler) {
+    console.log(`[I18nNumericIndexPlugin] Plugin loaded - v1.0.0`);
     this.detectI18nGroupComments(compiler);
     compiler.hooks.thisCompilation.tap(pluginName, compilation => {
       this.groupAssetUrls = {};
@@ -161,6 +162,120 @@ class I18nNumericIndexPlugin {
     return chunkIdToGroup;
   }
 
+  getAvailableLocales(propertiesFolderPath) {
+    const locales = ['en_US'];
+
+    try {
+      const files = _fs.default.readdirSync(propertiesFolderPath);
+
+      files.forEach(file => {
+        if (file.endsWith('.properties')) {
+          const match = file.match(/^ApplicationResources_([a-z]{2}_[A-Z]{2})\.properties$/);
+
+          if (match && !locales.includes(match[1])) {
+            locales.push(match[1]);
+          }
+        }
+      });
+    } catch (err) {
+      console.warn(`[I18nNumericIndexPlugin] Failed to read properties folder: ${err.message}`);
+    }
+
+    return locales;
+  }
+
+  processLocale(locale, jsResourceKeys, propertiesFolderPath, compilation) {
+    const {
+      customGroups,
+      jsonpFunc,
+      numericFilenameTemplate,
+      dynamicFilenameTemplate
+    } = this.options;
+    let localeData;
+
+    if (locale === 'en_US') {
+      localeData = jsResourceKeys;
+    } else {
+      const localeFile = _path.default.join(propertiesFolderPath, `ApplicationResources_${locale}.properties`);
+
+      if (!_fs.default.existsSync(localeFile)) {
+        return;
+      }
+
+      try {
+        const localeProperties = (0, _propertiesUtils.getPropertiesAsJSON)(localeFile);
+        localeData = { ...jsResourceKeys,
+          ...this.normalizeObjectValues(localeProperties)
+        };
+      } catch (err) {
+        console.warn(`[I18nNumericIndexPlugin] Failed to load locale ${locale}: ${err.message}`);
+        return;
+      }
+    }
+
+    if (this.options.restrictToBaseKeys) {
+      const baseKeys = Object.keys(jsResourceKeys);
+      const filtered = {};
+      baseKeys.forEach(k => {
+        filtered[k] = localeData[k];
+      });
+      localeData = filtered;
+    }
+
+    const numericData = {};
+    const dynamicData = {};
+    const groupData = {};
+    Object.keys(customGroups || {}).forEach(groupName => {
+      groupData[groupName] = {};
+    });
+    Object.keys(localeData).forEach(key => {
+      const value = localeData[key];
+      const numericId = this.numericMap[key];
+      const hasNumericId = numericId !== undefined && numericId !== null;
+
+      if (hasNumericId) {
+        const numericKey = String(numericId);
+        const belongsToGroup = this.getKeyGroup(key);
+
+        if (belongsToGroup) {
+          groupData[belongsToGroup][numericKey] = value;
+        } else {
+          numericData[numericKey] = value;
+        }
+      } else {
+        dynamicData[key] = value;
+      }
+    });
+
+    if (this.options.singleFile) {
+      const combinedData = { ...numericData,
+        ...dynamicData
+      };
+
+      if (Object.keys(combinedData).length > 0) {
+        const singleFileTemplate = this.options.singleFileTemplate || '[locale].js';
+        this.prepareChunkAsset(compilation, singleFileTemplate, locale, combinedData, jsonpFunc, null, null);
+      }
+    } else {
+      if (Object.keys(numericData).length > 0) {
+        this.prepareChunkAsset(compilation, numericFilenameTemplate, locale, numericData, jsonpFunc, null, 'numeric');
+      }
+
+      if (Object.keys(dynamicData).length > 0) {
+        this.prepareChunkAsset(compilation, dynamicFilenameTemplate, locale, dynamicData, jsonpFunc, null, 'dynamic');
+      }
+    }
+
+    Object.entries(groupData).forEach(([groupName, data]) => {
+      const groupConfig = customGroups[groupName];
+
+      if (groupConfig && Object.keys(data).length > 0) {
+        const groupTemplate = groupConfig.filenameTemplate || `[locale]/${groupName}.i18n.js`;
+        this.prepareChunkAsset(compilation, groupTemplate, locale, data, jsonpFunc, groupName, `group-${groupName}`);
+      }
+    });
+  }
+
   processI18nFiles(compilation) {
     this.preparedAssets = [];
     this.groupAssetUrls = {};
@@ -168,14 +283,18 @@ class I18nNumericIndexPlugin {
       jsResourcePath,
       propertiesFolderPath,
       numericMapPath,
-      customGroups,
-      jsonpFunc,
-      numericFilenameTemplate,
-      dynamicFilenameTemplate
+      customGroups
     } = this.options;
 
     if (!jsResourcePath || !propertiesFolderPath) {
       return;
+    }
+
+    compilation.fileDependencies.add(_path.default.resolve(jsResourcePath));
+    compilation.fileDependencies.add(_path.default.resolve(propertiesFolderPath));
+
+    if (numericMapPath) {
+      compilation.fileDependencies.add(_path.default.resolve(numericMapPath));
     } // Reset caches for incremental builds
 
 
@@ -202,92 +321,10 @@ class I18nNumericIndexPlugin {
       this.parseCustomGroups(jsResourcePath, customGroups);
     }
 
-    const allI18nObject = (0, _propertiesUtils.getAllI18n)({
-      folderPath: propertiesFolderPath,
-      disableDefault: false,
-      jsResourceI18nKeys: jsResourceKeys
-    });
-    Object.keys(allI18nObject).forEach(loc => {
-      allI18nObject[loc] = this.normalizeObjectValues(allI18nObject[loc]);
-    });
-    allI18nObject['en_US'] = jsResourceKeys;
-
-    if (this.options.restrictToBaseKeys) {
-      const baseKeys = Object.keys(jsResourceKeys);
-      Object.keys(allI18nObject).forEach(locale => {
-        const merged = { ...jsResourceKeys,
-          ...allI18nObject[locale]
-        };
-        const filtered = {};
-        baseKeys.forEach(k => {
-          filtered[k] = merged[k];
-        });
-        allI18nObject[locale] = filtered;
-      });
-    }
-
-    const locales = Object.keys(allI18nObject);
-    locales.forEach(locale => {
-      const localeData = allI18nObject[locale];
-      const numericData = {};
-      const dynamicData = {};
-      const groupData = {};
-      Object.keys(customGroups || {}).forEach(groupName => {
-        groupData[groupName] = {};
-      }); // Process each key
-
-      Object.keys(localeData).forEach(key => {
-        const value = localeData[key]; // Simple logic: if has numeric ID use it, otherwise it's dynamic
-
-        const numericId = this.numericMap[key];
-        const hasNumericId = numericId !== undefined && numericId !== null;
-
-        if (hasNumericId) {
-          const numericKey = String(numericId); // Check if belongs to a custom group
-
-          const belongsToGroup = this.getKeyGroup(key);
-
-          if (belongsToGroup) {
-            groupData[belongsToGroup][numericKey] = value;
-          } else {
-            numericData[numericKey] = value;
-          }
-        } else {
-          // No numeric ID = dynamic key
-          dynamicData[key] = value;
-        }
-      }); // Handle single-file mode or separate files
-
-      if (this.options.singleFile) {
-        const combinedData = { ...numericData,
-          ...dynamicData
-        };
-
-        if (Object.keys(combinedData).length > 0) {
-          const singleFileTemplate = this.options.singleFileTemplate || '[locale].js';
-          this.prepareChunkAsset(compilation, singleFileTemplate, locale, combinedData, jsonpFunc, null, null);
-        }
-      } else {
-        // Emit numeric chunk
-        if (Object.keys(numericData).length > 0) {
-          this.prepareChunkAsset(compilation, numericFilenameTemplate, locale, numericData, jsonpFunc, null, 'numeric');
-        } // Emit dynamic chunk
-
-
-        if (Object.keys(dynamicData).length > 0) {
-          this.prepareChunkAsset(compilation, dynamicFilenameTemplate, locale, dynamicData, jsonpFunc, null, 'dynamic');
-        }
-      } // Emit custom group chunks (always separate)
-
-
-      Object.entries(groupData).forEach(([groupName, data]) => {
-        const groupConfig = customGroups[groupName];
-
-        if (groupConfig && Object.keys(data).length > 0) {
-          const groupTemplate = groupConfig.filenameTemplate || `[locale]/${groupName}.i18n.js`;
-          this.prepareChunkAsset(compilation, groupTemplate, locale, data, jsonpFunc, groupName, `group-${groupName}`);
-        }
-      });
+    const availableLocales = this.getAvailableLocales(propertiesFolderPath);
+    console.log(`[I18nNumericIndexPlugin] Processing ${availableLocales.length} locales:`, availableLocales.join(', '));
+    availableLocales.forEach(locale => {
+      this.processLocale(locale, jsResourceKeys, propertiesFolderPath, compilation);
     }); // Generate manifest file if enabled
 
     if (this.options.generateManifest && Object.keys(this.manifest).length > 0) {

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

@@ -12,7 +12,7 @@ var _fs = _interopRequireDefault(require("fs"));
 
 var _path = _interopRequireDefault(require("path"));
 
-var _propertiesUtils = require("../../I18nSplitPlugin/utils/propertiesUtils.js");
+var _propertiesUtils = require("../../I18nSplitPlugin/utils/propertiesUtils");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 

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

@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.i18nIdReplaceLoaderConfig = i18nIdReplaceLoaderConfig;
 
-var _propertiesUtils = require("../custom_plugins/I18nSplitPlugin/utils/propertiesUtils.js");
+var _propertiesUtils = require("../custom_plugins/I18nSplitPlugin/utils/propertiesUtils");
 
-var _i18nOptionsValidator = require("../common/i18nOptionsValidator.js");
+var _i18nOptionsValidator = require("../common/i18nOptionsValidator");
 
 var _fs = _interopRequireDefault(require("fs"));
 

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@zohodesk/client_build_tool",
-  "version": "0.0.11-exp.17.0",
+  "version": "0.0.11-exp.32.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@zohodesk/client_build_tool",
-      "version": "0.0.11-exp.17.0",
+      "version": "0.0.11-exp.32.0",
       "license": "ISC",
       "dependencies": {
         "@babel/cli": "7.17.10",

package/package.json

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