From d0b223fa3353d411d7f05fab8de0a1edda66a695 Mon Sep 17 00:00:00 2001
From: Eryn Wells <eryn@erynwells.me>
Date: Mon, 7 Nov 2022 08:36:39 -0800
Subject: [PATCH] All the template updates for fingerprinting

---
 layouts/_default/baseof.html | 48 ++++++++++++------------------------
 layouts/_default/single.html | 22 +++++++++++------
 2 files changed, 31 insertions(+), 39 deletions(-)

diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 0116b4b..0f547f8 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -13,40 +13,24 @@
     {{ end }}
   </body>
 
-  <style>
-    @font-face {
-      font-family: "Museo_Slab";
-      src: url("{{ `/fonts/Museo_Slab_500.woff2` | relURL }}") format("woff2"),
-           url("{{ `/fonts/Museo_Slab_500.woff` | relURL }}") format("woff");
-      font-weight: normal;
-      font-style: normal;
-    }
-  </style>
-  <link rel="stylesheet" as="style" href="{{ `/styles/root.css` | relURL }}">
-  {{- if not hugo.IsProduction -}}
-    <link rel="stylesheet" as="style" href="{{ `/styles/development.css` | relURL }}">
-  {{- end -}}
-
-  {{- $includedCSS := slice -}}
-  {{- if not .FirstSection.IsHome -}}
-    {{- range .FirstSection.Resources.Match "*.css" -}}
-      {{- if not (in $includedCSS .Permalink) -}}
-        {{- $includedCSS = $includedCSS | append .Permalink -}}
-        <link rel="stylesheet" as="style" href="{{ .RelPermalink }}">
-      {{- end -}}
-    {{- end -}}
-  {{- end -}}
-
-  {{- range .Resources.Match "*.css" -}}
-    {{- if not (in $includedCSS .Permalink) -}}
-      {{- $includedCSS = $includedCSS | append .Permalink -}}
-      <link rel="stylesheet" as="style" href="{{ .RelPermalink }}">
-    {{- end -}}
-  {{- end -}}
+  {{- $rootCSS := resources.Get "styles/root.css"
+                | resources.ExecuteAsTemplate "root.css" .
+                | resources.Fingerprint "sha512" -}}
+  <link rel="stylesheet" as="style" href="{{ $rootCSS.RelPermalink }}" integrity="{{ $rootCSS.Data.Integrity }}">
+  {{ if not hugo.IsProduction }}
+  <link rel="stylesheet" as="style" href="{{ `/styles/development.css` | relURL }}">
+  {{ end }}
+  {{ with partial "secure_asset.html" (printf "styles/%s.css" .Section) }}
+  <link rel="stylesheet" as="style" href="{{ .Secure.RelPermalink }}" integrity="{{ .Secure.Data.Integrity }}">
+  {{ end }}
+  {{ range .Resources.Match "*.css" }}
+  <link rel="stylesheet" as="style" href="{{ .RelPermalink }}">
+  {{ end }}
 
   {{ block "styles" . }}{{ end }}
-
   {{ block "scripts" . }}{{ end }}
 
-  <script src="{{ `scripts/site.js` | relURL }}"></script>
+  {{ $concatenatedSiteScript := resources.Get "scripts/site.js"
+                              | resources.Fingerprint "sha512" }}
+  <script type="module" src="{{ $concatenatedSiteScript.Permalink }}" integrity="{{ $concatenatedSiteScript.Data.Integrity }}"></script>
 </html>
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index dfaae82..fb78001 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -8,25 +8,33 @@
 
 {{ define "styles" }}
   {{- if .HasShortcode "figures/railroad" -}}
-    <link rel="preload stylesheet" as="style" href="{{ `styles/railroad.css` | absURL }}">
+  <link rel="preload stylesheet" as="style" href="{{ `styles/railroad.css` | absURL }}">
   {{- end -}}
   <link rel="preload stylesheet" as="style" href="{{ `styles/monokai.css` | absURL }}">
 {{ end }}
 
 {{ define "scripts" }}
   {{- if .HasShortcode "figures/railroad" -}}
-    <script defer type="module" src="{{ `scripts/railroad.js` | absURL }}"></script>
-    <script defer type="module" src="{{ `scripts/railroad-utils.js` | absURL }}"></script>
+  {{- with partial "secure_asset.html" "scripts/lib/railroad.js" -}}
+  <script defer type="module" src="{{ .Secure.Permalink }}" integrity="{{ .Secure.Data.Integrity }}"></script>
+  {{- end -}}
+  {{- with resources.Get "scripts/railroad-utils.js" -}}
+  <script defer type="module" src="{{ .Secure.Permalink }}" integrity="{{ .Secure.Data.Integrity }}"></script>
+  {{- end -}}
   {{- end -}}
 
   {{- if .HasShortcode "figures/p5" -}}
-    <script defer src="{{ `scripts/p5-1.4.1.min.js` | absURL }}"></script>
-    <script defer src="{{ `scripts/sketch-utils.js` | absURL }}"></script>
+  {{- with partial "secure_asset.html" "scripts/lib/p5-1.5.0.js" -}}
+  <script defer src="{{ .Secure.Permalink }}" integrity="{{ .Secure.Data.Integrity }}"></script>
+  {{- end -}}
+  {{- with partial "secure_asset.html" "scripts/sketch-utils.js" -}}
+  <script defer src="{{ .Secure.Permalink }}" integrity="{{ .Secure.Data.Integrity }}"></script>
+  {{- end -}}
   {{- end -}}
 
   {{- range $script := .Resources.Match "*.js" -}}
-    {{- $isModule := default true $script.Params.is_module -}}
-    <script defer {{ if $isModule }}type="module"{{ end }} src="{{ $script.Permalink | relURL }}"></script>
+  {{- $isModule := default true $script.Params.is_module -}}
+  <script defer {{ if $isModule }}type="module"{{ end }} src="{{ $script.Permalink | relURL }}"></script>
   {{- end -}}
 {{ end }}