diff options
| author | Bjørn Erik Pedersen <[email protected]> | 2022-05-02 16:07:52 +0200 |
|---|---|---|
| committer | Bjørn Erik Pedersen <[email protected]> | 2022-05-06 19:43:22 +0200 |
| commit | f2946da9e806c2bafbdd26707fe339db79bd980b (patch) | |
| tree | b5609317a861ea5f399e094e1b9287ca71dc22d1 /navigation | |
| parent | 6eea32bd6bc8e7a7dd07a8cb6a8343ae2c74aba0 (diff) | |
| download | hugo-f2946da9e806c2bafbdd26707fe339db79bd980b.tar.gz hugo-f2946da9e806c2bafbdd26707fe339db79bd980b.zip | |
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 'navigation')
| -rw-r--r-- | navigation/menu.go | 4 | ||||
| -rw-r--r-- | navigation/pagemenus.go | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/navigation/menu.go b/navigation/menu.go index 02e1f8fec..5e4996f39 100644 --- a/navigation/menu.go +++ b/navigation/menu.go @@ -19,8 +19,6 @@ import ( "sort" "strings" - "github.com/pkg/errors" - "github.com/gohugoio/hugo/common/maps" "github.com/gohugoio/hugo/common/types" "github.com/gohugoio/hugo/compare" @@ -190,7 +188,7 @@ func (m *MenuEntry) MarshallMap(ime map[string]any) error { } if err != nil { - return errors.Wrapf(err, "failed to marshal menu entry %q", m.KeyName()) + return fmt.Errorf("failed to marshal menu entry %q: %w", m.KeyName(), err) } return nil diff --git a/navigation/pagemenus.go b/navigation/pagemenus.go index 46ed5221e..7b4f6f648 100644 --- a/navigation/pagemenus.go +++ b/navigation/pagemenus.go @@ -14,10 +14,11 @@ package navigation import ( + "fmt" + "github.com/gohugoio/hugo/common/maps" "github.com/gohugoio/hugo/common/types" - "github.com/pkg/errors" "github.com/spf13/cast" ) @@ -76,7 +77,7 @@ func PageMenusFromPage(p Page) (PageMenus, error) { } var wrapErr = func(err error) error { - return errors.Wrapf(err, "unable to process menus for page %q", p.Path()) + return fmt.Errorf("unable to process menus for page %q: %w", p.Path(), err) } // Could be a structured menu entry |