@atlaspack/bundler-default 2.14.4 → 2.14.5-canary.10

package/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright (c) 2024 Atlassian US., Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/lib/bundleMerge.js

@@ -0,0 +1,91 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.findMergeCandidates = findMergeCandidates;
+function _assert() {
+  const data = _interopRequireDefault(require("assert"));
+  _assert = function () {
+    return data;
+  };
+  return data;
+}
+function _nullthrows() {
+  const data = _interopRequireDefault(require("nullthrows"));
+  _nullthrows = function () {
+    return data;
+  };
+  return data;
+}
+function _graph() {
+  const data = require("@atlaspack/graph");
+  _graph = function () {
+    return data;
+  };
+  return data;
+}
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+// Returns a decimal showing the proportion source bundles are common to
+// both bundles versus the total number of source bundles.
+function scoreBundleMerge(bundleA, bundleB) {
+  let sharedSourceBundles = 0;
+  let allSourceBundles = new Set([...bundleA.sourceBundles, ...bundleB.sourceBundles]);
+  for (let bundle of bundleB.sourceBundles) {
+    if (bundleA.sourceBundles.has(bundle)) {
+      sharedSourceBundles++;
+    }
+  }
+  return sharedSourceBundles / allSourceBundles.size;
+}
+function getMergeClusters(graph, candidates) {
+  let clusters = [];
+  for (let candidate of candidates) {
+    let cluster = [];
+    graph.traverse(nodeId => {
+      cluster.push((0, _nullthrows().default)(graph.getNode(nodeId)));
+      // Remove node from candidates as it has already been processed
+      candidates.delete(nodeId);
+    }, candidate);
+    clusters.push(cluster);
+  }
+  return clusters;
+}
+function findMergeCandidates(bundleGraph, bundles, threshold) {
+  let graph = new (_graph().ContentGraph)();
+  let seen = new Set();
+  let candidates = new Set();
+
+  // Build graph of clustered merge candidates
+  for (let bundleId of bundles) {
+    let bundle = bundleGraph.getNode(bundleId);
+    (0, _assert().default)(bundle && bundle !== 'root');
+    if (bundle.type !== 'js') {
+      continue;
+    }
+    for (let otherBundleId of bundles) {
+      if (bundleId === otherBundleId) {
+        continue;
+      }
+      let key = [bundleId, otherBundleId].sort().join(':');
+      if (seen.has(key)) {
+        continue;
+      }
+      seen.add(key);
+      let otherBundle = bundleGraph.getNode(otherBundleId);
+      (0, _assert().default)(otherBundle && otherBundle !== 'root');
+      let score = scoreBundleMerge(bundle, otherBundle);
+      if (score >= threshold) {
+        let bundleNode = graph.addNodeByContentKeyIfNeeded(bundleId.toString(), bundleId);
+        let otherBundleNode = graph.addNodeByContentKeyIfNeeded(otherBundleId.toString(), otherBundleId);
+
+        // Add edge in both directions
+        graph.addEdge(bundleNode, otherBundleNode);
+        graph.addEdge(otherBundleNode, bundleNode);
+        candidates.add(bundleNode);
+        candidates.add(otherBundleNode);
+      }
+    }
+  }
+  return getMergeClusters(graph, candidates);
+}

package/lib/bundlerConfig.js

@@ -53,14 +53,16 @@ const HTTP_OPTIONS = {
     manualSharedBundles: [],
     minBundleSize: 30000,
     maxParallelRequests: 6,
-    disableSharedBundles: false
+    disableSharedBundles: false,
+    sharedBundleMergeThreshold: 1
   },
   '2': {
     minBundles: 1,
     manualSharedBundles: [],
     minBundleSize: 20000,
     maxParallelRequests: 25,
-    disableSharedBundles: false
+    disableSharedBundles: false,
+    sharedBundleMergeThreshold: 1
   }
 };
 const CONFIG_SCHEMA = {
@@ -115,6 +117,9 @@ const CONFIG_SCHEMA = {
     },
     loadConditionalBundlesInParallel: {
       type: 'boolean'
+    },
+    sharedBundleMergeThreshold: {
+      type: 'number'
     }
   },
   additionalProperties: false
