@zohodesk/client_build_tool 0.0.15-exp.11 → 0.0.15-exp.13

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

@@ -21,13 +21,7 @@ class ChunkHierarchyPlugin {
 
         for (const chunk of compilation.chunks) {
           // skip unnamed or runtime chunks
-          if (!chunk.name) {
-            continue;
-          }
-
-          ;
-
-          if (chunk.name.includes("runtime")) {
+          if (chunk.name && chunk.name.includes("runtime")) {
             continue;
           }
 
@@ -37,13 +31,33 @@ 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.*/)?.[0]);
+              if (!conn.module) continue;
+              const mod = conn.module;
+
+              const ConcatenatedModule = require("webpack/lib/optimize/ConcatenatedModule");
+
+              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\/.*/);
+
+                if (match && /^(?!.*node_modules).*$/.test(match)) {
+                  deps.add(match[0]);
+                }
               }
             }
           }
 
-          hierarchy[chunk.name] = Array.from(deps);
+          hierarchy[chunk.name || chunk.id] = Array.from(deps);
         }
 
         const outputPath = compiler.options.output.path;

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

@@ -36,6 +36,10 @@ class InjectChunkGraphPlugin {
         const newSource = originalSource.replace('__PRELOAD_CHUNK_GRAPH__', `${JSON.stringify(chunkGraph)}`); // Update the runtime asset with injected code
 
         compilation.updateAsset(runtimeChunkName, new RawSource(newSource));
+
+        if (runtimeChunkName.includes('smap/')) {
+          compilation.updateAsset(runtimeChunkName.replace('smap/', ''), new RawSource(newSource));
+        }
       });
     });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/client_build_tool",
-  "version": "0.0.15-exp.11",
+  "version": "0.0.15-exp.13",
   "description": "A CLI tool to  build  web applications and client libraries",
   "main": "lib/index.js",
   "bin": {
@@ -17,7 +17,7 @@
     "test": "react-cli test"
   },
   "repository": {
-    "type": "git",
+    "type": "git", 
     "url": "https://zgit.csecz.zohocorpin.com/zohodesk/react-cli.git"
   },
   "keywords": [