Merge remote-tracking branch 'origin/main' into main

feat(params.toml): add 'bundled' parameter to control whether to use bundled js and css or build from scratch
This commit is contained in:
Sped0n
2023-11-02 10:50:24 +08:00
parent 9d365d8c96
commit 4c09b08172
2 changed files with 19 additions and 5 deletions

View File

@@ -8,13 +8,24 @@
{{- partial "plugin/style.html" $style -}}
{{/* main style */}}
{{- $style := dict "Source" "scss/style.scss" "Fingerprint" $fingerprint -}}
{{- $options := dict "targetPath" "css/style.css" "enableSourceMap" true "includePaths" (slice "node_modules") -}}
{{- $style = dict "Context" . "ToCSS" $options "Minify" hugo.IsProduction "Defer" true | merge $style -}}
{{- partial "plugin/style.html" $style -}}
{{- if site.Params.bundled -}}
<link
rel="stylesheet"
as="style"
onload="this.onload=null;this.rel='stylesheet'"
href="/bundled/css/style.min.css"
/>
<noscript><link rel="stylesheet" href="/bundled/css/style.min.css" /></noscript>
{{- else -}}
{{- $style := dict "Source" "scss/style.scss" "Fingerprint" $fingerprint -}}
{{- $style := dict "Source" "scss/style.scss" "Fingerprint" $fingerprint -}}
{{- $options := dict "targetPath" "css/style.css" "enableSourceMap" true "includePaths" (slice "node_modules") -}}
{{- $style = dict "Context" . "ToCSS" $options "Minify" hugo.IsProduction "Defer" true | merge $style -}}
{{- partial "plugin/style.html" $style -}}
{{- end -}}
{{/* main js */}}
<script type="module" src="js/main.js" defer></script>
<script type="module" src="bundled/js/main.js" defer></script>
{{/* fonts */}}
<link