@atlaspack/bundler-default 2.14.5-dev.73 → 2.14.5-dev.95

package/CHANGELOG.md

@@ -1,5 +1,37 @@
 # @atlaspack/bundler-default
 
+## 3.0.5
+
+### Patch Changes
+
+- Updated dependencies [[`644b157`](https://github.com/atlassian-labs/atlaspack/commit/644b157dee72a871acc2d0facf0b87b8eea51956)]:
+  - @atlaspack/feature-flags@2.18.2
+  - @atlaspack/graph@3.5.4
+  - @atlaspack/utils@2.15.2
+  - @atlaspack/plugin@2.14.14
+
+## 3.0.4
+
+### Patch Changes
+
+- Updated dependencies [[`26aa9c5`](https://github.com/atlassian-labs/atlaspack/commit/26aa9c599d2be45ce1438a74c5fa22f39b9b554b), [`0501255`](https://github.com/atlassian-labs/atlaspack/commit/05012550da35b05ce7d356a8cc29311e7f9afdca)]:
+  - @atlaspack/feature-flags@2.18.1
+  - @atlaspack/utils@2.15.1
+  - @atlaspack/graph@3.5.3
+  - @atlaspack/plugin@2.14.13
+
+## 3.0.3
+
+### Patch Changes
+
+- [#622](https://github.com/atlassian-labs/atlaspack/pull/622) [`e39c6cf`](https://github.com/atlassian-labs/atlaspack/commit/e39c6cf05f7e95ce5420dbcea66f401b1cbd397c) Thanks [@benjervis](https://github.com/benjervis)! - Change the overlap calculation system in findMergeCandidates to improve performance
+
+- Updated dependencies [[`10fbcfb`](https://github.com/atlassian-labs/atlaspack/commit/10fbcfbfa49c7a83da5d7c40983e36e87f524a75), [`85c52d3`](https://github.com/atlassian-labs/atlaspack/commit/85c52d3f7717b3c84a118d18ab98cfbfd71dcbd2), [`e39c6cf`](https://github.com/atlassian-labs/atlaspack/commit/e39c6cf05f7e95ce5420dbcea66f401b1cbd397c)]:
+  - @atlaspack/feature-flags@2.18.0
+  - @atlaspack/utils@2.15.0
+  - @atlaspack/graph@3.5.2
+  - @atlaspack/plugin@2.14.12
+
 ## 3.0.2
 
 ### Patch Changes

package/lib/bundleMerge.js

@@ -25,6 +25,13 @@ function _graph() {
   };
   return data;
 }
+function _utils() {
+  const data = require("@atlaspack/utils");
+  _utils = function () {
+    return data;
+  };
+  return data;
+}
 var _memoize = require("./memoize");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function getBundlesForBundleGroup(bundleGraph, bundleGroupId) {
@@ -37,16 +44,16 @@ function getBundlesForBundleGroup(bundleGraph, bundleGroupId) {
   }, bundleGroupId);
   return count;
 }
-let getBundleOverlapBitSet = (sourceBundlesA, sourceBundlesB) => {
-  let allSourceBundles = _graph().BitSet.union(sourceBundlesA, sourceBundlesB);
-  let sharedSourceBundles = _graph().BitSet.intersect(sourceBundlesA, sourceBundlesB);
-  return sharedSourceBundles.size() / allSourceBundles.size();
+let getBundleOverlap = (sourceBundlesA, sourceBundlesB) => {
+  let allSourceBundles = (0, _utils().setUnion)(sourceBundlesA, sourceBundlesB);
+  let sharedSourceBundles = (0, _utils().setIntersectStatic)(sourceBundlesA, sourceBundlesB);
+  return sharedSourceBundles.size / allSourceBundles.size;
 };
 
 // Returns a decimal showing the proportion source bundles are common to
 // both bundles versus the total number of source bundles.
 function checkBundleThreshold(bundleA, bundleB, threshold) {
-  return getBundleOverlapBitSet(bundleA.sourceBundleBitSet, bundleB.sourceBundleBitSet) >= threshold;
+  return getBundleOverlap(bundleA.bundle.sourceBundles, bundleB.bundle.sourceBundles) >= threshold;
 }
 let checkSharedSourceBundles = (0, _memoize.memoize)((bundle, importantAncestorBundles) => {
   return importantAncestorBundles.every(ancestorId => bundle.sourceBundles.has(ancestorId));
@@ -100,14 +107,9 @@ function getPossibleMergeCandidates(bundleGraph, bundles) {
   let mergeCandidates = bundles.map(bundleId => {
     let bundle = bundleGraph.getNode(bundleId);
     (0, _assert().default)(bundle && bundle !== 'root', 'Bundle should exist');
-    let sourceBundleBitSet = new (_graph().BitSet)(bundleGraph.nodes.length);
-    for (let sourceBundle of bundle.sourceBundles) {
-      sourceBundleBitSet.add(sourceBundle);
-    }
     return {
       id: bundleId,
       bundle,
-      sourceBundleBitSet,
       contentKey: bundleId.toString()
     };
   });

package/lib/idealGraph.js

@@ -109,15 +109,7 @@ function createIdealGraph(assetGraph, config, entries, logger) {
   }
   let assets = [];
   let assetToIndex = new Map();
-  //Manual is a map of the user-given name to the bundle node Id that corresponds to ALL the assets that match any glob in that user-specified array
-  let manualSharedMap = new Map();
-  // May need a map to be able to look up NON- bundle root assets which need special case instructions
-  // Use this when placing assets into bundles, to avoid duplication
-  let manualAssetToBundle = new Map();
-  let {
-    manualAssetToConfig,
-    constantModuleToMSB
-  } = function makeManualAssetToConfigLookup() {
+  function makeManualAssetToConfigLookup() {
     let manualAssetToConfig = new Map();
     let constantModuleToMSB = new (_utils().DefaultMap)(() => []);
     if (config.manualSharedBundles.length === 0) {
@@ -181,7 +173,17 @@ function createIdealGraph(assetGraph, config, entries, logger) {
       manualAssetToConfig,
       constantModuleToMSB
     };
-  }();
+  }
+
+  //Manual is a map of the user-given name to the bundle node Id that corresponds to ALL the assets that match any glob in that user-specified array
+  let manualSharedMap = new Map();
+  // May need a map to be able to look up NON- bundle root assets which need special case instructions
+  // Use this when placing assets into bundles, to avoid duplication
+  let manualAssetToBundle = new Map();
+  let {
+    manualAssetToConfig,
+    constantModuleToMSB
+  } = makeManualAssetToConfigLookup();
   let manualBundleToInternalizedAsset = new (_utils().DefaultMap)(() => []);
   let mergeSourceBundleLookup = new Map();
   let mergeSourceBundleAssets = new Set((_config$sharedBundleM = config.sharedBundleMerge) === null || _config$sharedBundleM === void 0 ? void 0 : _config$sharedBundleM.flatMap(c => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/bundler-default",
-  "version": "2.14.5-dev.73+84eec3484",
+  "version": "2.14.5-dev.95+d8e35a83e",
   "license": "(MIT OR Apache-2.0)",
   "type": "commonjs",
   "publishConfig": {
@@ -16,14 +16,14 @@
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.1-dev.141+84eec3484",
-    "@atlaspack/feature-flags": "2.14.1-dev.141+84eec3484",
-    "@atlaspack/graph": "3.4.1-dev.141+84eec3484",
-    "@atlaspack/plugin": "2.14.5-dev.73+84eec3484",
-    "@atlaspack/rust": "3.2.1-dev.73+84eec3484",
-    "@atlaspack/utils": "2.14.5-dev.73+84eec3484",
+    "@atlaspack/diagnostic": "2.14.1-dev.163+d8e35a83e",
+    "@atlaspack/feature-flags": "2.14.1-dev.163+d8e35a83e",
+    "@atlaspack/graph": "3.4.1-dev.163+d8e35a83e",
+    "@atlaspack/plugin": "2.14.5-dev.95+d8e35a83e",
+    "@atlaspack/rust": "3.2.1-dev.95+d8e35a83e",
+    "@atlaspack/utils": "2.14.5-dev.95+d8e35a83e",
     "many-keys-map": "^1.0.3",
     "nullthrows": "^1.1.1"
   },
-  "gitHead": "84eec348413c647de4872f902c4bc8ff54c347f3"
+  "gitHead": "d8e35a83e480e0811b63a319e88ffe9a2cd509e6"
 }

package/src/bundleMerge.js

@@ -2,8 +2,9 @@
 
 import invariant from 'assert';
 import nullthrows from 'nullthrows';
-import {ContentGraph, BitSet} from '@atlaspack/graph';
+import {ContentGraph} from '@atlaspack/graph';
 import type {NodeId} from '@atlaspack/graph';
+import {setUnion, setIntersectStatic} from '@atlaspack/utils';
 import type {Bundle, IdealBundleGraph} from './idealGraph';
 import {memoize, clearCaches} from './memoize';
 
@@ -20,14 +21,14 @@ function getBundlesForBundleGroup(
   return count;
 }
 
-let getBundleOverlapBitSet = (
-  sourceBundlesA: BitSet,
-  sourceBundlesB: BitSet,
+let getBundleOverlap = (
+  sourceBundlesA: Set<NodeId>,
+  sourceBundlesB: Set<NodeId>,
 ): number => {
-  let allSourceBundles = BitSet.union(sourceBundlesA, sourceBundlesB);
-  let sharedSourceBundles = BitSet.intersect(sourceBundlesA, sourceBundlesB);
+  let allSourceBundles = setUnion(sourceBundlesA, sourceBundlesB);
+  let sharedSourceBundles = setIntersectStatic(sourceBundlesA, sourceBundlesB);
 
-  return sharedSourceBundles.size() / allSourceBundles.size();
+  return sharedSourceBundles.size / allSourceBundles.size;
 };
 
 // Returns a decimal showing the proportion source bundles are common to
@@ -38,9 +39,9 @@ function checkBundleThreshold(
   threshold: number,
 ): boolean {
   return (
-    getBundleOverlapBitSet(
-      bundleA.sourceBundleBitSet,
-      bundleB.sourceBundleBitSet,
+    getBundleOverlap(
+      bundleA.bundle.sourceBundles,
+      bundleB.bundle.sourceBundles,
     ) >= threshold
   );
 }
@@ -147,7 +148,6 @@ function getMergeClusters(
 type MergeCandidate = {|
   bundle: Bundle,
   id: NodeId,
-  sourceBundleBitSet: BitSet,
   contentKey: string,
 |};
 function getPossibleMergeCandidates(
@@ -158,15 +158,9 @@ function getPossibleMergeCandidates(
     let bundle = bundleGraph.getNode(bundleId);
     invariant(bundle && bundle !== 'root', 'Bundle should exist');
 
-    let sourceBundleBitSet = new BitSet(bundleGraph.nodes.length);
-    for (let sourceBundle of bundle.sourceBundles) {
-      sourceBundleBitSet.add(sourceBundle);
-    }
-
     return {
       id: bundleId,
       bundle,
-      sourceBundleBitSet,
       contentKey: bundleId.toString(),
     };
   });