feat: preload some stylesheets and rename some plugin partials

2022-05-14 02:28:35 +08:00
parent f4c7857f4f
commit a0c340316a
15 changed files with 76 additions and 45 deletions
--- a/layouts/partials/head/link.html
+++ b/layouts/partials/head/link.html
@@ -30,17 +30,17 @@
 {{- end -}}

 {{- /* style.min.css */ -}}
-{{- $style := dict "Source" "css/style.scss" "Fingerprint" $fingerprint -}}
-{{- $options := dict "targetPath" "css/style.min.css" "enableSourceMap" true -}}
-{{- $style = dict "Context" . "ToCSS" $options | merge $style -}}
-{{- partial "plugin/style.html" $style -}}
+{{- $options := dict "Source" "css/style.scss" "Fingerprint" $fingerprint -}}
+{{- $toCSS := dict "targetPath" "css/style.min.css" "enableSourceMap" true -}}
+{{- $options = dict "Context" . "ToCSS" $toCSS | merge $options -}}
+{{- partial "plugin/style.html" $options -}}

 {{- /* Font Awesome */ -}}
 {{- $source := $cdn.fontawesomeFreeCSS | default "lib/fontawesome-free/all.min.css" -}}
-{{- $style := dict "Source" $source "Fingerprint" $fingerprint -}}
-{{- partial "plugin/style.html" $style -}}
+{{- $options := dict "Source" $source "Fingerprint" $fingerprint "Preload" true -}}
+{{- partial "plugin/style.html" $options -}}

 {{- /* Animate.css */ -}}
 {{- $source := $cdn.animateCSS | default "lib/animate/animate.min.css" -}}
-{{- $style := dict "Source" $source "Fingerprint" $fingerprint -}}
-{{- partial "plugin/style.html" $style -}}
+{{- $options := dict "Source" $source "Fingerprint" $fingerprint "Preload" true -}}
+{{- partial "plugin/style.html" $options -}}
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -5,7 +5,7 @@
            <a href="{{ .Site.Home.RelPermalink }}" title="{{ .Site.Title }}">
                {{- with .Site.Params.header.title -}}
                    {{- with .logo -}}
-                        {{- dict "Src" . "Class" "logo" | partial "plugin/image.html" -}}
+                        {{- dict "Src" . "Class" "logo" | partial "plugin/img.html" -}}
                    {{- end -}}
                    {{- with .pre -}}
                        <span class="header-title-pre">{{ . | safeHTML }}</span>
@@ -92,7 +92,7 @@
                <a href="{{ .Site.Home.RelPermalink }}" title="{{ .Site.Title }}">
                    {{- with .Site.Params.header.title -}}
                        {{- with .logo -}}
-                            {{- dict "Src" . "Class" "logo" | partial "plugin/image.html" -}}
+                            {{- dict "Src" . "Class" "logo" | partial "plugin/img.html" -}}
                        {{- end -}}
                        {{- with .pre -}}
                            <span class="header-title-pre">{{ . | safeHTML }}</span>
--- a/layouts/partials/home/profile.html
+++ b/layouts/partials/home/profile.html
@@ -13,10 +13,10 @@
                    {{- $url = .RelPermalink -}}
                {{- end -}}
                <a href="{{ $url }}"{{ with .Title | default .Name }} title="{{ . }}"{{ end }}{{ if (urls.Parse $url).Host }} rel="noopener noreffer" target="_blank"{{ end }}>
-                    {{- dict "Src" $avatar | partial "plugin/image.html" -}}
+                    {{- dict "Src" $avatar | partial "plugin/img.html" -}}
                </a>
            {{- else -}}
-                {{- dict "Src" $avatar | partial "plugin/image.html" -}}
+                {{- dict "Src" $avatar | partial "plugin/img.html" -}}
            {{- end -}}
        </div>
    {{- end -}}
--- a/layouts/partials/plugin/link.html
+++ b/layouts/partials/plugin/link.html
@@ -6,4 +6,4 @@
    {{- with .Content -}}
        {{- . | safeHTML -}}
    {{- end -}}
-</a>
+</a>
--- a/layouts/partials/plugin/image.html
+++ b/layouts/partials/plugin/image.html
--- a/layouts/partials/plugin/script.html
+++ b/layouts/partials/plugin/script.html
@@ -1,25 +1,41 @@
-{{- if .Content -}}
-    <script type="text/javascript">
-        {{- .Content | safeJS -}}
-    </script>
-{{- else if strings.HasPrefix .Source "<script" -}}
-    {{- safeHTML .Source -}}
+{{- with .Content -}}
+    <script type="text/javascript">{{ . | safeJS }}</script>
 {{- else -}}
