Fix --renderStaticToDisk

See gohugoio#9626

commands/commandeer.go

@@ -42,6 +42,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"
@@ -395,7 +396,17 @@ func (c *commandeer) loadConfig() error {
 			publishDir := config.GetString("publishDir")
 			writableFs := afero.NewBasePathFs(afero.NewMemMapFs(), publishDir)
 			publicFs := afero.NewOsFs()
-			fs.Destination = afero.NewCopyOnWriteFs(afero.NewReadOnlyFs(publicFs), writableFs)
+
+			// TODO(bep) use this overlayfs in the other places.
+			fs.Destination = overlayfs.New(
+				overlayfs.Options{
+					FirstWritable: true,
+					Fss: []afero.Fs{
+						writableFs,
+						publicFs,
+					},
+				},
+			)
 			fs.DestinationStatic = publicFs
 		} else if createMemFs {
 			// Hugo writes the output to memory instead of the disk.

commands/server_test.go

@@ -77,6 +77,9 @@ func TestServerFlags(t *testing.T) {
 		{"--renderToDisk", func(c *qt.C, r serverTestResult) {
 			assertPublic(c, r, true)
 		}},
+		{"--renderStaticToDisk", func(c *qt.C, r serverTestResult) {
+			assertPublic(c, r, true)
+		}},
 	} {
 		c.Run(test.flag, func(c *qt.C) {
 			config := `

go.mod

@@ -1,108 +1,9 @@
 module github.com/gohugoio/hugo
 
 require (
-	github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69
-	github.com/PuerkitoBio/purell v1.1.1
-	github.com/alecthomas/chroma v0.10.0
-	github.com/armon/go-radix v1.0.0
-	github.com/aws/aws-sdk-go v1.43.5
-	github.com/bep/debounce v1.2.0
-	github.com/bep/gitmap v1.1.2
-	github.com/bep/goat v0.5.0
-	github.com/bep/godartsass v0.14.0
-	github.com/bep/golibsass v1.0.0
-	github.com/bep/gowebp v0.1.0
-	github.com/bep/tmc v0.5.1
-	github.com/clbanning/mxj/v2 v2.5.5
-	github.com/cli/safeexec v1.0.0
-	github.com/disintegration/gift v1.2.1
-	github.com/dustin/go-humanize v1.0.0
-	github.com/evanw/esbuild v0.14.25
-	github.com/fortytw2/leaktest v1.3.0
-	github.com/frankban/quicktest v1.14.2
-	github.com/fsnotify/fsnotify v1.5.1
-	github.com/getkin/kin-openapi v0.91.0
-	github.com/ghodss/yaml v1.0.0
-	github.com/gobuffalo/flect v0.2.4
-	github.com/gobwas/glob v0.2.3
-	github.com/gohugoio/go-i18n/v2 v2.1.3-0.20210430103248-4c28c89f8013
-	github.com/gohugoio/locales v0.14.0
-	github.com/gohugoio/localescompressed v0.15.0
-	github.com/gohugoio/testmodBuilder/mods v0.0.0-20190520184928-c56af20f2e95
-	github.com/google/go-cmp v0.5.7
-	github.com/gorilla/websocket v1.5.0
-	github.com/hairyhenderson/go-codeowners v0.2.3-0.20201026200250-cdc7c0759690
-	github.com/jdkato/prose v1.2.1
-	github.com/kylelemons/godebug v1.1.0
-	github.com/kyokomi/emoji/v2 v2.2.9
-	github.com/magefile/mage v1.12.1
-	github.com/mattn/go-isatty v0.0.14
-	github.com/mitchellh/hashstructure v1.1.0
-	github.com/mitchellh/mapstructure v1.4.3
-	github.com/muesli/smartcrop v0.3.0
-	github.com/niklasfasching/go-org v1.6.2
-	github.com/olekukonko/tablewriter v0.0.5
-	github.com/pelletier/go-toml/v2 v2.0.0-beta.6
-	github.com/pkg/errors v0.9.1
-	github.com/rogpeppe/go-internal v1.8.1
-	github.com/russross/blackfriday v1.6.0
-	github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd
-	github.com/sanity-io/litter v1.5.2
-	github.com/spf13/afero v1.8.1
-	github.com/spf13/cast v1.4.1
-	github.com/spf13/cobra v1.4.0
-	github.com/spf13/fsync v0.9.0
-	github.com/spf13/jwalterweatherman v1.1.0
-	github.com/spf13/pflag v1.0.5
-	github.com/tdewolff/minify/v2 v2.10.0
-	github.com/yuin/goldmark v1.4.10
-	go.uber.org/atomic v1.9.0
-	gocloud.dev v0.20.0
-	golang.org/x/image v0.0.0-20211028202545-6944b10bf410
-	golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd
-	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
-	golang.org/x/text v0.3.7
-	golang.org/x/tools v0.1.9
-	google.golang.org/api v0.70.0
-	gopkg.in/yaml.v2 v2.4.0
 )
 
 require (
-	cloud.google.com/go v0.100.2 // indirect
-	cloud.google.com/go/compute v1.3.0 // indirect
-	cloud.google.com/go/iam v0.2.0 // indirect
-	cloud.google.com/go/storage v1.14.0 // indirect
-	github.com/Azure/azure-pipeline-go v0.2.2 // indirect
-	github.com/Azure/azure-storage-blob-go v0.9.0 // indirect
-	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
-	github.com/dlclark/regexp2 v1.4.0 // indirect
-	github.com/go-openapi/jsonpointer v0.19.5 // indirect
-	github.com/go-openapi/swag v0.19.5 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/google/uuid v1.1.2 // indirect
-	github.com/google/wire v0.4.0 // indirect
-	github.com/googleapis/gax-go v2.0.2+incompatible // indirect
-	github.com/googleapis/gax-go/v2 v2.1.1 // indirect
-	github.com/inconshreveable/mousetrap v1.0.0 // indirect
-	github.com/jmespath/go-jmespath v0.4.0 // indirect
-	github.com/kr/pretty v0.3.0 // indirect
-	github.com/kr/text v0.2.0 // indirect
-	github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e // indirect
-	github.com/mattn/go-ieproxy v0.0.1 // indirect
-	github.com/mattn/go-runewidth v0.0.9 // indirect
-	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
-	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/tdewolff/parse/v2 v2.5.27 // indirect
-	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
-	golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c // indirect
-	google.golang.org/grpc v1.44.0 // indirect
-	google.golang.org/protobuf v1.27.1 // indirect
 )
 
 go 1.18

go.sum

@@ -132,6 +132,10 @@ github.com/bep/golibsass v1.0.0 h1:gNguBMSDi5yZEZzVZP70YpuFQE3qogJIGUlrVILTmOw=
 github.com/bep/golibsass v1.0.0/go.mod h1:DL87K8Un/+pWUS75ggYv41bliGiolxzDKWJAq3eJ1MA=
 github.com/bep/gowebp v0.1.0 h1:4/iQpfnxHyXs3x/aTxMMdOpLEQQhFmF6G7EieWPTQyo=
 github.com/bep/gowebp v0.1.0/go.mod h1:ZhFodwdiFp8ehGJpF4LdPl6unxZm9lLFjxD3z2h2AgI=
+github.com/bep/overlayfs v0.0.0-20220321101519-92f60787ef08 h1:WN/VQG+NnAtHWa9Bu+bnzNkgJAOszisigrFwYkB5xrs=
+github.com/bep/overlayfs v0.0.0-20220321101519-92f60787ef08/go.mod h1:NFjSmn3kCqG7KX2Lmz8qT8VhPPCwZap3UNogXawoQHM=
+github.com/bep/overlayfs v0.1.0 h1:1hOCrvS4E5Hf0qwxM7m+9oitqClD9mRjQ1d4pECsVcU=
+github.com/bep/overlayfs v0.1.0/go.mod h1:NFjSmn3kCqG7KX2Lmz8qT8VhPPCwZap3UNogXawoQHM=
 github.com/bep/tmc v0.5.1 h1:CsQnSC6MsomH64gw0cT5f+EwQDcvZz4AazKunFwTpuI=
 github.com/bep/tmc v0.5.1/go.mod h1:tGYHN8fS85aJPhDLgXETVKp+PR382OvFi2+q2GkGsq0=
 github.com/bep/workers v1.0.0 h1:U+H8YmEaBCEaFZBst7GcRVEoqeRC9dzH2dWOwGmOchg=
@@ -413,6 +417,8 @@ github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasO
 github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
 github.com/spf13/afero v1.8.1 h1:izYHOT71f9iZ7iq37Uqjael60/vYC6vMtzedudZ0zEk=
 github.com/spf13/afero v1.8.1/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo=
+github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo=
+github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo=
 github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA=
 github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q=