upgrade to Hugo 0.167 and replace the ./hugo script with mounts

Hugo upgrade (0.121.2 -> 0.167.0):
- remove the blackfriday and pygments* settings (markup.highlight instead)
- languageName -> label, _build -> build, .Scratch -> .Store,
  .Sites -> hugo.Sites, .LanguageName -> .Label, .LanguageCode -> .Locale
- move the templates to the new layout tree (_partials, _shortcodes,
  home.html, page.html, term.html, taxonomy.html, section.html)
- use the embedded pagination, opengraph and twitter_cards partials
- fix the term filtering in post-metadata.html (.Data.<singular> is gone)
- keep the taxonomy terms as written (capitalizeListTitles: false) and
  give a proper title to the blog section ("Articles" instead of "Blogs")
- <s> is raw HTML (omitted by Goldmark): use ~~ instead
- use relref for a relative link that was broken in the RSS feeds

Mounts:
- the english content not translated in french is now published in the
  french site through module mounts, instead of symlinks created by the
  ./hugo script. hugo and hugo server can be used directly.
- chroma.css is now versioned instead of generated at each build
- remove the ./hugo script and realpath.py

The generated site has the same set of files. The remaining differences
come from the new minifier, the new embedded templates (og:locale, empty
meta tags removed, youtube iframe) and the new summary computation.

Refs #11

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01YNHsWYTXPThURz6TbVS1j3

README.md

@@ -17,13 +17,16 @@ Create a new branch:
 git checkout -b "$(date +%F)-update"
 ```
 
-Create a new page:
+Create a new page (in english or in french):
 
 ```sh
-hugo new speaking/my-wonderful-event.md
-vim content/speaking/my-wonderful-event.md
+hugo new content content/english/speaking/my-wonderful-event.md
+hugo new content content/french/speaking/my-wonderful-event.md
 ```
 
+English pages that are not translated are automatically published in the
+french site too (see the `module.mounts` section of `config.yaml`).
+
 Check locally that your changes are OK:
 
 ```sh
@@ -74,6 +77,6 @@ and released under the MIT license (see [LICENSE-theme](LICENSE-theme)).
 
 ## How to change the Chroma style for syntax highlighting
 
-The Chroma style sheet is generated by the `./hugo` script in
-`assets/css/chroma.css`. To change the style, edit the `--style` argument
-of the `hugo gen chromastyles` command in the `./hugo` script.
+```sh
+hugo gen chromastyles --style=borland > assets/css/chroma.css
+```

assets/css/.gitignore

@@ -1 +0,0 @@
-chroma.css

assets/css/chroma.css

