diff --git a/layouts/partials/body.html b/layouts/partials/body.html index ece90a0..231efd6 100644 --- a/layouts/partials/body.html +++ b/layouts/partials/body.html @@ -1,10 +1,9 @@ {{- with partialCached "va/script" . -}} - -{{ end }} \ No newline at end of file +{{- end -}} \ No newline at end of file diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 68e6592..35f9a81 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -1,22 +1,20 @@ -{{ with partialCached "va/style" . }} - -{{ end }} -{{ with partialCached "va/script" . }} - +{{- end -}} +{{- with partialCached "va/script" . -}} + -{{ end }} \ No newline at end of file + type="{{ .MediaType.String }}" + importance="high" + crossorigin="anonymous" + referrerpolicy="no-referrer-when-downgrade"> +{{- end -}} \ No newline at end of file diff --git a/layouts/partials/script.html b/layouts/partials/script.html index dd4cca9..5afe4c2 100644 --- a/layouts/partials/script.html +++ b/layouts/partials/script.html @@ -1,12 +1,16 @@ {{- $scripts := slice -}} + {{- range $index, $name := slice "cover" "reel" -}} {{- $scripts = $scripts | append (resources.Get (printf "va/js/%s.js" $name)) -}} {{- end -}} + {{- $script := $scripts | resources.Concat "va.js" | js.Build "va.js" -}} + {{- if hugo.IsProduction -}} {{- $script = $script | minify | fingerprint "sha512" -}} {{- end -}} + {{- return $script -}} diff --git a/layouts/partials/style.html b/layouts/partials/style.html index d917ae6..4b2dca3 100644 --- a/layouts/partials/style.html +++ b/layouts/partials/style.html @@ -1,4 +1,5 @@ {{- $styles := slice -}} + {{- range $index, $name := slice "reset" "variables" @@ -20,8 +21,11 @@ -}} {{- $styles = $styles | append (resources.Get (printf "va/css/%s.css" $name)) -}} {{- end -}} + {{- $style := $styles | resources.Concat "va.css" -}} + {{- if hugo.IsProduction -}} {{- $style = $style | minify | fingerprint "sha512" -}} {{- end -}} + {{- return $style -}}