From 1c30b0a2c7c686e323d40e68d9bc1b5ec5b3d80b Mon Sep 17 00:00:00 2001
From: Gora Kong <gora.kong1@gmail.com>
Date: Wed, 23 Mar 2022 18:58:11 -0700
Subject: [PATCH 01/12] implement parallel request limits

---
 .../experimental/src/ExperimentalBundler.js   | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/packages/bundlers/experimental/src/ExperimentalBundler.js b/packages/bundlers/experimental/src/ExperimentalBundler.js
index 99719dba6c6..1a17e0e8672 100644
--- a/packages/bundlers/experimental/src/ExperimentalBundler.js
+++ b/packages/bundlers/experimental/src/ExperimentalBundler.js
@@ -789,6 +789,24 @@ function createIdealGraph(
         let key = reachable.map(a => a.id).join(',');
         let bundleId = bundles.get(key);
         let bundle;
+
+        sourceBundles.filter(sourceBundleId => {
+          if (bundleId !== sourceBundleId) {
+            let sourceBundle = nullthrows(bundleGraph.getNode(sourceBundleId));
+            invariant(sourceBundle !== 'root');
+            let bundleGroupIds = bundleGraph
+              .getNodeIdsConnectedTo(sourceBundleId)
+              .filter(n => bundleGraph.getNode(n) !== 'root');
+            // Check that all bundle groups the source bundle belongs to
+            // are within the parallel request limit
+            return bundleGroupIds.every(
+              groupId =>
+                bundleGraph.getNodeIdsConnectedFrom(groupId).length <
+                config.maxParallelRequests,
+            );
+          }
+        });
+
         if (bundleId == null) {
           let firstSourceBundle = nullthrows(
             bundleGraph.getNode(sourceBundles[0]),
@@ -808,7 +826,6 @@ function createIdealGraph(
         }
         bundle.assets.add(asset);
         bundle.size += asset.stats.size;
-
         for (let sourceBundleId of sourceBundles) {
           if (bundleId !== sourceBundleId) {
             bundleGraph.addEdge(sourceBundleId, bundleId);

From f8a8e65b9d2408c1ad8f443b550c13991e5da684 Mon Sep 17 00:00:00 2001
From: Gora Kong <gora.kong1@gmail.com>
Date: Thu, 24 Mar 2022 16:42:38 -0700
Subject: [PATCH 02/12] cleanup

---
 packages/bundlers/experimental/src/ExperimentalBundler.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/bundlers/experimental/src/ExperimentalBundler.js b/packages/bundlers/experimental/src/ExperimentalBundler.js
index 1a17e0e8672..5c7279c5a4a 100644
--- a/packages/bundlers/experimental/src/ExperimentalBundler.js
+++ b/packages/bundlers/experimental/src/ExperimentalBundler.js
@@ -788,7 +788,6 @@ function createIdealGraph(
         let sourceBundles = reachable.map(a => nullthrows(bundles.get(a.id)));
         let key = reachable.map(a => a.id).join(',');
         let bundleId = bundles.get(key);
-        let bundle;
 
         sourceBundles.filter(sourceBundleId => {
           if (bundleId !== sourceBundleId) {
@@ -807,6 +806,7 @@ function createIdealGraph(
           }
         });
 
+        let bundle;
         if (bundleId == null) {
           let firstSourceBundle = nullthrows(
             bundleGraph.getNode(sourceBundles[0]),
@@ -826,6 +826,7 @@ function createIdealGraph(
         }
         bundle.assets.add(asset);
         bundle.size += asset.stats.size;
+
         for (let sourceBundleId of sourceBundles) {
           if (bundleId !== sourceBundleId) {
             bundleGraph.addEdge(sourceBundleId, bundleId);

From 892edd37107a8032ae33466b721570efec3e556f Mon Sep 17 00:00:00 2001
From: Gora Kong <gora.kong1@gmail.com>
Date: Mon, 28 Mar 2022 18:09:24 -0700
Subject: [PATCH 03/12] create all shared bundles first then remove later

---
 .../experimental/src/ExperimentalBundler.js   | 75 ++++++++++++++-----
 1 file changed, 57 insertions(+), 18 deletions(-)

diff --git a/packages/bundlers/experimental/src/ExperimentalBundler.js b/packages/bundlers/experimental/src/ExperimentalBundler.js
index 5c7279c5a4a..421722a1a73 100644
--- a/packages/bundlers/experimental/src/ExperimentalBundler.js
+++ b/packages/bundlers/experimental/src/ExperimentalBundler.js
@@ -788,24 +788,6 @@ function createIdealGraph(
         let sourceBundles = reachable.map(a => nullthrows(bundles.get(a.id)));
         let key = reachable.map(a => a.id).join(',');
         let bundleId = bundles.get(key);
-
-        sourceBundles.filter(sourceBundleId => {
-          if (bundleId !== sourceBundleId) {
-            let sourceBundle = nullthrows(bundleGraph.getNode(sourceBundleId));
-            invariant(sourceBundle !== 'root');
-            let bundleGroupIds = bundleGraph
-              .getNodeIdsConnectedTo(sourceBundleId)
-              .filter(n => bundleGraph.getNode(n) !== 'root');
-            // Check that all bundle groups the source bundle belongs to
-            // are within the parallel request limit
-            return bundleGroupIds.every(
-              groupId =>
-                bundleGraph.getNodeIdsConnectedFrom(groupId).length <
-                config.maxParallelRequests,
-            );
-          }
-        });
-
         let bundle;
         if (bundleId == null) {
           let firstSourceBundle = nullthrows(
@@ -852,6 +834,63 @@ function createIdealGraph(
     }
   }
 
+  // Step 8: Remove shared bundles from bundle groups that hit the parallel request limit.
+  for (let [bundleId, bundleGroupId] of bundleRoots.values()) {
+    // Only handle bundle group entries.
+    if (bundleId != bundleGroupId) {
+      continue;
+    }
+
+    // Find the bundles in this bundle group.
+    let bundleIdsInGroup = bundleGraph.getNodeIdsConnectedFrom(bundleGroupId);
+    if (bundleIdsInGroup.length > config.maxParallelRequests) {
+      // Sort the bundles so the smallest ones are removed first.
+      let bundlesInGroup = bundleIdsInGroup
+        .map(id => nullthrows(bundleGraph.getNode(id)))
+        .map(bundle => {
+          // For Flow
+          invariant(bundle !== 'root');
+          return bundle;
+        })
+        .sort((a, b) => a.size - b.size);
+
+      // Remove bundles until the bundle group is within the parallel request limit.
+      for (
+        let i = 0;
+        i < bundlesInGroup.length - config.maxParallelRequests;
+        i++
+      ) {
+        let bundleId = bundleIdsInGroup[i];
+        let bundle = nullthrows(bundleGraph.getNode(bundleId));
+        invariant(bundle !== 'root');
+        // Add all assets in the shared bundle into the source bundles that are within this bundle group.
+        let sourceBundles = bundle.sourceBundles
+          .filter(b => bundlesInGroup.includes(b))
+          .map(id => nullthrows(bundleGraph.getNode(id)));
+
+        for (let sourceBundle of sourceBundles) {
+          invariant(sourceBundle !== 'root');
+          for (let asset of bundle.assets) {
+            sourceBundle.assets.add(asset);
+            sourceBundle.size += asset.stats.size;
+          }
+        }
+
+        // Remove the edge from this bundle group to the shared bundle.
+        bundleGraph.removeEdge(bundleGroupId, bundleId);
+        // If there is now only a single bundle group that contains this bundle,
+        // merge it into the remaining source bundles. If it is orphaned entirely, remove it.
+        let incomingNodeCount =
+          bundleGraph.getNodeIdsConnectedTo(bundleId).length;
+        if (incomingNodeCount === 1) {
+          removeBundle(bundleGraph, bundleId);
+        } else if (incomingNodeCount == 0) {
+          bundleGraph.removeNode(bundleId);
+        }
+      }
+    }
+  }
+
   return {
     bundleGraph,
     dependencyBundleGraph,

From 7faa3d738f17d1a710963fd0e6f47cd9d0959a77 Mon Sep 17 00:00:00 2001
From: Gora Kong <gora.kong1@gmail.com>
Date: Mon, 2 May 2022 11:08:41 -0700
Subject: [PATCH 04/12] remove asset references for deleted bundles + minor
 fixes

---
 .../experimental/src/ExperimentalBundler.js   | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/packages/bundlers/experimental/src/ExperimentalBundler.js b/packages/bundlers/experimental/src/ExperimentalBundler.js
index cf45f4220fc..7b127ef846c 100644
--- a/packages/bundlers/experimental/src/ExperimentalBundler.js
+++ b/packages/bundlers/experimental/src/ExperimentalBundler.js
@@ -878,7 +878,7 @@ function createIdealGraph(
     if (bundle === 'root') continue;
     if (bundle.sourceBundles.length > 0 && bundle.size < config.minBundleSize) {
       sharedToSourceBundleIds.delete(bundleNodeId);
-      removeBundle(bundleGraph, bundleNodeId);
+      removeBundle(bundleGraph, bundleNodeId, assetReference);
     }
   }
 
@@ -931,7 +931,7 @@ function createIdealGraph(
         let incomingNodeCount =
           bundleGraph.getNodeIdsConnectedTo(bundleId).length;
         if (incomingNodeCount === 1) {
-          removeBundle(bundleGraph, bundleId);
+          removeBundle(bundleGraph, bundleId, assetReference);
         } else if (incomingNodeCount === 0) {
           bundleGraph.removeNode(bundleId);
         }
@@ -1007,11 +1007,18 @@ function createBundle(opts: {|
   };
 }
 
-function removeBundle(bundleGraph: Graph<Bundle | 'root'>, bundleId: NodeId) {
+function removeBundle(
+  bundleGraph: Graph<Bundle | 'root'>,
+  bundleId: NodeId,
+  assetReference: DefaultMap<Asset, Array<[Dependency, Bundle]>>,
+) {
   let bundle = nullthrows(bundleGraph.getNode(bundleId));
   invariant(bundle !== 'root');
-
   for (let asset of bundle.assets) {
+    assetReference.set(
+      asset,
+      assetReference.get(asset).filter(t => !t.includes(bundle)),
+    );
     for (let sourceBundleId of bundle.sourceBundles) {
       let sourceBundle = nullthrows(bundleGraph.getNode(sourceBundleId));
       invariant(sourceBundle !== 'root');
@@ -1028,7 +1035,7 @@ async function loadBundlerConfig(
   options: PluginOptions,
 ): Promise<ResolvedBundlerConfig> {
   let conf = await config.getConfig<BundlerConfig>([], {
-    packageKey: '@parcel/bundler-default',
+    packageKey: '@parcel/bundler-experimental',
   });
   if (!conf) {
     return HTTP_OPTIONS['2'];
@@ -1042,10 +1049,10 @@ async function loadBundlerConfig(
       data: conf?.contents,
       source: await options.inputFS.readFile(conf.filePath, 'utf8'),
       filePath: conf.filePath,
-      prependKey: `/${encodeJSONKeyComponent('@parcel/bundler-default')}`,
+      prependKey: `/${encodeJSONKeyComponent('@parcel/bundler-experimental')}`,
     },
-    '@parcel/bundler-default',
-    'Invalid config for @parcel/bundler-default',
+    '@parcel/bundler-experimental',
+    'Invalid config for @parcel/bundler-experimental',
   );
 
   let http = conf.contents.http ?? 2;

From b8060e99d92eb389ae2cd6a980520f566ae167b2 Mon Sep 17 00:00:00 2001
From: Gora Kong <gora.kong1@gmail.com>
Date: Wed, 1 Jun 2022 18:05:27 -0700
Subject: [PATCH 05/12] revise method of getting shared bundles from
 bundlegroup + integration test

---
 .../experimental/src/ExperimentalBundler.js   | 24 +++++++++--
 packages/core/integration-tests/test/cache.js | 40 +++++++++++++++++++
 .../test/integration/large-bundlegroup/a.js   |  1 +
 .../test/integration/large-bundlegroup/b.js   |  1 +
 .../test/integration/large-bundlegroup/c.js   |  1 +
 .../test/integration/large-bundlegroup/d.js   |  1 +
 .../integration/large-bundlegroup/index.js    |  4 ++
 .../large-bundlegroup/package.json            |  1 +
 .../integration/large-bundlegroup/yarn.lock   |  0
 9 files changed, 69 insertions(+), 4 deletions(-)
 create mode 100644 packages/core/integration-tests/test/integration/large-bundlegroup/a.js
 create mode 100644 packages/core/integration-tests/test/integration/large-bundlegroup/b.js
 create mode 100644 packages/core/integration-tests/test/integration/large-bundlegroup/c.js
 create mode 100644 packages/core/integration-tests/test/integration/large-bundlegroup/d.js
 create mode 100644 packages/core/integration-tests/test/integration/large-bundlegroup/index.js
 create mode 100644 packages/core/integration-tests/test/integration/large-bundlegroup/package.json
 create mode 100644 packages/core/integration-tests/test/integration/large-bundlegroup/yarn.lock

diff --git a/packages/bundlers/experimental/src/ExperimentalBundler.js b/packages/bundlers/experimental/src/ExperimentalBundler.js
index 264f6b607b0..0b167e4add7 100644
--- a/packages/bundlers/experimental/src/ExperimentalBundler.js
+++ b/packages/bundlers/experimental/src/ExperimentalBundler.js
@@ -778,15 +778,24 @@ function createIdealGraph(
     }
   }
 
-  // Step 8: Remove shared bundles from bundle groups that hit the parallel request limit.
+  // Step Remove Shared Bundles: Remove shared bundles from bundle groups that hit the parallel request limit.
   for (let [bundleId, bundleGroupId] of bundleRoots.values()) {
     // Only handle bundle group entries.
-    if (bundleId != bundleGroupId) {
+    if (bundleId !== bundleGroupId) {
       continue;
     }
 
-    // Find the bundles in this bundle group.
-    let bundleIdsInGroup = bundleGraph.getNodeIdsConnectedFrom(bundleGroupId);
+    // Find shared bundles in this bundle group.
+    let bundleIdsInGroup = [];
+    for (let [
+      sharedBundleId,
+      sourceBundleIds,
+    ] of sharedToSourceBundleIds.entries()) {
+      if (sourceBundleIds.includes(bundleId)) {
+        bundleIdsInGroup.push(sharedBundleId);
+      }
+    }
+
     if (bundleIdsInGroup.length > config.maxParallelRequests) {
       // Sort the bundles so the smallest ones are removed first.
       let bundlesInGroup = bundleIdsInGroup
@@ -807,6 +816,7 @@ function createIdealGraph(
         let bundleId = bundleIdsInGroup[i];
         let bundle = nullthrows(bundleGraph.getNode(bundleId));
         invariant(bundle !== 'root');
+
         // Add all assets in the shared bundle into the source bundles that are within this bundle group.
         let sourceBundles = bundle.sourceBundles
           .filter(b => bundlesInGroup.includes(b))
@@ -822,12 +832,18 @@ function createIdealGraph(
 
         // Remove the edge from this bundle group to the shared bundle.
         bundleGraph.removeEdge(bundleGroupId, bundleId);
+
         // If there is now only a single bundle group that contains this bundle,
         // merge it into the remaining source bundles. If it is orphaned entirely, remove it.
         let incomingNodeCount =
           bundleGraph.getNodeIdsConnectedTo(bundleId).length;
         if (incomingNodeCount === 1) {
           removeBundle(bundleGraph, bundleId, assetReference);
+          for (let sharedBundleId of sharedToSourceBundleIds.keys()) {
+            if (sharedBundleId === bundleId) {
+              sharedToSourceBundleIds.delete(sharedBundleId);
+            }
+          }
         } else if (incomingNodeCount === 0) {
           bundleGraph.removeNode(bundleId);
         }
diff --git a/packages/core/integration-tests/test/cache.js b/packages/core/integration-tests/test/cache.js
index b03c13689e8..544938972f2 100644
--- a/packages/core/integration-tests/test/cache.js
+++ b/packages/core/integration-tests/test/cache.js
@@ -4404,6 +4404,46 @@ describe('cache', function () {
         assert.equal(html.match(/<script/g)?.length, 5);
       });
 
+      it('should support adding bundler config for parallel request limits', async function () {
+        let b = await testCache(
+          {
+            entries: ['index.js'],
+            mode: 'production',
+            async setup() {
+              let pkgFile = path.join(inputDir, 'package.json');
+              let pkg = JSON.parse(await overlayFS.readFile(pkgFile));
+              await overlayFS.writeFile(
+                pkgFile,
+                JSON.stringify({
+                  ...pkg,
+                  '@parcel/bundler-default': undefined,
+                  '@parcel/bundler-experimental': undefined,
+                }),
+              );
+            },
+            async update(b) {
+              assert(b.bundleGraph.getBundles().length, 7);
+              let pkgFile = path.join(inputDir, 'package.json');
+              let pkg = JSON.parse(await overlayFS.readFile(pkgFile));
+              await overlayFS.writeFile(
+                pkgFile,
+                JSON.stringify({
+                  ...pkg,
+                  '@parcel/bundler-default': {
+                    maxParallelRequests: 0,
+                  },
+                  '@parcel/bundler-experimental': {
+                    maxParallelRequests: 0,
+                  },
+                }),
+              );
+            },
+          },
+          'large-bundlegroup',
+        );
+        assert(b.bundleGraph.getBundles().length, 5);
+      });
+
       it('should support updating bundler config', async function () {
         let b = await testCache(
           {
diff --git a/packages/core/integration-tests/test/integration/large-bundlegroup/a.js b/packages/core/integration-tests/test/integration/large-bundlegroup/a.js
new file mode 100644
index 00000000000..8d080affc6e
--- /dev/null
+++ b/packages/core/integration-tests/test/integration/large-bundlegroup/a.js
@@ -0,0 +1 @@
+module.exports = require('lodash').add(1, 1);
diff --git a/packages/core/integration-tests/test/integration/large-bundlegroup/b.js b/packages/core/integration-tests/test/integration/large-bundlegroup/b.js
new file mode 100644
index 00000000000..f897854c19e
--- /dev/null
+++ b/packages/core/integration-tests/test/integration/large-bundlegroup/b.js
@@ -0,0 +1 @@
+module.exports = require("react");
diff --git a/packages/core/integration-tests/test/integration/large-bundlegroup/c.js b/packages/core/integration-tests/test/integration/large-bundlegroup/c.js
new file mode 100644
index 00000000000..22fd70818f4
--- /dev/null
+++ b/packages/core/integration-tests/test/integration/large-bundlegroup/c.js
@@ -0,0 +1 @@
+module.exports = require('lodash').add(2, 2);
diff --git a/packages/core/integration-tests/test/integration/large-bundlegroup/d.js b/packages/core/integration-tests/test/integration/large-bundlegroup/d.js
new file mode 100644
index 00000000000..f897854c19e
--- /dev/null
+++ b/packages/core/integration-tests/test/integration/large-bundlegroup/d.js
@@ -0,0 +1 @@
+module.exports = require("react");
diff --git a/packages/core/integration-tests/test/integration/large-bundlegroup/index.js b/packages/core/integration-tests/test/integration/large-bundlegroup/index.js
new file mode 100644
index 00000000000..edb2fd021f2
--- /dev/null
+++ b/packages/core/integration-tests/test/integration/large-bundlegroup/index.js
@@ -0,0 +1,4 @@
+import('./a.js');
+import('./b.js');
+import('./c.js');
+import('./d.js');
diff --git a/packages/core/integration-tests/test/integration/large-bundlegroup/package.json b/packages/core/integration-tests/test/integration/large-bundlegroup/package.json
new file mode 100644
index 00000000000..0967ef424bc
--- /dev/null
+++ b/packages/core/integration-tests/test/integration/large-bundlegroup/package.json
@@ -0,0 +1 @@
+{}
diff --git a/packages/core/integration-tests/test/integration/large-bundlegroup/yarn.lock b/packages/core/integration-tests/test/integration/large-bundlegroup/yarn.lock
new file mode 100644
index 00000000000..e69de29bb2d

From 45c6b094400c1649f95011c47085d47adffb556b Mon Sep 17 00:00:00 2001
From: Gora Kong <gora.kong1@gmail.com>
Date: Wed, 1 Jun 2022 18:48:22 -0700
Subject: [PATCH 06/12] deep equal

---
 packages/core/integration-tests/test/cache.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/core/integration-tests/test/cache.js b/packages/core/integration-tests/test/cache.js
index edf5a38450e..4d033689e30 100644
--- a/packages/core/integration-tests/test/cache.js
+++ b/packages/core/integration-tests/test/cache.js
@@ -4422,7 +4422,7 @@ describe('cache', function () {
               );
             },
             async update(b) {
-              assert(b.bundleGraph.getBundles().length, 7);
+              assert.deepEqual(b.bundleGraph.getBundles().length, 7);
               let pkgFile = path.join(inputDir, 'package.json');
               let pkg = JSON.parse(await overlayFS.readFile(pkgFile));
               await overlayFS.writeFile(
@@ -4441,7 +4441,7 @@ describe('cache', function () {
           },
           'large-bundlegroup',
         );
-        assert(b.bundleGraph.getBundles().length, 5);
+        assert.deepEqual(b.bundleGraph.getBundles().length, 5);
       });
 
       it('should support updating bundler config', async function () {

From c5eab76aa604ceb09513b8a1a24a0a41c1f8e388 Mon Sep 17 00:00:00 2001
From: Gora Kong <gora.kong1@gmail.com>
Date: Thu, 23 Jun 2022 23:37:09 -0700
Subject: [PATCH 07/12] fix bugs with missing node/edges

---
 .../experimental/src/ExperimentalBundler.js   | 36 ++++++++++---------
 packages/core/integration-tests/test/cache.js |  4 ---
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/packages/bundlers/experimental/src/ExperimentalBundler.js b/packages/bundlers/experimental/src/ExperimentalBundler.js
index 0b167e4add7..ee8b72dd076 100644
--- a/packages/bundlers/experimental/src/ExperimentalBundler.js
+++ b/packages/bundlers/experimental/src/ExperimentalBundler.js
@@ -791,6 +791,8 @@ function createIdealGraph(
       sharedBundleId,
       sourceBundleIds,
     ] of sharedToSourceBundleIds.entries()) {
+      // If the bundle group's entry is a source bundle of this shared bundle,
+      // the shared bundle is part of the bundle group.
       if (sourceBundleIds.includes(bundleId)) {
         bundleIdsInGroup.push(sharedBundleId);
       }
@@ -799,13 +801,16 @@ function createIdealGraph(
     if (bundleIdsInGroup.length > config.maxParallelRequests) {
       // Sort the bundles so the smallest ones are removed first.
       let bundlesInGroup = bundleIdsInGroup
-        .map(id => nullthrows(bundleGraph.getNode(id)))
-        .map(bundle => {
+        .map(id => ({
+          id,
+          bundle: nullthrows(bundleGraph.getNode(id)),
+        }))
+        .map(({id, bundle}) => {
           // For Flow
           invariant(bundle !== 'root');
-          return bundle;
+          return {id, bundle};
         })
-        .sort((a, b) => a.size - b.size);
+        .sort((a, b) => a.bundle.size - b.bundle.size);
 
       // Remove bundles until the bundle group is within the parallel request limit.
       for (
@@ -813,39 +818,38 @@ function createIdealGraph(
         i < bundlesInGroup.length - config.maxParallelRequests;
         i++
       ) {
-        let bundleId = bundleIdsInGroup[i];
-        let bundle = nullthrows(bundleGraph.getNode(bundleId));
-        invariant(bundle !== 'root');
+        let bundleToRemove = bundlesInGroup[i].bundle;
+        let bundleIdToRemove = bundlesInGroup[i].id;
 
         // Add all assets in the shared bundle into the source bundles that are within this bundle group.
-        let sourceBundles = bundle.sourceBundles
-          .filter(b => bundlesInGroup.includes(b))
+        let sourceBundles = bundleToRemove.sourceBundles
+          .filter(b => bundlesInGroup.map(b => b.bundle).includes(b)) // bundleGraph.hasNode(b) is hacky. see if we can get rid of it?
           .map(id => nullthrows(bundleGraph.getNode(id)));
 
         for (let sourceBundle of sourceBundles) {
           invariant(sourceBundle !== 'root');
-          for (let asset of bundle.assets) {
+          for (let asset of bundleToRemove.assets) {
             sourceBundle.assets.add(asset);
             sourceBundle.size += asset.stats.size;
           }
         }
 
         // Remove the edge from this bundle group to the shared bundle.
-        bundleGraph.removeEdge(bundleGroupId, bundleId);
+        bundleGraph.removeEdge(bundleGroupId, bundleIdToRemove);
 
         // If there is now only a single bundle group that contains this bundle,
         // merge it into the remaining source bundles. If it is orphaned entirely, remove it.
         let incomingNodeCount =
-          bundleGraph.getNodeIdsConnectedTo(bundleId).length;
+          bundleGraph.getNodeIdsConnectedTo(bundleIdToRemove).length;
         if (incomingNodeCount === 1) {
-          removeBundle(bundleGraph, bundleId, assetReference);
+          removeBundle(bundleGraph, bundleIdToRemove, assetReference);
           for (let sharedBundleId of sharedToSourceBundleIds.keys()) {
-            if (sharedBundleId === bundleId) {
+            if (sharedBundleId === bundleIdToRemove) {
               sharedToSourceBundleIds.delete(sharedBundleId);
             }
           }
         } else if (incomingNodeCount === 0) {
-          bundleGraph.removeNode(bundleId);
+          bundleGraph.removeNode(bundleIdToRemove);
         }
       }
     }
@@ -957,7 +961,7 @@ async function loadBundlerConfig(
   options: PluginOptions,
 ): Promise<ResolvedBundlerConfig> {
   let conf = await config.getConfig<BundlerConfig>([], {
-    packageKey: '@parcel/bundler-experimental',
+    packageKey: '@parcel/bundler-default',
   });
   if (!conf) {
     return HTTP_OPTIONS['2'];
diff --git a/packages/core/integration-tests/test/cache.js b/packages/core/integration-tests/test/cache.js
index 4d033689e30..fb94ebb5f3d 100644
--- a/packages/core/integration-tests/test/cache.js
+++ b/packages/core/integration-tests/test/cache.js
@@ -4417,7 +4417,6 @@ describe('cache', function () {
                 JSON.stringify({
                   ...pkg,
                   '@parcel/bundler-default': undefined,
-                  '@parcel/bundler-experimental': undefined,
                 }),
               );
             },
@@ -4432,9 +4431,6 @@ describe('cache', function () {
                   '@parcel/bundler-default': {
                     maxParallelRequests: 0,
                   },
-                  '@parcel/bundler-experimental': {
-                    maxParallelRequests: 0,
-                  },
                 }),
               );
             },

From 8d942fc1d5505acd1b173b62d53b02dd4cb8b7a3 Mon Sep 17 00:00:00 2001
From: Gora Kong <gora.kong1@gmail.com>
Date: Fri, 24 Jun 2022 00:10:28 -0700
Subject: [PATCH 08/12] remove logs

---
 packages/bundlers/experimental/src/ExperimentalBundler.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/bundlers/experimental/src/ExperimentalBundler.js b/packages/bundlers/experimental/src/ExperimentalBundler.js
index ee8b72dd076..f054b78f39b 100644
--- a/packages/bundlers/experimental/src/ExperimentalBundler.js
+++ b/packages/bundlers/experimental/src/ExperimentalBundler.js
@@ -823,7 +823,7 @@ function createIdealGraph(
 
         // Add all assets in the shared bundle into the source bundles that are within this bundle group.
         let sourceBundles = bundleToRemove.sourceBundles
-          .filter(b => bundlesInGroup.map(b => b.bundle).includes(b)) // bundleGraph.hasNode(b) is hacky. see if we can get rid of it?
+          .filter(b => bundlesInGroup.map(b => b.bundle).includes(b))
           .map(id => nullthrows(bundleGraph.getNode(id)));
 
         for (let sourceBundle of sourceBundles) {

From 466e51b33bcebc6c2208d738495d7f4cea8b1733 Mon Sep 17 00:00:00 2001
From: Gora Kong <gora.kong1@gmail.com>
Date: Mon, 27 Jun 2022 11:13:28 -0700
Subject: [PATCH 09/12] change config to default in validateSchema

---
 packages/bundlers/experimental/src/ExperimentalBundler.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/bundlers/experimental/src/ExperimentalBundler.js b/packages/bundlers/experimental/src/ExperimentalBundler.js
index f054b78f39b..901344e3106 100644
--- a/packages/bundlers/experimental/src/ExperimentalBundler.js
+++ b/packages/bundlers/experimental/src/ExperimentalBundler.js
@@ -975,7 +975,7 @@ async function loadBundlerConfig(
       data: conf?.contents,
       source: await options.inputFS.readFile(conf.filePath, 'utf8'),
       filePath: conf.filePath,
-      prependKey: `/${encodeJSONKeyComponent('@parcel/bundler-experimental')}`,
+      prependKey: `/${encodeJSONKeyComponent('@parcel/bundler-default')}`,
     },
     '@parcel/bundler-experimental',
     'Invalid config for @parcel/bundler-experimental',

From 8abca3028245c783900ef1b6c47c3f0411603166 Mon Sep 17 00:00:00 2001
From: Gora Kong <gora.kong1@gmail.com>
Date: Tue, 5 Jul 2022 11:07:14 -0700
Subject: [PATCH 10/12] include all referenced bundles in bundleGroups

---
 .../experimental/src/ExperimentalBundler.js   | 53 +++++++++++--------
 1 file changed, 32 insertions(+), 21 deletions(-)

diff --git a/packages/bundlers/experimental/src/ExperimentalBundler.js b/packages/bundlers/experimental/src/ExperimentalBundler.js
index 920f8f3a5e1..efe52a30281 100644
--- a/packages/bundlers/experimental/src/ExperimentalBundler.js
+++ b/packages/bundlers/experimental/src/ExperimentalBundler.js
@@ -1002,6 +1002,17 @@ function createIdealGraph(
     }
   }
 
+  // Build a map of bundleGroups to bundles in the group -- this includes all referenced bundles.
+  let bundleGroups = bundleGraph.getNodeIdsConnectedFrom(rootNodeId);
+  let bundleGroupToBundles = new Map<NodeId, Set<NodeId>>();
+  for (let bundleGroupId of bundleGroups) {
+    let bundleIds = new Set();
+    bundleGraph.traverse(nodeId => {
+      bundleIds.add(nodeId);
+    }, bundleGroupId);
+    bundleGroupToBundles.set(bundleGroupId, bundleIds);
+  }
+
   // Step Remove Shared Bundles: Remove shared bundles from bundle groups that hit the parallel request limit.
   for (let [bundleId, bundleGroupId] of bundleRoots.values()) {
     // Only handle bundle group entries.
@@ -1009,22 +1020,18 @@ function createIdealGraph(
       continue;
     }
 
+    let bundleIdsInGroup = [
+      ...nullthrows(bundleGroupToBundles.get(bundleGroupId)),
+    ];
+
     // Find shared bundles in this bundle group.
-    let bundleIdsInGroup = [];
-    for (let [
-      sharedBundleId,
-      sourceBundleIds,
-    ] of sharedToSourceBundleIds.entries()) {
-      // If the bundle group's entry is a source bundle of this shared bundle,
-      // the shared bundle is part of the bundle group.
-      if (sourceBundleIds.includes(bundleId)) {
-        bundleIdsInGroup.push(sharedBundleId);
-      }
-    }
+    let sharedBundleIdsInGroup = bundleIdsInGroup.filter(id =>
+      [...sharedToSourceBundleIds.keys()].includes(id),
+    );
 
     if (bundleIdsInGroup.length > config.maxParallelRequests) {
       // Sort the bundles so the smallest ones are removed first.
-      let bundlesInGroup = bundleIdsInGroup
+      let sharedBundlesInGroup = sharedBundleIdsInGroup
         .map(id => ({
           id,
           bundle: nullthrows(bundleGraph.getNode(id)),
@@ -1039,27 +1046,31 @@ function createIdealGraph(
       // Remove bundles until the bundle group is within the parallel request limit.
       for (
         let i = 0;
-        i < bundlesInGroup.length - config.maxParallelRequests;
+        i < bundleIdsInGroup.length - config.maxParallelRequests;
         i++
       ) {
-        let bundleToRemove = bundlesInGroup[i].bundle;
-        let bundleIdToRemove = bundlesInGroup[i].id;
+        let bundleToRemove = sharedBundlesInGroup[i].bundle;
+        let bundleIdToRemove = sharedBundlesInGroup[i].id;
 
         // Add all assets in the shared bundle into the source bundles that are within this bundle group.
-        let sourceBundles = bundleToRemove.sourceBundles
-          .filter(b => bundlesInGroup.map(b => b.bundle).includes(b))
-          .map(id => nullthrows(bundleGraph.getNode(id)));
+        let sourceBundleIds = bundleToRemove.sourceBundles.filter(id =>
+          bundleIdsInGroup.includes(id),
+        );
 
-        for (let sourceBundle of sourceBundles) {
+        for (let sourceBundleId of sourceBundleIds) {
+          let sourceBundle = nullthrows(bundleGraph.getNode(sourceBundleId));
           invariant(sourceBundle !== 'root');
           for (let asset of bundleToRemove.assets) {
             sourceBundle.assets.add(asset);
             sourceBundle.size += asset.stats.size;
           }
+          bundleGraph.removeEdge(sourceBundleId, bundleIdToRemove);
         }
 
-        // Remove the edge from this bundle group to the shared bundle.
-        bundleGraph.removeEdge(bundleGroupId, bundleIdToRemove);
+        // Remove the direct edge from this bundle group to the shared bundle if it exists.
+        if (bundleGraph.hasEdge(bundleGroupId, bundleIdToRemove)) {
+          bundleGraph.removeEdge(bundleGroupId, bundleIdToRemove);
+        }
 
         // If there is now only a single bundle group that contains this bundle,
         // merge it into the remaining source bundles. If it is orphaned entirely, remove it.

From fdbe58ec9ace279aa0d138565d20320e8766306d Mon Sep 17 00:00:00 2001
From: Gora Kong <gora.kong1@gmail.com>
Date: Tue, 5 Jul 2022 15:11:36 -0700
Subject: [PATCH 11/12] update bundle.sourceBundle when removing shared bundle

---
 packages/bundlers/experimental/src/ExperimentalBundler.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/bundlers/experimental/src/ExperimentalBundler.js b/packages/bundlers/experimental/src/ExperimentalBundler.js
index efe52a30281..972281468e9 100644
--- a/packages/bundlers/experimental/src/ExperimentalBundler.js
+++ b/packages/bundlers/experimental/src/ExperimentalBundler.js
@@ -1064,6 +1064,13 @@ function createIdealGraph(
             sourceBundle.assets.add(asset);
             sourceBundle.size += asset.stats.size;
           }
+          sharedToSourceBundleIds.set(
+            bundleIdToRemove,
+            bundleToRemove.sourceBundles.filter(id => id !== sourceBundleId),
+          );
+          bundleToRemove.sourceBundles = bundleToRemove.sourceBundles.filter(
+            id => id !== sourceBundleId,
+          );
           bundleGraph.removeEdge(sourceBundleId, bundleIdToRemove);
         }
 

From a2e15fc79a5d7bc3ec5fc77bb448481a0a5fc256 Mon Sep 17 00:00:00 2001
From: Gora Kong <gora.kong1@gmail.com>
Date: Tue, 5 Jul 2022 15:59:04 -0700
Subject: [PATCH 12/12] match limit to num shared bundles in group

---
 packages/bundlers/experimental/src/ExperimentalBundler.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/bundlers/experimental/src/ExperimentalBundler.js b/packages/bundlers/experimental/src/ExperimentalBundler.js
index 972281468e9..f09b7898691 100644
--- a/packages/bundlers/experimental/src/ExperimentalBundler.js
+++ b/packages/bundlers/experimental/src/ExperimentalBundler.js
@@ -1029,7 +1029,7 @@ function createIdealGraph(
       [...sharedToSourceBundleIds.keys()].includes(id),
     );
 
-    if (bundleIdsInGroup.length > config.maxParallelRequests) {
+    if (sharedBundleIdsInGroup.length > config.maxParallelRequests) {
       // Sort the bundles so the smallest ones are removed first.
       let sharedBundlesInGroup = sharedBundleIdsInGroup
         .map(id => ({
@@ -1046,7 +1046,7 @@ function createIdealGraph(
       // Remove bundles until the bundle group is within the parallel request limit.
       for (
         let i = 0;
-        i < bundleIdsInGroup.length - config.maxParallelRequests;
+        i < sharedBundlesInGroup.length - config.maxParallelRequests;
         i++
       ) {
         let bundleToRemove = sharedBundlesInGroup[i].bundle;