mirror of
https://github.com/gohugoio/hugo.git
synced 2025-08-31 22:41:53 +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:
@@ -14,6 +14,7 @@
|
||||
package hugolib
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"io"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
@@ -25,7 +26,6 @@ import (
|
||||
|
||||
"github.com/gohugoio/hugo/resources/page"
|
||||
|
||||
"github.com/pkg/errors"
|
||||
"github.com/spf13/afero"
|
||||
)
|
||||
|
||||
@@ -48,12 +48,12 @@ func (f ContentFactory) ApplyArchetypeFilename(w io.Writer, p page.Page, archety
|
||||
}
|
||||
|
||||
if fi.IsDir() {
|
||||
return errors.Errorf("archetype directory (%q) not supported", archetypeFilename)
|
||||
return fmt.Errorf("archetype directory (%q) not supported", archetypeFilename)
|
||||
}
|
||||
|
||||
templateSource, err := afero.ReadFile(f.h.SourceFilesystems.Archetypes.Fs, archetypeFilename)
|
||||
if err != nil {
|
||||
return errors.Wrapf(err, "failed to read archetype file %q: %s", archetypeFilename, err)
|
||||
return fmt.Errorf("failed to read archetype file %q: %s: %w", archetypeFilename, err, err)
|
||||
|
||||
}
|
||||
|
||||
@@ -79,12 +79,12 @@ func (f ContentFactory) ApplyArchetypeTemplate(w io.Writer, p page.Page, archety
|
||||
|
||||
templ, err := ps.s.TextTmpl().Parse("archetype.md", string(templateSource))
|
||||
if err != nil {
|
||||
return errors.Wrapf(err, "failed to parse archetype template: %s", err)
|
||||
return fmt.Errorf("failed to parse archetype template: %s: %w", err, err)
|
||||
}
|
||||
|
||||
result, err := executeToString(ps.s.Tmpl(), templ, d)
|
||||
if err != nil {
|
||||
return errors.Wrapf(err, "failed to execute archetype template: %s", err)
|
||||
return fmt.Errorf("failed to execute archetype template: %s: %w", err, err)
|
||||
}
|
||||
|
||||
_, err = io.WriteString(w, f.shortcodeReplacerPost.Replace(result))
|
||||
|
Reference in New Issue
Block a user