releaser: Prepare repository for 0.140.0-DEV

[ci skip]

.circleci/config.yml

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

.gitignore

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

README.md

@@ -66,6 +66,8 @@ See the [features] section of the documentation for a comprehensive summary of H
 <p float="left">
   <a href="https://www.linode.com/?utm_campaign=hugosponsor&utm_medium=banner&utm_source=hugogithub" target="_blank"><img src="https://raw.githubusercontent.com/gohugoio/gohugoioTheme/master/assets/images/sponsors/linode-logo_standard_light_medium.png" width="200" alt="Linode"></a>
 &nbsp;&nbsp;&nbsp;
+  <a href="https://route4me.com/" target="_blank"><img src="https://raw.githubusercontent.com/gohugoio/gohugoioTheme/master/assets/images/sponsors/Route4MeLogoBlueOnWhite.svg" width="200" alt="Route Planning & Route Optimization Software"></a>
+  &nbsp;&nbsp;&nbsp;
   <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>
 
@@ -101,7 +103,6 @@ Build the extended edition:
 ```text
 CGO_ENABLED=1 go install -tags extended 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)
@@ -155,7 +156,7 @@ 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.3"
@@ -190,7 +191,7 @@ github.com/gohugoio/locales="v0.14.0"
 github.com/gohugoio/localescompressed="v1.0.1"
 github.com/google/go-cmp="v0.6.0"
 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"
@@ -219,32 +220,30 @@ github.com/russross/blackfriday/v2="v2.1.0"
 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/sass/libsass="3.6.6"
 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.5"
-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/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.31.0"
+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.33.0"
-golang.org/x/sync="v0.10.0"
-golang.org/x/sys="v0.28.0"
-golang.org/x/text="v0.21.0"
-golang.org/x/tools="v0.28.0"
-google.golang.org/protobuf="v1.35.2"
+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"
-rsc.io/qr="v0.2.0"
+howett.net/plist="v1.0.0"
 software.sslmate.com/src/go-pkcs12="v0.2.0"
 ```
 </details>

bench.sh

