releaser: Bump versions for release of 0.139.5

[ci skip]
2026-08-26 16:28:52 +00:00 · 2024-12-14 20:16:21 +01:00
2862 changed files with 74921 additions and 112951 deletions
@@ -4,7 +4,7 @@ parameters:
 defaults: &defaults
  resource_class: large
  docker:
-      - image: bepsays/ci-hugoreleaser:1.22700.20000
+      - 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.22700.20000
+    - image: bepsays/ci-hugoreleaser-linux-arm64:1.22300.20200
    steps:
      - *restore-cache
      - &attach-workspace
@@ -16,20 +16,20 @@ jobs:

    steps:
      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7

      - name: Docker meta
        id: meta
-        uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6.0.0
+        uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5.5.1
        with:
          images: ${{ env.REGISTRY_IMAGE }}

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
+        uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.6.1

      - name: Login to GHCR
        # Login is only needed when the image is pushed
-        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
+        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
@@ -37,7 +37,7 @@ jobs:

      - name: Build and push
        id: build
-        uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
+        uses: docker/build-push-action@16ebe778df0e7752d2cfcbd924afdbbd89c1a755 # v6.6.1
        with:
          context: .
          provenance: mode=max
@@ -46,4 +46,3 @@ jobs:
          platforms: linux/amd64,linux/arm64
          tags: ${{ steps.meta.outputs.tags }}
          labels: ${{ steps.meta.outputs.labels }}
-          build-args: HUGO_BUILD_TAGS=extended,withdeploy
@@ -12,7 +12,7 @@ jobs:
      pull-requests: write
    runs-on: ubuntu-latest
    steps:
-      - uses: dessant/lock-threads@f5f995c727ac99a91dec92781a8e34e7c839a65e # v6.0.0
+      - uses: dessant/lock-threads@7de207be1d3ce97a9abe6ff1306222982d1ca9f9 # v5.0.1
        with:
          issue-inactive-days: 21
          add-issue-labels: 'Outdated'
@@ -24,7 +24,7 @@ jobs:
            This pull request has been automatically locked since there
            has not been any recent activity after it was closed.
            Please open a new issue for related bugs.
-      - uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10.2.0
+      - uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9.0.0
        with:
          operations-per-run: 999
          days-before-issue-stale: 365
@@ -43,7 +43,7 @@ jobs:
          stale-pr-message: This PR has been automatically marked as stale because it has not had
            recent activity. The resources of the Hugo team are limited, and so we are asking for your help.

-            Please check https://github.com/gohugoio/hugo/blob/master/CONTRIBUTING.md#code-contribution and verify that this code contribution fits with the description. If yes, tell us in a comment.
+            Please check https://github.com/gohugoio/hugo/blob/master/CONTRIBUTING.md#code-contribution and verify that this code contribution fits with the description. If yes, tell is in a comment.

            This PR will automatically be closed in the near future if no further activity occurs. Thank you for all your contributions.
          stale-issue-label: 'Stale'
@@ -16,15 +16,17 @@ jobs:
  test:
    strategy:
      matrix:
-        go-version: [1.27.x]
-        os: [ubuntu-latest, windows-latest]
+        go-version: [1.22.x, 1.23.x]
+        os: [ubuntu-latest, windows-latest] # macos disabled for now because of disk space issues.
    runs-on: ${{ matrix.os }}
    steps:
      - if: matrix.os == 'ubuntu-latest'
        name: Free Disk Space (Ubuntu)
        uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
        with:
-          tool-cache: true
+          # this might remove tools that are actually needed,
+          # if set to "true" but frees about 6 GB
+          tool-cache: false
          android: true
          dotnet: true
          haskell: true
@@ -32,39 +34,32 @@ jobs:
          docker-images: true
          swap-storage: true
      - name: Checkout code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
      - name: Install Go
-        uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
+        uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
        with:
          go-version: ${{ matrix.go-version }}
          check-latest: true
          cache: true
-      - name: Install Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
-        with:
-          node-version: "22"
+          cache-dependency-path: |
+            **/go.sum
+            **/go.mod
      - name: Install Ruby
-        uses: ruby/setup-ruby@7372622e62b60b3cb750dcd2b9e32c247ffec26a # v1.302.0
+        uses: ruby/setup-ruby@a6e6f86333f0a2523ece813039b8b4be04560854 # v1.190.0
        with:
-          ruby-version: "3.4.5"
-      - name: Install Ruby gems
-        run: |
-          gem install asciidoctor -v "2.0.26"
-          gem install asciidoctor-diagram -v "3.1.0"
-          gem install asciidoctor-html5s -v "0.5.1"
-      - name: Install GoAT
-        run: go install github.com/blampe/goat/cmd/goat@177de93b192b8ffae608e5d9ec421cc99bf68402
+          ruby-version: "2.7"
+          bundler-cache: true #
      - name: Install Python
-        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
+        uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
        with:
          python-version: "3.x"
      - name: Install Mage
        run: go install github.com/magefile/mage@v1.15.0
-      - name: Install gotmplfmt
-        run: go install github.com/gohugoio/gotmplfmt@latest
+      - name: Install asciidoctor
+        uses: reitzig/actions-asciidoctor@c642db5eedd1d729bb8c92034770d0b2f769eda6 # v2.0.2
      - name: Install docutils
        run: |
-          pip install docutils Pygments
+          pip install docutils
          rst2html --version
      - if: matrix.os == 'ubuntu-latest'
        name: Install pandoc on Linux
@@ -108,15 +103,9 @@ jobs:
      - if: matrix.os == 'ubuntu-latest'
        name: Install staticcheck
        run: go install honnef.co/go/tools/cmd/staticcheck@latest
-      - if: matrix.os == 'ubuntu-latest'
-        name: Check embedded go template formatting
-        run: "diff <(gotmplfmt -d tpl/tplimpl/embedded/templates) <(printf '')"
      - if: matrix.os == 'ubuntu-latest'
        name: Run staticcheck
-        run: |
-          export STATICCHECK_CACHE="${{ runner.temp }}/staticcheck"
-          staticcheck ./...
-          rm -rf ${{ runner.temp }}/staticcheck
+        run: staticcheck ./...
      - if: matrix.os != 'windows-latest'
        name: Check
        run: |
@@ -128,14 +117,16 @@ jobs:
        # See issue #11052. We limit the build to regular test (no -race flag) on Windows for now.
        name: Test
        run: |
-          mage -v test
+          mage -v test;
        env:
          HUGO_BUILD_TAGS: extended,withdeploy
+      - name: Build tags
+        run: |
+          go install -tags extended
      - if: matrix.os == 'ubuntu-latest'
        name: Build for dragonfly
        run: |
          go install
-          go clean -i -cache
        env:
          GOARCH: amd64
          GOOS: dragonfly
@@ -3,7 +3,3 @@
 imports.*
 dist/
 public/
-.DS_Store 
-cache/filecache/_gen/
-.claude/
-dump.txt
@@ -1 +0,0 @@
-tpl/tplimpl/embedded/templates/**
@@ -1,22 +0,0 @@
-
-* Brevity is good.
-* Assume that the maintainers and readers of the code you write are Go experts:
-   * Don't use comments to explain the obvious.
-   * Use self-explanatory variable and function names.
-   * Use short variable names when the context is clear.
-* If you need to add temporary debug printing, use `hdebug.Printf`.[^1]
-* Never export symbols that's not needed outside of the package.
-* Avoid global state at (almost) all cost.
-* This is a project with a long history; assume that a similiar problem has been solved before, look hard for helper functions before creating new ones.
-* In tests, almost always write end-to-end integration tests using `hugolib.Test` or one of its siblings. Write unit tests only for isolated utilities.
-* In tests, use `qt` matchers (e.g. `b.Assert(err, qt.ErrorMatches, ...)`) instead of raw `if`/`t.Fatal` checks.
-* In tests, always use the latest Hugo specification, e.g. for layouts, it's `layouts/page.html` and not `layouts/_default/single.html`, `layouts/list.html` and not `layouts/_default/list.html`
-* Never name tests `TestIssue1234`; always give the test function a descriptive name, e.g. `TestDisablePathToLower`, and add any issue reference as a Go doc function comment, e.g. `// See issue 1234.`.
-* If you borrow a test case (e.g. from the issue), that test's author must be added as co-author in the commit.
-* If you're a security researcher, read @SECURITY.md carefully.
-* Brevity is good. This applies to code, comments and commit messages. Don't write a novel.
-* Use `./check.sh ./somepackage/...` when iterating.
-* Use `./check.sh` when you're done.
-
-
-[^1]: CI build fail if you forget to remove the debug printing.
@@ -1 +0,0 @@
-@AGENTS.md
@@ -1,3 +1,5 @@
+>**Note:** We would apprecitate if you hold on with any big refactorings (like renaming deprecated Go packages), mainly because of potential for extra merge work for future coming in in the near future.
+
 # Contributing to Hugo

 We welcome contributions to Hugo of any kind including documentation, themes,
@@ -17,7 +19,6 @@ The Hugo community and maintainers are [very active](https://github.com/gohugoio
 * [Reporting Issues](#reporting-issues)
 * [Submitting Patches](#submitting-patches)
  * [Code Contribution Guidelines](#code-contribution-guidelines)
-  * [AI Assistance Notice](#ai-assistance-notice)
  * [Git Commit Message Guidelines](#git-commit-message-guidelines)
  * [Fetching the Sources From GitHub](#fetching-the-sources-from-github)
  * [Building Hugo with Your Changes](#building-hugo-with-your-changes)
@@ -53,7 +54,7 @@ If it is of some complexity, the contributor is expected to maintain and support

 Any non-trivial code change needs to update an open [issue](https://github.com/gohugoio/hugo/issues). A non-trivial code change without an issue reference with one of the labels `bug` or `enhancement` will not be merged.

-Note that we do not accept new features that require [CGO](https://go.dev/wiki/cgo).
+Note that we do not accept new features that require [CGO](https://github.com/golang/go/wiki/cgo).
 We have one exception to this rule which is LibSASS.

 **Bug fixes are, of course, always welcome.**
@@ -72,26 +73,12 @@ To make the contribution process as seamless as possible, we ask for the followi
 * When you’re ready to create a pull request, be sure to:
    * Sign the [CLA](https://cla-assistant.io/gohugoio/hugo).
    * Have test cases for the new code. If you have questions about how to do this, please ask in your pull request.
-	 * If you borrow a test case (e.g. from the issue), that test's author must be added as [co-author](https://docs.github.com/en/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/creating-a-commit-with-multiple-authors) in the commit.
    * Run `go fmt`.
    * Add documentation if you are adding new features or changing functionality.  The docs site lives in `/docs`.
    * Squash your commits into a single commit. `git rebase -i`. It’s okay to force update your pull request with `git push -f`.
-    * Ensure that `./check.sh` succeeds. Note that some tests are skipped when running locally, some because they are slow. To run these locally,  do `CI_LOCAL=true ./check.sh ./somepackage/...`.
+    * Ensure that `mage check` succeeds. [Travis CI](https://travis-ci.org/gohugoio/hugo) (Windows, Linux and macOS) will fail the build if `mage check` fails.
    * Follow the **Git Commit Message Guidelines** below.

-## AI Assistance Notice
-
-If a substantial part of your contribution is autogenerated with AI, **this must be disclosed in the pull request**, along with the extent to which AI assistance was used. AI contributions from non-maintainers needs to have a fairly narrow scope (e.g. a bug fix), as we have limited review capacity.
-
-An example disclosure:
-
-> This PR was written primarily by Claude Code.
-
-Also, When using AI assistance:
-
-* We expect contributors to manually verify that the state of the pull request is OK (e.g. that the CLI is signed).
-* We expect contributors to understand the code that is produced and be able to answer critical questions about it
-
 ### Git Commit Message Guidelines

 This [blog article](https://cbea.ms/git-commit/) is a good resource for learning how to write good commit messages,
@@ -106,7 +93,6 @@ Most title/subjects should have a lower-cased prefix with a colon and one whites
 * If this commit touches many packages without a common functional topic, prefix with `all:` (e.g. `all: Reformat Go code`)
 * If this is a documentation update, prefix with `docs:`.
 * If nothing of the above applies, just leave the prefix out.
-* Note that the above excludes nouns seen in other repositories, e.g. "chore:".

 Also, if your commit references one or more GitHub issues, always end your commit message body with *See #1234* or *Fixes #1234*.
 Replace *1234* with the GitHub issue ID. The last example will close the issue when the commit is merged into *master*.
@@ -2,8 +2,8 @@
 # Twitter:      https://twitter.com/gohugoio
 # Website:      https://gohugo.io/

-ARG GO_VERSION="1.27"
-ARG ALPINE_VERSION="3.24"
+ARG GO_VERSION="1.23.2"
+ARG ALPINE_VERSION="3.20"
 ARG DART_SASS_VERSION="1.79.3"

 FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.5.0 AS xx
@@ -19,7 +19,7 @@ RUN apk add clang lld
 COPY --from=xx / /

 ARG TARGETPLATFORM
-RUN xx-apk add musl-dev gcc g++
+RUN xx-apk add musl-dev gcc g++ 

 # Optionally set HUGO_BUILD_TAGS to "none" or "withdeploy" when building like so:
 # docker build --build-arg HUGO_BUILD_TAGS=withdeploy .
@@ -65,16 +65,14 @@ RUN apk add --no-cache \
    git \
    runuser \
    nodejs \
-    npm \
-    openssh-client \
-    tar
+    npm

 RUN mkdir -p /var/hugo/bin /cache && \
    addgroup -Sg 1000 hugo && \
    adduser -Sg hugo -u 1000 -h /var/hugo hugo && \
    chown -R hugo: /var/hugo /cache && \
    # For the Hugo's Git integration to work.
-    runuser -u hugo -- git config --global --add safe.directory /project && \
+    runuser -u hugo -- git config --global --add safe.directory /project && \ 
    # See https://github.com/gohugoio/hugo/issues/9810
    runuser -u hugo -- git config --global core.quotepath false

@@ -1,19 +1,14 @@
-[Clang]: https://clang.llvm.org/
-[GCC]: https://gcc.gnu.org/
-[Git]: https://git-scm.com/book/en/v2/Getting-Started-Installing-Git
-[Go]: https://go.dev/doc/install
 [bep]: https://github.com/bep
 [bugs]: https://github.com/gohugoio/hugo/issues?q=is%3Aopen+is%3Aissue+label%3ABug
 [contributing]: CONTRIBUTING.md
 [create a proposal]: https://github.com/gohugoio/hugo/issues/new?labels=Proposal%2C+NeedsTriage&template=feature_request.md
-[dart sass]: https://gohugo.io/functions/css/sass/#dart-sass
-[details]: https://gohugo.io/host-and-deploy/deploy-with-hugo-deploy/
 [documentation repository]: https://github.com/gohugoio/hugoDocs
 [documentation]: https://gohugo.io/documentation
 [dragonfly bsd, freebsd, netbsd, and openbsd]: https://gohugo.io/installation/bsd
 [features]: https://gohugo.io/about/features/
 [forum]: https://discourse.gohugo.io
 [friends]: https://github.com/gohugoio/hugo/graphs/contributors
+[go]: https://go.dev/
 [hugo modules]: https://gohugo.io/hugo-modules/
 [installation]: https://gohugo.io/installation
 [issue queue]: https://github.com/gohugoio/hugo/issues
@@ -25,24 +20,23 @@
 [static site generator]: https://en.wikipedia.org/wiki/Static_site_generator
 [support]: https://discourse.gohugo.io
 [themes]: https://themes.gohugo.io/
-[transpile sass to css]: https://gohugo.io/functions/css/sass/
 [website]: https://gohugo.io
 [windows]: https://gohugo.io/installation/windows

 <a href="https://gohugo.io/"><img src="https://raw.githubusercontent.com/gohugoio/gohugoioTheme/master/static/images/hugo-logo-wide.svg?sanitize=true" alt="Hugo" width="565"></a>

-A fast and flexible static site generator built with love by [bep][], [spf13][], and [friends][] in Go.
+A fast and flexible static site generator built with love by [bep], [spf13], and [friends] in [Go].

 ---

 [![GoDoc](https://godoc.org/github.com/gohugoio/hugo?status.svg)](https://godoc.org/github.com/gohugoio/hugo)
 [![Tests on Linux, MacOS and Windows](https://github.com/gohugoio/hugo/workflows/Test/badge.svg)](https://github.com/gohugoio/hugo/actions?query=workflow%3ATest)
+[![Go Report Card](https://goreportcard.com/badge/github.com/gohugoio/hugo)](https://goreportcard.com/report/github.com/gohugoio/hugo)

-[Website][] | [Installation][] | [Documentation][] | [Support][] | [Contributing][] | <a rel="me" href="https://fosstodon.org/@gohugoio">Mastodon</a>
-
+[Website] | [Installation] | [Documentation] | [Support] | [Contributing] | <a rel="me" href="https://fosstodon.org/@gohugoio">Mastodon</a>
 ## Overview

-Hugo is a [static site generator][] written in Go, optimized for speed and designed for flexibility. With its advanced templating system and fast asset pipelines, Hugo renders a complete site in seconds, often less.
+Hugo is a [static site generator] written in [Go], optimized for speed and designed for flexibility. With its advanced templating system and fast asset pipelines, Hugo renders a complete site in seconds, often less.

 Due to its flexible framework, multilingual support, and powerful taxonomy system, Hugo is widely used to create:

@@ -57,131 +51,96 @@ Use Hugo's embedded web server during development to instantly see changes to co

 Hugo's fast asset pipelines include:

- CSS Processing &ndash; Bundle, transform, minify, create source maps, perform SRI hashing, and integrate with PostCSS.
- Image processing &ndash; Convert, resize, crop, rotate, adjust colors, apply filters, overlay text and images, and extract metadata
+- Image processing &ndash; Convert, resize, crop, rotate, adjust colors, apply filters, overlay text and images, and extract EXIF data
 - JavaScript bundling &ndash; Transpile TypeScript and JSX to JavaScript, bundle, tree shake, minify, create source maps, and perform SRI hashing.
 - Sass processing &ndash; Transpile Sass to CSS, bundle, tree shake, minify, create source maps, perform SRI hashing, and integrate with PostCSS
 - Tailwind CSS processing &ndash; Compile Tailwind CSS utility classes into standard CSS, bundle, tree shake, optimize, minify, perform SRI hashing, and integrate with PostCSS

-And with [Hugo Modules][], you can share content, assets, data, translations, themes, templates, and configuration with other projects via public or private Git repositories.
+And with [Hugo Modules], you can share content, assets, data, translations, themes, templates, and configuration with other projects via public or private Git repositories.

-See the [features][] section of the documentation for a comprehensive summary of Hugo's capabilities.
+See the [features] section of the documentation for a comprehensive summary of Hugo's capabilities.

 ## Sponsors

 <p>&nbsp;</p>
 <p float="left">
-  <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/hugoDocs/master/assets/images/sponsors/goland.svg" width="200" alt="The complete IDE crafted for professional Go developers."></a>
+  <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://cloudcannon.com/hugo-cms/?utm_campaign=HugoSponsorship&utm_source=sponsor&utm_content=gohugo" target="_blank"><img src="https://raw.githubusercontent.com/gohugoio/hugoDocs/master/assets/images/sponsors/cloudcannon-cms-logo.svg" width="200" alt="CloudCannon"></a>
+  <a href="https://www.jetbrains.com/go/?utm_source=OSS&utm_medium=referral&utm_campaign=hugo" target="_blank"><img src="https://raw.githubusercontent.com/gohugoio/gohugoioTheme/master/assets/images/sponsors/goland.svg" width="200" alt="The complete IDE crafted for professional Go developers."></a>
 </p>

-## Editions
-
-Hugo is available in several editions. Use the standard edition unless you need additional features.
-
-Feature|standard|deploy|extended|extended/deploy
-:--|:-:|:-:|:-:|:-:
-Core features|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:
-Direct cloud deployment (1)|:x:|:heavy_check_mark:|:x:|:heavy_check_mark:
-LibSass support (2)|:x:|:x:|:heavy_check_mark:|:heavy_check_mark:
-
-(1) Deploy your site directly to a Google Cloud Storage bucket, an AWS S3 bucket, or an Azure Storage container. See&nbsp;[details][].
-
-(2) [Transpile Sass to CSS][] via embedded LibSass. Note that embedded LibSass was deprecated in v0.153.0 and will be removed in a future release. Use the [Dart Sass][] transpiler instead, which is compatible with any edition.
-
 ## Installation

-Install Hugo from a [prebuilt binary][], package manager, or package repository. Please see the installation instructions for your operating system:
+Install Hugo from a [prebuilt binary], package manager, or package repository. Please see the installation instructions for your operating system:

- [macOS][]
- [Linux][]
- [Windows][]
- [DragonFly BSD, FreeBSD, NetBSD, and OpenBSD][]
+- [macOS]
+- [Linux]
+- [Windows]
+- [DragonFly BSD, FreeBSD, NetBSD, and OpenBSD]

 ## Build from source

-To build Hugo from source you must install:
+Hugo is available in two editions: standard and extended. With the extended edition you can:

-1. [Git][]
-1. [Go][] version 1.26.0 or later
+- Encode to the WebP format when processing images. You can decode WebP images with either edition.
+- Transpile Sass to CSS using the embedded LibSass transpiler. The extended edition is not required to use the Dart Sass transpiler.

-### Standard edition
+Prerequisites to build Hugo from source:

-To build and install the standard edition:
+- Standard edition: Go 1.20 or later
+- Extended edition: Go 1.20 or later, and GCC

-```sh
-CGO_ENABLED=0 go install github.com/gohugoio/hugo@latest
+Build the standard edition:
+
+```text
+go install github.com/gohugoio/hugo@latest
 ```

-### Deploy edition
+Build the extended edition:

-To build and install the deploy edition:
-
-```sh
-CGO_ENABLED=0 go install -tags withdeploy github.com/gohugoio/hugo@latest
-```
-
-### Extended edition
-
-To build and install the extended edition, first install a C compiler such as [GCC][] or [Clang][] and then run the following command.
-
-```sh
+```text
 CGO_ENABLED=1 go install -tags extended github.com/gohugoio/hugo@latest
 ```
+## Star History

-### Extended/deploy edition
-
-To build and install the extended/deploy edition, first install a C compiler such as [GCC][] or [Clang][] and then run the following command.
-
-```sh
-CGO_ENABLED=1 go install -tags extended,withdeploy github.com/gohugoio/hugo@latest
-```
+[![Star History Chart](https://api.star-history.com/svg?repos=gohugoio/hugo&type=Timeline)](https://star-history.com/#gohugoio/hugo&Timeline)

 ## Documentation

-Hugo's [documentation][] includes installation instructions, a quick start guide, conceptual explanations, reference information, and examples.
+Hugo's [documentation] includes installation instructions, a quick start guide, conceptual explanations, reference information, and examples.

-Please submit documentation issues and pull requests to the [documentation repository][].
+Please submit documentation issues and pull requests to the [documentation repository].

 ## Support

-Please **do not use the issue queue** for questions or troubleshooting. Unless you are certain that your issue is a software defect, use the [forum][].
+Please **do not use the issue queue** for questions or troubleshooting. Unless you are certain that your issue is a software defect, use the [forum].

-Hugo's [forum][] is an active community of users and developers who answer questions, share knowledge, and provide examples. A quick search of over 20,000 topics will often answer your question. Please be sure to read about [requesting help][] before asking your first question.
+Hugo’s [forum] is an active community of users and developers who answer questions, share knowledge, and provide examples. A quick search of over 20,000 topics will often answer your question. Please be sure to read about [requesting help] before asking your first question.

 ## Contributing

 You can contribute to the Hugo project by:

- Answering questions on the [forum][]
- Improving the [documentation][]
- Monitoring the [issue queue][]
- Creating or improving [themes][]
- Squashing [bugs][]
+- Answering questions on the [forum]
+- Improving the [documentation]
+- Monitoring the [issue queue]
+- Creating or improving [themes]
+- Squashing [bugs]

-Please submit documentation issues and pull requests to the [documentation repository][].
+Please submit documentation issues and pull requests to the [documentation repository].

-If you have an idea for an enhancement or new feature, create a new topic on the [forum][] in the "Feature" category. This will help you to:
+If you have an idea for an enhancement or new feature, create a new topic on the [forum] in the "Feature" category. This will help you to:

 - Determine if the capability already exists
 - Measure interest
 - Refine the concept

-If there is sufficient interest, [create a proposal][]. Do not submit a pull request until the project lead accepts the proposal.
+If there is sufficient interest, [create a proposal]. Do not submit a pull request until the project lead accepts the proposal.

 For a complete guide to contributing to Hugo, see the [Contribution Guide](CONTRIBUTING.md).

-## License
-
-For the Hugo source code, see [LICENSE](/LICENSE).
-
-We also bundle some libraries in binary/WASM form:
-
- [libwebp](https://github.com/webmproject/libwebp), [BSD-3-Clause license](https://github.com/webmproject/libwebp?tab=BSD-3-Clause-1-ov-file#readme)
- [Katex](https://github.com/KaTeX/KaTeX), [MIT license](https://github.com/KaTeX/KaTeX?tab=MIT-1-ov-file#readme)
- [QuickJS](https://github.com/bellard/quickjs?tab=License-1-ov-file#readme), [License](https://github.com/bellard/quickjs?tab=License-1-ov-file#readme)
-
 ## Dependencies

 Hugo stands on the shoulders of great open source libraries. Run `hugo env --logLevel info` to display a list of dependencies.
@@ -190,178 +149,101 @@ Hugo stands on the shoulders of great open source libraries. Run `hugo env --log
 <summary>See current dependencies</summary>

 ```text
-cel.dev/expr="v0.25.1"
-cloud.google.com/go/auth/oauth2adapt="v0.2.8"
-cloud.google.com/go/auth="v0.20.0"
-cloud.google.com/go/compute/metadata="v0.9.0"
-cloud.google.com/go/iam="v1.5.3"
-cloud.google.com/go/monitoring="v1.24.3"
-cloud.google.com/go/storage="v1.57.2"
-cloud.google.com/go="v0.123.0"
-github.com/Azure/azure-sdk-for-go/sdk/azcore="v1.20.0"
-github.com/Azure/azure-sdk-for-go/sdk/azidentity="v1.13.1"
-github.com/Azure/azure-sdk-for-go/sdk/internal="v1.11.2"
-github.com/Azure/azure-sdk-for-go/sdk/storage/azblob="v1.6.3"
-github.com/Azure/go-autorest/autorest/to="v0.4.1"
-github.com/AzureAD/microsoft-authentication-library-for-go="v1.6.0"
 github.com/BurntSushi/locker="v0.0.0-20171006230638-a6e239ea1c69"
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp="v1.31.0"
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric="v0.54.0"
-github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping="v0.54.0"
-github.com/JohannesKaufmann/dom="v0.3.1"
-github.com/JohannesKaufmann/html-to-markdown/v2="v2.5.2"
-github.com/alecthomas/chroma/v2="v2.27.0"
-github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream="v1.7.8"
-github.com/aws/aws-sdk-go-v2/config="v1.32.2"
-github.com/aws/aws-sdk-go-v2/credentials="v1.19.2"
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds="v1.18.14"
-github.com/aws/aws-sdk-go-v2/feature/s3/manager="v1.20.12"
-github.com/aws/aws-sdk-go-v2/internal/configsources="v1.4.22"
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2="v2.7.22"
-github.com/aws/aws-sdk-go-v2/internal/ini="v1.8.4"
-github.com/aws/aws-sdk-go-v2/internal/v4a="v1.4.22"
-github.com/aws/aws-sdk-go-v2/service/cloudfront="v1.61.1"
-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding="v1.13.7"
-github.com/aws/aws-sdk-go-v2/service/internal/checksum="v1.9.13"
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url="v1.13.21"
-github.com/aws/aws-sdk-go-v2/service/internal/s3shared="v1.19.21"
-github.com/aws/aws-sdk-go-v2/service/s3="v1.97.3"
-github.com/aws/aws-sdk-go-v2/service/signin="v1.0.2"
-github.com/aws/aws-sdk-go-v2/service/sso="v1.30.5"
-github.com/aws/aws-sdk-go-v2/service/ssooidc="v1.35.10"
-github.com/aws/aws-sdk-go-v2/service/sts="v1.41.2"
-github.com/aws/aws-sdk-go-v2="v1.41.6"
-github.com/aws/smithy-go="v1.25.0"
-github.com/aymerick/douceur="v0.2.0"
+github.com/alecthomas/chroma/v2="v2.14.0"
+github.com/armon/go-radix="v1.0.1-0.20221118154546-54df44f2176c"
 github.com/bep/clocks="v0.5.0"
 github.com/bep/debounce="v1.2.0"
-github.com/bep/gitmap="v1.9.0"
+github.com/bep/gitmap="v1.6.0"
 github.com/bep/goat="v0.5.0"
-github.com/bep/godartsass/v2="v2.5.0"
+github.com/bep/godartsass/v2="v2.3.0"
 github.com/bep/golibsass="v1.2.0"
-github.com/bep/golocales="v0.2.0"
-github.com/bep/goportabletext="v0.2.0"
-github.com/bep/helpers="v0.12.0"
-github.com/bep/imagemeta="v0.17.2"
-github.com/bep/lazycache="v0.8.1"
+github.com/bep/gowebp="v0.3.0"
+github.com/bep/imagemeta="v0.8.3"
+github.com/bep/lazycache="v0.7.0"
 github.com/bep/logg="v0.4.0"
-github.com/bep/mclib="v1.20401.20400"
-github.com/bep/overlayfs="v0.11.0"
-github.com/bep/simplecobra="v0.7.0"
-github.com/bep/textandbinarywriter="v0.1.0"
-github.com/bep/tmc="v0.6.0"
-github.com/bits-and-blooms/bitset="v1.24.5"
+github.com/bep/mclib="v1.20400.20402"
+github.com/bep/overlayfs="v0.9.2"
+github.com/bep/simplecobra="v0.4.0"
+github.com/bep/tmc="v0.5.1"
 github.com/cespare/xxhash/v2="v2.3.0"
 github.com/clbanning/mxj/v2="v2.7.0"
-github.com/clipperhouse/displaywidth="v0.10.0"
-github.com/clipperhouse/uax29/v2="v2.6.0"
-github.com/cncf/xds/go="v0.0.0-20251210132809-ee656c7534f5"
-github.com/cpuguy83/go-md2man/v2="v2.0.6"
-github.com/dlclark/regexp2/v2="v2.2.1"
-github.com/dustin/go-humanize="v1.0.1"
-github.com/envoyproxy/go-control-plane/envoy="v1.36.0"
-github.com/envoyproxy/protoc-gen-validate="v1.3.0"
-github.com/evanw/esbuild="v0.28.1"
+github.com/cli/safeexec="v1.0.1"
+github.com/cpuguy83/go-md2man/v2="v2.0.4"
+github.com/disintegration/gift="v1.2.1"
+github.com/dlclark/regexp2="v1.11.0"
+github.com/evanw/esbuild="v0.24.0"
 github.com/fatih/color="v1.18.0"
-github.com/felixge/httpsnoop="v1.0.4"
 github.com/frankban/quicktest="v1.14.6"
-github.com/fsnotify/fsnotify="v1.9.0"
-github.com/getkin/kin-openapi="v0.140.0"
-github.com/go-jose/go-jose/v4="v4.1.4"
-github.com/go-logr/logr="v1.4.3"
-github.com/go-logr/stdr="v1.2.2"
-github.com/go-openapi/jsonpointer="v0.22.5"
-github.com/go-openapi/swag/jsonname="v0.25.5"
+github.com/fsnotify/fsnotify="v1.8.0"
+github.com/getkin/kin-openapi="v0.123.0"
+github.com/ghodss/yaml="v1.0.0"
+github.com/go-openapi/jsonpointer="v0.20.2"
+github.com/go-openapi/swag="v0.22.8"
 github.com/gobuffalo/flect="v1.0.3"
 github.com/gobwas/glob="v0.2.3"
-github.com/goccy/go-yaml="v1.19.2"
-github.com/gohugoio/gift="v0.2.0"
-github.com/gohugoio/go-i18n/v2="v2.1.3-0.20251018145728-cfcc22d823c6"
-github.com/gohugoio/go-radix="v1.2.0"
-github.com/gohugoio/hashstructure="v0.6.0"
-github.com/gohugoio/httpcache="v0.8.0"
-github.com/gohugoio/hugo-goldmark-extensions/extras="v0.7.0"
-github.com/gohugoio/hugo-goldmark-extensions/passthrough="v0.5.0"
-github.com/golang-jwt/jwt/v5="v5.3.0"
-github.com/google/go-cmp="v0.7.0"
-github.com/google/s2a-go="v0.1.9"
-github.com/google/uuid="v1.6.0"
-github.com/google/wire="v0.7.0"
-github.com/googleapis/enterprise-certificate-proxy="v0.3.14"
-github.com/googleapis/gax-go/v2="v2.21.0"
-github.com/gorilla/css="v1.0.1"
+github.com/gohugoio/go-i18n/v2="v2.1.3-0.20230805085216-e63c13218d0e"
+github.com/gohugoio/hashstructure="v0.1.0"
+github.com/gohugoio/httpcache="v0.7.0"
+github.com/gohugoio/hugo-goldmark-extensions/extras="v0.2.0"
+github.com/gohugoio/hugo-goldmark-extensions/passthrough="v0.3.0"
+github.com/gohugoio/locales="v0.14.0"
+github.com/gohugoio/localescompressed="v1.0.1"
+github.com/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"
+github.com/josharian/intern="v1.0.0"
 github.com/kr/pretty="v0.3.1"
 github.com/kr/text="v0.2.0"
-github.com/kylelemons/godebug="v1.1.0"
 github.com/kyokomi/emoji/v2="v2.2.13"
+github.com/mailru/easyjson="v0.7.7"
 github.com/makeworld-the-better-one/dither/v2="v2.4.0"
 github.com/marekm4/color-extractor="v1.2.1"
-github.com/mattn/go-colorable="v0.1.14"
-github.com/mattn/go-isatty="v0.0.22"
-github.com/mattn/go-runewidth="v0.0.19"
-github.com/microcosm-cc/bluemonday="v1.0.27"
+github.com/mattn/go-colorable="v0.1.13"
+github.com/mattn/go-isatty="v0.0.20"
+github.com/mattn/go-runewidth="v0.0.9"
 github.com/mitchellh/mapstructure="v1.5.1-0.20231216201459-8508981c8b6c"
+github.com/mohae/deepcopy="v0.0.0-20170929034955-c48cc78d4826"
 github.com/muesli/smartcrop="v0.3.0"
-github.com/niklasfasching/go-org="v1.9.1"
-github.com/oasdiff/yaml3="v0.0.13"
-github.com/oasdiff/yaml="v0.1.0"
-github.com/olekukonko/cat="v0.0.0-20250911104152-50322a0618f6"
-github.com/olekukonko/errors="v1.2.0"
-github.com/olekukonko/ll="v0.1.6"
-github.com/olekukonko/tablewriter="v1.1.4"
+github.com/niklasfasching/go-org="v1.7.0"
+github.com/olekukonko/tablewriter="v0.0.5"
 github.com/pbnjay/memory="v0.0.0-20210728143218-7b4eea64cf58"
-github.com/pelletier/go-toml/v2="v2.4.3"
+github.com/pelletier/go-toml/v2="v2.2.3"
+github.com/perimeterx/marshmallow="v1.1.5"
 github.com/pkg/browser="v0.0.0-20240102092130-5ac0b6a4141c"
 github.com/pkg/errors="v0.9.1"
-github.com/rogpeppe/go-internal="v1.15.0"
+github.com/rogpeppe/go-internal="v1.13.1"
 github.com/russross/blackfriday/v2="v2.1.0"
-github.com/santhosh-tekuri/jsonschema/v6="v6.0.2"
-github.com/spf13/afero="v1.15.0"
-github.com/spf13/cast="v1.10.0"
-github.com/spf13/cobra="v1.10.2"
+github.com/sass/dart-sass/compiler="1.81.0"
+github.com/sass/dart-sass/implementation="1.81.0"
+github.com/sass/dart-sass/protocol="3.1.0"
+github.com/spf13/afero="v1.11.0"
+github.com/spf13/cast="v1.7.0"
+github.com/spf13/cobra="v1.8.1"
 github.com/spf13/fsync="v0.10.1"
-github.com/spf13/pflag="v1.0.10"
-github.com/spiffe/go-spiffe/v2="v2.6.0"
-github.com/tdewolff/minify/v2="v2.24.13"
-github.com/tdewolff/parse/v2="v2.8.12"
-github.com/tetratelabs/wazero="v1.12.0"
-github.com/webmproject/libwebp="v1.6.0"
-github.com/yuin/goldmark-emoji="v1.0.6"
-github.com/yuin/goldmark="v1.8.2"
-go.opentelemetry.io/auto/sdk="v1.2.1"
-go.opentelemetry.io/contrib/detectors/gcp="v1.39.0"
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc="v0.67.0"
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp="v0.67.0"
-go.opentelemetry.io/otel/metric="v1.43.0"
-go.opentelemetry.io/otel/sdk/metric="v1.43.0"
-go.opentelemetry.io/otel/sdk="v1.43.0"
-go.opentelemetry.io/otel/trace="v1.43.0"
-go.opentelemetry.io/otel="v1.43.0"
+github.com/spf13/pflag="v1.0.5"
+github.com/tdewolff/minify/v2="v2.21.1"
+github.com/tdewolff/parse/v2="v2.7.18"
+github.com/tetratelabs/wazero="v1.8.1"
+github.com/yuin/goldmark-emoji="v1.0.4"
+github.com/yuin/goldmark="v1.7.8"
 go.uber.org/automaxprocs="v1.5.3"
-go.yaml.in/yaml/v3="v3.0.4"
-gocloud.dev="v0.45.0"
-golang.org/x/crypto="v0.53.0"
-golang.org/x/image="v0.43.0"
-golang.org/x/mod="v0.37.0"
-golang.org/x/net="v0.56.0"
-golang.org/x/oauth2="v0.36.0"
-golang.org/x/sync="v0.21.0"
-golang.org/x/sys="v0.46.0"
-golang.org/x/text="v0.38.0"
-golang.org/x/time="v0.15.0"
-golang.org/x/tools="v0.47.0"
-golang.org/x/xerrors="v0.0.0-20240903120638-7835f813f4da"
-google.golang.org/api="v0.276.0"
-google.golang.org/genproto/googleapis/api="v0.0.0-20260319201613-d00831a3d3e7"
-google.golang.org/genproto/googleapis/rpc="v0.0.0-20260401024825-9d38bb4040a9"
-google.golang.org/genproto="v0.0.0-20260319201613-d00831a3d3e7"
-google.golang.org/grpc="v1.80.0"
-google.golang.org/protobuf="v1.36.11"
-rsc.io/qr="v0.2.0"
-software.sslmate.com/src/go-pkcs12="v0.7.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.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"
+howett.net/plist="v1.0.0"
+software.sslmate.com/src/go-pkcs12="v0.2.0"
 ```
 </details>
@@ -1,11 +1,7 @@
 ## Security Policy

-### Before You Report
-
-Please read [Hugo's Security Model](https://gohugo.io/about/security/) first. If the issue reproduces in an upstream project, please report it there — we cannot triage or patch on their behalf.
-
 ### Reporting a Vulnerability

-If, after the above, you believe you have found a vulnerability in Hugo itself with a concrete, reproducible impact, report it privately to **[bjorn.erik.pedersen@gmail.com](mailto:bjorn.erik.pedersen@gmail.com)**. Include a minimal reproducer, the Hugo version, and the observed vs. expected behavior.
+Please report (suspected) security vulnerabilities to **[bjorn.erik.pedersen@gmail.com](mailto:bjorn.erik.pedersen@gmail.com)**. You will receive a response from us within 48 hours. If we can confirm the issue, we will release a patch as soon as possible depending on the complexity of the issue but historically within days.

-You should receive an initial response within a few days. Confirmed issues are typically patched within days, depending on complexity.
+Also see [Hugo's Security Model](https://gohugo.io/about/security/).
@@ -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
@@ -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
@@ -0,0 +1 @@
+gobench -package=./hugolib -bench="BenchmarkSiteNew/Deep_content_tree"
@@ -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
@@ -69,7 +69,7 @@ func New(opts Options) *Cache {

 	infol := opts.Log.InfoCommand("dynacache")

-	evictedIdentities := collections.NewStackThreadSafe[KeyIdentity]()
+	evictedIdentities := collections.NewStack[KeyIdentity]()

 	onEvict := func(k, v any) {
 		if !opts.Watching {
@@ -129,7 +129,7 @@ type Cache struct {
 	partitions map[string]PartitionManager

 	onEvict           func(k, v any)
-	evictedIdentities *collections.StackThreadSafe[KeyIdentity]
+	evictedIdentities *collections.Stack[KeyIdentity]

 	opts  Options
 	infol logg.LevelLogger
@@ -176,12 +176,11 @@ func (c *Cache) ClearMatching(predicatePartition func(k string, p PartitionManag
 }

 // ClearOnRebuild prepares the cache for a new rebuild taking the given changeset into account.
-// predicate is optional and will clear any entry for which it returns true.
-func (c *Cache) ClearOnRebuild(predicate func(k, v any) bool, changeset ...identity.Identity) {
+func (c *Cache) ClearOnRebuild(changeset ...identity.Identity) {
 	g := rungroup.Run[PartitionManager](context.Background(), rungroup.Config[PartitionManager]{
 		NumWorkers: len(c.partitions),
 		Handle: func(ctx context.Context, partition PartitionManager) error {
-			partition.clearOnRebuild(predicate, changeset...)
+			partition.clearOnRebuild(changeset...)
 			return nil
 		},
 	})
@@ -340,7 +339,7 @@ func GetOrCreatePartition[K comparable, V any](c *Cache, name string, opts Optio
 		panic("invalid Weight, must be between 1 and 100")
 	}

-	if !partitionNameRe.MatchString(name) {
+	if partitionNameRe.FindString(name) != name {
 		panic(fmt.Sprintf("invalid partition name %q", name))
 	}

@@ -480,12 +479,7 @@ func (p *Partition[K, V]) clearMatching(predicate func(k, v any) bool) {
 	})
 }

-func (p *Partition[K, V]) clearOnRebuild(predicate func(k, v any) bool, changeset ...identity.Identity) {
-	if predicate == nil {
-		predicate = func(k, v any) bool {
-			return false
-		}
-	}
+func (p *Partition[K, V]) clearOnRebuild(changeset ...identity.Identity) {
 	opts := p.getOptions()
 	if opts.ClearWhen == ClearNever {
 		return
@@ -531,7 +525,7 @@ func (p *Partition[K, V]) clearOnRebuild(predicate func(k, v any) bool, changese
 	// Second pass needs to be done in a separate loop to catch any
 	// elements marked as stale in the other partitions.
 	p.c.DeleteFunc(func(key K, v V) bool {
-		if predicate(key, v) || shouldDelete(key, v) {
+		if shouldDelete(key, v) {
 			p.trace.Log(
 				logg.StringFunc(
 					func() string {
@@ -607,7 +601,7 @@ type PartitionManager interface {
 	adjustMaxSize(addend int) int
 	getMaxSize() int
 	getOptions() OptionsPartition
-	clearOnRebuild(predicate func(k, v any) bool, changeset ...identity.Identity)
+	clearOnRebuild(changeset ...identity.Identity)
 	clearMatching(predicate func(k, v any) bool)
 	clearStale()
 }
@@ -147,13 +147,13 @@ func TestClear(t *testing.T) {

 	c.Assert(cache.Keys(predicateAll), qt.HasLen, 4)

-	cache.ClearOnRebuild(nil)
+	cache.ClearOnRebuild()

 	// Stale items are always cleared.
 	c.Assert(cache.Keys(predicateAll), qt.HasLen, 2)

 	cache = newTestCache(t)
-	cache.ClearOnRebuild(nil, identity.StringIdentity("changed"))
+	cache.ClearOnRebuild(identity.StringIdentity("changed"))

 	c.Assert(cache.Keys(nil), qt.HasLen, 1)

@@ -191,16 +191,16 @@ func TestPanicInCreate(t *testing.T) {
 		return err
 	}

-	for i := range 3 {
-		for range 3 {
+	for i := 0; i < 3; i++ {
+		for j := 0; j < 3; j++ {
 			c.Assert(willPanic(i), qt.PanicMatches, fmt.Sprintf("panic-%d", i))
 			c.Assert(willErr(i), qt.ErrorMatches, fmt.Sprintf("error-%d", i))
 		}
 	}

 	// Test the same keys again without the panic.
-	for i := range 3 {
-		for range 3 {
+	for i := 0; i < 3; i++ {
+		for j := 0; j < 3; j++ {
 			v, err := p1.GetOrCreate(fmt.Sprintf("panic-%d", i), func(key string) (testItem, error) {
 				return testItem{
 					name: key,
@@ -1,4 +1,4 @@
-// Copyright 2026 The Hugo Authors. All rights reserved.
+// 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.
@@ -16,7 +16,6 @@ package filecache
 import (
 	"bytes"
 	"errors"
-	"fmt"
 	"io"
 	"os"
 	"path/filepath"
@@ -31,7 +30,6 @@ import (
 	"github.com/gohugoio/hugo/helpers"

 	"github.com/BurntSushi/locker"
-	"github.com/bep/helpers/maphelpers"
 	"github.com/spf13/afero"
 )

@@ -47,17 +45,22 @@ const (
 type Cache struct {
 	Fs afero.Fs

-	cfg FileCacheConfig
+	// Max age for items in this cache. Negative duration means forever,
+	// 0 is effectively turning this cache off.
+	maxAge time.Duration

-	entryLocker *lockTracker
+	// When set, we just remove this entire root directory on expiration.
+	pruneAllRootDir string
+
+	nlocker *lockTracker

 	initOnce sync.Once
-	isInited bool
 	initErr  error
 }

 type lockTracker struct {
-	seen *maphelpers.ConcurrentSet[string]
+	seenMu sync.RWMutex
+	seen   map[string]struct{}

 	*locker.Locker
 }
@@ -65,7 +68,16 @@ type lockTracker struct {
 // Lock tracks the ids in use. We use this information to do garbage collection
 // after a Hugo build.
 func (l *lockTracker) Lock(id string) {
-	l.seen.AddIfAbsent(id)
+	l.seenMu.RLock()
+	if _, seen := l.seen[id]; !seen {
+		l.seenMu.RUnlock()
+		l.seenMu.Lock()
+		l.seen[id] = struct{}{}
+		l.seenMu.Unlock()
+	} else {
+		l.seenMu.RUnlock()
+	}
+
 	l.Locker.Lock(id)
 }

@@ -76,15 +88,12 @@ type ItemInfo struct {
 }

 // NewCache creates a new file cache with the given filesystem and max age.
-func NewCache(fs afero.Fs, cfg FileCacheConfig) *Cache {
-	if err := cfg.init(); err != nil {
-		panic(fmt.Sprintf("invalid cache config: %s", err))
-	}
-
+func NewCache(fs afero.Fs, maxAge time.Duration, pruneAllRootDir string) *Cache {
 	return &Cache{
-		Fs:          fs,
-		entryLocker: &lockTracker{Locker: locker.NewLocker(), seen: maphelpers.NewConcurrentSet[string]()},
-		cfg:         cfg,
+		Fs:              fs,
+		nlocker:         &lockTracker{Locker: locker.NewLocker(), seen: make(map[string]struct{})},
+		maxAge:          maxAge,
+		pruneAllRootDir: pruneAllRootDir,
 	}
 }

@@ -100,15 +109,9 @@ func (l *lockedFile) Close() error {
 }

 func (c *Cache) init() error {
-	if c == nil {
-		panic("cache is nil")
-	}
-
 	c.initOnce.Do(func() {
-		c.isInited = true
 		// Create the base dir if it does not exist.
 		if err := c.Fs.MkdirAll("", 0o777); err != nil && !os.IsExist(err) {
-			err = fmt.Errorf("failled to create base cache directory: %s", err)
 			c.initErr = err
 		}
 	})
@@ -123,19 +126,19 @@ func (c *Cache) WriteCloser(id string) (ItemInfo, io.WriteCloser, error) {
 	}

 	id = cleanID(id)
-	c.entryLocker.Lock(id)
+	c.nlocker.Lock(id)

 	info := ItemInfo{Name: id}

 	f, err := helpers.OpenFileForWriting(c.Fs, id)
 	if err != nil {
-		c.entryLocker.Unlock(id)
+		c.nlocker.Unlock(id)
 		return info, nil, err
 	}

 	return info, &lockedFile{
 		File:   f,
-		unlock: func() { c.entryLocker.Unlock(id) },
+		unlock: func() { c.nlocker.Unlock(id) },
 	}, nil
 }

@@ -153,8 +156,8 @@ func (c *Cache) ReadOrCreate(id string,

 	id = cleanID(id)

-	c.entryLocker.Lock(id)
-	defer c.entryLocker.Unlock(id)
+	c.nlocker.Lock(id)
+	defer c.nlocker.Unlock(id)

 	info = ItemInfo{Name: id}

@@ -183,9 +186,9 @@ func (c *Cache) ReadOrCreate(id string,
 // NamedLock locks the given id. The lock is released when the returned function is called.
 func (c *Cache) NamedLock(id string) func() {
 	id = cleanID(id)
-	c.entryLocker.Lock(id)
+	c.nlocker.Lock(id)
 	return func() {
-		c.entryLocker.Unlock(id)
+		c.nlocker.Unlock(id)
 	}
 }

@@ -198,8 +201,8 @@ func (c *Cache) GetOrCreate(id string, create func() (io.ReadCloser, error)) (It
 	}
 	id = cleanID(id)

-	c.entryLocker.Lock(id)
-	defer c.entryLocker.Unlock(id)
+	c.nlocker.Lock(id)
+	defer c.nlocker.Unlock(id)

 	info := ItemInfo{Name: id}

@@ -217,7 +220,7 @@ func (c *Cache) GetOrCreate(id string, create func() (io.ReadCloser, error)) (It
 		return info, nil, err
 	}

-	if c.cfg.MaxAge == 0 {
+	if c.maxAge == 0 {
 		// No caching.
 		return info, hugio.ToReadCloser(r), nil
 	}
@@ -228,40 +231,6 @@ func (c *Cache) GetOrCreate(id string, create func() (io.ReadCloser, error)) (It
 		c.writeReader(id, io.TeeReader(r, &buff))
 }

-// AbsFilenameFromID returns the filename for the given id in the cache.
-// This will be an absolute path.
-func (c *Cache) AbsFilenameFromID(id string) string {
-	return filepath.Join(c.cfg.DirCompiled, cleanID(id))
-}
-
-// GetOrCreateInfo tries to get the item info with the given id from cache. If not found or expired, create will
-// be invoked with the id. The create function is expected to create the cache item with the given id. The returned ItemInfo will have the id as Name.
-// This method is protected by a named lock using the given id as identifier.
-func (c *Cache) GetOrCreateInfo(id string, create func(id string) error) (ItemInfo, error) {
-	if err := c.init(); err != nil {
-		return ItemInfo{}, err
-	}
-
-	id = cleanID(id)
-
-	c.entryLocker.Lock(id)
-	defer c.entryLocker.Unlock(id)
-
-	info := ItemInfo{Name: id}
-
-	if !c.removeIfNeeded(id) {
-		// The file exists and is not expired, so we consider it a cache hit.
-		return info, nil
-	}
-
-	if err := create(id); err != nil {
-		c.remove(id)
-		return info, err
-	}
-
-	return info, nil
-}
-
 func (c *Cache) writeReader(id string, r io.Reader) error {
 	dir := filepath.Dir(id)
 	if dir != "" {
@@ -285,8 +254,8 @@ func (c *Cache) GetOrCreateBytes(id string, create func() ([]byte, error)) (Item
 	}
 	id = cleanID(id)

-	c.entryLocker.Lock(id)
-	defer c.entryLocker.Unlock(id)
+	c.nlocker.Lock(id)
+	defer c.nlocker.Unlock(id)

 	info := ItemInfo{Name: id}

@@ -306,7 +275,7 @@ func (c *Cache) GetOrCreateBytes(id string, create func() ([]byte, error)) (Item
 		return info, nil, err
 	}

-	if c.cfg.MaxAge == 0 {
+	if c.maxAge == 0 {
 		return info, b, nil
 	}

@@ -317,39 +286,15 @@ func (c *Cache) GetOrCreateBytes(id string, create func() ([]byte, error)) (Item
 	return info, b, nil
 }

-// SetBytes sets the file content with the given id in the cache.
-func (c *Cache) SetBytes(id string, data []byte) error {
-	if err := c.init(); err != nil {
-		return err
-	}
-	id = cleanID(id)
-
-	c.entryLocker.Lock(id)
-	defer c.entryLocker.Unlock(id)
-
-	if c.cfg.MaxAge == 0 {
-		// No caching.
-		return nil
-	}
-
-	return c.writeReader(id, bytes.NewReader(data))
-}
-
 // GetBytes gets the file content with the given id from the cache, nil if none found.
-func (c *Cache) GetBytes(id string) ([]byte, error) {
-	_, b, err := c.GetItemBytes(id)
-	return b, err
-}
-
-// GetItemBytes gets the ItemInfo and file content with the given id from the cache, nil if none found.
-func (c *Cache) GetItemBytes(id string) (ItemInfo, []byte, error) {
+func (c *Cache) GetBytes(id string) (ItemInfo, []byte, error) {
 	if err := c.init(); err != nil {
 		return ItemInfo{}, nil, err
 	}
 	id = cleanID(id)

-	c.entryLocker.Lock(id)
-	defer c.entryLocker.Unlock(id)
+	c.nlocker.Lock(id)
+	defer c.nlocker.Unlock(id)

 	info := ItemInfo{Name: id}

@@ -369,8 +314,8 @@ func (c *Cache) Get(id string) (ItemInfo, io.ReadCloser, error) {
 	}
 	id = cleanID(id)

-	c.entryLocker.Lock(id)
-	defer c.entryLocker.Unlock(id)
+	c.nlocker.Lock(id)
+	defer c.nlocker.Unlock(id)

 	info := ItemInfo{Name: id}

@@ -379,23 +324,10 @@ func (c *Cache) Get(id string) (ItemInfo, io.ReadCloser, error) {
 	return info, r, nil
 }

-// removeIfNeeded checks if the file with the given id should be re-created.
-func (c *Cache) removeIfNeeded(id string) bool {
-	if c.cfg.MaxAge == 0 {
-		// No caching, remove.
-		c.remove(id)
-		return true
-	}
-	if removed, err := c.removeIfExpired(id); err != nil || removed {
-		return true
-	}
-	return false
-}
-
 // getOrRemove gets the file with the given id. If it's expired, it will
 // be removed.
 func (c *Cache) getOrRemove(id string) hugio.ReadSeekCloser {
-	if c.cfg.MaxAge == 0 {
+	if c.maxAge == 0 {
 		// No caching.
 		return nil
 	}
@@ -413,7 +345,7 @@ func (c *Cache) getOrRemove(id string) hugio.ReadSeekCloser {
 }

 func (c *Cache) getBytesAndRemoveIfExpired(id string) ([]byte, bool) {
-	if c.cfg.MaxAge == 0 {
+	if c.maxAge == 0 {
 		// No caching.
 		return nil, false
 	}
@@ -438,7 +370,7 @@ func (c *Cache) getBytesAndRemoveIfExpired(id string) ([]byte, bool) {
 }

 func (c *Cache) removeIfExpired(id string) (bool, error) {
-	if c.cfg.MaxAge <= 0 {
+	if c.maxAge <= 0 {
 		return false, nil
 	}

@@ -448,37 +380,29 @@ func (c *Cache) removeIfExpired(id string) (bool, error) {
 	}

 	if c.isExpired(fi.ModTime()) {
-		c.remove(id)
+		c.Fs.Remove(id)
 		return true, nil
 	}

 	return false, nil
 }

-func (c *Cache) remove(id string) {
-	if c.cfg.entryIsDir {
-		c.Fs.RemoveAll(id)
-	} else {
-		c.Fs.Remove(id)
-	}
-}
-
 func (c *Cache) isExpired(modTime time.Time) bool {
-	if c.cfg.MaxAge < 0 {
+	if c.maxAge < 0 {
 		return false
 	}

 	// Note the use of time.Since here.
 	// We cannot use Hugo's global Clock for this.
-	return c.cfg.MaxAge == 0 || time.Since(modTime) > c.cfg.MaxAge
+	return c.maxAge == 0 || time.Since(modTime) > c.maxAge
 }

 // For testing
 func (c *Cache) GetString(id string) string {
 	id = cleanID(id)

-	c.entryLocker.Lock(id)
-	defer c.entryLocker.Unlock(id)
+	c.nlocker.Lock(id)
+	defer c.nlocker.Unlock(id)

 	f, err := c.Fs.Open(id)
 	if err != nil {
@@ -493,17 +417,6 @@ func (c *Cache) GetString(id string) string {
 // Caches is a named set of caches.
 type Caches map[string]*Cache

-func (f Caches) SetResourceFs(fs afero.Fs) {
-	for _, c := range f {
-		if c.cfg.IsResourceDir {
-			if c.isInited {
-				panic("cannot set resource fs after init")
-			}
-			c.Fs = hugofs.NewBasePathFs(fs, c.cfg.DirCompiled)
-		}
-	}
-}
-
 // Get gets a named cache, nil if none found.
 func (f Caches) Get(name string) *Cache {
 	return f[strings.ToLower(name)]
@@ -511,21 +424,34 @@ func (f Caches) Get(name string) *Cache {

 // NewCaches creates a new set of file caches from the given
 // configuration.
-func NewCaches(dcfg Configs, sourceFs afero.Fs) (Caches, error) {
-	fs := sourceFs
+func NewCaches(p *helpers.PathSpec) (Caches, error) {
+	dcfg := p.Cfg.GetConfigSection("caches").(Configs)
+	fs := p.Fs.Source

 	m := make(Caches)
 	for k, v := range dcfg {
 		var cfs afero.Fs
+
 		if v.IsResourceDir {
-			cfs = nil // Set later. TODO(bep) this needs to be cleanded up.
+			cfs = p.BaseFs.ResourcesCache
 		} else {
-			cfs = hugofs.NewBasePathFs(fs, v.DirCompiled)
+			cfs = fs
 		}

-		c := NewCache(cfs, v)
+		if cfs == nil {
+			panic("nil fs")
+		}

-		m[k] = c
+		baseDir := v.DirCompiled
+
+		bfs := hugofs.NewBasePathFs(cfs, baseDir)
+
+		var pruneAllRootDir string
+		if k == CacheKeyModules {
+			pruneAllRootDir = "pkg"
+		}
+
+		m[k] = NewCache(bfs, v.MaxAge, pruneAllRootDir)
 	}

 	return m, nil
@@ -554,7 +480,7 @@ func (h *httpCache) Get(id string) (resp []byte, ok bool) {
 }

 func (h *httpCache) Set(id string, resp []byte) {
-	if h.c.cfg.MaxAge == 0 {
+	if h.c.maxAge == 0 {
 		return
 	}

@@ -15,7 +15,6 @@
 package filecache

 import (
-	"encoding/json"
 	"errors"
 	"fmt"
 	"path"
@@ -23,7 +22,7 @@ import (
 	"strings"
 	"time"

-	"github.com/gohugoio/hugo/common/hmaps"
+	"github.com/gohugoio/hugo/common/maps"
 	"github.com/gohugoio/hugo/config"

 	"github.com/mitchellh/mapstructure"
@@ -35,50 +34,35 @@ const (
 	cacheDirProject = ":cacheDir/:project"
 )

+var defaultCacheConfig = FileCacheConfig{
+	MaxAge: -1, // Never expire
+	Dir:    cacheDirProject,
+}
+
 const (
-	CacheKeyImages        = "images"
-	CacheKeyAssets        = "assets"
-	CacheKeyModules       = "modules"
-	CacheKeyModuleQueries = "modulequeries"
-	CacheKeyModuleGitInfo = "modulegitinfo"
-	CacheKeyGetResource   = "getresource"
-	CacheKeyMisc          = "misc"
+	CacheKeyGetJSON     = "getjson"
+	CacheKeyGetCSV      = "getcsv"
+	CacheKeyImages      = "images"
+	CacheKeyAssets      = "assets"
+	CacheKeyModules     = "modules"
+	CacheKeyGetResource = "getresource"
+	CacheKeyMisc        = "misc"
 )

 type Configs map[string]FileCacheConfig

-// CacheDirModules returns the compiled path to the modules cache.
 // For internal use.
 func (c Configs) CacheDirModules() string {
 	return c[CacheKeyModules].DirCompiled
 }

-// CacheDirMisc returns the compiled path to the misc cache.
-// For internal use.
-func (c Configs) CacheDirMisc() string {
-	return c[CacheKeyMisc].DirCompiled
-}
-
 var defaultCacheConfigs = Configs{
 	CacheKeyModules: {
 		MaxAge: -1,
 		Dir:    ":cacheDir/modules",
-		fileCacheConfigInternal: fileCacheConfigInternal{
-			entryIsDir: true,
-			isReadOnly: true, // we need to make it writable when pruning.
-		},
-	},
-	CacheKeyModuleQueries: {
-		MaxAge: 24 * time.Hour,
-		Dir:    ":cacheDir/modules",
-	},
-	CacheKeyModuleGitInfo: {
-		MaxAge: 24 * time.Hour,
-		Dir:    ":cacheDir/modules",
-		fileCacheConfigInternal: fileCacheConfigInternal{
-			entryIsDir: true,
-		},
 	},
+	CacheKeyGetJSON: defaultCacheConfig,
+	CacheKeyGetCSV:  defaultCacheConfig,
 	CacheKeyImages: {
 		MaxAge: -1,
 		Dir:    resourcesGenDir,
@@ -97,13 +81,6 @@ var defaultCacheConfigs = Configs{
 	},
 }

-func init() {
-	for k, v := range defaultCacheConfigs {
-		v.name = k
-		defaultCacheConfigs[k] = v
-	}
-}
-
 type FileCacheConfig struct {
 	// Max age of cache entries in this cache. Any items older than this will
 	// be removed and not returned from the cache.
@@ -115,50 +92,22 @@ type FileCacheConfig struct {
 	MaxAge time.Duration

 	// The directory where files are stored.
-	Dir string
+	Dir         string
+	DirCompiled string `json:"-"`

-	fileCacheConfigInternal `json:"-"`
+	// Will resources/_gen will get its own composite filesystem that
+	// also checks any theme.
+	IsResourceDir bool `json:"-"`
 }

-func (cfg *FileCacheConfig) init() error {
-	if cfg.DirCompiled == "" {
-		// From unit tests. Just check that it does not contain any placeholders.
-		if strings.Contains(cfg.Dir, ":") {
-			return fmt.Errorf("cache dir %q contains unresolved placeholders", cfg.Dir)
-		}
-		cfg.DirCompiled = cfg.Dir
-	}
-	// Sanity check the config.
-	if len(cfg.DirCompiled) < 5 {
-		panic(fmt.Sprintf("invalid cache dir: %q", cfg.DirCompiled))
-	}
-	return nil
+// GetJSONCache gets the file cache for getJSON.
+func (f Caches) GetJSONCache() *Cache {
+	return f[CacheKeyGetJSON]
 }

-type fileCacheConfigInternal struct {
-	DirCompiled string
-
-	name          string // The name of this cache, e.g. "images", "modules" etc.
-	entryIsDir    bool   // when set, the cache entries represents directories directly below the base dir.
-	isReadOnly    bool   // when set, the cache is read only and needs to be pruned differently. This is used for the Go modules cache.
-	IsResourceDir bool   //  resources/_gen will get its own composite filesystem that also checks any theme. TODO(bep) unexport this.
-}
-
-// MarshalJSON marshals FileCacheConfig to JSON with MaxAge as a human-readable string.
-func (c FileCacheConfig) MarshalJSON() ([]byte, error) {
-	var maxAge any
-	if c.MaxAge == -1 {
-		maxAge = -1
-	} else {
-		maxAge = strings.TrimSuffix(c.MaxAge.String(), "0m0s")
-	}
-	return json.Marshal(&struct {
-		MaxAge any    `json:"maxAge"`
-		Dir    string `json:"dir"`
-	}{
-		MaxAge: maxAge,
-		Dir:    c.Dir,
-	})
+// GetCSVCache gets the file cache for getCSV.
+func (f Caches) GetCSVCache() *Cache {
+	return f[CacheKeyGetCSV]
 }

 // ImageCache gets the file cache for processed images.
@@ -171,25 +120,6 @@ func (f Caches) ModulesCache() *Cache {
 	return f[CacheKeyModules]
 }

-// ModuleQueriesCache gets the file cache for Hugo Module version queries.
-// Returns nil if not found.
-func (f Caches) ModuleQueriesCache() *Cache {
-	c, ok := f[CacheKeyModuleQueries]
-	if !ok {
-		panic("module queries cache not set")
-	}
-	return c
-}
-
-// ModuleGitInfoCache gets the file cache for Hugo Module git info.
-func (f Caches) ModuleGitInfoCache() *Cache {
-	c, ok := f[CacheKeyModuleGitInfo]
-	if !ok {
-		panic("module git info cache not set")
-	}
-	return c
-}
-
 // AssetsCache gets the file cache for assets (processed resources, SCSS etc.).
 func (f Caches) AssetsCache() *Cache {
 	return f[CacheKeyAssets]
@@ -217,14 +147,10 @@ func DecodeConfig(fs afero.Fs, bcfg config.BaseConfig, m map[string]any) (Config
 	_, isOsFs := fs.(*afero.OsFs)

 	for k, v := range m {
-		if _, ok := v.(hmaps.Params); !ok {
+		if _, ok := v.(maps.Params); !ok {
 			continue
 		}
-		var ok bool
-		cc, ok := c[k]
-		if !ok {
-			return nil, fmt.Errorf("%q is not a valid cache name", k)
-		}
+		cc := defaultCacheConfig

 		dc := &mapstructure.DecoderConfig{
 			Result:           &cc,
@@ -245,8 +171,12 @@ func DecodeConfig(fs afero.Fs, bcfg config.BaseConfig, m map[string]any) (Config
 			return c, errors.New("must provide cache Dir")
 		}

-		c[k] = cc
+		name := strings.ToLower(k)
+		if !valid[name] {
+			return nil, fmt.Errorf("%q is not a valid cache name", name)
+		}

+		c[name] = cc
 	}

 	for k, v := range c {
@@ -14,7 +14,6 @@
 package filecache_test

 import (
-	"encoding/json"
 	"path/filepath"
 	"runtime"
 	"testing"
@@ -44,9 +43,12 @@ assetDir = "assets"
 archetypeDir = "archetypes"

 [caches]
-[caches.misc]
+[caches.getJSON]
 maxAge = "10m"
 dir = "/path/to/c1"
+[caches.getCSV]
+maxAge = "11h"
+dir = "/path/to/c2"
 [caches.images]
 dir = "/path/to/c3"
 [caches.getResource]
@@ -59,9 +61,9 @@ dir = "/path/to/c4"
 	decoded := testconfig.GetTestConfigs(fs, cfg).Base.Caches
 	c.Assert(len(decoded), qt.Equals, 7)

-	c2 := decoded["misc"]
-	c.Assert(c2.MaxAge.String(), qt.Equals, "10m0s")
-	c.Assert(c2.DirCompiled, qt.Equals, filepath.FromSlash("/path/to/c1/filecache/misc"))
+	c2 := decoded["getcsv"]
+	c.Assert(c2.MaxAge.String(), qt.Equals, "11h0m0s")
+	c.Assert(c2.DirCompiled, qt.Equals, filepath.FromSlash("/path/to/c2/filecache/getcsv"))

 	c3 := decoded["images"]
 	c.Assert(c3.MaxAge, qt.Equals, time.Duration(-1))
@@ -88,9 +90,12 @@ archeTypedir = "archetypes"

 ignoreCache = true
 [caches]
-[caches.misc]
+[caches.getJSON]
 maxAge = 1234
 dir = "/path/to/c1"
+[caches.getCSV]
+maxAge = 3456
+dir = "/path/to/c2"
 [caches.images]
 dir = "/path/to/c3"
 [caches.getResource]
@@ -127,45 +132,15 @@ func TestDecodeConfigDefault(t *testing.T) {
 	c.Assert(len(decoded), qt.Equals, 7)

 	imgConfig := decoded[filecache.CacheKeyImages]
-	miscConfig := decoded[filecache.CacheKeyMisc]
+	jsonConfig := decoded[filecache.CacheKeyGetJSON]

 	if runtime.GOOS == "windows" {
 		c.Assert(imgConfig.DirCompiled, qt.Equals, filepath.FromSlash("_gen/images"))
 	} else {
 		c.Assert(imgConfig.DirCompiled, qt.Equals, "_gen/images")
-		c.Assert(miscConfig.DirCompiled, qt.Equals, "/cache/thecache/hugoproject/filecache/misc")
+		c.Assert(jsonConfig.DirCompiled, qt.Equals, "/cache/thecache/hugoproject/filecache/getjson")
 	}

 	c.Assert(imgConfig.IsResourceDir, qt.Equals, true)
-	c.Assert(miscConfig.IsResourceDir, qt.Equals, false)
-}
-
-func TestFileCacheConfigMarshalJSON(t *testing.T) {
-	c := qt.New(t)
-
-	cfg := config.New()
-	cfg.Set("cacheDir", "/cache")
-	cfg.Set("workingDir", "/my/project")
-
-	fs := afero.NewMemMapFs()
-	decoded := testconfig.GetTestConfigs(fs, cfg).Base.Caches
-
-	moduleQueriesConfig := decoded[filecache.CacheKeyModuleQueries]
-	c.Assert(moduleQueriesConfig.MaxAge, qt.Equals, 24*time.Hour)
-
-	// Also verify the new moduleGitInfo cache.
-	moduleGitInfoConfig := decoded[filecache.CacheKeyModuleGitInfo]
-	c.Assert(moduleGitInfoConfig.MaxAge, qt.Equals, 24*time.Hour)
-
-	b, err := json.Marshal(moduleQueriesConfig)
-	c.Assert(err, qt.IsNil)
-
-	c.Assert(string(b), qt.Contains, `"maxAge":"24h"`)
-	c.Assert(string(b), qt.Not(qt.Contains), "86400000000000")
-	c.Assert(string(b), qt.Not(qt.Contains), "8.64e")
-
-	moduleQueriesConfig.MaxAge = -1
-	b, err = json.Marshal(moduleQueriesConfig)
-	c.Assert(err, qt.IsNil)
-	c.Assert(string(b), qt.Contains, `"maxAge":-1`)
+	c.Assert(jsonConfig.IsResourceDir, qt.Equals, false)
 }
@@ -18,6 +18,7 @@ import (
 	"testing"
 	"time"

+	"github.com/bep/logg"
 	qt "github.com/frankban/quicktest"
 	"github.com/gohugoio/hugo/htesting"
 	"github.com/gohugoio/hugo/hugolib"
@@ -38,9 +39,9 @@ title: "Home"

 `

-	b := hugolib.Test(t, files, hugolib.TestOptOsFs(), hugolib.TestOptWithConfig(func(c *hugolib.IntegrationTestConfig) {
-		c.RunGC = true
-	}))
+	b := hugolib.NewIntegrationTestBuilder(
+		hugolib.IntegrationTestConfig{T: t, TxtarString: files, RunGC: true, NeedsOsFS: true},
+	).Build()

 	_, err := b.H.BaseFs.ResourcesCache.Stat(filepath.Join("_gen", "images"))

@@ -66,7 +67,7 @@ title: "Home"
 ---
 -- assets/a/pixel.png --
 iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkYPhfDwAChwGA60e6kgAAAABJRU5ErkJggg==
-- layouts/home.html --
+-- layouts/index.html --
 {{ warnf "HOME!" }}
 {{ $img := resources.GetMatch "**.png" }}
 {{ $img = $img.Resize "3x3" }}
@@ -76,9 +77,9 @@ iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkYPhfDwAChwGA60e6kgAA

 `

-	b := hugolib.TestRunning(t, files, hugolib.TestOptOsFs(), hugolib.TestOptInfo(), hugolib.TestOptWithConfig(func(c *hugolib.IntegrationTestConfig) {
-		c.RunGC = true
-	}))
+	b := hugolib.NewIntegrationTestBuilder(
+		hugolib.IntegrationTestConfig{T: t, TxtarString: files, Running: true, RunGC: true, NeedsOsFS: true, LogLevel: logg.LevelInfo},
+	).Build()

 	b.Assert(b.GCCount, qt.Equals, 0)
 	b.Assert(b.H, qt.IsNotNil)
@@ -17,7 +17,6 @@ import (
 	"fmt"
 	"io"
 	"os"
-	"strings"

 	"github.com/gohugoio/hugo/common/herrors"
 	"github.com/gohugoio/hugo/hugofs"
@@ -51,8 +50,8 @@ func (c Caches) Prune() (int, error) {
 // Prune removes expired and unused items from this cache.
 // If force is set, everything will be removed not considering expiry time.
 func (c *Cache) Prune(force bool) (int, error) {
-	if c.cfg.entryIsDir {
-		return c.pruneRootDirs(force)
+	if c.pruneAllRootDir != "" {
+		return c.pruneRootDir(force)
 	}
 	if err := c.init(); err != nil {
 		return 0, err
@@ -60,29 +59,6 @@ func (c *Cache) Prune(force bool) (int, error) {

 	counter := 0

-	seen := c.entryLocker.seen
-	seenByLower := make(map[string]string, seen.Len())
-	for id := range seen.All() {
-		seenByLower[strings.ToLower(id)] = id
-	}
-
-	// Names on disk matching a used cache key except for the case, and the used keys
-	// actually walked. See the note about case-insensitive filesystems below.
-	var candidates map[string]string
-	visited := make(map[string]bool, seen.Len())
-
-	remove := func(name string) error {
-		err := c.Fs.Remove(name)
-		if err == nil {
-			counter++
-			return nil
-		}
-		if !herrors.IsNotExist(err) {
-			return err
-		}
-		return nil
-	}
-
 	err := afero.Walk(c.Fs, "", func(name string, info os.FileInfo, err error) error {
 		if info == nil {
 			return nil
@@ -117,83 +93,35 @@ func (c *Cache) Prune(force bool) (int, error) {

 		shouldRemove := force || c.isExpired(info.ModTime())

-		if seen.Has(name) {
-			visited[name] = true
-		} else if !shouldRemove && seen.Len() > 0 {
-			if id, found := seenByLower[strings.ToLower(name)]; found {
-				// On case-insensitive filesystems this is the same file as id; e.g. an
-				// entry created before Hugo started lowercasing the content paths in
-				// v0.123 (content/MyBundle => _gen/images/MyBundle). Decided once the
-				// walk is done: if id is walked too, they are distinct files and this
-				// one is stale. See issue 15101.
-				if candidates == nil {
-					candidates = make(map[string]string)
-				}
-				candidates[name] = id
-			} else {
-				// Remove it if it's not been touched/used in the last build.
-				shouldRemove = true
-			}
+		if !shouldRemove && len(c.nlocker.seen) > 0 {
+			// Remove it if it's not been touched/used in the last build.
+			_, seen := c.nlocker.seen[name]
+			shouldRemove = !seen
 		}

 		if shouldRemove {
-			return remove(name)
+			err := c.Fs.Remove(name)
+			if err == nil {
+				counter++
+			}
+
+			if err != nil && !herrors.IsNotExist(err) {
+				return err
+			}
+
 		}

 		return nil
 	})
-	if err != nil {
-		return counter, err
-	}

-	for name, id := range candidates {
-		if visited[id] {
-			if err := remove(name); err != nil {
-				return counter, err
-			}
-		}
-	}
-
-	return counter, nil
+	return counter, err
 }

-func (c *Cache) pruneRootDirs(force bool) (int, error) {
-	dirs, err := afero.ReadDir(c.Fs, "")
-	if err != nil {
-		if herrors.IsNotExist(err) {
-			return 0, nil
-		}
-		return 0, err
-	}
-
-	counter := 0
-
-	for _, dir := range dirs {
-		if !dir.IsDir() {
-			continue
-		}
-
-		count, err := c.pruneRootDir(dir.Name(), force)
-		if err != nil {
-			return counter, err
-		}
-		counter += count
-	}
-
-	return counter, nil
-}
-
-func (c *Cache) pruneRootDir(dirname string, force bool) (int, error) {
+func (c *Cache) pruneRootDir(force bool) (int, error) {
 	if err := c.init(); err != nil {
 		return 0, err
 	}
-
-	// Sanity check.
-	if dirname != "pkg" && len(dirname) < 5 {
-		panic(fmt.Sprintf("invalid cache dir name: %q", dirname))
-	}
-
-	info, err := c.Fs.Stat(dirname)
+	info, err := c.Fs.Stat(c.pruneAllRootDir)
 	if err != nil {
 		if herrors.IsNotExist(err) {
 			return 0, nil
@@ -205,9 +133,5 @@ func (c *Cache) pruneRootDir(dirname string, force bool) (int, error) {
 		return 0, nil
 	}

-	if c.cfg.isReadOnly {
-		return hugofs.MakeReadableAndRemoveAllModulePkgDir(c.Fs, dirname)
-	}
-
-	return 1, c.Fs.RemoveAll(dirname)
+	return hugofs.MakeReadableAndRemoveAllModulePkgDir(c.Fs, c.pruneAllRootDir)
 }
@@ -16,83 +16,20 @@ package filecache_test
 import (
 	"fmt"
 	"testing"
-	"testing/synctest"
 	"time"

 	"github.com/gohugoio/hugo/cache/filecache"
-	"github.com/gohugoio/hugo/htesting"
 	"github.com/spf13/afero"

 	qt "github.com/frankban/quicktest"
 )

-// A cache entry created before Hugo started lowercasing content paths in v0.123
-// (e.g. _gen/images/MyBundle) is on a case-insensitive filesystem the same file as
-// the lowercased cache key used today, and must not be pruned.
-// See issue 15101.
-func TestPruneCacheEntryWithOtherCase(t *testing.T) {
-	t.Parallel()
-	c := qt.New(t)
-
-	dir := t.TempDir()
-	if isCaseInsensitive, err := htesting.IsCaseInsensitiveFs(dir); err != nil {
-		t.Fatal(err)
-	} else if !isCaseInsensitive {
-		t.Skip("skip test on case-sensitive filesystem")
-	}
-
-	fs := afero.NewBasePathFs(afero.NewOsFs(), dir)
-	newCache := func() *filecache.Cache {
-		return filecache.NewCache(fs, filecache.FileCacheConfig{Dir: "cache", MaxAge: -1})
-	}
-
-	c.Assert(newCache().SetBytes("MyBundle/i1", []byte("abc")), qt.IsNil)
-
-	cache := newCache()
-	_, b, err := cache.GetOrCreateBytes("mybundle/i1", func() ([]byte, error) {
-		return []byte("def"), nil
-	})
-	c.Assert(err, qt.IsNil)
-	c.Assert(string(b), qt.Equals, "abc")
-
-	count, err := cache.Prune(false)
-	c.Assert(err, qt.IsNil)
-	c.Assert(count, qt.Equals, 0)
-	c.Assert(cache.GetString("MyBundle/i1"), qt.Equals, "abc")
-}
-
-// On a case-sensitive filesystem the entries above are distinct files,
-// and the one not used in this build should be pruned.
-func TestPruneCacheEntryWithOtherCaseCaseSensitiveFs(t *testing.T) {
-	t.Parallel()
-	c := qt.New(t)
-
-	fs := afero.NewMemMapFs()
-	cache := filecache.NewCache(fs, filecache.FileCacheConfig{Dir: "cache", MaxAge: -1})
-
-	c.Assert(cache.SetBytes("MyBundle/i1", []byte("abc")), qt.IsNil)
-
-	cache = filecache.NewCache(fs, filecache.FileCacheConfig{Dir: "cache", MaxAge: -1})
-	_, b, err := cache.GetOrCreateBytes("mybundle/i1", func() ([]byte, error) {
-		return []byte("def"), nil
-	})
-	c.Assert(err, qt.IsNil)
-	c.Assert(string(b), qt.Equals, "def")
-
-	count, err := cache.Prune(false)
-	c.Assert(err, qt.IsNil)
-	c.Assert(count, qt.Equals, 1)
-	c.Assert(cache.GetString("MyBundle/i1"), qt.Equals, "")
-	c.Assert(cache.GetString("mybundle/i1"), qt.Equals, "def")
-}
-
 func TestPrune(t *testing.T) {
 	t.Parallel()

-	synctest.Test(t, func(t *testing.T) {
-		c := qt.New(t)
+	c := qt.New(t)

-		configStr := `
+	configStr := `
 resourceDir = "myresources"
 contentDir = "content"
 dataDir = "data"
@@ -102,9 +39,12 @@ assetDir = "assets"
 archeTypedir = "archetypes"

 [caches]
-[caches.misc]
+[caches.getjson]
 maxAge = "200ms"
 dir = "/cache/c"
+[caches.getcsv]
+maxAge = "200ms"
+dir = "/cache/d"
 [caches.assets]
 maxAge = "200ms"
 dir = ":resourceDir/_gen"
@@ -113,64 +53,59 @@ maxAge = "200ms"
 dir = ":resourceDir/_gen"
 `

-		for _, name := range []string{filecache.CacheKeyAssets, filecache.CacheKeyImages} {
-			msg := qt.Commentf("cache: %s", name)
-			fs := afero.NewMemMapFs()
-			p := newPathsSpec(t, fs, configStr)
-			fileCachConfig := p.Cfg.GetConfigSection("caches").(filecache.Configs)
-			caches, err := filecache.NewCaches(fileCachConfig, fs)
-			c.Assert(err, qt.IsNil)
-			caches.SetResourceFs(fs)
-			cache := caches[name]
-			for i := range 10 {
-				id := fmt.Sprintf("i%d", i)
-				cache.GetOrCreateBytes(id, func() ([]byte, error) {
-					return []byte("abc"), nil
-				})
-				if i == 4 {
-					// This will expire the first 5
-					time.Sleep(201 * time.Millisecond)
-				}
-			}
-
-			count, err := caches.Prune()
-			c.Assert(err, qt.IsNil)
-			c.Assert(count, qt.Equals, 5, msg)
-
-			for i := range 10 {
-				id := fmt.Sprintf("i%d", i)
-				v := cache.GetString(id)
-				if i < 5 {
-					c.Assert(v, qt.Equals, "")
-				} else {
-					c.Assert(v, qt.Equals, "abc")
-				}
-			}
-
-			caches, err = filecache.NewCaches(fileCachConfig, fs)
-			c.Assert(err, qt.IsNil)
-			caches.SetResourceFs(fs)
-			cache = caches[name]
-			// Touch one and then prune.
-			cache.GetOrCreateBytes("i5", func() ([]byte, error) {
+	for _, name := range []string{filecache.CacheKeyGetCSV, filecache.CacheKeyGetJSON, filecache.CacheKeyAssets, filecache.CacheKeyImages} {
+		msg := qt.Commentf("cache: %s", name)
+		p := newPathsSpec(t, afero.NewMemMapFs(), configStr)
+		caches, err := filecache.NewCaches(p)
+		c.Assert(err, qt.IsNil)
+		cache := caches[name]
+		for i := 0; i < 10; i++ {
+			id := fmt.Sprintf("i%d", i)
+			cache.GetOrCreateBytes(id, func() ([]byte, error) {
 				return []byte("abc"), nil
 			})
-
-			count, err = caches.Prune()
-			c.Assert(err, qt.IsNil)
-			c.Assert(count, qt.Equals, 4)
-
-			// Now only the i5 should be left.
-			for i := range 10 {
-				id := fmt.Sprintf("i%d", i)
-				v := cache.GetString(id)
-				if i != 5 {
-					c.Assert(v, qt.Equals, "")
-				} else {
-					c.Assert(v, qt.Equals, "abc")
-				}
+			if i == 4 {
+				// This will expire the first 5
+				time.Sleep(201 * time.Millisecond)
 			}
-
 		}
-	})
+
+		count, err := caches.Prune()
+		c.Assert(err, qt.IsNil)
+		c.Assert(count, qt.Equals, 5, msg)
+
+		for i := 0; i < 10; i++ {
+			id := fmt.Sprintf("i%d", i)
+			v := cache.GetString(id)
+			if i < 5 {
+				c.Assert(v, qt.Equals, "")
+			} else {
+				c.Assert(v, qt.Equals, "abc")
+			}
+		}
+
+		caches, err = filecache.NewCaches(p)
+		c.Assert(err, qt.IsNil)
+		cache = caches[name]
+		// Touch one and then prune.
+		cache.GetOrCreateBytes("i5", func() ([]byte, error) {
+			return []byte("abc"), nil
+		})
+
+		count, err = caches.Prune()
+		c.Assert(err, qt.IsNil)
+		c.Assert(count, qt.Equals, 4)
+
+		// Now only the i5 should be left.
+		for i := 0; i < 10; i++ {
+			id := fmt.Sprintf("i%d", i)
+			v := cache.GetString(id)
+			if i != 5 {
+				c.Assert(v, qt.Equals, "")
+			} else {
+				c.Assert(v, qt.Equals, "abc")
+			}
+		}
+
+	}
 }
@@ -22,8 +22,6 @@ import (
 	"testing"
 	"time"

-	"github.com/gohugoio/hugo/htesting"
-
 	"github.com/gohugoio/hugo/cache/filecache"
 	"github.com/gohugoio/hugo/common/hugio"
 	"github.com/gohugoio/hugo/config"
@@ -66,7 +64,7 @@ assetDir = "assets"
 archeTypedir = "archetypes"

 [caches]
-[caches.misc]
+[caches.getJSON]
 maxAge = "10h"
 dir = ":cacheDir/c"

@@ -80,13 +78,11 @@ dir = ":cacheDir/c"
 		configStr = strings.Replace(configStr, "\\", winPathSep, -1)

 		p := newPathsSpec(t, osfs, configStr)
-		fileCachConfig := p.Cfg.GetConfigSection("caches").(filecache.Configs)

-		caches, err := filecache.NewCaches(fileCachConfig, p.Fs.Source)
+		caches, err := filecache.NewCaches(p)
 		c.Assert(err, qt.IsNil)
-		caches.SetResourceFs(p.SourceFs)

-		cache := caches.Get("Misc")
+		cache := caches.Get("GetJSON")
 		c.Assert(cache, qt.Not(qt.IsNil))

 		cache = caches.Get("Images")
@@ -108,8 +104,8 @@ dir = ":cacheDir/c"
 			return []byte("bcd"), nil
 		}

-		for _, ca := range []*filecache.Cache{caches.ImageCache(), caches.AssetsCache()} {
-			for range 2 {
+		for _, ca := range []*filecache.Cache{caches.ImageCache(), caches.AssetsCache(), caches.GetJSONCache(), caches.GetCSVCache()} {
+			for i := 0; i < 2; i++ {
 				info, r, err := ca.GetOrCreate("a", rf("abc"))
 				c.Assert(err, qt.IsNil)
 				c.Assert(r, qt.Not(qt.IsNil))
@@ -136,6 +132,8 @@ dir = ":cacheDir/c"
 			}
 		}

+		c.Assert(caches.Get("getJSON"), qt.Not(qt.IsNil))
+
 		info, w, err := caches.ImageCache().WriteCloser("mykey")
 		c.Assert(err, qt.IsNil)
 		c.Assert(info.Name, qt.Equals, "mykey")
@@ -151,7 +149,7 @@ dir = ":cacheDir/c"
 		r.Close()
 		c.Assert(string(b), qt.Equals, "Hugo is great!")

-		info, b, err = caches.ImageCache().GetItemBytes("mykey")
+		info, b, err = caches.ImageCache().GetBytes("mykey")
 		c.Assert(err, qt.IsNil)
 		c.Assert(info.Name, qt.Equals, "mykey")
 		c.Assert(string(b), qt.Equals, "Hugo is great!")
@@ -160,7 +158,6 @@ dir = ":cacheDir/c"
 }

 func TestFileCacheConcurrent(t *testing.T) {
-	htesting.SkipSlowTestUnlessCI(t)
 	t.Parallel()

 	c := qt.New(t)
@@ -175,19 +172,18 @@ assetDir = "assets"
 archeTypedir = "archetypes"

 [caches]
-[caches.misc]
+[caches.getjson]
 maxAge = "1s"
 dir = "/cache/c"

 `

 	p := newPathsSpec(t, afero.NewMemMapFs(), configStr)
-	fileCachConfig := p.Cfg.GetConfigSection("caches").(filecache.Configs)
-	caches, err := filecache.NewCaches(fileCachConfig, p.Fs.Source)
-	c.Assert(err, qt.IsNil)
-	caches.SetResourceFs(p.Fs.Source)

-	const cacheName = "misc"
+	caches, err := filecache.NewCaches(p)
+	c.Assert(err, qt.IsNil)
+
+	const cacheName = "getjson"

 	filenameData := func(i int) (string, string) {
 		data := fmt.Sprintf("data: %d", i)
@@ -197,11 +193,11 @@ dir = "/cache/c"

 	var wg sync.WaitGroup

-	for i := range 50 {
+	for i := 0; i < 50; i++ {
 		wg.Add(1)
 		go func(i int) {
 			defer wg.Done()
-			for range 20 {
+			for j := 0; j < 20; j++ {
 				ca := caches.Get(cacheName)
 				c.Assert(ca, qt.Not(qt.IsNil))
 				filename, data := filenameData(i)
@@ -252,12 +248,7 @@ func TestFileCacheReadOrCreateErrorInRead(t *testing.T) {
 		}
 	}

-	cfg := filecache.FileCacheConfig{
-		MaxAge: 100 * time.Hour,
-		Dir:    "cache/c",
-	}
-
-	cache := filecache.NewCache(afero.NewMemMapFs(), cfg)
+	cache := filecache.NewCache(afero.NewMemMapFs(), 100*time.Hour, "")

 	const id = "a32"

@@ -279,7 +270,7 @@ func newPathsSpec(t *testing.T, fs afero.Fs, configStr string) *helpers.PathSpec
 	cfg, err := config.FromConfigString(configStr, "toml")
 	c.Assert(err, qt.IsNil)
 	acfg := testconfig.GetTestConfig(fs, cfg)
-	p, err := helpers.NewPathSpec(hugofs.NewFrom(fs, acfg.BaseConfig()), acfg, nil, nil)
+	p, err := helpers.NewPathSpec(hugofs.NewFrom(fs, acfg.BaseConfig()), acfg, nil)
 	c.Assert(err, qt.IsNil)
 	return p
 }
@@ -25,8 +25,6 @@ import (

 // DefaultConfig holds the default configuration for the HTTP cache.
 var DefaultConfig = Config{
-	RespectCacheControlNoStoreInRequest:  true,
-	RespectCacheControlNoStoreInResponse: false,
 	Cache: Cache{
 		For: GlobMatcher{
 			Excludes: []string{"**"},
@@ -44,13 +42,7 @@ var DefaultConfig = Config{

 // Config holds the configuration for the HTTP cache.
 type Config struct {
-	// When enabled and there's a Cache-Control: no-store directive in the request, response will never be stored in disk cache.
-	RespectCacheControlNoStoreInRequest bool
-
-	// When enabled and there's a Cache-Control: no-store directive in the response, response will never be stored in disk cache.
-	RespectCacheControlNoStoreInResponse bool
-
-	// Enables HTTP cache behavior (RFC 9111) for these resources.
+	// Configures the HTTP cache behaviour (RFC 9111).
 	// When this is not enabled for a resource, Hugo will go straight to the file cache.
 	Cache Cache

@@ -60,14 +52,12 @@ type Config struct {
 }

 type Cache struct {
-	// Enable HTTP cache behavior (RFC 9111) for these resources.
+	// Enable HTTP cache behaviour (RFC 9111) for these rsources.
 	For GlobMatcher
 }

 func (c *Config) Compile() (ConfigCompiled, error) {
-	cc := ConfigCompiled{
-		Base: *c,
-	}
+	var cc ConfigCompiled

 	p, err := c.Cache.For.CompilePredicate()
 	if err != nil {
@@ -132,12 +122,7 @@ type GlobMatcher struct {
 	Includes []string
 }

-func (gm GlobMatcher) IsZero() bool {
-	return len(gm.Includes) == 0 && len(gm.Excludes) == 0
-}
-
 type ConfigCompiled struct {
-	Base        Config
 	For         predicate.P[string]
 	PollConfigs []PollConfigCompiled
 }
@@ -170,19 +155,16 @@ func (p PollConfigCompiled) IsZero() bool {
 }

 func (gm *GlobMatcher) CompilePredicate() (func(string) bool, error) {
-	if gm.IsZero() {
-		panic("no includes or excludes")
-	}
-	var b predicate.PR[string]
+	var p predicate.P[string]
 	for _, include := range gm.Includes {
 		g, err := glob.Compile(include, '/')
 		if err != nil {
 			return nil, err
 		}
-		fn := func(s string) predicate.Match {
-			return predicate.BoolMatch(g.Match(s))
+		fn := func(s string) bool {
+			return g.Match(s)
 		}
-		b = b.Or(fn)
+		p = p.Or(fn)
 	}

 	for _, exclude := range gm.Excludes {
@@ -190,16 +172,16 @@ func (gm *GlobMatcher) CompilePredicate() (func(string) bool, error) {
 		if err != nil {
 			return nil, err
 		}
-		fn := func(s string) predicate.Match {
-			return predicate.BoolMatch(!g.Match(s))
+		fn := func(s string) bool {
+			return !g.Match(s)
 		}
-		b = b.And(fn)
+		p = p.And(fn)
 	}

-	return b.BoolFunc(), nil
+	return p, nil
 }

-func DecodeConfig(_ config.BaseConfig, m map[string]any) (Config, error) {
+func DecodeConfig(bcfg config.BaseConfig, m map[string]any) (Config, error) {
 	if len(m) == 0 {
 		return DefaultConfig, nil
 	}
@@ -221,20 +203,5 @@ func DecodeConfig(_ config.BaseConfig, m map[string]any) (Config, error) {
 		return c, err
 	}

-	if c.Cache.For.IsZero() {
-		c.Cache.For = DefaultConfig.Cache.For
-	}
-
-	for pci := range c.Polls {
-		if c.Polls[pci].For.IsZero() {
-			c.Polls[pci].For = DefaultConfig.Cache.For
-			c.Polls[pci].Disable = true
-		}
-	}
-
-	if len(c.Polls) == 0 {
-		c.Polls = DefaultConfig.Polls
-	}
-
 	return c, nil
 }
@@ -22,8 +22,6 @@ import (
 )

 func TestConfigCustom(t *testing.T) {
-	t.Parallel()
-
 	files := `
 -- hugo.toml --
 [httpcache]
@@ -53,8 +51,6 @@ includes = ["**gohugo.io**"]
 }

 func TestConfigDefault(t *testing.T) {
-	t.Parallel()
-
 	files := `
 -- hugo.toml --
 `
@@ -66,30 +62,3 @@ func TestConfigDefault(t *testing.T) {
 	b.Assert(compiled.For("https://gohugo.io/foo.jpg"), qt.IsFalse)
 	b.Assert(compiled.PollConfigFor("https://gohugo.io/foo.jpg").Config.Disable, qt.IsTrue)
 }
-
-func TestConfigPollsOnly(t *testing.T) {
-	t.Parallel()
-	files := `
-- hugo.toml --
-[httpcache]
-[[httpcache.polls]]
-low = "5s"
-high = "32s"
-[httpcache.polls.for]
-includes = ["**gohugo.io**"]
-		
-	
-`
-
-	b := hugolib.Test(t, files)
-
-	compiled := b.H.Configs.Base.C.HTTPCache
-
-	b.Assert(compiled.For("https://gohugo.io/posts.json"), qt.IsFalse)
-	b.Assert(compiled.For("https://gohugo.io/foo.jpg"), qt.IsFalse)
-
-	pc := compiled.PollConfigFor("https://gohugo.io/foo.jpg")
-	b.Assert(pc.Config.Low, qt.Equals, 5*time.Second)
-	b.Assert(pc.Config.High, qt.Equals, 32*time.Second)
-	b.Assert(compiled.PollConfigFor("https://example.com/foo.jpg").IsZero(), qt.IsTrue)
-}
@@ -17,7 +17,6 @@ import (
 	"testing"

 	qt "github.com/frankban/quicktest"
-	"github.com/gohugoio/hugo/config"
 )

 func TestGlobMatcher(t *testing.T) {
@@ -41,33 +40,3 @@ func TestGlobMatcher(t *testing.T) {
 	c.Assert(p("foo/bar/foo.css"), qt.IsFalse)
 	c.Assert(p("foo/bar/foo.xml"), qt.IsTrue)
 }
-
-func TestDefaultConfig(t *testing.T) {
-	c := qt.New(t)
-
-	_, err := DefaultConfig.Compile()
-	c.Assert(err, qt.IsNil)
-}
-
-func TestDecodeConfigInjectsDefaultAndCompiles(t *testing.T) {
-	c := qt.New(t)
-
-	cfg, err := DecodeConfig(config.BaseConfig{}, map[string]any{})
-	c.Assert(err, qt.IsNil)
-	c.Assert(cfg, qt.DeepEquals, DefaultConfig)
-
-	_, err = cfg.Compile()
-	c.Assert(err, qt.IsNil)
-
-	cfg, err = DecodeConfig(config.BaseConfig{}, map[string]any{
-		"cache": map[string]any{
-			"polls": []map[string]any{
-				{"disable": true},
-			},
-		},
-	})
-	c.Assert(err, qt.IsNil)
-
-	_, err = cfg.Compile()
-	c.Assert(err, qt.IsNil)
-}
@@ -1,89 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Default to all packages if none specified
-PACKAGES="${1:-./...}"
-
-echo "==> Checking packages: $PACKAGES"
-
-# Timing arrays
-declare -a STEP_NAMES
-declare -a STEP_TIMES
-
-time_step() {
-    local name="$1"
-    shift
-    local start=$(date +%s.%N)
-    "$@"
-    local end=$(date +%s.%N)
-    local elapsed=$(echo "$end - $start" | bc)
-    STEP_NAMES+=("$name")
-    STEP_TIMES+=("$elapsed")
-}
-
-# Check gofmt
-run_gofmt() {
-    echo "==> Running gofmt..."
-    # Convert package pattern to path (e.g., ./hugolib/... -> ./hugolib)
-    local path="${PACKAGES%/...}"
-    GOFMT_OUTPUT=$(gofmt -l "$path" 2>&1) || true
-    if [ -n "$GOFMT_OUTPUT" ]; then
-        echo "gofmt found issues in:"
-        echo "$GOFMT_OUTPUT"
-        exit 1
-    fi
-    echo "    OK"
-}
-
-# Run staticcheck
-run_staticcheck() {
-    local staticcheck_bin
-    if command -v staticcheck &> /dev/null; then
-        staticcheck_bin=$(command -v staticcheck)
-    else
-        echo "==> Installing staticcheck..."
-        go install honnef.co/go/tools/cmd/staticcheck@latest
-        staticcheck_bin="$(go env GOBIN)"
-        if [ -z "$staticcheck_bin" ]; then
-            staticcheck_bin="$(go env GOPATH)/bin"
-        fi
-        staticcheck_bin="$staticcheck_bin/staticcheck"
-    fi
-    echo "==> Running staticcheck..."
-    "$staticcheck_bin" $PACKAGES
-    echo "    OK"
-}
-
-# Run tests
-run_tests() {
-    echo "==> Running tests..."
-    local output
-    if ! output=$(go test -failfast $PACKAGES 2>&1); then
-        echo "$output"
-        exit 1
-    fi
-    echo "    OK"
-}
-
-# Run all steps with timing
-TOTAL_START=$(date +%s.%N)
-
-time_step "gofmt" run_gofmt
-time_step "staticcheck" run_staticcheck
-time_step "tests" run_tests
-
-TOTAL_END=$(date +%s.%N)
-TOTAL_ELAPSED=$(echo "$TOTAL_END - $TOTAL_START" | bc)
-
-# Print timing summary
-echo ""
-echo "==> All checks passed!"
-echo ""
-echo "Timing summary:"
-echo "---------------"
-for i in "${!STEP_NAMES[@]}"; do
-    printf "  %-15s %6.2fs\n" "${STEP_NAMES[$i]}" "${STEP_TIMES[$i]}"
-done
-echo "---------------"
-printf "  %-15s %6.2fs\n" "Total" "$TOTAL_ELAPSED"
@@ -26,7 +26,6 @@ import (
 	"path/filepath"
 	"reflect"
 	"regexp"
-	"slices"
 	"sort"
 	"strings"
 	"sync"
@@ -73,7 +72,7 @@ func (c *Inspector) MethodsFromTypes(include []reflect.Type, exclude []reflect.T
 	nameAndPackage := func(t reflect.Type) (string, string) {
 		var name, pkg string

-		isPointer := t.Kind() == reflect.Pointer
+		isPointer := t.Kind() == reflect.Ptr

 		if isPointer {
 			t = t.Elem()
@@ -103,7 +102,9 @@ func (c *Inspector) MethodsFromTypes(include []reflect.Type, exclude []reflect.T
 	}

 	for _, t := range include {
-		for m := range t.Methods() {
+		for i := 0; i < t.NumMethod(); i++ {
+
+			m := t.Method(i)
 			if excludes[m.Name] || seen[m.Name] {
 				continue
 			}
@@ -121,7 +122,7 @@ func (c *Inspector) MethodsFromTypes(include []reflect.Type, exclude []reflect.T

 			method := Method{Owner: t, OwnerName: ownerName, Name: m.Name}

-			for i := range numIn {
+			for i := 0; i < numIn; i++ {
 				in := m.Type.In(i)

 				name, pkg := nameAndPackage(in)
@@ -136,7 +137,7 @@ func (c *Inspector) MethodsFromTypes(include []reflect.Type, exclude []reflect.T
 			numOut := m.Type.NumOut()

 			if numOut > 0 {
-				for i := range numOut {
+				for i := 0; i < numOut; i++ {
 					out := m.Type.Out(i)
 					name, pkg := nameAndPackage(out)

@@ -303,7 +304,7 @@ func (m Method) inOutStr() string {
 	}

 	args := make([]string, len(m.In))
-	for i := range args {
+	for i := 0; i < len(args); i++ {
 		args[i] = fmt.Sprintf("arg%d", i)
 	}
 	return "(" + strings.Join(args, ", ") + ")"
@@ -315,7 +316,7 @@ func (m Method) inStr() string {
 	}

 	args := make([]string, len(m.In))
-	for i := range args {
+	for i := 0; i < len(args); i++ {
 		args[i] = fmt.Sprintf("arg%d %s", i, m.In[i])
 	}
 	return "(" + strings.Join(args, ", ") + ")"
@@ -338,7 +339,7 @@ func (m Method) outStrNamed() string {
 	}

 	outs := make([]string, len(m.Out))
-	for i := range outs {
+	for i := 0; i < len(outs); i++ {
 		outs[i] = fmt.Sprintf("o%d %s", i, m.Out[i])
 	}

@@ -434,7 +435,7 @@ func (m Methods) ToMarshalJSON(receiver, pkgPath string, excludes ...string) (st
 		// Exclude self
 		for i, pkgImp := range pkgImports {
 			if pkgImp == pkgPath {
-				pkgImports = slices.Delete(pkgImports, i, i+1)
+				pkgImports = append(pkgImports[:i], pkgImports[i+1:]...)
 			}
 		}
 	}
@@ -26,9 +26,9 @@ import (

 func TestMethods(t *testing.T) {
 	var (
-		zeroIE     = reflect.TypeFor[IEmbed]()
-		zeroIEOnly = reflect.TypeFor[IEOnly]()
-		zeroI      = reflect.TypeFor[I]()
+		zeroIE     = reflect.TypeOf((*IEmbed)(nil)).Elem()
+		zeroIEOnly = reflect.TypeOf((*IEOnly)(nil)).Elem()
+		zeroI      = reflect.TypeOf((*I)(nil)).Elem()
 	)

 	dir, _ := os.Getwd()
@@ -39,7 +39,6 @@ import (

 	"github.com/gohugoio/hugo/common/hstrings"
 	"github.com/gohugoio/hugo/common/htime"
-	"github.com/gohugoio/hugo/common/hugo"
 	"github.com/gohugoio/hugo/common/loggers"
 	"github.com/gohugoio/hugo/common/paths"
 	"github.com/gohugoio/hugo/common/types"
@@ -98,15 +97,13 @@ type commonConfig struct {
 type configKey struct {
 	counter                    int32
 	ignoreModulesDoesNotExists bool
-	skipNpmCheck               bool
 }

 // This is the root command.
 type rootCommand struct {
-	Printf  func(format string, v ...any)
-	Println func(a ...any)
-	StdOut  io.Writer
-	StdErr  io.Writer
+	Printf  func(format string, v ...interface{})
+	Println func(a ...interface{})
+	Out     io.Writer

 	logger loggers.Logger

@@ -133,7 +130,6 @@ type rootCommand struct {
 	gc              bool
 	poll            string
 	forceSyncStatic bool
-	panicOnWarning  bool

 	// Profile flags (for debugging of performance problems)
 	cpuprofile   string
@@ -153,23 +149,6 @@ type rootCommand struct {
 	cfgDir  string
 }

-// resolveEnvironment sets r.environment if not already set.
-// server indicates whether the server command is running (defaults to development).
-func (r *rootCommand) resolveEnvironment(server bool) {
-	if r.environment != "" {
-		return
-	}
-	if env := os.Getenv("HUGO_ENVIRONMENT"); env != "" {
-		r.environment = env
-	} else if env := os.Getenv("HUGO_ENV"); env != "" {
-		r.environment = env
-	} else if server {
-		r.environment = hugo.EnvironmentDevelopment
-	} else {
-		r.environment = hugo.EnvironmentProduction
-	}
-}
-
 func (r *rootCommand) isVerbose() bool {
 	return r.logger.Level() <= logg.LevelInfo
 }
@@ -214,7 +193,6 @@ func (r *rootCommand) ConfigFromConfig(key configKey, oldConf *commonConfig) (*c
 				Logger:                   r.logger,
 				Environment:              r.environment,
 				IgnoreModuleDoesNotExist: key.ignoreModulesDoesNotExists,
-				SkipNpmCheck:             key.skipNpmCheck,
 			},
 		)
 		if err != nil {
@@ -241,7 +219,6 @@ func (r *rootCommand) ConfigFromProvider(key configKey, cfg config.Provider) (*c
 	if cfg == nil {
 		panic("cfg must be set")
 	}
-	r.resolveEnvironment(false)
 	cc, _, err := r.commonConfigs.GetOrCreate(key, func(key configKey) (*commonConfig, error) {
 		var dir string
 		if r.source != "" {
@@ -272,7 +249,6 @@ func (r *rootCommand) ConfigFromProvider(key configKey, cfg config.Provider) (*c
 				Environment:              r.environment,
 				Logger:                   r.logger,
 				IgnoreModuleDoesNotExist: key.ignoreModulesDoesNotExists,
-				SkipNpmCheck:             key.skipNpmCheck,
 			},
 		)
 		if err != nil {
@@ -354,9 +330,6 @@ func (r *rootCommand) ConfigFromProvider(key configKey, cfg config.Provider) (*c
 }

 func (r *rootCommand) HugFromConfig(conf *commonConfig) (*hugolib.HugoSites, error) {
-	if conf == nil {
-		return nil, fmt.Errorf("conf must be set")
-	}
 	k := configKey{counter: r.configVersionID.Load()}
 	h, _, err := r.hugoSites.GetOrCreate(k, func(key configKey) (*hugolib.HugoSites, error) {
 		depsCfg := r.newDepsConfig(conf)
@@ -383,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 {
@@ -427,7 +400,9 @@ func (r *rootCommand) Run(ctx context.Context, cd *simplecobra.Commandeer, args

 	watchGroups := helpers.ExtractAndGroupRootPaths(watchDirs)

-	r.Printf("Watching for changes in %s\n", strings.Join(watchGroups, ", "))
+	for _, group := range watchGroups {
+		r.Printf("Watching for changes in %s\n", group)
+	}
 	watcher, err := b.newWatcher(r.poll, watchDirs...)
 	if err != nil {
 		return err
@@ -446,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 ...any) {
+	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 ...any) {
+	r.Println = func(a ...interface{}) {
 		if !r.quiet {
-			fmt.Fprintln(r.StdOut, a...)
+			fmt.Fprintln(r.Out, a...)
 		}
 	}
 	_, running := runner.Command.(*serverCommand)
@@ -471,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.SetGlobalLogger(r.logger)

 	r.changesFromBuild = make(chan []identity.Identity, 10)

@@ -511,18 +482,12 @@ func (r *rootCommand) createLogger(running bool) (loggers.Logger, error) {
 		}
 	}

-	var logHookLast func(e *logg.Entry) error
-	if r.panicOnWarning {
-		logHookLast = loggers.PanicOnWarningHook
-	}
-
 	optsLogger := loggers.Options{
 		DistinctLevel: logg.LevelWarn,
 		Level:         level,
-		StdOut:        r.StdOut,
-		StdErr:        r.StdErr,
+		Stdout:        r.Out,
+		Stderr:        r.Out,
 		StoreErrors:   running,
-		HandlerPost:   logHookLast,
 	}

 	return loggers.New(optsLogger), nil
@@ -549,8 +514,8 @@ func (r *rootCommand) initRootCommand(subCommandName string, cd *simplecobra.Com
 		commandName = subCommandName
 	}
 	cmd.Use = fmt.Sprintf("%s [flags]", commandName)
-	cmd.Short = "Build your project"
-	cmd.Long = `COMMAND_NAME is the main command, used to build your Hugo project.
+	cmd.Short = "Build your site"
+	cmd.Long = `COMMAND_NAME is the main command, used to build your Hugo site.

 Hugo is a Fast and Flexible Static Site Generator
 built with love by spf13 and friends in Go.
@@ -570,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)
@@ -613,19 +577,20 @@ func applyLocalFlagsBuild(cmd *cobra.Command, r *rootCommand) {
 	cmd.Flags().BoolP("buildDrafts", "D", false, "include content marked as draft")
 	cmd.Flags().BoolP("buildFuture", "F", false, "include content with publishdate in the future")
 	cmd.Flags().BoolP("buildExpired", "E", false, "include expired content")
-	cmd.Flags().BoolP("ignoreCache", "", false, "ignore the configured file caches")
+	cmd.Flags().BoolP("ignoreCache", "", false, "ignores the cache directory")
 	cmd.Flags().Bool("enableGitInfo", false, "add Git revision, date, author, and CODEOWNERS info to the pages")
 	cmd.Flags().StringP("layoutDir", "l", "", "filesystem path to layout directory")
 	_ = cmd.MarkFlagDirname("layoutDir")
 	cmd.Flags().BoolVar(&r.gc, "gc", false, "enable to run some cleanup tasks (remove unused cache files) after the build")
 	cmd.Flags().StringVar(&r.poll, "poll", "", "set this to a poll interval, e.g --poll 700ms, to use a poll based approach to watch for file system changes")
 	_ = cmd.RegisterFlagCompletionFunc("poll", cobra.NoFileCompletions)
-	cmd.Flags().BoolVar(&r.panicOnWarning, "panicOnWarning", false, "panic on first WARNING log")
+	cmd.Flags().Bool("panicOnWarning", false, "panic on first WARNING log")
 	cmd.Flags().Bool("templateMetrics", false, "display metrics about template executions")
 	cmd.Flags().Bool("templateMetricsHints", false, "calculate some improvement hints when combined with --templateMetrics")
 	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.")
@@ -651,14 +616,13 @@ func (r *rootCommand) timeTrack(start time.Time, name string) {
 }

 type simpleCommand struct {
-	use     string
-	name    string
-	short   string
-	long    string
-	aliases []string
-	run     func(ctx context.Context, cd *simplecobra.Commandeer, rootCmd *rootCommand, args []string) error
-	withc   func(cmd *cobra.Command, r *rootCommand)
-	initc   func(cd *simplecobra.Commandeer) error
+	use   string
+	name  string
+	short string
+	long  string
+	run   func(ctx context.Context, cd *simplecobra.Commandeer, rootCmd *rootCommand, args []string) error
+	withc func(cmd *cobra.Command, r *rootCommand)
+	initc func(cd *simplecobra.Commandeer) error

 	commands []simplecobra.Commander

@@ -685,7 +649,6 @@ func (c *simpleCommand) Init(cd *simplecobra.Commandeer) error {
 	cmd := cd.CobraCommand
 	cmd.Short = c.short
 	cmd.Long = c.long
-	cmd.Aliases = c.aliases
 	if c.use != "" {
 		cmd.Use = c.use
 	}
@@ -703,7 +666,7 @@ func (c *simpleCommand) PreRun(cd, runner *simplecobra.Commandeer) error {
 }

 func mapLegacyArgs(args []string) []string {
-	if len(args) > 1 && args[0] == "new" && !hstrings.EqualAny(args[1], "project", "site", "theme", "content") {
+	if len(args) > 1 && args[0] == "new" && !hstrings.EqualAny(args[1], "site", "theme", "content") {
 		// Insert "content" as the second argument
 		args = append(args[:1], append([]string{"content"}, args[1:]...)...)
 	}
@@ -23,9 +23,8 @@ import (
 	"time"

 	"github.com/bep/simplecobra"
-	"github.com/gohugoio/hugo/common/hmaps"
+	"github.com/gohugoio/hugo/common/maps"
 	"github.com/gohugoio/hugo/config/allconfig"
-	"github.com/gohugoio/hugo/hugolib/sitesmatrix"
 	"github.com/gohugoio/hugo/modules"
 	"github.com/gohugoio/hugo/parser"
 	"github.com/gohugoio/hugo/parser/metadecoders"
@@ -44,9 +43,8 @@ func newConfigCommand() *configCommand {
 type configCommand struct {
 	r *rootCommand

-	format    string
-	lang      string
-	printZero bool
+	format string
+	lang   string

 	commands []simplecobra.Commander
 }
@@ -72,7 +70,7 @@ func (c *configCommand) Run(ctx context.Context, cd *simplecobra.Commandeer, arg
 			return fmt.Errorf("language %q not found", c.lang)
 		}
 	} else {
-		config = conf.configs.LanguageConfigMap[conf.configs.Base.DefaultContentLanguage]
+		config = conf.configs.LanguageConfigSlice[0]
 	}

 	var buf bytes.Buffer
@@ -80,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
 	}

@@ -91,11 +89,11 @@ func (c *configCommand) Run(ctx context.Context, cd *simplecobra.Commandeer, arg
 		os.Stdout.Write(buf.Bytes())
 	default:
 		// Decode the JSON to a map[string]interface{} and then unmarshal it again to the correct format.
-		var m map[string]any
+		var m map[string]interface{}
 		if err := json.Unmarshal(buf.Bytes(), &m); err != nil {
 			return err
 		}
-		hmaps.ConvertFloat64WithNoDecimalsToInt(m)
+		maps.ConvertFloat64WithNoDecimalsToInt(m)
 		switch format {
 		case "yaml":
 			return parser.InterfaceToConfig(m, metadecoders.YAML, os.Stdout)
@@ -112,12 +110,11 @@ func (c *configCommand) Run(ctx context.Context, cd *simplecobra.Commandeer, arg
 func (c *configCommand) Init(cd *simplecobra.Commandeer) error {
 	c.r = cd.Root.Command.(*rootCommand)
 	cmd := cd.CobraCommand
-	cmd.Short = "Display project configuration"
-	cmd.Long = `Display project configuration, both default and custom settings.`
+	cmd.Short = "Display site configuration"
+	cmd.Long = `Display site configuration, both default and custom settings.`
 	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 (default is the default content language)")
-	cmd.Flags().BoolVar(&c.printZero, "printZero", false, `include config options with zero values (e.g. false, 0, "") in the output`)
+	cmd.Flags().StringVar(&c.lang, "lang", "", "the language to display config for. Defaults to the first language defined.")
 	_ = cmd.RegisterFlagCompletionFunc("lang", cobra.NoFileCompletions)
 	applyLocalFlagsBuildConfig(cmd, c.r)

@@ -129,9 +126,9 @@ func (c *configCommand) PreRun(cd, runner *simplecobra.Commandeer) error {
 }

 type configModMount struct {
-	Source string            `json:"source"`
-	Target string            `json:"target"`
-	Sites  sitesmatrix.Sites `json:"sites,omitzero"`
+	Source string `json:"source"`
+	Target string `json:"target"`
+	Lang   string `json:"lang,omitempty"`
 }

 type configModMounts struct {
@@ -147,7 +144,7 @@ func (m *configModMounts) MarshalJSON() ([]byte, error) {
 		mounts = append(mounts, configModMount{
 			Source: mount.Source,
 			Target: mount.Target,
-			Sites:  mount.Sites,
+			Lang:   mount.Lang,
 		})
 	}

@@ -18,12 +18,10 @@ import (
 	"context"
 	"fmt"
 	"path/filepath"
-	"slices"
 	"strings"
 	"time"

 	"github.com/bep/simplecobra"
-	"github.com/gohugoio/hugo/common/hugio"
 	"github.com/gohugoio/hugo/config"
 	"github.com/gohugoio/hugo/helpers"
 	"github.com/gohugoio/hugo/hugofs"
@@ -202,56 +200,6 @@ func (c *convertCommand) convertAndSavePage(p page.Page, site *hugolib.Site, tar
 	return nil
 }

-func (c *convertCommand) copyContentDirsForOutput(pagesBackedByFile page.Pages) error {
-	contentDirs := make(map[string]bool)
-	for _, p := range pagesBackedByFile {
-		filename := p.File().Filename()
-		contentDir := strings.TrimSuffix(filename, p.File().Path())
-		if contentDir == filename {
-			continue
-		}
-		contentDirs[filepath.Clean(contentDir)] = true
-	}
-
-	var contentDirList []string
-	for contentDir := range contentDirs {
-		contentDirList = append(contentDirList, contentDir)
-	}
-	slices.Sort(contentDirList)
-
-	outputDirAbs, err := filepath.Abs(c.outputDir)
-	if err != nil {
-		return fmt.Errorf("failed to resolve output path %q: %w", c.outputDir, err)
-	}
-
-	for _, contentDir := range contentDirList {
-		outputContentDirAbs := filepath.Join(outputDirAbs, filepath.Base(contentDir))
-
-		skipDirs := make(map[string]bool)
-		relToOutputDir, err := filepath.Rel(contentDir, outputDirAbs)
-		if err == nil && relToOutputDir != ".." && !strings.HasPrefix(relToOutputDir, ".."+string(filepath.Separator)) {
-			skipDirs[filepath.Clean(outputDirAbs)] = true
-		}
-		relToOutputContentDir, err := filepath.Rel(contentDir, outputContentDirAbs)
-		if err == nil && relToOutputContentDir != ".." && !strings.HasPrefix(relToOutputContentDir, ".."+string(filepath.Separator)) {
-			skipDirs[filepath.Clean(outputContentDirAbs)] = true
-		}
-
-		var shouldCopy func(filename string) bool
-		if len(skipDirs) > 0 {
-			shouldCopy = func(filename string) bool {
-				return !skipDirs[filepath.Clean(filename)]
-			}
-		}
-
-		if err := hugio.CopyDir(hugofs.Os, contentDir, outputContentDirAbs, shouldCopy); err != nil {
-			return fmt.Errorf("failed to copy %q to %q: %w", contentDir, outputContentDirAbs, err)
-		}
-	}
-
-	return nil
-}
-
 func (c *convertCommand) convertContents(format metadecoders.Format) error {
 	if c.outputDir == "" && !c.unsafe {
 		return newUserError("Unsafe operation not allowed, use --unsafe or set a different output path")
@@ -263,50 +211,16 @@ func (c *convertCommand) convertContents(format metadecoders.Format) error {

 	site := c.h.Sites[0]

-	workingDir := c.h.Sites[0].Deps.Conf.WorkingDir() + string(filepath.Separator)
-
-	isConvertible := func(p page.Page) bool {
-		// Skip pages not backed by a content file.
-		if p.File() == nil {
-			return false
-		}
-		// Skip content adapters.
-		if p.File().IsContentAdapter() {
-			return false
-		}
-		// Skip content files provided by modules, including vendored modules.
-		if !p.File().FileInfo().Meta().IsProject {
-			return false
-		}
-		// Skip content files in project mounts outside the working directory.
-		if !strings.HasPrefix(p.File().Filename(), workingDir) {
-			return false
-		}
-		return true
-	}
-
-	seen := make(map[string]bool)
 	var pagesBackedByFile page.Pages
-	for _, p := range c.h.Pages() {
-		if !isConvertible(p) {
+	for _, p := range site.AllPages() {
+		if p.File() == nil {
 			continue
 		}
-		filename := p.File().Filename()
-		if seen[filename] {
-			continue
-		}
-		seen[filename] = true
 		pagesBackedByFile = append(pagesBackedByFile, p)
 	}

-	if c.outputDir != "" {
-		if err := c.copyContentDirsForOutput(pagesBackedByFile); err != nil {
-			return err
-		}
-	}
-
 	site.Log.Println("processing", len(pagesBackedByFile), "content files")
-	for _, p := range pagesBackedByFile {
+	for _, p := range site.AllPages() {
 		if err := c.convertAndSavePage(p, site, format); err != nil {
 			return err
 		}
@@ -12,6 +12,7 @@
 // limitations under the License.

 //go:build withdeploy
+// +build withdeploy

 package commands

@@ -27,8 +28,8 @@ import (
 func newDeployCommand() simplecobra.Commander {
 	return &simpleCommand{
 		name:  "deploy",
-		short: "Deploy your project to a cloud provider",
-		long: `Deploy your project to a cloud provider
+		short: "Deploy your site to a cloud provider",
+		long: `Deploy your site to a cloud provider

 See https://gohugo.io/hosting-and-deployment/hugo-deploy/ for detailed
 documentation.
@@ -12,6 +12,7 @@
 // limitations under the License.

 //go:build !withdeploy
+// +build !withdeploy

 // Copyright 2024 The Hugo Authors. All rights reserved.
 //
@@ -23,17 +23,19 @@ import (
 	"path/filepath"
 	"strings"

+	"github.com/alecthomas/chroma/v2"
+	"github.com/alecthomas/chroma/v2/formatters/html"
+	"github.com/alecthomas/chroma/v2/styles"
 	"github.com/bep/simplecobra"
-	"github.com/goccy/go-yaml"
 	"github.com/gohugoio/hugo/common/hugo"
 	"github.com/gohugoio/hugo/docshelper"
 	"github.com/gohugoio/hugo/helpers"
 	"github.com/gohugoio/hugo/hugofs"
 	"github.com/gohugoio/hugo/hugolib"
-	"github.com/gohugoio/hugo/markup/highlight"
 	"github.com/gohugoio/hugo/parser"
 	"github.com/spf13/cobra"
 	"github.com/spf13/cobra/doc"
+	"gopkg.in/yaml.v2"
 )

 func newGenCommand() *genCommand {
@@ -44,15 +46,9 @@ func newGenCommand() *genCommand {

 		// Chroma flags.
 		style                  string
-		mode                   string
-		modeSelector           bool
-		classDark              string
-		classLight             string
 		highlightStyle         string
 		lineNumbersInlineStyle string
 		lineNumbersTableStyle  string
-		omitEmpty              bool
-		omitClassComments      bool
 	)

 	newChromaStyles := func() simplecobra.Commander {
@@ -61,54 +57,37 @@ func newGenCommand() *genCommand {
 			short: "Generate CSS stylesheet for the Chroma code highlighter",
 			long: `Generate CSS stylesheet for the Chroma code highlighter for a given style. This stylesheet is needed if markup.highlight.noClasses is disabled in config.

-See https://gohugo.io/quick-reference/syntax-highlighting-styles/ for a preview of the available styles.`,
+See https://xyproto.github.io/splash/docs/all.html for a preview of the available styles`,

 			run: func(ctx context.Context, cd *simplecobra.Commandeer, r *rootCommand, args []string) error {
-				if omitEmpty {
-					// See https://github.com/alecthomas/chroma/commit/5b2a4c5a26c503c79bc86ba3c4ae5b330028bd3d
-					hugo.Deprecate("--omitEmpty", "Flag is no longer needed, empty classes are now always omitted.", "v0.149.0")
+				builder := styles.Get(style).Builder()
+				if highlightStyle != "" {
+					builder.Add(chroma.LineHighlight, highlightStyle)
 				}
-				css, err := highlight.ChromaStylesCSS(highlight.ChromaStylesOptions{
-					Style:                  style,
-					Mode:                   mode,
-					ModeSelector:           modeSelector,
-					ClassDark:              classDark,
-					ClassLight:             classLight,
-					HighlightStyle:         highlightStyle,
-					LineNumbersInlineStyle: lineNumbersInlineStyle,
-					LineNumbersTableStyle:  lineNumbersTableStyle,
-					OmitClassComments:      omitClassComments,
-				})
+				if lineNumbersInlineStyle != "" {
+					builder.Add(chroma.LineNumbers, lineNumbersInlineStyle)
+				}
+				if lineNumbersTableStyle != "" {
+					builder.Add(chroma.LineNumbersTable, lineNumbersTableStyle)
+				}
+				style, err := builder.Build()
 				if err != nil {
 					return err
 				}
-
-				fmt.Printf("/* Generated using: hugo %s */\n\n", strings.Join(os.Args[1:], " "))
-				fmt.Print(css)
+				formatter := html.New(html.WithAllClasses(true))
+				formatter.WriteCSS(os.Stdout, style)
 				return nil
 			},
 			withc: func(cmd *cobra.Command, r *rootCommand) {
 				cmd.ValidArgsFunction = cobra.NoFileCompletions
-				cmd.PersistentFlags().StringVar(&style, "style", "friendly", "highlighter style")
+				cmd.PersistentFlags().StringVar(&style, "style", "friendly", "highlighter style (see https://xyproto.github.io/splash/docs/)")
 				_ = cmd.RegisterFlagCompletionFunc("style", cobra.NoFileCompletions)
-				cmd.PersistentFlags().StringVar(&mode, "mode", "", `style mode ("light", "dark")`)
-				_ = cmd.RegisterFlagCompletionFunc("mode", cobra.FixedCompletions([]string{"light", "dark"}, cobra.ShellCompDirectiveNoFileComp))
-				cmd.PersistentFlags().BoolVar(&modeSelector, "modeSelector", false, `scope selectors under a top level mode class, e.g. ".dark .chroma"`)
-				_ = cmd.RegisterFlagCompletionFunc("modeSelector", cobra.NoFileCompletions)
-				cmd.PersistentFlags().StringVar(&classDark, "classDark", "dark", `class name used by --modeSelector for dark styles`)
-				_ = cmd.RegisterFlagCompletionFunc("classDark", cobra.NoFileCompletions)
-				cmd.PersistentFlags().StringVar(&classLight, "classLight", "light", `class name used by --modeSelector for light styles`)
-				_ = cmd.RegisterFlagCompletionFunc("classLight", cobra.NoFileCompletions)
 				cmd.PersistentFlags().StringVar(&highlightStyle, "highlightStyle", "", `foreground and background colors for highlighted lines, e.g. --highlightStyle "#fff000 bg:#000fff"`)
 				_ = cmd.RegisterFlagCompletionFunc("highlightStyle", cobra.NoFileCompletions)
 				cmd.PersistentFlags().StringVar(&lineNumbersInlineStyle, "lineNumbersInlineStyle", "", `foreground and background colors for inline line numbers, e.g. --lineNumbersInlineStyle "#fff000 bg:#000fff"`)
 				_ = cmd.RegisterFlagCompletionFunc("lineNumbersInlineStyle", cobra.NoFileCompletions)
 				cmd.PersistentFlags().StringVar(&lineNumbersTableStyle, "lineNumbersTableStyle", "", `foreground and background colors for table line numbers, e.g. --lineNumbersTableStyle "#fff000 bg:#000fff"`)
 				_ = cmd.RegisterFlagCompletionFunc("lineNumbersTableStyle", cobra.NoFileCompletions)
-				cmd.PersistentFlags().BoolVar(&omitEmpty, "omitEmpty", false, `omit empty CSS rules (deprecated, no longer needed)`)
-				_ = cmd.RegisterFlagCompletionFunc("omitEmpty", cobra.NoFileCompletions)
-				cmd.PersistentFlags().BoolVar(&omitClassComments, "omitClassComments", false, `omit CSS class comment prefixes in the generated CSS`)
-				_ = cmd.RegisterFlagCompletionFunc("omitClassComments", cobra.NoFileCompletions)
 			},
 		}
 	}
@@ -163,7 +142,7 @@ url: %s

 		return &simpleCommand{
 			name:  "doc",
-			short: "Generate Markdown documentation for the Hugo CLI",
+			short: "Generate Markdown documentation for the Hugo CLI.",
 			long: `Generate Markdown documentation for the Hugo CLI.
 			This command is, mostly, used to create up-to-date documentation
 	of Hugo's command-line interface for https://gohugo.io/.
@@ -188,13 +167,13 @@ url: %s
 				prepender := func(filename string) string {
 					name := filepath.Base(filename)
 					base := strings.TrimSuffix(name, path.Ext(name))
-					url := "/docs/reference/commands/" + strings.ToLower(base) + "/"
+					url := "/commands/" + strings.ToLower(base) + "/"
 					return fmt.Sprintf(gendocFrontmatterTemplate, strings.Replace(base, "_", " ", -1), base, url)
 				}

 				linkHandler := func(name string) string {
 					base := strings.TrimSuffix(name, path.Ext(name))
-					return "/docs/reference/commands/" + strings.ToLower(base) + "/"
+					return "/commands/" + strings.ToLower(base) + "/"
 				}
 				r.Println("Generating Hugo command-line documentation in", gendocdir, "...")
 				doc.GenMarkdownTreeCustom(cd.CobraCommand.Root(), gendocdir, prepender, linkHandler)
@@ -215,7 +194,7 @@ url: %s
 	newDocsHelper := func() simplecobra.Commander {
 		return &simpleCommand{
 			name:  "docshelper",
-			short: "Generate some data files for the Hugo docs",
+			short: "Generate some data files for the Hugo docs.",

 			run: func(ctx context.Context, cd *simplecobra.Commandeer, r *rootCommand, args []string) error {
 				r.Println("Generate docs data to", docsHelperTarget)
@@ -236,7 +215,7 @@ url: %s
 				}

 				// Decode the JSON to a map[string]interface{} and then unmarshal it again to the correct format.
-				var m map[string]any
+				var m map[string]interface{}
 				if err := json.Unmarshal(buf.Bytes(), &m); err != nil {
 					return err
 				}
@@ -248,7 +227,7 @@ url: %s
 					return err
 				}
 				defer f.Close()
-				yamlEnc := yaml.NewEncoder(f, yaml.UseSingleQuote(true), yaml.AutoInt())
+				yamlEnc := yaml.NewEncoder(f)
 				if err := yamlEnc.Encode(m); err != nil {
 					return err
 				}
@@ -76,12 +76,12 @@ func flagsToCfgWithAdditionalConfigBase(cd *simplecobra.Commandeer, cfg config.P

 	// Flags with a different name in the config.
 	keyMap := map[string]string{
-		"minify":      "minify.minifyOutput",
+		"minify":      "minifyOutput",
 		"destination": "publishDir",
 		"editor":      "newContentEditor",
 	}

-	// Flags that we for some reason don't want to expose in the project config.
+	// Flags that we for some reason don't want to expose in the site config.
 	internalKeySet := map[string]bool{
 		"quiet":          true,
 		"verbose":        true,
@@ -27,15 +27,13 @@ import (
 	"sync/atomic"
 	"time"

-	"github.com/bep/debounce"
 	"github.com/bep/simplecobra"
 	"github.com/fsnotify/fsnotify"
 	"github.com/gohugoio/hugo/common/herrors"
-	"github.com/gohugoio/hugo/common/hmaps"
-	"github.com/gohugoio/hugo/common/hstrings"
 	"github.com/gohugoio/hugo/common/htime"
 	"github.com/gohugoio/hugo/common/hugo"
 	"github.com/gohugoio/hugo/common/loggers"
+	"github.com/gohugoio/hugo/common/maps"
 	"github.com/gohugoio/hugo/common/paths"
 	"github.com/gohugoio/hugo/common/terminal"
 	"github.com/gohugoio/hugo/common/types"
@@ -56,16 +54,15 @@ import (
 type hugoBuilder struct {
 	r *rootCommand

-	confmu  sync.Mutex
-	confOld *commonConfig
-	conf    *commonConfig
+	confmu sync.Mutex
+	conf   *commonConfig

 	// May be nil.
 	s *serverCommand

 	// Currently only set when in "fast render mode".
 	changeDetector *fileChangeDetector
-	visitedURLs    *types.EvictingQueue[string]
+	visitedURLs    *types.EvictingStringQueue

 	fullRebuildSem *semaphore.Weighted
 	debounce       func(f func())
@@ -95,27 +92,6 @@ func (c *hugoBuilder) withConf(fn func(conf *commonConfig)) {
 	fn(c.conf)
 }

-func (c *hugoBuilder) withConfOrOldConf(fn func(conf *commonConfig)) {
-	c.confmu.Lock()
-	defer c.confmu.Unlock()
-	if c.conf != nil {
-		fn(c.conf)
-	} else if c.confOld != nil {
-		fn(c.confOld)
-	}
-}
-
-func (c *hugoBuilder) withConfOrOldConfE(fn func(conf *commonConfig) error) error {
-	c.confmu.Lock()
-	defer c.confmu.Unlock()
-	if c.conf != nil {
-		return fn(c.conf)
-	} else if c.confOld != nil {
-		return fn(c.confOld)
-	}
-	return errConfigNotSet
-}
-
 type hugoBuilderErrState struct {
 	mu       sync.Mutex
 	paused   bool
@@ -166,7 +142,7 @@ func (c *hugoBuilder) getDirList() ([]string, error) {
 		return nil, err
 	}

-	return hstrings.UniqueStringsSorted(h.PathSpec.BaseFs.WatchFilenames()), nil
+	return helpers.UniqueStringsSorted(h.PathSpec.BaseFs.WatchFilenames()), nil
 }

 func (c *hugoBuilder) initCPUProfile() (func(), error) {
@@ -179,7 +155,6 @@ func (c *hugoBuilder) initCPUProfile() (func(), error) {
 		return nil, fmt.Errorf("failed to create CPU profile: %w", err)
 	}
 	if err := pprof.StartCPUProfile(f); err != nil {
-		f.Close()
 		return nil, fmt.Errorf("failed to start CPU profile: %w", err)
 	}
 	return func() {
@@ -367,7 +342,7 @@ func (c *hugoBuilder) newWatcher(pollIntervalStr string, dirList ...string) (*wa
 			case changes := <-c.r.changesFromBuild:
 				unlock, err := h.LockBuild()
 				if err != nil {
-					c.r.logger.Errorf("Failed to acquire a build lock: %s", err)
+					c.r.logger.Errorln("Failed to acquire a build lock: %s", err)
 					return
 				}
 				c.changeDetector.PrepareNew()
@@ -387,7 +362,7 @@ func (c *hugoBuilder) newWatcher(pollIntervalStr string, dirList ...string) (*wa
 			case evs := <-watcher.Events:
 				unlock, err := h.LockBuild()
 				if err != nil {
-					c.r.logger.Errorf("Failed to acquire a build lock: %s", err)
+					c.r.logger.Errorln("Failed to acquire a build lock: %s", err)
 					return
 				}
 				c.handleEvents(watcher, staticSyncer, evs, configSet)
@@ -487,15 +462,7 @@ func (c *hugoBuilder) copyStaticTo(sourceFs *filesystems.SourceFilesystem) (uint
 		infol.Logf("removing all files from destination that don't exist in static dirs")

 		syncer.DeleteFilter = func(f fsync.FileInfo) bool {
-			name := f.Name()
-
-			// Keep .gitignore and .gitattributes anywhere
-			if name == ".gitignore" || name == ".gitattributes" {
-				return true
-			}
-
-			// Keep Hugo's original dot-directory behavior
-			return f.IsDir() && strings.HasPrefix(name, ".")
+			return f.IsDir() && strings.HasPrefix(f.Name(), ".")
 		}
 	}
 	start := time.Now()
@@ -548,14 +515,6 @@ func (c *hugoBuilder) doWithPublishDirs(f func(sourceFs *filesystems.SourceFiles
 	return langCount, nil
 }

-func (c *hugoBuilder) progressIntermediate() {
-	terminal.ReportProgress(c.r.StdOut, terminal.ProgressIntermediate, 0)
-}
-
-func (c *hugoBuilder) progressHidden() {
-	terminal.ReportProgress(c.r.StdOut, terminal.ProgressHidden, 0)
-}
-
 func (c *hugoBuilder) fullBuild(noBuildLock bool) error {
 	var (
 		g         errgroup.Group
@@ -704,20 +663,7 @@ func (c *hugoBuilder) handleEvents(watcher *watcher.Batcher,
 	var n int
 	for _, ev := range evs {
 		keep := true
-		// Write and rename operations are often followed by CHMOD.
-		// There may be valid use cases for rebuilding the site on CHMOD,
-		// but that will require more complex logic than this simple conditional.
-		// On OS X this seems to be related to Spotlight, see:
-		// https://github.com/go-fsnotify/fsnotify/issues/15
-		// A workaround is to put your site(s) on the Spotlight exception list,
-		// but that may be a little mysterious for most end users.
-		// So, for now, we skip reload on CHMOD.
-		// We do have to check for WRITE though. On slower laptops a Chmod
-		// could be aggregated with other important events, and we still want
-		// to rebuild on those
-		if ev.Op == fsnotify.Chmod {
-			keep = false
-		} else if ev.Has(fsnotify.Create) || ev.Has(fsnotify.Write) {
+		if ev.Has(fsnotify.Create) || ev.Has(fsnotify.Write) {
 			if _, err := os.Stat(ev.Name); err != nil {
 				keep = false
 			}
@@ -859,7 +805,22 @@ func (c *hugoBuilder) handleEvents(watcher *watcher.Batcher,
 			continue
 		}

-		walkAdder := func(ctx context.Context, path string, f hugofs.FileMetaInfo) error {
+		// Write and rename operations are often followed by CHMOD.
+		// There may be valid use cases for rebuilding the site on CHMOD,
+		// but that will require more complex logic than this simple conditional.
+		// On OS X this seems to be related to Spotlight, see:
+		// https://github.com/go-fsnotify/fsnotify/issues/15
+		// A workaround is to put your site(s) on the Spotlight exception list,
+		// but that may be a little mysterious for most end users.
+		// So, for now, we skip reload on CHMOD.
+		// We do have to check for WRITE though. On slower laptops a Chmod
+		// could be aggregated with other important events, and we still want
+		// to rebuild on those
+		if ev.Op&(fsnotify.Chmod|fsnotify.Write|fsnotify.Create) == fsnotify.Chmod {
+			continue
+		}
+
+		walkAdder := func(path string, f hugofs.FileMetaInfo) error {
 			if f.IsDir() {
 				c.r.logger.Println("adding created directory to watchlist", path)
 				if err := watcher.Add(path); err != nil {
@@ -959,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
@@ -1003,7 +960,7 @@ func (c *hugoBuilder) handleEvents(watcher *watcher.Batcher,
 					lrl.Logf("no page to navigate to, force refresh")
 					livereload.ForceRefresh()
 				}
-			} else if len(otherChanges) > 0 || len(cssChanges) > 0 {
+			} else if len(otherChanges) > 0 {
 				if len(otherChanges) == 1 {
 					// Allow single changes to be refreshed without a full page reload.
 					pathToRefresh := h.PathSpec.RelURL(paths.ToSlashTrimLeading(otherChanges[0]), false)
@@ -1013,9 +970,6 @@ func (c *hugoBuilder) handleEvents(watcher *watcher.Batcher,
 					lrl.Logf("force refresh")
 					livereload.ForceRefresh()
 				}
-			} else {
-				lrl.Logf("force refresh")
-				livereload.ForceRefresh()
 			}

 			if len(cssChanges) > 0 {
@@ -1068,25 +1022,28 @@ func (c *hugoBuilder) hugoTry() *hugolib.HugoSites {
 }

 func (c *hugoBuilder) loadConfig(cd *simplecobra.Commandeer, running bool) error {
-	if terminal.PrintANSIColors(os.Stdout) {
-		defer c.progressHidden()
-		// If the configuration takes a while to load, we want to show some progress.
-		// This is typically loading of external modules.
-		d := debounce.New(500 * time.Millisecond)
-		d(func() {
-			c.progressIntermediate()
-		})
-		defer d(func() {})
-	}
-
 	cfg := config.New()
 	cfg.Set("renderToMemory", c.r.renderToMemory)
 	watch := c.r.buildWatch || (c.s != nil && c.s.serverWatch)
-	// We need to set the environment as early as possible because we need it to load the correct config.
-	c.r.resolveEnvironment(c.s != nil)
+	if c.r.environment == "" {
+		// We need to set the environment as early as possible because we need it to load the correct config.
+		// Check if the user has set it in env.
+		if env := os.Getenv("HUGO_ENVIRONMENT"); env != "" {
+			c.r.environment = env
+		} else if env := os.Getenv("HUGO_ENV"); env != "" {
+			c.r.environment = env
+		} else {
+			if c.s != nil {
+				// The server defaults to development.
+				c.r.environment = hugo.EnvironmentDevelopment
+			} else {
+				c.r.environment = hugo.EnvironmentProduction
+			}
+		}
+	}
 	cfg.Set("environment", c.r.environment)

-	cfg.Set("internal", hmaps.Params{
+	cfg.Set("internal", maps.Params{
 		"running":        running,
 		"watch":          watch,
 		"verbose":        c.r.isVerbose(),
@@ -1100,11 +1057,10 @@ func (c *hugoBuilder) loadConfig(cd *simplecobra.Commandeer, running bool) error

 	if len(conf.configs.LoadingInfo.ConfigFiles) == 0 {
 		//lint:ignore ST1005 end user message.
-		return errors.New("Unable to locate config file or config directory. Perhaps you need to create a new project.\nRun `hugo help new` for details.")
+		return errors.New("Unable to locate config file or config directory. Perhaps you need to create a new site.\nRun `hugo help new` for details.")
 	}

 	c.conf = conf
-	c.confOld = conf
 	if c.onConfigLoaded != nil {
 		if err := c.onConfigLoaded(false); err != nil {
 			return err
@@ -1143,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
 }

@@ -1159,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
 }
@@ -1168,9 +1124,8 @@ func (c *hugoBuilder) reloadConfig() error {
 	c.r.resetLogs()
 	c.r.configVersionID.Add(1)

-	if err := c.withConfOrOldConfE(func(conf *commonConfig) error {
+	if err := c.withConfE(func(conf *commonConfig) error {
 		oldConf := conf
-		c.conf = nil
 		newConf, err := c.r.ConfigFromConfig(configKey{counter: c.r.configVersionID.Load()}, conf)
 		if err != nil {
 			return err
@@ -29,9 +29,9 @@ import (
 	"unicode"

 	"github.com/bep/simplecobra"
-	"github.com/gohugoio/hugo/common/hmaps"
 	"github.com/gohugoio/hugo/common/htime"
 	"github.com/gohugoio/hugo/common/hugio"
+	"github.com/gohugoio/hugo/common/maps"
 	"github.com/gohugoio/hugo/helpers"
 	"github.com/gohugoio/hugo/hugofs"
 	"github.com/gohugoio/hugo/parser"
@@ -49,7 +49,7 @@ func newImportCommand() *importCommand {
 				name:  "jekyll",
 				short: "hugo import from Jekyll",
 				long: `hugo import from Jekyll.
-
+		
 Import from Jekyll requires two paths, e.g. ` + "`hugo import jekyll jekyll_root_path target_path`.",
 				run: func(ctx context.Context, cd *simplecobra.Commandeer, r *rootCommand, args []string) error {
 					if len(args) < 2 {
@@ -90,8 +90,8 @@ func (c *importCommand) Run(ctx context.Context, cd *simplecobra.Commandeer, arg

 func (c *importCommand) Init(cd *simplecobra.Commandeer) error {
 	cmd := cd.CobraCommand
-	cmd.Short = "Import a project from another system"
-	cmd.Long = `Import a project from another system.
+	cmd.Short = "Import a site from another system"
+	cmd.Long = `Import a site from another system.

 Import requires a subcommand, e.g. ` + "`hugo import jekyll jekyll_root_path target_path`."

@@ -105,7 +105,7 @@ func (c *importCommand) PreRun(cd, runner *simplecobra.Commandeer) error {
 }

 func (i *importCommand) createConfigFromJekyll(fs afero.Fs, inpath string, kind metadecoders.Format, jekyllConfig map[string]any) (err error) {
-	title := "My New Hugo Project"
+	title := "My New Hugo Site"
 	baseURL := "http://example.org/"

 	for key, value := range jekyllConfig {
@@ -127,7 +127,7 @@ func (i *importCommand) createConfigFromJekyll(fs afero.Fs, inpath string, kind
 	in := map[string]any{
 		"baseURL":            baseURL,
 		"title":              title,
-		"locale":             "en-us",
+		"languageCode":       "en-us",
 		"disablePathToLower": true,
 	}

@@ -159,7 +159,7 @@ func (c *importCommand) getJekyllDirInfo(fs afero.Fs, jekyllRoot string) (map[st
 	return postDirs, hasAnyPost
 }

-func (c *importCommand) createProjectFromJekyll(jekyllRoot, targetDir string, jekyllPostDirs map[string]bool) error {
+func (c *importCommand) createSiteFromJekyll(jekyllRoot, targetDir string, jekyllPostDirs map[string]bool) error {
 	fs := &afero.OsFs{}
 	if exists, _ := helpers.Exists(targetDir, fs); exists {
 		if isDir, _ := helpers.IsDir(targetDir, fs); !isDir {
@@ -190,7 +190,7 @@ func (c *importCommand) createProjectFromJekyll(jekyllRoot, targetDir string, je
 }

 func (c *importCommand) convertJekyllContent(m any, content string) (string, error) {
-	metadata, _ := hmaps.ToStringMapE(m)
+	metadata, _ := maps.ToStringMapE(m)

 	lines := strings.Split(content, "\n")
 	var resultLines []string
@@ -246,7 +246,7 @@ func (c *importCommand) convertJekyllContent(m any, content string) (string, err
 }

 func (c *importCommand) convertJekyllMetaData(m any, postName string, postDate time.Time, draft bool) (any, error) {
-	metadata, err := hmaps.ToStringMapE(m)
+	metadata, err := maps.ToStringMapE(m)
 	if err != nil {
 		return nil, err
 	}
@@ -419,7 +419,7 @@ func (c *importCommand) importFromJekyll(args []string) error {
 		return errors.New("abort: jekyll root contains neither posts nor drafts")
 	}

-	err = c.createProjectFromJekyll(jekyllRoot, targetDir, jekyllPostDirs)
+	err = c.createSiteFromJekyll(jekyllRoot, targetDir, jekyllPostDirs)
 	if err != nil {
 		return newUserError(err)
 	}
@@ -427,7 +427,7 @@ func (c *importCommand) importFromJekyll(args []string) error {
 	c.r.Println("Importing...")

 	fileCount := 0
-	callback := func(ctx context.Context, path string, fi hugofs.FileMetaInfo) error {
+	callback := func(path string, fi hugofs.FileMetaInfo) error {
 		if fi.IsDir() {
 			return nil
 		}
@@ -463,51 +463,44 @@ func (c *importCommand) importFromJekyll(args []string) error {
 	}

 	c.r.Println("Congratulations!", fileCount, "post(s) imported!")
-	c.r.Println("Now, start Hugo by yourself:")
+	c.r.Println("Now, start Hugo by yourself:\n")
 	c.r.Println("cd " + args[1])
 	c.r.Println("git init")
-	c.r.Println("git submodule add https://github.com/gohugo-ananke/ananke themes/ananke")
-	c.r.Println("echo \"theme: ananke\" >> hugo.yaml")
+	c.r.Println("git submodule add https://github.com/theNewDynamic/gohugo-theme-ananke themes/ananke")
+	c.r.Println("echo \"theme = 'ananke'\" > hugo.toml")
 	c.r.Println("hugo server")

 	return nil
 }

 func (c *importCommand) loadJekyllConfig(fs afero.Fs, jekyllRoot string) map[string]any {
-	for _, candidate := range []struct {
-		filename string
-		format   metadecoders.Format
-	}{
-		{"_config.yml", metadecoders.YAML},
-		{"_config.yaml", metadecoders.YAML},
-		{"_config.toml", metadecoders.TOML},
-	} {
-		path := filepath.Join(jekyllRoot, candidate.filename)
-		exists, err := helpers.Exists(path, fs)
-		if err != nil || !exists {
-			continue
-		}
+	path := filepath.Join(jekyllRoot, "_config.yml")

-		f, err := fs.Open(path)
-		if err != nil {
-			continue
-		}
-		b, err := io.ReadAll(f)
-		f.Close()
-		if err != nil {
-			continue
-		}
+	exists, err := helpers.Exists(path, fs)

-		m, err := metadecoders.Default.UnmarshalToMap(b, candidate.format)
-		if err != nil {
-			continue
-		}
-
-		return m
+	if err != nil || !exists {
+		c.r.Println("_config.yaml not found: Is the specified Jekyll root correct?")
+		return nil
 	}

-	c.r.Println("no config file (_config.yml, _config.yaml, or _config.toml) found: is the specified Jekyll root correct?")
-	return nil
+	f, err := fs.Open(path)
+	if err != nil {
+		return nil
+	}
+
+	defer f.Close()
+
+	b, err := io.ReadAll(f)
+	if err != nil {
+		return nil
+	}
+
+	m, err := metadecoders.Default.UnmarshalToMap(b, metadecoders.YAML)
+	if err != nil {
+		return nil
+	}
+
+	return m
 }

 func (c *importCommand) parseJekyllFilename(filename string) (time.Time, string, error) {
@@ -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{
@@ -21,13 +21,12 @@ import (

 	"github.com/bep/simplecobra"
 	"github.com/gohugoio/hugo/config"
-	"github.com/gohugoio/hugo/hugolib"
 	"github.com/gohugoio/hugo/modules/npm"
 	"github.com/spf13/cobra"
 )

 const commonUsageMod = `
-Note that Hugo will always start out by resolving the components defined in the project
+Note that Hugo will always start out by resolving the components defined in the site
 configuration, provided by a _vendor directory (if no --ignoreVendorPaths flag provided),
 Go Modules, or a folder inside the themes directory, in that order.

@@ -45,39 +44,33 @@ func newModCommands() *modCommands {

 	npmCommand := &simpleCommand{
 		name:  "npm",
-		short: "Various npm helpers",
+		short: "Various npm helpers.",
 		long:  `Various npm (Node package manager) helpers.`,
 		commands: []simplecobra.Commander{
 			&simpleCommand{
 				name:  "pack",
-				short: "Merges module Node.js dependencies into an npm workspace",
-				long: `Merges Node.js dependencies from all Hugo modules into a "packages/hugoautogen" npm workspace.
+				short: "Experimental: Prepares and writes a composite package.json file for your project.",
+				long: `Prepares and writes a composite package.json file for your project.

-The merged dependencies are written to packages/hugoautogen/package.json, and the root package.json
-is updated with a "workspaces" entry pointing to "packages/hugoautogen".
+On first run it creates a "package.hugo.json" in the project root if not already there. This file will be used as a template file
+with the base dependency set. 

-The source entries are read from either package.hugo.json or package.json in the module root, with package.hugo.json taking precedence if both exist.
+This set will be merged with all "package.hugo.json" files found in the dependency tree, picking the version closest to the project.

-See [Node.js dependencies](/hugo-modules/nodejs-dependencies/) for more information.
+This command is marked as 'Experimental'. We think it's a great idea, so it's not likely to be
+removed from Hugo, but we need to test this out in "real life" to get a feel of it,
+so this may/will change in future versions of Hugo.
 `,
 				withc: func(cmd *cobra.Command, r *rootCommand) {
 					cmd.ValidArgsFunction = cobra.NoFileCompletions
 					applyLocalFlagsBuildConfig(cmd, r)
 				},
 				run: func(ctx context.Context, cd *simplecobra.Commandeer, r *rootCommand, args []string) error {
-					cfg := flagsToCfg(cd, nil)
-					k := configKey{counter: r.configVersionID.Load(), skipNpmCheck: true}
-					h, _, err := r.hugoSites.GetOrCreate(k, func(key configKey) (*hugolib.HugoSites, error) {
-						conf, err := r.ConfigFromProvider(key, cfg)
-						if err != nil {
-							return nil, err
-						}
-						return hugolib.NewHugoSites(r.newDepsConfig(conf))
-					})
+					h, err := r.Hugo(flagsToCfg(cd, nil))
 					if err != nil {
 						return err
 					}
-					return npm.Pack(h.BaseFs.ProjectSourceFs, h.BaseFs.AssetsWithDuplicatesPreserved.Fs, h.Configs.Modules)
+					return npm.Pack(h.BaseFs.ProjectSourceFs, h.BaseFs.AssetsWithDuplicatesPreserved.Fs)
 				},
 			},
 		},
@@ -87,12 +80,12 @@ See [Node.js dependencies](/hugo-modules/nodejs-dependencies/) for more informat
 		commands: []simplecobra.Commander{
 			&simpleCommand{
 				name:  "init",
-				short: "Initialize this project as a Hugo Module",
+				short: "Initialize this project as a Hugo Module.",
 				long: `Initialize this project as a Hugo Module.
 	It will try to guess the module path, but you may help by passing it as an argument, e.g:
-
+	
 		hugo mod init github.com/gohugoio/testshortcodes
-
+	
 	Note that Hugo Modules supports multi-module projects, so you can initialize a Hugo Module
 	inside a subfolder on GitHub, as one example.
 	`,
@@ -118,7 +111,7 @@ See [Node.js dependencies](/hugo-modules/nodejs-dependencies/) for more informat
 			},
 			&simpleCommand{
 				name:  "verify",
-				short: "Verify dependencies",
+				short: "Verify dependencies.",
 				long:  `Verify checks that the dependencies of the current module, which are stored in a local downloaded source cache, have not been modified since being downloaded.`,
 				withc: func(cmd *cobra.Command, r *rootCommand) {
 					cmd.ValidArgsFunction = cobra.NoFileCompletions
@@ -136,7 +129,7 @@ See [Node.js dependencies](/hugo-modules/nodejs-dependencies/) for more informat
 			},
 			&simpleCommand{
 				name:  "graph",
-				short: "Print a module dependency graph",
+				short: "Print a module dependency graph.",
 				long: `Print a module dependency graph with information about module status (disabled, vendored).
 Note that for vendored modules, that is the version listed and not the one from go.mod.
 `,
@@ -156,7 +149,7 @@ Note that for vendored modules, that is the version listed and not the one from
 			},
 			&simpleCommand{
 				name:  "clean",
-				short: "Delete the Hugo Module cache for the current project",
+				short: "Delete the Hugo Module cache for the current project.",
 				long:  `Delete the Hugo Module cache for the current project.`,
 				withc: func(cmd *cobra.Command, r *rootCommand) {
 					cmd.ValidArgsFunction = cobra.NoFileCompletions
@@ -173,7 +166,7 @@ Note that for vendored modules, that is the version listed and not the one from
 					if all {
 						modCache := h.ResourceSpec.FileCaches.ModulesCache()
 						count, err := modCache.Prune(true)
-						r.Printf("Deleted %d directories from module cache.", count)
+						r.Printf("Deleted %d files from module cache.", count)
 						return err
 					}

@@ -182,7 +175,7 @@ Note that for vendored modules, that is the version listed and not the one from
 			},
 			&simpleCommand{
 				name:  "tidy",
-				short: "Remove unused entries in go.mod and go.sum",
+				short: "Remove unused entries in go.mod and go.sum.",
 				withc: func(cmd *cobra.Command, r *rootCommand) {
 					cmd.ValidArgsFunction = cobra.NoFileCompletions
 					applyLocalFlagsBuildConfig(cmd, r)
@@ -197,7 +190,7 @@ Note that for vendored modules, that is the version listed and not the one from
 			},
 			&simpleCommand{
 				name:  "vendor",
-				short: "Vendor all module dependencies into the _vendor directory",
+				short: "Vendor all module dependencies into the _vendor directory.",
 				long: `Vendor all module dependencies into the _vendor directory.
 	If a module is vendored, that is where Hugo will look for it's dependencies.
 	`,
@@ -216,16 +209,16 @@ Note that for vendored modules, that is the version listed and not the one from

 			&simpleCommand{
 				name:  "get",
-				short: "Resolves dependencies in your current Hugo project",
+				short: "Resolves dependencies in your current Hugo Project.",
 				long: `
-Resolves dependencies in your current Hugo project.
+Resolves dependencies in your current Hugo Project.

 Some examples:

 Install the latest version possible for a given module:

    hugo mod get github.com/gohugoio/testshortcodes
-
+    
 Install a specific version:

    hugo mod get github.com/gohugoio/testshortcodes@v0.3.0
@@ -300,10 +293,7 @@ Run "go help get" for more information. All flags available for "go get" is also
 							return err
 						}
 						client := conf.configs.ModulesClient
-						if err := client.Get(args...); err != nil {
-							return err
-						}
-						return nil
+						return client.Get(args...)
 					}
 				},
 			},
@@ -46,16 +46,14 @@ It will guess which kind of file to create based on the path provided.

 You can also specify the kind with ` + "`-k KIND`" + `.

-If archetypes are provided in your theme or project, they will be used.
+If archetypes are provided in your theme or site, they will be used.

-Ensure you run this within the root directory of your project.`,
+Ensure you run this within the root directory of your site.`,
 				run: func(ctx context.Context, cd *simplecobra.Commandeer, r *rootCommand, args []string) error {
 					if len(args) < 1 {
 						return newUserError("path needs to be provided")
 					}
-					cfg := flagsToCfg(cd, nil)
-					cfg.Set("BuildFuture", true)
-					h, err := r.Hugo(cfg)
+					h, err := r.Hugo(flagsToCfg(cd, nil))
 					if err != nil {
 						return err
 					}
@@ -76,11 +74,12 @@ Ensure you run this within the root directory of your project.`,
 				},
 			},
 			&simpleCommand{
-				name:    "project",
-				use:     "project [path]",
-				short:   "Create a new project",
-				long:    `Create a new project at the specified path.`,
-				aliases: []string{"site"},
+				name:  "site",
+				use:   "site [path]",
+				short: "Create a new site (skeleton)",
+				long: `Create a new site in the provided directory.
+The new site will have the correct structure, but no content or theme yet.
+Use ` + "`hugo new [contentPath]`" + ` to create new content.`,
 				run: func(ctx context.Context, cd *simplecobra.Commandeer, r *rootCommand, args []string) error {
 					if len(args) < 1 {
 						return newUserError("path needs to be provided")
@@ -100,13 +99,13 @@ Ensure you run this within the root directory of your project.`,
 					}
 					sourceFs := conf.fs.Source

-					err = skeletons.CreateProject(createpath, sourceFs, force, format)
+					err = skeletons.CreateSite(createpath, sourceFs, force, format)
 					if err != nil {
 						return err
 					}

-					r.Printf("Congratulations! Your new Hugo project was created in %s.\n\n", createpath)
-					r.Println(c.newProjectNextStepsText(createpath, format))
+					r.Printf("Congratulations! Your new Hugo site was created in %s.\n\n", createpath)
+					r.Println(c.newSiteNextStepsText(createpath, format))

 					return nil
 				},
@@ -125,9 +124,11 @@ Ensure you run this within the root directory of your project.`,
 			&simpleCommand{
 				name:  "theme",
 				use:   "theme [name]",
-				short: "Create a new theme",
-				long: `Create a new theme with the specified name in the ./themes directory.
-This generates a functional theme including template examples and sample content.`,
+				short: "Create a new theme (skeleton)",
+				long: `Create a new theme (skeleton) called [name] in ./themes.
+New theme is a skeleton. Please add content to the touched files. Add your
+name to the copyright line in the license and adjust the theme.toml file
+according to your needs.`,
 				run: func(ctx context.Context, cd *simplecobra.Commandeer, r *rootCommand, args []string) error {
 					if len(args) < 1 {
 						return newUserError("theme name needs to be provided")
@@ -143,7 +144,7 @@ This generates a functional theme including template examples and sample content
 					createpath := paths.AbsPathify(conf.configs.Base.WorkingDir, filepath.Join(conf.configs.Base.ThemesDir, args[0]))
 					r.Println("Creating new theme in", createpath)

-					err = skeletons.CreateTheme(createpath, sourceFs, format)
+					err = skeletons.CreateTheme(createpath, sourceFs)
 					if err != nil {
 						return err
 					}
@@ -151,14 +152,7 @@ This generates a functional theme including template examples and sample content
 					return nil
 				},
 				withc: func(cmd *cobra.Command, r *rootCommand) {
-					cmd.ValidArgsFunction = func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-						if len(args) != 0 {
-							return []string{}, cobra.ShellCompDirectiveNoFileComp
-						}
-						return []string{}, cobra.ShellCompDirectiveNoFileComp | cobra.ShellCompDirectiveFilterDirs
-					}
-					cmd.Flags().StringVar(&format, "format", "toml", "preferred file format (toml, yaml or json)")
-					_ = cmd.RegisterFlagCompletionFunc("format", cobra.FixedCompletions([]string{"toml", "yaml", "json"}, cobra.ShellCompDirectiveNoFileComp))
+					cmd.ValidArgsFunction = cobra.NoFileCompletions
 				},
 			},
 		},
@@ -193,9 +187,9 @@ It will guess which kind of file to create based on the path provided.

 You can also specify the kind with ` + "`-k KIND`" + `.

-If archetypes are provided in your theme or project, they will be used.
+If archetypes are provided in your theme or site, they will be used.

-Ensure you run this within the root directory of your project.`
+Ensure you run this within the root directory of your site.`

 	cmd.RunE = nil
 	return nil
@@ -206,7 +200,7 @@ func (c *newCommand) PreRun(cd, runner *simplecobra.Commandeer) error {
 	return nil
 }

-func (c *newCommand) newProjectNextStepsText(path string, format string) string {
+func (c *newCommand) newSiteNextStepsText(path string, format string) string {
 	format = strings.ToLower(format)
 	var nextStepsText bytes.Buffer

@@ -28,14 +28,13 @@ func newReleaseCommand() simplecobra.Commander {
 		step     int
 		skipPush bool
 		try      bool
-		version  string
 	)

 	return &simpleCommand{
 		name:  "release",
-		short: "Release a new version of Hugo",
+		short: "Release a new version of Hugo.",
 		run: func(ctx context.Context, cd *simplecobra.Commandeer, r *rootCommand, args []string) error {
-			rel, err := releaser.New(skipPush, try, step, version)
+			rel, err := releaser.New(skipPush, try, step)
 			if err != nil {
 				return err
 			}
@@ -48,7 +47,6 @@ func newReleaseCommand() simplecobra.Commander {
 			cmd.PersistentFlags().BoolVarP(&skipPush, "skip-push", "", false, "skip pushing to remote")
 			cmd.PersistentFlags().BoolVarP(&try, "try", "", false, "no changes")
 			cmd.PersistentFlags().IntVarP(&step, "step", "", 0, "step to run (1: set new version 2: prepare next dev version)")
-			cmd.PersistentFlags().StringVarP(&version, "version", "", "", "version to release (derived from branch name if not set)")
 			_ = cmd.RegisterFlagCompletionFunc("step", cobra.FixedCompletions([]string{"1", "2"}, cobra.ShellCompDirectiveNoFileComp))
 		},
 	}
@@ -23,7 +23,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"maps"
 	"net"
 	"net/http"
 	_ "net/http/pprof"
@@ -33,7 +32,6 @@ import (
 	"path"
 	"path/filepath"
 	"regexp"
-	"sort"
 	"strconv"
 	"strings"
 	"sync"
@@ -49,9 +47,6 @@ import (
 	"github.com/fsnotify/fsnotify"
 	"github.com/gohugoio/hugo/common/herrors"
 	"github.com/gohugoio/hugo/common/hugo"
-	"github.com/gohugoio/hugo/common/paths"
-	"github.com/gohugoio/hugo/langs"
-	"github.com/gohugoio/hugo/tpl/tplimpl"

 	"github.com/gohugoio/hugo/common/types"
 	"github.com/gohugoio/hugo/common/urls"
@@ -61,6 +56,7 @@ import (
 	"github.com/gohugoio/hugo/hugolib"
 	"github.com/gohugoio/hugo/hugolib/filesystems"
 	"github.com/gohugoio/hugo/livereload"
+	"github.com/gohugoio/hugo/tpl"
 	"github.com/gohugoio/hugo/transform"
 	"github.com/gohugoio/hugo/transform/livereloadinject"
 	"github.com/spf13/afero"
@@ -87,14 +83,10 @@ const (
 	configChangeGoWork = "go work file"
 )

-const (
-	hugoHeaderRedirect = "X-Hugo-Redirect"
-)
-
 func newHugoBuilder(r *rootCommand, s *serverCommand, onConfigLoaded ...func(reloaded bool) error) *hugoBuilder {
-	var visitedURLs *types.EvictingQueue[string]
+	var visitedURLs *types.EvictingStringQueue
 	if s != nil && !s.disableFastRender {
-		visitedURLs = types.NewEvictingQueue[string](20)
+		visitedURLs = types.NewEvictingStringQueue(20)
 	}
 	return &hugoBuilder{
 		r:              r,
@@ -122,7 +114,7 @@ func newServerCommand() *serverCommand {
 		commands: []simplecobra.Commander{
 			&simpleCommand{
 				name:  "trust",
-				short: "Install the local CA in the system trust store",
+				short: "Install the local CA in the system trust store.",
 				run: func(ctx context.Context, cd *simplecobra.Commandeer, r *rootCommand, args []string) error {
 					action := "-install"
 					if uninstall {
@@ -198,7 +190,9 @@ func (f *fileChangeDetector) PrepareNew() {
 	}

 	f.prev = make(map[string]uint64)
-	maps.Copy(f.prev, f.current)
+	for k, v := range f.current {
+		f.prev[k] = v
+	}
 	f.current = make(map[string]uint64)
 }

@@ -216,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
 }

@@ -246,7 +239,7 @@ func (f *fileServer) createEndpoint(i int) (*http.ServeMux, net.Listener, string
 	logger := f.c.r.logger

 	if i == 0 {
-		r.Printf("Environment: %q\n", f.c.hugoTry().Deps.Site.Hugo().Environment())
+		r.Printf("Environment: %q\n", f.c.hugoTry().Deps.Site.Hugo().Environment)
 		mainTarget := "disk"
 		if f.c.r.renderToMemory {
 			mainTarget = "memory"
@@ -282,7 +275,7 @@ func (f *fileServer) createEndpoint(i int) (*http.ServeMux, net.Listener, string
 					}

 					port = 1313
-					f.c.withConfOrOldConf(func(conf *commonConfig) {
+					f.c.withConf(func(conf *commonConfig) {
 						if lrport := conf.configs.GetFirstLanguageConfig().BaseURLLiveReload().Port(); lrport != 0 {
 							port = lrport
 						}
@@ -312,71 +305,64 @@ func (f *fileServer) createEndpoint(i int) (*http.ServeMux, net.Listener, string
 				w.Header().Set(header.Key, header.Value)
 			}

-			if canRedirect(requestURI, r) {
-				if redirect := serverConfig.MatchRedirect(requestURI, r.Header); !redirect.IsZero() {
-					doRedirect := true
-					// This matches Netlify's behavior and is needed for SPA behavior.
-					// See https://docs.netlify.com/routing/redirects/rewrites-proxies/
-					if !redirect.Force {
-						path := filepath.Clean(strings.TrimPrefix(requestURI, baseURL.Path()))
-						if root != "" {
-							path = filepath.Join(root, path)
-						}
-						var fs afero.Fs
-						f.c.withConf(func(conf *commonConfig) {
-							fs = conf.fs.PublishDirServer
-						})
-
-						fi, err := fs.Stat(path)
-
-						if err == nil {
-							if fi.IsDir() {
-								// There will be overlapping directories, so we
-								// need to check for a file.
-								_, err = fs.Stat(filepath.Join(path, "index.html"))
-								doRedirect = err != nil
-							} else {
-								doRedirect = false
-							}
-						}
+			if redirect := serverConfig.MatchRedirect(requestURI); !redirect.IsZero() {
+				// fullName := filepath.Join(dir, filepath.FromSlash(path.Clean("/"+name)))
+				doRedirect := true
+				// This matches Netlify's behavior and is needed for SPA behavior.
+				// See https://docs.netlify.com/routing/redirects/rewrites-proxies/
+				if !redirect.Force {
+					path := filepath.Clean(strings.TrimPrefix(requestURI, baseURL.Path()))
+					if root != "" {
+						path = filepath.Join(root, path)
 					}
+					var fs afero.Fs
+					f.c.withConf(func(conf *commonConfig) {
+						fs = conf.fs.PublishDirServer
+					})

-					if doRedirect {
-						w.Header().Set(hugoHeaderRedirect, "true")
-						switch redirect.Status {
-						case 404:
-							w.WriteHeader(404)
-							file, err := fs.Open(strings.TrimPrefix(redirect.To, baseURL.Path()))
-							if err == nil {
-								defer file.Close()
-								io.Copy(w, file)
-							} else {
-								fmt.Fprintln(w, "<h1>Page Not Found</h1>")
-							}
-							return
-						case 200:
-							if r2 := f.rewriteRequest(r, strings.TrimPrefix(redirect.To, baseURL.Path())); r2 != nil {
-								requestURI = redirect.To
-								r = r2
-							}
-						default:
-							w.Header().Set("Content-Type", "")
-							http.Redirect(w, r, redirect.To, redirect.Status)
-							return
+					fi, err := fs.Stat(path)

+					if err == nil {
+						if fi.IsDir() {
+							// There will be overlapping directories, so we
+							// need to check for a file.
+							_, err = fs.Stat(filepath.Join(path, "index.html"))
+							doRedirect = err != nil
+						} else {
+							doRedirect = false
 						}
 					}
 				}
+
+				if doRedirect {
+					switch redirect.Status {
+					case 404:
+						w.WriteHeader(404)
+						file, err := fs.Open(strings.TrimPrefix(redirect.To, baseURL.Path()))
+						if err == nil {
+							defer file.Close()
+							io.Copy(w, file)
+						} else {
+							fmt.Fprintln(w, "<h1>Page Not Found</h1>")
+						}
+						return
+					case 200:
+						if r2 := f.rewriteRequest(r, strings.TrimPrefix(redirect.To, baseURL.Path())); r2 != nil {
+							requestURI = redirect.To
+							r = r2
+						}
+					default:
+						w.Header().Set("Content-Type", "")
+						http.Redirect(w, r, redirect.To, redirect.Status)
+						return
+
+					}
+				}
+
 			}

 			if f.c.fastRenderMode && f.c.errState.buildErr() == nil {
-				if isNavigation(requestURI, r) {
-					// See issue 14240.
-					// Hugo escapes the URL paths when generating them,
-					// that may not be the case when we receive it back from the browser.
-					// PathEscape will escape if it is not already escaped.
-					requestURI = paths.PathEscape(requestURI)
-
+				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 {
@@ -499,7 +485,9 @@ func (c *serverCommand) Run(ctx context.Context, cd *simplecobra.Commandeer, arg

 		watchGroups := helpers.ExtractAndGroupRootPaths(watchDirs)

-		c.r.Printf("Watching for changes in %s\n", strings.Join(watchGroups, ", "))
+		for _, group := range watchGroups {
+			c.r.Printf("Watching for changes in %s\n", group)
+		}
 		watcher, err := c.newWatcher(c.r.poll, watchDirs...)
 		if err != nil {
 			return err
@@ -523,7 +511,7 @@ func (c *serverCommand) Run(ctx context.Context, cd *simplecobra.Commandeer, arg
 func (c *serverCommand) Init(cd *simplecobra.Commandeer) error {
 	cmd := cd.CobraCommand
 	cmd.Short = "Start the embedded web server"
-	cmd.Long = `Hugo provides its own webserver which builds and serves the project.
+	cmd.Long = `Hugo provides its own webserver which builds and serves the site.
 While hugo server is high performance, it is a webserver with limited options.

 The ` + "`" + `hugo server` + "`" + ` command will by default write and serve files from disk, but
@@ -531,8 +519,8 @@ you can render to memory by using the ` + "`" + `--renderToMemory` + "`" + ` fla
 faster in some cases, but it will consume more memory.

 By default hugo will also watch your files for any changes you make and
-automatically rebuild the project. It will then live reload any open browser pages
-and push the latest content to them. As most Hugo projects are built in a fraction
+automatically rebuild the site. It will then live reload any open browser pages
+and push the latest content to them. As most Hugo sites are built in a fraction
 of a second, you will be able to save and see your changes nearly instantly.`
 	cmd.Aliases = []string{"serve"}

@@ -549,11 +537,11 @@ of a second, you will be able to save and see your changes nearly instantly.`
 	cmd.Flags().BoolVar(&c.tlsAuto, "tlsAuto", false, "generate and use locally-trusted certificates.")
 	cmd.Flags().BoolVar(&c.pprof, "pprof", false, "enable the pprof server (port 8080)")
 	cmd.Flags().BoolVarP(&c.serverWatch, "watch", "w", true, "watch filesystem for changes and recreate as needed")
-	cmd.Flags().BoolVar(&c.noHTTPCache, "noHTTPCache", false, "disable browser caching of pages served by the embedded web server")
+	cmd.Flags().BoolVar(&c.noHTTPCache, "noHTTPCache", false, "prevent HTTP caching")
 	cmd.Flags().BoolVarP(&c.serverAppend, "appendPort", "", true, "append port to baseURL")
 	cmd.Flags().BoolVar(&c.disableLiveReload, "disableLiveReload", false, "watch without enabling live browser reload on rebuild")
 	cmd.Flags().BoolVarP(&c.navigateToChanged, "navigateToChanged", "N", false, "navigate to changed content file on live browser reload")
-	cmd.Flags().BoolVarP(&c.openBrowser, "openBrowser", "O", false, "open the project in a browser after server startup")
+	cmd.Flags().BoolVarP(&c.openBrowser, "openBrowser", "O", false, "open the site in a browser after server startup")
 	cmd.Flags().BoolVar(&c.renderStaticToDisk, "renderStaticToDisk", false, "serve static files from disk and dynamic files from memory")
 	cmd.Flags().BoolVar(&c.disableFastRender, "disableFastRender", false, "enables full re-renders on changes")
 	cmd.Flags().BoolVar(&c.disableBrowserError, "disableBrowserError", false, "do not show build errors in the browser")
@@ -764,7 +752,7 @@ func (c *serverCommand) createServerPorts(cd *simplecobra.Commandeer) error {
 			c.serverPorts = make([]serverPortListener, len(conf.configs.Languages))
 		}
 		currentServerPort := c.serverPort
-		for i := range c.serverPorts {
+		for i := 0; i < len(c.serverPorts); i++ {
 			l, err := net.Listen("tcp", net.JoinHostPort(c.serverInterface, strconv.Itoa(currentServerPort)))
 			if err == nil {
 				c.serverPorts[i] = serverPortListener{ln: l, p: currentServerPort}
@@ -848,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)
 	}
@@ -860,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
 }
@@ -885,7 +873,7 @@ func (c *serverCommand) serve() error {
 		if isMultihost {
 			for _, l := range conf.configs.ConfigLangs() {
 				baseURLs = append(baseURLs, l.BaseURL())
-				roots = append(roots, l.Language().(*langs.Language).Lang)
+				roots = append(roots, l.Language().Lang)
 			}
 		} else {
 			l := conf.configs.GetFirstLanguageConfig()
@@ -903,16 +891,16 @@ func (c *serverCommand) serve() error {
 	// To allow the en user to change the error template while the server is running, we use
 	// the freshest template we can provide.
 	var (
-		errTempl     *tplimpl.TemplInfo
-		templHandler *tplimpl.TemplateStore
+		errTempl     tpl.Template
+		templHandler tpl.TemplateHandler
 	)
-	getErrorTemplateAndHandler := func(h *hugolib.HugoSites) (*tplimpl.TemplInfo, *tplimpl.TemplateStore) {
+	getErrorTemplateAndHandler := func(h *hugolib.HugoSites) (tpl.Template, tpl.TemplateHandler) {
 		if h == nil {
 			return errTempl, templHandler
 		}
-		templHandler := h.GetTemplateStore()
-		errTempl := templHandler.LookupByPath("/_server/error.html")
-		if errTempl == nil {
+		templHandler := h.Tmpl()
+		errTempl, found := templHandler.Lookup("_server/error.html")
+		if !found {
 			panic("template server/error.html not found")
 		}
 		return errTempl, templHandler
@@ -1040,6 +1028,7 @@ func (c *serverCommand) serve() error {
 	defer cancel()
 	wg2, ctx := errgroup.WithContext(ctx)
 	for _, srv := range servers {
+		srv := srv
 		wg2.Go(func() error {
 			return srv.Shutdown(ctx)
 		})
@@ -1108,7 +1097,7 @@ func (s *staticSyncer) syncsStaticEvents(staticEvents []fsnotify.Event) error {

 			fromPath := ev.Name

-			relPath, found := sourceFs.MakePathRelative(fromPath, false)
+			relPath, found := sourceFs.MakePathRelative(fromPath, true)

 			if !found {
 				// Not member of this virtual host.
@@ -1160,17 +1149,18 @@ func (s *staticSyncer) syncsStaticEvents(staticEvents []fsnotify.Event) error {
 	return err
 }

-// chmodFilter is a ChmodFilter for static syncing.
-// Returns true to skip syncing permissions for directories and files without
-// owner-write permission. The primary use case is files from the module cache (0444).
 func chmodFilter(dst, src os.FileInfo) bool {
-	if src.IsDir() {
-		return true
-	}
-	return src.Mode().Perm()&0o200 == 0
+	// Hugo publishes data from multiple sources, potentially
+	// with overlapping directory structures. We cannot sync permissions
+	// for directories as that would mean that we might end up with write-protected
+	// directories inside /public.
+	// One example of this would be syncing from the Go Module cache,
+	// which have 0555 directories.
+	return src.IsDir()
 }

 func cleanErrorLog(content string) string {
+	content = strings.ReplaceAll(content, "\n", " ")
 	content = logReplacer.Replace(content)
 	content = logDuplicateTemplateExecuteRe.ReplaceAllString(content, "")
 	content = logDuplicateTemplateParseRe.ReplaceAllString(content, "")
@@ -1238,24 +1228,3 @@ func formatByteCount(b uint64) string {
 	return fmt.Sprintf("%.1f %cB",
 		float64(b)/float64(div), "kMGTPE"[exp])
 }
-
-func canRedirect(requestURIWithoutQuery string, r *http.Request) bool {
-	if r.Header.Get(hugoHeaderRedirect) != "" {
-		return false
-	}
-	return isNavigation(requestURIWithoutQuery, r)
-}
-
-// Sec-Fetch-Mode should be sent by all recent browser versions, see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Sec-Fetch-Mode#navigate
-// Fall back to the file extension if not set.
-// The main take here is that we don't want to have CSS/JS files etc. partake in this logic.
-func isNavigation(requestURIWithoutQuery string, r *http.Request) bool {
-	return r.Header.Get("Sec-Fetch-Mode") == "navigate" || isPropablyHTMLRequest(requestURIWithoutQuery)
-}
-
-func isPropablyHTMLRequest(requestURIWithoutQuery string) bool {
-	if strings.HasSuffix(requestURIWithoutQuery, "/") || strings.HasSuffix(requestURIWithoutQuery, "html") || strings.HasSuffix(requestURIWithoutQuery, "htm") {
-		return true
-	}
-	return !strings.Contains(requestURIWithoutQuery, ".")
-}
@@ -16,8 +16,6 @@ package collections
 import (
 	"fmt"
 	"reflect"
-
-	"github.com/gohugoio/hugo/common/hreflect"
 )

 // Append appends from to a slice to and returns the resulting slice.
@@ -27,7 +25,7 @@ func Append(to any, from ...any) (any, error) {
 	if len(from) == 0 {
 		return to, nil
 	}
-	tov, toIsNil := hreflect.Indirect(reflect.ValueOf(to))
+	tov, toIsNil := indirect(reflect.ValueOf(to))

 	toIsNil = toIsNil || to == nil
 	var tot reflect.Type
@@ -102,7 +100,7 @@ func Append(to any, from ...any) (any, error) {
 		fv := reflect.ValueOf(f)
 		if !fv.IsValid() || !fv.Type().AssignableTo(tot) {
 			// Fall back to a []interface{} slice.
-			tov, _ := hreflect.Indirect(reflect.ValueOf(to))
+			tov, _ := indirect(reflect.ValueOf(to))
 			return appendToInterfaceSlice(tov, from...)
 		}
 		tov = reflect.Append(tov, fv)
@@ -119,7 +117,7 @@ func appendToInterfaceSliceFromValues(slice1, slice2 reflect.Value) ([]any, erro
 			tos = append(tos, nil)
 			continue
 		}
-		for i := range slice.Len() {
+		for i := 0; i < slice.Len(); i++ {
 			tos = append(tos, slice.Index(i).Interface())
 		}
 	}
@@ -130,7 +128,7 @@ func appendToInterfaceSliceFromValues(slice1, slice2 reflect.Value) ([]any, erro
 func appendToInterfaceSlice(tov reflect.Value, from ...any) ([]any, error) {
 	var tos []any

-	for i := range tov.Len() {
+	for i := 0; i < tov.Len(); i++ {
 		tos = append(tos, tov.Index(i).Interface())
 	}

@@ -138,3 +136,17 @@ func appendToInterfaceSlice(tov reflect.Value, from ...any) ([]any, error) {

 	return tos, nil
 }
+
+// indirect is borrowed from the Go stdlib: 'text/template/exec.go'
+// TODO(bep) consolidate
+func indirect(v reflect.Value) (rv reflect.Value, isNil bool) {
+	for ; v.Kind() == reflect.Ptr || v.Kind() == reflect.Interface; v = v.Elem() {
+		if v.IsNil() {
+			return v, true
+		}
+		if v.Kind() == reflect.Interface && v.NumMethod() > 0 {
+			break
+		}
+	}
+	return v, false
+}
@@ -77,7 +77,6 @@ func TestAppend(t *testing.T) {
 		{[]string{"a", "b"}, []any{nil}, []any{"a", "b", nil}},
 		{[]string{"a", "b"}, []any{nil, "d", nil}, []any{"a", "b", nil, "d", nil}},
 		{[]any{"a", nil, "c"}, []any{"d", nil, "f"}, []any{"a", nil, "c", "d", nil, "f"}},
-		{[]string{"a", "b"}, []any{}, []string{"a", "b"}},
 	} {

 		result, err := Append(test.start, test.addend...)
@@ -136,37 +136,3 @@ func TestSortedStringSlice(t *testing.T) {
 	c.Assert(s.Count("z"), qt.Equals, 0)
 	c.Assert(s.Count("a"), qt.Equals, 1)
 }
-
-func TestStringSliceToInterfaceSlice(t *testing.T) {
-	t.Parallel()
-	c := qt.New(t)
-
-	tests := []struct {
-		name string
-		in   []string
-		want []any
-	}{
-		{
-			name: "empty slice",
-			in:   []string{},
-			want: []any{},
-		},
-		{
-			name: "single element",
-			in:   []string{"hello"},
-			want: []any{"hello"},
-		},
-		{
-			name: "multiple elements",
-			in:   []string{"a", "b", "c"},
-			want: []any{"a", "b", "c"},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := StringSliceToInterfaceSlice(tt.in)
-			c.Assert(got, qt.DeepEquals, tt.want)
-		})
-	}
-}
@@ -13,87 +13,13 @@

 package collections

-import (
-	"iter"
-	"slices"
-	"sync"
+import "sync"

-	"github.com/gohugoio/hugo/common/hiter"
-)
-
-// StackThreadSafe is a simple LIFO stack that is safe for concurrent use.
-type StackThreadSafe[T any] struct {
-	items []T
-	zero  T
-	mu    sync.RWMutex
-}
-
-func NewStackThreadSafe[T any]() *StackThreadSafe[T] {
-	return &StackThreadSafe[T]{}
-}
-
-func (s *StackThreadSafe[T]) Push(item T) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	s.items = append(s.items, item)
-}
-
-func (s *StackThreadSafe[T]) Pop() (T, bool) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	if len(s.items) == 0 {
-		return s.zero, false
-	}
-	item := s.items[len(s.items)-1]
-	s.items = s.items[:len(s.items)-1]
-	return item, true
-}
-
-func (s *StackThreadSafe[T]) Peek() (T, bool) {
-	s.mu.RLock()
-	defer s.mu.RUnlock()
-	if len(s.items) == 0 {
-		return s.zero, false
-	}
-	return s.items[len(s.items)-1], true
-}
-
-func (s *StackThreadSafe[T]) Len() int {
-	s.mu.RLock()
-	defer s.mu.RUnlock()
-	return len(s.items)
-}
-
-// All returns all items in the stack, from bottom to top.
-func (s *StackThreadSafe[T]) All() iter.Seq2[int, T] {
-	return hiter.Lock2(slices.All(s.items), s.mu.RLock, s.mu.RUnlock)
-}
-
-func (s *StackThreadSafe[T]) Drain() []T {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	items := s.items
-	s.items = nil
-	return items
-}
-
-func (s *StackThreadSafe[T]) DrainMatching(predicate func(T) bool) []T {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	var items []T
-	for i, v := range slices.Backward(s.items) {
-		if predicate(v) {
-			items = append(items, v)
-			s.items = slices.Delete(s.items, i, i+1)
-		}
-	}
-	return items
-}
-
-// Stack is a simple LIFO stack that is not safe for concurrent use.
+// Stack is a simple LIFO stack that is safe for concurrent use.
 type Stack[T any] struct {
 	items []T
 	zero  T
+	mu    sync.RWMutex
 }

 func NewStack[T any]() *Stack[T] {
@@ -101,10 +27,14 @@ func NewStack[T any]() *Stack[T] {
 }

 func (s *Stack[T]) Push(item T) {
+	s.mu.Lock()
+	defer s.mu.Unlock()
 	s.items = append(s.items, item)
 }

 func (s *Stack[T]) Pop() (T, bool) {
+	s.mu.Lock()
+	defer s.mu.Unlock()
 	if len(s.items) == 0 {
 		return s.zero, false
 	}
@@ -114,6 +44,8 @@ func (s *Stack[T]) Pop() (T, bool) {
 }

 func (s *Stack[T]) Peek() (T, bool) {
+	s.mu.RLock()
+	defer s.mu.RUnlock()
 	if len(s.items) == 0 {
 		return s.zero, false
 	}
@@ -121,15 +53,28 @@ func (s *Stack[T]) Peek() (T, bool) {
 }

 func (s *Stack[T]) Len() int {
+	s.mu.RLock()
+	defer s.mu.RUnlock()
 	return len(s.items)
 }

-func (s *Stack[T]) All() iter.Seq2[int, T] {
-	return slices.All(s.items)
-}
-
 func (s *Stack[T]) Drain() []T {
+	s.mu.Lock()
+	defer s.mu.Unlock()
 	items := s.items
 	s.items = nil
 	return items
 }
+
+func (s *Stack[T]) DrainMatching(predicate func(T) bool) []T {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+	var items []T
+	for i := len(s.items) - 1; i >= 0; i-- {
+		if predicate(s.items[i]) {
+			items = append(items, s.items[i])
+			s.items = append(s.items[:i], s.items[i+1:]...)
+		}
+	}
+	return items
+}
@@ -1,77 +0,0 @@
-package collections
-
-import (
-	"testing"
-
-	qt "github.com/frankban/quicktest"
-)
-
-func TestNewStack(t *testing.T) {
-	t.Parallel()
-	c := qt.New(t)
-
-	s := NewStackThreadSafe[int]()
-
-	c.Assert(s, qt.IsNotNil)
-}
-
-func TestStackBasic(t *testing.T) {
-	t.Parallel()
-	c := qt.New(t)
-
-	s := NewStackThreadSafe[int]()
-
-	c.Assert(s.Len(), qt.Equals, 0)
-
-	s.Push(1)
-	s.Push(2)
-	s.Push(3)
-
-	c.Assert(s.Len(), qt.Equals, 3)
-
-	top, ok := s.Peek()
-	c.Assert(ok, qt.Equals, true)
-	c.Assert(top, qt.Equals, 3)
-
-	popped, ok := s.Pop()
-	c.Assert(ok, qt.Equals, true)
-	c.Assert(popped, qt.Equals, 3)
-
-	c.Assert(s.Len(), qt.Equals, 2)
-
-	_, _ = s.Pop()
-	_, _ = s.Pop()
-	_, ok = s.Pop()
-
-	c.Assert(ok, qt.Equals, false)
-}
-
-func TestStackDrain(t *testing.T) {
-	t.Parallel()
-	c := qt.New(t)
-
-	s := NewStackThreadSafe[string]()
-	s.Push("a")
-	s.Push("b")
-
-	got := s.Drain()
-
-	c.Assert(got, qt.DeepEquals, []string{"a", "b"})
-	c.Assert(s.Len(), qt.Equals, 0)
-}
-
-func TestStackDrainMatching(t *testing.T) {
-	t.Parallel()
-	c := qt.New(t)
-
-	s := NewStackThreadSafe[int]()
-	s.Push(1)
-	s.Push(2)
-	s.Push(3)
-	s.Push(4)
-
-	got := s.DrainMatching(func(v int) bool { return v%2 == 0 })
-
-	c.Assert(got, qt.DeepEquals, []int{4, 2})
-	c.Assert(s.Drain(), qt.DeepEquals, []int{1, 3})
-}
@@ -16,10 +16,13 @@ package constants
 // Error/Warning IDs.
 // Do not change these values.
 const (
-	WarnRenderShortcodesInHTML   = "warning-rendershortcodes-in-html"
-	WarnGoldmarkRawHTML          = "warning-goldmark-raw-html"
-	WarnPartialSuperfluousPrefix = "warning-partial-superfluous-prefix"
-	WarnHomePageIsLeafBundle     = "warning-home-page-is-leaf-bundle"
+	// IDs for remote errors in tpl/data.
+	ErrRemoteGetJSON = "error-remote-getjson"
+	ErrRemoteGetCSV  = "error-remote-getcsv"
+
+	WarnFrontMatterParamsOverrides = "warning-frontmatter-params-overrides"
+	WarnRenderShortcodesInHTML     = "warning-rendershortcodes-in-html"
+	WarnGoldmarkRawHTML            = "warning-goldmark-raw-html"
 )

 // Field/method names with special meaning.
@@ -18,13 +18,11 @@ import (
 	"crypto/md5"
 	"encoding/hex"
 	"io"
-	"reflect"
 	"strconv"
 	"sync"

 	"github.com/cespare/xxhash/v2"
 	"github.com/gohugoio/hashstructure"
-	"github.com/gohugoio/hugo/common/hugio"
 	"github.com/gohugoio/hugo/identity"
 )

@@ -40,47 +38,6 @@ func XXHashFromReader(r io.Reader) (uint64, int64, error) {
 	return h.Sum64(), size, nil
 }

-type Hasher interface {
-	io.StringWriter
-	io.Writer
-	io.ReaderFrom
-	Sum64() uint64
-}
-
-type HashCloser interface {
-	Hasher
-	io.Closer
-}
-
-// XxHasher returns a Hasher that uses xxHash.
-// Remember to call Close when done.
-func XxHasher() HashCloser {
-	h := getXxHashReadFrom()
-	return struct {
-		Hasher
-		io.Closer
-	}{
-		Hasher: h,
-		Closer: hugio.CloserFunc(func() error {
-			putXxHashReadFrom(h)
-			return 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()
@@ -88,13 +45,11 @@ func XXHashFromString(s string) (uint64, error) {
 	return h.Sum64(), nil
 }

-// XxHashFromStringHexEncoded calculates the xxHash for the given strings
+// XxHashFromStringHexEncoded calculates the xxHash for the given string
 // and returns the hash as a hex encoded string.
-func XxHashFromStringHexEncoded(s ...string) string {
+func XxHashFromStringHexEncoded(f string) string {
 	h := xxhash.New()
-	for _, f := range s {
-		h.WriteString(f)
-	}
+	h.WriteString(f)
 	hash := h.Sum(nil)
 	return hex.EncodeToString(hash)
 }
@@ -106,16 +61,6 @@ func MD5FromStringHexEncoded(f string) string {
 	return hex.EncodeToString(h.Sum(nil))
 }

-// MD5FromReaderHexEncoded returns the MD5 hash of the given reader.
-func MD5FromReaderHexEncoded(r io.Reader) string {
-	h := md5.New()
-	_, err := io.Copy(h, r)
-	if err != nil {
-		return ""
-	}
-	return hex.EncodeToString(h.Sum(nil))
-}
-
 // HashString returns a hash from the given elements.
 // It will panic if the hash cannot be calculated.
 // Note that this hash should be used primarily for identity, not for change detection as
@@ -125,48 +70,14 @@ 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{
-			Hasher:     xxhash.New(),
-			UnwrapFunc: unwrapForHashing,
+			Hasher: xxhash.New(),
 		}
 	},
 }

-// hashstructure only sees exported struct fields, so rewrite known identity types before hashing,
-// e.g. a Resource or Page nested in an options map hashes by its Key.
-func unwrapForHashing(v reflect.Value) (reflect.Value, error) {
-	if v.Kind() != reflect.Struct {
-		return v, nil
-	}
-	var in any
-	if v.CanAddr() {
-		// The common case; pointer receiver methods on a struct
-		// reached through a pointer.
-		in = v.Addr().Interface()
-	} else {
-		in = v.Interface()
-	}
-	switch t := in.(type) {
-	case hashstructure.Hashable:
-		// Let hashstructure handle it.
-		return v, nil
-	case keyer:
-		return reflect.ValueOf(t.Key()), nil
-	case identity.IdentityProvider:
-		return reflect.ValueOf(t.GetIdentity()), nil
-	}
-	return v, nil
-}
-
 func getHashOpts() *hashstructure.HashOptions {
 	return hashOptsPool.Get().(*hashstructure.HashOptions)
 }
@@ -183,32 +94,42 @@ func putHashOpts(opts *hashstructure.HashOptions) {
 func HashUint64(vs ...any) uint64 {
 	var o any
 	if len(vs) == 1 {
-		o = vs[0]
+		o = toHashable(vs[0])
 	} else {
-		o = vs
+		elements := make([]any, len(vs))
+		for i, e := range vs {
+			elements[i] = toHashable(e)
+		}
+		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
 }

+// For structs, hashstructure.Hash only works on the exported fields,
+// so rewrite the input slice for known identity types.
+func toHashable(v any) any {
+	switch t := v.(type) {
+	case keyer:
+		return t.Key()
+	case identity.IdentityProvider:
+		return t.GetIdentity()
+	default:
+		return v
+	}
+}
+
 type xxhashReadFrom struct {
 	buff []byte
 	*xxhash.Digest
@@ -37,9 +37,12 @@ func TestXxHashFromReaderPara(t *testing.T) {
 	c := qt.New(t)

 	var wg sync.WaitGroup
-	for i := range 10 {
-		wg.Go(func() {
-			for j := range 100 {
+	for i := 0; i < 10; i++ {
+		i := i
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			for j := 0; j < 100; j++ {
 				s := strings.Repeat("Hello ", i+j+1*42)
 				r := strings.NewReader(s)
 				got, size, err := XXHashFromReader(r)
@@ -48,7 +51,7 @@ func TestXxHashFromReaderPara(t *testing.T) {
 				expect, _ := XXHashFromString(s)
 				c.Assert(got, qt.Equals, expect)
 			}
-		})
+		}()
 	}

 	wg.Wait()
@@ -72,8 +75,8 @@ func TestXxHashFromStringHexEncoded(t *testing.T) {

 func BenchmarkXXHashFromReader(b *testing.B) {
 	r := strings.NewReader("Hello World")
-
-	for b.Loop() {
+	b.ResetTimer()
+	for i := 0; i < b.N; i++ {
 		XXHashFromReader(r)
 		r.Seek(0, 0)
 	}
@@ -81,16 +84,16 @@ func BenchmarkXXHashFromReader(b *testing.B) {

 func BenchmarkXXHashFromString(b *testing.B) {
 	s := "Hello World"
-
-	for b.Loop() {
+	b.ResetTimer()
+	for i := 0; i < b.N; i++ {
 		XXHashFromString(s)
 	}
 }

 func BenchmarkXXHashFromStringHexEncoded(b *testing.B) {
 	s := "The quick brown fox jumps over the lazy dog"
-
-	for b.Loop() {
+	b.ResetTimer()
+	for i := 0; i < b.N; i++ {
 		XxHashFromStringHexEncoded(s)
 	}
 }
@@ -133,20 +136,9 @@ func BenchmarkHashString(b *testing.B) {

 	for _, test := range tests {
 		b.Run(fmt.Sprintf("n%d", len(test)), func(b *testing.B) {
-			for b.Loop() {
+			for i := 0; i < b.N; i++ {
 				HashString(test)
 			}
 		})
 	}
 }
-
-func BenchmarkHashMap(b *testing.B) {
-	m := map[string]any{}
-	for i := range 1000 {
-		m[fmt.Sprintf("key%d", i)] = i
-	}
-
-	for b.Loop() {
-		HashString(m)
-	}
-}
@@ -0,0 +1,46 @@
+// 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 hcontext
+
+import "context"
+
+// ContextDispatcher is a generic interface for setting and getting values from a context.
+type ContextDispatcher[T any] interface {
+	Set(ctx context.Context, value T) context.Context
+	Get(ctx context.Context) T
+}
+
+// NewContextDispatcher creates a new ContextDispatcher with the given key.
+func NewContextDispatcher[T any, R comparable](key R) ContextDispatcher[T] {
+	return keyInContext[T, R]{
+		id: key,
+	}
+}
+
+type keyInContext[T any, R comparable] struct {
+	zero T
+	id   R
+}
+
+func (f keyInContext[T, R]) Get(ctx context.Context) T {
+	v := ctx.Value(f.id)
+	if v == nil {
+		return f.zero
+	}
+	return v.(T)
+}
+
+func (f keyInContext[T, R]) Set(ctx context.Context, value T) context.Context {
+	return context.WithValue(ctx, f.id, value)
+}
@@ -1,61 +0,0 @@
-// Copyright 2025 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 hdebug
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/gohugoio/hugo/common/types"
-	"github.com/gohugoio/hugo/htesting"
-)
-
-// Printf is a debug print function that should be removed before committing code to the repository.
-func Printf(format string, args ...any) {
-	panicIfRealCI()
-	if len(args) == 1 && !strings.Contains(format, "%") {
-		format = format + ": %v"
-	}
-	if !strings.HasSuffix(format, "\n") {
-		format = format + "\n"
-	}
-	fmt.Printf(format, args...)
-}
-
-func AssertNotNil(a ...any) {
-	panicIfRealCI()
-	for _, v := range a {
-		if types.IsNil(v) {
-			panic("hdebug.AssertNotNil: value is nil")
-		}
-	}
-}
-
-func Panicf(format string, args ...any) {
-	panicIfRealCI()
-	// fmt.Println(stack())
-	if len(args) == 1 && !strings.Contains(format, "%") {
-		format = format + ": %v"
-	}
-	if !strings.HasSuffix(format, "\n") {
-		format = format + "\n"
-	}
-	panic(fmt.Sprintf(format, args...))
-}
-
-func panicIfRealCI() {
-	if htesting.IsRealCI() {
-		panic("This debug statement should be removed before committing code!")
-	}
-}
@@ -152,7 +152,10 @@ func locateError(r io.Reader, le FileError, matches LineMatcherFn) *ErrorContext
 	}

 	if ectx.Position.LineNumber > 0 {
-		low := max(ectx.Position.LineNumber-3, 0)
+		low := ectx.Position.LineNumber - 3
+		if low < 0 {
+			low = 0
+		}

 		if ectx.Position.LineNumber > 2 {
 			ectx.LinesPos = 2
@@ -160,7 +163,10 @@ func locateError(r io.Reader, le FileError, matches LineMatcherFn) *ErrorContext
 			ectx.LinesPos = ectx.Position.LineNumber - 1
 		}

-		high := min(ectx.Position.LineNumber+2, len(lines))
+		high := ectx.Position.LineNumber + 2
+		if high > len(lines) {
+			high = len(lines)
+		}

 		ectx.Lines = lines[low:high]

@@ -17,13 +17,22 @@ package herrors
 import (
 	"errors"
 	"fmt"
+	"io"
 	"os"
 	"regexp"
 	"runtime"
+	"runtime/debug"
 	"strings"
 	"time"
 )

+// PrintStackTrace prints the current stacktrace to w.
+func PrintStackTrace(w io.Writer) {
+	buf := make([]byte, 1<<16)
+	runtime.Stack(buf, true)
+	fmt.Fprintf(w, "%s", buf)
+}
+
 // ErrorSender is a, typically, non-blocking error handler.
 type ErrorSender interface {
 	SendError(err error)
@@ -36,9 +45,7 @@ type ErrorSender interface {
 func Recover(args ...any) {
 	if r := recover(); r != nil {
 		fmt.Println("ERR:", r)
-		buf := make([]byte, 64<<10)
-		buf = buf[:runtime.Stack(buf, false)]
-		args = append(args, "stacktrace from panic: \n"+string(buf), "\n")
+		args = append(args, "stacktrace from panic: \n"+string(debug.Stack()), "\n")
 		fmt.Println(args...)
 	}
 }
@@ -126,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/"
@@ -178,14 +170,3 @@ func improveIfNilPointerMsg(inErr error) string {
 	s := fmt.Sprintf("– %s is nil; wrap it in if or with: {{ with %s }}{{ .%s }}{{ end }}", receiverName, receiver, field)
 	return nilPointerErrRe.ReplaceAllString(inErr.Error(), s)
 }
-
-// Or returns the first non-nil error from the given list of errors.
-// If all errors are nil, it returns nil.
-func Or(errs ...error) error {
-	for _, err := range errs {
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
@@ -110,11 +110,11 @@ func (fe *fileError) UpdateContent(r io.Reader, linematcher LineMatcherFn) FileE

 	fe.errorContext = ectx

-	if ectx.Position.LineNumber > 0 && ectx.Position.LineNumber > fe.position.LineNumber {
+	if ectx.Position.LineNumber > 0 {
 		fe.position.LineNumber = ectx.Position.LineNumber
 	}

-	if ectx.Position.ColumnNumber > 0 && ectx.Position.ColumnNumber > fe.position.ColumnNumber {
+	if ectx.Position.ColumnNumber > 0 {
 		fe.position.ColumnNumber = ectx.Position.ColumnNumber
 	}

@@ -177,7 +177,6 @@ func NewFileErrorFromName(err error, name string) FileError {
 	// Filetype is used to determine the Chroma lexer to use.
 	fileType, pos := extractFileTypePos(err)
 	pos.Filename = name
-
 	if fileType == "" {
 		_, fileType = paths.FileAndExtNoDelimiter(filepath.Clean(name))
 	}
@@ -235,9 +234,7 @@ func NewFileErrorFromFile(err error, filename string, fs afero.Fs, linematcher L
 		return NewFileErrorFromName(err, realFilename)
 	}
 	defer f.Close()
-	fe := NewFileErrorFromName(err, realFilename)
-	fe = fe.UpdateContent(f, linematcher)
-	return fe
+	return NewFileErrorFromName(err, realFilename).UpdateContent(f, linematcher)
 }

 func openFile(filename string, fs afero.Fs) (afero.File, string, error) {
@@ -261,79 +258,16 @@ 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
 	}
 	return err
 }

-// UnwrapFileErrors returns all FileError contained in err.
-func UnwrapFileErrors(err error) []FileError {
-	if err == nil {
-		return nil
-	}
-	errs := Errors(err)
-	var fileErrors []FileError
-	for _, e := range errs {
-		if v, ok := e.(FileError); ok {
-			fileErrors = append(fileErrors, v)
-		}
-		fileErrors = append(fileErrors, UnwrapFileErrors(errors.Unwrap(e))...)
-	}
-	return fileErrors
-}
-
-// UnwrapFileErrorsWithErrorContext tries to unwrap all FileError in err that has an ErrorContext.
-func UnwrapFileErrorsWithErrorContext(err error) []FileError {
-	errs := UnwrapFileErrors(err)
-	var n int
-	for _, e := range errs {
-		if e.ErrorContext() != nil {
-			errs[n] = e
-			n++
-		}
-	}
-	return errs[:n]
-}
-
-// Errors returns the list of errors contained in err.
-func Errors(err error) []error {
-	if err == nil {
-		return nil
-	}
-
-	type unwrapper interface {
-		Unwrap() []error
-	}
-	if u, ok := err.(unwrapper); ok {
-		return u.Unwrap()
-	}
-	return []error{err}
-}
-
 func extractFileTypePos(err error) (string, text.Position) {
-	err = Unwrap(err)
+	err = Cause(err)

 	var fileType string

@@ -368,9 +302,13 @@ func extractFileTypePos(err error) (string, text.Position) {
 	}

 	// Look in the error message for the line number.
-	if lno, col := commonLineNumberExtractor(err); lno > 0 {
-		pos.ColumnNumber = col
-		pos.LineNumber = lno
+	for _, handle := range lineNumberExtractors {
+		lno, col := handle(err)
+		if lno > 0 {
+			pos.ColumnNumber = col
+			pos.LineNumber = lno
+			break
+		}
 	}

 	if fileType == "" && pos.Filename != "" {
@@ -394,6 +332,30 @@ func UnwrapFileError(err error) FileError {
 	return nil
 }

+// UnwrapFileErrors tries to unwrap all FileError.
+func UnwrapFileErrors(err error) []FileError {
+	var errs []FileError
+	for err != nil {
+		if v, ok := err.(FileError); ok {
+			errs = append(errs, v)
+		}
+		err = errors.Unwrap(err)
+	}
+	return errs
+}
+
+// UnwrapFileErrorsWithErrorContext tries to unwrap all FileError in err that has an ErrorContext.
+func UnwrapFileErrorsWithErrorContext(err error) []FileError {
+	var errs []FileError
+	for err != nil {
+		if v, ok := err.(FileError); ok && v.ErrorContext() != nil {
+			errs = append(errs, v)
+		}
+		err = errors.Unwrap(err)
+	}
+	return errs
+}
+
 func extractOffsetAndType(e error) (int, string) {
 	switch v := e.(type) {
 	case *json.UnmarshalTypeError:
@@ -422,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
@@ -32,15 +32,15 @@ func TestNewFileError(t *testing.T) {
 	fe := NewFileErrorFromName(errors.New("bar"), "foo.html")
 	c.Assert(fe.Error(), qt.Equals, `"foo.html:1:1": bar`)

-	var lines strings.Builder
+	lines := ""
 	for i := 1; i <= 100; i++ {
-		lines.WriteString(fmt.Sprintf("line %d\n", i))
+		lines += fmt.Sprintf("line %d\n", i)
 	}

 	fe.UpdatePosition(text.Position{LineNumber: 32, ColumnNumber: 2})
 	c.Assert(fe.Error(), qt.Equals, `"foo.html:32:2": bar`)
 	fe.UpdatePosition(text.Position{LineNumber: 0, ColumnNumber: 0, Offset: 212})
-	fe.UpdateContent(strings.NewReader(lines.String()), nil)
+	fe.UpdateContent(strings.NewReader(lines), nil)
 	c.Assert(fe.Error(), qt.Equals, `"foo.html:32:0": bar`)
 	errorContext := fe.ErrorContext()
 	c.Assert(errorContext, qt.IsNotNil)
@@ -19,27 +19,17 @@ import (
 )

 var lineNumberExtractors = []lineNumberExtractor{
-	// YAML parse errors.
-	newLineNumberErrHandlerFromRegexp(`\[(\d+):(\d+)\]`),
-
 	// Template/shortcode parse errors
 	newLineNumberErrHandlerFromRegexp(`:(\d+):(\d*):`),
 	newLineNumberErrHandlerFromRegexp(`:(\d+):`),

+	// YAML parse errors
+	newLineNumberErrHandlerFromRegexp(`line (\d+):`),
+
 	// i18n bundle errors
 	newLineNumberErrHandlerFromRegexp(`\((\d+),\s(\d*)`),
 }

-func commonLineNumberExtractor(e error) (int, int) {
-	for _, handler := range lineNumberExtractors {
-		lno, col := handler(e)
-		if lno > 0 {
-			return lno, col
-		}
-	}
-	return 0, 0
-}
-
 type lineNumberExtractor func(e error) (int, int)

 func newLineNumberErrHandlerFromRegexp(expression string) lineNumberExtractor {
@@ -1,30 +0,0 @@
-// Copyright 2026 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 hexec
-
-import (
-	_ "embed"
-	"encoding/base64"
-	"sync"
-)
-
-//go:embed esmloader.mjs
-var esmLoaderSource string
-
-// nodeESMLoaderImportArg returns a "--import=data:..." argument that installs
-// a Node.js ESM resolver hook making NODE_PATH a fallback for failed bare
-// imports. See esmloader.mjs for the rationale.
-var nodeESMLoaderImportArg = sync.OnceValue(func() string {
-	return "--import=data:text/javascript;base64," + base64.StdEncoding.EncodeToString([]byte(esmLoaderSource))
-})
@@ -1,61 +0,0 @@
-// Node.js ESM resolver hook installed by Hugo.
-//
-// Node's ESM resolver does not consult NODE_PATH, unlike CJS require().
-// That breaks postcss.config.js / babel.config.js / etc. files written in
-// ESM and loaded from outside the project tree (typically the Hugo module
-// cache): bare imports like `import x from "postcss-import"` cannot be
-// resolved by walking up from the file's location.
-//
-// This hook makes the ESM resolver fall back to NODE_PATH for bare
-// specifiers when Node's normal resolution fails. It is a no-op for
-// relative/absolute paths and URL-scheme specifiers, and it never fires
-// unless Node would itself have thrown ERR_MODULE_NOT_FOUND or
-// ERR_ACCESS_DENIED.
-//
-// ERR_ACCESS_DENIED is handled because Node's resolver walks up the
-// directory tree looking for node_modules. Under the permission model that
-// walk can hit a node_modules outside the allow-list (e.g. Netlify stores
-// its node_modules cache in the same tree as the Hugo file cache), aborting
-// resolution even though the package is reachable via NODE_PATH. If the
-// NODE_PATH fallback also fails we re-throw the original error so the
-// access-denied resource is still reported.
-//
-// Uses the synchronous registerHooks API so it runs on the main thread and
-// does not require --allow-worker under the Node permission model.
-
-import { registerHooks, createRequire } from 'node:module';
-import { pathToFileURL } from 'node:url';
-
-const resolvers = [];
-const np = process.env.NODE_PATH;
-if (np) {
-	const sep = process.platform === 'win32' ? ';' : ':';
-	for (const p of np.split(sep)) {
-		if (p) resolvers.push(createRequire(p + '/_'));
-	}
-}
-
-function isBareSpecifier(s) {
-	if (!s) return false;
-	if (s.startsWith('.') || s.startsWith('/') || s.startsWith('#')) return false;
-	if (/^[a-z][a-z0-9+.-]*:/i.test(s)) return false;
-	return true;
-}
-
-registerHooks({
-	resolve(specifier, context, nextResolve) {
-		try {
-			return nextResolve(specifier, context);
-		} catch (err) {
-			if (err?.code !== 'ERR_MODULE_NOT_FOUND' && err?.code !== 'ERR_ACCESS_DENIED') throw err;
-			if (!isBareSpecifier(specifier)) throw err;
-			for (const r of resolvers) {
-				try {
-					const resolved = r.resolve(specifier);
-					return { url: pathToFileURL(resolved).href, shortCircuit: true, format: null };
-				} catch (_) { /* try next */ }
-			}
-			throw err;
-		}
-	},
-});
@@ -1,4 +1,4 @@
-// Copyright 2026 The Hugo Authors. All rights reserved.
+// Copyright 2020 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.
@@ -14,7 +14,6 @@
 package hexec

 import (
-	"bufio"
 	"bytes"
 	"context"
 	"errors"
@@ -24,12 +23,10 @@ import (
 	"os/exec"
 	"path/filepath"
 	"regexp"
-	"slices"
 	"strings"
+	"sync"

-	"github.com/bep/logg"
-	"github.com/gohugoio/hugo/common/hmaps"
-	"github.com/gohugoio/hugo/common/loggers"
+	"github.com/cli/safeexec"
 	"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,
-		nodeRunnerCache: hmaps.NewCache[string, func(arg ...any) (Runner, error)](),
+		sc:          cfg,
+		workingDir:  workingDir,
+		baseEnviron: baseEnviron,
 	}
 }

@@ -113,25 +108,28 @@ func IsNotFound(err error) bool {
 	return errors.As(err, &notFoundErr)
 }

+// SafeCommand is a wrapper around os/exec Command which uses a LookPath
+// implementation that does not search in current directory before looking in PATH.
+// See https://github.com/cli/safeexec and the linked issues.
+func SafeCommand(name string, arg ...string) (*exec.Cmd, error) {
+	bin, err := safeexec.LookPath(name)
+	if err != nil {
+		return nil, err
+	}
+
+	return exec.Command(bin, arg...), nil
+}
+
 // Exec enforces a security policy for commands run via os/exec.
 type Exec struct {
 	sc         security.Config
 	workingDir string
-	infol      logg.LevelLogger

 	// os.Environ filtered by the Exec.OsEnviron whitelist filter.
 	baseEnviron []string

-	// Additional absolute paths to allow reading from in the Node.js permission model.
-	nodeReadPaths []string
-
-	nodeRunnerCache *hmaps.Cache[string, func(arg ...any) (Runner, error)]
-}
-
-// SetNodeReadPaths sets additional absolute paths to allow reading from
-// in the Node.js permission model (e.g. Hugo module cache directories).
-func (e *Exec) SetNodeReadPaths(paths []string) {
-	e.nodeReadPaths = paths
+	npxInit      sync.Once
+	npxAvailable bool
 }

 func (e *Exec) New(name string, arg ...any) (Runner, error) {
@@ -157,270 +155,43 @@ 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 binaryLocationPath:
-		return "PATH"
+// 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.
+func (e *Exec) Npx(name string, arg ...any) (Runner, error) {
+	// 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...)
 	}
-	return "unknown"
+	e.checkNpx()
+	if e.npxAvailable {
+		r, err := e.npx(name, arg...)
+		if err == nil {
+			return r, nil
+		}
+	}
+	return e.New(name, arg...)
 }

 const (
-	binaryLocationNodeModules binaryLocation = iota + 1
-	binaryLocationPath
+	npxNoInstall       = "--no-install"
+	npxBinary          = "npx"
+	nodeModulesBinPath = "node_modules/.bin"
 )

-// Npx finds and runs a Node.js tool. The binary is located first in
-// WORKINGDIR/node_modules/.bin, then in PATH. The tool is always invoked via
-// "node [--permission <flags>] <script> <args>"; the --permission flags are
-// added when the Node.js permission model is enabled.
-func (e *Exec) Npx(name string, arg ...any) (Runner, error) {
-	if err := e.sc.CheckAllowedExec(name); err != nil {
-		return nil, err
-	}
-	if err := e.sc.CheckAllowedExec("node"); err != nil {
-		// Legacy path: We replaced npx with node in v0.161.0, and anyone using these tools with a custom security.exec.allow list
-		// would get an error when upgrading. To avoid this, check for npx as well.
-		if err2 := e.sc.CheckAllowedExec("npx"); err2 != nil {
-			return nil, err
-		}
-	}
-
-	newRunner, err := e.nodeRunnerCache.GetOrCreate(name, func() (func(...any) (Runner, error), error) {
-		var resolvedBin string
-		var loc binaryLocation
-
-		nodeBinFilename := filepath.Join(e.workingDir, nodeModulesBinPath, name)
-		if p, err := exec.LookPath(nodeBinFilename); err == nil {
-			resolvedBin = p
-			loc = binaryLocationNodeModules
-		} else if p, err := exec.LookPath(name); err == nil {
-			resolvedBin = p
-			loc = binaryLocationPath
-		} else {
-			return nil, &NotFoundError{name: name, method: "in PATH"}
-		}
-
-		scriptPath := resolveNodeBin(resolvedBin)
-
-		e.infol.WithFields(logg.Fields{
-			logg.Field{Name: "location", Value: loc},
-			logg.Field{Name: "bin", Value: resolvedBin},
-			logg.Field{Name: "script", Value: scriptPath},
-		}).Logf("resolve %q", name)
-
-		if scriptPath == "" {
-			return nil, fmt.Errorf("binary %q is not a Node.js script", name)
-		}
-
-		return func(arg2 ...any) (Runner, error) {
-			return e.newNode(name, scriptPath, arg2...)
-		}, nil
+func (e *Exec) checkNpx() {
+	e.npxInit.Do(func() {
+		e.npxAvailable = InPath(npxBinary)
 	})
-	if err != nil {
-		return nil, err
-	}
-
-	return newRunner(arg...)
 }

-// newNode runs a Node.js script via "node [--permission <flags>] <scriptPath> <args>".
-func (e *Exec) newNode(name, scriptPath string, arg ...any) (Runner, error) {
-	var allArgs []any
-	for _, pa := range e.nodePermissionArgs(name, scriptPath) {
-		allArgs = append(allArgs, pa)
-	}
-	// Install an ESM resolver hook that makes NODE_PATH a fallback for failed
-	// bare imports, so postcss.config.js / babel.config.js / etc. written in
-	// ESM work when loaded from the Hugo module cache. See esmloader.mjs.
-	allArgs = append(allArgs, nodeESMLoaderImportArg())
-	allArgs = append(allArgs, scriptPath)
-	allArgs = append(allArgs, arg...)
-	// When the script lives outside the working dir (a globally installed
-	// tool), point NODE_PATH at the script's node_modules ancestor so Node's
-	// resolver (and tools that honor it, e.g. tailwindcss v4) can locate the
-	// tool's sibling packages. tailwindcss v4's CSS resolver treats NODE_PATH
-	// as a single path, not a list, so we don't concatenate with the local
-	// path here. For local installs the caller's NODE_PATH (set by
-	// hugo.GetExecEnviron to <workDir>/node_modules) already covers the need.
-	localNM := filepath.Join(e.workingDir, "node_modules")
-	if p := nodeScriptReadPath(scriptPath); p != "" && p != localNM {
-		allArgs = append(allArgs, WithEnviron([]string{"NODE_PATH=" + p}))
-	}
-
-	return e.New("node", allArgs...)
-}
-
-// nodePermissionArgs builds the Node.js --permission flags from the security config.
-func (e *Exec) nodePermissionArgs(name, scriptPath string) []string {
-	perms := e.sc.Node.Permissions
-	if !perms.IsEnabled() {
-		return nil
-	}
-
-	args := []string{"--permission"}
-
-	for _, p := range e.resolveNodePermPaths(perms.AllowRead) {
-		args = append(args, "--allow-fs-read="+p)
-	}
-	for _, p := range e.nodeReadPaths {
-		args = append(args, "--allow-fs-read="+p)
-	}
-	if p := nodeScriptReadPath(scriptPath); p != "" {
-		args = append(args, "--allow-fs-read="+p)
-	}
-
-	for _, p := range e.resolveNodePermPaths(perms.AllowWrite) {
-		args = append(args, "--allow-fs-write="+p)
-	}
-
-	var silenceSecurityWarnings bool
-	if slices.Contains(perms.AllowAddons, name) {
-		silenceSecurityWarnings = true
-		args = append(args, "--allow-addons")
-	}
-
-	if slices.Contains(perms.AllowWorker, name) {
-		silenceSecurityWarnings = true
-		args = append(args, "--allow-worker")
-	}
-
-	if slices.Contains(perms.AllowChildProcess, name) {
-		silenceSecurityWarnings = true
-		args = append(args, "--allow-child-process")
-	}
-
-	if silenceSecurityWarnings {
-		// There are no more fine grained way to do this, see https://github.com/nodejs/node/issues/59818
-		// If the process is configured to allow either workers or addons, Node will print warnings that's not very helpful.
-		args = append(args, "--disable-warning=SecurityWarning")
-	}
-
-	return args
-}
-
-// resolveNodePermPaths resolves relative paths against the working directory.
-func (e *Exec) resolveNodePermPaths(paths []string) []string {
-	resolved := make([]string, len(paths))
-	for i, p := range paths {
-		switch {
-		case p == "*":
-			resolved[i] = "*"
-		case filepath.IsAbs(p):
-			resolved[i] = p
-		default:
-			resolved[i] = filepath.Join(e.workingDir, p)
-		}
-	}
-	return resolved
-}
-
-const nodeModulesBinPath = "node_modules/.bin"
-
-// nodeScriptReadPath returns a path to add to the Node.js read allow-list so
-// a script can load its dependencies. For scripts inside a node_modules tree
-// it returns the nearest ancestor "node_modules" directory, so both nested
-// and hoisted deps are reachable. Otherwise the script's own directory.
-func nodeScriptReadPath(scriptPath string) string {
-	if scriptPath == "" {
-		return ""
-	}
-	dir := filepath.Dir(scriptPath)
-	for {
-		if filepath.Base(dir) == "node_modules" {
-			return dir
-		}
-		parent := filepath.Dir(dir)
-		if parent == dir {
-			return filepath.Dir(scriptPath)
-		}
-		dir = parent
-	}
-}
-
-// resolveNodeBin resolves a binary path to the underlying Node.js script.
-// Returns the path to the JS entry point, or "" if the binary is not a Node script.
-func resolveNodeBin(path string) string {
-	// 1. If the file is a symlink, resolve it (macOS/Linux npm creates symlinks in node_modules/.bin).
-	if info, err := os.Lstat(path); err == nil && info.Mode()&os.ModeSymlink != 0 {
-		if resolved, err := filepath.EvalSymlinks(path); err == nil {
-			if hasJSExtension(resolved) || isNodeScript(resolved) {
-				return resolved
-			}
-		}
-		return ""
-	}
-	// 2. Check if the file itself is a Node script (e.g. globally installed with #!/usr/bin/env node).
-	if isNodeScript(path) {
-		return path
-	}
-	// 3. Try extracting JS entry point from an npm wrapper script (.cmd or shell).
-	return extractNodeEntryPoint(path)
-}
-
-// nodeEntryPointRe matches a relative path in npm-generated wrapper scripts.
-// The entry may be a .js/.mjs/.cjs file or an extensionless Node shebang
-// script (e.g. postcss-cli 7's bin/postcss). Local installs reference the
-// entry via "..", global installs via "node_modules" (notably on Windows,
-// where npm does not symlink global binaries).
-// Examples:
-//
-//	Local shell:  "$basedir/../postcss-cli/index.js"
-//	Local cmd:    "%dp0%\..\postcss-cli\index.js"
-//	Scoped:       "$basedir/../@babel/cli/bin/babel.js"
-//	No ext:       "%dp0%\..\postcss-cli\bin\postcss"
-//	Global shell: "$basedir/node_modules/postcss-cli/index.js"
-//	Global cmd:   "%dp0%\node_modules\postcss-cli\index.js"
-var nodeEntryPointRe = regexp.MustCompile(`[/\\]((?:\.\.|node_modules)[/\\][\w@][\w@./\\-]*)`)
-
-// extractNodeEntryPoint reads an npm wrapper script and extracts the Node
-// entry point path, validating that it's a JS file or a Node shebang script.
-func extractNodeEntryPoint(wrapperPath string) string {
-	data, err := os.ReadFile(wrapperPath)
-	if err != nil {
-		return ""
-	}
-	m := nodeEntryPointRe.FindSubmatch(data)
-	if m == nil {
-		return ""
-	}
-	// Normalize backslashes from Windows .cmd wrappers.
-	relPath := strings.ReplaceAll(string(m[1]), "\\", "/")
-	resolved := filepath.Join(filepath.Dir(wrapperPath), relPath)
-	if _, err := os.Stat(resolved); err != nil {
-		return ""
-	}
-	if !hasJSExtension(resolved) && !isNodeScript(resolved) {
-		return ""
-	}
-	return resolved
-}
-
-func hasJSExtension(path string) bool {
-	switch filepath.Ext(path) {
-	case ".js", ".mjs", ".cjs":
-		return true
-	}
-	return false
-}
-
-// isNodeScript reports whether the file at path has a Node.js shebang.
-func isNodeScript(path string) bool {
-	f, err := os.Open(path)
-	if err != nil {
-		return false
-	}
-	defer f.Close()
-	r := bufio.NewReader(f)
-	line, err := r.ReadString('\n')
-	if err != nil && len(line) == 0 {
-		return false
-	}
-	return strings.HasPrefix(line, "#!") && strings.Contains(line, "node")
+// npx is a convenience method to create a Runner running npx --no-install <name> <args.
+func (e *Exec) npx(name string, arg ...any) (Runner, error) {
+	arg = append(arg[:0], append([]any{npxNoInstall, name}, arg[0:]...)...)
+	return e.New(npxBinary, arg...)
 }

 // Sec returns the security policies this Exec is configured with.
@@ -457,8 +228,14 @@ func (c *cmdWrapper) Run() error {
 	if err == nil {
 		return nil
 	}
+	name := c.name
+	method := "in PATH"
+	if name == npxBinary {
+		name = c.c.Args[2]
+		method = "using npx"
+	}
 	if notFoundRe.MatchString(c.outerr.String()) {
-		return &NotFoundError{name: c.name, method: "in PATH"}
+		return &NotFoundError{name: name, method: method}
 	}
 	return fmt.Errorf("failed to execute binary %q with args %v: %s", c.name, c.c.Args[1:], c.outerr.String())
 }
@@ -501,7 +278,7 @@ func (c *commandeer) command(arg ...any) (*cmdWrapper, error) {
 		bin = c.fullyQualifiedName
 	} else {
 		var err error
-		bin, err = exec.LookPath(c.name)
+		bin, err = safeexec.LookPath(c.name)
 		if err != nil {
 			return nil, &NotFoundError{
 				name:   c.name,
@@ -539,7 +316,7 @@ func InPath(binaryName string) bool {
 	if strings.Contains(binaryName, "/") {
 		panic("binary name should not contain any slash")
 	}
-	_, err := exec.LookPath(binaryName)
+	_, err := safeexec.LookPath(binaryName)
 	return err == nil
 }

@@ -549,7 +326,7 @@ func LookPath(binaryName string) string {
 	if strings.Contains(binaryName, "/") {
 		panic("binary name should not contain any slash")
 	}
-	s, err := exec.LookPath(binaryName)
+	s, err := safeexec.LookPath(binaryName)
 	if err != nil {
 		return ""
 	}
@@ -1,74 +0,0 @@
-// Copyright 2026 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 hexec_test
-
-import (
-	"testing"
-
-	"github.com/gohugoio/hugo/htesting"
-	"github.com/gohugoio/hugo/hugolib"
-)
-
-func TestNPMGlobalInstalls(t *testing.T) {
-	if !htesting.IsRealCI() {
-		t.Skip("We only ever want to run this in CI.")
-	}
-	files := `
-- hugo.toml --
-disableKinds = ["taxonomy", "term"]
-[security.exec]
-allow = ['^(babel|node|postcss|tailwindcss)$']
-
-- package.json --
-{}
-- hugo_stats.json --
-- assets/js/main.js --
-console.log("Hello, world!");
-- assets/css/main1.css --
-body { color: red }
-- assets/css/main2.css --
-@import "tailwindcss";
-@plugin "@tailwindcss/typography";
-@source "hugo_stats.json";
-body { color: blue }
-- layouts/home.html --
-{{ with resources.Get "css/main1.css"  }}
-	{{ with . | css.PostCSS  }}
-		 CSS1: {{ .RelPermalink }}|{{ gt (.Content | len) 10 }}|
-	{{ end }}
-{{ end }}
- {{ with resources.Get "css/main2.css" }}
-	{{ with . | css.TailwindCSS  }}
-		 CSS2: {{ .RelPermalink }}|{{ gt (.Content | len) 10 }}|
-	{{ end }}
-{{ end }}
-{{ with resources.Get "js/main.js" }}
-	{{ with . | js.Babel  }}
-		 JS: {{ .RelPermalink }}|{{ gt (.Content | len) 10 }}|
-	{{ end }}
-{{ end }}
-`
-
-	b := hugolib.Test(t, files, hugolib.TestOptOsFs(), hugolib.TestOptWithNpmInstallGlobal(
-		"postcss", "postcss-cli",
-		"@babel/core", "@babel/cli",
-		"tailwindcss", "@tailwindcss/cli", "@tailwindcss/typography",
-	))
-
-	b.AssertFileContent("public/index.html",
-		"CSS1: /css/main1.css|true|",
-		"CSS2: /css/main2.css|true|",
-		"JS: /js/main.js|true|",
-	)
-}
@@ -1,474 +0,0 @@
-// Copyright 2026 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 hexec
-
-import (
-	"os"
-	"path/filepath"
-	"runtime"
-	"testing"
-
-	qt "github.com/frankban/quicktest"
-	"github.com/gohugoio/hugo/config/security"
-)
-
-func TestNodePermissionArgs(t *testing.T) {
-	c := qt.New(t)
-
-	// Use t.TempDir() so paths are absolute on any OS (avoids Windows volume assumptions).
-	base := t.TempDir()
-	site := filepath.Join(base, "site")
-	tmp := filepath.Join(base, "tmp")
-	cacheDir := filepath.Join(base, "home", "user", ".cache", "hugo_cache", "modules")
-
-	c.Run("Default config tailwindcss", func(c *qt.C) {
-		e := &Exec{
-			sc:         security.DefaultConfig,
-			workingDir: site,
-		}
-		args := e.nodePermissionArgs("tailwindcss", "")
-		c.Assert(args, qt.DeepEquals, []string{
-			"--permission",
-			"--allow-fs-read=" + site,
-			"--allow-addons",
-			"--allow-worker",
-			"--allow-child-process",
-			"--disable-warning=SecurityWarning",
-		})
-	})
-
-	c.Run("Default config postcss", func(c *qt.C) {
-		e := &Exec{
-			sc:         security.DefaultConfig,
-			workingDir: site,
-		}
-		args := e.nodePermissionArgs("postcss", "")
-		c.Assert(args, qt.DeepEquals, []string{
-			"--permission",
-			"--allow-fs-read=" + site,
-		})
-	})
-
-	c.Run("Multiple paths", func(c *qt.C) {
-		cfg := security.DefaultConfig
-		cfg.Node.Permissions.AllowRead = []string{".", tmp}
-		cfg.Node.Permissions.AllowWrite = []string{"."}
-		e := &Exec{
-			sc:         cfg,
-			workingDir: site,
-		}
-		args := e.nodePermissionArgs("tailwindcss", "")
-		c.Assert(args, qt.DeepEquals, []string{
-			"--permission",
-			"--allow-fs-read=" + site,
-			"--allow-fs-read=" + tmp,
-			"--allow-fs-write=" + site,
-			"--allow-addons",
-			"--allow-worker",
-			"--allow-child-process",
-			"--disable-warning=SecurityWarning",
-		})
-	})
-
-	c.Run("Wildcard", func(c *qt.C) {
-		cfg := security.DefaultConfig
-		cfg.Node.Permissions.AllowRead = []string{"*"}
-		cfg.Node.Permissions.AllowWrite = []string{"*"}
-		e := &Exec{
-			sc:         cfg,
-			workingDir: site,
-		}
-		args := e.nodePermissionArgs("tailwindcss", "")
-		c.Assert(args, qt.DeepEquals, []string{
-			"--permission",
-			"--allow-fs-read=*",
-			"--allow-fs-write=*",
-			"--allow-addons",
-			"--allow-worker",
-			"--allow-child-process",
-			"--disable-warning=SecurityWarning",
-		})
-	})
-
-	c.Run("Disabled", func(c *qt.C) {
-		cfg := security.DefaultConfig
-		cfg.Node.Permissions.Disable = true
-		e := &Exec{
-			sc:         cfg,
-			workingDir: site,
-		}
-		args := e.nodePermissionArgs("tailwindcss", "")
-		c.Assert(args, qt.IsNil)
-	})
-
-	c.Run("No fs flags", func(c *qt.C) {
-		cfg := security.DefaultConfig
-		cfg.Node.Permissions.AllowRead = nil
-		cfg.Node.Permissions.AllowAddons = nil
-		cfg.Node.Permissions.AllowWorker = nil
-		cfg.Node.Permissions.AllowChildProcess = nil
-		e := &Exec{
-			sc:         cfg,
-			workingDir: site,
-		}
-		args := e.nodePermissionArgs("postcss", "")
-		c.Assert(args, qt.DeepEquals, []string{"--permission"})
-	})
-
-	c.Run("Read only", func(c *qt.C) {
-		cfg := security.DefaultConfig
-		cfg.Node.Permissions.AllowRead = []string{"."}
-		cfg.Node.Permissions.AllowWrite = nil
-		e := &Exec{
-			sc:         cfg,
-			workingDir: site,
-		}
-		args := e.nodePermissionArgs("postcss", "")
-		c.Assert(args, qt.DeepEquals, []string{
-			"--permission",
-			"--allow-fs-read=" + site,
-		})
-	})
-
-	c.Run("With additional read paths", func(c *qt.C) {
-		e := &Exec{
-			sc:            security.DefaultConfig,
-			workingDir:    site,
-			nodeReadPaths: []string{cacheDir},
-		}
-		args := e.nodePermissionArgs("postcss", "")
-		c.Assert(args, qt.DeepEquals, []string{
-			"--permission",
-			"--allow-fs-read=" + site,
-			"--allow-fs-read=" + cacheDir,
-		})
-	})
-
-	c.Run("Global install script path", func(c *qt.C) {
-		e := &Exec{
-			sc:         security.DefaultConfig,
-			workingDir: site,
-		}
-		globalNM := filepath.Join(base, "nvm", "lib", "node_modules")
-		script := filepath.Join(globalNM, "postcss-cli", "bin", "postcss")
-		args := e.nodePermissionArgs("postcss", script)
-		c.Assert(args, qt.DeepEquals, []string{
-			"--permission",
-			"--allow-fs-read=" + site,
-			"--allow-fs-read=" + globalNM,
-		})
-	})
-}
-
-func TestNodeScriptReadPath(t *testing.T) {
-	c := qt.New(t)
-
-	base := t.TempDir()
-	nm := filepath.Join(base, "node_modules")
-	globalNM := filepath.Join(base, "nvm", "lib", "node_modules")
-
-	c.Assert(nodeScriptReadPath(""), qt.Equals, "")
-	c.Assert(nodeScriptReadPath(filepath.Join(nm, "postcss-cli", "index.js")), qt.Equals, nm)
-	c.Assert(nodeScriptReadPath(filepath.Join(nm, "@babel", "cli", "bin", "babel.js")), qt.Equals, nm)
-	c.Assert(nodeScriptReadPath(filepath.Join(globalNM, "postcss-cli", "bin", "postcss")), qt.Equals, globalNM)
-
-	loose := filepath.Join(base, "tools", "script.js")
-	c.Assert(nodeScriptReadPath(loose), qt.Equals, filepath.Dir(loose))
-}
-
-func TestResolveNodeBin(t *testing.T) {
-	c := qt.New(t)
-
-	// Create a fake node_modules structure.
-	dir := t.TempDir()
-	nodeModules := filepath.Join(dir, "node_modules")
-	binDir := filepath.Join(nodeModules, ".bin")
-
-	// Create target JS files.
-	postcssJS := filepath.Join(nodeModules, "postcss-cli", "index.js")
-	babelJS := filepath.Join(nodeModules, "@babel", "cli", "bin", "babel.js")
-	mkdirAndWrite(t, postcssJS, "#!/usr/bin/env node\nconsole.log('postcss');\n")
-	mkdirAndWrite(t, babelJS, "#!/usr/bin/env node\nconsole.log('babel');\n")
-	os.MkdirAll(binDir, 0o755)
-
-	c.Run("Symlink to JS file", func(c *qt.C) {
-		if runtime.GOOS == "windows" {
-			c.Skip("Symlinks may require elevated privileges on Windows")
-		}
-		link := filepath.Join(binDir, "postcss-link")
-		os.Remove(link)
-		c.Assert(os.Symlink(postcssJS, link), qt.IsNil)
-
-		resolved := resolveNodeBin(link)
-		t.Logf("Symlink: link=%q, resolved=%q", link, resolved)
-		c.Assert(resolved, qt.Not(qt.Equals), "")
-		c.Assert(sameFile(t, resolved, postcssJS), qt.IsTrue)
-	})
-
-	c.Run("Symlink to scoped package", func(c *qt.C) {
-		if runtime.GOOS == "windows" {
-			c.Skip("Symlinks may require elevated privileges on Windows")
-		}
-		link := filepath.Join(binDir, "babel-link")
-		os.Remove(link)
-		c.Assert(os.Symlink(babelJS, link), qt.IsNil)
-
-		resolved := resolveNodeBin(link)
-		t.Logf("Scoped symlink: link=%q, resolved=%q", link, resolved)
-		c.Assert(resolved, qt.Not(qt.Equals), "")
-		c.Assert(sameFile(t, resolved, babelJS), qt.IsTrue)
-	})
-
-	c.Run("Shell wrapper", func(c *qt.C) {
-		wrapper := filepath.Join(binDir, "postcss-sh")
-		content := "#!/bin/sh\n" +
-			`basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")` + "\n" +
-			`exec node  "$basedir/../postcss-cli/index.js" "$@"` + "\n"
-		mkdirAndWrite(t, wrapper, content)
-
-		resolved := resolveNodeBin(wrapper)
-		t.Logf("Shell wrapper: wrapper=%q, resolved=%q", wrapper, resolved)
-		c.Assert(resolved, qt.Not(qt.Equals), "")
-		c.Assert(sameFile(t, resolved, postcssJS), qt.IsTrue)
-	})
-
-	c.Run("Cmd wrapper", func(c *qt.C) {
-		wrapper := filepath.Join(binDir, "postcss.cmd")
-		content := "@ECHO off\r\n" +
-			"SETLOCAL\r\n" +
-			`endLocal & goto #_undefined_# 2>NUL || title %COMSPEC% & "%_prog%"  "%dp0%\..\postcss-cli\index.js" %*` + "\r\n"
-		mkdirAndWrite(t, wrapper, content)
-
-		resolved := resolveNodeBin(wrapper)
-		t.Logf("Cmd wrapper: wrapper=%q, resolved=%q", wrapper, resolved)
-		c.Assert(resolved, qt.Not(qt.Equals), "")
-		c.Assert(sameFile(t, resolved, postcssJS), qt.IsTrue)
-	})
-
-	c.Run("Cmd wrapper scoped package", func(c *qt.C) {
-		wrapper := filepath.Join(binDir, "babel.cmd")
-		content := "@ECHO off\r\n" +
-			`endLocal & goto #_undefined_# 2>NUL || title %COMSPEC% & "%_prog%"  "%dp0%\..\@babel\cli\bin\babel.js" %*` + "\r\n"
-		mkdirAndWrite(t, wrapper, content)
-
-		resolved := resolveNodeBin(wrapper)
-		t.Logf("Cmd wrapper (scoped): wrapper=%q, resolved=%q", wrapper, resolved)
-		c.Assert(resolved, qt.Not(qt.Equals), "")
-		c.Assert(sameFile(t, resolved, babelJS), qt.IsTrue)
-	})
-
-	c.Run("Node script with shebang", func(c *qt.C) {
-		script := filepath.Join(binDir, "node-global")
-		mkdirAndWrite(t, script, "#!/usr/bin/env node\nconsole.log('global');\n")
-
-		resolved := resolveNodeBin(script)
-		t.Logf("Node script: path=%q, resolved=%q", script, resolved)
-		c.Assert(resolved, qt.Equals, script)
-	})
-
-	c.Run("Native binary", func(c *qt.C) {
-		native := filepath.Join(binDir, "native-tool")
-		mkdirAndWrite(t, native, "\x7fELF\x00\x00\x00")
-
-		resolved := resolveNodeBin(native)
-		t.Logf("Native binary: path=%q, resolved=%q", native, resolved)
-		c.Assert(resolved, qt.Equals, "")
-	})
-
-	c.Run("Nonexistent file", func(c *qt.C) {
-		c.Assert(resolveNodeBin("/nonexistent/path"), qt.Equals, "")
-	})
-
-	c.Run("Wrapper with missing target", func(c *qt.C) {
-		wrapper := filepath.Join(binDir, "missing-target")
-		mkdirAndWrite(t, wrapper, "#!/bin/sh\nexec node \"$basedir/../no-such-pkg/index.js\" \"$@\"\n")
-
-		resolved := resolveNodeBin(wrapper)
-		t.Logf("Missing target: wrapper=%q, resolved=%q", wrapper, resolved)
-		c.Assert(resolved, qt.Equals, "")
-	})
-}
-
-func TestExtractNodeEntryPointRegex(t *testing.T) {
-	c := qt.New(t)
-
-	cases := []struct {
-		name    string
-		content string
-		want    string // expected capture group (with original separators)
-	}{
-		{"shell postcss", `"$basedir/../postcss-cli/index.js"`, "../postcss-cli/index.js"},
-		{"shell babel", `"$basedir/../@babel/cli/bin/babel.js"`, "../@babel/cli/bin/babel.js"},
-		{"shell tailwind mjs", `"$basedir/../@tailwindcss/cli/dist/index.mjs"`, "../@tailwindcss/cli/dist/index.mjs"},
-		{"cmd postcss", `"%dp0%\..\postcss-cli\index.js"`, `..\postcss-cli\index.js`},
-		{"cmd babel", `"%dp0%\..\@babel\cli\bin\babel.js"`, `..\@babel\cli\bin\babel.js`},
-		{"cmd postcss no ext", `"%dp0%\..\postcss-cli\bin\postcss"`, `..\postcss-cli\bin\postcss`},
-		{"shell postcss no ext", `"$basedir/../postcss-cli/bin/postcss"`, "../postcss-cli/bin/postcss"},
-		{"cmd postcss global", `"%dp0%\node_modules\postcss-cli\index.js"`, `node_modules\postcss-cli\index.js`},
-		{"cmd babel global", `"%dp0%\node_modules\@babel\cli\bin\babel.js"`, `node_modules\@babel\cli\bin\babel.js`},
-		{"shell postcss global", `"$basedir/node_modules/postcss-cli/index.js"`, "node_modules/postcss-cli/index.js"},
-	}
-
-	for _, tc := range cases {
-		c.Run(tc.name, func(c *qt.C) {
-			m := nodeEntryPointRe.FindStringSubmatch(tc.content)
-			t.Logf("regex match for %q: %v", tc.name, m)
-			c.Assert(m, qt.Not(qt.IsNil))
-			c.Assert(m[1], qt.Equals, tc.want)
-		})
-	}
-
-	c.Run("No match", func(c *qt.C) {
-		for _, s := range []string{"@ECHO off", "#!/bin/bash\necho hello", "\x7fELF"} {
-			c.Assert(nodeEntryPointRe.FindStringSubmatch(s), qt.IsNil)
-		}
-	})
-}
-
-// TestResolveNodeBinWindows tests wrapper resolution on all platforms
-// by simulating Windows-style wrapper files. On Windows CI, this also
-// tests the native .cmd resolution path.
-func TestResolveNodeBinWindows(t *testing.T) {
-	c := qt.New(t)
-
-	dir := t.TempDir()
-	nodeModules := filepath.Join(dir, "node_modules")
-	binDir := filepath.Join(nodeModules, ".bin")
-
-	// Create target JS file.
-	targetJS := filepath.Join(nodeModules, "postcss-cli", "index.js")
-	mkdirAndWrite(t, targetJS, "#!/usr/bin/env node\nconsole.log('postcss');\n")
-	os.MkdirAll(binDir, 0o755)
-
-	// Simulate what npm creates on Windows: a .cmd wrapper and a shell script.
-	cmdWrapper := filepath.Join(binDir, "postcss.cmd")
-	cmdContent := "@ECHO off\r\n" +
-		"SETLOCAL\r\n" +
-		"CALL :find_dp0\r\n" +
-		`endLocal & goto #_undefined_# 2>NUL || title %COMSPEC% & "%_prog%"  "%dp0%\..\postcss-cli\index.js" %*` + "\r\n"
-	mkdirAndWrite(t, cmdWrapper, cmdContent)
-
-	shWrapper := filepath.Join(binDir, "postcss")
-	shContent := "#!/bin/sh\n" +
-		`exec node  "$basedir/../postcss-cli/index.js" "$@"` + "\n"
-	mkdirAndWrite(t, shWrapper, shContent)
-
-	t.Logf("GOOS=%s", runtime.GOOS)
-	t.Logf("cmd wrapper: %s", cmdWrapper)
-	t.Logf("sh wrapper: %s", shWrapper)
-	t.Logf("target JS: %s", targetJS)
-
-	c.Run("cmd wrapper resolves to JS", func(c *qt.C) {
-		resolved := resolveNodeBin(cmdWrapper)
-		t.Logf("resolveNodeBin(%q) = %q", cmdWrapper, resolved)
-		c.Assert(resolved, qt.Not(qt.Equals), "")
-		c.Assert(sameFile(t, resolved, targetJS), qt.IsTrue)
-	})
-
-	c.Run("sh wrapper resolves to JS", func(c *qt.C) {
-		resolved := resolveNodeBin(shWrapper)
-		t.Logf("resolveNodeBin(%q) = %q", shWrapper, resolved)
-		c.Assert(resolved, qt.Not(qt.Equals), "")
-		c.Assert(sameFile(t, resolved, targetJS), qt.IsTrue)
-	})
-
-	// Simulate postcss-cli 7, whose wrappers point to an extensionless Node
-	// shebang script (bin/postcss) rather than a .js file.
-	targetNoExt := filepath.Join(nodeModules, "postcss-cli", "bin", "postcss")
-	mkdirAndWrite(t, targetNoExt, "#!/usr/bin/env node\nrequire('../');\n")
-
-	cmdNoExt := filepath.Join(binDir, "postcssne.cmd")
-	mkdirAndWrite(t, cmdNoExt, "@ECHO off\r\n"+
-		`"%dp0%\..\postcss-cli\bin\postcss" %*`+"\r\n")
-
-	shNoExt := filepath.Join(binDir, "postcssne")
-	mkdirAndWrite(t, shNoExt, "#!/bin/sh\n"+
-		`exec node "$basedir/../postcss-cli/bin/postcss" "$@"`+"\n")
-
-	c.Run("cmd wrapper resolves to extensionless script", func(c *qt.C) {
-		resolved := resolveNodeBin(cmdNoExt)
-		t.Logf("resolveNodeBin(%q) = %q", cmdNoExt, resolved)
-		c.Assert(resolved, qt.Not(qt.Equals), "")
-		c.Assert(sameFile(t, resolved, targetNoExt), qt.IsTrue)
-	})
-
-	c.Run("sh wrapper resolves to extensionless script", func(c *qt.C) {
-		resolved := resolveNodeBin(shNoExt)
-		t.Logf("resolveNodeBin(%q) = %q", shNoExt, resolved)
-		c.Assert(resolved, qt.Not(qt.Equals), "")
-		c.Assert(sameFile(t, resolved, targetNoExt), qt.IsTrue)
-	})
-
-	// Simulate `npm install -g` on Windows: the wrapper sits at the npm
-	// global prefix and references node_modules as a child (no `..`).
-	globalDir := filepath.Join(dir, "global")
-	globalTarget := filepath.Join(globalDir, "node_modules", "postcss-cli", "index.js")
-	mkdirAndWrite(t, globalTarget, "#!/usr/bin/env node\nconsole.log('postcss');\n")
-
-	globalCmd := filepath.Join(globalDir, "postcss.cmd")
-	mkdirAndWrite(t, globalCmd, "@ECHO off\r\n"+
-		`endLocal & goto #_undefined_# 2>NUL || title %COMSPEC% & "%_prog%"  "%dp0%\node_modules\postcss-cli\index.js" %*`+"\r\n")
-
-	globalSh := filepath.Join(globalDir, "postcss")
-	mkdirAndWrite(t, globalSh, "#!/bin/sh\n"+
-		`exec node  "$basedir/node_modules/postcss-cli/index.js" "$@"`+"\n")
-
-	c.Run("global cmd wrapper resolves to JS", func(c *qt.C) {
-		resolved := resolveNodeBin(globalCmd)
-		t.Logf("resolveNodeBin(%q) = %q", globalCmd, resolved)
-		c.Assert(resolved, qt.Not(qt.Equals), "")
-		c.Assert(sameFile(t, resolved, globalTarget), qt.IsTrue)
-	})
-
-	c.Run("global sh wrapper resolves to JS", func(c *qt.C) {
-		resolved := resolveNodeBin(globalSh)
-		t.Logf("resolveNodeBin(%q) = %q", globalSh, resolved)
-		c.Assert(resolved, qt.Not(qt.Equals), "")
-		c.Assert(sameFile(t, resolved, globalTarget), qt.IsTrue)
-	})
-
-	globalScopedTarget := filepath.Join(globalDir, "node_modules", "@babel", "cli", "bin", "babel.js")
-	mkdirAndWrite(t, globalScopedTarget, "#!/usr/bin/env node\nconsole.log('babel');\n")
-	globalScopedCmd := filepath.Join(globalDir, "babel.cmd")
-	mkdirAndWrite(t, globalScopedCmd, "@ECHO off\r\n"+
-		`endLocal & goto #_undefined_# 2>NUL || title %COMSPEC% & "%_prog%"  "%dp0%\node_modules\@babel\cli\bin\babel.js" %*`+"\r\n")
-
-	c.Run("global cmd wrapper scoped package", func(c *qt.C) {
-		resolved := resolveNodeBin(globalScopedCmd)
-		t.Logf("resolveNodeBin(%q) = %q", globalScopedCmd, resolved)
-		c.Assert(resolved, qt.Not(qt.Equals), "")
-		c.Assert(sameFile(t, resolved, globalScopedTarget), qt.IsTrue)
-	})
-}
-
-func sameFile(t *testing.T, a, b string) bool {
-	t.Helper()
-	infoA, errA := os.Stat(a)
-	infoB, errB := os.Stat(b)
-	if errA != nil || errB != nil {
-		t.Logf("sameFile: stat errors: a=%v, b=%v", errA, errB)
-		return false
-	}
-	return os.SameFile(infoA, infoB)
-}
-
-func mkdirAndWrite(t *testing.T, path, content string) {
-	t.Helper()
-	if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.WriteFile(path, []byte(content), 0o755); err != nil {
-		t.Fatal(err)
-	}
-}
@@ -1,84 +0,0 @@
-// Copyright 2025 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 himage provides some high level image types and interfaces.
-package himage
-
-import "image"
-
-// AnimatedImage represents an animated image.
-// This is currently supported for GIF and WebP images.
-type AnimatedImage interface {
-	image.Image        // The first frame.
-	GetRaw() any       // *gif.GIF or *WEBP.
-	GetLoopCount() int // Number of times to loop the animation. 0 means infinite.
-	ImageFrames
-}
-
-// ImageFrames provides access to the frames of an animated image.
-type ImageFrames interface {
-	GetFrames() []image.Image
-
-	// Frame durations in milliseconds.
-	// Note that Gif frame durations are in 100ths of a second,
-	// so they need to be multiplied by 10 to get milliseconds and vice versa.
-	GetFrameDurations() []int
-
-	SetFrames(frames []image.Image)
-	SetWidthHeight(width, height int)
-}
-
-// ImageConfigProvider provides access to the image.Config of an image.
-type ImageConfigProvider interface {
-	GetImageConfig() image.Config
-}
-
-// ColorPropertiesProvider provides access to CICP color properties (for HDR images).
-// Images implementing this interface preserve color space information through processing.
-type ColorPropertiesProvider interface {
-	GetColorPrimaries() int
-	GetTransferCharacteristics() int
-	GetMatrixCoefficients() int
-}
-
-// HasColorProperties returns true if the image has non-zero color properties that should be preserved.
-func HasColorProperties(img image.Image) bool {
-	if cpp, ok := img.(ColorPropertiesProvider); ok {
-		// Consider it as having properties if any value is non-zero.
-		return cpp.GetColorPrimaries() > 0 || cpp.GetTransferCharacteristics() > 0 || cpp.GetMatrixCoefficients() > 0
-	}
-	return false
-}
-
-// FrameDurationsToGifDelays converts frame durations in milliseconds to
-// GIF delays in 100ths of a second.
-func FrameDurationsToGifDelays(frameDurations []int) []int {
-	delays := make([]int, len(frameDurations))
-	for i, fd := range frameDurations {
-		delays[i] = fd / 10
-		if delays[i] == 0 && fd > 0 {
-			delays[i] = 1
-		}
-	}
-	return delays
-}
-
-// GifDelaysToFrameDurations converts GIF delays in 100ths of a second to
-// frame durations in milliseconds.
-func GifDelaysToFrameDurations(delays []int) []int {
-	frameDurations := make([]int, len(delays))
-	for i, d := range delays {
-		frameDurations[i] = d * 10
-	}
-	return frameDurations
-}
@@ -1,66 +0,0 @@
-package hiter
-
-// Common iterator functions.
-// Some of these are based on this discsussion: https://github.com/golang/go/issues/61898
-
-import "iter"
-
-// Concat returns an iterator over the concatenation of the sequences.
-// Any nil sequences are ignored.
-func Concat[V any](seqs ...iter.Seq[V]) iter.Seq[V] {
-	return func(yield func(V) bool) {
-		for _, seq := range seqs {
-			if seq == nil {
-				continue
-			}
-			for e := range seq {
-				if !yield(e) {
-					return
-				}
-			}
-		}
-	}
-}
-
-// Concat2 returns an iterator over the concatenation of the sequences.
-// Any nil sequences are ignored.
-func Concat2[K, V any](seqs ...iter.Seq2[K, V]) iter.Seq2[K, V] {
-	return func(yield func(K, V) bool) {
-		for _, seq := range seqs {
-			if seq == nil {
-				continue
-			}
-			for k, v := range seq {
-				if !yield(k, v) {
-					return
-				}
-			}
-		}
-	}
-}
-
-// Lock returns an iterator that locks before iterating and unlocks after.
-func Lock[V any](seq iter.Seq[V], lock, unlock func()) iter.Seq[V] {
-	return func(yield func(V) bool) {
-		lock()
-		defer unlock()
-		for e := range seq {
-			if !yield(e) {
-				return
-			}
-		}
-	}
-}
-
-// Lock2 returns an iterator that locks before iterating and unlocks after.
-func Lock2[K, V any](seq iter.Seq2[K, V], lock, unlock func()) iter.Seq2[K, V] {
-	return func(yield func(K, V) bool) {
-		lock()
-		defer unlock()
-		for k, v := range seq {
-			if !yield(k, v) {
-				return
-			}
-		}
-	}
-}
@@ -1,57 +0,0 @@
-// Copyright 2026 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 hmaps
-
-import (
-	"testing"
-
-	qt "github.com/frankban/quicktest"
-)
-
-func TestCacheSize(t *testing.T) {
-	c := qt.New(t)
-
-	cache := NewCacheWithOptions[string, string](CacheOptions{Size: 10})
-
-	for i := range 30 {
-		cache.Set(string(rune('a'+i)), "value")
-	}
-
-	c.Assert(len(cache.m), qt.Equals, 10)
-
-	for i := 20; i < 50; i++ {
-		cache.GetOrCreate(string(rune('a'+i)), func() (string, error) {
-			return "value", nil
-		})
-	}
-
-	c.Assert(len(cache.m), qt.Equals, 10)
-
-	for i := 100; i < 200; i++ {
-		cache.SetIfAbsent(string(rune('a'+i)), "value")
-	}
-
-	c.Assert(len(cache.m), qt.Equals, 10)
-
-	cache.InitAndGet("foo", func(
-		get func(key string) (string, bool), set func(key string, value string),
-	) error {
-		for i := 50; i < 100; i++ {
-			set(string(rune('a'+i)), "value")
-		}
-		return nil
-	})
-
-	c.Assert(len(cache.m), qt.Equals, 10)
-}
@@ -1,144 +0,0 @@
-// Copyright 2026 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 hmaps
-
-import (
-	"slices"
-
-	"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
-}
-
-// Has returns whether the given key exists in the map.
-func (m *Ordered[K, T]) Has(key K) bool {
-	if m == nil {
-		return false
-	}
-	_, found := m.values[key]
-	return 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 = slices.Delete(m.keys, i, 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)
-}
@@ -1,99 +0,0 @@
-// Copyright 2026 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 hmaps
-
-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))
-}
@@ -1,154 +0,0 @@
-// Copyright 2026 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 hmaps
-
-import (
-	"fmt"
-	"slices"
-
-	"github.com/bits-and-blooms/bitset"
-)
-
-type OrderedIntSet struct {
-	keys   []int
-	values *bitset.BitSet
-}
-
-// NewOrderedIntSet creates a new OrderedIntSet.
-// Note that this is backed by https://github.com/bits-and-blooms/bitset
-func NewOrderedIntSet(vals ...int) *OrderedIntSet {
-	m := &OrderedIntSet{
-		keys:   make([]int, 0, len(vals)),
-		values: bitset.New(uint(len(vals))),
-	}
-	for _, v := range vals {
-		m.Set(v)
-	}
-	return m
-}
-
-// Set sets the value for the given key.
-// Note that insertion order is not affected if a key is re-inserted into the set.
-func (m *OrderedIntSet) Set(key int) {
-	if m == nil {
-		panic("nil OrderedIntSet")
-	}
-	keyu := uint(key)
-	if m.values.Test(keyu) {
-		return
-	}
-	m.values.Set(keyu)
-	m.keys = append(m.keys, key)
-}
-
-// SetFrom sets the values from another OrderedIntSet.
-func (m *OrderedIntSet) SetFrom(other *OrderedIntSet) {
-	if m == nil || other == nil {
-		return
-	}
-	for _, key := range other.keys {
-		m.Set(key)
-	}
-}
-
-func (m *OrderedIntSet) Clone() *OrderedIntSet {
-	if m == nil {
-		return nil
-	}
-	newSet := &OrderedIntSet{
-		keys:   slices.Clone(m.keys),
-		values: m.values.Clone(),
-	}
-	return newSet
-}
-
-// Next returns the next key in the set possibly including the given key.
-// It returns -1 if the key is not found or if there are no keys greater than the given key.
-func (m *OrderedIntSet) Next(i int) int {
-	n, ok := m.values.NextSet(uint(i))
-	if !ok {
-		return -1
-	}
-	return int(n)
-}
-
-// The reason we don't use iter.Seq is https://github.com/golang/go/issues/69015
-// This is 70% faster than using iter.Seq2[int, int] for the keys.
-// It returns false if the iteration was stopped early.
-func (m *OrderedIntSet) ForEachKey(yield func(int) bool) bool {
-	if m == nil {
-		return true
-	}
-	for _, key := range m.keys {
-		if !yield(key) {
-			return false
-		}
-	}
-	return true
-}
-
-func (m *OrderedIntSet) Has(key int) bool {
-	if m == nil {
-		return false
-	}
-	return m.values.Test(uint(key))
-}
-
-func (m *OrderedIntSet) Len() int {
-	if m == nil {
-		return 0
-	}
-	return len(m.keys)
-}
-
-// KeysSorted returns the keys in sorted order.
-func (m *OrderedIntSet) KeysSorted() []int {
-	if m == nil {
-		return nil
-	}
-	keys := slices.Clone(m.keys)
-	slices.Sort(keys)
-	return m.keys
-}
-
-func (m *OrderedIntSet) String() string {
-	if m == nil {
-		return "[]"
-	}
-	return fmt.Sprintf("%v", m.keys)
-}
-
-func (m *OrderedIntSet) Values() *bitset.BitSet {
-	if m == nil {
-		return nil
-	}
-	return m.values
-}
-
-func (m *OrderedIntSet) IsSuperSet(other *OrderedIntSet) bool {
-	if m == nil || other == nil {
-		return false
-	}
-	return m.values.IsSuperSet(other.values)
-}
-
-// Words returns the bitset as array of 64-bit words, giving direct access to the internal representation.
-// It is not a copy, so changes to the returned slice will affect the bitset.
-// It is meant for advanced users.
-func (m *OrderedIntSet) Words() []uint64 {
-	if m == nil {
-		return nil
-	}
-	return m.values.Words()
-}
@@ -1,117 +0,0 @@
-// Copyright 2026 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 hmaps
-
-import (
-	"testing"
-
-	qt "github.com/frankban/quicktest"
-)
-
-func TestOrderedIntSet(t *testing.T) {
-	c := qt.New(t)
-
-	m := NewOrderedIntSet(2, 1, 3, 7)
-
-	c.Assert(m.Len(), qt.Equals, 4)
-	c.Assert(m.Has(1), qt.Equals, true)
-	c.Assert(m.Has(4), qt.Equals, false)
-	c.Assert(m.String(), qt.Equals, "[2 1 3 7]")
-	m.Set(4)
-	c.Assert(m.Len(), qt.Equals, 5)
-	c.Assert(m.Has(4), qt.Equals, true)
-	c.Assert(m.Next(0), qt.Equals, 1)
-	c.Assert(m.Next(1), qt.Equals, 1)
-	c.Assert(m.Next(2), qt.Equals, 2)
-	c.Assert(m.Next(3), qt.Equals, 3)
-	c.Assert(m.Next(4), qt.Equals, 4)
-	c.Assert(m.Next(7), qt.Equals, 7)
-	c.Assert(m.Next(8), qt.Equals, -1)
-	c.Assert(m.String(), qt.Equals, "[2 1 3 7 4]")
-
-	var nilset *OrderedIntSet
-	c.Assert(nilset.Len(), qt.Equals, 0)
-	c.Assert(nilset.Has(1), qt.Equals, false)
-	c.Assert(nilset.String(), qt.Equals, "[]")
-
-	var collected []int
-	m.ForEachKey(func(key int) bool {
-		collected = append(collected, key)
-		return true
-	})
-	c.Assert(collected, qt.DeepEquals, []int{2, 1, 3, 7, 4})
-}
-
-func BenchmarkOrderedIntSet(b *testing.B) {
-	smallSet := NewOrderedIntSet()
-	for i := range 8 {
-		smallSet.Set(i)
-	}
-	mediumSet := NewOrderedIntSet()
-	for i := range 64 {
-		mediumSet.Set(i)
-	}
-	largeSet := NewOrderedIntSet()
-	for i := range 1024 {
-		largeSet.Set(i)
-	}
-
-	b.Run("New", func(b *testing.B) {
-		for b.Loop() {
-			NewOrderedIntSet(1, 2, 3, 4, 5, 6, 7, 8)
-		}
-	})
-
-	b.Run("Has small", func(b *testing.B) {
-		for i := 0; b.Loop(); i++ {
-			smallSet.Has(i % 32)
-		}
-	})
-
-	b.Run("Has medium", func(b *testing.B) {
-		for i := 0; b.Loop(); i++ {
-			mediumSet.Has(i % 32)
-		}
-	})
-
-	b.Run("Next", func(b *testing.B) {
-		for i := 0; b.Loop(); i++ {
-			mediumSet.Next(i % 32)
-		}
-	})
-
-	b.Run("ForEachKey small", func(b *testing.B) {
-		for b.Loop() {
-			smallSet.ForEachKey(func(key int) bool {
-				return true
-			})
-		}
-	})
-
-	b.Run("ForEachKey medium", func(b *testing.B) {
-		for b.Loop() {
-			mediumSet.ForEachKey(func(key int) bool {
-				return true
-			})
-		}
-	})
-
-	b.Run("ForEachKey large", func(b *testing.B) {
-		for b.Loop() {
-			largeSet.ForEachKey(func(key int) bool {
-				return true
-			})
-		}
-	})
-}
@@ -1,222 +0,0 @@
-// Copyright 2025 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 hreflect
-
-import (
-	"fmt"
-	"math"
-	"reflect"
-)
-
-var (
-	typeInt64   = reflect.TypeFor[int64]()
-	typeFloat64 = reflect.TypeFor[float64]()
-	typeString  = reflect.TypeFor[string]()
-)
-
-// ToInt64 converts v to int64 if possible, returning an error if not.
-func ToInt64E(v reflect.Value) (int64, error) {
-	if v, ok := ConvertIfPossible(v, typeInt64); ok {
-		return v.Int(), nil
-	}
-	return 0, errConvert(v, "int64")
-}
-
-// ToInt64 converts v to int64 if possible. It panics if the conversion is not possible.
-func ToInt64(v reflect.Value) int64 {
-	vv, err := ToInt64E(v)
-	if err != nil {
-		panic(err)
-	}
-	return vv
-}
-
-// ToFloat64E converts v to float64 if possible, returning an error if not.
-func ToFloat64E(v reflect.Value) (float64, error) {
-	if v, ok := ConvertIfPossible(v, typeFloat64); ok {
-		return v.Float(), nil
-	}
-	return 0, errConvert(v, "float64")
-}
-
-// ToFloat64 converts v to float64 if possible, panicking if not.
-func ToFloat64(v reflect.Value) float64 {
-	vv, err := ToFloat64E(v)
-	if err != nil {
-		panic(err)
-	}
-	return vv
-}
-
-// ToStringE converts v to string if possible, returning an error if not.
-func ToStringE(v reflect.Value) (string, error) {
-	vv, err := ToStringValueE(v)
-	if err != nil {
-		return "", err
-	}
-	return vv.String(), nil
-}
-
-func ToStringValueE(v reflect.Value) (reflect.Value, error) {
-	if v, ok := ConvertIfPossible(v, typeString); ok {
-		return v, nil
-	}
-	return reflect.Value{}, errConvert(v, "string")
-}
-
-// ToString converts v to string if possible, panicking if not.
-func ToString(v reflect.Value) string {
-	vv, err := ToStringE(v)
-	if err != nil {
-		panic(err)
-	}
-	return vv
-}
-
-func errConvert(v reflect.Value, s string) error {
-	return fmt.Errorf("unable to convert value of type %q to %q", v.Type().String(), s)
-}
-
-// ConvertIfPossible tries to convert val to typ if possible.
-// This is currently only implemented for int kinds,
-// added to handle the move to a new YAML library which produces uint64 for unsigned integers.
-// We can expand on this later if needed.
-// This conversion is lossless.
-// See Issue 14079.
-func ConvertIfPossible(val reflect.Value, typ reflect.Type) (reflect.Value, bool) {
-	switch val.Kind() {
-	case reflect.Pointer, reflect.Interface:
-		if val.IsNil() {
-			// Return typ's zero value.
-			return reflect.Zero(typ), true
-		}
-		val = val.Elem()
-	}
-
-	if val.Type().AssignableTo(typ) {
-		// No conversion needed.
-		return val, true
-	}
-
-	if IsInt(typ.Kind()) {
-		return convertToIntIfPossible(val, typ)
-	}
-	if IsFloat(typ.Kind()) {
-		return convertToFloatIfPossible(val, typ)
-	}
-	if IsUint(typ.Kind()) {
-		return convertToUintIfPossible(val, typ)
-	}
-	if IsString(typ.Kind()) && IsString(val.Kind()) {
-		return val.Convert(typ), true
-	}
-
-	return reflect.Value{}, false
-}
-
-func convertToUintIfPossible(val reflect.Value, typ reflect.Type) (reflect.Value, bool) {
-	if IsInt(val.Kind()) {
-		i := val.Int()
-		if i < 0 {
-			return reflect.Value{}, false
-		}
-		u := uint64(i)
-		if typ.OverflowUint(u) {
-			return reflect.Value{}, false
-		}
-		return reflect.ValueOf(u).Convert(typ), true
-	}
-	if IsUint(val.Kind()) {
-		if typ.OverflowUint(val.Uint()) {
-			return reflect.Value{}, false
-		}
-		return val.Convert(typ), true
-	}
-	if IsFloat(val.Kind()) {
-		f := val.Float()
-		if f < 0 || f > float64(math.MaxUint64) {
-			return reflect.Value{}, false
-		}
-		if f != math.Trunc(f) {
-			return reflect.Value{}, false
-		}
-		u := uint64(f)
-		if typ.OverflowUint(u) {
-			return reflect.Value{}, false
-		}
-		return reflect.ValueOf(u).Convert(typ), true
-	}
-	return reflect.Value{}, false
-}
-
-func convertToFloatIfPossible(val reflect.Value, typ reflect.Type) (reflect.Value, bool) {
-	if IsInt(val.Kind()) {
-		i := val.Int()
-		f := float64(i)
-		if typ.OverflowFloat(f) {
-			return reflect.Value{}, false
-		}
-		return reflect.ValueOf(f).Convert(typ), true
-	}
-	if IsUint(val.Kind()) {
-		u := val.Uint()
-		f := float64(u)
-		if typ.OverflowFloat(f) {
-			return reflect.Value{}, false
-		}
-		return reflect.ValueOf(f).Convert(typ), true
-	}
-	if IsFloat(val.Kind()) {
-		if typ.OverflowFloat(val.Float()) {
-			return reflect.Value{}, false
-		}
-		return val.Convert(typ), true
-	}
-
-	return reflect.Value{}, false
-}
-
-func convertToIntIfPossible(val reflect.Value, typ reflect.Type) (reflect.Value, bool) {
-	if IsInt(val.Kind()) {
-		if typ.OverflowInt(val.Int()) {
-			return reflect.Value{}, false
-		}
-		return val.Convert(typ), true
-	}
-	if IsUint(val.Kind()) {
-		if val.Uint() > uint64(math.MaxInt64) {
-			return reflect.Value{}, false
-		}
-		if typ.OverflowInt(int64(val.Uint())) {
-			return reflect.Value{}, false
-		}
-		return val.Convert(typ), true
-	}
-	if IsFloat(val.Kind()) {
-		f := val.Float()
-		if f < float64(math.MinInt64) || f > float64(math.MaxInt64) {
-			return reflect.Value{}, false
-		}
-		if f != math.Trunc(f) {
-			return reflect.Value{}, false
-		}
-		if typ.OverflowInt(int64(f)) {
-			return reflect.Value{}, false
-		}
-		return reflect.ValueOf(int64(f)).Convert(typ), true
-
-	}
-
-	return reflect.Value{}, false
-}
@@ -1,284 +0,0 @@
-// Copyright 2025 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 hreflect
-
-import (
-	"math"
-	"reflect"
-	"testing"
-
-	qt "github.com/frankban/quicktest"
-	"github.com/gohugoio/hugo/htesting/hqt"
-)
-
-func TestToFuncs(t *testing.T) {
-	c := qt.New(t)
-
-	c.Assert(ToInt64(reflect.ValueOf(int(42))), qt.Equals, int64(42))
-	c.Assert(ToFloat64(reflect.ValueOf(float32(3.14))), hqt.IsSameFloat64, float64(3.14))
-	c.Assert(ToString(reflect.ValueOf("hello")), qt.Equals, "hello")
-}
-
-func TestConvertIfPossible(t *testing.T) {
-	c := qt.New(t)
-
-	for _, test := range []struct {
-		name     string
-		value    any
-		typ      any
-		expected any
-		ok       bool
-	}{
-		// From uint to int.
-		{
-			name:  "uint64(math.MaxUint64) to int16",
-			value: uint64(math.MaxUint64),
-			typ:   int16(0),
-			ok:    false, // overflow
-		},
-
-		{
-			name:  "uint64(math.MaxUint64) to int64",
-			value: uint64(math.MaxUint64),
-			typ:   int64(0),
-			ok:    false, // overflow
-		},
-		{
-			name:     "uint64(math.MaxInt16) to int16",
-			value:    uint64(math.MaxInt16),
-			typ:      int64(0),
-			ok:       true,
-			expected: int64(math.MaxInt16),
-		},
-		// From int to int.
-		{
-			name:  "int64(math.MaxInt64) to int16",
-			value: int64(math.MaxInt64),
-			typ:   int16(0),
-			ok:    false, // overflow
-		},
-		{
-			name:     "int64(math.MaxInt16) to int",
-			value:    int64(math.MaxInt16),
-			typ:      int(0),
-			ok:       true,
-			expected: int(math.MaxInt16),
-		},
-
-		{
-			name:     "int64(math.MaxInt16) to int",
-			value:    int64(math.MaxInt16),
-			typ:      int(0),
-			ok:       true,
-			expected: int(math.MaxInt16),
-		},
-		// From float64 to int.
-		{
-			name:  "float64(1.5) to int",
-			value: float64(1.5),
-			typ:   int(0),
-			ok:    false, // loss of precision
-		},
-		{
-			name:     "float64(1.0) to int",
-			value:    float64(1.0),
-			typ:      int(0),
-			ok:       true,
-			expected: int(1),
-		},
-		{
-			name:  "float64(math.MaxInt16+1) to int16",
-			value: float64(math.MaxInt16 + 1),
-			typ:   int16(0),
-			ok:    false, // overflow
-		},
-		{
-			name:  "float64(math.MaxFloat64) to int64",
-			value: float64(math.MaxFloat64),
-			typ:   int64(0),
-			ok:    false, // overflow
-		},
-		{
-			name:     "float64(32767) to int16",
-			value:    float64(32767),
-			typ:      int16(0),
-			ok:       true,
-			expected: int16(32767),
-		},
-		// From float32 to int.
-		{
-			name:  "float32(1.5) to int",
-			value: float32(1.5),
-			typ:   int(0),
-			ok:    false, // loss of precision
-		},
-		{
-			name:     "float32(1.0) to int",
-			value:    float32(1.0),
-			typ:      int(0),
-			ok:       true,
-			expected: int(1),
-		},
-		{
-			name:  "float32(math.MaxFloat32) to int16",
-			value: float32(math.MaxFloat32),
-			typ:   int16(0),
-			ok:    false, // overflow
-		},
-		{
-			name:  "float32(math.MaxFloat32) to int64",
-			value: float32(math.MaxFloat32),
-			typ:   int64(0),
-			ok:    false, // overflow
-		},
-		{
-			name:     "float32(math.MaxInt16) to int16",
-			value:    float32(math.MaxInt16),
-			typ:      int16(0),
-			ok:       true,
-			expected: int16(32767),
-		},
-		{
-			name:  "float32(math.MaxInt16+1) to int16",
-			value: float32(math.MaxInt16 + 1),
-			typ:   int16(0),
-			ok:    false, // overflow
-		},
-		// Int to float.
-		{
-			name:     "int16(32767) to float32",
-			value:    int16(32767),
-			typ:      float32(0),
-			ok:       true,
-			expected: float32(32767),
-		},
-		{
-			name:     "int64(32767) to float32",
-			value:    int64(32767),
-			typ:      float32(0),
-			ok:       true,
-			expected: float32(32767),
-		},
-		{
-			name:     "int64(math.MaxInt64) to float32",
-			value:    int64(math.MaxInt64),
-			typ:      float32(0),
-			ok:       true,
-			expected: float32(math.MaxInt64),
-		},
-		{
-			name:     "int64(math.MaxInt64) to float64",
-			value:    int64(math.MaxInt64),
-			typ:      float64(0),
-			ok:       true,
-			expected: float64(math.MaxInt64),
-		},
-		// Int to uint.
-		{
-			name:     "int16(32767) to uint16",
-			value:    int16(32767),
-			typ:      uint16(0),
-			ok:       true,
-			expected: uint16(32767),
-		},
-		{
-			name:  "int16(32767) to uint8",
-			value: int16(32767),
-			typ:   uint8(0),
-			ok:    false,
-		},
-		{
-			name:  "float64(3.14) to uint64",
-			value: float64(3.14),
-			typ:   uint64(0),
-			ok:    false,
-		},
-		{
-			name:     "float64(3.0) to uint64",
-			value:    float64(3.0),
-			typ:      uint64(0),
-			ok:       true,
-			expected: uint64(3),
-		},
-		// From uint to float.
-		{
-			name:     "uint64(math.MaxInt16) to float64",
-			value:    uint64(math.MaxInt16),
-			typ:      float64(0),
-			ok:       true,
-			expected: float64(math.MaxInt16),
-		},
-		// Float to float.
-		{
-			name:     "float64(3.14) to float32",
-			value:    float64(3.14),
-			typ:      float32(0),
-			ok:       true,
-			expected: float32(3.14),
-		},
-		{
-			name:     "float32(3.14) to float64",
-			value:    float32(3.14),
-			typ:      float64(0),
-			ok:       true,
-			expected: float64(3.14),
-		},
-		{
-			name:     "float64(3.14) to float64",
-			value:    float64(3.14),
-			typ:      float64(0),
-			ok:       true,
-			expected: float64(3.14),
-		},
-	} {
-
-		v, ok := ConvertIfPossible(reflect.ValueOf(test.value), reflect.TypeOf(test.typ))
-		c.Assert(ok, qt.Equals, test.ok, qt.Commentf("test case: %s", test.name))
-		if test.ok {
-			c.Assert(v.Interface(), hqt.IsSameNumber, test.expected, qt.Commentf("test case: %s", test.name))
-		}
-	}
-}
-
-func TestConvertIfPossibleMisc(t *testing.T) {
-	c := qt.New(t)
-	type s string
-
-	var (
-		i          = int32(42)
-		i64        = int64(i)
-		iv     any = i
-		ip         = &i
-		inil   any = (*int32)(nil)
-		shello     = s("hello")
-	)
-
-	convertOK := func(v any, typ any) any {
-		rv, ok := ConvertIfPossible(reflect.ValueOf(v), reflect.TypeOf(typ))
-		c.Assert(ok, qt.IsTrue)
-		return rv.Interface()
-	}
-
-	c.Assert(convertOK(shello, ""), qt.Equals, "hello")
-	c.Assert(convertOK(ip, int64(0)), qt.Equals, i64)
-	c.Assert(convertOK(iv, int64(0)), qt.Equals, i64)
-	c.Assert(convertOK(inil, int64(0)), qt.Equals, int64(0))
-}
-
-func BenchmarkToInt64(b *testing.B) {
-	v := reflect.ValueOf(int(42))
-	for b.Loop() {
-		ToInt64(v)
-	}
-}
@@ -1,4 +1,6 @@
-// Copyright 2025 The Hugo Authors. All rights reserved.
+// Copyright 2024 The Hugo Authors. All rights reserved.
+// Some functions in this file (see comments) is based on the Go source code,
+// copyright The Go Authors and  governed by a BSD-style license.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,16 +22,11 @@ import (
 	"sync"
 	"time"

-	"github.com/gohugoio/hugo/common/hmaps"
 	"github.com/gohugoio/hugo/common/htime"
+	"github.com/gohugoio/hugo/common/maps"
 	"github.com/gohugoio/hugo/common/types"
 )

-// IsInterfaceOrPointer returns whether the given kind is an interface or a pointer.
-func IsInterfaceOrPointer(kind reflect.Kind) bool {
-	return kind == reflect.Interface || kind == reflect.Pointer
-}
-
 // TODO(bep) replace the private versions in /tpl with these.
 // IsNumber returns whether the given kind is a number.
 func IsNumber(kind reflect.Kind) bool {
@@ -66,11 +63,6 @@ func IsFloat(kind reflect.Kind) bool {
 	}
 }

-// IsString returns whether the given kind is a string.
-func IsString(kind reflect.Kind) bool {
-	return kind == reflect.String
-}
-
 // IsTruthful returns whether in represents a truthful value.
 // See IsTruthfulValue
 func IsTruthful(in any) bool {
@@ -82,29 +74,7 @@ func IsTruthful(in any) bool {
 	}
 }

-// IsMap reports whether v is a map.
-func IsMap(v any) bool {
-	return reflect.ValueOf(v).Kind() == reflect.Map
-}
-
-// IsSlice reports whether v is a slice.
-func IsSlice(v any) bool {
-	return reflect.ValueOf(v).Kind() == reflect.Slice
-}
-
-var zeroType = reflect.TypeFor[types.Zeroer]()
-
-var isZeroCache sync.Map
-
-func implementsIsZero(tp reflect.Type) bool {
-	v, ok := isZeroCache.Load(tp)
-	if ok {
-		return v.(bool)
-	}
-	implements := tp.Implements(zeroType)
-	isZeroCache.Store(tp, implements)
-	return implements
-}
+var zeroType = reflect.TypeOf((*types.Zeroer)(nil)).Elem()

 // IsTruthfulValue returns whether the given value has a meaningful truth value.
 // This is based on template.IsTrue in Go's stdlib, but also considers
@@ -114,18 +84,14 @@ func implementsIsZero(tp reflect.Type) bool {
 // Based on:
 // https://github.com/golang/go/blob/178a2c42254166cffed1b25fb1d3c7a5727cada6/src/text/template/exec.go#L306
 func IsTruthfulValue(val reflect.Value) (truth bool) {
-	val, isNil := Indirect(val)
+	val = indirectInterface(val)

 	if !val.IsValid() {
-		// Something like: var x any, never set. It's a form of nil.
+		// Something like var x interface{}, never set. It's a form of nil.
 		return
 	}

-	if val.Kind() == reflect.Pointer && isNil {
-		return
-	}
-
-	if implementsIsZero(val.Type()) {
+	if val.Type().Implements(zeroType) {
 		return !val.Interface().(types.Zeroer).IsZero()
 	}

@@ -136,7 +102,7 @@ func IsTruthfulValue(val reflect.Value) (truth bool) {
 		truth = val.Bool()
 	case reflect.Complex64, reflect.Complex128:
 		truth = val.Complex() != 0
-	case reflect.Chan, reflect.Func, reflect.Pointer, reflect.UnsafePointer, reflect.Interface:
+	case reflect.Chan, reflect.Func, reflect.Ptr, reflect.Interface:
 		truth = !val.IsNil()
 	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
 		truth = val.Int() != 0
@@ -158,31 +124,15 @@ type methodKey struct {
 	name string
 }

-var (
-	methodIndexCache sync.Map
-	methodCache      sync.Map
-)
-
-// GetMethodByNameForType returns the method with the given name for the given type,
-// or a zero Method if no such method exists.
-// It panics if tp is an interface type.
-// It caches the lookup.
-func GetMethodByNameForType(tp reflect.Type, name string) reflect.Method {
-	if tp.Kind() == reflect.Interface {
-		// Func field is nil for interface types.
-		panic("not supported for interface types")
-	}
-	k := methodKey{tp, name}
-	v, found := methodCache.Load(k)
-	if found {
-		return v.(reflect.Method)
-	}
-	m, _ := tp.MethodByName(name)
-	methodCache.Store(k, m)
-	return m
+type methods struct {
+	sync.RWMutex
+	cache map[methodKey]int
 }

-// GetMethodByName is the same as reflect.Value.MethodByName, but it caches the lookup.
+var methodCache = &methods{cache: make(map[methodKey]int)}
+
+// GetMethodByName is the same as reflect.Value.MethodByName, but it caches the
+// type lookup.
 func GetMethodByName(v reflect.Value, name string) reflect.Value {
 	index := GetMethodIndexByName(v.Type(), name)

@@ -197,16 +147,22 @@ func GetMethodByName(v reflect.Value, name string) reflect.Value {
 // -1 if no such method exists.
 func GetMethodIndexByName(tp reflect.Type, name string) int {
 	k := methodKey{tp, name}
-	v, found := methodIndexCache.Load(k)
+	methodCache.RLock()
+	index, found := methodCache.cache[k]
+	methodCache.RUnlock()
 	if found {
-		return v.(int)
+		return index
 	}
+
+	methodCache.Lock()
+	defer methodCache.Unlock()
+
 	m, ok := tp.MethodByName(name)
-	index := m.Index
+	index = m.Index
 	if !ok {
 		index = -1
 	}
-	methodIndexCache.Store(k, index)
+	methodCache.cache[k] = index

 	if !ok {
 		return -1
@@ -216,8 +172,8 @@ func GetMethodIndexByName(tp reflect.Type, name string) int {
 }

 var (
-	timeType           = reflect.TypeFor[time.Time]()
-	asTimeProviderType = reflect.TypeFor[htime.AsTimeProvider]()
+	timeType           = reflect.TypeOf((*time.Time)(nil)).Elem()
+	asTimeProviderType = reflect.TypeOf((*htime.AsTimeProvider)(nil)).Elem()
 )

 // IsTime returns whether tp is a time.Time type or if it can be converted into one
@@ -240,7 +196,7 @@ func IsValid(v reflect.Value) bool {
 	}

 	switch v.Kind() {
-	case reflect.Chan, reflect.Func, reflect.Interface, reflect.Map, reflect.Pointer, reflect.Slice:
+	case reflect.Chan, reflect.Func, reflect.Interface, reflect.Map, reflect.Ptr, reflect.Slice:
 		return !v.IsNil()
 	}

@@ -267,28 +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 := range vvv.Len() {
-				out[i] = vvv.Index(i).Interface()
-			}
-			return out, true
-		}
-	}
-	return nil, false
-}
-
-// CallMethodByName calls the method with the given name on v.
 func CallMethodByName(cxt context.Context, name string, v reflect.Value) []reflect.Value {
 	fn := v.MethodByName(name)
 	var args []reflect.Value
@@ -306,56 +240,20 @@ func CallMethodByName(cxt context.Context, name string, v reflect.Value) []refle
 	return fn.Call(args)
 }

-// Indirect unwraps interfaces and pointers until it finds a non-interface/pointer value.
-// If a nil is encountered, the second return value is true.
-// If a pointer to a struct is encountered, it is not unwrapped.
-func Indirect(v reflect.Value) (vv reflect.Value, isNil bool) {
-	for ; IsInterfaceOrPointer(v.Kind()); v = v.Elem() {
-		if IsNil(v) {
-			return v, true
-		}
-		if v.Kind() != reflect.Interface {
-			// A pointer.
-			if v.NumMethod() > 0 {
-				break
-			}
-			if v.Elem().Kind() == reflect.Struct {
-				// Avoid unwrapping pointers to structs.
-				break
-			}
-		}
+// Based on: https://github.com/golang/go/blob/178a2c42254166cffed1b25fb1d3c7a5727cada6/src/text/template/exec.go#L931
+func indirectInterface(v reflect.Value) reflect.Value {
+	if v.Kind() != reflect.Interface {
+		return v
 	}
-	return v, false
+	if v.IsNil() {
+		return reflect.Value{}
+	}
+	return v.Elem()
 }

-// IndirectElem is like Indirect, but if the final value is a pointer, it unwraps it.
-func IndirectElem(v reflect.Value) (vv reflect.Value, isNil bool) {
-	vv, isNil = Indirect(v)
-	if isNil {
-		return vv, isNil
-	}
-	if vv.Kind() == reflect.Pointer {
-		vv = vv.Elem()
-	}
-	return vv, isNil
-}
+var contextInterface = reflect.TypeOf((*context.Context)(nil)).Elem()

-// IsNil reports whether v is nil.
-// Based on reflect.Value.IsNil, but also considers invalid values as nil.
-func IsNil(v reflect.Value) bool {
-	if !v.IsValid() {
-		return true
-	}
-	switch v.Kind() {
-	case reflect.Chan, reflect.Func, reflect.Interface, reflect.Map, reflect.Pointer, reflect.Slice:
-		return v.IsNil()
-	}
-	return false
-}
-
-var contextInterface = reflect.TypeFor[context.Context]()
-
-var isContextCache = hmaps.NewCache[reflect.Type, bool]()
+var isContextCache = maps.NewCache[reflect.Type, bool]()

 type k string

@@ -1,4 +1,4 @@
-// Copyright 2025 The Hugo Authors. All rights reserved.
+// Copyright 2019 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.
@@ -20,32 +20,15 @@ import (
 	"time"

 	qt "github.com/frankban/quicktest"
-	"github.com/gohugoio/hugo/htesting/hqt"
 )

-type zeroStruct struct {
-	zero bool
-}
-
-func (z zeroStruct) IsZero() bool {
-	return z.zero
-}
-
 func TestIsTruthful(t *testing.T) {
 	c := qt.New(t)

-	var nilpointerZero *zeroStruct
-
 	c.Assert(IsTruthful(true), qt.Equals, true)
 	c.Assert(IsTruthful(false), qt.Equals, false)
 	c.Assert(IsTruthful(time.Now()), qt.Equals, true)
 	c.Assert(IsTruthful(time.Time{}), qt.Equals, false)
-	c.Assert(IsTruthful(&zeroStruct{zero: false}), qt.Equals, true)
-	c.Assert(IsTruthful(&zeroStruct{zero: true}), qt.Equals, false)
-	c.Assert(IsTruthful(zeroStruct{zero: false}), qt.Equals, true)
-	c.Assert(IsTruthful(zeroStruct{zero: true}), qt.Equals, false)
-	c.Assert(IsTruthful(nil), qt.Equals, false)
-	c.Assert(IsTruthful(nilpointerZero), qt.Equals, false)
 }

 func TestGetMethodByName(t *testing.T) {
@@ -67,103 +50,18 @@ 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})
-}
-
-type testIndirectStruct struct {
-	S string
-}
-
-func (t *testIndirectStruct) GetS() string {
-	return t.S
-}
-
-func (t testIndirectStruct) Foo() string {
-	return "bar"
-}
-
-type testIndirectStructNoMethods struct {
-	S string
-}
-
-func TestIsNil(t *testing.T) {
-	c := qt.New(t)
-
-	var (
-		nilPtr      *testIndirectStruct
-		nilIface    any = nil
-		nonNilIface any = &testIndirectStruct{S: "hello"}
-	)
-
-	c.Assert(IsNil(reflect.ValueOf(nilPtr)), qt.Equals, true)
-	c.Assert(IsNil(reflect.ValueOf(nilIface)), qt.Equals, true)
-	c.Assert(IsNil(reflect.ValueOf(nonNilIface)), qt.Equals, false)
-}
-
-func TestIndirectInterface(t *testing.T) {
-	c := qt.New(t)
-
-	var (
-		structWithMethods               = testIndirectStruct{S: "hello"}
-		structWithMethodsPointer        = &testIndirectStruct{S: "hello"}
-		structWithMethodsPointerAny any = structWithMethodsPointer
-		structPointerToPointer          = &structWithMethodsPointer
-		structNoMethodsPtr              = &testIndirectStructNoMethods{S: "no methods"}
-		structNoMethods                 = testIndirectStructNoMethods{S: "no methods"}
-		intValue                        = 32
-		intPtr                          = &intValue
-		nilPtr                      *testIndirectStruct
-		nilIface                    any = nil
-	)
-
-	ind := func(v any) any {
-		c.Helper()
-		vv, isNil := Indirect(reflect.ValueOf(v))
-		c.Assert(isNil, qt.IsFalse)
-		return vv.Interface()
-	}
-
-	c.Assert(ind(intValue), hqt.IsSameType, 32)
-	c.Assert(ind(intPtr), hqt.IsSameType, 32)
-	c.Assert(ind(structNoMethodsPtr), hqt.IsSameType, structNoMethodsPtr)
-	c.Assert(ind(structWithMethods), hqt.IsSameType, structWithMethods)
-	c.Assert(ind(structNoMethods), hqt.IsSameType, structNoMethods)
-	c.Assert(ind(structPointerToPointer), hqt.IsSameType, &testIndirectStruct{})
-	c.Assert(ind(structWithMethodsPointer), hqt.IsSameType, &testIndirectStruct{})
-	c.Assert(ind(structWithMethodsPointerAny), hqt.IsSameType, structWithMethodsPointer)
-
-	vv, isNil := Indirect(reflect.ValueOf(nilPtr))
-	c.Assert(isNil, qt.IsTrue)
-	c.Assert(vv, qt.Equals, reflect.ValueOf(nilPtr))
-
-	vv, isNil = Indirect(reflect.ValueOf(nilIface))
-	c.Assert(isNil, qt.IsFalse)
-	c.Assert(vv, qt.Equals, reflect.ValueOf(nilIface))
-}
-
 func BenchmarkIsContextType(b *testing.B) {
-	const size = 1000
 	type k string
 	b.Run("value", func(b *testing.B) {
 		ctx := context.Background()
-		ctxs := make([]reflect.Type, size)
-		for i := range size {
+		ctxs := make([]reflect.Type, b.N)
+		for i := 0; i < b.N; i++ {
 			ctxs[i] = reflect.TypeOf(context.WithValue(ctx, k("key"), i))
 		}

-		for i := 0; b.Loop(); i++ {
-			idx := i % size
-			if !IsContextType(ctxs[idx]) {
+		b.ResetTimer()
+		for i := 0; i < b.N; i++ {
+			if !IsContextType(ctxs[i]) {
 				b.Fatal("not context")
 			}
 		}
@@ -171,7 +69,7 @@ func BenchmarkIsContextType(b *testing.B) {

 	b.Run("background", func(b *testing.B) {
 		var ctxt reflect.Type = reflect.TypeOf(context.Background())
-		for b.Loop() {
+		for i := 0; i < b.N; i++ {
 			if !IsContextType(ctxt) {
 				b.Fatal("not context")
 			}
@@ -179,25 +77,14 @@ func BenchmarkIsContextType(b *testing.B) {
 	})
 }

-func BenchmarkIsTruthFulValue(b *testing.B) {
-	var (
-		stringHugo  = reflect.ValueOf("Hugo")
-		stringEmpty = reflect.ValueOf("")
-		zero        = reflect.ValueOf(time.Time{})
-		timeNow     = reflect.ValueOf(time.Now())
-		boolTrue    = reflect.ValueOf(true)
-		boolFalse   = reflect.ValueOf(false)
-		nilPointer  = reflect.ValueOf((*zeroStruct)(nil))
-	)
+func BenchmarkIsTruthFul(b *testing.B) {
+	v := reflect.ValueOf("Hugo")

-	for b.Loop() {
-		IsTruthfulValue(stringHugo)
-		IsTruthfulValue(stringEmpty)
-		IsTruthfulValue(zero)
-		IsTruthfulValue(timeNow)
-		IsTruthfulValue(boolTrue)
-		IsTruthfulValue(boolFalse)
-		IsTruthfulValue(nilPointer)
+	b.ResetTimer()
+	for i := 0; i < b.N; i++ {
+		if !IsTruthfulValue(v) {
+			b.Fatal("not truthful")
+		}
 	}
 }

@@ -223,38 +110,14 @@ func (t *testStruct) Method5() string {
 	return "Hugo"
 }

-func BenchmarkGetMethodByNameForType(b *testing.B) {
-	tp := reflect.TypeFor[*testStruct]()
-	methods := []string{"Method1", "Method2", "Method3", "Method4", "Method5"}
-
-	for b.Loop() {
-		for _, method := range methods {
-			_ = GetMethodByNameForType(tp, method)
-		}
-	}
-}
-
 func BenchmarkGetMethodByName(b *testing.B) {
 	v := reflect.ValueOf(&testStruct{})
 	methods := []string{"Method1", "Method2", "Method3", "Method4", "Method5"}

-	for b.Loop() {
+	b.ResetTimer()
+	for i := 0; i < b.N; i++ {
 		for _, method := range methods {
 			_ = GetMethodByName(v, method)
 		}
 	}
 }
-
-func BenchmarkGetMethodByNamePara(b *testing.B) {
-	v := reflect.ValueOf(&testStruct{})
-	methods := []string{"Method1", "Method2", "Method3", "Method4", "Method5"}
-
-	b.ResetTimer()
-	b.RunParallel(func(pb *testing.PB) {
-		for pb.Next() {
-			for _, method := range methods {
-				_ = GetMethodByName(v, method)
-			}
-		}
-	})
-}
@@ -16,11 +16,9 @@ package hstrings
 import (
 	"fmt"
 	"regexp"
-	"slices"
-	"sort"
 	"strings"
+	"sync"

-	"github.com/bep/helpers/maphelpers"
 	"github.com/gohugoio/hugo/compare"
 )

@@ -52,45 +50,65 @@ func (s StringEqualFold) Eq(s2 any) bool {

 // EqualAny returns whether a string is equal to any of the given strings.
 func EqualAny(a string, b ...string) bool {
-	return slices.Contains(b, a)
+	for _, s := range b {
+		if a == s {
+			return true
+		}
+	}
+	return false
 }

-var reCache = *maphelpers.NewConcurrentMap[string, *regexp.Regexp]()
+// regexpCache represents a cache of regexp objects protected by a mutex.
+type regexpCache struct {
+	mu sync.RWMutex
+	re map[string]*regexp.Regexp
+}
+
+func (rc *regexpCache) getOrCompileRegexp(pattern string) (re *regexp.Regexp, err error) {
+	var ok bool
+
+	if re, ok = rc.get(pattern); !ok {
+		re, err = regexp.Compile(pattern)
+		if err != nil {
+			return nil, err
+		}
+		rc.set(pattern, re)
+	}
+
+	return re, nil
+}
+
+func (rc *regexpCache) get(key string) (re *regexp.Regexp, ok bool) {
+	rc.mu.RLock()
+	re, ok = rc.re[key]
+	rc.mu.RUnlock()
+	return
+}
+
+func (rc *regexpCache) set(key string, re *regexp.Regexp) {
+	rc.mu.Lock()
+	rc.re[key] = re
+	rc.mu.Unlock()
+}
+
+var reCache = regexpCache{re: make(map[string]*regexp.Regexp)}

 // GetOrCompileRegexp retrieves a regexp object from the cache based upon the pattern.
 // If the pattern is not found in the cache, the pattern is compiled and added to
 // the cache.
 func GetOrCompileRegexp(pattern string) (re *regexp.Regexp, err error) {
-	return reCache.GetOrCreate(pattern,
-		func() (*regexp.Regexp, error) {
-			return regexp.Compile(pattern)
-		},
-	)
-}
-
-// HasAnyPrefix checks if the string s has any of the prefixes given.
-func HasAnyPrefix(s string, prefixes ...string) bool {
-	for _, p := range prefixes {
-		if strings.HasPrefix(s, p) {
-			return true
-		}
-	}
-	return false
-}
-
-func HasUppercase(s string) bool {
-	for _, r := range s {
-		if 'A' <= r && r <= 'Z' {
-			return true
-		}
-	}
-	return false
+	return reCache.getOrCompileRegexp(pattern)
 }

 // InSlice checks if a string is an element of a slice of strings
 // and returns a boolean value.
 func InSlice(arr []string, el string) bool {
-	return slices.Contains(arr, el)
+	for _, v := range arr {
+		if v == el {
+			return true
+		}
+	}
+	return false
 }

 // InSlicEqualFold checks if a string is an element of a slice of strings
@@ -119,61 +137,7 @@ func ToString(v any) (string, bool) {
 	return "", false
 }

-// UniqueStrings returns a new slice with any duplicates removed.
-func UniqueStrings(s []string) []string {
-	unique := make([]string, 0, len(s))
-	for i, val := range s {
-		var seen bool
-		for j := range i {
-			if s[j] == val {
-				seen = true
-				break
-			}
-		}
-		if !seen {
-			unique = append(unique, val)
-		}
-	}
-	return unique
-}
-
-// UniqueStringsReuse returns a slice with any duplicates removed.
-// It will modify the input slice.
-func UniqueStringsReuse(s []string) []string {
-	result := s[:0]
-	for i, val := range s {
-		var seen bool
-
-		for j := range i {
-			if s[j] == val {
-				seen = true
-				break
-			}
-		}
-
-		if !seen {
-			result = append(result, val)
-		}
-	}
-	return result
-}
-
-// UniqueStringsSorted returns a sorted slice with any duplicates removed.
-// It will modify the input slice.
-func UniqueStringsSorted(s []string) []string {
-	if len(s) == 0 {
-		return nil
-	}
-	ss := sort.StringSlice(s)
-	ss.Sort()
-	i := 0
-	for j := 1; j < len(s); j++ {
-		if !ss.Less(i, j) {
-			continue
-		}
-		i++
-		s[i] = s[j]
-	}
-
-	return s[:i+1]
+type Tuple struct {
+	First  string
+	Second string
 }
@@ -1,4 +1,4 @@
-// Copyright 2025 The Hugo Authors. All rights reserved.
+// 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.
@@ -14,7 +14,6 @@
 package hstrings

 import (
-	"reflect"
 	"regexp"
 	"testing"

@@ -44,101 +43,14 @@ func TestGetOrCompileRegexp(t *testing.T) {
 	c.Assert(re.MatchString("123"), qt.Equals, true)
 }

-func TestUniqueStrings(t *testing.T) {
-	in := []string{"a", "b", "a", "b", "c", "", "a", "", "d"}
-	output := UniqueStrings(in)
-	expected := []string{"a", "b", "c", "", "d"}
-	if !reflect.DeepEqual(output, expected) {
-		t.Errorf("Expected %#v, got %#v\n", expected, output)
-	}
-}
-
-func TestUniqueStringsReuse(t *testing.T) {
-	in := []string{"a", "b", "a", "b", "c", "", "a", "", "d"}
-	output := UniqueStringsReuse(in)
-	expected := []string{"a", "b", "c", "", "d"}
-	if !reflect.DeepEqual(output, expected) {
-		t.Errorf("Expected %#v, got %#v\n", expected, output)
-	}
-}
-
-func TestUniqueStringsSorted(t *testing.T) {
-	c := qt.New(t)
-	in := []string{"a", "a", "b", "c", "b", "", "a", "", "d"}
-	output := UniqueStringsSorted(in)
-	expected := []string{"", "a", "b", "c", "d"}
-	c.Assert(output, qt.DeepEquals, expected)
-	c.Assert(UniqueStringsSorted(nil), qt.IsNil)
-}
-
-func TestHasUppercase(t *testing.T) {
-	c := qt.New(t)
-
-	c.Assert(HasUppercase("abc"), qt.Equals, false)
-	c.Assert(HasUppercase("Abc"), qt.Equals, true)
-	c.Assert(HasUppercase("aBc"), qt.Equals, true)
-	c.Assert(HasUppercase("abC"), qt.Equals, true)
-	c.Assert(HasUppercase("ABC"), qt.Equals, true)
-}
-
-// Note that these cannot use b.Loop() because of golang/go#27217.
-func BenchmarkUniqueStrings(b *testing.B) {
-	input := []string{"a", "b", "d", "e", "d", "h", "a", "i"}
-
-	b.Run("Safe", func(b *testing.B) {
-		for b.Loop() {
-			result := UniqueStrings(input)
-			if len(result) != 6 {
-				b.Fatalf("invalid count: %d", len(result))
-			}
-		}
-	})
-
-	b.Run("Reuse slice", func(b *testing.B) {
-		inputs := make([][]string, b.N)
-		for i := 0; i < b.N; i++ {
-			inputc := make([]string, len(input))
-			copy(inputc, input)
-			inputs[i] = inputc
-		}
-		b.ResetTimer()
-		for i := 0; i < b.N; i++ {
-			inputc := inputs[i]
-
-			result := UniqueStringsReuse(inputc)
-			if len(result) != 6 {
-				b.Fatalf("invalid count: %d", len(result))
-			}
-		}
-	})
-
-	b.Run("Reuse slice sorted", func(b *testing.B) {
-		inputs := make([][]string, b.N)
-		for i := 0; i < b.N; i++ {
-			inputc := make([]string, len(input))
-			copy(inputc, input)
-			inputs[i] = inputc
-		}
-		b.ResetTimer()
-		for i := 0; i < b.N; i++ {
-			inputc := inputs[i]
-
-			result := UniqueStringsSorted(inputc)
-			if len(result) != 6 {
-				b.Fatalf("invalid count: %d", len(result))
-			}
-		}
-	})
-}
-
 func BenchmarkGetOrCompileRegexp(b *testing.B) {
-	for b.Loop() {
+	for i := 0; i < b.N; i++ {
 		GetOrCompileRegexp(`\d+`)
 	}
 }

 func BenchmarkCompileRegexp(b *testing.B) {
-	for b.Loop() {
+	for i := 0; i < b.N; i++ {
 		regexp.MustCompile(`\d+`)
 	}
 }
@@ -1,162 +0,0 @@
-// Copyright 2025 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 hsync
-
-import (
-	"context"
-	"sync"
-	"sync/atomic"
-)
-
-// OnceMore is similar to sync.Once.
-//
-// Additional features are:
-// * it can be reset, so the action can be repeated if needed
-// * it has methods to check if it's done or in progress
-type OnceMore struct {
-	_    doNotCopy
-	done atomic.Bool
-	mu   sync.Mutex
-}
-
-func (t *OnceMore) Do(f func()) {
-	if t.Done() {
-		return
-	}
-
-	t.mu.Lock()
-	defer t.mu.Unlock()
-
-	// Double check
-	if t.Done() {
-		return
-	}
-
-	defer t.done.Store(true)
-	f()
-}
-
-func (t *OnceMore) Done() bool {
-	return t.done.Load()
-}
-
-func (t *OnceMore) Reset() {
-	t.mu.Lock()
-	t.done.Store(false)
-	t.mu.Unlock()
-}
-
-type ValueResetter[T any] struct {
-	reset func()
-	f     func(context.Context) T
-}
-
-func (v *ValueResetter[T]) Value(ctx context.Context) T {
-	return v.f(ctx)
-}
-
-func (v *ValueResetter[T]) Reset() {
-	v.reset()
-}
-
-// OnceMoreValue returns a function that invokes f only once and returns the value
-// returned by f. The returned function may be called concurrently.
-//
-// If f panics, the returned function will panic with the same value on every call.
-func OnceMoreValue[T any](f func(context.Context) T) ValueResetter[T] {
-	v := struct {
-		f      func(context.Context) T
-		once   OnceMore
-		ok     bool
-		p      any
-		result T
-	}{
-		f: f,
-	}
-	ff := func(ctx context.Context) T {
-		v.once.Do(func() {
-			v.ok = false
-			defer func() {
-				v.p = recover()
-				if !v.ok {
-					panic(v.p)
-				}
-			}()
-			v.result = v.f(ctx)
-			v.ok = true
-		})
-		if !v.ok {
-			panic(v.p)
-		}
-		return v.result
-	}
-
-	return ValueResetter[T]{
-		reset: v.once.Reset,
-		f:     ff,
-	}
-}
-
-type FuncResetter struct {
-	f     func(context.Context) error
-	reset func()
-}
-
-func (v *FuncResetter) Do(ctx context.Context) error {
-	return v.f(ctx)
-}
-
-func (v *FuncResetter) Reset() {
-	v.reset()
-}
-
-func OnceMoreFunc(f func(context.Context) error) FuncResetter {
-	v := struct {
-		f    func(context.Context) error
-		once OnceMore
-		ok   bool
-		err  error
-		p    any
-	}{
-		f: f,
-	}
-	ff := func(ctx context.Context) error {
-		v.once.Do(func() {
-			v.ok = false
-			defer func() {
-				v.p = recover()
-				if !v.ok {
-					panic(v.p)
-				}
-			}()
-			v.err = v.f(ctx)
-			v.ok = true
-		})
-		if !v.ok {
-			panic(v.p)
-		}
-		return v.err
-	}
-
-	return FuncResetter{
-		f:     ff,
-		reset: v.once.Reset,
-	}
-}
-
-type doNotCopy struct{}
-
-// Lock is a no-op used by -copylocks checker from `go vet`.
-func (*doNotCopy) Lock()   {}
-func (*doNotCopy) Unlock() {}
@@ -1,80 +0,0 @@
-// Copyright 2025 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 hsync
-
-import (
-	"context"
-	"testing"
-
-	qt "github.com/frankban/quicktest"
-)
-
-func TestOnceMoreValue(t *testing.T) {
-	c := qt.New(t)
-
-	var counter int
-	f := func(context.Context) int {
-		counter++
-		return counter
-	}
-
-	omf := OnceMoreValue(f)
-	for range 10 {
-		c.Assert(omf.Value(context.Background()), qt.Equals, 1)
-	}
-	omf.Reset()
-	for range 10 {
-		c.Assert(omf.Value(context.Background()), qt.Equals, 2)
-	}
-}
-
-func TestOnceMoreFunc(t *testing.T) {
-	c := qt.New(t)
-
-	var counter int
-	f := func(context.Context) error {
-		counter++
-		return nil
-	}
-
-	omf := OnceMoreFunc(f)
-	for range 10 {
-		c.Assert(omf.Do(context.Background()), qt.IsNil)
-		c.Assert(counter, qt.Equals, 1)
-	}
-	omf.Reset()
-	for range 10 {
-		c.Assert(omf.Do(context.Background()), qt.IsNil)
-		c.Assert(counter, qt.Equals, 2)
-	}
-}
-
-func BenchmarkOnceMoreValue(b *testing.B) {
-	var counter int
-	f := func(context.Context) int {
-		counter++
-		return counter
-	}
-
-	for b.Loop() {
-		omf := OnceMoreValue(f)
-		for range 10 {
-			omf.Value(context.Background())
-		}
-		omf.Reset()
-		for range 10 {
-			omf.Value(context.Background())
-		}
-	}
-}
@@ -24,9 +24,9 @@ func TestApplyWithContext(t *testing.T) {
 	t.Parallel()

 	files := `
-- hugo.toml --
+-- config.toml --
 defaultContentLanguage = 'it'
-- layouts/home.html --
+-- layouts/index.html --
 {{ $dates := slice
  "2022-01-03"
  "2022-02-01"
@@ -18,10 +18,10 @@ import (
 	"strings"
 	"time"

-	"github.com/bep/golocales"
-
 	"github.com/bep/clocks"
 	"github.com/spf13/cast"
+
+	"github.com/gohugoio/locales"
 )

 var (
@@ -78,9 +78,9 @@ var (
 	Clock = clocks.System()
 )

-func NewTimeFormatter(ltr golocales.Translator) TimeFormatter {
+func NewTimeFormatter(ltr locales.Translator) TimeFormatter {
 	if ltr == nil {
-		panic("must provide a golocales.Translator")
+		panic("must provide a locales.Translator")
 	}
 	return TimeFormatter{
 		ltr: ltr,
@@ -89,7 +89,7 @@ func NewTimeFormatter(ltr golocales.Translator) TimeFormatter {

 // TimeFormatter is locale aware.
 type TimeFormatter struct {
-	ltr golocales.Translator
+	ltr locales.Translator
 }

 func (f TimeFormatter) Format(t time.Time, layout string) string {
@@ -101,39 +101,39 @@ func (f TimeFormatter) Format(t time.Time, layout string) string {
 		// It may be one of Hugo's custom layouts.
 		switch strings.ToLower(layout[1:]) {
 		case "date_full":
-			return f.ltr.FormatDateFull(t)
+			return f.ltr.FmtDateFull(t)
 		case "date_long":
-			return f.ltr.FormatDateLong(t)
+			return f.ltr.FmtDateLong(t)
 		case "date_medium":
-			return f.ltr.FormatDateMedium(t)
+			return f.ltr.FmtDateMedium(t)
 		case "date_short":
-			return f.ltr.FormatDateShort(t)
+			return f.ltr.FmtDateShort(t)
 		case "time_full":
-			return f.ltr.FormatTimeFull(t)
+			return f.ltr.FmtTimeFull(t)
 		case "time_long":
-			return f.ltr.FormatTimeLong(t)
+			return f.ltr.FmtTimeLong(t)
 		case "time_medium":
-			return f.ltr.FormatTimeMedium(t)
+			return f.ltr.FmtTimeMedium(t)
 		case "time_short":
-			return f.ltr.FormatTimeShort(t)
+			return f.ltr.FmtTimeShort(t)
 		}
 	}

 	s := t.Format(layout)

-	monthIdx := t.Month() - 1 // time.Month is 1-based, but our month name slices are 0-based.
+	monthIdx := t.Month() - 1 // Month() starts at 1.
 	dayIdx := t.Weekday()

 	if strings.Contains(layout, "January") {
-		s = strings.ReplaceAll(s, longMonthNames[monthIdx], f.ltr.MonthsWide()[monthIdx])
+		s = strings.ReplaceAll(s, longMonthNames[monthIdx], f.ltr.MonthWide(t.Month()))
 	} else if strings.Contains(layout, "Jan") {
-		s = strings.ReplaceAll(s, shortMonthNames[monthIdx], f.ltr.MonthsAbbreviated()[monthIdx])
+		s = strings.ReplaceAll(s, shortMonthNames[monthIdx], f.ltr.MonthAbbreviated(t.Month()))
 	}

 	if strings.Contains(layout, "Monday") {
-		s = strings.ReplaceAll(s, longDayNames[dayIdx], f.ltr.WeekdaysWide()[dayIdx])
+		s = strings.ReplaceAll(s, longDayNames[dayIdx], f.ltr.WeekdayWide(t.Weekday()))
 	} else if strings.Contains(layout, "Mon") {
-		s = strings.ReplaceAll(s, shortDayNames[dayIdx], f.ltr.WeekdaysAbbreviated()[dayIdx])
+		s = strings.ReplaceAll(s, shortDayNames[dayIdx], f.ltr.WeekdayAbbreviated(t.Weekday()))
 	}

 	return s
@@ -17,9 +17,8 @@ import (
 	"testing"
 	"time"

-	"github.com/bep/golocales"
-
 	qt "github.com/frankban/quicktest"
+	translators "github.com/gohugoio/localescompressed"
 )

 func TestTimeFormatter(t *testing.T) {
@@ -35,7 +34,7 @@ func TestTimeFormatter(t *testing.T) {
 	mondayNovemberFirst = mondayNovemberFirst.Add(33 * time.Second)

 	c.Run("Norsk nynorsk", func(c *qt.C) {
-		f := NewTimeFormatter(golocales.New("nn"))
+		f := NewTimeFormatter(translators.GetTranslator("nn"))

 		c.Assert(f.Format(june06, "Monday Jan 2 2006"), qt.Equals, "onsdag juni 6 2018")
 		c.Assert(f.Format(june06, "Mon January 2 2006"), qt.Equals, "on. juni 6 2018")
@@ -43,35 +42,35 @@ func TestTimeFormatter(t *testing.T) {
 	})

 	c.Run("Custom layouts Norsk nynorsk", func(c *qt.C) {
-		f := NewTimeFormatter(golocales.New("nn"))
+		f := NewTimeFormatter(translators.GetTranslator("nn"))

 		c.Assert(f.Format(june06, ":date_full"), qt.Equals, "onsdag 6. juni 2018")
 		c.Assert(f.Format(june06, ":date_long"), qt.Equals, "6. juni 2018")
 		c.Assert(f.Format(june06, ":date_medium"), qt.Equals, "6. juni 2018")
-		c.Assert(f.Format(june06, ":date_short"), qt.Equals, "06.06.18")
+		c.Assert(f.Format(june06, ":date_short"), qt.Equals, "06.06.2018")

-		c.Assert(f.Format(june06, ":time_full"), qt.Equals, "02:09:37 UTC")
+		c.Assert(f.Format(june06, ":time_full"), qt.Equals, "kl. 02:09:37 UTC")
 		c.Assert(f.Format(june06, ":time_long"), qt.Equals, "02:09:37 UTC")
 		c.Assert(f.Format(june06, ":time_medium"), qt.Equals, "02:09:37")
 		c.Assert(f.Format(june06, ":time_short"), qt.Equals, "02:09")
 	})

 	c.Run("Custom layouts English", func(c *qt.C) {
-		f := NewTimeFormatter(golocales.New("en"))
+		f := NewTimeFormatter(translators.GetTranslator("en"))

 		c.Assert(f.Format(june06, ":date_full"), qt.Equals, "Wednesday, June 6, 2018")
 		c.Assert(f.Format(june06, ":date_long"), qt.Equals, "June 6, 2018")
 		c.Assert(f.Format(june06, ":date_medium"), qt.Equals, "Jun 6, 2018")
 		c.Assert(f.Format(june06, ":date_short"), qt.Equals, "6/6/18")

-		c.Assert(f.Format(june06, ":time_full"), qt.Equals, "2:09:37\u202fam UTC")
-		c.Assert(f.Format(june06, ":time_long"), qt.Equals, "2:09:37\u202fam UTC")
-		c.Assert(f.Format(june06, ":time_medium"), qt.Equals, "2:09:37\u202fam")
-		c.Assert(f.Format(june06, ":time_short"), qt.Equals, "2:09\u202fam")
+		c.Assert(f.Format(june06, ":time_full"), qt.Equals, "2:09:37 am UTC")
+		c.Assert(f.Format(june06, ":time_long"), qt.Equals, "2:09:37 am UTC")
+		c.Assert(f.Format(june06, ":time_medium"), qt.Equals, "2:09:37 am")
+		c.Assert(f.Format(june06, ":time_short"), qt.Equals, "2:09 am")
 	})

 	c.Run("English", func(c *qt.C) {
-		f := NewTimeFormatter(golocales.New("en"))
+		f := NewTimeFormatter(translators.GetTranslator("en"))

 		c.Assert(f.Format(june06, "Monday Jan 2 2006"), qt.Equals, "Wednesday Jun 6 2018")
 		c.Assert(f.Format(june06, "Mon January 2 2006"), qt.Equals, "Wed June 6 2018")
@@ -79,31 +78,31 @@ func TestTimeFormatter(t *testing.T) {
 	})

 	c.Run("Weekdays German", func(c *qt.C) {
-		tr := golocales.New("de")
+		tr := translators.GetTranslator("de")
 		f := NewTimeFormatter(tr)

 		// Issue #9107
 		for i, weekDayWideGerman := range []string{"Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag", "Sonntag"} {
 			date := mondayNovemberFirst.Add(time.Duration(i*24) * time.Hour)
-			c.Assert(tr.WeekdaysWide()[date.Weekday()], qt.Equals, weekDayWideGerman)
+			c.Assert(tr.WeekdayWide(date.Weekday()), qt.Equals, weekDayWideGerman)
 			c.Assert(f.Format(date, "Monday"), qt.Equals, weekDayWideGerman)
 		}

 		for i, weekDayAbbreviatedGerman := range []string{"Mo.", "Di.", "Mi.", "Do.", "Fr.", "Sa.", "So."} {
 			date := mondayNovemberFirst.Add(time.Duration(i*24) * time.Hour)
-			c.Assert(tr.WeekdaysAbbreviated()[date.Weekday()], qt.Equals, weekDayAbbreviatedGerman)
+			c.Assert(tr.WeekdayAbbreviated(date.Weekday()), qt.Equals, weekDayAbbreviatedGerman)
 			c.Assert(f.Format(date, "Mon"), qt.Equals, weekDayAbbreviatedGerman)
 		}
 	})

 	c.Run("Months German", func(c *qt.C) {
-		tr := golocales.New("de")
+		tr := translators.GetTranslator("de")
 		f := NewTimeFormatter(tr)

 		// Issue #9107
 		for i, monthWideNorway := range []string{"Januar", "Februar", "März", "April", "Mai", "Juni", "Juli"} {
 			date := jan06.Add(time.Duration(i*24*31) * time.Hour)
-			c.Assert(tr.MonthsWide()[date.Month()-1], qt.Equals, monthWideNorway)
+			c.Assert(tr.MonthWide(date.Month()), qt.Equals, monthWideNorway)
 			c.Assert(f.Format(date, "January"), qt.Equals, monthWideNorway)
 		}
 	})
@@ -113,7 +112,7 @@ func BenchmarkTimeFormatter(b *testing.B) {
 	june06, _ := time.Parse("2006-Jan-02", "2018-Jun-06")

 	b.Run("Native", func(b *testing.B) {
-		for b.Loop() {
+		for i := 0; i < b.N; i++ {
 			got := june06.Format("Monday Jan 2 2006")
 			if got != "Wednesday Jun 6 2018" {
 				b.Fatalf("invalid format, got %q", got)
@@ -122,9 +121,9 @@ func BenchmarkTimeFormatter(b *testing.B) {
 	})

 	b.Run("Localized", func(b *testing.B) {
-		f := NewTimeFormatter(golocales.New("nn"))
+		f := NewTimeFormatter(translators.GetTranslator("nn"))
 		b.ResetTimer()
-		for b.Loop() {
+		for i := 0; i < b.N; i++ {
 			got := f.Format(june06, "Monday Jan 2 2006")
 			if got != "onsdag juni 6 2018" {
 				b.Fatalf("invalid format, got %q", got)
@@ -133,9 +132,9 @@ func BenchmarkTimeFormatter(b *testing.B) {
 	})

 	b.Run("Localized Custom", func(b *testing.B) {
-		f := NewTimeFormatter(golocales.New("nn"))
+		f := NewTimeFormatter(translators.GetTranslator("nn"))
 		b.ResetTimer()
-		for b.Loop() {
+		for i := 0; i < b.N; i++ {
 			got := f.Format(june06, ":date_medium")
 			if got != "6. juni 2018" {
 				b.Fatalf("invalid format, got %q", got)
@@ -82,9 +82,6 @@ func CopyDir(fs afero.Fs, from, to string, shouldCopy func(filename string) bool
 				return err
 			}
 		} else {
-			if shouldCopy != nil && !shouldCopy(fromFilename) {
-				continue
-			}
 			if err := CopyFile(fs, fromFilename, toFilename); err != nil {
 				return err
 			}
@@ -21,9 +21,8 @@ import (
 type HasBytesWriter struct {
 	Patterns []*HasBytesPattern

+	i    int
 	done bool
-	// The tail of the bytes written so far, retained so we can detect a
-	// pattern that straddles the boundary between two Write calls.
 	buff []byte
 }

@@ -32,13 +31,10 @@ type HasBytesPattern struct {
 	Pattern []byte
 }

-// maxPatternLen returns the length of the longest pattern.
-func (h *HasBytesWriter) maxPatternLen() int {
+func (h *HasBytesWriter) patternLen() int {
 	l := 0
 	for _, p := range h.Patterns {
-		if len(p.Pattern) > l {
-			l = len(p.Pattern)
-		}
+		l += len(p.Pattern)
 	}
 	return l
 }
@@ -48,55 +44,36 @@ func (h *HasBytesWriter) Write(p []byte) (n int, err error) {
 		return len(p), nil
 	}

-	keep := h.maxPatternLen() - 1
-
-	// Join the tail retained from previous Writes with the head of this chunk
-	// so a pattern straddling the boundary is still detected. Only the
-	// boundary window is copied; the chunk itself is scanned in place below.
-	var boundary []byte
-	if keep > 0 && len(h.buff) > 0 {
-		head := p
-		if len(head) > keep {
-			head = head[:keep]
-		}
-		boundary = make([]byte, 0, len(h.buff)+len(head))
-		boundary = append(boundary, h.buff...)
-		boundary = append(boundary, head...)
+	if len(h.buff) == 0 {
+		h.buff = make([]byte, h.patternLen()*2)
 	}

-	// Scan each not-yet-matched pattern once per Write instead of once per byte.
-	done := true
-	for _, pp := range h.Patterns {
-		if pp.Match {
-			continue
+	for i := range p {
+		h.buff[h.i] = p[i]
+		h.i++
+		if h.i == len(h.buff) {
+			// Shift left.
+			copy(h.buff, h.buff[len(h.buff)/2:])
+			h.i = len(h.buff) / 2
 		}
-		if bytes.Contains(p, pp.Pattern) || bytes.Contains(boundary, pp.Pattern) {
-			pp.Match = true
-			continue
-		}
-		done = false
-	}

-	if done {
-		// All patterns found; no need to look at any more data.
-		h.done = true
-		h.buff = nil
-		return len(p), nil
-	}
-
-	// Retain the last keep bytes of (previous tail + this chunk) to detect a
-	// pattern straddling into the next Write.
-	switch {
-	case keep <= 0:
-		h.buff = h.buff[:0]
-	case len(p) >= keep:
-		h.buff = append(h.buff[:0], p[len(p)-keep:]...)
-	default:
-		// Chunk shorter than keep: slide the window over the retained tail.
-		if total := len(h.buff) + len(p); total > keep {
-			h.buff = h.buff[total-keep:]
+		for _, pp := range h.Patterns {
+			if bytes.Contains(h.buff, pp.Pattern) {
+				pp.Match = true
+				done := true
+				for _, ppp := range h.Patterns {
+					if !ppp.Match {
+						done = false
+						break
+					}
+				}
+				if done {
+					h.done = true
+				}
+				return len(p), nil
+			}
 		}
-		h.buff = append(h.buff, p...)
+
 	}

 	return len(p), nil
@@ -46,18 +46,18 @@ func TestHasBytesWriter(t *testing.T) {
 		return strings.Repeat("ab cfo", r.Intn(33))
 	}

-	for range 22 {
+	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)
 	}

@@ -65,61 +65,3 @@ func TestHasBytesWriter(t *testing.T) {
 	fmt.Fprintf(w, "__foo")
 	c.Assert(h.Patterns[0].Match, qt.Equals, true)
 }
-
-func TestHasBytesWriterMultiplePatterns(t *testing.T) {
-	c := qt.New(t)
-
-	neww := func() (*HasBytesWriter, io.Writer) {
-		var b bytes.Buffer
-		h := &HasBytesWriter{
-			Patterns: []*HasBytesPattern{
-				{Pattern: []byte("__hdeferred/")},
-				{Pattern: []byte("__h_pp_l1")},
-			},
-		}
-		return h, io.MultiWriter(&b, h)
-	}
-
-	// Neither pattern present.
-	h, w := neww()
-	fmt.Fprint(w, "the quick brown fox jumps over the lazy dog")
-	c.Assert(h.Patterns[0].Match, qt.Equals, false)
-	c.Assert(h.Patterns[1].Match, qt.Equals, false)
-	c.Assert(h.done, qt.Equals, false)
-
-	// Only the second pattern present; the writer must not report a match
-	// for the first, and must not prematurely mark itself done.
-	h, w = neww()
-	fmt.Fprint(w, "prefix __h_pp_l1 suffix")
-	c.Assert(h.Patterns[0].Match, qt.Equals, false)
-	c.Assert(h.Patterns[1].Match, qt.Equals, true)
-	c.Assert(h.done, qt.Equals, false)
-
-	// Both patterns present across multiple writes; done once all match.
-	h, w = neww()
-	fmt.Fprint(w, "aaa __hdef")
-	fmt.Fprint(w, "erred/xyz bbb __h_p")
-	fmt.Fprint(w, "p_l1 ccc")
-	c.Assert(h.Patterns[0].Match, qt.Equals, true)
-	c.Assert(h.Patterns[1].Match, qt.Equals, true)
-	c.Assert(h.done, qt.Equals, true)
-}
-
-func BenchmarkHasBytesWriter(b *testing.B) {
-	// A large chunk of output containing neither pattern is the common case
-	// (a normal rendered page): the writer must scan all of it.
-	content := []byte(strings.Repeat("<div class=\"nav\"><a href=\"/foo/bar\">baz</a></div>\n", 4000))
-
-	b.ResetTimer()
-	for range b.N {
-		h := &HasBytesWriter{
-			Patterns: []*HasBytesPattern{
-				{Pattern: []byte("__hdeferred/")},
-				{Pattern: []byte("__h_pp_l1")},
-			},
-		}
-		if _, err := h.Write(content); err != nil {
-			b.Fatal(err)
-		}
-	}
-}
@@ -19,44 +19,19 @@ import (
 	"strings"
 )

+// ReadSeeker wraps io.Reader and io.Seeker.
+type ReadSeeker interface {
+	io.Reader
+	io.Seeker
+}
+
 // ReadSeekCloser is implemented by afero.File. We use this as the common type for
 // content in Resource objects, even for strings.
 type ReadSeekCloser interface {
-	io.ReadSeeker
+	ReadSeeker
 	io.Closer
 }

-// Sizer provides the size of, typically, a io.Reader.
-// As implemented by e.g. os.File and io.SectionReader.
-type Sizer interface {
-	Size() int64
-}
-
-type SizeReader interface {
-	io.Reader
-	Sizer
-}
-
-// ToSizeReader converts the given io.Reader to a SizeReader.
-// Note that if r is not a SizeReader, the entire content will be read into memory
-func ToSizeReader(r io.Reader) (SizeReader, error) {
-	if sr, ok := r.(SizeReader); ok {
-		return sr, nil
-	}
-	b, err := io.ReadAll(r)
-	if err != nil {
-		return nil, err
-	}
-	return bytes.NewReader(b), nil
-}
-
-// CloserFunc is an adapter to allow the use of ordinary functions as io.Closers.
-type CloserFunc func() error
-
-func (f CloserFunc) Close() error {
-	return f()
-}
-
 // ReadSeekCloserProvider provides a ReadSeekCloser.
 type ReadSeekCloserProvider interface {
 	ReadSeekCloser() (ReadSeekCloser, error)
@@ -64,7 +39,7 @@ type ReadSeekCloserProvider interface {

 // readSeekerNopCloser implements ReadSeekCloser by doing nothing in Close.
 type readSeekerNopCloser struct {
-	io.ReadSeeker
+	ReadSeeker
 }

 // Close does nothing.
@@ -73,7 +48,7 @@ func (r readSeekerNopCloser) Close() error {
 }

 // NewReadSeekerNoOpCloser creates a new ReadSeekerNoOpCloser with the given ReadSeeker.
-func NewReadSeekerNoOpCloser(r io.ReadSeeker) ReadSeekCloser {
+func NewReadSeekerNoOpCloser(r ReadSeeker) ReadSeekCloser {
 	return readSeekerNopCloser{r}
 }

@@ -105,22 +80,6 @@ func NewReadSeekerNoOpCloserFromBytes(content []byte) readSeekerNopCloser {
 	return readSeekerNopCloser{bytes.NewReader(content)}
 }

-// NewReadSeekerNoOpCloserFromReader creates a new ReadSeekerNoOpCloser from the given io.Reader.
-// If the given io.Reader is not an io.ReadSeeker, the entire content will be read into memory.
-func NewReadSeekerNoOpCloserFromReader(r io.Reader) (readSeekerNopCloser, error) {
-	var rs io.ReadSeeker
-	if s, ok := r.(io.ReadSeeker); ok {
-		rs = s
-	} else {
-		b, err := io.ReadAll(r)
-		if err != nil {
-			return readSeekerNopCloser{rs}, err
-		}
-		rs = bytes.NewReader(b)
-	}
-	return readSeekerNopCloser{rs}, nil
-}
-
 // NewOpenReadSeekCloser creates a new ReadSeekCloser from the given ReadSeeker.
 // The ReadSeeker will be seeked to the beginning before returned.
 func NewOpenReadSeekCloser(r ReadSeekCloser) OpenReadSeekCloser {
@@ -16,6 +16,7 @@ package hugo
 import (
 	"context"
 	"fmt"
+	"html/template"
 	"os"
 	"path/filepath"
 	"runtime/debug"
@@ -24,16 +25,14 @@ import (
 	"sync"
 	"time"

-	"github.com/bep/helpers/contexthelpers"
 	"github.com/bep/logg"

 	"github.com/bep/godartsass/v2"
-
+	"github.com/gohugoio/hugo/common/hcontext"
 	"github.com/gohugoio/hugo/common/hexec"
 	"github.com/gohugoio/hugo/common/loggers"
-	"github.com/gohugoio/hugo/common/version"
+	"github.com/gohugoio/hugo/common/maps"
 	"github.com/gohugoio/hugo/hugofs/files"
-	"github.com/gohugoio/hugo/internal/warpc"

 	"github.com/spf13/afero"

@@ -55,40 +54,95 @@ var (
 	vendorInfo string
 )

-// BuildInfo holds build information extracted from runtime/debug.
-type BuildInfo struct {
-	Revision     string
-	RevisionTime string
-	GoVersion    string
+var _ maps.StoreProvider = (*HugoInfo)(nil)
+
+// HugoInfo contains information about the current Hugo environment
+type HugoInfo struct {
+	CommitHash string
+	BuildDate  string
+
+	// The build environment.
+	// Defaults are "production" (hugo) and "development" (hugo server).
+	// This can also be set by the user.
+	// It can be any string, but it will be all lower case.
+	Environment string
+
+	// version of go that the Hugo binary was built with
+	GoVersion string
+
+	conf ConfigProvider
+	deps []*Dependency
+
+	store *maps.Scratch
+
+	// Context gives access to some of the context scoped variables.
+	Context Context
 }

-// GetBuildDate returns the build date if set by -ldflags="-X github.com/gohugoio/hugo/common/hugo.buildDate="
-func GetBuildDate() string {
-	return buildDate
+// Version returns the current version as a comparable version string.
+func (i HugoInfo) Version() VersionString {
+	return CurrentVersion.Version()
 }

-// GetBuildInfo returns the build info for the current binary.
-func GetBuildInfo() *BuildInfo {
-	bi := getBuildInfo()
-	if bi == nil {
-		return nil
-	}
-	return &BuildInfo{
-		Revision:     bi.Revision,
-		RevisionTime: bi.RevisionTime,
-		GoVersion:    bi.GoVersion,
-	}
+// Generator a Hugo meta generator HTML tag.
+func (i HugoInfo) Generator() template.HTML {
+	return template.HTML(fmt.Sprintf(`<meta name="generator" content="Hugo %s">`, CurrentVersion.String()))
 }

-type contextKey uint8
+// IsDevelopment reports whether the current running environment is "development".
+func (i HugoInfo) IsDevelopment() bool {
+	return i.Environment == EnvironmentDevelopment
+}

-const (
-	contextKeyMarkupScope contextKey = iota
-)
+// IsProduction reports whether the current running environment is "production".
+func (i HugoInfo) IsProduction() bool {
+	return i.Environment == EnvironmentProduction
+}

-var markupScope = contexthelpers.NewContextDispatcher[string](contextKeyMarkupScope)
+// IsServer reports whether the built-in server is running.
+func (i HugoInfo) IsServer() bool {
+	return i.conf.Running()
+}
+
+// IsExtended reports whether the Hugo binary is the extended version.
+func (i HugoInfo) IsExtended() bool {
+	return IsExtended
+}
+
+// WorkingDir returns the project working directory.
+func (i HugoInfo) WorkingDir() string {
+	return i.conf.WorkingDir()
+}
+
+// Deps gets a list of dependencies for this Hugo build.
+func (i HugoInfo) Deps() []*Dependency {
+	return i.deps
+}
+
+func (i HugoInfo) Store() *maps.Scratch {
+	return i.store
+}
+
+// Deprecated: Use hugo.IsMultihost instead.
+func (i HugoInfo) IsMultiHost() bool {
+	Deprecate("hugo.IsMultiHost", "Use hugo.IsMultihost instead.", "v0.124.0")
+	return i.conf.IsMultihost()
+}
+
+// IsMultihost reports whether each configured language has a unique baseURL.
+func (i HugoInfo) IsMultihost() bool {
+	return i.conf.IsMultihost()
+}
+
+// IsMultilingual reports whether there are two or more configured languages.
+func (i HugoInfo) IsMultilingual() bool {
+	return i.conf.IsMultilingual()
+}
+
+type contextKey string
+
+var markupScope = hcontext.NewContextDispatcher[string](contextKey("markupScope"))

-// Context gives access to some of the context scoped variables.
 type Context struct{}

 func (c Context) MarkupScope(ctx context.Context) string {
@@ -105,13 +159,51 @@ func GetMarkupScope(ctx context.Context) string {
 	return markupScope.Get(ctx)
 }

+// ConfigProvider represents the config options that are relevant for HugoInfo.
+type ConfigProvider interface {
+	Environment() string
+	Running() bool
+	WorkingDir() string
+	IsMultihost() bool
+	IsMultilingual() bool
+}
+
+// NewInfo creates a new Hugo Info object.
+func NewInfo(conf ConfigProvider, deps []*Dependency) HugoInfo {
+	if conf.Environment() == "" {
+		panic("environment not set")
+	}
+	var (
+		commitHash string
+		buildDate  string
+		goVersion  string
+	)
+
+	bi := getBuildInfo()
+	if bi != nil {
+		commitHash = bi.Revision
+		buildDate = bi.RevisionTime
+		goVersion = bi.GoVersion
+	}
+
+	return HugoInfo{
+		CommitHash:  commitHash,
+		BuildDate:   buildDate,
+		Environment: conf.Environment(),
+		conf:        conf,
+		deps:        deps,
+		store:       maps.NewScratch(),
+		GoVersion:   goVersion,
+	}
+}
+
 // GetExecEnviron creates and gets the common os/exec environment used in the
 // external programs we interact with via os/exec, e.g. postcss.
 func GetExecEnviron(workDir string, cfg config.AllProvider, fs afero.Fs) []string {
 	var env []string
 	nodepath := filepath.Join(workDir, "node_modules")
 	if np := os.Getenv("NODE_PATH"); np != "" {
-		nodepath = nodepath + string(os.PathListSeparator) + np
+		nodepath = workDir + string(os.PathListSeparator) + np
 	}
 	config.SetEnvVars(&env, "NODE_PATH", nodepath)
 	config.SetEnvVars(&env, "PWD", workDir)
@@ -213,14 +305,12 @@ func GetDependencyList() []string {
 // GetDependencyListNonGo returns a list of non-Go dependencies.
 func GetDependencyListNonGo() []string {
 	var deps []string
-	for _, dep := range warpc.GetWASMDeps() {
-		deps = append(deps, formatDep(dep[0], dep[1]))
-	}

 	if IsExtended {
 		deps = append(
 			deps,
 			formatDep("github.com/sass/libsass", "3.6.6"),
+			formatDep("github.com/webmproject/libwebp", "v1.3.2"),
 		)
 	}

@@ -229,8 +319,7 @@ func GetDependencyListNonGo() []string {
 		if IsDartSassGeV2() {
 			dartSassPath = "github.com/sass/dart-sass"
 		}
-		deps = append(
-			deps,
+		deps = append(deps,
 			formatDep(dartSassPath+"/protocol", dartSass.ProtocolVersion),
 			formatDep(dartSassPath+"/compiler", dartSass.CompilerVersion),
 			formatDep(dartSassPath+"/implementation", dartSass.ImplementationVersion),
@@ -322,101 +411,36 @@ func IsDartSassGeV2() bool {
 // 2. Their theme to work for at least the last few Hugo versions.
 func Deprecate(item, alternative string, version string) {
 	level := deprecationLogLevelFromVersion(version)
-	deprecateLevel(item, alternative, version, level)
-}
-
-// See Deprecate for details.
-func DeprecateWithLogger(item, alternative string, version string, log logg.Logger) {
-	level := deprecationLogLevelFromVersion(version)
-	deprecateLevelWithLogger(item, alternative, version, level, log)
-}
-
-// DeprecateLevelMin informs about a deprecation starting at the given version, but with a minimum log level.
-func DeprecateLevelMin(item, alternative string, version string, minLevel logg.Level) {
-	level := max(deprecationLogLevelFromVersion(version), minLevel)
-	deprecateLevel(item, alternative, version, level)
-}
-
-// deprecateLevel informs about a deprecation logging at the given level.
-func deprecateLevel(item, alternative, version string, level logg.Level) {
-	deprecateLevelWithLogger(item, alternative, version, level, loggers.Log().Logger())
+	DeprecateLevel(item, alternative, version, level)
 }

 // DeprecateLevel informs about a deprecation logging at the given level.
-func deprecateLevelWithLogger(item, alternative, version string, level logg.Level, log logg.Logger) {
-	//if strings.Contains(item, "module.mounts.lang") || strings.Contains(item, "includeFiles") {
-	// hdebug.Panicf("Deprecated")
-	//}
+func DeprecateLevel(item, alternative, version string, level logg.Level) {
 	var msg string
 	if level == logg.LevelError {
-		// Useful to debug deprecation errors that needs to be removedor fixed. Comment out when done debugging.
-		// hdebug.Panicf("deprecation error: %s was removed in Hugo %s. %s", item, version, alternative)
-		msg = fmt.Sprintf("%s was deprecated in Hugo %s and subsequently removed. %s", item, version, alternative)
+		msg = fmt.Sprintf("%s was deprecated in Hugo %s and will be removed in Hugo %s. %s", item, version, CurrentVersion.Next().ReleaseVersion(), alternative)
 	} else {
 		msg = fmt.Sprintf("%s was deprecated in Hugo %s and will be removed in a future release. %s", item, version, alternative)
 	}

-	log.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.
 // We want people to run at least the current and previous version without any warnings.
 // We want people who don't update Hugo that often to see the warnings and errors before we remove the feature.
 func deprecationLogLevelFromVersion(ver string) logg.Level {
-	from := version.MustParseVersion(ver)
+	from := MustParseVersion(ver)
 	to := CurrentVersion
 	minorDiff := to.Minor - from.Minor
 	switch {
-	case minorDiff >= 15:
-		// Start failing the build after about 15 months.
+	case minorDiff >= 12:
+		// Start failing the build after about a year.
 		return logg.LevelError
-	case minorDiff >= 3:
-		// Start printing warnings after about 3 months.
+	case minorDiff >= 6:
+		// Start printing warnings after about six months.
 		return logg.LevelWarn
 	default:
 		return logg.LevelInfo
 	}
 }
-
-// BuildVersionString creates a version string. This is what you see when
-// running "hugo version".
-func BuildVersionString() string {
-	// program := "Hugo Static Site Generator"
-	program := "hugo"
-
-	version := "v" + CurrentVersion.String()
-
-	bi := getBuildInfo()
-	if bi == nil {
-		return version
-	}
-	if bi.Revision != "" {
-		version += "-" + bi.Revision
-	}
-	if IsExtended {
-		version += "+extended"
-	}
-	if IsWithdeploy {
-		version += "+withdeploy"
-	}
-
-	osArch := bi.GoOS + "/" + bi.GoArch
-
-	date := bi.RevisionTime
-	if date == "" {
-		// Accept vendor-specified build date if .git/ is unavailable.
-		date = buildDate
-	}
-	if date == "" {
-		date = "unknown"
-	}
-
-	versionString := fmt.Sprintf("%s %s %s BuildDate=%s",
-		program, version, osArch, date)
-
-	if vendorInfo != "" {
-		versionString += " VendorInfo=" + vendorInfo
-	}
-
-	return versionString
-}
@@ -35,7 +35,7 @@ baseURL = 'https://en.example.org/'
 ---
 title: home
 ---
-- layouts/home.html --
+-- layouts/index.html --
 multilingual={{ hugo.IsMultilingual }}
 multihost={{ hugo.IsMultihost }}
  `
@@ -75,39 +75,3 @@ multihost={{ hugo.IsMultihost }}
 		"multihost=false",
 	)
 }
-
-func TestHugoSites(t *testing.T) {
-	t.Parallel()
-
-	files := `
-- hugo.toml --
-disableKinds = ['page','rss','section','sitemap','taxonomy','term']
-defaultContentLanguage = 'fr'
-defaultContentLanguageInSubdir = true
-defaultContentVersionInSubdir = true
-defaultContentRoleInSubdir = true
-[languages]
-[languages.en]
-weight = 1
-[languages.fr]
-weight = 2
-[languages.de]
-weight = 3
-[roles]
-[roles.guest]
-weight = 1
-[roles.member]
-weight = 2
-[versions]
-[versions.'v1.0.0']
-weight = 1
-[versions.'v2.0.0']
-weight = 2
-- layouts/home.html --
-{{ range hugo.Sites }}{{ .Language.Name }}-{{ .Role.Name }}-{{ .Version.Name }}|{{ end }}
-  `
-
-	b := hugolib.Test(t, files)
-
-	b.AssertFileContent("public/guest/v1.0.0/en/index.html", "en-guest-v1.0.0|en-member-v1.0.0|en-guest-v2.0.0|en-member-v2.0.0|fr-guest-v1.0.0|fr-member-v1.0.0|fr-guest-v2.0.0|fr-member-v2.0.0|de-guest-v1.0.0|de-member-v1.0.0|de-guest-v2.0.0|de-member-v2.0.0|")
-}
@@ -15,47 +15,97 @@ package hugo

 import (
 	"context"
+	"fmt"
 	"testing"

 	"github.com/bep/logg"
 	qt "github.com/frankban/quicktest"
 )

+func TestHugoInfo(t *testing.T) {
+	c := qt.New(t)
+
+	conf := testConfig{environment: "production", workingDir: "/mywork", running: false}
+	hugoInfo := NewInfo(conf, nil)
+
+	c.Assert(hugoInfo.Version(), qt.Equals, CurrentVersion.Version())
+	c.Assert(fmt.Sprintf("%T", VersionString("")), qt.Equals, fmt.Sprintf("%T", hugoInfo.Version()))
+	c.Assert(hugoInfo.WorkingDir(), qt.Equals, "/mywork")
+
+	bi := getBuildInfo()
+	if bi != nil {
+		c.Assert(hugoInfo.CommitHash, qt.Equals, bi.Revision)
+		c.Assert(hugoInfo.BuildDate, qt.Equals, bi.RevisionTime)
+		c.Assert(hugoInfo.GoVersion, qt.Equals, bi.GoVersion)
+	}
+	c.Assert(hugoInfo.Environment, qt.Equals, "production")
+	c.Assert(string(hugoInfo.Generator()), qt.Contains, fmt.Sprintf("Hugo %s", hugoInfo.Version()))
+	c.Assert(hugoInfo.IsDevelopment(), qt.Equals, false)
+	c.Assert(hugoInfo.IsProduction(), qt.Equals, true)
+	c.Assert(hugoInfo.IsExtended(), qt.Equals, IsExtended)
+	c.Assert(hugoInfo.IsServer(), qt.Equals, false)
+
+	devHugoInfo := NewInfo(testConfig{environment: "development", running: true}, nil)
+	c.Assert(devHugoInfo.IsDevelopment(), qt.Equals, true)
+	c.Assert(devHugoInfo.IsProduction(), qt.Equals, false)
+	c.Assert(devHugoInfo.IsServer(), qt.Equals, true)
+}
+
 func TestDeprecationLogLevelFromVersion(t *testing.T) {
 	c := qt.New(t)

 	c.Assert(deprecationLogLevelFromVersion("0.55.0"), qt.Equals, logg.LevelError)
 	ver := CurrentVersion
 	c.Assert(deprecationLogLevelFromVersion(ver.String()), qt.Equals, logg.LevelInfo)
-	ver.Minor -= 3
+	ver.Minor -= 1
+	c.Assert(deprecationLogLevelFromVersion(ver.String()), qt.Equals, logg.LevelInfo)
+	ver.Minor -= 6
 	c.Assert(deprecationLogLevelFromVersion(ver.String()), qt.Equals, logg.LevelWarn)
-	ver.Minor -= 4
-	c.Assert(deprecationLogLevelFromVersion(ver.String()), qt.Equals, logg.LevelWarn)
-	ver.Minor -= 13
+	ver.Minor -= 6
 	c.Assert(deprecationLogLevelFromVersion(ver.String()), qt.Equals, logg.LevelError)

 	// Added just to find the threshold for where we can remove deprecated items.
-	// Subtract 5 from the minor version of the first ERRORed version => 0.145.0.
-	c.Assert(deprecationLogLevelFromVersion("0.150.0"), qt.Equals, logg.LevelError)
+	// Subtract 5 from the minor version of the first ERRORed version => 0.122.0.
+	c.Assert(deprecationLogLevelFromVersion("0.127.0"), qt.Equals, logg.LevelError)
 }

 func TestMarkupScope(t *testing.T) {
 	c := qt.New(t)

+	conf := testConfig{environment: "production", workingDir: "/mywork", running: false}
+	info := NewInfo(conf, nil)
+
 	ctx := context.Background()
+
 	ctx = SetMarkupScope(ctx, "foo")

-	var hugoCtx Context
-	c.Assert(hugoCtx.MarkupScope(ctx), qt.Equals, "foo")
-	c.Assert(GetMarkupScope(ctx), qt.Equals, "foo")
+	c.Assert(info.Context.MarkupScope(ctx), qt.Equals, "foo")
 }

-func TestGetBuildInfo(t *testing.T) {
-	c := qt.New(t)
-
-	bi := GetBuildInfo()
-	// In test mode, build info may or may not be available.
-	if bi != nil {
-		c.Assert(bi.GoVersion, qt.Not(qt.Equals), "")
-	}
+type testConfig struct {
+	environment  string
+	running      bool
+	workingDir   string
+	multihost    bool
+	multilingual bool
+}
+
+func (c testConfig) Environment() string {
+	return c.environment
+}
+
+func (c testConfig) Running() bool {
+	return c.running
+}
+
+func (c testConfig) WorkingDir() string {
+	return c.workingDir
+}
+
+func (c testConfig) IsMultihost() bool {
+	return c.multihost
+}
+
+func (c testConfig) IsMultilingual() bool {
+	return c.multilingual
 }
@@ -12,6 +12,7 @@
 // limitations under the License.

 //go:build extended
+// +build extended

 package hugo

@@ -12,6 +12,7 @@
 // limitations under the License.

 //go:build !extended
+// +build !extended

 package hugo

@@ -12,6 +12,7 @@
 // limitations under the License.

 //go:build withdeploy
+// +build withdeploy

 package hugo

@@ -12,6 +12,7 @@
 // limitations under the License.

 //go:build !withdeploy
+// +build !withdeploy

 package hugo

@@ -1,4 +1,4 @@
-// Copyright 2025 The Hugo Authors. All rights reserved.
+// Copyright 2018 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.
@@ -11,7 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-package version
+package hugo

 import (
 	"fmt"
@@ -37,9 +37,6 @@ type Version struct {
 	// HugoVersionSuffix is the suffix used in the Hugo version string.
 	// It will be blank for release versions.
 	Suffix string
-
-	// Set when parsed from a string,
-	source string
 }

 var (
@@ -47,17 +44,6 @@ var (
 	_ compare.Comparer = (*VersionString)(nil)
 )

-// IsAlphaBetaOrRC returns whether this version is an alpha, beta, or release candidate.
-func (v Version) IsAlphaBetaOrRC() bool {
-	s := strings.ToLower(v.Suffix)
-	// e.g. "alpha.1", "beta.2", "rc.3"
-	return strings.Contains(s, "alpha.") || strings.Contains(s, "beta.") || strings.Contains(s, "rc.")
-}
-
-func (v Version) IsZero() bool {
-	return v.Major == 0 && v.Minor == 0 && v.PatchLevel == 0 && v.Suffix == ""
-}
-
 func (v Version) String() string {
 	return version(v.Major, v.Minor, v.PatchLevel, v.Suffix)
 }
@@ -69,7 +55,7 @@ func (v Version) Version() VersionString {

 // Compare implements the compare.Comparer interface.
 func (h Version) Compare(other any) int {
-	return CompareVersions(h, other)
+	return compareVersions(h, other)
 }

 // VersionString represents a Hugo version string.
@@ -81,7 +67,7 @@ func (h VersionString) String() string {

 // Compare implements the compare.Comparer interface.
 func (h VersionString) Compare(other any) int {
-	return CompareVersions(h.Version(), other)
+	return compareVersions(h.Version(), other)
 }

 func (h VersionString) Version() Version {
@@ -97,26 +83,19 @@ func (h VersionString) Eq(other any) bool {
 	return s == h.String()
 }

+var versionSuffixes = []string{"-test", "-DEV"}
+
 // ParseVersion parses a version string.
 func ParseVersion(s string) (Version, error) {
-	s = strings.TrimPrefix(strings.TrimSpace(s), "v")
 	var vv Version
-	hyphen := strings.Index(s, "-")
-	if hyphen > 0 {
-		suffix := s[hyphen:]
-		if len(suffix) > 1 {
-			if suffix[0] == '-' {
-				suffix = suffix[1:]
-			}
-			if len(suffix) > 0 {
-				vv.Suffix = suffix
-				s = s[:hyphen]
-			}
+	for _, suffix := range versionSuffixes {
+		if strings.HasSuffix(s, suffix) {
+			vv.Suffix = suffix
+			s = strings.TrimSuffix(s, suffix)
 		}
-		vv.Suffix = suffix
 	}
+
 	vv.Major, vv.Minor, vv.PatchLevel = parseVersion(s)
-	vv.source = s

 	return vv, nil
 }
@@ -155,70 +134,107 @@ func (v Version) NextPatchLevel(level int) Version {
 	return prev
 }

-func version(major, minor, patch int, suffix string) string {
-	if suffix != "" {
-		if suffix[0] != '-' {
-			suffix = "-" + suffix
-		}
+// BuildVersionString creates a version string. This is what you see when
+// running "hugo version".
+func BuildVersionString() string {
+	// program := "Hugo Static Site Generator"
+	program := "hugo"
+
+	version := "v" + CurrentVersion.String()
+
+	bi := getBuildInfo()
+	if bi == nil {
+		return version
 	}
+	if bi.Revision != "" {
+		version += "-" + bi.Revision
+	}
+	if IsExtended {
+		version += "+extended"
+	}
+	if IsWithdeploy {
+		version += "+withdeploy"
+	}
+
+	osArch := bi.GoOS + "/" + bi.GoArch
+
+	date := bi.RevisionTime
+	if date == "" {
+		// Accept vendor-specified build date if .git/ is unavailable.
+		date = buildDate
+	}
+	if date == "" {
+		date = "unknown"
+	}
+
+	versionString := fmt.Sprintf("%s %s %s BuildDate=%s",
+		program, version, osArch, date)
+
+	if vendorInfo != "" {
+		versionString += " VendorInfo=" + vendorInfo
+	}
+
+	return versionString
+}
+
+func version(major, minor, patch int, suffix string) string {
 	if patch > 0 || minor > 53 {
 		return fmt.Sprintf("%d.%d.%d%s", major, minor, patch, suffix)
 	}
 	return fmt.Sprintf("%d.%d%s", major, minor, suffix)
 }

-// CompareVersion compares v1 with v2.
-// It returns -1 if the v2 is less than, 0 if equal and 1 if greater than
-// v1.
-func CompareVersions(v1 Version, v2 any) int {
+// CompareVersion compares the given version string or number against the
+// running Hugo version.
+// It returns -1 if the given version is less than, 0 if equal and 1 if greater than
+// the running version.
+func CompareVersion(version any) int {
+	return compareVersions(CurrentVersion, version)
+}
+
+func compareVersions(inVersion Version, in any) int {
 	var c int
-	switch d := v2.(type) {
+	switch d := in.(type) {
 	case float64:
-		c = compareFloatWithVersion(d, v1)
+		c = compareFloatWithVersion(d, inVersion)
 	case float32:
-		c = compareFloatWithVersion(float64(d), v1)
+		c = compareFloatWithVersion(float64(d), inVersion)
 	case int:
-		c = compareFloatWithVersion(float64(d), v1)
+		c = compareFloatWithVersion(float64(d), inVersion)
 	case int32:
-		c = compareFloatWithVersion(float64(d), v1)
+		c = compareFloatWithVersion(float64(d), inVersion)
 	case int64:
-		c = compareFloatWithVersion(float64(d), v1)
+		c = compareFloatWithVersion(float64(d), inVersion)
 	case Version:
-		if v1.IsZero() && d.IsZero() {
-			// Fall back to source comparison.
-			return strings.Compare(v1.source, d.source)
+		if d.Major == inVersion.Major && d.Minor == inVersion.Minor && d.PatchLevel == inVersion.PatchLevel {
+			return strings.Compare(inVersion.Suffix, d.Suffix)
 		}
-		if d.Major == v1.Major && d.Minor == v1.Minor && d.PatchLevel == v1.PatchLevel {
-			return strings.Compare(v1.Suffix, d.Suffix)
-		}
-		if d.Major > v1.Major {
+		if d.Major > inVersion.Major {
 			return 1
-		} else if d.Major < v1.Major {
+		} else if d.Major < inVersion.Major {
 			return -1
 		}
-		if d.Minor > v1.Minor {
+		if d.Minor > inVersion.Minor {
 			return 1
-		} else if d.Minor < v1.Minor {
+		} else if d.Minor < inVersion.Minor {
 			return -1
 		}
-		if d.PatchLevel > v1.PatchLevel {
+		if d.PatchLevel > inVersion.PatchLevel {
 			return 1
-		} else if d.PatchLevel < v1.PatchLevel {
+		} else if d.PatchLevel < inVersion.PatchLevel {
 			return -1
 		}
 	default:
-		s, err := cast.ToStringE(v2)
+		s, err := cast.ToStringE(in)
 		if err != nil {
 			return -1
 		}

-		v2v, _ := ParseVersion(s)
-		if v1.IsZero() && v2v.IsZero() {
-			// Fall back to source comparison.
-			return strings.Compare(v1.source, v2v.source)
+		v, err := ParseVersion(s)
+		if err != nil {
+			return -1
 		}
-
-		return v1.Compare(v2v)
+		return inVersion.Compare(v)

 	}

@@ -1,4 +1,4 @@
-// Copyright 2025 The Hugo Authors. All rights reserved.
+// Copyright 2018 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.
@@ -13,13 +13,11 @@

 package hugo

-import "github.com/gohugoio/hugo/common/version"
-
 // CurrentVersion represents the current build version.
 // This should be the only one.
-var CurrentVersion = version.Version{
+var CurrentVersion = Version{
 	Major:      0,
-	Minor:      166,
-	PatchLevel: 0,
-	Suffix:     "-DEV",
+	Minor:      139,
+	PatchLevel: 5,
+	Suffix:     "",
 }
@@ -1,4 +1,4 @@
-// Copyright 2025 The Hugo Authors. All rights reserved.
+// Copyright 2015 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.
@@ -11,7 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-package version
+package hugo

 import (
 	"testing"
@@ -50,45 +50,30 @@ func TestHugoVersion(t *testing.T) {
 func TestCompareVersions(t *testing.T) {
 	c := qt.New(t)

-	parseIgnoreErr := func(s string) Version {
-		v, _ := ParseVersion(s)
-		return v
-	}
-
-	c.Assert(CompareVersions(MustParseVersion("0.20.0"), 0.20), qt.Equals, 0)
-	c.Assert(CompareVersions(MustParseVersion("0.20.0"), float32(0.20)), qt.Equals, 0)
-	c.Assert(CompareVersions(MustParseVersion("0.20.0"), float64(0.20)), qt.Equals, 0)
-	c.Assert(CompareVersions(MustParseVersion("0.19.1"), 0.20), qt.Equals, 1)
-	c.Assert(CompareVersions(MustParseVersion("0.19.3"), "0.20.2"), qt.Equals, 1)
-	c.Assert(CompareVersions(MustParseVersion("0.1"), 3), qt.Equals, 1)
-	c.Assert(CompareVersions(MustParseVersion("0.1"), int32(3)), qt.Equals, 1)
-	c.Assert(CompareVersions(MustParseVersion("0.1"), int64(3)), qt.Equals, 1)
-	c.Assert(CompareVersions(MustParseVersion("0.20"), "0.20"), qt.Equals, 0)
-	c.Assert(CompareVersions(MustParseVersion("0.20.1"), "0.20.1"), qt.Equals, 0)
-	c.Assert(CompareVersions(MustParseVersion("0.20.1"), "0.20"), qt.Equals, -1)
-	c.Assert(CompareVersions(MustParseVersion("0.20.0"), "0.20.1"), qt.Equals, 1)
-	c.Assert(CompareVersions(MustParseVersion("0.20.1"), "0.20.2"), qt.Equals, 1)
-	c.Assert(CompareVersions(MustParseVersion("0.21.1"), "0.22.1"), qt.Equals, 1)
-	c.Assert(CompareVersions(MustParseVersion("0.22.0"), "0.22-DEV"), qt.Equals, -1)
-	c.Assert(CompareVersions(MustParseVersion("0.22.0"), "0.22.1-DEV"), qt.Equals, 1)
-	c.Assert(CompareVersions(MustParseVersion("0.22.0-DEV"), "0.22"), qt.Equals, 1)
-	c.Assert(CompareVersions(MustParseVersion("0.22.1-DEV"), "0.22"), qt.Equals, -1)
-	c.Assert(CompareVersions(MustParseVersion("0.22.1-DEV"), "0.22.1-DEV"), qt.Equals, 0)
-
-	c.Assert(CompareVersions(parseIgnoreErr("foobar"), "v1.0.0"), qt.Equals, 1)
-	c.Assert(CompareVersions(parseIgnoreErr("v1.0.0"), "foobar"), qt.Equals, -1)
-	c.Assert(CompareVersions(parseIgnoreErr("foobar"), "foobar"), qt.Equals, 0)
-	c.Assert(CompareVersions(parseIgnoreErr("foobar"), parseIgnoreErr("foobar")), qt.Equals, 0)
-	c.Assert(CompareVersions(parseIgnoreErr("a"), "b"), qt.Equals, -1)
-	c.Assert(CompareVersions(parseIgnoreErr("a"), parseIgnoreErr("b")), qt.Equals, -1)
-	c.Assert(CompareVersions(parseIgnoreErr("b"), "a"), qt.Equals, 1)
-	c.Assert(CompareVersions(parseIgnoreErr("b"), parseIgnoreErr("a")), qt.Equals, 1)
+	c.Assert(compareVersions(MustParseVersion("0.20.0"), 0.20), qt.Equals, 0)
+	c.Assert(compareVersions(MustParseVersion("0.20.0"), float32(0.20)), qt.Equals, 0)
+	c.Assert(compareVersions(MustParseVersion("0.20.0"), float64(0.20)), qt.Equals, 0)
+	c.Assert(compareVersions(MustParseVersion("0.19.1"), 0.20), qt.Equals, 1)
+	c.Assert(compareVersions(MustParseVersion("0.19.3"), "0.20.2"), qt.Equals, 1)
+	c.Assert(compareVersions(MustParseVersion("0.1"), 3), qt.Equals, 1)
+	c.Assert(compareVersions(MustParseVersion("0.1"), int32(3)), qt.Equals, 1)
+	c.Assert(compareVersions(MustParseVersion("0.1"), int64(3)), qt.Equals, 1)
+	c.Assert(compareVersions(MustParseVersion("0.20"), "0.20"), qt.Equals, 0)
+	c.Assert(compareVersions(MustParseVersion("0.20.1"), "0.20.1"), qt.Equals, 0)
+	c.Assert(compareVersions(MustParseVersion("0.20.1"), "0.20"), qt.Equals, -1)
+	c.Assert(compareVersions(MustParseVersion("0.20.0"), "0.20.1"), qt.Equals, 1)
+	c.Assert(compareVersions(MustParseVersion("0.20.1"), "0.20.2"), qt.Equals, 1)
+	c.Assert(compareVersions(MustParseVersion("0.21.1"), "0.22.1"), qt.Equals, 1)
+	c.Assert(compareVersions(MustParseVersion("0.22.0"), "0.22-DEV"), qt.Equals, -1)
+	c.Assert(compareVersions(MustParseVersion("0.22.0"), "0.22.1-DEV"), qt.Equals, 1)
+	c.Assert(compareVersions(MustParseVersion("0.22.0-DEV"), "0.22"), qt.Equals, 1)
+	c.Assert(compareVersions(MustParseVersion("0.22.1-DEV"), "0.22"), qt.Equals, -1)
+	c.Assert(compareVersions(MustParseVersion("0.22.1-DEV"), "0.22.1-DEV"), qt.Equals, 0)
 }

 func TestParseHugoVersion(t *testing.T) {
 	c := qt.New(t)

-	c.Assert(MustParseVersion("v2.3.2").String(), qt.Equals, "2.3.2")
 	c.Assert(MustParseVersion("0.25").String(), qt.Equals, "0.25")
 	c.Assert(MustParseVersion("0.25.2").String(), qt.Equals, "0.25.2")
 	c.Assert(MustParseVersion("0.25-test").String(), qt.Equals, "0.25-test")
@@ -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
 }
@@ -20,7 +20,6 @@ import (
 	"io"
 	"os"
 	"strings"
-	"sync"
 	"time"

 	"github.com/bep/logg"
@@ -39,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
@@ -49,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{}
@@ -124,11 +122,8 @@ func New(opts Options) Logger {
 	)

 	l := logger.WithLevel(opts.Level)
-	logMu := &sync.Mutex{}

 	reset := func() {
-		logMu.Lock()
-		defer logMu.Unlock()
 		logCounters.mu.Lock()
 		defer logCounters.mu.Unlock()
 		logCounters.counters = make(map[logg.Level]int)
@@ -139,12 +134,10 @@ func New(opts Options) Logger {
 	}

 	return &logAdapter{
-		mu:          logMu,
 		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),
@@ -160,6 +153,8 @@ func NewDefault() Logger {
 	opts := Options{
 		DistinctLevel: logg.LevelWarn,
 		Level:         logg.LevelWarn,
+		Stdout:        os.Stdout,
+		Stderr:        os.Stdout,
 	}
 	return New(opts)
 }
@@ -168,6 +163,8 @@ func NewTrace() Logger {
 	opts := Options{
 		DistinctLevel: logg.LevelWarn,
 		Level:         logg.LevelTrace,
+		Stdout:        os.Stdout,
+		Stderr:        os.Stdout,
 	}
 	return New(opts)
 }
@@ -178,7 +175,6 @@ func LevelLoggerToWriter(l logg.LevelLogger) io.Writer {

 type Logger interface {
 	Debug() logg.LevelLogger
-	DebugCommand(command string) logg.LevelLogger
 	Debugf(format string, v ...any)
 	Debugln(v ...any)
 	Error() logg.LevelLogger
@@ -193,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)
@@ -209,12 +204,10 @@ type Logger interface {
 }

 type logAdapter struct {
-	mu          *sync.Mutex
 	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
@@ -228,10 +221,6 @@ func (l *logAdapter) Debug() logg.LevelLogger {
 	return l.debugl
 }

-func (l *logAdapter) DebugCommand(command string) logg.LevelLogger {
-	return l.debugl.WithField(FieldNameCmd, command)
-}
-
 func (l *logAdapter) Debugf(format string, v ...any) {
 	l.debugl.Logf(format, v...)
 }
@@ -270,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
@@ -286,7 +271,7 @@ func (l *logAdapter) PrintTimerIfDelayed(start time.Time, name string) {
 	if milli < 500 {
 		return
 	}
-	fmt.Fprintf(l.stdErr, "%s in %v ms\n", name, milli)
+	l.Printf("%s in %v ms", name, milli)
 }

 func (l *logAdapter) Printf(format string, v ...any) {
@@ -294,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() {
@@ -334,8 +319,6 @@ func (l *logAdapter) Errorln(v ...any) {
 }

 func (l *logAdapter) Errors() string {
-	l.mu.Lock()
-	defer l.mu.Unlock()
 	return l.errors.String()
 }

@@ -352,7 +335,7 @@ func (l *logAdapter) Warnidf(id, format string, v ...any) {
 }

 func (l *logAdapter) idfInfoStatement(what, id, format string) string {
-	return fmt.Sprintf("\nYou can suppress this %s by adding the following to your project configuration:\nignoreLogs = ['%s']", what, id)
+	return fmt.Sprintf("\nYou can suppress this %s by adding the following to your site configuration:\nignoreLogs = ['%s']", what, id)
 }

 func (l *logAdapter) Trace(s logg.StringFunc) {
@@ -31,13 +31,13 @@ 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)

-	for range 10 {
+	for i := 0; i < 10; i++ {
 		l.Errorln("error 1")
 		l.Errorln("error 2")
 		l.Warnln("warn 1")
@@ -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,13 +131,13 @@ 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)

-	for range 3 {
+	for i := 0; i < 3; i++ {
 		l.Errorln("error 1")
 		l.Errorln("error 2")
 		l.Errorln("error 1")
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`gobench -package=./hugolib -bench="BenchmarkSiteNew/Deep_content_tree"`
				`@@ -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`