Merge pull request #46681 from sftim/20240605_redo_mermaid_shortcode

Redo Mermaid shortcode (Docsy alignment)

Author: k8s-ci-robot

static/js/mermaid-10.6.1.min.js renamed to assets/js/mermaid-10.6.1.min.js

@@ -74,11 +74,6 @@
 {{ end }}
 <meta property="og:type" content="{{ $ogType }}">
 
-{{ if .HasShortcode "mermaid" }}
-<!-- Copied from https://unpkg.com/[email protected]/dist/mermaid.min.js -->
-<script async src="/js/mermaid-10.6.1.min.js" integrity="sha384-+NGfjU8KzpDLXRHduEqW+ZiJr2rIg+cidUVk7B51R5xK7cHwMKQfrdFwGdrq1Bcz" crossorigin="anonymous"></script>
-{{ end }}
-
 <script src="/js/jquery-3.6.0.min.js" intregrity="sha384-vtXRMe3mGCbOeY7l30aIg8H9p3GdeSe4IFlP6G8JMa7o7lXvnz3GFKzPxzJdPfGK" crossorigin="anonymous"></script>
 <!--script src="https://unpkg.com/split.js/dist/split.min.js"></script-->
 <script src="/js/split-1.6.0.js" intregrity="sha384-0blL3GqHy6+9fw0cyY2Aoiwg4onHAtslAs4OkqZY7UQBrR65/K4gI+hxLdWDrjpz"></script>

layouts/partials/head.html

@@ -25,6 +25,16 @@
   {{- end -}}
 {{- end -}}
 
+{{ if .HasShortcode "mermaid" }}
+  <!-- Copied from https://unpkg.com/[email protected]/dist/mermaid.min.js -->
+  {{- with resources.Get "js/mermaid-10.6.1.min.js" -}}
+  <script src="{{ .RelPermalink }}" integrity="sha384-+NGfjU8KzpDLXRHduEqW+ZiJr2rIg+cidUVk7B51R5xK7cHwMKQfrdFwGdrq1Bcz"></script>
+  {{- else -}}
+    <!-- without Mermaid, the site won't appear right -->
+    {{- errorf "No Mermaid helper script found" -}}
+  {{- end -}}
+{{- end -}}
+
 {{- if eq .Layout "glossary" -}}
   {{- with resources.Get "js/glossary.js" -}}
   <script defer src="{{ .RelPermalink }}"></script>
@@ -41,4 +51,4 @@
     {{- $releaseBinariesJs := resources.Get "js/release_binaries.js" -}}
 <script defer src="{{ $releaseBinariesJs.RelPermalink }}"></script>
   {{- end -}}
-{{- end -}}
+{{- end -}}