refactor: Switch to dart-sass

morniteaque · Jun 19, 2024 · 9e6f134 · 9e6f134
1 parent c53b169
commit 9e6f134
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,4 @@ public
 resources
 node_modules
 out
-static/fonts
+static/assets
diff --git a/Hydrunfile b/Hydrunfile
@@ -5,7 +5,7 @@ set -e
 # Frontend
 if [ "$1" = "pwa" ]; then
     # Install Hugo
-    apk add curl make hugo npm
+    apk add curl make hugo dart-sass npm
 
     # Generate dependencies
     make depend

diff --git a/Makefile b/Makefile
@@ -50,6 +50,6 @@ clean:
 depend:
 	npm i
 	find node_modules/@patternfly/patternfly/ -name "*.css" -type f -delete
-	rm -rf static/fonts
+	rm -rf static/assets
 	mkdir -p static
-	cp -r node_modules/@patternfly/patternfly/assets/fonts static
+	cp -r node_modules/@patternfly/patternfly/assets static
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
@@ -26,10 +26,13 @@
       content="© {{ now.Year }} {{ .Site.Data.site.author }}"
     />
 
-    <link
-      rel="stylesheet"
-      href="{{ (resources.Get `scss/main.scss` | resources.ExecuteAsTemplate `main.scss` . | resources.ToCSS | resources.Minify).Permalink }}"
-    />
+    {{ $opts := dict
+      "transpiler" "dartsass"
+      "includePaths" (slice "node_modules")
+    }}
+    {{ with resources.Get `scss/main.scss` | resources.ExecuteAsTemplate `main.scss` . | toCSS $opts | minify }}
+      <link rel="stylesheet" href="{{ .RelPermalink }}" />
+    {{ end }}
   </head>
   <body>
     <div class="pf-c-page">