mirror of
https://github.com/gohugoio/hugo.git
synced 2025-08-29 22:29:56 +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:
@@ -17,6 +17,7 @@ import (
|
||||
"bytes"
|
||||
"crypto/sha256"
|
||||
"encoding/hex"
|
||||
"fmt"
|
||||
"io"
|
||||
"io/ioutil"
|
||||
"path"
|
||||
@@ -36,8 +37,9 @@ import (
|
||||
"github.com/spf13/afero"
|
||||
"github.com/spf13/cast"
|
||||
|
||||
"errors"
|
||||
|
||||
"github.com/gohugoio/hugo/hugofs"
|
||||
"github.com/pkg/errors"
|
||||
|
||||
"github.com/mitchellh/mapstructure"
|
||||
|
||||
@@ -161,7 +163,7 @@ func (t *postcssTransformation) Transform(ctx *resources.ResourceTransformationC
|
||||
configFile = t.rs.BaseFs.ResolveJSConfigFile(configFile)
|
||||
if configFile == "" && t.options.Config != "" {
|
||||
// Only fail if the user specified config file is not found.
|
||||
return errors.Errorf("postcss config %q not found:", configFile)
|
||||
return fmt.Errorf("postcss config %q not found:", configFile)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -388,15 +390,9 @@ func (imp *importResolver) toFileError(output string) error {
|
||||
if err != nil {
|
||||
return inErr
|
||||
}
|
||||
|
||||
realFilename := fi.(hugofs.FileMetaInfo).Meta().Filename
|
||||
|
||||
ferr := herrors.NewFileError("css", -1, file.Offset+1, 1, inErr)
|
||||
return herrors.NewFileErrorFromFile(inErr, file.Filename, realFilename, hugofs.Os, herrors.SimpleLineMatcher)
|
||||
|
||||
werr, ok := herrors.WithFileContextForFile(ferr, realFilename, file.Filename, imp.fs, herrors.SimpleLineMatcher)
|
||||
|
||||
if !ok {
|
||||
return ferr
|
||||
}
|
||||
|
||||
return werr
|
||||
}
|
||||
|
Reference in New Issue
Block a user