@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+# allow user to override go executable by running as GOEXE=xxx make ...
+GOEXE="${GOEXE-go}"
+
+# Convenience script to
+# - For a given branch
+# - Run  benchmark tests for a given package
+# - Do the same for master
+# - then compare the two runs with benchcmp
+
+benchFilter=".*"
+
+if (( $# < 2 ));
+  then
+    echo "USAGE: ./bench.sh <git-branch> <package-to-bench> (and <benchmark filter> (regexp, optional))"
+    exit 1
+fi
+
+
+
+if [ $# -eq 3 ]; then
+  benchFilter=$3
+fi
+
+
+BRANCH=$1
+PACKAGE=$2
+
+git checkout $BRANCH
+"${GOEXE}" test -test.run=NONE -bench="$benchFilter" -test.benchmem=true ./$PACKAGE > /tmp/bench-$PACKAGE-$BRANCH.txt
+
+git checkout master
+"${GOEXE}" test -test.run=NONE -bench="$benchFilter" -test.benchmem=true ./$PACKAGE > /tmp/bench-$PACKAGE-master.txt
+
+
+benchcmp /tmp/bench-$PACKAGE-master.txt /tmp/bench-$PACKAGE-$BRANCH.txt

benchSite.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# allow user to override go executable by running as GOEXE=xxx make ...
+GOEXE="${GOEXE-go}"
+
+# Send in a regexp matching the benchmarks you want to run, i.e. './benchSite.sh "YAML"'.
+# Note the quotes, which will be needed for more complex expressions.
+# The above will run all variations, but only for front matter YAML.
+
+echo "Running with BenchmarkSiteBuilding/${1}"
+
+"${GOEXE}" test -run="NONE" -bench="BenchmarkSiteBuilding/${1}" -test.benchmem=true ./hugolib -memprofile mem.prof -count 3 -cpuprofile cpu.prof

benchbep.sh

@@ -0,0 +1 @@
+gobench -package=./hugolib -bench="BenchmarkSiteNew/Deep_content_tree"

bepdock.sh

@@ -0,0 +1 @@
+docker run --rm --mount type=bind,source="$(pwd)",target=/hugo -w /hugo  -i -t bepsays/ci-goreleaser:1.11-2 /bin/bash

commands/commandeer.go

@@ -103,8 +103,7 @@ type configKey struct {
 type rootCommand struct {
 	Printf  func(format string, v ...interface{})
 	Println func(a ...interface{})
-	StdOut  io.Writer
-	StdErr  io.Writer
+	Out     io.Writer
 
 	logger loggers.Logger
 
@@ -357,7 +356,7 @@ func (r *rootCommand) getOrCreateHugo(cfg config.Provider, ignoreModuleDoesNotEx
 }
 
 func (r *rootCommand) newDepsConfig(conf *commonConfig) deps.DepsCfg {
-	return deps.DepsCfg{Configs: conf.configs, Fs: conf.fs, StdOut: r.logger.StdOut(), StdErr: r.logger.StdErr(), LogLevel: r.logger.Level(), ChangesFromBuild: r.changesFromBuild}
+	return deps.DepsCfg{Configs: conf.configs, Fs: conf.fs, LogOut: r.logger.Out(), LogLevel: r.logger.Level(), ChangesFromBuild: r.changesFromBuild}
 }
 
 func (r *rootCommand) Name() string {
@@ -422,23 +421,21 @@ func (r *rootCommand) Run(ctx context.Context, cd *simplecobra.Commandeer, args
 }
 
 func (r *rootCommand) PreRun(cd, runner *simplecobra.Commandeer) error {
-	r.StdOut = os.Stdout
-	r.StdErr = os.Stderr
+	r.Out = os.Stdout
 	if r.quiet {
-		r.StdOut = io.Discard
-		r.StdErr = io.Discard
+		r.Out = io.Discard
 	}
 	// Used by mkcert (server).
-	log.SetOutput(r.StdOut)
+	log.SetOutput(r.Out)
 
 	r.Printf = func(format string, v ...interface{}) {
 		if !r.quiet {
-			fmt.Fprintf(r.StdOut, format, v...)
+			fmt.Fprintf(r.Out, format, v...)
 		}
 	}
 	r.Println = func(a ...interface{}) {
 		if !r.quiet {
-			fmt.Fprintln(r.StdOut, a...)
+			fmt.Fprintln(r.Out, a...)
 		}
 	}
 	_, running := runner.Command.(*serverCommand)
@@ -447,8 +444,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.InitGlobalLogger(r.logger.Level(), false)
 
 	r.changesFromBuild = make(chan []identity.Identity, 10)
 
@@ -490,8 +485,8 @@ func (r *rootCommand) createLogger(running bool) (loggers.Logger, error) {
 	optsLogger := loggers.Options{
 		DistinctLevel: logg.LevelWarn,
 		Level:         level,
-		StdOut:        r.StdOut,
-		StdErr:        r.StdErr,
+		Stdout:        r.Out,
+		Stderr:        r.Out,
 		StoreErrors:   running,
 	}
 
@@ -540,7 +535,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 +590,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/gen.go

@@ -75,9 +75,7 @@ See https://xyproto.github.io/splash/docs/all.html for a preview of the availabl
 					return err
 				}
 				formatter := html.New(html.WithAllClasses(true))
-				w := os.Stdout
-				fmt.Fprintf(w, "/* Generated using: hugo %s */\n\n", strings.Join(os.Args[1:], " "))
-				formatter.WriteCSS(w, style)
+				formatter.WriteCSS(os.Stdout, style)
 				return nil
 			},
 			withc: func(cmd *cobra.Command, r *rootCommand) {

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())
@@ -920,11 +920,7 @@ func (c *hugoBuilder) handleEvents(watcher *watcher.Batcher,
 
 			changed := c.changeDetector.changed()
 			if c.changeDetector != nil {
-				if len(changed) >= 10 {
-					lrl.Logf("build changed %d files", len(changed))
-				} else {
-					lrl.Logf("build changed %d files: %q", len(changed), changed)
-				}
+				lrl.Logf("build changed %d files", len(changed))
 				if len(changed) == 0 {
 					// Nothing has changed.
 					return
@@ -1103,7 +1099,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
 }
 
@@ -1119,7 +1115,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/list.go

@@ -57,7 +57,7 @@ func newListCommand() *listCommand {
 			return err
 		}
 
-		writer := csv.NewWriter(r.StdOut)
+		writer := csv.NewWriter(r.Out)
 		defer writer.Flush()
 
 		writer.Write([]string{

commands/server.go

@@ -32,7 +32,6 @@ import (
 	"path"
 	"path/filepath"
 	"regexp"
-	"sort"
 	"strconv"
 	"strings"
 	"sync"
@@ -85,9 +84,9 @@ const (
 )
 
 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,
@@ -211,17 +210,16 @@ func (f *fileChangeDetector) changed() []string {
 		}
 	}
 
-	return f.filterIrrelevantAndSort(c)
+	return f.filterIrrelevant(c)
 }
 
-func (f *fileChangeDetector) filterIrrelevantAndSort(in []string) []string {
+func (f *fileChangeDetector) filterIrrelevant(in []string) []string {
 	var filtered []string
 	for _, v := range in {
 		if !f.irrelevantRe.MatchString(v) {
 			filtered = append(filtered, v)
 		}
 	}
-	sort.Strings(filtered)
 	return filtered
 }
 
@@ -364,10 +362,7 @@ func (f *fileServer) createEndpoint(i int) (*http.ServeMux, net.Listener, string
 			}
 
 			if f.c.fastRenderMode && f.c.errState.buildErr() == nil {
-				// 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.
-				if r.Header.Get("Sec-Fetch-Mode") == "navigate" || strings.HasSuffix(requestURI, "/") || strings.HasSuffix(requestURI, "html") || strings.HasSuffix(requestURI, "htm") {
+				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 {
@@ -841,7 +836,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)
 	}
@@ -853,7 +848,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
 }

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/errors.go

@@ -133,21 +133,6 @@ func IsNotExist(err error) bool {
 	return false
 }
 
-// IsExist returns true if the error is a file exists error.
-// Unlike os.IsExist, this also considers wrapped errors.
-func IsExist(err error) bool {
-	if os.IsExist(err) {
-		return true
-	}
-
-	// os.IsExist does not consider wrapped errors.
-	if os.IsExist(errors.Unwrap(err)) {
-		return true
-	}
-
-	return false
-}
-
 var nilPointerErrRe = regexp.MustCompile(`at <(.*)>: error calling (.*?): runtime error: invalid memory address or nil pointer dereference`)
 
 const deferredPrefix = "__hdeferred/"

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
 
@@ -403,7 +384,7 @@ func extractPosition(e error) (pos text.Position) {
 	case godartsass.SassError:
 		span := v.Span
 		start := span.Start
-		filename, _ := paths.UrlStringToFilename(span.Url)
+		filename, _ := paths.UrlToFilename(span.Url)
 		pos.Filename = filename
 		pos.Offset = start.Offset
 		pos.ColumnNumber = start.Column

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

@@ -223,27 +223,6 @@ func AsTime(v reflect.Value, loc *time.Location) (time.Time, bool) {
 	return time.Time{}, false
 }
 
-// ToSliceAny converts the given value to a slice of any if possible.
-func ToSliceAny(v any) ([]any, bool) {
-	if v == nil {
-		return nil, false
-	}
-	switch vv := v.(type) {
-	case []any:
-		return vv, true
-	default:
-		vvv := reflect.ValueOf(v)
-		if vvv.Kind() == reflect.Slice {
-			out := make([]any, vvv.Len())
-			for i := 0; i < vvv.Len(); i++ {
-				out[i] = vvv.Index(i).Interface()
-			}
-			return out, true
-		}
-	}
-	return nil, false
-}
-
 func CallMethodByName(cxt context.Context, name string, v reflect.Value) []reflect.Value {
 	fn := v.MethodByName(name)
 	var args []reflect.Value

common/hreflect/helpers_test.go

@@ -50,19 +50,6 @@ func TestIsContextType(t *testing.T) {
 	c.Assert(IsContextType(reflect.TypeOf(valueCtx)), qt.IsTrue)
 }
 
-func TestToSliceAny(t *testing.T) {
-	c := qt.New(t)
-
-	checkOK := func(in any, expected []any) {
-		out, ok := ToSliceAny(in)
-		c.Assert(ok, qt.Equals, true)
-		c.Assert(out, qt.DeepEquals, expected)
-	}
-
-	checkOK([]any{1, 2, 3}, []any{1, 2, 3})
-	checkOK([]int{1, 2, 3}, []any{1, 2, 3})
-}
-
 func BenchmarkIsContextType(b *testing.B) {
 	type k string
 	b.Run("value", func(b *testing.B) {

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

@@ -423,7 +423,7 @@ func DeprecateLevel(item, alternative, version string, level logg.Level) {
 		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.

common/hugo/version_current.go

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

common/loggers/handlerterminal.go

@@ -40,8 +40,8 @@ func newNoAnsiEscapeHandler(outWriter, errWriter io.Writer, noLevelPrefix bool,
 
 type noAnsiEscapeHandler struct {
 	mu            sync.Mutex
-	outWriter     io.Writer
-	errWriter     io.Writer
+	outWriter     io.Writer // Defaults to os.Stdout.
+	errWriter     io.Writer // Defaults to os.Stderr.
 	predicate     func(*logg.Entry) bool
 	noLevelPrefix bool
 }

common/loggers/logger.go

@@ -38,8 +38,8 @@ var (
 // Options defines options for the logger.
 type Options struct {
 	Level              logg.Level
-	StdOut             io.Writer
-	StdErr             io.Writer
+	Stdout             io.Writer
+	Stderr             io.Writer
 	DistinctLevel      logg.Level
 	StoreErrors        bool
 	HandlerPost        func(e *logg.Entry) error
@@ -48,22 +48,21 @@ type Options struct {
 
 // New creates a new logger with the given options.
 func New(opts Options) Logger {
-	if opts.StdOut == nil {
-		opts.StdOut = os.Stdout
+	if opts.Stdout == nil {
+		opts.Stdout = os.Stdout
 	}
-	if opts.StdErr == nil {
-		opts.StdErr = os.Stderr
+	if opts.Stderr == nil {
+		opts.Stderr = os.Stdout
 	}
-
 	if opts.Level == 0 {
 		opts.Level = logg.LevelWarn
 	}
 
 	var logHandler logg.Handler
-	if terminal.PrintANSIColors(os.Stderr) {
-		logHandler = newDefaultHandler(opts.StdErr, opts.StdErr)
+	if terminal.PrintANSIColors(os.Stdout) {
+		logHandler = newDefaultHandler(opts.Stdout, opts.Stderr)
 	} else {
-		logHandler = newNoAnsiEscapeHandler(opts.StdErr, opts.StdErr, false, nil)
+		logHandler = newNoAnsiEscapeHandler(opts.Stdout, opts.Stderr, false, nil)
 	}
 
 	errorsw := &strings.Builder{}
@@ -138,8 +137,7 @@ func New(opts Options) Logger {
 		logCounters: logCounters,
 		errors:      errorsw,
 		reset:       reset,
-		stdOut:      opts.StdOut,
-		stdErr:      opts.StdErr,
+		out:         opts.Stdout,
 		level:       opts.Level,
 		logger:      logger,
 		tracel:      l.WithLevel(logg.LevelTrace),
@@ -155,6 +153,8 @@ func NewDefault() Logger {
 	opts := Options{
 		DistinctLevel: logg.LevelWarn,
 		Level:         logg.LevelWarn,
+		Stdout:        os.Stdout,
+		Stderr:        os.Stdout,
 	}
 	return New(opts)
 }
@@ -163,6 +163,8 @@ func NewTrace() Logger {
 	opts := Options{
 		DistinctLevel: logg.LevelWarn,
 		Level:         logg.LevelTrace,
+		Stdout:        os.Stdout,
+		Stderr:        os.Stdout,
 	}
 	return New(opts)
 }
@@ -187,8 +189,7 @@ type Logger interface {
 	Level() logg.Level
 	LoggCount(logg.Level) int
 	Logger() logg.Logger
-	StdOut() io.Writer
-	StdErr() io.Writer
+	Out() io.Writer
 	Printf(format string, v ...any)
 	Println(v ...any)
 	PrintTimerIfDelayed(start time.Time, name string)
@@ -206,8 +207,7 @@ type logAdapter struct {
 	logCounters *logLevelCounter
 	errors      *strings.Builder
 	reset       func()
-	stdOut      io.Writer
-	stdErr      io.Writer
+	out         io.Writer
 	level       logg.Level
 	logger      logg.Logger
 	tracel      logg.LevelLogger
@@ -259,12 +259,8 @@ func (l *logAdapter) Logger() logg.Logger {
 	return l.logger
 }
 
-func (l *logAdapter) StdOut() io.Writer {
-	return l.stdOut
-}
-
-func (l *logAdapter) StdErr() io.Writer {
-	return l.stdErr
+func (l *logAdapter) Out() io.Writer {
+	return l.out
 }
 
 // PrintTimerIfDelayed prints a time statement to the FEEDBACK logger
@@ -275,7 +271,7 @@ func (l *logAdapter) PrintTimerIfDelayed(start time.Time, name string) {
 	if milli < 500 {
 		return
 	}
-	fmt.Fprintf(l.stdErr, "%s in %v ms", name, milli)
+	l.Printf("%s in %v ms", name, milli)
 }
 
 func (l *logAdapter) Printf(format string, v ...any) {
@@ -283,11 +279,11 @@ func (l *logAdapter) Printf(format string, v ...any) {
 	if !strings.HasSuffix(format, "\n") {
 		format += "\n"
 	}
-	fmt.Fprintf(l.stdOut, format, v...)
+	fmt.Fprintf(l.out, format, v...)
 }
 
 func (l *logAdapter) Println(v ...any) {
-	fmt.Fprintln(l.stdOut, v...)
+	fmt.Fprintln(l.out, v...)
 }
 
 func (l *logAdapter) Reset() {

common/loggers/logger_test.go

@@ -31,8 +31,8 @@ func TestLogDistinct(t *testing.T) {
 	opts := loggers.Options{
 		DistinctLevel: logg.LevelWarn,
 		StoreErrors:   true,
-		StdOut:        io.Discard,
-		StdErr:        io.Discard,
+		Stdout:        io.Discard,
+		Stderr:        io.Discard,
 	}
 
 	l := loggers.New(opts)
@@ -54,8 +54,8 @@ func TestHookLast(t *testing.T) {
 		HandlerPost: func(e *logg.Entry) error {
 			panic(e.Message)
 		},
-		StdOut: io.Discard,
-		StdErr: io.Discard,
+		Stdout: io.Discard,
+		Stderr: io.Discard,
 	}
 
 	l := loggers.New(opts)
@@ -70,8 +70,8 @@ func TestOptionStoreErrors(t *testing.T) {
 
 	opts := loggers.Options{
 		StoreErrors: true,
-		StdErr:      &sb,
-		StdOut:      &sb,
+		Stderr:      &sb,
+		Stdout:      &sb,
 	}
 
 	l := loggers.New(opts)
@@ -131,8 +131,8 @@ func TestReset(t *testing.T) {
 	opts := loggers.Options{
 		StoreErrors:   true,
 		DistinctLevel: logg.LevelWarn,
-		StdOut:        io.Discard,
-		StdErr:        io.Discard,
+		Stdout:        io.Discard,
+		Stderr:        io.Discard,
 	}
 
 	l := loggers.New(opts)

common/maps/cache.go

@@ -113,14 +113,11 @@ func (c *Cache[K, T]) set(key K, value T) {
 }
 
 // ForEeach calls the given function for each key/value pair in the cache.
-// If the function returns false, the iteration stops.
-func (c *Cache[K, T]) ForEeach(f func(K, T) bool) {
+func (c *Cache[K, T]) ForEeach(f func(K, T)) {
 	c.RLock()
 	defer c.RUnlock()
 	for k, v := range c.m {
-		if !f(k, v) {
-			return
-		}
+		f(k, v)
 	}
 }
 

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/paths/url.go

@@ -1,4 +1,4 @@
-// Copyright 2024 The Hugo Authors. All rights reserved.
+// Copyright 2021 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.
@@ -18,7 +18,6 @@ import (
 	"net/url"
 	"path"
 	"path/filepath"
-	"runtime"
 	"strings"
 )
 
@@ -160,77 +159,9 @@ func Uglify(in string) string {
 	return path.Clean(in)
 }
 
-// URLEscape escapes unicode letters.
-func URLEscape(uri string) string {
-	// escape unicode letters
-	u, err := url.Parse(uri)
-	if err != nil {
-		panic(err)
-	}
-	return u.String()
-}
-
-// TrimExt trims the extension from a path..
-func TrimExt(in string) string {
-	return strings.TrimSuffix(in, path.Ext(in))
-}
-
-// From https://github.com/golang/go/blob/e0c76d95abfc1621259864adb3d101cf6f1f90fc/src/cmd/go/internal/web/url.go#L45
-func UrlFromFilename(filename string) (*url.URL, error) {
-	if !filepath.IsAbs(filename) {
-		return nil, fmt.Errorf("filepath must be absolute")
-	}
-
-	// If filename has a Windows volume name, convert the volume to a host and prefix
-	// per https://blogs.msdn.microsoft.com/ie/2006/12/06/file-uris-in-windows/.
-	if vol := filepath.VolumeName(filename); vol != "" {
-		if strings.HasPrefix(vol, `\\`) {
-			filename = filepath.ToSlash(filename[2:])
-			i := strings.IndexByte(filename, '/')
-
-			if i < 0 {
-				// A degenerate case.
-				// \\host.example.com (without a share name)
-				// becomes
-				// file://host.example.com/
-				return &url.URL{
-					Scheme: "file",
-					Host:   filename,
-					Path:   "/",
-				}, nil
-			}
-
-			// \\host.example.com\Share\path\to\file
-			// becomes
-			// file://host.example.com/Share/path/to/file
-			return &url.URL{
-				Scheme: "file",
-				Host:   filename[:i],
-				Path:   filepath.ToSlash(filename[i:]),
-			}, nil
-		}
-
-		// C:\path\to\file
-		// becomes
-		// file:///C:/path/to/file
-		return &url.URL{
-			Scheme: "file",
-			Path:   "/" + filepath.ToSlash(filename),
-		}, nil
-	}
-
-	// /path/to/file
-	// becomes
-	// file:///path/to/file
-	return &url.URL{
-		Scheme: "file",
-		Path:   filepath.ToSlash(filename),
-	}, 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) {
+func UrlToFilename(s string) (string, bool) {
 	u, err := url.ParseRequestURI(s)
 	if err != nil {
 		return filepath.FromSlash(s), false
@@ -240,34 +171,25 @@ func UrlStringToFilename(s string) (string, bool) {
 
 	if p == "" {
 		p, _ = url.QueryUnescape(u.Opaque)
-		return filepath.FromSlash(p), false
-	}
-
-	if runtime.GOOS != "windows" {
-		return p, true
-	}
-
-	if len(p) == 0 || p[0] != '/' {
-		return filepath.FromSlash(p), false
+		return filepath.FromSlash(p), true
 	}
 
 	p = filepath.FromSlash(p)
 
-	if len(u.Host) == 1 {
-		// file://c/Users/...
-		return strings.ToUpper(u.Host) + ":" + p, true
+	if u.Host != "" {
+		// C:\data\file.txt
+		p = strings.ToUpper(u.Host) + ":" + p
 	}
 
-	if u.Host != "" && u.Host != "localhost" {
-		if filepath.VolumeName(u.Host) != "" {
-			return "", false
-		}
-		return `\\` + u.Host + p, true
-	}
-
-	if vol := filepath.VolumeName(p[1:]); vol == "" || strings.HasPrefix(vol, `\\`) {
-		return "", false
-	}
-
-	return p[1:], true
+	return p, true
+}
+
+// URLEscape escapes unicode letters.
+func URLEscape(uri string) string {
+	// escape unicode letters
+	u, err := url.Parse(uri)
+	if err != nil {
+		panic(err)
+	}
+	return u.String()
 }

common/types/closer.go

@@ -19,13 +19,6 @@ type Closer interface {
 	Close() error
 }
 
-// CloserFunc is a convenience type to create a Closer from a function.
-type CloserFunc func() error
-
-func (f CloserFunc) Close() error {
-	return f()
-}
-
 type CloseAdder interface {
 	Add(Closer)
 }

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,22 +64,19 @@ func (q *EvictingQueue[T]) Len() int {
 }
 
 // Contains returns whether the queue contains v.
-func (q *EvictingQueue[T]) Contains(v T) bool {
-	if q == nil {
-		return false
-	}
+func (q *EvictingStringQueue) Contains(v string) bool {
 	q.mu.Lock()
 	defer q.mu.Unlock()
 	return q.set[v]
 }
 
 // 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 +84,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 +96,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

@@ -143,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:"-"`
@@ -301,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
@@ -402,46 +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
-	}
-
 	c.C = &ConfigCompiled{
-		Timeout:             timeout,
-		BaseURL:             baseURL,
-		BaseURLLiveReload:   baseURL,
-		DisabledKinds:       disabledKinds,
-		DisabledLanguages:   disabledLangs,
-		IgnoredLogs:         ignoredLogIDs,
-		KindOutputFormats:   kindOutputFormats,
-		DefaultOutputFormat: defaultOutputFormat,
-		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,
+		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 {
@@ -465,23 +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
-	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
+	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
@@ -541,13 +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
-
 	// Disable creation of alias redirect pages.
 	DisableAliases bool
 
@@ -766,16 +723,15 @@ 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
 }
 
 // transientErr returns the last transient error found during config compilation.
 func (c *Configs) transientErr() error {
-	for _, l := range c.LanguageConfigMap {
+	for _, l := range c.LanguageConfigSlice {
 		if l.C.transientErr != nil {
 			return l.C.transientErr
 		}
@@ -792,6 +748,7 @@ func (c *Configs) Init() error {
 	var languages langs.Languages
 	defaultContentLanguage := c.Base.DefaultContentLanguage
 	for k, v := range c.LanguageConfigMap {
+		c.LanguageConfigSlice = append(c.LanguageConfigSlice, v)
 		languageConf := v.Languages[k]
 		language, err := langs.NewLanguage(k, defaultContentLanguage, v.TimeZone, languageConf)
 		if err != nil {

config/allconfig/allconfig_integration_test.go

@@ -175,43 +175,3 @@ func TestMapUglyURLs(t *testing.T) {
 	b.Assert(c.C.IsUglyURLSection("posts"), qt.IsTrue)
 	b.Assert(c.C.IsUglyURLSection("blog"), qt.IsFalse)
 }
-
-// Issue 13199
-func TestInvalidOutputFormat(t *testing.T) {
-	t.Parallel()
-
-	files := `
--- hugo.toml --
-disableKinds = ['page','rss','section','sitemap','taxonomy','term']
-[outputs]
-home = ['html','foo']
--- layouts/index.html --
-x
-`
-
-	b, err := hugolib.TestE(t, files)
-	b.Assert(err, qt.IsNotNil)
-	b.Assert(err.Error(), qt.Contains, `failed to create config: unknown output format "foo" for kind "home"`)
-}
-
-// Issue 13201
-func TestLanguageConfigSlice(t *testing.T) {
-	t.Parallel()
-
-	files := `
--- hugo.toml --
-disableKinds = ['page','rss','section','sitemap','taxonomy','term']
-[languages.en]
-title = 'TITLE_EN'
-weight = 2
-[languages.de]
-title = 'TITLE_DE'
-weight = 1
-[languages.fr]
-title = 'TITLE_FR'
-weight = 3
-`
-
-	b := hugolib.Test(t, files)
-	b.Assert(b.H.Configs.LanguageConfigSlice[0].Title, qt.Equals, `TITLE_DE`)
-}

config/allconfig/configlanguage.go

@@ -137,11 +137,11 @@ func (c ConfigLanguage) Watching() bool {
 	return c.m.Base.Internal.Watch
 }
 
-func (c ConfigLanguage) NewIdentityManager(name string, opts ...identity.ManagerOption) identity.Manager {
+func (c ConfigLanguage) NewIdentityManager(name string) identity.Manager {
 	if !c.Watching() {
 		return identity.NopManager
 	}
-	return identity.NewManager(name, opts...)
+	return identity.NewManager(name)
 }
 
 func (c ConfigLanguage) ContentTypes() config.ContentTypesProvider {

config/allconfig/load.go

@@ -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/configProvider.go

@@ -58,7 +58,7 @@ type AllProvider interface {
 	BuildDrafts() bool
 	Running() bool
 	Watching() bool
-	NewIdentityManager(name string, opts ...identity.ManagerOption) identity.Manager
+	NewIdentityManager(name string) identity.Manager
 	FastRenderMode() bool
 	PrintUnusedTemplates() bool
 	EnableMissingTranslationPlaceholders() bool

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

@@ -40,10 +40,6 @@ simple = true
 disable = true
 enableDNT = true
 simple = true
-[privacy.x]
-disable = true
-enableDNT = true
-simple = true
 [privacy.vimeo]
 disable = true
 enableDNT = true
@@ -65,8 +61,7 @@ simple = true
 		pc.GoogleAnalytics.RespectDoNotTrack, pc.Instagram.Disable,
 		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, pc.X.Disable, pc.X.EnableDNT,
-		pc.X.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()

deps/deps.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"os"
 	"path/filepath"
 	"sort"
 	"strings"
@@ -24,7 +23,6 @@ import (
 	"github.com/gohugoio/hugo/helpers"
 	"github.com/gohugoio/hugo/hugofs"
 	"github.com/gohugoio/hugo/identity"
-	"github.com/gohugoio/hugo/internal/js"
 	"github.com/gohugoio/hugo/internal/warpc"
 	"github.com/gohugoio/hugo/media"
 	"github.com/gohugoio/hugo/resources/page"
@@ -49,9 +47,6 @@ type Deps struct {
 	// The templates to use. This will usually implement the full tpl.TemplateManager.
 	tmplHandlers *tpl.TemplateHandlers
 
-	// The template funcs.
-	TmplFuncMap map[string]any
-
 	// The file systems to use.
 	Fs *hugofs.Fs `json:"-"`
 
@@ -88,13 +83,10 @@ type Deps struct {
 	Metrics metrics.Provider
 
 	// BuildStartListeners will be notified before a build starts.
-	BuildStartListeners *Listeners[any]
+	BuildStartListeners *Listeners
 
 	// BuildEndListeners will be notified after a build finishes.
-	BuildEndListeners *Listeners[any]
-
-	// OnChangeListeners will be notified when something changes.
-	OnChangeListeners *Listeners[identity.Identity]
+	BuildEndListeners *Listeners
 
 	// Resources that gets closed when the build is done or the server shuts down.
 	BuildClosers *types.Closers
@@ -106,12 +98,6 @@ type Deps struct {
 	// TODO(bep) rethink this re. a plugin setup, but this will have to do for now.
 	WasmDispatchers *warpc.Dispatchers
 
-	// The JS batcher client.
-	JSBatcherClient js.BatcherClient
-
-	// The JS batcher client.
-	// JSBatcherClient *esbuild.BatcherClient
-
 	isClosed bool
 
 	*globalErrHandler
@@ -168,27 +154,23 @@ func (d *Deps) Init() error {
 	}
 
 	if d.BuildStartListeners == nil {
-		d.BuildStartListeners = &Listeners[any]{}
+		d.BuildStartListeners = &Listeners{}
 	}
 
 	if d.BuildEndListeners == nil {
-		d.BuildEndListeners = &Listeners[any]{}
+		d.BuildEndListeners = &Listeners{}
 	}
 
 	if d.BuildClosers == nil {
 		d.BuildClosers = &types.Closers{}
 	}
 
-	if d.OnChangeListeners == nil {
-		d.OnChangeListeners = &Listeners[identity.Identity]{}
-	}
-
 	if d.Metrics == nil && d.Conf.TemplateMetrics() {
 		d.Metrics = metrics.NewProvider(d.Conf.TemplateMetricsHints())
 	}
 
 	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 {
@@ -286,23 +268,6 @@ func (d *Deps) Compile(prototype *Deps) error {
 	return nil
 }
 
-// MkdirTemp returns a temporary directory path that will be cleaned up on exit.
-func (d Deps) MkdirTemp(pattern string) (string, error) {
-	filename, err := os.MkdirTemp("", pattern)
-	if err != nil {
-		return "", err
-	}
-	d.BuildClosers.Add(
-		types.CloserFunc(
-			func() error {
-				return os.RemoveAll(filename)
-			},
-		),
-	)
-
-	return filename, nil
-}
-
 type globalErrHandler struct {
 	logger loggers.Logger
 
@@ -341,16 +306,15 @@ func (e *globalErrHandler) StopErrorCollector() {
 }
 
 // Listeners represents an event listener.
-type Listeners[T any] struct {
+type Listeners struct {
 	sync.Mutex
 
 	// A list of funcs to be notified about an event.
-	// If the return value is true, the listener will be removed.
-	listeners []func(...T) bool
+	listeners []func()
 }
 
 // Add adds a function to a Listeners instance.
-func (b *Listeners[T]) Add(f func(...T) bool) {
+func (b *Listeners) Add(f func()) {
 	if b == nil {
 		return
 	}
@@ -360,16 +324,12 @@ func (b *Listeners[T]) Add(f func(...T) bool) {
 }
 
 // Notify executes all listener functions.
-func (b *Listeners[T]) Notify(vs ...T) {
+func (b *Listeners) Notify() {
 	b.Lock()
 	defer b.Unlock()
-	temp := b.listeners[:0]
 	for _, notify := range b.listeners {
-		if !notify(vs...) {
-			temp = append(temp, notify)
-		}
+		notify()
 	}
-	b.listeners = temp
 }
 
 // ResourceProvider is used to create and refresh, and clone resources needed.
@@ -412,11 +372,9 @@ type DepsCfg struct {
 	// The logging level to use.
 	LogLevel logg.Level
 
-	// Logging output.
-	StdErr io.Writer
-
-	// The console output.
-	StdOut io.Writer
+	// Where to write the logs.
+	// Currently we typically write everything to stdout.
+	LogOut io.Writer
 
 	// The file systems to use
 	Fs *hugofs.Fs

docs/.markdownlint.yaml

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

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

@@ -10,9 +10,9 @@
 }
 
 code {
-    padding: 2px 3px;
+    padding: 0.2em;
     margin: 0;
-    font-size: 93.75%;
+    font-size: 85%;
     background-color: rgba(27,31,35,0.05);
     border-radius: 3px;
 }

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

@@ -18,8 +18,3 @@ h6:first-of-type {
 h6 ~ p {
   margin: 0.5em 0 2em 0;
 }
-
-/* QR codes */
-img.qrcode {
-  width: initial;
-}

docs/_vendor/github.com/gohugoio/gohugoioTheme/assets/output/css/app.css

@@ -4769,9 +4769,9 @@ h6:hover .header-link {
   margin: 0;
 }
 code {
-    padding: 2px 3px;
+    padding: 0.2em;
     margin: 0;
-    font-size: 93.75%;
+    font-size: 85%;
     background-color: rgba(27, 31, 35, .05);
     border-radius: 3px;
 }
@@ -5333,11 +5333,6 @@ h6:first-of-type {
 h6 ~ p {
   margin: 0.5em 0 2em 0;
 }
-/* QR codes */
-img.qrcode {
-  width: auto;
-  width: initial;
-}
 .nested-blockquote blockquote {
   border-left: 4px solid #0594CB;
   padding-left: 1em;

docs/_vendor/github.com/gohugoio/gohugoioTheme/data/sponsors.toml

@@ -5,6 +5,15 @@
     utm_campaign = "hugosponsor"
     bgcolor      = "#ffffff"
 
+[[banners]]
+    name            = "Route4Me"
+    link            = "https://route4me.com/"
+    title           = "Route Planning & Route Optimization Software"
+    no_query_params = true
+    utm_campaign    = "hugosponsor"
+    bgcolor         = "#334799"
+    link_attr       = "style='color: #ffffff; font-weight: bold; text-decoration: none; text-align: center'"
+
 [[banners]]
     name            = "GoLand"
     title           = "The complete IDE crafted for professional Go developers."
@@ -12,11 +21,3 @@
     link            = "https://www.jetbrains.com/go/?utm_source=OSS&utm_medium=referral&utm_campaign=hugo"
     logo            = "images/sponsors/goland.svg"
     bgcolor         = "#f4f4f4"
-
-[[banners]]
-    name          = "Your Company?"
-    link          = "https://bep.is/en/hugo-sponsor-2023-01/"
-    utm_campaign  = "hugosponsor"
-    show_on_hover = true
-    bgcolor       = "#4e4f4f"
-    link_attr     = "style='color: #ffffff; font-weight: bold; text-decoration: none; text-align: center'"

docs/_vendor/github.com/gohugoio/gohugoioTheme/layouts/_default/_markup/render-link.html

@@ -98,7 +98,12 @@ either of these shortcodes in conjunction with this render hook.
 {{- end }}
 
 {{- /* Determine content path for warning and error messages. */}}
-{{- $contentPath := .Page.String }}
+{{- $contentPath := "" }}
+{{- with .Page.File }}
+  {{- $contentPath = .Path }}
+{{- else }}
+  {{- $contentPath = .Path }}
+{{- end }}
 
 {{- /* Parse destination. */}}
 {{- $u := urls.Parse .Destination }}

docs/_vendor/github.com/gohugoio/gohugoioTheme/layouts/news/list.html

@@ -22,15 +22,8 @@
       {{ $releases = where $releases "draft" false }}
       {{ $releases = where $releases "prerelease" false }}
       {{ range $releases | first 20 }}
-        {{ $publishDate := .published_at | time.AsTime }}
-
-        {{/* Correct the v0.138.0 release date. See https://github.com/gohugoio/hugo/issues/13066. */}}
-        {{ if eq .name "v0.138.0" }}
-          {{ $publishDate = "2024-11-06T11:22:34Z" | time.AsTime }}
-        {{ end }}
-
         {{ $ctx := dict
-          "Date" $publishDate
+          "Date" (.published_at | time.AsTime)
           "Title" (printf "Release %s" .name)
           "Permalink" .html_url
           "Section" "news"

docs/_vendor/github.com/gohugoio/gohugoioTheme/layouts/news/list.xml

@@ -21,21 +21,14 @@
     {{- $releases = where $releases "draft" false }}
     {{- $releases = where $releases "prerelease" false }}
     {{- range $releases | first 20 }}
-      {{- $publishDate := .published_at | time.AsTime }}
-
-      {{- /* Correct the v0.138.0 release date. See https://github.com/gohugoio/hugo/issues/13066. */}}
-      {{- if eq .name "v0.138.0" }}
-        {{- $publishDate = "2024-11-06T11:22:34Z" | time.AsTime }}
-      {{- end }}
-
       {{- $summary := printf
         "Hugo %s was released on %s. See [release notes](%s) for details."
         .tag_name
-        ($publishDate | time.AsTime | time.Format "2 Jan 2006")
+        (.published_at | time.AsTime | time.Format "2 Jan 2006")
         .html_url
       }}
       {{- $ctx := dict
-        "PublishDate" $publishDate
+        "PublishDate" (.published_at | time.AsTime)
         "Title" (printf "Release %s" .name)
         "Permalink" .html_url
         "Section" "news"

docs/_vendor/github.com/gohugoio/gohugoioTheme/layouts/partials/components/author-github-data-card.html

@@ -4,14 +4,14 @@
 
     {{ $data := "" }}
     {{ $url := urls.JoinPath "https://api.github.com/users" $author }}
-    {{ with try (resources.GetRemote $url) }}
+    {{ with resources.GetRemote $url }}
       {{ with .Err }}
         {{ errorf "%s" . }}
-      {{ else with .Value }}
-        {{ $data = . | transform.Unmarshal }}
       {{ else }}
-        {{ errorf "Unable to get remote resource %q" $url }}
+        {{ $data = . | transform.Unmarshal }}
       {{ end }}
+    {{ else }}
+      {{ errorf "Unable to get remote resource %q" $url }}
     {{ end }}
 
     <div class="tc">

docs/_vendor/github.com/gohugoio/gohugoioTheme/layouts/partials/components/author-github-data.html

@@ -4,14 +4,14 @@
 
     {{ $data := "" }}
     {{ $url := urls.JoinPath "https://api.github.com/users" $author }}
-    {{ with try (resources.GetRemote $url) }}
+    {{ with resources.GetRemote $url }}
       {{ with .Err }}
         {{ errorf "%s" . }}
-      {{ else with .Value }}
-        {{ $data = . | transform.Unmarshal }}
       {{ else }}
-        {{ errorf "Unable to get remote resource %q" $url }}
+        {{ $data = . | transform.Unmarshal }}
       {{ end }}
+    {{ else }}
+      {{ errorf "Unable to get remote resource %q" $url }}
     {{ end }}
 
     {{ with $data }}

docs/_vendor/github.com/gohugoio/gohugoioTheme/layouts/partials/related.html

@@ -16,7 +16,7 @@
   <h2>{{ $heading }}</h2>
   <ul>
     {{- range . }}
-      <li><a href="{{ .RelPermalink }}">{{ .LinkTitle }}</a></li>
+      <li><a href="{{ .RelPermalink }}">{{ .Title }}</a></li>
     {{- end }}
   </ul>
 {{- end }}

docs/_vendor/github.com/gohugoio/gohugoioTheme/layouts/partials/utilities/get-remote-data.html

@@ -11,13 +11,13 @@ Supports CSV, JSON, TOML, YAML, and XML.
 
 {{ $url := . }}
 {{ $data := dict }}
-{{ with try (resources.GetRemote $url) }}
+{{ with resources.GetRemote $url }}
   {{ with .Err }}
     {{ errorf "%s" . }}
-  {{ else with .Value }}
-    {{ $data = .Content | transform.Unmarshal }}
   {{ else }}
-    {{ errorf "Unable to get remote resource %q" $url }}
+    {{ $data = .Content | transform.Unmarshal }}
   {{ end }}
+{{ else }}
+  {{ errorf "Unable to get remote resource %q" $url }}
 {{ end }}
 {{ return $data }}

docs/_vendor/github.com/gohugoio/gohugoioTheme/layouts/shortcodes/hl.html

@@ -1,11 +0,0 @@
-{{- /*
-Returns syntax-highlighted code from the given text.
-
-This is useful as a terse way to highlight inline code snippets. Calling the
-highlight shortcode for inline snippets is verbose.
-*/}}
-
-{{- $code := .Inner | strings.TrimSpace }}
-{{- $lang := or (.Get 0) "go"  }}
-{{- $opts := dict "hl_inline" true "noClasses" true }}
-{{- transform.Highlight $code $lang $opts }}

docs/_vendor/github.com/gohugoio/gohugoioTheme/layouts/shortcodes/img.html

@@ -120,8 +120,8 @@ Renders the given image using the given filter, if any.
 
 {{- $validFilters := slice
   "autoorient" "brightness" "colorbalance" "colorize" "contrast" "dither"
-  "gamma" "gaussianblur" "grayscale" "hue" "invert" "mask" "none" "opacity"
-  "overlay" "padding" "pixelate" "process" "saturation" "sepia" "sigmoid" "text"
+  "gamma" "gaussianblur" "grayscale" "hue" "invert" "none" "opacity" "overlay"
+  "padding" "pixelate" "process" "saturation" "sepia" "sigmoid" "text"
   "unsharpmask"
 }}
 
@@ -229,12 +229,6 @@ Renders the given image using the given filter, if any.
   {{- $ctx = merge $ctx (dict "argsRequired" 0) }}
   {{- template "validate-arg-count" $ctx }}
   {{- $f = images.Invert }}
-{{- else if eq $filter "mask" }}
-  {{- $ctx = merge $ctx (dict "argsRequired" 1) }}
-  {{- template "validate-arg-count" $ctx }}
-  {{- $ctx := dict "src" (index $filterArgs 0) "name" .Name "position" .Position }}
-  {{- $maskImage := partial "inline/get-resource.html" $ctx }}
-  {{- $f = images.Mask $maskImage }}
 {{- else if eq $filter "opacity" }}
   {{- $ctx = merge $ctx (dict "argsRequired" 1) }}
   {{- template "validate-arg-count" $ctx }}
@@ -328,15 +322,11 @@ Renders the given image using the given filter, if any.
 {{- end }}
 
 {{- /* Render. */}}
-{{- $class := "di va b--black-20" }}
-{{- if eq $filter "mask" }}
-  {{- $class = "di va" }}
-{{- end }}
 {{- if $example }}
   <p>Original</p>
-  <img class="{{ $class}}" style="width: initial;" src="{{ $i.RelPermalink }}" alt="{{ $alt }}">
+  <img class='di ba b--black-20' style="width: initial;" src="{{ $i.RelPermalink }}" alt="{{ $alt }}">
   <p>Processed</p>
-  <img class="{{ $class }}" style="width: initial;" src="{{ $fi.RelPermalink }}" alt="{{ $alt }}">
+  <img class='di ba b--black-20' style="width: initial;" src="{{ $fi.RelPermalink }}" alt="{{ $alt }}">
 {{- else -}}
   <img class='di' style="width: initial;" src="{{ $fi.RelPermalink }}" alt="{{ $alt }}">
 {{- end }}
@@ -364,15 +354,15 @@ Renders the given image using the given filter, if any.
   {{- $u := urls.Parse .src }}
   {{- $msg := "The %q shortcode was unable to resolve %s. See %s" }}
   {{- if $u.IsAbs }}
-    {{- with try (resources.GetRemote $u.String) }}
+    {{- with resources.GetRemote $u.String }}
       {{- with .Err }}
         {{- errorf "%s" . }}
-      {{- else with .Value }}
+      {{- else }}
         {{- /* This is a remote resource. */}}
         {{- $r = . }}
-      {{- else }}
-        {{- errorf $msg $.name $u.String $.position }}
       {{- end }}
+    {{- else }}
+      {{- errorf $msg $.name $u.String $.position }}
     {{- end }}
   {{- else }}
     {{- with .page.Resources.Get (strings.TrimPrefix "./" $u.Path) }}

docs/_vendor/github.com/gohugoio/gohugoioTheme/layouts/shortcodes/include.html

@@ -10,7 +10,7 @@ You must call this shortcode using the {{% %}} notation.
 */}}
 
 {{- with .Get 0 }}
-  {{- with $.Page.GetPage . }}
+  {{- with site.GetPage . }}
     {{- .RenderShortcodes }}
   {{- else }}
     {{- errorf "The %q shortcode was unable to find %q. See %s" $.Name . $.Position }}

docs/_vendor/modules.txt

@@ -1 +1 @@
-# github.com/gohugoio/gohugoioTheme v0.0.0-20250116152525-2d382cae7743
+# github.com/gohugoio/gohugoioTheme v0.0.0-20241105120803-6c6e5fb8f8af

docs/archetypes/glossary.md

@@ -1,19 +0,0 @@
----
-title: {{ replace .File.ContentBaseName "-" " " }}
----
-
-<!--
-You can insert these definitions in other pages using the `glossary-term` shortcode, so they must be self-contained.
-
-Do this:
-
-    A _foo_ is big bar.
-    
-Not this:
-
-    A big bar.
-    
-Italicize the term whenever you use it in the definition.
-
-An exception to this rule occurs when a term is an alias for another. In such cases, it is sufficient to use the phrase 'See [page kind]'."
--->

docs/archetypes/showcase/index.md

@@ -20,7 +20,7 @@ byline: "[bep](https://github.com/bep), Hugo Lead"
 To complete this showcase:
 
 1. Write the story about your site in this file.
-2. Add a summary to the `bio.md` file in this directory.
+2. Add a summary to the `bio.md` file in this folder.
 3. Replace the `featured-template.png` with a screenshot of your site. You can rename it, but it must contain the word `featured`.
 4. Create a new pull request in https://github.com/gohugoio/hugoDocs/pulls
 

docs/config/_default/menus/menus.en.toml

@@ -54,27 +54,21 @@ weight = 90
 identifier = 'render-hooks'
 pageRef = '/render-hooks/'
 
-[[docs]]
-name = 'Shortcodes'
-weight = 100
-identifier = 'shortcodes'
-pageRef = '/shortcodes/'
-
 [[docs]]
 name = 'Hugo Modules'
-weight = 110
+weight = 100
 identifier = 'modules'
 pageRef = '/hugo-modules/'
 
 [[docs]]
 name = 'Hugo Pipes'
-weight = 120
+weight = 110
 identifier = 'hugo-pipes'
 pageRef = '/hugo-pipes/'
 
 [[docs]]
 name = 'CLI'
-weight = 130
+weight = 120
 post = 'break'
 identifier = 'commands'
 pageRef = '/commands/'
@@ -83,25 +77,25 @@ pageRef = '/commands/'
 
 [[docs]]
 name = 'Troubleshooting'
-weight = 140
+weight = 130
 identifier = 'troubleshooting'
 pageRef = '/troubleshooting/'
 
 [[docs]]
 name = 'Developer tools'
-weight = 150
+weight = 140
 identifier = 'developer-tools'
 pageRef = '/tools/'
 
 [[docs]]
 name = 'Hosting and deployment'
-weight = 160
+weight = 150
 identifier = 'hosting-and-deployment'
 pageRef = '/hosting-and-deployment/'
 
 [[docs]]
 name = 'Contribute'
-weight = 170
+weight = 160
 post = 'break'
 identifier = 'contribute'
 pageRef = '/contribute/'

docs/content/en/about/features.md

@@ -55,7 +55,7 @@ toc: true
 : Use fenced code blocks and Markdown render hooks to include diagrams in your content.
 
 [Mathematics]
-: Include mathematical equations and expressions in Markdown using LaTeX markup.
+: Include mathematical equations and expressions in Markdown using LaTeX or TeX typesetting syntax.
 
 [Syntax highlighting]
 : Syntactically highlight code examples using Hugo's embedded syntax highlighter, enabled by default for fenced code blocks in Markdown. The syntax highlighter supports hundreds of code languages and dozens of styles.
@@ -123,7 +123,7 @@ toc: true
 [Mathematics]: /content-management/mathematics/
 [Menus]: /content-management/menus/
 [Minification]: /getting-started/configuration/#configure-minify
-[Modules]: /hugo-modules/
+[Modules]: https://gohugo.io/hugo-modules/
 [Multilingual]: /content-management/multilingual/
 [Multiplatform]: /installation/
 [Output formats]: /templates/output-formats/
@@ -134,6 +134,6 @@ toc: true
 [Syntax highlighting]: /content-management/syntax-highlighting/
 [Tailwind CSS processing]: /functions/css/tailwindcss/
 [Taxonomies]: /content-management/taxonomies/
-[Templates]: /templates/introduction/
+[Templates]: templates/introduction/
 [Themes]: https://themes.gohugo.io/
 [URL management]: /content-management/urls/

docs/content/en/about/privacy.md

@@ -39,11 +39,11 @@ respectDoNotTrack = false
 [privacy.instagram]
 disable = false
 simple = false
-[privacy.vimeo]
+[privacy.twitter]
 disable = false
 enableDNT = false
 simple = false
-[privacy.x]
+[privacy.vimeo]
 disable = false
 enableDNT = false
 simple = false
@@ -64,9 +64,9 @@ disable = true
 disable = true
 [privacy.instagram]
 disable = true
-[privacy.vimeo]
+[privacy.twitter]
 disable = true
-[privacy.x]
+[privacy.vimeo]
 disable = true
 [privacy.youtube]
 disable = true
@@ -92,19 +92,19 @@ simple
 disableInlineCSS = true
 {{< /code-toggle >}}
 
-### X
+### Twitter
 
 enableDNT
-: Enabling this for the x shortcode, the post and its embedded page on your site are not used for purposes that include personalized suggestions and personalized ads.
+: Enabling this for the twitter/tweet shortcode, the tweet and its embedded page on your site are not used for purposes that include personalized suggestions and personalized ads.
 
 simple
-: If simple mode is enabled, a static and no-JS version of a post will be built.
+: If simple mode is enabled, a static and no-JS version of a tweet will be built.
 
-**Note:** If you use the _simple mode_ for X, you may want to disable the inline styles provided by Hugo:
+**Note:** If you use the _simple mode_ for Twitter, you may want to disable the inline styles provided by Hugo:
 
 {{< code-toggle file=hugo >}}
 [services]
-[services.x]
+[services.twitter]
 disableInlineCSS = true
 {{< /code-toggle >}}
 

docs/content/en/commands/hugo.md

@@ -72,6 +72,7 @@ hugo [flags]
 * [hugo completion](/commands/hugo_completion/)	 - Generate the autocompletion script for the specified shell
 * [hugo config](/commands/hugo_config/)	 - Display site configuration
 * [hugo convert](/commands/hugo_convert/)	 - Convert front matter to another format
+* [hugo deploy](/commands/hugo_deploy/)	 - Deploy your site to a cloud provider
 * [hugo env](/commands/hugo_env/)	 - Display version and environment info
 * [hugo gen](/commands/hugo_gen/)	 - Generate documentation and syntax highlighting styles
 * [hugo import](/commands/hugo_import/)	 - Import a site from another system

docs/content/en/commands/hugo_completion.md

@@ -29,7 +29,6 @@ See each sub-command's help for details on how to use the generated script.
   -e, --environment string         build environment
       --ignoreVendorPaths string   ignores any _vendor for module paths matching the given Glob pattern
       --logLevel string            log level (debug|info|warn|error)
-      --noBuildLock                don't create .hugo_build.lock file
       --quiet                      build in quiet mode
   -M, --renderToMemory             render to memory (mostly useful when running the server)
   -s, --source string              filesystem path to read files relative from

docs/content/en/commands/hugo_completion_bash.md

@@ -52,7 +52,6 @@ hugo completion bash
   -e, --environment string         build environment
       --ignoreVendorPaths string   ignores any _vendor for module paths matching the given Glob pattern
       --logLevel string            log level (debug|info|warn|error)
-      --noBuildLock                don't create .hugo_build.lock file
       --quiet                      build in quiet mode
   -M, --renderToMemory             render to memory (mostly useful when running the server)
   -s, --source string              filesystem path to read files relative from

docs/content/en/commands/hugo_completion_fish.md

@@ -43,7 +43,6 @@ hugo completion fish [flags]
   -e, --environment string         build environment
       --ignoreVendorPaths string   ignores any _vendor for module paths matching the given Glob pattern
       --logLevel string            log level (debug|info|warn|error)
-      --noBuildLock                don't create .hugo_build.lock file
       --quiet                      build in quiet mode
   -M, --renderToMemory             render to memory (mostly useful when running the server)
   -s, --source string              filesystem path to read files relative from

docs/content/en/commands/hugo_completion_powershell.md

@@ -40,7 +40,6 @@ hugo completion powershell [flags]
   -e, --environment string         build environment
       --ignoreVendorPaths string   ignores any _vendor for module paths matching the given Glob pattern
       --logLevel string            log level (debug|info|warn|error)
-      --noBuildLock                don't create .hugo_build.lock file
       --quiet                      build in quiet mode
   -M, --renderToMemory             render to memory (mostly useful when running the server)
   -s, --source string              filesystem path to read files relative from

docs/content/en/commands/hugo_completion_zsh.md

@@ -54,7 +54,6 @@ hugo completion zsh [flags]
   -e, --environment string         build environment
       --ignoreVendorPaths string   ignores any _vendor for module paths matching the given Glob pattern
       --logLevel string            log level (debug|info|warn|error)
-      --noBuildLock                don't create .hugo_build.lock file
       --quiet                      build in quiet mode
   -M, --renderToMemory             render to memory (mostly useful when running the server)
   -s, --source string              filesystem path to read files relative from

docs/content/en/commands/hugo_config.md

@@ -24,7 +24,6 @@ hugo config [command] [flags]
       --format string            preferred file format (toml, yaml or json) (default "toml")
   -h, --help                     help for config
       --lang string              the language to display config for. Defaults to the first language defined.
-      --printZero                include config options with zero values (e.g. false, 0, "") in the output
       --renderSegments strings   named segments to render (configured in the segments config)
   -t, --theme strings            themes to use (located in /themes/THEMENAME/)
 ```
@@ -39,7 +38,6 @@ hugo config [command] [flags]
   -e, --environment string         build environment
       --ignoreVendorPaths string   ignores any _vendor for module paths matching the given Glob pattern
       --logLevel string            log level (debug|info|warn|error)
-      --noBuildLock                don't create .hugo_build.lock file
       --quiet                      build in quiet mode
   -M, --renderToMemory             render to memory (mostly useful when running the server)
   -s, --source string              filesystem path to read files relative from

docs/content/en/commands/hugo_config_mounts.md

@@ -32,7 +32,6 @@ hugo config mounts [flags] [args]
   -e, --environment string         build environment
       --ignoreVendorPaths string   ignores any _vendor for module paths matching the given Glob pattern
       --logLevel string            log level (debug|info|warn|error)
-      --noBuildLock                don't create .hugo_build.lock file
       --quiet                      build in quiet mode
   -M, --renderToMemory             render to memory (mostly useful when running the server)
   -s, --source string              filesystem path to read files relative from

docs/content/en/commands/hugo_convert.md

@@ -31,7 +31,6 @@ See convert's subcommands toJSON, toTOML and toYAML for more information.
   -e, --environment string         build environment
       --ignoreVendorPaths string   ignores any _vendor for module paths matching the given Glob pattern
       --logLevel string            log level (debug|info|warn|error)
-      --noBuildLock                don't create .hugo_build.lock file
       --quiet                      build in quiet mode
   -M, --renderToMemory             render to memory (mostly useful when running the server)
   -s, --source string              filesystem path to read files relative from

docs/content/en/commands/hugo_convert_toJSON.md

@@ -32,7 +32,6 @@ hugo convert toJSON [flags] [args]
   -e, --environment string         build environment
       --ignoreVendorPaths string   ignores any _vendor for module paths matching the given Glob pattern
       --logLevel string            log level (debug|info|warn|error)
-      --noBuildLock                don't create .hugo_build.lock file
   -o, --output string              filesystem path to write files to
       --quiet                      build in quiet mode
   -M, --renderToMemory             render to memory (mostly useful when running the server)

docs/content/en/commands/hugo_convert_toTOML.md

@@ -32,7 +32,6 @@ hugo convert toTOML [flags] [args]
   -e, --environment string         build environment
       --ignoreVendorPaths string   ignores any _vendor for module paths matching the given Glob pattern
       --logLevel string            log level (debug|info|warn|error)
-      --noBuildLock                don't create .hugo_build.lock file
   -o, --output string              filesystem path to write files to
       --quiet                      build in quiet mode
   -M, --renderToMemory             render to memory (mostly useful when running the server)

docs/content/en/commands/hugo_convert_toYAML.md

@@ -32,7 +32,6 @@ hugo convert toYAML [flags] [args]
   -e, --environment string         build environment
       --ignoreVendorPaths string   ignores any _vendor for module paths matching the given Glob pattern
       --logLevel string            log level (debug|info|warn|error)
-      --noBuildLock                don't create .hugo_build.lock file
   -o, --output string              filesystem path to write files to
       --quiet                      build in quiet mode
   -M, --renderToMemory             render to memory (mostly useful when running the server)

docs/content/en/commands/hugo_deploy.md

@@ -42,7 +42,6 @@ hugo deploy [flags] [args]
   -e, --environment string         build environment
       --ignoreVendorPaths string   ignores any _vendor for module paths matching the given Glob pattern
       --logLevel string            log level (debug|info|warn|error)
-      --noBuildLock                don't create .hugo_build.lock file
       --quiet                      build in quiet mode
   -M, --renderToMemory             render to memory (mostly useful when running the server)
   -s, --source string              filesystem path to read files relative from

docs/content/en/commands/hugo_env.md

@@ -31,7 +31,6 @@ hugo env [flags] [args]
   -e, --environment string         build environment
       --ignoreVendorPaths string   ignores any _vendor for module paths matching the given Glob pattern
       --logLevel string            log level (debug|info|warn|error)
-      --noBuildLock                don't create .hugo_build.lock file
       --quiet                      build in quiet mode
   -M, --renderToMemory             render to memory (mostly useful when running the server)
   -s, --source string              filesystem path to read files relative from

docs/content/en/commands/hugo_gen.md

@@ -27,7 +27,6 @@ Generate documentation for your project using Hugo's documentation engine, inclu
   -e, --environment string         build environment
       --ignoreVendorPaths string   ignores any _vendor for module paths matching the given Glob pattern
       --logLevel string            log level (debug|info|warn|error)
-      --noBuildLock                don't create .hugo_build.lock file
       --quiet                      build in quiet mode
   -M, --renderToMemory             render to memory (mostly useful when running the server)
   -s, --source string              filesystem path to read files relative from

docs/content/en/commands/hugo_gen_chromastyles.md

@@ -37,7 +37,6 @@ hugo gen chromastyles [flags] [args]
   -e, --environment string         build environment
       --ignoreVendorPaths string   ignores any _vendor for module paths matching the given Glob pattern
       --logLevel string            log level (debug|info|warn|error)
-      --noBuildLock                don't create .hugo_build.lock file
       --quiet                      build in quiet mode
   -M, --renderToMemory             render to memory (mostly useful when running the server)
   -s, --source string              filesystem path to read files relative from

docs/content/en/commands/hugo_gen_doc.md

@@ -37,7 +37,6 @@ hugo gen doc [flags] [args]
   -e, --environment string         build environment
       --ignoreVendorPaths string   ignores any _vendor for module paths matching the given Glob pattern
       --logLevel string            log level (debug|info|warn|error)
-      --noBuildLock                don't create .hugo_build.lock file
       --quiet                      build in quiet mode
   -M, --renderToMemory             render to memory (mostly useful when running the server)
   -s, --source string              filesystem path to read files relative from

docs/content/en/commands/hugo_gen_man.md

@@ -34,7 +34,6 @@ hugo gen man [flags] [args]
   -e, --environment string         build environment
       --ignoreVendorPaths string   ignores any _vendor for module paths matching the given Glob pattern
       --logLevel string            log level (debug|info|warn|error)
-      --noBuildLock                don't create .hugo_build.lock file
       --quiet                      build in quiet mode
   -M, --renderToMemory             render to memory (mostly useful when running the server)
   -s, --source string              filesystem path to read files relative from

docs/content/en/commands/hugo_import.md

@@ -29,7 +29,6 @@ Import requires a subcommand, e.g. `hugo import jekyll jekyll_root_path target_p
   -e, --environment string         build environment
       --ignoreVendorPaths string   ignores any _vendor for module paths matching the given Glob pattern
       --logLevel string            log level (debug|info|warn|error)
-      --noBuildLock                don't create .hugo_build.lock file
       --quiet                      build in quiet mode
   -M, --renderToMemory             render to memory (mostly useful when running the server)
   -s, --source string              filesystem path to read files relative from

docs/content/en/commands/hugo_import_jekyll.md

@@ -34,7 +34,6 @@ hugo import jekyll [flags] [args]
   -e, --environment string         build environment
       --ignoreVendorPaths string   ignores any _vendor for module paths matching the given Glob pattern
       --logLevel string            log level (debug|info|warn|error)
-      --noBuildLock                don't create .hugo_build.lock file
       --quiet                      build in quiet mode
   -M, --renderToMemory             render to memory (mostly useful when running the server)
   -s, --source string              filesystem path to read files relative from

docs/content/en/commands/hugo_list.md

@@ -29,7 +29,6 @@ List requires a subcommand, e.g. hugo list drafts
   -e, --environment string         build environment
       --ignoreVendorPaths string   ignores any _vendor for module paths matching the given Glob pattern
       --logLevel string            log level (debug|info|warn|error)
-      --noBuildLock                don't create .hugo_build.lock file
       --quiet                      build in quiet mode
   -M, --renderToMemory             render to memory (mostly useful when running the server)
   -s, --source string              filesystem path to read files relative from

docs/content/en/commands/hugo_list_all.md

@@ -31,7 +31,6 @@ hugo list all [flags] [args]
   -e, --environment string         build environment
       --ignoreVendorPaths string   ignores any _vendor for module paths matching the given Glob pattern
       --logLevel string            log level (debug|info|warn|error)
-      --noBuildLock                don't create .hugo_build.lock file
       --quiet                      build in quiet mode
   -M, --renderToMemory             render to memory (mostly useful when running the server)
   -s, --source string              filesystem path to read files relative from

docs/content/en/commands/hugo_list_drafts.md

@@ -31,7 +31,6 @@ hugo list drafts [flags] [args]
   -e, --environment string         build environment
       --ignoreVendorPaths string   ignores any _vendor for module paths matching the given Glob pattern
       --logLevel string            log level (debug|info|warn|error)
-      --noBuildLock                don't create .hugo_build.lock file
       --quiet                      build in quiet mode
   -M, --renderToMemory             render to memory (mostly useful when running the server)
   -s, --source string              filesystem path to read files relative from

docs/content/en/commands/hugo_list_expired.md

@@ -31,7 +31,6 @@ hugo list expired [flags] [args]
   -e, --environment string         build environment
       --ignoreVendorPaths string   ignores any _vendor for module paths matching the given Glob pattern
       --logLevel string            log level (debug|info|warn|error)
-      --noBuildLock                don't create .hugo_build.lock file
       --quiet                      build in quiet mode
   -M, --renderToMemory             render to memory (mostly useful when running the server)
   -s, --source string              filesystem path to read files relative from

docs/content/en/commands/hugo_list_future.md

@@ -31,7 +31,6 @@ hugo list future [flags] [args]
   -e, --environment string         build environment
       --ignoreVendorPaths string   ignores any _vendor for module paths matching the given Glob pattern
       --logLevel string            log level (debug|info|warn|error)
-      --noBuildLock                don't create .hugo_build.lock file
       --quiet                      build in quiet mode
   -M, --renderToMemory             render to memory (mostly useful when running the server)
   -s, --source string              filesystem path to read files relative from

docs/content/en/commands/hugo_list_published.md

@@ -31,7 +31,6 @@ hugo list published [flags] [args]
   -e, --environment string         build environment
       --ignoreVendorPaths string   ignores any _vendor for module paths matching the given Glob pattern
       --logLevel string            log level (debug|info|warn|error)
-      --noBuildLock                don't create .hugo_build.lock file
       --quiet                      build in quiet mode
   -M, --renderToMemory             render to memory (mostly useful when running the server)
   -s, --source string              filesystem path to read files relative from

docs/content/en/commands/hugo_mod.md

@@ -38,7 +38,6 @@ See https://gohugo.io/hugo-modules/ for more information.
   -e, --environment string         build environment
       --ignoreVendorPaths string   ignores any _vendor for module paths matching the given Glob pattern
       --logLevel string            log level (debug|info|warn|error)
-      --noBuildLock                don't create .hugo_build.lock file
       --quiet                      build in quiet mode
   -M, --renderToMemory             render to memory (mostly useful when running the server)
   -s, --source string              filesystem path to read files relative from

docs/content/en/commands/hugo_mod_clean.md

@@ -38,7 +38,6 @@ hugo mod clean [flags] [args]
   -e, --environment string         build environment
       --ignoreVendorPaths string   ignores any _vendor for module paths matching the given Glob pattern
       --logLevel string            log level (debug|info|warn|error)
-      --noBuildLock                don't create .hugo_build.lock file
       --quiet                      build in quiet mode
   -M, --renderToMemory             render to memory (mostly useful when running the server)
   -s, --source string              filesystem path to read files relative from

docs/content/en/commands/hugo_mod_get.md

@@ -62,7 +62,6 @@ hugo mod get [flags] [args]
   -e, --environment string         build environment
       --ignoreVendorPaths string   ignores any _vendor for module paths matching the given Glob pattern
       --logLevel string            log level (debug|info|warn|error)
-      --noBuildLock                don't create .hugo_build.lock file
       --quiet                      build in quiet mode
   -M, --renderToMemory             render to memory (mostly useful when running the server)
   -s, --source string              filesystem path to read files relative from

docs/content/en/commands/hugo_mod_graph.md

@@ -39,7 +39,6 @@ hugo mod graph [flags] [args]
   -e, --environment string         build environment
       --ignoreVendorPaths string   ignores any _vendor for module paths matching the given Glob pattern
       --logLevel string            log level (debug|info|warn|error)
-      --noBuildLock                don't create .hugo_build.lock file
       --quiet                      build in quiet mode
   -M, --renderToMemory             render to memory (mostly useful when running the server)
   -s, --source string              filesystem path to read files relative from

docs/content/en/commands/hugo_mod_init.md

@@ -43,7 +43,6 @@ hugo mod init [flags] [args]
   -e, --environment string         build environment
       --ignoreVendorPaths string   ignores any _vendor for module paths matching the given Glob pattern
       --logLevel string            log level (debug|info|warn|error)
-      --noBuildLock                don't create .hugo_build.lock file
       --quiet                      build in quiet mode
   -M, --renderToMemory             render to memory (mostly useful when running the server)
   -s, --source string              filesystem path to read files relative from