Merge branch 'master' into pr/dclimber/635

# Conflicts: # exampleSite/config.toml # layouts/partials/plugin/analytics.html
2022-06-04 22:47:19 +08:00
parent 56d01049ba f89bb12541
commit 06f101a1e5
2660 changed files with 17816 additions and 24389 deletions
--- a/layouts/partials/plugin/link.html
+++ b/layouts/partials/plugin/link.html
--- a/layouts/partials/plugin/analytics.html
+++ b/layouts/partials/plugin/analytics.html
@@ -20,8 +20,13 @@
        {{- dict "Source" ($analytics.fathom.server | default "cdn.usefathom.com" | printf "https://%v/tracker.js") "Async" true "Attr" "id=fathom-script" | partial "plugin/script.html" -}}
    {{- end -}}

-    {{- /* Yandex Metrika */ -}}
-    {{- with $analytics.yandexMetrika.id -}}
+    {{- /* Plausible Analytics */ -}}
+    {{- with $analytics.plausible.dataDomain -}}
+        {{- dict "Source" "https://plausible.io/js/plausible.js" "Async" true "Defer" true "Attr" ($analytics.plausible.dataDomain | printf `data-domain="%v"`) | partial "plugin/script.html" -}}
+    {{- end -}}
+
+    {{- /* Yandex Metrica */ -}}
+    {{- with $analytics.yandexMetrica.id -}}
        <script type="text/javascript" >
           (function(m,e,t,r,i,k,a){m[i]=m[i]||function(){(m[i].a=m[i].a||[]).push(arguments)};
           m[i].l=1*new Date();k=e.createElement(t),a=e.getElementsByTagName(t)[0],k.async=1,k.src=r,a.parentNode.insertBefore(k,a)})
@@ -34,5 +39,4 @@
           });
        </script>
        <noscript><div><img src="https://mc.yandex.ru/watch/{{ . }}" style="position:absolute; left:-9999px;" alt="" /></div></noscript>
-    {{- end -}}
 {{- end -}}
--- a/layouts/partials/plugin/icon.html
+++ b/layouts/partials/plugin/icon.html
@@ -1,5 +1,5 @@
 {{- with .Class -}}
-    <i class="{{ . }}"></i>
+    <i class="{{ . }}" aria-hidden="true"></i>
 {{- else -}}
    {{- $src := .Src -}}
    {{- with .Simpleicons -}}
@@ -9,5 +9,5 @@
    {{- if (urls.Parse $src).Host | not -}}
        {{- $src = (resources.Get $src | minify).RelPermalink -}}
    {{- end -}}
-    <i data-svg-src="{{ $src }}"></i>
+    <i data-svg-src="{{ $src }}" aria-hidden="true"></i>
 {{- end -}}
--- a/layouts/partials/plugin/image.html
+++ b/layouts/partials/plugin/image.html
@@ -1,7 +1,11 @@
-{{- /* lazysizes and lightgallery.js */ -}}
+{{- /* lazysizes and lightgallery */ -}}
 {{- $src := .Src -}}
-{{- with dict "Path" .Src "Resources" .Resources | partial "function/resource.html" -}}
+{{- $width := .Width -}}
+{{- $height := .Height -}}
+{{- with dict "Path" $src "Resources" .Resources | partial "function/resource.html" -}}
    {{- $src = .RelPermalink -}}
+    {{- $width = $width | default .Width -}}
+    {{- $height = $height | default .Height -}}
 {{- end -}}

 {{- $small := .SrcSmall | default $src -}}
@@ -21,18 +25,22 @@
        <img
            class="lazyload{{ with .Class }} {{ . }}{{ end }}"
            src="{{ $loading.RelPermalink }}"
-            data-src="{{ .Src | safeURL }}"
-            data-srcset="{{ $small | safeURL }}, {{ .Src | safeURL }} 1.5x, {{ $large | safeURL }} 2x"
+            data-src="{{ $src | safeURL }}"
+            data-srcset="{{ $small | safeURL }}, {{ $src | safeURL }} 1.5x, {{ $large | safeURL }} 2x"
            data-sizes="auto"
