From 3e8bdfd8f971b7a7ebafa054b551ea1d935dba84 Mon Sep 17 00:00:00 2001 From: Cell <1024@lruihao.cn> Date: Thu, 3 Jul 2025 12:34:28 +0800 Subject: [PATCH] :recycle: Refactor: global/site/page scope state management (#610) * :zap: Perf: adjust global/site scope state management * :zap: Perf: adjust page scope state management --- layouts/_markup/render-heading.html | 6 +- layouts/_partials/assets.html | 99 ++++++++++--------- layouts/_partials/feed/rss.html | 2 +- layouts/_partials/footer.html | 6 +- layouts/_partials/function/id.html | 5 +- layouts/_partials/head/link.html | 4 +- layouts/_partials/head/script.html | 2 +- layouts/_partials/header.html | 2 +- layouts/_partials/home/profile.html | 2 +- .../_partials/init/detection-deprecated.html | 16 +-- layouts/_partials/init/detection-env.html | 19 ++-- layouts/_partials/init/detection-version.html | 8 +- layouts/_partials/init/global.html | 6 +- layouts/_partials/init/index.html | 4 +- layouts/_partials/init/patch.html | 6 +- layouts/_partials/paginator.html | 12 +-- layouts/_partials/plugin/analytics.html | 2 +- layouts/_partials/plugin/compatibility.html | 8 +- layouts/_partials/plugin/fixit-encryptor.html | 2 +- layouts/_partials/plugin/post-chat-ai.html | 8 +- layouts/_partials/plugin/share.html | 8 +- layouts/_partials/recently-updated.html | 2 +- layouts/_partials/scratch/script.html | 5 +- layouts/_partials/scratch/style.html | 6 +- layouts/_partials/single/comment.html | 50 +++++----- layouts/_partials/single/footer.html | 4 +- layouts/_partials/single/related-aside.html | 2 +- layouts/_partials/single/related.html | 2 +- layouts/_partials/single/reward.html | 2 +- layouts/_partials/widgets.html | 2 +- layouts/_shortcodes/fixit-encryptor.html | 2 +- layouts/_shortcodes/reward.html | 2 +- layouts/_shortcodes/style.html | 2 +- layouts/baseof.html | 4 +- layouts/home.archives.html | 2 +- layouts/home.html | 2 +- layouts/home.readme.md | 2 +- layouts/home.rss.xml | 4 +- layouts/page.html | 2 +- layouts/posts/single.html | 10 +- layouts/section.rss.xml | 2 +- layouts/term.rss.xml | 2 +- 42 files changed, 165 insertions(+), 173 deletions(-) diff --git a/layouts/_markup/render-heading.html b/layouts/_markup/render-heading.html index 667aee6a..bc1609ab 100644 --- a/layouts/_markup/render-heading.html +++ b/layouts/_markup/render-heading.html @@ -29,7 +29,7 @@ {{- if $ordered -}} {{- /* Set the count for child level to 0 */ -}} - {{- .Page.Scratch.SetInMap "heading-counter" (string (add $level 1)) 0 -}} + {{- .Page.Store.SetInMap "heading-counter" (string (add $level 1)) 0 -}} {{- end -}} {{- $attrs := "" }} @@ -50,9 +50,9 @@ {{- $title := .Text -}} {{- if $ordered -}} {{- /* Add 1 to the current level */ -}} - {{- $headingMap := .Page.Scratch.Get "heading-counter" -}} + {{- $headingMap := .Page.Store.Get "heading-counter" -}} {{- $count := (string $level) | index $headingMap | int | add 1 -}} - {{- .Page.Scratch.SetInMap "heading-counter" (string $level) $count -}} + {{- .Page.Store.SetInMap "heading-counter" (string $level) $count -}} {{- /* Get the counters for all levels */ -}} {{- $h1 := "1" | index $headingMap | int | string -}} diff --git a/layouts/_partials/assets.html b/layouts/_partials/assets.html index b6ccb4f4..ac61eadb 100644 --- a/layouts/_partials/assets.html +++ b/layouts/_partials/assets.html @@ -1,26 +1,27 @@ +{{- $noop := .WordCount -}} {{- $params := partial "function/params.html" -}} -{{- $cdn := .Scratch.Get "cdn" | default dict -}} -{{- $fingerprint := .Scratch.Get "fingerprint" -}} -{{- $config := (.Scratch.Get "this").config -}} -{{- $config = dict "version" (.Scratch.Get "version") | merge $config -}} +{{- $cdn := .Site.Store.Get "cdn" | default dict -}} +{{- $fingerprint := .Site.Store.Get "fingerprint" -}} +{{- $config := (.Store.Get "this").config -}} +{{- $config = dict "version" (hugo.Store.Get "version") | merge $config -}} {{- /* Search */ -}} {{- if .Site.Params.search | and .Site.Params.search.enable -}} {{- $search := .Site.Params.search -}} {{- /* TODO update "lib/autocomplete-js/umd/index.production.js" */ -}} {{- $source := $cdn.autocompleteJS | default "lib/autocomplete/autocomplete.min.js" -}} - {{- dict "Source" $source "Fingerprint" $fingerprint "Defer" true | dict "Scratch" .Scratch "Data" | partial "scratch/script.html" -}} + {{- dict "Source" $source "Fingerprint" $fingerprint "Defer" true | dict "Page" . "Data" | partial "scratch/script.html" -}} {{- $config = dict "maxResultLength" $search.maxResultLength "snippetLength" $search.snippetLength "highlightTag" $search.highlightTag "noResultsFound" (T "assets.noResultsFound") | dict "search" | merge $config -}} {{- if eq $search.type "algolia" -}} {{- $source := $cdn.algoliasearchJS | default "lib/algoliasearch/algoliasearch-lite.umd.min.js" -}} - {{- dict "Source" $source "Fingerprint" $fingerprint "Defer" true | dict "Scratch" .Scratch "Data" | partial "scratch/script.html" -}} + {{- dict "Source" $source "Fingerprint" $fingerprint "Defer" true | dict "Page" . "Data" | partial "scratch/script.html" -}} {{- $config = dict "type" "algolia" "algoliaIndex" $search.algolia.index "algoliaAppID" $search.algolia.appID "algoliaSearchKey" $search.algolia.searchKey | dict "search" | merge $config -}} {{- else if eq $search.type "fuse" -}} {{- with .Site.Home.OutputFormats.Get "search" -}} {{- $config = dict "type" "fuse" "fuseIndexURL" .RelPermalink | dict "search" | merge $config -}} {{- end -}} {{- $source := $cdn.fuseJS | default "lib/fuse/fuse.min.js" -}} - {{- dict "Source" $source "Fingerprint" $fingerprint "Defer" true | dict "Scratch" .Scratch "Data" | partial "scratch/script.html" -}} + {{- dict "Source" $source "Fingerprint" $fingerprint "Defer" true | dict "Page" . "Data" | partial "scratch/script.html" -}} {{- $config = dict "isCaseSensitive" $search.fuse.isCaseSensitive "minMatchCharLength" $search.fuse.minMatchCharLength "findAllMatches" $search.fuse.findAllMatches "location" $search.fuse.location "threshold" $search.fuse.threshold "distance" $search.fuse.distance "ignoreLocation" $search.fuse.ignoreLocation "useExtendedSearch" $search.fuse.useExtendedSearch "ignoreFieldNorm" $search.fuse.ignoreFieldNorm | dict "search" | merge $config -}} {{- else if eq $search.type "cse" -}} {{- $config = dict "type" "cse" | dict "search" | merge $config -}} @@ -40,26 +41,26 @@ {{- /* instant.page */ -}} {{- if $params.instantPage -}} {{- $source := $cdn.instantPage | default "lib/instant-page/instantpage.min.js" -}} - {{- dict "Source" $source "Fingerprint" $fingerprint "Attr" `type="module"` "Async" true "Defer" true | dict "Scratch" .Scratch "Data" | partial "scratch/script.html" -}} + {{- dict "Source" $source "Fingerprint" $fingerprint "Attr" `type="module"` "Async" true "Defer" true | dict "Page" . "Data" | partial "scratch/script.html" -}} {{- end -}} {{- /* twemoji */ -}} {{- if $params.twemoji -}} {{- $source := $cdn.twemojiJS | default "lib/twemoji/twemoji.min.js" -}} - {{- dict "Source" $source "Fingerprint" $fingerprint "Defer" true | dict "Scratch" .Scratch "Data" | partial "scratch/script.html" -}} + {{- dict "Source" $source "Fingerprint" $fingerprint "Defer" true | dict "Page" . "Data" | partial "scratch/script.html" -}} {{- $config = dict "twemoji" true | merge $config -}} {{- end -}} {{- /* lightgallery */ -}} {{- if $params.lightgallery | or (eq $params.lightgallery "force") -}} {{- $source := $cdn.lightgalleryCSS | default "lib/lightgallery/css/lightgallery-bundle.min.css" -}} - {{- dict "Source" $source "Fingerprint" $fingerprint | dict "Scratch" .Scratch "Data" | partial "scratch/style.html" -}} + {{- dict "Source" $source "Fingerprint" $fingerprint | dict "Page" . "Data" | partial "scratch/style.html" -}} {{- $source := $cdn.lightgalleryJS | default "lib/lightgallery/lightgallery.min.js" -}} - {{- dict "Source" $source "Fingerprint" $fingerprint "Defer" true | dict "Scratch" .Scratch "Data" | partial "scratch/script.html" -}} + {{- dict "Source" $source "Fingerprint" $fingerprint "Defer" true | dict "Page" . "Data" | partial "scratch/script.html" -}} {{- $source := $cdn.lightgalleryThumbnailJS | default "lib/lightgallery/plugins/thumbnail/lg-thumbnail.min.js" -}} - {{- dict "Source" $source "Fingerprint" $fingerprint "Defer" true | dict "Scratch" .Scratch "Data" | partial "scratch/script.html" -}} + {{- dict "Source" $source "Fingerprint" $fingerprint "Defer" true | dict "Page" . "Data" | partial "scratch/script.html" -}} {{- $source := $cdn.lightgalleryZoomJS | default "lib/lightgallery/plugins/zoom/lg-zoom.min.js" -}} - {{- dict "Source" $source "Fingerprint" $fingerprint "Defer" true | dict "Scratch" .Scratch "Data" | partial "scratch/script.html" -}} + {{- dict "Source" $source "Fingerprint" $fingerprint "Defer" true | dict "Page" . "Data" | partial "scratch/script.html" -}} {{- $config = dict "lightgallery" true | merge $config -}} {{- end -}} @@ -78,14 +79,14 @@ {{- /* Sharer.js */ -}} {{- if $params.share.enable -}} {{- $source := $cdn.sharerJS | default "lib/sharer/sharer.min.js" -}} - {{- dict "Source" $source "Fingerprint" $fingerprint "Async" true "Defer" true | dict "Scratch" .Scratch "Data" | partial "scratch/script.html" -}} + {{- dict "Source" $source "Fingerprint" $fingerprint "Async" true "Defer" true | dict "Page" . "Data" | partial "scratch/script.html" -}} {{- end -}} {{- /* TypeIt */ -}} {{- if .Store.Get "hasTyped" -}} {{- $typeit := .Site.Params.typeit -}} {{- $source := $cdn.typeitJS | default "lib/typeit/index.umd.js" -}} - {{- dict "Source" $source "Fingerprint" $fingerprint "Defer" true | dict "Scratch" $.Scratch "Data" | partial "scratch/script.html" -}} + {{- dict "Source" $source "Fingerprint" $fingerprint "Defer" true | dict "Page" . "Data" | partial "scratch/script.html" -}} {{- $config = dict "speed" $typeit.speed "cursorSpeed" $typeit.cursorSpeed "cursorChar" $typeit.cursorChar "duration" $typeit.duration "loop" $typeit.loop | dict "typeit" | merge $config -}} {{- end -}} @@ -95,11 +96,11 @@ {{- /* KaTeX */ -}} {{- if (eq $math.type "katex") | and (.Store.Get "hasKaTeX") -}} {{- $source := $cdn.katexCSS | default "lib/katex/katex.min.css" -}} - {{- dict "Source" $source "Fingerprint" $fingerprint "Preload" true | dict "Scratch" .Scratch "Data" | partial "scratch/style.html" -}} + {{- dict "Source" $source "Fingerprint" $fingerprint "Preload" true | dict "Page" . "Data" | partial "scratch/style.html" -}} {{- /* Copy-tex extension */ -}} {{- if $math.katex.copyTex -}} {{- $source := $cdn.katexCopyTexJS | default "lib/katex/copy-tex.min.js" -}} - {{- dict "Source" $source "Fingerprint" $fingerprint "Defer" true | dict "Scratch" .Scratch "Data" | partial "scratch/script.html" -}} + {{- dict "Source" $source "Fingerprint" $fingerprint "Defer" true | dict "Page" . "Data" | partial "scratch/script.html" -}} {{- end -}} {{- end -}} @@ -123,7 +124,7 @@ {{- if not hugo.IsProduction -}} {{- $options = dict "sourceMap" "external" | merge $options -}} {{- end -}} - {{- dict "Source" $source "Build" $options "Fingerprint" $fingerprint "Async" true "Defer" true | dict "Scratch" .Scratch "Data" | partial "scratch/script.html" -}} + {{- dict "Source" $source "Build" $options "Fingerprint" $fingerprint "Async" true "Defer" true | dict "Page" . "Data" | partial "scratch/script.html" -}} {{- end -}} {{- end -}} @@ -142,7 +143,7 @@ {{- /* ECharts */ -}} {{- if .Store.Get "hasEcharts" -}} {{- $source := $cdn.echartsJS | default "lib/echarts/echarts.min.js" -}} - {{- dict "Source" $source "Fingerprint" $fingerprint "Defer" true | dict "Scratch" .Scratch "Data" | partial "scratch/script.html" -}} + {{- dict "Source" $source "Fingerprint" $fingerprint "Defer" true | dict "Page" . "Data" | partial "scratch/script.html" -}} {{- $lightTheme := resources.Get "lib/echarts/theme/light.yml" | transform.Unmarshal -}} {{- $darkTheme := resources.Get "lib/echarts/theme/dark.yml" | transform.Unmarshal -}} {{- $config = dict "lightTheme" $lightTheme "darkTheme" $darkTheme | dict "echarts" | merge $config -}} @@ -151,10 +152,10 @@ {{- /* Mapbox GL */ -}} {{- if .HasShortcode "mapbox" -}} {{- $source := $cdn.mapboxGLCSS | default "lib/mapbox-gl/mapbox-gl.css" -}} - {{- dict "Source" $source "Minify" true "Fingerprint" $fingerprint "Preload" true | dict "Scratch" .Scratch "Data" | partial "scratch/style.html" -}} + {{- dict "Source" $source "Minify" true "Fingerprint" $fingerprint "Preload" true | dict "Page" . "Data" | partial "scratch/style.html" -}} {{- $source = $cdn.mapboxGLJS | default "lib/mapbox-gl/mapbox-gl.js" -}} - {{- dict "Source" $source "Fingerprint" $fingerprint "Defer" true | dict "Scratch" .Scratch "Data" | partial "scratch/script.html" -}} - {{- dict "Source" "lib/mapbox-gl/mapbox-gl-language.js" "Minify" true "Fingerprint" $fingerprint "Defer" true | dict "Scratch" .Scratch "Data" | partial "scratch/script.html" -}} + {{- dict "Source" $source "Fingerprint" $fingerprint "Defer" true | dict "Page" . "Data" | partial "scratch/script.html" -}} + {{- dict "Source" "lib/mapbox-gl/mapbox-gl-language.js" "Minify" true "Fingerprint" $fingerprint "Defer" true | dict "Page" . "Data" | partial "scratch/script.html" -}} {{- $config = dict "accessToken" $params.mapbox.accessToken "RTLTextPlugin" "https://api.mapbox.com/mapbox-gl-js/plugins/mapbox-gl-rtl-text/v0.2.0/mapbox-gl-rtl-text.js" | dict "mapbox" | merge $config -}} {{- end -}} @@ -162,23 +163,23 @@ {{- if .HasShortcode "music" -}} {{- /* APlayer */ -}} {{- $source := $cdn.aplayerCSS | default "lib/aplayer/APlayer.min.css" -}} - {{- dict "Source" $source "Fingerprint" $fingerprint "Preload" true | dict "Scratch" .Scratch "Data" | partial "scratch/style.html" -}} + {{- dict "Source" $source "Fingerprint" $fingerprint "Preload" true | dict "Page" . "Data" | partial "scratch/style.html" -}} {{- $options := dict "targetPath" "lib/aplayer/dark.min.css" "enableSourceMap" true -}} - {{- dict "Source" "lib/aplayer/dark.scss" "ToCSS" $options "Fingerprint" $fingerprint | dict "Scratch" .Scratch "Data" | partial "scratch/style.html" -}} + {{- dict "Source" "lib/aplayer/dark.scss" "ToCSS" $options "Fingerprint" $fingerprint | dict "Page" . "Data" | partial "scratch/style.html" -}} {{- $source := $cdn.aplayerJS | default "lib/aplayer/APlayer.min.js" -}} - {{- dict "Source" $source "Fingerprint" $fingerprint "Defer" true | dict "Scratch" .Scratch "Data" | partial "scratch/script.html" -}} + {{- dict "Source" $source "Fingerprint" $fingerprint "Defer" true | dict "Page" . "Data" | partial "scratch/script.html" -}} {{- /* MetingJS */ -}} {{- $source := $cdn.metingJS | default "lib/meting/Meting.min.js" -}} - {{- dict "Source" $source "Fingerprint" $fingerprint "Defer" true | dict "Scratch" .Scratch "Data" | partial "scratch/script.html" -}} + {{- dict "Source" $source "Fingerprint" $fingerprint "Defer" true | dict "Page" . "Data" | partial "scratch/script.html" -}} {{- end -}} {{- /* Cookie Consent */ -}} {{- if .Site.Params.cookieconsent | and .Site.Params.cookieconsent.enable -}} {{- $source := $cdn.cookieconsentCSS | default "lib/cookieconsent/cookieconsent.min.css" -}} - {{- dict "Source" $source "Fingerprint" $fingerprint | dict "Scratch" .Scratch "Data" | partial "scratch/style.html" -}} + {{- dict "Source" $source "Fingerprint" $fingerprint | dict "Page" . "Data" | partial "scratch/style.html" -}} {{- $source := $cdn.cookieconsentJS | default "lib/cookieconsent/cookieconsent.min.js" -}} - {{- dict "Source" $source "Fingerprint" $fingerprint "Defer" true | dict "Scratch" .Scratch "Data" | partial "scratch/script.html" -}} + {{- dict "Source" $source "Fingerprint" $fingerprint "Defer" true | dict "Page" . "Data" | partial "scratch/script.html" -}} {{- $cookieconsentConfig := dict "popup" (dict "background" "#1aa3ff") "button" (dict "background" "#f0f0f0") | dict "theme" "edgeless" "palette" -}} {{- $cookieconsentConfig = .Site.Params.cookieconsent | merge $cookieconsentConfig -}} {{- $cookieconsentConfig = dict "message" ($cookieconsentConfig.content.message | default (T "assets.cookieconsentMessage")) "dismiss" ($cookieconsentConfig.content.dismiss | default (T "assets.cookieconsentDismiss")) "link" ($cookieconsentConfig.content.link | default (T "assets.cookieconsentLink")) | dict "content" | merge $cookieconsentConfig -}} @@ -188,14 +189,14 @@ {{- /* PanguJS */ -}} {{- if eq .Site.Params.pangu.enable true -}} {{- $source := $cdn.panguJS | default "lib/pangu/pangu.min.js" -}} - {{- dict "Source" $source "Fingerprint" $fingerprint "Defer" true | dict "Scratch" .Scratch "Data" | partial "scratch/script.html" -}} + {{- dict "Source" $source "Fingerprint" $fingerprint "Defer" true | dict "Page" . "Data" | partial "scratch/script.html" -}} {{- $config = dict "pangu" .Site.Params.pangu | merge $config -}} {{- end -}} {{- /* Watermark */ -}} {{- if eq .Site.Params.watermark.enable true -}} {{- $source := $cdn.cellWatermarkJS | default "lib/cell-watermark/watermark.min.js" -}} - {{- dict "Source" $source "Fingerprint" $fingerprint "Defer" true | dict "Scratch" .Scratch "Data" | partial "scratch/script.html" -}} + {{- dict "Source" $source "Fingerprint" $fingerprint "Defer" true | dict "Page" . "Data" | partial "scratch/script.html" -}} {{- /* Hugo bug: case insensitive for `.Site.Params` */ -}} {{- $config = dict "watermark" .Site.Params.watermark | merge $config -}} {{- end -}} @@ -207,27 +208,27 @@ {{- $cryptoEncBase64JS := $cdn.cryptoEncBase64JS | default "lib/crypto-js/enc-base64.js" -}} {{- $cryptoSha256JS := $cdn.cryptoSha256JS | default "lib/crypto-js/sha256.js" -}} {{- $xxhashWasmJS := $cdn.xxhashWasmJS | default "lib/xxhash-wasm/xxhash-wasm.js" -}} - {{- dict "Source" $cryptoCoreJS "Minify" true "Fingerprint" $fingerprint "Defer" true | dict "Scratch" .Scratch "Data" | partial "scratch/script.html" -}} - {{- dict "Source" $cryptoEncBase64JS "Minify" true "Fingerprint" $fingerprint "Defer" true | dict "Scratch" .Scratch "Data" | partial "scratch/script.html" -}} - {{- dict "Source" $cryptoSha256JS "Minify" true "Fingerprint" $fingerprint "Defer" true | dict "Scratch" .Scratch "Data" | partial "scratch/script.html" -}} - {{- dict "Source" $xxhashWasmJS "Fingerprint" $fingerprint "Defer" true | dict "Scratch" .Scratch "Data" | partial "scratch/script.html" -}} + {{- dict "Source" $cryptoCoreJS "Minify" true "Fingerprint" $fingerprint "Defer" true | dict "Page" . "Data" | partial "scratch/script.html" -}} + {{- dict "Source" $cryptoEncBase64JS "Minify" true "Fingerprint" $fingerprint "Defer" true | dict "Page" . "Data" | partial "scratch/script.html" -}} + {{- dict "Source" $cryptoSha256JS "Minify" true "Fingerprint" $fingerprint "Defer" true | dict "Page" . "Data" | partial "scratch/script.html" -}} + {{- dict "Source" $xxhashWasmJS "Fingerprint" $fingerprint "Defer" true | dict "Page" . "Data" | partial "scratch/script.html" -}} {{- /* Decryption script */ -}} {{- $options := dict "targetPath" "js/fixit-decryptor.min.js" "minify" hugo.IsProduction -}} {{- if not hugo.IsProduction -}} {{- $options = dict "sourceMap" "external" | merge $options -}} {{- end -}} - {{- dict "Source" (resources.Get "js/fixit-decryptor.js") "Build" $options "Fingerprint" $fingerprint "Defer" true | dict "Scratch" .Scratch "Data" | partial "scratch/script.html" -}} + {{- dict "Source" (resources.Get "js/fixit-decryptor.js") "Build" $options "Fingerprint" $fingerprint "Defer" true | dict "Page" . "Data" | partial "scratch/script.html" -}} {{- $config = dict "all" (isset $params "password") "shortcode" ($encryptPartial | default false) | dict "encryption" | merge $config -}} {{- end -}} {{- /* 不蒜子 */ -}} {{- if .Site.Params.busuanzi.enable | and hugo.IsProduction -}} {{- $source := .Site.Params.busuanzi.source | default "https://vercount.one/js" -}} - {{- dict "Source" $source "Fingerprint" $fingerprint "Async" true "Defer" true | dict "Scratch" .Scratch "Data" | partial "scratch/script.html" -}} + {{- dict "Source" $source "Fingerprint" $fingerprint "Async" true "Defer" true | dict "Page" . "Data" | partial "scratch/script.html" -}} {{- end -}} {{- /* Site creation time */ -}} -{{- $siteTime := .Scratch.Get "siteTime" -}} +{{- $siteTime := .Site.Store.Get "siteTime" -}} {{- if $siteTime.enable -}} {{- with $siteTime.value -}} {{- $config = dict "siteTime" . | merge $config -}} @@ -261,11 +262,11 @@ {{- $paceCSS = printf "%v/pace-theme-default.min.css" . -}} {{- end -}} {{- end -}} - {{- dict "Source" $paceJS "Fingerprint" $fingerprint "Async" true "Defer" true | dict "Scratch" .Scratch "Data" | partial "scratch/script.html" -}} - {{- dict "Source" $paceCSS "Fingerprint" $fingerprint | dict "Scratch" .Scratch "Data" | partial "scratch/style.html" -}} + {{- dict "Source" $paceJS "Fingerprint" $fingerprint "Async" true "Defer" true | dict "Page" . "Data" | partial "scratch/script.html" -}} + {{- dict "Source" $paceCSS "Fingerprint" $fingerprint | dict "Page" . "Data" | partial "scratch/style.html" -}} {{- /* To patch pace theme flat-top z-index error */ -}} {{- if eq $.Site.Params.pace.theme "flat-top" -}} - {{- dict "Source" "lib/pace/pace-patch-flat-top.css" "Fingerprint" $fingerprint | dict "Scratch" .Scratch "Data" | partial "scratch/style.html" -}} + {{- dict "Source" "lib/pace/pace-patch-flat-top.css" "Fingerprint" $fingerprint | dict "Page" . "Data" | partial "scratch/style.html" -}} {{- end -}} {{- end -}} @@ -273,18 +274,18 @@ {{- partial "plugin/post-chat-ai.html" . -}} {{- range $params.library.css -}} - {{- dict "Source" . "Fingerprint" $fingerprint | dict "Scratch" $.Scratch "Data" | partial "scratch/style.html" -}} + {{- dict "Source" . "Fingerprint" $fingerprint | dict "Page" $ "Data" | partial "scratch/style.html" -}} {{- end -}} {{- range $params.library.js -}} - {{- dict "Source" . "Fingerprint" $fingerprint "Defer" true | dict "Scratch" $.Scratch "Data" | partial "scratch/script.html" -}} + {{- dict "Source" . "Fingerprint" $fingerprint "Defer" true | dict "Page" $ "Data" | partial "scratch/script.html" -}} {{- end -}} {{- with .Store.Get "styleArr" -}} {{- $content := delimit . " " -}} {{- $path := substr (md5 $.RelPermalink) 0 8 | printf "css/%v" -}} {{- $options := printf "%v.min.css" $path | dict "targetPath" -}} - {{- dict "Content" $content "Path" (printf "%v.scss" $path) "ToCSS" $options | dict "Scratch" $.Scratch "Data" | partial "scratch/style.html" -}} + {{- dict "Content" $content "Path" (printf "%v.scss" $path) "ToCSS" $options | dict "Page" $ "Data" | partial "scratch/style.html" -}} {{- end -}} {{- /* Config script */ -}} @@ -292,14 +293,14 @@ {{- if hugo.IsServer -}} {{- $configJS = add $configJS "console.log('Page config:', window.config);" -}} {{- end -}} -{{- $configJS | dict "Content" | dict "Scratch" .Scratch "Data" | partial "scratch/script.html" -}} +{{- $configJS | dict "Content" | dict "Page" . "Data" | partial "scratch/script.html" -}} {{- /* Theme script */ -}} {{- $options := dict "targetPath" "js/theme.min.js" "minify" hugo.IsProduction -}} {{- if not hugo.IsProduction -}} {{- $options = dict "sourceMap" "external" | merge $options -}} {{- end -}} -{{- dict "Source" (resources.Get "js/theme.js") "Build" $options "Fingerprint" $fingerprint "Defer" true | dict "Scratch" .Scratch "Data" | partial "scratch/script.html" -}} +{{- dict "Source" (resources.Get "js/theme.js") "Build" $options "Fingerprint" $fingerprint "Defer" true | dict "Page" . "Data" | partial "scratch/script.html" -}} {{- /* Custom Assets */ -}} {{- block "custom-assets" . }}{{ end -}} @@ -310,20 +311,20 @@ {{- if not hugo.IsProduction -}} {{- $options = dict "sourceMap" "inline" | merge $options -}} {{- end -}} - {{- dict "Source" . "Build" $options "Fingerprint" $fingerprint "Defer" true | dict "Scratch" $.Scratch "Data" | partial "scratch/script.html" -}} + {{- dict "Source" . "Build" $options "Fingerprint" $fingerprint "Defer" true | dict "Page" $ "Data" | partial "scratch/script.html" -}} {{- end -}} {{- with .Store.Get "scriptArr" -}} {{- $content := delimit . "\n" -}} {{- $targetPath := substr (md5 $.RelPermalink) 0 8 | printf "js/%v.js" -}} - {{- dict "Content" $content "Path" $targetPath "Defer" true | dict "Scratch" $.Scratch "Data" | partial "scratch/script.html" -}} + {{- dict "Content" $content "Path" $targetPath "Defer" true | dict "Page" $ "Data" | partial "scratch/script.html" -}} {{- end -}} -{{- range (.Scratch.Get "this").style -}} +{{- range (.Store.Get "this").style -}} {{- partial "plugin/style.html" . -}} {{- end -}} -{{- range (.Scratch.Get "this").script -}} +{{- range (.Store.Get "this").script -}} {{- partial "plugin/script.html" . -}} {{- end -}} diff --git a/layouts/_partials/feed/rss.html b/layouts/_partials/feed/rss.html index 292cbcb3..d55e27f7 100644 --- a/layouts/_partials/feed/rss.html +++ b/layouts/_partials/feed/rss.html @@ -19,7 +19,7 @@ {{ .Site.Params.feed.follow.userId }} {{- end }} - Hugo {{ hugo.Version }} & FixIt {{ .Version }} + Hugo {{ hugo.Version }} & FixIt {{ hugo.Store.Get "version" }} {{ .Site.Language.LanguageCode }}{{ with .Site.Params.author.email }} {{.}}{{ with $.Site.Params.author.name }} ({{ . }}){{ end }}{{ end }}{{ with .Site.Params.author.email }} {{ . }}{{ with $.Site.Params.author.name }} ({{ . }}){{ end }}{{ end }}{{ with .Site.Copyright }} diff --git a/layouts/_partials/footer.html b/layouts/_partials/footer.html index 1d9f4f4b..507fbbbb 100644 --- a/layouts/_partials/footer.html +++ b/layouts/_partials/footer.html @@ -10,7 +10,7 @@ {{- if ne $footerConfig.powered.enable false -}}
{{- $hugo := printf `{hugoLogo}Hugo` hugo.Version -}} - {{- $theme := printf `{themeLogo}FixIt` (.Scratch.Get "version") -}} + {{- $theme := printf `{themeLogo}FixIt` (hugo.Store.Get "version") -}} {{- if $footerConfig.powered.hugoLogo -}} {{- $hugoLogo := printf `Hugo logo ` (resources.Get "images/hugo.svg" | minify).RelPermalink -}} {{- $hugo = replace $hugo "{hugoLogo}" $hugoLogo -}} @@ -42,7 +42,7 @@ {{- /* Author */ -}} {{- if ne $footerConfig.author false -}} - {{ partial "plugin/link.html" (dict "Destination" ($.Site.Params.author.link | default (.Scratch.Get "homeRelPermalink")) "Content" .Site.Params.author.name) -}} + {{ partial "plugin/link.html" (dict "Destination" ($.Site.Params.author.link | default (.Site.Store.Get "homeRelPermalink")) "Content" .Site.Params.author.name) -}} {{- end -}} @@ -53,7 +53,7 @@
{{- end -}} - {{- $siteTime := .Scratch.Get "siteTime" -}} + {{- $siteTime := .Site.Store.Get "siteTime" -}} {{- if $siteTime.enable -}}
{{- if $siteTime.enable | and $siteTime.value -}} diff --git a/layouts/_partials/function/id.html b/layouts/_partials/function/id.html index 4ca6a0bc..a8ddee51 100644 --- a/layouts/_partials/function/id.html +++ b/layouts/_partials/function/id.html @@ -1,11 +1,12 @@ {{- /* ID */ -}} +{{- $noop := .Page.WordCount -}} {{- $id := "" -}} {{- with .Id -}} {{- /* If an ID is specified, then just use it.*/ -}} {{- $id = printf "%v" . -}} {{- else -}} - {{- $count := ($.Scratch.Get "this").count | default 1 -}} + {{- $count := ($.Page.Store.Get "this").count | default 1 -}} {{- $id = printf "id-%d" $count -}} - {{- $count | add 1 | $.Scratch.SetInMap "this" "count" -}} + {{- $count | add 1 | $.Page.Store.SetInMap "this" "count" -}} {{- end -}} {{- return $id -}} diff --git a/layouts/_partials/head/link.html b/layouts/_partials/head/link.html index cf8d66cf..c71f199f 100644 --- a/layouts/_partials/head/link.html +++ b/layouts/_partials/head/link.html @@ -1,5 +1,5 @@ -{{- $cdn := .Scratch.Get "cdn" | default dict -}} -{{- $fingerprint := .Scratch.Get "fingerprint" -}} +{{- $cdn := .Site.Store.Get "cdn" | default dict -}} +{{- $fingerprint := .Site.Store.Get "fingerprint" -}} {{- $title := printf "%s %s %s" .Title .Site.Params.titleDelimiter .Site.Title -}} {{- if .IsHome -}} {{- $title = site.Title -}} diff --git a/layouts/_partials/head/script.html b/layouts/_partials/head/script.html index 20fe901c..b13f3314 100644 --- a/layouts/_partials/head/script.html +++ b/layouts/_partials/head/script.html @@ -1,4 +1,4 @@ -{{- $fingerprint := .Scratch.Get "fingerprint" -}} +{{- $fingerprint := .Site.Store.Get "fingerprint" -}} {{- /* Check theme isDark before body rendering */ -}} {{- $options := dict "targetPath" "js/head/color-scheme.min.js" "minify" hugo.IsProduction -}} diff --git a/layouts/_partials/header.html b/layouts/_partials/header.html index 2a0ebf91..59c1a34c 100644 --- a/layouts/_partials/header.html +++ b/layouts/_partials/header.html @@ -1,5 +1,5 @@ {{- $buildDrafts := .Site.BuildDrafts -}} -{{- $homeRelPermalink := .Scratch.Get "homeRelPermalink" -}} +{{- $homeRelPermalink := .Site.Store.Get "homeRelPermalink" -}} {{- /* Desktop header */ -}}
diff --git a/layouts/_partials/home/profile.html b/layouts/_partials/home/profile.html index 3be111dd..ea911d0a 100644 --- a/layouts/_partials/home/profile.html +++ b/layouts/_partials/home/profile.html @@ -105,7 +105,7 @@ {{- $social = dict "Id" $value | merge $social -}} {{- end -}} {{- if $social.Icon.Simpleicons -}} - {{- $prefix := ($.Scratch.Get "cdn" | default dict).simpleIconsPrefix -}} + {{- $prefix := ($.Site.Store.Get "cdn" | default dict).simpleIconsPrefix -}} {{- $social = dict "Prefix" $prefix | dict "Icon" | merge $social -}} {{- end -}} {{- $socialArr = $socialArr | append $social -}} diff --git a/layouts/_partials/init/detection-deprecated.html b/layouts/_partials/init/detection-deprecated.html index c444b846..18be4471 100644 --- a/layouts/_partials/init/detection-deprecated.html +++ b/layouts/_partials/init/detection-deprecated.html @@ -2,26 +2,14 @@ {{- $warns := slice -}} {{- $errors := slice -}} -{{- with .Site.Params.gitRepo | or .Site.Params.page.edit -}} - {{- $warns = $warns | append "The parameter `params.gitRepo` and `params.page.edit` is deprecated since v0.3.0, use `params.gitInfo` instead." -}} -{{- end -}} - -{{- with .Site.Params.customFilePath -}} - {{- $warns = $warns | append "The parameter `params.customFilePath` is deprecated since v0.3.7, use `layouts/_partials/custom.html` instead." -}} -{{- end -}} - -{{- with .Site.Params.footer.custom -}} - {{- $warns = $warns | append "The parameter `params.footer.custom` is deprecated since v0.3.7, use `layouts/_partials/custom.html` instead." -}} -{{- end -}} - {{- with .Site.Params.ibruce -}} {{- $warns = $warns | append "The parameter `params.ibruce` is deprecated since v0.3.9, use `params.busuanzi` instead." -}} {{- end -}} {{- if len $warns -}} - {{- warnf "Deprecated parameter detection until %v\n - %v\n\n" (.Scratch.Get "version") (delimit $warns "\n - ") -}} + {{- warnf "Deprecated parameter detection until %v\n - %v\n\n" (hugo.Store.Get "version") (delimit $warns "\n - ") -}} {{- end -}} {{- if len $errors -}} - {{- errorf "Deprecated parameter detection until %v\n - %v\n\n" (.Scratch.Get "version") (delimit $errors "\n - ") -}} + {{- errorf "Deprecated parameter detection until %v\n - %v\n\n" (hugo.Store.Get "version") (delimit $errors "\n - ") -}} {{- end -}} diff --git a/layouts/_partials/init/detection-env.html b/layouts/_partials/init/detection-env.html index e6167179..768ad17c 100644 --- a/layouts/_partials/init/detection-env.html +++ b/layouts/_partials/init/detection-env.html @@ -1,5 +1,4 @@ {{- /* FixIt theme environment detection */ -}} - {{- $params := partial "function/params.html" -}} {{- if hugo.IsProduction -}} @@ -12,21 +11,21 @@ {{- $cdn = printf "%v%v" $prefix $value | dict $key | merge $cdn -}} {{- end -}} {{- end -}} - {{- .Scratch.Set "cdn" $cdn -}} - {{- .Scratch.Set "fingerprint" .Site.Params.fingerprint -}} - {{- .Scratch.Set "analytics" .Site.Params.analytics -}} - {{- .Scratch.Set "comment" $params.comment -}} + {{- .Site.Store.Set "cdn" $cdn -}} + {{- .Site.Store.Set "fingerprint" .Site.Params.fingerprint -}} + {{- .Site.Store.Set "analytics" .Site.Params.analytics -}} + {{- .Store.Set "comment" $params.comment -}} {{- if eq .Params.comment true -}} - {{- .Scratch.Set "comment" .Site.Params.page.comment -}} + {{- .Store.Set "comment" .Site.Params.page.comment -}} {{- else if eq .Params.comment false -}} - {{- .Scratch.Set "comment" (dict "enable" false) -}} + {{- .Store.Set "comment" (dict "enable" false) -}} {{- end -}} {{- else -}} - {{- .Scratch.Set "devOpts" .Site.Params.dev -}} + {{- .Site.Store.Set "devOpts" .Site.Params.dev -}} {{- if ne .Site.Params.dev.enable true -}} - {{- .Scratch.Set "devOpts" dict -}} + {{- .Site.Store.Set "devOpts" dict -}} {{- end -}} {{- if eq .Site .Sites.Default -}} - {{- warnf "FixIt %v\n%v\n\n" (.Scratch.Get "version") (T "init.devEnvWarn") -}} + {{- warnf "FixIt %v\n%v\n\n" (hugo.Store.Get "version") (T "init.devEnvWarn") -}} {{- end -}} {{- end -}} diff --git a/layouts/_partials/init/detection-version.html b/layouts/_partials/init/detection-version.html index 00604c65..d261bf84 100644 --- a/layouts/_partials/init/detection-version.html +++ b/layouts/_partials/init/detection-version.html @@ -1,11 +1,11 @@ -{{- $version := .Scratch.Get "version" -}} +{{- $version := hugo.Store.Get "version" -}} {{- $latest := $version -}} -{{- $devOpts := .Scratch.Get "devOpts" -}} +{{- $devOpts := .Site.Store.Get "devOpts" -}} {{- /* Check for updates */ -}} {{- if $devOpts.c4u -}} {{- $url := "https://api.github.com/repos/hugo-fixit/FixIt/releases/latest" -}} - {{- $options := dict "headers" (.Scratch.Get "githubTokenHeader") -}} + {{- $options := dict "headers" (hugo.Store.Get "githubTokenHeader") -}} {{- $latest = (partial "function/get-remote-json" (dict "URL" $url "OPTIONS" $options )).tag_name -}} {{- end -}} @@ -24,4 +24,4 @@ {{- end -}} {{- end -}} -{{- .Scratch.Set "latest" $latest -}} +{{- hugo.Store.Set "latest" $latest -}} diff --git a/layouts/_partials/init/global.html b/layouts/_partials/init/global.html index 46925cc0..3a5a9ddd 100644 --- a/layouts/_partials/init/global.html +++ b/layouts/_partials/init/global.html @@ -2,16 +2,16 @@ {{- $homeRelPermalink := .Site.Home.RelPermalink -}} {{- $homeRelPermalink = strings.TrimSuffix "archives/" $homeRelPermalink -}} {{- $homeRelPermalink = strings.TrimSuffix "offline/" $homeRelPermalink -}} -{{- .Scratch.Set "homeRelPermalink" $homeRelPermalink -}} +{{- .Site.Store.Set "homeRelPermalink" $homeRelPermalink -}} {{- /* Set pages of main sections */ -}} {{- $pages := where .Site.RegularPages "Section" "in" .Site.MainSections -}} {{- $pages = $pages | union (where .Site.RegularPages "Type" "in" .Site.MainSections) -}} -{{- .Scratch.Set "mainSectionPages" $pages -}} +{{- .Site.Store.Set "mainSectionPages" $pages -}} {{- /* Select the scope named `public_repo` to generate personal access token */ -}} {{- $header := dict "Authorization" "" -}} {{- with (getenv "HUGO_PARAMS_GHTOKEN") -}} {{- $header = dict "Authorization" (printf "token %v" .) -}} {{- end -}} -{{- .Scratch.Set "githubTokenHeader" $header -}} +{{- hugo.Store.Set "githubTokenHeader" $header -}} diff --git a/layouts/_partials/init/index.html b/layouts/_partials/init/index.html index bf7dac9c..998cb554 100644 --- a/layouts/_partials/init/index.html +++ b/layouts/_partials/init/index.html @@ -1,5 +1,5 @@ -{{- .Scratch.Set "version" "v0.3.21-89f9373b" -}} -{{- .Scratch.Set "this" dict -}} +{{- hugo.Store.Set "version" "v0.3.21-40345324" -}} +{{- .Store.Set "this" dict -}} {{- partial "init/detection-env.html" . -}} {{- partial "init/detection-version.html" . -}} diff --git a/layouts/_partials/init/patch.html b/layouts/_partials/init/patch.html index 9089ea66..ca4a1da4 100644 --- a/layouts/_partials/init/patch.html +++ b/layouts/_partials/init/patch.html @@ -6,7 +6,7 @@ {{- if not (reflect.IsMap $toc) -}} {{- $toc = dict "enable" $toc | merge .Site.Params.page.toc -}} {{- end -}} -{{- .Scratch.Set "toc" $toc -}} +{{- .Store.Set "toc" $toc -}} {{- /* Reward data patch */ -}} {{- $reward := $params.reward -}} @@ -15,7 +15,7 @@ {{- else if eq $reward false -}} {{- $reward = dict "enable" false -}} {{- end -}} -{{- .Scratch.Set "reward" $reward -}} +{{- .Store.Set "reward" $reward -}} {{- /* KaTeX data patch */ -}} {{- $math := $params.math -}} @@ -35,4 +35,4 @@ {{- $siteTime = dict "enable" true "value" . | merge $siteTime -}} {{- end -}} {{- end -}} -{{- .Scratch.Set "siteTime" $siteTime -}} +{{- .Site.Store.Set "siteTime" $siteTime -}} diff --git a/layouts/_partials/paginator.html b/layouts/_partials/paginator.html index 77f527bc..8733286f 100644 --- a/layouts/_partials/paginator.html +++ b/layouts/_partials/paginator.html @@ -1,16 +1,16 @@ {{- if gt .Paginator.TotalPages 1 -}}