From 7f0081726a292f5e4311d18e212b0cd82a602b54 Mon Sep 17 00:00:00 2001
From: Ari Archer <ari.web.xyz@gmail.com>
Date: Fri, 6 Oct 2023 21:56:06 +0300
Subject: [PATCH] update @ Fri Oct  6 21:56:06 EEST 2023

Signed-off-by: Ari Archer <ari.web.xyz@gmail.com>
---
 netlify.toml                                         |  2 +-
 .../requirements-extra.txt => requirements-extra.txt |  0
 requirements/requirements.txt => requirements.txt    |  2 +-
 rust-toolchain.toml                                  |  2 --
 scripts/blog.py                                      | 12 +++++++-----
 scripts/netlify.sh                                   | 12 ------------
 6 files changed, 9 insertions(+), 21 deletions(-)
 rename requirements/requirements-extra.txt => requirements-extra.txt (100%)
 rename requirements/requirements.txt => requirements.txt (67%)
 delete mode 100644 rust-toolchain.toml
 delete mode 100644 scripts/netlify.sh

diff --git a/netlify.toml b/netlify.toml
index f19d1ed..8681664 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -1,5 +1,5 @@
 [build]
-    command = "sh scripts/netlify.sh"
+    command = "CI=1 NOCLR=1 python3 ./scripts/blog.py static"
 
 [[redirects]]
     from = "/git/*"
diff --git a/requirements/requirements-extra.txt b/requirements-extra.txt
similarity index 100%
rename from requirements/requirements-extra.txt
rename to requirements-extra.txt
diff --git a/requirements/requirements.txt b/requirements.txt
similarity index 67%
rename from requirements/requirements.txt
rename to requirements.txt
index 27e5dd0..494405f 100644
--- a/requirements/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-minify-html-onepass
+html-minifer
 rcssmin
 mistune
 typing
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
deleted file mode 100644
index 292fe49..0000000
--- a/rust-toolchain.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-[toolchain]
-channel = "stable"
diff --git a/scripts/blog.py b/scripts/blog.py
index 1b1adf9..748bc83 100755
--- a/scripts/blog.py
+++ b/scripts/blog.py
@@ -24,7 +24,7 @@ from threading import Thread
 from timeit import default_timer as code_timer
 from warnings import filterwarnings as filter_warnings
 
-import minify_html_onepass
+import html_minifier.minify  # type: ignore
 import mistune
 import mistune.core
 import mistune.inline_parser
@@ -571,6 +571,10 @@ def process_css_file(file: str, out: str) -> None:
         css.write(process_css_from_file(file))
 
 
+def min_html(code: str) -> str:
+    return html_minifier.minify.Minifier(code).minify()  # type: ignore
+
+
 # markdown
 
 TITLE_LINKS_RE: typing.Final[str] = r"<#:[^>]+?>"
@@ -891,7 +895,7 @@ def build(config: dict[str, typing.Any]) -> int:
 
         with open(f"{post_dir}/index.html", "w") as html:
             html.write(
-                minify_html_onepass.minify(
+                min_html(
                     POST_TEMPLATE.format(
                         lang=lang,
                         keywords=html_escape(
@@ -933,7 +937,6 @@ def build(config: dict[str, typing.Any]) -> int:
                         path=f"{config['posts-dir']}/{slug}",
                         license=config["license"],
                     ),
-                    True,
                 )
             )
 
@@ -949,7 +952,7 @@ def build(config: dict[str, typing.Any]) -> int:
 
     with open("index.html", "w") as index:
         index.write(
-            minify_html_onepass.minify(
+            min_html(
                 INDEX_TEMPLATE.format(  # type: ignore
                     lang=lang,
                     keywords=html_escape(", ".join(config["blog-keywords"])),
@@ -982,7 +985,6 @@ def build(config: dict[str, typing.Any]) -> int:
                         for slug, post in config["posts"].items()
                     ),
                 ),
-                True,
             )
         )
 
diff --git a/scripts/netlify.sh b/scripts/netlify.sh
deleted file mode 100644
index a6d6f4d..0000000
--- a/scripts/netlify.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-!/usr/bin/env sh
-
-set -xeu
-
-main() {
-    pip install -r requirements/requirements.txt
-    CI=1 NOCLR=1 python3 ./scripts/blog.py static
-    rm -rf ./scripts/ ./requirements/
-}
-
-main "$@"
-