Merge pull request #78 from unstubbable/webpack-race-conditions

Prevent race conditions during webpack compilation
unstubbable · May 17, 2024 · bfc36c4 · bfc36c4
2 parents 97c58bd + 247f98c
commit bfc36c4
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 28 deletions.
diff --git a/.changeset/selfish-beans-jump.md b/.changeset/selfish-beans-jump.md
@@ -0,0 +1,5 @@
+---
+'@mfng/webpack-rsc': patch
+---
+
+Prevent race conditions during webpack compilation
diff --git a/packages/webpack-rsc/src/webpack-rsc-server-plugin.ts b/packages/webpack-rsc/src/webpack-rsc-server-plugin.ts
@@ -131,31 +131,46 @@ export class WebpackRscServerPlugin {
       });
     };
 
+    let needsAdditionalPass = false;
+
     compiler.hooks.finishMake.tapPromise(
       WebpackRscServerPlugin.name,
       async (compilation) => {
         this.serverManifest = {};
+        const clientReferences = [...this.clientReferencesMap.keys()];
+        const serverReferences = [...this.serverReferencesMap.keys()];
+        const referencesBefore = [...clientReferences, ...serverReferences];
 
         await Promise.all([
-          ...Array.from(this.clientReferencesMap.keys()).map(
-            async (resource) => {
-              try {
-                await includeModule(compilation, resource);
-              } catch (error) {
-                this.clientReferencesMap.delete(resource);
-              }
-            },
-          ),
-          ...Array.from(this.serverReferencesMap.keys()).map(
-            async (resource) => {
-              try {
-                await includeModule(compilation, resource, webpackRscLayerName);
-              } catch (error) {
-                this.serverReferencesMap.delete(resource);
-              }
-            },
-          ),
+          ...clientReferences.map(async (resource) => {
+            try {
+              await includeModule(compilation, resource);
+            } catch (error) {
+              this.clientReferencesMap.delete(resource);
+            }
+          }),
+          ...serverReferences.map(async (resource) => {
+            try {
+              await includeModule(compilation, resource, webpackRscLayerName);
+            } catch (error) {
+              this.serverReferencesMap.delete(resource);
+            }
+          }),
         ]);
+
+        const referencesAfter = [
+          ...this.clientReferencesMap.keys(),
+          ...this.serverReferencesMap.keys(),
+        ];
+
+        if (
+          referencesBefore.length !== referencesAfter.length ||
+          !referencesAfter.every((reference) =>
+            referencesBefore.includes(reference),
+          )
+        ) {
+          needsAdditionalPass = true;
+        }
       },
     );
 
@@ -191,16 +206,12 @@ export class WebpackRscServerPlugin {
               return;
             }
 
-            if (module.layer === webpackRscLayerName) {
-              if (isClientModule) {
-                void includeModule(compilation, resource).catch(() => {
-                  this.clientReferencesMap.delete(resource);
-                });
-              }
-
-              if (isServerModule && !hasServerReferenceDependency(module)) {
-                module.addDependency(new ServerReferenceDependency());
-              }
+            if (
+              module.layer === webpackRscLayerName &&
+              isServerModule &&
+              !hasServerReferenceDependency(module)
+            ) {
+              module.addDependency(new ServerReferenceDependency());
             }
           });
 
@@ -226,6 +237,11 @@ export class WebpackRscServerPlugin {
           .for(`javascript/esm`)
           .tap(`HarmonyModulesPlugin`, onNormalModuleFactoryParser);
 
+        compilation.hooks.needAdditionalPass.tap(
+          WebpackRscServerPlugin.name,
+          () => !(needsAdditionalPass = !needsAdditionalPass),
+        );
+
         compilation.hooks.afterOptimizeModuleIds.tap(
           WebpackRscServerPlugin.name,
           (modules) => {