➕ Add Mermaid as bundled dependency

CHANGELOG.md

@@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Changed
 
 - Site name, author and menus will now render Markdown and Emoji
+- Bundled Mermaid for better vendor dependency management
 
 ## [1.4.0] - 2021-10-20
 

layouts/partials/analytics.html

@@ -1,9 +1,9 @@
 {{ if not .Site.IsServer }}
   {{ with .Site.Params.fathomAnalytics.site }}
     {{ if isset $.Site.Params.fathomanalytics "domain" }}
-      <script src="https://{{ $.Site.Params.fathomanalytics.domain }}/script.js" data-site="{{ . }}" defer></script>
+      <script defer src="https://{{ $.Site.Params.fathomanalytics.domain }}/script.js" data-site="{{ . }}"></script>
     {{ else }}
-      <script src="https://cdn.usefathom.com/script.js" data-site="{{ . }}" defer></script>
+      <script defer src="https://cdn.usefathom.com/script.js" data-site="{{ . }}"></script>
     {{ end }}
   {{ end }}
   {{ template "_internal/google_analytics.html" . }}

layouts/partials/footer.html

@@ -41,11 +41,3 @@
     {{ partialCached "extend-footer.html" . }}
   {{ end }}
 </footer>
-
-{{/* Include mermaid.js only on pages that use the shortcode */}}
-{{- if .Page.HasShortcode "mermaid" -}}
-  <script src="https://unpkg.com/mermaid@8.13.3/dist/mermaid.min.js"></script>
-  <script>
-    mermaid.initialize({ theme: "default" });
-  </script>
-{{- end -}}

layouts/partials/head.html

@@ -100,6 +100,19 @@
       {{ range $name, $url := $links }}<link href="{{ $url }}" rel="me" />{{ end }}
     {{ end }}
   {{ end }}
+  {{/* Mermaid */}}
+  {{ if .Page.HasShortcode "mermaid" }}
+    {{ $mermaidJS := resources.Get "vendor/mermaid/mermaid.min.js" }}
+    {{ if $mermaidJS }}
+      {{ $mermaidJS := $mermaidJS | resources.Fingerprint "sha512" }}
+      <script defer src="{{ $mermaidJS.RelPermalink }}" integrity="{{ $mermaidJS.Data.Integrity }}"></script>
+      <script>
+        document.addEventListener('DOMContentLoaded', (event) => {
+          mermaid.initialize({ theme: "default" });
+        });
+      </script>
+    {{ end }}
+  {{ end }}
   {{/* Analytics */}}
   {{ partialCached "analytics.html" .Site }}
   {{/* Extend head - eg. for custom analytics scripts, etc. */}}

package.json

@@ -4,6 +4,9 @@
   "description": "Congo theme for Hugo",
   "main": "index.js",
   "scripts": {
+    "preinstall": "rimraf assets/vendor",
+    "postinstall": "vendor-copy",
+    "assets": "rimraf assets/vendor && vendor-copy",
     "dev": "NODE_ENV=development ./node_modules/tailwindcss/lib/cli.js -i ./assets/css/main.css -o ./assets/css/compiled/main.css --jit -w",
     "build": "NODE_ENV=production ./node_modules/tailwindcss/lib/cli.js -i ./assets/css/main.css -o ./assets/css/compiled/main.css --jit",
     "example": "hugo server --source exampleSite --themesDir ../.. --buildDrafts -b http://localhost/congo/ -p 8008"
@@ -26,9 +29,18 @@
   "homepage": "https://github.com/jpanther/congo#readme",
   "devDependencies": {
     "@tailwindcss/typography": "^0.4.1",
+    "mermaid": "^8.13.3",
     "prettier": "^2.3.2",
     "prettier-plugin-go-template": "^0.0.11",
+    "rimraf": "^3.0.2",
     "tailwind-underline-utils": "^1.1.3",
-    "tailwindcss": "^2.2.17"
+    "tailwindcss": "^2.2.17",
+    "vendor-copy": "^3.0.1"
+  },
+  "vendorCopy": [
+    {
+      "from": "node_modules/mermaid/dist/mermaid.min.js",
+      "to": "assets/vendor/mermaid/mermaid.min.js"
     }
+  ]
 }