htmlnano 3.2.0 → 3.2.1

package/dist/presets/ampSafe.d.ts

@@ -1,17 +1,14 @@
 import PostHTML from 'posthtml';
-import { MinifyOptions } from 'terser';
-import { Options } from 'cssnano';
-import { Config } from 'svgo';
-import { UserDefinedOptions } from 'purgecss';
 
-type PostHTMLTreeLike = [PostHTML.Node] & PostHTML.NodeAPI & {
+type PostHTMLNodeLike = PostHTML.Node | string;
+type PostHTMLTreeLike = [PostHTMLNodeLike] & PostHTML.NodeAPI & {
     options?: {
         quoteAllAttributes?: boolean | undefined;
         quoteStyle?: 0 | 1 | 2 | undefined;
         replaceQuote?: boolean | undefined;
     } | undefined;
     render(): string;
-    render(node: PostHTML.Node | PostHTMLTreeLike, renderOptions?: any): string;
+    render(node: PostHTMLNodeLike | PostHTMLTreeLike, renderOptions?: any): string;
 };
 type MaybeArray<T> = T | Array<T>;
 type HtmlnanoTemplateRule = {
@@ -19,6 +16,55 @@ type HtmlnanoTemplateRule = {
     attrs?: Record<string, string | boolean | void>;
 };
 type MinifyHtmlTemplateOptions = boolean | HtmlnanoTemplateRule[];
+type HtmlnanoMinifyCssOptions = object;
+type HtmlnanoMinifyJsOptions = object;
+type HtmlnanoMinifySvgOptions = object;
+type HtmlnanoPurgeCssPattern = string | RegExp;
+type HtmlnanoPurgeCssExtractorResultDetailed = {
+    attributes: {
+        names: string[];
+        values: string[];
+    };
+    classes: string[];
+    ids: string[];
+    tags: string[];
+    undetermined: string[];
+};
+type HtmlnanoPurgeCssExtractorResult = HtmlnanoPurgeCssExtractorResultDetailed | string[];
+type HtmlnanoPurgeCssDefaultExtractor = (content: string) => HtmlnanoPurgeCssExtractorResult;
+type HtmlnanoPurgeCssSourceMapOptions = {
+    absolute?: boolean;
+    annotation?: boolean | string;
+    from?: string;
+    inline?: boolean;
+    prev?: boolean | object | string;
+    sourcesContent?: boolean;
+    to?: string;
+};
+type HtmlnanoPurgeCssSafelist = HtmlnanoPurgeCssPattern[] | {
+    standard?: HtmlnanoPurgeCssPattern[];
+    deep?: RegExp[];
+    greedy?: RegExp[];
+    variables?: HtmlnanoPurgeCssPattern[];
+    keyframes?: HtmlnanoPurgeCssPattern[];
+};
+interface HtmlnanoPurgeCssOptions {
+    tool: 'purgeCSS';
+    defaultExtractor?: HtmlnanoPurgeCssDefaultExtractor;
+    fontFace?: boolean;
+    keyframes?: boolean;
+    output?: string;
+    rejected?: boolean;
+    rejectedCss?: boolean;
+    sourceMap?: boolean | HtmlnanoPurgeCssSourceMapOptions;
+    stdin?: boolean;
+    stdout?: boolean;
+    variables?: boolean;
+    safelist?: HtmlnanoPurgeCssSafelist;
+    blocklist?: HtmlnanoPurgeCssPattern[];
+    skippedContentGlobs?: string[];
+    dynamicAttributes?: string[];
+}
 interface HtmlnanoOptions {
     skipConfigLoading?: boolean;
     configPath?: string;
@@ -33,16 +79,16 @@ interface HtmlnanoOptions {
     minifyUrls?: URL | string | false;
     mergeStyles?: boolean;
     mergeScripts?: boolean;
-    minifyCss?: Options | boolean;
+    minifyCss?: HtmlnanoMinifyCssOptions | boolean;
     minifyHtmlTemplate?: MinifyHtmlTemplateOptions;
     minifyConditionalComments?: boolean;
-    minifyJs?: MinifyOptions | boolean;
+    minifyJs?: HtmlnanoMinifyJsOptions | boolean;
     minifyJson?: boolean;
     minifyAttributes?: boolean | {
         metaContent?: boolean;
         redundantWhitespaces?: 'safe' | 'agressive' | false;
     };
-    minifySvg?: Config | boolean;
+    minifySvg?: HtmlnanoMinifySvgOptions | boolean;
     normalizeAttributeValues?: boolean;
     removeAttributeQuotes?: boolean | {
         force?: boolean;
@@ -54,9 +100,8 @@ interface HtmlnanoOptions {
     };
     removeRedundantAttributes?: boolean;
     removeOptionalTags?: boolean;
-    removeUnusedCss?: boolean | ({
-        tool: 'purgeCSS';
-    } & Omit<UserDefinedOptions, 'content' | 'css' | 'extractors'>) | {
+    removeUnusedCss?: boolean | HtmlnanoPurgeCssOptions | {
+        tool?: 'uncss';
         banner?: boolean;
         csspath?: string;
         htmlroot?: string;

package/dist/presets/max.d.ts

@@ -1,17 +1,14 @@
 import PostHTML from 'posthtml';
-import { MinifyOptions } from 'terser';
-import { Options } from 'cssnano';
-import { Config } from 'svgo';
-import { UserDefinedOptions } from 'purgecss';
 
-type PostHTMLTreeLike = [PostHTML.Node] & PostHTML.NodeAPI & {
+type PostHTMLNodeLike = PostHTML.Node | string;
+type PostHTMLTreeLike = [PostHTMLNodeLike] & PostHTML.NodeAPI & {
     options?: {
         quoteAllAttributes?: boolean | undefined;
         quoteStyle?: 0 | 1 | 2 | undefined;
         replaceQuote?: boolean | undefined;
     } | undefined;
     render(): string;
-    render(node: PostHTML.Node | PostHTMLTreeLike, renderOptions?: any): string;
+    render(node: PostHTMLNodeLike | PostHTMLTreeLike, renderOptions?: any): string;
 };
 type MaybeArray<T> = T | Array<T>;
 type HtmlnanoTemplateRule = {
@@ -19,6 +16,55 @@ type HtmlnanoTemplateRule = {
     attrs?: Record<string, string | boolean | void>;
 };
 type MinifyHtmlTemplateOptions = boolean | HtmlnanoTemplateRule[];
+type HtmlnanoMinifyCssOptions = object;
+type HtmlnanoMinifyJsOptions = object;
+type HtmlnanoMinifySvgOptions = object;
+type HtmlnanoPurgeCssPattern = string | RegExp;
+type HtmlnanoPurgeCssExtractorResultDetailed = {
+    attributes: {
+        names: string[];
+        values: string[];
+    };
+    classes: string[];
+    ids: string[];
+    tags: string[];
+    undetermined: string[];
+};
+type HtmlnanoPurgeCssExtractorResult = HtmlnanoPurgeCssExtractorResultDetailed | string[];
+type HtmlnanoPurgeCssDefaultExtractor = (content: string) => HtmlnanoPurgeCssExtractorResult;
+type HtmlnanoPurgeCssSourceMapOptions = {
+    absolute?: boolean;
+    annotation?: boolean | string;
+    from?: string;
+    inline?: boolean;
+    prev?: boolean | object | string;
+    sourcesContent?: boolean;
+    to?: string;
+};
+type HtmlnanoPurgeCssSafelist = HtmlnanoPurgeCssPattern[] | {
+    standard?: HtmlnanoPurgeCssPattern[];
+    deep?: RegExp[];
+    greedy?: RegExp[];
+    variables?: HtmlnanoPurgeCssPattern[];
+    keyframes?: HtmlnanoPurgeCssPattern[];
+};
+interface HtmlnanoPurgeCssOptions {
+    tool: 'purgeCSS';
+    defaultExtractor?: HtmlnanoPurgeCssDefaultExtractor;
+    fontFace?: boolean;
+    keyframes?: boolean;
+    output?: string;
+    rejected?: boolean;
+    rejectedCss?: boolean;
+    sourceMap?: boolean | HtmlnanoPurgeCssSourceMapOptions;
+    stdin?: boolean;
+    stdout?: boolean;
+    variables?: boolean;
+    safelist?: HtmlnanoPurgeCssSafelist;
+    blocklist?: HtmlnanoPurgeCssPattern[];
+    skippedContentGlobs?: string[];
+    dynamicAttributes?: string[];
+}
 interface HtmlnanoOptions {
     skipConfigLoading?: boolean;
     configPath?: string;
@@ -33,16 +79,16 @@ interface HtmlnanoOptions {
     minifyUrls?: URL | string | false;
     mergeStyles?: boolean;
     mergeScripts?: boolean;
-    minifyCss?: Options | boolean;
+    minifyCss?: HtmlnanoMinifyCssOptions | boolean;
     minifyHtmlTemplate?: MinifyHtmlTemplateOptions;
     minifyConditionalComments?: boolean;
-    minifyJs?: MinifyOptions | boolean;
+    minifyJs?: HtmlnanoMinifyJsOptions | boolean;
     minifyJson?: boolean;
     minifyAttributes?: boolean | {
         metaContent?: boolean;
         redundantWhitespaces?: 'safe' | 'agressive' | false;
     };
-    minifySvg?: Config | boolean;
+    minifySvg?: HtmlnanoMinifySvgOptions | boolean;
     normalizeAttributeValues?: boolean;
     removeAttributeQuotes?: boolean | {
         force?: boolean;
@@ -54,9 +100,8 @@ interface HtmlnanoOptions {
     };
     removeRedundantAttributes?: boolean;
     removeOptionalTags?: boolean;
-    removeUnusedCss?: boolean | ({
-        tool: 'purgeCSS';
-    } & Omit<UserDefinedOptions, 'content' | 'css' | 'extractors'>) | {
+    removeUnusedCss?: boolean | HtmlnanoPurgeCssOptions | {
+        tool?: 'uncss';
         banner?: boolean;
         csspath?: string;
         htmlroot?: string;

package/dist/presets/safe.d.ts

@@ -1,17 +1,14 @@
 import PostHTML from 'posthtml';
-import { MinifyOptions } from 'terser';
-import { Options } from 'cssnano';
-import { Config } from 'svgo';
-import { UserDefinedOptions } from 'purgecss';
 
-type PostHTMLTreeLike = [PostHTML.Node] & PostHTML.NodeAPI & {
+type PostHTMLNodeLike = PostHTML.Node | string;
+type PostHTMLTreeLike = [PostHTMLNodeLike] & PostHTML.NodeAPI & {
     options?: {
         quoteAllAttributes?: boolean | undefined;
         quoteStyle?: 0 | 1 | 2 | undefined;
         replaceQuote?: boolean | undefined;
     } | undefined;
     render(): string;
-    render(node: PostHTML.Node | PostHTMLTreeLike, renderOptions?: any): string;
+    render(node: PostHTMLNodeLike | PostHTMLTreeLike, renderOptions?: any): string;
 };
 type MaybeArray<T> = T | Array<T>;
 type HtmlnanoTemplateRule = {
@@ -19,6 +16,55 @@ type HtmlnanoTemplateRule = {
     attrs?: Record<string, string | boolean | void>;
 };
 type MinifyHtmlTemplateOptions = boolean | HtmlnanoTemplateRule[];
+type HtmlnanoMinifyCssOptions = object;
+type HtmlnanoMinifyJsOptions = object;
+type HtmlnanoMinifySvgOptions = object;
+type HtmlnanoPurgeCssPattern = string | RegExp;
+type HtmlnanoPurgeCssExtractorResultDetailed = {
+    attributes: {
+        names: string[];
+        values: string[];
+    };
+    classes: string[];
+    ids: string[];
+    tags: string[];
+    undetermined: string[];
+};
+type HtmlnanoPurgeCssExtractorResult = HtmlnanoPurgeCssExtractorResultDetailed | string[];
+type HtmlnanoPurgeCssDefaultExtractor = (content: string) => HtmlnanoPurgeCssExtractorResult;
+type HtmlnanoPurgeCssSourceMapOptions = {
+    absolute?: boolean;
+    annotation?: boolean | string;
+    from?: string;
+    inline?: boolean;
+    prev?: boolean | object | string;
+    sourcesContent?: boolean;
+    to?: string;
+};
+type HtmlnanoPurgeCssSafelist = HtmlnanoPurgeCssPattern[] | {
+    standard?: HtmlnanoPurgeCssPattern[];
+    deep?: RegExp[];
+    greedy?: RegExp[];
+    variables?: HtmlnanoPurgeCssPattern[];
+    keyframes?: HtmlnanoPurgeCssPattern[];
+};
+interface HtmlnanoPurgeCssOptions {
+    tool: 'purgeCSS';
+    defaultExtractor?: HtmlnanoPurgeCssDefaultExtractor;
+    fontFace?: boolean;
+    keyframes?: boolean;
+    output?: string;
+    rejected?: boolean;
+    rejectedCss?: boolean;
+    sourceMap?: boolean | HtmlnanoPurgeCssSourceMapOptions;
+    stdin?: boolean;
+    stdout?: boolean;
+    variables?: boolean;
+    safelist?: HtmlnanoPurgeCssSafelist;
+    blocklist?: HtmlnanoPurgeCssPattern[];
+    skippedContentGlobs?: string[];
+    dynamicAttributes?: string[];
+}
 interface HtmlnanoOptions {
     skipConfigLoading?: boolean;
     configPath?: string;
@@ -33,16 +79,16 @@ interface HtmlnanoOptions {
     minifyUrls?: URL | string | false;
     mergeStyles?: boolean;
     mergeScripts?: boolean;
-    minifyCss?: Options | boolean;
+    minifyCss?: HtmlnanoMinifyCssOptions | boolean;
     minifyHtmlTemplate?: MinifyHtmlTemplateOptions;
     minifyConditionalComments?: boolean;
-    minifyJs?: MinifyOptions | boolean;
+    minifyJs?: HtmlnanoMinifyJsOptions | boolean;
     minifyJson?: boolean;
     minifyAttributes?: boolean | {
         metaContent?: boolean;
         redundantWhitespaces?: 'safe' | 'agressive' | false;
     };
-    minifySvg?: Config | boolean;
+    minifySvg?: HtmlnanoMinifySvgOptions | boolean;
     normalizeAttributeValues?: boolean;
     removeAttributeQuotes?: boolean | {
         force?: boolean;
@@ -54,9 +100,8 @@ interface HtmlnanoOptions {
     };
     removeRedundantAttributes?: boolean;
     removeOptionalTags?: boolean;
-    removeUnusedCss?: boolean | ({
-        tool: 'purgeCSS';
-    } & Omit<UserDefinedOptions, 'content' | 'css' | 'extractors'>) | {
+    removeUnusedCss?: boolean | HtmlnanoPurgeCssOptions | {
+        tool?: 'uncss';
         banner?: boolean;
         csspath?: string;
         htmlroot?: string;

package/dist/presets/safe.js

@@ -43,7 +43,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
     },
     minifyHtmlTemplate: true,
     minifyJs: {},
-    minifyJson: {},
+    minifyJson: true,
     minifySvg: {
         plugins: [
             {

package/dist/presets/safe.mjs

@@ -41,7 +41,7 @@
     },
     minifyHtmlTemplate: true,
     minifyJs: {},
-    minifyJson: {},
+    minifyJson: true,
     minifySvg: {
         plugins: [
             {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "htmlnano",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "description": "Modular HTML minifier, built on top of the PostHTML",
   "author": "Kirill Maltsev <maltsevkirill@gmail.com>",
   "license": "MIT",
@@ -9,14 +9,16 @@
     "build": "npm run clean && bunchee",
     "postbuild": "chmod +x dist/bin.js",
     "compile": "npm run build",
+    "release": "node scripts/release.js",
     "lint:eslint": "eslint --fix .",
     "lint:duplicates": "jscpd",
     "lint:knip": "knip",
     "lint": "npm run lint:eslint && npm run lint:duplicates && npm run lint:knip",
-    "test:mocha": "mocha --timeout 5000 --require @swc-node/register --recursive --check-leaks --globals addresses 'test/**/*.ts'",
-    "pretest": "npm run lint && npm run compile",
+    "test:types": "tsc --noEmit -p tsconfig.typecheck.json",
+    "test:mocha": "mocha --timeout 5000 --require @swc-node/register --recursive --ignore 'test/typecheck/**/*.ts' --check-leaks --globals addresses 'test/**/*.ts'",
+    "pretest": "npm run lint && npm run compile && npm run test:types",
     "test": "c8 -r text -r html npm run test:mocha",
-    "posttest": "c8 check-coverage --lines 87 --per-file",
+    "posttest": "c8 check-coverage --lines 85 --per-file",
     "prepare": "npm run compile"
   },
   "files": [
@@ -66,7 +68,7 @@
     "posthtml": "^0.16.5"
   },
   "devDependencies": {
-    "@eslint/js": "^9.35.0",
+    "@eslint/js": "^10.0.1",
     "@stylistic/eslint-plugin": "^5.3.1",
     "@swc-node/register": "^1.10.10",
     "@types/mocha": "^10.0.10",
@@ -74,14 +76,14 @@
     "bunchee": "^6.5.1",
     "c8": "^11.0.0",
     "cssnano": "^7.0.0",
-    "eslint": "^9.25.1",
-    "eslint-config-flat-gitignore": "^2.1.0",
-    "eslint-plugin-import-x": "^4.11.0",
-    "eslint-plugin-unused-imports": "^4.1.4",
+    "eslint": "^10.2.0",
+    "eslint-config-flat-gitignore": "^2.3.0",
+    "eslint-plugin-import-x": "^4.16.2",
+    "eslint-plugin-unused-imports": "^4.4.1",
     "expect": "^30.1.1",
     "globals": "^17.0.0",
     "jscpd": "^4.0.8",
-    "knip": "^5.83.1",
+    "knip": "^6.0.2",
     "mocha": "^11.0.1",
     "postcss": "^8.3.11",
     "purgecss": "^8.0.0",
@@ -90,8 +92,8 @@
     "srcset": "^5.0.1",
     "svgo": "^4.0.0",
     "terser": "^5.21.0",
-    "typescript": "^5.8.3",
-    "typescript-eslint": "^8.44.0",
+    "typescript": "^6.0.2",
+    "typescript-eslint": "^8.58.1",
     "uncss": "^0.17.3"
   },
   "peerDependencies": {