Fix cannot find module runtime error with runtimes in multiple bundles

devongovett · devongovett · commit 882d39554726 · 2024-04-15T15:46:36.000-07:00
diff --git a/packages/core/core/src/applyRuntimes.js b/packages/core/core/src/applyRuntimes.js
@@ -84,16 +84,7 @@ export default async function applyRuntimes<TResult>({
   let runtimes = await config.getRuntimes();
   let connections: Array<RuntimeConnection> = [];
 
-  // As manifest bundles may be added during runtimes we process them in reverse topological
-  // sort order. This allows bundles to be added to their bundle groups before they are referenced
-  // by other bundle groups by loader runtimes
-  let bundles = [];
-  bundleGraph.traverseBundles({
-    exit(bundle) {
-      bundles.push(bundle);
-    },
-  });
-
+  let bundles = bundleGraph.getBundles({includeInline: true});
   for (let bundle of bundles) {
     for (let runtime of runtimes) {
       let measurement;
@@ -172,12 +163,20 @@ export default async function applyRuntimes<TResult>({
               nameRuntimeBundle(connectionBundle, bundle);
             }
 
-            connections.push({
+            let connection = {
               bundle: connectionBundle,
               assetGroup,
               dependency,
               isEntry,
-            });
+            };
+
+            if (connectionBundle === bundle) {
+              connections.push(connection);
+            } else {
+              // If this is a parallel bundle, it needs to be inserted before this one
+              // so that its dependencies are already loaded when this bundle runs.
+              connections.unshift(connection);
+            }
           }
         }
       } catch (e) {
@@ -192,9 +191,6 @@ export default async function applyRuntimes<TResult>({
     }
   }
 
-  // Correct connection order after generating runtimes in reverse order
-  connections.reverse();
-
   // Add dev deps for runtime plugins AFTER running them, to account for lazy require().
   for (let runtime of runtimes) {
     let devDepRequest = await createDevDependency(
diff --git a/packages/core/integration-tests/test/html.js b/packages/core/integration-tests/test/html.js
@@ -11,6 +11,7 @@ import {
   outputFS,
   overlayFS,
   ncp,
+  fsFixture,
 } from '@parcel/test-utils';
 import path from 'path';
 
@@ -3055,4 +3056,36 @@ describe('html', function () {
 
     await run(b, {output: null}, {require: false});
   });
+
+  it('should insert bundle manifest into the correct bundle with multiple script tags', async function () {
+    const dir = path.join(__dirname, 'manifest-multi-script');
+    overlayFS.mkdirp(dir);
+
+    await fsFixture(overlayFS, dir)`
+      index.html:
+        <body>
+          <script src="./polyfills.js" type="module"></script>
+          <script src="./main.js" type="module"></script>
+        </body>
+        
+      polyfills.js:
+        import('./polyfills-async');
+
+      polyfills-async.js:
+        export const foo = 2;
+
+      main.js:
+        import('./main-async');
+
+      main-async.js:
+        export const bar = 3;
+      `;
+
+    let b = await bundle(path.join(dir, '/index.html'), {
+      inputFS: overlayFS,
+    });
+
+    // Should not error with "Cannot find module" error at runtime.
+    await run(b);
+  });
 });
