@atlaspack/optimizer-htmlnano 2.14.5-canary.137 → 2.14.5-canary.139

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaspack/optimizer-htmlnano
 
+## 2.14.21
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atlaspack/plugin@2.14.21
+
 ## 2.14.20
 
 ### Patch Changes

package/lib/HTMLNanoOptimizer.d.ts

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

package/lib/HTMLNanoOptimizer.js

@@ -34,6 +34,8 @@ function _path() {
 }
 var _svgMappings = require("./svgMappings");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+// @ts-expect-error TS2724
+// @ts-expect-error TS7016
 var _default = exports.default = new (_plugin().Optimizer)({
   async loadConfig({
     config,
@@ -59,20 +61,10 @@ var _default = exports.default = new (_plugin().Optimizer)({
     if (typeof contents !== 'string') {
       throw new Error('HTMLNanoOptimizer: Only string contents are currently supported');
     }
-
-    // $FlowFixMe
     const clonedConfig = config || {};
-
-    // $FlowFixMe
     const presets = _htmlnano().default.presets;
-    // $FlowFixMe
-    const preset =
-    // $FlowFixMe
-    typeof clonedConfig.preset === 'string' ? presets[clonedConfig.preset] : {};
-    // $FlowFixMe
+    const preset = typeof clonedConfig.preset === 'string' ? presets[clonedConfig.preset] : {};
     delete clonedConfig.preset;
-
-    // $FlowFixMe
     const htmlNanoConfig = {
       // Inline <script> and <style> elements, and style attributes are already
       // minified before they are re-inserted by the packager.
@@ -109,15 +101,15 @@ var _default = exports.default = new (_plugin().Optimizer)({
       // skipConfigLoading: true,
     };
 
-    // $FlowFixMe
     let plugins = [(0, _htmlnano().default)(htmlNanoConfig)];
 
-    // $FlowFixMe
+    // @ts-expect-error TS18046
     if (htmlNanoConfig.minifySvg !== false) {
       plugins.unshift(mapSVG);
     }
     return {
       contents: (await (0, _posthtml().default)(plugins).process(contents, {
+        // @ts-expect-error TS2353
         xmlMode: bundle.type === 'xhtml',
         closingSingleTag: bundle.type === 'xhtml' ? 'slash' : undefined
       })).html
@@ -129,7 +121,6 @@ var _default = exports.default = new (_plugin().Optimizer)({
 function mapSVG(node, inSVG = false) {
   if (Array.isArray(node)) {
     for (let i = 0; i < node.length; i++) {
-      // $FlowFixMe
       node[i] = mapSVG(node[i], inSVG);
     }
   } else if (node && typeof node === 'object') {

package/lib/svgMappings.d.ts

@@ -0,0 +1,6 @@
+export declare const SVG_TAG_NAMES: {
+    [key: string]: string;
+};
+export declare const SVG_ATTRS: {
+    [key: string]: string;
+};

package/lib/svgMappings.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.SVG_TAG_NAMES = exports.SVG_ATTRS = void 0;
 // Based on parse5: https://github.com/inikulin/parse5/blob/252819607421a5741cf745bb60c404f023531b0d/packages/parse5/lib/common/foreign-content.js#L54
+
 const SVG_TAG_NAMES = exports.SVG_TAG_NAMES = {
   altglyph: 'altGlyph',
   altglyphdef: 'altGlyphDef',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/optimizer-htmlnano",
-  "version": "2.14.5-canary.137+069de478e",
+  "version": "2.14.5-canary.139+d2fd84977",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -9,18 +9,22 @@
     "type": "git",
     "url": "https://github.com/atlassian-labs/atlaspack.git"
   },
-  "main": "lib/HTMLNanoOptimizer.js",
-  "source": "src/HTMLNanoOptimizer.js",
+  "main": "./lib/HTMLNanoOptimizer.js",
+  "source": "./src/HTMLNanoOptimizer.ts",
+  "types": "./lib/HTMLNanoOptimizer.d.ts",
   "engines": {
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/plugin": "2.14.5-canary.137+069de478e",
+    "@atlaspack/plugin": "2.14.5-canary.139+d2fd84977",
     "htmlnano": "^2.0.0",
     "nullthrows": "^1.1.1",
     "posthtml": "^0.16.5",
     "svgo": "^2.4.0"
   },
   "type": "commonjs",
-  "gitHead": "069de478e64fb5889f6f2ce023eb510782767fbd"
-}
+  "scripts": {
+    "check-ts": "tsc --emitDeclarationOnly --rootDir src"
+  },
+  "gitHead": "d2fd849770fe6305e9c694bd97b1bd905abd9d94"
+}

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

@@ -1,13 +1,14 @@
-// @flow strict-local
+// @ts-expect-error TS2724
 import type {PostHTMLNode} from 'posthtml';
 
+// @ts-expect-error TS7016
 import htmlnano from 'htmlnano';
 import {Optimizer} from '@atlaspack/plugin';
 import posthtml from 'posthtml';
 import path from 'path';
 import {SVG_ATTRS, SVG_TAG_NAMES} from './svgMappings';
 
-export default (new Optimizer({
+export default new Optimizer({
   async loadConfig({config, options}) {
     let userConfig = await config.getConfigFrom(
       path.join(options.projectRoot, 'index.html'),
@@ -39,22 +40,16 @@ export default (new Optimizer({
       );
     }
 
-    // $FlowFixMe
-    const clonedConfig: {} = config || {};
+    const clonedConfig: Record<any, any> = config || {};
 
-    // $FlowFixMe
     const presets = htmlnano.presets;
-    // $FlowFixMe
-    const preset: {} =
-      // $FlowFixMe
+    const preset: Record<any, any> =
       typeof clonedConfig.preset === 'string'
         ? presets[clonedConfig.preset]
         : {};
-    // $FlowFixMe
     delete clonedConfig.preset;
 
-    // $FlowFixMe
-    const htmlNanoConfig: mixed = {
+    const htmlNanoConfig: unknown = {
       // Inline <script> and <style> elements, and style attributes are already
       // minified before they are re-inserted by the packager.
       minifyJs: false,
@@ -92,10 +87,9 @@ export default (new Optimizer({
       // skipConfigLoading: true,
     };
 
-    // $FlowFixMe
     let plugins = [htmlnano(htmlNanoConfig)];
 
-    // $FlowFixMe
+    // @ts-expect-error TS18046
     if (htmlNanoConfig.minifySvg !== false) {
       plugins.unshift(mapSVG);
     }
@@ -103,13 +97,14 @@ export default (new Optimizer({
     return {
       contents: (
         await posthtml(plugins).process(contents, {
+          // @ts-expect-error TS2353
           xmlMode: bundle.type === 'xhtml',
           closingSingleTag: bundle.type === 'xhtml' ? 'slash' : undefined,
         })
       ).html,
     };
   },
-}): Optimizer<mixed, mixed>);
+}) as Optimizer<unknown, unknown>;
 
 // HTML tags and attributes are case insensitive. The HTML transformer normalizes them so it can
 // more easily process any case. But SVGO requires case sensitive tags and attributes to work correctly.
@@ -120,7 +115,6 @@ function mapSVG(
 ) {
   if (Array.isArray(node)) {
     for (let i = 0; i < node.length; i++) {
-      // $FlowFixMe
       node[i] = mapSVG(node[i], inSVG);
     }
   } else if (node && typeof node === 'object') {

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

@@ -1,7 +1,8 @@
-// @flow
 // Based on parse5: https://github.com/inikulin/parse5/blob/252819607421a5741cf745bb60c404f023531b0d/packages/parse5/lib/common/foreign-content.js#L54
 
-export const SVG_TAG_NAMES: {|[string]: string|} = {
+export const SVG_TAG_NAMES: {
+  [key: string]: string;
+} = {
   altglyph: 'altGlyph',
   altglyphdef: 'altGlyphDef',
   altglyphitem: 'altGlyphItem',
@@ -40,7 +41,9 @@ export const SVG_TAG_NAMES: {|[string]: string|} = {
   textpath: 'textPath',
 };
 
-export const SVG_ATTRS: {|[string]: string|} = {
+export const SVG_ATTRS: {
+  [key: string]: string;
+} = {
   attributename: 'attributeName',
   attributetype: 'attributeType',
   basefrequency: 'baseFrequency',

package/tsconfig.json

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