@atlaspack/packager-html 2.14.5-canary.171 → 2.14.5-canary.173

package/lib/HTMLPackager.js

@@ -64,10 +64,8 @@ var _default = exports.default = new (_plugin().Packager)({
       packageKey: '@atlaspack/packager-html'
     });
     return {
-      // @ts-expect-error TS2339
       render: posthtmlConfig === null || posthtmlConfig === void 0 || (_posthtmlConfig$conte = posthtmlConfig.contents) === null || _posthtmlConfig$conte === void 0 ? void 0 : _posthtmlConfig$conte.render,
-      evaluateRootConditionalBundles: Boolean( // @ts-expect-error TS2339
-      conf === null || conf === void 0 || (_conf$contents = conf.contents) === null || _conf$contents === void 0 ? void 0 : _conf$contents.evaluateRootConditionalBundles)
+      evaluateRootConditionalBundles: Boolean(conf === null || conf === void 0 || (_conf$contents = conf.contents) === null || _conf$contents === void 0 ? void 0 : _conf$contents.evaluateRootConditionalBundles)
     };
   },
   async package({
@@ -76,7 +74,6 @@ var _default = exports.default = new (_plugin().Packager)({
     getInlineBundleContents,
     config
   }) {
-    // @ts-expect-error TS2552
     let assets = [];
     bundle.traverseAssets(asset => {
       assets.push(asset);
@@ -95,9 +92,7 @@ var _default = exports.default = new (_plugin().Packager)({
     let renderConfig = config === null || config === void 0 ? void 0 : config.render;
     let {
       html
-    } = await (0, _posthtml().default)([tree => insertBundleReferences(
-    // @ts-expect-error TS2345
-    [...conditionalBundles, ...referencedBundles], tree, conditionalBundles), 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
@@ -147,7 +142,6 @@ async function getAssetContent(bundleGraph, getInlineBundleContents, assetId) {
 }
 async function replaceInlineAssetContent(bundleGraph, getInlineBundleContents, tree) {
   const inlineNodes = [];
-  // @ts-expect-error TS7006
   tree.walk(node => {
     if (node.attrs && node.attrs['data-parcel-key']) {
       inlineNodes.push(node);
@@ -212,8 +206,6 @@ function insertBundleReferences(siblingBundles, tree, conditionalBundles) {
   }
   addBundlesToTree(bundles, tree);
 }
-
-// @ts-expect-error TS7006
 function addBundlesToTree(bundles, tree) {
   const main = find(tree, 'head') || find(tree, 'html');
   // @ts-expect-error TS2339

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/packager-html",
-  "version": "2.14.5-canary.171+f0349a6b9",
+  "version": "2.14.5-canary.173+f93000336",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -16,10 +16,10 @@
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/feature-flags": "2.14.1-canary.239+f0349a6b9",
-    "@atlaspack/plugin": "2.14.5-canary.171+f0349a6b9",
-    "@atlaspack/types": "2.14.5-canary.171+f0349a6b9",
-    "@atlaspack/utils": "2.14.5-canary.171+f0349a6b9",
+    "@atlaspack/feature-flags": "2.14.1-canary.241+f93000336",
+    "@atlaspack/plugin": "2.14.5-canary.173+f93000336",
+    "@atlaspack/types": "2.14.5-canary.173+f93000336",
+    "@atlaspack/utils": "2.14.5-canary.173+f93000336",
     "nullthrows": "^1.1.1",
     "posthtml": "^0.16.5"
   },
@@ -28,5 +28,5 @@
     "check-ts": "tsc --emitDeclarationOnly --rootDir src",
     "build:lib": "gulp build --gulpfile ../../../gulpfile.js --cwd ."
   },
-  "gitHead": "f0349a6b9b04755088f121095ca6301a2ada3767"
+  "gitHead": "f930003364fdc31e5487520ebe256f1a9389f579"
 }

package/src/HTMLPackager.ts

@@ -1,4 +1,11 @@
-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';
@@ -25,9 +32,15 @@ const metadataContent = new Set([
   'title',
 ]);
 
+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',
@@ -42,21 +55,22 @@ 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 {
-      // @ts-expect-error TS2339
       render: posthtmlConfig?.contents?.render,
       evaluateRootConditionalBundles: Boolean(
-        // @ts-expect-error TS2339
         conf?.contents?.evaluateRootConditionalBundles,
       ),
     };
   },
   async package({bundle, bundleGraph, getInlineBundleContents, config}) {
-    // @ts-expect-error TS2552
     let assets: Array<Asset> = [];
     bundle.traverseAssets((asset) => {
       assets.push(asset);
@@ -85,13 +99,12 @@ export default new Packager({
           ),
           new Set(referencedBundles),
         )
-      : new Set();
+      : new Set<NamedBundle>();
     let renderConfig = config?.render;
 
     let {html} = await posthtml([
       (tree: any) =>
         insertBundleReferences(
-          // @ts-expect-error TS2345
           [...conditionalBundles, ...referencedBundles],
           tree,
           conditionalBundles,
@@ -131,7 +144,6 @@ async function getAssetContent(
   getInlineBundleContents: (
     arg1: Bundle,
     arg2: BundleGraph<NamedBundle>,
-    // @ts-expect-error TS2304
   ) => Async<{
     contents: Blob;
   }>,
@@ -163,15 +175,13 @@ async function replaceInlineAssetContent(
   getInlineBundleContents: (
     arg1: Bundle,
     arg2: BundleGraph<NamedBundle>,
-    // @ts-expect-error TS2304
   ) => Async<{
     contents: Blob;
   }>,
   tree: any,
 ) {
   const inlineNodes: Array<any> = [];
-  // @ts-expect-error TS7006
-  tree.walk((node) => {
+  tree.walk((node: any) => {
     if (node.attrs && node.attrs['data-parcel-key']) {
       inlineNodes.push(node);
     }
@@ -258,8 +268,7 @@ function insertBundleReferences(
   addBundlesToTree(bundles, tree);
 }
 
-// @ts-expect-error TS7006
-function addBundlesToTree(bundles, tree: any) {
+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;