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

1 files changed, 6 insertions, 8 deletions

diff --git a/modules/npm/package_builder.go b/modules/npm/package_builder.go
index 911241813..9bdc7eb78 100644
--- a/modules/npm/package_builder.go
+++ b/modules/npm/package_builder.go
@@ -24,8 +24,6 @@ import (
 
 	"github.com/gohugoio/hugo/hugofs/files"
 
-	"github.com/pkg/errors"
-
 	"github.com/gohugoio/hugo/hugofs"
 	"github.com/spf13/afero"
 
@@ -57,7 +55,7 @@ func Pack(fs afero.Fs, fis []hugofs.FileMetaInfo) error {
 		if err == nil {
 			// Preserve the original in package.hugo.json.
 			if err = hugio.CopyFile(fs, packageJSONName, files.FilenamePackageHugoJSON); err != nil {
-				return errors.Wrap(err, "npm pack: failed to copy package file")
+				return fmt.Errorf("npm pack: failed to copy package file: %w", err)
 			}
 		} else {
 			// Create one.
@@ -83,7 +81,7 @@ func Pack(fs afero.Fs, fis []hugofs.FileMetaInfo) error {
 	masterFilename := meta.Filename
 	f, err := meta.Open()
 	if err != nil {
-		return errors.Wrap(err, "npm pack: failed to open package file")
+		return fmt.Errorf("npm pack: failed to open package file: %w", err)
 	}
 	b = newPackageBuilder(meta.Module, f)
 	f.Close()
@@ -106,14 +104,14 @@ func Pack(fs afero.Fs, fis []hugofs.FileMetaInfo) error {
 
 		f, err := meta.Open()
 		if err != nil {
-			return errors.Wrap(err, "npm pack: failed to open package file")
+			return fmt.Errorf("npm pack: failed to open package file: %w", err)
 		}
 		b.Add(meta.Module, f)
 		f.Close()
 	}
 
 	if b.Err() != nil {
-		return errors.Wrap(b.Err(), "npm pack: failed to build")
+		return fmt.Errorf("npm pack: failed to build: %w", b.Err())
 	}
 
 	// Replace the dependencies in the original template with the merged set.
@@ -136,11 +134,11 @@ func Pack(fs afero.Fs, fis []hugofs.FileMetaInfo) error {
 	encoder.SetEscapeHTML(false)
 	encoder.SetIndent("", strings.Repeat(" ", 2))
 	if err := encoder.Encode(b.originalPackageJSON); err != nil {
-		return errors.Wrap(err, "npm pack: failed to marshal JSON")
+		return fmt.Errorf("npm pack: failed to marshal JSON: %w", err)
 	}
 
 	if err := afero.WriteFile(fs, packageJSONName, packageJSONData.Bytes(), 0666); err != nil {
-		return errors.Wrap(err, "npm pack: failed to write package.json")
+		return fmt.Errorf("npm pack: failed to write package.json: %w", err)
 	}
 
 	return nil