@zohodesk/client_build_tool 0.0.6 → 0.0.7

package/lib/shared/bundler/webpack/custom_plugins/TPHashMappingPlugin/index.js

@@ -29,7 +29,7 @@ class TPHashMappingPlugin {
 
   getFiles() {
     const hashMapping = {};
-    this.fileMappings.filter(f => f.enable).forEach(fileInfo => {
+    this.fileMappings.forEach(fileInfo => {
       const filePath = _path.default.join(this.tpFolder, fileInfo.filePath);
 
       if (_fs.default.existsSync(filePath)) {

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

@@ -46,11 +46,11 @@ function getInitialAssetsFuncTemplate({
     chunkSplitEnable,
     i18nFileNameTemplate
   });
-  const initialAssetsFuncTemplate = `function ${functionName}({ lang, dir}) {
+  const initialAssetsFuncTemplate = `function ${functionName}() {
     return {
-      js: ${JSON.stringify(initialJsFiles)}.map(urlPath => urlPath.replace(/@locale@/g, lang)),
-      css: ${JSON.stringify(initialCssFiles)}${enableRTLSplit ? '.map(urlPath => urlPath.replace(/@dir@/g, dir))' : ''},
-      i18n: ${initialI18nAssets},
+      js: ${JSON.stringify(initialJsFiles)}.map(urlPath => urlPath.replace('smap/', '')),
+      css: ${JSON.stringify(initialCssFiles)},
+      i18n: ${initialI18nAssets}
     }
   }`;
   return initialAssetsFuncTemplate;

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

@@ -5,6 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.devtoolConfig = devtoolConfig;
 
+// eslint-disable-next-line consistent-return
 function devtoolConfig(options) {
-  return options.devtool;
+  if (options.createSeparateSMap) {
+    return options.devtool;
+  }
 }

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

@@ -7,7 +7,11 @@ exports.externals = externals;
 
 // eslint-disable-next-line no-unused-vars
 function externals(options) {
+  const {
+    externals
+  } = options;
   return {
-    ZC: '$ZC'
+    ZC: '$ZC',
+    ...externals
   };
 }

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

@@ -14,7 +14,7 @@ var _nameTemplates = require("../common/nameTemplates");
 const ImageExtRegex = /\.jpe?g$|\.gif$|\.png|\.webp$/;
 const FontExtRegex = /\.woff2|\.woff$|\.ttf$|\.eot$/;
 const SVGExtRegex = /\.svg$/;
-const AudioExtRegex = /\.ogg$/;
+const AudioExtRegex = /\.ogg|\.mp3$/;
 const VideoExtRegex = /\.mp4|\.webm$/;
 
 function createAssetLoader({

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

@@ -51,7 +51,12 @@ var _default = options => {
 
     const fileNameWithoutExt = _path.default.parse(relativePath).name;
 
-    const cleanFileName = fileNameWithoutExt.replace(/-/g, '_').toLowerCase();
+    let cleanFileName = fileNameWithoutExt.replace(/-/g, '_').toLowerCase();
+
+    if (cleanFileName.endsWith('.module')) {
+      cleanFileName = cleanFileName.slice(0, -7);
+    }
+
     const suitableBlob = getSuitableBlob(customizations, resourcePath);
     return suitableBlob.replaceAll('[local]', localName).replaceAll('[prefix]', classNamePrefix).replaceAll('[filename]', cleanFileName).replaceAll('[hash]', getHash(`${relativePath}-${localName}`, 10));
   };

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

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.optimizationConfig = optimizationConfig;
 
+var _terserWebpackPlugin = _interopRequireDefault(require("terser-webpack-plugin"));
+
 var _nameTemplates = require("./common/nameTemplates");
 
 var _hashUtils = require("./custom_plugins/I18nSplitPlugin/utils/hashUtils");
@@ -13,6 +15,8 @@ var _configCSSMinifierPlugin = require("./pluginConfigs/configCSSMinifierPlugin"
 
 var _splitChunksConfig = require("./splitChunksConfig");
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 function optimizationConfig(options) {
   const {
     changeRuntimeChunkChar
@@ -20,7 +24,7 @@ function optimizationConfig(options) {
   const {
     chunkSplitEnable
   } = options.i18nChunkSplit;
-  const i18nChunkFilename = (0, _nameTemplates.nameTemplates)('i18nchunkjs', options);
+  const i18nChunkFilename = (0, _nameTemplates.nameTemplates)('i18njs', options);
   const chunkFilenameHasContentHash = (0, _hashUtils.hasContentHash)(i18nChunkFilename);
   /**
    * NOTE: we only need multiple runtime files when we use contentHash
@@ -31,10 +35,19 @@ 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
-    '...', (0, _configCSSMinifierPlugin.configCSSMinifierPlugin)(options)].filter(Boolean),
+    // '...',
+    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),
     moduleIds: 'named',
     runtimeChunk: {
       name: entrypoint => `runtime${char}${entrypoint.name}${suffix}`

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

@@ -14,11 +14,15 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // import UglifyCSSPlugin from '../custom_plugins/UglifyCSSPlugin';
 // eslint-disable-next-line no-unused-vars
 function configCSSMinifierPlugin(options) {
+  const excludeList = options.optimization.cssExcludePath;
+
   if ((0, _modeUtils.isNotProduction)(options)) {
     return null;
   } // return null;
   // return new UglifyCSSPlugin();
 
 
-  return new _cssMinimizerWebpackPlugin.default();
+  return excludeList !== '' ? new _cssMinimizerWebpackPlugin.default({
+    exclude: excludeList
+  }) : new _cssMinimizerWebpackPlugin.default();
 }

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

@@ -0,0 +1,76 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.configCustomScriptLoadingStrategyPlugin = configCustomScriptLoadingStrategyPlugin;
+
+var _CustomScriptLoadingPlugin = require("../custom_plugins/CustomScriptLoadingPlugin");
+
+var _utils = require("../utils");
+
+const defaultScriptLoadingStrategy = 'defer';
+const allowedScriptLoadingStrategies = ['blocking', 'defer', 'async', 'module'];
+
+function isAllowedScriptLoadingStrategyUsed(scriptLoadingStategey) {
+  return allowedScriptLoadingStrategies.includes(scriptLoadingStategey);
+}
+
+function getScriptLoadingStrategyForStringType(scriptLoadingStategey) {
+  if (isAllowedScriptLoadingStrategyUsed(scriptLoadingStategey)) {
+    return scriptLoadingStategey;
+  }
+
+  return defaultScriptLoadingStrategy;
+}
+
+function getScriptLoadingStrategyForObject(scriptLoadingStategey) {
+  if (Object.keys(scriptLoadingStategey).length === 0) {
+    return defaultScriptLoadingStrategy;
+  }
+
+  const isAllowedScriptLoadingStrategy = Object.keys(scriptLoadingStategey).every(key => isAllowedScriptLoadingStrategyUsed(key));
+
+  if (isAllowedScriptLoadingStrategy) {
+    return Object.assign({}, scriptLoadingStategey);
+  }
+
+  console.warn('un supported script loading strategy used', scriptLoadingStategey);
+  return defaultScriptLoadingStrategy;
+}
+
+function getScriptLoadingStrategy(scriptLoadingStategey) {
+  if ((0, _utils.getTypeOf)(scriptLoadingStategey) === 'string') {
+    return {
+      [getScriptLoadingStrategyForStringType(scriptLoadingStategey)]: [/.*/]
+    };
+  }
+
+  if ((0, _utils.getTypeOf)(scriptLoadingStategey) === 'object') {
+    return getScriptLoadingStrategyForObject(scriptLoadingStategey);
+  }
+
+  return {
+    [defaultScriptLoadingStrategy]: [/.*/]
+  };
+}
+
+function configCustomScriptLoadingStrategyPlugin(options) {
+  const {
+    customScriptLoadingStrategey
+  } = options;
+
+  if (customScriptLoadingStrategey) {
+    const currentScriptLoadingStrategy = getScriptLoadingStrategy(customScriptLoadingStrategey.options);
+
+    if ((0, _utils.getTypeOf)(currentScriptLoadingStrategy) === 'object') {
+      return new _CustomScriptLoadingPlugin.CustomScriptLoadingStrategyPlugin({
+        scriptLoadingStategey: currentScriptLoadingStrategy
+      });
+    } else {
+      return null;
+    }
+  } else {
+    return null;
+  }
+}

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

@@ -32,7 +32,7 @@ function configI18nSplitPlugin(options) {
     templateLabel: i18nChunkSplit.templateLabel,
     disableDefault: i18nChunkSplit.disableDefault,
     filename: (0, _nameTemplates.nameTemplates)('i18njs', options),
-    chunkFilename: (0, _nameTemplates.nameTemplates)('i18nchunkjs', options),
+    chunkFilename: (0, _nameTemplates.nameTemplates)('i18njs', options),
     publicPath: i18nPublicPath,
     i18nManifestFileName: (0, _nameTemplates.nameTemplates)('i18nmanifest', options),
     // template: (object, locale) => `window.loadI18n(${JSON.stringify(object)}, ${JSON.stringify(locale)})`,

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

@@ -9,24 +9,36 @@ var _ManifestJsonPlugin = require("../custom_plugins/ManifestJsonPlugin");
 
 function configManifestJsonPlugin(options) {
   const {
-    manifestJson
-  } = options;
+    enable,
+    i18nManifestJson,
+    licenseManifest
+  } = options.manifestJson;
 
-  if (!manifestJson.enable) {
+  if (!enable) {
     return null;
   }
 
-  return new _ManifestJsonPlugin.AddFileToManifestJson([{
+  const params = [{
     outputJsonFileName: 'manifest.json',
     test: f => !/\.i18n\.js$|\.LICENSE\.txt$|\.map$/.test(f),
     needInitialEntries: true
-  }, {
-    outputJsonFileName: 'i18nManifest.json',
-    test: f => /\.i18n\.js$/g.test(f),
-    needInitialEntries: false
-  }, {
-    outputJsonFileName: 'licenseManifest.json',
-    test: f => /\.LICENSE\.txt$/g.test(f),
-    needInitialEntries: false
-  }]);
+  }];
+
+  if (i18nManifestJson) {
+    params.push({
+      outputJsonFileName: 'i18nManifest.json',
+      test: f => /\.i18n\.js$/g.test(f),
+      needInitialEntries: false
+    });
+  }
+
+  if (licenseManifest) {
+    params.push({
+      outputJsonFileName: 'licenseManifest.json',
+      test: f => /\.LICENSE\.txt$/g.test(f),
+      needInitialEntries: false
+    });
+  }
+
+  return new _ManifestJsonPlugin.AddFileToManifestJson(params);
 }

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

@@ -15,7 +15,8 @@ function configMiniCSSExtractPlugin(options) {
   const {
     enableRTLSplit
   } = options.css.plugins.rtlSplit;
-  const cssLTRFileNameTempalte = enableRTLSplit ? (0, _nameTemplates.nameTemplates)('cssdir', options) : (0, _nameTemplates.nameTemplates)('css', options);
+  const cssLTRFileNameTempalte = enableRTLSplit ? (0, _nameTemplates.nameTemplates)('cssdir', options) : (0, _nameTemplates.nameTemplates)('css', options); // eslint-disable-next-line no-undef
+
   return new _miniCssExtractPlugin.default({
     filename: cssLTRFileNameTempalte,
     chunkFilename: cssLTRFileNameTempalte

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

@@ -47,10 +47,12 @@ var _configBundleIntegrityReport = require("./pluginConfigs/configBundleIntegrit
 
 var _configRuntimeResourceCleanup = require("./pluginConfigs/configRuntimeResourceCleanup");
 
+var _configCustomScriptLoadingStrategyPlugin = require("./pluginConfigs/configCustomScriptLoadingStrategyPlugin");
+
 // import { IgnorePlugin } from 'webpack';
 function plugins(options) {
   const {
     webpackPlugins
   } = options;
-  return [(0, _configEnvVariables.configEnvVariables)(options), (0, _configCustomAttributesPlugin.configCustomAttributesPlugin)(options), (0, _configTPHashMappingPlugin.configTPHashMappingPlugin)(options), (0, _configCopyPublicFolders.configCopyPublicFolders)(options), (0, _configIgnorePlugin.configIgnorePlugin)(options), (0, _configMiniCSSExtractPlugin.configMiniCSSExtractPlugin)(options), (0, _configSelectorWeightPlugin.configSelectorWeightPlugin)(options), (0, _configVariableConversionPlugin.configVariableConversionPlugin)(options), (0, _configI18nSplitPlugin.configI18nSplitPlugin)(options), (0, _configRtlCssPlugin.configRtlCssPlugin)(options), (0, _configHtmlWebpackPlugin.configHtmlWebpackPlugin)(options), (0, _configCdnChangePlugin.configCdnChangePlugin)(options), (0, _configServiceWorkerPlugin.configServiceWorkerPlugin)(options), (0, _configEFCTemplatePlugin.configEFCTemplatePlugin)(options), (0, _configResourceHintsPlugin.configResourceHintsPlugin)(options), (0, _configBundleAnalyzer.configBundleAnalyzer)(options), (0, _configManifestJsonPlugin.configManifestJsonPlugin)(options), (0, _configSourceMapPlugin.configSourceMapPlugin)(options), (0, _configProgressPlugin.configProgressPlugin)(options), (0, _configBundleIntegrityReport.configBundleIntegrityReport)(options), (0, _configRuntimeResourceCleanup.configRuntimeResourceCleanup)(options), ...webpackPlugins].filter(Boolean);
+  return [(0, _configEnvVariables.configEnvVariables)(options), (0, _configCustomAttributesPlugin.configCustomAttributesPlugin)(options), (0, _configTPHashMappingPlugin.configTPHashMappingPlugin)(options), (0, _configCopyPublicFolders.configCopyPublicFolders)(options), (0, _configIgnorePlugin.configIgnorePlugin)(options), (0, _configMiniCSSExtractPlugin.configMiniCSSExtractPlugin)(options), (0, _configSelectorWeightPlugin.configSelectorWeightPlugin)(options), (0, _configVariableConversionPlugin.configVariableConversionPlugin)(options), (0, _configI18nSplitPlugin.configI18nSplitPlugin)(options), (0, _configRtlCssPlugin.configRtlCssPlugin)(options), (0, _configHtmlWebpackPlugin.configHtmlWebpackPlugin)(options), (0, _configCustomScriptLoadingStrategyPlugin.configCustomScriptLoadingStrategyPlugin)(options), (0, _configCdnChangePlugin.configCdnChangePlugin)(options), (0, _configServiceWorkerPlugin.configServiceWorkerPlugin)(options), (0, _configEFCTemplatePlugin.configEFCTemplatePlugin)(options), (0, _configResourceHintsPlugin.configResourceHintsPlugin)(options), (0, _configBundleAnalyzer.configBundleAnalyzer)(options), (0, _configManifestJsonPlugin.configManifestJsonPlugin)(options), (0, _configSourceMapPlugin.configSourceMapPlugin)(options), (0, _configProgressPlugin.configProgressPlugin)(options), (0, _configBundleIntegrityReport.configBundleIntegrityReport)(options), (0, _configRuntimeResourceCleanup.configRuntimeResourceCleanup)(options), ...webpackPlugins].filter(Boolean);
 }

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

@@ -62,7 +62,8 @@ function moduleResolver(options) {
     modules: useAppNodeModulesAsPreferred(preferLocalFirst, [nodeModulesPath, _constants.cliNodeModulesPath].filter(Boolean)),
     alias: { ...(defaultAlias ? _libAlias.libAlias : {}),
       ...(alias || {})
-    }
+    },
+    extensions: ['.ts', '.js', '.json', '.tsx']
   };
 }
 

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

@@ -0,0 +1,17 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.tsLoaders = tsLoaders;
+
+var _babelLoaderConfig = require("./loaderConfigs/babelLoaderConfig");
+
+function tsLoaders(options) {
+  return [{
+    test: /\.tsx$/,
+    exclude: /node_modules/,
+    use: [(0, _babelLoaderConfig.babelLoaderConfig)(options)] // include: path.join(appPath, folder)
+
+  }];
+}

package/lib/shared/bundler/webpack/utils/index.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.getTypeOf = getTypeOf;
 exports.isJsFile = exports.isDirRelatedCss = exports.isCssFile = exports.isCss = void 0;
 
 var _path = _interopRequireDefault(require("path"));
@@ -23,4 +24,8 @@ exports.isJsFile = isJsFile;
 
 const isCssFile = file => /\.css$/.test(file);
 
-exports.isCssFile = isCssFile;
+exports.isCssFile = isCssFile;
+
+function getTypeOf(value) {
+  return Object.prototype.toString.call(value).split(/\s/)[1].replace(/\]/, '').toLowerCase();
+}

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

@@ -11,6 +11,8 @@ var _outputConfig = require("./outputConfig");
 
 var _jsLoaders = require("./jsLoaders");
 
+var _tsLoaders = require("./tsLoaders");
+
 var _cssLoaders = require("./cssLoaders");
 
 var _assetLoaders = require("./loaderConfigs/assetLoaders");
@@ -46,7 +48,7 @@ function webpackConfigCreator(options) {
     module: {
       /* strictExportPresence for break the build when imported module not present in respective file */
       // strictExportPresence: true,
-      rules: [...(0, _jsLoaders.jsLoaders)(options), ...(0, _cssLoaders.cssLoaders)(options), (0, _configWebWorkerLoader.configWebWorkerLoader)(options), (0, _configHtmlTemplateLoader.configHtmlTemplateLoader)(options), ...(0, _assetLoaders.assetLoaders)(options), ...(0, _configCustomLoaders.configCustomLoaders)(options)]
+      rules: [...(0, _jsLoaders.jsLoaders)(options), ...(0, _tsLoaders.tsLoaders)(options), ...(0, _cssLoaders.cssLoaders)(options), (0, _configWebWorkerLoader.configWebWorkerLoader)(options), (0, _configHtmlTemplateLoader.configHtmlTemplateLoader)(options), ...(0, _assetLoaders.assetLoaders)(options), ...(0, _configCustomLoaders.configCustomLoaders)(options)]
     },
     plugins: (0, _plugins.plugins)(options),
     externals: (0, _externals.externals)(options),

package/lib/shared/fileUtils/watchRun.js

@@ -11,6 +11,8 @@ var _watcher = _interopRequireDefault(require("watcher"));
 
 var _runBabelForJSFile = require("../babel/runBabelForJSFile");
 
+var _runBabelForTsFile = require("../babel/runBabelForTsFile");
+
 var _runPostCssForCssFile = require("../postcss/runPostCssForCssFile");
 
 var _directoryIterator = require("./directoryIterator");
@@ -23,6 +25,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 const isJs = ext => ext === '.js';
 
+const isTs = ext => ext === '.ts' || ext === '.tsx';
+
 const isCss = ext => ext === '.css';
 
 function watchRun({
@@ -54,6 +58,13 @@ function watchRun({
         outputFile,
         options
       });
+    } else if (isTs(ext)) {
+      (0, _runBabelForTsFile.runBabelForTSFile)({
+        filename,
+        outputFile,
+        options,
+        mode
+      });
     } else {
       (0, _copyFile.copyFile)(filename, outputFile);
     }
@@ -81,7 +92,8 @@ function watchRun({
     const watcher = new _watcher.default(src, {
       recursive: true,
       ignoreInitial: true,
-      ignore: filename => filename.indexOf('__tests__') !== -1
+      ignore: filename => filename.indexOf('__tests__') !== -1 // remove the test cases 
+
     });
     watcher.on('all', (event, filename) => {
       if (event === 'unlink' || event === 'unlinkDir') {

package/lib/shared/postcss/custom_postcss_plugins/ValueReplacer.js

@@ -46,7 +46,7 @@ const PostcssValueReplacer = (valueReplacer = []) => {
       const propOptions = options[decl.prop];
       propOptions?.sortedKeys.forEach(k => {
         // eslint-disable-next-line no-param-reassign
-        decl.value = decl.value.replaceAll(k, propOptions.values[k]);
+        decl.value = decl.value.replaceAll(new RegExp(k, 'g'), propOptions.values[k]);
       });
     }
   };

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

@@ -108,6 +108,10 @@ const singleConvertor = (value, changeVal, details, range) => {
     }
   }
 
+  if (value == '0px') {
+    value = value.replace('px', '');
+  }
+
   if (getNumericValue(value) >= range.start && getNumericValue(value) <= range.end || getNumericValue(value) === 0) {
     let retVal = value.replace(/(\d+)px/gi, changeVal.replace('$$', '$1'));
 

package/lib/shared/server/getServerURL.js

@@ -9,10 +9,11 @@ exports.getServerUrl = getServerUrl;
 function getServerDomain(serverInfo) {
   const {
     host,
-    domain
+    domain,
+    k8s
   } = serverInfo;
 
-  if (domain) {
+  if (domain && !k8s) {
     return `${host}.${domain}.zohocorpin.com`;
   }
 
@@ -21,9 +22,15 @@ function getServerDomain(serverInfo) {
 
 function getServerUrl({
   domain,
+  k8s,
   port,
   protocol = 'http'
 }) {
   const prefix = protocol ? `${protocol}:` : '';
+
+  if (k8s) {
+    return `${prefix}//${domain}`;
+  }
+
   return `${prefix}//${domain}:${port}/`;
 }