From 3995639d517d80e3fab950ff400e64c131ab218f Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@me.com>
Date: Sat, 12 Dec 2020 18:29:39 +0000
Subject: [PATCH] Add support for concatenated modules

---
 .../src/ReactFlightWebpackPlugin.js                       | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/react-server-dom-webpack/src/ReactFlightWebpackPlugin.js b/packages/react-server-dom-webpack/src/ReactFlightWebpackPlugin.js
index adf3f09dd2478..eb8c489d394d5 100644
--- a/packages/react-server-dom-webpack/src/ReactFlightWebpackPlugin.js
+++ b/packages/react-server-dom-webpack/src/ReactFlightWebpackPlugin.js
@@ -183,7 +183,7 @@ export default class ReactFlightWebpackPlugin {
           const moduleExports = {};
           ['', '*'].concat(mod.buildMeta.providedExports).forEach(name => {
             moduleExports[name] = {
-              id: mod.id,
+              id: id,
               chunks: chunkIds,
               name: name,
             };
@@ -197,6 +197,12 @@ export default class ReactFlightWebpackPlugin {
         chunkGroup.chunks.forEach(chunk => {
           chunk.getModules().forEach(mod => {
             recordModule(mod.id, mod);
+            // If this is a concatenation, register each child to the parent ID.
+            if (mod.modules) {
+              mod.modules.forEach(concatenatedMod => {
+                recordModule(mod.id, concatenatedMod);
+              });
+            }
           });
         });
       });