@atlaspack/bundler-default 3.0.1 → 3.0.3

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @atlaspack/bundler-default
 
+## 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
+
+- [#613](https://github.com/atlassian-labs/atlaspack/pull/613) [`4ca19d8`](https://github.com/atlassian-labs/atlaspack/commit/4ca19d8060dfcd279183e4039f2ecb43334ac44c) Thanks [@marcins](https://github.com/marcins)! - Ensure that constant modules are correctly included in MSBs even if they wouldn't otherwise be.
+
+- Updated dependencies [[`73ea3c4`](https://github.com/atlassian-labs/atlaspack/commit/73ea3c4d85d4401fdd15abcbf988237e890e7ad3), [`b1b3693`](https://github.com/atlassian-labs/atlaspack/commit/b1b369317c66f8a431c170df2ebba4fa5b2e38ef)]:
+  - @atlaspack/feature-flags@2.17.0
+  - @atlaspack/graph@3.5.1
+  - @atlaspack/utils@2.14.11
+  - @atlaspack/plugin@2.14.11
+
 ## 3.0.1
 
 ### 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

@@ -161,17 +161,15 @@ function createIdealGraph(assetGraph, config, entries, logger) {
       assetGraph.traverse((node, _, actions) => {
         if (node.type === 'asset' && (!Array.isArray(c.types) || c.types.includes(node.value.type))) {
           let projectRelativePath = _path().default.relative(config.projectRoot, node.value.filePath);
-          if (!assetRegexes.some(regex => regex.test(projectRelativePath))) {
-            return;
-          }
 
           // We track all matching MSB's for constant modules as they are never duplicated
           // and need to be assigned to all matching bundles
           if (node.value.meta.isConstantModule === true) {
             constantModuleToMSB.get(node.value).push(c);
           }
-          manualAssetToConfig.set(node.value, c);
-          return;
+          if (assetRegexes.some(regex => regex.test(projectRelativePath))) {
+            manualAssetToConfig.set(node.value, c);
+          }
         }
         if (node.type === 'dependency' && (node.value.priority === 'lazy' || (0, _featureFlags().getFeatureFlag)('conditionalBundlingApi') && node.value.priority === 'conditional') && parentAsset) {
           // Don't walk past the bundle group assets

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/bundler-default",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "license": "(MIT OR Apache-2.0)",
   "type": "commonjs",
   "publishConfig": {
@@ -17,11 +17,11 @@
   },
   "dependencies": {
     "@atlaspack/diagnostic": "2.14.1",
-    "@atlaspack/feature-flags": "2.16.0",
-    "@atlaspack/graph": "3.5.0",
-    "@atlaspack/plugin": "2.14.10",
+    "@atlaspack/feature-flags": "2.18.0",
+    "@atlaspack/graph": "3.5.2",
+    "@atlaspack/plugin": "2.14.12",
     "@atlaspack/rust": "3.3.5",
-    "@atlaspack/utils": "2.14.10",
+    "@atlaspack/utils": "2.15.0",
     "nullthrows": "^1.1.1",
     "many-keys-map": "^1.0.3"
   }

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(),
     };
   });

package/src/idealGraph.js

@@ -204,17 +204,16 @@ export function createIdealGraph(
             config.projectRoot,
             node.value.filePath,
           );
-          if (!assetRegexes.some((regex) => regex.test(projectRelativePath))) {
-            return;
-          }
 
           // We track all matching MSB's for constant modules as they are never duplicated
           // and need to be assigned to all matching bundles
           if (node.value.meta.isConstantModule === true) {
             constantModuleToMSB.get(node.value).push(c);
           }
-          manualAssetToConfig.set(node.value, c);
-          return;
+
+          if (assetRegexes.some((regex) => regex.test(projectRelativePath))) {
+            manualAssetToConfig.set(node.value, c);
+          }
         }
 
         if (