Merge pull request #34794 from chrismetz09/bugMermaid

Fix Mermaid render problem
kubernetes · Sep 1, 2022 · bb3ba4b · bb3ba4b
2 parents 0f299d3 + 61a1ec2
commit bb3ba4b
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 70 deletions.
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
@@ -28,10 +28,6 @@
 {{ template "_internal/google_analytics.html" . }}
 {{ end }}
 {{ partialCached "head-css.html" . "asdf" }}
-<script
-  src="{{ "js/jquery-3.3.1.min.js" | relURL }}"
-  integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8="
-  crossorigin="anonymous"></script>
 {{ if and (.Site.Params.offlineSearch) (not .Site.Params.gcs_engine_id) }}
 <script src="https://unpkg.com/lunr@2.1.6/lunr.js"></script>
 <script src="/js/offline-search.js"></script>
@@ -78,10 +74,12 @@
 <meta property="og:type" content="{{ $ogType }}">
 
 {{ if .HasShortcode "mermaid" }}
-<!-- Copied from https://unpkg.com/mermaid@8.11.2/dist/mermaid.min.js -->
-<script async src="{{ "js/mermaid.min.js" | relURL }}"></script>
+<!-- Copied from https://unpkg.com/mermaid@8.13.4/dist/mermaid.min.js -->
+<script async src="{{ "js/mermaid-8.13.4.min.js" | relURL }}"></script>
 {{ end }}
 
+<script src="/js/jquery-3.6.0.min.js" intregrity="sha384-vtXRMe3mGCbOeY7l30aIg8H9p3GdeSe4IFlP6G8JMa7o7lXvnz3GFKzPxzJdPfGK" crossorigin="anonymous"></script>
+
 {{- if eq (lower .Params.cid) "community" -}}
 {{- if eq .Params.community_styles_migrated true -}}
 <link href="/css/community.css" rel="stylesheet"><!-- legacy styles -->
@@ -90,6 +88,6 @@
 {{- end -}}
 <script defer src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
 {{- end -}}
-<script src="{{ "js/script.js" | relURL }}"></script>
+<script src="{{ "/js/script.js" | relURL }}"></script>
 {{ with .Params.js }}{{ range (split . ",") }}<script src="{{ (trim . " ") | relURL }}"></script><!-- custom js added -->
 {{ end }}{{ else }}<!-- no custom js detected -->{{ end }}
diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html
@@ -1,11 +1,8 @@
-
-<script src="/js/popper-1.14.3.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
-<script src="/js/bootstrap-4.3.1.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
-
-{{ if .Site.Params.mermaid.enable }}
-<script src="/js/mermaid.min.js" crossorigin="anonymous"></script>
-
-{{ end }}
+<script src="/js/jquery-3.6.0.min.js" integrity="sha384-vtXRMe3mGCbOeY7l30aIg8H9p3GdeSe4IFlP6G8JMa7o7lXvnz3GFKzPxzJdPfGK" crossorigin="anonymous"></script>
+<script src="/js/popper-1.16.1.min.js" intregrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN" crossorigin="anonymous"></script>
+<script src="/js/bootstrap-4.6.1.min.js" integrity="sha384-VHvPCCyXqtD5DqJeNxl2dtTyhF78xXNXdkwX1CZeRusQfRKp+tA7hAShOK/B/fQ2" crossorigin="anonymous"></script>
+<script src="{{ "js/script.js" | relURL }}"></script>
+<script async src="/js/mermaid-8.13.4.min.js" integrity="sha384-5hHNvPeMrNH14oM3IcQofDoBhiclNK3g2+hnEinKzQ07C4AliMeVpnvxuiwEGpaO" crossorigin="anonymous"></script>
 
 {{ $jsBase := resources.Get "js/base.js" }}
 {{ $jsAnchor := resources.Get "js/anchor.js" }}

diff --git a/static/js/bootstrap-4.3.1.min.js b/static/js/bootstrap-4.3.1.min.js
diff --git a/static/js/bootstrap-4.6.1.min.js b/static/js/bootstrap-4.6.1.min.js
diff --git a/static/js/jquery-3.3.1.min.js b/static/js/jquery-3.3.1.min.js
diff --git a/static/js/jquery-3.6.0.min.js b/static/js/jquery-3.6.0.min.js
diff --git a/static/js/jquery.scrollTo-2.1.2.min.js b/static/js/jquery.scrollTo-2.1.2.min.js
diff --git a/static/js/jquery.scrollTo-2.1.3.min.js b/static/js/jquery.scrollTo-2.1.3.min.js
diff --git a/static/js/mermaid-8.13.4.min.js b/static/js/mermaid-8.13.4.min.js
diff --git a/static/js/mermaid.min.js b/static/js/mermaid.min.js
diff --git a/static/js/popper-1.14.3.min.js b/static/js/popper-1.14.3.min.js
diff --git a/static/js/popper-1.16.1.min.js b/static/js/popper-1.16.1.min.js