Bump to mermaid 10.0.2

layouts/partials/scripts.html

@@ -66,7 +66,6 @@
 {{ $jsBase := resources.Get "js/base.js" -}}
 {{ $jsAnchor := resources.Get "js/anchor.js" -}}
 {{ $jsSearch := resources.Get "js/search.js" | resources.ExecuteAsTemplate "js/search.js" .Site.Home -}}
-{{ $jsMermaid := resources.Get "js/mermaid.js" | resources.ExecuteAsTemplate "js/mermaid.js" . -}}
 {{ $jsMarkmap := resources.Get "js/markmap.js" | resources.ExecuteAsTemplate "js/markmap.js" . -}}
 {{ $jsPlantuml := resources.Get "js/plantuml.js" | resources.ExecuteAsTemplate "js/plantuml.js" . -}}
 {{ $jsDrawio := resources.Get "js/drawio.js" | resources.ExecuteAsTemplate "js/drawio.js" . -}}
@@ -77,7 +76,6 @@
 {{ $jsArray := slice $jsBs $jsBase $jsAnchor $jsSearch $jsPlantuml $jsMarkmap $jsDrawio -}}
 
 {{ if $needmermaid -}}
-{{ $jsArray = $jsArray | append $jsMermaid -}}
 {{ partial "scripts/mermaid.html" . -}}
 {{ end -}}
 

layouts/partials/scripts/mermaid.html

@@ -1,19 +1,60 @@
-{{ $version := cond ( ge hugo.Version "0.90.0" ) "latest" "9.3.0" -}}
+{{ $version := cond ( ge hugo.Version "0.90.0" ) "latest" "10.0.2" -}}
 {{ with .Site.Params.mermaid.version -}}
 {{ $version = . -}}
 {{ end -}}
 
-{{ $cdnurl := printf "https://cdn.jsdelivr.net/npm/mermaid@%s/dist/mermaid.min.js" $version -}}
+{{ $cdnurl := printf "https://cdn.jsdelivr.net/npm/mermaid@%s/dist/mermaid.esm.min.mjs" $version -}}
 {{ if ge hugo.Version "0.90.0" -}}
-{{ $mermaidjs := resources.GetRemote $cdnurl -}}
-{{ if eq $mermaidjs nil -}}
+{{ if eq (resources.GetRemote $cdnurl) nil -}}
 {{ errorf "Invalid Mermaid version %s, could not retrieve this version from CDN" $version -}}
+{{ end -}}
 {{ else -}}
-{{ $mermaidsecure := $mermaidjs | resources.Fingerprint "sha512" -}}
-<script type="text/javascript" src="{{ $mermaidsecure.Permalink }}" integrity="{{ $mermaidsecure.Data.Integrity -}}">
-</script>
-{{ end }}
-{{ else -}}
-<script src="{{- $cdnurl -}}" integrity="sha512-ku2nmBrzAXY5YwohzTqLYH1/lvyMrpTVxgQKrvTabd/b/uesqltLORdmpVapYv6QhZVCLUX6wkvFaKOAY4xpUA==" crossorigin="anonymous"></script>
 {{ warnf "Outdated Hugo version %s, consider upgrading to make full use of all theme features" hugo.Version -}}
 {{ end -}}
+
+<script type="module" async>
+import mermaid from "{{- $cdnurl -}}";
+
+(function($) {
+    var needMermaid = false;
+
+{{ if ge hugo.Version "0.93.0" -}}
+    if ($('.mermaid').length > 0) {
+        needMermaid = true;
+    };
+{{ else -}}
+    $('.language-mermaid').parent().replaceWith(function() {
+        needMermaid = true;
+        return $('<pre class="mermaid">').text($(this).text());
+    });
+{{ end -}}
+
+    if (!needMermaid)  {
+        mermaid.initialize({startOnLoad: false});
+        return;
+    }
+
+    var params = {{ .Site.Params.mermaid | jsonify | safeJS }};
+
+    // site params are stored with lowercase keys; lookup correct casing
+    // from Mermaid default config.
+    var norm = function(defaultConfig, params) {
+        var result = {};
+        for (const key in defaultConfig) {
+            const keyLower = key.toLowerCase();
+            if (defaultConfig.hasOwnProperty(key) && params.hasOwnProperty(keyLower)) {
+                if (typeof defaultConfig[key] === "object") {
+                    result[key] = norm(defaultConfig[key], params[keyLower]);
+                } else {
+                    result[key] = params[keyLower];
+                }
+            }
+        }
+        return result;
+    };
+    //var settings = norm(mermaid.mermaidAPI.defaultConfig, params);
+    //settings.startOnLoad = true;
+    mermaid.initialize(params);
+})(jQuery);
+
+</script>

userguide/content/en/docs/adding-content/diagrams-and-formulae/index.md

@@ -366,47 +366,48 @@ graph TD
 
 With hugo version 0.93 or higher, support of Mermaid diagrams is automatically enabled as soon as you use a `mermaid` code block on your page.
 
-By default, docsy pulls in the latest officially released version of Mermaid at build time. If that doesn't fit your needs, you can specify the wanted mermaid version inside your `hugo.toml`:
+In case of hugo version 0.92 or lower you have to enable mermaid manually inside your `hugo.toml`/`hugo.yaml`/`hugo.json`:
 
 {{< tabpane persistLang=false >}}
-{{< tab header="Hugo version >= 0.90 only:" disabled=true />}}
+{{< tab header="Hugo version <= 0.92 only:" disabled=true />}}
 {{< tab header="hugo.toml" lang="toml" >}}
 [params.mermaid]
-version = "9.3.0"
+enable = true
 {{< /tab >}}
 {{< tab header="hugo.yaml" lang="yaml" >}}
 params:
   mermaid:
-    version: 9.3.0
+    enable: true
 {{< /tab >}}
 {{< tab header="hugo.json" lang="json" >}}
 {
   "params": {
     "mermaid": {
-      "version": "9.3.0"
+      "enable": true
     }
   }
 }
 {{< /tab >}}
 {{< /tabpane >}}
 
+By default, docsy pulls in the latest officially released version of Mermaid at build time. If that doesn't fit your needs, you can specify the wanted mermaid version inside your `hugo.toml`:
 
 {{< tabpane persistLang=false >}}
-{{< tab header="Hugo version <= 0.92 only:" disabled=true />}}
+{{< tab header="Hugo version >= 0.90 only:" disabled=true />}}
 {{< tab header="hugo.toml" lang="toml" >}}
 [params.mermaid]
-enable = true
+version = "10.0.2"
 {{< /tab >}}
 {{< tab header="hugo.yaml" lang="yaml" >}}
 params:
   mermaid:
-    enable: true
+    version: 10.0.2
 {{< /tab >}}
 {{< tab header="hugo.json" lang="json" >}}
 {
   "params": {
     "mermaid": {
-      "enable": true
+      "version": "10.0.2"
     }
   }
 }

userguide/hugo.yaml

@@ -120,7 +120,7 @@ params:
   markmap:
     enable: true
   mermaid:
-    version: 9.3.0
+    version: 10.0.2
     theme: default
     flowchart:
       diagramPadding: 20