@@ -0,0 +1,62 @@
+/* Generated using: hugo gen chromastyles --style=borland */
+
+/* Background */ .bg { background-color:#fff; }
+/* PreWrapper */ .chroma { background-color:#fff;-webkit-text-size-adjust:none; }
+/* Error */ .chroma .err { color:#a61717;background-color:#e3d2d2 }
+/* LineLink */ .chroma .lnlinks { outline:none;text-decoration:none;color:inherit }
+/* LineTableTD */ .chroma .lntd { vertical-align:top;padding:0;margin:0;border:0; }
+/* LineTable */ .chroma .lntable { border-spacing:0;padding:0;margin:0;border:0; }
+/* LineHighlight */ .chroma .hl { background-color:#e5e5e5 }
+/* LineNumbersTable */ .chroma .lnt { white-space:pre;-webkit-user-select:none;user-select:none;margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f }
+/* LineNumbers */ .chroma .ln { white-space:pre;-webkit-user-select:none;user-select:none;margin-right:0.4em;padding:0 0.4em 0 0.4em;color:#7f7f7f }
+/* Line */ .chroma .line { display:flex; }
+/* Keyword */ .chroma .k { color:#000080;font-weight:bold }
+/* KeywordConstant */ .chroma .kc { color:#000080;font-weight:bold }
+/* KeywordDeclaration */ .chroma .kd { color:#000080;font-weight:bold }
+/* KeywordNamespace */ .chroma .kn { color:#000080;font-weight:bold }
+/* KeywordPseudo */ .chroma .kp { color:#000080;font-weight:bold }
+/* KeywordReserved */ .chroma .kr { color:#000080;font-weight:bold }
+/* KeywordType */ .chroma .kt { color:#000080;font-weight:bold }
+/* NameAttribute */ .chroma .na { color:#f00 }
+/* NameTag */ .chroma .nt { color:#000080;font-weight:bold }
+/* LiteralString */ .chroma .s { color:#00f }
+/* LiteralStringAffix */ .chroma .sa { color:#00f }
+/* LiteralStringBacktick */ .chroma .sb { color:#00f }
+/* LiteralStringChar */ .chroma .sc { color:#800080 }
+/* LiteralStringDelimiter */ .chroma .dl { color:#00f }
+/* LiteralStringDoc */ .chroma .sd { color:#00f }
+/* LiteralStringDouble */ .chroma .s2 { color:#00f }
+/* LiteralStringEscape */ .chroma .se { color:#00f }
+/* LiteralStringHeredoc */ .chroma .sh { color:#00f }
+/* LiteralStringInterpol */ .chroma .si { color:#00f }
+/* LiteralStringOther */ .chroma .sx { color:#00f }
+/* LiteralStringRegex */ .chroma .sr { color:#00f }
+/* LiteralStringSingle */ .chroma .s1 { color:#00f }
+/* LiteralStringSymbol */ .chroma .ss { color:#00f }
+/* LiteralNumber */ .chroma .m { color:#00f }
+/* LiteralNumberBin */ .chroma .mb { color:#00f }
+/* LiteralNumberFloat */ .chroma .mf { color:#00f }
+/* LiteralNumberHex */ .chroma .mh { color:#00f }
+/* LiteralNumberInteger */ .chroma .mi { color:#00f }
+/* LiteralNumberIntegerLong */ .chroma .il { color:#00f }
+/* LiteralNumberOct */ .chroma .mo { color:#00f }
+/* OperatorWord */ .chroma .ow { font-weight:bold }
+/* Comment */ .chroma .c { color:#080;font-style:italic }
+/* CommentHashbang */ .chroma .ch { color:#080;font-style:italic }
+/* CommentMultiline */ .chroma .cm { color:#080;font-style:italic }
+/* CommentSingle */ .chroma .c1 { color:#080;font-style:italic }
+/* CommentSpecial */ .chroma .cs { color:#080;font-weight:bold }
+/* CommentPreproc */ .chroma .cp { color:#008080 }
+/* CommentPreprocFile */ .chroma .cpf { color:#008080 }
+/* GenericDeleted */ .chroma .gd { color:#000;background-color:#fdd }
+/* GenericEmph */ .chroma .ge { font-style:italic }
+/* GenericError */ .chroma .gr { color:#a00 }
+/* GenericHeading */ .chroma .gh { color:#999 }
+/* GenericInserted */ .chroma .gi { color:#000;background-color:#dfd }
+/* GenericOutput */ .chroma .go { color:#888 }
+/* GenericPrompt */ .chroma .gp { color:#555 }
+/* GenericStrong */ .chroma .gs { font-weight:bold }
+/* GenericSubheading */ .chroma .gu { color:#aaa }
+/* GenericTraceback */ .chroma .gt { color:#a00 }
+/* GenericUnderline */ .chroma .gl { text-decoration:underline }
+/* TextWhitespace */ .chroma .w { color:#bbb }

config.yaml

@@ -1,24 +1,21 @@
 baseURL: "/"
 title: "Nicolas Massé"
 author: "Nicolas Massé"
-# pygmentsUseClasses implies a style sheet that can be generated as follow:
-# hugo gen chromastyles --style=borland > assets/css/chroma.css
-# (this is done automatically by the ./hugo script)
-pygmentsUseClasses: true
-pygmentsCodefences: true
 enableRobotsTXT: true
+# Keep the taxonomy terms as they are written in the front matter
+capitalizeListTitles: false
 
-blackfriday:
-  extensionsmask:
-  # No "a" tag on bare links
-  - autolink
+markup:
+  highlight:
+    # Use CSS classes for syntax highlighting. The style sheet is generated with:
+    #   hugo gen chromastyles --style=borland > assets/css/chroma.css
+    noClasses: false
 
 defaultContentLanguage: "en"
 languages:
   en:
     weight: 1
-    languageName: English
-    contentDir: content/english
+    label: English
     menu:
       main:
       - name: "Articles"
@@ -44,8 +41,7 @@ languages:
         url: "https://www.linkedin.com/in/nicolasmasse/"
   fr:
     weight: 2
-    languageName: Français
-    contentDir: content/french
+    label: Français
     menu:
       main:
       - name: "Articles"
@@ -70,6 +66,26 @@ languages:
         weight: 70
         url: "https://www.linkedin.com/in/nicolasmasse/"
 
+# The french site contains the french content plus the english content that
+# has not been translated (french files take precedence over english files).
+module:
+  mounts:
+  - source: content/english
+    target: content
+    sites:
+      matrix:
+        languages: [en]
+  - source: content/french
+    target: content
+    sites:
+      matrix:
+        languages: [fr]
+  - source: content/english
+    target: content
+    sites:
+      matrix:
+        languages: [fr]
+
 taxonomies:
   opensource: "opensource"
   topic: "topics"
@@ -84,5 +100,5 @@ params:
 # files, etc.) and not the source files that sit next to them (xcf, heic,
 # raw videos, etc.).
 cascade:
-  _build:
+  build:
     publishResources: false

content/english/blog/_index.md

@@ -0,0 +1,3 @@
+---
+title: "Articles"
+---

content/english/blog/deploying-invidious-openshift.md

@@ -65,7 +65,7 @@ oc set volume dc/postgresql --add -t configmap --name postgresql-init \
                             -m /opt/app-root/src/postgresql-start
 ```
 
-Because of a <s>bug</s> feature in the [PostgreSQL base image](https://github.com/sclorg/postgresql-container) (see [#351](https://github.com/sclorg/postgresql-container/issues/351)), we need to hack a little bit the PostgreSQL image.
+Because of a ~~bug~~ feature in the [PostgreSQL base image](https://github.com/sclorg/postgresql-container) (see [#351](https://github.com/sclorg/postgresql-container/issues/351)), we need to hack a little bit the PostgreSQL image.
 
 ```sh
 cat <<"EOF" > /tmp/common.sh

content/english/blog/deploying-miniflux-openshift.md

@@ -48,7 +48,7 @@ oc set volume dc/postgresql --add -t configmap --name postgresql-init \
                             -m /opt/app-root/src/postgresql-start
 ```
 
-Because of a <s>bug</s> feature in the [PostgreSQL base image](https://github.com/sclorg/postgresql-container) (see [#351](https://github.com/sclorg/postgresql-container/issues/351)), we need to hack a little bit the PostgreSQL image.
+Because of a ~~bug~~ feature in the [PostgreSQL base image](https://github.com/sclorg/postgresql-container) (see [#351](https://github.com/sclorg/postgresql-container/issues/351)), we need to hack a little bit the PostgreSQL image.
 
 ```sh
 cat <<"EOF" > /tmp/common.sh

content/english/writing/apis-as-a-product-get-started-in-no-time.md

@@ -8,6 +8,6 @@ topics:
 - API Management
 ---
 
-In the previous article, [APIs as a Product: Get the value out of your APIs](../apis-as-a-product-get-the-value-out-of-your-apis/), we presented a new approach called “APIs as a Product” to maximize the value of your APIs. In this article, we show how to quickly get started with APIs as a Product using the new features of Red Hat 3scale API Management 2.7.
+In the previous article, [APIs as a Product: Get the value out of your APIs]({{< relref "apis-as-a-product-get-the-value-out-of-your-apis.md" >}}), we presented a new approach called “APIs as a Product” to maximize the value of your APIs. In this article, we show how to quickly get started with APIs as a Product using the new features of Red Hat 3scale API Management 2.7.
 
 [Continue reading](https://developers.redhat.com/blog/2019/12/03/apis-as-a-product-get-started-in-no-time/)

content/french/blog/_index.md

@@ -0,0 +1,3 @@
+---
+title: "Articles"
+---

find-internal-redirects

@@ -19,12 +19,12 @@ addExitHook "rm -rf \$DEST"
 echo "All artefacts will be generated in $DEST"
 
 #echo "Generating and serving content..."
-#./hugo serve -p 1313 -b http://localhost:1313/ --disableLiveReload --disableBrowserError --watch false --logLevel info --quiet --appendPort false &>"$DEST/hugo.log" &
+#hugo serve -p 1313 -b http://localhost:1313/ --disableLiveReload --disableBrowserError --watch false --logLevel info --quiet --appendPort false &>"$DEST/hugo.log" &
 #addExitHook "pkill -e --ignore-ancestors --full '^hugo'"
 
 echo "Generating content..."
 mkdir -p "$DEST/html" "$DEST/nginx"
-./hugo -b http://localhost:1313/ -d "$DEST/html"
+hugo -b http://localhost:1313/ -d "$DEST/html"
 
 echo "Serving content with nginx..."
 cat > "$DEST/nginx.conf" <<EOF

hugo

@@ -1,42 +0,0 @@
-#!/bin/bash
-
-set -Eeuo pipefail
-trap cleanup SIGINT SIGTERM ERR EXIT
-
-function cleanup() {
-  trap - SIGINT SIGTERM ERR EXIT
-
-  if [ -n "${NETLIFY_BUILD_BASE:-}" ]; then
-    # Dirty hack for netlify that don't ship the realpath command
-    realpath="python ./realpath.py"
-  fi
-
-  # On exit, remove any symbolic link in content/french that points
-  # to content/english
-  find content/french -type l -print0 | while IFS= read -r -d $'\0' filename; do
-    if ${realpath:-realpath} "$filename" | grep -E "^$PWD/" > /dev/null; then
-      rm -f "$filename"
-    fi
-  done
-}
-
-# First, try to find page bundles. In that case, link the directory
-(cd content/english && find * -type f -name 'index.md') | while read file; do
-  if [ ! -e "content/french/$file" ]; then
-    d="$(dirname $file)"
-    ln -s ../../../content/english/$d content/french/$d
-  fi
-done
-
-# Then, find the regular pages and link the files directly.
-(cd content/english && find * -type f -name '*.md') | while read file; do
-  if [ ! -e "content/french/$file" ]; then
-    ln -s ../../../content/english/$file content/french/$file
-  fi
-done
-
-# Remove dangling links
-find content/french -xtype l -exec rm -f {} \;
-
-hugo gen chromastyles --style=borland > assets/css/chroma.css
-hugo "$@"

layouts/partials/article-headline.html → layouts/_partials/article-headline.html

@@ -2,7 +2,7 @@
 <section>
 <h4><a href="{{ .current.RelPermalink }}">{{ .current.Title }}
 {{- partial "lang-detection.html" .current -}}
-{{ if .current.Scratch.Get "en_article_in_fr_site" }}
+{{ if .current.Store.Get "en_article_in_fr_site" }}
 {{- partial "icons/en.svg" . -}}
 {{ end }}
 </a></h4>

layouts/partials/head.html → layouts/_partials/head.html

@@ -70,8 +70,8 @@
   -->
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-{{ template "_internal/opengraph.html" . }}
-{{ template "_internal/twitter_cards.html" . }}
+{{ partial "opengraph.html" . }}
+{{ partial "twitter_cards.html" . }}
 
 <!-- The search page is the only one to require Javascript -->
 {{ if eq .Type "search" }}
@@ -92,7 +92,7 @@
 
 <!-- Deal with the case of english articles published in the french site -->
 {{- partial "lang-detection.html" . -}}
-{{- if .Scratch.Get "en_article_in_fr_site" -}}
+{{- if .Store.Get "en_article_in_fr_site" -}}
 <!--
   -- It's an english article published in the french site
   -- Tell Google not to index it and link to the original article.
@@ -112,7 +112,7 @@
   -->
 {{- with partial "real-translations.html" . -}}
 {{- range . | append $ }}
-<link rel="alternate" hreflang="{{ .Language.Lang }}" href="{{ .Permalink }}" title="{{ .Language.LanguageName }}">
+<link rel="alternate" hreflang="{{ .Language.Lang }}" href="{{ .Permalink }}" title="{{ .Language.Label }}">
 {{- end -}}
 {{- end -}}
 {{- end -}}
@@ -122,29 +122,29 @@
   -- https://search.google.com/test/rich-results
   -->
 {{- if .IsHome -}}
-  {{- $.Scratch.Set "structured_data" (dict "@context" "http://schema.org" "@type" "WebSite" "name" .Site.Title "url" .Site.BaseURL) -}}
+  {{- $.Store.Set "structured_data" (dict "@context" "http://schema.org" "@type" "WebSite" "name" .Site.Title "url" .Site.BaseURL) -}}
   {{- with .Site.Params.subtitle -}}
-    {{- $.Scratch.SetInMap "structured_data" "description" . -}}
+    {{- $.Store.SetInMap "structured_data" "description" . -}}
   {{- end -}}
 {{- else if and .IsPage (eq .Section "blog") -}}
-  {{- $.Scratch.Set "structured_data" (dict "@context" "http://schema.org" "@type" "BlogPosting" "headline" .Title "image" (slice) "articleSection" .Section) -}}
-  {{- if and (eq .Lang "fr") (.Scratch.Get "en_article_in_fr_site") -}}
-    {{- $.Scratch.SetInMap "structured_data" "inLanguage" "en" -}}
+  {{- $.Store.Set "structured_data" (dict "@context" "http://schema.org" "@type" "BlogPosting" "headline" .Title "image" (slice) "articleSection" .Section) -}}
+  {{- if and (eq .Lang "fr") (.Store.Get "en_article_in_fr_site") -}}
+    {{- $.Store.SetInMap "structured_data" "inLanguage" "en" -}}
     {{- range first 1 .Translations -}}
-      {{- $.Scratch.SetInMap "structured_data" "mainEntityOfPage" (dict "@type" "WebPage" "@id" .Permalink) -}}
+      {{- $.Store.SetInMap "structured_data" "mainEntityOfPage" (dict "@type" "WebPage" "@id" .Permalink) -}}
     {{- end -}}
   {{- else -}}
-    {{- $.Scratch.SetInMap "structured_data" "inLanguage" .Language.Lang -}}
-    {{- $.Scratch.SetInMap "structured_data" "mainEntityOfPage" (dict "@type" "WebPage" "@id" .Permalink) -}}
+    {{- $.Store.SetInMap "structured_data" "inLanguage" .Language.Lang -}}
+    {{- $.Store.SetInMap "structured_data" "mainEntityOfPage" (dict "@type" "WebPage" "@id" .Permalink) -}}
   {{- end -}}
   {{- if not .PublishDate.IsZero -}}
-    {{- $.Scratch.SetInMap "structured_data" "datePublished" .PublishDate -}}
+    {{- $.Store.SetInMap "structured_data" "datePublished" .PublishDate -}}
   {{- end -}}
   {{- if and (not .Lastmod.IsZero) (ne .Lastmod .PublishDate) -}}
-    {{- $.Scratch.SetInMap "structured_data" "dateModified" .Lastmod -}}
+    {{- $.Store.SetInMap "structured_data" "dateModified" .Lastmod -}}
   {{- end -}}
 {{- end -}}
-{{- with $.Scratch.Get "structured_data" }}
+{{- with $.Store.Get "structured_data" }}
 <script type="application/ld+json">
 {{- . | jsonify | safeJS -}}
 </script>

layouts/partials/lang-detection.html → layouts/_partials/lang-detection.html

@@ -4,12 +4,12 @@
     {{ $file0 := readFile (index .AllTranslations 0).File.Filename }}
     {{ $file1 := readFile (index .AllTranslations 1).File.Filename }}
     {{ if eq (sha256 $file0) (sha256 $file1) }}
-      {{ .Scratch.Set "en_article_in_fr_site" true }}
+      {{ .Store.Set "en_article_in_fr_site" true }}
     {{ end }}
   {{ else }}
     <!-- Sometimes there is no file though. In that case, compare the content. -->
     {{ if eq (index .AllTranslations 0).Plain (index .AllTranslations 1).Plain }}
-      {{ .Scratch.Set "en_article_in_fr_site" true }}
+      {{ .Store.Set "en_article_in_fr_site" true }}
     {{ end }}
   {{ end }}
 {{ end }}

layouts/partials/menu.html → layouts/_partials/menu.html

@@ -50,7 +50,7 @@
             {{- end -}}
             {{- else -}}
             <!-- Otherwise, redirect it to the homepage -->
-            {{- range site.Sites }}
+            {{- range hugo.Sites }}
             <a href="{{ .Home.RelPermalink }}">{{- partial (printf "icons/%s.svg" .Language.Lang) . -}}</a>
             {{- end -}}
             {{- end }}

layouts/partials/post-metadata.html → layouts/_partials/post-metadata.html

@@ -10,7 +10,7 @@
     <!-- Expertise / Topics -->
     {{ range .current.Params.topics -}}
     <!-- Skip the item if we are on the term page presenting this item -->
-    {{- if or (not $.parent.Data.topic) (ne . $.parent.Data.Term) }}
+    {{- if not (and (eq $.parent.Kind "term") (eq $.parent.Data.Plural "topics") (eq (urlize .) (urlize $.parent.Data.Term))) }}
     <span class="topic">
         {{- partial "icons/link.svg" . -}}<a href="{{ "/topics/" | relLangURL }}{{ . | urlize }}/">{{ . }}</a>
     </span>
@@ -20,7 +20,7 @@
     <!-- Open Source communities -->
     {{ range .current.Params.opensource -}}
     <!-- Skip the item if we are on the term page presenting this item -->
-    {{- if or (not $.parent.Data.opensource) (ne . $.parent.Data.Term) }}
+    {{- if not (and (eq $.parent.Kind "term") (eq $.parent.Data.Plural "opensource") (eq (urlize .) (urlize $.parent.Data.Term))) }}
     <span class="opensource">
         {{- partial "icons/label.svg" . -}}<a href="{{ "/opensource/" | relLangURL }}{{ . | urlize }}/">{{ . }}</a>
     </span>

layouts/partials/real-translations.html → layouts/_partials/real-translations.html

@@ -5,7 +5,7 @@
 {{- $translations := slice -}}
 {{- range .Translations -}}
   {{- partial "lang-detection.html" . -}}
-  {{- if not (.Scratch.Get "en_article_in_fr_site") -}}
+  {{- if not (.Store.Get "en_article_in_fr_site") -}}
     {{- $translations = $translations | append . -}}
   {{- end -}}
 {{- end -}}

layouts/shortcodes/internalLink.html → layouts/_shortcodes/internalLink.html

@@ -4,9 +4,9 @@
 {{ $path := .Get "path" }}
 {{ $currentLang := .Page.Lang }}
 {{ $title := .Get "title" }}
-{{ $sites := .Page.Sites }}
-{{ if ne $currentLang (index .Page.Sites 0).Language.Lang }}
-{{ $sites = collections.Reverse .Page.Sites }}
+{{ $sites := hugo.Sites }}
+{{ if ne $currentLang (index hugo.Sites 0).Language.Lang }}
+{{ $sites = collections.Reverse hugo.Sites }}
 {{ end }}
 {{ range $sites }}
 {{ with .GetPage $path }}
@@ -22,7 +22,7 @@
 {{ end }}
 {{ if (eq $currentLang "fr") }}
 {{- partial "lang-detection.html" . -}}
-{{ if .Scratch.Get "en_article_in_fr_site" }}
+{{ if .Store.Get "en_article_in_fr_site" }}
 {{- partial "icons/en.svg" . -}}
 {{ end }}
 {{ end }}

layouts/blog/list.html → layouts/blog/section.html

@@ -1,5 +1,5 @@
 {{ define "main" }}
-<!-- the blog/list.html layout is used to render the list of posts under "blog" -->
+<!-- the blog/section.html layout is used to render the list of posts under "blog" -->
 <article class="article-list">
     <header>
         <h1>Articles</h1>
@@ -9,6 +9,6 @@
     {{ range (.Paginate (sort .Pages "Date").Reverse).Pages }}
     {{- partial "article-headline.html" (dict "current" . "parent" $.Page) -}}
     {{ end }}
-    {{ template "_internal/pagination.html" . }}
+    {{ partial "pagination.html" . }}
 </article>
 {{ end }}

layouts/index.html → layouts/home.html

@@ -1,5 +1,5 @@
 {{ define "main" }}
-<!-- the index.html layout is used only to render the home page -->
+<!-- the home.html layout is used only to render the home page -->
 <div>
 <article class="bio">
     <!--

layouts/_default/single.html → layouts/page.html

@@ -1,7 +1,7 @@
 {{ define "main" }}
-<!-- The "single" layout prints a single post -->
+<!-- The "page" layout prints a single post -->
 {{- partial "lang-detection.html" . -}}
-<article class="post" {{ if .Scratch.Get "en_article_in_fr_site" }}lang="en"{{ end }}>
+<article class="post" {{ if .Store.Get "en_article_in_fr_site" }}lang="en"{{ end }}>
     <header>
         <h1>{{ .Title }}</h1>
         {{- with .Description }}

layouts/_default/search.html → layouts/search.html

@@ -1,5 +1,5 @@
 {{ define "main" }}
-<!-- The "search/index.html" layout renders the search engine -->
+<!-- The "search" layout renders the search engine -->
 <article class="search article-list">
     <header>
         <h1>{{ .Title }}</h1>
@@ -167,37 +167,37 @@ function executeSearch(term) {
 }
 
 // Fill-in details about taxonomies
-{{- $.Scratch.Set "taxonomies" dict -}}
+{{- $.Store.Set "taxonomies" dict -}}
 {{- range $name, $taxonomy := .Site.Taxonomies -}}
-{{- $.Scratch.Set "taxonomy" dict -}}
+{{- $.Store.Set "taxonomy" dict -}}
 {{- range (index $.Site.Taxonomies $name) -}}
-{{- $.Scratch.SetInMap "taxonomy" .Page.Title (dict "href" .Page.RelPermalink "title" .Page.Title) -}}
+{{- $.Store.SetInMap "taxonomy" .Page.Title (dict "href" .Page.RelPermalink "title" .Page.Title) -}}
 {{- end -}}
-{{- $.Scratch.SetInMap "taxonomies" $name ($.Scratch.Get "taxonomy") -}}
+{{- $.Store.SetInMap "taxonomies" $name ($.Store.Get "taxonomy") -}}
 {{- end }}
-var taxonomies = {{- $.Scratch.Get "taxonomies" | jsonify | safeJS -}};
+var taxonomies = {{- $.Store.Get "taxonomies" | jsonify | safeJS -}};
 
 // Fill-in the Search DB with site's content
-{{- $.Scratch.Add "index" slice -}}
+{{- $.Store.Set "index" slice -}}
 {{- range .Site.RegularPages -}}
-    {{- $.Scratch.Set "reading_time" nil -}}
+    {{- $.Store.Set "reading_time" nil -}}
     {{- if eq .Type "blog" -}}
         {{- $minutes := .ReadingTime -}}
         {{- if gt $minutes 0 -}}
-        {{- $.Scratch.Set "reading_time" (i18n "minutes" $minutes) -}}
+        {{- $.Store.Set "reading_time" (i18n "minutes" $minutes) -}}
         {{- end -}}
     {{- end -}}
 
-    {{- $.Scratch.Set "date" nil -}}
+    {{- $.Store.Set "date" nil -}}
     {{- if ne .Type "page" -}}
-    {{- $.Scratch.Set "date" (.Date.Format (i18n "date_format")) -}}
+    {{- $.Store.Set "date" (.Date.Format (i18n "date_format")) -}}
     {{- end -}}
 
-    {{ .Scratch.Set "en_article_in_fr_site" false }}
+    {{ .Store.Set "en_article_in_fr_site" false }}
     {{- partial "lang-detection.html" . -}}
-    {{- $.Scratch.Add "index" (dict "title" .Title "opensource" .Params.opensource "topics" .Params.topics "permalink" .Permalink "hasEnFlag" (.Scratch.Get "en_article_in_fr_site") "type" .Type "type_label" (i18n (print "type_" .Type)) "date" ($.Scratch.Get "date") "reading_time" ($.Scratch.Get "reading_time") "summary" (.Summary | plainify | htmlUnescape)) -}}
+    {{- $.Store.Add "index" (dict "title" .Title "opensource" .Params.opensource "topics" .Params.topics "permalink" .Permalink "hasEnFlag" (.Store.Get "en_article_in_fr_site") "type" .Type "type_label" (i18n (print "type_" .Type)) "date" ($.Store.Get "date") "reading_time" ($.Store.Get "reading_time") "summary" (.Summary | plainify | htmlUnescape)) -}}
 {{- end }}
-var searchDb = {{- $.Scratch.Get "index" | jsonify | safeJS -}};
+var searchDb = {{- $.Store.Get "index" | jsonify | safeJS -}};
 
 // Initialize the Fuse.io framework with the Search DB
 fuseInit(searchDb);

layouts/_default/sitemap.xml → layouts/sitemap.xml

@@ -10,7 +10,7 @@
   xmlns:xhtml="http://www.w3.org/1999/xhtml">
   {{ range $page := .Data.Pages }}
     {{- partial "lang-detection.html" . -}}
-    {{- if and .Permalink (not (.Scratch.Get "en_article_in_fr_site")) -}}
+    {{- if and .Permalink (not (.Store.Get "en_article_in_fr_site")) -}}
   <url>
     <loc>{{ .Permalink }}</loc>{{ if not .Lastmod.IsZero }}
     <lastmod>{{ safeHTML ( .Lastmod.Format "2006-01-02T15:04:05-07:00" ) }}</lastmod>{{ end }}{{ with .Sitemap.ChangeFreq }}
@@ -18,12 +18,12 @@
     <priority>{{ .Sitemap.Priority }}</priority>{{ end }}{{ with partial "real-translations.html" . }}{{ range . }}
     <xhtml:link
                 rel="alternate"
-                hreflang="{{ .Language.LanguageCode }}"
+                hreflang="{{ .Language.Locale }}"
                 href="{{ .Permalink }}"
                 />{{ end }}
     <xhtml:link
                 rel="alternate"
-                hreflang="{{ $page.Language.LanguageCode }}"
+                hreflang="{{ $page.Language.Locale }}"
                 href="{{ $page.Permalink }}"
                 />{{ end }}
   </url>

layouts/speaking/list.html → layouts/speaking/section.html

@@ -1,5 +1,5 @@
 {{ define "main" }}
-<!-- the speaking/list.html layout is used to render the list of posts under "speaking" -->
+<!-- the speaking/section.html layout is used to render the list of posts under "speaking" -->
 <article class="article-list">
     <header>
         <h1>{{ .Title }}</h1>

layouts/_default/terms.html → layouts/taxonomy.html

@@ -1,5 +1,5 @@
 {{ define "main" }}
-<!-- the terms.html layout is used to render the list of values of a certain tag, topic, etc. -->
+<!-- the taxonomy.html layout is used to render the list of values of a certain tag, topic, etc. -->
 <article class="terms">
     <header>
         <h1>{{ .Title }}</h1>

layouts/_default/taxonomy.html → layouts/term.html

@@ -1,5 +1,5 @@
 {{ define "main" }}
-<!-- the taxonomy.html layout is used to render the list of posts having a certain tag, topic, etc. -->
+<!-- the term.html layout is used to render the list of posts having a certain tag, topic, etc. -->
 <article class="article-list">
     <header>
         <h1>{{ .Title }}</h1>
@@ -9,6 +9,6 @@
     {{ range (.Paginate (sort .Pages "Date").Reverse).Pages }}
     {{- partial "article-headline.html" (dict "current" . "parent" $.Page) -}}
     {{ end }}
-    {{ template "_internal/pagination.html" . }}
+    {{ partial "pagination.html" . }}
 </article>
 {{ end }}

layouts/writing/list.html → layouts/writing/section.html

@@ -1,5 +1,5 @@
 {{ define "main" }}
-<!-- the writing/list.html layout is used to render the list of posts under "writing" -->
+<!-- the writing/section.html layout is used to render the list of posts under "writing" -->
 <article class="article-list">
     <header>
         <h1>{{ .Title }}</h1>

netlify.toml

@@ -2,16 +2,16 @@
 publish = "public"
 # Use --minify to reduce HTML file size since Google is now tracking this
 # as "Core Web Vitals".
-command = "./hugo --baseURL https://www.itix.fr --minify"
+command = "hugo --baseURL https://www.itix.fr --minify"
 
 [build.environment] # Global
-HUGO_VERSION = "0.121.2"
+HUGO_VERSION = "0.167.0"
 
 [context.production.environment] # Only for prod
-HUGO_VERSION = "0.121.2"
+HUGO_VERSION = "0.167.0"
 
 [context.deploy-preview]
-command = "./hugo --buildDrafts --buildFuture --baseURL $DEPLOY_PRIME_URL"
+command = "hugo --buildDrafts --buildFuture --baseURL $DEPLOY_PRIME_URL"
 
 [context.deploy-preview.environment]
 HUGO_ENABLEGITINFO = "true"

realpath.py

@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-import os
-import sys
-
-# Dirty hack for netlify that don't ship the realpath command
-print(os.path.realpath(sys.argv[1]))