@@ -172,6 +177,7 @@ async function loadBundlerConfig(config, options, logger) {
   return {
     minBundles: modeConfig.minBundles ?? defaults.minBundles,
     minBundleSize: modeConfig.minBundleSize ?? defaults.minBundleSize,
+    sharedBundleMergeThreshold: modeConfig.sharedBundleMergeThreshold ?? defaults.sharedBundleMergeThreshold,
     maxParallelRequests: modeConfig.maxParallelRequests ?? defaults.maxParallelRequests,
     projectRoot: options.projectRoot,
     disableSharedBundles: modeConfig.disableSharedBundles ?? defaults.disableSharedBundles,

package/lib/idealGraph.js

@@ -47,6 +47,7 @@ function _nullthrows() {
   };
   return data;
 }
+var _bundleMerge = require("./bundleMerge");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /* BundleRoot - An asset that is the main entry of a Bundle. */
 const dependencyPriorityEdges = {
@@ -848,6 +849,12 @@ function createIdealGraph(assetGraph, config, entries, logger) {
     }
   }
 
+  // Step merge shared bundles that meet the overlap threshold
+  // This step is skipped by default as the threshold defaults to 1
+  if (config.sharedBundleMergeThreshold < 1) {
+    mergeOverlapBundles();
+  }
+
   // Step Merge Share Bundles: Merge any shared bundles under the minimum bundle size back into
   // their source bundles, and remove the bundle.
   // We should include "bundle reuse" as shared bundles that may be removed but the bundle itself would have to be retained
@@ -857,9 +864,9 @@ function createIdealGraph(assetGraph, config, entries, logger) {
       removeBundle(bundleGraph, bundleNodeId, assetReference);
     }
   }
-  let modifiedSourceBundles = new Set();
 
   // Step Remove Shared Bundles: Remove shared bundles from bundle groups that hit the parallel request limit.
+  let modifiedSourceBundles = new Set();
   if (config.disableSharedBundles === false) {
     for (let bundleGroupId of bundleGraph.getNodeIdsConnectedFrom(rootNodeId)) {
       // Find shared bundles in this bundle group.
@@ -944,6 +951,61 @@ function createIdealGraph(assetGraph, config, entries, logger) {
       }
     }
   }
