Fix server refresh on 404 template changes

Fixes #13209

.circleci/config.yml

@@ -4,7 +4,7 @@ parameters:
 defaults: &defaults
   resource_class: large
   docker:
-      - image: bepsays/ci-hugoreleaser:1.22400.20000
+      - image: bepsays/ci-hugoreleaser:1.22301.20401
 environment: &buildenv
       GOMODCACHE: /root/project/gomodcache
 version: 2
@@ -58,7 +58,7 @@ jobs:
     environment:
         <<: [*buildenv]
     docker:
-    - image: bepsays/ci-hugoreleaser-linux-arm64:1.22400.20000
+    - image: bepsays/ci-hugoreleaser-linux-arm64:1.22301.20401
     steps:
       - *restore-cache
       - &attach-workspace

.github/workflows/test.yml

@@ -16,7 +16,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.23.x, 1.24.x]
+        go-version: [1.22.x, 1.23.x]
         os: [ubuntu-latest, windows-latest] # macos disabled for now because of disk space issues.
     runs-on: ${{ matrix.os }}
     steps:

.gitignore

@@ -3,4 +3,3 @@
 imports.*
 dist/
 public/
-.DS_Store 

CONTRIBUTING.md

@@ -93,7 +93,6 @@ Most title/subjects should have a lower-cased prefix with a colon and one whites
 * If this commit touches many packages without a common functional topic, prefix with `all:` (e.g. `all: Reformat Go code`)
 * If this is a documentation update, prefix with `docs:`.
 * If nothing of the above applies, just leave the prefix out.
-* Note that the above excludes nouns seen in other repositories, e.g. "chore:".
 
 Also, if your commit references one or more GitHub issues, always end your commit message body with *See #1234* or *Fixes #1234*.
 Replace *1234* with the GitHub issue ID. The last example will close the issue when the commit is merged into *master*.

README.md

