@zohodesk/client_build_tool 0.0.11-exp.13 → 0.0.11-exp.15.1

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

@@ -28,7 +28,8 @@ class I18nNumericIndexPlugin {
       singleFile: options.singleFile || false,
       singleFileTemplate: options.singleFileTemplate,
       includeContentHash: options.includeContentHash || false,
-      generateManifest: options.generateManifest || false
+      generateManifest: options.generateManifest || false,
+      manifestPath: options.manifestPath || 'i18n/manifest.json'
     };
     this.numericMap = null;
     this.i18nData = null;
@@ -157,7 +158,18 @@ class I18nNumericIndexPlugin {
         });
 
         if (this.options.generateManifest && Object.keys(this.manifest).length > 0) {
-          const manifestPath = path.dirname(this.options.numericFilenameTemplate) + '/manifest.json';
+          // Determine manifest path
+          let manifestPath;
+
+          if (this.options.manifestPath) {
+            // Use explicitly configured path
+            manifestPath = this.options.manifestPath;
+          } else {
+            // Default to same directory as i18n files with manifest.json name
+            const template = this.options.singleFileTemplate || this.options.numericFilenameTemplate;
+            manifestPath = path.dirname(template) + '/manifest.json';
+          }
+
           const manifestContent = JSON.stringify(this.manifest, null, 2);
           compilation.emitAsset(manifestPath, new RawSource(manifestContent));
         }

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

@@ -43,9 +43,10 @@ function folderPatterns(publicFolders) {
 
 function configCopyPublicFolders(options) {
   let {
-    publicFolders
+    publicFolders,
+    mode = 'dev'
   } = options;
-  publicFolders = (0, _updateArrayWithDefault.updateArrayWithDefault)(publicFolders, defaultPublicFolders);
+  publicFolders = (0, _updateArrayWithDefault.updateArrayWithDefault)(publicFolders[mode], defaultPublicFolders);
 
   if (publicFolders.length === 0) {
     return null;

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

@@ -16,8 +16,11 @@ function configI18nNumericIndexPlugin(options) {
     return null;
   }
 
-  const i18nOpts = options.i18nIndexing;
-  const requiredOptions = ['jsResourcePath', 'propertiesFolderPath', 'numericMapPath', 'jsonpFunc', 'htmlTemplateLabel', 'localeVarName', 'numericFilenameTemplate', 'dynamicFilenameTemplate'];
+  const i18nOpts = options.i18nIndexing; // Check for required options based on singleFile mode
+
+  const baseRequiredOptions = ['jsResourcePath', 'propertiesFolderPath', 'numericMapPath', 'jsonpFunc', 'htmlTemplateLabel', 'localeVarName']; // Add template requirements based on mode
+
+  const requiredOptions = i18nOpts.singleFile ? [...baseRequiredOptions, 'singleFileTemplate'] : [...baseRequiredOptions, 'numericFilenameTemplate', 'dynamicFilenameTemplate'];
   const missingOptions = requiredOptions.filter(opt => !i18nOpts[opt]);
 
   if (missingOptions.length > 0) {
@@ -31,14 +34,20 @@ function configI18nNumericIndexPlugin(options) {
     jsResource: i18nOpts.jsResourcePath,
     propertiesFolder: i18nOpts.propertiesFolderPath,
     disableDefault: false
-  });
+  }); // Validate template patterns based on mode
 
-  if (!i18nOpts.numericFilenameTemplate.includes('[locale]')) {
-    return null;
-  }
+  if (i18nOpts.singleFile) {
+    if (i18nOpts.singleFileTemplate && !i18nOpts.singleFileTemplate.includes('[locale]')) {
+      return null;
+    }
+  } else {
+    if (!i18nOpts.numericFilenameTemplate?.includes('[locale]')) {
+      return null;
+    }
 
-  if (!i18nOpts.dynamicFilenameTemplate.includes('[locale]')) {
-    return null;
+    if (!i18nOpts.dynamicFilenameTemplate?.includes('[locale]')) {
+      return null;
+    }
   }
 
   const i18nAssetsPublicPathPrefix = '';
@@ -60,7 +69,8 @@ function configI18nNumericIndexPlugin(options) {
     jsonpFunc: i18nOpts.jsonpFunc,
     singleFile: i18nOpts.singleFile || false,
     includeContentHash: finalIncludeContentHash,
-    generateManifest: i18nOpts.generateManifest || false
+    generateManifest: i18nOpts.generateManifest || false,
+    manifestPath: i18nOpts.manifestPath
   };
   const htmlInjectorOptions = {
     numericFilenameTemplate: i18nOpts.numericFilenameTemplate,

package/lib/shared/postcss/custom_postcss_plugins/VariableModificationPlugin/index.js

@@ -259,7 +259,7 @@ var _default = ({
               if (range) {
                 // console.log('multiple :', decl.value)
                 let newVal = '';
-                decl.value.split(' ').forEach(singleVal => {
+                decl.value.split(' ').filter(Boolean).forEach(singleVal => {
                   newVal += `${singleConvertor(singleVal, settings.replacements.px, {
                     decl,
                     filename,

package/lib/shared/server/mockApiHandler.js

@@ -44,6 +44,13 @@ function handleMockApi(mockEntryFile, app) {
   const entryFilePath = (0, _constants.joinWithAppPath)(mockEntryFile); // eslint-disable-next-line no-use-before-define
 
   const mockFunc = safeRequire(entryFilePath);
+
+  if (typeof mockFunc === 'function') {
+    // eslint-disable-next-line no-use-before-define
+    mockFunc(app);
+    return;
+  }
+
   mockFunc?.mockApi?.(app);
 } // function handleMockApi(params) {
 // }

package/lib/shared/server/urlConcat.js

@@ -17,10 +17,11 @@ function urlConcat(url, path) {
   const slashRemovedPath = removeFrontSlash(path);
 
   if (slashRemovedUrl === '') {
-    return path;
-  }
+    return `${path}/`;
+  } //return  `${slashRemovedUrl}/${slashRemovedPath}`;
 
-  return `${slashRemovedUrl}/${slashRemovedPath}/`;
+
+  return `${[slashRemovedUrl, slashRemovedPath].filter(a => a).join('/')}/`;
 }
 
 function removeLastSlash(url) {