fix: code splitting on dev mode

flarum · Sep 11, 2024 · b9037df · b9037df
1 parent 270ba09
commit b9037df
Showing 1 changed file with 43 additions and 17 deletions.
diff --git a/js-packages/webpack-config/src/RegisterAsyncChunksPlugin.cjs b/js-packages/webpack-config/src/RegisterAsyncChunksPlugin.cjs
@@ -1,6 +1,7 @@
 const path = require('path');
 const extensionId = require('./extensionId.cjs');
 const { Compilation } = require('webpack');
+const ConcatenatedModule = require('webpack/lib/optimize/ConcatenatedModule');
 
 class RegisterAsyncChunksPlugin {
   static registry = {};
@@ -81,28 +82,53 @@ class RegisterAsyncChunksPlugin {
                     return match;
                   }
 
-                  let concatenatedModule = chunkModules(relevantChunk)[0];
-                  const moduleId = compilation.chunkGraph.getModuleId(concatenatedModule);
+                  const relevantChunkModules = chunkModules(relevantChunk);
+                  const mainModule = relevantChunkModules.filter((m) => {
+                    return m.resource?.split('.')[0] === importPathResolved || m.rootModule?.resource?.split('.')[0] === importPathResolved;
+                  })[0];
+                  const otherRelevantChunkModules = relevantChunkModules.filter((m) => m !== mainModule);
+
+                  if (mainModule instanceof ConcatenatedModule && mainModule.modules) {
+                    otherRelevantChunkModules.push(...mainModule.modules);
+                  }
+
+                  if (!mainModule) {
+                    return match;
+                  }
+
+                  const moduleId = compilation.chunkGraph.getModuleId(mainModule);
                   const registrableModulesUrlPaths = new Map();
                   registrableModulesUrlPaths.set(urlPath, [relevantChunk.id, moduleId, namespace, urlPath]);
 
-                  if (concatenatedModule?.rootModule) {
-                    // This is a chunk with many modules, we need to register all of them.
-                    concatenatedModule.modules?.forEach((module) => {
-                      if (!module.resource.includes(`${path.sep}src${path.sep}`)) {
-                        return;
-                      }
-
-                      // The path right after the src/ directory, without the extension.
-                      const regPathSep = `\\${path.sep}`;
-                      const urlPath = module.resource.replace(new RegExp(`.*${regPathSep}src${regPathSep}([^.]+)\..+`), '$1');
-
-                      if (!registrableModulesUrlPaths.has(urlPath)) {
-                        registrableModulesUrlPaths.set(urlPath, [relevantChunk.id, moduleId, namespace, urlPath]);
-                      }
-                    });
+                  const modules = [];
+
+                  otherRelevantChunkModules.forEach((module) => {
+                    if (module instanceof ConcatenatedModule && module.modules) {
+                      modules.push(...module.modules);
+                    } else {
+                      modules.push(module);
+                    }
+                  });
+
+                  if (relevantChunk.name.endsWith('PostStream')) {
+                    console.log(otherRelevantChunkModules);
                   }
 
+                  // This is a chunk with many modules, we need to register all of them.
+                  modules?.forEach((module) => {
+                    if (!module.resource.includes(`${path.sep}src${path.sep}`)) {
+                      return;
+                    }
+
+                    // The path right after the src/ directory, without the extension.
+                    const regPathSep = `\\${path.sep}`;
+                    const urlPath = module.resource.replace(new RegExp(`.*${regPathSep}src${regPathSep}([^.]+)\..+`), '$1');
+
+                    if (!registrableModulesUrlPaths.has(urlPath)) {
+                      registrableModulesUrlPaths.set(urlPath, [relevantChunk.id, moduleId, namespace, urlPath]);
+                    }
+                  });
+
                   registrableModulesUrlPaths.forEach(([chunkId, moduleId, namespace, urlPath]) => {
                     chunkModuleMemory[sourceChunkId] = chunkModuleMemory[sourceChunkId] || [];