From 44e8c677a6ab1b291e27b104d6bf9e66e0c42fd1 Mon Sep 17 00:00:00 2001
From: Alan Orth <alan.orth@gmail.com>
Date: Thu, 23 Jan 2020 19:34:21 +0200
Subject: [PATCH] Use Hugo's built-in subresource integrity support

We can use Hugo's built-in SRI support instead of using our custom
SRI generator script (as cool as it was at the time). This is more
clean and gives us the added benefit of adding fingerprints to the
CSS and JS filenames, which acts as a cache buster.

See: https://gohugo.io/hugo-pipes/introduction/
See: https://github.com/alanorth/hugo-theme-bootstrap4-blog/issues/120
---
 {static => assets}/css/cookieconsent.min.css | 0
 {static => assets}/css/style.css             | 0
 {static => assets}/css/style.rtl.css         | 0
 {static => assets}/js/cookieconsent.min.js   | 0
 layouts/_default/baseof.html                 | 6 ++++--
 layouts/partials/cookie-consent.html         | 6 ++++--
 package.json                                 | 8 ++++----
 7 files changed, 12 insertions(+), 8 deletions(-)
 rename {static => assets}/css/cookieconsent.min.css (100%)
 rename {static => assets}/css/style.css (100%)
 rename {static => assets}/css/style.rtl.css (100%)
 rename {static => assets}/js/cookieconsent.min.js (100%)

diff --git a/static/css/cookieconsent.min.css b/assets/css/cookieconsent.min.css
similarity index 100%
rename from static/css/cookieconsent.min.css
rename to assets/css/cookieconsent.min.css
diff --git a/static/css/style.css b/assets/css/style.css
similarity index 100%
rename from static/css/style.css
rename to assets/css/style.css
diff --git a/static/css/style.rtl.css b/assets/css/style.rtl.css
similarity index 100%
rename from static/css/style.rtl.css
rename to assets/css/style.rtl.css
diff --git a/static/js/cookieconsent.min.js b/assets/js/cookieconsent.min.js
similarity index 100%
rename from static/js/cookieconsent.min.js
rename to assets/js/cookieconsent.min.js
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 04ba23d..e0ca337 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -14,10 +14,12 @@
 
     {{ if or (eq .Lang "ar") (eq .Lang "fa") }}
     {{ "<!-- ar -->" | safeHTML }}
-    <link href="{{ "css/style.rtl.css" | absURL }}" rel="stylesheet"{{ if not .Site.Params.disable_sri }} integrity="{{ .Site.Data.sri.styleltr}}" crossorigin="anonymous"{{ end }}>
+    {{ $styleRtl := resources.Get "css/style.rtl.css" | resources.Fingerprint }}
+    <link href="{{ $styleRtl.Permalink }}" rel="stylesheet"{{ if not .Site.Params.disable_sri }} integrity="{{ $styleRtl.Data.Integrity }}" crossorigin="anonymous"{{ end }}>
     {{ else }}
     {{ "<!-- combined, minified CSS -->" | safeHTML }}
-    <link href="{{ "css/style.css" | absURL }}" rel="stylesheet"{{ if not .Site.Params.disable_sri }} integrity="{{ .Site.Data.sri.style}}" crossorigin="anonymous"{{ end }}>
+    {{ $style := resources.Get "css/style.css" | resources.Fingerprint }}
+    <link href="{{ $style.Permalink }}" rel="stylesheet"{{ if not .Site.Params.disable_sri }} integrity="{{ $style.Data.Integrity }}" crossorigin="anonymous"{{ end }}>
     {{ end }}
 
     {{ "<!-- RSS 2.0 feed -->" | safeHTML }}
diff --git a/layouts/partials/cookie-consent.html b/layouts/partials/cookie-consent.html
index 24d5689..e0e72a4 100644
--- a/layouts/partials/cookie-consent.html
+++ b/layouts/partials/cookie-consent.html
@@ -1,5 +1,7 @@
-<link href="{{ "css/cookieconsent.min.css" | absURL }}" rel="stylesheet" type="text/css"{{ if not .Site.Params.disable_sri }} integrity="{{ .Site.Data.sri.cookieconsentcss }}" crossorigin="anonymous"{{ end }}>
-<script src="{{ "js/cookieconsent.min.js" |absURL }}"{{ if not .Site.Params.disable_sri }} integrity="{{ .Site.Data.sri.cookieconsentjs }}" crossorigin="anonymous"{{ end }} async></script>
+{{ $cookieConsentStyle := resources.Get "css/cookieconsent.min.css" | resources.Fingerprint }}
+<link href="{{ $cookieConsentStyle.Permalink }}" rel="stylesheet" type="text/css"{{ if not .Site.Params.disable_sri }} integrity="{{ $cookieConsentStyle.Data.Integrity }}" crossorigin="anonymous"{{ end }}>
+{{ $cookieConsentScript := resources.Get "js/cookieconsent.min.js" | resources.Fingerprint }}
+<script src="{{ $cookieConsentScript.Permalink }}"{{ if not .Site.Params.disable_sri }} integrity="{{ $cookieConsentScript.Data.Integrity }}" crossorigin="anonymous"{{ end }} async></script>
 
 <script>
 window.addEventListener("load", function(){
diff --git a/package.json b/package.json
index 30cefe8..292c358 100644
--- a/package.json
+++ b/package.json
@@ -7,13 +7,13 @@
     "url": "https://github.com/alanorth/hugo-theme-bootstrap4-blog.git"
   },
   "scripts": {
-    "build:css": "node-sass --output-style expanded --precision 6 source/scss/style.scss static/css/style.css.tmp && cleancss --level 1 static/css/style.css.tmp -o static/css/style.css",
-    "build:ltrcss": "rtlcss -s static/css/style.css.tmp static/css/style.rtl.css.tmp && cleancss --level 1 static/css/style.rtl.css.tmp -o static/css/style.rtl.css",
+    "build:css": "node-sass --output-style expanded --precision 6 source/scss/style.scss assets/css/style.css.tmp && cleancss --level 1 assets/css/style.css.tmp -o assets/css/style.css",
+    "build:ltrcss": "rtlcss -s assets/css/style.css.tmp assets/css/style.rtl.css.tmp && cleancss --level 1 assets/css/style.rtl.css.tmp -o assets/css/style.rtl.css",
     "build:fonts": "cp node_modules/font-awesome/fonts/* static/fonts",
-    "build:cookieconsent": "cp node_modules/cookieconsent/build/cookieconsent.min.css static/css && cp node_modules/cookieconsent/build/cookieconsent.min.js static/js",
+    "build:cookieconsent": "cp node_modules/cookieconsent/build/cookieconsent.min.css assets/css && cp node_modules/cookieconsent/build/cookieconsent.min.js assets/js",
     "build:generatesri": "node build/sri.js > data/sri.toml",
     "build": "npm run build:css && npm run build:ltrcss && npm run build:fonts && npm run build:cookieconsent && npm run build:generatesri && npm run clean",
-    "clean": "rm static/css/style.css.tmp static/css/style.rtl.css.tmp"
+    "clean": "rm assets/css/style.css.tmp assets/css/style.rtl.css.tmp"
   },
   "keywords": "hugo",
   "author": "Alan Orth",