use asset directory to avoid conflicts

HidegonSan · Nov 25, 2023 · de64596 · de64596
1 parent b22dbbe
commit de64596
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 7 deletions.
diff --git a/layouts/partials/footer/instant_page.html b/layouts/partials/footer/instant_page.html
@@ -1,5 +1,11 @@
 {{/*  instant.page | Thanks: https://instant.page/  */}}
 
-{{- with resources.Get "js/instantpage.js" | fingerprint -}}
-    <script defer crossorigin="anonymous" type="module" src="{{- .RelPermalink -}}" integrity="{{- .Data.Integrity -}}"></script>
+{{- with slice (resources.Get "js/instantpage.js") | resources.Concat "assets/js/instantpage.min.js" | fingerprint -}}
+    <script
+        defer
+        crossorigin="anonymous"
+        type="module"
+        src="{{- .RelPermalink -}}"
+        integrity="{{- .Data.Integrity -}}"
+    ></script>
 {{- end -}}
diff --git a/layouts/partials/head/css/chroma_css.html b/layouts/partials/head/css/chroma_css.html
@@ -17,17 +17,28 @@
             $chroma_tweak
             $codeblock_file_name
         )
-        | resources.Concat "css/chroma/chroma_all.css"
+        | resources.Concat "assets/css/chroma/chroma_all.css"
     -}}
 
     {{- with $chroma_css | toCSS | minify | fingerprint -}}
-        <link href="{{- .RelPermalink -}}" integrity="{{- .Data.Integrity -}}" crossorigin="anonymous" rel="preload stylesheet" as="style">
+        <link
+            crossorigin="anonymous"
+            href="{{- .RelPermalink -}}"
+            integrity="{{- .Data.Integrity -}}"
+            rel="preload stylesheet"
+            as="style">
     {{- end -}}
 
     {{/*  chroma css for noscript  */}}
     <noscript>
-        {{- with resources.Get "css/chroma/chroma_noscript.css" | toCSS | minify | fingerprint -}}
-            <link href="{{- .RelPermalink -}}" integrity="{{- .Data.Integrity -}}" crossorigin="anonymous" rel="preload stylesheet" as="style">
+        {{- with slice (resources.Get "css/chroma/chroma_noscript.css") | resources.Concat "assets/css/chroma/chroma_noscript.css" | toCSS | minify | fingerprint -}}
+            <link
+                crossorigin="anonymous"
+                href="{{- .RelPermalink -}}"
+                integrity="{{- .Data.Integrity -}}"
+                rel="preload stylesheet"
+                as="style"
+            >
         {{- end -}}
     </noscript>
 

diff --git a/layouts/partials/head/goatcounter.html b/layouts/partials/head/goatcounter.html
@@ -5,7 +5,7 @@
     {{- $goatcounter_license_body   := "// GoatCounter: https://www.goatcounter.com\n// This file (and *only* this file) is released under the ISC license:\n// https://opensource.org/licenses/ISC\n" -}}
     {{- $goatcounter_license        := $goatcounter_license_body | resources.FromString "js/goatcounter_license.js" -}}
     {{- $goatcounter                := (resources.Get "js/goatcounter.js") | minify -}}
-    {{- $goatcounter_bundled        := (slice $goatcounter_license $goatcounter) | resources.Concat "js/goatcounter.js" -}}
+    {{- $goatcounter_bundled        := (slice $goatcounter_license $goatcounter) | resources.Concat "assets/js/goatcounter.min.js" -}}
 
     {{- with $goatcounter_bundled | fingerprint -}}
         <script