@atlaspack/packager-html 2.14.5-canary.13 → 2.14.5-canary.130

package/CHANGELOG.md

@@ -1,5 +1,135 @@
 # @atlaspack/packager-html
 
+## 2.15.0
+
+### Minor Changes
+
+- [#640](https://github.com/atlassian-labs/atlaspack/pull/640) [`dbb4072`](https://github.com/atlassian-labs/atlaspack/commit/dbb40721ebeb45990a14ba04e6b44e7f836fb32d) Thanks [@JakeLane](https://github.com/JakeLane)! - Clean up conditional bundling feature flags
+
+### Patch Changes
+
+- Updated dependencies [[`dbb4072`](https://github.com/atlassian-labs/atlaspack/commit/dbb40721ebeb45990a14ba04e6b44e7f836fb32d), [`becf977`](https://github.com/atlassian-labs/atlaspack/commit/becf977f625d5ee46dae3d4c679f173bf5f40cc0), [`c4415a4`](https://github.com/atlassian-labs/atlaspack/commit/c4415a455543d984ca28452c2cb87a794d22497c), [`f0f7c71`](https://github.com/atlassian-labs/atlaspack/commit/f0f7c7168a1d3d18c6f30d2daed611275692b7c5), [`de23e0c`](https://github.com/atlassian-labs/atlaspack/commit/de23e0ce49d5504fe3947ac26640a3d951087da3), [`18a57cf`](https://github.com/atlassian-labs/atlaspack/commit/18a57cf8a4789b2de5ad8e2676f317a26cc91417), [`a5ed1b4`](https://github.com/atlassian-labs/atlaspack/commit/a5ed1b414498560f393ff491af4da25b6e8dde56)]:
+  - @atlaspack/feature-flags@2.19.0
+  - @atlaspack/utils@2.17.0
+  - @atlaspack/types@2.15.8
+  - @atlaspack/plugin@2.14.18
+
+## 2.14.17
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atlaspack/utils@2.16.1
+  - @atlaspack/types@2.15.7
+  - @atlaspack/plugin@2.14.17
+
+## 2.14.16
+
+### Patch Changes
+
+- Updated dependencies [[`e8a60ff`](https://github.com/atlassian-labs/atlaspack/commit/e8a60ffbea41caef265786bbf73349771760081c), [`30ee2cf`](https://github.com/atlassian-labs/atlaspack/commit/30ee2cfcd34cf2646ded0eda13fdb80a2a5de529)]:
+  - @atlaspack/feature-flags@2.18.4
+  - @atlaspack/utils@2.16.0
+  - @atlaspack/types@2.15.6
+  - @atlaspack/plugin@2.14.16
+
+## 2.14.15
+
+### Patch Changes
+
+- Updated dependencies [[`5ded263`](https://github.com/atlassian-labs/atlaspack/commit/5ded263c7f11b866e8885b81c73e20dd060b25be)]:
+  - @atlaspack/feature-flags@2.18.3
+  - @atlaspack/utils@2.15.3
+  - @atlaspack/types@2.15.5
+  - @atlaspack/plugin@2.14.15
+
+## 2.14.14
+
+### Patch Changes
+
+- Updated dependencies [[`644b157`](https://github.com/atlassian-labs/atlaspack/commit/644b157dee72a871acc2d0facf0b87b8eea51956)]:
+  - @atlaspack/feature-flags@2.18.2
+  - @atlaspack/utils@2.15.2
+  - @atlaspack/types@2.15.4
+  - @atlaspack/plugin@2.14.14
+
+## 2.14.13
+
+### 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/types@2.15.3
+  - @atlaspack/utils@2.15.1
+  - @atlaspack/plugin@2.14.13
+
+## 2.14.12
+
+### Patch Changes
+
+- 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/types@2.15.2
+  - @atlaspack/plugin@2.14.12
+
+## 2.14.11
+
+### Patch Changes
+
+- [#623](https://github.com/atlassian-labs/atlaspack/pull/623) [`b1b3693`](https://github.com/atlassian-labs/atlaspack/commit/b1b369317c66f8a431c170df2ebba4fa5b2e38ef) Thanks [@JakeLane](https://github.com/JakeLane)! - Load same conditional bundles as conditional manifest in HTML
+
+- 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/utils@2.14.11
+  - @atlaspack/types@2.15.1
+  - @atlaspack/plugin@2.14.11
+
+## 2.14.10
+
+### Patch Changes
+
+- Updated dependencies [[`51aba5f`](https://github.com/atlassian-labs/atlaspack/commit/51aba5fc0e49235ee06bbc3c376f48c3e7da5c4b), [`1e32d4e`](https://github.com/atlassian-labs/atlaspack/commit/1e32d4eae6b3af3968e8a0ef97d35b4347fd4196)]:
+  - @atlaspack/types@2.15.0
+  - @atlaspack/plugin@2.14.10
+  - @atlaspack/utils@2.14.10
+
+## 2.14.9
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atlaspack/utils@2.14.9
+  - @atlaspack/types@2.14.9
+  - @atlaspack/plugin@2.14.9
+
+## 2.14.8
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atlaspack/utils@2.14.8
+  - @atlaspack/types@2.14.8
+  - @atlaspack/plugin@2.14.8
+
+## 2.14.7
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atlaspack/utils@2.14.7
+  - @atlaspack/types@2.14.7
+  - @atlaspack/plugin@2.14.7
+
+## 2.14.6
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atlaspack/utils@2.14.6
+  - @atlaspack/types@2.14.6
+  - @atlaspack/plugin@2.14.6
+
 ## 2.14.5
 
 ### Patch Changes

package/lib/HTMLPackager.js

@@ -88,7 +88,7 @@ var _default = exports.default = new (_plugin().Packager)({
     let referencedBundles = [...(0, _utils().setSymmetricDifference)(new Set(referencedBundlesRecursive), new Set(bundleGraph.getReferencedBundles(bundle, {
       recursive: false
     })))];
-    let conditionalBundles = config.evaluateRootConditionalBundles ? (0, _utils().setDifference)(new Set([...referencedBundlesRecursive.flatMap(referencedBundle => bundleGraph.getReferencedConditionalBundles(referencedBundle))]), new Set(referencedBundles)) : new Set();
+    let conditionalBundles = config.evaluateRootConditionalBundles ? (0, _utils().setDifference)(getReferencedConditionalScripts(bundleGraph, referencedBundlesRecursive), new Set(referencedBundles)) : new Set();
     let renderConfig = config === null || config === void 0 ? void 0 : config.render;
     let {
       html
@@ -243,4 +243,20 @@ function findBundleInsertIndex(content) {
     }
   }
   return doctypeIndex ? doctypeIndex + 1 : 0;
+}
+function getReferencedConditionalScripts(bundleGraph, referencedBundles) {
+  const conditionalBundleMapping = bundleGraph.getConditionalBundleMapping();
+  const bundles = [];
+  for (const bundle of referencedBundles) {
+    const conditions = conditionalBundleMapping.get(bundle.id);
+    if (conditions) {
+      for (const [, cond] of conditions) {
+        // Reverse so dependent bundles are loaded first
+        const dependentBundles = [...cond.ifTrueBundles.reverse(), ...cond.ifFalseBundles.reverse()];
+        bundles.push(...dependentBundles);
+        referencedBundles.push(...dependentBundles);
+      }
+    }
+  }
+  return new Set(bundles);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/packager-html",
-  "version": "2.14.5-canary.13+e0f533757",
+  "version": "2.14.5-canary.130+13aef177e",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -15,12 +15,13 @@
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/plugin": "2.14.5-canary.13+e0f533757",
-    "@atlaspack/types": "2.14.5-canary.13+e0f533757",
-    "@atlaspack/utils": "2.14.5-canary.13+e0f533757",
+    "@atlaspack/feature-flags": "2.14.1-canary.198+13aef177e",
+    "@atlaspack/plugin": "2.14.5-canary.130+13aef177e",
+    "@atlaspack/types": "2.14.5-canary.130+13aef177e",
+    "@atlaspack/utils": "2.14.5-canary.130+13aef177e",
     "nullthrows": "^1.1.1",
     "posthtml": "^0.16.5"
   },
   "type": "commonjs",
-  "gitHead": "e0f533757bd1019dbd108a04952c87da15286e09"
+  "gitHead": "13aef177eea289a6e40d2113b5ec1ac9be18a33d"
 }

package/src/HTMLPackager.js

@@ -77,15 +77,13 @@ export default (new Packager({
 
     let conditionalBundles = config.evaluateRootConditionalBundles
       ? setDifference(
-          new Set([
-            ...referencedBundlesRecursive.flatMap((referencedBundle) =>
-              bundleGraph.getReferencedConditionalBundles(referencedBundle),
-            ),
-          ]),
+          getReferencedConditionalScripts(
+            bundleGraph,
+            referencedBundlesRecursive,
+          ),
           new Set(referencedBundles),
         )
       : new Set();
-
     let renderConfig = config?.render;
 
     let {html} = await posthtml([
@@ -284,3 +282,28 @@ function findBundleInsertIndex(content) {
 
   return doctypeIndex ? doctypeIndex + 1 : 0;
 }
+
+function getReferencedConditionalScripts(
+  bundleGraph: BundleGraph<NamedBundle>,
+  referencedBundles: NamedBundle[],
+): Set<NamedBundle> {
+  const conditionalBundleMapping = bundleGraph.getConditionalBundleMapping();
+
+  const bundles = [];
+  for (const bundle of referencedBundles) {
+    const conditions = conditionalBundleMapping.get(bundle.id);
+    if (conditions) {
+      for (const [, cond] of conditions) {
+        // Reverse so dependent bundles are loaded first
+        const dependentBundles = [
+          ...cond.ifTrueBundles.reverse(),
+          ...cond.ifFalseBundles.reverse(),
+        ];
+        bundles.push(...dependentBundles);
+        referencedBundles.push(...dependentBundles);
+      }
+    }
+  }
+
+  return new Set(bundles);
+}