@zohodesk/client_build_tool 0.0.14-exp.4 → 0.0.14-exp.6

package/lib/schemas/defaultConfigValues.js

@@ -302,7 +302,8 @@ var _default = {
   },
   customLoaders: [],
   resourceHints: {
-    allowPrefetchingMultipleChunks: false
+    enable: false,
+    PreloadChunkNames: []
   },
   devModeContentHashAllowedTypes: null,
   nameTemplateCustomization: null,

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

@@ -38,7 +38,7 @@ class ChunkHierarchyPlugin {
           for (const module of modules) {
             for (const conn of moduleGraph.getOutgoingConnections(module)) {
               if (conn.module && conn.module.resource) {
-                deps.add(conn.module.resource.match(/jsapps\/supportapp.*/)?.[1]);
+                deps.add(conn.module.resource.match(/jsapps\/supportapp.*/)?.[0]);
               }
             }
           }

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

@@ -0,0 +1,45 @@
+"use strict";
+
+const {
+  RawSource
+} = require('webpack-sources');
+
+class InjectChunkGraphPlugin {
+  constructor(resourceHints) {
+    this.chunkNames = resourceHints.PreloadChunkNames || [];
+  }
+
+  apply(compiler) {
+    compiler.hooks.thisCompilation.tap('InjectChunkGraphPlugin', compilation => {
+      compilation.hooks.processAssets.tap({
+        name: 'InjectChunkGraphPlugin',
+        stage: compiler.webpack.Compilation.PROCESS_ASSETS_STAGE_ADDITIONS
+      }, () => {
+        const stats = compilation.getStats().toJson({
+          all: true
+        });
+        const chunkGraph = {};
+        this.chunkNames.forEach(chunkName => {
+          const chunkGroup = stats.namedChunkGroups?.[chunkName];
+
+          if (!chunkGroup) {
+            compilation.warnings.push(new Error(`[InjectChunkGraphPlugin] Chunk group "${chunkName}" not found.`));
+            return;
+          }
+
+          chunkGraph[chunkName] = chunkGroup.chunks;
+        }); // Find runtime chunk file
+
+        const runtimeChunk = stats.chunks.find(chunk => chunk.names?.some(n => n.includes('runtime~main')));
+        const runtimeChunkName = runtimeChunk.files[0];
+        const originalSource = compilation.assets[runtimeChunkName].source();
+        const newSource = originalSource.replace('{{--preload-chunk-graph-object}}', `${JSON.stringify(chunkGraph)}`); // Update the runtime asset with injected code
+
+        compilation.updateAsset(runtimeChunkName, new RawSource(newSource));
+      });
+    });
+  }
+
+}
+
+module.exports = InjectChunkGraphPlugin;

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

@@ -22,11 +22,8 @@ const pluginName = 'prefetch-preload-chunk-plugin';
 
 class ResourceHintsPlugin {
   constructor({
-    publicPath,
-    resourceHints
+    publicPath
   }) {
-    this.resourceHints = resourceHints;
-    this.allowPrefetchingMultipleChunks = resourceHints.allowPrefetchingMultipleChunks;
     this.publicPathsTemplateObj = {
       js: publicPath,
       css: publicPath,
@@ -53,7 +50,6 @@ class ResourceHintsPlugin {
         compilation.addRuntimeModule(entryRuntimeChunk, // eslint-disable-next-line no-use-before-define
         new ResourceHintsRuntimePlugin(compiler, {
           chunk: entryRuntimeChunk,
-          allowPrefetchingMultipleChunks: this.allowPrefetchingMultipleChunks,
           publicPathsTemplateObj
         }));
       };
@@ -69,13 +65,11 @@ exports.default = ResourceHintsPlugin;
 class ResourceHintsRuntimePlugin extends _webpack.RuntimeModule {
   constructor(compiler, {
     chunk,
-    publicPathsTemplateObj,
-    allowPrefetchingMultipleChunks
+    publicPathsTemplateObj
   }) {
     super('ResourceHintsRuntimePlugin loading', 10);
     this.compiler = compiler;
     this.publicPathsTemplateObj = publicPathsTemplateObj;
-    this.allowPrefetchingMultipleChunks = allowPrefetchingMultipleChunks;
     this.chunk = chunk;
   }
 
@@ -85,7 +79,7 @@ class ResourceHintsRuntimePlugin extends _webpack.RuntimeModule {
     } = this;
     const idNameMap = chunk.getChunkMaps().name;
     const nameIdMap = {};
-    let needsMap = this.allowPrefetchingMultipleChunks;
+    let needsMap = false;
     Object.keys(idNameMap).forEach(key => {
       const value = idNameMap[key];
       nameIdMap[value] = key;
@@ -111,7 +105,7 @@ class ResourceHintsRuntimePlugin extends _webpack.RuntimeModule {
      */
 
     return _webpack.Template.asString([`const ntc = ${JSON.stringify(needsMap ? nameIdMap : {})};
-       const cns = Object.keys(ntc);
+      //  const cns = Object.keys(ntc);      
 
       function clt(href, rel) {
         let link = document.createElement("link");
@@ -129,8 +123,8 @@ class ResourceHintsRuntimePlugin extends _webpack.RuntimeModule {
         //return !url.includes(".undefined.");
         return url.indexOf(".undefined") === -1;
       }
-      function lpp(_chunkId, rel) {
-        let chunkId = ${_webpack.RuntimeGlobals.require}.getChunkId(_chunkId);
+      function lpp(chunkId, rel) {
+        // let chunkId = ${_webpack.RuntimeGlobals.require}.getChunkId(_chunkId);
         // ${_webpack.RuntimeGlobals.require}.e(chunkId);
         if(__webpack_require__.O.j(chunkId)) {
           return;
@@ -145,33 +139,29 @@ class ResourceHintsRuntimePlugin extends _webpack.RuntimeModule {
         }
       }
 
-      ${_webpack.RuntimeGlobals.require}.getChunkId = function getChunkId(chunkId) {
-        ${needsMap ? 'chunkId = ntc[chunkId]||chunkId;' : ''}
-        return chunkId;
+      ${_webpack.RuntimeGlobals.require}.getChunkId = function getChunkId(chunkName) {
+        return ntc[chunkName]||chunkName;
       }
-      ${_webpack.RuntimeGlobals.require}.getChunkIds = function getChunkIds(chunkId) {
-        ${// eslint-disable-next-line no-nested-ternary
-    this.allowPrefetchingMultipleChunks ? `
-            const isRegExAsChunkId = chunkId instanceof RegExp;
-            if(isRegExAsChunkId) {
-              return cns.filter(chunkName => chunkId.test(chunkName)).map(chunkName => ntc[chunkName]);
-            }
-            return [${_webpack.RuntimeGlobals.require}.getChunkId(chunkId)];
-            ` : `return [${_webpack.RuntimeGlobals.require}.getChunkId(chunkId)];`}
-      }
-      // Prefetch a chunk (${pluginName})
-      ${_webpack.RuntimeGlobals.require}.pfc = function prefetchChunk(chunkId) {
+      
+      // Preload a chunk (${pluginName})
+      ${_webpack.RuntimeGlobals.require}.plc = function preloadChunk(chunkId) {
+      const preloadChunkGraph = {{--preload-chunk-graph-object}}
         ${`
-            let chunkIds = ${_webpack.RuntimeGlobals.require}.getChunkIds(chunkId);
-            chunkIds.forEach(idOfAChunk => {
-              ${_webpack.RuntimeGlobals.require}.e(idOfAChunk);
-            })`}
+           if (typeof preloadChunkGraph !== 'object' || !preloadChunkGraph) return;
+        preloadChunkGraph[chunkId].forEach(idOfAChunk => {
+             ${_webpack.RuntimeGlobals.require}.e(idOfAChunk);
+            })
+            // let idOfAChunk = ${_webpack.RuntimeGlobals.require}.getChunkId(chunkId);
+            //  chunkIds.forEach(idOfAChunk => {
+            //   ${_webpack.RuntimeGlobals.require}.e(idOfAChunk);
+            //  })
+              `}
       };
 
-      // Preload a chunk (${pluginName})
-      ${_webpack.RuntimeGlobals.require}.plc = function preloadChunk(chunkId) {
-            let idOfAChunk = ${_webpack.RuntimeGlobals.require}.getChunkIds(chunkId)[0];
-            lpp(idOfAChunk, "preload");
+      // Prefetch a chunk (${pluginName})
+      ${_webpack.RuntimeGlobals.require}.pfc = function prefetchChunk(chunkId) {
+            let idOfAChunk = ${_webpack.RuntimeGlobals.require}.getChunkId(chunkId);
+            lpp(idOfAChunk, "prefetch");
         }
         ` // `// Prefetch a chunk (${pluginName})`,
     // `${RuntimeGlobals.require}.pfc = function prefetchChunk(chunkId) {`,
@@ -190,4 +180,17 @@ class ResourceHintsRuntimePlugin extends _webpack.RuntimeModule {
     ]);
   }
 
-}
+} // ${RuntimeGlobals.require}.getChunkIds = function getChunkIds(chunkId) {
+//         ${
+//           // eslint-disable-next-line no-nested-ternary
+//           this.allowPrefetchingMultipleChunks
+//             ? `
+//             const isRegExAsChunkId = chunkId instanceof RegExp;
+//             if(isRegExAsChunkId) {
+//               return cns.filter(chunkName => chunkId.test(chunkName)).map(chunkName => ntc[chunkName]);
+//             }
+//             return [${RuntimeGlobals.require}.getChunkId(chunkId)];
+//             `
+//             : `return [${RuntimeGlobals.require}.getChunkId(chunkId)];`
+//         }
+//       }

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

@@ -5,13 +5,15 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.configChunkHierarchyPlugin = configChunkHierarchyPlugin;
 
+var _modeUtils = require("../common/modeUtils");
+
 var _ChunkHierarchyPlugin = _interopRequireDefault(require("../custom_plugins/ChunkHierarchyPlugin"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /* eslint-disable no-use-before-define */
 function configChunkHierarchyPlugin(options) {
-  if (options.chunkGraph.enable) {
+  if (options.chunkGraph.enable && (0, _modeUtils.isProductionMode)(options.mode)) {
     return new _ChunkHierarchyPlugin.default(options.chunkGraph.fileName);
   }
 

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

@@ -0,0 +1,22 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.configInjectChunkGraphPlugin = configInjectChunkGraphPlugin;
+
+var _InjectChunkGraphPlugin = _interopRequireDefault(require("../custom_plugins/InjectChunkGraphPlugin"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function configInjectChunkGraphPlugin(options) {
+  const {
+    resourceHints
+  } = options;
+
+  if (resourceHints.enable) {
+    return new _InjectChunkGraphPlugin.default(resourceHints);
+  }
+
+  return null;
+}

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

@@ -14,8 +14,12 @@ function configResourceHintsPlugin(options) {
     publicPath,
     resourceHints
   } = options;
-  return new _ResourceHintsPlugin.default({
-    resourceHints,
-    publicPath: JSON.stringify(publicPath)
-  });
+
+  if (resourceHints.enable) {
+    return new _ResourceHintsPlugin.default({
+      publicPath: JSON.stringify(publicPath)
+    });
+  }
+
+  return null;
 }

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

@@ -53,10 +53,12 @@ var _configCustomScriptLoadingStrategyPlugin = require("./pluginConfigs/configCu
 
 var _configChunkHierarchyPlugin = require("./pluginConfigs/configChunkHierarchyPlugin");
 
+var _configInjectChunkGraphPlugin = require("./pluginConfigs/configInjectChunkGraphPlugin");
+
 // 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, _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), (0, _configMurphyInjectorPlugin.configMurphyInjectorPlugin)(options), (0, _configChunkHierarchyPlugin.configChunkHierarchyPlugin)(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), (0, _configMurphyInjectorPlugin.configMurphyInjectorPlugin)(options), (0, _configChunkHierarchyPlugin.configChunkHierarchyPlugin)(options), (0, _configInjectChunkGraphPlugin.configInjectChunkGraphPlugin)(options), ...webpackPlugins].filter(Boolean);
 }

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

@@ -8,7 +8,6 @@ exports.tsLoaders = tsLoaders;
 var _babelLoaderConfig = require("./loaderConfigs/babelLoaderConfig");
 
 function tsLoaders(options) {
-  console.log('testing');
   return [{
     test: /\.tsx?$/,
     exclude: /node_modules/,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/client_build_tool",
-  "version": "0.0.14-exp.4",
+  "version": "0.0.14-exp.6",
   "description": "A CLI tool to  build  web applications and client libraries",
   "main": "lib/index.js",
   "bin": {
@@ -32,6 +32,7 @@
     "@babel/preset-env": "7.18.2",
     "@babel/preset-react": "7.17.12",
     "@babel/preset-typescript": "7.23.2",
+    "@zohodesk-private/client_dev_cert": "^1.0.6",
     "@zohodesk/client_packages_group": "1.0.2",
     "babel-loader": "9.1.2",
     "babel-plugin-module-resolver": "5.0.2",