From 5a775a49bd8d816100b18722421c610613f48260 Mon Sep 17 00:00:00 2001
From: James Panther <4462786+jpanther@users.noreply.github.com>
Date: Wed, 12 Jan 2022 11:20:59 +1100
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Refactor=20vendor=20inline?=
 =?UTF-8?q?=20JS=20to=20bundles?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/js/chart.js            | 13 ++++++++++++
 assets/js/mermaid.js          | 20 ++++++++++++++++++
 layouts/partials/vendor.html  | 40 +++++++++--------------------------
 layouts/shortcodes/chart.html |  4 ++--
 4 files changed, 45 insertions(+), 32 deletions(-)
 create mode 100644 assets/js/chart.js
 create mode 100644 assets/js/mermaid.js

diff --git a/assets/js/chart.js b/assets/js/chart.js
new file mode 100644
index 00000000..4d76e7f6
--- /dev/null
+++ b/assets/js/chart.js
@@ -0,0 +1,13 @@
+function css(name) {
+  return getComputedStyle(document.documentElement).getPropertyValue(name);
+}
+
+Chart.defaults.font.size = 14;
+Chart.defaults.backgroundColor = css("--color-primary-300");
+Chart.defaults.elements.point.borderColor = css("--color-primary-400");
+Chart.defaults.elements.bar.borderColor = css("--color-primary-500");
+Chart.defaults.elements.bar.borderWidth = 1;
+Chart.defaults.elements.line.borderColor = css("--color-primary-400");
+Chart.defaults.elements.arc.backgroundColor = css("--color-primary-200");
+Chart.defaults.elements.arc.borderColor = css("--color-primary-500");
+Chart.defaults.elements.arc.borderWidth = 1;
diff --git a/assets/js/mermaid.js b/assets/js/mermaid.js
new file mode 100644
index 00000000..59b3e1a1
--- /dev/null
+++ b/assets/js/mermaid.js
@@ -0,0 +1,20 @@
+function css(name) {
+  return getComputedStyle(document.documentElement).getPropertyValue(name);
+}
+
+mermaid.initialize({
+  theme: "base",
+  themeVariables: {
+    background: css("--color-neutral"),
+    primaryColor: css("--color-primary-200"),
+    secondaryColor: css("--color-secondary-200"),
+    tertiaryColor: css("--color-neutral-100"),
+    primaryBorderColor: css("--color-primary-400"),
+    secondaryBorderColor: css("--color-secondary-400"),
+    tertiaryBorderColor: css("--color-neutral-400"),
+    lineColor: css("--color-neutral-600"),
+    fontFamily:
+      "ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,segoe ui,Roboto,helvetica neue,Arial,noto sans,sans-serif",
+    fontSize: "16px",
+  },
+});
diff --git a/layouts/partials/vendor.html b/layouts/partials/vendor.html
index 80244d6e..1f0a4db1 100644
--- a/layouts/partials/vendor.html
+++ b/layouts/partials/vendor.html
@@ -1,38 +1,18 @@
 {{/* Mermaid */}}
 {{ if .Page.HasShortcode "mermaid" }}
-  {{ $mermaidJS := resources.Get "lib/mermaid/mermaid.min.js" }}
-  {{ $mermaidJS := $mermaidJS | resources.Fingerprint "sha512" }}
-  <script defer src="{{ $mermaidJS.RelPermalink }}" integrity="{{ $mermaidJS.Data.Integrity }}"></script>
-  <script>
-    document.addEventListener('DOMContentLoaded', (event) => {
-      function css(name) {
-        return getComputedStyle(document.documentElement).getPropertyValue(name);
-      }
-      mermaid.initialize({ theme: "base", themeVariables: { background: css("--color-neutral"), primaryColor: css("--color-primary-200"), secondaryColor: css("--color-secondary-200"), tertiaryColor: css("--color-neutral-100"), primaryBorderColor: css("--color-primary-400"), secondaryBorderColor: css("--color-secondary-400"), tertiaryBorderColor: css("--color-neutral-400"), lineColor: css("--color-neutral-600"), fontFamily: "ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,segoe ui,Roboto,helvetica neue,Arial,noto sans,sans-serif", fontSize: "16px" }});
-    });
-  </script>
+  {{ $mermaidLib := resources.Get "lib/mermaid/mermaid.min.js" }}
+  {{ $mermaidConfig := resources.Get "js/mermaid.js" }}
+  {{ $mermaidConfig := $mermaidConfig | resources.Minify }}
+  {{ $mermaidJS := slice $mermaidLib $mermaidConfig | resources.Concat "js/mermaid.bundle.js" | resources.Fingerprint "sha512" }}
+  <script defer type="text/javascript" src="{{ $mermaidJS.RelPermalink }}" integrity="{{ $mermaidJS.Data.Integrity }}"></script>
 {{ end }}
 {{/* Chart */}}
 {{ if .Page.HasShortcode "chart" }}
-  {{ $chartJS := resources.Get "lib/chart/chart.min.js" }}
-  {{ $chartJS := $chartJS | resources.Fingerprint "sha512" }}
-  <script defer src="{{ $chartJS.RelPermalink }}" integrity="{{ $chartJS.Data.Integrity }}"></script>
-  <script>
-    document.addEventListener('DOMContentLoaded', (event) => {
-      function css(name) {
-        return getComputedStyle(document.documentElement).getPropertyValue(name);
-      }
-      Chart.defaults.font.size = 14;
-      Chart.defaults.backgroundColor = css("--color-primary-300");
-      Chart.defaults.elements.point.borderColor = css("--color-primary-400");
-      Chart.defaults.elements.bar.borderColor = css("--color-primary-500");
-      Chart.defaults.elements.bar.borderWidth = 1;
-      Chart.defaults.elements.line.borderColor = css("--color-primary-400");
-      Chart.defaults.elements.arc.backgroundColor = css("--color-primary-200");
-      Chart.defaults.elements.arc.borderColor = css("--color-primary-500");
-      Chart.defaults.elements.arc.borderWidth = 1;
-    });
-  </script>
+  {{ $chartLib := resources.Get "lib/chart/chart.min.js" }}
+  {{ $chartConfig := resources.Get "js/chart.js" }}
+  {{ $chartConfig := $chartConfig | resources.Minify }}
+  {{ $chartJS := slice $chartLib $chartConfig | resources.Concat "js/chart.bundle.js" | resources.Fingerprint "sha512" }}
+  <script defer type="text/javascript" src="{{ $chartJS.RelPermalink }}" integrity="{{ $chartJS.Data.Integrity }}"></script>
 {{ end }}
 {{/* Katex */}}
 {{ if .Page.HasShortcode "katex" }}
diff --git a/layouts/shortcodes/chart.html b/layouts/shortcodes/chart.html
index bcfc4d2a..98ae8fa7 100644
--- a/layouts/shortcodes/chart.html
+++ b/layouts/shortcodes/chart.html
@@ -1,8 +1,8 @@
 <div class="chart">
   {{ $id := delimit (shuffle (seq 1 9)) "" }}
   <canvas id="{{ $id }}"></canvas>
-  <script>
-    document.addEventListener("DOMContentLoaded", (event) => {
+  <script type="text/javascript">
+    window.addEventListener("DOMContentLoaded", (event) => {
       const ctx = document.getElementById("{{ $id }}");
       const chart = new Chart(ctx, {
         {{ .Inner | safeJS }}