diff options
| author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2022-05-02 16:07:52 +0200 |
|---|---|---|
| committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2022-05-06 19:43:22 +0200 |
| commit | f2946da9e806c2bafbdd26707fe339db79bd980b (patch) | |
| tree | b5609317a861ea5f399e094e1b9287ca71dc22d1 /deploy | |
| parent | 6eea32bd6bc8e7a7dd07a8cb6a8343ae2c74aba0 (diff) | |
Improve error messages, esp. when the server is running
* Add file context to minifier errors when publishing
* Misc fixes (see issues)
* Allow custom server error template in layouts/server/error.html
To get to this, this commit also cleans up and simplifies the code surrounding errors and files. This also removes the usage of `github.com/pkg/errors`, mostly because of https://github.com/pkg/errors/issues/223 -- but also because most of this is now built-in to Go.
Fixes #9852
Fixes #9857
Fixes #9863
Diffstat (limited to 'deploy')
| -rw-r--r-- | deploy/deploy.go | 3 | ||||
| -rw-r--r-- | deploy/deployConfig.go | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/deploy/deploy.go b/deploy/deploy.go index e33bbf3f2..f0a4e0178 100644 --- a/deploy/deploy.go +++ b/deploy/deploy.go @@ -34,11 +34,12 @@ import ( "strings" "sync" + "errors" + "github.com/dustin/go-humanize" "github.com/gobwas/glob" "github.com/gohugoio/hugo/config" "github.com/gohugoio/hugo/media" - "github.com/pkg/errors" "github.com/spf13/afero" jww "github.com/spf13/jwalterweatherman" "golang.org/x/text/unicode/norm" diff --git a/deploy/deployConfig.go b/deploy/deployConfig.go index cdc146f21..ad2516922 100644 --- a/deploy/deployConfig.go +++ b/deploy/deployConfig.go @@ -20,12 +20,13 @@ import ( "fmt" "regexp" + "errors" + "github.com/gobwas/glob" "github.com/gohugoio/hugo/config" hglob "github.com/gohugoio/hugo/hugofs/glob" "github.com/gohugoio/hugo/media" "github.com/mitchellh/mapstructure" - "github.com/pkg/errors" ) const deploymentConfigKey = "deployment" |