@atlaspack/core 2.16.2-canary.31 → 2.16.2-canary.33

package/lib/public/BundleGraph.js

@@ -32,6 +32,13 @@ var _Dependency = _interopRequireWildcard(require("./Dependency"));
 var _Target = require("./Target");
 var _utils = require("../utils");
 var _BundleGroup = _interopRequireWildcard(require("./BundleGroup"));
+function _featureFlags() {
+  const data = require("@atlaspack/feature-flags");
+  _featureFlags = function () {
+    return data;
+  };
+  return data;
+}
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -263,11 +270,20 @@ class BundleGraph {
       }
       for (let bundle of bundles) {
         const conditions = bundleConditions.get(bundle.id) ?? new Map();
-        conditions.set(cond.key, {
-          bundle,
-          ifTrueBundles,
-          ifFalseBundles
-        });
+        const currentCondition = conditions.get(cond.key);
+        if ((0, _featureFlags().getFeatureFlag)('conditionalBundlingReporterSameConditionFix')) {
+          conditions.set(cond.key, {
+            bundle,
+            ifTrueBundles: [...((currentCondition === null || currentCondition === void 0 ? void 0 : currentCondition.ifTrueBundles) ?? []), ...ifTrueBundles],
+            ifFalseBundles: [...((currentCondition === null || currentCondition === void 0 ? void 0 : currentCondition.ifFalseBundles) ?? []), ...ifFalseBundles]
+          });
+        } else {
+          conditions.set(cond.key, {
+            bundle,
+            ifTrueBundles,
+            ifFalseBundles
+          });
+        }
         bundleConditions.set(bundle.id, conditions);
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/core",
-  "version": "2.16.2-canary.31+e05252108",
+  "version": "2.16.2-canary.33+209692ffb",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -21,21 +21,21 @@
     "check-ts": "tsc --noEmit index.d.ts"
   },
   "dependencies": {
-    "@atlaspack/build-cache": "2.13.3-canary.99+e05252108",
-    "@atlaspack/cache": "3.1.1-canary.31+e05252108",
-    "@atlaspack/diagnostic": "2.14.1-canary.99+e05252108",
-    "@atlaspack/events": "2.14.1-canary.99+e05252108",
-    "@atlaspack/feature-flags": "2.14.1-canary.99+e05252108",
-    "@atlaspack/fs": "2.14.5-canary.31+e05252108",
-    "@atlaspack/graph": "3.4.1-canary.99+e05252108",
-    "@atlaspack/logger": "2.14.5-canary.31+e05252108",
-    "@atlaspack/package-manager": "2.14.5-canary.31+e05252108",
-    "@atlaspack/plugin": "2.14.5-canary.31+e05252108",
-    "@atlaspack/profiler": "2.14.1-canary.99+e05252108",
-    "@atlaspack/rust": "3.2.1-canary.31+e05252108",
-    "@atlaspack/types": "2.14.5-canary.31+e05252108",
-    "@atlaspack/utils": "2.14.5-canary.31+e05252108",
-    "@atlaspack/workers": "2.14.5-canary.31+e05252108",
+    "@atlaspack/build-cache": "2.13.3-canary.101+209692ffb",
+    "@atlaspack/cache": "3.1.1-canary.33+209692ffb",
+    "@atlaspack/diagnostic": "2.14.1-canary.101+209692ffb",
+    "@atlaspack/events": "2.14.1-canary.101+209692ffb",
+    "@atlaspack/feature-flags": "2.14.1-canary.101+209692ffb",
+    "@atlaspack/fs": "2.14.5-canary.33+209692ffb",
+    "@atlaspack/graph": "3.4.1-canary.101+209692ffb",
+    "@atlaspack/logger": "2.14.5-canary.33+209692ffb",
+    "@atlaspack/package-manager": "2.14.5-canary.33+209692ffb",
+    "@atlaspack/plugin": "2.14.5-canary.33+209692ffb",
+    "@atlaspack/profiler": "2.14.1-canary.101+209692ffb",
+    "@atlaspack/rust": "3.2.1-canary.33+209692ffb",
+    "@atlaspack/types": "2.14.5-canary.33+209692ffb",
+    "@atlaspack/utils": "2.14.5-canary.33+209692ffb",
+    "@atlaspack/workers": "2.14.5-canary.33+209692ffb",
     "@mischnic/json-sourcemap": "^0.1.0",
     "@parcel/source-map": "^2.1.1",
     "base-x": "^3.0.8",
@@ -71,5 +71,5 @@
     "./src/serializerCore.js": "./src/serializerCore.browser.js"
   },
   "type": "commonjs",
-  "gitHead": "e0525210850ed1606146eb86991049cf567c5dec"
+  "gitHead": "209692ffb11eae103a0d65c5e1118a5aa1625818"
 }

package/src/public/BundleGraph.js

@@ -31,6 +31,7 @@ import Dependency, {
 import {targetToInternalTarget} from './Target';
 import {fromInternalSourceLocation} from '../utils';
 import BundleGroup, {bundleGroupToInternalBundleGroup} from './BundleGroup';
+import {getFeatureFlag} from '@atlaspack/feature-flags';
 
 // Friendly access for other modules within this package that need access
 // to the internal bundle.
@@ -489,11 +490,27 @@ export default class BundleGraph<TBundle: IBundle>
       for (let bundle of bundles) {
         const conditions = bundleConditions.get(bundle.id) ?? new Map();
 
-        conditions.set(cond.key, {
-          bundle,
-          ifTrueBundles,
-          ifFalseBundles,
-        });
+        const currentCondition = conditions.get(cond.key);
+
+        if (getFeatureFlag('conditionalBundlingReporterSameConditionFix')) {
+          conditions.set(cond.key, {
+            bundle,
+            ifTrueBundles: [
+              ...(currentCondition?.ifTrueBundles ?? []),
+              ...ifTrueBundles,
+            ],
+            ifFalseBundles: [
+              ...(currentCondition?.ifFalseBundles ?? []),
+              ...ifFalseBundles,
+            ],
+          });
+        } else {
+          conditions.set(cond.key, {
+            bundle,
+            ifTrueBundles,
+            ifFalseBundles,
+          });
+        }
 
         bundleConditions.set(bundle.id, conditions);
       }