-    {{- $src := .Source -}}
-    {{- $integrity := .Integrity -}}
-    {{- if (urls.Parse $src).Host | not -}}
-        {{- $resource := resources.Get $src -}}
-        {{- with .Template -}}
-            {{- $resource = $resource | resources.ExecuteAsTemplate . $.Context -}}
+    {{- if strings.HasPrefix .Source "<script" -}}
+        {{- safeHTML .Source -}}
+    {{- else -}}
+        {{- $src := .Source -}}
+        {{- $integrity := .Integrity -}}
+        {{- if (urls.Parse $src).Host | not -}}
+            {{- $resource := resources.Get $src -}}
+            {{- with .Template -}}
+                {{- $resource = $resource | resources.ExecuteAsTemplate . $.Context -}}
+            {{- end -}}
+            {{- if .Minify -}}
+                {{- $resource = $resource | minify -}}
+            {{- end -}}
+            {{- with .Fingerprint -}}
+                {{- $resource = $resource | fingerprint . -}}
+                {{- $integrity = $resource.Data.Integrity -}}
+            {{- end -}}
+            {{- $src = $resource.RelPermalink -}}
        {{- end -}}
-        {{- if .Minify -}}
-            {{- $resource = $resource | minify -}}
+        {{- $attrs := printf `src="%v"` $src -}}
+        {{- if .Crossorigin -}}
+            {{- $attrs = ` crossorigin="anonymous"` | add $attrs -}}
        {{- end -}}
-        {{- with .Fingerprint -}}
-            {{- $resource = $resource | fingerprint . -}}
-            {{- $integrity = $resource.Data.Integrity -}}
+        {{- with $integrity -}}
+            {{- $attrs = printf ` integrity="%v"` . | add $attrs -}}
        {{- end -}}
-        {{- $src = $resource.RelPermalink -}}
+        {{- if .Async -}}
+            {{- $attrs = " async" | add $attrs -}}
+        {{- end -}}
+        {{- if .Defer -}}
+            {{- $attrs = " defer" | add $attrs -}}
+        {{- end -}}
+        {{- with .Attr -}}
+            {{- $attrs = add " " . | add $attrs -}}
+        {{- end -}}
+        <script type="text/javascript" {{ $attrs | safeHTMLAttr }}></script>
    {{- 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 -}}
--- a/layouts/partials/plugin/social.html
+++ b/layouts/partials/plugin/social.html
@@ -8,4 +8,4 @@
    {{- end -}}
    {{- $destination = printf (string $template) .Id -}}
 {{- end -}}
-{{- dict "Destination" $destination "Rel" "me" | merge . | partial "plugin/link.html" -}}
+{{- dict "Destination" $destination "Rel" "me" | merge . | partial "plugin/a.html" -}}
--- a/layouts/partials/plugin/style.html
+++ b/layouts/partials/plugin/style.html
@@ -27,5 +27,20 @@
        {{- end -}}
        {{- $href = $resource.RelPermalink -}}
    {{- end -}}
-    <link rel="stylesheet" href="{{ $href }}"{{ if .Crossorigin }} crossorigin="anonymous"{{ end }}{{ with $integrity }} integrity="{{ . }}"{{ end }}{{ with .Attr }} {{ . | safeHTMLAttr }}{{ end }}>
+    {{- $attrs := printf `href="%v"` $href -}}
+    {{- if .Crossorigin -}}
+        {{- $attrs = ` crossorigin="anonymous"` | add $attrs -}}
+    {{- end -}}
+    {{- with $integrity -}}
+        {{- $attrs = printf ` integrity="%v"` . | add $attrs -}}
+    {{- end -}}
+    {{- with .Attr -}}
+        {{- $attrs = add " " . | add $attrs -}}
+    {{- end -}}
+    {{- if .Preload -}}
+        <link rel="preload" {{ $attrs | safeHTMLAttr }} as="style" onload="this.onload=null;this.rel='stylesheet'">
+        <noscript></noscript><link rel="stylesheet" {{ $attrs | safeHTMLAttr }}></noscript>
+    {{- else -}}
+        <link rel="stylesheet" {{ $attrs | safeHTMLAttr }}>
+    {{- end -}}
 {{- end -}}