-            alt="{{ $alt }}"{{ with .Height }} height="{{ . }}"{{ end }}{{ with .Width }} width="{{ . }}"{{ end }} />
+            alt="{{ $alt }}"
+            {{- with $width }} width="{{ . }}"{{ end }}
+            {{- with $height }} height="{{ . }}"{{ end }} />
    </a>
 {{- else -}}
    <img
        class="lazyload{{ with .Class }} {{ . }}{{ end }}"
        src="{{ $loading.RelPermalink }}"
-        data-src="{{ .Src | safeURL }}"
-        data-srcset="{{ $small | safeURL }}, {{ .Src | safeURL }} 1.5x, {{ $large | safeURL }} 2x"
+        data-src="{{ $src | safeURL }}"
+        data-srcset="{{ $small | safeURL }}, {{ $src | safeURL }} 1.5x, {{ $large | safeURL }} 2x"
        data-sizes="auto"
        alt="{{ $alt }}"
-        title="{{ .Title | default $alt }}"{{ with .Height }} height="{{ . }}"{{ end }}{{ with .Width }} width="{{ . }}"{{ end }} />
+        title="{{ .Title | default $alt }}"
+        {{- with $width }} width="{{ . }}"{{ end }}
+        {{- with $height }} height="{{ . }}"{{ end }} />
 {{- end -}}
--- 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/share.html
+++ b/layouts/partials/plugin/share.html
@@ -106,91 +106,63 @@
        </a>
    {{- end -}}

-    {{- /* 016: Digg */ -}}
-    {{- if $share.Digg -}}
-        <a href="javascript:void(0);" title="{{ T `shareOn` }} Digg" data-sharer="digg" data-url="{{ .Permalink }}">
-            {{- dict "Class" "fab fa-digg fa-fw" | partial "plugin/icon.html" -}}
-        </a>
-    {{- end -}}
-
-    {{- /* 017: StumbleUpon */ -}}
-    {{- if $share.Stumbleupon -}}
-        <a href="javascript:void(0);" title="{{ T `shareOn` }} StumbleUpon" data-sharer="stumbleupon" data-url="{{ .Permalink }}" data-title="{{ .Title }}">
-            {{- dict "Class" "fab fa-stumbleupon fa-fw" | partial "plugin/icon.html" -}}
-        </a>
-    {{- end -}}
-
-    {{- /* 018: Flipboard */ -}}
+    {{- /* 016: Flipboard */ -}}
    {{- if $share.Flipboard -}}
        <a href="javascript:void(0);" title="{{ T `shareOn` }} Flipboard" data-sharer="flipboard" data-url="{{ .Permalink }}" data-title="{{ .Title }}">
            {{- dict "Class" "fab fa-flipboard fa-fw" | partial "plugin/icon.html" -}}
        </a>
    {{- end -}}

-    {{- /* 019: 微博 */ -}}
+    {{- /* 017: 微博 */ -}}
    {{- if $share.Weibo -}}
        <a href="javascript:void(0);" title="{{ T `shareOn` }} 微博" data-sharer="weibo" data-url="{{ .Permalink }}" data-title="{{ .Title }}"{{ with .Params.featuredImage }} data-image="{{ . }}"{{ end }}{{ with .Site.Params.Social.Weibo }} data-ralateuid="{{ . }}"{{ end }}>
            {{- dict "Class" "fab fa-weibo fa-fw" | partial "plugin/icon.html" -}}
        </a>
    {{- end -}}

