tocss: Fix the import resolving from absolute to relative assets paths

Fixes #12137
2026-09-03 04:02:38 +00:00 · 2024-02-24 16:04:08 +01:00
244 changed files with 1997 additions and 12014 deletions
@@ -4,7 +4,7 @@ parameters:
 defaults: &defaults
  resource_class: large
  docker:
-      - image: bepsays/ci-hugoreleaser:1.22200.20201
+      - image: bepsays/ci-hugoreleaser:1.22200.20000
 environment: &buildenv
      GOMODCACHE: /root/project/gomodcache
 version: 2
@@ -60,7 +60,7 @@ jobs:
    environment:
        <<: [*buildenv]
    docker:
-    - image: bepsays/ci-hugoreleaser-linux-arm64:1.22200.20201
+    - image: bepsays/ci-hugoreleaser-linux-arm64:1.22200.20000
    steps:
      - *restore-cache
      - &attach-workspace
@@ -1,13 +1,13 @@
 on:
  push:
-    branches: [master]
+    branches: [ master ]
  pull_request:
 name: TestDartSassV1
 env:
-  GOPROXY: https://proxy.golang.org
-  GO111MODULE: on
-  DART_SASS_VERSION: 1.62.1
-  DART_SASS_SHA_LINUX: 3574da75a7322a539034648b8ff84ff2cca162eb924d72b663d718cd3936f075
+    GOPROXY: https://proxy.golang.org
+    GO111MODULE: on
+    DART_SASS_VERSION: 1.62.1
+    DART_SASS_SHA_LINUX: 3574da75a7322a539034648b8ff84ff2cca162eb924d72b663d718cd3936f075
 permissions:
  contents: read
 jobs:
@@ -18,69 +18,56 @@ jobs:
        os: [ubuntu-latest]
    runs-on: ${{ matrix.os }}
    steps:
-      - if: matrix.os == 'ubuntu-latest'
-        name: Free Disk Space (Ubuntu)
-        uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be
-        with:
-          # 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
-          large-packages: true
-          docker-images: true
-          swap-storage: true
-      - name: Checkout code
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
-      - name: Install Go
-        uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491
-        with:
-          go-version: ${{ matrix.go-version }}
-          check-latest: true
-          cache: true
-          cache-dependency-path: |
-            **/go.sum
-            **/go.mod
-      - name: Install Ruby
-        uses: ruby/setup-ruby@5f19ec79cedfadb78ab837f95b87734d0003c899
-        with:
-          ruby-version: "2.7"
-          bundler-cache: true #
-      - name: Install Python
-        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d
-        with:
-          python-version: "3.x"
-      - name: Install Mage
-        run: go install github.com/magefile/mage@v1.15.0
-      - name: Install asciidoctor
-        uses: reitzig/actions-asciidoctor@03fcc74cd74880b697950c4930c9ec8a67c69ecc
-      - name: Install docutils
-        run: |
-          pip install docutils
-          rst2html --version
-      - if: matrix.os == 'ubuntu-latest'
-        name: Install pandoc on Linux
-        run: |
+    - name: Checkout code
+      uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+    - name: Install Go
+      uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753
+      with:
+        go-version: ${{ matrix.go-version }}
+        check-latest: true
+        cache: true
+        cache-dependency-path: |
+          **/go.sum
+          **/go.mod
+    - name: Install Ruby
+      uses: ruby/setup-ruby@036ef458ddccddb148a2b9fb67e95a22fdbf728b
+      with:
+        ruby-version: '2.7' 
+        bundler-cache: true #
+    - name: Install Python
+      uses: actions/setup-python@3105fb18c05ddd93efea5f9e0bef7a03a6e9e7df
+      with:
+        python-version: '3.x'
+    - name: Install Mage
+      run: go install github.com/magefile/mage@v1.15.0
+    - name: Install asciidoctor
+      uses: reitzig/actions-asciidoctor@7570212ae20b63653481675fb1ff62d1073632b0
+    - name: Install docutils
+      run: |
+        pip install docutils
+        rst2html.py --version
+    - if: matrix.os == 'ubuntu-latest'
+      name: Install pandoc on Linux
+      run: |
          sudo apt-get update -y
          sudo apt-get install -y pandoc
-      - if: matrix.os == 'macos-latest'
-        run: |
-          brew install pandoc
-      - if: matrix.os == 'windows-latest'
-        run: |
-          Choco-Install -PackageName pandoc
-      - run: pandoc -v
-      - name: Install dart-sass-embedded Linux
-        run: |
-          echo "Install Dart Sass version ${DART_SASS_VERSION} ..."
-          curl -LJO "https://github.com/sass/dart-sass-embedded/releases/download/${DART_SASS_VERSION}/sass_embedded-${DART_SASS_VERSION}-linux-x64.tar.gz";
-          echo "${DART_SASS_SHA_LINUX}  sass_embedded-${DART_SASS_VERSION}-linux-x64.tar.gz" | sha256sum -c;
-          tar -xvf "sass_embedded-${DART_SASS_VERSION}-linux-x64.tar.gz";
-          echo "$GITHUB_WORKSPACE/sass_embedded/" >> $GITHUB_PATH
-      - name: Check
-        run: |
-          dart-sass-embedded --version
-          mage -v check;
-        env:
-          HUGO_BUILD_TAGS: extended
+    - if: matrix.os == 'macos-latest'
+      run: |
+        brew install pandoc
+    - if: matrix.os == 'windows-latest'
+      run: |
+        Choco-Install -PackageName pandoc
+    - run: pandoc -v
+    - name: Install dart-sass-embedded Linux
+      run: |
+        echo "Install Dart Sass version ${DART_SASS_VERSION} ..."
+        curl -LJO "https://github.com/sass/dart-sass-embedded/releases/download/${DART_SASS_VERSION}/sass_embedded-${DART_SASS_VERSION}-linux-x64.tar.gz";
+        echo "${DART_SASS_SHA_LINUX}  sass_embedded-${DART_SASS_VERSION}-linux-x64.tar.gz" | sha256sum -c;
+        tar -xvf "sass_embedded-${DART_SASS_VERSION}-linux-x64.tar.gz";
+        echo "$GITHUB_WORKSPACE/sass_embedded/" >> $GITHUB_PATH
+    - name: Check
+      run: |
+        dart-sass-embedded --version
+        mage -v check;
+      env:
+        HUGO_BUILD_TAGS: extended
@@ -1,132 +1,119 @@
 on:
  push:
-    branches: [master]
+    branches: [ master ]
  pull_request:
 name: Test
 env:
-  GOPROXY: https://proxy.golang.org
-  GO111MODULE: on
-  SASS_VERSION: 1.63.2
-  DART_SASS_SHA_LINUX: 3ea33c95ad5c35fda6e9a0956199eef38a398f496cfb8750e02479d7d1dd42af
-  DART_SASS_SHA_MACOS: 11c70f259836b250b44a9cb57fed70e030f21f45069b467d371685855f1eb4f0
-  DART_SASS_SHA_WINDOWS: cd8cd36a619dd8e27f93d3186c52d70eb7d69472aa6c85f5094b29693e773f64
+    GOPROXY: https://proxy.golang.org
+    GO111MODULE: on
+    SASS_VERSION: 1.63.2
+    DART_SASS_SHA_LINUX: 3ea33c95ad5c35fda6e9a0956199eef38a398f496cfb8750e02479d7d1dd42af
+    DART_SASS_SHA_MACOS: 11c70f259836b250b44a9cb57fed70e030f21f45069b467d371685855f1eb4f0
+    DART_SASS_SHA_WINDOWS: cd8cd36a619dd8e27f93d3186c52d70eb7d69472aa6c85f5094b29693e773f64
 permissions:
  contents: read
 jobs:
  test:
    strategy:
      matrix:
-        go-version: [1.21.x, 1.22.x]
+        go-version: [1.21.x,1.22.x]
        os: [ubuntu-latest, macos-latest, windows-latest]
    runs-on: ${{ matrix.os }}
    steps:
-      - if: matrix.os == 'ubuntu-latest'
-        name: Free Disk Space (Ubuntu)
-        uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be
-        with:
-          # 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
-          large-packages: true
-          docker-images: true
-          swap-storage: true
-      - name: Checkout code
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
-      - name: Install Go
-        uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491
-        with:
-          go-version: ${{ matrix.go-version }}
-          check-latest: true
-          cache: true
-          cache-dependency-path: |
-            **/go.sum
-            **/go.mod
-      - name: Install Ruby
-        uses: ruby/setup-ruby@5f19ec79cedfadb78ab837f95b87734d0003c899
-        with:
-          ruby-version: "2.7"
-          bundler-cache: true #
-      - name: Install Python
-        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d
-        with:
-          python-version: "3.x"
-      - name: Install Mage
-        run: go install github.com/magefile/mage@v1.15.0
-      - name: Install asciidoctor
-        uses: reitzig/actions-asciidoctor@03fcc74cd74880b697950c4930c9ec8a67c69ecc
-      - name: Install docutils
-        run: |
-          pip install docutils
-          rst2html --version
-      - if: matrix.os == 'ubuntu-latest'
-        name: Install pandoc on Linux
-        run: |
+    - name: Checkout code
+      uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
+    - name: Install Go
+      uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753
+      with:
+        go-version: ${{ matrix.go-version }}
+        check-latest: true
+        cache: true
+        cache-dependency-path: |
+          **/go.sum
+          **/go.mod
+    - name: Install Ruby
+      uses: ruby/setup-ruby@036ef458ddccddb148a2b9fb67e95a22fdbf728b
+      with:
+        ruby-version: '2.7'
+        bundler-cache: true #
+    - name: Install Python
+      uses: actions/setup-python@3105fb18c05ddd93efea5f9e0bef7a03a6e9e7df
+      with:
+        python-version: '3.x'
+    - name: Install Mage
+      run: go install github.com/magefile/mage@v1.15.0
+    - name: Install asciidoctor
+      uses: reitzig/actions-asciidoctor@7570212ae20b63653481675fb1ff62d1073632b0
+    - name: Install docutils
+      run: |
+        pip install docutils
+        rst2html.py --version
+    - if: matrix.os == 'ubuntu-latest'
+      name: Install pandoc on Linux
+      run: |
          sudo apt-get update -y
          sudo apt-get install -y pandoc
-      - if: matrix.os == 'macos-latest'
-        run: |
-          brew install pandoc
-      - if: matrix.os == 'windows-latest'
-        run: |
-          choco install pandoc
-      - run: pandoc -v
-      - if: matrix.os == 'windows-latest'
-        run: |
-          choco install mingw
-      - if: matrix.os == 'ubuntu-latest'
-        name: Install dart-sass Linux
-        run: |
-          echo "Install Dart Sass version ${SASS_VERSION} ..."
-          curl -LJO "https://github.com/sass/dart-sass/releases/download/${SASS_VERSION}/dart-sass-${SASS_VERSION}-linux-x64.tar.gz";
-          echo "${DART_SASS_SHA_LINUX}  dart-sass-${SASS_VERSION}-linux-x64.tar.gz" | sha256sum -c;
-          tar -xvf "dart-sass-${SASS_VERSION}-linux-x64.tar.gz";
-          echo "$GOBIN"
-          echo "$GITHUB_WORKSPACE/dart-sass/" >> $GITHUB_PATH
-      - if: matrix.os == 'macos-latest'
-        name: Install dart-sass MacOS
-        run: |
-          echo "Install Dart Sass version ${SASS_VERSION} ..."
-          curl -LJO "https://github.com/sass/dart-sass/releases/download/${SASS_VERSION}/dart-sass-${SASS_VERSION}-macos-x64.tar.gz";
-          echo "${DART_SASS_SHA_MACOS}  dart-sass-${SASS_VERSION}-macos-x64.tar.gz" | shasum -a 256 -c;
-          tar -xvf "dart-sass-${SASS_VERSION}-macos-x64.tar.gz";
-          echo "$GITHUB_WORKSPACE/dart-sass/" >> $GITHUB_PATH
-      - if: matrix.os == 'windows-latest'
-        name: Install dart-sass Windows
-        run: |
-          echo "Install Dart Sass version ${env:SASS_VERSION} ..."
-          curl -LJO "https://github.com/sass/dart-sass/releases/download/${env:SASS_VERSION}/dart-sass-${env:SASS_VERSION}-windows-x64.zip";
-          Expand-Archive -Path "dart-sass-${env:SASS_VERSION}-windows-x64.zip" -DestinationPath .;
-          echo  "$env:GITHUB_WORKSPACE/dart-sass/" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf-8 -Append
-      - if: matrix.os == 'ubuntu-latest'
-        name: Install staticcheck
-        run: go install honnef.co/go/tools/cmd/staticcheck@latest
-      - if: matrix.os == 'ubuntu-latest'
-        name: Run staticcheck
-        run: staticcheck ./...
-      - if: matrix.os != 'windows-latest'
-        name: Check
-        run: |
-          sass --version;
-          mage -v check;
-        env:
-          HUGO_BUILD_TAGS: extended
-      - if: matrix.os == 'windows-latest'
-        # See issue #11052. We limit the build to regular test (no -race flag) on Windows for now.
-        name: Test
-        run: |
-          mage -v test;
-        env:
-          HUGO_BUILD_TAGS: extended
-      - name: Build tags
-        run: |
-          go install -tags extended,nodeploy
-      - if: matrix.os == 'ubuntu-latest'
-        name: Build for dragonfly
-        run: |
-          go install
-        env:
-          GOARCH: amd64
-          GOOS: dragonfly
+    - if: matrix.os == 'macos-latest'
+      run: |
+        brew install pandoc
+    - if: matrix.os == 'windows-latest'
+      run: |
+        choco install pandoc
+    - run: pandoc -v
+    - if: matrix.os == 'windows-latest'
+      run: |
+        choco install mingw
+    - if: matrix.os == 'ubuntu-latest'
+      name: Install dart-sass Linux
+      run: |
+        echo "Install Dart Sass version ${SASS_VERSION} ..."
+        curl -LJO "https://github.com/sass/dart-sass/releases/download/${SASS_VERSION}/dart-sass-${SASS_VERSION}-linux-x64.tar.gz";
+        echo "${DART_SASS_SHA_LINUX}  dart-sass-${SASS_VERSION}-linux-x64.tar.gz" | sha256sum -c;
+        tar -xvf "dart-sass-${SASS_VERSION}-linux-x64.tar.gz";
+        echo "$GOBIN"
+        echo "$GITHUB_WORKSPACE/dart-sass/" >> $GITHUB_PATH
+    - if: matrix.os == 'macos-latest'
+      name: Install dart-sass MacOS
+      run: |
+        echo "Install Dart Sass version ${SASS_VERSION} ..."
+        curl -LJO "https://github.com/sass/dart-sass/releases/download/${SASS_VERSION}/dart-sass-${SASS_VERSION}-macos-x64.tar.gz";
+        echo "${DART_SASS_SHA_MACOS}  dart-sass-${SASS_VERSION}-macos-x64.tar.gz" | shasum -a 256 -c;
+        tar -xvf "dart-sass-${SASS_VERSION}-macos-x64.tar.gz";
+        echo "$GITHUB_WORKSPACE/dart-sass/" >> $GITHUB_PATH
+    - if: matrix.os == 'windows-latest'
+      name: Install dart-sass Windows
+      run: |
+        echo "Install Dart Sass version ${env:SASS_VERSION} ..."
+        curl -LJO "https://github.com/sass/dart-sass/releases/download/${env:SASS_VERSION}/dart-sass-${env:SASS_VERSION}-windows-x64.zip";
+        Expand-Archive -Path "dart-sass-${env:SASS_VERSION}-windows-x64.zip" -DestinationPath .;
+        echo  "$env:GITHUB_WORKSPACE/dart-sass/" | Out-File -FilePath $Env:GITHUB_PATH -Encoding utf-8 -Append
+    - if: matrix.os == 'ubuntu-latest'
+      name: Install staticcheck
+      run: go install honnef.co/go/tools/cmd/staticcheck@latest
+    - if: matrix.os == 'ubuntu-latest'
+      name: Run staticcheck
+      run: staticcheck ./...
+    - if: matrix.os != 'windows-latest'
+      name: Check
+      run: |
+        sass --version;
+        mage -v check;
+      env:
+        HUGO_BUILD_TAGS: extended
+    - if: matrix.os == 'windows-latest'
+      # See issue #11052. We limit the build to regular test (no -race flag) on Windows for now.
+      name: Test
+      run: |
+        mage -v test;
+      env:
+        HUGO_BUILD_TAGS: extended
+    - name: Build tags
+      run: |
+        go install -tags extended,nodeploy
+    - if: matrix.os == 'ubuntu-latest'
+      name: Build for dragonfly
+      run: |
+        go install
+      env:
+        GOARCH: amd64
+        GOOS: dragonfly
@@ -186,7 +186,7 @@
      same "printed page" as the copyright notice for easier
      identification within third-party archives.

-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2022 The Hugo Authors.

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -62,7 +62,8 @@ And with [Hugo Modules], you can share content, assets, data, translations, them

 <p>&nbsp;</p>
 <p float="left">
-  <a href="https://www.linode.com/?utm_campaign=hugosponsor&utm_medium=banner&utm_source=hugogithub" target="_blank"><img src="https://raw.githubusercontent.com/gohugoio/gohugoioTheme/master/assets/images/sponsors/linode-logo_standard_light_medium.png" width="200" alt="Linode"></a>
+  <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;&nbsp;&nbsp;&nbsp;&nbsp;&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/gohugoioTheme/master/assets/images/sponsors/cloudcannon-blue.svg" width="220" alt="CloudCannon"></a>
 <p>&nbsp;</p>

 ## Installation
@@ -4,4 +4,4 @@

 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.

-Also see [Hugo's Security Model](https://gohugo.io/about/security/).
+Also see [Hugo's Security Model](https://gohugo.io/about/security-model/).
@@ -67,7 +67,7 @@ func New(opts Options) *Cache {
 	evictedIdentities := collections.NewStack[identity.Identity]()

 	onEvict := func(k, v any) {
-		if !opts.Watching {
+		if !opts.Running {
 			return
 		}
 		identity.WalkIdentitiesShallow(v, func(level int, id identity.Identity) bool {
@@ -97,7 +97,7 @@ type Options struct {
 	CheckInterval time.Duration
 	MaxSize       int
 	MinMaxSize    int
-	Watching      bool
+	Running       bool
 }

 // Options for a partition.
@@ -140,25 +140,16 @@ func (c *Cache) DrainEvictedIdentities() []identity.Identity {
 }

 // ClearMatching clears all partition for which the predicate returns true.
-func (c *Cache) ClearMatching(predicatePartition func(k string, p PartitionManager) bool, predicateValue func(k, v any) bool) {
-	if predicatePartition == nil {
-		predicatePartition = func(k string, p PartitionManager) bool { return true }
-	}
-	if predicateValue == nil {
-		panic("nil predicateValue")
-	}
+func (c *Cache) ClearMatching(predicate func(k, v any) bool) {
 	g := rungroup.Run[PartitionManager](context.Background(), rungroup.Config[PartitionManager]{
 		NumWorkers: len(c.partitions),
 		Handle: func(ctx context.Context, partition PartitionManager) error {
-			partition.clearMatching(predicateValue)
+			partition.clearMatching(predicate)
 			return nil
 		},
 	})

-	for k, p := range c.partitions {
-		if !predicatePartition(k, p) {
-			continue
-		}
+	for _, p := range c.partitions {
 		g.Enqueue(p)
 	}

@@ -349,7 +340,7 @@ func GetOrCreatePartition[K comparable, V any](c *Cache, name string, opts Optio
 		return p.(*Partition[K, V])
 	}

-	// At this point, we don't know the number of partitions or their configuration, but
+	// At this point, we don't know the the number of partitions or their configuration, but
 	// this will be re-adjusted later.
 	const numberOfPartitionsEstimate = 10
 	maxSize := opts.CalculateMaxSize(c.opts.MaxSize / numberOfPartitionsEstimate)
@@ -365,7 +356,6 @@ func GetOrCreatePartition[K comparable, V any](c *Cache, name string, opts Optio
 		trace:   c.opts.Log.Logger().WithLevel(logg.LevelTrace).WithField("partition", name),
 		opts:    opts,
 	}
-
 	c.partitions[name] = partition

 	return partition
@@ -385,37 +375,13 @@ type Partition[K comparable, V any] struct {

 // GetOrCreate gets or creates a value for the given key.
 func (p *Partition[K, V]) GetOrCreate(key K, create func(key K) (V, error)) (V, error) {
-	v, err := p.doGetOrCreate(key, create)
-	if err != nil {
-		return p.zero, err
-	}
-	if resource.StaleVersion(v) > 0 {
-		p.c.Delete(key)
-		return p.doGetOrCreate(key, create)
-	}
-	return v, err
-}
-
-func (p *Partition[K, V]) doGetOrCreate(key K, create func(key K) (V, error)) (V, error) {
 	v, _, err := p.c.GetOrCreate(key, create)
 	return v, err
 }

-func (p *Partition[K, V]) GetOrCreateWitTimeout(key K, duration time.Duration, create func(key K) (V, error)) (V, error) {
-	v, err := p.doGetOrCreateWitTimeout(key, duration, create)
-	if err != nil {
-		return p.zero, err
-	}
-	if resource.StaleVersion(v) > 0 {
-		p.c.Delete(key)
-		return p.doGetOrCreateWitTimeout(key, duration, create)
-	}
-	return v, err
-}
-
 // GetOrCreateWitTimeout gets or creates a value for the given key and times out if the create function
 // takes too long.
-func (p *Partition[K, V]) doGetOrCreateWitTimeout(key K, duration time.Duration, create func(key K) (V, error)) (V, error) {
+func (p *Partition[K, V]) GetOrCreateWitTimeout(key K, duration time.Duration, create func(key K) (V, error)) (V, error) {
 	resultch := make(chan V, 1)
 	errch := make(chan error, 1)

@@ -472,7 +438,7 @@ func (p *Partition[K, V]) clearOnRebuild(changeset ...identity.Identity) {

 	shouldDelete := func(key K, v V) bool {
 		// We always clear elements marked as stale.
-		if resource.StaleVersion(v) > 0 {
+		if resource.IsStaleAny(v) {
 			return true
 		}

@@ -527,8 +493,8 @@ func (p *Partition[K, V]) Keys() []K {

 func (p *Partition[K, V]) clearStale() {
 	p.c.DeleteFunc(func(key K, v V) bool {
-		staleVersion := resource.StaleVersion(v)
-		if staleVersion > 0 {
+		isStale := resource.IsStaleAny(v)
+		if isStale {
 			p.trace.Log(
 				logg.StringFunc(
 					func() string {
@@ -538,7 +504,7 @@ func (p *Partition[K, V]) clearStale() {
 			)
 		}

-		return staleVersion > 0
+		return isStale
 	})
 }

@@ -29,12 +29,12 @@ var (
 )

 type testItem struct {
-	name         string
-	staleVersion uint32
+	name    string
+	isStale bool
 }

-func (t testItem) StaleVersion() uint32 {
-	return t.staleVersion
+func (t testItem) IsStale() bool {
+	return t.isStale
 }

 func (t testItem) IdentifierBase() string {
@@ -109,7 +109,7 @@ func newTestCache(t *testing.T) *Cache {

 	p2.GetOrCreate("clearBecauseStale", func(string) (testItem, error) {
 		return testItem{
-			staleVersion: 32,
+			isStale: true,
 		}, nil
 	})

@@ -121,7 +121,7 @@ func newTestCache(t *testing.T) *Cache {

 	p2.GetOrCreate("clearNever", func(string) (testItem, error) {
 		return testItem{
-			staleVersion: 0,
+			isStale: false,
 		}, nil
 	})

@@ -156,7 +156,7 @@ func TestClear(t *testing.T) {

 	cache = newTestCache(t)

-	cache.ClearMatching(nil, func(k, v any) bool {
+	cache.ClearMatching(func(k, v any) bool {
 		return k.(string) == "clearOnRebuild"
 	})

@@ -48,7 +48,6 @@ import (
 	"github.com/gohugoio/hugo/helpers"
 	"github.com/gohugoio/hugo/hugofs"
 	"github.com/gohugoio/hugo/hugolib"
-	"github.com/gohugoio/hugo/resources/kinds"
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
 )
@@ -128,7 +127,6 @@ type rootCommand struct {
 	verbose bool
 	debug   bool
 	quiet   bool
-	devMode bool // Hidden flag.

 	renderToMemory bool

@@ -327,12 +325,12 @@ func (r *rootCommand) Name() string {
 }

 func (r *rootCommand) Run(ctx context.Context, cd *simplecobra.Commandeer, args []string) error {
-	b := newHugoBuilder(r, nil)
-
 	if !r.buildWatch {
-		defer b.postBuild("Total", time.Now())
+		defer r.timeTrack(time.Now(), "Total")
 	}

+	b := newHugoBuilder(r, nil)
+
 	if err := b.loadConfig(cd, false); err != nil {
 		return err
 	}
@@ -424,33 +422,29 @@ func (r *rootCommand) PreRun(cd, runner *simplecobra.Commandeer) error {
 func (r *rootCommand) createLogger(running bool) (loggers.Logger, error) {
 	level := logg.LevelWarn

-	if r.devMode {
-		level = logg.LevelTrace
+	if r.logLevel != "" {
+		switch strings.ToLower(r.logLevel) {
+		case "debug":
+			level = logg.LevelDebug
+		case "info":
+			level = logg.LevelInfo
+		case "warn", "warning":
+			level = logg.LevelWarn
+		case "error":
+			level = logg.LevelError
+		default:
+			return nil, fmt.Errorf("invalid log level: %q, must be one of debug, warn, info or error", r.logLevel)
+		}
 	} else {
-		if r.logLevel != "" {
-			switch strings.ToLower(r.logLevel) {
-			case "debug":
-				level = logg.LevelDebug
-			case "info":
-				level = logg.LevelInfo
-			case "warn", "warning":
-				level = logg.LevelWarn
-			case "error":
-				level = logg.LevelError
-			default:
-				return nil, fmt.Errorf("invalid log level: %q, must be one of debug, warn, info or error", r.logLevel)
-			}
-		} else {
-			if r.verbose {
-				hugo.Deprecate("--verbose", "use --logLevel info", "v0.114.0")
-				hugo.Deprecate("--verbose", "use --logLevel info", "v0.114.0")
-				level = logg.LevelInfo
-			}
+		if r.verbose {
+			hugo.Deprecate("--verbose", "use --logLevel info", "v0.114.0")
+			hugo.Deprecate("--verbose", "use --logLevel info", "v0.114.0")
+			level = logg.LevelInfo
+		}

-			if r.debug {
-				hugo.Deprecate("--debug", "use --logLevel debug", "v0.114.0")
-				level = logg.LevelDebug
-			}
+		if r.debug {
+			hugo.Deprecate("--debug", "use --logLevel debug", "v0.114.0")
+			level = logg.LevelDebug
 		}
 	}

@@ -488,50 +482,46 @@ Complete documentation is available at https://gohugo.io/.`

 	// Configure persistent flags
 	cmd.PersistentFlags().StringVarP(&r.source, "source", "s", "", "filesystem path to read files relative from")
-	_ = cmd.MarkFlagDirname("source")
+	cmd.PersistentFlags().SetAnnotation("source", cobra.BashCompSubdirsInDir, []string{})
 	cmd.PersistentFlags().StringP("destination", "d", "", "filesystem path to write files to")
-	_ = cmd.MarkFlagDirname("destination")
+	cmd.PersistentFlags().SetAnnotation("destination", cobra.BashCompSubdirsInDir, []string{})

 	cmd.PersistentFlags().StringVarP(&r.environment, "environment", "e", "", "build environment")
-	_ = cmd.RegisterFlagCompletionFunc("environment", cobra.NoFileCompletions)
 	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.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)

 	cmd.PersistentFlags().StringVar(&r.cfgFile, "config", "", "config file (default is hugo.yaml|json|toml)")
-	_ = cmd.MarkFlagFilename("config", config.ValidConfigFileExtensions...)
 	cmd.PersistentFlags().StringVar(&r.cfgDir, "configDir", "config", "config dir")
-	_ = cmd.MarkFlagDirname("configDir")
 	cmd.PersistentFlags().BoolVar(&r.quiet, "quiet", false, "build in quiet mode")
 	cmd.PersistentFlags().BoolVar(&r.renderToMemory, "renderToMemory", false, "render to memory (mostly useful when running the server)")

+	// Set bash-completion
+	_ = cmd.PersistentFlags().SetAnnotation("config", cobra.BashCompFilenameExt, config.ValidConfigFileExtensions)
+
 	cmd.PersistentFlags().BoolVarP(&r.verbose, "verbose", "v", false, "verbose output")
 	cmd.PersistentFlags().BoolVarP(&r.debug, "debug", "", false, "debug output")
-	cmd.PersistentFlags().BoolVarP(&r.devMode, "devMode", "", false, "only used for internal testing, flag hidden.")
 	cmd.PersistentFlags().StringVar(&r.logLevel, "logLevel", "", "log level (debug|info|warn|error)")
-	_ = cmd.RegisterFlagCompletionFunc("logLevel", cobra.FixedCompletions([]string{"debug", "info", "warn", "error"}, cobra.ShellCompDirectiveNoFileComp))
 	cmd.Flags().BoolVarP(&r.buildWatch, "watch", "w", false, "watch filesystem for changes and recreate as needed")

-	cmd.PersistentFlags().MarkHidden("devMode")
-
 	// Configure local flags
 	applyLocalFlagsBuild(cmd, r)

+	// Set bash-completion.
+	// Each flag must first be defined before using the SetAnnotation() call.
+	_ = cmd.Flags().SetAnnotation("source", cobra.BashCompSubdirsInDir, []string{})
+
 	return nil
 }

 // A sub set of the complete build flags. These flags are used by new and mod.
 func applyLocalFlagsBuildConfig(cmd *cobra.Command, r *rootCommand) {
 	cmd.Flags().StringSliceP("theme", "t", []string{}, "themes to use (located in /themes/THEMENAME/)")
-	_ = cmd.MarkFlagDirname("theme")
 	cmd.Flags().StringVarP(&r.baseURL, "baseURL", "b", "", "hostname (and path) to the root, e.g. https://spf13.com/")
 	cmd.Flags().StringP("cacheDir", "", "", "filesystem path to cache directory")
-	_ = cmd.MarkFlagDirname("cacheDir")
+	_ = cmd.Flags().SetAnnotation("cacheDir", cobra.BashCompSubdirsInDir, []string{})
 	cmd.Flags().StringP("contentDir", "c", "", "filesystem path to content directory")
-	cmd.Flags().StringSliceP("renderSegments", "", []string{}, "named segments to render (configured in the segments config)")
+	_ = cmd.Flags().SetAnnotation("theme", cobra.BashCompSubdirsInDir, []string{"themes"})
 }

 // Flags needed to do a build (used by hugo and hugo server commands)
@@ -544,10 +534,8 @@ func applyLocalFlagsBuild(cmd *cobra.Command, r *rootCommand) {
 	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().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")
@@ -570,8 +558,8 @@ func applyLocalFlagsBuild(cmd *cobra.Command, r *rootCommand) {
 	cmd.Flags().MarkHidden("profile-mutex")

 	cmd.Flags().StringSlice("disableKinds", []string{}, "disable different kind of pages (home, RSS etc.)")
-	_ = cmd.RegisterFlagCompletionFunc("disableKinds", cobra.FixedCompletions(kinds.AllKinds, cobra.ShellCompDirectiveNoFileComp))
 	cmd.Flags().Bool("minify", false, "minify any supported output format (HTML, XML etc.)")
+	_ = cmd.Flags().SetAnnotation("destination", cobra.BashCompSubdirsInDir, []string{})
 }

 func (r *rootCommand) timeTrack(start time.Time, name string) {
@@ -28,7 +28,6 @@ import (
 	"github.com/gohugoio/hugo/modules"
 	"github.com/gohugoio/hugo/parser"
 	"github.com/gohugoio/hugo/parser/metadecoders"
-	"github.com/spf13/cobra"
 )

 // newConfigCommand creates a new config command and its subcommands.
@@ -113,9 +112,7 @@ func (c *configCommand) Init(cd *simplecobra.Commandeer) error {
 	cmd.Short = "Print the site configuration"
 	cmd.Long = `Print the 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. Defaults to the first language defined.")
-	_ = cmd.RegisterFlagCompletionFunc("lang", cobra.NoFileCompletions)
 	applyLocalFlagsBuildConfig(cmd, c.r)

 	return nil
@@ -226,7 +223,6 @@ func (c *configMountsCommand) Init(cd *simplecobra.Commandeer) error {
 	c.r = cd.Root.Command.(*rootCommand)
 	cmd := cd.CobraCommand
 	cmd.Short = "Print the configured file mounts"
-	cmd.ValidArgsFunction = cobra.NoFileCompletions
 	applyLocalFlagsBuildConfig(cmd, c.r)
 	return nil
 }
@@ -46,7 +46,6 @@ to use JSON for the front matter.`,
 					return c.convertContents(metadecoders.JSON)
 				},
 				withc: func(cmd *cobra.Command, r *rootCommand) {
-					cmd.ValidArgsFunction = cobra.NoFileCompletions
 				},
 			},
 			&simpleCommand{
@@ -58,7 +57,6 @@ to use TOML for the front matter.`,
 					return c.convertContents(metadecoders.TOML)
 				},
 				withc: func(cmd *cobra.Command, r *rootCommand) {
-					cmd.ValidArgsFunction = cobra.NoFileCompletions
 				},
 			},
 			&simpleCommand{
@@ -70,7 +68,6 @@ to use YAML for the front matter.`,
 					return c.convertContents(metadecoders.YAML)
 				},
 				withc: func(cmd *cobra.Command, r *rootCommand) {
-					cmd.ValidArgsFunction = cobra.NoFileCompletions
 				},
 			},
 		},
@@ -111,7 +108,6 @@ func (c *convertCommand) Init(cd *simplecobra.Commandeer) error {
 See convert's subcommands toJSON, toTOML and toYAML for more information.`

 	cmd.PersistentFlags().StringVarP(&c.outputDir, "output", "o", "", "filesystem path to write files to")
-	_ = cmd.MarkFlagDirname("output")
 	cmd.PersistentFlags().BoolVar(&c.unsafe, "unsafe", false, "enable less safe operations, please backup first")

 	cmd.RunE = nil
@@ -60,17 +60,13 @@ documentation.
 			return deployer.Deploy(ctx)
 		},
 		withc: func(cmd *cobra.Command, r *rootCommand) {
-			cmd.ValidArgsFunction = cobra.NoFileCompletions
 			cmd.Flags().String("target", "", "target deployment from deployments section in config file; defaults to the first one")
-			_ = cmd.RegisterFlagCompletionFunc("target", cobra.NoFileCompletions)
 			cmd.Flags().Bool("confirm", false, "ask for confirmation before making changes to the target")
 			cmd.Flags().Bool("dryRun", false, "dry run")
 			cmd.Flags().Bool("force", false, "force upload of all files")
 			cmd.Flags().Bool("invalidateCDN", deployconfig.DefaultConfig.InvalidateCDN, "invalidate the CDN cache listed in the deployment target")
 			cmd.Flags().Int("maxDeletes", deployconfig.DefaultConfig.MaxDeletes, "maximum # of files to delete, or -1 to disable")
-			_ = cmd.RegisterFlagCompletionFunc("maxDeletes", cobra.NoFileCompletions)
 			cmd.Flags().Int("workers", deployconfig.DefaultConfig.Workers, "number of workers to transfer files. defaults to 10")
-			_ = cmd.RegisterFlagCompletionFunc("workers", cobra.NoFileCompletions)
 		},
 	}
 }
@@ -19,7 +19,6 @@ import (

 	"github.com/bep/simplecobra"
 	"github.com/gohugoio/hugo/common/hugo"
-	"github.com/spf13/cobra"
 )

 func newEnvCommand() simplecobra.Commander {
@@ -48,9 +47,6 @@ func newEnvCommand() simplecobra.Commander {
 			}
 			return nil
 		},
-		withc: func(cmd *cobra.Command, r *rootCommand) {
-			cmd.ValidArgsFunction = cobra.NoFileCompletions
-		},
 	}
 }

@@ -63,8 +59,5 @@ func newVersionCmd() simplecobra.Commander {
 		},
 		short: "Print Hugo version and environment info",
 		long:  "Print Hugo version and environment info. This is useful in Hugo bug reports.",
-		withc: func(cmd *cobra.Command, r *rootCommand) {
-			cmd.ValidArgsFunction = cobra.NoFileCompletions
-		},
 	}
 }
@@ -45,10 +45,9 @@ func newGenCommand() *genCommand {
 		genmandir string

 		// Chroma flags.
-		style                  string
-		highlightStyle         string
-		lineNumbersInlineStyle string
-		lineNumbersTableStyle  string
+		style          string
+		highlightStyle string
+		linesStyle     string
 	)

 	newChromaStyles := func() simplecobra.Commander {
@@ -64,11 +63,8 @@ See https://xyproto.github.io/splash/docs/all.html for a preview of the availabl
 				if highlightStyle != "" {
 					builder.Add(chroma.LineHighlight, highlightStyle)
 				}
-				if lineNumbersInlineStyle != "" {
-					builder.Add(chroma.LineNumbers, lineNumbersInlineStyle)
-				}
-				if lineNumbersTableStyle != "" {
-					builder.Add(chroma.LineNumbersTable, lineNumbersTableStyle)
+				if linesStyle != "" {
+					builder.Add(chroma.LineNumbers, linesStyle)
 				}
 				style, err := builder.Build()
 				if err != nil {
@@ -79,15 +75,9 @@ See https://xyproto.github.io/splash/docs/all.html for a preview of the availabl
 				return nil
 			},
 			withc: func(cmd *cobra.Command, r *rootCommand) {
-				cmd.ValidArgsFunction = cobra.NoFileCompletions
 				cmd.PersistentFlags().StringVar(&style, "style", "friendly", "highlighter style (see https://xyproto.github.io/splash/docs/)")
-				_ = cmd.RegisterFlagCompletionFunc("style", 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().StringVar(&highlightStyle, "highlightStyle", "", "style used for highlighting lines (see https://github.com/alecthomas/chroma)")
+				cmd.PersistentFlags().StringVar(&linesStyle, "linesStyle", "", "style used for line numbers (see https://github.com/alecthomas/chroma)")
 			},
 		}
 	}
@@ -125,9 +115,9 @@ See https://xyproto.github.io/splash/docs/all.html for a preview of the availabl
 				return nil
 			},
 			withc: func(cmd *cobra.Command, r *rootCommand) {
-				cmd.ValidArgsFunction = cobra.NoFileCompletions
 				cmd.PersistentFlags().StringVar(&genmandir, "dir", "man/", "the directory to write the man pages.")
-				_ = cmd.MarkFlagDirname("dir")
+				// For bash-completion
+				cmd.PersistentFlags().SetAnnotation("dir", cobra.BashCompSubdirsInDir, []string{})
 			},
 		}
 	}
@@ -182,9 +172,9 @@ url: %s
 				return nil
 			},
 			withc: func(cmd *cobra.Command, r *rootCommand) {
-				cmd.ValidArgsFunction = cobra.NoFileCompletions
 				cmd.PersistentFlags().StringVar(&gendocdir, "dir", "/tmp/hugodoc/", "the directory to write the doc.")
-				_ = cmd.MarkFlagDirname("dir")
+				// For bash-completion
+				cmd.PersistentFlags().SetAnnotation("dir", cobra.BashCompSubdirsInDir, []string{})
 			},
 		}
 	}
@@ -237,7 +227,6 @@ url: %s
 			},
 			withc: func(cmd *cobra.Command, r *rootCommand) {
 				cmd.Hidden = true
-				cmd.ValidArgsFunction = cobra.NoFileCompletions
 				cmd.PersistentFlags().StringVarP(&docsHelperTarget, "dir", "", "docs/data", "data dir")
 			},
 		}
@@ -75,14 +75,9 @@ type hugoBuilder struct {
 	errState hugoBuilderErrState
 }

-var errConfigNotSet = errors.New("config not set")
-
 func (c *hugoBuilder) withConfE(fn func(conf *commonConfig) error) error {
 	c.confmu.Lock()
 	defer c.confmu.Unlock()
-	if c.conf == nil {
-		return errConfigNotSet
-	}
 	return fn(c.conf)
 }

@@ -590,7 +585,7 @@ func (c *hugoBuilder) fullRebuild(changeType string) {
 			time.Sleep(2 * time.Second)
 		}()

-		defer c.postBuild("Rebuilt", time.Now())
+		defer c.r.timeTrack(time.Now(), "Rebuilt")

 		err := c.reloadConfig()
 		if err != nil {
@@ -854,13 +849,13 @@ func (c *hugoBuilder) handleEvents(watcher *watcher.Batcher,
 			h.BaseFs.SourceFilesystems,
 			dynamicEvents)

-		onePageName := pickOneWriteOrCreatePath(h.Conf.ContentTypes(), partitionedEvents.ContentEvents)
+		onePageName := pickOneWriteOrCreatePath(partitionedEvents.ContentEvents)

 		c.printChangeDetected("")
 		c.changeDetector.PrepareNew()

 		func() {
-			defer c.postBuild("Total", time.Now())
+			defer c.r.timeTrack(time.Now(), "Total")
 			if err := c.rebuildSites(dynamicEvents); err != nil {
 				c.handleBuildErr(err, "Rebuild failed")
 			}
@@ -906,13 +901,6 @@ func (c *hugoBuilder) handleEvents(watcher *watcher.Batcher,
 	}
 }

-func (c *hugoBuilder) postBuild(what string, start time.Time) {
-	if h, err := c.hugo(); err == nil && h.Conf.Running() {
-		h.LogServerAddresses()
-	}
-	c.r.timeTrack(start, what)
-}
-
 func (c *hugoBuilder) hugo() (*hugolib.HugoSites, error) {
 	var h *hugolib.HugoSites
 	if err := c.withConfE(func(conf *commonConfig) error {
@@ -58,7 +58,6 @@ Import from Jekyll requires two paths, e.g. ` + "`hugo import jekyll jekyll_root
 					return c.importFromJekyll(args)
 				},
 				withc: func(cmd *cobra.Command, r *rootCommand) {
-					cmd.ValidArgsFunction = cobra.NoFileCompletions
 					cmd.Flags().BoolVar(&c.force, "force", false, "allow import into non-empty target directory")
 				},
 			},
@@ -26,7 +26,6 @@ import (
 	"github.com/gohugoio/hugo/hugolib"
 	"github.com/gohugoio/hugo/resources/page"
 	"github.com/gohugoio/hugo/resources/resource"
-	"github.com/spf13/cobra"
 )

 // newListCommand creates a new list command and its subcommands.
@@ -103,9 +102,6 @@ func newListCommand() *listCommand {
 						"buildExpired", true,
 					)
 				},
-				withc: func(cmd *cobra.Command, r *rootCommand) {
-					cmd.ValidArgsFunction = cobra.NoFileCompletions
-				},
 			},
 			&simpleCommand{
 				name:  "future",
@@ -123,9 +119,6 @@ func newListCommand() *listCommand {
 						"buildDrafts", true,
 					)
 				},
-				withc: func(cmd *cobra.Command, r *rootCommand) {
-					cmd.ValidArgsFunction = cobra.NoFileCompletions
-				},
 			},
 			&simpleCommand{
 				name:  "expired",
@@ -143,9 +136,6 @@ func newListCommand() *listCommand {
 						"buildDrafts", true,
 					)
 				},
-				withc: func(cmd *cobra.Command, r *rootCommand) {
-					cmd.ValidArgsFunction = cobra.NoFileCompletions
-				},
 			},
 			&simpleCommand{
 				name:  "all",
@@ -157,9 +147,6 @@ func newListCommand() *listCommand {
 					}
 					return list(cd, r, shouldInclude, "buildDrafts", true, "buildFuture", true, "buildExpired", true)
 				},
-				withc: func(cmd *cobra.Command, r *rootCommand) {
-					cmd.ValidArgsFunction = cobra.NoFileCompletions
-				},
 			},
 		},
 	}
@@ -62,7 +62,6 @@ removed from Hugo, but we need to test this out in "real life" to get a feel of
 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 {
@@ -90,7 +89,6 @@ so this may/will change in future versions of Hugo.
 	inside a subfolder on GitHub, as one example.
 	`,
 				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 {
@@ -110,7 +108,6 @@ so this may/will change in future versions of Hugo.
 				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
 					applyLocalFlagsBuildConfig(cmd, r)
 					cmd.Flags().BoolVarP(&clean, "clean", "", false, "delete module cache for dependencies that fail verification")
 				},
@@ -130,7 +127,6 @@ so this may/will change in future versions of Hugo.
 Note that for vendored modules, that is the version listed and not the one from go.mod.
 `,
 				withc: func(cmd *cobra.Command, r *rootCommand) {
-					cmd.ValidArgsFunction = cobra.NoFileCompletions
 					applyLocalFlagsBuildConfig(cmd, r)
 					cmd.Flags().BoolVarP(&clean, "clean", "", false, "delete module cache for dependencies that fail verification")
 				},
@@ -148,10 +144,8 @@ Note that for vendored modules, that is the version listed and not the one from
 				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
 					applyLocalFlagsBuildConfig(cmd, r)
 					cmd.Flags().StringVarP(&pattern, "pattern", "", "", `pattern matching module paths to clean (all if not set), e.g. "**hugo*"`)
-					_ = cmd.RegisterFlagCompletionFunc("pattern", cobra.NoFileCompletions)
 					cmd.Flags().BoolVarP(&all, "all", "", false, "clean entire module cache")
 				},
 				run: func(ctx context.Context, cd *simplecobra.Commandeer, r *rootCommand, args []string) error {
@@ -173,7 +167,6 @@ Note that for vendored modules, that is the version listed and not the one from
 				name:  "tidy",
 				short: "Remove unused entries in go.mod and go.sum.",
 				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 {
@@ -191,7 +184,6 @@ Note that for vendored modules, that is the version listed and not the one from
 	If a module is vendored, that is where Hugo will look for it's dependencies.
 	`,
 				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 {
@@ -233,7 +225,6 @@ Run "go help get" for more information. All flags available for "go get" is also
 ` + commonUsageMod,
 				withc: func(cmd *cobra.Command, r *rootCommand) {
 					cmd.DisableFlagParsing = true
-					cmd.ValidArgsFunction = cobra.NoFileCompletions
 				},
 				run: func(ctx context.Context, cd *simplecobra.Commandeer, r *rootCommand, args []string) error {
 					// We currently just pass on the flags we get to Go and
@@ -60,15 +60,8 @@ Ensure you run this within the root directory of your site.`,
 					return create.NewContent(h, contentType, args[0], force)
 				},
 				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().StringVarP(&contentType, "kind", "k", "", "content type to create")
 					cmd.Flags().String("editor", "", "edit new content with this editor, if provided")
-					_ = cmd.RegisterFlagCompletionFunc("editor", cobra.NoFileCompletions)
 					cmd.Flags().BoolVarP(&force, "force", "f", false, "overwrite file if it already exists")
 					applyLocalFlagsBuildConfig(cmd, r)
 				},
@@ -110,15 +103,8 @@ Use ` + "`hugo new [contentPath]`" + ` to create new 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().BoolVarP(&force, "force", "f", false, "init inside non-empty directory")
 					cmd.Flags().StringVar(&format, "format", "toml", "preferred file format (toml, yaml or json)")
-					_ = cmd.RegisterFlagCompletionFunc("format", cobra.FixedCompletions([]string{"toml", "yaml", "json"}, cobra.ShellCompDirectiveNoFileComp))
 				},
 			},
 			&simpleCommand{
@@ -151,9 +137,6 @@ according to your needs.`,

 					return nil
 				},
-				withc: func(cmd *cobra.Command, r *rootCommand) {
-					cmd.ValidArgsFunction = cobra.NoFileCompletions
-				},
 			},
 		},
 	}
@@ -209,7 +192,7 @@ func (c *newCommand) newSiteNextStepsText(path string, format string) string {
 1. Change the current directory to ` + path + `.
 2. Create or install a theme:
   - Create a new theme with the command "hugo new theme <THEMENAME>"
-   - Or, install a theme from https://themes.gohugo.io/
+   - Install a theme from https://themes.gohugo.io/
 3. Edit hugo.` + format + `, setting the "theme" property to the theme name.
 4. Create new content with the command "hugo new content `)

@@ -43,11 +43,9 @@ func newReleaseCommand() simplecobra.Commander {
 		},
 		withc: func(cmd *cobra.Command, r *rootCommand) {
 			cmd.Hidden = true
-			cmd.ValidArgsFunction = cobra.NoFileCompletions
 			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.RegisterFlagCompletionFunc("step", cobra.FixedCompletions([]string{"1", "2"}, cobra.ShellCompDirectiveNoFileComp))
 		},
 	}
 }
@@ -46,12 +46,12 @@ import (
 	"github.com/fsnotify/fsnotify"
 	"github.com/gohugoio/hugo/common/herrors"
 	"github.com/gohugoio/hugo/common/hugo"
-
 	"github.com/gohugoio/hugo/common/types"
 	"github.com/gohugoio/hugo/common/urls"
 	"github.com/gohugoio/hugo/config"
 	"github.com/gohugoio/hugo/helpers"
 	"github.com/gohugoio/hugo/hugofs"
+	"github.com/gohugoio/hugo/hugofs/files"
 	"github.com/gohugoio/hugo/hugolib"
 	"github.com/gohugoio/hugo/hugolib/filesystems"
 	"github.com/gohugoio/hugo/livereload"
@@ -123,7 +123,6 @@ func newServerCommand() *serverCommand {
 					return mclib.RunMain()
 				},
 				withc: func(cmd *cobra.Command, r *rootCommand) {
-					cmd.ValidArgsFunction = cobra.NoFileCompletions
 					cmd.Flags().BoolVar(&uninstall, "uninstall", false, "Uninstall the local CA (but do not delete it).")
 				},
 			},
@@ -237,8 +236,9 @@ func (f *fileServer) createEndpoint(i int) (*http.ServeMux, net.Listener, string
 	listener := f.c.serverPorts[i].ln
 	logger := f.c.r.logger

+	r.Printf("Environment: %q\n", f.c.hugoTry().Deps.Site.Hugo().Environment)
+
 	if i == 0 {
-		r.Printf("Environment: %q\n", f.c.hugoTry().Deps.Site.Hugo().Environment)
 		mainTarget := "disk"
 		if f.c.r.renderToMemory {
 			mainTarget = "memory"
@@ -307,7 +307,7 @@ func (f *fileServer) createEndpoint(i int) (*http.ServeMux, net.Listener, string
 			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.
+				// This matches Netlify's behaviour and is needed for SPA behaviour.
 				// See https://docs.netlify.com/routing/redirects/rewrites-proxies/
 				if !redirect.Force {
 					path := filepath.Clean(strings.TrimPrefix(requestURI, baseURL.Path()))
@@ -512,9 +512,9 @@ func (c *serverCommand) Init(cd *simplecobra.Commandeer) error {
 	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
-you can render to memory by using the ` + "`" + `--renderToMemory` + "`" + ` flag. This can be
-faster in some cases, but it will consume more memory.
+'hugo server' will by default write and server files from disk, but you can
+render to memory by using the '--renderToMemory' flag. This can be 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 site. It will then live reload any open browser pages
@@ -523,15 +523,10 @@ of a second, you will be able to save and see your changes nearly instantly.`
 	cmd.Aliases = []string{"serve"}

 	cmd.Flags().IntVarP(&c.serverPort, "port", "p", 1313, "port on which the server will listen")
-	_ = cmd.RegisterFlagCompletionFunc("port", cobra.NoFileCompletions)
 	cmd.Flags().IntVar(&c.liveReloadPort, "liveReloadPort", -1, "port for live reloading (i.e. 443 in HTTPS proxy situations)")
-	_ = cmd.RegisterFlagCompletionFunc("liveReloadPort", cobra.NoFileCompletions)
 	cmd.Flags().StringVarP(&c.serverInterface, "bind", "", "127.0.0.1", "interface to which the server will bind")
-	_ = cmd.RegisterFlagCompletionFunc("bind", cobra.NoFileCompletions)
 	cmd.Flags().StringVarP(&c.tlsCertFile, "tlsCertFile", "", "", "path to TLS certificate file")
-	_ = cmd.MarkFlagFilename("tlsCertFile", "pem")
 	cmd.Flags().StringVarP(&c.tlsKeyFile, "tlsKeyFile", "", "", "path to TLS key file")
-	_ = cmd.MarkFlagFilename("tlsKeyFile", "pem")
 	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")
@@ -543,6 +538,9 @@ of a second, you will be able to save and see your changes nearly instantly.`
 	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")

+	cmd.Flags().SetAnnotation("tlsCertFile", cobra.BashCompSubdirsInDir, []string{})
+	cmd.Flags().SetAnnotation("tlsKeyFile", cobra.BashCompSubdirsInDir, []string{})
+
 	r := cd.Root.Command.(*rootCommand)
 	applyLocalFlagsBuild(cmd, r)

@@ -568,7 +566,7 @@ func (c *serverCommand) PreRun(cd, runner *simplecobra.Commandeer) error {
 				}
 			}

-			if err := c.setServerInfoInConfig(); err != nil {
+			if err := c.setBaseURLsInConfig(); err != nil {
 				return err
 			}

@@ -613,15 +611,15 @@ func (c *serverCommand) PreRun(cd, runner *simplecobra.Commandeer) error {
 	return nil
 }

-func (c *serverCommand) setServerInfoInConfig() error {
+func (c *serverCommand) setBaseURLsInConfig() error {
 	if len(c.serverPorts) == 0 {
 		panic("no server ports set")
 	}
 	return c.withConfE(func(conf *commonConfig) error {
 		for i, language := range conf.configs.Languages {
-			isMultihost := conf.configs.IsMultihost
+			isMultiHost := conf.configs.IsMultihost
 			var serverPort int
-			if isMultihost {
+			if isMultiHost {
 				serverPort = c.serverPorts[i].p
 			} else {
 				serverPort = c.serverPorts[0].p
@@ -640,8 +638,7 @@ func (c *serverCommand) setServerInfoInConfig() error {
 			if c.liveReloadPort != -1 {
 				baseURLLiveReload, _ = baseURLLiveReload.WithPort(c.liveReloadPort)
 			}
-			langConfig.C.SetServerInfo(baseURL, baseURLLiveReload, c.serverInterface)
-
+			langConfig.C.SetBaseURL(baseURL, baseURLLiveReload)
 		}
 		return nil
 	})
@@ -740,9 +737,9 @@ func (c *serverCommand) createServerPorts(cd *simplecobra.Commandeer) error {
 	flags := cd.CobraCommand.Flags()
 	var cerr error
 	c.withConf(func(conf *commonConfig) {
-		isMultihost := conf.configs.IsMultihost
+		isMultiHost := conf.configs.IsMultihost
 		c.serverPorts = make([]serverPortListener, 1)
-		if isMultihost {
+		if isMultiHost {
 			if !c.serverAppend {
 				cerr = errors.New("--appendPort=false not supported when in multihost mode")
 				return
@@ -855,7 +852,7 @@ func (c *serverCommand) serve() error {
 		h        *hugolib.HugoSites
 	)
 	err := c.withConfE(func(conf *commonConfig) error {
-		isMultihost := conf.configs.IsMultihost
+		isMultiHost := conf.configs.IsMultihost
 		var err error
 		h, err = c.r.HugFromConfig(conf)
 		if err != nil {
@@ -865,7 +862,7 @@ func (c *serverCommand) serve() error {
 		// We need the server to share the same logger as the Hugo build (for error counts etc.)
 		c.r.logger = h.Log

-		if isMultihost {
+		if isMultiHost {
 			for _, l := range conf.configs.ConfigLangs() {
 				baseURLs = append(baseURLs, l.BaseURL())
 				roots = append(roots, l.Language().Lang)
@@ -1008,6 +1005,7 @@ func (c *serverCommand) serve() error {
 			}
 		}
 	}()
+
 	if err != nil {
 		c.r.Println("Error:", err)
 	}
@@ -1188,16 +1186,16 @@ func partitionDynamicEvents(sourceFs *filesystems.SourceFilesystems, events []fs
 	return
 }

-func pickOneWriteOrCreatePath(contentTypes config.ContentTypesProvider, events []fsnotify.Event) string {
+func pickOneWriteOrCreatePath(events []fsnotify.Event) string {
 	name := ""

 	for _, ev := range events {
 		if ev.Op&fsnotify.Write == fsnotify.Write || ev.Op&fsnotify.Create == fsnotify.Create {
-			if contentTypes.IsIndexContentFile(ev.Name) {
+			if files.IsIndexContentFile(ev.Name) {
 				return ev.Name
 			}

-			if contentTypes.IsContentFile(ev.Name) {
+			if files.IsContentFile(ev.Name) {
 				name = ev.Name
 			}

@@ -123,20 +123,6 @@ func InSlicEqualFold(arr []string, el string) bool {
 	return false
 }

-// ToString converts the given value to a string.
-// Note that this is a more strict version compared to cast.ToString,
-// as it will not try to convert numeric values to strings,
-// but only accept strings or fmt.Stringer.
-func ToString(v any) (string, bool) {
-	switch vv := v.(type) {
-	case string:
-		return vv, true
-	case fmt.Stringer:
-		return vv.String(), true
-	}
-	return "", false
-}
-
 type Tuple struct {
 	First  string
 	Second string
@@ -111,29 +111,11 @@ func (i HugoInfo) Deps() []*Dependency {
 	return i.deps
 }

-// 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()
-}
-
 // 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.
@@ -1,77 +0,0 @@
-// Copyright 2024 The Hugo Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package hugo_test
-
-import (
-	"strings"
-	"testing"
-
-	"github.com/gohugoio/hugo/hugolib"
-)
-
-func TestIsMultilingualAndIsMultihost(t *testing.T) {
-	t.Parallel()
-
-	files := `
-- hugo.toml --
-disableKinds = ['page','rss','section','sitemap','taxonomy','term']
-defaultContentLanguageInSubdir = true
-[languages.de]
-baseURL = 'https://de.example.org/'
-[languages.en]
-baseURL = 'https://en.example.org/'
-- content/_index.md --
---
-title: home
---
-- layouts/index.html --
-multilingual={{ hugo.IsMultilingual }}
-multihost={{ hugo.IsMultihost }}
-  `
-
-	b := hugolib.Test(t, files)
-
-	b.AssertFileContent("public/de/index.html",
-		"multilingual=true",
-		"multihost=true",
-	)
-	b.AssertFileContent("public/en/index.html",
-		"multilingual=true",
-		"multihost=true",
-	)
-
-	files = strings.ReplaceAll(files, "baseURL = 'https://de.example.org/'", "")
-	files = strings.ReplaceAll(files, "baseURL = 'https://en.example.org/'", "")
-
-	b = hugolib.Test(t, files)
-
-	b.AssertFileContent("public/de/index.html",
-		"multilingual=true",
-		"multihost=false",
-	)
-	b.AssertFileContent("public/en/index.html",
-		"multilingual=true",
-		"multihost=false",
-	)
-
-	files = strings.ReplaceAll(files, "[languages.de]", "")
-	files = strings.ReplaceAll(files, "[languages.en]", "")
-
-	b = hugolib.Test(t, files)
-
-	b.AssertFileContent("public/en/index.html",
-		"multilingual=false",
-		"multihost=false",
-	)
-}
@@ -65,11 +65,9 @@ func TestDeprecationLogLevelFromVersion(t *testing.T) {
 }

 type testConfig struct {
-	environment  string
-	running      bool
-	workingDir   string
-	multihost    bool
-	multilingual bool
+	environment string
+	running     bool
+	workingDir  string
 }

 func (c testConfig) Environment() string {
@@ -83,11 +81,3 @@ func (c testConfig) Running() bool {
 func (c testConfig) WorkingDir() string {
 	return c.workingDir
 }
-
-func (c testConfig) IsMultihost() bool {
-	return c.multihost
-}
-
-func (c testConfig) IsMultilingual() bool {
-	return c.multilingual
-}
@@ -17,7 +17,7 @@ package hugo
 // This should be the only one.
 var CurrentVersion = Version{
 	Major:      0,
-	Minor:      127,
+	Minor:      124,
 	PatchLevel: 0,
 	Suffix:     "-DEV",
 }
@@ -27,12 +27,7 @@ func NewCache[K comparable, T any]() *Cache[K, T] {
 }

 // Delete deletes the given key from the cache.
-// If c is nil, this method is a no-op.
 func (c *Cache[K, T]) Get(key K) (T, bool) {
-	if c == nil {
-		var zero T
-		return zero, false
-	}
 	c.RLock()
 	v, found := c.m[key]
 	c.RUnlock()
@@ -65,15 +60,6 @@ func (c *Cache[K, T]) Set(key K, value T) {
 	c.Unlock()
 }

-// ForEeach calls the given function for each key/value pair in the cache.
-func (c *Cache[K, T]) ForEeach(f func(K, T)) {
-	c.RLock()
-	defer c.RUnlock()
-	for k, v := range c.m {
-		f(k, v)
-	}
-}
-
 // SliceCache is a simple thread safe cache backed by a map.
 type SliceCache[T any] struct {
 	m map[string][]T
@@ -25,6 +25,8 @@ import (
 	"github.com/gohugoio/hugo/identity"
 )

+var defaultPathParser PathParser
+
 // PathParser parses a path into a Path.
 type PathParser struct {
 	// Maps the language code to its index in the languages/sites slice.
@@ -32,9 +34,11 @@ type PathParser struct {

 	// Reports whether the given language is disabled.
 	IsLangDisabled func(string) bool
+}

-	// Reports whether the given ext is a content file.
-	IsContentExt func(string) bool
+// Parse parses component c with path s into Path using the default path parser.
+func Parse(c, s string) *Path {
+	return defaultPathParser.Parse(c, s)
 }

 // NormalizePathString returns a normalized path string using the very basic Hugo rules.
@@ -104,6 +108,7 @@ func (pp *PathParser) parse(component, s string) (*Path, error) {
 		var err error
 		// Preserve the original case for titles etc.
 		p.unnormalized, err = pp.doParse(component, s, pp.newPath(component))
+
 		if err != nil {
 			return nil, err
 		}
@@ -190,26 +195,23 @@ func (pp *PathParser) doParse(component, s string, p *Path) (*Path, error) {
 		}
 	}

-	if len(p.identifiers) > 0 {
-		isContentComponent := p.component == files.ComponentFolderContent || p.component == files.ComponentFolderArchetypes
-		isContent := isContentComponent && pp.IsContentExt(p.Ext())
+	isContentComponent := p.component == files.ComponentFolderContent || p.component == files.ComponentFolderArchetypes
+	isContent := isContentComponent && files.IsContentExt(p.Ext())
+
+	if isContent {
 		id := p.identifiers[len(p.identifiers)-1]
 		b := p.s[p.posContainerHigh : id.Low-1]
-		if isContent {
-			switch b {
-			case "index":
-				p.bundleType = PathTypeLeaf
-			case "_index":
-				p.bundleType = PathTypeBranch
-			default:
-				p.bundleType = PathTypeContentSingle
-			}
+		switch b {
+		case "index":
+			p.bundleType = PathTypeLeaf
+		case "_index":
+			p.bundleType = PathTypeBranch
+		default:
+			p.bundleType = PathTypeContentSingle
+		}

-			if slashCount == 2 && p.IsLeafBundle() {
-				p.posSectionHigh = 0
-			}
-		} else if b == files.NameContentData && files.IsContentDataExt(p.Ext()) {
-			p.bundleType = PathTypeContentData
+		if slashCount == 2 && p.IsLeafBundle() {
+			p.posSectionHigh = 0
 		}
 	}

@@ -237,16 +239,13 @@ const (
 	// E.g. /blog/my-post.md
 	PathTypeContentSingle

-	// All below are bundled content files.
+	// All bewlow are bundled content files.

 	// Leaf bundles, e.g. /blog/my-post/index.md
 	PathTypeLeaf

 	// Branch bundles, e.g. /blog/_index.md
 	PathTypeBranch
-
-	// Content data file, _content.gotmpl.
-	PathTypeContentData
 )

 type Path struct {
@@ -314,7 +313,7 @@ func (p *Path) norm(s string) string {
 	return s
 }

-// IdentifierBase satisfies identity.Identity.
+// IdentifierBase satifies identity.Identity.
 func (p *Path) IdentifierBase() string {
 	return p.Base()
 }
@@ -369,7 +368,7 @@ func (p *Path) Name() string {
 	return p.s
 }

-// Name returns the last element of path without any extension.
+// Name returns the last element of path withhout any extension.
 func (p *Path) NameNoExt() string {
 	if i := p.identifierIndex(0); i != -1 {
 		return p.s[p.posContainerHigh : p.identifiers[i].Low-1]
@@ -377,7 +376,7 @@ func (p *Path) NameNoExt() string {
 	return p.s[p.posContainerHigh:]
 }

-// Name returns the last element of path without any language identifier.
+// Name returns the last element of path withhout any language identifier.
 func (p *Path) NameNoLang() string {
 	i := p.identifierIndex(p.posIdentifierLanguage)
 	if i == -1 {
@@ -387,7 +386,7 @@ func (p *Path) NameNoLang() string {
 	return p.s[p.posContainerHigh:p.identifiers[i].Low-1] + p.s[p.identifiers[i].High:]
 }

-// BaseNameNoIdentifier returns the logical base name for a resource without any identifier (e.g. no extension).
+// BaseNameNoIdentifier returns the logcical base name for a resource without any idenifier (e.g. no extension).
 // For bundles this will be the containing directory's name, e.g. "blog".
 func (p *Path) BaseNameNoIdentifier() string {
 	if p.IsBundle() {
@@ -396,7 +395,7 @@ func (p *Path) BaseNameNoIdentifier() string {
 	return p.NameNoIdentifier()
 }

-// NameNoIdentifier returns the last element of path without any identifier (e.g. no extension).
+// NameNoIdentifier returns the last element of path withhout any identifier (e.g. no extension).
 func (p *Path) NameNoIdentifier() string {
 	if len(p.identifiers) > 0 {
 		return p.s[p.posContainerHigh : p.identifiers[len(p.identifiers)-1].Low-1]
@@ -436,7 +435,7 @@ func (p *Path) PathNoIdentifier() string {
 	return p.base(false, false)
 }

-// PathRel returns the path relative to the given owner.
+// PathRel returns the path relativeto the given owner.
 func (p *Path) PathRel(owner *Path) string {
 	ob := owner.Base()
 	if !strings.HasSuffix(ob, "/") {
@@ -522,6 +521,10 @@ func (p *Path) Identifiers() []string {
 	return ids
 }

+func (p *Path) IsHTML() bool {
+	return files.IsHTML(p.Ext())
+}
+
 func (p *Path) BundleType() PathType {
 	return p.bundleType
 }
@@ -538,10 +541,6 @@ func (p *Path) IsLeafBundle() bool {
 	return p.bundleType == PathTypeLeaf
 }

-func (p *Path) IsContentData() bool {
-	return p.bundleType == PathTypeContentData
-}
-
 func (p Path) ForBundleType(t PathType) *Path {
 	p.bundleType = t
 	return &p
@@ -27,9 +27,6 @@ var testParser = &PathParser{
 		"no": 0,
 		"en": 1,
 	},
-	IsContentExt: func(ext string) bool {
-		return ext == "md"
-	},
 }

 func TestParse(t *testing.T) {
@@ -336,22 +333,6 @@ func TestParse(t *testing.T) {
 				c.Assert(p.Path(), qt.Equals, "/a/b/c.txt")
 			},
 		},
-		{
-			"Content data file gotmpl",
-			"/a/b/_content.gotmpl",
-			func(c *qt.C, p *Path) {
-				c.Assert(p.Path(), qt.Equals, "/a/b/_content.gotmpl")
-				c.Assert(p.Ext(), qt.Equals, "gotmpl")
-				c.Assert(p.IsContentData(), qt.IsTrue)
-			},
-		},
-		{
-			"Content data file yaml",
-			"/a/b/_content.yaml",
-			func(c *qt.C, p *Path) {
-				c.Assert(p.IsContentData(), qt.IsFalse)
-			},
-		},
 	}
 	for _, test := range tests {
 		c.Run(test.name, func(c *qt.C) {
@@ -99,14 +99,6 @@ type Unwrapper interface {
 	Unwrapv() any
 }

-// Unwrap returns the underlying value of v if it implements Unwrapper, otherwise v is returned.
-func Unwrapv(v any) any {
-	if u, ok := v.(Unwrapper); ok {
-		return u.Unwrapv()
-	}
-	return v
-}
-
 // LowHigh is typically used to represent a slice boundary.
 type LowHigh struct {
 	Low  int
@@ -39,7 +39,6 @@ import (
 	"github.com/gohugoio/hugo/config/services"
 	"github.com/gohugoio/hugo/deploy/deployconfig"
 	"github.com/gohugoio/hugo/helpers"
-	"github.com/gohugoio/hugo/hugolib/segments"
 	"github.com/gohugoio/hugo/langs"
 	"github.com/gohugoio/hugo/markup/markup_config"
 	"github.com/gohugoio/hugo/media"
@@ -104,11 +103,9 @@ type Config struct {
 	RootConfig

 	// Author information.
-	// Deprecated: Use taxonomies instead.
 	Author map[string]any

 	// Social links.
-	// Deprecated: Use .Site.Params instead.
 	Social map[string]string

 	// The build configuration section contains build-related configuration options.
@@ -140,9 +137,6 @@ type Config struct {
 	// a slice of page matcher and params to apply to those pages.
 	Cascade *config.ConfigNamespace[[]page.PageMatcherParamsConfig, map[page.PageMatcher]maps.Params] `mapstructure:"-"`

-	// The segments defines segments for the site. Used for partial/segmented builds.
-	Segments *config.ConfigNamespace[map[string]segments.SegmentConfig, segments.Segments] `mapstructure:"-"`
-
 	// Menu configuration.
 	// <docsmeta>{"refs": ["config:languages:menus"] }</docsmeta>
 	Menus *config.ConfigNamespace[map[string]navigation.MenuConfig, navigation.Menus] `mapstructure:"-"`
@@ -367,11 +361,9 @@ func (c *Config) CompileConfig(logger loggers.Logger) error {
 		DisabledLanguages: disabledLangs,
 		IgnoredLogs:       ignoredLogIDs,
 		KindOutputFormats: kindOutputFormats,
-		ContentTypes:      media.DefaultContentTypes.FromTypes(c.MediaTypes.Config),
 		CreateTitle:       helpers.GetTitleFunc(c.TitleCaseStyle),
 		IsUglyURLSection:  isUglyURL,
 		IgnoreFile:        ignoreFile,
-		SegmentFilter:     c.Segments.Config.Get(func(s string) { logger.Warnf("Render segment %q not found in configuration", s) }, c.RootConfig.RenderSegments...),
 		MainSections:      c.MainSections,
 		Clock:             clock,
 		transientErr:      transientErr,
@@ -401,16 +393,13 @@ type ConfigCompiled struct {
 	Timeout           time.Duration
 	BaseURL           urls.BaseURL
 	BaseURLLiveReload urls.BaseURL
-	ServerInterface   string
 	KindOutputFormats map[string]output.Formats
-	ContentTypes      media.ContentTypes
 	DisabledKinds     map[string]bool
 	DisabledLanguages map[string]bool
 	IgnoredLogs       map[string]bool
 	CreateTitle       func(s string) string
 	IsUglyURLSection  func(section string) bool
 	IgnoreFile        func(filename string) bool
-	SegmentFilter     segments.SegmentFilter
 	MainSections      []string
 	Clock             time.Time

@@ -437,10 +426,9 @@ func (c *ConfigCompiled) IsMainSectionsSet() bool {
 }

 // This is set after the config is compiled by the server command.
-func (c *ConfigCompiled) SetServerInfo(baseURL, baseURLLiveReload urls.BaseURL, serverInterface string) {
+func (c *ConfigCompiled) SetBaseURL(baseURL, baseURLLiveReload urls.BaseURL) {
 	c.BaseURL = baseURL
 	c.BaseURLLiveReload = baseURLLiveReload
-	c.ServerInterface = serverInterface
 }

 // RootConfig holds all the top-level configuration options in Hugo
@@ -484,10 +472,6 @@ type RootConfig struct {
 	// A list of languages to disable.
 	DisableLanguages []string

-	// The named segments to render.
-	// This needs to match the name of the segment in the segments configuration.
-	RenderSegments []string
-
 	// Disable the injection of the Hugo generator tag on the home page.
 	DisableHugoGeneratorInject bool

@@ -687,13 +671,6 @@ type Configs struct {
 	configLangs []config.AllProvider
 }

-func (c *Configs) Validate(logger loggers.Logger) error {
-	for p := range c.Base.Cascade.Config {
-		page.CheckCascadePattern(logger, p)
-	}
-	return nil
-}
-
 // transientErr returns the last transient error found during config compilation.
 func (c *Configs) transientErr() error {
 	for _, l := range c.LanguageConfigSlice {
@@ -761,7 +738,7 @@ func (c *Configs) Init() error {
 	c.Languages = languages
 	c.LanguagesDefaultFirst = languagesDefaultFirst

-	c.ContentPathParser = &paths.PathParser{LanguageIndex: languagesDefaultFirst.AsIndexSet(), IsLangDisabled: c.Base.IsLangDisabled, IsContentExt: c.Base.C.ContentTypes.IsContentSuffix}
+	c.ContentPathParser = &paths.PathParser{LanguageIndex: languagesDefaultFirst.AsIndexSet(), IsLangDisabled: c.Base.IsLangDisabled}

 	c.configLangs = make([]config.AllProvider, len(c.Languages))
 	for i, l := range c.LanguagesDefaultFirst {
@@ -842,7 +819,7 @@ func fromLoadConfigResult(fs afero.Fs, logger loggers.Logger, res config.LoadCon
 	langConfigMap := make(map[string]*Config)

 	languagesConfig := cfg.GetStringMap("languages")
-	var isMultihost bool
+	var isMultiHost bool

 	if err := all.CompileConfig(logger); err != nil {
 		return nil, err
@@ -879,7 +856,7 @@ func fromLoadConfigResult(fs afero.Fs, logger loggers.Logger, res config.LoadCon
 				}
 				if kk == "baseurl" {
 					// baseURL configure don the language level is a multihost setup.
-					isMultihost = true
+					isMultiHost = true
 				}
 				mergedConfig.Set(kk, vv)
 				rootv := cfg.Get(kk)
@@ -929,7 +906,7 @@ func fromLoadConfigResult(fs afero.Fs, logger loggers.Logger, res config.LoadCon
 			}

 			// Adjust Goldmark config defaults for multilingual, single-host sites.
-			if len(languagesConfig) > 1 && !isMultihost && !clone.Markup.Goldmark.DuplicateResourceFiles {
+			if len(languagesConfig) > 1 && !isMultiHost && !clone.Markup.Goldmark.DuplicateResourceFiles {
 				if !clone.Markup.Goldmark.DuplicateResourceFiles {
 					if clone.Markup.Goldmark.RenderHooks.Link.EnableDefault == nil {
 						clone.Markup.Goldmark.RenderHooks.Link.EnableDefault = types.NewBool(true)
@@ -959,7 +936,7 @@ func fromLoadConfigResult(fs afero.Fs, logger loggers.Logger, res config.LoadCon
 		Base:              all,
 		LanguageConfigMap: langConfigMap,
 		LoadingInfo:       res,
-		IsMultihost:       isMultihost,
+		IsMultihost:       isMultiHost,
 	}

 	return cm, nil
@@ -992,7 +969,7 @@ func decodeConfigFromParams(fs afero.Fs, logger loggers.Logger, bcfg config.Base
 	})

 	for _, v := range decoderSetups {
-		p := decodeConfig{p: p, c: target, fs: fs, bcfg: bcfg}
+		p := decodeConfig{p: p, c: target, fs: fs, logger: logger, bcfg: bcfg}
 		if err := v.decode(v, p); err != nil {
 			return fmt.Errorf("failed to decode %q: %w", v.key, err)
 		}
@@ -84,21 +84,3 @@ logPathWarnings = true
 	b.Assert(conf.PrintI18nWarnings, qt.Equals, true)
 	b.Assert(conf.PrintPathWarnings, qt.Equals, true)
 }
-
-func TestRedefineContentTypes(t *testing.T) {
-	files := `
-- hugo.toml --
-baseURL = "https://example.com"
-[mediaTypes]
-[mediaTypes."text/html"]
-suffixes = ["html", "xhtml"]
-`
-
-	b := hugolib.Test(t, files)
-
-	conf := b.H.Configs.Base
-	contentTypes := conf.C.ContentTypes
-
-	b.Assert(contentTypes.HTML.Suffixes(), qt.DeepEquals, []string{"html", "xhtml"})
-	b.Assert(contentTypes.Markdown.Suffixes(), qt.DeepEquals, []string{"md", "mdown", "markdown"})
-}
@@ -18,6 +18,7 @@ import (
 	"strings"

 	"github.com/gohugoio/hugo/cache/filecache"
+	"github.com/gohugoio/hugo/common/loggers"
 	"github.com/gohugoio/hugo/common/maps"
 	"github.com/gohugoio/hugo/common/types"
 	"github.com/gohugoio/hugo/config"
@@ -25,13 +26,11 @@ import (
 	"github.com/gohugoio/hugo/config/security"
 	"github.com/gohugoio/hugo/config/services"
 	"github.com/gohugoio/hugo/deploy/deployconfig"
-	"github.com/gohugoio/hugo/hugolib/segments"
 	"github.com/gohugoio/hugo/langs"
 	"github.com/gohugoio/hugo/markup/markup_config"
 	"github.com/gohugoio/hugo/media"
 	"github.com/gohugoio/hugo/minifiers"
 	"github.com/gohugoio/hugo/modules"
-
 	"github.com/gohugoio/hugo/navigation"
 	"github.com/gohugoio/hugo/output"
 	"github.com/gohugoio/hugo/related"
@@ -44,10 +43,11 @@ import (
 )

 type decodeConfig struct {
-	p    config.Provider
-	c    *Config
-	fs   afero.Fs
-	bcfg config.BaseConfig
+	p      config.Provider
+	c      *Config
+	fs     afero.Fs
+	logger loggers.Logger
+	bcfg   config.BaseConfig
 }

 type decodeWeight struct {
@@ -122,14 +122,6 @@ var allDecoderSetups = map[string]decodeWeight{
 			return err
 		},
 	},
-	"segments": {
-		key: "segments",
-		decode: func(d decodeWeight, p decodeConfig) error {
-			var err error
-			p.c.Segments, err = segments.DecodeSegments(p.p.GetStringMap(d.key))
-			return err
-		},
-	},
 	"server": {
 		key: "server",
 		decode: func(d decodeWeight, p decodeConfig) error {
@@ -301,7 +293,7 @@ var allDecoderSetups = map[string]decodeWeight{
 		key: "cascade",
 		decode: func(d decodeWeight, p decodeConfig) error {
 			var err error
-			p.c.Cascade, err = page.DecodeCascadeConfig(nil, p.p.Get(d.key))
+			p.c.Cascade, err = page.DecodeCascadeConfig(p.logger, p.p.Get(d.key))
 			return err
 		},
 	},
@@ -52,7 +52,7 @@ func (c ConfigLanguage) LanguagePrefix() string {
 		return c.Language().Lang
 	}

-	if !c.IsMultilingual() || c.DefaultContentLanguage() == c.Language().Lang {
+	if !c.IsMultiLingual() || c.DefaultContentLanguage() == c.Language().Lang {
 		return ""
 	}
 	return c.Language().Lang
@@ -71,9 +71,6 @@ func (c ConfigLanguage) Environment() string {
 }

 func (c ConfigLanguage) IsMultihost() bool {
-	if len(c.m.Languages)-len(c.config.C.DisabledLanguages) <= 1 {
-		return false
-	}
 	return c.m.IsMultihost
 }

@@ -81,7 +78,7 @@ func (c ConfigLanguage) FastRenderMode() bool {
 	return c.config.Internal.FastRenderMode
 }

-func (c ConfigLanguage) IsMultilingual() bool {
+func (c ConfigLanguage) IsMultiLingual() bool {
 	return len(c.m.Languages) > 1
 }

@@ -144,10 +141,6 @@ func (c ConfigLanguage) NewIdentityManager(name string) identity.Manager {
 	return identity.NewManager(name)
 }

-func (c ConfigLanguage) ContentTypes() config.ContentTypesProvider {
-	return c.config.C.ContentTypes
-}
-
 // GetConfigSection is mostly used in tests. The switch statement isn't complete, but what's in use.
 func (c ConfigLanguage) GetConfigSection(s string) any {
 	switch s {
@@ -215,8 +215,6 @@ type SitemapConfig struct {
 	Priority float64
 	// The sitemap filename.
 	Filename string
-	// Whether to disable page inclusion.
-	Disable bool
 }

 func DecodeSitemap(prototype SitemapConfig, input map[string]any) (SitemapConfig, error) {
@@ -35,13 +35,12 @@ type AllProvider interface {
 	PathParser() *paths.PathParser
 	Environment() string
 	IsMultihost() bool
-	IsMultilingual() bool
+	IsMultiLingual() bool
 	NoBuildLock() bool
 	BaseConfig() BaseConfig
 	Dirs() CommonDirs
 	Quiet() bool
 	DirsBase() CommonDirs
-	ContentTypes() ContentTypesProvider
 	GetConfigSection(string) any
 	GetConfig() any
 	CanonifyURLs() bool
@@ -76,15 +75,6 @@ type AllProvider interface {
 	EnableEmoji() bool
 }

-// We cannot import the media package as that would create a circular dependency.
-// This interface defineds a sub set of what media.ContentTypes provides.
-type ContentTypesProvider interface {
-	IsContentSuffix(suffix string) bool
-	IsContentFile(filename string) bool
-	IsIndexContentFile(filename string) bool
-	IsHTMLSuffix(suffix string) bool
-}
-
 // Provider provides the configuration settings for Hugo.
 type Provider interface {
 	GetString(key string) string
@@ -44,9 +44,15 @@ type Disqus struct {
 type GoogleAnalytics struct {
 	Service `mapstructure:",squash"`

+	// Enabling this will disable the use of Cookies and use Session Storage to Store the GA Client ID.
+	UseSessionStorage bool
+
 	// Enabling this will make the GA templates respect the
 	// "Do Not Track" HTTP header. See  https://www.paulfurley.com/google-analytics-dnt/.
 	RespectDoNotTrack bool
+
+	// Enabling this will make it so the users' IP addresses are anonymized within Google Analytics.
+	AnonymizeIP bool
 }

 // Instagram holds the privacy configuration settings related to the Instagram shortcode.
@@ -33,6 +33,8 @@ disable = true
 [privacy.googleAnalytics]
 disable = true
 respectDoNotTrack = true
+anonymizeIP = true
+useSessionStorage = true
 [privacy.instagram]
 disable = true
 simple = true
@@ -58,7 +60,8 @@ simple = true

 	got := []bool{
 		pc.Disqus.Disable, pc.GoogleAnalytics.Disable,
-		pc.GoogleAnalytics.RespectDoNotTrack, pc.Instagram.Disable,
+		pc.GoogleAnalytics.RespectDoNotTrack, pc.GoogleAnalytics.AnonymizeIP,
+		pc.GoogleAnalytics.UseSessionStorage, pc.Instagram.Disable,
 		pc.Instagram.Simple, pc.Twitter.Disable, pc.Twitter.EnableDNT,
 		pc.Twitter.Simple, pc.Vimeo.Disable, pc.Vimeo.EnableDNT, pc.Vimeo.Simple,
 		pc.YouTube.PrivacyEnhanced, pc.YouTube.Disable,
@@ -29,6 +29,8 @@ import (
 	"github.com/gohugoio/hugo/common/hstrings"
 	"github.com/gohugoio/hugo/common/paths"

+	"github.com/gohugoio/hugo/hugofs/files"
+
 	"github.com/gohugoio/hugo/hugofs"

 	"github.com/gohugoio/hugo/helpers"
@@ -96,7 +98,7 @@ func NewContent(h *hugolib.HugoSites, kind, targetPath string, force bool) error
 			return "", fmt.Errorf("failed to resolve %q to an archetype template", targetPath)
 		}

-		if !h.Conf.ContentTypes().IsContentFile(b.targetPath) {
+		if !files.IsContentFile(b.targetPath) {
 			return "", fmt.Errorf("target path %q is not a known content format", b.targetPath)
 		}

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ or site.Language.LanguageCode }}" dir="{{ or site.Language.LanguageDirection `ltr` }}">
+<html lang="{{ or site.Language.LanguageCode site.Language.Lang }}" dir="{{ or site.Language.LanguageDirection `ltr` }}">
 <head>
  {{ partial "head.html" . }}
 </head>
@@ -2,7 +2,7 @@
 For a given taxonomy, renders a list of terms assigned to the page.

@context {page} page The current page.
-@context {string} taxonomy The taxonomy.
+@context {string} taxonomy The taxonony.

@example: {{ partial "terms.html" (dict "taxonomy" "tags" "page" .) }}
 */}}
@@ -155,7 +155,7 @@ func (d *Deps) Init() error {
 	}

 	if d.MemCache == nil {
-		d.MemCache = dynacache.New(dynacache.Options{Watching: d.Conf.Watching(), Log: d.Log})
+		d.MemCache = dynacache.New(dynacache.Options{Running: d.Conf.Running(), Log: d.Log})
 	}

 	if d.PathSpec == nil {
@@ -361,7 +361,7 @@ type BuildState struct {

 	mu sync.Mutex // protects state below.

-	// A set of filenames in /public that
+	// A set of ilenames in /public that
 	// contains a post-processing prefix.
 	filenamesWithPostPrefix map[string]bool
 }
@@ -56,7 +56,6 @@ hugo [flags]
      --printPathWarnings          print warnings on duplicate target paths etc.
      --printUnusedTemplates       print warnings on unused templates.
      --quiet                      build in quiet mode
-      --renderSegments strings     named segments to render (configured in the segments config)
      --renderToMemory             render to memory (mostly useful when running the server)
  -s, --source string              filesystem path to read files relative from
      --templateMetrics            display metrics about template executions
@@ -18,14 +18,13 @@ hugo config [command] [flags]
 ### Options

 ```
-  -b, --baseURL string           hostname (and path) to the root, e.g. https://spf13.com/
-      --cacheDir string          filesystem path to cache directory
-  -c, --contentDir string        filesystem path to content directory
-      --format string            preferred file format (toml, yaml or json) (default "toml")
-  -h, --help                     help for config
-      --lang string              the language to display config for. Defaults to the first language defined.
-      --renderSegments strings   named segments to render (configured in the segments config)
-  -t, --theme strings            themes to use (located in /themes/THEMENAME/)
+  -b, --baseURL string      hostname (and path) to the root, e.g. https://spf13.com/
+      --cacheDir string     filesystem path to cache directory
+  -c, --contentDir string   filesystem path to content directory
+      --format string       preferred file format (toml, yaml or json) (default "toml")
+  -h, --help                help for config
+      --lang string         the language to display config for. Defaults to the first language defined.
+  -t, --theme strings       themes to use (located in /themes/THEMENAME/)
 ```

 ### Options inherited from parent commands
@@ -14,12 +14,11 @@ hugo config mounts [flags] [args]
 ### Options

 ```
-  -b, --baseURL string           hostname (and path) to the root, e.g. https://spf13.com/
-      --cacheDir string          filesystem path to cache directory
-  -c, --contentDir string        filesystem path to content directory
-  -h, --help                     help for mounts
-      --renderSegments strings   named segments to render (configured in the segments config)
-  -t, --theme strings            themes to use (located in /themes/THEMENAME/)
+  -b, --baseURL string      hostname (and path) to the root, e.g. https://spf13.com/
+      --cacheDir string     filesystem path to cache directory
+  -c, --contentDir string   filesystem path to content directory
+  -h, --help                help for mounts
+  -t, --theme strings       themes to use (located in /themes/THEMENAME/)
 ```

 ### Options inherited from parent commands
@@ -20,11 +20,10 @@ hugo gen chromastyles [flags] [args]
 ### Options

 ```
-  -h, --help                            help for chromastyles
-      --highlightStyle string           foreground and background colors for highlighted lines, e.g. --highlightStyle "#fff000 bg:#000fff"
-      --lineNumbersInlineStyle string   foreground and background colors for inline line numbers, e.g. --lineNumbersInlineStyle "#fff000 bg:#000fff"
-      --lineNumbersTableStyle string    foreground and background colors for table line numbers, e.g. --lineNumbersTableStyle "#fff000 bg:#000fff"
-      --style string                    highlighter style (see https://xyproto.github.io/splash/docs/) (default "friendly")
+  -h, --help                    help for chromastyles
+      --highlightStyle string   style used for highlighting lines (see https://github.com/alecthomas/chroma)
+      --linesStyle string       style used for line numbers (see https://github.com/alecthomas/chroma)
+      --style string            highlighter style (see https://xyproto.github.io/splash/docs/) (default "friendly")
 ```

 ### Options inherited from parent commands
@@ -18,14 +18,13 @@ hugo mod clean [flags] [args]
 ### Options

 ```
-      --all                      clean entire module cache
-  -b, --baseURL string           hostname (and path) to the root, e.g. https://spf13.com/
-      --cacheDir string          filesystem path to cache directory
-  -c, --contentDir string        filesystem path to content directory
-  -h, --help                     help for clean
-      --pattern string           pattern matching module paths to clean (all if not set), e.g. "**hugo*"
-      --renderSegments strings   named segments to render (configured in the segments config)
-  -t, --theme strings            themes to use (located in /themes/THEMENAME/)
+      --all                 clean entire module cache
+  -b, --baseURL string      hostname (and path) to the root, e.g. https://spf13.com/
+      --cacheDir string     filesystem path to cache directory
+  -c, --contentDir string   filesystem path to content directory
+  -h, --help                help for clean
+      --pattern string      pattern matching module paths to clean (all if not set), e.g. "**hugo*"
+  -t, --theme strings       themes to use (located in /themes/THEMENAME/)
 ```

 ### Options inherited from parent commands
@@ -20,13 +20,12 @@ hugo mod graph [flags] [args]
 ### Options

 ```
-  -b, --baseURL string           hostname (and path) to the root, e.g. https://spf13.com/
-      --cacheDir string          filesystem path to cache directory
-      --clean                    delete module cache for dependencies that fail verification
-  -c, --contentDir string        filesystem path to content directory
-  -h, --help                     help for graph
-      --renderSegments strings   named segments to render (configured in the segments config)
-  -t, --theme strings            themes to use (located in /themes/THEMENAME/)
+  -b, --baseURL string      hostname (and path) to the root, e.g. https://spf13.com/
+      --cacheDir string     filesystem path to cache directory
+      --clean               delete module cache for dependencies that fail verification
+  -c, --contentDir string   filesystem path to content directory
+  -h, --help                help for graph
+  -t, --theme strings       themes to use (located in /themes/THEMENAME/)
 ```

 ### Options inherited from parent commands
@@ -25,12 +25,11 @@ hugo mod init [flags] [args]
 ### Options

 ```
-  -b, --baseURL string           hostname (and path) to the root, e.g. https://spf13.com/
-      --cacheDir string          filesystem path to cache directory
-  -c, --contentDir string        filesystem path to content directory
-  -h, --help                     help for init
-      --renderSegments strings   named segments to render (configured in the segments config)
-  -t, --theme strings            themes to use (located in /themes/THEMENAME/)
+  -b, --baseURL string      hostname (and path) to the root, e.g. https://spf13.com/
+      --cacheDir string     filesystem path to cache directory
+  -c, --contentDir string   filesystem path to content directory
+  -h, --help                help for init
+  -t, --theme strings       themes to use (located in /themes/THEMENAME/)
 ```

 ### Options inherited from parent commands
@@ -28,12 +28,11 @@ hugo mod npm pack [flags] [args]
 ### Options

 ```
-  -b, --baseURL string           hostname (and path) to the root, e.g. https://spf13.com/
-      --cacheDir string          filesystem path to cache directory
-  -c, --contentDir string        filesystem path to content directory
-  -h, --help                     help for pack
-      --renderSegments strings   named segments to render (configured in the segments config)
-  -t, --theme strings            themes to use (located in /themes/THEMENAME/)
+  -b, --baseURL string      hostname (and path) to the root, e.g. https://spf13.com/
+      --cacheDir string     filesystem path to cache directory
+  -c, --contentDir string   filesystem path to content directory
+  -h, --help                help for pack
+  -t, --theme strings       themes to use (located in /themes/THEMENAME/)
 ```

 ### Options inherited from parent commands
@@ -14,12 +14,11 @@ hugo mod tidy [flags] [args]
 ### Options

 ```
-  -b, --baseURL string           hostname (and path) to the root, e.g. https://spf13.com/
-      --cacheDir string          filesystem path to cache directory
-  -c, --contentDir string        filesystem path to content directory
-  -h, --help                     help for tidy
-      --renderSegments strings   named segments to render (configured in the segments config)
-  -t, --theme strings            themes to use (located in /themes/THEMENAME/)
+  -b, --baseURL string      hostname (and path) to the root, e.g. https://spf13.com/
+      --cacheDir string     filesystem path to cache directory
+  -c, --contentDir string   filesystem path to content directory
+  -h, --help                help for tidy
+  -t, --theme strings       themes to use (located in /themes/THEMENAME/)
 ```

 ### Options inherited from parent commands
@@ -20,12 +20,11 @@ hugo mod vendor [flags] [args]
 ### Options

 ```
-  -b, --baseURL string           hostname (and path) to the root, e.g. https://spf13.com/
-      --cacheDir string          filesystem path to cache directory
-  -c, --contentDir string        filesystem path to content directory
-  -h, --help                     help for vendor
-      --renderSegments strings   named segments to render (configured in the segments config)
-  -t, --theme strings            themes to use (located in /themes/THEMENAME/)
+  -b, --baseURL string      hostname (and path) to the root, e.g. https://spf13.com/
+      --cacheDir string     filesystem path to cache directory
+  -c, --contentDir string   filesystem path to content directory
+  -h, --help                help for vendor
+  -t, --theme strings       themes to use (located in /themes/THEMENAME/)
 ```

 ### Options inherited from parent commands
@@ -18,13 +18,12 @@ hugo mod verify [flags] [args]
 ### Options

 ```
-  -b, --baseURL string           hostname (and path) to the root, e.g. https://spf13.com/
-      --cacheDir string          filesystem path to cache directory
-      --clean                    delete module cache for dependencies that fail verification
-  -c, --contentDir string        filesystem path to content directory
-  -h, --help                     help for verify
-      --renderSegments strings   named segments to render (configured in the segments config)
-  -t, --theme strings            themes to use (located in /themes/THEMENAME/)
+  -b, --baseURL string      hostname (and path) to the root, e.g. https://spf13.com/
+      --cacheDir string     filesystem path to cache directory
+      --clean               delete module cache for dependencies that fail verification
+  -c, --contentDir string   filesystem path to content directory
+  -h, --help                help for verify
+  -t, --theme strings       themes to use (located in /themes/THEMENAME/)
 ```

 ### Options inherited from parent commands
@@ -25,15 +25,14 @@ hugo new content [path] [flags]
 ### Options

 ```
-  -b, --baseURL string           hostname (and path) to the root, e.g. https://spf13.com/
-      --cacheDir string          filesystem path to cache directory
-  -c, --contentDir string        filesystem path to content directory
-      --editor string            edit new content with this editor, if provided
-  -f, --force                    overwrite file if it already exists
-  -h, --help                     help for content
-  -k, --kind string              content type to create
-      --renderSegments strings   named segments to render (configured in the segments config)
-  -t, --theme strings            themes to use (located in /themes/THEMENAME/)
+  -b, --baseURL string      hostname (and path) to the root, e.g. https://spf13.com/
+      --cacheDir string     filesystem path to cache directory
+  -c, --contentDir string   filesystem path to content directory
+      --editor string       edit new content with this editor, if provided
+  -f, --force               overwrite file if it already exists
+  -h, --help                help for content
+  -k, --kind string         content type to create
+  -t, --theme strings       themes to use (located in /themes/THEMENAME/)
 ```

 ### Options inherited from parent commands
@@ -12,9 +12,9 @@ A high performance webserver
 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
-you can render to memory by using the `--renderToMemory` flag. This can be
-faster in some cases, but it will consume more memory.
+'hugo server' will by default write and server files from disk, but you can
+render to memory by using the '--renderToMemory' flag. This can be 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 site. It will then live reload any open browser pages
@@ -28,50 +28,49 @@ hugo server [command] [flags]
 ### Options

 ```
-      --appendPort               append port to baseURL (default true)
-  -b, --baseURL string           hostname (and path) to the root, e.g. https://spf13.com/
-      --bind string              interface to which the server will bind (default "127.0.0.1")
-  -D, --buildDrafts              include content marked as draft
-  -E, --buildExpired             include expired content
-  -F, --buildFuture              include content with publishdate in the future
-      --cacheDir string          filesystem path to cache directory
-      --cleanDestinationDir      remove files from destination not found in static directories
-  -c, --contentDir string        filesystem path to content directory
-      --disableBrowserError      do not show build errors in the browser
-      --disableFastRender        enables full re-renders on changes
-      --disableKinds strings     disable different kind of pages (home, RSS etc.)
-      --disableLiveReload        watch without enabling live browser reload on rebuild
-      --enableGitInfo            add Git revision, date, author, and CODEOWNERS info to the pages
-      --forceSyncStatic          copy all files when static is changed.
-      --gc                       enable to run some cleanup tasks (remove unused cache files) after the build
-  -h, --help                     help for server
-      --ignoreCache              ignores the cache directory
-  -l, --layoutDir string         filesystem path to layout directory
-      --liveReloadPort int       port for live reloading (i.e. 443 in HTTPS proxy situations) (default -1)
-      --minify                   minify any supported output format (HTML, XML etc.)
-      --navigateToChanged        navigate to changed content file on live browser reload
-      --noBuildLock              don't create .hugo_build.lock file
-      --noChmod                  don't sync permission mode of files
-      --noHTTPCache              prevent HTTP caching
-      --noTimes                  don't sync modification time of files
-      --panicOnWarning           panic on first WARNING log
-      --poll string              set this to a poll interval, e.g --poll 700ms, to use a poll based approach to watch for file system changes
-  -p, --port int                 port on which the server will listen (default 1313)
-      --pprof                    enable the pprof server (port 8080)
-      --printI18nWarnings        print missing translations
-      --printMemoryUsage         print memory usage to screen at intervals
-      --printPathWarnings        print warnings on duplicate target paths etc.
-      --printUnusedTemplates     print warnings on unused templates.
-      --renderSegments strings   named segments to render (configured in the segments config)
-      --renderStaticToDisk       serve static files from disk and dynamic files from memory
-      --templateMetrics          display metrics about template executions
-      --templateMetricsHints     calculate some improvement hints when combined with --templateMetrics
-  -t, --theme strings            themes to use (located in /themes/THEMENAME/)
-      --tlsAuto                  generate and use locally-trusted certificates.
-      --tlsCertFile string       path to TLS certificate file
-      --tlsKeyFile string        path to TLS key file
-      --trace file               write trace to file (not useful in general)
-  -w, --watch                    watch filesystem for changes and recreate as needed (default true)
+      --appendPort             append port to baseURL (default true)
+  -b, --baseURL string         hostname (and path) to the root, e.g. https://spf13.com/
+      --bind string            interface to which the server will bind (default "127.0.0.1")
+  -D, --buildDrafts            include content marked as draft
+  -E, --buildExpired           include expired content
+  -F, --buildFuture            include content with publishdate in the future
+      --cacheDir string        filesystem path to cache directory
+      --cleanDestinationDir    remove files from destination not found in static directories
+  -c, --contentDir string      filesystem path to content directory
+      --disableBrowserError    do not show build errors in the browser
+      --disableFastRender      enables full re-renders on changes
+      --disableKinds strings   disable different kind of pages (home, RSS etc.)
+      --disableLiveReload      watch without enabling live browser reload on rebuild
+      --enableGitInfo          add Git revision, date, author, and CODEOWNERS info to the pages
+      --forceSyncStatic        copy all files when static is changed.
+      --gc                     enable to run some cleanup tasks (remove unused cache files) after the build
+  -h, --help                   help for server
+      --ignoreCache            ignores the cache directory
+  -l, --layoutDir string       filesystem path to layout directory
+      --liveReloadPort int     port for live reloading (i.e. 443 in HTTPS proxy situations) (default -1)
+      --minify                 minify any supported output format (HTML, XML etc.)
+      --navigateToChanged      navigate to changed content file on live browser reload
+      --noBuildLock            don't create .hugo_build.lock file
+      --noChmod                don't sync permission mode of files
+      --noHTTPCache            prevent HTTP caching
+      --noTimes                don't sync modification time of files
+      --panicOnWarning         panic on first WARNING log
+      --poll string            set this to a poll interval, e.g --poll 700ms, to use a poll based approach to watch for file system changes
+  -p, --port int               port on which the server will listen (default 1313)
+      --pprof                  enable the pprof server (port 8080)
+      --printI18nWarnings      print missing translations
+      --printMemoryUsage       print memory usage to screen at intervals
+      --printPathWarnings      print warnings on duplicate target paths etc.
+      --printUnusedTemplates   print warnings on unused templates.
+      --renderStaticToDisk     serve static files from disk and dynamic files from memory
+      --templateMetrics        display metrics about template executions
+      --templateMetricsHints   calculate some improvement hints when combined with --templateMetrics
+  -t, --theme strings          themes to use (located in /themes/THEMENAME/)
+      --tlsAuto                generate and use locally-trusted certificates.
+      --tlsCertFile string     path to TLS certificate file
+      --tlsKeyFile string      path to TLS key file
+      --trace file             write trace to file (not useful in general)
+  -w, --watch                  watch filesystem for changes and recreate as needed (default true)
 ```

 ### Options inherited from parent commands
@@ -207,10 +207,6 @@ chroma:
  - Aliases:
    - dax
    Name: Dax
-  - Aliases:
-    - desktop
-    - desktop_entry
-    Name: Desktop file
  - Aliases:
    - diff
    - udiff
@@ -447,10 +443,6 @@ chroma:
  - Aliases:
    - mason
    Name: Mason
-  - Aliases:
-    - materialize
-    - mzsql
-    Name: Materialize SQL dialect
  - Aliases:
    - mathematica
    - mma
@@ -501,9 +493,6 @@ chroma:
  - Aliases:
    - natural
    Name: Natural
-  - Aliases:
-    - ndisasm
-    Name: NDISASM
  - Aliases:
    - newspeak
    Name: Newspeak
@@ -618,9 +607,6 @@ chroma:
  - Aliases:
    - prolog
    Name: Prolog
-  - Aliases:
-    - promela
-    Name: Promela
  - Aliases:
    - promql
    Name: PromQL
@@ -687,9 +673,6 @@ chroma:
  - Aliases:
    - registry
    Name: reg
-  - Aliases:
-    - rego
-    Name: Rego
  - Aliases:
    - rst
    - rest
@@ -699,9 +682,6 @@ chroma:
    - rexx
    - arexx
    Name: Rexx
-  - Aliases:
-    - spec
-    Name: RPMSpec
  - Aliases:
    - rb
    - ruby
@@ -966,7 +946,6 @@ config:
      dir: :cacheDir/modules
      maxAge: -1
  canonifyURLs: false
-  capitalizeListTitles: true
  cascade: []
  cleanDestinationDir: false
  contentDir: content
@@ -1065,15 +1044,6 @@ config:
          enable: false
          escapedSpace: false
        definitionList: true
-        extras:
-          insert:
-            enable: false
-          mark:
-            enable: false
-          subscript:
-            enable: false
-          superscript:
-            enable: false
        footnote: true
        linkify: true
        linkifyProtocol: https
@@ -1209,12 +1179,6 @@ config:
      delimiter: .
      suffixes:
      - webp
-    text/asciidoc:
-      delimiter: .
-      suffixes:
-      - adoc
-      - asciidoc
-      - ad
    text/calendar:
      delimiter: .
      suffixes:
@@ -1231,7 +1195,6 @@ config:
      delimiter: .
      suffixes:
      - html
-      - htm
    text/javascript:
      delimiter: .
      suffixes:
@@ -1246,25 +1209,11 @@ config:
      delimiter: .
      suffixes:
      - md
-      - mdown
      - markdown
-    text/org:
-      delimiter: .
-      suffixes:
-      - org
-    text/pandoc:
-      delimiter: .
-      suffixes:
-      - pandoc
-      - pdc
    text/plain:
      delimiter: .
      suffixes:
      - txt
-    text/rst:
-      delimiter: .
-      suffixes:
-      - rst
    text/tsx:
      delimiter: .
      suffixes:
@@ -1587,8 +1536,10 @@ config:
    disqus:
      disable: false
    googleAnalytics:
+      anonymizeIP: false
      disable: false
      respectDoNotTrack: false
+      useSessionStorage: false
    instagram:
      disable: false
      simple: false
@@ -1634,7 +1585,6 @@ config:
    toLower: false
  relativeURLs: false
  removePathAccents: false
-  renderSegments: null
  resourceDir: resources
  sectionPagesMenu: ""
  security:
@@ -1657,7 +1607,6 @@ config:
      - (?i)GET|POST
      urls:
      - .*
-  segments: {}
  server:
    headers: null
    redirects:
@@ -1679,7 +1628,6 @@ config:
      disableInlineCSS: false
  sitemap:
    changeFreq: ""
-    disable: false
    filename: sitemap.xml
    priority: -1
  social: null
@@ -1756,8 +1704,6 @@ config_helpers:
      _merge: none
    security:
      _merge: none
-    segments:
-      _merge: none
    server:
      _merge: none
    services:
@@ -2828,8 +2774,8 @@ tpl:
            {{ $m.Set "Hugo" "Rocks!" }}
            {{ $m.Values | debug.Dump | safeHTML }}
          - |-
-            {
-              "Hugo": "Rocks!"
+            map[string]interface {}{
+              "Hugo": "Rocks!",
            }
      TestDeprecationErr:
        Aliases: null
@@ -3019,21 +2965,6 @@ tpl:
        Args: null
        Description: ""
        Examples: null
-      IsMultiHost:
-        Aliases: null
-        Args: null
-        Description: ""
-        Examples: null
-      IsMultihost:
-        Aliases: null
-        Args: null
-        Description: ""
-        Examples: null
-      IsMultilingual:
-        Aliases: null
-        Args: null
-        Description: ""
-        Examples: null
      IsProduction:
        Aliases: null
        Args: null
@@ -4047,11 +3978,6 @@ tpl:
        - s
        Description: CountWords returns the approximate word count in s.
        Examples: []
-      Diff:
-        Aliases: null
-        Args: null
-        Description: ""
-        Examples: null
      FindRE:
        Aliases:
        - findRE
@@ -4616,5 +4542,5 @@ tpl:
        - urlize
        Args:
        - s
-        Description: URLize returns the strings s formatted as an URL.
+        Description: URLize returns the the strings s formatted as an URL.
        Examples: []
@@ -2,10 +2,10 @@ module github.com/gohugoio/hugo

 require (
 	github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69
-	github.com/alecthomas/chroma/v2 v2.13.0
+	github.com/alecthomas/chroma/v2 v2.12.0
 	github.com/armon/go-radix v1.0.1-0.20221118154546-54df44f2176c
-	github.com/aws/aws-sdk-go-v2 v1.26.1
-	github.com/aws/aws-sdk-go-v2/service/cloudfront v1.35.4
+	github.com/aws/aws-sdk-go-v2 v1.24.1
+	github.com/aws/aws-sdk-go-v2/service/cloudfront v1.32.6
 	github.com/bep/clocks v0.5.0
 	github.com/bep/debounce v1.2.0
 	github.com/bep/gitmap v1.1.2
@@ -18,14 +18,14 @@ require (
 	github.com/bep/lazycache v0.4.0
 	github.com/bep/logg v0.4.0
 	github.com/bep/mclib v1.20400.20402
-	github.com/bep/overlayfs v0.9.2
+	github.com/bep/overlayfs v0.9.1
 	github.com/bep/simplecobra v0.4.0
 	github.com/bep/tmc v0.5.1
 	github.com/clbanning/mxj/v2 v2.7.0
 	github.com/cli/safeexec v1.0.1
 	github.com/disintegration/gift v1.2.1
 	github.com/dustin/go-humanize v1.0.1
-	github.com/evanw/esbuild v0.20.2
+	github.com/evanw/esbuild v0.20.1
 	github.com/fatih/color v1.16.0
 	github.com/fortytw2/leaktest v1.3.0
 	github.com/frankban/quicktest v1.14.6
@@ -35,8 +35,7 @@ require (
 	github.com/gobuffalo/flect v1.0.2
 	github.com/gobwas/glob v0.2.3
 	github.com/gohugoio/go-i18n/v2 v2.1.3-0.20230805085216-e63c13218d0e
-	github.com/gohugoio/hugo-goldmark-extensions/extras v0.1.0
-	github.com/gohugoio/hugo-goldmark-extensions/passthrough v0.2.0
+	github.com/gohugoio/hugo-goldmark-extensions/passthrough v0.1.0
 	github.com/gohugoio/locales v0.14.0
 	github.com/gohugoio/localescompressed v1.0.1
 	github.com/gohugoio/testmodBuilder/mods v0.0.0-20190520184928-c56af20f2e95
@@ -56,28 +55,28 @@ require (
 	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.2.2
+	github.com/pelletier/go-toml/v2 v2.1.1
 	github.com/rogpeppe/go-internal v1.12.0
 	github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd
 	github.com/sanity-io/litter v1.5.5
 	github.com/spf13/afero v1.11.0
 	github.com/spf13/cast v1.6.0
 	github.com/spf13/cobra v1.8.0
-	github.com/spf13/fsync v0.10.1
+	github.com/spf13/fsync v0.10.0
 	github.com/spf13/pflag v1.0.5
-	github.com/tdewolff/minify/v2 v2.20.20
-	github.com/tdewolff/parse/v2 v2.7.13
-	github.com/yuin/goldmark v1.7.1
+	github.com/tdewolff/minify/v2 v2.20.17
+	github.com/tdewolff/parse/v2 v2.7.12
+	github.com/yuin/goldmark v1.7.0
 	github.com/yuin/goldmark-emoji v1.0.2
 	go.uber.org/automaxprocs v1.5.3
 	gocloud.dev v0.36.0
 	golang.org/x/exp v0.0.0-20221031165847-c99f073a8326
-	golang.org/x/image v0.16.0
-	golang.org/x/mod v0.17.0
-	golang.org/x/net v0.25.0
-	golang.org/x/sync v0.7.0
-	golang.org/x/text v0.15.0
-	golang.org/x/tools v0.20.0
+	golang.org/x/image v0.15.0
+	golang.org/x/mod v0.15.0
+	golang.org/x/net v0.21.0
+	golang.org/x/sync v0.6.0
+	golang.org/x/text v0.14.0
+	golang.org/x/tools v0.18.0
 	google.golang.org/api v0.152.0
 	gopkg.in/yaml.v2 v2.4.0
 )
@@ -101,8 +100,8 @@ require (
 	github.com/aws/aws-sdk-go-v2/credentials v1.16.12 // indirect
 	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.10 // indirect
 	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.15.7 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.5 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.5 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.10 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.10 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/ini v1.7.2 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.9 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4 // indirect
@@ -113,9 +112,9 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/sso v1.18.5 // indirect
 	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.5 // indirect
 	github.com/aws/aws-sdk-go-v2/service/sts v1.26.5 // indirect
-	github.com/aws/smithy-go v1.20.2 // indirect
+	github.com/aws/smithy-go v1.19.0 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
-	github.com/dlclark/regexp2 v1.11.0 // indirect
+	github.com/dlclark/regexp2 v1.10.0 // indirect
 	github.com/go-openapi/jsonpointer v0.20.2 // indirect
 	github.com/go-openapi/swag v0.22.8 // indirect
 	github.com/golang-jwt/jwt/v5 v5.1.0 // indirect
@@ -143,9 +142,9 @@ require (
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	golang.org/x/crypto v0.23.0 // indirect
+	golang.org/x/crypto v0.19.0 // indirect
 	golang.org/x/oauth2 v0.15.0 // indirect
-	golang.org/x/sys v0.20.0 // indirect
+	golang.org/x/sys v0.17.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
 	golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
@@ -153,7 +152,7 @@ require (
 	google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
 	google.golang.org/grpc v1.59.0 // indirect
-	google.golang.org/protobuf v1.33.0 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	howett.net/plist v1.0.0 // indirect
 	software.sslmate.com/src/go-pkcs12 v0.2.0 // indirect
@@ -66,16 +66,16 @@ github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69/go.mod h1:L1AbZd
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/alecthomas/assert/v2 v2.6.0 h1:o3WJwILtexrEUk3cUVal3oiQY2tfgr/FHWiz/v2n4FU=
-github.com/alecthomas/chroma/v2 v2.13.0 h1:VP72+99Fb2zEcYM0MeaWJmV+xQvz5v5cxRHd+ooU1lI=
-github.com/alecthomas/chroma/v2 v2.13.0/go.mod h1:BUGjjsD+ndS6eX37YgTchSEG+Jg9Jv1GiZs9sqPqztk=
-github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc=
+github.com/alecthomas/assert/v2 v2.2.1 h1:XivOgYcduV98QCahG8T5XTezV5bylXe+lBxLG2K2ink=
+github.com/alecthomas/chroma/v2 v2.12.0 h1:Wh8qLEgMMsN7mgyG8/qIpegky2Hvzr4By6gEF7cmWgw=
+github.com/alecthomas/chroma/v2 v2.12.0/go.mod h1:4TQu7gdfuPjSh76j78ietmqh9LiurGF0EpseFXdKMBw=
+github.com/alecthomas/repr v0.2.0 h1:HAzS41CIzNW5syS8Mf9UwXhNH1J9aix/BvDRf1Ml2Yk=
 github.com/armon/go-radix v1.0.1-0.20221118154546-54df44f2176c h1:651/eoCRnQ7YtSjAnSzRucrJz+3iGEFt+ysraELS81M=
 github.com/armon/go-radix v1.0.1-0.20221118154546-54df44f2176c/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/aws/aws-sdk-go v1.50.7 h1:odKb+uneeGgF2jgAerKjFzpljiyZxleV4SHB7oBK+YA=
 github.com/aws/aws-sdk-go v1.50.7/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
-github.com/aws/aws-sdk-go-v2 v1.26.1 h1:5554eUqIYVWpU0YmeeYZ0wU64H2VLBs8TlhRB2L+EkA=
-github.com/aws/aws-sdk-go-v2 v1.26.1/go.mod h1:ffIFB97e2yNsv4aTSGkqtHnppsIJzw7G7BReUZ3jCXM=
+github.com/aws/aws-sdk-go-v2 v1.24.1 h1:xAojnj+ktS95YZlDf0zxWBkbFtymPeDP+rvUQIH3uAU=
+github.com/aws/aws-sdk-go-v2 v1.24.1/go.mod h1:LNh45Br1YAkEKaAqvmE1m8FUx6a5b/V0oAKV7of29b4=
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.4 h1:OCs21ST2LrepDfD3lwlQiOqIGp6JiEUqG84GzTDoyJs=
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.4/go.mod h1:usURWEKSNNAcAZuzRn/9ZYPT8aZQkR7xcCtunK/LkJo=
 github.com/aws/aws-sdk-go-v2/config v1.26.1 h1:z6DqMxclFGL3Zfo+4Q0rLnAZ6yVkzCRxhRMsiRQnD1o=
@@ -86,16 +86,16 @@ github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.10 h1:w98BT5w+ao1/r5sUuiH6Jk
 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.10/go.mod h1:K2WGI7vUvkIv1HoNbfBA1bvIZ+9kL3YVmWxeKuLQsiw=
 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.15.7 h1:FnLf60PtjXp8ZOzQfhJVsqF0OtYKQZWQfqOLshh8YXg=
 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.15.7/go.mod h1:tDVvl8hyU6E9B8TrnNrZQEVkQlB8hjJwcgpPhgtlnNg=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.5 h1:aw39xVGeRWlWx9EzGVnhOR4yOjQDHPQ6o6NmBlscyQg=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.5/go.mod h1:FSaRudD0dXiMPK2UjknVwwTYyZMRsHv3TtkabsZih5I=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.5 h1:PG1F3OD1szkuQPzDw3CIQsRIrtTlUC3lP84taWzHlq0=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.5/go.mod h1:jU1li6RFryMz+so64PpKtudI+QzbKoIEivqdf6LNpOc=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.10 h1:vF+Zgd9s+H4vOXd5BMaPWykta2a6Ih0AKLq/X6NYKn4=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.10/go.mod h1:6BkRjejp/GR4411UGqkX8+wFMbFbqsUIimfK4XjOKR4=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.10 h1:nYPe006ktcqUji8S2mqXf9c/7NdiKriOwMvWQHgYztw=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.10/go.mod h1:6UV4SZkVvmODfXKql4LCbaZUpF7HO2BX38FgBf9ZOLw=
 github.com/aws/aws-sdk-go-v2/internal/ini v1.7.2 h1:GrSw8s0Gs/5zZ0SX+gX4zQjRnRsMJDJ2sLur1gRBhEM=
 github.com/aws/aws-sdk-go-v2/internal/ini v1.7.2/go.mod h1:6fQQgfuGmw8Al/3M2IgIllycxV7ZW7WCdVSqfBeUiCY=
 github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.9 h1:ugD6qzjYtB7zM5PN/ZIeaAIyefPaD82G8+SJopgvUpw=
 github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.9/go.mod h1:YD0aYBWCrPENpHolhKw2XDlTIWae2GKXT1T4o6N6hiM=
-github.com/aws/aws-sdk-go-v2/service/cloudfront v1.35.4 h1:a4gfRHHCzvV0jEjOUdZOK0oJ4H21x5WT+E4ucWk4jeM=
-github.com/aws/aws-sdk-go-v2/service/cloudfront v1.35.4/go.mod h1:Pphkts8iBnexoEpcMti5fUvN3/yoGRLtl2heOeppF70=
+github.com/aws/aws-sdk-go-v2/service/cloudfront v1.32.6 h1:xKbFXea2CIF/Wskauz1TMr//wZ6FyzEafMdSBIQqn80=
+github.com/aws/aws-sdk-go-v2/service/cloudfront v1.32.6/go.mod h1:iB6PQSb3ULRrrlEiuFfVE318JiBOdk4k46BbuzrrgXc=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4 h1:/b31bi3YVNlkzkBrm9LfpaKoaYZUxIAj4sHfOTmLfqw=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4/go.mod h1:2aGXHFmbInwgP9ZfpmdIfOELL79zhdNYNmReK8qDfdQ=
 github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.2.9 h1:/90OR2XbSYfXucBMJ4U14wrjlfleq/0SB6dZDPncgmo=
@@ -112,8 +112,8 @@ github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.5 h1:2k9KmFawS63euAkY4/ixVNsY
 github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.5/go.mod h1:W+nd4wWDVkSUIox9bacmkBP5NMFQeTJ/xqNabpzSR38=
 github.com/aws/aws-sdk-go-v2/service/sts v1.26.5 h1:5UYvv8JUvllZsRnfrcMQ+hJ9jNICmcgKPAO1CER25Wg=
 github.com/aws/aws-sdk-go-v2/service/sts v1.26.5/go.mod h1:XX5gh4CB7wAs4KhcF46G6C8a2i7eupU19dcAAE+EydU=
-github.com/aws/smithy-go v1.20.2 h1:tbp628ireGtzcHDDmLT/6ADHidqnwgF57XOXZe6tp4Q=
-github.com/aws/smithy-go v1.20.2/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E=
+github.com/aws/smithy-go v1.19.0 h1:KWFKQV80DpP3vJrrA9sVAHQ5gc2z8i4EzrLhLlWXcBM=
+github.com/aws/smithy-go v1.19.0/go.mod h1:NukqUGpCZIILqqiV0NIjeFh24kd/FAa4beRb6nbIUPE=
 github.com/bep/clocks v0.5.0 h1:hhvKVGLPQWRVsBP/UB7ErrHYIO42gINVbvqxvYTPVps=
 github.com/bep/clocks v0.5.0/go.mod h1:SUq3q+OOq41y2lRQqH5fsOoxN8GbxSiT6jvoVVLCVhU=
 github.com/bep/debounce v1.2.0 h1:wXds8Kq8qRfwAOpAxHrJDbCXgC5aHSzgQb/0gKsHQqo=
@@ -138,8 +138,8 @@ github.com/bep/logg v0.4.0 h1:luAo5mO4ZkhA5M1iDVDqDqnBBnlHjmtZF6VAyTp+nCQ=
 github.com/bep/logg v0.4.0/go.mod h1:Ccp9yP3wbR1mm++Kpxet91hAZBEQgmWgFgnXX3GkIV0=
 github.com/bep/mclib v1.20400.20402 h1:olpCE2WSPpOAbFE1R4hnftSEmQ34+xzy2HRzd0m69rA=
 github.com/bep/mclib v1.20400.20402/go.mod h1:pkrk9Kyfqg34Uj6XlDq9tdEFJBiL1FvCoCgVKRzw1EY=
-github.com/bep/overlayfs v0.9.2 h1:qJEmFInsW12L7WW7dOTUhnMfyk/fN9OCDEO5Gr8HSDs=
-github.com/bep/overlayfs v0.9.2/go.mod h1:aYY9W7aXQsGcA7V9x/pzeR8LjEgIxbtisZm8Q7zPz40=
+github.com/bep/overlayfs v0.9.1 h1:SL54SV8A3zRkmQ+83Jj4TLE88jadHd5d1L4NpfmqJJs=
+github.com/bep/overlayfs v0.9.1/go.mod h1:aYY9W7aXQsGcA7V9x/pzeR8LjEgIxbtisZm8Q7zPz40=
 github.com/bep/simplecobra v0.4.0 h1:ufX/6WcOtEVJdCd7hsztTWURlZkOaWYOD+zCqrM8qUE=
 github.com/bep/simplecobra v0.4.0/go.mod h1:evSM6iQqRwqpV7W4H4DlYFfe9mZ0x6Hj5GEOnIV7dI4=
 github.com/bep/tmc v0.5.1 h1:CsQnSC6MsomH64gw0cT5f+EwQDcvZz4AazKunFwTpuI=
@@ -168,8 +168,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/disintegration/gift v1.2.1 h1:Y005a1X4Z7Uc+0gLpSAsKhWi4qLtsdEcMIbbdvdZ6pc=
 github.com/disintegration/gift v1.2.1/go.mod h1:Jh2i7f7Q2BM7Ezno3PhfezbR1xpUg9dUg3/RlKGr4HI=
-github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI=
-github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
+github.com/dlclark/regexp2 v1.10.0 h1:+/GIL799phkJqYW+3YbOd8LCcbHzT0Pbo8zl70MHsq0=
+github.com/dlclark/regexp2 v1.10.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
 github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
@@ -179,8 +179,8 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
 github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/evanw/esbuild v0.20.2 h1:E4Y0iJsothpUCq7y0D+ERfqpJmPWrZpNybJA3x3I4p8=
-github.com/evanw/esbuild v0.20.2/go.mod h1:D2vIQZqV/vIf/VRHtViaUtViZmG7o+kKmlBfVQuRi48=
+github.com/evanw/esbuild v0.20.1 h1:ueyMIL19umCcJTSxiBH/QmPipgGt8hEDM24pdfowgEc=
+github.com/evanw/esbuild v0.20.1/go.mod h1:D2vIQZqV/vIf/VRHtViaUtViZmG7o+kKmlBfVQuRi48=
 github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
 github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
 github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
@@ -195,8 +195,6 @@ github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nos
 github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
 github.com/getkin/kin-openapi v0.123.0 h1:zIik0mRwFNLyvtXK274Q6ut+dPh6nlxBp0x7mNrPhs8=
 github.com/getkin/kin-openapi v0.123.0/go.mod h1:wb1aSZA/iWmorQP9KTAS/phLj/t17B5jT7+fS8ed9NM=
-github.com/getkin/kin-openapi v0.124.0 h1:VSFNMB9C9rTKBnQ/fpyDU8ytMTr4dWI9QovSKj9kz/M=
-github.com/getkin/kin-openapi v0.124.0/go.mod h1:wb1aSZA/iWmorQP9KTAS/phLj/t17B5jT7+fS8ed9NM=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
@@ -213,10 +211,8 @@ github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
 github.com/gohugoio/go-i18n/v2 v2.1.3-0.20230805085216-e63c13218d0e h1:QArsSubW7eDh8APMXkByjQWvuljwPGAGQpJEFn0F0wY=
 github.com/gohugoio/go-i18n/v2 v2.1.3-0.20230805085216-e63c13218d0e/go.mod h1:3Ltoo9Banwq0gOtcOwxuHG6omk+AwsQPADyw2vQYOJQ=
-github.com/gohugoio/hugo-goldmark-extensions/extras v0.1.0 h1:YhxZNU8y2vxV6Ibr7QJzzUlpr8oHHWX/l+Q1R/a5Zao=
-github.com/gohugoio/hugo-goldmark-extensions/extras v0.1.0/go.mod h1:0cuvOnGKW7WeXA3i7qK6IS07FH1bgJ2XzOjQ7BMJYH4=
-github.com/gohugoio/hugo-goldmark-extensions/passthrough v0.2.0 h1:PCtO5l++psZf48yen2LxQ3JiOXxaRC6v0594NeHvGZg=
-github.com/gohugoio/hugo-goldmark-extensions/passthrough v0.2.0/go.mod h1:g9CCh+Ci2IMbPUrVJuXbBTrA+rIIx5+hDQ4EXYaQDoM=
+github.com/gohugoio/hugo-goldmark-extensions/passthrough v0.1.0 h1:oFQ3f1M3Ook6amHmbqVu/uBRrQ6yjMDFkIv4HQr0f1Y=
+github.com/gohugoio/hugo-goldmark-extensions/passthrough v0.1.0/go.mod h1:g9CCh+Ci2IMbPUrVJuXbBTrA+rIIx5+hDQ4EXYaQDoM=
 github.com/gohugoio/locales v0.14.0 h1:Q0gpsZwfv7ATHMbcTNepFd59H7GoykzWJIxi113XGDc=
 github.com/gohugoio/locales v0.14.0/go.mod h1:ip8cCAv/cnmVLzzXtiTpPwgJ4xhKZranqNqtoIu0b/4=
 github.com/gohugoio/localescompressed v1.0.1 h1:KTYMi8fCWYLswFyJAeOtuk/EkXR/KPTHHNN9OS+RTxo=
@@ -380,8 +376,8 @@ github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N
 github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
 github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 h1:onHthvaw9LFnH4t2DcNVpwGmV9E1BkGknEliJkfwQj0=
 github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58/go.mod h1:DXv8WO4yhMYhSNPKjeNKa5WY9YCIEBRbNzFFPJbWO6Y=
-github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
-github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
+github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI=
+github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
 github.com/perimeterx/marshmallow v1.1.5 h1:a2LALqQ1BlHM8PZblsDdidgv1mWi1DgC2UmX50IvK2s=
 github.com/perimeterx/marshmallow v1.1.5/go.mod h1:dsXbUu8CRzfYP5a87xpp0xq9S3u0Vchtcl8we9tYaXw=
 github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU=
@@ -414,14 +410,13 @@ github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0=
 github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
 github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0=
 github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho=
-github.com/spf13/fsync v0.10.1 h1:JRnB7G72b+gIBaBcpn5ibJSd7ww1iEahXSX2B8G6dSE=
-github.com/spf13/fsync v0.10.1/go.mod h1:y+B41vYq5i6Boa3Z+BVoPbDeOvxVkNU5OBXhoT8i4TQ=
+github.com/spf13/fsync v0.10.0 h1:j+zUMN41zWj3sEqueD4mAsPDQwyOvMeJCcrawdmbqXk=
+github.com/spf13/fsync v0.10.0/go.mod h1:y+B41vYq5i6Boa3Z+BVoPbDeOvxVkNU5OBXhoT8i4TQ=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v0.0.0-20161117074351-18a02ba4a312/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
@@ -430,13 +425,12 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/tdewolff/minify/v2 v2.20.20 h1:vhULb+VsW2twkplgsawAoUY957efb+EdiZ7zu5fUhhk=
-github.com/tdewolff/minify/v2 v2.20.20/go.mod h1:GYaLXFpIIwsX99apQHXfGdISUdlA98wmaoWxjT9C37k=
-github.com/tdewolff/parse/v2 v2.7.13 h1:iSiwOUkCYLNfapHoqdLcqZVgvQ0jrsao8YYKP/UJYTI=
-github.com/tdewolff/parse/v2 v2.7.13/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA=
+github.com/tdewolff/minify/v2 v2.20.17 h1:zGqEDhspr3XjSrQI/56vw9IdAhLAaKTLXWnDBsxNVt8=
+github.com/tdewolff/minify/v2 v2.20.17/go.mod h1:ulkFoeAVWMLEyjuDz1ZIWOA31g5aWOawCFRp9R/MudM=
+github.com/tdewolff/parse/v2 v2.7.12 h1:tgavkHc2ZDEQVKy1oWxwIyh5bP4F5fEh/JmBwPP/3LQ=
+github.com/tdewolff/parse/v2 v2.7.12/go.mod h1:3FbJWZp3XT9OWVN3Hmfp0p/a08v4h8J9W1aghka0soA=
 github.com/tdewolff/test v1.0.11-0.20231101010635-f1265d231d52/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE=
 github.com/tdewolff/test v1.0.11-0.20240106005702-7de5f7df4739 h1:IkjBCtQOOjIn03u/dMQK9g+Iw9ewps4mCl1nB8Sscbo=
 github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0=
@@ -447,8 +441,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.3.7/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-github.com/yuin/goldmark v1.7.1 h1:3bajkSilaCbjdKVsKdZjZCLBNPL9pYzrCakKaf4U49U=
-github.com/yuin/goldmark v1.7.1/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
+github.com/yuin/goldmark v1.7.0 h1:EfOIvIMZIzHdB/R/zVrikYLPPwJlfMcNczJFMs1m6sA=
+github.com/yuin/goldmark v1.7.0/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
 github.com/yuin/goldmark-emoji v1.0.2 h1:c/RgTShNgHTtc6xdz2KKI74jJr6rWi7FPgnP9GAsO5s=
 github.com/yuin/goldmark-emoji v1.0.2/go.mod h1:RhP/RWpexdp+KHs7ghKnifRoIs/Bq4nDS7tRbCkOwKY=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
@@ -472,8 +466,8 @@ golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
-golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
+golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo=
+golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -489,8 +483,8 @@ golang.org/x/exp v0.0.0-20221031165847-c99f073a8326/go.mod h1:CxIveKay+FTh1D0yPZ
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.16.0 h1:9kloLAKhUufZhA12l5fwnx2NZW39/we1UhBesW433jw=
-golang.org/x/image v0.16.0/go.mod h1:ugSZItdV4nOxyqp56HmXwH0Ry0nBCpjnZdpDaIHdoPs=
+golang.org/x/image v0.15.0 h1:kOELfmgrmJlw4Cdb7g/QGuB3CvDrXbqEIww/pNtNBm8=
+golang.org/x/image v0.15.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -514,8 +508,8 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
-golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8=
+golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -551,8 +545,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
-golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
+golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
+golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -576,8 +570,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
-golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
+golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -621,8 +615,8 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
-golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
+golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -634,8 +628,8 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
-golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
-golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -691,8 +685,8 @@ golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY=
-golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg=
+golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ=
+golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -801,8 +795,8 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
-google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
+google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
@@ -26,7 +26,6 @@ import (

 	"github.com/gohugoio/hugo/common/hexec"
 	"github.com/gohugoio/hugo/common/loggers"
-	"github.com/gohugoio/hugo/media"

 	"github.com/spf13/afero"

@@ -37,6 +36,11 @@ import (
 	"github.com/gohugoio/hugo/config"
 )

+var (
+	openingPTag = []byte("<p>")
+	closingPTag = []byte("</p>")
+)
+
 // ContentSpec provides functionality to render markdown content.
 type ContentSpec struct {
 	Converters          markup.ConverterProvider
@@ -136,16 +140,20 @@ func (c *ContentSpec) SanitizeAnchorName(s string) string {
 }

 func (c *ContentSpec) ResolveMarkup(in string) string {
+	if c == nil {
+		panic("nil ContentSpec")
+	}
 	in = strings.ToLower(in)
-
-	if mediaType, found := c.Cfg.ContentTypes().(media.ContentTypes).Types().GetBestMatch(markup.ResolveMarkup(in)); found {
-		return mediaType.SubType
+	switch in {
+	case "md", "markdown", "mdown":
+		return "markdown"
+	case "html", "htm":
+		return "html"
+	default:
+		if conv := c.Converters.Get(in); conv != nil {
+			return conv.Name()
+		}
 	}
-
-	if conv := c.Converters.Get(in); conv != nil {
-		return markup.ResolveMarkup(conv.Name())
-	}
-
 	return ""
 }

@@ -234,26 +242,19 @@ func (c *ContentSpec) TruncateWordsToWholeSentence(s string) (string, bool) {
 	return strings.TrimSpace(s[:endIndex]), endIndex < len(s)
 }

-// TrimShortHTML removes the outer tags from HTML input where (a) the opening
-// tag is present only once with the input, and (b) the opening and closing
-// tags wrap the input after white space removal.
-func (c *ContentSpec) TrimShortHTML(input []byte, markup string) []byte {
-	openingTag := []byte("<p>")
-	closingTag := []byte("</p>")
-
-	if markup == media.DefaultContentTypes.AsciiDoc.SubType {
-		openingTag = []byte("<div class=\"paragraph\">\n<p>")
-		closingTag = []byte("</p>\n</div>")
-	}
-
-	if bytes.Count(input, openingTag) == 1 {
+// TrimShortHTML removes the <p>/</p> tags from HTML input in the situation
+// where said tags are the only <p> tags in the input and enclose the content
+// of the input (whitespace excluded).
+func (c *ContentSpec) TrimShortHTML(input []byte) []byte {
+	if bytes.Count(input, openingPTag) == 1 {
 		input = bytes.TrimSpace(input)
-		if bytes.HasPrefix(input, openingTag) && bytes.HasSuffix(input, closingTag) {
-			input = bytes.TrimPrefix(input, openingTag)
-			input = bytes.TrimSuffix(input, closingTag)
+		if bytes.HasPrefix(input, openingPTag) && bytes.HasSuffix(input, closingPTag) {
+			input = bytes.TrimPrefix(input, openingPTag)
+			input = bytes.TrimSuffix(input, closingPTag)
 			input = bytes.TrimSpace(input)
 		}
 	}
+
 	return input
 }

@@ -26,41 +26,30 @@ import (

 func TestTrimShortHTML(t *testing.T) {
 	tests := []struct {
-		markup string
-		input  []byte
-		output []byte
+		input, output []byte
 	}{
-		{"markdown", []byte(""), []byte("")},
-		{"markdown", []byte("Plain text"), []byte("Plain text")},
-		{"markdown", []byte("<p>Simple paragraph</p>"), []byte("Simple paragraph")},
-		{"markdown", []byte("\n  \n \t  <p> \t Whitespace\nHTML  \n\t </p>\n\t"), []byte("Whitespace\nHTML")},
-		{"markdown", []byte("<p>Multiple</p><p>paragraphs</p>"), []byte("<p>Multiple</p><p>paragraphs</p>")},
-		{"markdown", []byte("<p>Nested<p>paragraphs</p></p>"), []byte("<p>Nested<p>paragraphs</p></p>")},
-		{"markdown", []byte("<p>Hello</p>\n<ul>\n<li>list1</li>\n<li>list2</li>\n</ul>"), []byte("<p>Hello</p>\n<ul>\n<li>list1</li>\n<li>list2</li>\n</ul>")},
-		// Issue 11698
-		{"markdown", []byte("<h2 id=`a`>b</h2>\n\n<p>c</p>"), []byte("<h2 id=`a`>b</h2>\n\n<p>c</p>")},
-		// Issue 12369
-		{"markdown", []byte("<div class=\"paragraph\">\n<p>foo</p>\n</div>"), []byte("<div class=\"paragraph\">\n<p>foo</p>\n</div>")},
-		{"asciidoc", []byte("<div class=\"paragraph\">\n<p>foo</p>\n</div>"), []byte("foo")},
+		{[]byte(""), []byte("")},
+		{[]byte("Plain text"), []byte("Plain text")},
+		// This seems wrong. Why touch it if it doesn't have p tag?
+		// {[]byte("  \t\n Whitespace text\n\n"), []byte("Whitespace text")},
+		{[]byte("<p>Simple paragraph</p>"), []byte("Simple paragraph")},
+		{[]byte("\n  \n \t  <p> \t Whitespace\nHTML  \n\t </p>\n\t"), []byte("Whitespace\nHTML")},
+		{[]byte("<p>Multiple</p><p>paragraphs</p>"), []byte("<p>Multiple</p><p>paragraphs</p>")},
+		{[]byte("<p>Nested<p>paragraphs</p></p>"), []byte("<p>Nested<p>paragraphs</p></p>")},
+		{[]byte("<p>Hello</p>\n<ul>\n<li>list1</li>\n<li>list2</li>\n</ul>"), []byte("<p>Hello</p>\n<ul>\n<li>list1</li>\n<li>list2</li>\n</ul>")},
+		// Issue #11698
+		{[]byte("<h2 id=`a`>b</h2>\n\n<p>c</p>"), []byte("<h2 id=`a`>b</h2>\n\n<p>c</p>")},
 	}

 	c := newTestContentSpec(nil)
 	for i, test := range tests {
-		output := c.TrimShortHTML(test.input, test.markup)
+		output := c.TrimShortHTML(test.input)
 		if !bytes.Equal(test.output, output) {
 			t.Errorf("Test %d failed. Expected %q got %q", i, test.output, output)
 		}
 	}
 }

-func BenchmarkTrimShortHTML(b *testing.B) {
-	c := newTestContentSpec(nil)
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		c.TrimShortHTML([]byte("<p>Simple paragraph</p>"), "markdown")
-	}
-}
-
 func TestBytesToHTML(t *testing.T) {
 	c := qt.New(t)
 	c.Assert(helpers.BytesToHTML([]byte("dobedobedo")), qt.Equals, template.HTML("dobedobedo"))
@@ -35,9 +35,9 @@ func TestResolveMarkup(t *testing.T) {
 		{"md", "markdown"},
 		{"markdown", "markdown"},
 		{"mdown", "markdown"},
-		{"asciidocext", "asciidoc"},
-		{"adoc", "asciidoc"},
-		{"ad", "asciidoc"},
+		{"asciidocext", "asciidocext"},
+		{"adoc", "asciidocext"},
+		{"ad", "asciidocext"},
 		{"rst", "rst"},
 		{"pandoc", "pandoc"},
 		{"pdc", "pandoc"},
@@ -374,7 +374,7 @@ func cacheDirDefault(cacheDir string) string {
 	// Turns out that Cloudflare also sets NETLIFY=true in its build environment,
 	// but all of these 3 should not give any false positives.
 	if os.Getenv("NETLIFY") == "true" && os.Getenv("PULL_REQUEST") != "" && os.Getenv("DEPLOY_PRIME_URL") != "" {
-		// Netlify's cache behavior is not documented, the currently best example
+		// Netlify's cache behaviour is not documented, the currently best example
 		// is this project:
 		// https://github.com/philhawksworth/content-shards/blob/master/gulpfile.js
 		return "/opt/build/cache/hugo_cache/"
@@ -16,7 +16,6 @@ package hqt
 import (
 	"errors"
 	"fmt"
-	"math"
 	"reflect"
 	"strings"

@@ -39,11 +38,6 @@ var IsSameType qt.Checker = &typeChecker{
 	argNames: []string{"got", "want"},
 }

-// IsSameFloat64 asserts that two float64 values are equal within a small delta.
-var IsSameFloat64 = qt.CmpEquals(cmp.Comparer(func(a, b float64) bool {
-	return math.Abs(a-b) < 0.0001
-}))
-
 type argNames []string

 func (a argNames) ArgNames() []string {
@@ -42,7 +42,7 @@ var LanguageDirsMerger overlayfs.DirsMerger = func(lofi, bofi []fs.DirEntry) []f

 // AppendDirsMerger merges two directories keeping all regular files
 // with the first slice as the base.
-// Duplicate directories in the second slice will be ignored.
+// Duplicate directories in the secnond slice will be ignored.
 // This strategy is used for the i18n and data fs where we need all entries.
 var AppendDirsMerger overlayfs.DirsMerger = func(lofi, bofi []fs.DirEntry) []fs.DirEntry {
 	for _, fi1 := range bofi {
@@ -73,9 +73,7 @@ type FileMeta struct {
 	InclusionFilter *glob.FilenameFilter

 	// Rename the name part of the file (not the directory).
-	// Returns the new name and a boolean indicating if the file
-	// should be included.
-	Rename func(name string, toFrom bool) (string, bool)
+	Rename func(name string, toFrom bool) string
 }

 func (m *FileMeta) Copy() *FileMeta {
@@ -29,13 +29,57 @@ const (
 	FilenameHugoStatsJSON = "hugo_stats.json"
 )

-func IsGoTmplExt(ext string) bool {
-	return ext == "gotmpl"
+var (
+	// This should be the only list of valid extensions for content files.
+	contentFileExtensions = []string{
+		"html", "htm",
+		"mdown", "markdown", "md",
+		"asciidoc", "adoc", "ad",
+		"rest", "rst",
+		"org",
+		"pandoc", "pdc",
+	}
+
+	contentFileExtensionsSet map[string]bool
+
+	htmlFileExtensions = []string{
+		"html", "htm",
+	}
+
+	htmlFileExtensionsSet map[string]bool
+)
+
+func init() {
+	contentFileExtensionsSet = make(map[string]bool)
+	for _, ext := range contentFileExtensions {
+		contentFileExtensionsSet[ext] = true
+	}
+	htmlFileExtensionsSet = make(map[string]bool)
+	for _, ext := range htmlFileExtensions {
+		htmlFileExtensionsSet[ext] = true
+	}
 }

-// Supported data file extensions for _content.* files.
-func IsContentDataExt(ext string) bool {
-	return IsGoTmplExt(ext)
+func IsContentFile(filename string) bool {
+	return contentFileExtensionsSet[strings.TrimPrefix(filepath.Ext(filename), ".")]
+}
+
+func IsIndexContentFile(filename string) bool {
+	if !IsContentFile(filename) {
+		return false
+	}
+
+	base := filepath.Base(filename)
+
+	return strings.HasPrefix(base, "index.") || strings.HasPrefix(base, "_index.")
+}
+
+func IsHTML(ext string) bool {
+	return htmlFileExtensionsSet[ext]
+}
+
+func IsContentExt(ext string) bool {
+	return contentFileExtensionsSet[ext]
 }

 const (
@@ -49,8 +93,6 @@ const (

 	FolderResources = "resources"
 	FolderJSConfig  = "_jsconfig" // Mounted below /assets with postcss.config.js etc.
-
-	NameContentData = "_content"
 )

 var (
@@ -14,11 +14,22 @@
 package files

 import (
+	"path/filepath"
 	"testing"

 	qt "github.com/frankban/quicktest"
 )

+func TestIsContentFile(t *testing.T) {
+	c := qt.New(t)
+
+	c.Assert(IsContentFile(filepath.FromSlash("my/file.md")), qt.Equals, true)
+	c.Assert(IsContentFile(filepath.FromSlash("my/file.ad")), qt.Equals, true)
+	c.Assert(IsContentFile(filepath.FromSlash("textfile.txt")), qt.Equals, false)
+	c.Assert(IsContentExt("md"), qt.Equals, true)
+	c.Assert(IsContentExt("json"), qt.Equals, false)
+}
+
 func TestComponentFolders(t *testing.T) {
 	c := qt.New(t)

@@ -1,4 +1,4 @@
-// Copyright 2024 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.
@@ -21,7 +21,6 @@ import (
 	"path"
 	"path/filepath"
 	"strings"
-	"sync/atomic"

 	"github.com/gohugoio/hugo/common/herrors"
 	"github.com/gohugoio/hugo/common/paths"
@@ -44,7 +43,7 @@ var _ ReverseLookupProvder = (*RootMappingFs)(nil)
 func NewRootMappingFs(fs afero.Fs, rms ...RootMapping) (*RootMappingFs, error) {
 	rootMapToReal := radix.New()
 	realMapToRoot := radix.New()
-	id := fmt.Sprintf("rfs-%d", rootMappingFsCounter.Add(1))
+	var virtualRoots []RootMapping

 	addMapping := func(key string, rm RootMapping, to *radix.Tree) {
 		var mappings []RootMapping
@@ -78,49 +77,45 @@ func NewRootMappingFs(fs afero.Fs, rms ...RootMapping) (*RootMappingFs, error) {
 			rm.Meta = NewFileMeta()
 		}

-		if rm.FromBase == "" {
-			panic(" rm.FromBase is empty")
-		}
-
-		rm.Meta.Component = rm.FromBase
-		rm.Meta.Module = rm.Module
-		rm.Meta.ModuleOrdinal = rm.ModuleOrdinal
-		rm.Meta.IsProject = rm.IsProject
-		rm.Meta.BaseDir = rm.ToBase
-
 		if !fi.IsDir() {
 			// We do allow single file mounts.
 			// However, the file system logic will be much simpler with just directories.
-			// So, convert this mount into a directory mount with a renamer,
-			// which will tell the caller if name should be included.
+			// So, convert this mount into a directory mount with a nameTo filter and renamer.
 			dirFrom, nameFrom := filepath.Split(rm.From)
 			dirTo, nameTo := filepath.Split(rm.To)
 			dirFrom, dirTo = strings.TrimSuffix(dirFrom, filepathSeparator), strings.TrimSuffix(dirTo, filepathSeparator)
 			rm.From = dirFrom
-			singleFileMeta := rm.Meta.Copy()
-			singleFileMeta.Name = nameFrom
-			rm.fiSingleFile = NewFileMetaInfo(fi, singleFileMeta)
+
+			fi, err = fs.Stat(rm.To)
+			if err != nil {
+				if herrors.IsNotExist(err) {
+					continue
+				}
+				return nil, err
+			}
+
+			rm.fiSingleFile = NewFileMetaInfo(fi, rm.Meta.Copy())
 			rm.To = dirTo

-			rm.Meta.Rename = func(name string, toFrom bool) (string, bool) {
+			rm.Meta.Rename = func(name string, toFrom bool) string {
 				if toFrom {
 					if name == nameTo {
-						return nameFrom, true
+						return nameFrom
 					}
-					return "", false
+					return name
 				}

 				if name == nameFrom {
-					return nameTo, true
+					return nameTo
 				}

-				return "", false
+				return name
 			}
 			nameToFilename := filepathSeparator + nameTo

 			rm.Meta.InclusionFilter = rm.Meta.InclusionFilter.Append(glob.NewFilenameFilterForInclusionFunc(
 				func(filename string) bool {
-					return nameToFilename == filename
+					return strings.HasPrefix(nameToFilename, filename)
 				},
 			))

@@ -134,9 +129,19 @@ func NewRootMappingFs(fs afero.Fs, rms ...RootMapping) (*RootMappingFs, error) {
 			}
 		}

+		if rm.FromBase == "" {
+			panic(" rm.FromBase is empty")
+		}
+
 		// Extract "blog" from "content/blog"
 		rm.path = strings.TrimPrefix(strings.TrimPrefix(rm.From, rm.FromBase), filepathSeparator)
+
 		rm.Meta.SourceRoot = fi.(MetaProvider).Meta().Filename
+		rm.Meta.BaseDir = rm.ToBase
+		rm.Meta.Module = rm.Module
+		rm.Meta.ModuleOrdinal = rm.ModuleOrdinal
+		rm.Meta.Component = rm.FromBase
+		rm.Meta.IsProject = rm.IsProject

 		meta := rm.Meta.Copy()

@@ -155,10 +160,12 @@ func NewRootMappingFs(fs afero.Fs, rms ...RootMapping) (*RootMappingFs, error) {

 		addMapping(rev, rm, realMapToRoot)

+		virtualRoots = append(virtualRoots, rm)
 	}

+	rootMapToReal.Insert(filepathSeparator, virtualRoots)
+
 	rfs := &RootMappingFs{
-		id:            id,
 		Fs:            fs,
 		rootMapToReal: rootMapToReal,
 		realMapToRoot: realMapToRoot,
@@ -230,14 +237,11 @@ var _ FilesystemUnwrapper = (*RootMappingFs)(nil)
 // is directories only, and they will be returned in Readdir and Readdirnames
 // in the order given.
 type RootMappingFs struct {
-	id string
 	afero.Fs
 	rootMapToReal *radix.Tree
 	realMapToRoot *radix.Tree
 }

-var rootMappingFsCounter atomic.Int32
-
 func (fs *RootMappingFs) Mounts(base string) ([]FileMetaInfo, error) {
 	base = filepathSeparator + fs.cleanName(base)
 	roots := fs.getRootsWithPrefix(base)
@@ -248,11 +252,13 @@ func (fs *RootMappingFs) Mounts(base string) ([]FileMetaInfo, error) {

 	fss := make([]FileMetaInfo, len(roots))
 	for i, r := range roots {
+
 		if r.fiSingleFile != nil {
 			// A single file mount.
 			fss[i] = r.fiSingleFile
 			continue
 		}
+
 		bfs := NewBasePathFs(fs.Fs, r.To)
 		fs := bfs
 		if r.Meta.InclusionFilter != nil {
@@ -263,16 +269,17 @@ func (fs *RootMappingFs) Mounts(base string) ([]FileMetaInfo, error) {
 		if err != nil {
 			return nil, fmt.Errorf("RootMappingFs.Dirs: %w", err)
 		}
+
+		if !fi.IsDir() {
+			fi.(FileMetaInfo).Meta().Merge(r.Meta)
+		}
+
 		fss[i] = fi.(FileMetaInfo)
 	}

 	return fss, nil
 }

-func (fs *RootMappingFs) Key() string {
-	return fs.id
-}
-
 func (fs *RootMappingFs) UnwrapFilesystem() afero.Fs {
 	return fs.Fs
 }
@@ -330,16 +337,16 @@ func (c ComponentPath) ComponentPathJoined() string {
 }

 type ReverseLookupProvder interface {
-	ReverseLookup(filename string) ([]ComponentPath, error)
-	ReverseLookupComponent(component, filename string) ([]ComponentPath, error)
+	ReverseLookup(filename string, checkExists bool) ([]ComponentPath, error)
+	ReverseLookupComponent(component, filename string, checkExists bool) ([]ComponentPath, error)
 }

 // func (fs *RootMappingFs) ReverseStat(filename string) ([]FileMetaInfo, error)
-func (fs *RootMappingFs) ReverseLookup(filename string) ([]ComponentPath, error) {
-	return fs.ReverseLookupComponent("", filename)
+func (fs *RootMappingFs) ReverseLookup(filename string, checkExists bool) ([]ComponentPath, error) {
+	return fs.ReverseLookupComponent("", filename, checkExists)
 }

-func (fs *RootMappingFs) ReverseLookupComponent(component, filename string) ([]ComponentPath, error) {
+func (fs *RootMappingFs) ReverseLookupComponent(component, filename string, checkExists bool) ([]ComponentPath, error) {
 	filename = fs.cleanName(filename)
 	key := filepathSeparator + filename

@@ -358,18 +365,19 @@ func (fs *RootMappingFs) ReverseLookupComponent(component, filename string) ([]C
 		if component != "" && first.FromBase != component {
 			continue
 		}
-
-		var filename string
 		if first.Meta.Rename != nil {
-			// Single file mount.
-			if newname, ok := first.Meta.Rename(name, true); ok {
-				filename = filepathSeparator + filepath.Join(first.path, dir, newname)
-			} else {
+			name = first.Meta.Rename(name, true)
+		}
+
+		// Now we know that this file _could_ be in this fs.
+		filename := filepathSeparator + filepath.Join(first.path, dir, name)
+
+		if checkExists {
+			// Confirm that it exists.
+			_, err := fs.Stat(first.FromBase + filename)
+			if err != nil {
 				continue
 			}
-		} else {
-			// Now we know that this file _could_ be in this fs.
-			filename = filepathSeparator + filepath.Join(first.path, dir, name)
 		}

 		cps = append(cps, ComponentPath{
@@ -412,7 +420,6 @@ func (fs *RootMappingFs) getRoots(key string) (string, []RootMapping) {
 	for {
 		var found bool
 		ss, vv, found := tree.LongestPrefix(key)
-
 		if !found || (levels < 2 && ss == key) {
 			break
 		}
@@ -475,11 +482,6 @@ func (fs *RootMappingFs) newUnionFile(fis ...FileMetaInfo) (afero.File, error) {
 		return fis[0].Meta().Open()
 	}

-	if !fis[0].IsDir() {
-		// Pick the last file mount.
-		return fis[len(fis)-1].Meta().Open()
-	}
-
 	openers := make([]func() (afero.File, error), len(fis))
 	for i := len(fis) - 1; i >= 0; i-- {
 		fi := fis[i]
@@ -568,11 +570,9 @@ func (rfs *RootMappingFs) collectDirEntries(prefix string) ([]iofs.DirEntry, err
 				}
 				fi = newDirNameOnlyFileInfo(name, meta, opener)
 			} else if rm.Meta.Rename != nil {
-				n, ok := rm.Meta.Rename(fi.Name(), true)
-				if !ok {
-					continue
+				if n := rm.Meta.Rename(fi.Name(), true); n != fi.Name() {
+					fi.(MetaProvider).Meta().Name = n
 				}
-				fi.(MetaProvider).Meta().Name = n
 			}
 			fis = append(fis, fi)
 		}
@@ -617,16 +617,25 @@ func (rfs *RootMappingFs) collectDirEntries(prefix string) ([]iofs.DirEntry, err

 		rms := v.([]RootMapping)
 		for _, rm := range rms {
+			if !rm.fi.IsDir() {
+				// A single file mount
+				fis = append(fis, rm.fi)
+				continue
+			}
 			name := filepath.Base(rm.From)
 			if seen[name] {
 				continue
 			}
 			seen[name] = true
+
 			opener := func() (afero.File, error) {
 				return rfs.Open(rm.From)
 			}
+
 			fi := newDirNameOnlyFileInfo(name, rm.Meta, opener)
+
 			fis = append(fis, fi)
+
 		}

 		return false
@@ -652,28 +661,6 @@ func (rfs *RootMappingFs) collectDirEntries(prefix string) ([]iofs.DirEntry, err
 }

 func (fs *RootMappingFs) doStat(name string) ([]FileMetaInfo, error) {
-	fis, err := fs.doDoStat(name)
-	if err != nil {
-		return nil, err
-	}
-	// Sanity check. Check that all is either file or directories.
-	var isDir, isFile bool
-	for _, fi := range fis {
-		if fi.IsDir() {
-			isDir = true
-		} else {
-			isFile = true
-		}
-	}
-	if isDir && isFile {
-		// For now.
-		return nil, os.ErrNotExist
-	}
-
-	return fis, nil
-}
-
-func (fs *RootMappingFs) doDoStat(name string) ([]FileMetaInfo, error) {
 	name = fs.cleanName(name)
 	key := filepathSeparator + name

@@ -714,20 +701,48 @@ func (fs *RootMappingFs) doDoStat(name string) ([]FileMetaInfo, error) {
 		return nil, err
 	}

-	return []FileMetaInfo{newDirNameOnlyFileInfo(name, roots[0].Meta, fs.virtualDirOpener(name))}, nil
+	fileCount := 0
+	var wasFiltered bool
+	for _, root := range roots {
+		meta := root.fi.Meta()
+		if !meta.InclusionFilter.Match(strings.TrimPrefix(meta.Filename, meta.SourceRoot), root.fi.IsDir()) {
+			wasFiltered = true
+			continue
+		}
+
+		if !root.fi.IsDir() {
+			fileCount++
+		}
+		if fileCount > 1 {
+			break
+		}
+	}
+
+	if fileCount == 0 {
+		if wasFiltered {
+			return nil, os.ErrNotExist
+		}
+		// Dir only.
+		return []FileMetaInfo{newDirNameOnlyFileInfo(name, roots[0].Meta, fs.virtualDirOpener(name))}, nil
+	}
+
+	if fileCount > 1 {
+		// Not supported by this filesystem.
+		return nil, fmt.Errorf("found multiple files with name %q, use .Readdir or the source filesystem directly", name)
+	}
+
+	return []FileMetaInfo{roots[0].fi}, nil
 }

 func (fs *RootMappingFs) statRoot(root RootMapping, filename string) (FileMetaInfo, error) {
 	dir, name := filepath.Split(filename)
 	if root.Meta.Rename != nil {
-		n, ok := root.Meta.Rename(name, false)
-		if !ok {
-			return nil, os.ErrNotExist
+		if n := root.Meta.Rename(name, false); n != name {
+			filename = filepath.Join(dir, n)
 		}
-		filename = filepath.Join(dir, n)
 	}

-	if !root.Meta.InclusionFilter.Match(root.trimFrom(filename), true) {
+	if !root.Meta.InclusionFilter.Match(root.trimFrom(filename), root.fi.IsDir()) {
 		return nil, os.ErrNotExist
 	}

@@ -738,27 +753,24 @@ func (fs *RootMappingFs) statRoot(root RootMapping, filename string) (FileMetaIn
 	}

 	var opener func() (afero.File, error)
-	if !fi.IsDir() {
-		// Open the file directly.
-		// Opens the real file directly.
-		opener = func() (afero.File, error) {
-			return fs.Fs.Open(filename)
-		}
-	} else if root.Meta.Rename != nil {
-		// A single file mount where we have mounted the containing directory.
-		n, ok := root.Meta.Rename(fi.Name(), true)
-		if !ok {
-			return nil, os.ErrNotExist
-		}
-		meta := fi.(MetaProvider).Meta()
-		meta.Name = n
-		// Opens the real file directly.
-		opener = func() (afero.File, error) {
-			return fs.Fs.Open(filename)
-		}
-	} else {
+	if fi.IsDir() {
 		// Make sure metadata gets applied in ReadDir.
 		opener = fs.realDirOpener(filename, root.Meta)
+	} else {
+		if root.Meta.Rename != nil {
+			if n := root.Meta.Rename(fi.Name(), true); n != fi.Name() {
+				meta := fi.(MetaProvider).Meta()
+
+				meta.Name = n
+
+			}
+		}
+
+		// Opens the real file directly.
+		opener = func() (afero.File, error) {
+			return fs.Fs.Open(filename)
+		}
+
 	}

 	fim := decorateFileInfo(fi, opener, "", root.Meta)
@@ -822,7 +834,7 @@ func (f *rootMappingDir) ReadDir(count int) ([]iofs.DirEntry, error) {
 	return f.fs.collectDirEntries(f.name)
 }

-// Sentinel error to signal that a file is a directory.
+// Sentinal error to signal that a file is a directory.
 var errIsDir = errors.New("isDir")

 func (f *rootMappingDir) Stat() (iofs.FileInfo, error) {
@@ -276,20 +276,15 @@ func TestRootMappingFsMount(t *testing.T) {

 	// Test ReverseLookup.
 	// Single file mounts.
-	cps, err := rfs.ReverseLookup(filepath.FromSlash("singlefiles/no.txt"))
+	cps, err := rfs.ReverseLookup(filepath.FromSlash("singlefiles/no.txt"), true)
 	c.Assert(err, qt.IsNil)
 	c.Assert(cps, qt.DeepEquals, []ComponentPath{
 		{Component: "content", Path: "singles/p1.md", Lang: "no"},
-	})
-
-	cps, err = rfs.ReverseLookup(filepath.FromSlash("singlefiles/sv.txt"))
-	c.Assert(err, qt.IsNil)
-	c.Assert(cps, qt.DeepEquals, []ComponentPath{
 		{Component: "content", Path: "singles/p1.md", Lang: "sv"},
 	})

 	// File inside directory mount.
-	cps, err = rfs.ReverseLookup(filepath.FromSlash("mynoblogcontent/test.txt"))
+	cps, err = rfs.ReverseLookup(filepath.FromSlash("mynoblogcontent/test.txt"), true)
 	c.Assert(err, qt.IsNil)
 	c.Assert(cps, qt.DeepEquals, []ComponentPath{
 		{Component: "content", Path: "blog/test.txt", Lang: "no"},
@@ -23,7 +23,6 @@ import (
 	"github.com/gohugoio/hugo/common/herrors"
 	"github.com/gohugoio/hugo/common/loggers"
 	"github.com/gohugoio/hugo/common/paths"
-	"github.com/gohugoio/hugo/media"

 	"github.com/spf13/afero"
 )
@@ -51,8 +50,7 @@ type WalkwayConfig struct {
 	Root string

 	// The logger to use.
-	Logger     loggers.Logger
-	PathParser *paths.PathParser
+	Logger loggers.Logger

 	// One or both of these may be pre-set.
 	Info       FileMetaInfo               // The start info.
@@ -74,10 +72,6 @@ func NewWalkway(cfg WalkwayConfig) *Walkway {
 		panic("fs must be set")
 	}

-	if cfg.PathParser == nil {
-		cfg.PathParser = media.DefaultPathParser
-	}
-
 	logger := cfg.Logger
 	if logger == nil {
 		logger = loggers.NewDefault()
@@ -167,7 +161,7 @@ func (w *Walkway) walk(path string, info FileMetaInfo, dirEntries []FileMetaInfo
 		dirEntries = DirEntriesToFileMetaInfos(fis)
 		for _, fi := range dirEntries {
 			if fi.Meta().PathInfo == nil {
-				fi.Meta().PathInfo = w.cfg.PathParser.Parse("", filepath.Join(pathRel, fi.Name()))
+				fi.Meta().PathInfo = paths.Parse("", filepath.Join(pathRel, fi.Name()))
 			}
 		}

@@ -329,7 +329,7 @@ cascade:

 		counters := &buildCounters{}
 		b.Build(BuildCfg{testCounters: counters})
-		b.Assert(int(counters.contentRenderCounter.Load()), qt.Equals, 1)
+		b.Assert(int(counters.contentRenderCounter.Load()), qt.Equals, 2)

 		b.AssertFileContent("public/post/index.html", `Banner: post.jpg|Layout: postlayout|Type: posttype|Content: <p>content edit</p>`)
 		b.AssertFileContent("public/post/dir/p1/index.html", `Banner: post.jpg|Layout: postlayout|`)
@@ -672,59 +672,8 @@ S1|p1:|p2:p2|
 	})
 }

-func TestCascadeEditIssue12449(t *testing.T) {
-	t.Parallel()
-
-	files := `
-- hugo.toml --
-baseURL = "https://example.com"
-disableKinds = ['sitemap','rss', 'home', 'taxonomy','term']
-disableLiveReload = true
-- layouts/_default/list.html --
-Title: {{ .Title }}|{{ .Content }}|cascadeparam: {{ .Params.cascadeparam }}|
-- layouts/_default/single.html --
-Title: {{ .Title }}|{{ .Content }}|cascadeparam: {{ .Params.cascadeparam }}|
-- content/mysect/_index.md --
---
-title: mysect
-cascade:
-  description: descriptionvalue
-  params:
-    cascadeparam: cascadeparamvalue
---
-mysect-content|
-- content/mysect/p1/index.md --
---
-slug: p1
---
-p1-content|
-- content/mysect/subsect/_index.md --
---
-slug: subsect
---
-subsect-content|
-`
-
-	b := TestRunning(t, files)
-
-	// Make the cascade set the title.
-	b.EditFileReplaceAll("content/mysect/_index.md", "description: descriptionvalue", "title: cascadetitle").Build()
-	b.AssertFileContent("public/mysect/subsect/index.html", "Title: cascadetitle|")
-
-	// Edit cascade title.
-	b.EditFileReplaceAll("content/mysect/_index.md", "title: cascadetitle", "title: cascadetitle-edit").Build()
-	b.AssertFileContent("public/mysect/subsect/index.html", "Title: cascadetitle-edit|")
-
-	// Revert title change.
-	// The step below failed in #12449.
-	b.EditFileReplaceAll("content/mysect/_index.md", "title: cascadetitle-edit", "description: descriptionvalue").Build()
-	b.AssertFileContent("public/mysect/subsect/index.html", "Title: |")
-}
-
 // Issue 11977.
 func TestCascadeExtensionInPath(t *testing.T) {
-	t.Parallel()
-
 	files := `
 -- hugo.toml --
 baseURL = "https://example.org"
@@ -751,93 +700,3 @@ title: "Post 1"
 	b.Assert(err, qt.IsNotNil)
 	b.AssertLogContains(`cascade target path "/posts/post-1.de.md" looks like a path with an extension; since Hugo v0.123.0 this will not match anything, see  https://gohugo.io/methods/page/path/`)
 }
-
-func TestCascadeExtensionInPathIgnore(t *testing.T) {
-	t.Parallel()
-
-	files := `
-- hugo.toml --
-baseURL = "https://example.org"
-ignoreLogs   = ['cascade-pattern-with-extension']
-[languages]
-[languages.en]
-weight = 1
-[languages.de]
-- content/_index.de.md --
-+++
-[[cascade]]
-[cascade.params]
-foo = 'bar'
-[cascade._target]
-path = '/posts/post-1.de.md'
-+++
-- content/posts/post-1.de.md --
---
-title: "Post 1"
---
-- layouts/_default/single.html --
-{{ .Title }}|{{ .Params.foo }}$
-`
-	b := Test(t, files)
-	b.AssertLogNotContains(`looks like a path with an extension`)
-}
-
-func TestCascadConfigExtensionInPath(t *testing.T) {
-	t.Parallel()
-
-	files := `
-- hugo.toml --
-baseURL = "https://example.org"
-[[cascade]]
-[cascade.params]
-foo = 'bar'
-[cascade._target]
-path = '/p1.md'
-`
-	b, err := TestE(t, files)
-	b.Assert(err, qt.IsNotNil)
-	b.AssertLogContains(`looks like a path with an extension`)
-}
-
-func TestCascadConfigExtensionInPathIgnore(t *testing.T) {
-	t.Parallel()
-
-	files := `
-- hugo.toml --
-baseURL = "https://example.org"
-ignoreLogs   = ['cascade-pattern-with-extension']
-[[cascade]]
-[cascade.params]
-foo = 'bar'
-[cascade._target]
-path = '/p1.md'
-`
-	b := Test(t, files)
-	b.AssertLogNotContains(`looks like a path with an extension`)
-}
-
-func TestCascadeIssue12172(t *testing.T) {
-	t.Parallel()
-
-	files := `
-- hugo.toml --
-disableKinds = ['rss','sitemap','taxonomy','term']
-[[cascade]]
-headless = true
-[cascade._target]
-path = '/s1**'
-- content/s1/p1.md --
---
-title: p1
---
-- layouts/_default/single.html --
-{{ .Title }}|
-- layouts/_default/list.html --
-{{ .Title }}|
-  `
-	b := Test(t, files)
-
-	b.AssertFileExists("public/index.html", true)
-	b.AssertFileExists("public/s1/index.html", false)
-	b.AssertFileExists("public/s1/p1/index.html", false)
-}
@@ -490,10 +490,11 @@ name = "menu-theme"
 			got := b.Configs.Base

 			if mergeStrategy == "none" {
-				b.Assert(got.Sitemap, qt.DeepEquals, config.SitemapConfig{ChangeFreq: "", Disable: false, Priority: -1, Filename: "sitemap.xml"})
+				b.Assert(got.Sitemap, qt.DeepEquals, config.SitemapConfig{ChangeFreq: "", Priority: -1, Filename: "sitemap.xml"})
+
 				b.AssertFileContent("public/sitemap.xml", "schemas/sitemap")
 			} else {
-				b.Assert(got.Sitemap, qt.DeepEquals, config.SitemapConfig{ChangeFreq: "monthly", Disable: false, Priority: -1, Filename: "sitemap.xml"})
+				b.Assert(got.Sitemap, qt.DeepEquals, config.SitemapConfig{ChangeFreq: "monthly", Priority: -1, Filename: "sitemap.xml"})
 				b.AssertFileContent("public/sitemap.xml", "<changefreq>monthly</changefreq>")
 			}
 		})
@@ -507,12 +508,12 @@ func TestLoadConfigFromThemeDir(t *testing.T) {
 theme = "test-theme"

 [params]
-m1 = "mv1"
+m1 = "mv1"	
 `

 	themeConfig := `
 [params]
-t1 = "tv1"
+t1 = "tv1"	
 t2 = "tv2"
 `

@@ -884,9 +885,9 @@ ThisIsAParam: {{ site.Params.thisIsAParam }}
 	).BuildE()

 	b.Assert(err, qt.IsNil)
-	b.AssertFileContent("public/index.html", `
+	b.AssertFileContent("public/index.html", `		
 MyParam: enParamValue
-ThisIsAParam: thisIsAParamValue
+ThisIsAParam: thisIsAParamValue	
 `)
 }

@@ -918,7 +919,7 @@ title: "My Swedish Section"
 -- layouts/index.html --
 LanguageCode: {{ eq site.LanguageCode site.Language.LanguageCode }}|{{ site.Language.LanguageCode }}|
 {{ range $i, $e := (slice site .Site) }}
-{{ $i }}|AllPages: {{ len .AllPages }}|Sections: {{ if .Sections }}true{{ end }}| Author: {{ .Authors }}|BuildDrafts: {{ .BuildDrafts }}|IsMultilingual: {{ .IsMultiLingual }}|Param: {{ .Language.Params.myparam }}|Language string: {{ .Language }}|Languages: {{ .Languages }}
+{{ $i }}|AllPages: {{ len .AllPages }}|Sections: {{ if .Sections }}true{{ end }}| Author: {{ .Authors }}|BuildDrafts: {{ .BuildDrafts }}|IsMultiLingual: {{ .IsMultiLingual }}|Param: {{ .Language.Params.myparam }}|Language string: {{ .Language }}|Languages: {{ .Languages }}
 {{ end }}


@@ -938,9 +939,9 @@ LanguageCode: {{ eq site.LanguageCode site.Language.LanguageCode }}|{{ site.Lang
 	b.AssertFileContent("public/index.html", `
 AllPages: 4|
 Sections: true|
-Param: enParamValue
-Param: enParamValue
-IsMultilingual: true
+Param: enParamValue	
+Param: enParamValue	
+IsMultiLingual: true
 LanguageCode: true|en-US|
 `)

@@ -1061,7 +1062,7 @@ Home
 	).BuildE()

 	b.Assert(err, qt.IsNil)
-	b.AssertFileContent("public/index.html", `
+	b.AssertFileContent("public/index.html", `		
 Home
 `)

@@ -1094,7 +1095,7 @@ HTML.
 HTACCESS.


-
+	
 `
 	b := Test(t, files)

@@ -1110,7 +1111,7 @@ languageCode = "en-US"
 -- layouts/index.html --
 LanguageCode: {{ .Site.LanguageCode }}|{{ site.Language.LanguageCode }}|

-
+	
 `
 	b := Test(t, files)

@@ -1136,7 +1137,7 @@ suffixes = ["bar"]
 -- layouts/index.html --
 Home.

-
+	
 `
 	b := Test(t, files)

@@ -1144,7 +1145,7 @@ Home.

 	enConfig := b.H.Sites[0].conf
 	m, _ := enConfig.MediaTypes.Config.GetByType("text/html")
-	b.Assert(m.Suffixes(), qt.DeepEquals, []string{"html", "htm"})
+	b.Assert(m.Suffixes(), qt.DeepEquals, []string{"html"})

 	svConfig := b.H.Sites[1].conf
 	f, _ := svConfig.OutputFormats.Config.GetByName("html")
@@ -1163,8 +1164,8 @@ func TestConfigMiscPanics(t *testing.T) {
 params:
 -- layouts/index.html --
 Foo: {{ site.Params.foo }}|
-
-
+	
+		
 	`
 		b := Test(t, files)

@@ -1187,8 +1188,8 @@ defaultContentLanguage = "en"
 	weight = 1
 -- layouts/index.html --
 Foo: {{ site.Params.foo }}|
-
-
+	
+		
 	`
 		b, err := NewIntegrationTestBuilder(
 			IntegrationTestConfig{
@@ -1214,8 +1215,8 @@ languageCode = "en"
 languageName = "English"
 weight = 1

-
-
+	
+		
 	`
 		b, err := NewIntegrationTestBuilder(
 			IntegrationTestConfig{
@@ -1240,7 +1241,7 @@ contentDir = "mycontent"
 -- layouts/index.html --
 Home.

-
+	
 `
 	b := Test(t, files)

@@ -1342,7 +1343,7 @@ disabled = true
 -- layouts/index.html --
 Home.

-
+	
 `
 	b := Test(t, files)

@@ -1437,7 +1438,7 @@ home = ["html"]
 -- hugo.toml --
 baseURL = "https://example.com"
 disableKinds = ["taxonomy", "term", "RSS", "sitemap", "robotsTXT", "page", "section"]
-
+		
 		`

 		runVariant(t, files, nil)
@@ -1538,22 +1539,3 @@ List.
 	b.AssertLogContains("WARN  DEPRECATED: Kind \"taxonomyterm\" used in disableKinds is deprecated, use \"taxonomy\" instead.\n")
 	b.AssertLogContains("WARN  DEPRECATED: Kind \"taxonomyterm\" used in outputs configuration is deprecated, use \"taxonomy\" instead.\n")
 }
-
-func TestDisableKindsIssue12144(t *testing.T) {
-	files := `
-- hugo.toml --
-disableKinds = ["page"]
-defaultContentLanguage = "pt-br"
-- layouts/index.html --
-Home.
-- content/custom/index.pt-br.md --
---
-title: "P1 pt"
---
-- content/custom/index.en-us.md --
---
-title: "P1 us"
---
-`
-	Test(t, files)
-}
@@ -14,7 +14,6 @@
 package hugolib

 import (
-	"context"
 	"fmt"
 	"path"
 	"path/filepath"
@@ -24,13 +23,10 @@ import (
 	"github.com/bep/logg"
 	"github.com/gohugoio/hugo/common/hugio"
 	"github.com/gohugoio/hugo/common/paths"
-	"github.com/gohugoio/hugo/hugofs/files"
-	"github.com/gohugoio/hugo/hugolib/pagesfromdata"
 	"github.com/gohugoio/hugo/identity"
 	"github.com/gohugoio/hugo/source"

 	"github.com/gohugoio/hugo/resources/page"
-	"github.com/gohugoio/hugo/resources/page/pagemeta"
 	"github.com/gohugoio/hugo/resources/resource"

 	"github.com/gohugoio/hugo/hugofs"
@@ -55,11 +51,9 @@ type contentMapConfig struct {
 var _ contentNodeI = (*resourceSource)(nil)

 type resourceSource struct {
-	langIndex int
-	path      *paths.Path
-	opener    hugio.OpenReadSeekCloser
-	fi        hugofs.FileMetaInfo
-	rc        *pagemeta.ResourceConfig
+	path   *paths.Path
+	opener hugio.OpenReadSeekCloser
+	fi     hugofs.FileMetaInfo

 	r resource.Resource
 }
@@ -70,7 +64,11 @@ func (r resourceSource) clone() *resourceSource {
 }

 func (r *resourceSource) LangIndex() int {
-	return r.langIndex
+	if r.r != nil && r.isPage() {
+		return r.r.(*pageState).s.languagei
+	}
+
+	return r.fi.Meta().LangIndex
 }

 func (r *resourceSource) MarkStale() {
@@ -164,13 +162,12 @@ func (cfg contentMapConfig) getTaxonomyConfig(s string) (v viewName) {
 	return
 }

-func (m *pageMap) AddFi(fi hugofs.FileMetaInfo, buildConfig *BuildCfg) (pageCount uint64, resourceCount uint64, addErr error) {
+func (m *pageMap) AddFi(fi hugofs.FileMetaInfo) error {
 	if fi.IsDir() {
-		return
+		return nil
 	}

 	insertResource := func(fim hugofs.FileMetaInfo) error {
-		resourceCount++
 		pi := fi.Meta().PathInfo
 		key := pi.Base()
 		tree := m.treeResources
@@ -184,7 +181,7 @@ func (m *pageMap) AddFi(fi hugofs.FileMetaInfo, buildConfig *BuildCfg) (pageCoun

 		var rs *resourceSource
 		if pi.IsContent() {
-			// Create the page now as we need it at assembly time.
+			// Create the page now as we need it at assemembly time.
 			// The other resources are created if needed.
 			pageResource, pi, err := m.s.h.newPage(
 				&pageMeta{
@@ -196,15 +193,11 @@ func (m *pageMap) AddFi(fi hugofs.FileMetaInfo, buildConfig *BuildCfg) (pageCoun
 			if err != nil {
 				return err
 			}
-			if pageResource == nil {
-				// Disabled page.
-				return nil
-			}
 			key = pi.Base()

-			rs = &resourceSource{r: pageResource, langIndex: pageResource.s.languagei}
+			rs = &resourceSource{r: pageResource}
 		} else {
-			rs = &resourceSource{path: pi, opener: r, fi: fim, langIndex: fim.Meta().LangIndex}
+			rs = &resourceSource{path: pi, opener: r, fi: fim}
 		}

 		tree.InsertIntoValuesDimension(key, rs)
@@ -223,27 +216,14 @@ func (m *pageMap) AddFi(fi hugofs.FileMetaInfo, buildConfig *BuildCfg) (pageCoun
 			},
 		))
 		if err := insertResource(fi); err != nil {
-			addErr = err
-			return
+			return err
 		}
-	case paths.PathTypeContentData:
-		pc, rc, err := m.addPagesFromGoTmplFi(fi, buildConfig)
-		pageCount += pc
-		resourceCount += rc
-		if err != nil {
-			addErr = err
-			return
-		}
-
 	default:
 		m.s.Log.Trace(logg.StringFunc(
 			func() string {
 				return fmt.Sprintf("insert bundle: %q", fi.Meta().Filename)
 			},
 		))
-
-		pageCount++
-
 		// A content file.
 		p, pi, err := m.s.h.newPage(
 			&pageMeta{
@@ -253,164 +233,17 @@ func (m *pageMap) AddFi(fi hugofs.FileMetaInfo, buildConfig *BuildCfg) (pageCoun
 			},
 		)
 		if err != nil {
-			addErr = err
-			return
+			return err
 		}
 		if p == nil {
 			// Disabled page.
-			return
+			return nil
 		}

-		m.treePages.InsertIntoValuesDimensionWithLock(pi.Base(), p)
+		m.treePages.InsertWithLock(pi.Base(), p)

 	}
-	return
-}
-
-func (m *pageMap) addPagesFromGoTmplFi(fi hugofs.FileMetaInfo, buildConfig *BuildCfg) (pageCount uint64, resourceCount uint64, addErr error) {
-	meta := fi.Meta()
-	pi := meta.PathInfo
-
-	m.s.Log.Trace(logg.StringFunc(
-		func() string {
-			return fmt.Sprintf("insert pages from data file: %q", fi.Meta().Filename)
-		},
-	))
-
-	if !files.IsGoTmplExt(pi.Ext()) {
-		addErr = fmt.Errorf("unsupported data file extension %q", pi.Ext())
-		return
-	}
-
-	s := m.s.h.resolveSite(fi.Meta().Lang)
-	f := source.NewFileInfo(fi)
-	h := s.h
-
-	// Make sure the layouts are initialized.
-	if _, err := h.init.layouts.Do(context.Background()); err != nil {
-		addErr = err
-		return
-	}
-
-	contentAdapter := s.pageMap.treePagesFromTemplateAdapters.Get(pi.Base())
-	var rebuild bool
-	if contentAdapter != nil {
-		// Rebuild
-		contentAdapter = contentAdapter.CloneForGoTmpl(fi)
-		rebuild = true
-	} else {
-		contentAdapter = pagesfromdata.NewPagesFromTemplate(
-			pagesfromdata.PagesFromTemplateOptions{
-				GoTmplFi: fi,
-				Site:     s,
-				DepsFromSite: func(s page.Site) pagesfromdata.PagesFromTemplateDeps {
-					ss := s.(*Site)
-					return pagesfromdata.PagesFromTemplateDeps{
-						TmplFinder: ss.TextTmpl(),
-						TmplExec:   ss.Tmpl(),
-					}
-				},
-				DependencyManager: s.Conf.NewIdentityManager("pagesfromdata"),
-				Watching:          s.Conf.Watching(),
-				HandlePage: func(pt *pagesfromdata.PagesFromTemplate, pc *pagemeta.PageConfig) error {
-					s := pt.Site.(*Site)
-					if err := pc.Compile(pt.GoTmplFi.Meta().PathInfo.Base(), true, "", s.Log, s.conf.MediaTypes.Config); err != nil {
-						return err
-					}
-
-					ps, pi, err := h.newPage(
-						&pageMeta{
-							f: f,
-							s: s,
-							pageMetaParams: &pageMetaParams{
-								pageConfig: pc,
-							},
-						},
-					)
-					if err != nil {
-						return err
-					}
-
-					if ps == nil {
-						// Disabled page.
-						return nil
-					}
-
-					u, n, replaced := s.pageMap.treePages.InsertIntoValuesDimensionWithLock(pi.Base(), ps)
-
-					if h.isRebuild() {
-						if replaced {
-							pt.AddChange(n.GetIdentity())
-						} else {
-							pt.AddChange(u.GetIdentity())
-						}
-					}
-
-					return nil
-				},
-				HandleResource: func(pt *pagesfromdata.PagesFromTemplate, rc *pagemeta.ResourceConfig) error {
-					s := pt.Site.(*Site)
-					if err := rc.Compile(
-						pt.GoTmplFi.Meta().PathInfo.Base(),
-						s.Conf.PathParser(),
-						s.conf.MediaTypes.Config,
-					); err != nil {
-						return err
-					}
-
-					rs := &resourceSource{path: rc.PathInfo, rc: rc, opener: nil, fi: nil, langIndex: s.languagei}
-
-					_, n, replaced := s.pageMap.treeResources.InsertIntoValuesDimensionWithLock(rc.PathInfo.Base(), rs)
-
-					if h.isRebuild() && replaced {
-						pt.AddChange(n.GetIdentity())
-					}
-					return nil
-				},
-			},
-		)
-
-		s.pageMap.treePagesFromTemplateAdapters.Insert(pi.Base(), contentAdapter)
-
-	}
-
-	handleBuildInfo := func(s *Site, bi pagesfromdata.BuildInfo) {
-		resourceCount += bi.NumResourcesAdded
-		pageCount += bi.NumPagesAdded
-		s.handleContentAdapterChanges(bi, buildConfig)
-	}
-
-	bi, err := contentAdapter.Execute(context.Background())
-	if err != nil {
-		addErr = err
-		return
-	}
-	handleBuildInfo(s, bi)
-
-	if !rebuild && bi.EnableAllLanguages {
-		// Clone and insert the adapter for the other sites.
-		for _, ss := range s.h.Sites {
-			if s == ss {
-				continue
-			}
-
-			clone := contentAdapter.CloneForSite(ss)
-
-			// Make sure it gets executed for the first time.
-			bi, err := clone.Execute(context.Background())
-			if err != nil {
-				addErr = err
-				return
-			}
-			handleBuildInfo(ss, bi)
-
-			// Insert into the correct language tree so it get rebuilt on changes.
-			ss.pageMap.treePagesFromTemplateAdapters.Insert(pi.Base(), clone)
-
-		}
-	}
-
-	return
+	return nil
 }

 // The home page is represented with the zero string.
@@ -34,9 +34,7 @@ import (
 	"github.com/gohugoio/hugo/common/types"
 	"github.com/gohugoio/hugo/hugofs/files"
 	"github.com/gohugoio/hugo/hugolib/doctree"
-	"github.com/gohugoio/hugo/hugolib/pagesfromdata"
 	"github.com/gohugoio/hugo/identity"
-	"github.com/gohugoio/hugo/media"
 	"github.com/gohugoio/hugo/output"
 	"github.com/gohugoio/hugo/resources"
 	"github.com/spf13/cast"
@@ -95,15 +93,12 @@ type pageMap struct {
 	// Used for simple page lookups by name, e.g. "mypage.md" or "mypage".
 	pageReverseIndex *contentTreeReverseIndex

-	cachePages1            *dynacache.Partition[string, page.Pages]
-	cachePages2            *dynacache.Partition[string, page.Pages]
+	cachePages             *dynacache.Partition[string, page.Pages]
 	cacheResources         *dynacache.Partition[string, resource.Resources]
 	cacheContentRendered   *dynacache.Partition[string, *resources.StaleValue[contentSummary]]
 	cacheContentPlain      *dynacache.Partition[string, *resources.StaleValue[contentPlainPlainWords]]
 	contentTableOfContents *dynacache.Partition[string, *resources.StaleValue[contentTableOfContents]]

-	contentDataFileSeenItems *maps.Cache[string, map[uint64]bool]
-
 	cfg contentMapConfig
 }

@@ -126,10 +121,6 @@ type pageTrees struct {
 	// This tree contains all taxonomy entries, e.g "/tags/blue/page1"
 	treeTaxonomyEntries *doctree.TreeShiftTree[*weightedContentNode]

-	// Stores the state for _content.gotmpl files.
-	// Mostly releveant for rebuilds.
-	treePagesFromTemplateAdapters *doctree.TreeShiftTree[*pagesfromdata.PagesFromTemplate]
-
 	// A slice of the resource trees.
 	resourceTrees doctree.MutableTrees
 }
@@ -141,7 +132,7 @@ type pageTrees struct {
 func (t *pageTrees) collectAndMarkStaleIdentities(p *paths.Path) []identity.Identity {
 	key := p.Base()
 	var ids []identity.Identity
-	// We need only one identity sample per dimension.
+	// We need only one identity sample per dimensio.
 	nCount := 0
 	cb := func(n contentNodeI) bool {
 		if n == nil {
@@ -230,7 +221,6 @@ func (t pageTrees) Shape(d, v int) *pageTrees {
 	t.treePages = t.treePages.Shape(d, v)
 	t.treeResources = t.treeResources.Shape(d, v)
 	t.treeTaxonomyEntries = t.treeTaxonomyEntries.Shape(d, v)
-	t.treePagesFromTemplateAdapters = t.treePagesFromTemplateAdapters.Shape(d, v)
 	t.createMutableTrees()

 	return &t
@@ -334,19 +324,15 @@ func (m *pageMap) forEeachPageIncludingBundledPages(include predicate.P[*pageSta
 }

 func (m *pageMap) getOrCreatePagesFromCache(
-	cache *dynacache.Partition[string, page.Pages],
 	key string, create func(string) (page.Pages, error),
 ) (page.Pages, error) {
-	if cache == nil {
-		cache = m.cachePages1
-	}
-	return cache.GetOrCreate(key, create)
+	return m.cachePages.GetOrCreate(key, create)
 }

 func (m *pageMap) getPagesInSection(q pageMapQueryPagesInSection) page.Pages {
 	cacheKey := q.Key()

-	pages, err := m.getOrCreatePagesFromCache(nil, cacheKey, func(string) (page.Pages, error) {
+	pages, err := m.getOrCreatePagesFromCache(cacheKey, func(string) (page.Pages, error) {
 		prefix := paths.AddTrailingSlash(q.Path)

 		var (
@@ -362,28 +348,31 @@ func (m *pageMap) getPagesInSection(q pageMapQueryPagesInSection) page.Pages {
 		w := &doctree.NodeShiftTreeWalker[contentNodeI]{
 			Tree:   m.treePages,
 			Prefix: prefix,
-		}
+			Handle: func(key string, n contentNodeI, match doctree.DimensionFlag) (bool, error) {
+				if q.Recursive {
+					if p, ok := n.(*pageState); ok && include(p) {
+						pas = append(pas, p)
+					}
+					return false, nil
+				}
+
+				// We store both leafs and branches in the same tree, so for non-recursive walks,
+				// we need to walk until the end, but can skip
+				// any not belonging to child branches.
+				if otherBranch != "" && strings.HasPrefix(key, otherBranch) {
+					return false, nil
+				}

-		w.Handle = func(key string, n contentNodeI, match doctree.DimensionFlag) (bool, error) {
-			if q.Recursive {
 				if p, ok := n.(*pageState); ok && include(p) {
 					pas = append(pas, p)
 				}
-				return false, nil
-			}

-			if p, ok := n.(*pageState); ok && include(p) {
-				pas = append(pas, p)
-			}
-
-			if n.isContentNodeBranch() {
-				currentBranch := key + "/"
-				if otherBranch == "" || otherBranch != currentBranch {
-					w.SkipPrefix(currentBranch)
+				if n.isContentNodeBranch() {
+					otherBranch = key + "/"
 				}
-				otherBranch = currentBranch
-			}
-			return false, nil
+
+				return false, nil
+			},
 		}

 		err := w.Walk(context.Background())
@@ -411,7 +400,7 @@ func (m *pageMap) getPagesInSection(q pageMapQueryPagesInSection) page.Pages {
 func (m *pageMap) getPagesWithTerm(q pageMapQueryPagesBelowPath) page.Pages {
 	key := q.Key()

-	v, err := m.cachePages1.GetOrCreate(key, func(string) (page.Pages, error) {
+	v, err := m.cachePages.GetOrCreate(key, func(string) (page.Pages, error) {
 		var pas page.Pages
 		include := q.Include
 		if include == nil {
@@ -448,7 +437,7 @@ func (m *pageMap) getPagesWithTerm(q pageMapQueryPagesBelowPath) page.Pages {
 func (m *pageMap) getTermsForPageInTaxonomy(path, taxonomy string) page.Pages {
 	prefix := paths.AddLeadingSlash(taxonomy)

-	v, err := m.cachePages1.GetOrCreate(prefix+path, func(string) (page.Pages, error) {
+	v, err := m.cachePages.GetOrCreate(prefix+path, func(string) (page.Pages, error) {
 		var pas page.Pages

 		err := m.treeTaxonomyEntries.WalkPrefix(
@@ -498,17 +487,12 @@ func (m *pageMap) forEachResourceInPage(

 	rw.Handle = func(resourceKey string, n contentNodeI, match doctree.DimensionFlag) (bool, error) {
 		if isBranch {
-			// A resourceKey always represents a filename with extension.
-			// A page key points to the logical path of a page, which when sourced from the filesystem
-			// may represent a directory (bundles) or a single content file (e.g. p1.md).
-			// So, to avoid any overlapping ambiguity, we start looking from the owning directory.
-			ownerKey, _ := m.treePages.LongestPrefixAll(path.Dir(resourceKey))
+			ownerKey, _ := m.treePages.LongestPrefixAll(resourceKey)
 			if ownerKey != keyPage {
 				// Stop walking downwards, someone else owns this resource.
 				rw.SkipPrefix(ownerKey + "/")
 				return false, nil
 			}
-
 		}
 		return handle(resourceKey, n, match)
 	}
@@ -558,7 +542,7 @@ func (m *pageMap) getOrCreateResourcesForPage(ps *pageState) resource.Resources
 				for _, r := range res2 {
 					var found bool
 					for _, r2 := range res {
-						if r2.(resource.NameNormalizedProvider).NameNormalized() == r.(resource.NameNormalizedProvider).NameNormalized() {
+						if r2.Name() == r.Name() {
 							found = true
 							break
 						}
@@ -596,9 +580,9 @@ func (m *pageMap) getOrCreateResourcesForPage(ps *pageState) resource.Resources

 		sort.SliceStable(res, lessFunc)

-		if len(ps.m.pageConfig.ResourcesMeta) > 0 {
+		if len(ps.m.pageConfig.Resources) > 0 {
 			for i, r := range res {
-				res[i] = resources.CloneWithMetadataFromMapIfNeeded(ps.m.pageConfig.ResourcesMeta, r)
+				res[i] = resources.CloneWithMetadataIfNeeded(ps.m.pageConfig.Resources, r)
 			}
 			sort.SliceStable(res, lessFunc)
 		}
@@ -676,13 +660,12 @@ type contentNodeShifter struct {
 	numLanguages int
 }

-func (s *contentNodeShifter) Delete(n contentNodeI, dimension doctree.Dimension) (contentNodeI, bool, bool) {
+func (s *contentNodeShifter) Delete(n contentNodeI, dimension doctree.Dimension) (bool, bool) {
 	lidx := dimension[0]
 	switch v := n.(type) {
 	case contentNodeIs:
-		deleted := v[lidx]
-		resource.MarkStale(deleted)
-		wasDeleted := deleted != nil
+		resource.MarkStale(v[lidx])
+		wasDeleted := v[lidx] != nil
 		v[lidx] = nil
 		isEmpty := true
 		for _, vv := range v {
@@ -691,11 +674,10 @@ func (s *contentNodeShifter) Delete(n contentNodeI, dimension doctree.Dimension)
 				break
 			}
 		}
-		return deleted, wasDeleted, isEmpty
+		return wasDeleted, isEmpty
 	case resourceSources:
-		deleted := v[lidx]
-		resource.MarkStale(deleted)
-		wasDeleted := deleted != nil
+		resource.MarkStale(v[lidx])
+		wasDeleted := v[lidx] != nil
 		v[lidx] = nil
 		isEmpty := true
 		for _, vv := range v {
@@ -704,19 +686,19 @@ func (s *contentNodeShifter) Delete(n contentNodeI, dimension doctree.Dimension)
 				break
 			}
 		}
-		return deleted, wasDeleted, isEmpty
+		return wasDeleted, isEmpty
 	case *resourceSource:
-		if lidx != v.LangIndex() {
-			return nil, false, false
+		if lidx > 0 {
+			return false, false
 		}
 		resource.MarkStale(v)
-		return v, true, true
+		return true, true
 	case *pageState:
-		if lidx != v.s.languagei {
-			return nil, false, false
+		if lidx > 0 {
+			return false, false
 		}
 		resource.MarkStale(v)
-		return v, true, true
+		return true, true
 	default:
 		panic(fmt.Sprintf("unknown type %T", n))
 	}
@@ -789,7 +771,7 @@ func (s *contentNodeShifter) ForEeachInDimension(n contentNodeI, d int, f func(c
 	}
 }

-func (s *contentNodeShifter) InsertInto(old, new contentNodeI, dimension doctree.Dimension) (contentNodeI, contentNodeI, bool) {
+func (s *contentNodeShifter) InsertInto(old, new contentNodeI, dimension doctree.Dimension) contentNodeI {
 	langi := dimension[doctree.DimensionLanguage.Index()]
 	switch vv := old.(type) {
 	case *pageState:
@@ -798,39 +780,37 @@ func (s *contentNodeShifter) InsertInto(old, new contentNodeI, dimension doctree
 			panic(fmt.Sprintf("unknown type %T", new))
 		}
 		if vv.s.languagei == newp.s.languagei && newp.s.languagei == langi {
-			return new, vv, true
+			return new
 		}
 		is := make(contentNodeIs, s.numLanguages)
 		is[vv.s.languagei] = old
 		is[langi] = new
-		return is, old, false
+		return is
 	case contentNodeIs:
-		oldv := vv[langi]
 		vv[langi] = new
-		return vv, oldv, oldv != nil
+		return vv
 	case resourceSources:
-		oldv := vv[langi]
 		vv[langi] = new.(*resourceSource)
-		return vv, oldv, oldv != nil
+		return vv
 	case *resourceSource:
 		newp, ok := new.(*resourceSource)
 		if !ok {
 			panic(fmt.Sprintf("unknown type %T", new))
 		}
 		if vv.LangIndex() == newp.LangIndex() && newp.LangIndex() == langi {
-			return new, vv, true
+			return new
 		}
 		rs := make(resourceSources, s.numLanguages)
 		rs[vv.LangIndex()] = vv
 		rs[langi] = newp
-		return rs, vv, false
+		return rs

 	default:
 		panic(fmt.Sprintf("unknown type %T", old))
 	}
 }

-func (s *contentNodeShifter) Insert(old, new contentNodeI) (contentNodeI, contentNodeI, bool) {
+func (s *contentNodeShifter) Insert(old, new contentNodeI) contentNodeI {
 	switch vv := old.(type) {
 	case *pageState:
 		newp, ok := new.(*pageState)
@@ -838,52 +818,40 @@ func (s *contentNodeShifter) Insert(old, new contentNodeI) (contentNodeI, conten
 			panic(fmt.Sprintf("unknown type %T", new))
 		}
 		if vv.s.languagei == newp.s.languagei {
-			if newp != old {
-				resource.MarkStale(old)
-			}
-			return new, vv, true
+			return new
 		}
 		is := make(contentNodeIs, s.numLanguages)
 		is[newp.s.languagei] = new
 		is[vv.s.languagei] = old
-		return is, old, false
+		return is
 	case contentNodeIs:
 		newp, ok := new.(*pageState)
 		if !ok {
 			panic(fmt.Sprintf("unknown type %T", new))
 		}
-		oldp := vv[newp.s.languagei]
-		if oldp != newp {
-			resource.MarkStale(oldp)
-		}
+		resource.MarkStale(vv[newp.s.languagei])
 		vv[newp.s.languagei] = new
-		return vv, oldp, oldp != nil
+		return vv
 	case *resourceSource:
 		newp, ok := new.(*resourceSource)
 		if !ok {
 			panic(fmt.Sprintf("unknown type %T", new))
 		}
 		if vv.LangIndex() == newp.LangIndex() {
-			if vv != newp {
-				resource.MarkStale(vv)
-			}
-			return new, vv, true
+			return new
 		}
 		rs := make(resourceSources, s.numLanguages)
 		rs[newp.LangIndex()] = newp
 		rs[vv.LangIndex()] = vv
-		return rs, vv, false
+		return rs
 	case resourceSources:
 		newp, ok := new.(*resourceSource)
 		if !ok {
 			panic(fmt.Sprintf("unknown type %T", new))
 		}
-		oldp := vv[newp.LangIndex()]
-		if oldp != newp {
-			resource.MarkStale(oldp)
-		}
+		resource.MarkStale(vv[newp.LangIndex()])
 		vv[newp.LangIndex()] = newp
-		return vv, oldp, oldp != nil
+		return vv
 	default:
 		panic(fmt.Sprintf("unknown type %T", old))
 	}
@@ -896,15 +864,12 @@ func newPageMap(i int, s *Site, mcache *dynacache.Cache, pageTrees *pageTrees) *

 	m = &pageMap{
 		pageTrees:              pageTrees.Shape(0, i),
-		cachePages1:            dynacache.GetOrCreatePartition[string, page.Pages](mcache, fmt.Sprintf("/pag1/%d", i), dynacache.OptionsPartition{Weight: 10, ClearWhen: dynacache.ClearOnRebuild}),
-		cachePages2:            dynacache.GetOrCreatePartition[string, page.Pages](mcache, fmt.Sprintf("/pag2/%d", i), dynacache.OptionsPartition{Weight: 10, ClearWhen: dynacache.ClearOnRebuild}),
+		cachePages:             dynacache.GetOrCreatePartition[string, page.Pages](mcache, fmt.Sprintf("/pags/%d", i), dynacache.OptionsPartition{Weight: 10, ClearWhen: dynacache.ClearOnRebuild}),
 		cacheResources:         dynacache.GetOrCreatePartition[string, resource.Resources](mcache, fmt.Sprintf("/ress/%d", i), dynacache.OptionsPartition{Weight: 60, ClearWhen: dynacache.ClearOnRebuild}),
 		cacheContentRendered:   dynacache.GetOrCreatePartition[string, *resources.StaleValue[contentSummary]](mcache, fmt.Sprintf("/cont/ren/%d", i), dynacache.OptionsPartition{Weight: 70, ClearWhen: dynacache.ClearOnChange}),
 		cacheContentPlain:      dynacache.GetOrCreatePartition[string, *resources.StaleValue[contentPlainPlainWords]](mcache, fmt.Sprintf("/cont/pla/%d", i), dynacache.OptionsPartition{Weight: 70, ClearWhen: dynacache.ClearOnChange}),
 		contentTableOfContents: dynacache.GetOrCreatePartition[string, *resources.StaleValue[contentTableOfContents]](mcache, fmt.Sprintf("/cont/toc/%d", i), dynacache.OptionsPartition{Weight: 70, ClearWhen: dynacache.ClearOnChange}),

-		contentDataFileSeenItems: maps.NewCache[string, map[uint64]bool](),
-
 		cfg: contentMapConfig{
 			lang:                 s.Lang(),
 			taxonomyConfig:       taxonomiesConfig.Values(),
@@ -975,6 +940,8 @@ type contentTreeReverseIndexMap struct {

 type sitePagesAssembler struct {
 	*Site
+	watching        bool
+	incomingChanges *whatChanged
 	assembleChanges *whatChanged
 	ctx             context.Context
 }
@@ -1079,7 +1046,7 @@ func (h *HugoSites) resolveAndClearStateForIdentities(
 	)

 	for _, id := range changes {
-		if staler, ok := id.(resource.Staler); ok {
+		if staler, ok := id.(resource.Staler); ok && !staler.IsStale() {
 			var msgDetail string
 			if p, ok := id.(*pageState); ok && p.File() != nil {
 				msgDetail = fmt.Sprintf(" (%s)", p.File().Filename())
@@ -1093,7 +1060,6 @@ func (h *HugoSites) resolveAndClearStateForIdentities(
 	// 1. Handle the cache busters first, as those may produce identities for the page reset step.
 	// 2. Then reset the page outputs, which may mark some resources as stale.
 	// 3. Then GC the cache.
-	// TOOD1
 	if cachebuster != nil {
 		if err := loggers.TimeTrackfn(func() (logg.LevelLogger, error) {
 			ll := l.WithField("substep", "gc dynacache cachebuster")
@@ -1110,7 +1076,7 @@ func (h *HugoSites) resolveAndClearStateForIdentities(
 				return b
 			}

-			h.MemCache.ClearMatching(nil, shouldDelete)
+			h.MemCache.ClearMatching(shouldDelete)

 			return ll, nil
 		}); err != nil {
@@ -1118,7 +1084,7 @@ func (h *HugoSites) resolveAndClearStateForIdentities(
 		}
 	}

-	// Drain the cache eviction stack.
+	// Drain the the cache eviction stack.
 	evicted := h.Deps.MemCache.DrainEvictedIdentities()
 	if len(evicted) < 200 {
 		changes = append(changes, evicted...)
@@ -1139,33 +1105,6 @@ func (h *HugoSites) resolveAndClearStateForIdentities(
 	}
 	changes = changes[:n]

-	if h.pageTrees.treePagesFromTemplateAdapters.LenRaw() > 0 {
-		if err := loggers.TimeTrackfn(func() (logg.LevelLogger, error) {
-			ll := l.WithField("substep", "resolve content adapter change set").WithField("changes", len(changes))
-			checkedCount := 0
-			matchCount := 0
-			depsFinder := identity.NewFinder(identity.FinderConfig{})
-
-			h.pageTrees.treePagesFromTemplateAdapters.WalkPrefixRaw(doctree.LockTypeRead, "",
-				func(s string, n *pagesfromdata.PagesFromTemplate) (bool, error) {
-					for _, id := range changes {
-						checkedCount++
-						if r := depsFinder.Contains(id, n.DependencyManager, 2); r > identity.FinderNotFound {
-							n.MarkStale()
-							matchCount++
-							break
-						}
-					}
-					return false, nil
-				})
-
-			ll = ll.WithField("checked", checkedCount).WithField("matches", matchCount)
-			return ll, nil
-		}); err != nil {
-			return err
-		}
-	}
-
 	if err := loggers.TimeTrackfn(func() (logg.LevelLogger, error) {
 		// changesLeft: The IDs that the pages is dependent on.
 		// changesRight: The IDs that the pages depend on.
@@ -1310,7 +1249,6 @@ func (sa *sitePagesAssembler) applyAggregates() error {
 	rw := pw.Extend()
 	rw.Tree = sa.pageMap.treeResources
 	sa.lastmod = time.Time{}
-	rebuild := sa.s.h.isRebuild()

 	pw.Handle = func(keyPage string, n contentNodeI, match doctree.DimensionFlag) (bool, error) {
 		pageBundle := n.(*pageState)
@@ -1331,7 +1269,7 @@ func (sa *sitePagesAssembler) applyAggregates() error {
 			// Home page gets it's cascade from the site config.
 			cascade = sa.conf.Cascade.Config

-			if pageBundle.m.pageConfig.CascadeCompiled == nil {
+			if pageBundle.m.pageConfig.Cascade == nil {
 				// Pass the site cascade downwards.
 				pw.WalkContext.Data().Insert(keyPage, cascade)
 			}
@@ -1342,20 +1280,18 @@ func (sa *sitePagesAssembler) applyAggregates() error {
 			}
 		}

-		if rebuild {
-			if (pageBundle.IsHome() || pageBundle.IsSection()) && pageBundle.m.setMetaPostCount > 0 {
-				oldDates := pageBundle.m.pageConfig.Dates
+		if (pageBundle.IsHome() || pageBundle.IsSection()) && pageBundle.m.setMetaPostCount > 0 {
+			oldDates := pageBundle.m.pageConfig.Dates

-				// We need to wait until after the walk to determine if any of the dates have changed.
-				pw.WalkContext.AddPostHook(
-					func() error {
-						if oldDates != pageBundle.m.pageConfig.Dates {
-							sa.assembleChanges.Add(pageBundle)
-						}
-						return nil
-					},
-				)
-			}
+			// We need to wait until after the walk to determine if any of the dates have changed.
+			pw.WalkContext.AddPostHook(
+				func() error {
+					if oldDates != pageBundle.m.pageConfig.Dates {
+						sa.assembleChanges.Add(pageBundle)
+					}
+					return nil
+				},
+			)
 		}

 		// Combine the cascade map with front matter.
@@ -1365,15 +1301,15 @@ func (sa *sitePagesAssembler) applyAggregates() error {

 		// We receive cascade values from above. If this leads to a change compared
 		// to the previous value, we need to mark the page and its dependencies as changed.
-		if rebuild && pageBundle.m.setMetaPostCascadeChanged {
+		if pageBundle.m.setMetaPostCascadeChanged {
 			sa.assembleChanges.Add(pageBundle)
 		}

 		const eventName = "dates"
 		if n.isContentNodeBranch() {
-			if pageBundle.m.pageConfig.CascadeCompiled != nil {
+			if pageBundle.m.pageConfig.Cascade != nil {
 				// Pass it down.
-				pw.WalkContext.Data().Insert(keyPage, pageBundle.m.pageConfig.CascadeCompiled)
+				pw.WalkContext.Data().Insert(keyPage, pageBundle.m.pageConfig.Cascade)
 			}

 			wasZeroDates := pageBundle.m.pageConfig.Dates.IsAllDatesZero()
@@ -1474,9 +1410,9 @@ func (sa *sitePagesAssembler) applyAggregatesToTaxonomiesAndTerms() error {
 				p := n.(*pageState)
 				if p.Kind() != kinds.KindTerm {
 					// The other kinds were handled in applyAggregates.
-					if p.m.pageConfig.CascadeCompiled != nil {
+					if p.m.pageConfig.Cascade != nil {
 						// Pass it down.
-						pw.WalkContext.Data().Insert(s, p.m.pageConfig.CascadeCompiled)
+						pw.WalkContext.Data().Insert(s, p.m.pageConfig.Cascade)
 					}
 				}

@@ -1567,6 +1503,13 @@ func (sa *sitePagesAssembler) assembleTermsAndTranslations() error {
 				return false, nil
 			}

+			// This is a little out of place, but is conveniently put here.
+			// Check if translationKey is set by user.
+			// This is to support the manual way of setting the translationKey in front matter.
+			if ps.m.pageConfig.TranslationKey != "" {
+				sa.s.h.translationKeyPages.Append(ps.m.pageConfig.TranslationKey, ps)
+			}
+
 			if sa.pageMap.cfg.taxonomyTermDisabled {
 				return false, nil
 			}
@@ -1597,7 +1540,7 @@ func (sa *sitePagesAssembler) assembleTermsAndTranslations() error {
 							singular: viewName.singular,
 							s:        sa.Site,
 							pathInfo: pi,
-							pageMetaParams: &pageMetaParams{
+							pageMetaParams: pageMetaParams{
 								pageConfig: &pagemeta.PageConfig{
 									Kind: kinds.KindTerm,
 								},
@@ -1609,10 +1552,8 @@ func (sa *sitePagesAssembler) assembleTermsAndTranslations() error {
 						}
 						pages.InsertIntoValuesDimension(pi.Base(), n)
 						term = pages.Get(pi.Base())
-					} else {
-						m := term.(*pageState).m
-						m.term = v
-						m.singular = viewName.singular
+					} else if term.(*pageState).m.term != v {
+						term.(*pageState).m.term = v
 					}

 					if s == "" {
@@ -1647,25 +1588,18 @@ func (sa *sitePagesAssembler) assembleResources() error {
 		Handle: func(s string, n contentNodeI, match doctree.DimensionFlag) (bool, error) {
 			ps := n.(*pageState)

-			// This is a little out of place, but is conveniently put here.
-			// Check if translationKey is set by user.
-			// This is to support the manual way of setting the translationKey in front matter.
-			if ps.m.pageConfig.TranslationKey != "" {
-				sa.s.h.translationKeyPages.Append(ps.m.pageConfig.TranslationKey, ps)
-			}
-
 			// Prepare resources for this page.
 			ps.shiftToOutputFormat(true, 0)
 			targetPaths := ps.targetPaths()
 			baseTarget := targetPaths.SubResourceBaseTarget
 			duplicateResourceFiles := true
-			if ps.m.pageConfig.ContentMediaType.IsMarkdown() {
+			if ps.s.ContentSpec.Converters.IsGoldmark(ps.m.pageConfig.Markup) {
 				duplicateResourceFiles = ps.s.ContentSpec.Converters.GetMarkupConfig().Goldmark.DuplicateResourceFiles
 			}

 			duplicateResourceFiles = duplicateResourceFiles || ps.s.Conf.IsMultihost()

-			err := sa.pageMap.forEachResourceInPage(
+			sa.pageMap.forEachResourceInPage(
 				ps, lockType,
 				!duplicateResourceFiles,
 				func(resourceKey string, n contentNodeI, match doctree.DimensionFlag) (bool, error) {
@@ -1691,23 +1625,6 @@ func (sa *sitePagesAssembler) assembleResources() error {

 					}

-					if rs.rc != nil && rs.rc.Content.IsResourceValue() {
-						if rs.rc.Name == "" {
-							rs.rc.Name = relPathOriginal
-						}
-						r, err := ps.m.s.ResourceSpec.NewResourceWrapperFromResourceConfig(rs.rc)
-						if err != nil {
-							return false, err
-						}
-						rs.r = r
-						return false, nil
-					}
-
-					var mt media.Type
-					if rs.rc != nil {
-						mt = rs.rc.ContentMediaType
-					}
-
 					rd := resources.ResourceSourceDescriptor{
 						OpenReadSeekCloser:   rs.opener,
 						Path:                 rs.path,
@@ -1716,25 +1633,10 @@ func (sa *sitePagesAssembler) assembleResources() error {
 						TargetBasePaths:      targetBasePaths,
 						BasePathRelPermalink: targetPaths.SubResourceBaseLink,
 						BasePathTargetPath:   baseTarget,
-						NameNormalized:       relPath,
+						Name:                 relPath,
 						NameOriginal:         relPathOriginal,
-						MediaType:            mt,
 						LazyPublish:          !ps.m.pageConfig.Build.PublishResources,
 					}
-
-					if rs.rc != nil {
-						rc := rs.rc
-						rd.OpenReadSeekCloser = rc.Content.ValueAsOpenReadSeekCloser()
-						if rc.Name != "" {
-							rd.NameNormalized = rc.Name
-							rd.NameOriginal = rc.Name
-						}
-						if rc.Title != "" {
-							rd.Title = rc.Title
-						}
-						rd.Params = rc.Params
-					}
-
 					r, err := ps.m.s.ResourceSpec.NewResource(rd)
 					if err != nil {
 						return false, err
@@ -1744,7 +1646,7 @@ func (sa *sitePagesAssembler) assembleResources() error {
 				},
 			)

-			return false, err
+			return false, nil
 		},
 	}

@@ -1777,11 +1679,6 @@ func (sa *sitePagesAssembler) assemblePagesStep2() error {
 	if err := sa.applyAggregatesToTaxonomiesAndTerms(); err != nil {
 		return err
 	}
-
-	return nil
-}
-
-func (sa *sitePagesAssembler) assemblePagesStepFinal() error {
 	if err := sa.assembleResources(); err != nil {
 		return err
 	}
@@ -1818,7 +1715,6 @@ func (sa *sitePagesAssembler) removeShouldNotBuild() error {
 	if len(keys) == 0 {
 		return nil
 	}
-
 	sa.pageMap.DeletePageAndResourcesBelow(keys...)

 	return nil
@@ -1851,7 +1747,7 @@ func (sa *sitePagesAssembler) addStandalonePages() error {
 		m := &pageMeta{
 			s:        s,
 			pathInfo: s.Conf.PathParser().Parse(files.ComponentFolderContent, key+f.MediaType.FirstSuffix.FullSuffix),
-			pageMetaParams: &pageMetaParams{
+			pageMetaParams: pageMetaParams{
 				pageConfig: &pagemeta.PageConfig{
 					Kind: kind,
 				},
@@ -1868,7 +1764,7 @@ func (sa *sitePagesAssembler) addStandalonePages() error {

 	if s.conf.EnableRobotsTXT {
 		if m.i == 0 || s.Conf.IsMultihost() {
-			addStandalone("/_robots", kinds.KindRobotsTXT, output.RobotsTxtFormat)
+			addStandalone("/robots", kinds.KindRobotsTXT, output.RobotsTxtFormat)
 		}
 	}

@@ -1881,11 +1777,11 @@ func (sa *sitePagesAssembler) addStandalonePages() error {
 	}

 	if sitemapEnabled {
-		addStandalone("/_sitemap", kinds.KindSitemap, output.SitemapFormat)
-		skipSitemapIndex := s.Conf.IsMultihost() || !(s.Conf.DefaultContentLanguageInSubdir() || s.Conf.IsMultilingual())
+		addStandalone("/sitemap", kinds.KindSitemap, output.SitemapFormat)
+		skipSitemapIndex := s.Conf.IsMultihost() || !(s.Conf.DefaultContentLanguageInSubdir() || s.Conf.IsMultiLingual())

 		if !skipSitemapIndex {
-			addStandalone("/_sitemapindex", kinds.KindSitemapIndex, output.SitemapIndexFormat)
+			addStandalone("/sitemapindex", kinds.KindSitemapIndex, output.SitemapIndexFormat)
 		}
 	}

@@ -1918,14 +1814,6 @@ func (sa *sitePagesAssembler) addMissingRootSections() error {
 				return false, nil
 			}

-			switch ps.Kind() {
-			case kinds.KindPage, kinds.KindSection:
-				// OK
-			default:
-				// Skip taxonomy nodes etc.
-				return false, nil
-			}
-
 			p := ps.m.pathInfo
 			section := p.Section()
 			if section == "" || seen[section] {
@@ -1969,7 +1857,7 @@ func (sa *sitePagesAssembler) addMissingRootSections() error {
 		m := &pageMeta{
 			s:        sa.Site,
 			pathInfo: p,
-			pageMetaParams: &pageMetaParams{
+			pageMetaParams: pageMetaParams{
 				pageConfig: &pagemeta.PageConfig{
 					Kind: kinds.KindHome,
 				},
@@ -1979,7 +1867,7 @@ func (sa *sitePagesAssembler) addMissingRootSections() error {
 		if err != nil {
 			return err
 		}
-		w.Tree.InsertIntoValuesDimensionWithLock(p.Base(), n)
+		w.Tree.InsertWithLock(p.Base(), n)
 		sa.home = n
 	}

@@ -2002,7 +1890,7 @@ func (sa *sitePagesAssembler) addMissingTaxonomies() error {
 			m := &pageMeta{
 				s:        sa.Site,
 				pathInfo: sa.Conf.PathParser().Parse(files.ComponentFolderContent, key+"/_index.md"),
-				pageMetaParams: &pageMetaParams{
+				pageMetaParams: pageMetaParams{
 					pageConfig: &pagemeta.PageConfig{
 						Kind: kinds.KindTaxonomy,
 					},
@@ -326,35 +326,3 @@ R: {{ with $r }}{{ .Content }}{{ end }}|Len: {{ len $bundle.Resources }}|$
 		b.AssertFileContent("public/index.html", "R: Data 1.txt|", "Len: 1|")
 	}
 }
-
-func TestBundleResourcesNoPublishedIssue12198(t *testing.T) {
-	t.Parallel()
-
-	files := `
-- hugo.toml --
-disableKinds = ['home','rss','sitemap','taxonomy','term']
-- content/s1/p1.md --
---
-title: p1
---
-- content/s1/foo.txt --
-foo.txt
-- content/s1/p1.txt --
-p1.txt
-- content/s1/p1-foo.txt --
-p1-foo.txt
-- layouts/_default/list.html --
-{{.Title }}|
-- layouts/_default/single.html --
-{{.Title }}|
-	`
-
-	b := Test(t, files)
-	b.Build()
-
-	b.AssertFileExists("public/s1/index.html", true)
-	b.AssertFileExists("public/s1/foo.txt", true)
-	b.AssertFileExists("public/s1/p1.txt", true)     // failing test
-	b.AssertFileExists("public/s1/p1-foo.txt", true) // failing test
-	b.AssertFileExists("public/s1/p1/index.html", true)
-}
@@ -14,7 +14,6 @@
 package hugolib

 import (
-	"fmt"
 	"strings"
 	"testing"
 )
@@ -242,52 +241,3 @@ iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkYPhfDwAChwGA60e6kgAA
 			"p1|<p><a href=\"p2\">P2</a>", "<img src=\"pixel.png\" alt=\"Pixel\">")
 	})
 }
-
-func TestRenderHooksDefaultEscape(t *testing.T) {
-	files := `
-- hugo.toml --
-[markup.goldmark.renderHooks]
-[markup.goldmark.renderHooks.image]
-  enableDefault = ENABLE
-[markup.goldmark.renderHooks.link]
-enableDefault = ENABLE
-[markup.goldmark.parser]
-wrapStandAloneImageWithinParagraph = false
-[markup.goldmark.parser.attribute]
-block = true
-title = true
-- content/_index.md --
---
-title: "Home"
---
-Link: [text-"<>&](/destination-"<> 'title-"<>&')
-
-Image: ![alt-"<>&](/destination-"<> 'title-"<>&')
-{class="><script>alert()</script>" id="baz"}
-
-- layouts/index.html --
-{{ .Content }}
-`
-
-	for _, enabled := range []bool{true, false} {
-		enabled := enabled
-		t.Run(fmt.Sprint(enabled), func(t *testing.T) {
-			t.Parallel()
-			b := Test(t, strings.ReplaceAll(files, "ENABLE", fmt.Sprint(enabled)))
-
-			// The escaping is slightly different between the two.
-			if enabled {
-				b.AssertFileContent("public/index.html",
-					"Link: <a href=\"/destination-%22%3C%3E\" title=\"title-&#34;&lt;&gt;&amp;\">text-&quot;&lt;&gt;&amp;</a>",
-					"img alt=\"alt-&quot;&lt;&gt;&amp;\" src=\"/destination-%22%3C%3E\" title=\"title-&#34;&lt;&gt;&amp;\">",
-					"&gt;&lt;script&gt;",
-				)
-			} else {
-				b.AssertFileContent("public/index.html",
-					"Link: <a href=\"/destination-%22%3C%3E\" title=\"title-&quot;&lt;&gt;&amp;\">text-&quot;&lt;&gt;&amp;</a>",
-					"Image: <img src=\"/destination-%22%3C%3E\" alt=\"alt-&quot;&lt;&gt;&amp;\" title=\"title-&quot;&lt;&gt;&amp;\">",
-				)
-			}
-		})
-	}
-}
@@ -64,21 +64,3 @@ v1: {{  site.Data.MyFolder.MyData.v1 }}|

 	b.AssertFileContent("public/index.html", "v1: my_v1|")
 }
-
-// Issue #12133
-func TestDataNoAssets(t *testing.T) {
-	t.Parallel()
-
-	files := `
-- hugo.toml --
-disableKinds = ['page','rss','section','sitemap','taxonomy','term']
-- assets/data/foo.toml --
-content = "I am assets/data/foo.toml"
-- layouts/index.html --
-|{{ site.Data.foo.content }}|
-	`
-
-	b := Test(t, files)
-
-	b.AssertFileContent("public/index.html", "||")
-}
@@ -173,7 +173,7 @@ func TestTreeInsert(t *testing.T) {
 	c.Assert(tree.Get("/notfound"), qt.IsNil)

 	ab2 := &testValue{ID: "/a/b", Lang: 0}
-	v, _, ok := tree.InsertIntoValuesDimension("/a/b", ab2)
+	v, ok := tree.InsertIntoValuesDimension("/a/b", ab2)
 	c.Assert(ok, qt.IsTrue)
 	c.Assert(v, qt.DeepEquals, ab2)

@@ -239,16 +239,16 @@ func (s *testShifter) ForEeachInDimension(n *testValue, d int, f func(n *testVal
 	f(n)
 }

-func (s *testShifter) Insert(old, new *testValue) (*testValue, *testValue, bool) {
-	return new, old, true
+func (s *testShifter) Insert(old, new *testValue) *testValue {
+	return new
 }

-func (s *testShifter) InsertInto(old, new *testValue, dimension doctree.Dimension) (*testValue, *testValue, bool) {
-	return new, old, true
+func (s *testShifter) InsertInto(old, new *testValue, dimension doctree.Dimension) *testValue {
+	return new
 }

-func (s *testShifter) Delete(n *testValue, dimension doctree.Dimension) (*testValue, bool, bool) {
-	return nil, true, true
+func (s *testShifter) Delete(n *testValue, dimension doctree.Dimension) (bool, bool) {
+	return true, true
 }

 func (s *testShifter) Shift(n *testValue, dimension doctree.Dimension, exact bool) (*testValue, bool, doctree.DimensionFlag) {
@@ -38,18 +38,16 @@ type (

 		// Insert inserts new into the tree into the dimension it provides.
 		// It may replace old.
-		// It returns the updated and existing T
-		// and a bool indicating if an existing record is updated.
-		Insert(old, new T) (T, T, bool)
+		// It returns a T (can be the same as old).
+		Insert(old, new T) T

 		// Insert inserts new into the given dimension.
 		// It may replace old.
-		// It returns the updated and existing T
-		// and a bool indicating if an existing record is updated.
-		InsertInto(old, new T, dimension Dimension) (T, T, bool)
+		// It returns a T (can be the same as old).
+		InsertInto(old, new T, dimension Dimension) T

-		// Delete deletes T from the given dimension and returns the deleted T and whether the dimension was deleted and if  it's empty after the delete.
-		Delete(v T, dimension Dimension) (T, bool, bool)
+		// Delete deletes T from the given dimension and returns whether the dimension was deleted and if  it's empty after the delete.
+		Delete(v T, dimension Dimension) (bool, bool)

 		// Shift shifts T into the given dimension
 		// and returns the shifted T and a bool indicating if the shift was successful and
@@ -83,11 +81,7 @@ func New[T any](cfg Config[T]) *NodeShiftTree[T] {
 	}
 }

-func (r *NodeShiftTree[T]) Delete(key string) (T, bool) {
-	return r.delete(key)
-}
-
-func (r *NodeShiftTree[T]) DeleteRaw(key string) {
+func (r *NodeShiftTree[T]) Delete(key string) {
 	r.delete(key)
 }

@@ -109,24 +103,23 @@ func (r *NodeShiftTree[T]) DeletePrefix(prefix string) int {
 		return false
 	})
 	for _, key := range keys {
-		if _, ok := r.delete(key); ok {
+		if ok := r.delete(key); ok {
 			count++
 		}
 	}
 	return count
 }

-func (r *NodeShiftTree[T]) delete(key string) (T, bool) {
+func (r *NodeShiftTree[T]) delete(key string) bool {
 	var wasDeleted bool
-	var deleted T
 	if v, ok := r.tree.Get(key); ok {
 		var isEmpty bool
-		deleted, wasDeleted, isEmpty = r.shifter.Delete(v.(T), r.dims)
+		wasDeleted, isEmpty = r.shifter.Delete(v.(T), r.dims)
 		if isEmpty {
 			r.tree.Delete(key)
 		}
 	}
-	return deleted, wasDeleted
+	return wasDeleted
 }

 func (t *NodeShiftTree[T]) DeletePrefixAll(prefix string) int {
@@ -148,33 +141,22 @@ func (t *NodeShiftTree[T]) Increment(d int) *NodeShiftTree[T] {
 	return t.Shape(d, t.dims[d]+1)
 }

-func (r *NodeShiftTree[T]) InsertIntoCurrentDimension(s string, v T) (T, T, bool) {
+func (r *NodeShiftTree[T]) InsertIntoCurrentDimension(s string, v T) (T, bool) {
 	s = mustValidateKey(cleanKey(s))
-	var (
-		updated  bool
-		existing T
-	)
 	if vv, ok := r.tree.Get(s); ok {
-		v, existing, updated = r.shifter.InsertInto(vv.(T), v, r.dims)
+		v = r.shifter.InsertInto(vv.(T), v, r.dims)
 	}
 	r.tree.Insert(s, v)
-	return v, existing, updated
+	return v, true
 }

-// InsertIntoValuesDimension inserts v into the tree at the given key and the
-// dimension defined by the value.
-// It returns the updated and existing T and a bool indicating if an existing record is updated.
-func (r *NodeShiftTree[T]) InsertIntoValuesDimension(s string, v T) (T, T, bool) {
+func (r *NodeShiftTree[T]) InsertIntoValuesDimension(s string, v T) (T, bool) {
 	s = mustValidateKey(cleanKey(s))
-	var (
-		updated  bool
-		existing T
-	)
 	if vv, ok := r.tree.Get(s); ok {
-		v, existing, updated = r.shifter.Insert(vv.(T), v)
+		v = r.shifter.Insert(vv.(T), v)
 	}
 	r.tree.Insert(s, v)
-	return v, existing, updated
+	return v, true
 }

 func (r *NodeShiftTree[T]) InsertRawWithLock(s string, v any) (any, bool) {
@@ -183,8 +165,7 @@ func (r *NodeShiftTree[T]) InsertRawWithLock(s string, v any) (any, bool) {
 	return r.tree.Insert(s, v)
 }

-// It returns the updated and existing T and a bool indicating if an existing record is updated.
-func (r *NodeShiftTree[T]) InsertIntoValuesDimensionWithLock(s string, v T) (T, T, bool) {
+func (r *NodeShiftTree[T]) InsertWithLock(s string, v T) (T, bool) {
 	r.mu.Lock()
 	defer r.mu.Unlock()
 	return r.InsertIntoValuesDimension(s, v)
@@ -28,12 +28,12 @@ type Tree[T any] interface {
 }

 // NewSimpleTree creates a new SimpleTree.
-func NewSimpleTree[T comparable]() *SimpleTree[T] {
+func NewSimpleTree[T any]() *SimpleTree[T] {
 	return &SimpleTree[T]{tree: radix.New()}
 }

 // SimpleTree is a thread safe radix tree that holds T.
-type SimpleTree[T comparable] struct {
+type SimpleTree[T any] struct {
 	mu   sync.RWMutex
 	tree *radix.Tree
 	zero T
@@ -67,23 +67,16 @@ func (tree *SimpleTree[T]) Insert(s string, v T) T {
 	return v
 }

-func (tree *SimpleTree[T]) Lock(lockType LockType) func() {
+func (tree *SimpleTree[T]) WalkPrefix(lockType LockType, s string, f func(s string, v T) (bool, error)) error {
 	switch lockType {
 	case LockTypeNone:
-		return func() {}
 	case LockTypeRead:
 		tree.mu.RLock()
-		return tree.mu.RUnlock
+		defer tree.mu.RUnlock()
 	case LockTypeWrite:
 		tree.mu.Lock()
-		return tree.mu.Unlock
+		defer tree.mu.Unlock()
 	}
-	return func() {}
-}
-
-func (tree *SimpleTree[T]) WalkPrefix(lockType LockType, s string, f func(s string, v T) (bool, error)) error {
-	commit := tree.Lock(lockType)
-	defer commit()
 	var err error
 	tree.tree.WalkPrefix(s, func(s string, v any) bool {
 		var b bool
@@ -113,7 +113,7 @@ type LockType int

 // MutableTree is a tree that can be modified.
 type MutableTree interface {
-	DeleteRaw(key string)
+	Delete(key string)
 	DeleteAll(key string)
 	DeletePrefix(prefix string) int
 	DeletePrefixAll(prefix string) int
@@ -140,9 +140,9 @@ var _ MutableTree = MutableTrees(nil)

 type MutableTrees []MutableTree

-func (t MutableTrees) DeleteRaw(key string) {
+func (t MutableTrees) Delete(key string) {
 	for _, tree := range t {
-		tree.DeleteRaw(key)
+		tree.Delete(key)
 	}
 }

@@ -15,21 +15,18 @@ package doctree

 var _ Tree[string] = (*TreeShiftTree[string])(nil)

-type TreeShiftTree[T comparable] struct {
+type TreeShiftTree[T any] struct {
 	// This tree is shiftable in one dimension.
 	d int

 	// The value of the current dimension.
 	v int

-	// The zero value of T.
-	zero T
-
 	// Will be of length equal to the length of the dimension.
 	trees []*SimpleTree[T]
 }

-func NewTreeShiftTree[T comparable](d, length int) *TreeShiftTree[T] {
+func NewTreeShiftTree[T any](d, length int) *TreeShiftTree[T] {
 	if length <= 0 {
 		panic("length must be > 0")
 	}
@@ -55,17 +52,6 @@ func (t *TreeShiftTree[T]) Get(s string) T {
 	return t.trees[t.v].Get(s)
 }

-func (t *TreeShiftTree[T]) DeleteAllFunc(s string, f func(s string, v T) bool) {
-	for _, tt := range t.trees {
-		if v := tt.Get(s); v != t.zero {
-			if f(s, v) {
-				// Delete.
-				tt.tree.Delete(s)
-			}
-		}
-	}
-}
-
 func (t *TreeShiftTree[T]) LongestPrefix(s string) (string, T) {
 	return t.trees[t.v].LongestPrefix(s)
 }
@@ -74,31 +60,10 @@ func (t *TreeShiftTree[T]) Insert(s string, v T) T {
 	return t.trees[t.v].Insert(s, v)
 }

-func (t *TreeShiftTree[T]) Lock(lockType LockType) func() {
-	return t.trees[t.v].Lock(lockType)
-}
-
 func (t *TreeShiftTree[T]) WalkPrefix(lockType LockType, s string, f func(s string, v T) (bool, error)) error {
 	return t.trees[t.v].WalkPrefix(lockType, s, f)
 }

-func (t *TreeShiftTree[T]) WalkPrefixRaw(lockType LockType, s string, f func(s string, v T) (bool, error)) error {
-	for _, tt := range t.trees {
-		if err := tt.WalkPrefix(lockType, s, f); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (t *TreeShiftTree[T]) LenRaw() int {
-	var count int
-	for _, tt := range t.trees {
-		count += tt.tree.Len()
-	}
-	return count
-}
-
 func (t *TreeShiftTree[T]) Delete(key string) {
 	for _, tt := range t.trees {
 		tt.tree.Delete(key)
@@ -112,3 +77,25 @@ func (t *TreeShiftTree[T]) DeletePrefix(prefix string) int {
 	}
 	return count
 }
+
+func (t *TreeShiftTree[T]) Lock(writable bool) (commit func()) {
+	if writable {
+		for _, tt := range t.trees {
+			tt.mu.Lock()
+		}
+		return func() {
+			for _, tt := range t.trees {
+				tt.mu.Unlock()
+			}
+		}
+	}
+
+	for _, tt := range t.trees {
+		tt.mu.RLock()
+	}
+	return func() {
+		for _, tt := range t.trees {
+			tt.mu.RUnlock()
+		}
+	}
+}
@@ -67,7 +67,7 @@ package main

 ## YouTube

-{{< youtube 0RKpf3rK57I >}}
+{{< youtube PArFPgHrNZM >}}

 ## Param

@@ -83,7 +83,7 @@ Content: {{ .Content }}|
 https://gist.github.com/spf13/7896402.js
 <span style="color:#a6e22e">main</span></span>
 https://t.co/X94FmYDEZJ
-https://www.youtube.com/embed/0RKpf3rK57I
+https://www.youtube.com/embed/PArFPgHrNZM
 Foo: bar


@@ -15,6 +15,8 @@ package hugolib

 import (
 	"testing"
+
+	qt "github.com/frankban/quicktest"
 )

 func TestInternalTemplatesImage(t *testing.T) {
@@ -60,41 +62,78 @@ title: My Site
 	b.Build(BuildCfg{})

 	b.AssertFileContent("public/mybundle/index.html", `
-<meta name="twitter:image" content="https://example.org/mybundle/featured-sunset.jpg">
-<meta name="twitter:title" content="My Bundle">
-<meta property="og:title" content="My Bundle">
-<meta property="og:url" content="https://example.org/mybundle/">
-<meta property="og:image" content="https://example.org/mybundle/featured-sunset.jpg">
-<meta property="article:published_time" content="2021-02-26T18:02:00-01:00">
-<meta property="article:modified_time" content="2021-05-22T19:25:00-01:00">
+<meta name="twitter:image" content="https://example.org/mybundle/featured-sunset.jpg" />
+<meta name="twitter:title" content="My Bundle"/>
+<meta property="og:title" content="My Bundle" />
+<meta property="og:url" content="https://example.org/mybundle/" />
+<meta property="og:image" content="https://example.org/mybundle/featured-sunset.jpg" />
+<meta property="article:published_time" content="2021-02-26T18:02:00-01:00" />
+<meta property="article:modified_time" content="2021-05-22T19:25:00-01:00" />
 <meta itemprop="name" content="My Bundle">
-<meta itemprop="image" content="https://example.org/mybundle/featured-sunset.jpg">
-<meta itemprop="datePublished" content="2021-02-26T18:02:00-01:00">
-<meta itemprop="dateModified" content="2021-05-22T19:25:00-01:00">
+<meta itemprop="image" content="https://example.org/mybundle/featured-sunset.jpg" />
+<meta itemprop="datePublished" content="2021-02-26T18:02:00-01:00" />
+<meta itemprop="dateModified" content="2021-05-22T19:25:00-01:00" />

 `)
 	b.AssertFileContent("public/mypage/index.html", `
-<meta name="twitter:image" content="https://example.org/pageimg1.jpg">
-<meta property="og:image" content="https://example.org/pageimg1.jpg">
-<meta property="og:image" content="https://example.org/pageimg2.jpg">
-<meta property="og:image" content="https://example.local/logo.png">
-<meta property="og:image" content="https://example.org/mypage/sample.jpg">
-<meta property="article:published_time" content="2021-02-26T18:02:00+01:00">
-<meta property="article:modified_time" content="2021-05-22T19:25:00+01:00">
-<meta itemprop="image" content="https://example.org/pageimg1.jpg">
-<meta itemprop="image" content="https://example.org/pageimg2.jpg">
-<meta itemprop="image" content="https://example.local/logo.png">
-<meta itemprop="image" content="https://example.org/mypage/sample.jpg">
-<meta itemprop="datePublished" content="2021-02-26T18:02:00+01:00">
-<meta itemprop="dateModified" content="2021-05-22T19:25:00+01:00">
+<meta name="twitter:image" content="https://example.org/pageimg1.jpg" />
+<meta property="og:image" content="https://example.org/pageimg1.jpg" />
+<meta property="og:image" content="https://example.org/pageimg2.jpg" />
+<meta property="og:image" content="https://example.local/logo.png" />
+<meta property="og:image" content="https://example.org/mypage/sample.jpg" />
+<meta property="article:published_time" content="2021-02-26T18:02:00+01:00" />
+<meta property="article:modified_time" content="2021-05-22T19:25:00+01:00" />
+<meta itemprop="image" content="https://example.org/pageimg1.jpg" />
+<meta itemprop="image" content="https://example.org/pageimg2.jpg" />
+<meta itemprop="image" content="https://example.local/logo.png" />
+<meta itemprop="image" content="https://example.org/mypage/sample.jpg" />
+<meta itemprop="datePublished" content="2021-02-26T18:02:00+01:00" />
+<meta itemprop="dateModified" content="2021-05-22T19:25:00+01:00" />
 `)
 	b.AssertFileContent("public/mysite/index.html", `
-<meta name="twitter:image" content="https://example.org/siteimg1.jpg">
-<meta property="og:image" content="https://example.org/siteimg1.jpg">
-<meta itemprop="image" content="https://example.org/siteimg1.jpg">
+<meta name="twitter:image" content="https://example.org/siteimg1.jpg" />
+<meta property="og:image" content="https://example.org/siteimg1.jpg" />
+<meta itemprop="image" content="https://example.org/siteimg1.jpg" />
 `)
 }

+// Just some simple test of the embedded templates to avoid
+// https://github.com/gohugoio/hugo/issues/4757 and similar.
+func TestEmbeddedTemplates(t *testing.T) {
+	t.Parallel()
+
+	c := qt.New(t)
+	c.Assert(true, qt.Equals, true)
+
+	home := []string{"index.html", `
+GA:
+{{ template "_internal/google_analytics.html" . }}
+
+GA async:
+
+{{ template "_internal/google_analytics_async.html" . }}
+
+Disqus:
+
+{{ template "_internal/disqus.html" . }}
+
+`}
+
+	b := newTestSitesBuilder(t)
+	b.WithSimpleConfigFile().WithTemplatesAdded(home...)
+
+	b.Build(BuildCfg{})
+
+	// Gheck GA regular and async
+	b.AssertFileContent("public/index.html",
+		"'anonymizeIp', true",
+		"'script','https://www.google-analytics.com/analytics.js','ga');\n\tga('create', 'UA-ga_id', 'auto')",
+		"<script async src='https://www.google-analytics.com/analytics.js'>")
+
+	// Disqus
+	b.AssertFileContent("public/index.html", "\"disqus_shortname\" + '.disqus.com/embed.js';")
+}
+
 func TestEmbeddedPaginationTemplate(t *testing.T) {
 	t.Parallel()

@@ -1,4 +1,4 @@
-// Copyright 2024 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.
@@ -265,9 +265,6 @@ type SourceFilesystem struct {
 	// This is a virtual composite filesystem. It expects path relative to a context.
 	Fs afero.Fs

-	// The source filesystem (usually the OS filesystem).
-	SourceFs afero.Fs
-
 	// When syncing a source folder to the target (e.g. /public), this may
 	// be set to publish into a subfolder. This is used for static syncing
 	// in multihost mode.
@@ -323,10 +320,10 @@ func (s SourceFilesystems) IsContent(filename string) bool {
 }

 // ResolvePaths resolves the given filename to a list of paths in the filesystems.
-func (s *SourceFilesystems) ResolvePaths(filename string) []hugofs.ComponentPath {
+func (s *SourceFilesystems) ResolvePaths(filename string, checkExists bool) []hugofs.ComponentPath {
 	var cpss []hugofs.ComponentPath
 	for _, rfs := range s.RootFss {
-		cps, err := rfs.ReverseLookup(filename)
+		cps, err := rfs.ReverseLookup(filename, checkExists)
 		if err != nil {
 			panic(err)
 		}
@@ -365,17 +362,7 @@ func (d *SourceFilesystem) ReverseLookup(filename string, checkExists bool) ([]h
 	var cps []hugofs.ComponentPath
 	hugofs.WalkFilesystems(d.Fs, func(fs afero.Fs) bool {
 		if rfs, ok := fs.(hugofs.ReverseLookupProvder); ok {
-			if c, err := rfs.ReverseLookupComponent(d.Name, filename); err == nil {
-				if checkExists {
-					n := 0
-					for _, cp := range c {
-						if _, err := d.Fs.Stat(filepath.FromSlash(cp.Path)); err == nil {
-							c[n] = cp
-							n++
-						}
-					}
-					c = c[:n]
-				}
+			if c, err := rfs.ReverseLookupComponent(d.Name, filename, checkExists); err == nil {
 				cps = append(cps, c...)
 			}
 		}
@@ -392,12 +379,11 @@ func (d *SourceFilesystem) mounts() []hugofs.FileMetaInfo {
 			if err == nil {
 				m = append(m, mounts...)
 			}
+
 		}
 		return false
 	})
-
 	// Filter out any mounts not belonging to this filesystem.
-	// TODO(bep) I think this is superflous.
 	n := 0
 	for _, mm := range m {
 		if mm.Meta().Component == d.Name {
@@ -406,7 +392,6 @@ func (d *SourceFilesystem) mounts() []hugofs.FileMetaInfo {
 		}
 	}
 	m = m[:n]
-
 	return m
 }

@@ -443,8 +428,10 @@ func (d *SourceFilesystem) RealDirs(from string) []string {
 		if !m.IsDir() {
 			continue
 		}
-		dirname := filepath.Join(m.Meta().Filename, from)
-		if _, err := d.SourceFs.Stat(dirname); err == nil {
+		meta := m.Meta()
+		_, err := d.Fs.Stat(from)
+		if err == nil {
+			dirname := filepath.Join(meta.Filename, from)
 			dirnames = append(dirnames, dirname)
 		}
 	}
@@ -532,9 +519,8 @@ func newSourceFilesystemsBuilder(p *paths.Paths, logger loggers.Logger, b *BaseF

 func (b *sourceFilesystemsBuilder) newSourceFilesystem(name string, fs afero.Fs) *SourceFilesystem {
 	return &SourceFilesystem{
-		Name:     name,
-		Fs:       fs,
-		SourceFs: b.sourceFs,
+		Name: name,
+		Fs:   fs,
 	}
 }

@@ -234,7 +234,6 @@ foo
 	b := hugolib.Test(t, files)
 	bfs := b.H.BaseFs
 	watchFilenames := bfs.WatchFilenames()
-	//   []string{"/hugo_stats.json", "/content", "/content2", "/themes/t1/layouts", "/themes/t1/layouts/_default", "/themes/t1/static"}
 	b.Assert(watchFilenames, qt.HasLen, 6)
 }

@@ -315,7 +314,7 @@ func TestStaticFs(t *testing.T) {
 	checkFileContent(sfs, "f2.txt", c, "Hugo Themes Still Rocks!")
 }

-func TestStaticFsMultihost(t *testing.T) {
+func TestStaticFsMultiHost(t *testing.T) {
 	c := qt.New(t)
 	v := config.New()
 	workDir := "mywork"
@@ -509,40 +508,6 @@ l2
 	}
 }

-func TestAssetsIssue12175(t *testing.T) {
-	files := `
-- hugo.toml --
-baseURL = "https://example.com/"
-[module]
-[[module.mounts]]
-source = "node_modules/@foo/core/assets"
-target = "assets"
-[[module.mounts]]
-source = "assets"
-target = "assets"
-- node_modules/@foo/core/assets/js/app.js --
-JS.
-- node_modules/@foo/core/assets/scss/app.scss --
-body { color: red; }
-- assets/scss/app.scss --
-body { color: blue; }
-- layouts/index.html --
-Home.
-SCSS: {{ with resources.Get "scss/app.scss" }}{{ .RelPermalink }}|{{ .Content }}{{ end }}|
-# Note that the pattern below will match 2 resources, which doesn't make much sense,
-# but is how the current (and also < v0.123.0) merge logic works, and for most practical purposes, it doesn't matter.
-SCSS Match: {{ with resources.Match "**.scss" }}{{ . | len }}|{{ range .}}{{ .RelPermalink }}|{{ end }}{{ end }}|
-
-`
-
-	b := hugolib.Test(t, files)
-
-	b.AssertFileContent("public/index.html", `
-SCSS: /scss/app.scss|body { color: blue; }|
-SCSS Match: 2|
-`)
-}
-
 func TestStaticComposite(t *testing.T) {
 	files := `
 -- hugo.toml --
@@ -578,30 +543,6 @@ files/f2.txt false
 `)
 }

-func TestMountIssue12141(t *testing.T) {
-	files := `
-- hugo.toml --
-disableKinds = ["taxonomy", "term"]
-[module]
-[[module.mounts]]
-source = "myfiles"
-target = "static"
-[[module.mounts]]
-source = "myfiles/f1.txt"
-target = "static/f2.txt"
-- myfiles/f1.txt --
-f1
-`
-	b := hugolib.Test(t, files)
-	fs := b.H.BaseFs.StaticFs("")
-
-	b.AssertFs(fs, `
-. true
-f1.txt false
-f2.txt false
-`)
-}
-
 func checkFileCount(fs afero.Fs, dirname string, c *qt.C, expected int) {
 	c.Helper()
 	count, names, err := countFilesAndGetFilenames(fs, dirname)
@@ -111,24 +111,6 @@ func (h *HugoSites) ShouldSkipFileChangeEvent(ev fsnotify.Event) bool {
 	return h.skipRebuildForFilenames[ev.Name]
 }

-func (h *HugoSites) isRebuild() bool {
-	return h.buildCounter.Load() > 0
-}
-
-func (h *HugoSites) resolveSite(lang string) *Site {
-	if lang == "" {
-		lang = h.Conf.DefaultContentLanguage()
-	}
-
-	for _, s := range h.Sites {
-		if s.Lang() == lang {
-			return s
-		}
-	}
-
-	return nil
-}
-
 // Only used in tests.
 type buildCounters struct {
 	contentRenderCounter atomic.Uint64
@@ -287,7 +269,7 @@ func (h *HugoSites) pickOneAndLogTheRest(errors []error) error {
 	return errors[i]
 }

-func (h *HugoSites) isMultilingual() bool {
+func (h *HugoSites) isMultiLingual() bool {
 	return len(h.Sites) > 1
 }

@@ -428,10 +410,6 @@ type BuildCfg struct {

 // shouldRender returns whether this output format should be rendered or not.
 func (cfg *BuildCfg) shouldRender(p *pageState) bool {
-	if p.skipRender() {
-		return false
-	}
-
 	if !p.renderOnce {
 		return true
 	}
@@ -497,7 +475,6 @@ func (h *HugoSites) loadData() error {
 		hugofs.WalkwayConfig{
 			Fs:         h.PathSpec.BaseFs.Data.Fs,
 			IgnoreFile: h.SourceSpec.IgnoreFile,
-			PathParser: h.Conf.PathParser(),
 			WalkFn: func(path string, fi hugofs.FileMetaInfo) error {
 				if fi.IsDir() {
 					return nil
@@ -26,24 +26,22 @@ import (
 	"time"

 	"github.com/bep/logg"
+	"github.com/gohugoio/hugo/cache/dynacache"
 	"github.com/gohugoio/hugo/deps"
-	"github.com/gohugoio/hugo/hugofs"
 	"github.com/gohugoio/hugo/hugofs/files"
 	"github.com/gohugoio/hugo/hugofs/glob"
-	"github.com/gohugoio/hugo/hugolib/doctree"
-	"github.com/gohugoio/hugo/hugolib/pagesfromdata"
-	"github.com/gohugoio/hugo/hugolib/segments"
 	"github.com/gohugoio/hugo/identity"
 	"github.com/gohugoio/hugo/output"
 	"github.com/gohugoio/hugo/publisher"
 	"github.com/gohugoio/hugo/source"
 	"github.com/gohugoio/hugo/tpl"

+	"github.com/gohugoio/hugo/hugofs"
+
 	"github.com/gohugoio/hugo/common/herrors"
 	"github.com/gohugoio/hugo/common/loggers"
 	"github.com/gohugoio/hugo/common/para"
 	"github.com/gohugoio/hugo/common/paths"
-	"github.com/gohugoio/hugo/common/rungroup"
 	"github.com/gohugoio/hugo/config"
 	"github.com/gohugoio/hugo/resources/page"
 	"github.com/gohugoio/hugo/resources/page/siteidentities"
@@ -99,10 +97,6 @@ func (h *HugoSites) Build(config BuildCfg, events ...fsnotify.Event) error {
 		close(to)
 	}(errCollector, errs)

-	for _, s := range h.Sites {
-		s.state = siteStateInit
-	}
-
 	if h.Metrics != nil {
 		h.Metrics.Reset()
 	}
@@ -116,7 +110,7 @@ func (h *HugoSites) Build(config BuildCfg, events ...fsnotify.Event) error {
 	conf := &config
 	if conf.whatChanged == nil {
 		// Assume everything has changed
-		conf.whatChanged = &whatChanged{needsPagesAssembly: true}
+		conf.whatChanged = &whatChanged{contentChanged: true}
 	}

 	var prepareErr error
@@ -160,10 +154,6 @@ func (h *HugoSites) Build(config BuildCfg, events ...fsnotify.Event) error {
 		}
 	}

-	for _, s := range h.Sites {
-		s.state = siteStateReady
-	}
-
 	if prepareErr == nil {
 		if err := h.render(infol, conf); err != nil {
 			h.SendError(fmt.Errorf("render: %w", err))
@@ -224,7 +214,7 @@ func (h *HugoSites) initRebuild(config *BuildCfg) error {
 	})

 	for _, s := range h.Sites {
-		s.resetBuildState(config.whatChanged.needsPagesAssembly)
+		s.resetBuildState(config.whatChanged.contentChanged)
 	}

 	h.reset(config)
@@ -243,7 +233,7 @@ func (h *HugoSites) process(ctx context.Context, l logg.LevelLogger, config *Bui
 		// This is a rebuild
 		return h.processPartial(ctx, l, config, init, events)
 	}
-	return h.processFull(ctx, l, config)
+	return h.processFull(ctx, l, *config)
 }

 // assemble creates missing sections, applies aggregate values (e.g. dates, cascading params),
@@ -252,24 +242,22 @@ func (h *HugoSites) assemble(ctx context.Context, l logg.LevelLogger, bcfg *Buil
 	l = l.WithField("step", "assemble")
 	defer loggers.TimeTrackf(l, time.Now(), nil, "")

-	if !bcfg.whatChanged.needsPagesAssembly {
-		changes := bcfg.whatChanged.Drain()
-		if len(changes) > 0 {
-			if err := h.resolveAndClearStateForIdentities(ctx, l, nil, changes); err != nil {
-				return err
-			}
-		}
+	if !bcfg.whatChanged.contentChanged {
 		return nil
 	}

 	h.translationKeyPages.Reset()
 	assemblers := make([]*sitePagesAssembler, len(h.Sites))
 	// Changes detected during assembly (e.g. aggregate date changes)
-
+	assembleChanges := &whatChanged{
+		identitySet: make(map[identity.Identity]bool),
+	}
 	for i, s := range h.Sites {
 		assemblers[i] = &sitePagesAssembler{
 			Site:            s,
-			assembleChanges: bcfg.whatChanged,
+			watching:        s.watching(),
+			incomingChanges: bcfg.whatChanged,
+			assembleChanges: assembleChanges,
 			ctx:             ctx,
 		}
 	}
@@ -285,15 +273,20 @@ func (h *HugoSites) assemble(ctx context.Context, l logg.LevelLogger, bcfg *Buil
 		return err
 	}

-	changes := bcfg.whatChanged.Drain()
+	changes := assembleChanges.Changes()

-	// Changes from the assemble step (e.g. lastMod, cascade) needs a re-calculation
+	// Changes from the assemble step (e.g. lastMod, cascase) needs a re-calculation
 	// of what needs to be re-built.
 	if len(changes) > 0 {
 		if err := h.resolveAndClearStateForIdentities(ctx, l, nil, changes); err != nil {
 			return err
 		}
 	}
+	h.renderFormats = output.Formats{}
+	for _, s := range h.Sites {
+		s.s.initRenderFormats()
+		h.renderFormats = append(h.renderFormats, s.renderFormats...)
+	}

 	for _, s := range assemblers {
 		if err := s.assemblePagesStep2(); err != nil {
@@ -303,16 +296,9 @@ func (h *HugoSites) assemble(ctx context.Context, l logg.LevelLogger, bcfg *Buil

 	h.renderFormats = output.Formats{}
 	for _, s := range h.Sites {
-		s.s.initRenderFormats()
 		h.renderFormats = append(h.renderFormats, s.renderFormats...)
 	}

-	for _, s := range assemblers {
-		if err := s.assemblePagesStepFinal(); err != nil {
-			return err
-		}
-	}
-
 	return nil
 }

@@ -332,20 +318,9 @@ func (h *HugoSites) render(l logg.LevelLogger, config *BuildCfg) error {

 	i := 0
 	for _, s := range h.Sites {
-		segmentFilter := s.conf.C.SegmentFilter
-		if segmentFilter.ShouldExcludeCoarse(segments.SegmentMatcherFields{Lang: s.language.Lang}) {
-			l.Logf("skip language %q not matching segments set in --renderSegments", s.language.Lang)
-			continue
-		}
-
 		siteRenderContext.languageIdx = s.languagei
 		h.currentSite = s
 		for siteOutIdx, renderFormat := range s.renderFormats {
-			if segmentFilter.ShouldExcludeCoarse(segments.SegmentMatcherFields{Output: renderFormat.Name, Lang: s.language.Lang}) {
-				l.Logf("skip output format %q for language %q not matching segments set in --renderSegments", renderFormat.Name, s.language.Lang)
-				continue
-			}
-
 			siteRenderContext.outIdx = siteOutIdx
 			siteRenderContext.sitesOutIdx = i
 			i++
@@ -608,10 +583,6 @@ type pathChange struct {
 	isDir bool
 }

-func (p pathChange) isStructuralChange() bool {
-	return p.delete || p.isDir
-}
-
 // processPartial prepares the Sites' sources for a partial rebuild.
 func (h *HugoSites) processPartial(ctx context.Context, l logg.LevelLogger, config *BuildCfg, init func(config *BuildCfg) error, events []fsnotify.Event) error {
 	h.Log.Trace(logg.StringFunc(func() string {
@@ -624,18 +595,16 @@ func (h *HugoSites) processPartial(ctx context.Context, l logg.LevelLogger, conf
 		return sb.String()
 	}))

-	// For a list of events for the different OSes, see the test output in https://github.com/bep/fsnotifyeventlister/.
 	events = h.fileEventsFilter(events)
-	events = h.fileEventsTrim(events)
-	eventInfos := h.fileEventsApplyInfo(events)
+	events = h.fileEventsTranslate(events)

 	logger := h.Log

 	var (
-		tmplAdded          bool
-		tmplChanged        bool
-		i18nChanged        bool
-		needsPagesAssemble bool
+		tmplAdded      bool
+		tmplChanged    bool
+		i18nChanged    bool
+		contentChanged bool
 	)

 	changedPaths := struct {
@@ -662,12 +631,36 @@ func (h *HugoSites) processPartial(ctx context.Context, l logg.LevelLogger, conf
 		addedContentPaths []*paths.Path
 	)

-	for _, ev := range eventInfos {
-		cpss := h.BaseFs.ResolvePaths(ev.Name)
+	for _, ev := range events {
+		removed := false
+		added := false
+
+		if ev.Op&fsnotify.Remove == fsnotify.Remove {
+			removed = true
+		}
+
+		fi, statErr := h.Fs.Source.Stat(ev.Name)
+
+		// Some editors (Vim) sometimes issue only a Rename operation when writing an existing file
+		// Sometimes a rename operation means that file has been renamed other times it means
+		// it's been updated.
+		if ev.Op.Has(fsnotify.Rename) {
+			// If the file is still on disk, it's only been updated, if it's not, it's been moved
+			if statErr != nil {
+				removed = true
+			}
+		}
+		if ev.Op.Has(fsnotify.Create) {
+			added = true
+		}
+
+		isChangedDir := statErr == nil && fi.IsDir()
+
+		cpss := h.BaseFs.ResolvePaths(ev.Name, !removed)
 		pss := make([]*paths.Path, len(cpss))
 		for i, cps := range cpss {
 			p := cps.Path
-			if ev.removed && !paths.HasExt(p) {
+			if removed && !paths.HasExt(p) {
 				// Assume this is a renamed/removed directory.
 				// For deletes, we walk up the tree to find the container (e.g. branch bundle),
 				// so we will catch this even if it is a file without extension.
@@ -678,7 +671,7 @@ func (h *HugoSites) processPartial(ctx context.Context, l logg.LevelLogger, conf
 			}

 			pss[i] = h.Configs.ContentPathParser.Parse(cps.Component, p)
-			if ev.added && !ev.isChangedDir && cps.Component == files.ComponentFolderContent {
+			if added && !isChangedDir && cps.Component == files.ComponentFolderContent {
 				addedContentPaths = append(addedContentPaths, pss[i])
 			}

@@ -690,9 +683,9 @@ func (h *HugoSites) processPartial(ctx context.Context, l logg.LevelLogger, conf
 			}
 		}

-		if ev.removed {
+		if removed {
 			changedPaths.deleted = append(changedPaths.deleted, pss...)
-		} else if ev.isChangedDir {
+		} else if isChangedDir {
 			changedPaths.changedDirs = append(changedPaths.changedDirs, pss...)
 		} else {
 			changedPaths.changedFiles = append(changedPaths.changedFiles, pss...)
@@ -709,33 +702,11 @@ func (h *HugoSites) processPartial(ctx context.Context, l logg.LevelLogger, conf
 		switch pathInfo.Component() {
 		case files.ComponentFolderContent:
 			logger.Println("Source changed", pathInfo.Path())
-			isContentDataFile := pathInfo.IsContentData()
-			if !isContentDataFile {
-				if ids := h.pageTrees.collectAndMarkStaleIdentities(pathInfo); len(ids) > 0 {
-					changes = append(changes, ids...)
-				}
-			} else {
-				h.pageTrees.treePagesFromTemplateAdapters.DeleteAllFunc(pathInfo.Base(),
-					func(s string, n *pagesfromdata.PagesFromTemplate) bool {
-						changes = append(changes, n.DependencyManager)
-
-						// Try to open the file to see if has been deleted.
-						f, err := n.GoTmplFi.Meta().Open()
-						if err == nil {
-							f.Close()
-						}
-						if err != nil {
-							// Remove all pages and resources below.
-							prefix := pathInfo.Base() + "/"
-							h.pageTrees.treePages.DeletePrefixAll(prefix)
-							h.pageTrees.resourceTrees.DeletePrefixAll(prefix)
-							changes = append(changes, identity.NewGlobIdentity(prefix+"*"))
-						}
-						return err != nil
-					})
+			if ids := h.pageTrees.collectAndMarkStaleIdentities(pathInfo); len(ids) > 0 {
+				changes = append(changes, ids...)
 			}

-			needsPagesAssemble = true
+			contentChanged = true

 			if config.RecentlyVisited != nil {
 				// Fast render mode. Adding them to the visited queue
@@ -749,7 +720,7 @@ func (h *HugoSites) processPartial(ctx context.Context, l logg.LevelLogger, conf

 			h.pageTrees.treeTaxonomyEntries.DeletePrefix("")

-			if delete && !isContentDataFile {
+			if delete {
 				_, ok := h.pageTrees.treePages.LongestPrefixAll(pathInfo.Base())
 				if ok {
 					h.pageTrees.treePages.DeleteAll(pathInfo.Base())
@@ -768,7 +739,7 @@ func (h *HugoSites) processPartial(ctx context.Context, l logg.LevelLogger, conf

 		case files.ComponentFolderLayouts:
 			tmplChanged = true
-			templatePath := pathInfo.Unnormalized().TrimLeadingSlash().PathNoLang()
+			templatePath := pathInfo.TrimLeadingSlash().PathNoLang()
 			if !h.Tmpl().HasTemplate(templatePath) {
 				tmplAdded = true
 			}
@@ -797,7 +768,17 @@ func (h *HugoSites) processPartial(ctx context.Context, l logg.LevelLogger, conf
 			}
 		case files.ComponentFolderAssets:
 			logger.Println("Asset changed", pathInfo.Path())
-			changes = append(changes, pathInfo)
+
+			var hasID bool
+			r, _ := h.ResourceSpec.ResourceCache.Get(context.Background(), dynacache.CleanKey(pathInfo.Base()))
+			identity.WalkIdentitiesShallow(r, func(level int, rid identity.Identity) bool {
+				hasID = true
+				changes = append(changes, rid)
+				return false
+			})
+			if !hasID {
+				changes = append(changes, pathInfo)
+			}
 		case files.ComponentFolderData:
 			logger.Println("Data changed", pathInfo.Path())

@@ -811,8 +792,6 @@ func (h *HugoSites) processPartial(ctx context.Context, l logg.LevelLogger, conf
 			// It's hard to determine the exact change set of this,
 			// so be very coarse grained for now.
 			changes = append(changes, identity.GenghisKhan)
-		case files.ComponentFolderArchetypes:
-			// Ignore for now.
 		default:
 			panic(fmt.Sprintf("unknown component: %q", pathInfo.Component()))
 		}
@@ -888,8 +867,8 @@ func (h *HugoSites) processPartial(ctx context.Context, l logg.LevelLogger, conf
 	resourceFiles := h.fileEventsContentPaths(addedOrChangedContent)

 	changed := &whatChanged{
-		needsPagesAssembly: needsPagesAssemble,
-		identitySet:        make(identity.Identities),
+		contentChanged: contentChanged,
+		identitySet:    make(identity.Identities),
 	}
 	changed.Add(changes...)

@@ -911,7 +890,10 @@ func (h *HugoSites) processPartial(ctx context.Context, l logg.LevelLogger, conf
 		}
 	}

-	if err := h.resolveAndClearStateForIdentities(ctx, l, cacheBusterOr, changed.Drain()); err != nil {
+	// Removes duplicates.
+	changes = changed.identitySet.AsSlice()
+
+	if err := h.resolveAndClearStateForIdentities(ctx, l, cacheBusterOr, changes); err != nil {
 		return err
 	}

@@ -939,13 +921,7 @@ func (h *HugoSites) processPartial(ctx context.Context, l logg.LevelLogger, conf
 	}

 	if resourceFiles != nil {
-		if err := h.processFiles(ctx, l, config, resourceFiles...); err != nil {
-			return err
-		}
-	}
-
-	if h.isRebuild() {
-		if err := h.processContentAdaptersOnRebuild(ctx, config); err != nil {
+		if err := h.processFiles(ctx, l, *config, resourceFiles...); err != nil {
 			return err
 		}
 	}
@@ -953,18 +929,7 @@ func (h *HugoSites) processPartial(ctx context.Context, l logg.LevelLogger, conf
 	return nil
 }

-func (h *HugoSites) LogServerAddresses() {
-	if h.hugoInfo.IsMultihost() {
-		for _, s := range h.Sites {
-			h.Log.Printf("Web Server is available at %s (bind address %s) %s\n", s.conf.C.BaseURL, s.conf.C.ServerInterface, s.Language().Lang)
-		}
-	} else {
-		s := h.Sites[0]
-		h.Log.Printf("Web Server is available at %s (bind address %s)\n", s.conf.C.BaseURL, s.conf.C.ServerInterface)
-	}
-}
-
-func (h *HugoSites) processFull(ctx context.Context, l logg.LevelLogger, config *BuildCfg) (err error) {
+func (h *HugoSites) processFull(ctx context.Context, l logg.LevelLogger, config BuildCfg) (err error) {
 	if err = h.processFiles(ctx, l, config); err != nil {
 		err = fmt.Errorf("readAndProcessContent: %w", err)
 		return
@@ -972,49 +937,7 @@ func (h *HugoSites) processFull(ctx context.Context, l logg.LevelLogger, config
 	return err
 }

-func (s *Site) handleContentAdapterChanges(bi pagesfromdata.BuildInfo, buildConfig *BuildCfg) {
-	if !s.h.isRebuild() {
-		return
-	}
-
-	if len(bi.ChangedIdentities) > 0 {
-		buildConfig.whatChanged.Add(bi.ChangedIdentities...)
-		buildConfig.whatChanged.needsPagesAssembly = true
-	}
-
-	for _, p := range bi.DeletedPaths {
-		pp := path.Join(bi.Path.Base(), p)
-		if v, ok := s.pageMap.treePages.Delete(pp); ok {
-			buildConfig.whatChanged.Add(v.GetIdentity())
-		}
-	}
-}
-
-func (h *HugoSites) processContentAdaptersOnRebuild(ctx context.Context, buildConfig *BuildCfg) error {
-	g := rungroup.Run[*pagesfromdata.PagesFromTemplate](ctx, rungroup.Config[*pagesfromdata.PagesFromTemplate]{
-		NumWorkers: h.numWorkers,
-		Handle: func(ctx context.Context, p *pagesfromdata.PagesFromTemplate) error {
-			bi, err := p.Execute(ctx)
-			if err != nil {
-				return err
-			}
-			s := p.Site.(*Site)
-			s.handleContentAdapterChanges(bi, buildConfig)
-			return nil
-		},
-	})
-
-	h.pageTrees.treePagesFromTemplateAdapters.WalkPrefixRaw(doctree.LockTypeRead, "", func(key string, p *pagesfromdata.PagesFromTemplate) (bool, error) {
-		if p.StaleVersion() > 0 {
-			g.Enqueue(p)
-		}
-		return false, nil
-	})
-
-	return g.Wait()
-}
-
-func (s *HugoSites) processFiles(ctx context.Context, l logg.LevelLogger, buildConfig *BuildCfg, filenames ...pathChange) error {
+func (s *HugoSites) processFiles(ctx context.Context, l logg.LevelLogger, buildConfig BuildCfg, filenames ...pathChange) error {
 	if s.Deps == nil {
 		panic("nil deps on site")
 	}
@@ -1024,7 +947,7 @@ func (s *HugoSites) processFiles(ctx context.Context, l logg.LevelLogger, buildC
 	// For inserts, we can pick an arbitrary pageMap.
 	pageMap := s.Sites[0].pageMap

-	c := newPagesCollector(ctx, s.h, sourceSpec, s.Log, l, pageMap, buildConfig, filenames)
+	c := newPagesCollector(ctx, s.h, sourceSpec, s.Log, l, pageMap, filenames)

 	if err := c.Collect(); err != nil {
 		return err
@@ -66,12 +66,12 @@ robots|{{ site.Language.Lang }}
 404|{{ site.Language.Lang }}


-
+	
 `

 	b := Test(t, files)

-	b.Assert(b.H.Conf.IsMultilingual(), qt.Equals, true)
+	b.Assert(b.H.Conf.IsMultiLingual(), qt.Equals, true)
 	b.Assert(b.H.Conf.IsMultihost(), qt.Equals, true)

 	// helpers.PrintFs(b.H.Fs.PublishDir, "", os.Stdout)
@@ -162,52 +162,6 @@ title: "Mybundle fr"
 	b.AssertFileContent("public/fr/section/mybundle/styles.min.css", ".body{color:french}")
 }

-func TestResourcePerLanguageIssue12163(t *testing.T) {
-	files := `
-- hugo.toml --
-defaultContentLanguage = 'de'
-disableKinds = ['rss','sitemap','taxonomy','term']
-
-[languages.de]
-baseURL = 'https://de.example.org/'
-contentDir = 'content/de'
-weight = 1
-
-[languages.en]
-baseURL = 'https://en.example.org/'
-contentDir = 'content/en'
-weight = 2
-- content/de/mybundle/index.md --
---
-title: mybundle-de
---
-- content/de/mybundle/pixel.png --
-iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNkYPhfDwAChwGA60e6kgAAAABJRU5ErkJggg==
-- content/en/mybundle/index.md --
---
-title: mybundle-en
---
-- layouts/_default/single.html --
-{{ with .Resources.Get "pixel.png" }}
-  {{ with .Resize "2x2" }}
-    {{ .RelPermalink }}|
-  {{ end }}
-{{ end }}
-`
-
-	b := Test(t, files)
-
-	b.AssertFileExists("public/de/mybundle/index.html", true)
-	b.AssertFileExists("public/en/mybundle/index.html", true)
-
-	b.AssertFileExists("public/de/mybundle/pixel.png", true)
-	b.AssertFileExists("public/en/mybundle/pixel.png", true)
-
-	b.AssertFileExists("public/de/mybundle/pixel_hu8aa3346827e49d756ff4e630147c42b5_70_2x2_resize_box_3.png", true)
-	// failing test below
-	b.AssertFileExists("public/en/mybundle/pixel_hu8aa3346827e49d756ff4e630147c42b5_70_2x2_resize_box_3.png", true)
-}
-
 func TestMultihostResourceOneBaseURLWithSuPath(t *testing.T) {
 	files := `
 -- hugo.toml --
@@ -252,31 +206,3 @@ Files: {{ range $files }}{{ .Permalink }}|{{ end }}$
 	b.AssertFileContent("public/en/enpages/mybundle-en/file2.txt", "File 2 en.")
 	b.AssertFileContent("public/fr/section/mybundle/file2.txt", "File 2 en.")
 }
-
-func TestMultihostAllButOneLanguageDisabledIssue12288(t *testing.T) {
-	t.Parallel()
-
-	files := `
-- hugo.toml --
-defaultContentLanguage = "en"
-disableLanguages = ["fr"]
-#baseURL = "https://example.com"
-[languages]
-[languages.en]
-baseURL = "https://example.en"
-weight = 1
-[languages.fr]
-baseURL = "https://example.fr"
-weight = 2
--  assets/css/main.css --
-body { color: red; }
-- layouts/index.html --
-{{ $css := resources.Get "css/main.css" | minify }}
-CSS: {{ $css.Permalink }}|{{ $css.RelPermalink }}|
-`
-
-	b := Test(t, files)
-
-	b.AssertFileContent("public/css/main.min.css", "body{color:red}")
-	b.AssertFileContent("public/index.html", "CSS: https://example.en/css/main.min.css|/css/main.min.css|")
-}
@@ -41,7 +41,7 @@ Home: {{ .Title }}
 		IntegrationTestConfig{
 			T:           t,
 			TxtarString: files,
-			// LogLevel:    logg.LevelTrace,
+			LogLevel:    logg.LevelTrace,
 		},
 	).Build()

@@ -10,7 +10,6 @@ import (
 	"os"
 	"path/filepath"
 	"regexp"
-	"runtime"
 	"sort"
 	"strings"
 	"sync"
@@ -38,20 +37,12 @@ import (

 type TestOpt func(*IntegrationTestConfig)

-// TestOptRunning will enable running in integration tests.
 func TestOptRunning() TestOpt {
 	return func(c *IntegrationTestConfig) {
 		c.Running = true
 	}
 }

-// TestOptWatching will enable watching in integration tests.
-func TestOptWatching() TestOpt {
-	return func(c *IntegrationTestConfig) {
-		c.Watching = true
-	}
-}
-
 // Enable tracing in integration tests.
 // THis should only be used during development and not committed to the repo.
 func TestOptTrace() TestOpt {
@@ -178,11 +169,10 @@ type IntegrationTestBuilder struct {
 	renamedFiles []string
 	renamedDirs  []string

-	buildCount   int
-	GCCount      int
-	counters     *buildCounters
-	logBuff      lockingBuffer
-	lastBuildLog string
+	buildCount int
+	GCCount    int
+	counters   *buildCounters
+	logBuff    lockingBuffer

 	builderInit sync.Once
 }
@@ -192,13 +182,6 @@ type lockingBuffer struct {
 	bytes.Buffer
 }

-func (b *lockingBuffer) ReadFrom(r io.Reader) (n int64, err error) {
-	b.Lock()
-	n, err = b.Buffer.ReadFrom(r)
-	b.Unlock()
-	return
-}
-
 func (b *lockingBuffer) Write(p []byte) (n int, err error) {
 	b.Lock()
 	n, err = b.Buffer.Write(p)
@@ -209,21 +192,21 @@ func (b *lockingBuffer) Write(p []byte) (n int, err error) {
 func (s *IntegrationTestBuilder) AssertLogContains(els ...string) {
 	s.Helper()
 	for _, el := range els {
-		s.Assert(s.lastBuildLog, qt.Contains, el)
+		s.Assert(s.logBuff.String(), qt.Contains, el)
 	}
 }

 func (s *IntegrationTestBuilder) AssertLogNotContains(els ...string) {
 	s.Helper()
 	for _, el := range els {
-		s.Assert(s.lastBuildLog, qt.Not(qt.Contains), el)
+		s.Assert(s.logBuff.String(), qt.Not(qt.Contains), el)
 	}
 }

 func (s *IntegrationTestBuilder) AssertLogMatches(expression string) {
 	s.Helper()
 	re := regexp.MustCompile(expression)
-	s.Assert(re.MatchString(s.lastBuildLog), qt.IsTrue, qt.Commentf(s.lastBuildLog))
+	s.Assert(re.MatchString(s.logBuff.String()), qt.IsTrue, qt.Commentf(s.logBuff.String()))
 }

 func (s *IntegrationTestBuilder) AssertBuildCountData(count int) {
@@ -298,7 +281,7 @@ func (s *IntegrationTestBuilder) AssertPublishDir(matches ...string) {
 func (s *IntegrationTestBuilder) AssertFs(fs afero.Fs, matches ...string) {
 	s.Helper()
 	var buff bytes.Buffer
-	s.Assert(s.printAndCheckFs(fs, "", &buff), qt.IsNil)
+	helpers.PrintFs(fs, "", &buff)
 	printFsLines := strings.Split(buff.String(), "\n")
 	sort.Strings(printFsLines)
 	content := strings.TrimSpace((strings.Join(printFsLines, "\n")))
@@ -321,34 +304,6 @@ func (s *IntegrationTestBuilder) AssertFs(fs afero.Fs, matches ...string) {
 	}
 }

-func (s *IntegrationTestBuilder) printAndCheckFs(fs afero.Fs, path string, w io.Writer) error {
-	if fs == nil {
-		return nil
-	}
-
-	return afero.Walk(fs, path, func(path string, info os.FileInfo, err error) error {
-		if err != nil {
-			return fmt.Errorf("error: path %q: %s", path, err)
-		}
-		path = filepath.ToSlash(path)
-		if path == "" {
-			path = "."
-		}
-		if !info.IsDir() {
-			f, err := fs.Open(path)
-			if err != nil {
-				return fmt.Errorf("error: path %q: %s", path, err)
-			}
-			defer f.Close()
-			// This will panic if the file is a directory.
-			var buf [1]byte
-			io.ReadFull(f, buf[:])
-		}
-		fmt.Fprintln(w, path, info.IsDir())
-		return nil
-	})
-}
-
 func (s *IntegrationTestBuilder) AssertFileExists(filename string, b bool) {
 	checker := qt.IsNil
 	if !b {
@@ -386,7 +341,7 @@ func (s *IntegrationTestBuilder) Build() *IntegrationTestBuilder {
 	s.Helper()
 	_, err := s.BuildE()
 	if s.Cfg.Verbose || err != nil {
-		fmt.Println(s.lastBuildLog)
+		fmt.Println(s.logBuff.String())
 		if s.H != nil && err == nil {
 			for _, s := range s.H.Sites {
 				m := s.pageMap
@@ -397,7 +352,7 @@ func (s *IntegrationTestBuilder) Build() *IntegrationTestBuilder {
 			}
 		}
 	} else if s.Cfg.LogLevel <= logg.LevelDebug {
-		fmt.Println(s.lastBuildLog)
+		fmt.Println(s.logBuff.String())
 	}
 	s.Assert(err, qt.IsNil)
 	if s.Cfg.RunGC {
@@ -409,7 +364,7 @@ func (s *IntegrationTestBuilder) Build() *IntegrationTestBuilder {
 }

 func (s *IntegrationTestBuilder) LogString() string {
-	return s.lastBuildLog
+	return s.logBuff.String()
 }

 func (s *IntegrationTestBuilder) BuildE() (*IntegrationTestBuilder, error) {
@@ -426,7 +381,6 @@ func (s *IntegrationTestBuilder) Init() *IntegrationTestBuilder {
 	if err := s.initBuilder(); err != nil {
 		s.Fatalf("Failed to init builder: %s", err)
 	}
-	s.lastBuildLog = s.logBuff.String()
 	return s
 }

@@ -578,10 +532,6 @@ func (s *IntegrationTestBuilder) initBuilder() error {
 				"running": s.Cfg.Running,
 				"watch":   s.Cfg.Running,
 			})
-		} else if s.Cfg.Watching {
-			flags.Set("internal", maps.Params{
-				"watch": s.Cfg.Watching,
-			})
 		}

 		if s.Cfg.WorkingDir != "" {
@@ -676,11 +626,10 @@ func (s *IntegrationTestBuilder) build(cfg BuildCfg) error {
 	s.Helper()
 	defer func() {
 		s.reset()
-		s.lastBuildLog = s.logBuff.String()
-		s.logBuff.Reset()
 	}()

 	changeEvents := s.changeEvents()
+	s.logBuff.Reset()
 	s.counters = &buildCounters{}
 	cfg.testCounters = s.counters

@@ -694,21 +643,16 @@ func (s *IntegrationTestBuilder) build(cfg BuildCfg) error {
 	if err != nil {
 		return err
 	}
+	logErrorCount := s.H.NumLogErrors()
+	if logErrorCount > 0 {
+		return fmt.Errorf("logged %d error(s): %s", logErrorCount, s.logBuff.String())
+	}

 	return nil
 }

-// We simulate the fsnotify events.
-// See the test output in https://github.com/bep/fsnotifyeventlister for what events gets produced
-// by the different OSes.
 func (s *IntegrationTestBuilder) changeEvents() []fsnotify.Event {
-	var (
-		events    []fsnotify.Event
-		isLinux   = runtime.GOOS == "linux"
-		isMacOs   = runtime.GOOS == "darwin"
-		isWindows = runtime.GOOS == "windows"
-	)
-
+	var events []fsnotify.Event
 	for _, v := range s.removedFiles {
 		events = append(events, fsnotify.Event{
 			Name: v,
@@ -735,32 +679,12 @@ func (s *IntegrationTestBuilder) changeEvents() []fsnotify.Event {
 			Name: v,
 			Op:   fsnotify.Write,
 		})
-		if isLinux || isWindows {
-			// Duplicate write events, for some reason.
-			events = append(events, fsnotify.Event{
-				Name: v,
-				Op:   fsnotify.Write,
-			})
-		}
-		if isMacOs {
-			events = append(events, fsnotify.Event{
-				Name: v,
-				Op:   fsnotify.Chmod,
-			})
-		}
 	}
 	for _, v := range s.createdFiles {
 		events = append(events, fsnotify.Event{
 			Name: v,
 			Op:   fsnotify.Create,
 		})
-		if isLinux || isWindows {
-			events = append(events, fsnotify.Event{
-				Name: v,
-				Op:   fsnotify.Write,
-			})
-		}
-
 	}

 	// Shuffle events.
@@ -829,11 +753,6 @@ type IntegrationTestConfig struct {
 	// Whether to simulate server mode.
 	Running bool

-	// Watch for changes.
-	// This is (currently) always set to true when Running is set.
-	// Note that the CLI for the server does allow for --watch=false, but that is not used in these test.
-	Watching bool
-
 	// Will print the log buffer after the build
 	Verbose bool

@@ -636,77 +636,3 @@ Menu Item: {{ $i }}|{{ .URL }}|
 Menu Item: 0|/foo/posts|
 `)
 }
-
-func TestSectionPagesMenuMultilingualWarningIssue12306(t *testing.T) {
-	t.Parallel()
-
-	files := `
-- hugo.toml --
-disableKinds = ['section','rss','sitemap','taxonomy','term']
-defaultContentLanguageInSubdir = true
-sectionPagesMenu = "main"
-[languages.en]
-[languages.fr]
-- layouts/_default/home.html --
-{{- range site.Menus.main -}}
-  <a href="{{ .URL }}">{{ .Name }}</a>
-{{- end -}}
-- layouts/_default/single.html --
-{{ .Title }}
-- content/p1.en.md --
---
-title: p1
-menu: main
---
-- content/p1.fr.md --
---
-title: p1
-menu: main
---
-- content/p2.en.md --
---
-title: p2
-menu: main
---
-`
-
-	b := Test(t, files, TestOptWarn())
-
-	b.AssertFileContent("public/en/index.html", `<a href="/en/p1/">p1</a><a href="/en/p2/">p2</a>`)
-	b.AssertFileContent("public/fr/index.html", `<a href="/fr/p1/">p1</a>`)
-	b.AssertLogNotContains("WARN")
-}
-
-func TestSectionPagesIssue12399(t *testing.T) {
-	t.Parallel()
-
-	files := `
-- hugo.toml --
-disableKinds = ['rss','sitemap','taxonomy','term']
-capitalizeListTitles = false
-pluralizeListTitles = false
-sectionPagesMenu = 'main'
-- content/p1.md --
---
-title: p1
---
-- content/s1/p2.md --
---
-title: p2
-menus: main
---
-- content/s1/p3.md --
---
-title: p3
---
-- layouts/_default/list.html --
-{{ range site.Menus.main }}<a href="{{ .URL }}">{{ .Name }}</a>{{ end }}
-- layouts/_default/single.html --
-{{ .Title }}
-`
-
-	b := Test(t, files)
-
-	b.AssertFileExists("public/index.html", true)
-	b.AssertFileContent("public/index.html", `<a href="/s1/p2/">p2</a><a href="/s1/">s1</a>`)
-}
@@ -22,7 +22,6 @@ import (

 	"github.com/gohugoio/hugo/hugofs"
 	"github.com/gohugoio/hugo/hugolib/doctree"
-	"github.com/gohugoio/hugo/hugolib/segments"
 	"github.com/gohugoio/hugo/identity"
 	"github.com/gohugoio/hugo/media"
 	"github.com/gohugoio/hugo/output"
@@ -37,7 +36,6 @@ import (

 	"github.com/gohugoio/hugo/common/herrors"
 	"github.com/gohugoio/hugo/common/maps"
-	"github.com/gohugoio/hugo/common/types"

 	"github.com/gohugoio/hugo/source"

@@ -153,19 +151,6 @@ func (p *pageState) reusePageOutputContent() bool {
 	return p.pageOutputTemplateVariationsState.Load() == 1
 }

-func (p *pageState) skipRender() bool {
-	b := p.s.conf.C.SegmentFilter.ShouldExcludeFine(
-		segments.SegmentMatcherFields{
-			Path:   p.Path(),
-			Kind:   p.Kind(),
-			Lang:   p.Lang(),
-			Output: p.pageOutput.f.Name,
-		},
-	)
-
-	return b
-}
-
 func (po *pageState) isRenderedAny() bool {
 	for _, o := range po.pageOutputs {
 		if o.isRendered() {
@@ -380,9 +365,7 @@ func (p *pageState) TranslationKey() string {
 // AllTranslations returns all translations, including the current Page.
 func (p *pageState) AllTranslations() page.Pages {
 	key := p.Path() + "/" + "translations-all"
-	// This is called from Translations, so we need to use a different partition, cachePages2,
-	// to avoid potential deadlocks.
-	pages, err := p.s.pageMap.getOrCreatePagesFromCache(p.s.pageMap.cachePages2, key, func(string) (page.Pages, error) {
+	pages, err := p.s.pageMap.getOrCreatePagesFromCache(key, func(string) (page.Pages, error) {
 		if p.m.pageConfig.TranslationKey != "" {
 			// translationKey set by user.
 			pas, _ := p.s.h.translationKeyPages.Get(p.m.pageConfig.TranslationKey)
@@ -415,7 +398,7 @@ func (p *pageState) AllTranslations() page.Pages {
 // Translations returns the translations excluding the current Page.
 func (p *pageState) Translations() page.Pages {
 	key := p.Path() + "/" + "translations"
-	pages, err := p.s.pageMap.getOrCreatePagesFromCache(nil, key, func(string) (page.Pages, error) {
+	pages, err := p.s.pageMap.getOrCreatePagesFromCache(key, func(string) (page.Pages, error) {
 		var pas page.Pages
 		for _, pp := range p.AllTranslations() {
 			if !pp.Eq(p) {
@@ -510,15 +493,9 @@ func (p *pageState) renderResources() error {
 				continue
 			}

-			if _, isWrapper := r.(resource.ResourceWrapper); isWrapper {
-				// Skip resources that are wrapped.
-				// These gets published on its own.
-				continue
-			}
-
 			src, ok := r.(resource.Source)
 			if !ok {
-				initErr = fmt.Errorf("resource %T does not support resource.Source", r)
+				initErr = fmt.Errorf("resource %T does not support resource.Source", src)
 				return
 			}

@@ -587,11 +564,7 @@ func (p *pageState) getPageInfoForError() string {
 func (p *pageState) getContentConverter() converter.Converter {
 	var err error
 	p.contentConverterInit.Do(func() {
-		if p.m.pageConfig.ContentMediaType.IsZero() {
-			panic("ContentMediaType not set")
-		}
-		markup := p.m.pageConfig.ContentMediaType.SubType
-
+		markup := p.m.pageConfig.Markup
 		if markup == "html" {
 			// Only used for shortcode inner content.
 			markup = "markdown"
@@ -758,9 +731,3 @@ func (p pageWithWeight0) Weight0() int {
 func (p pageWithWeight0) page() page.Page {
 	return p.pageState
 }
-
-var _ types.Unwrapper = (*pageWithWeight0)(nil)
-
-func (p pageWithWeight0) Unwrapv() any {
-	return p.pageState
-}
@@ -67,7 +67,6 @@ type pageCommon struct {
 	page.InSectionPositioner
 	page.OutputFormatsProvider
 	page.PageMetaProvider
-	page.PageMetaInternalProvider
 	page.Positioner
 	page.RawContentProvider
 	page.RelatedKeywordsProvider
@@ -20,7 +20,6 @@ import (
 	"fmt"
 	"html/template"
 	"io"
-	"path/filepath"
 	"strconv"
 	"strings"
 	"unicode/utf8"
@@ -55,31 +54,21 @@ type pageContentReplacement struct {
 	source pageparser.Item
 }

-func (m *pageMeta) parseFrontMatter(h *HugoSites, pid uint64) (*contentParseInfo, error) {
-	var (
-		sourceKey  string
-		openSource hugio.OpenReadSeekCloser
-		hasContent = m.pageConfig.IsFromContentAdapter
-	)
-
-	if m.f != nil && !hasContent {
-		sourceKey = filepath.ToSlash(m.f.Filename())
-		if !hasContent {
-			meta := m.f.FileInfo().Meta()
-			openSource = func() (hugio.ReadSeekCloser, error) {
-				r, err := meta.Open()
-				if err != nil {
-					return nil, fmt.Errorf("failed to open file %q: %w", meta.Filename, err)
-				}
-				return r, nil
+func (m *pageMeta) parseFrontMatter(h *HugoSites, pid uint64, sourceKey string) (*contentParseInfo, error) {
+	var openSource hugio.OpenReadSeekCloser
+	if m.f != nil {
+		meta := m.f.FileInfo().Meta()
+		openSource = func() (hugio.ReadSeekCloser, error) {
+			r, err := meta.Open()
+			if err != nil {
+				return nil, fmt.Errorf("failed to open file %q: %w", meta.Filename, err)
 			}
+			return r, nil
 		}
-	} else if hasContent {
-		openSource = m.pageConfig.Content.ValueAsOpenReadSeekCloser()
 	}

 	if sourceKey == "" {
-		sourceKey = strconv.FormatUint(pid, 10)
+		sourceKey = strconv.Itoa(int(pid))
 	}

 	pi := &contentParseInfo{
@@ -104,11 +93,6 @@ func (m *pageMeta) parseFrontMatter(h *HugoSites, pid uint64) (*contentParseInfo

 	pi.itemsStep1 = items

-	if hasContent {
-		// No front matter.
-		return pi, nil
-	}
-
 	if err := pi.mapFrontMatter(source); err != nil {
 		return nil, err
 	}
@@ -434,8 +418,6 @@ func (c *cachedContent) mustSource() []byte {

 func (c *contentParseInfo) contentSource(s resource.StaleInfo) ([]byte, error) {
 	key := c.sourceKey
-	versionv := s.StaleVersion()
-
 	v, err := c.h.cacheContentSource.GetOrCreate(key, func(string) (*resources.StaleValue[[]byte], error) {
 		b, err := c.readSourceAll()
 		if err != nil {
@@ -444,8 +426,8 @@ func (c *contentParseInfo) contentSource(s resource.StaleInfo) ([]byte, error) {

 		return &resources.StaleValue[[]byte]{
 			Value: b,
-			StaleVersionFunc: func() uint32 {
-				return s.StaleVersion() - versionv
+			IsStaleFunc: func() bool {
+				return s.IsStale()
 			},
 		}, nil
 	})
@@ -505,7 +487,7 @@ type contentPlainPlainWords struct {
 func (c *cachedContent) contentRendered(ctx context.Context, cp *pageContentOutput) (contentSummary, error) {
 	ctx = tpl.Context.DependencyScope.Set(ctx, pageDependencyScopeGlobal)
 	key := c.pi.sourceKey + "/" + cp.po.f.Name
-	versionv := c.version(cp)
+	versionv := cp.contentRenderedVersion

 	v, err := c.pm.cacheContentRendered.GetOrCreate(key, func(string) (*resources.StaleValue[contentSummary], error) {
 		cp.po.p.s.Log.Trace(logg.StringFunc(func() string {
@@ -522,8 +504,8 @@ func (c *cachedContent) contentRendered(ctx context.Context, cp *pageContentOutp
 		}

 		rs := &resources.StaleValue[contentSummary]{
-			StaleVersionFunc: func() uint32 {
-				return c.version(cp) - versionv
+			IsStaleFunc: func() bool {
+				return c.IsStale() || cp.contentRenderedVersion != versionv
 			},
 		}

@@ -540,7 +522,6 @@ func (c *cachedContent) contentRendered(ctx context.Context, cp *pageContentOutp
 			if err != nil {
 				return nil, err
 			}
-
 			if !ok {
 				return nil, errors.New("invalid state: astDoc is set but RenderContent returned false")
 			}
@@ -583,14 +564,15 @@ func (c *cachedContent) contentRendered(ctx context.Context, cp *pageContentOutp
 		var result contentSummary // hasVariants bool

 		if c.pi.hasSummaryDivider {
-			if cp.po.p.m.pageConfig.ContentMediaType.IsHTML() {
+			isHTML := cp.po.p.m.pageConfig.Markup == "html"
+			if isHTML {
 				// Use the summary sections as provided by the user.
 				i := bytes.Index(b, internalSummaryDividerPre)
 				result.summary = helpers.BytesToHTML(b[:i])
 				b = b[i+len(internalSummaryDividerPre):]

 			} else {
-				summary, content, err := splitUserDefinedSummaryAndContent(cp.po.p.m.pageConfig.Content.Markup, b)
+				summary, content, err := splitUserDefinedSummaryAndContent(cp.po.p.m.pageConfig.Markup, b)
 				if err != nil {
 					cp.po.p.s.Log.Errorf("Failed to set user defined summary for page %q: %s", cp.po.p.pathOrTitle(), err)
 				} else {
@@ -624,7 +606,7 @@ var setGetContentCallbackInContext = hcontext.NewContextDispatcher[func(*pageCon

 func (c *cachedContent) contentToC(ctx context.Context, cp *pageContentOutput) (contentTableOfContents, error) {
 	key := c.pi.sourceKey + "/" + cp.po.f.Name
-	versionv := c.version(cp)
+	versionv := cp.contentRenderedVersion

 	v, err := c.pm.contentTableOfContents.GetOrCreate(key, func(string) (*resources.StaleValue[contentTableOfContents], error) {
 		source, err := c.pi.contentSource(c)
@@ -644,10 +626,8 @@ func (c *cachedContent) contentToC(ctx context.Context, cp *pageContentOutput) (
 			return nil, err
 		}

-		// Callback called from below (e.g. in .RenderString)
+		// Callback called from above (e.g. in .RenderString)
 		ctxCallback := func(cp2 *pageContentOutput, ct2 contentTableOfContents) {
-			cp.otherOutputs[cp2.po.p.pid] = cp2
-
 			// Merge content placeholders
 			for k, v := range ct2.contentPlaceholders {
 				ct.contentPlaceholders[k] = v
@@ -680,7 +660,7 @@ func (c *cachedContent) contentToC(ctx context.Context, cp *pageContentOutput) (
 			p.pageOutputTemplateVariationsState.Add(1)
 		}

-		isHTML := cp.po.p.m.pageConfig.ContentMediaType.IsHTML()
+		isHTML := cp.po.p.m.pageConfig.Markup == "html"

 		if !isHTML {
 			createAndSetToC := func(tocProvider converter.TableOfContentsProvider) {
@@ -730,8 +710,8 @@ func (c *cachedContent) contentToC(ctx context.Context, cp *pageContentOutput) (

 		return &resources.StaleValue[contentTableOfContents]{
 			Value: ct,
-			StaleVersionFunc: func() uint32 {
-				return c.version(cp) - versionv
+			IsStaleFunc: func() bool {
+				return c.IsStale() || cp.contentRenderedVersion != versionv
 			},
 		}, nil
 	})
@@ -742,21 +722,16 @@ func (c *cachedContent) contentToC(ctx context.Context, cp *pageContentOutput) (
 	return v.Value, nil
 }

-func (c *cachedContent) version(cp *pageContentOutput) uint32 {
-	// Both of these gets incremented on change.
-	return c.StaleVersion() + cp.contentRenderedVersion
-}
-
 func (c *cachedContent) contentPlain(ctx context.Context, cp *pageContentOutput) (contentPlainPlainWords, error) {
 	key := c.pi.sourceKey + "/" + cp.po.f.Name

-	versionv := c.version(cp)
+	versionv := cp.contentRenderedVersion

 	v, err := c.pm.cacheContentPlain.GetOrCreateWitTimeout(key, cp.po.p.s.Conf.Timeout(), func(string) (*resources.StaleValue[contentPlainPlainWords], error) {
 		var result contentPlainPlainWords
 		rs := &resources.StaleValue[contentPlainPlainWords]{
-			StaleVersionFunc: func() uint32 {
-				return c.version(cp) - versionv
+			IsStaleFunc: func() bool {
+				return c.IsStale() || cp.contentRenderedVersion != versionv
 			},
 		}

@@ -795,7 +770,7 @@ func (c *cachedContent) contentPlain(ctx context.Context, cp *pageContentOutput)
 			result.readingTime = (result.wordCount + 212) / 213
 		}

-		if c.pi.hasSummaryDivider || rendered.summary != "" {
+		if rendered.summary != "" {
 			result.summary = rendered.summary
 			result.summaryTruncated = rendered.summaryTruncated
 		} else if cp.po.p.m.pageConfig.Summary != "" {
@@ -803,7 +778,7 @@ func (c *cachedContent) contentPlain(ctx context.Context, cp *pageContentOutput)
 			if err != nil {
 				return nil, err
 			}
-			html := cp.po.p.s.ContentSpec.TrimShortHTML(b.Bytes(), cp.po.p.m.pageConfig.Content.Markup)
+			html := cp.po.p.s.ContentSpec.TrimShortHTML(b.Bytes())
 			result.summary = helpers.BytesToHTML(html)
 		} else {
 			var summary string
@@ -54,7 +54,7 @@ type pageMeta struct {
 	singular string // Set for kind == KindTerm and kind == KindTaxonomy.

 	resource.Staler
-	*pageMetaParams
+	pageMetaParams
 	pageMetaFrontMatter

 	// Set for standalone pages, e.g. robotsTXT.
@@ -74,9 +74,7 @@ type pageMeta struct {
 // Prepare for a rebuild of the data passed in from front matter.
 func (m *pageMeta) setMetaPostPrepareRebuild() {
 	params := xmaps.Clone[map[string]any](m.paramsOriginal)
-	m.pageMetaParams.pageConfig = &pagemeta.PageConfig{
-		Params: params,
-	}
+	m.pageMetaParams.pageConfig.Params = params
 	m.pageMetaFrontMatter = pageMetaFrontMatter{}
 }

@@ -100,7 +98,7 @@ type pageMetaFrontMatter struct {
 func (m *pageMetaParams) init(preserveOringal bool) {
 	if preserveOringal {
 		m.paramsOriginal = xmaps.Clone[maps.Params](m.pageConfig.Params)
-		m.cascadeOriginal = xmaps.Clone[map[page.PageMatcher]maps.Params](m.pageConfig.CascadeCompiled)
+		m.cascadeOriginal = xmaps.Clone[map[page.PageMatcher]maps.Params](m.pageConfig.Cascade)
 	}
 }

@@ -108,9 +106,9 @@ func (p *pageMeta) Aliases() []string {
 	return p.pageConfig.Aliases
 }

-// Deprecated: Use taxonomies instead.
+// Deprecated: use taxonomies.
 func (p *pageMeta) Author() page.Author {
-	hugo.Deprecate(".Page.Author", "Use taxonomies instead.", "v0.98.0")
+	hugo.Deprecate(".Author", "Use taxonomies.", "v0.98.0")
 	authors := p.Authors()

 	for _, author := range authors {
@@ -119,9 +117,9 @@ func (p *pageMeta) Author() page.Author {
 	return page.Author{}
 }

-// Deprecated: Use taxonomies instead.
+// Deprecated: use taxonomies.
 func (p *pageMeta) Authors() page.AuthorList {
-	hugo.Deprecate(".Page.Authors", "Use taxonomies instead.", "v0.112.0")
+	hugo.Deprecate(".Author", "Use taxonomies.", "v0.112.0")
 	return nil
 }

@@ -137,19 +135,19 @@ func (p *pageMeta) BundleType() string {
 }

 func (p *pageMeta) Date() time.Time {
-	return p.pageConfig.Dates.Date
+	return p.pageConfig.Date
 }

 func (p *pageMeta) PublishDate() time.Time {
-	return p.pageConfig.Dates.PublishDate
+	return p.pageConfig.PublishDate
 }

 func (p *pageMeta) Lastmod() time.Time {
-	return p.pageConfig.Dates.Lastmod
+	return p.pageConfig.Lastmod
 }

 func (p *pageMeta) ExpiryDate() time.Time {
-	return p.pageConfig.Dates.ExpiryDate
+	return p.pageConfig.ExpiryDate
 }

 func (p *pageMeta) Description() string {
@@ -277,9 +275,11 @@ func (p *pageMeta) Weight() int {

 func (p *pageMeta) setMetaPre(pi *contentParseInfo, logger loggers.Logger, conf config.AllProvider) error {
 	frontmatter := pi.frontMatter
-
 	if frontmatter != nil {
 		pcfg := p.pageConfig
+		if pcfg == nil {
+			panic("pageConfig not set")
+		}
 		// Needed for case insensitive fetching of params values
 		maps.PrepareParams(frontmatter)
 		pcfg.Params = frontmatter
@@ -290,7 +290,7 @@ func (p *pageMeta) setMetaPre(pi *contentParseInfo, logger loggers.Logger, conf
 			if err != nil {
 				return err
 			}
-			pcfg.CascadeCompiled = cascade
+			pcfg.Cascade = cascade
 		}

 		// Look for path, lang and kind, all of which values we need early on.
@@ -328,18 +328,18 @@ func (ps *pageState) setMetaPost(cascade map[page.PageMatcher]maps.Params) error
 	ps.m.setMetaPostCount++
 	var cascadeHashPre uint64
 	if ps.m.setMetaPostCount > 1 {
-		cascadeHashPre = identity.HashUint64(ps.m.pageConfig.CascadeCompiled)
-		ps.m.pageConfig.CascadeCompiled = xmaps.Clone[map[page.PageMatcher]maps.Params](ps.m.cascadeOriginal)
+		cascadeHashPre = identity.HashUint64(ps.m.pageConfig.Cascade)
+		ps.m.pageConfig.Cascade = xmaps.Clone[map[page.PageMatcher]maps.Params](ps.m.cascadeOriginal)

 	}

 	// Apply cascades first so they can be overridden later.
 	if cascade != nil {
-		if ps.m.pageConfig.CascadeCompiled != nil {
+		if ps.m.pageConfig.Cascade != nil {
 			for k, v := range cascade {
-				vv, found := ps.m.pageConfig.CascadeCompiled[k]
+				vv, found := ps.m.pageConfig.Cascade[k]
 				if !found {
-					ps.m.pageConfig.CascadeCompiled[k] = v
+					ps.m.pageConfig.Cascade[k] = v
 				} else {
 					// Merge
 					for ck, cv := range v {
@@ -349,20 +349,19 @@ func (ps *pageState) setMetaPost(cascade map[page.PageMatcher]maps.Params) error
 					}
 				}
 			}
-			cascade = ps.m.pageConfig.CascadeCompiled
+			cascade = ps.m.pageConfig.Cascade
 		} else {
-			ps.m.pageConfig.CascadeCompiled = cascade
+			ps.m.pageConfig.Cascade = cascade
 		}
 	}

 	if cascade == nil {
-		cascade = ps.m.pageConfig.CascadeCompiled
+		cascade = ps.m.pageConfig.Cascade
 	}

 	if ps.m.setMetaPostCount > 1 {
-		ps.m.setMetaPostCascadeChanged = cascadeHashPre != identity.HashUint64(ps.m.pageConfig.CascadeCompiled)
+		ps.m.setMetaPostCascadeChanged = cascadeHashPre != identity.HashUint64(ps.m.pageConfig.Cascade)
 		if !ps.m.setMetaPostCascadeChanged {
-
 			// No changes, restore any value that may be changed by aggregation.
 			ps.m.pageConfig.Dates = ps.m.datesOriginal
 			return nil
@@ -401,17 +400,11 @@ func (p *pageState) setMetaPostParams() error {
 	pm := p.m
 	var mtime time.Time
 	var contentBaseName string
-	var ext string
-	var isContentAdapter bool
 	if p.File() != nil {
-		isContentAdapter = p.File().IsContentAdapter()
 		contentBaseName = p.File().ContentBaseName()
 		if p.File().FileInfo() != nil {
 			mtime = p.File().FileInfo().ModTime()
 		}
-		if !isContentAdapter {
-			ext = p.File().Ext()
-		}
 	}

 	var gitAuthorDate time.Time
@@ -435,11 +428,6 @@ func (p *pageState) setMetaPostParams() error {
 		p.s.Log.Errorf("Failed to handle dates for page %q: %s", p.pathOrTitle(), err)
 	}

-	if isContentAdapter {
-		// Done.
-		return nil
-	}
-
 	var buildConfig any
 	var isNewBuildKeyword bool
 	if v, ok := pm.pageConfig.Params["_build"]; ok {
@@ -468,10 +456,8 @@ params:
 	var sitemapSet bool

 	pcfg := pm.pageConfig
+
 	params := pcfg.Params
-	if params == nil {
-		panic("params not set for " + p.Title())
-	}

 	var draft, published, isCJKLanguage *bool
 	var userParams map[string]any
@@ -537,7 +523,7 @@ params:
 			// pages.
 			isHeadless := cast.ToBool(v)
 			params[loki] = isHeadless
-			if isHeadless {
+			if p.File().TranslationBaseName() == "index" && isHeadless {
 				pm.pageConfig.Build.List = pagemeta.Never
 				pm.pageConfig.Build.Render = pagemeta.Never
 			}
@@ -564,8 +550,8 @@ params:
 			pcfg.Layout = cast.ToString(v)
 			params[loki] = pcfg.Layout
 		case "markup":
-			pcfg.Content.Markup = cast.ToString(v)
-			params[loki] = pcfg.Content.Markup
+			pcfg.Markup = cast.ToString(v)
+			params[loki] = pcfg.Markup
 		case "weight":
 			pcfg.Weight = cast.ToInt(v)
 			params[loki] = pcfg.Weight
@@ -615,7 +601,7 @@ params:
 			}

 			if handled {
-				pcfg.ResourcesMeta = resources
+				pcfg.Resources = resources
 				break
 			}
 			fallthrough
@@ -662,6 +648,8 @@ params:
 		pcfg.Sitemap = p.s.conf.Sitemap
 	}

+	pcfg.Markup = p.s.ContentSpec.ResolveMarkup(pcfg.Markup)
+
 	if draft != nil && published != nil {
 		pcfg.Draft = *draft
 		p.m.s.Log.Warnf("page %q has both draft and published settings in its frontmatter. Using draft.", p.File().Filename())
@@ -684,19 +672,11 @@ params:

 	params["iscjklanguage"] = pcfg.IsCJKLanguage

-	if err := pcfg.Validate(false); err != nil {
-		return err
-	}
-
-	if err := pcfg.Compile("", false, ext, p.s.Log, p.s.conf.MediaTypes.Config); err != nil {
-		return err
-	}
-
 	return nil
 }

 // shouldList returns whether this page should be included in the list of pages.
-// global indicates site.Pages etc.
+// glogal indicates site.Pages etc.
 func (p *pageMeta) shouldList(global bool) bool {
 	if p.isStandalone() {
 		// Never list 404, sitemap and similar.
@@ -747,13 +727,13 @@ func (p *pageMeta) applyDefaultValues() error {
 		(&p.pageConfig.Build).Disable()
 	}

-	if p.pageConfig.Content.Markup == "" {
+	if p.pageConfig.Markup == "" {
 		if p.File() != nil {
 			// Fall back to file extension
-			p.pageConfig.Content.Markup = p.s.ContentSpec.ResolveMarkup(p.File().Ext())
+			p.pageConfig.Markup = p.s.ContentSpec.ResolveMarkup(p.File().Ext())
 		}
-		if p.pageConfig.Content.Markup == "" {
-			p.pageConfig.Content.Markup = "markdown"
+		if p.pageConfig.Markup == "" {
+			p.pageConfig.Markup = "markdown"
 		}
 	}

@@ -814,26 +794,12 @@ func (p *pageMeta) newContentConverter(ps *pageState, markup string) (converter.
 		path = p.Path()
 	}

-	doc := newPageForRenderHook(ps)
-
-	documentLookup := func(id uint64) any {
-		if id == ps.pid {
-			// This prevents infinite recursion in some cases.
-			return doc
-		}
-		if v, ok := ps.pageOutput.pco.otherOutputs[id]; ok {
-			return v.po.p
-		}
-		return nil
-	}
-
 	cpp, err := cp.New(
 		converter.DocumentContext{
-			Document:       doc,
-			DocumentLookup: documentLookup,
-			DocumentID:     id,
-			DocumentName:   path,
-			Filename:       filename,
+			Document:     newPageForRenderHook(ps),
+			DocumentID:   id,
+			DocumentName: path,
+			Filename:     filename,
 		},
 	)
 	if err != nil {
@@ -11,11 +11,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-package hugolib
+package hugolib_test

 import (
 	"strings"
 	"testing"
+
+	"github.com/gohugoio/hugo/hugolib"
 )

 // Issue 9793
@@ -41,7 +43,7 @@ tags: 'tag-a'
 {{ .Title }}
 	`

-	b := Test(t, files)
+	b := hugolib.Test(t, files)

 	b.AssertFileContent("public/section-1/index.html", "Section-1s")
 	b.AssertFileContent("public/tags/index.html", "Tags")
@@ -49,34 +51,9 @@ tags: 'tag-a'

 	files = strings.Replace(files, "true", "false", -1)

-	b = Test(t, files)
+	b = hugolib.Test(t, files)

 	b.AssertFileContent("public/section-1/index.html", "section-1")
 	b.AssertFileContent("public/tags/index.html", "tags")
 	b.AssertFileContent("public/tags/tag-a/index.html", "tag-a")
 }
-
-func TestDraftNonDefaultContentLanguage(t *testing.T) {
-	t.Parallel()
-
-	files := `
-- hugo.toml --
-defaultContentLanguage = "en"
-[languages]
-[languages.en]
-weight = 1
-[languages.nn]
-weight = 2
-- content/p1.md --
-- content/p2.nn.md --
---
-title: "p2"
-draft: true
---
-- layouts/_default/single.html --
-{{ .Title }}
-`
-	b := Test(t, files)
-
-	b.AssertFileExists("public/nn/p2/index.html", false)
-}
@@ -15,6 +15,7 @@ package hugolib

 import (
 	"fmt"
+	"path/filepath"
 	"sync"
 	"sync/atomic"

@@ -35,17 +36,21 @@ var pageIDCounter atomic.Uint64

 func (h *HugoSites) newPage(m *pageMeta) (*pageState, *paths.Path, error) {
 	m.Staler = &resources.AtomicStaler{}
-	if m.pageMetaParams == nil {
-		m.pageMetaParams = &pageMetaParams{
-			pageConfig: &pagemeta.PageConfig{},
+	if m.pageConfig == nil {
+		m.pageMetaParams = pageMetaParams{
+			pageConfig: &pagemeta.PageConfig{
+				Params: maps.Params{},
+			},
 		}
 	}
-	if m.pageConfig.Params == nil {
-		m.pageConfig.Params = maps.Params{}
+
+	var sourceKey string
+	if m.f != nil {
+		sourceKey = filepath.ToSlash(m.f.Filename())
 	}

 	pid := pageIDCounter.Add(1)
-	pi, err := m.parseFrontMatter(h, pid)
+	pi, err := m.parseFrontMatter(h, pid, sourceKey)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -64,40 +69,28 @@ func (h *HugoSites) newPage(m *pageMeta) (*pageState, *paths.Path, error) {
 		s := m.pageConfig.Path
 		if !paths.HasExt(s) {
 			var (
-				isBranch    bool
-				isBranchSet bool
-				ext         string = m.pageConfig.ContentMediaType.FirstSuffix.Suffix
+				isBranch bool
+				ext      string = "md"
 			)
 			if pcfg.Kind != "" {
 				isBranch = kinds.IsBranch(pcfg.Kind)
-				isBranchSet = true
-			}
-
-			if !pcfg.IsFromContentAdapter {
-				if m.pathInfo != nil {
-					if !isBranchSet {
-						isBranch = m.pathInfo.IsBranchBundle()
-					}
-					if m.pathInfo.Ext() != "" {
-						ext = m.pathInfo.Ext()
-					}
-				} else if m.f != nil {
-					pi := m.f.FileInfo().Meta().PathInfo
-					if !isBranchSet {
-						isBranch = pi.IsBranchBundle()
-					}
-					if pi.Ext() != "" {
-						ext = pi.Ext()
-					}
+			} else if m.pathInfo != nil {
+				isBranch = m.pathInfo.IsBranchBundle()
+				if m.pathInfo.Ext() != "" {
+					ext = m.pathInfo.Ext()
+				}
+			} else if m.f != nil {
+				pi := m.f.FileInfo().Meta().PathInfo
+				isBranch = pi.IsBranchBundle()
+				if pi.Ext() != "" {
+					ext = pi.Ext()
 				}
 			}
-
 			if isBranch {
 				s += "/_index." + ext
 			} else {
 				s += "/index." + ext
 			}
-
 		}
 		m.pathInfo = h.Conf.PathParser().Parse(files.ComponentFolderContent, s)
 	} else if m.pathInfo == nil {
@@ -119,13 +112,23 @@ func (h *HugoSites) newPage(m *pageMeta) (*pageState, *paths.Path, error) {
 			} else if m.f != nil {
 				meta := m.f.FileInfo().Meta()
 				lang = meta.Lang
+				m.s = h.Sites[meta.LangIndex]
 			} else {
 				lang = m.pathInfo.Lang()
 			}
+			if lang == "" {
+				lang = h.Conf.DefaultContentLanguage()
+			}
+			var found bool
+			for _, ss := range h.Sites {
+				if ss.Lang() == lang {
+					m.s = ss
+					found = true
+					break
+				}
+			}

-			m.s = h.resolveSite(lang)
-
-			if m.s == nil {
+			if !found {
 				return nil, fmt.Errorf("no site found for language %q", lang)
 			}
 		}
@@ -142,11 +145,9 @@ func (h *HugoSites) newPage(m *pageMeta) (*pageState, *paths.Path, error) {
 					// Either a taxonomy or a term.
 					if tc.pluralTreeKey == m.Path() {
 						m.pageConfig.Kind = kinds.KindTaxonomy
-						m.singular = tc.singular
 					} else {
 						m.pageConfig.Kind = kinds.KindTerm
 						m.term = m.pathInfo.Unnormalized().BaseNameNoIdentifier()
-						m.singular = tc.singular
 					}
 				}
 			} else if m.f != nil {
@@ -181,7 +182,6 @@ func (h *HugoSites) newPage(m *pageMeta) (*pageState, *paths.Path, error) {
 				ResourceNameTitleProvider: m,
 				ResourceParamsProvider:    m,
 				PageMetaProvider:          m,
-				PageMetaInternalProvider:  m,
 				RelatedKeywordsProvider:   m,
 				OutputFormatsProvider:     page.NopPage,
 				ResourceTypeProvider:      pageTypesProvider,
@@ -25,14 +25,11 @@ import (
 	"github.com/gohugoio/hugo/common/text"
 	"github.com/gohugoio/hugo/common/types/hstring"
 	"github.com/gohugoio/hugo/identity"
-	"github.com/gohugoio/hugo/markup"
-	"github.com/gohugoio/hugo/media"
 	"github.com/gohugoio/hugo/parser/pageparser"
 	"github.com/mitchellh/mapstructure"
 	"github.com/spf13/cast"

 	"github.com/gohugoio/hugo/markup/converter/hooks"
-	"github.com/gohugoio/hugo/markup/goldmark/hugocontext"
 	"github.com/gohugoio/hugo/markup/highlight/chromalexers"
 	"github.com/gohugoio/hugo/markup/tableofcontents"

@@ -71,9 +68,8 @@ var (

 func newPageContentOutput(po *pageOutput) (*pageContentOutput, error) {
 	cp := &pageContentOutput{
-		po:           po,
-		renderHooks:  &renderHooks{},
-		otherOutputs: make(map[uint64]*pageContentOutput),
+		po:          po,
+		renderHooks: &renderHooks{},
 	}
 	return cp, nil
 }
@@ -87,12 +83,8 @@ type renderHooks struct {
 type pageContentOutput struct {
 	po *pageOutput

-	// Other pages involved in rendering of this page,
-	// typically included with .RenderShortcodes.
-	otherOutputs map[uint64]*pageContentOutput
-
-	contentRenderedVersion uint32 // Incremented on reset.
-	contentRendered        bool   // Set on content render.
+	contentRenderedVersion int  // Incremented on reset.
+	contentRendered        bool // Set on content render.

 	// Renders Markdown hooks.
 	renderHooks *renderHooks
@@ -173,13 +165,6 @@ func (pco *pageContentOutput) RenderShortcodes(ctx context.Context) (template.HT
 		cb(pco, ct)
 	}

-	if tpl.Context.IsInGoldmark.Get(ctx) {
-		// This content will be parsed and rendered by Goldmark.
-		// Wrap it in a special Hugo markup to assign the correct Page from
-		// the stack.
-		return template.HTML(hugocontext.Wrap(c, pco.po.p.pid)), nil
-	}
-
 	return helpers.BytesToHTML(c), nil
 }

@@ -264,9 +249,6 @@ func (pco *pageContentOutput) RenderString(ctx context.Context, args ...any) (te
 		if err := mapstructure.WeakDecode(m, &opts); err != nil {
 			return "", fmt.Errorf("failed to decode options: %w", err)
 		}
-		if opts.Markup != "" {
-			opts.Markup = markup.ResolveMarkup(opts.Markup)
-		}
 	}

 	contentToRenderv := args[sidx]
@@ -288,8 +270,7 @@ func (pco *pageContentOutput) RenderString(ctx context.Context, args ...any) (te
 	}

 	conv := pco.po.p.getContentConverter()
-
-	if opts.Markup != "" && opts.Markup != pco.po.p.m.pageConfig.ContentMediaType.SubType {
+	if opts.Markup != "" && opts.Markup != pco.po.p.m.pageConfig.Markup {
 		var err error
 		conv, err = pco.po.p.m.newContentConverter(pco.po.p, opts.Markup)
 		if err != nil {
@@ -382,11 +363,9 @@ func (pco *pageContentOutput) RenderString(ctx context.Context, args ...any) (te
 	}

 	if opts.Display == "inline" {
-		markup := pco.po.p.m.pageConfig.Content.Markup
-		if opts.Markup != "" {
-			markup = pco.po.p.s.ContentSpec.ResolveMarkup(opts.Markup)
-		}
-		rendered = pco.po.p.s.ContentSpec.TrimShortHTML(rendered, markup)
+		// We may have to rethink this in the future when we get other
+		// renderers.
+		rendered = pco.po.p.s.ContentSpec.TrimShortHTML(rendered)
 	}

 	return template.HTML(string(rendered)), nil
@@ -663,7 +642,7 @@ func splitUserDefinedSummaryAndContent(markup string, c []byte) (summary []byte,

 	startTag := "p"
 	switch markup {
-	case media.DefaultContentTypes.AsciiDoc.SubType:
+	case "asciidocext":
 		startTag = "div"
 	}

@@ -124,16 +124,11 @@ func (pt pageTree) Parent() page.Page {
 		return pt.p.s.home
 	}

-	for {
-		_, n := pt.p.s.pageMap.treePages.LongestPrefix(dir, true, nil)
-		if n == nil {
-			return pt.p.s.home
-		}
-		if pt.p.m.bundled || n.isContentNodeBranch() {
-			return n.(page.Page)
-		}
-		dir = paths.Dir(dir)
+	_, n := pt.p.s.pageMap.treePages.LongestPrefix(dir, true, nil)
+	if n != nil {
+		return n.(page.Page)
 	}
+	return nil
 }

 func (pt pageTree) Ancestors() page.Pages {
--- a/Show More
+++ b/Show More