satotake
diff --git a/‎.circleci/config.yml
+1-1 b/‎.circleci/config.yml
+1-1
diff --git a/‎.github/workflows/stale.yml
+1-1 b/‎.github/workflows/stale.yml
+1-1
diff --git a/‎.github/workflows/test.yml
+6-2 b/‎.github/workflows/test.yml
+6-2
diff --git a/‎CONTRIBUTING.md
+3-1 b/‎CONTRIBUTING.md
+3-1
diff --git a/‎Dockerfile
+2-2 b/‎Dockerfile
+2-2
diff --git a/‎README.md
+4-2 b/‎README.md
+4-2
diff --git a/‎bufferpool/bufpool.go
+1-1 b/‎bufferpool/bufpool.go
+1-1
diff --git a/‎cache/filecache/filecache_config_test.go
+1-1 b/‎cache/filecache/filecache_config_test.go
+1-1
diff --git a/‎cache/filecache/filecache_test.go
+1 b/‎cache/filecache/filecache_test.go
+1
diff --git a/‎cache/namedmemcache/named_cache.go
+2-2 b/‎cache/namedmemcache/named_cache.go
+2-2
diff --git a/‎cache/namedmemcache/named_cache_test.go
+3-3 b/‎cache/namedmemcache/named_cache_test.go
+3-3
diff --git a/‎codegen/methods.go
+1-1 b/‎codegen/methods.go
+1-1
diff --git a/‎codegen/methods_test.go
+1-1 b/‎codegen/methods_test.go
+1-1
diff --git a/‎commands/commandeer.go
+68-15 b/‎commands/commandeer.go
+68-15
@@ -1,6 +1,6 @@
 defaults: &defaults
   docker:
-      - image: bepsays/ci-goreleaser:1.1700.600
+      - image: bepsays/ci-goreleaser:1.1800.000
   environment:
     CGO_ENABLED: "0"
 
 
@@ -21,7 +21,7 @@ jobs:
             Please open a new issue for related bugs.
       - uses: actions/stale@04a1828bc18ada028d85a0252a47cd2963a91abe
         with:
-          operations-per-run: 90
+          operations-per-run: 999
           days-before-issue-stale: 365
           days-before-pr-stale: 200
           days-before-issue-close: 21
 
@@ -7,7 +7,11 @@ jobs:
       GO111MODULE: on
     strategy:
       matrix:
-        go-version: [1.16.x, 1.17.x]
+        # Note: We upgraded to Go 1.18 in Hugo v0.95.0
+        # Go 1.18 had some breaking changes on the source level which means Hugo cannot be built
+        # with older Go versions, but the improvements in Go 1.18 were too good to pass on (e.g. break and continue).
+        # Note that you don't need Go (or Go 1.18) to run a pre-built binary.
+        go-version: [1.18.x]
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
@@ -24,7 +28,7 @@ jobs:
       with:
         python-version: '3.x'
     - name: Install Mage
-      run: go get github.com/magefile/mage@07afc7d24f4d6d6442305d49552f04fbda5ccb3e
+      run: go install github.com/magefile/mage@07afc7d24f4d6d6442305d49552f04fbda5ccb3e
     - name: Install asciidoctor
       uses: reitzig/actions-asciidoctor@7570212ae20b63653481675fb1ff62d1073632b0
     - name: Checkout code
 
@@ -1,5 +1,7 @@
 # Contributing to Hugo
 
+**Note  March 16th 2022:** We are currently very constrained on human resources to do code reviews, so we currently require any new Pull Requests to be limited to bug fixes closing an existing issue. Also, we have updated to Go 1.18, but we will currently not accept any generic rewrites, "interface{} to any" replacements and similar.
+
 We welcome contributions to Hugo of any kind including documentation, themes,
 organization, tutorials, blog posts, bug reports, issues, feature requests,
 feature implementations, pull requests, answering questions on the forum,
@@ -124,7 +126,7 @@ go install
 For some convenient build and test targets, you also will want to install Mage:
 
 ```bash
-go get github.com/magefile/mage
+go install github.com/magefile/mage
 ```
 
 Now, to make a change to Hugo's source:
 
@@ -2,7 +2,7 @@
 # Twitter:      https://twitter.com/gohugoio
 # Website:      https://gohugo.io/
 
-FROM golang:1.16-alpine AS build
+FROM golang:1.18-alpine AS build
 
 # Optionally set HUGO_BUILD_TAGS to "extended" or "nodeploy" when building like so:
 #   docker build --build-arg HUGO_BUILD_TAGS=extended .
