@atlaspack/packager-html 2.12.1-dev.3520 → 2.12.1-dev.3566

package/lib/HTMLPackager.js

@@ -53,14 +53,19 @@ const metadataContent = new Set(['base', 'link', 'meta', 'noscript',
 'style', 'template', 'title']);
 var _default = exports.default = new (_plugin().Packager)({
   async loadConfig({
-    config
+    config,
+    options
   }) {
-    var _posthtmlConfig$conte;
+    var _posthtmlConfig$conte, _conf$contents;
     let posthtmlConfig = await config.getConfig(['.posthtmlrc', '.posthtmlrc.js', '.posthtmlrc.cjs', '.posthtmlrc.mjs', 'posthtml.config.js', 'posthtml.config.cjs', 'posthtml.config.mjs'], {
       packageKey: 'posthtml'
     });
+    let conf = await config.getConfigFrom(options.projectRoot + '/index', [], {
+      packageKey: '@atlaspack/packager-html'
+    });
     return {
-      render: posthtmlConfig === null || posthtmlConfig === void 0 || (_posthtmlConfig$conte = posthtmlConfig.contents) === null || _posthtmlConfig$conte === void 0 ? void 0 : _posthtmlConfig$conte.render
+      render: posthtmlConfig === null || posthtmlConfig === void 0 || (_posthtmlConfig$conte = posthtmlConfig.contents) === null || _posthtmlConfig$conte === void 0 ? void 0 : _posthtmlConfig$conte.render,
+      evaluateRootConditionalBundles: Boolean(conf === null || conf === void 0 || (_conf$contents = conf.contents) === null || _conf$contents === void 0 ? void 0 : _conf$contents.evaluateRootConditionalBundles)
     };
   },
   async package({
@@ -79,13 +84,15 @@ var _default = exports.default = new (_plugin().Packager)({
 
     // Add bundles in the same bundle group that are not inline. For example, if two inline
     // bundles refer to the same library that is extracted into a shared bundle.
-    let referencedBundles = [...(0, _utils().setDifference)(new Set(bundleGraph.getReferencedBundles(bundle)), new Set(bundleGraph.getReferencedBundles(bundle, {
+    let referencedBundlesRecursive = bundleGraph.getReferencedBundles(bundle);
+    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 renderConfig = config === null || config === void 0 ? void 0 : config.render;
     let {
       html
-    } = await (0, _posthtml().default)([tree => insertBundleReferences(referencedBundles, tree), tree => replaceInlineAssetContent(bundleGraph, getInlineBundleContents, tree)]).process(code, {
+    } = await (0, _posthtml().default)([tree => insertBundleReferences([...conditionalBundles, ...referencedBundles], tree, conditionalBundles), tree => replaceInlineAssetContent(bundleGraph, getInlineBundleContents, tree)]).process(code, {
       ...renderConfig,
       xmlMode: bundle.type === 'xhtml',
       closingSingleTag: bundle.type === 'xhtml' ? 'slash' : undefined
@@ -172,7 +179,7 @@ async function replaceInlineAssetContent(bundleGraph, getInlineBundleContents, t
   }
   return tree;
 }
-function insertBundleReferences(siblingBundles, tree) {
+function insertBundleReferences(siblingBundles, tree, conditionalBundles) {
   const bundles = [];
   for (let bundle of siblingBundles) {
     if (bundle.type === 'css') {
@@ -191,6 +198,7 @@ function insertBundleReferences(siblingBundles, tree) {
           type: bundle.env.outputFormat === 'esmodule' ? 'module' : undefined,
           nomodule: nomodule ? '' : undefined,
           defer: nomodule ? '' : undefined,
+          'data-conditional': conditionalBundles.has(bundle) ? true : undefined,
           src: (0, _utils().urlJoin)(bundle.target.publicUrl, bundle.name)
         }
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/packager-html",
-  "version": "2.12.1-dev.3520+8a5346e28",
+  "version": "2.12.1-dev.3566+facdfb05f",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -12,15 +12,15 @@
   "main": "lib/HTMLPackager.js",
   "source": "src/HTMLPackager.js",
   "engines": {
-    "node": ">= 16.0.0",
-    "parcel": "^2.12.1-dev.3520+8a5346e28"
+    "atlaspack": "^2.12.1-dev.3566+facdfb05f",
+    "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/plugin": "2.12.1-dev.3520+8a5346e28",
-    "@atlaspack/types": "2.12.1-dev.3520+8a5346e28",
-    "@atlaspack/utils": "2.12.1-dev.3520+8a5346e28",
+    "@atlaspack/plugin": "2.12.1-dev.3566+facdfb05f",
+    "@atlaspack/types": "2.12.1-dev.3566+facdfb05f",
+    "@atlaspack/utils": "2.12.1-dev.3566+facdfb05f",
     "nullthrows": "^1.1.1",
     "posthtml": "^0.16.5"
   },
-  "gitHead": "8a5346e28c1bb3b9cd40f1c4e77c66dd6666f1e4"
+  "gitHead": "facdfb05f693e50037a82a4afa101adf093fd8c9"
 }

package/src/HTMLPackager.js

@@ -4,7 +4,7 @@ import type {Bundle, BundleGraph, NamedBundle} from '@atlaspack/types';
 import assert from 'assert';
 import {Readable} from 'stream';
 import {Packager} from '@atlaspack/plugin';
-import {setDifference} from '@atlaspack/utils';
+import {setSymmetricDifference, setDifference} from '@atlaspack/utils';
 import posthtml from 'posthtml';
 import {
   bufferStream,
@@ -27,7 +27,7 @@ const metadataContent = new Set([
 ]);
 
 export default (new Packager({
-  async loadConfig({config}) {
+  async loadConfig({config, options}) {
     let posthtmlConfig = await config.getConfig(
       [
         '.posthtmlrc',
@@ -42,8 +42,16 @@ export default (new Packager({
         packageKey: 'posthtml',
       },
     );
+
+    let conf = await config.getConfigFrom(options.projectRoot + '/index', [], {
+      packageKey: '@atlaspack/packager-html',
+    });
+
     return {
       render: posthtmlConfig?.contents?.render,
+      evaluateRootConditionalBundles: Boolean(
+        conf?.contents?.evaluateRootConditionalBundles,
+      ),
     };
   },
   async package({bundle, bundleGraph, getInlineBundleContents, config}) {
@@ -59,17 +67,34 @@ export default (new Packager({
 
     // Add bundles in the same bundle group that are not inline. For example, if two inline
     // bundles refer to the same library that is extracted into a shared bundle.
+    let referencedBundlesRecursive = bundleGraph.getReferencedBundles(bundle);
     let referencedBundles = [
-      ...setDifference(
-        new Set(bundleGraph.getReferencedBundles(bundle)),
+      ...setSymmetricDifference(
+        new Set(referencedBundlesRecursive),
         new Set(bundleGraph.getReferencedBundles(bundle, {recursive: false})),
       ),
     ];
 
+    let conditionalBundles = config.evaluateRootConditionalBundles
+      ? setDifference(
+          new Set([
+            ...referencedBundlesRecursive.flatMap((referencedBundle) =>
+              bundleGraph.getReferencedConditionalBundles(referencedBundle),
+            ),
+          ]),
+          new Set(referencedBundles),
+        )
+      : new Set();
+
     let renderConfig = config?.render;
 
     let {html} = await posthtml([
-      (tree) => insertBundleReferences(referencedBundles, tree),
+      (tree) =>
+        insertBundleReferences(
+          [...conditionalBundles, ...referencedBundles],
+          tree,
+          conditionalBundles,
+        ),
       (tree) =>
         replaceInlineAssetContent(bundleGraph, getInlineBundleContents, tree),
     ]).process(code, {
@@ -182,7 +207,7 @@ async function replaceInlineAssetContent(
   return tree;
 }
 
-function insertBundleReferences(siblingBundles, tree) {
+function insertBundleReferences(siblingBundles, tree, conditionalBundles) {
   const bundles = [];
 
   for (let bundle of siblingBundles) {
@@ -205,6 +230,7 @@ function insertBundleReferences(siblingBundles, tree) {
           type: bundle.env.outputFormat === 'esmodule' ? 'module' : undefined,
           nomodule: nomodule ? '' : undefined,
           defer: nomodule ? '' : undefined,
+          'data-conditional': conditionalBundles.has(bundle) ? true : undefined,
           src: urlJoin(bundle.target.publicUrl, bundle.name),
         },
       });