@zohodesk/client_build_tool 0.0.6-exp.35 → 0.0.6-exp.36

package/lib/schemas/defaultConfigValues.js

@@ -281,7 +281,9 @@ var _default = {
     i18nTemplate: ''
   },
   manifestJson: {
-    enable: false
+    enable: false,
+    i18nManifestJson: false,
+    licenseManifest: false
   },
   changeRuntimeChunkChar: '~',
   serviceWorker: {

package/lib/shared/bundler/webpack/common/nameTemplates.js

@@ -14,14 +14,14 @@ var _modeUtils = require("./modeUtils");
 // NOTE: array[0] is dev mode file templates and array[1] is prod mode file templates
 const defaultTemplates = {
   html: ['index.html', 'index.[contenthash].html'],
-  js: ['js/[name].js', 'js/[name].[contenthash].js'],
-  chunkjs: ['js-chunk/[name].js', 'js-chunks/[name].[contenthash].js'],
-  i18njs: ['i18n-chunk/[locale]/[name].i18n.js', 'i18n-chunk/[locale]/[name].[chunkhash].i18n.js'],
+  js: ['js/[name].js', 'js/[name].[contenthash]_.js'],
+  chunkjs: ['js-chunk/[name].js', 'js-chunks/[name].[contenthash]_.js'],
+  i18njs: ['i18n-chunk/[locale]/[name].i18n.js', 'i18n-chunk/[locale]/[name].[chunkhash]_.i18n.js'],
   i18nchunkjs: ['i18n-chunk/[locale]/[name].i18n.js', // 'i18n-chunk/[locale]/[name].[chunkhash].i18n.js'
-  'i18n-chunk/[locale]/[name].[contenthash].i18n.js'],
+  'i18n-chunk/[locale]/[name].[contenthash]_.i18n.js'],
   i18nmanifest: ['i18n-manifest.json', 'i18n-manifest.json'],
   workerjs: ['js/[name].js', 'js/[name].[contenthash].js'],
-  css: ['css/[name].css', 'css/[name].[contenthash].css'],
+  css: ['css/[name].css', 'css/[name].[contenthash]_.css'],
 
   /**
    * NOTE: when you change (cssdir) this line it  will have affect on Below files will be affected
@@ -29,7 +29,7 @@ const defaultTemplates = {
    *   pluginConfigs/configMiniCSSExtractPlugin.js
    *   pluginConfigs/configRtlCssPlugin.js
    *  */
-  cssdir: ['css/[name].[dir].css', 'css/[name].[contenthash].[dir].css'],
+  cssdir: ['css/[name].[dir].css', 'css/[name].[contenthash]_.[dir].css'],
   image: ['images/[name][ext]', 'images/[name].[contenthash][ext]'],
   font: ['fonts/[name][ext]', 'fonts/[name].[contenthash][ext]'],
   svg: ['fonts/[name][ext]', 'fonts/[name].[contenthash][ext]'],

package/lib/shared/bundler/webpack/custom_plugins/ManifestJsonPlugin/addFilesNamesToManifestJson.js

@@ -5,8 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.addFilesNamesToManifestJson = addFilesNamesToManifestJson;
 
+var _path = _interopRequireDefault(require("path"));
+
 var _removeHashFromFileName = require("./removeHashFromFileName");
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 function addFilesNamesToManifestJson({
   manifestJson,
   option,
@@ -15,9 +19,11 @@ function addFilesNamesToManifestJson({
 }) {
   const json = manifestJson;
   Object.keys(assets).forEach(filename => {
+    const fileName = _path.default.parse(filename).base;
+
     if (option.test(filename)) {
-      const filenameNameWithoutHash = (0, _removeHashFromFileName.removeHashFromFileName)(filename, hashDigestLength);
-      json[filenameNameWithoutHash] = filename;
+      const filenameNameWithoutHash = (0, _removeHashFromFileName.removeHashFromFileName)(fileName, hashDigestLength);
+      json[filenameNameWithoutHash] = fileName;
     }
   });
   return json;

package/lib/shared/bundler/webpack/custom_plugins/ManifestJsonPlugin/createInitialEntries.js

@@ -5,11 +5,17 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createInitialEntriesForManifestJson = createInitialEntriesForManifestJson;
 
+var _path = _interopRequireDefault(require("path"));
+
 var _removeHashFromFileName = require("./removeHashFromFileName");
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 function createInitialEntriesForManifestJson(initialFileNames, hashLength) {
   const initialEntries = {};
-  initialFileNames.forEach(fileName => {
+  initialFileNames.forEach(filename => {
+    const fileName = _path.default.parse(filename).base;
+
     const filenameNameWithoutHash = (0, _removeHashFromFileName.removeHashFromFileName)(fileName, hashLength);
     initialEntries[filenameNameWithoutHash] = fileName;
   });

package/lib/shared/bundler/webpack/custom_plugins/ManifestJsonPlugin/createManifestJson.js

@@ -22,7 +22,7 @@ function createManifestJson({
   if (option.needInitialEntries) {
     const initialFileNames = (0, _findInitialFileNames.findInitialFileNames)(compilation);
     const initialEntries = (0, _createInitialEntries.createInitialEntriesForManifestJson)(initialFileNames, hashDigestLength);
-    manifestJson.initialEntries = initialEntries;
+    manifestJson.entryFiles = initialEntries;
   }
 
   const outputJson = (0, _addFilesNamesToManifestJson.addFilesNamesToManifestJson)({

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

@@ -40,10 +40,13 @@ function optimizationConfig(options) {
     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
     // '...',
-    new _terserWebpackPlugin.default({
+    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: {

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

@@ -22,7 +22,7 @@ function configCSSMinifierPlugin(options) {
   // return new UglifyCSSPlugin();
 
 
-  return new _cssMinimizerWebpackPlugin.default({
+  return excludeList !== '' ? new _cssMinimizerWebpackPlugin.default({
     exclude: excludeList
-  });
+  }) : new _cssMinimizerWebpackPlugin.default();
 }

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/npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/client_build_tool",
-  "version": "0.0.6-exp.27",
+  "version": "0.0.6-exp.36",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package/package.json

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