@atlaspack/packager-html 2.14.10 → 2.14.12

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @atlaspack/packager-html
 
+## 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

package/lib/HTMLPackager.js

@@ -46,6 +46,13 @@ function _nullthrows() {
   };
   return data;
 }
+function _featureFlags() {
+  const data = require("@atlaspack/feature-flags");
+  _featureFlags = function () {
+    return data;
+  };
+  return data;
+}
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // https://www.w3.org/TR/html5/dom.html#metadata-content-2
 const metadataContent = new Set(['base', 'link', 'meta', 'noscript',
@@ -88,7 +95,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, _featureFlags().getFeatureFlag)('condbHtmlPackagerChange') ? (0, _utils().setDifference)(getReferencedConditionalScripts(bundleGraph, referencedBundlesRecursive), new Set(referencedBundles)) : (0, _utils().setDifference)(new Set([...referencedBundlesRecursive.flatMap(referencedBundle => bundleGraph.getReferencedConditionalBundles(referencedBundle))]), new Set(referencedBundles)) : new Set();
     let renderConfig = config === null || config === void 0 ? void 0 : config.render;
     let {
       html
@@ -243,4 +250,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.10",
+  "version": "2.14.12",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -15,9 +15,10 @@
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/plugin": "2.14.10",
-    "@atlaspack/types": "2.15.0",
-    "@atlaspack/utils": "2.14.10",
+    "@atlaspack/plugin": "2.14.12",
+    "@atlaspack/types": "2.15.2",
+    "@atlaspack/utils": "2.15.0",
+    "@atlaspack/feature-flags": "2.18.0",
     "nullthrows": "^1.1.1",
     "posthtml": "^0.16.5"
   },

package/src/HTMLPackager.js

@@ -13,6 +13,7 @@ import {
   urlJoin,
 } from '@atlaspack/utils';
 import nullthrows from 'nullthrows';
+import {getFeatureFlag} from '@atlaspack/feature-flags';
 
 // https://www.w3.org/TR/html5/dom.html#metadata-content-2
 const metadataContent = new Set([
@@ -76,16 +77,23 @@ export default (new Packager({
     ];
 
     let conditionalBundles = config.evaluateRootConditionalBundles
-      ? setDifference(
-          new Set([
-            ...referencedBundlesRecursive.flatMap((referencedBundle) =>
-              bundleGraph.getReferencedConditionalBundles(referencedBundle),
+      ? getFeatureFlag('condbHtmlPackagerChange')
+        ? setDifference(
+            getReferencedConditionalScripts(
+              bundleGraph,
+              referencedBundlesRecursive,
             ),
-          ]),
-          new Set(referencedBundles),
-        )
+            new Set(referencedBundles),
+          )
+        : setDifference(
+            new Set([
+              ...referencedBundlesRecursive.flatMap((referencedBundle) =>
+                bundleGraph.getReferencedConditionalBundles(referencedBundle),
+              ),
+            ]),
+            new Set(referencedBundles),
+          )
       : new Set();
-
     let renderConfig = config?.render;
 
     let {html} = await posthtml([
@@ -284,3 +292,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);
+}