From df5d839074ef3b81eb66c341896fde54a3834aa8 Mon Sep 17 00:00:00 2001
From: Sped0n <realsped0n@outlook.com>
Date: Wed, 1 Nov 2023 23:09:53 +0800
Subject: [PATCH] chore(link.html): update critical style source and options to
 improve performance and maintainability chore(link.html): update main style
 source and options to improve performance and maintainability
 chore(link.html): remove unused meta.html file chore(nav.html): update
 decrement and increment buttons to use Unicode characters for better
 accessibility chore(plugin/style.html): update style plugin to support inline
 styles for critical CSS chore(plugin/style.html): update style plugin to
 support minification and fingerprinting for main CSS
 chore(plugin/style.html): remove script plugin as it is no longer used
 chore(plugin/style.html): update style plugin to support inline styles for
 critical CSS chore(plugin/style.html): update style plugin to support
 minification and fingerprinting for main CSS chore(resources/imageJSON.html):
 update image resize options for better performance and quality

---
 layouts/partials/head/link.html           | 20 ++++++-----
 layouts/partials/head/meta.html           |  1 -
 layouts/partials/nav.html                 |  4 +--
 layouts/partials/plugin/script.html       | 41 -----------------------
 layouts/partials/plugin/style.html        |  7 ++--
 layouts/partials/resources/imageJSON.html |  2 +-
 6 files changed, 18 insertions(+), 57 deletions(-)
 delete mode 100644 layouts/partials/plugin/script.html

diff --git a/layouts/partials/head/link.html b/layouts/partials/head/link.html
index 6b1ee7e..3b28a7b 100644
--- a/layouts/partials/head/link.html
+++ b/layouts/partials/head/link.html
@@ -1,25 +1,27 @@
 {{/* fingerprint */}}
 {{- $fingerprint := .Scratch.Get "fingerprint" | default "" -}}
 
-{{/* main style */}}
-{{- $style := dict "Source" "scss/style.scss" "Fingerprint" $fingerprint -}}
-{{- $options := dict "targetPath" "css/style.css" "enableSourceMap" true -}}
-{{- $style = dict "Context" . "ToCSS" $options "Minify" hugo.IsProduction | merge $style -}}
+{{/* critical style */}}
+{{- $style := dict "Source" "scss/critical.scss" "Fingerprint" $fingerprint -}}
+{{- $options := dict "enableSourceMap" true "includePaths" (slice "node_modules") -}}
+{{- $style = dict "Context" . "ToCSS" $options "Inline" true | merge $style -}}
 {{- partial "plugin/style.html" $style -}}
 
+{{/* main style */}}
+{{- $style := dict "Source" "scss/style.scss" "Fingerprint" $fingerprint -}}
+{{- $options := dict "targetPath" "css/style.css" "enableSourceMap" true "includePaths" (slice "node_modules") -}}
+{{- $style = dict "Context" . "ToCSS" $options "Minify" hugo.IsProduction "Defer" true | merge $style -}}
 {{- partial "plugin/style.html" $style -}}
 
 {{/* main js */}}
-{{- $esBuildOpts := dict "minify" hugo.IsProduction "targetPath" "js/main.js" -}}
-{{- $script := dict "Source" "ts/main.ts" "Fingerprint" $fingerprint "Defer" true -}}
-{{- $script = dict "ToESBuild" $esBuildOpts "Minify" hugo.IsProduction | merge $script -}}
-{{- partial "plugin/script.html" $script -}}
+<script type="module" src="js/main.js" defer></script>
 
 {{/* fonts */}}
 <link
   rel="preload"
-  href="/lib/fonts/HelveticaNowText-Regular.woff2"
+  href="/lib/fonts/GeistVF.woff2"
   as="font"
   type="font/woff2"
   crossorigin
 />
+<link rel="preload" href="/lib/fonts/fw.svg" as="font" type="font/svg" crossorigin />
diff --git a/layouts/partials/head/meta.html b/layouts/partials/head/meta.html
index 8b13789..e69de29 100644
--- a/layouts/partials/head/meta.html
+++ b/layouts/partials/head/meta.html
@@ -1 +0,0 @@
-
diff --git a/layouts/partials/nav.html b/layouts/partials/nav.html
index ad2144d..9bfa0fd 100644
--- a/layouts/partials/nav.html
+++ b/layouts/partials/nav.html
@@ -19,10 +19,10 @@
   <div class="threshold">
     <span>Threshold:</span>
     <span>
