@zohodesk/client_build_tool 0.0.16-exp.7 → 0.0.16-exp.9

package/lib/schemas/defaultConfigValues.js

@@ -7,14 +7,15 @@ exports.default = void 0;
 
 var _os = require("os");
 
-var _webpack = require("webpack");
-
 // NOTE: Don't use 'config_file' as cli option it was reserved
 var _default = {
   context: {
     value: 'app',
     cli: 'context'
   },
+  library: {
+    ignorePatterns: []
+  },
   devtool: 'source-map',
   statsLogConfig: null,
   stats: {
@@ -183,6 +184,11 @@ var _default = {
     prod: ['...']
   },
   app: {
+    AdditionalEntry: {
+      enable: false,
+      entryFile: 'src/widget.js',
+      entryPointName: 'widget'
+    },
     entryFile: {
       value: 'src/index.js',
       cli: 'entry'
@@ -198,6 +204,7 @@ var _default = {
     alias: null
   },
   htmlTemplate: {
+    generateHtml: true,
     crossorigin: {
       value: false,
       cli: 'enable_crossorigin'
@@ -302,8 +309,7 @@ var _default = {
   },
   customLoaders: [],
   resourceHints: {
-    enable: false,
-    PreloadChunkNames: []
+    allowPrefetchingMultipleChunks: false
   },
   devModeContentHashAllowedTypes: null,
   nameTemplateCustomization: null,

package/lib/shared/babel/babelWebConfig.js

@@ -30,7 +30,7 @@ function babelWebConfig(options, mode) {
   } = options.typeScript;
   return {
     presets: typeScriptEnable ? [getBabelPresetEnvConfig(browserList, mode), require.resolve('@babel/preset-react'), require.resolve('@babel/preset-typescript')] : [getBabelPresetEnvConfig(browserList, mode), require.resolve('@babel/preset-react')],
-    plugins: customBabelPlugins(babelPlugins).concat((0, _getBabelPlugin.getBabelPlugin)(options)).filter(Boolean)
+    plugins: customBabelPlugins(babelPlugins).concat((0, _getBabelPlugin.getBabelPlugin)(options, mode)).filter(Boolean)
   };
 }
 

package/lib/shared/babel/getBabelPlugin.js

@@ -16,12 +16,22 @@ const babelPluginMapping = {
 };
 const babelPluginOrder = ['removeAttribute', 'removePropTypes', 'devConsoleExclude'];
 
-function getBabelPlugin(options) {
+function getBabelPlugin(options, command) {
   const {
     mode
-  } = options; // let customPlugins = [];
-
+  } = options;
+  const {
+    alias
+  } = options.resolve;
   let customPlugins = [];
+
+  if (command == 'es' || command == 'lib') {
+    customPlugins = [[require.resolve('babel-plugin-module-resolver'), {
+      root: ['./'],
+      alias
+    }]];
+  }
+
   const {
     babelCustomizations
   } = options;

package/lib/shared/babel/runBabelForTsFile.js

@@ -11,18 +11,32 @@ var _babelWebConfig = require("./babelWebConfig");
 
 var _copyFile = require("../fileUtils/copyFile");
 
+var _fs = require("fs");
+
 function runBabelForTSFile({
   filename,
   outputFile,
   options,
   mode = 'es'
 }) {
+  const {
+    ignorePatterns
+  } = options.library;
   const {
     enable
   } = options.typeScript;
 
   if (enable) {
-    // const jsSourceCode = readFileSync(filename).toString();
+    function shouldIgnore(filename) {
+      return ignorePatterns.some(pattern => pattern.test(filename));
+    }
+
+    if (shouldIgnore(filename)) {
+      const jsSourceCode = (0, _fs.readFileSync)(filename).toString();
+      (0, _copyFile.writeFile)(outputFile, jsSourceCode);
+      return;
+    }
+
     const babelConfig = (0, _babelWebConfig.babelWebConfig)(options, mode);
     const result = (0, _core.transformFileSync)(filename, babelConfig);
     (0, _copyFile.writeFile)(outputFile.replace('.tsx', '.js').replace('.ts', '.js'), result.code);

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

@@ -1,78 +1,68 @@
 "use strict";
 
 // plugins/ChunkHierarchyPlugin.js
-const fs = require("fs");
+const fs = require('fs');
 
-const path = require("path");
+const path = require('path');
 
 class ChunkHierarchyPlugin {
-  constructor(outputFileName) {
-    this.outputFileName = outputFileName || "chunk-hierarchy-report.json";
+  constructor(outputFile) {
+    this.outputFile = outputFile || 'chunk-hierarchy-report.json';
   }
 
   apply(compiler) {
-    compiler.hooks.afterEmit.tap("ChunkHierarchyPlugin", compilation => {
-      try {
-        const {
-          chunkGraph,
-          moduleGraph
-        } = compilation;
-        const hierarchy = {};
+    compiler.hooks.emit.tapAsync('ChunkHierarchyPlugin', (compilation, callback) => {
+      const result = {};
+      const rootContext = path.resolve(compiler.context, '..', '..');
 
-        for (const chunk of compilation.chunks) {
-          // skip unnamed or runtime chunks
-          if (chunk.name && chunk.name.includes("runtime")) {
-            continue;
-          }
+      for (const chunk of compilation.chunks) {
+        const chunkName = chunk.name || chunk.id;
+        const modules = [];
 
-          ;
-          const modules = chunkGraph.getChunkModulesIterable(chunk);
-          const deps = new Set();
+        for (const module of compilation.chunkGraph.getChunkModulesIterable(chunk)) {
+          // Recursively extract real modules (handle ConcatenatedModules)
+          collectModules(module, modules, rootContext);
+        }
 
-          for (const module of modules) {
-            for (const conn of moduleGraph.getOutgoingConnections(module)) {
-              if (!conn.module) continue;
-              const mod = conn.module;
+        result[chunkName] = modules;
+      }
 
-              const ConcatenatedModule = require("webpack/lib/optimize/ConcatenatedModule");
+      const json = JSON.stringify(result, null, 2);
+      const outputPath = compiler.outputPath;
+      const outputFile = path.join(outputPath, this.outputFile);
+      fs.mkdirSync(outputPath, {
+        recursive: true
+      });
+      fs.writeFileSync(outputFile, json, 'utf-8');
+      callback();
+    });
+  }
 
-              if (mod instanceof ConcatenatedModule) {
-                for (const inner of mod.modules) {
-                  if (inner.resource) {
-                    const match = inner.resource.match(/(?<!node_modules\/)jsapps\/.*/);
+}
 
-                    if (match && /^(?!.*node_modules).*$/.test(match)) {
-                      deps.add(match[0]);
-                    }
-                  }
-                }
-              } else {
-                const identifier = mod.resource || mod.identifier();
-                const match = identifier && identifier.match(/(?<!node_modules\/)jsapps\/.*/);
+function collectModules(module, modules, context) {
+  // Handle normal modules
+  if (module.resource) {
+    console.log(module.resource);
+    modules.push(path.relative(context, module.resource));
+    return;
+  } // Handle ConcatenatedModule (webpack internal)
 
-                if (match && /^(?!.*node_modules).*$/.test(match)) {
-                  deps.add(match[0]);
-                }
-              }
-            }
-          }
 
-          hierarchy[chunk.name || chunk.id] = Array.from(deps);
-        }
+  if (module.modules) {
+    for (const innerModule of module.modules) {
+      collectModules(innerModule, modules, context);
+    }
+  } // Handle Webpack 5 internal API (ConcatenatedModule inside _orderedConcatenationList)
 
-        const outputPath = compiler.options.output.path;
-        const outputFile = path.join(outputPath, this.outputFileName); // Ensure folder exists before writing
 
-        fs.mkdirSync(outputPath, {
-          recursive: true
-        });
-        fs.writeFileSync(outputFile, JSON.stringify(hierarchy, null, 2), "utf-8");
-      } catch (err) {
-        console.error("❌ ChunkHierarchyPlugin failed:", err);
+  if (module._orderedConcatenationList) {
+    for (const item of module._orderedConcatenationList) {
+      if (item.module) {
+        collectModules(item.module, modules, context);
       }
-    });
+    }
   }
-
 }
 
 module.exports = ChunkHierarchyPlugin;

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

@@ -22,8 +22,11 @@ const pluginName = 'prefetch-preload-chunk-plugin';
 
 class ResourceHintsPlugin {
   constructor({
-    publicPath
+    publicPath,
+    resourceHints
   }) {
+    this.resourceHints = resourceHints;
+    this.allowPrefetchingMultipleChunks = resourceHints.allowPrefetchingMultipleChunks;
     this.publicPathsTemplateObj = {
       js: publicPath,
       css: publicPath,
@@ -50,6 +53,7 @@ class ResourceHintsPlugin {
         compilation.addRuntimeModule(entryRuntimeChunk, // eslint-disable-next-line no-use-before-define
         new ResourceHintsRuntimePlugin(compiler, {
           chunk: entryRuntimeChunk,
+          allowPrefetchingMultipleChunks: this.allowPrefetchingMultipleChunks,
           publicPathsTemplateObj
         }));
       };
@@ -65,11 +69,13 @@ exports.default = ResourceHintsPlugin;
 class ResourceHintsRuntimePlugin extends _webpack.RuntimeModule {
   constructor(compiler, {
     chunk,
-    publicPathsTemplateObj
+    publicPathsTemplateObj,
+    allowPrefetchingMultipleChunks
   }) {
     super('ResourceHintsRuntimePlugin loading', 10);
     this.compiler = compiler;
     this.publicPathsTemplateObj = publicPathsTemplateObj;
+    this.allowPrefetchingMultipleChunks = allowPrefetchingMultipleChunks;
     this.chunk = chunk;
   }
 
@@ -79,7 +85,7 @@ class ResourceHintsRuntimePlugin extends _webpack.RuntimeModule {
     } = this;
     const idNameMap = chunk.getChunkMaps().name;
     const nameIdMap = {};
-    let needsMap = false;
+    let needsMap = this.allowPrefetchingMultipleChunks;
     Object.keys(idNameMap).forEach(key => {
       const value = idNameMap[key];
       nameIdMap[value] = key;
@@ -105,7 +111,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");
@@ -123,8 +129,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;
@@ -139,29 +145,33 @@ class ResourceHintsRuntimePlugin extends _webpack.RuntimeModule {
         }
       }
 
-      ${_webpack.RuntimeGlobals.require}.getChunkId = function getChunkId(chunkName) {
-        return ntc[chunkName]||chunkName;
+      ${_webpack.RuntimeGlobals.require}.getChunkId = function getChunkId(chunkId) {
+        ${needsMap ? 'chunkId = ntc[chunkId]||chunkId;' : ''}
+        return chunkId;
       }
-      
-      // Preload a chunk (${pluginName})
-      ${_webpack.RuntimeGlobals.require}.plc = function preloadChunk(chunkId) {
-      const preloadChunkGraph = __PRELOAD_CHUNK_GRAPH__
+      ${_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) {
         ${`
-           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);
-            //  })
-              `}
+            let chunkIds = ${_webpack.RuntimeGlobals.require}.getChunkIds(chunkId);
+            chunkIds.forEach(idOfAChunk => {
+              ${_webpack.RuntimeGlobals.require}.e(idOfAChunk);
+            })`}
       };
 
-      // Prefetch a chunk (${pluginName})
-      ${_webpack.RuntimeGlobals.require}.pfc = function prefetchChunk(chunkId) {
-            let idOfAChunk = ${_webpack.RuntimeGlobals.require}.getChunkId(chunkId);
-            lpp(idOfAChunk, "prefetch");
+      // 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})`,
     // `${RuntimeGlobals.require}.pfc = function prefetchChunk(chunkId) {`,
@@ -180,17 +190,4 @@ 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/entryConfig.js

@@ -14,7 +14,8 @@ function entryConfig(options) {
     entryPointName
   } = options.efc;
   const {
-    entryFile: mainEntry
+    entryFile: mainEntry,
+    AdditionalEntry
   } = options.app;
   const entry = {
     main: (0, _constants.joinWithAppPath)(mainEntry)
@@ -24,5 +25,9 @@ function entryConfig(options) {
     entry[entryPointName] = (0, _constants.joinWithAppPath)(entryFile);
   }
 
+  if (AdditionalEntry.enable) {
+    entry[AdditionalEntry.entryPointName] = (0, _constants.joinWithAppPath)(AdditionalEntry.entryFile);
+  }
+
   return entry;
 }

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

@@ -17,13 +17,19 @@ function configHtmlWebpackPlugin(options) {
   const {
     htmlTemplate,
     mode,
-    enableSubResourceIntegrity
+    enableSubResourceIntegrity,
+    generateHtml
   } = options;
   const {
     inject,
     templateFile
   } = htmlTemplate;
   const appInitialHTMLTemplatePath = (0, _constants.joinWithAppPath)(templateFile);
+
+  if (!generateHtml) {
+    return null;
+  }
+
   const minifyHtmlOptions = (0, _modeUtils.isProductionMode)(mode) ? // eslint-disable-next-line no-use-before-define
   getHTMLMinifyOptions(htmlTemplate) : false;
   return new _InitialHtmlPlugin.InitialHtmlPlugin({

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

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

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

@@ -60,5 +60,5 @@ 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), (0, _configInjectChunkGraphPlugin.configInjectChunkGraphPlugin)(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), ...webpackPlugins].filter(Boolean);
 }

package/package.json

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