@@ -20,7 +20,7 @@ COPY . /go/src/github.com/gohugoio/hugo/
 # gcc/g++ are required to build SASS libraries for extended version
 RUN apk update && \
     apk add --no-cache gcc g++ musl-dev git && \
-    go get github.com/magefile/mage
+    go install github.com/magefile/mage
 
 RUN mage hugo && mage install
 
 
@@ -54,11 +54,11 @@ Use the [installation instructions in the Hugo documentation](https://gohugo.io/
 #### Prerequisite Tools
 
 * [Git](https://git-scm.com/)
-* [Go (we test it with the last 2 major versions; but note that Hugo 0.81.0 only builds with >= Go 1.16.)](https://golang.org/dl/)
+* [Go (we test it with the last 2 major versions; but note that Hugo 0.95.0 only builds with >= Go 1.18.)](https://golang.org/dl/)
 
 #### Fetch from GitHub
 
-Since Hugo 0.48, Hugo uses the Go Modules support built into Go 1.11 to build. The easiest is to clone Hugo in a directory outside of `GOPATH`, as in the following example:
+To fetch and build the source from GitHub:
 
 ```bash
 mkdir $HOME/src
@@ -85,6 +85,8 @@ git clone [email protected]:gohugoio/hugo.git
 ```
 ## Contributing to Hugo
 
+**Note  March 16th 2022:** We are currently very constrained on human resources to do code reviews, so we currently require any new Pull Requests to be limited to bug fixes closing an existing issue. Also, we have updated to Go 1.18, but we will currently not accept any generic rewrites, "interface{} to any" replacements and similar.
+
 For a complete guide to contributing to Hugo, see the [Contribution Guide](CONTRIBUTING.md).
 
 We welcome contributions to Hugo of any kind including documentation, themes,
 
@@ -20,7 +20,7 @@ import (
 )
 
 var bufferPool = &sync.Pool{
-	New: func() interface{} {
+	New: func() any {
 		return &bytes.Buffer{}
 	},
 }
 
@@ -184,7 +184,7 @@ dir = "/"
 }
 
 func newTestConfig() config.Provider {
-	cfg := config.New()
+	cfg := config.NewWithTestDefaults()
 	cfg.Set("workingDir", filepath.FromSlash("/my/cool/hugoproject"))
 	cfg.Set("contentDir", "content")
 	cfg.Set("dataDir", "data")
 
@@ -342,6 +342,7 @@ func newPathsSpec(t *testing.T, fs afero.Fs, configStr string) *helpers.PathSpec
 	cfg, err := config.FromConfigString(configStr, "toml")
 	c.Assert(err, qt.IsNil)
 	initConfig(fs, cfg)
+	config.SetBaseTestDefaults(cfg)
 	p, err := helpers.NewPathSpec(hugofs.NewFrom(fs, cfg), cfg, nil)
 	c.Assert(err, qt.IsNil)
 	return p
 
@@ -30,7 +30,7 @@ type Cache struct {
 }
 
 type cacheEntry struct {
-	value interface{}
+	value any
 	err   error
 }
 
@@ -55,7 +55,7 @@ func (c *Cache) Clear() {
 // create will be called and cached.
 // This method is thread safe. It also guarantees that the create func for a given
 // key is invoked only once for this cache.
-func (c *Cache) GetOrCreate(key string, create func() (interface{}, error)) (interface{}, error) {
+func (c *Cache) GetOrCreate(key string, create func() (any, error)) (any, error) {
 	c.mu.RLock()
 	entry, found := c.cache[key]
 	c.mu.RUnlock()
 
@@ -28,7 +28,7 @@ func TestNamedCache(t *testing.T) {
 	cache := New()
 
 	counter := 0
-	create := func() (interface{}, error) {
+	create := func() (any, error) {
 		counter++
 		return counter, nil
 	}
@@ -58,8 +58,8 @@ func TestNamedCacheConcurrent(t *testing.T) {
 
 	cache := New()
 
-	create := func(i int) func() (interface{}, error) {
-		return func() (interface{}, error) {
+	create := func(i int) func() (any, error) {
+		return func() (any, error) {
 			return i, nil
 		}
 	}
 
@@ -505,7 +505,7 @@ func typeName(name, pkg string) string {
 
 func uniqueNonEmptyStrings(s []string) []string {
 	var unique []string
-	set := map[string]interface{}{}
+	set := map[string]any{}
 	for _, val := range s {
 		if val == "" {
 			continue
 
@@ -85,7 +85,7 @@ type I interface {
 	Method3(myint int, mystring string)
 	Method5() (string, error)
 	Method6() *net.IP
-	Method7() interface{}
+	Method7() any
 	Method8() herrors.ErrorContext
 	method2()
 	method9() os.FileInfo
 
@@ -17,6 +17,7 @@ import (
 	"bytes"
 	"errors"
 	"io/ioutil"
+	"net"
 	"os"
 	"path/filepath"
 	"regexp"
@@ -29,6 +30,7 @@ import (
 
 	"github.com/gohugoio/hugo/common/herrors"
 	"github.com/gohugoio/hugo/common/hugo"
+	"github.com/gohugoio/hugo/common/paths"
 
 	jww "github.com/spf13/jwalterweatherman"
 
@@ -41,6 +43,7 @@ import (
 	"github.com/spf13/afero"
 
 	"github.com/bep/debounce"
+	"github.com/bep/overlayfs"
 	"github.com/gohugoio/hugo/common/types"
 	"github.com/gohugoio/hugo/deps"
 	"github.com/gohugoio/hugo/helpers"
@@ -72,8 +75,10 @@ type commandeer struct {
 	// be fast enough that we could maybe just add it for all server modes.
 	changeDetector *fileChangeDetector
 
-	// We need to reuse this on server rebuilds.
-	destinationFs afero.Fs
+	// We need to reuse these on server rebuilds.
+	// These 2 will be different if --renderStaticToDisk is set.
+	publishDirFs       afero.Fs
+	publishDirServerFs afero.Fs
 
 	h    *hugoBuilderCommon
 	ftch flagsToConfigHandler
@@ -88,10 +93,12 @@ type commandeer struct {
 	// Used in cases where we get flooded with events in server mode.
 	debounce func(f func())
 
-	serverPorts         []int
+	serverPorts []serverPortListener
+
 	languagesConfigured bool
 	languages           langs.Languages
 	doLiveReload        bool
+	renderStaticToDisk  bool
 	fastRenderMode      bool
 	showErrorInBrowser  bool
 	wasError            bool
@@ -105,6 +112,11 @@ type commandeer struct {
 	buildErr error
 }
 
+type serverPortListener struct {
+	p  int
+	ln net.Listener
+}
+
 func newCommandeerHugoState() *commandeerHugoState {
 	return &commandeerHugoState{
 		created: make(chan struct{}),
@@ -120,14 +132,14 @@ func (c *commandeer) errCount() int {
 	return int(c.logger.LogCounters().ErrorCounter.Count())
 }
 
-func (c *commandeer) getErrorWithContext() interface{} {
+func (c *commandeer) getErrorWithContext() any {
 	errCount := c.errCount()
 
 	if errCount == 0 {
 		return nil
 	}
 
-	m := make(map[string]interface{})
+	m := make(map[string]any)
 
 	m["Error"] = errors.New(removeErrorPrefixFromLog(c.logger.Errors()))
 	m["Version"] = hugo.BuildVersionString()
@@ -146,15 +158,16 @@ func (c *commandeer) getErrorWithContext() interface{} {
 	return m
 }
 
-func (c *commandeer) Set(key string, value interface{}) {
+func (c *commandeer) Set(key string, value any) {
 	if c.configured {
 		panic("commandeer cannot be changed")
 	}
 	c.Cfg.Set(key, value)
 }
 
 func (c *commandeer) initFs(fs *hugofs.Fs) error {
-	c.destinationFs = fs.Destination
+	c.publishDirFs = fs.PublishDir
+	c.publishDirServerFs = fs.PublishDirServer
 	c.DepsCfg.Fs = fs
 
 	return nil
@@ -368,21 +381,57 @@ func (c *commandeer) loadConfig() error {
 	}
 
 	createMemFs := config.GetBool("renderToMemory")
+	c.renderStaticToDisk = config.GetBool("renderStaticToDisk")
 
 	if createMemFs {
 		// Rendering to memoryFS, publish to Root regardless of publishDir.
 		config.Set("publishDir", "/")
+		config.Set("publishDirStatic", "/")
+	} else if c.renderStaticToDisk {
+		// Hybrid, render dynamic content to Root.
+		config.Set("publishDirStatic", config.Get("publishDir"))
+		config.Set("publishDir", "/")
+
 	}
 
 	c.fsCreate.Do(func() {
-		fs := hugofs.NewFrom(sourceFs, config)
+		// Assume both source and destination are using same filesystem.
+		fs := hugofs.NewFromSourceAndDestination(sourceFs, sourceFs, config)
 
-		if c.destinationFs != nil {
+		if c.publishDirFs != nil {
 			// Need to reuse the destination on server rebuilds.
-			fs.Destination = c.destinationFs
-		} else if createMemFs {
-			// Hugo writes the output to memory instead of the disk.
-			fs.Destination = new(afero.MemMapFs)
+			fs.PublishDir = c.publishDirFs
+			fs.PublishDirServer = c.publishDirServerFs
+		} else {
+			if c.renderStaticToDisk {
+				publishDirStatic := config.GetString("publishDirStatic")
+				workingDir := config.GetString("workingDir")
+				absPublishDirStatic := paths.AbsPathify(workingDir, publishDirStatic)
+
+				fs = hugofs.NewFromSourceAndDestination(sourceFs, afero.NewMemMapFs(), config)
+				// Writes the dynamic output to memory,
+				// while serve others directly from /public on disk.
+				dynamicFs := fs.PublishDir
+				staticFs := afero.NewBasePathFs(afero.NewOsFs(), absPublishDirStatic)
+
+				// Serve from both the static and dynamic fs,
+				// the first will take priority.
+				// THis is a read-only filesystem,
+				// we do all the writes to
+				// fs.Destination and fs.DestinationStatic.
+				fs.PublishDirServer = overlayfs.New(
+					overlayfs.Options{
+						Fss: []afero.Fs{
+							dynamicFs,
+							staticFs,
+						},
+					},
+				)
+				fs.PublishDirStatic = staticFs
+			} else if createMemFs {
+				// Hugo writes the output to memory instead of the disk.
+				fs = hugofs.NewFromSourceAndDestination(sourceFs, afero.NewMemMapFs(), config)
+			}
 		}
 
 		if c.fastRenderMode {
@@ -396,12 +445,15 @@ func (c *commandeer) loadConfig() error {
 			}
 
 			changeDetector.PrepareNew()
-			fs.Destination = hugofs.NewHashingFs(fs.Destination, changeDetector)
+			fs.PublishDir = hugofs.NewHashingFs(fs.PublishDir, changeDetector)
+			fs.PublishDirStatic = hugofs.NewHashingFs(fs.PublishDirStatic, changeDetector)
 			c.changeDetector = changeDetector
 		}
 
 		if c.Cfg.GetBool("logPathWarnings") {
-			fs.Destination = hugofs.NewCreateCountingFs(fs.Destination)
+			// Note that we only care about the "dynamic creates" here,
+			// so skip the static fs.
+			fs.PublishDir = hugofs.NewCreateCountingFs(fs.PublishDir)
 		}
 
 		// To debug hard-to-find path issues.
@@ -420,6 +472,7 @@ func (c *commandeer) loadConfig() error {
 		if h == nil || c.failOnInitErr {
 			err = createErr
 		}
+
 		c.hugoSites = h
 		// TODO(bep) improve.
 		if c.buildLock == nil && h != nil {
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ import (`
`20`	`20`	`)`
`21`	`21`
`22`	`22`	`var bufferPool = &sync.Pool{`
`23`		`- New: func() interface{} {`
	`23`	`+ New: func() any {`
`24`	`24`	`return &bytes.Buffer{}`
`25`	`25`	`},`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ dir = "/"`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`func newTestConfig() config.Provider {`
`187`		`- cfg := config.New()`
	`187`	`+ cfg := config.NewWithTestDefaults()`
`188`	`188`	`cfg.Set("workingDir", filepath.FromSlash("/my/cool/hugoproject"))`
`189`	`189`	`cfg.Set("contentDir", "content")`
`190`	`190`	`cfg.Set("dataDir", "data")`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ func TestNamedCache(t *testing.T) {`
`28`	`28`	`cache := New()`
`29`	`29`
`30`	`30`	`counter := 0`
`31`		`- create := func() (interface{}, error) {`
	`31`	`+ create := func() (any, error) {`
`32`	`32`	`counter++`
`33`	`33`	`return counter, nil`
`34`	`34`	`}`
`@@ -58,8 +58,8 @@ func TestNamedCacheConcurrent(t *testing.T) {`
`58`	`58`
`59`	`59`	`cache := New()`
`60`	`60`
`61`		`- create := func(i int) func() (interface{}, error) {`
`62`		`- return func() (interface{}, error) {`
	`61`	`+ create := func(i int) func() (any, error) {`
	`62`	`+ return func() (any, error) {`
`63`	`63`	`return i, nil`
`64`	`64`	`}`
`65`	`65`	`}`