@atlaspack/packager-html 2.14.5-canary.36 → 2.14.5-canary.361

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
@@ -208,12 +208,14 @@ function insertBundleReferences(siblingBundles, tree, conditionalBundles) {
 }
 function addBundlesToTree(bundles, tree) {
   const main = find(tree, 'head') || find(tree, 'html');
+  // @ts-expect-error TS2339
   const content = main ? main.content || (main.content = []) : tree;
   const index = findBundleInsertIndex(content);
   content.splice(index, 0, ...bundles);
 }
 function find(tree, tag) {
   let res;
+  // @ts-expect-error TS7006
   tree.match({
     tag
   }, node => {
@@ -243,4 +245,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/lib/types/HTMLPackager.d.ts

@@ -0,0 +1,3 @@
+import { Packager } from '@atlaspack/plugin';
+declare const _default: Packager<unknown, unknown>;
+export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/packager-html",
-  "version": "2.14.5-canary.36+2d10c6656",
+  "version": "2.14.5-canary.361+405bbaf61",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -9,18 +9,23 @@
     "type": "git",
     "url": "https://github.com/atlassian-labs/atlaspack.git"
   },
-  "main": "lib/HTMLPackager.js",
-  "source": "src/HTMLPackager.js",
+  "main": "./lib/HTMLPackager.js",
+  "source": "./src/HTMLPackager.ts",
+  "types": "./lib/types/HTMLPackager.d.ts",
   "engines": {
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/plugin": "2.14.5-canary.36+2d10c6656",
-    "@atlaspack/types": "2.14.5-canary.36+2d10c6656",
-    "@atlaspack/utils": "2.14.5-canary.36+2d10c6656",
+    "@atlaspack/feature-flags": "2.14.1-canary.429+405bbaf61",
+    "@atlaspack/plugin": "2.14.5-canary.361+405bbaf61",
+    "@atlaspack/types": "2.14.5-canary.361+405bbaf61",
+    "@atlaspack/utils": "2.14.5-canary.361+405bbaf61",
     "nullthrows": "^1.1.1",
     "posthtml": "^0.16.5"
   },
   "type": "commonjs",
-  "gitHead": "2d10c6656fc58743c5dbed1d2b6c5666887f9fe4"
-}
+  "scripts": {
+    "build:lib": "gulp build --gulpfile ../../../gulpfile.js --cwd ."
+  },
+  "gitHead": "405bbaf619f634cf9e58cc618d9a911f7db2998d"
+}

package/src/{HTMLPackager.js → HTMLPackager.ts}

@@ -1,5 +1,11 @@
-// @flow strict-local
-import type {Bundle, BundleGraph, NamedBundle} from '@atlaspack/types';
+import type {
+  Asset,
+  Async,
+  Blob,
+  Bundle,
+  BundleGraph,
+  NamedBundle,
+} from '@atlaspack/types';
 
 import assert from 'assert';
 import {Readable} from 'stream';
@@ -26,9 +32,15 @@ const metadataContent = new Set([
   'title',
 ]);
 