+  function mergeBundles(bundleGraph, bundleToKeepId, bundleToRemoveId, assetReference) {
+    let bundleToKeep = (0, _nullthrows().default)(bundleGraph.getNode(bundleToKeepId));
+    let bundleToRemove = (0, _nullthrows().default)(bundleGraph.getNode(bundleToRemoveId));
+    (0, _assert().default)(bundleToKeep !== 'root' && bundleToRemove !== 'root');
+    for (let asset of bundleToRemove.assets) {
+      bundleToKeep.assets.add(asset);
+      bundleToKeep.size += asset.stats.size;
+      let newAssetReference = assetReference.get(asset).map(([dep, bundle]) => bundle === bundleToRemove ? [dep, bundleToKeep] : [dep, bundle]);
+      assetReference.set(asset, newAssetReference);
+    }
+    for (let sourceBundleId of bundleToRemove.sourceBundles) {
+      if (bundleToKeep.sourceBundles.has(sourceBundleId)) {
+        continue;
+      }
+      bundleToKeep.sourceBundles.add(sourceBundleId);
+      bundleGraph.addEdge(sourceBundleId, bundleToKeepId);
+    }
+
+    // Merge any internalized assets
+    if (bundleToRemove.internalizedAssets) {
+      if (bundleToKeep.internalizedAssets) {
+        bundleToKeep.internalizedAssets.union(bundleToRemove.internalizedAssets);
+      } else {
+        bundleToKeep.internalizedAssets = bundleToRemove.internalizedAssets;
+      }
+    }
+    bundleGraph.removeNode(bundleToRemoveId);
+  }
+  function mergeOverlapBundles() {
+    // Find all shared bundles
+    let sharedBundles = new Set();
+    bundleGraph.traverse(nodeId => {
+      let bundle = bundleGraph.getNode(nodeId);
+      if (!bundle) {
+        throw new Error(`Unable to find bundle ${nodeId} in bundle graph`);
+      }
+      if (bundle === 'root') {
+        return;
+      }
+
+      // Only consider JS shared bundles and non-reused bundles.
+      // These count potentially be considered for merging in future but they're
+      // more complicated to merge
+      if (bundle.sourceBundles.size > 0 && bundle.manualSharedBundle == null && !bundle.mainEntryAsset && bundle.type === 'js') {
+        sharedBundles.add(nodeId);
+      }
+    });
+    let clusters = (0, _bundleMerge.findMergeCandidates)(bundleGraph, Array.from(sharedBundles), config.sharedBundleMergeThreshold);
+    for (let cluster of clusters) {
+      let [mergeTarget, ...rest] = cluster;
+      for (let bundleIdToMerge of rest) {
+        mergeBundles(bundleGraph, mergeTarget, bundleIdToMerge, assetReference);
+      }
+    }
+  }
   function getBigIntFromContentKey(contentKey) {
     let b = Buffer.alloc(64);
     b.write(contentKey);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/bundler-default",
-  "version": "2.14.4",
+  "version": "2.14.5-canary.10+e28fbeb3a",
   "license": "(MIT OR Apache-2.0)",
   "type": "commonjs",
   "publishConfig": {
@@ -16,12 +16,13 @@
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.1",
-    "@atlaspack/feature-flags": "2.14.2",
-    "@atlaspack/graph": "3.4.2",
-    "@atlaspack/plugin": "2.14.4",
-    "@atlaspack/rust": "3.2.0",
-    "@atlaspack/utils": "2.14.4",
+    "@atlaspack/diagnostic": "2.14.1-canary.78+e28fbeb3a",
+    "@atlaspack/feature-flags": "2.14.1-canary.78+e28fbeb3a",
+    "@atlaspack/graph": "3.4.1-canary.78+e28fbeb3a",
+    "@atlaspack/plugin": "2.14.5-canary.10+e28fbeb3a",
+    "@atlaspack/rust": "3.2.1-canary.10+e28fbeb3a",
+    "@atlaspack/utils": "2.14.5-canary.10+e28fbeb3a",
     "nullthrows": "^1.1.1"
-  }
+  },
+  "gitHead": "e28fbeb3a609aad3e44af9b8d3d5fd83dda38941"
 }

package/src/bundleMerge.js

@@ -0,0 +1,103 @@
+// @flow strict-local
+
+import invariant from 'assert';
+import nullthrows from 'nullthrows';
+import type {NodeId} from '@atlaspack/graph';
+import type {Bundle, IdealBundleGraph} from './idealGraph';
+import {ContentGraph} from '@atlaspack/graph';
+
+// Returns a decimal showing the proportion source bundles are common to
+// both bundles versus the total number of source bundles.
+function scoreBundleMerge(bundleA: Bundle, bundleB: Bundle): number {
+  let sharedSourceBundles = 0;
+  let allSourceBundles = new Set([
+    ...bundleA.sourceBundles,
+    ...bundleB.sourceBundles,
+  ]);
+
+  for (let bundle of bundleB.sourceBundles) {
+    if (bundleA.sourceBundles.has(bundle)) {
+      sharedSourceBundles++;
+    }
+  }
+
+  return sharedSourceBundles / allSourceBundles.size;
+}
+
+function getMergeClusters(
+  graph: ContentGraph<NodeId>,
+  candidates: Set<NodeId>,
+): Array<Array<NodeId>> {
+  let clusters = [];
+
+  for (let candidate of candidates) {
+    let cluster: Array<NodeId> = [];
+
+    graph.traverse((nodeId) => {
+      cluster.push(nullthrows(graph.getNode(nodeId)));
+      // Remove node from candidates as it has already been processed
+      candidates.delete(nodeId);
+    }, candidate);
+
+    clusters.push(cluster);
+  }
+
+  return clusters;
+}
+
+export function findMergeCandidates(
+  bundleGraph: IdealBundleGraph,
+  bundles: Array<NodeId>,
+  threshold: number,
+): Array<Array<NodeId>> {
+  let graph = new ContentGraph<NodeId>();
+  let seen = new Set<string>();
+  let candidates = new Set<NodeId>();
+
+  // Build graph of clustered merge candidates
+  for (let bundleId of bundles) {
+    let bundle = bundleGraph.getNode(bundleId);
+    invariant(bundle && bundle !== 'root');
+    if (bundle.type !== 'js') {
+      continue;
+    }
+
+    for (let otherBundleId of bundles) {
+      if (bundleId === otherBundleId) {
+        continue;
+      }
+
+      let key = [bundleId, otherBundleId].sort().join(':');
+
+      if (seen.has(key)) {
+        continue;
+      }
+      seen.add(key);
+
+      let otherBundle = bundleGraph.getNode(otherBundleId);
+      invariant(otherBundle && otherBundle !== 'root');
+
+      let score = scoreBundleMerge(bundle, otherBundle);
+
+      if (score >= threshold) {
+        let bundleNode = graph.addNodeByContentKeyIfNeeded(
+          bundleId.toString(),
+          bundleId,
+        );
+        let otherBundleNode = graph.addNodeByContentKeyIfNeeded(
+          otherBundleId.toString(),
+          otherBundleId,
+        );
+
+        // Add edge in both directions
+        graph.addEdge(bundleNode, otherBundleNode);
+        graph.addEdge(otherBundleNode, bundleNode);
+
+        candidates.add(bundleNode);
+        candidates.add(otherBundleNode);
+      }
+    }
+  }
+
+  return getMergeClusters(graph, candidates);
+}

