From 36456d735af4e76cf3f0f321b1749f0199a3fde5 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@me.com>
Date: Thu, 10 Dec 2020 02:43:05 +0000
Subject: [PATCH] [Flight] Fix webpack plugin to use chunk groups

---
 .../src/ReactFlightWebpackPlugin.js           | 41 ++++++++++---------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/packages/react-server-dom-webpack/src/ReactFlightWebpackPlugin.js b/packages/react-server-dom-webpack/src/ReactFlightWebpackPlugin.js
index 4b273acdfef61..a1957692b7e74 100644
--- a/packages/react-server-dom-webpack/src/ReactFlightWebpackPlugin.js
+++ b/packages/react-server-dom-webpack/src/ReactFlightWebpackPlugin.js
@@ -170,26 +170,29 @@ export default class ReactFlightWebpackPlugin {
 
     compiler.hooks.emit.tap(PLUGIN_NAME, compilation => {
       const json = {};
-      compilation.chunks.forEach(chunk => {
-        chunk.getModules().forEach(mod => {
-          // TOOD: Hook into deps instead of the target module.
-          // That way we know by the type of dep whether to include.
-          // It also resolves conflicts when the same module is in multiple chunks.
-          if (!/\.client\.js$/.test(mod.resource)) {
-            return;
-          }
-          const moduleExports = {};
-          ['', '*'].concat(mod.buildMeta.providedExports).forEach(name => {
-            moduleExports[name] = {
-              id: mod.id,
-              chunks: chunk.ids,
-              name: name,
-            };
+      compilation.chunkGroups.forEach(chunkGroup => {
+        const chunkIds = chunkGroup.chunks.map(c => c.id);
+        chunkGroup.chunks.forEach(chunk => {
+          chunk.getModules().forEach(mod => {
+            // TODO: Hook into deps instead of the target module.
+            // That way we know by the type of dep whether to include.
+            // It also resolves conflicts when the same module is in multiple chunks.
+            if (!/\.client\.js$/.test(mod.resource)) {
+              return;
+            }
+            const moduleExports = {};
+            ['', '*'].concat(mod.buildMeta.providedExports).forEach(name => {
+              moduleExports[name] = {
+                id: mod.id,
+                chunks: chunkIds,
+                name: name,
+              };
+            });
+            const href = pathToFileURL(mod.resource).href;
+            if (href !== undefined) {
+              json[href] = moduleExports;
+            }
           });
-          const href = pathToFileURL(mod.resource).href;
-          if (href !== undefined) {
-            json[href] = moduleExports;
-          }
         });
       });
       const output = JSON.stringify(json, null, 2);