mirror of
https://github.com/gohugoio/hugo.git
synced 2025-08-25 22:00:58 +02:00
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
This commit is contained in:
@@ -24,8 +24,6 @@ import (
|
||||
|
||||
"github.com/gohugoio/hugo/common/paths"
|
||||
|
||||
"github.com/pkg/errors"
|
||||
|
||||
"github.com/gohugoio/hugo/resources/images"
|
||||
"github.com/gohugoio/hugo/resources/images/exif"
|
||||
"github.com/spf13/afero"
|
||||
@@ -431,10 +429,10 @@ func (r *resourceAdapter) transform(publish, setContent bool) error {
|
||||
errMsg = ". You need to install Babel, see https://gohugo.io/hugo-pipes/babel/"
|
||||
}
|
||||
|
||||
return errors.Wrap(err, msg+errMsg)
|
||||
return fmt.Errorf(msg+errMsg+": %w", err)
|
||||
}
|
||||
|
||||
return errors.Wrap(err, msg)
|
||||
return fmt.Errorf(msg+": %w", err)
|
||||
}
|
||||
|
||||
var tryFileCache bool
|
||||
@@ -461,7 +459,7 @@ func (r *resourceAdapter) transform(publish, setContent bool) error {
|
||||
if err != nil {
|
||||
return newErr(err)
|
||||
}
|
||||
return newErr(errors.Errorf("resource %q not found in file cache", key))
|
||||
return newErr(fmt.Errorf("resource %q not found in file cache", key))
|
||||
}
|
||||
transformedContentr = f
|
||||
updates.sourceFs = cache.fileCache.Fs
|
||||
|
Reference in New Issue
Block a user