-    {{- /* 020: 人人 */ -}}
-    {{- if $share.Renren -}}
-        <a href="javascript:void(0);" title="{{ T `shareOn` }} 人人" data-sharer="renren" data-url="{{ .Permalink }}">
-            {{- dict "Class" "fab fa-renren fa-fw" | partial "plugin/icon.html" -}}
-        </a>
-    {{- end -}}
-
-    {{- /* 021: Myspace */ -}}
-    {{- if $share.Myspace -}}
-        <a href="javascript:void(0);" title="{{ T `shareOn` }} Myspace" data-sharer="myspace" data-url="{{ .Permalink }}" data-title="{{ .Title }}" data-description="{{ .Description }}">
-            {{- dict "Simpleicons" "myspace" "Prefix" (.Scratch.Get "cdn" | default dict).simpleIconsPrefix | partial "plugin/icon.html" -}}
-        </a>
-    {{- end -}}
-
-    {{- /* 022: Blogger */ -}}
+    {{- /* 018: Blogger */ -}}
    {{- if $share.Blogger -}}
        <a href="javascript:void(0);" title="{{ T `shareOn` }} Blogger" data-sharer="blogger" data-url="{{ .Permalink }}" data-title="{{ .Title }}" data-description="{{ .Description }}">
            {{- dict "Class" "fab fa-blogger fa-fw" | partial "plugin/icon.html" -}}
        </a>
    {{- end -}}

-    {{- /* 023: 百度 */ -}}
+    {{- /* 019: 百度 */ -}}
    {{- if $share.Baidu -}}
        <a href="javascript:void(0);" title="{{ T `shareOn` }} 百度" data-sharer="baidu" data-url="{{ .Permalink }}" data-title="{{ .Title }}">
            {{- dict "Simpleicons" "baidu" "Prefix" (.Scratch.Get "cdn" | default dict).simpleIconsPrefix | partial "plugin/icon.html" -}}
        </a>
    {{- end -}}

-    {{- /* 024: OK.RU */ -}}
+    {{- /* 020: OK.RU */ -}}
    {{- if $share.Odnoklassniki -}}
        <a href="javascript:void(0);" title="{{ T `shareOn` }} OK.RU" data-sharer="okru" data-url="{{ .Permalink }}" data-title="{{ .Title }}">
            {{- dict "Class" "fab fa-odnoklassniki fa-fw" | partial "plugin/icon.html" -}}
        </a>
    {{- end -}}

-    {{- /* 025: Evernote */ -}}
+    {{- /* 021: Evernote */ -}}
    {{- if $share.Evernote -}}
        <a href="javascript:void(0);" title="{{ T `shareOn` }} Evernote" data-sharer="evernote" data-url="{{ .Permalink }}" data-title="{{ .Title }}">
            {{- dict "Class" "fab fa-evernote fa-fw" | partial "plugin/icon.html" -}}
        </a>
    {{- end -}}

-    {{- /* 026: Skype */ -}}
+    {{- /* 022: Skype */ -}}
    {{- if $share.Skype -}}
        <a href="javascript:void(0);" title="{{ T `shareOn` }} Skype" data-sharer="skype" data-url="{{ .Permalink }}" data-title="{{ .Title }}">
            {{- dict "Class" "fab fa-skype fa-fw" | partial "plugin/icon.html" -}}
        </a>
    {{- end -}}

-    {{- /* 027: Trello */ -}}
+    {{- /* 023: Trello */ -}}
    {{- if $share.Trello -}}
        <a href="javascript:void(0);" title="{{ T `shareOn` }} Trello" data-sharer="trello" data-url="{{ .Permalink }}" data-title="{{ .Title }}" data-description="{{ .Description }}">
            {{- dict "Class" "fab fa-trello fa-fw" | partial "plugin/icon.html" -}}
        </a>
    {{- end -}}

-    {{- /* 028: Mix */ -}}
+    {{- /* 024: Mix */ -}}
    {{- if $share.Mix -}}
        <a href="//mix.com/add?url={{ .Permalink }}&amp;description={{ .Title }}" target="_blank" title="{{ T `shareOn` }} Mix">
            {{- dict "Class" "fab fa-mix fa-fw" | partial "plugin/icon.html" -}}
--- 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><link rel="stylesheet" {{ $attrs | safeHTMLAttr }}></noscript>
+    {{- else -}}
+        <link rel="stylesheet" {{ $attrs | safeHTMLAttr }}>
+    {{- end -}}
 {{- end -}}