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 /tpl/resources | |
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 'tpl/resources')
-rw-r--r-- | tpl/resources/resources.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tpl/resources/resources.go b/tpl/resources/resources.go index d3a98002f..2adec358c 100644 --- a/tpl/resources/resources.go +++ b/tpl/resources/resources.go @@ -20,8 +20,9 @@ import ( "github.com/gohugoio/hugo/common/herrors" + "errors" + "github.com/gohugoio/hugo/common/maps" - "github.com/pkg/errors" "github.com/gohugoio/hugo/tpl/internal/resourcehelpers" @@ -162,7 +163,7 @@ func (ns *Namespace) GetRemote(args ...any) resource.Resource { case *create.HTTPError: return resources.NewErrorResource(resource.NewResourceError(v, v.Data)) default: - return resources.NewErrorResource(resource.NewResourceError(errors.Wrap(err, "error calling resources.GetRemote"), make(map[string]any))) + return resources.NewErrorResource(resource.NewResourceError(fmt.Errorf("error calling resources.GetRemote: %w", err), make(map[string]any))) } } @@ -354,7 +355,7 @@ func (ns *Namespace) ToCSS(args ...any) (resource.Resource, error) { case transpilerDart, transpilerLibSass: transpiler = cast.ToString(t) default: - return nil, errors.Errorf("unsupported transpiler %q; valid values are %q or %q", t, transpilerLibSass, transpilerDart) + return nil, fmt.Errorf("unsupported transpiler %q; valid values are %q or %q", t, transpilerLibSass, transpilerDart) } } } |