@@ -34,7 +34,6 @@ A fast and flexible static site generator built with love by [bep], [spf13], and
 [![Go Report Card](https://goreportcard.com/badge/github.com/gohugoio/hugo)](https://goreportcard.com/report/github.com/gohugoio/hugo)
 
 [Website] | [Installation] | [Documentation] | [Support] | [Contributing] | <a rel="me" href="https://fosstodon.org/@gohugoio">Mastodon</a>
-
 ## Overview
 
 Hugo is a [static site generator] written in [Go], optimized for speed and designed for flexibility. With its advanced templating system and fast asset pipelines, Hugo renders a complete site in seconds, often less.
@@ -70,23 +69,6 @@ See the [features] section of the documentation for a comprehensive summary of H
   <a href="https://www.jetbrains.com/go/?utm_source=OSS&utm_medium=referral&utm_campaign=hugo" target="_blank"><img src="https://raw.githubusercontent.com/gohugoio/gohugoioTheme/master/assets/images/sponsors/goland.svg" width="200" alt="The complete IDE crafted for professional Go developers."></a>
 </p>
 
-## Editions
-
-Hugo is available in three editions: standard, extended, and extended/deploy. While the standard edition provides core functionality, the extended and extended/deploy editions offer advanced features.
-
-Feature|extended edition|extended/deploy edition
-:--|:-:|:-:
-Encode to the WebP format when [processing images]. You can decode WebP images with any edition.|:heavy_check_mark:|:heavy_check_mark:
-[Transpile Sass to CSS] using the embedded LibSass transpiler. You can use the [Dart Sass] transpiler with any edition.|:heavy_check_mark:|:heavy_check_mark:
-Deploy your site directly to a Google Cloud Storage bucket, an AWS S3 bucket, or an Azure Storage container. See&nbsp;[details].|:x:|:heavy_check_mark:
-
-[dart sass]: /functions/css/sass/#dart-sass
-[processing images]: /content-management/image-processing/
-[transpile sass to css]: /functions/css/sass/
-[details]: /hosting-and-deployment/hugo-deploy/
-
-Unless your specific deployment needs require the extended/deploy edition, we recommend the extended edition.
-
 ## Installation
 
 Install Hugo from a [prebuilt binary], package manager, or package repository. Please see the installation instructions for your operating system:
@@ -98,11 +80,15 @@ Install Hugo from a [prebuilt binary], package manager, or package repository. P
 
 ## Build from source
 
+Hugo is available in two editions: standard and extended. With the extended edition you can:
+
+- Encode to the WebP format when processing images. You can decode WebP images with either edition.
+- Transpile Sass to CSS using the embedded LibSass transpiler. The extended edition is not required to use the Dart Sass transpiler.
+
 Prerequisites to build Hugo from source:
 
-- Standard edition: Go 1.23.0 or later
-- Extended edition: Go 1.23.0 or later, and GCC
-- Extended/deploy edition: Go 1.23.0 or later, and GCC
+- Standard edition: Go 1.20 or later
+- Extended edition: Go 1.20 or later, and GCC
 
 Build the standard edition:
 
@@ -115,13 +101,6 @@ Build the extended edition:
 ```text
 CGO_ENABLED=1 go install -tags extended github.com/gohugoio/hugo@latest
 ```
-
-Build the extended/deploy edition:
-
-```text
-CGO_ENABLED=1 go install -tags extended,withdeploy github.com/gohugoio/hugo@latest
-```
-
 ## Star History
 
 [![Star History Chart](https://api.star-history.com/svg?repos=gohugoio/hugo&type=Timeline)](https://star-history.com/#gohugoio/hugo&Timeline)
@@ -169,113 +148,100 @@ Hugo stands on the shoulders of great open source libraries. Run `hugo env --log
 
 ```text
 github.com/BurntSushi/locker="v0.0.0-20171006230638-a6e239ea1c69"
-github.com/PuerkitoBio/goquery="v1.10.1"
-github.com/alecthomas/chroma/v2="v2.15.0"
-github.com/andybalholm/cascadia="v1.3.3"
+github.com/alecthomas/chroma/v2="v2.14.0"
 github.com/armon/go-radix="v1.0.1-0.20221118154546-54df44f2176c"
 github.com/bep/clocks="v0.5.0"
 github.com/bep/debounce="v1.2.0"
 github.com/bep/gitmap="v1.6.0"
 github.com/bep/goat="v0.5.0"
-github.com/bep/godartsass/v2="v2.3.2"
+github.com/bep/godartsass/v2="v2.3.0"
 github.com/bep/golibsass="v1.2.0"
 github.com/bep/gowebp="v0.3.0"
-github.com/bep/imagemeta="v0.8.4"
+github.com/bep/imagemeta="v0.8.3"
 github.com/bep/lazycache="v0.7.0"
 github.com/bep/logg="v0.4.0"
 github.com/bep/mclib="v1.20400.20402"
 github.com/bep/overlayfs="v0.9.2"
-github.com/bep/simplecobra="v0.5.0"
+github.com/bep/simplecobra="v0.4.0"
 github.com/bep/tmc="v0.5.1"
 github.com/cespare/xxhash/v2="v2.3.0"
 github.com/clbanning/mxj/v2="v2.7.0"
 github.com/cli/safeexec="v1.0.1"
 github.com/cpuguy83/go-md2man/v2="v2.0.4"
 github.com/disintegration/gift="v1.2.1"
-github.com/dlclark/regexp2="v1.11.5"
-github.com/dop251/goja="v0.0.0-20250125213203-5ef83b82af17"
-github.com/evanw/esbuild="v0.24.2"
+github.com/dlclark/regexp2="v1.11.0"
+github.com/evanw/esbuild="v0.24.0"
 github.com/fatih/color="v1.18.0"
 github.com/frankban/quicktest="v1.14.6"
 github.com/fsnotify/fsnotify="v1.8.0"
-github.com/getkin/kin-openapi="v0.129.0"
+github.com/getkin/kin-openapi="v0.123.0"
 github.com/ghodss/yaml="v1.0.0"
-github.com/go-openapi/jsonpointer="v0.21.0"
-github.com/go-openapi/swag="v0.23.0"
-github.com/go-sourcemap/sourcemap="v2.1.4+incompatible"
+github.com/go-openapi/jsonpointer="v0.20.2"
+github.com/go-openapi/swag="v0.22.8"
 github.com/gobuffalo/flect="v1.0.3"
 github.com/gobwas/glob="v0.2.3"
 github.com/gohugoio/go-i18n/v2="v2.1.3-0.20230805085216-e63c13218d0e"
-github.com/gohugoio/hashstructure="v0.5.0"
+github.com/gohugoio/hashstructure="v0.1.0"
 github.com/gohugoio/httpcache="v0.7.0"
 github.com/gohugoio/hugo-goldmark-extensions/extras="v0.2.0"
 github.com/gohugoio/hugo-goldmark-extensions/passthrough="v0.3.0"
 github.com/gohugoio/locales="v0.14.0"
 github.com/gohugoio/localescompressed="v1.0.1"
-github.com/golang/freetype="v0.0.0-20170609003504-e2365dfdc4a0"
 github.com/google/go-cmp="v0.6.0"
-github.com/google/pprof="v0.0.0-20250208200701-d0013a598941"
 github.com/gorilla/websocket="v1.5.3"
-github.com/hairyhenderson/go-codeowners="v0.7.0"
+github.com/hairyhenderson/go-codeowners="v0.6.1"
 github.com/hashicorp/golang-lru/v2="v2.0.7"
+github.com/invopop/yaml="v0.2.0"
 github.com/jdkato/prose="v1.2.1"
 github.com/josharian/intern="v1.0.0"
 github.com/kr/pretty="v0.3.1"
 github.com/kr/text="v0.2.0"
 github.com/kyokomi/emoji/v2="v2.2.13"
-github.com/lucasb-eyer/go-colorful="v1.2.0"
 github.com/mailru/easyjson="v0.7.7"
 github.com/makeworld-the-better-one/dither/v2="v2.4.0"
 github.com/marekm4/color-extractor="v1.2.1"
 github.com/mattn/go-colorable="v0.1.13"
 github.com/mattn/go-isatty="v0.0.20"
 github.com/mattn/go-runewidth="v0.0.9"
-github.com/mazznoer/csscolorparser="v0.1.5"
 github.com/mitchellh/mapstructure="v1.5.1-0.20231216201459-8508981c8b6c"
 github.com/mohae/deepcopy="v0.0.0-20170929034955-c48cc78d4826"
 github.com/muesli/smartcrop="v0.3.0"
 github.com/niklasfasching/go-org="v1.7.0"
-github.com/oasdiff/yaml3="v0.0.0-20241210130736-a94c01f36349"
-github.com/oasdiff/yaml="v0.0.0-20241210131133-6b86fb107d80"
 github.com/olekukonko/tablewriter="v0.0.5"
 github.com/pbnjay/memory="v0.0.0-20210728143218-7b4eea64cf58"
 github.com/pelletier/go-toml/v2="v2.2.3"
 github.com/perimeterx/marshmallow="v1.1.5"
 github.com/pkg/browser="v0.0.0-20240102092130-5ac0b6a4141c"
 github.com/pkg/errors="v0.9.1"
-github.com/rivo/uniseg="v0.4.7"
 github.com/rogpeppe/go-internal="v1.13.1"
 github.com/russross/blackfriday/v2="v2.1.0"
-github.com/sass/libsass="3.6.6"
+github.com/sass/dart-sass/compiler="1.81.0"
+github.com/sass/dart-sass/implementation="1.81.0"
+github.com/sass/dart-sass/protocol="3.1.0"
 github.com/spf13/afero="v1.11.0"
-github.com/spf13/cast="v1.7.1"
+github.com/spf13/cast="v1.7.0"
 github.com/spf13/cobra="v1.8.1"
 github.com/spf13/fsync="v0.10.1"
-github.com/spf13/pflag="v1.0.6"
-github.com/tdewolff/minify/v2="v2.20.37"
-github.com/tdewolff/parse/v2="v2.7.15"
-github.com/tetratelabs/wazero="v1.8.2"
-github.com/webmproject/libwebp="v1.3.2"
+github.com/spf13/pflag="v1.0.5"
+github.com/tdewolff/minify/v2="v2.21.1"
+github.com/tdewolff/parse/v2="v2.7.18"
+github.com/tetratelabs/wazero="v1.8.1"
 github.com/yuin/goldmark-emoji="v1.0.4"
 github.com/yuin/goldmark="v1.7.8"
 go.uber.org/automaxprocs="v1.5.3"
-golang.org/x/crypto="v0.33.0"
-golang.org/x/exp="v0.0.0-20250210185358-939b2ce775ac"
-golang.org/x/image="v0.24.0"
-golang.org/x/mod="v0.23.0"
-golang.org/x/net="v0.35.0"
-golang.org/x/sync="v0.11.0"
-golang.org/x/sys="v0.30.0"
-golang.org/x/text="v0.22.0"
-golang.org/x/tools="v0.30.0"
-golang.org/x/xerrors="v0.0.0-20240903120638-7835f813f4da"
-gonum.org/v1/plot="v0.15.0"
-google.golang.org/protobuf="v1.36.5"
+golang.org/x/crypto="v0.29.0"
+golang.org/x/exp="v0.0.0-20221031165847-c99f073a8326"
+golang.org/x/image="v0.22.0"
+golang.org/x/mod="v0.22.0"
+golang.org/x/net="v0.31.0"
+golang.org/x/sync="v0.9.0"
+golang.org/x/sys="v0.27.0"
+golang.org/x/text="v0.20.0"
+golang.org/x/tools="v0.27.0"
+google.golang.org/protobuf="v1.35.1"
 gopkg.in/yaml.v2="v2.4.0"
 gopkg.in/yaml.v3="v3.0.1"
-oss.terrastruct.com/d2="v0.6.9"
-oss.terrastruct.com/util-go="v0.0.0-20241005222610-44c011a04896"
-rsc.io/qr="v0.2.0"
+howett.net/plist="v1.0.0"
 software.sslmate.com/src/go-pkcs12="v0.2.0"
 ```
 </details>

cache/dynacache/dynacache.go

@@ -176,12 +176,11 @@ func (c *Cache) ClearMatching(predicatePartition func(k string, p PartitionManag
 }
 
 // ClearOnRebuild prepares the cache for a new rebuild taking the given changeset into account.
-// predicate is optional and will clear any entry for which it returns true.
-func (c *Cache) ClearOnRebuild(predicate func(k, v any) bool, changeset ...identity.Identity) {
+func (c *Cache) ClearOnRebuild(changeset ...identity.Identity) {
 	g := rungroup.Run[PartitionManager](context.Background(), rungroup.Config[PartitionManager]{
 		NumWorkers: len(c.partitions),
 		Handle: func(ctx context.Context, partition PartitionManager) error {
-			partition.clearOnRebuild(predicate, changeset...)
+			partition.clearOnRebuild(changeset...)
 			return nil
 		},
 	})
@@ -480,12 +479,7 @@ func (p *Partition[K, V]) clearMatching(predicate func(k, v any) bool) {
 	})
 }
 
-func (p *Partition[K, V]) clearOnRebuild(predicate func(k, v any) bool, changeset ...identity.Identity) {
-	if predicate == nil {
-		predicate = func(k, v any) bool {
-			return false
-		}
-	}
+func (p *Partition[K, V]) clearOnRebuild(changeset ...identity.Identity) {
 	opts := p.getOptions()
 	if opts.ClearWhen == ClearNever {
 		return
@@ -531,7 +525,7 @@ func (p *Partition[K, V]) clearOnRebuild(predicate func(k, v any) bool, changese
 	// Second pass needs to be done in a separate loop to catch any
 	// elements marked as stale in the other partitions.
 	p.c.DeleteFunc(func(key K, v V) bool {
-		if predicate(key, v) || shouldDelete(key, v) {
+		if shouldDelete(key, v) {
 			p.trace.Log(
 				logg.StringFunc(
 					func() string {
@@ -607,7 +601,7 @@ type PartitionManager interface {
 	adjustMaxSize(addend int) int
 	getMaxSize() int
 	getOptions() OptionsPartition
-	clearOnRebuild(predicate func(k, v any) bool, changeset ...identity.Identity)
+	clearOnRebuild(changeset ...identity.Identity)
 	clearMatching(predicate func(k, v any) bool)
 	clearStale()
 }

cache/dynacache/dynacache_test.go

@@ -147,13 +147,13 @@ func TestClear(t *testing.T) {
 
 	c.Assert(cache.Keys(predicateAll), qt.HasLen, 4)
 
-	cache.ClearOnRebuild(nil)
+	cache.ClearOnRebuild()
 
 	// Stale items are always cleared.
 	c.Assert(cache.Keys(predicateAll), qt.HasLen, 2)
 
 	cache = newTestCache(t)
-	cache.ClearOnRebuild(nil, identity.StringIdentity("changed"))
+	cache.ClearOnRebuild(identity.StringIdentity("changed"))
 
 	c.Assert(cache.Keys(nil), qt.HasLen, 1)
 

commands/commandeer.go

@@ -447,8 +447,6 @@ func (r *rootCommand) PreRun(cd, runner *simplecobra.Commandeer) error {
 	if err != nil {
 		return err
 	}
-	// Set up the global logger early to allow info deprecations during config load.
-	loggers.SetGlobalLogger(r.logger)
 
 	r.changesFromBuild = make(chan []identity.Identity, 10)
 
@@ -540,7 +538,6 @@ Complete documentation is available at https://gohugo.io/.`
 	cmd.PersistentFlags().StringP("themesDir", "", "", "filesystem path to themes directory")
 	_ = cmd.MarkFlagDirname("themesDir")
 	cmd.PersistentFlags().StringP("ignoreVendorPaths", "", "", "ignores any _vendor for module paths matching the given Glob pattern")
-	cmd.PersistentFlags().BoolP("noBuildLock", "", false, "don't create .hugo_build.lock file")
 	_ = cmd.RegisterFlagCompletionFunc("ignoreVendorPaths", cobra.NoFileCompletions)
 	cmd.PersistentFlags().String("clock", "", "set the clock used by Hugo, e.g. --clock 2021-11-06T22:30:00.00+09:00")
 	_ = cmd.RegisterFlagCompletionFunc("clock", cobra.NoFileCompletions)
@@ -596,6 +593,7 @@ func applyLocalFlagsBuild(cmd *cobra.Command, r *rootCommand) {
 	cmd.Flags().BoolVar(&r.forceSyncStatic, "forceSyncStatic", false, "copy all files when static is changed.")
 	cmd.Flags().BoolP("noTimes", "", false, "don't sync modification time of files")
 	cmd.Flags().BoolP("noChmod", "", false, "don't sync permission mode of files")
+	cmd.Flags().BoolP("noBuildLock", "", false, "don't create .hugo_build.lock file")
 	cmd.Flags().BoolP("printI18nWarnings", "", false, "print missing translations")
 	cmd.Flags().BoolP("printPathWarnings", "", false, "print warnings on duplicate target paths etc.")
 	cmd.Flags().BoolP("printUnusedTemplates", "", false, "print warnings on unused templates.")

commands/config.go

@@ -43,9 +43,8 @@ func newConfigCommand() *configCommand {
 type configCommand struct {
 	r *rootCommand
 
-	format    string
-	lang      string
-	printZero bool
+	format string
+	lang   string
 
 	commands []simplecobra.Commander
 }
@@ -79,7 +78,7 @@ func (c *configCommand) Run(ctx context.Context, cd *simplecobra.Commandeer, arg
 	dec.SetIndent("", "  ")
 	dec.SetEscapeHTML(false)
 
-	if err := dec.Encode(parser.ReplacingJSONMarshaller{Value: config, KeysToLower: true, OmitEmpty: !c.printZero}); err != nil {
+	if err := dec.Encode(parser.ReplacingJSONMarshaller{Value: config, KeysToLower: true, OmitEmpty: true}); err != nil {
 		return err
 	}
 
@@ -116,7 +115,6 @@ func (c *configCommand) Init(cd *simplecobra.Commandeer) error {
 	cmd.Flags().StringVar(&c.format, "format", "toml", "preferred file format (toml, yaml or json)")
 	_ = cmd.RegisterFlagCompletionFunc("format", cobra.FixedCompletions([]string{"toml", "yaml", "json"}, cobra.ShellCompDirectiveNoFileComp))
 	cmd.Flags().StringVar(&c.lang, "lang", "", "the language to display config for. Defaults to the first language defined.")
-	cmd.Flags().BoolVar(&c.printZero, "printZero", false, `include config options with zero values (e.g. false, 0, "") in the output`)
 	_ = cmd.RegisterFlagCompletionFunc("lang", cobra.NoFileCompletions)
 	applyLocalFlagsBuildConfig(cmd, c.r)
 

commands/deploy.go

@@ -12,6 +12,7 @@
 // limitations under the License.
 
 //go:build withdeploy
+// +build withdeploy
 
 package commands
 

commands/deploy_off.go

@@ -12,6 +12,7 @@
 // limitations under the License.
 
 //go:build !withdeploy
+// +build !withdeploy
 
 // Copyright 2024 The Hugo Authors. All rights reserved.
 //

commands/gen.go

@@ -21,7 +21,6 @@ import (
 	"os"
 	"path"
 	"path/filepath"
-	"slices"
 	"strings"
 
 	"github.com/alecthomas/chroma/v2"
@@ -61,10 +60,6 @@ func newGenCommand() *genCommand {
 See https://xyproto.github.io/splash/docs/all.html for a preview of the available styles`,
 
 			run: func(ctx context.Context, cd *simplecobra.Commandeer, r *rootCommand, args []string) error {
-				style = strings.ToLower(style)
-				if !slices.Contains(styles.Names(), style) {
-					return fmt.Errorf("invalid style: %s", style)
-				}
 				builder := styles.Get(style).Builder()
 				if highlightStyle != "" {
 					builder.Add(chroma.LineHighlight, highlightStyle)
@@ -149,7 +144,7 @@ url: %s
 
 		return &simpleCommand{
 			name:  "doc",
-			short: "Generate Markdown documentation for the Hugo CLI",
+			short: "Generate Markdown documentation for the Hugo CLI.",
 			long: `Generate Markdown documentation for the Hugo CLI.
 			This command is, mostly, used to create up-to-date documentation
 	of Hugo's command-line interface for https://gohugo.io/.
@@ -201,7 +196,7 @@ url: %s
 	newDocsHelper := func() simplecobra.Commander {
 		return &simpleCommand{
 			name:  "docshelper",
-			short: "Generate some data files for the Hugo docs",
+			short: "Generate some data files for the Hugo docs.",
 
 			run: func(ctx context.Context, cd *simplecobra.Commandeer, r *rootCommand, args []string) error {
 				r.Println("Generate docs data to", docsHelperTarget)

commands/hugobuilder.go

@@ -62,7 +62,7 @@ type hugoBuilder struct {
 
 	// Currently only set when in "fast render mode".
 	changeDetector *fileChangeDetector
-	visitedURLs    *types.EvictingQueue[string]
+	visitedURLs    *types.EvictingStringQueue
 
 	fullRebuildSem *semaphore.Weighted
 	debounce       func(f func())
@@ -663,20 +663,7 @@ func (c *hugoBuilder) handleEvents(watcher *watcher.Batcher,
 	var n int
 	for _, ev := range evs {
 		keep := true
-		// Write and rename operations are often followed by CHMOD.
-		// There may be valid use cases for rebuilding the site on CHMOD,
-		// but that will require more complex logic than this simple conditional.
-		// On OS X this seems to be related to Spotlight, see:
-		// https://github.com/go-fsnotify/fsnotify/issues/15
-		// A workaround is to put your site(s) on the Spotlight exception list,
-		// but that may be a little mysterious for most end users.
-		// So, for now, we skip reload on CHMOD.
-		// We do have to check for WRITE though. On slower laptops a Chmod
-		// could be aggregated with other important events, and we still want
-		// to rebuild on those
-		if ev.Op == fsnotify.Chmod {
-			keep = false
-		} else if ev.Has(fsnotify.Create) || ev.Has(fsnotify.Write) {
+		if ev.Has(fsnotify.Create) || ev.Has(fsnotify.Write) {
 			if _, err := os.Stat(ev.Name); err != nil {
 				keep = false
 			}
@@ -818,6 +805,21 @@ func (c *hugoBuilder) handleEvents(watcher *watcher.Batcher,
 			continue
 		}
 
+		// Write and rename operations are often followed by CHMOD.
+		// There may be valid use cases for rebuilding the site on CHMOD,
+		// but that will require more complex logic than this simple conditional.
+		// On OS X this seems to be related to Spotlight, see:
+		// https://github.com/go-fsnotify/fsnotify/issues/15
+		// A workaround is to put your site(s) on the Spotlight exception list,
+		// but that may be a little mysterious for most end users.
+		// So, for now, we skip reload on CHMOD.
+		// We do have to check for WRITE though. On slower laptops a Chmod
+		// could be aggregated with other important events, and we still want
+		// to rebuild on those
+		if ev.Op&(fsnotify.Chmod|fsnotify.Write|fsnotify.Create) == fsnotify.Chmod {
+			continue
+		}
+
 		walkAdder := func(path string, f hugofs.FileMetaInfo) error {
 			if f.IsDir() {
 				c.r.logger.Println("adding created directory to watchlist", path)
@@ -1101,7 +1103,7 @@ func (c *hugoBuilder) rebuildSites(events []fsnotify.Event) (err error) {
 	if err != nil {
 		return
 	}
-	err = h.Build(hugolib.BuildCfg{NoBuildLock: true, RecentlyTouched: c.visitedURLs, ErrRecovery: c.errState.wasErr()}, events...)
+	err = h.Build(hugolib.BuildCfg{NoBuildLock: true, RecentlyVisited: c.visitedURLs, ErrRecovery: c.errState.wasErr()}, events...)
 	return
 }
 
@@ -1117,7 +1119,7 @@ func (c *hugoBuilder) rebuildSitesForChanges(ids []identity.Identity) (err error
 	}
 	whatChanged := &hugolib.WhatChanged{}
 	whatChanged.Add(ids...)
-	err = h.Build(hugolib.BuildCfg{NoBuildLock: true, WhatChanged: whatChanged, RecentlyTouched: c.visitedURLs, ErrRecovery: c.errState.wasErr()})
+	err = h.Build(hugolib.BuildCfg{NoBuildLock: true, WhatChanged: whatChanged, RecentlyVisited: c.visitedURLs, ErrRecovery: c.errState.wasErr()})
 
 	return
 }

commands/mod.go

@@ -44,16 +44,16 @@ func newModCommands() *modCommands {
 
 	npmCommand := &simpleCommand{
 		name:  "npm",
-		short: "Various npm helpers",
+		short: "Various npm helpers.",
 		long:  `Various npm (Node package manager) helpers.`,
 		commands: []simplecobra.Commander{
 			&simpleCommand{
 				name:  "pack",
-				short: "Experimental: Prepares and writes a composite package.json file for your project",
+				short: "Experimental: Prepares and writes a composite package.json file for your project.",
 				long: `Prepares and writes a composite package.json file for your project.
 
 On first run it creates a "package.hugo.json" in the project root if not already there. This file will be used as a template file
-with the base dependency set.
+with the base dependency set. 
 
 This set will be merged with all "package.hugo.json" files found in the dependency tree, picking the version closest to the project.
 
@@ -80,12 +80,12 @@ so this may/will change in future versions of Hugo.
 		commands: []simplecobra.Commander{
 			&simpleCommand{
 				name:  "init",
-				short: "Initialize this project as a Hugo Module",
+				short: "Initialize this project as a Hugo Module.",
 				long: `Initialize this project as a Hugo Module.
 	It will try to guess the module path, but you may help by passing it as an argument, e.g:
-
+	
 		hugo mod init github.com/gohugoio/testshortcodes
-
+	
 	Note that Hugo Modules supports multi-module projects, so you can initialize a Hugo Module
 	inside a subfolder on GitHub, as one example.
 	`,
@@ -111,7 +111,7 @@ so this may/will change in future versions of Hugo.
 			},
 			&simpleCommand{
 				name:  "verify",
-				short: "Verify dependencies",
+				short: "Verify dependencies.",
 				long:  `Verify checks that the dependencies of the current module, which are stored in a local downloaded source cache, have not been modified since being downloaded.`,
 				withc: func(cmd *cobra.Command, r *rootCommand) {
 					cmd.ValidArgsFunction = cobra.NoFileCompletions
@@ -129,7 +129,7 @@ so this may/will change in future versions of Hugo.
 			},
 			&simpleCommand{
 				name:  "graph",
-				short: "Print a module dependency graph",
+				short: "Print a module dependency graph.",
 				long: `Print a module dependency graph with information about module status (disabled, vendored).
 Note that for vendored modules, that is the version listed and not the one from go.mod.
 `,
@@ -149,7 +149,7 @@ Note that for vendored modules, that is the version listed and not the one from
 			},
 			&simpleCommand{
 				name:  "clean",
-				short: "Delete the Hugo Module cache for the current project",
+				short: "Delete the Hugo Module cache for the current project.",
 				long:  `Delete the Hugo Module cache for the current project.`,
 				withc: func(cmd *cobra.Command, r *rootCommand) {
 					cmd.ValidArgsFunction = cobra.NoFileCompletions
@@ -175,7 +175,7 @@ Note that for vendored modules, that is the version listed and not the one from
 			},
 			&simpleCommand{
 				name:  "tidy",
-				short: "Remove unused entries in go.mod and go.sum",
+				short: "Remove unused entries in go.mod and go.sum.",
 				withc: func(cmd *cobra.Command, r *rootCommand) {
 					cmd.ValidArgsFunction = cobra.NoFileCompletions
 					applyLocalFlagsBuildConfig(cmd, r)
@@ -190,7 +190,7 @@ Note that for vendored modules, that is the version listed and not the one from
 			},
 			&simpleCommand{
 				name:  "vendor",
-				short: "Vendor all module dependencies into the _vendor directory",
+				short: "Vendor all module dependencies into the _vendor directory.",
 				long: `Vendor all module dependencies into the _vendor directory.
 	If a module is vendored, that is where Hugo will look for it's dependencies.
 	`,
@@ -209,16 +209,16 @@ Note that for vendored modules, that is the version listed and not the one from
 
 			&simpleCommand{
 				name:  "get",
-				short: "Resolves dependencies in your current Hugo project",
+				short: "Resolves dependencies in your current Hugo Project.",
 				long: `
-Resolves dependencies in your current Hugo project.
+Resolves dependencies in your current Hugo Project.
 
 Some examples:
 
 Install the latest version possible for a given module:
 
     hugo mod get github.com/gohugoio/testshortcodes
-
+    
 Install a specific version:
 
     hugo mod get github.com/gohugoio/testshortcodes@v0.3.0

commands/release.go

@@ -32,7 +32,7 @@ func newReleaseCommand() simplecobra.Commander {
 
 	return &simpleCommand{
 		name:  "release",
-		short: "Release a new version of Hugo",
+		short: "Release a new version of Hugo.",
 		run: func(ctx context.Context, cd *simplecobra.Commandeer, r *rootCommand, args []string) error {
 			rel, err := releaser.New(skipPush, try, step)
 			if err != nil {

commands/server.go

@@ -84,14 +84,10 @@ const (
 	configChangeGoWork = "go work file"
 )
 
-const (
-	hugoHeaderRedirect = "X-Hugo-Redirect"
-)
-
 func newHugoBuilder(r *rootCommand, s *serverCommand, onConfigLoaded ...func(reloaded bool) error) *hugoBuilder {
-	var visitedURLs *types.EvictingQueue[string]
+	var visitedURLs *types.EvictingStringQueue
 	if s != nil && !s.disableFastRender {
-		visitedURLs = types.NewEvictingQueue[string](20)
+		visitedURLs = types.NewEvictingStringQueue(20)
 	}
 	return &hugoBuilder{
 		r:              r,
@@ -119,7 +115,7 @@ func newServerCommand() *serverCommand {
 		commands: []simplecobra.Commander{
 			&simpleCommand{
 				name:  "trust",
-				short: "Install the local CA in the system trust store",
+				short: "Install the local CA in the system trust store.",
 				run: func(ctx context.Context, cd *simplecobra.Commandeer, r *rootCommand, args []string) error {
 					action := "-install"
 					if uninstall {
@@ -311,65 +307,64 @@ func (f *fileServer) createEndpoint(i int) (*http.ServeMux, net.Listener, string
 				w.Header().Set(header.Key, header.Value)
 			}
 
-			if canRedirect(requestURI, r) {
-				if redirect := serverConfig.MatchRedirect(requestURI, r.Header); !redirect.IsZero() {
-					doRedirect := true
-					// This matches Netlify's behavior and is needed for SPA behavior.
-					// See https://docs.netlify.com/routing/redirects/rewrites-proxies/
-					if !redirect.Force {
-						path := filepath.Clean(strings.TrimPrefix(requestURI, baseURL.Path()))
-						if root != "" {
-							path = filepath.Join(root, path)
-						}
-						var fs afero.Fs
-						f.c.withConf(func(conf *commonConfig) {
-							fs = conf.fs.PublishDirServer
-						})
-
-						fi, err := fs.Stat(path)
-
-						if err == nil {
-							if fi.IsDir() {
-								// There will be overlapping directories, so we
-								// need to check for a file.
-								_, err = fs.Stat(filepath.Join(path, "index.html"))
-								doRedirect = err != nil
-							} else {
-								doRedirect = false
-							}
-						}
+			if redirect := serverConfig.MatchRedirect(requestURI); !redirect.IsZero() {
+				// fullName := filepath.Join(dir, filepath.FromSlash(path.Clean("/"+name)))
+				doRedirect := true
+				// This matches Netlify's behavior and is needed for SPA behavior.
+				// See https://docs.netlify.com/routing/redirects/rewrites-proxies/
+				if !redirect.Force {
+					path := filepath.Clean(strings.TrimPrefix(requestURI, baseURL.Path()))
+					if root != "" {
+						path = filepath.Join(root, path)
 					}
+					var fs afero.Fs
+					f.c.withConf(func(conf *commonConfig) {
+						fs = conf.fs.PublishDirServer
+					})
 
-					if doRedirect {
-						w.Header().Set(hugoHeaderRedirect, "true")
-						switch redirect.Status {
-						case 404:
-							w.WriteHeader(404)
-							file, err := fs.Open(strings.TrimPrefix(redirect.To, baseURL.Path()))
-							if err == nil {
-								defer file.Close()
-								io.Copy(w, file)
-							} else {
-								fmt.Fprintln(w, "<h1>Page Not Found</h1>")
-							}
-							return
-						case 200:
-							if r2 := f.rewriteRequest(r, strings.TrimPrefix(redirect.To, baseURL.Path())); r2 != nil {
-								requestURI = redirect.To
-								r = r2
-							}
-						default:
-							w.Header().Set("Content-Type", "")
-							http.Redirect(w, r, redirect.To, redirect.Status)
-							return
+					fi, err := fs.Stat(path)
 
+					if err == nil {
+						if fi.IsDir() {
+							// There will be overlapping directories, so we
+							// need to check for a file.
+							_, err = fs.Stat(filepath.Join(path, "index.html"))
+							doRedirect = err != nil
+						} else {
+							doRedirect = false
 						}
 					}
 				}
+
+				if doRedirect {
+					switch redirect.Status {
+					case 404:
+						w.WriteHeader(404)
+						file, err := fs.Open(strings.TrimPrefix(redirect.To, baseURL.Path()))
+						if err == nil {
+							defer file.Close()
+							io.Copy(w, file)
+						} else {
+							fmt.Fprintln(w, "<h1>Page Not Found</h1>")
+						}
+						return
+					case 200:
+						if r2 := f.rewriteRequest(r, strings.TrimPrefix(redirect.To, baseURL.Path())); r2 != nil {
+							requestURI = redirect.To
+							r = r2
+						}
+					default:
+						w.Header().Set("Content-Type", "")
+						http.Redirect(w, r, redirect.To, redirect.Status)
+						return
+
+					}
+				}
+
 			}
 
 			if f.c.fastRenderMode && f.c.errState.buildErr() == nil {
-				if isNavigation(requestURI, r) {
+				if strings.HasSuffix(requestURI, "/") || strings.HasSuffix(requestURI, "html") || strings.HasSuffix(requestURI, "htm") {
 					if !f.c.visitedURLs.Contains(requestURI) {
 						// If not already on stack, re-render that single page.
 						if err := f.c.partialReRender(requestURI); err != nil {
@@ -843,7 +838,7 @@ func (c *serverCommand) partialReRender(urls ...string) (err error) {
 	defer func() {
 		c.errState.setWasErr(false)
 	}()
-	visited := types.NewEvictingQueue[string](len(urls))
+	visited := types.NewEvictingStringQueue(len(urls))
 	for _, url := range urls {
 		visited.Add(url)
 	}
@@ -855,7 +850,7 @@ func (c *serverCommand) partialReRender(urls ...string) (err error) {
 	}
 
 	// Note: We do not set NoBuildLock as the file lock is not acquired at this stage.
-	err = h.Build(hugolib.BuildCfg{NoBuildLock: false, RecentlyTouched: visited, PartialReRender: true, ErrRecovery: c.errState.wasErr()})
+	err = h.Build(hugolib.BuildCfg{NoBuildLock: false, RecentlyVisited: visited, PartialReRender: true, ErrRecovery: c.errState.wasErr()})
 
 	return
 }
@@ -1235,24 +1230,3 @@ func formatByteCount(b uint64) string {
 	return fmt.Sprintf("%.1f %cB",
 		float64(b)/float64(div), "kMGTPE"[exp])
 }
-
-func canRedirect(requestURIWithoutQuery string, r *http.Request) bool {
-	if r.Header.Get(hugoHeaderRedirect) != "" {
-		return false
-	}
-	return isNavigation(requestURIWithoutQuery, r)
-}
-
-// Sec-Fetch-Mode should be sent by all recent browser versions, see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Sec-Fetch-Mode#navigate
-// Fall back to the file extension if not set.
-// The main take here is that we don't want to have CSS/JS files etc. partake in this logic.
-func isNavigation(requestURIWithoutQuery string, r *http.Request) bool {
-	return r.Header.Get("Sec-Fetch-Mode") == "navigate" || isPropablyHTMLRequest(requestURIWithoutQuery)
-}
-
-func isPropablyHTMLRequest(requestURIWithoutQuery string) bool {
-	if strings.HasSuffix(requestURIWithoutQuery, "/") || strings.HasSuffix(requestURIWithoutQuery, "html") || strings.HasSuffix(requestURIWithoutQuery, "htm") {
-		return true
-	}
-	return !strings.Contains(requestURIWithoutQuery, ".")
-}

common/hashing/hashing.go

@@ -38,19 +38,6 @@ func XXHashFromReader(r io.Reader) (uint64, int64, error) {
 	return h.Sum64(), size, nil
 }
 
-// XxHashFromReaderHexEncoded calculates the xxHash for the given reader
-// and returns the hash as a hex encoded string.
-func XxHashFromReaderHexEncoded(r io.Reader) (string, error) {
-	h := getXxHashReadFrom()
-	defer putXxHashReadFrom(h)
-	_, err := io.Copy(h, r)
-	if err != nil {
-		return "", err
-	}
-	hash := h.Sum(nil)
-	return hex.EncodeToString(hash), nil
-}
-
 // XXHashFromString calculates the xxHash for the given string.
 func XXHashFromString(s string) (uint64, error) {
 	h := xxhash.New()
@@ -83,13 +70,6 @@ func HashString(vs ...any) string {
 	return strconv.FormatUint(hash, 10)
 }
 
-// HashStringHex returns a hash from the given elements as a hex encoded string.
-// See HashString for more information.
-func HashStringHex(vs ...any) string {
-	hash := HashUint64(vs...)
-	return strconv.FormatUint(hash, 16)
-}
-
 var hashOptsPool = sync.Pool{
 	New: func() any {
 		return &hashstructure.HashOptions{
@@ -123,24 +103,16 @@ func HashUint64(vs ...any) uint64 {
 		o = elements
 	}
 
-	hash, err := Hash(o)
+	hashOpts := getHashOpts()
+	defer putHashOpts(hashOpts)
+
+	hash, err := hashstructure.Hash(o, hashOpts)
 	if err != nil {
 		panic(err)
 	}
 	return hash
 }
 
-// Hash returns a hash from vs.
-func Hash(vs ...any) (uint64, error) {
-	hashOpts := getHashOpts()
-	defer putHashOpts(hashOpts)
-	var v any = vs
-	if len(vs) == 1 {
-		v = vs[0]
-	}
-	return hashstructure.Hash(v, hashOpts)
-}
-
 type keyer interface {
 	Key() string
 }

common/hashing/hashing_test.go

@@ -142,16 +142,3 @@ func BenchmarkHashString(b *testing.B) {
 		})
 	}
 }
-
-func BenchmarkHashMap(b *testing.B) {
-	m := map[string]interface{}{}
-	for i := 0; i < 1000; i++ {
-		m[fmt.Sprintf("key%d", i)] = i
-	}
-
-	b.ResetTimer()
-
-	for i := 0; i < b.N; i++ {
-		HashString(m)
-	}
-}

common/herrors/file_error.go

@@ -258,27 +258,8 @@ func openFile(filename string, fs afero.Fs) (afero.File, string, error) {
 	return f, realFilename, nil
 }
 
-// Cause returns the underlying error, that is,
-// it unwraps errors until it finds one that does not implement
-// the Unwrap method.
-// For a shallow variant, see Unwrap.
+// Cause returns the underlying error or itself if it does not implement Unwrap.
 func Cause(err error) error {
-	type unwrapper interface {
-		Unwrap() error
-	}
-
-	for err != nil {
-		cause, ok := err.(unwrapper)
-		if !ok {
-			break
-		}
-		err = cause.Unwrap()
-	}
-	return err
-}
-
-// Unwrap returns the underlying error or itself if it does not implement Unwrap.
-func Unwrap(err error) error {
 	if u := errors.Unwrap(err); u != nil {
 		return u
 	}
@@ -286,7 +267,7 @@ func Unwrap(err error) error {
 }
 
 func extractFileTypePos(err error) (string, text.Position) {
-	err = Unwrap(err)
+	err = Cause(err)
 
 	var fileType string
 

common/hexec/exec.go

@@ -26,10 +26,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/bep/logg"
 	"github.com/cli/safeexec"
-	"github.com/gohugoio/hugo/common/loggers"
-	"github.com/gohugoio/hugo/common/maps"
 	"github.com/gohugoio/hugo/config"
 	"github.com/gohugoio/hugo/config/security"
 )
@@ -89,7 +86,7 @@ var WithEnviron = func(env []string) func(c *commandeer) {
 }
 
 // New creates a new Exec using the provided security config.
-func New(cfg security.Config, workingDir string, log loggers.Logger) *Exec {
+func New(cfg security.Config, workingDir string) *Exec {
 	var baseEnviron []string
 	for _, v := range os.Environ() {
 		k, _ := config.SplitEnvVar(v)
@@ -99,11 +96,9 @@ func New(cfg security.Config, workingDir string, log loggers.Logger) *Exec {
 	}
 
 	return &Exec{
-		sc:                cfg,
-		workingDir:        workingDir,
-		infol:             log.InfoCommand("exec"),
-		baseEnviron:       baseEnviron,
-		newNPXRunnerCache: maps.NewCache[string, func(arg ...any) (Runner, error)](),
+		sc:          cfg,
+		workingDir:  workingDir,
+		baseEnviron: baseEnviron,
 	}
 }
 
@@ -129,14 +124,12 @@ func SafeCommand(name string, arg ...string) (*exec.Cmd, error) {
 type Exec struct {
 	sc         security.Config
 	workingDir string
-	infol      logg.LevelLogger
 
 	// os.Environ filtered by the Exec.OsEnviron whitelist filter.
 	baseEnviron []string
 
-	newNPXRunnerCache *maps.Cache[string, func(arg ...any) (Runner, error)]
-	npxInit           sync.Once
-	npxAvailable      bool
+	npxInit      sync.Once
+	npxAvailable bool
 }
 
 func (e *Exec) New(name string, arg ...any) (Runner, error) {
@@ -162,86 +155,25 @@ func (e *Exec) new(name string, fullyQualifiedName string, arg ...any) (Runner,
 	return cm.command(arg...)
 }
 
-type binaryLocation int
-
-func (b binaryLocation) String() string {
-	switch b {
-	case binaryLocationNodeModules:
-		return "node_modules/.bin"
-	case binaryLocationNpx:
-		return "npx"
-	case binaryLocationPath:
-		return "PATH"
-	}
-	return "unknown"
-}
-
-const (
-	binaryLocationNodeModules binaryLocation = iota + 1
-	binaryLocationNpx
-	binaryLocationPath
-)
-
 // Npx will in order:
 // 1. Try fo find the binary in the WORKINGDIR/node_modules/.bin directory.
 // 2. If not found, and npx is available, run npx --no-install <name> <args>.
 // 3. Fall back to the PATH.
-// If name is "tailwindcss", we will try the PATH as the second option.
 func (e *Exec) Npx(name string, arg ...any) (Runner, error) {
-	if err := e.sc.CheckAllowedExec(name); err != nil {
-		return nil, err
+	// npx is slow, so first try the common case.
+	nodeBinFilename := filepath.Join(e.workingDir, nodeModulesBinPath, name)
+	_, err := safeexec.LookPath(nodeBinFilename)
+	if err == nil {
+		return e.new(name, nodeBinFilename, arg...)
 	}
-
-	newRunner, err := e.newNPXRunnerCache.GetOrCreate(name, func() (func(...any) (Runner, error), error) {
-		type tryFunc func() func(...any) (Runner, error)
-		tryFuncs := map[binaryLocation]tryFunc{
-			binaryLocationNodeModules: func() func(...any) (Runner, error) {
-				nodeBinFilename := filepath.Join(e.workingDir, nodeModulesBinPath, name)
-				_, err := safeexec.LookPath(nodeBinFilename)
-				if err != nil {
-					return nil
-				}
-				return func(arg2 ...any) (Runner, error) {
-					return e.new(name, nodeBinFilename, arg2...)
-				}
-			},
-			binaryLocationNpx: func() func(...any) (Runner, error) {
-				e.checkNpx()
-				if !e.npxAvailable {
-					return nil
-				}
-				return func(arg2 ...any) (Runner, error) {
-					return e.npx(name, arg2...)
-				}
-			},
-			binaryLocationPath: func() func(...any) (Runner, error) {
-				if _, err := safeexec.LookPath(name); err != nil {
-					return nil
-				}
-				return func(arg2 ...any) (Runner, error) {
-					return e.New(name, arg2...)
-				}
-			},
+	e.checkNpx()
+	if e.npxAvailable {
+		r, err := e.npx(name, arg...)
+		if err == nil {
+			return r, nil
 		}
-
-		locations := []binaryLocation{binaryLocationNodeModules, binaryLocationNpx, binaryLocationPath}
-		if name == "tailwindcss" {
-			// See https://github.com/gohugoio/hugo/issues/13221#issuecomment-2574801253
-			locations = []binaryLocation{binaryLocationNodeModules, binaryLocationPath, binaryLocationNpx}
-		}
-		for _, loc := range locations {
-			if f := tryFuncs[loc](); f != nil {
-				e.infol.Logf("resolve %q using %s", name, loc)
-				return f, nil
-			}
-		}
-		return nil, &NotFoundError{name: name, method: fmt.Sprintf("in %s", locations[len(locations)-1])}
-	})
-	if err != nil {
-		return nil, err
 	}
-
-	return newRunner(arg...)
+	return e.New(name, arg...)
 }
 
 const (

common/hreflect/helpers.go

@@ -74,16 +74,6 @@ func IsTruthful(in any) bool {
 	}
 }
 
-// IsMap reports whether v is a map.
-func IsMap(v any) bool {
-	return reflect.ValueOf(v).Kind() == reflect.Map
-}
-
-// IsSlice reports whether v is a slice.
-func IsSlice(v any) bool {
-	return reflect.ValueOf(v).Kind() == reflect.Slice
-}
-
 var zeroType = reflect.TypeOf((*types.Zeroer)(nil)).Elem()
 
 // IsTruthfulValue returns whether the given value has a meaningful truth value.

common/hugio/hasBytesWriter_test.go

@@ -48,16 +48,16 @@ func TestHasBytesWriter(t *testing.T) {
 
 	for i := 0; i < 22; i++ {
 		h, w := neww()
-		fmt.Fprint(w, rndStr()+"abc __foobar"+rndStr())
+		fmt.Fprintf(w, rndStr()+"abc __foobar"+rndStr())
 		c.Assert(h.Patterns[0].Match, qt.Equals, true)
 
 		h, w = neww()
-		fmt.Fprint(w, rndStr()+"abc __f")
-		fmt.Fprint(w, "oo bar"+rndStr())
+		fmt.Fprintf(w, rndStr()+"abc __f")
+		fmt.Fprintf(w, "oo bar"+rndStr())
 		c.Assert(h.Patterns[0].Match, qt.Equals, true)
 
 		h, w = neww()
-		fmt.Fprint(w, rndStr()+"abc __moo bar")
+		fmt.Fprintf(w, rndStr()+"abc __moo bar")
 		c.Assert(h.Patterns[0].Match, qt.Equals, false)
 	}
 

common/hugo/hugo.go

@@ -414,25 +414,16 @@ func Deprecate(item, alternative string, version string) {
 	DeprecateLevel(item, alternative, version, level)
 }
 
-// DeprecateLevelMin informs about a deprecation starting at the given version, but with a minimum log level.
-func DeprecateLevelMin(item, alternative string, version string, minLevel logg.Level) {
-	level := deprecationLogLevelFromVersion(version)
-	if level < minLevel {
-		level = minLevel
-	}
-	DeprecateLevel(item, alternative, version, level)
-}
-
 // DeprecateLevel informs about a deprecation logging at the given level.
 func DeprecateLevel(item, alternative, version string, level logg.Level) {
 	var msg string
 	if level == logg.LevelError {
-		msg = fmt.Sprintf("%s was deprecated in Hugo %s and subsequently removed. %s", item, version, alternative)
+		msg = fmt.Sprintf("%s was deprecated in Hugo %s and will be removed in Hugo %s. %s", item, version, CurrentVersion.Next().ReleaseVersion(), alternative)
 	} else {
 		msg = fmt.Sprintf("%s was deprecated in Hugo %s and will be removed in a future release. %s", item, version, alternative)
 	}
 
-	loggers.Log().Logger().WithLevel(level).WithField(loggers.FieldNameCmd, "deprecated").Logf("%s", msg)
+	loggers.Log().Logger().WithLevel(level).WithField(loggers.FieldNameCmd, "deprecated").Logf(msg)
 }
 
 // We usually do about one minor version a month.
@@ -443,11 +434,11 @@ func deprecationLogLevelFromVersion(ver string) logg.Level {
 	to := CurrentVersion
 	minorDiff := to.Minor - from.Minor
 	switch {
-	case minorDiff >= 15:
-		// Start failing the build after about 15 months.
+	case minorDiff >= 12:
+		// Start failing the build after about a year.
 		return logg.LevelError
-	case minorDiff >= 3:
-		// Start printing warnings after about 3 months.
+	case minorDiff >= 6:
+		// Start printing warnings after about six months.
 		return logg.LevelWarn
 	default:
 		return logg.LevelInfo

common/hugo/hugo_test.go

@@ -57,11 +57,11 @@ func TestDeprecationLogLevelFromVersion(t *testing.T) {
 	c.Assert(deprecationLogLevelFromVersion("0.55.0"), qt.Equals, logg.LevelError)
 	ver := CurrentVersion
 	c.Assert(deprecationLogLevelFromVersion(ver.String()), qt.Equals, logg.LevelInfo)
-	ver.Minor -= 3
+	ver.Minor -= 1
+	c.Assert(deprecationLogLevelFromVersion(ver.String()), qt.Equals, logg.LevelInfo)
+	ver.Minor -= 6
 	c.Assert(deprecationLogLevelFromVersion(ver.String()), qt.Equals, logg.LevelWarn)
-	ver.Minor -= 4
-	c.Assert(deprecationLogLevelFromVersion(ver.String()), qt.Equals, logg.LevelWarn)
-	ver.Minor -= 13
+	ver.Minor -= 6
 	c.Assert(deprecationLogLevelFromVersion(ver.String()), qt.Equals, logg.LevelError)
 
 	// Added just to find the threshold for where we can remove deprecated items.

common/hugo/vars_extended.go

@@ -12,6 +12,7 @@
 // limitations under the License.
 
 //go:build extended
+// +build extended
 
 package hugo
 

common/hugo/vars_regular.go

@@ -12,6 +12,7 @@
 // limitations under the License.
 
 //go:build !extended
+// +build !extended
 
 package hugo
 

common/hugo/vars_withdeploy.go

@@ -12,6 +12,7 @@
 // limitations under the License.
 
 //go:build withdeploy
+// +build withdeploy
 
 package hugo
 

common/hugo/vars_withdeploy_off.go

@@ -12,6 +12,7 @@
 // limitations under the License.
 
 //go:build !withdeploy
+// +build !withdeploy
 
 package hugo
 

common/hugo/version_current.go

@@ -17,7 +17,7 @@ package hugo
 // This should be the only one.
 var CurrentVersion = Version{
 	Major:      0,
-	Minor:      144,
-	PatchLevel: 2,
-	Suffix:     "",
+	Minor:      141,
+	PatchLevel: 0,
+	Suffix:     "-DEV",
 }

common/loggers/loggerglobal.go

@@ -21,15 +21,7 @@ import (
 	"github.com/bep/logg"
 )
 
-// SetGlobalLogger sets the global logger.
-// This is used in a few places in Hugo, e.g. deprecated functions.
-func SetGlobalLogger(logger Logger) {
-	logMu.Lock()
-	defer logMu.Unlock()
-	log = logger
-}
-
-func initGlobalLogger(level logg.Level, panicOnWarnings bool) {
+func InitGlobalLogger(level logg.Level, panicOnWarnings bool) {
 	logMu.Lock()
 	defer logMu.Unlock()
 	var logHookLast func(e *logg.Entry) error
@@ -58,5 +50,5 @@ func Log() Logger {
 var log Logger
 
 func init() {
-	initGlobalLogger(logg.LevelWarn, false)
+	InitGlobalLogger(logg.LevelWarn, false)
 }

common/maps/maps_test.go

@@ -73,14 +73,10 @@ func TestPrepareParams(t *testing.T) {
 	for i, test := range tests {
 		t.Run(fmt.Sprint(i), func(t *testing.T) {
 			// PrepareParams modifies input.
-			prepareClone := PrepareParamsClone(test.input)
 			PrepareParams(test.input)
 			if !reflect.DeepEqual(test.expected, test.input) {
 				t.Errorf("[%d] Expected\n%#v, got\n%#v\n", i, test.expected, test.input)
 			}
-			if !reflect.DeepEqual(test.expected, prepareClone) {
-				t.Errorf("[%d] Expected\n%#v, got\n%#v\n", i, test.expected, prepareClone)
-			}
 		})
 	}
 }

common/maps/ordered.go

@@ -1,133 +0,0 @@
-// Copyright 2024 The Hugo Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package maps
-
-import (
-	"github.com/gohugoio/hugo/common/hashing"
-)
-
-// Ordered is a map that can be iterated in the order of insertion.
-// Note that insertion order is not affected if a key is re-inserted into the map.
-// In a nil map, all operations are no-ops.
-// This is not thread safe.
-type Ordered[K comparable, T any] struct {
-	// The keys in the order they were added.
-	keys []K
-	// The values.
-	values map[K]T
-}
-
-// NewOrdered creates a new Ordered map.
-func NewOrdered[K comparable, T any]() *Ordered[K, T] {
-	return &Ordered[K, T]{values: make(map[K]T)}
-}
-
-// Set sets the value for the given key.
-// Note that insertion order is not affected if a key is re-inserted into the map.
-func (m *Ordered[K, T]) Set(key K, value T) {
-	if m == nil {
-		return
-	}
-	// Check if key already exists.
-	if _, found := m.values[key]; !found {
-		m.keys = append(m.keys, key)
-	}
-	m.values[key] = value
-}
-
-// Get gets the value for the given key.
-func (m *Ordered[K, T]) Get(key K) (T, bool) {
-	if m == nil {
-		var v T
-		return v, false
-	}
-	value, found := m.values[key]
-	return value, found
-}
-
-// Delete deletes the value for the given key.
-func (m *Ordered[K, T]) Delete(key K) {
-	if m == nil {
-		return
-	}
-	delete(m.values, key)
-	for i, k := range m.keys {
-		if k == key {
-			m.keys = append(m.keys[:i], m.keys[i+1:]...)
-			break
-		}
-	}
-}
-
-// Clone creates a shallow copy of the map.
-func (m *Ordered[K, T]) Clone() *Ordered[K, T] {
-	if m == nil {
-		return nil
-	}
-	clone := NewOrdered[K, T]()
-	for _, k := range m.keys {
-		clone.Set(k, m.values[k])
-	}
-	return clone
-}
-
-// Keys returns the keys in the order they were added.
-func (m *Ordered[K, T]) Keys() []K {
-	if m == nil {
-		return nil
-	}
-	return m.keys
-}
-
-// Values returns the values in the order they were added.
-func (m *Ordered[K, T]) Values() []T {
-	if m == nil {
-		return nil
-	}
-	var values []T
-	for _, k := range m.keys {
-		values = append(values, m.values[k])
-	}
-	return values
-}
-
-// Len returns the number of items in the map.
-func (m *Ordered[K, T]) Len() int {
-	if m == nil {
-		return 0
-	}
-	return len(m.keys)
-}
-
-// Range calls f sequentially for each key and value present in the map.
-// If f returns false, range stops the iteration.
-// TODO(bep) replace with iter.Seq2 when we bump go Go 1.24.
-func (m *Ordered[K, T]) Range(f func(key K, value T) bool) {
-	if m == nil {
-		return
-	}
-	for _, k := range m.keys {
-		if !f(k, m.values[k]) {
-			return
-		}
-	}
-}
-
-// Hash calculates a hash from the values.
-func (m *Ordered[K, T]) Hash() (uint64, error) {
-	if m == nil {
-		return 0, nil
-	}
-	return hashing.Hash(m.values)
-}

common/maps/ordered_test.go

@@ -1,99 +0,0 @@
-// Copyright 2024 The Hugo Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package maps
-
-import (
-	"testing"
-
-	qt "github.com/frankban/quicktest"
-)
-
-func TestOrdered(t *testing.T) {
-	c := qt.New(t)
-
-	m := NewOrdered[string, int]()
-	m.Set("a", 1)
-	m.Set("b", 2)
-	m.Set("c", 3)
-
-	c.Assert(m.Keys(), qt.DeepEquals, []string{"a", "b", "c"})
-	c.Assert(m.Values(), qt.DeepEquals, []int{1, 2, 3})
-
-	v, found := m.Get("b")
-	c.Assert(found, qt.Equals, true)
-	c.Assert(v, qt.Equals, 2)
-
-	m.Set("b", 22)
-	c.Assert(m.Keys(), qt.DeepEquals, []string{"a", "b", "c"})
-	c.Assert(m.Values(), qt.DeepEquals, []int{1, 22, 3})
-
-	m.Delete("b")
-
-	c.Assert(m.Keys(), qt.DeepEquals, []string{"a", "c"})
-	c.Assert(m.Values(), qt.DeepEquals, []int{1, 3})
-}
-
-func TestOrderedHash(t *testing.T) {
-	c := qt.New(t)
-
-	m := NewOrdered[string, int]()
-	m.Set("a", 1)
-	m.Set("b", 2)
-	m.Set("c", 3)
-
-	h1, err := m.Hash()
-	c.Assert(err, qt.IsNil)
-
-	m.Set("d", 4)
-
-	h2, err := m.Hash()
-	c.Assert(err, qt.IsNil)
-
-	c.Assert(h1, qt.Not(qt.Equals), h2)
-
-	m = NewOrdered[string, int]()
-	m.Set("b", 2)
-	m.Set("a", 1)
-	m.Set("c", 3)
-
-	h3, err := m.Hash()
-	c.Assert(err, qt.IsNil)
-	// Order does not matter.
-	c.Assert(h1, qt.Equals, h3)
-}
-
-func TestOrderedNil(t *testing.T) {
-	c := qt.New(t)
-
-	var m *Ordered[string, int]
-
-	m.Set("a", 1)
-	c.Assert(m.Keys(), qt.IsNil)
-	c.Assert(m.Values(), qt.IsNil)
-	v, found := m.Get("a")
-	c.Assert(found, qt.Equals, false)
-	c.Assert(v, qt.Equals, 0)
-	m.Delete("a")
-	var b bool
-	m.Range(func(k string, v int) bool {
-		b = true
-		return true
-	})
-	c.Assert(b, qt.Equals, false)
-	c.Assert(m.Len(), qt.Equals, 0)
-	c.Assert(m.Clone(), qt.IsNil)
-	h, err := m.Hash()
-	c.Assert(err, qt.IsNil)
-	c.Assert(h, qt.Equals, uint64(0))
-}

common/maps/params.go

@@ -303,7 +303,7 @@ func toMergeStrategy(v any) ParamsMergeStrategy {
 }
 
 // PrepareParams
-// * makes all the keys in the given map lower cased and will do so recursively.
+// * makes all the keys in the given map lower cased and will do so
 // * This will modify the map given.
 // * Any nested map[interface{}]interface{}, map[string]interface{},map[string]string  will be converted to Params.
 // * Any _merge value will be converted to proper type and value.
@@ -343,42 +343,3 @@ func PrepareParams(m Params) {
 		}
 	}
 }
-
-// PrepareParamsClone is like PrepareParams, but it does not modify the input.
-func PrepareParamsClone(m Params) Params {
-	m2 := make(Params)
-	for k, v := range m {
-		var retyped bool
-		lKey := strings.ToLower(k)
-		if lKey == MergeStrategyKey {
-			v = toMergeStrategy(v)
-			retyped = true
-		} else {
-			switch vv := v.(type) {
-			case map[any]any:
-				var p Params = cast.ToStringMap(v)
-				v = PrepareParamsClone(p)
-				retyped = true
-			case map[string]any:
-				var p Params = v.(map[string]any)
-				v = PrepareParamsClone(p)
-				retyped = true
-			case map[string]string:
-				p := make(Params)
-				for k, v := range vv {
-					p[k] = v
-				}
-				v = p
-				PrepareParams(p)
-				retyped = true
-			}
-		}
-
-		if retyped || k != lKey {
-			m2[lKey] = v
-		} else {
-			m2[k] = v
-		}
-	}
-	return m2
-}

common/paths/url.go

@@ -228,7 +228,7 @@ func UrlFromFilename(filename string) (*url.URL, error) {
 	}, nil
 }
 
-// UrlStringToFilename converts the URL s to a filename.
+// UrlToFilename converts the URL s to a filename.
 // If ParseRequestURI fails, the input is just converted to OS specific slashes and returned.
 func UrlStringToFilename(s string) (string, bool) {
 	u, err := url.ParseRequestURI(s)

common/types/evictingqueue.go

@@ -18,24 +18,24 @@ import (
 	"sync"
 )
 
-// EvictingQueue is a queue which automatically evicts elements from the head of
+// EvictingStringQueue is a queue which automatically evicts elements from the head of
 // the queue when attempting to add new elements onto the queue and it is full.
 // This queue orders elements LIFO (last-in-first-out). It throws away duplicates.
-type EvictingQueue[T comparable] struct {
+// Note: This queue currently does not contain any remove (poll etc.) methods.
+type EvictingStringQueue struct {
 	size int
-	vals []T
-	set  map[T]bool
+	vals []string
+	set  map[string]bool
 	mu   sync.Mutex
-	zero T
 }
 
-// NewEvictingQueue creates a new queue with the given size.
-func NewEvictingQueue[T comparable](size int) *EvictingQueue[T] {
-	return &EvictingQueue[T]{size: size, set: make(map[T]bool)}
+// NewEvictingStringQueue creates a new queue with the given size.
+func NewEvictingStringQueue(size int) *EvictingStringQueue {
+	return &EvictingStringQueue{size: size, set: make(map[string]bool)}
 }
 
 // Add adds a new string to the tail of the queue if it's not already there.
-func (q *EvictingQueue[T]) Add(v T) *EvictingQueue[T] {
+func (q *EvictingStringQueue) Add(v string) *EvictingStringQueue {
 	q.mu.Lock()
 	if q.set[v] {
 		q.mu.Unlock()
@@ -54,7 +54,7 @@ func (q *EvictingQueue[T]) Add(v T) *EvictingQueue[T] {
 	return q
 }
 
-func (q *EvictingQueue[T]) Len() int {
+func (q *EvictingStringQueue) Len() int {
 	if q == nil {
 		return 0
 	}
@@ -64,7 +64,7 @@ func (q *EvictingQueue[T]) Len() int {
 }
 
 // Contains returns whether the queue contains v.
-func (q *EvictingQueue[T]) Contains(v T) bool {
+func (q *EvictingStringQueue) Contains(v string) bool {
 	if q == nil {
 		return false
 	}
@@ -74,12 +74,12 @@ func (q *EvictingQueue[T]) Contains(v T) bool {
 }
 
 // Peek looks at the last element added to the queue.
-func (q *EvictingQueue[T]) Peek() T {
+func (q *EvictingStringQueue) Peek() string {
 	q.mu.Lock()
 	l := len(q.vals)
 	if l == 0 {
 		q.mu.Unlock()
-		return q.zero
+		return ""
 	}
 	elem := q.vals[l-1]
 	q.mu.Unlock()
@@ -87,12 +87,9 @@ func (q *EvictingQueue[T]) Peek() T {
 }
 
 // PeekAll looks at all the elements in the queue, with the newest first.
-func (q *EvictingQueue[T]) PeekAll() []T {
-	if q == nil {
-		return nil
-	}
+func (q *EvictingStringQueue) PeekAll() []string {
 	q.mu.Lock()
-	vals := make([]T, len(q.vals))
+	vals := make([]string, len(q.vals))
 	copy(vals, q.vals)
 	q.mu.Unlock()
 	for i, j := 0, len(vals)-1; i < j; i, j = i+1, j-1 {
@@ -102,9 +99,9 @@ func (q *EvictingQueue[T]) PeekAll() []T {
 }
 
 // PeekAllSet returns PeekAll as a set.
-func (q *EvictingQueue[T]) PeekAllSet() map[T]bool {
+func (q *EvictingStringQueue) PeekAllSet() map[string]bool {
 	all := q.PeekAll()
-	set := make(map[T]bool)
+	set := make(map[string]bool)
 	for _, v := range all {
 		set[v] = true
 	}

common/types/evictingqueue_test.go

@@ -23,7 +23,7 @@ import (
 func TestEvictingStringQueue(t *testing.T) {
 	c := qt.New(t)
 
-	queue := NewEvictingQueue[string](3)
+	queue := NewEvictingStringQueue(3)
 
 	c.Assert(queue.Peek(), qt.Equals, "")
 	queue.Add("a")
@@ -53,7 +53,7 @@ func TestEvictingStringQueueConcurrent(t *testing.T) {
 	var wg sync.WaitGroup
 	val := "someval"
 
-	queue := NewEvictingQueue[string](3)
+	queue := NewEvictingStringQueue(3)
 
 	for j := 0; j < 100; j++ {
 		wg.Add(1)

common/types/types.go

@@ -133,3 +133,22 @@ func NewBool(b bool) *bool {
 type PrintableValueProvider interface {
 	PrintableValue() any
 }
+
+var _ PrintableValueProvider = Result[any]{}
+
+// Result is a generic result type.
+type Result[T any] struct {
+	// The result value.
+	Value T
+
+	// The error value.
+	Err error
+}
+
+// PrintableValue returns the value or panics if there is an error.
+func (r Result[T]) PrintableValue() any {
+	if r.Err != nil {
+		panic(r.Err)
+	}
+	return r.Value
+}

config/allconfig/allconfig.go

@@ -128,9 +128,6 @@ type Config struct {
 	// <docsmeta>{"identifiers": ["markup"] }</docsmeta>
 	Markup markup_config.Config `mapstructure:"-"`
 
-	// ContentTypes are the media types that's considered content in Hugo.
-	ContentTypes *config.ConfigNamespace[map[string]media.ContentTypeConfig, media.ContentTypes] `mapstructure:"-"`
-
 	// The mediatypes configuration section maps the MIME type (a string) to a configuration object for that type.
 	// <docsmeta>{"identifiers": ["mediatypes"], "refs": ["types:media:type"] }</docsmeta>
 	MediaTypes *config.ConfigNamespace[map[string]media.MediaTypeConfig, media.Types] `mapstructure:"-"`
@@ -146,7 +143,7 @@ type Config struct {
 
 	// The cascade configuration section contains the top level front matter cascade configuration options,
 	// a slice of page matcher and params to apply to those pages.
-	Cascade *config.ConfigNamespace[[]page.PageMatcherParamsConfig, *maps.Ordered[page.PageMatcher, maps.Params]] `mapstructure:"-"`
+	Cascade *config.ConfigNamespace[[]page.PageMatcherParamsConfig, map[page.PageMatcher]maps.Params] `mapstructure:"-"`
 
 	// The segments defines segments for the site. Used for partial/segmented builds.
 	Segments *config.ConfigNamespace[map[string]segments.SegmentConfig, segments.Segments] `mapstructure:"-"`
@@ -304,18 +301,6 @@ func (c *Config) CompileConfig(logger loggers.Logger) error {
 		}
 	}
 
-	defaultOutputFormat := outputFormats[0]
-	c.DefaultOutputFormat = strings.ToLower(c.DefaultOutputFormat)
-	if c.DefaultOutputFormat != "" {
-		f, found := outputFormats.GetByName(c.DefaultOutputFormat)
-		if !found {
-			return fmt.Errorf("unknown default output format %q", c.DefaultOutputFormat)
-		}
-		defaultOutputFormat = f
-	} else {
-		c.DefaultOutputFormat = defaultOutputFormat.Name
-	}
-
 	disabledLangs := make(map[string]bool)
 	for _, lang := range c.DisableLanguages {
 		disabledLangs[lang] = true
@@ -405,54 +390,23 @@ func (c *Config) CompileConfig(logger loggers.Logger) error {
 		c.Pagination.Path = c.PaginatePath
 	}
 
-	// Legacy privacy values.
-	if c.Privacy.Twitter.Disable {
-		hugo.Deprecate("site config key privacy.twitter.disable", "Use privacy.x.disable instead.", "v0.141.0")
-		c.Privacy.X.Disable = c.Privacy.Twitter.Disable
-	}
-
-	if c.Privacy.Twitter.EnableDNT {
-		hugo.Deprecate("site config key privacy.twitter.enableDNT", "Use privacy.x.enableDNT instead.", "v0.141.0")
-		c.Privacy.X.EnableDNT = c.Privacy.Twitter.EnableDNT
-	}
-
-	if c.Privacy.Twitter.Simple {
-		hugo.Deprecate("site config key privacy.twitter.simple", "Use privacy.x.simple instead.", "v0.141.0")
-		c.Privacy.X.Simple = c.Privacy.Twitter.Simple
-	}
-
-	// Legacy services values.
-	if c.Services.Twitter.DisableInlineCSS {
-		hugo.Deprecate("site config key services.twitter.disableInlineCSS", "Use services.x.disableInlineCSS instead.", "v0.141.0")
-		c.Services.X.DisableInlineCSS = c.Services.Twitter.DisableInlineCSS
-	}
-
-	// Legacy permalink tokens
-	vs := fmt.Sprintf("%v", c.Permalinks)
-	if strings.Contains(vs, ":filename") {
-		hugo.Deprecate("the \":filename\" permalink token", "Use \":contentbasename\" instead.", "0.144.0")
-	}
-	if strings.Contains(vs, ":slugorfilename") {
-		hugo.Deprecate("the \":slugorfilename\" permalink token", "Use \":slugorcontentbasename\" instead.", "0.144.0")
-	}
-
 	c.C = &ConfigCompiled{
-		Timeout:             timeout,
-		BaseURL:             baseURL,
-		BaseURLLiveReload:   baseURL,
-		DisabledKinds:       disabledKinds,
-		DisabledLanguages:   disabledLangs,
-		IgnoredLogs:         ignoredLogIDs,
-		KindOutputFormats:   kindOutputFormats,
-		DefaultOutputFormat: defaultOutputFormat,
-		CreateTitle:         helpers.GetTitleFunc(c.TitleCaseStyle),
-		IsUglyURLSection:    isUglyURL,
-		IgnoreFile:          ignoreFile,
-		SegmentFilter:       c.Segments.Config.Get(func(s string) { logger.Warnf("Render segment %q not found in configuration", s) }, c.RootConfig.RenderSegments...),
-		MainSections:        c.MainSections,
-		Clock:               clock,
-		HTTPCache:           httpCache,
-		transientErr:        transientErr,
+		Timeout:           timeout,
+		BaseURL:           baseURL,
+		BaseURLLiveReload: baseURL,
+		DisabledKinds:     disabledKinds,
+		DisabledLanguages: disabledLangs,
+		IgnoredLogs:       ignoredLogIDs,
+		KindOutputFormats: kindOutputFormats,
+		ContentTypes:      media.DefaultContentTypes.FromTypes(c.MediaTypes.Config),
+		CreateTitle:       helpers.GetTitleFunc(c.TitleCaseStyle),
+		IsUglyURLSection:  isUglyURL,
+		IgnoreFile:        ignoreFile,
+		SegmentFilter:     c.Segments.Config.Get(func(s string) { logger.Warnf("Render segment %q not found in configuration", s) }, c.RootConfig.RenderSegments...),
+		MainSections:      c.MainSections,
+		Clock:             clock,
+		HTTPCache:         httpCache,
+		transientErr:      transientErr,
 	}
 
 	for _, s := range allDecoderSetups {
@@ -476,22 +430,22 @@ func (c *Config) IsLangDisabled(lang string) bool {
 
 // ConfigCompiled holds values and functions that are derived from the config.
 type ConfigCompiled struct {
-	Timeout             time.Duration
-	BaseURL             urls.BaseURL
-	BaseURLLiveReload   urls.BaseURL
-	ServerInterface     string
-	KindOutputFormats   map[string]output.Formats
-	DefaultOutputFormat output.Format
-	DisabledKinds       map[string]bool
-	DisabledLanguages   map[string]bool
-	IgnoredLogs         map[string]bool
-	CreateTitle         func(s string) string
-	IsUglyURLSection    func(section string) bool
-	IgnoreFile          func(filename string) bool
-	SegmentFilter       segments.SegmentFilter
-	MainSections        []string
-	Clock               time.Time
-	HTTPCache           httpcache.ConfigCompiled
+	Timeout           time.Duration
+	BaseURL           urls.BaseURL
+	BaseURLLiveReload urls.BaseURL
+	ServerInterface   string
+	KindOutputFormats map[string]output.Formats
+	ContentTypes      media.ContentTypes
+	DisabledKinds     map[string]bool
+	DisabledLanguages map[string]bool
+	IgnoredLogs       map[string]bool
+	CreateTitle       func(s string) string
+	IsUglyURLSection  func(section string) bool
+	IgnoreFile        func(filename string) bool
+	SegmentFilter     segments.SegmentFilter
+	MainSections      []string
+	Clock             time.Time
+	HTTPCache         httpcache.ConfigCompiled
 
 	// This is set to the last transient error found during config compilation.
 	// With themes/modules we compute the configuration in multiple passes, and
@@ -551,10 +505,6 @@ type RootConfig struct {
 	// Set this to true to put all languages below their language ID.
 	DefaultContentLanguageInSubdir bool
 
-	// The default output format to use for the site.
-	// If not set, we will use the first output format.
-	DefaultOutputFormat string
-
 	// Disable generation of redirect to the default language when DefaultContentLanguageInSubdir is enabled.
 	DisableDefaultLanguageRedirect bool
 
@@ -776,10 +726,9 @@ type Configs struct {
 }
 
 func (c *Configs) Validate(logger loggers.Logger) error {
-	c.Base.Cascade.Config.Range(func(p page.PageMatcher, params maps.Params) bool {
+	for p := range c.Base.Cascade.Config {
 		page.CheckCascadePattern(logger, p)
-		return true
-	})
+	}
 	return nil
 }
 
@@ -849,7 +798,7 @@ func (c *Configs) Init() error {
 	c.Languages = languages
 	c.LanguagesDefaultFirst = languagesDefaultFirst
 
-	c.ContentPathParser = &paths.PathParser{LanguageIndex: languagesDefaultFirst.AsIndexSet(), IsLangDisabled: c.Base.IsLangDisabled, IsContentExt: c.Base.ContentTypes.Config.IsContentSuffix}
+	c.ContentPathParser = &paths.PathParser{LanguageIndex: languagesDefaultFirst.AsIndexSet(), IsLangDisabled: c.Base.IsLangDisabled, IsContentExt: c.Base.C.ContentTypes.IsContentSuffix}
 
 	c.configLangs = make([]config.AllProvider, len(c.Languages))
 	for i, l := range c.LanguagesDefaultFirst {

config/allconfig/allconfig_integration_test.go

@@ -7,7 +7,6 @@ import (
 	qt "github.com/frankban/quicktest"
 	"github.com/gohugoio/hugo/config/allconfig"
 	"github.com/gohugoio/hugo/hugolib"
-	"github.com/gohugoio/hugo/media"
 )
 
 func TestDirsMount(t *testing.T) {
@@ -98,7 +97,7 @@ suffixes = ["html", "xhtml"]
 	b := hugolib.Test(t, files)
 
 	conf := b.H.Configs.Base
-	contentTypes := conf.ContentTypes.Config
+	contentTypes := conf.C.ContentTypes
 
 	b.Assert(contentTypes.HTML.Suffixes(), qt.DeepEquals, []string{"html", "xhtml"})
 	b.Assert(contentTypes.Markdown.Suffixes(), qt.DeepEquals, []string{"md", "mdown", "markdown"})
@@ -216,21 +215,3 @@ weight = 3
 	b := hugolib.Test(t, files)
 	b.Assert(b.H.Configs.LanguageConfigSlice[0].Title, qt.Equals, `TITLE_DE`)
 }
-
-func TestContentTypesDefault(t *testing.T) {
-	files := `
--- hugo.toml --
-baseURL = "https://example.com"
-
-
-`
-
-	b := hugolib.Test(t, files)
-
-	ct := b.H.Configs.Base.ContentTypes
-	c := ct.Config
-	s := ct.SourceStructure.(map[string]media.ContentTypeConfig)
-
-	b.Assert(c.IsContentFile("foo.md"), qt.Equals, true)
-	b.Assert(len(s), qt.Equals, 6)
-}

config/allconfig/alldecoders.go

@@ -163,15 +163,6 @@ var allDecoderSetups = map[string]decodeWeight{
 			return err
 		},
 	},
-	"contenttypes": {
-		key:    "contenttypes",
-		weight: 100, // This needs to be decoded after media types.
-		decode: func(d decodeWeight, p decodeConfig) error {
-			var err error
-			p.c.ContentTypes, err = media.DecodeContentTypes(p.p.GetStringMap(d.key), p.c.MediaTypes.Config)
-			return err
-		},
-	},
 	"mediatypes": {
 		key: "mediatypes",
 		decode: func(d decodeWeight, p decodeConfig) error {

config/allconfig/configlanguage.go

@@ -145,7 +145,7 @@ func (c ConfigLanguage) NewIdentityManager(name string, opts ...identity.Manager
 }
 
 func (c ConfigLanguage) ContentTypes() config.ContentTypesProvider {
-	return c.config.ContentTypes.Config
+	return c.config.C.ContentTypes
 }
 
 // GetConfigSection is mostly used in tests. The switch statement isn't complete, but what's in use.

config/allconfig/load.go

@@ -91,7 +91,7 @@ func LoadConfig(d ConfigSourceDescriptor) (*Configs, error) {
 		return nil, fmt.Errorf("failed to init config: %w", err)
 	}
 
-	loggers.SetGlobalLogger(d.Logger)
+	loggers.InitGlobalLogger(d.Logger.Level(), configs.Base.PanicOnWarning)
 
 	return configs, nil
 }
@@ -470,7 +470,7 @@ func (l *configLoader) loadModules(configs *Configs, ignoreModuleDoesNotExist bo
 		ignoreVendor, _ = hglob.GetGlob(hglob.NormalizePath(s))
 	}
 
-	ex := hexec.New(conf.Security, workingDir, l.Logger)
+	ex := hexec.New(conf.Security, workingDir)
 
 	hook := func(m *modules.ModulesConfig) error {
 		for _, tc := range m.AllModules {

config/commonConfig.go

@@ -15,7 +15,6 @@ package config
 
 import (
 	"fmt"
-	"net/http"
 	"regexp"
 	"sort"
 	"strings"
@@ -227,22 +226,7 @@ type Server struct {
 	Redirects []Redirect
 
 	compiledHeaders   []glob.Glob
-	compiledRedirects []redirect
-}
-
-type redirect struct {
-	from    glob.Glob
-	fromRe  *regexp.Regexp
-	headers map[string]glob.Glob
-}
-
-func (r redirect) matchHeader(header http.Header) bool {
-	for k, v := range r.headers {
-		if !v.Match(header.Get(k)) {
-			return false
-		}
-	}
-	return true
+	compiledRedirects []glob.Glob
 }
 
 func (s *Server) CompileConfig(logger loggers.Logger) error {
@@ -250,41 +234,10 @@ func (s *Server) CompileConfig(logger loggers.Logger) error {
 		return nil
 	}
 	for _, h := range s.Headers {
-		g, err := glob.Compile(h.For)
-		if err != nil {
-			return fmt.Errorf("failed to compile Headers glob %q: %w", h.For, err)
-		}
-		s.compiledHeaders = append(s.compiledHeaders, g)
+		s.compiledHeaders = append(s.compiledHeaders, glob.MustCompile(h.For))
 	}
 	for _, r := range s.Redirects {
-		if r.From == "" && r.FromRe == "" {
-			return fmt.Errorf("redirects must have either From or FromRe set")
-		}
-		rd := redirect{
-			headers: make(map[string]glob.Glob),
-		}
-		if r.From != "" {
-			g, err := glob.Compile(r.From)
-			if err != nil {
-				return fmt.Errorf("failed to compile Redirect glob %q: %w", r.From, err)
-			}
-			rd.from = g
-		}
-		if r.FromRe != "" {
-			re, err := regexp.Compile(r.FromRe)
-			if err != nil {
-				return fmt.Errorf("failed to compile Redirect regexp %q: %w", r.FromRe, err)
-			}
-			rd.fromRe = re
-		}
-		for k, v := range r.FromHeaders {
-			g, err := glob.Compile(v)
-			if err != nil {
-				return fmt.Errorf("failed to compile Redirect header glob %q: %w", v, err)
-			}
-			rd.headers[k] = g
-		}
-		s.compiledRedirects = append(s.compiledRedirects, rd)
+		s.compiledRedirects = append(s.compiledRedirects, glob.MustCompile(r.From))
 	}
 
 	return nil
@@ -313,42 +266,22 @@ func (s *Server) MatchHeaders(pattern string) []types.KeyValueStr {
 	return matches
 }
 
-func (s *Server) MatchRedirect(pattern string, header http.Header) Redirect {
+func (s *Server) MatchRedirect(pattern string) Redirect {
 	if s.compiledRedirects == nil {
 		return Redirect{}
 	}
 
 	pattern = strings.TrimSuffix(pattern, "index.html")
 
-	for i, r := range s.compiledRedirects {
+	for i, g := range s.compiledRedirects {
 		redir := s.Redirects[i]
 
-		var found bool
-
-		if r.from != nil {
-			if r.from.Match(pattern) {
-				found = header == nil || r.matchHeader(header)
-				// We need to do regexp group replacements if needed.
-			}
+		// No redirect to self.
+		if redir.To == pattern {
+			return Redirect{}
 		}
 
-		if r.fromRe != nil {
-			m := r.fromRe.FindStringSubmatch(pattern)
-			if m != nil {
-				if !found {
-					found = header == nil || r.matchHeader(header)
-				}
-
-				if found {
-					// Replace $1, $2 etc. in To.
-					for i, g := range m[1:] {
-						redir.To = strings.ReplaceAll(redir.To, fmt.Sprintf("$%d", i+1), g)
-					}
-				}
-			}
-		}
-
-		if found {
+		if g.Match(pattern) {
 			return redir
 		}
 	}
@@ -362,22 +295,8 @@ type Headers struct {
 }
 
 type Redirect struct {
-	// From is the Glob pattern to match.
-	// One of From or FromRe must be set.
 	From string
-
-	// FromRe is the regexp to match.
-	// This regexp can contain group matches (e.g. $1) that can be used in the To field.
-	// One of From or FromRe must be set.
-	FromRe string
-
-	// To is the target URL.
-	To string
-
-	// Headers to match for the redirect.
-	// This maps the HTTP header name to a Glob pattern with values to match.
-	// If the map is empty, the redirect will always be triggered.
-	FromHeaders map[string]string
+	To   string
 
 	// HTTP status code to use for the redirect.
 	// A status code of 200 will trigger a URL rewrite.
@@ -450,7 +369,7 @@ func (c *CacheBuster) CompileConfig(logger loggers.Logger) error {
 }
 
 func (r Redirect) IsZero() bool {
-	return r.From == "" && r.FromRe == ""
+	return r.From == ""
 }
 
 const (
@@ -464,7 +383,17 @@ func DecodeServer(cfg Provider) (Server, error) {
 	_ = mapstructure.WeakDecode(cfg.GetStringMap("server"), s)
 
 	for i, redir := range s.Redirects {
-		redir.To = strings.TrimSuffix(redir.To, "index.html")
+		// Get it in line with the Hugo server for OK responses.
+		// We currently treat the 404 as a special case, they are always "ugly", so keep them as is.
+		if redir.Status != 404 {
+			redir.To = strings.TrimSuffix(redir.To, "index.html")
+			if !strings.HasPrefix(redir.To, "https") && !strings.HasSuffix(redir.To, "/") {
+				// There are some tricky infinite loop situations when dealing
+				// when the target does not have a trailing slash.
+				// This can certainly be handled better, but not time for that now.
+				return Server{}, fmt.Errorf("unsupported redirect to value %q in server config; currently this must be either a remote destination or a local folder, e.g. \"/blog/\" or \"/blog/index.html\"", redir.To)
+			}
+		}
 		s.Redirects[i] = redir
 	}
 
@@ -472,7 +401,7 @@ func DecodeServer(cfg Provider) (Server, error) {
 		// Set up a default redirect for 404s.
 		s.Redirects = []Redirect{
 			{
-				From:   "/**",
+				From:   "**",
 				To:     "/404.html",
 				Status: 404,
 			},

config/commonConfig_test.go

@@ -71,28 +71,7 @@ X-Content-Type-Options = "nosniff"
 
 [[server.redirects]]
 from = "/foo/**"
-to = "/baz/index.html"
-status = 200
-
-[[server.redirects]]
-from = "/loop/**"
-to = "/loop/foo/"
-status = 200
-
-[[server.redirects]]
-from = "/b/**"
-fromRe = "/b/(.*)/"
-to = "/baz/$1/"
-status = 200
-
-[[server.redirects]]
-fromRe = "/c/(.*)/"
-to = "/boo/$1/"
-status = 200
-
-[[server.redirects]]
-fromRe = "/d/(.*)/"
-to = "/boo/$1/"
+to = "/foo/index.html"
 status = 200
 
 [[server.redirects]]
@@ -100,6 +79,11 @@ from = "/google/**"
 to = "https://google.com/"
 status = 301
 
+[[server.redirects]]
+from = "/**"
+to = "/default/index.html"
+status = 301
+
 
 
 `, "toml")
@@ -116,35 +100,45 @@ status = 301
 		{Key: "X-XSS-Protection", Value: "1; mode=block"},
 	})
 
-	c.Assert(s.MatchRedirect("/foo/bar/baz", nil), qt.DeepEquals, Redirect{
+	c.Assert(s.MatchRedirect("/foo/bar/baz"), qt.DeepEquals, Redirect{
 		From:   "/foo/**",
-		To:     "/baz/",
+		To:     "/foo/",
 		Status: 200,
 	})
 
-	c.Assert(s.MatchRedirect("/foo/bar/", nil), qt.DeepEquals, Redirect{
-		From:   "/foo/**",
-		To:     "/baz/",
-		Status: 200,
+	c.Assert(s.MatchRedirect("/someother"), qt.DeepEquals, Redirect{
+		From:   "/**",
+		To:     "/default/",
+		Status: 301,
 	})
 
-	c.Assert(s.MatchRedirect("/b/c/", nil), qt.DeepEquals, Redirect{
-		From:   "/b/**",
-		FromRe: "/b/(.*)/",
-		To:     "/baz/c/",
-		Status: 200,
-	})
-
-	c.Assert(s.MatchRedirect("/c/d/", nil).To, qt.Equals, "/boo/d/")
-	c.Assert(s.MatchRedirect("/c/d/e/", nil).To, qt.Equals, "/boo/d/e/")
-
-	c.Assert(s.MatchRedirect("/someother", nil), qt.DeepEquals, Redirect{})
-
-	c.Assert(s.MatchRedirect("/google/foo", nil), qt.DeepEquals, Redirect{
+	c.Assert(s.MatchRedirect("/google/foo"), qt.DeepEquals, Redirect{
 		From:   "/google/**",
 		To:     "https://google.com/",
 		Status: 301,
 	})
+
+	// No redirect loop, please.
+	c.Assert(s.MatchRedirect("/default/index.html"), qt.DeepEquals, Redirect{})
+	c.Assert(s.MatchRedirect("/default/"), qt.DeepEquals, Redirect{})
+
+	for _, errorCase := range []string{
+		`[[server.redirects]]
+from = "/**"
+to = "/file"
+status = 301`,
+		`[[server.redirects]]
+from = "/**"
+to = "/foo/file.html"
+status = 301`,
+	} {
+
+		cfg, err := FromConfigString(errorCase, "toml")
+		c.Assert(err, qt.IsNil)
+		_, err = DecodeServer(cfg)
+		c.Assert(err, qt.Not(qt.IsNil))
+
+	}
 }
 
 func TestBuildConfigCacheBusters(t *testing.T) {

config/defaultConfigProvider.go

@@ -15,6 +15,7 @@ package config
 
 import (
 	"fmt"
+	"sort"
 	"strings"
 	"sync"
 
@@ -25,6 +26,42 @@ import (
 	"github.com/gohugoio/hugo/common/maps"
 )
 
+var (
+
+	// ConfigRootKeysSet contains all of the config map root keys.
+	ConfigRootKeysSet = map[string]bool{
+		"build":         true,
+		"caches":        true,
+		"cascade":       true,
+		"frontmatter":   true,
+		"languages":     true,
+		"imaging":       true,
+		"markup":        true,
+		"mediatypes":    true,
+		"menus":         true,
+		"minify":        true,
+		"module":        true,
+		"outputformats": true,
+		"params":        true,
+		"permalinks":    true,
+		"related":       true,
+		"sitemap":       true,
+		"privacy":       true,
+		"security":      true,
+		"taxonomies":    true,
+	}
+
+	// ConfigRootKeys is a sorted version of ConfigRootKeysSet.
+	ConfigRootKeys []string
+)
+
+func init() {
+	for k := range ConfigRootKeysSet {
+		ConfigRootKeys = append(ConfigRootKeys, k)
+	}
+	sort.Strings(ConfigRootKeys)
+}
+
 // New creates a Provider backed by an empty maps.Params.
 func New() Provider {
 	return &defaultConfigProvider{

config/namespace.go

@@ -22,7 +22,7 @@ import (
 func DecodeNamespace[S, C any](configSource any, buildConfig func(any) (C, any, error)) (*ConfigNamespace[S, C], error) {
 	// Calculate the hash of the input (not including any defaults applied later).
 	// This allows us to introduce new config options without breaking the hash.
-	h := hashing.HashStringHex(configSource)
+	h := hashing.HashString(configSource)
 
 	// Build the config
 	c, ext, err := buildConfig(configSource)

config/namespace_test.go

@@ -43,7 +43,7 @@ func TestNamespace(t *testing.T) {
 	c.Assert(err, qt.IsNil)
 	c.Assert(ns, qt.Not(qt.IsNil))
 	c.Assert(ns.SourceStructure, qt.DeepEquals, map[string]interface{}{"foo": "bar"})
-	c.Assert(ns.SourceHash, qt.Equals, "1420f6c7782f7459")
+	c.Assert(ns.SourceHash, qt.Equals, "1450430416588600409")
 	c.Assert(ns.Config, qt.DeepEquals, &tstNsExt{Foo: "bar"})
 	c.Assert(ns.Signature(), qt.DeepEquals, []*tstNsExt(nil))
 }

config/privacy/privacyConfig.go

@@ -30,10 +30,9 @@ type Config struct {
 	Disqus          Disqus
 	GoogleAnalytics GoogleAnalytics
 	Instagram       Instagram
-	Twitter         Twitter // deprecated in favor of X in v0.141.0
+	Twitter         Twitter
 	Vimeo           Vimeo
 	YouTube         YouTube
-	X               X
 }
 
 // Disqus holds the privacy configuration settings related to the Disqus template.
@@ -59,8 +58,7 @@ type Instagram struct {
 	Simple bool
 }
 
-// Twitter holds the privacy configuration settings related to the Twitter shortcode.
-// Deprecated in favor of X in v0.141.0.
+// Twitter holds the privacy configuration settingsrelated to the Twitter shortcode.
 type Twitter struct {
 	Service `mapstructure:",squash"`
 
@@ -72,7 +70,7 @@ type Twitter struct {
 	Simple bool
 }
 
-// Vimeo holds the privacy configuration settings related to the Vimeo shortcode.
+// Vimeo holds the privacy configuration settingsrelated to the Vimeo shortcode.
 type Vimeo struct {
 	Service `mapstructure:",squash"`
 
@@ -86,7 +84,7 @@ type Vimeo struct {
 	Simple bool
 }
 
-// YouTube holds the privacy configuration settings related to the YouTube shortcode.
+// YouTube holds the privacy configuration settingsrelated to the YouTube shortcode.
 type YouTube struct {
 	Service `mapstructure:",squash"`
 
@@ -96,20 +94,6 @@ type YouTube struct {
 	PrivacyEnhanced bool
 }
 
-// X holds the privacy configuration settings related to the X shortcode.
-type X struct {
-	Service `mapstructure:",squash"`
-
-	// When set to true, the X post and its embedded page on your site are not
-	// used for purposes that include personalized suggestions and personalized
-	// ads.
-	EnableDNT bool
-
-	// If simple mode is enabled, a static and no-JS version of the X post will
-	// be built.
-	Simple bool
-}
-
 // DecodeConfig creates a privacy Config from a given Hugo configuration.
 func DecodeConfig(cfg config.Provider) (pc Config, err error) {
 	if !cfg.IsSet(privacyConfigKey) {

config/privacy/privacyConfig_test.go

@@ -36,7 +36,7 @@ respectDoNotTrack = true
 [privacy.instagram]
 disable = true
 simple = true
-[privacy.x]
+[privacy.twitter]
 disable = true
 enableDNT = true
 simple = true
@@ -59,10 +59,9 @@ simple = true
 	got := []bool{
 		pc.Disqus.Disable, pc.GoogleAnalytics.Disable,
 		pc.GoogleAnalytics.RespectDoNotTrack, pc.Instagram.Disable,
-		pc.Instagram.Simple,
-		pc.Vimeo.Disable, pc.Vimeo.EnableDNT, pc.Vimeo.Simple,
-		pc.YouTube.PrivacyEnhanced, pc.YouTube.Disable, pc.X.Disable, pc.X.EnableDNT,
-		pc.X.Simple,
+		pc.Instagram.Simple, pc.Twitter.Disable, pc.Twitter.EnableDNT,
+		pc.Twitter.Simple, pc.Vimeo.Disable, pc.Vimeo.EnableDNT, pc.Vimeo.Simple,
+		pc.YouTube.PrivacyEnhanced, pc.YouTube.Disable,
 	}
 
 	c.Assert(got, qt.All(qt.Equals), true)

config/services/servicesConfig.go

@@ -31,8 +31,7 @@ type Config struct {
 	Disqus          Disqus
 	GoogleAnalytics GoogleAnalytics
 	Instagram       Instagram
-	Twitter         Twitter // deprecated in favor of X in v0.141.0
-	X               X
+	Twitter         Twitter
 	RSS             RSS
 }
 
@@ -62,7 +61,6 @@ type Instagram struct {
 }
 
 // Twitter holds the functional configuration settings related to the Twitter shortcodes.
-// Deprecated in favor of X in v0.141.0.
 type Twitter struct {
 	// The Simple variant of Twitter is decorated with a basic set of inline styles.
 	// This means that if you want to provide your own CSS, you want
@@ -70,14 +68,6 @@ type Twitter struct {
 	DisableInlineCSS bool
 }
 
-// X holds the functional configuration settings related to the X shortcodes.
-type X struct {
-	// The Simple variant of X is decorated with a basic set of inline styles.
-	// This means that if you want to provide your own CSS, you want
-	// to disable the inline CSS provided by Hugo.
-	DisableInlineCSS bool
-}
-
 // RSS holds the functional configuration settings related to the RSS feeds.
 type RSS struct {
 	// Limit the number of pages.

config/services/servicesConfig_test.go

@@ -36,8 +36,6 @@ id = "ga_id"
 disableInlineCSS = true
 [services.twitter]
 disableInlineCSS = true
-[services.x]
-disableInlineCSS = true
 `
 	cfg, err := config.FromConfigString(tomlConfig, "toml")
 	c.Assert(err, qt.IsNil)

create/content.go

@@ -82,13 +82,11 @@ func NewContent(h *hugolib.HugoSites, kind, targetPath string, force bool) error
 	b.setArcheTypeFilenameToUse(ext)
 
 	withBuildLock := func() (string, error) {
-		if !h.Configs.Base.NoBuildLock {
-			unlock, err := h.BaseFs.LockBuild()
-			if err != nil {
-				return "", fmt.Errorf("failed to acquire a build lock: %s", err)
-			}
-			defer unlock()
+		unlock, err := h.BaseFs.LockBuild()
+		if err != nil {
+			return "", fmt.Errorf("failed to acquire a build lock: %s", err)
 		}
+		defer unlock()
 
 		if b.isDir {
 			return "", b.buildDir()

deploy/cloudfront.go

@@ -12,6 +12,7 @@
 // limitations under the License.
 
 //go:build withdeploy
+// +build withdeploy
 
 package deploy
 

deploy/deploy.go

@@ -12,6 +12,7 @@
 // limitations under the License.
 
 //go:build withdeploy
+// +build withdeploy
 
 package deploy
 

deploy/deploy_azure.go

@@ -12,6 +12,7 @@
 // limitations under the License.
 
 //go:build !solaris && withdeploy
+// +build !solaris,withdeploy
 
 package deploy
 

deploy/deploy_test.go

@@ -12,6 +12,7 @@
 // limitations under the License.
 
 //go:build withdeploy
+// +build withdeploy
 
 package deploy
 

deploy/deployconfig/deployConfig_test.go

@@ -12,6 +12,7 @@
 // limitations under the License.
 
 //go:build withdeploy
+// +build withdeploy
 
 package deployconfig
 

deploy/google.go

@@ -12,6 +12,7 @@
 // limitations under the License.
 
 //go:build withdeploy
+// +build withdeploy
 
 package deploy
 

deps/deps.go

@@ -188,7 +188,7 @@ func (d *Deps) Init() error {
 	}
 
 	if d.ExecHelper == nil {
-		d.ExecHelper = hexec.New(d.Conf.GetConfigSection("security").(security.Config), d.Conf.WorkingDir(), d.Log)
+		d.ExecHelper = hexec.New(d.Conf.GetConfigSection("security").(security.Config), d.Conf.WorkingDir())
 	}
 
 	if d.MemCache == nil {

docs/.codespellrc

@@ -1,13 +0,0 @@
-# Config file for codespell.
-# https://github.com/codespell-project/codespell#using-a-config-file
-
-[codespell]
-
-# Comma separated list of dirs to be skipped.
-skip = _vendor,.cspell.json,chroma.css,chroma_dark.css
-
-# Comma separated list of words to be ignored. Words must be lowercased.
-ignore-words-list = abl,edn,te,ue,trys,januar,womens,crossreferences
-
-# Check file names as well.
-check-filenames = true

docs/.cspell.json

@@ -68,7 +68,6 @@
     "# ----------------------------------------------------------------------",
     "# cspell: ignore hugo terminology",
     "# ----------------------------------------------------------------------",
-    "alignx",
     "attrlink",
     "canonify",
     "codeowners",
@@ -86,7 +85,6 @@
     "stringifier",
     "struct",
     "toclevels",
-    "unmarshal",
     "unpublishdate",
     "zgotmplz",
     "# ----------------------------------------------------------------------",
@@ -160,8 +158,6 @@
     "# cspell: ignore miscellaneous",
     "# ----------------------------------------------------------------------",
     "achristie",
-    "ccpa",
-    "crpa",
     "ddmaurier",
     "dring",
     "fleqn",
@@ -175,7 +171,6 @@
     "rsmith",
     "tdewolff",
     "tjones",
-    "vcard",
     "wcag",
     "xfeff"
   ]

docs/.github/ISSUE_TEMPLATE/config.yml

@@ -1 +0,0 @@
-blank_issues_enabled: false

docs/.github/ISSUE_TEMPLATE/default.md

@@ -1,6 +0,0 @@
----
-name: Default
-about: This is the default issue template.
-labels:
-  - NeedsTriage
----

docs/.github/workflows/spellcheck.yml

@@ -20,8 +20,3 @@ jobs:
           incremental_files_only: true
           inline: warning
           strict: false
-      - uses: codespell-project/actions-codespell@v2
-        with:
-          check_filenames: true
-          check_hidden: true
-          # by default, codespell uses configuration from the .codespellrc

docs/.gitignore

@@ -1,13 +1,10 @@
-.DS_Store
-.hugo_build.lock
 /.idea
 /.vscode
-/dist
 /public
-hugo_stats.json
-node_modules/
+/dist
+node_modules
 nohup.out
-package-lock.json
-public/
-resources/
-trace.out
+.DS_Store
+trace.out
+.hugo_build.lock
+resources/_gen/images/

docs/.markdownlint.yaml

@@ -23,4 +23,3 @@ MD046: false
 MD049: false
 MD050: false
 MD053: false
-MD055: false

docs/LICENSE.md

@@ -1,3 +1,201 @@
-See [content/LICENSE.md](content/LICENSE.md) for the license of the content of this repository.
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-The theme (layouts, CSS, JavaScript etc.) of this repository has no open source license. It is custom made for the Hugo sites and is not meant for reuse. 
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

docs/README.md

@@ -16,12 +16,3 @@ Please see the [contributing] section for guidelines, examples, and process.
 [friends]: https://github.com/gohugoio/hugo/graphs/contributors
 [go]: https://go.dev/
 [contributing]: https://gohugo.io/contribute/documentation
-
-# Install
-
-```bash
-npm i
-hugo server
-```
-
-**Note:** We're working on removing the need to run `npm i` for local development. Stay tuned.

docs/_vendor/github.com/gohugoio/gohugoioTheme/assets/css/_animation.css

@@ -0,0 +1,21 @@
+.animated {
+  animation-duration: .5s;
+  animation-fill-mode: forwards;
+  animation-timing-function: ease-in-out;
+}
+
+@keyframes fadeIn {
+  from {
+    opacity: 0;
+  }
+
+  to {
+    opacity: 1;
+  }
+}
+.fadeIn {
+  animation-name: fadeIn;
+}
+.animated-delay-1 {
+  animation-delay: 0.5s;
+}

docs/_vendor/github.com/gohugoio/gohugoioTheme/assets/css/_carousel.css

@@ -0,0 +1,25 @@
+/* These styles enhance the home page carousel, located here: themes/gohugoioTheme/layouts/partials/home-page-sections/showcase.html */
+.overflow-x-scroll{
+  -webkit-overflow-scrolling: touch;
+}
+.row {
+  transition: 450ms transform;
+  font-size: 0;
+}
+.tile {
+  transition: 450ms all;
+}
+.details {
+  background: -webkit-gradient(linear, left bottom, left top, from(rgba(0,0,0,0.9)), to(rgba(0,0,0,0)));
+  background: linear-gradient(to top, rgba(0,0,0,0.9) 0%, rgba(0,0,0,0) 100%);
+  transition: 450ms opacity;
+}
+.tile:hover .details {
+  opacity: 1;
+}
+.row:hover .tile {
+  opacity: 0.3;
+}
+.row:hover .tile:hover {
+  opacity: 1;
+}

docs/_vendor/github.com/gohugoio/gohugoioTheme/assets/css/_chroma.css

@@ -1,14 +1,10 @@
-/* Background */ .bg { background-color: var(--color-light); }
-/* PreWrapper */ .chroma { background-color: var(--color-light); }
-/* Other */ .chroma .x {  }
+/* Background */ .chroma { background-color: #ffffff }
 /* Error */ .chroma .err { color: #a61717; background-color: #e3d2d2 }
-/* CodeLine */ .chroma .cl {  }
 /* 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: #ffffcc }
-/* LineNumbersTable */ .chroma .lnt { white-space: pre; user-select: none; margin-right: 0.4em; padding: 0 0.4em 0 0.4em;color: #7f7f7f }
-/* LineNumbers */ .chroma .ln { white-space: pre; user-select: none; margin-right: 0.4em; padding: 0 0.4em 0 0.4em;color: #7f7f7f }
-/* Line */ .chroma .line { display: flex; }
+/* LineTable */ .chroma .lntable { border-spacing: 0; padding: 0; margin: 0; border: 0; width: auto; overflow: auto; display: block; }
+/* LineHighlight */ .chroma .hl { display: block; width: 100%;background-color: #ffffcc }
+/* LineNumbersTable */ .chroma .lnt { margin-right: 0.4em; padding: 0 0.4em 0 0.4em; }
+/* LineNumbers */ .chroma .ln { margin-right: 0.4em; padding: 0 0.4em 0 0.4em; }
 /* Keyword */ .chroma .k { font-weight: bold }
 /* KeywordConstant */ .chroma .kc { font-weight: bold }
 /* KeywordDeclaration */ .chroma .kd { font-weight: bold }
@@ -16,29 +12,16 @@
 /* KeywordPseudo */ .chroma .kp { font-weight: bold }
 /* KeywordReserved */ .chroma .kr { font-weight: bold }
 /* KeywordType */ .chroma .kt { color: #445588; font-weight: bold }
-/* Name */ .chroma .n {  }
 /* NameAttribute */ .chroma .na { color: #008080 }
 /* NameBuiltin */ .chroma .nb { color: #999999 }
-/* NameBuiltinPseudo */ .chroma .bp {  }
 /* NameClass */ .chroma .nc { color: #445588; font-weight: bold }
 /* NameConstant */ .chroma .no { color: #008080 }
-/* NameDecorator */ .chroma .nd {  }
 /* NameEntity */ .chroma .ni { color: #800080 }
 /* NameException */ .chroma .ne { color: #990000; font-weight: bold }
 /* NameFunction */ .chroma .nf { color: #990000; font-weight: bold }
-/* NameFunctionMagic */ .chroma .fm {  }
-/* NameLabel */ .chroma .nl {  }
 /* NameNamespace */ .chroma .nn { color: #555555 }
-/* NameOther */ .chroma .nx {  }
-/* NameProperty */ .chroma .py {  }
 /* NameTag */ .chroma .nt { color: #000080 }
 /* NameVariable */ .chroma .nv { color: #008080 }
-/* NameVariableClass */ .chroma .vc {  }
-/* NameVariableGlobal */ .chroma .vg {  }
-/* NameVariableInstance */ .chroma .vi {  }
-/* NameVariableMagic */ .chroma .vm {  }
-/* Literal */ .chroma .l {  }
-/* LiteralDate */ .chroma .ld {  }
 /* LiteralString */ .chroma .s { color: #bb8844 }
 /* LiteralStringAffix */ .chroma .sa { color: #bb8844 }
 /* LiteralStringBacktick */ .chroma .sb { color: #bb8844 }
@@ -62,7 +45,6 @@
 /* LiteralNumberOct */ .chroma .mo { color: #009999 }
 /* Operator */ .chroma .o { font-weight: bold }
 /* OperatorWord */ .chroma .ow { font-weight: bold }
-/* Punctuation */ .chroma .p {  }
 /* Comment */ .chroma .c { color: #999988; font-style: italic }
 /* CommentHashbang */ .chroma .ch { color: #999988; font-style: italic }
 /* CommentMultiline */ .chroma .cm { color: #999988; font-style: italic }
@@ -70,7 +52,6 @@
 /* CommentSpecial */ .chroma .cs { color: #999999; font-weight: bold; font-style: italic }
 /* CommentPreproc */ .chroma .cp { color: #999999; font-weight: bold }
 /* CommentPreprocFile */ .chroma .cpf { color: #999999; font-weight: bold }
-/* Generic */ .chroma .g {  }
 /* GenericDeleted */ .chroma .gd { color: #000000; background-color: #ffdddd }
 /* GenericEmph */ .chroma .ge { font-style: italic }
 /* GenericError */ .chroma .gr { color: #aa0000 }
@@ -81,5 +62,4 @@
 /* GenericStrong */ .chroma .gs { font-weight: bold }
 /* GenericSubheading */ .chroma .gu { color: #aaaaaa }
 /* GenericTraceback */ .chroma .gt { color: #aa0000 }
-/* GenericUnderline */ .chroma .gl { text-decoration: underline }
 /* TextWhitespace */ .chroma .w { color: #bbbbbb }

docs/_vendor/github.com/gohugoio/gohugoioTheme/assets/css/_code.css

@@ -0,0 +1,89 @@
+.chroma .lntable pre {
+  padding: 0;
+  margin: 0;
+  border: 0;
+}
+
+.chroma .lntable pre code  {
+  padding: 0;
+  margin: 0;
+}
+
+code {
+    padding: 0.2em;
+    margin: 0;
+    font-size: 85%;
+    background-color: rgba(27,31,35,0.05);
+    border-radius: 3px;
+}
+
+pre code {
+  display: block;
+  padding: 1.5em 1.5em;
+  font-size: .875rem;
+  line-height: 2;
+  overflow-x: auto;
+}
+
+pre {
+  background-color: #fff;
+  color: #333;
+  white-space: pre;
+  hyphens: none;
+  position: relative;
+  border-width: 1px;
+  border-color: #ccc;
+  border-style: solid;
+}
+
+/* The Pygments highlighter comes with its own styles. */
+.highlight pre {
+  background-color: inherit;
+  color: inherit;
+  padding: 0.5em;
+  font-size: .875rem;
+}
+
+
+/*We are adding the copy button content here so we can change it with javascript. See the "Clipboard scripts"*/
+.copy:after {
+  content: "Copy"
+}
+.copied:after {
+  content: "Copied"
+}
+
+@media (--breakpoint-large) {
+  .full-width
+  {
+  /*width: 100vw;
+  position: relative;
+  left: 50%;
+  right: 50%;
+  margin-left: -50vw;
+  margin-right: -50vw;*/
+  /*width: 60vw;*/
+  /*position: relative;
+  left: 50%;
+  right: 50%;*/
+  /*margin-left: -30vw;*/
+  margin-right: -30vw;
+  max-width: 100vw;
+  }
+}
+
+.code-block .line-numbers-rows {
+    background: #2f3a46;
+    border: none;
+    bottom: -50px;
+    color: #98a4b3;
+    left: -178px;
+    padding: 50px 0;
+    top: -50px;
+    width: 138px
+}
+
+.code-block .line-numbers-rows>span:before {
+    color: inherit;
+    padding-right: 30px
+}

docs/_vendor/github.com/gohugoio/gohugoioTheme/assets/css/_color-scheme.css

@@ -0,0 +1,38 @@
+.primary-color                      {color: var(--primary-color)}
+.bg-primary-color                   {background-color: var(--primary-color)}
+.hover-bg-primary-color:hover       {background-color: var(--primary-color)}
+
+.primary-color-dark                  {color: var(--primary-color-dark)}
+.bg-primary-color-dark               {background-color: var(--primary-color-dark)}
+.hover-bg-primary-color-dark:hover   {background-color: var(--primary-color-dark)}
+
+.primary-color-light                  {color: var(--primary-color-light)}
+.bg-primary-color-light               {background-color: var(--primary-color-light)}
+.hover-bg-primary-color-light:hover   {background-color: var(--primary-color-light)}
+
+.accent-color                         {color: var(--accent-color)}
+.bg-accent-color                      {background-color: var(--accent-color)}
+.hover-bg-accent-color:hover          {background-color: var(--accent-color)}
+
+.accent-color-light                   {color: var(--accent-color-light)}
+.hover-accent-color-light:hover                   {color: var(--accent-color-light)}
+.bg-accent-color-light                {background-color: var(--accent-color-light)}
+.hover-bg-accent-color-light:hover    {background-color: var(--accent-color-light)}
+
+.accent-color-dark                    {color: var(--accent-color-dark)}
+.bg-accent-color-dark                 {background-color: var(--accent-color-dark)}
+.hover-bg-accent-color-dark:hover     {background-color: var(--accent-color-dark)}
+
+.text-color-primary    {color: var(--text-color-primary)}
+.text-on-primary-color {color: var(--text-on-primary-color)}
+.text-color-secondary  {color: var(--text-color-secondary)}
+.text-color-disabled   {color: var(--text-color-disabled)}
+.divider-color         {color: var(--divider-color)}
+.warn-color            {color: var(--warn-color)}
+
+
+.nested-links a {
+  color: var(--primary-color);
+  text-decoration: none;
+
+}

docs/_vendor/github.com/gohugoio/gohugoioTheme/assets/css/_columns.css

@@ -0,0 +1,11 @@
+.column-count-2 {column-count: 1}
+.column-gap-1 {column-gap: 0}
+.break-inside-avoid {break-inside: auto}
+
+
+@media (--breakpoint-large) {
+  .column-count-3-l {column-count: 3}
+  .column-count-2-l {column-count: 2}
+  .column-gap-1-l {column-gap: 1}
+  .break-inside-avoid-l {break-inside: avoid}
+}

docs/_vendor/github.com/gohugoio/gohugoioTheme/assets/css/_content-tables.css

@@ -0,0 +1,28 @@
+.prose table {
+    width: 100%;
+    margin-bottom: 3em;
+    border-collapse: collapse;
+    border-spacing: 0;
+    font-size: 1em;
+    border: 1px solid var(--light-gray);
+     & th {
+       background-color: var(--primary-color);
+       border-bottom: 1px solid var(--primary-color);
+       color: white;
+       font-weight: 400;
+
+       text-align: left;
+       padding: .375em .5em;
+     }
+
+    & td, & tc {
+      padding: .75em .5em;
+      text-align: left;
+      border-right: 1px solid var(--light-gray);
+    }
+
+}
+
+.prose table tr:nth-child(even) {
+  background-color: var(--light-gray);
+}

docs/_vendor/github.com/gohugoio/gohugoioTheme/assets/css/_content.css

@@ -0,0 +1,53 @@
+.prose ul, .prose ol {
+  margin-bottom: 2em;
+}
+.prose ul li, .prose  ol li {
+  margin-bottom: .5em;
+}
+.prose li:hover {
+  background-color: var(--light-gray)
+}
+.prose ::selection {
+  background: var(--primary-color); /* WebKit/Blink Browsers */
+  color: white;
+}
+
+.prose-glossary h3 {
+  margin-top: 0;
+  font-size: 1.125rem;
+}
+
+.prose-glossary h3:first-of-type {
+  margin-top: 3em;
+}
+
+.prose-glossary h3 ~ p {
+  margin: 0.5em 0 2em 0;
+}
+
+body {
+
+line-height: 1.45;
+
+}
+
+p {margin-bottom: 1.3em;}
+
+h1, h2, h3, h4 {
+margin: 1.414em 0 0.5em;
+
+line-height: 1.2;
+}
+
+h1 {
+margin-top: 0;
+font-size: 2.441em;
+}
+
+h2 {font-size: 1.953em;}
+
+h3 {font-size: 1.563em;}
+
+h4 {font-size: 1.25em;}
+
+small, .font_small {font-size: 0.8em;}

docs/_vendor/github.com/gohugoio/gohugoioTheme/assets/css/_definition-lists.css

@@ -0,0 +1,9 @@
+
+dl dt {
+  font-weight: bold;
+  font-size: 1.125rem;
+}
+dd {
+  margin: .5em 0 2em 0;
+  padding: 0;
+}

docs/_vendor/github.com/gohugoio/gohugoioTheme/assets/css/_documentation-styles.css

@@ -0,0 +1,54 @@
+.note,
+.warning {
+
+  border-left-width: 4px;
+  border-left-style: solid;
+  position: relative;
+  border-color: var(--primary-color);
+
+  display: block;
+}
+.note #exclamation-icon,
+.warning #exclamation-icon {
+
+  fill: var(--primary-color);
+  position: absolute;
+  top: 35%;
+  left: -12px;
+  /*background-color: white;*/
+}
+
+  .admonition-content {
+    display: block;
+    margin: 0px;
+    padding: .125em 1em;
+    /*margin-left: 1em;*/
+    margin-top: 2em;
+    margin-bottom: 2em;
+    overflow-x: auto;
+    /*font-size: .9375em;*/
+    background-color: var(--black-05);
+  }
+
+
+  .hide-child-menu .child-menu {
+    display: none;
+  }
+  .hide-child-menu:hover  .child-menu,
+  .hide-child-menu:focus  .child-menu,
+  .hide-child-menu:active .child-menu {
+  display: block;
+  }
+
+
+/*documentation-copy headings exaggerate spacing and size to chunk content */
+  .documentation-copy h2 {
+    margin-top: 3em;
+    &.minor {
+      font-size: inherit;
+      margin-top: inherit;
+      border-bottom: none;
+    }
+  }
+
+  

docs/_vendor/github.com/gohugoio/gohugoioTheme/assets/css/_fluid-type.css

@@ -0,0 +1,10 @@
+.f2-fluid {
+  font-size: 2.25rem;
+}
+
+@media (--breakpoint-large) {
+  .f2-fluid {
+    font-size: 1.25rem;
+    font-size: calc(0.875rem + 0.5 * ((100vw - 20rem) / 60));
+  }
+}

docs/_vendor/github.com/gohugoio/gohugoioTheme/assets/css/_font-family.css

@@ -0,0 +1,74 @@
+/* From https://www.cssfontstack.com */
+code, .code, pre code, .highlight pre  {
+  font-family: 'inconsolata',Menlo,Monaco,'Courier New',monospace;
+}
+
+.sans-serif {
+  font-family: 'Muli', Avenir, 'Helvetica Neue', Helvetica, Roboto, Noto, 'Segoe UI', Arial, sans-serif;
+}
+
+
+.serif {
+  font-family: Palatino,"Palatino Linotype","Palatino LT STD","Book Antiqua",Georgia,serif;
+}
+
+/* Monospaced Typefaces (for code) */
+
+
+.courier {
+  font-family: 'Courier Next',
+               courier,
+               monospace;
+}
+
+
+/* Sans-Serif Typefaces */
+
+.helvetica {
+  font-family: 'helvetica neue', helvetica,
+               sans-serif;
+}
+
+.avenir {
+  font-family: 'avenir next', avenir,
+               sans-serif;
+}
+
+
+/* Serif Typefaces */
+
+.athelas {
+  font-family: athelas,
+               georgia,
+               serif;
+}
+
+.georgia {
+  font-family: georgia,
+               serif;
+}
+
+.times {
+  font-family: times,
+               serif;
+}
+
+.bodoni {
+  font-family: "Bodoni MT",
+                serif;
+}
+
+.calisto {
+  font-family: "Calisto MT",
+                serif;
+}
+
+.garamond {
+  font-family: garamond,
+               serif;
+}
+
+.baskerville {
+  font-family: baskerville,
+               serif;
+}

docs/_vendor/github.com/gohugoio/gohugoioTheme/assets/css/_header-link.css

@@ -0,0 +1,15 @@
+.header-link:after {
+  position: relative;
+  left: 0.5em;
+  opacity: 0;
+  font-size: 0.8em;
+  -moz-transition: opacity 0.2s ease-in-out 0.1s;
+  -ms-transition: opacity 0.2s ease-in-out 0.1s;
+}
+h2:hover .header-link,
+h3:hover .header-link,
+h4:hover .header-link,
+h5:hover .header-link,
+h6:hover .header-link {
+  opacity: 1;
+}

docs/_vendor/github.com/gohugoio/gohugoioTheme/assets/css/_hugo-internal-template-styling.css

@@ -0,0 +1,52 @@
+/* pagination.html: https://github.com/gohugoio/hugo/blob/master/tpl/tplimpl/template_embedded.go#L117 */
+.pagination {
+  margin: 3rem 0;
+}
+
+.pagination li {
+  display: inline-block;
+  margin-right: .375rem;
+  font-size: .875rem;
+  margin-bottom: 2.5em;
+}
+.pagination li a {
+  padding: .5rem .625rem;
+  background-color: white;
+  color: #333;
+  border: 1px solid #ddd;
+  border-radius: 3px;
+  text-decoration: none;
+}
+.pagination li.disabled {
+  display: none;
+}
+.pagination li.active a:link,
+.pagination li.active a:active,
+.pagination li.active a:visited {
+  background-color: #ddd;
+}
+
+/* Hides non-meaningful TOC items*/
+#TableOfContents ul li ul li ul li{
+    display: none;
+  }
+
+
+#TableOfContents ul li {
+  color: black;
+  display: block;
+  margin-bottom: .375em;
+  line-height: 1.375;
+}
+
+#TableOfContents ul li a{
+  width: 100%;
+  padding: .25em .375em;
+  margin-left: -.375em;
+
+}
+#TableOfContents ul li a:hover {
+  background-color: #999;
+  color: white;
+
+}

docs/_vendor/github.com/gohugoio/gohugoioTheme/assets/css/_no-js.css

@@ -0,0 +1,7 @@
+.no-js .needs-js {
+  opacity: 0
+}
+.js .needs-js {
+  opacity: 1;
+  transition: opacity .15s ease-in;
+}

docs/_vendor/github.com/gohugoio/gohugoioTheme/assets/css/_print.css

@@ -0,0 +1,7 @@
+@media print {
+  #page-footer,
+  body > footer,
+  body > nav {
+    display: none;
+  }
+}

docs/_vendor/github.com/gohugoio/gohugoioTheme/assets/css/_right-sidebar.css

@@ -0,0 +1,11 @@
+#right-sidebar {
+  scrollbar-width: none; /* hide scrollbar: Firefox */
+  -ms-overflow-style: none;  /* hide scrollbar: Internet Explorer 10+ */
+  height: calc(100vh - 9rem);
+  overflow-y: auto;
+}
+
+#right-sidebar::-webkit-scrollbar { /* hide scrollbar: WebKit */
+  width: 0;
+  height: 0;
+}

docs/_vendor/github.com/gohugoio/gohugoioTheme/assets/css/_shame.css

@@ -0,0 +1,20 @@
+/*
+Make h6 elements behave like dt elements. Initially implemented to support
+linkable glossary entries.
+
+Yes, it's a hack. That's why it's in the shame file.
+*/
+
+h6 {
+  margin-top: 0;
+  margin-bottom: 0;
+  font-size: 1.125rem;
+}
+
+h6:first-of-type {
+  margin-top: 3em;
+}
+
+h6 ~ p {
+  margin: 0.5em 0 2em 0;
+}

docs/_vendor/github.com/gohugoio/gohugoioTheme/assets/css/_social-icons.css

@@ -0,0 +1,52 @@
+.facebook,
+.twitter,
+.instagram,
+.youtube {
+  fill: #bababa;
+}
+.facebook:hover {
+  fill: #3b5998;
+}
+
+.twitter {
+  fill: #55acee;
+}
+
+.twitter:hover {
+  fill: #bababa;
+}
+
+.instagram:hover {
+  fill: #e95950;
+}
+
+.youtube:hover {
+  fill: #bb0000;
+}
+
+.mstdn {
+  display: inline-block;
+  background-color: #282c37;
+  color: #d9e1e8;
+  text-decoration: none;
+  padding: 4px 10px 4px 30px;
+  border-radius: 4px;
+  font-size: 16px;
+  background-image: url("data:image/svg+xml;charset=utf8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2261.076954mm%22%20height%3D%2265.47831mm%22%20viewBox%3D%220%200%20216.4144%20232.00976%22%3E%3Cpath%20d%3D%22M211.80734%20139.0875c-3.18125%2016.36625-28.4925%2034.2775-57.5625%2037.74875-15.15875%201.80875-30.08375%203.47125-45.99875%202.74125-26.0275-1.1925-46.565-6.2125-46.565-6.2125%200%202.53375.15625%204.94625.46875%207.2025%203.38375%2025.68625%2025.47%2027.225%2046.39125%2027.9425%2021.11625.7225%2039.91875-5.20625%2039.91875-5.20625l.8675%2019.09s-14.77%207.93125-41.08125%209.39c-14.50875.7975-32.52375-.365-53.50625-5.91875C9.23234%20213.82%201.40609%20165.31125.20859%20116.09125c-.365-14.61375-.14-28.39375-.14-39.91875%200-50.33%2032.97625-65.0825%2032.97625-65.0825C49.67234%203.45375%2078.20359.2425%20107.86484%200h.72875c29.66125.2425%2058.21125%203.45375%2074.8375%2011.09%200%200%2032.975%2014.7525%2032.975%2065.0825%200%200%20.41375%2037.13375-4.59875%2062.915%22%20fill%3D%22%233088d4%22%2F%3E%3Cpath%20d%3D%22M177.50984%2080.077v60.94125h-24.14375v-59.15c0-12.46875-5.24625-18.7975-15.74-18.7975-11.6025%200-17.4175%207.5075-17.4175%2022.3525v32.37625H96.20734V85.42325c0-14.845-5.81625-22.3525-17.41875-22.3525-10.49375%200-15.74%206.32875-15.74%2018.7975v59.15H38.90484V80.077c0-12.455%203.17125-22.3525%209.54125-29.675%206.56875-7.3225%2015.17125-11.07625%2025.85-11.07625%2012.355%200%2021.71125%204.74875%2027.8975%2014.2475l6.01375%2010.08125%206.015-10.08125c6.185-9.49875%2015.54125-14.2475%2027.8975-14.2475%2010.6775%200%2019.28%203.75375%2025.85%2011.07625%206.36875%207.3225%209.54%2017.22%209.54%2029.675%22%20fill%3D%22%23fff%22%2F%3E%3C%2Fsvg%3E");
+  background-size: 16px;
+  background-repeat: no-repeat;
+  background-position: top 50% left 8px;
+  transition: all 0.5s;
+}
+.mstdn:hover {
+  background-color: #484c56;
+}
+
+.mstdn > span {
+  color: #9baec8;
+  font-size: 12px;
+  padding-left: 3px;
+}
+.mstdn > span:before {
+  content: "@";
+}

docs/_vendor/github.com/gohugoio/gohugoioTheme/assets/css/_stickyheader.css

@@ -0,0 +1,15 @@
+
+@media (min-width: 75em) {
+  
+  [data-scrolldir="down"] .sticky {
+    position: fixed;
+    top:100px;
+    right:0;
+  }
+
+  [data-scrolldir="up"] .sticky {
+    position: fixed;
+    top:100px;
+    right:0;
+  }
+}

docs/_vendor/github.com/gohugoio/gohugoioTheme/assets/css/_svg.css

@@ -0,0 +1 @@
+.fill-current { fill: currentColor; }

docs/_vendor/github.com/gohugoio/gohugoioTheme/assets/css/_tabs.css

@@ -0,0 +1,34 @@
+.tab-button{
+	margin-bottom:1px;
+	position: relative;
+	z-index: 1;
+	color:#333;
+	border-color:#ccc;
+	outline: none;
+	background-color:white;
+}
+.tab-pane code{
+	background:#f1f2f2;
+	border-radius:0;
+}
+.tab-pane .chroma{
+	background:none;
+	padding:0;
+}
+.tab-button.active{
+	border-bottom-color:#f1f2f2;
+	background-color: #f1f2f2;
+}
+.tab-content .tab-pane{
+	display: none;
+}
+.tab-content .tab-pane.active{
+	display: block;
+}
+/* Treatment of copy buttons inside a tab module */ 
+.tab-content .copy, .tab-content .copied{
+	display: none;
+}
+.tab-content .tab-pane.active + .copy, .tab-content .tab-pane.active + .copied{
+	display: block;
+}

docs/_vendor/github.com/gohugoio/gohugoioTheme/assets/css/_tachyons.css

@@ -0,0 +1,94 @@
+/*! TACHYONS v4.7.0 | http://tachyons.io */
+
+/*
+ * NOTE: The Tachyons folder is for backup/reference only. This file references the module
+ *      ________            ______
+ *      ___  __/_____ _________  /______  ______________________
+ *      __  /  _  __ `/  ___/_  __ \_  / / /  __ \_  __ \_  ___/
+ *      _  /   / /_/ // /__ _  / / /  /_/ // /_/ /  / / /(__  )
+ *      /_/    \__,_/ \___/ /_/ /_/_\__, / \____//_/ /_//____/
+ *                                 /____/
+ *
+ *    TABLE OF CONTENTS
+ *
+ *    1. External Library Includes
+ *       - Normalize.css | http://normalize.css.github.io
+ *    2. Tachyons Modules
+ *    3. Variables
+ *       - Media Queries
+ *       - Colors
+ *    4. Debugging
+ *       - Debug all
+ *       - Debug children
+ *
+ */
+
+
+/* External Library Includes */
+@import 'tachyons/src/_normalize';
+
+
+/* Modules */
+@import 'tachyons/src/_box-sizing';
+/*@import 'tachyons/src/_aspect-ratios';*/
+@import 'tachyons/src/_images';
+@import 'tachyons/src/_background-size';
+@import 'tachyons/src/_background-position';
+/*@import 'tachyons/src/_outlines';*/
+@import 'tachyons/src/_borders';
+@import 'tachyons/src/_border-colors';
+@import 'tachyons/src/_border-radius';
+@import 'tachyons/src/_border-style';
+@import 'tachyons/src/_border-widths';
+@import 'tachyons/src/_box-shadow';
+/*@import 'tachyons/src/_code';*/
+@import 'tachyons/src/_coordinates';
+@import 'tachyons/src/_clears';
+@import 'tachyons/src/_display';
+@import 'tachyons/src/_flexbox';
+@import 'tachyons/src/_floats';
+/*@import 'tachyons/src/_font-family';*/
+@import 'tachyons/src/_font-style';
+@import 'tachyons/src/_font-weight';
+@import 'tachyons/src/_forms';
+@import 'tachyons/src/_heights';
+@import 'tachyons/src/_letter-spacing';
+@import 'tachyons/src/_line-height';
+@import 'tachyons/src/_links';
+@import 'tachyons/src/_lists';
+@import 'tachyons/src/_max-widths';
+@import 'tachyons/src/_widths';
+@import 'tachyons/src/_overflow';
+@import 'tachyons/src/_position';
+@import 'tachyons/src/_opacity';
+/*@import 'tachyons/src/_rotations';*/
+@import 'tachyons/src/_skins';
+@import 'tachyons/src/_skins-pseudo';
+@import 'tachyons/src/_spacing';
+@import 'tachyons/src/_negative-margins';
+@import 'tachyons/src/_tables';
+@import 'tachyons/src/_text-decoration';
+@import 'tachyons/src/_text-align';
+@import 'tachyons/src/_text-transform';
+@import 'tachyons/src/_type-scale';
+@import 'tachyons/src/_typography';
+@import 'tachyons/src/_utilities';
+@import 'tachyons/src/_visibility';
+@import 'tachyons/src/_white-space';
+@import 'tachyons/src/_vertical-align';
+@import 'tachyons/src/_hovers';
+@import 'tachyons/src/_z-index';
+@import 'tachyons/src/_nested';
+/*@import 'tachyons/src/_styles';*/
+
+/* Variables */
+/* Importing here will allow you to override any variables in the modules */
+@import 'tachyons/src/_colors';
+@import 'tachyons/src/_media-queries';
+
+/* Debugging */
+/*@import 'tachyons/src/_debug-children';
+@import 'tachyons/src/_debug-grid';*/
+
+/* Uncomment out the line below to help debug layout issues */
+/* @import 'tachyons/src/_debug'; */

docs/_vendor/github.com/gohugoio/gohugoioTheme/assets/css/_variables.css

@@ -0,0 +1,16 @@
+:root {
+  --primary-color:        #0594CB;
+  --primary-color-dark:   #0A1922;
+  --primary-color-light:  #f9f9f9;
+  --accent-color:         #EBB951;
+  --accent-color-light:   #FF4088;
+  --accent-color-dark:    #33ba91;
+  --text-color-primary:   #373737;
+  --text-on-primary-color: #fff;
+  --text-color-secondary: #ccc;
+  --text-color-disabled:  #F7f7f7;
+  --divider-color:        #f6f6f6;
+  --warn-color: red;
+
+  --blue: var(--primary-color);
+}

docs/_vendor/github.com/gohugoio/gohugoioTheme/assets/css/main.css

@@ -0,0 +1,39 @@
+/*Base Styles*/
+@import '_tachyons';
+
+/* purgecss start ignore */
+@import '_header-link';
+@import '_animation';
+@import '_documentation-styles';
+
+@import 'docsearch.js/dist/cdn/docsearch.min';
+@import '_carousel';
+@import '_code';
+@import '_tabs';
+@import '_color-scheme';
+@import '_columns';
+@import '_content';
+@import '_content-tables';
+@import '_definition-lists';
+@import '_fluid-type';
+@import '_font-family';
+@import '_hugo-internal-template-styling';
+@import '_no-js';
+@import '_social-icons';
+@import '_stickyheader';
+@import '_right-sidebar';
+@import '_svg';
+@import '_chroma';
+@import '_variables';
+@import '_print';
+@import '_shame';
+
+.nested-blockquote blockquote {
+  border-left: 4px solid var(--primary-color);
+  padding-left: 1em;
+}
+
+.mw-90 {
+  max-width:90%;
+}
+/* purgecss end ignore */