-      <button class="dec">－</button>
+      <button class="dec">&#xFF0D;</button>
       <span class="num"></span><span class="num"></span><span class="num"></span
       ><span class="num"></span>
-      <button class="inc">＋</button>
+      <button class="inc">&#xFF0B;</button>
     </span>
   </div>
   <div class="index">
diff --git a/layouts/partials/plugin/script.html b/layouts/partials/plugin/script.html
deleted file mode 100644
index b5eb390..0000000
--- a/layouts/partials/plugin/script.html
+++ /dev/null
@@ -1,41 +0,0 @@
-{{- if .Content -}}
-    <script type="text/javascript">
-        {{- .Content | safeJS -}}
-    </script>
-{{- else if strings.HasPrefix .Source "<script" -}}
-  {{- safeHTML .Source -}}
-{{- else -}}
-  {{- $src := .Source -}}
-  {{- $integrity := .Integrity -}}
-  {{- if $src -}}
-    {{- if (urls.Parse $src).Host | not -}}
-      {{- $resource := resources.Get $src -}}
-      {{- with .Template -}}
-        {{- $resource = $resource | resources.ExecuteAsTemplate . $.Context -}}
-      {{- end -}}
-      {{- with .ToESBuild -}}
-        {{- $resource = $resource | js.Build . -}}
-      {{- end -}}
-      {{- if .Minify -}}
-        {{- $resource = $resource | minify -}}
-      {{- end -}}
-      {{- with .Fingerprint -}}
-        {{- $resource = $resource | fingerprint . -}}
-        {{- $integrity = $resource.Data.Integrity -}}
-      {{- end -}}
-      {{- $src = $resource.RelPermalink -}}
-    {{- end -}}
-  {{- end -}}
-  {{- with .Link -}}
-    {{- $src = . -}}
-  {{- end -}}
-  <script
-    type="text/javascript"
-    src="{{ $src }}"
-    {{ if .Crossorigin }}crossorigin="anonymous"{{ end }}{{ with $integrity }}
-      integrity="{{ . }}"
-    {{ end }}{{ if .Async }}async{{ end }}{{ if .Defer }}defer{{ end }}{{ with .Attr }}
-      {{ . | safeHTMLAttr }}
-    {{ end }}
-  ></script>
-{{- end -}}
diff --git a/layouts/partials/plugin/style.html b/layouts/partials/plugin/style.html
index 8bf6d98..c5f426b 100644
--- a/layouts/partials/plugin/style.html
+++ b/layouts/partials/plugin/style.html
@@ -18,7 +18,7 @@
       {{- $options := . | merge (dict "outputStyle" "compressed") -}}
       {{- $resource = $resource | toCSS $options -}}
     {{- end -}}
-    {{- if .Minify -}}
+    {{- if or .Minify .Inline -}}
       {{- $resource = $resource | minify -}}
     {{- end -}}
     {{- with .Fingerprint -}}
@@ -27,7 +27,9 @@
     {{- end -}}
     {{- $href = $resource.RelPermalink -}}
   {{- end -}}
-  {{- if .Defer -}}
+  {{- if .Inline -}}
+    <style>{{- $resource.Content | safeCSS -}}</style>
+  {{- else if .Defer -}}
     <link
       rel="preload"
       as="style"
@@ -55,4 +57,3 @@
     />
   {{- end -}}
 {{- end -}}
-
diff --git a/layouts/partials/resources/imageJSON.html b/layouts/partials/resources/imageJSON.html
index c1a92b8..e10069f 100644
--- a/layouts/partials/resources/imageJSON.html
+++ b/layouts/partials/resources/imageJSON.html
@@ -6,7 +6,7 @@
   {{ $Page.Scratch.Add "img" slice }}
   {{ range . }}
     {{ $index = sub $index 1 }}
-    {{ $lores := .Resize "1000x webp Lanczos q70" }}
+    {{ $lores := .Resize "800x webp Lanczos q60" }}
     {{ $hires := .Resize "2500x webp Lanczos q75" }}
     {{ $Page.Scratch.Add "img" (dict
       "index" (int $index)