-export default (new Packager({
+type HTMLPackagerConfig = {
+  evaluateRootConditionalBundles: boolean;
+};
+
+export default new Packager({
   async loadConfig({config, options}) {
-    let posthtmlConfig = await config.getConfig(
+    let posthtmlConfig = await config.getConfig<{
+      render: any;
+    }>(
       [
         '.posthtmlrc',
         '.posthtmlrc.js',
@@ -43,9 +55,13 @@ export default (new Packager({
       },
     );
 
-    let conf = await config.getConfigFrom(options.projectRoot + '/index', [], {
-      packageKey: '@atlaspack/packager-html',
-    });
+    let conf = await config.getConfigFrom<HTMLPackagerConfig>(
+      options.projectRoot + '/index',
+      [],
+      {
+        packageKey: '@atlaspack/packager-html',
+      },
+    );
 
     return {
       render: posthtmlConfig?.contents?.render,
@@ -55,7 +71,7 @@ export default (new Packager({
     };
   },
   async package({bundle, bundleGraph, getInlineBundleContents, config}) {
-    let assets = [];
+    let assets: Array<Asset> = [];
     bundle.traverseAssets((asset) => {
       assets.push(asset);
     });
@@ -77,25 +93,23 @@ 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();
-
+      : new Set<NamedBundle>();
     let renderConfig = config?.render;
 
     let {html} = await posthtml([
-      (tree) =>
+      (tree: any) =>
         insertBundleReferences(
           [...conditionalBundles, ...referencedBundles],
           tree,
           conditionalBundles,
         ),
-      (tree) =>
+      (tree: any) =>
         replaceInlineAssetContent(bundleGraph, getInlineBundleContents, tree),
     ]).process(code, {
       ...renderConfig,
@@ -123,14 +137,19 @@ export default (new Packager({
       map,
     });
   },
-}): Packager);
+}) as Packager<unknown, unknown>;
 
 async function getAssetContent(
   bundleGraph: BundleGraph<NamedBundle>,
-  getInlineBundleContents,
-  assetId,
+  getInlineBundleContents: (
+    arg1: Bundle,
+    arg2: BundleGraph<NamedBundle>,
+  ) => Async<{
+    contents: Blob;
+  }>,
+  assetId: any,
 ) {
-  let inlineBundle: ?Bundle;
+  let inlineBundle: Bundle | null | undefined;
   bundleGraph.traverseBundles((bundle, context, {stop}) => {
     let entryAssets = bundle.getEntryAssets();
     if (entryAssets.some((a) => a.uniqueKey === assetId)) {
@@ -153,11 +172,16 @@ async function getAssetContent(
 
 async function replaceInlineAssetContent(
   bundleGraph: BundleGraph<NamedBundle>,
-  getInlineBundleContents,
-  tree,
+  getInlineBundleContents: (
+    arg1: Bundle,
+    arg2: BundleGraph<NamedBundle>,
+  ) => Async<{
+    contents: Blob;
+  }>,
+  tree: any,
 ) {
-  const inlineNodes = [];
-  tree.walk((node) => {
+  const inlineNodes: Array<any> = [];
+  tree.walk((node: any) => {
     if (node.attrs && node.attrs['data-parcel-key']) {
       inlineNodes.push(node);
     }
@@ -207,7 +231,11 @@ async function replaceInlineAssetContent(
   return tree;
 }
 
-function insertBundleReferences(siblingBundles, tree, conditionalBundles) {
+function insertBundleReferences(
+  siblingBundles: Array<NamedBundle>,
+  tree: any,
+  conditionalBundles: Set<NamedBundle>,
+) {
   const bundles = [];
 
   for (let bundle of siblingBundles) {
@@ -240,16 +268,18 @@ function insertBundleReferences(siblingBundles, tree, conditionalBundles) {
   addBundlesToTree(bundles, tree);
 }
 
-function addBundlesToTree(bundles, tree) {
+function addBundlesToTree(bundles: any[], tree: any) {
   const main = find(tree, 'head') || find(tree, 'html');
+  // @ts-expect-error TS2339
   const content = main ? main.content || (main.content = []) : tree;
   const index = findBundleInsertIndex(content);
 
   content.splice(index, 0, ...bundles);
 }
 
-function find(tree, tag) {
+function find(tree: any, tag: string) {
   let res;
+  // @ts-expect-error TS7006
   tree.match({tag}, (node) => {
     res = node;
     return node;
@@ -258,7 +288,7 @@ function find(tree, tag) {
   return res;
 }
 
-function findBundleInsertIndex(content) {
+function findBundleInsertIndex(content: any) {
   // HTML document order (https://html.spec.whatwg.org/multipage/syntax.html#writing)
   //   - Any number of comments and ASCII whitespace.
   //   - A DOCTYPE.
@@ -284,3 +314,28 @@ function findBundleInsertIndex(content) {
 
   return doctypeIndex ? doctypeIndex + 1 : 0;
 }
+
+function getReferencedConditionalScripts(
+  bundleGraph: BundleGraph<NamedBundle>,
+  referencedBundles: NamedBundle[],
+): Set<NamedBundle> {
+  const conditionalBundleMapping = bundleGraph.getConditionalBundleMapping();
+
+  const bundles: Array<NamedBundle> = [];
+  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/tsconfig.json

@@ -0,0 +1,21 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "include": ["src"],
+  "compilerOptions": {
+    "composite": true
+  },
+  "references": [
+    {
+      "path": "../../core/feature-flags/tsconfig.json"
+    },
+    {
+      "path": "../../core/plugin/tsconfig.json"
+    },
+    {
+      "path": "../../core/types/tsconfig.json"
+    },
+    {
+      "path": "../../core/utils/tsconfig.json"
+    }
+  ]
+}