@atlaspack/packager-html 2.14.5-canary.138 → 2.14.5-canary.139

package/lib/HTMLPackager.d.ts

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

package/lib/HTMLPackager.js

@@ -64,8 +64,10 @@ 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(conf === null || conf === void 0 || (_conf$contents = conf.contents) === null || _conf$contents === void 0 ? void 0 : _conf$contents.evaluateRootConditionalBundles)
+      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)
     };
   },
   async package({
@@ -74,6 +76,7 @@ var _default = exports.default = new (_plugin().Packager)({
     getInlineBundleContents,
     config
   }) {
+    // @ts-expect-error TS2552
     let assets = [];
     bundle.traverseAssets(asset => {
       assets.push(asset);
@@ -88,14 +91,13 @@ var _default = exports.default = new (_plugin().Packager)({
     let referencedBundles = [...(0, _utils().setSymmetricDifference)(new Set(referencedBundlesRecursive), new Set(bundleGraph.getReferencedBundles(bundle, {
       recursive: false
     })))];
-
-    // $FlowFixMe
     let conditionalBundles = config.evaluateRootConditionalBundles ? (0, _utils().setDifference)(getReferencedConditionalScripts(bundleGraph, referencedBundlesRecursive), new Set(referencedBundles)) : new Set();
-    // $FlowFixMe
     let renderConfig = config === null || config === void 0 ? void 0 : config.render;
     let {
       html
-    } = await (0, _posthtml().default)([tree => insertBundleReferences([...conditionalBundles, ...referencedBundles], tree, conditionalBundles), tree => replaceInlineAssetContent(bundleGraph, getInlineBundleContents, tree)]).process(code, {
+    } = await (0, _posthtml().default)([tree => insertBundleReferences(
+    // @ts-expect-error TS2345
+    [...conditionalBundles, ...referencedBundles], tree, conditionalBundles), tree => replaceInlineAssetContent(bundleGraph, getInlineBundleContents, tree)]).process(code, {
       ...renderConfig,
       xmlMode: bundle.type === 'xhtml',
       closingSingleTag: bundle.type === 'xhtml' ? 'slash' : undefined
@@ -145,6 +147,7 @@ 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);
@@ -209,14 +212,18 @@ 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
   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 => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/packager-html",
-  "version": "2.14.5-canary.138+eda07caaf",
+  "version": "2.14.5-canary.139+d2fd84977",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -9,19 +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/HTMLPackager.d.ts",
   "engines": {
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/feature-flags": "2.14.1-canary.206+eda07caaf",
-    "@atlaspack/plugin": "2.14.5-canary.138+eda07caaf",
-    "@atlaspack/types": "2.14.5-canary.138+eda07caaf",
-    "@atlaspack/utils": "2.14.5-canary.138+eda07caaf",
+    "@atlaspack/feature-flags": "2.14.1-canary.207+d2fd84977",
+    "@atlaspack/plugin": "2.14.5-canary.139+d2fd84977",
+    "@atlaspack/types": "2.14.5-canary.139+d2fd84977",
+    "@atlaspack/utils": "2.14.5-canary.139+d2fd84977",
     "nullthrows": "^1.1.1",
     "posthtml": "^0.16.5"
   },
   "type": "commonjs",
-  "gitHead": "eda07caafd2ebb814bbdbfd0ec12fa63124e213f"
-}
+  "scripts": {
+    "check-ts": "tsc --emitDeclarationOnly --rootDir src"
+  },
+  "gitHead": "d2fd849770fe6305e9c694bd97b1bd905abd9d94"
+}

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

@@ -1,4 +1,3 @@
-// @flow strict-local
 import type {Bundle, BundleGraph, NamedBundle} from '@atlaspack/types';
 
 import assert from 'assert';
@@ -26,7 +25,7 @@ const metadataContent = new Set([
   'title',
 ]);
 
-export default (new Packager({
+export default new Packager({
   async loadConfig({config, options}) {
     let posthtmlConfig = await config.getConfig(
       [
@@ -48,14 +47,17 @@ export default (new Packager({
     });
 
     return {
+      // @ts-expect-error TS2339
       render: posthtmlConfig?.contents?.render,
       evaluateRootConditionalBundles: Boolean(
+        // @ts-expect-error TS2339
         conf?.contents?.evaluateRootConditionalBundles,
       ),
     };
   },
   async package({bundle, bundleGraph, getInlineBundleContents, config}) {
-    let assets = [];
+    // @ts-expect-error TS2552
+    let assets: Array<Asset> = [];
     bundle.traverseAssets((asset) => {
       assets.push(asset);
     });
@@ -75,7 +77,6 @@ export default (new Packager({
       ),
     ];
 
-    // $FlowFixMe
     let conditionalBundles = config.evaluateRootConditionalBundles
       ? setDifference(
           getReferencedConditionalScripts(
@@ -85,17 +86,17 @@ export default (new Packager({
           new Set(referencedBundles),
         )
       : new Set();
-    // $FlowFixMe
     let renderConfig = config?.render;
 
     let {html} = await posthtml([
-      (tree) =>
+      (tree: any) =>
         insertBundleReferences(
+          // @ts-expect-error TS2345
           [...conditionalBundles, ...referencedBundles],
           tree,
           conditionalBundles,
         ),
-      (tree) =>
+      (tree: any) =>
         replaceInlineAssetContent(bundleGraph, getInlineBundleContents, tree),
     ]).process(code, {
       ...renderConfig,
@@ -123,14 +124,20 @@ export default (new Packager({
       map,
     });
   },
-}): Packager<mixed, mixed>);
+}) as Packager<unknown, unknown>;
 
 async function getAssetContent(
   bundleGraph: BundleGraph<NamedBundle>,
-  getInlineBundleContents,
-  assetId,
+  getInlineBundleContents: (
+    arg1: Bundle,
+    arg2: BundleGraph<NamedBundle>,
+    // @ts-expect-error TS2304
+  ) => 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,10 +160,17 @@ async function getAssetContent(
 
 async function replaceInlineAssetContent(
   bundleGraph: BundleGraph<NamedBundle>,
-  getInlineBundleContents,
-  tree,
+  getInlineBundleContents: (
+    arg1: Bundle,
+    arg2: BundleGraph<NamedBundle>,
+    // @ts-expect-error TS2304
+  ) => Async<{
+    contents: Blob;
+  }>,
+  tree: any,
 ) {
-  const inlineNodes = [];
+  const inlineNodes: Array<any> = [];
+  // @ts-expect-error TS7006
   tree.walk((node) => {
     if (node.attrs && node.attrs['data-parcel-key']) {
       inlineNodes.push(node);
@@ -207,7 +221,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 +258,19 @@ function insertBundleReferences(siblingBundles, tree, conditionalBundles) {
   addBundlesToTree(bundles, tree);
 }
 
-function addBundlesToTree(bundles, tree) {
+// @ts-expect-error TS7006
+function addBundlesToTree(bundles, 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 +279,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.
@@ -291,7 +312,7 @@ function getReferencedConditionalScripts(
 ): Set<NamedBundle> {
   const conditionalBundleMapping = bundleGraph.getConditionalBundleMapping();
 
-  const bundles = [];
+  const bundles: Array<NamedBundle> = [];
   for (const bundle of referencedBundles) {
     const conditions = conditionalBundleMapping.get(bundle.id);
     if (conditions) {

package/tsconfig.json

@@ -0,0 +1,4 @@
+{
+  "extends": "../../../tsconfig.json",
+  "include": ["src"]
+}