From 5a87101c708de246230004f7528278da9e5308c9 Mon Sep 17 00:00:00 2001
From: "Jens M. Sauer" <jm@sauers.cc>
Date: Thu, 1 Aug 2024 19:44:14 +0200
Subject: [PATCH] Simplify css and sass aggregation

---
 layouts/partials/head.html | 41 ++++++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index dfb42ee..43e6e2e 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -9,22 +9,33 @@
 	{{ end }}
 	
 	<!-- CSS -->
-	{{ if hugo.IsServer }}
-	{{ $style := resources.Get "sass/main.scss" | resources.ExecuteAsTemplate "scss/main.scss" . | toCSS (dict "targetPath" "css/main.css" "outputStyle" "compressed" "enableSourceMap" false) }}
-	<link rel="stylesheet" href="{{ ($style).RelPermalink }}">
-	{{ else }}
-	{{ $style := resources.Get "sass/main.scss" | resources.ExecuteAsTemplate "scss/main.scss" . | toCSS (dict "targetPath" "css/main.css" "enableSourceMap" false) }}
-	<link rel="stylesheet" href="{{ ($style | minify).RelPermalink }}">
+	{{ $opts := dict "targetPath" "css/main.css" "enableSourceMap" (not hugo.IsProduction) }}
+	{{ $sass := resources.Get "sass/main.scss" | resources.ExecuteAsTemplate "css/main.scss" . | toCSS $opts }}
+	{{ $css := resources.Match "css/*.css" | resources.Concat "css/bundle.css" }}
+        {{ with slice $sass $css | resources.Concat "css/main.css" }}
+	  {{ if hugo.IsDevelopment }}
+	    <link rel="stylesheet" href="{{ .RelPermalink }}">
+	  {{ else }}
+	    {{ with . | minify | fingerprint }}
+	      <link rel="stylesheet" href="{{ .RelPermalink }}" integrity="{{ .Data.Integrity }}" crossorigin="anonymous">
+	    {{ end }}
+	  {{ end }}
 	{{ end }}
-	{{ if hugo.IsServer }}
-	{{ $noscript := resources.Get "sass/noscript.scss" | resources.ExecuteAsTemplate "noscript.scss" . | toCSS (dict "targetPath" "css/noscript.css" "enableSourceMap" false) }}
-	<noscript><link rel="stylesheet" href="{{ ($noscript).RelPermalink }}" /></noscript>
-	{{ else }}
-	{{ $noscript := resources.Get "sass/noscript.scss" | resources.ExecuteAsTemplate "noscript.scss" . | toCSS (dict "targetPath" "css/noscript.css" "enableSourceMap" false) }}
-	<noscript><link rel="stylesheet" href="{{ ($noscript | minify).RelPermalink }}" /></noscript>
-	{{end}}
 
-	{{ with resources.Match "css/*.css" | resources.Concat "css/bundle.css" | minify | fingerprint }}
-	<link rel="stylesheet" href="{{ .RelPermalink }}" integrity="{{ .Data.Integrity }}" crossorigin="anonymous">
+	{{ with resources.Get "sass/noscript.scss" }}
+	  {{ $opts := dict "targetPath" "css/noscript.css" "enableSourceMap" (not hugo.IsProduction) }}
+	  {{ with . | resources.ExecuteAsTemplate "scss/main.scss" . | toCSS $opts }}
+	    {{ if hugo.IsDevelopment }}
+	      <noscript>
+	        <link rel="stylesheet" href="{{ .RelPermalink }}">
+	      </noscript>
+	    {{ else }}
+	      {{ with . | minify | fingerprint }}
+	        <noscript>
+	          <link rel="stylesheet" href="{{ .RelPermalink }}" integrity="{{ .Data.Integrity }}" crossorigin="anonymous">
+		</noscript>
+	      {{ end }}
+	    {{ end }}
+	  {{ end }}
 	{{ end }}
 </head>