From f00b90be7841fe446322672a6cde618b523c197e Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@geeklabor.de>
Date: Sun, 8 Nov 2020 22:36:04 +0100
Subject: [PATCH] load static css/js assets from data template

---
 CHANGELOG.md                      |  5 +++++
 data/assets.json                  |  8 ++++++++
 layouts/partials/foot.html        |  2 +-
 layouts/partials/head/others.html | 16 ++++++++--------
 layouts/shortcodes/mermaid.html   |  2 +-
 5 files changed, 23 insertions(+), 10 deletions(-)
 create mode 100644 data/assets.json

diff --git a/CHANGELOG.md b/CHANGELOG.md
index de86c37..6e156d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,11 @@
   - remove `title` and set empty `alt` tag on branding image
   - add minimal working CSS for printing
   - split out mobile CSS
+  - load static css/js assets from data template:
+    This way users can hash static assets and overwrite the data template
+    to deliver the hashed assets. Thats helpful if you have to deal with
+    long cache settings but wont to ensure your updated assets are delivered
+    to clients.
 - BUGFIX
   - use relative URL's for fonts
 - INTERNAL
diff --git a/data/assets.json b/data/assets.json
new file mode 100644
index 0000000..20a527d
--- /dev/null
+++ b/data/assets.json
@@ -0,0 +1,8 @@
+{
+  "main.min.css": "main.min.css",
+  "mobile.min.css": "mobile.min.css",
+  "print.min.css": "print.min.css",
+  "custom.css": "custom.css",
+  "js/clipboard.min.js": "js/clipboard.min.js",
+  "js/mermaid.min.js": "js/mermaid.min.js"
+}
diff --git a/layouts/partials/foot.html b/layouts/partials/foot.html
index 79349b8..db37bb0 100644
--- a/layouts/partials/foot.html
+++ b/layouts/partials/foot.html
@@ -1,5 +1,5 @@
 {{ if default true .Site.Params.GeekblogAnchorCopy }}
-<script defer src="{{ "js/clipboard.min.js" | relURL }}"></script>
+<script defer src="{{ index .Site.Data.assets "js/clipboard.min.js" | relURL }}"></script>
 <script>
     document.addEventListener("DOMContentLoaded", function(event) {
         var clipboard = new ClipboardJS('.clip');
diff --git a/layouts/partials/head/others.html b/layouts/partials/head/others.html
index b7f293f..55c191d 100644
--- a/layouts/partials/head/others.html
+++ b/layouts/partials/head/others.html
@@ -7,17 +7,17 @@
 <link rel="preload" as="font" href="{{ "fonts/DroidSans.woff2" | relURL }}" type="font/woff2" crossorigin="anonymous">
 <link rel="preload" as="font" href="{{ "fonts/GeekblogIcons.woff2" | relURL }}" type="font/woff2" crossorigin="anonymous">
 
-<link rel="preload" href="{{ "main.min.css" | relURL }}" as="style">
-<link rel="stylesheet" href="{{ "main.min.css" | relURL }}" media="all">
+<link rel="preload" href="{{ index .Site.Data.assets "main.min.css" | relURL }}" as="style">
+<link rel="stylesheet" href="{{ index .Site.Data.assets "main.min.css" | relURL }}" media="all">
 
-<link rel="preload" href="{{ "mobile.min.css" | relURL }}" as="style">
-<link rel="stylesheet" href="{{ "mobile.min.css" | relURL }}" media="screen and (max-width: 45rem)">
+<link rel="preload" href="{{ index .Site.Data.assets "mobile.min.css" | relURL }}" as="style">
+<link rel="stylesheet" href="{{ index .Site.Data.assets "mobile.min.css" | relURL }}" media="screen and (max-width: 45rem)">
 
-<link rel="preload" href="{{ "print.min.css" | relURL }}" as="style">
-<link rel="stylesheet" href="{{ "print.min.css" | relURL }}" media="print">
+<link rel="preload" href="{{ index .Site.Data.assets "print.min.css" | relURL }}" as="style">
+<link rel="stylesheet" href="{{ index .Site.Data.assets "print.min.css" | relURL }}" media="print">
 
-<link rel="preload" href="{{ "custom.css" | relURL }}" as="style">
-<link rel="stylesheet" href="{{ "custom.css" | relURL }}" media="all">
+<link rel="preload" href="{{ index .Site.Data.assets "custom.css" | relURL }}" as="style">
+<link rel="stylesheet" href="{{ index .Site.Data.assets "custom.css" | relURL }}" media="all">
 
 {{ with .OutputFormats.Get "atom" }}
     {{ printf `<link rel="%s" type="%s" href="%s" title="%s">` .Rel .MediaType.Type .Permalink $.Site.Title | safeHTML }}
diff --git a/layouts/shortcodes/mermaid.html b/layouts/shortcodes/mermaid.html
index 033f231..35921c3 100644
--- a/layouts/shortcodes/mermaid.html
+++ b/layouts/shortcodes/mermaid.html
@@ -1,6 +1,6 @@
 {{ if not (.Page.Scratch.Get "mermaid") }}
 <!-- Include mermaid only first time -->
-<script defer src="{{ "js/mermaid.min.js" | relURL }}"></script>
+<script defer src="{{ index .Site.Data.assets "js/mermaid.min.js" | relURL }}"></script>
 <script>
     document.addEventListener("DOMContentLoaded", function(event) {
         mermaid.initialize({