From 2ae8ee84ee289b8ad99b7ff5d1e1cbcc08510fc3 Mon Sep 17 00:00:00 2001
From: Fredrik Jonsson <frjo@xdeb.org>
Date: Wed, 14 Aug 2024 14:27:12 +0200
Subject: [PATCH] Min version is now v0.124.0. Using
 site.Config.Services.GoogleAnalytics.ID, hugo.IsMultilingual and hugo.yaml
 etc.

---
 exampleSite/{config.yaml => hugo.yaml} | 0
 config.yaml => hugo.yaml               | 2 +-
 layouts/_default/baseof.html           | 2 +-
 layouts/partials/mobilemenu.html       | 2 +-
 layouts/partials/tracking.html         | 5 ++---
 scripts/set_up_new_site.sh             | 6 +++---
 theme.toml                             | 2 +-
 7 files changed, 9 insertions(+), 10 deletions(-)
 rename exampleSite/{config.yaml => hugo.yaml} (100%)
 rename config.yaml => hugo.yaml (68%)

diff --git a/exampleSite/config.yaml b/exampleSite/hugo.yaml
similarity index 100%
rename from exampleSite/config.yaml
rename to exampleSite/hugo.yaml
diff --git a/config.yaml b/hugo.yaml
similarity index 68%
rename from config.yaml
rename to hugo.yaml
index 7ba4cae..c22babd 100644
--- a/config.yaml
+++ b/hugo.yaml
@@ -1,4 +1,4 @@
 module:
   hugoVersion:
     extended: true
-    min: "0.93.0"
+    min: "0.124.0"
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index fc861fe..9ad2293 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -28,7 +28,7 @@ <h1 class="header__site-name{{ if not ($.Param "sitename" | default true) }} vis
 <a href="{{ site.Home.RelPermalink }}" title="Home" class="header__site-link" rel="home"><span>{{ site.Title }}</span></a>
 </h1>
 <div class="region header__region">
-{{ if site.IsMultiLingual }}{{ partial "language-selector.html" . }}{{ end -}}
+{{ if hugo.IsMultilingual }}{{ partial "language-selector.html" . }}{{ end -}}
 {{ if $.Param "menuinheader" }}{{ partial "menu.html" . }}{{ end -}}
 </div>
 </header>
diff --git a/layouts/partials/mobilemenu.html b/layouts/partials/mobilemenu.html
index b2059ab..b1506e9 100644
--- a/layouts/partials/mobilemenu.html
+++ b/layouts/partials/mobilemenu.html
@@ -9,7 +9,7 @@
     </svg>
   </button>
   <div class="mobile-nav__sheet link-inverted link-nav" id="sheet" aria-hidden="true">
-    <div class="mobile-nav__region">{{ if site.IsMultiLingual }}{{ partial "language-selector.html" . }}{{ end }}</div>
+    <div class="mobile-nav__region">{{ if hugo.IsMultilingual }}{{ partial "language-selector.html" . }}{{ end }}</div>
     <nav class="mobile-nav__main-menu" aria-label="{{ i18n "menu_title" }}">
     <ul class="mobile-nav__navbar">
     {{ if site.Menus.main -}}
diff --git a/layouts/partials/tracking.html b/layouts/partials/tracking.html
index 4e318ec..115834e 100644
--- a/layouts/partials/tracking.html
+++ b/layouts/partials/tracking.html
@@ -1,4 +1,3 @@
-{{ $gaid := (or site.Config.Services.GoogleAnalytics.ID site.GoogleAnalytics) -}}
 {{ $opts := dict
   "minify" true
   "params" (dict
@@ -6,7 +5,7 @@
     "piwikTrackerUrl" site.Params.piwikTrackerUrl
     "piwikSiteID" site.Params.piwikSiteID
     "plausibleSiteID" site.Params.plausibleSiteID
-    "GoogleAnalytics" $gaid) -}}
+    "GoogleAnalytics" site.Config.Services.GoogleAnalytics.ID) -}}
 {{ if eq hugo.Environment "development" -}}
   {{ $opts = merge $opts (dict "minify" false) -}}
 {{ end -}}
@@ -20,7 +19,7 @@
 <script async defer data-domain="{{ site.Params.plausibleSiteID }}" src="{{ site.Params.plausibleTrackerURL | default "https://plausible.io/js/plausible.js" }}"></script>
 {{ end -}}
 
-{{ if $gaid -}}
+{{ if site.Config.Services.GoogleAnalytics.ID -}}
 {{ $script := resources.Get "js/tracking.js" | js.Build $opts | fingerprint -}}
 <script src="{{ $script.RelPermalink }}"></script>
 {{ template "_internal/google_analytics.html" . }}
diff --git a/scripts/set_up_new_site.sh b/scripts/set_up_new_site.sh
index da82971..f17ddce 100755
--- a/scripts/set_up_new_site.sh
+++ b/scripts/set_up_new_site.sh
@@ -22,7 +22,7 @@ copy_files=("themes/zen/assets/sass/_colors.scss:assets/sass/_colors.scss"
             "themes/zen/assets/sass/_custom.scss:assets/sass/_custom.scss"
             "themes/zen/assets/sass/_zen.scss:assets/sass/_zen.scss"
             "themes/zen/layouts/index.html:layouts/index.html"
-            "themes/zen/exampleSite/config.yaml:config.yaml"
+            "themes/zen/exampleSite/hugo.yaml:hugo.yaml"
             "themes/zen/.editorconfig:.editorconfig")
 
 for files in "${copy_files[@]}" ; do
@@ -34,6 +34,6 @@ for files in "${copy_files[@]}" ; do
   fi
 done
 
-if [[ -f "config.toml" && -f "config.yaml" ]]; then
-  mv config.toml config.toml.old
+if [[ -f "hugo.toml" && -f "hugo.yaml" ]]; then
+  mv hugo.toml hugo.toml.old
 fi
diff --git a/theme.toml b/theme.toml
index 8cd8cab..5b147e1 100644
--- a/theme.toml
+++ b/theme.toml
@@ -6,7 +6,7 @@ license = "GPLv2"
 licenselink = "http://www.gnu.org/licenses/old-licenses/gpl-2.0.html"
 tags = ["accessible", "multilingual", "responsive", "blog", "search", "math", "podcast"]
 features = ["accessible", "multilingual", "responsive", "grid", "sass", "search", "matomo", "jsonfeed", "math", "podcast"]
-min_version = "0.93.0"
+min_version = "0.124.0"
 
 [author]
   name = "Fredrik Jonsson"