Pull #112 to Staging

Signed-off-by: 1bl4z3r <[email protected]>

hugo.toml.example

@@ -122,6 +122,8 @@ expiryDate = ["expiryDate"]
   # siteNoIndex = false
   # noIndexPages = ["404 Page not found"]
   # usesAnimation = true
+  # mathjaxLib = "https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-chtml.js"
+  # mermaidLib = "https://cdn.jsdelivr.net/npm/mermaid/dist/mermaid.esm.min.mjs"
 
   [[params.socialLinks]]
     name = "mastodon"

layouts/partials/footer.html

@@ -13,5 +13,5 @@
 	&#183; Made with <a href="https://gohugo.io/" target="_blank" rel="noopener">Hugo</a>
 	&#183; Theme <a href="https://github.com/1bl4z3r/hermit-V2" target="_blank" rel="noopener">Hermit-V2</a>
 	{{- end -}}
-	{{- with .OutputFormats.Get "RSS" }}&#183; <a href="{{ "posts/index.xml" | absLangURL }}" target="_blank" title="rss">{{- partial "svg.html" (dict "context" . "name" "rss") -}}</a>{{- end -}}
+	{{- with .OutputFormats.Get "RSS" }}&#183; <a href="{{ "index.xml" | absLangURL }}" target="_blank" title="rss">{{- partial "svg.html" (dict "context" . "name" "rss") -}}</a>{{- end -}}
 </p>

layouts/partials/mathjax.html

@@ -1,6 +1,15 @@
 {{ if or (.Site.Params.global_mathjax) (.Params.mathjax) }}
-<script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-chtml.js"></script>
-{{ $mathjaxa := resources.Get "js/mathjax-assistant.js"}}
-{{ $mathjaxscript := slice $mathjaxa | resources.Concat "js/mathjaxs.js" | minify | fingerprint -}}
-<script type="text/javascript" id="MathJax-script" async src="{{ $mathjaxscript.Permalink }}" {{ printf "integrity=%q" $mathjaxscript.Data.Integrity | safeHTMLAttr }} crossorigin="anonymous"></script>
+{{- with $mathjaxLib := $.Site.Params.mathjaxLib | default "https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-chtml.js" -}}
+{{- if not (or (findRE `http[s]{0,1}://` $mathjaxLib 1) (findRE `^\/.*` $mathjaxLib 1)) -}}
+{{ $mj := resources.Get $mathjaxLib }}
+<script id="MathJax-script" type="text/javascript" async src="{{ $mj.Permalink }}" {{ printf "integrity=%q" $mj.Data.Integrity | safeHTMLAttr }} crossorigin="anonymous"></script>
+{{- else if findRE `^\/.*` $mathjaxLib 1 -}}
+{{ $mj := printf "%s%s" $.Site.BaseURL (strings.TrimLeft "/" $mathjaxLib) }}
+<script id="MathJax-script" type="text/javascript" async src="{{ $mj }}" crossorigin="anonymous"></script>
+{{- else -}}
+<script id="MathJax-script" type="text/javascript" async src="{{ $mathjaxLib }}" crossorigin="anonymous"></script>
+{{- end -}}
+{{- end -}}
+{{ $mathjaxa := resources.Get "js/mathjax-assistant.js" | minify | fingerprint }}
+<script type="text/javascript" id="MathJax-script-helper" async src="{{ $mathjaxa.Permalink }}" {{ printf "integrity=%q" $mathjaxa.Data.Integrity | safeHTMLAttr }} crossorigin="anonymous"></script>
 {{ end }}

layouts/partials/mermaid.html

@@ -1,6 +1,23 @@
 {{- if .Page.Store.Get "hasMermaid" -}}
-    <script defer async type="module">
-      import mermaid from 'https://cdn.jsdelivr.net/npm/mermaid/dist/mermaid.esm.min.mjs';
-      mermaid.initialize({ startOnLoad: true,theme: 'dark' });
-    </script>
+  {{- $mermaid_initialize := `startOnLoad: true,theme: 'dark'` -}}
+  {{- with $mermaidLib := $.Site.Params.mermaidLib | default "https://cdn.jsdelivr.net/npm/mermaid/dist/mermaid.esm.min.mjs" -}}
+  {{- if not (or (findRE `http[s]{0,1}://` $mermaidLib 1) (findRE `^\/.*` $mermaidLib 1)) -}}
+  {{ $mm := resources.Get $mermaidLib }}
+  <script defer async type="module">
+    import mermaid from '{{ $mm.Permalink }}';
+    mermaid.initialize({ {{ $mermaid_initialize | safeJS }} });
+  </script>
+  {{- else if findRE `^\/.*` $mermaidLib 1 -}}
+  {{ $mm := printf "%s%s" $.Site.BaseURL (strings.TrimLeft "/" $mermaidLib) }}
+  <script defer async type="module">
+    import mermaid from '{{ $mm }}';
+    mermaid.initialize({ {{ $mermaid_initialize | safeJS }} });
+  </script>
+  {{- else -}}
+  <script defer async type="module">
+    import mermaid from '{{ $mermaidLib }}';
+    mermaid.initialize({ {{ $mermaid_initialize | safeJS }} });
+  </script>
+  {{- end -}}
+  {{- end -}}
 {{- end -}}

theme.toml

@@ -17,7 +17,7 @@ features = [
 [module]
   [module.hugoVersion]
     extended = true
-    min = '0.140'
+    min = '0.140.0'
 
 
 [author]