package/src/bundlerConfig.js

@@ -28,6 +28,7 @@ type BaseBundlerConfig = {|
   disableSharedBundles?: boolean,
   manualSharedBundles?: ManualSharedBundles,
   loadConditionalBundlesInParallel?: boolean,
+  sharedBundleMergeThreshold?: number,
 |};
 
 type BundlerConfig = {|
@@ -42,6 +43,7 @@ export type ResolvedBundlerConfig = {|
   disableSharedBundles: boolean,
   manualSharedBundles: ManualSharedBundles,
   loadConditionalBundlesInParallel?: boolean,
+  sharedBundleMergeThreshold: number,
 |};
 
 function resolveModeConfig(
@@ -76,6 +78,7 @@ const HTTP_OPTIONS = {
     minBundleSize: 30000,
     maxParallelRequests: 6,
     disableSharedBundles: false,
+    sharedBundleMergeThreshold: 1,
   },
   '2': {
     minBundles: 1,
@@ -83,6 +86,7 @@ const HTTP_OPTIONS = {
     minBundleSize: 20000,
     maxParallelRequests: 25,
     disableSharedBundles: false,
+    sharedBundleMergeThreshold: 1,
   },
 };
 
@@ -139,6 +143,9 @@ const CONFIG_SCHEMA: SchemaEntity = {
     loadConditionalBundlesInParallel: {
       type: 'boolean',
     },
+    sharedBundleMergeThreshold: {
+      type: 'number',
+    },
   },
   additionalProperties: false,
 };
@@ -224,6 +231,9 @@ export async function loadBundlerConfig(
   return {
     minBundles: modeConfig.minBundles ?? defaults.minBundles,
     minBundleSize: modeConfig.minBundleSize ?? defaults.minBundleSize,
+    sharedBundleMergeThreshold:
+      modeConfig.sharedBundleMergeThreshold ??
+      defaults.sharedBundleMergeThreshold,
     maxParallelRequests:
       modeConfig.maxParallelRequests ?? defaults.maxParallelRequests,
     projectRoot: options.projectRoot,

package/src/idealGraph.js

@@ -23,6 +23,7 @@ import {DefaultMap, globToRegex} from '@atlaspack/utils';
 import invariant from 'assert';
 import nullthrows from 'nullthrows';
 
+import {findMergeCandidates} from './bundleMerge';
 import type {ResolvedBundlerConfig} from './bundlerConfig';
 
 /* BundleRoot - An asset that is the main entry of a Bundle. */
@@ -67,7 +68,7 @@ export const idealBundleGraphEdges = Object.freeze({
   conditional: 2,
 });
 
-type IdealBundleGraph = Graph<
+export type IdealBundleGraph = Graph<
   Bundle | 'root',
   $Values<typeof idealBundleGraphEdges>,
 >;
@@ -1128,6 +1129,12 @@ export function createIdealGraph(
     }
   }
 
+  // Step merge shared bundles that meet the overlap threshold
+  // This step is skipped by default as the threshold defaults to 1
+  if (config.sharedBundleMergeThreshold < 1) {
+    mergeOverlapBundles();
+  }
+
   // Step Merge Share Bundles: Merge any shared bundles under the minimum bundle size back into
   // their source bundles, and remove the bundle.
   // We should include "bundle reuse" as shared bundles that may be removed but the bundle itself would have to be retained
@@ -1143,9 +1150,9 @@ export function createIdealGraph(
     }
   }
 
+  // Step Remove Shared Bundles: Remove shared bundles from bundle groups that hit the parallel request limit.
   let modifiedSourceBundles = new Set();
 
-  // Step Remove Shared Bundles: Remove shared bundles from bundle groups that hit the parallel request limit.
   if (config.disableSharedBundles === false) {
     for (let bundleGroupId of bundleGraph.getNodeIdsConnectedFrom(rootNodeId)) {
       // Find shared bundles in this bundle group.
@@ -1249,6 +1256,93 @@ export function createIdealGraph(
     }
   }
 
+  function mergeBundles(
+    bundleGraph: IdealBundleGraph,
+    bundleToKeepId: NodeId,
+    bundleToRemoveId: NodeId,
+    assetReference: DefaultMap<Asset, Array<[Dependency, Bundle]>>,
+  ) {
+    let bundleToKeep = nullthrows(bundleGraph.getNode(bundleToKeepId));
+    let bundleToRemove = nullthrows(bundleGraph.getNode(bundleToRemoveId));
+    invariant(bundleToKeep !== 'root' && bundleToRemove !== 'root');
+    for (let asset of bundleToRemove.assets) {
+      bundleToKeep.assets.add(asset);
+      bundleToKeep.size += asset.stats.size;
+
+      let newAssetReference = assetReference
+        .get(asset)
+        .map(([dep, bundle]) =>
+          bundle === bundleToRemove ? [dep, bundleToKeep] : [dep, bundle],
+        );
+
+      assetReference.set(asset, newAssetReference);
+    }
+
+    for (let sourceBundleId of bundleToRemove.sourceBundles) {
+      if (bundleToKeep.sourceBundles.has(sourceBundleId)) {
+        continue;
+      }
+
+      bundleToKeep.sourceBundles.add(sourceBundleId);
+      bundleGraph.addEdge(sourceBundleId, bundleToKeepId);
+    }
+
+    // Merge any internalized assets
+    if (bundleToRemove.internalizedAssets) {
+      if (bundleToKeep.internalizedAssets) {
+        bundleToKeep.internalizedAssets.union(
+          bundleToRemove.internalizedAssets,
+        );
+      } else {
+        bundleToKeep.internalizedAssets = bundleToRemove.internalizedAssets;
+      }
+    }
+
+    bundleGraph.removeNode(bundleToRemoveId);
+  }
+
+  function mergeOverlapBundles() {
+    // Find all shared bundles
+    let sharedBundles = new Set<NodeId>();
+    bundleGraph.traverse((nodeId) => {
+      let bundle = bundleGraph.getNode(nodeId);
+
+      if (!bundle) {
+        throw new Error(`Unable to find bundle ${nodeId} in bundle graph`);
+      }
+
+      if (bundle === 'root') {
+        return;
+      }
+
+      // Only consider JS shared bundles and non-reused bundles.
+      // These count potentially be considered for merging in future but they're
+      // more complicated to merge
+      if (
+        bundle.sourceBundles.size > 0 &&
+        bundle.manualSharedBundle == null &&
+        !bundle.mainEntryAsset &&
+        bundle.type === 'js'
+      ) {
+        sharedBundles.add(nodeId);
+      }
+    });
+
+    let clusters = findMergeCandidates(
+      bundleGraph,
+      Array.from(sharedBundles),
+      config.sharedBundleMergeThreshold,
+    );
+
+    for (let cluster of clusters) {
+      let [mergeTarget, ...rest] = cluster;
+
+      for (let bundleIdToMerge of rest) {
+        mergeBundles(bundleGraph, mergeTarget, bundleIdToMerge, assetReference);
+      }
+    }
+  }
+
   function getBigIntFromContentKey(contentKey) {
     let b = Buffer.alloc(64);
     b.write(contentKey);