merge v0.13.7 into development (#1474)

SHOULDERS.md

@@ -95,6 +95,8 @@ Thank you to the following **GIANTS**:
 
 * [github.com/gobuffalo/pop/nulls](https://godoc.org/github.com/gobuffalo/pop/nulls)
 
+* [github.com/gobuffalo/syncx](https://godoc.org/github.com/gobuffalo/syncx)
+
 * [github.com/gobuffalo/tags](https://godoc.org/github.com/gobuffalo/tags)
 
 * [github.com/gobuffalo/tags/form](https://godoc.org/github.com/gobuffalo/tags/form)
@@ -167,10 +169,6 @@ Thank you to the following **GIANTS**:
 
 * [github.com/markbates/sigtx](https://godoc.org/github.com/markbates/sigtx)
 
-* [github.com/mattn/go-colorable](https://godoc.org/github.com/mattn/go-colorable)
-
-* [github.com/mattn/go-isatty](https://godoc.org/github.com/mattn/go-isatty)
-
 * [github.com/microcosm-cc/bluemonday](https://godoc.org/github.com/microcosm-cc/bluemonday)
 
 * [github.com/mitchellh/go-homedir](https://godoc.org/github.com/mitchellh/go-homedir)
@@ -199,8 +197,6 @@ Thank you to the following **GIANTS**:
 
 * [golang.org/x/crypto/ssh/terminal](https://godoc.org/golang.org/x/crypto/ssh/terminal)
 
-* [golang.org/x/net/context](https://godoc.org/golang.org/x/net/context)
-
 * [golang.org/x/net/html](https://godoc.org/golang.org/x/net/html)
 
 * [golang.org/x/net/html/atom](https://godoc.org/golang.org/x/net/html/atom)

buffalo/cmd/fix/npm.go

@@ -3,13 +3,12 @@ package fix
 import (
 	"bytes"
 	"fmt"
+	"html/template"
 	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
 
-	"html/template"
-
 	"github.com/gobuffalo/buffalo/generators/assets/webpack"
 	"github.com/gobuffalo/buffalo/generators/newapp"
 	"github.com/pkg/errors"
@@ -33,7 +32,7 @@ func PackageJSONCheck(r *Runner) error {
 
 	box := webpack.TemplateBox
 
-	f, err := box.MustString("package.json.tmpl")
+	f, err := box.FindString("package.json.tmpl")
 	if err != nil {
 		return errors.WithStack(err)
 	}

buffalo/cmd/fix/webpack.go

@@ -3,11 +3,10 @@ package fix
 import (
 	"bytes"
 	"fmt"
+	"html/template"
 	"io/ioutil"
 	"os"
 
-	"html/template"
-
 	"github.com/gobuffalo/buffalo/generators/assets/webpack"
 	"github.com/gobuffalo/buffalo/generators/newapp"
 	"github.com/pkg/errors"
@@ -31,7 +30,7 @@ func WebpackCheck(r *Runner) error {
 
 	box := webpack.TemplateBox
 
-	f, err := box.MustString("webpack.config.js.tmpl")
+	f, err := box.FindString("webpack.config.js.tmpl")
 	if err != nil {
 		return errors.WithStack(err)
 	}

generators/resource/resource.go

@@ -6,12 +6,11 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/pkg/errors"
-
 	"github.com/gobuffalo/buffalo/generators"
 	"github.com/gobuffalo/genny"
 	"github.com/gobuffalo/makr"
 	"github.com/gobuffalo/packr"
+	"github.com/pkg/errors"
 )
 
 // Run generates a new actions/resource file and a stub test.

go.mod

@@ -6,20 +6,20 @@ require (
 	github.com/fatih/color v1.7.0
 	github.com/go-sql-driver/mysql v1.4.1 // indirect
 	github.com/gobuffalo/buffalo-docker v1.0.5
-	github.com/gobuffalo/buffalo-plugins v1.7.0
+	github.com/gobuffalo/buffalo-plugins v1.7.2
 	github.com/gobuffalo/envy v1.6.9
 	github.com/gobuffalo/events v1.1.8
 	github.com/gobuffalo/fizz v1.1.3 // indirect
 	github.com/gobuffalo/flect v0.0.0-20181114183036-47375f6d8328
 	github.com/gobuffalo/genny v0.0.0-20181119162812-e8ff4adce8bb
 	github.com/gobuffalo/github_flavored_markdown v1.0.7
-	github.com/gobuffalo/httptest v1.0.4
+	github.com/gobuffalo/httptest v1.0.5
 	github.com/gobuffalo/logger v0.0.0-20181117211126-8e9b89b7c264
 	github.com/gobuffalo/makr v1.1.5
-	github.com/gobuffalo/meta v0.0.0-20181116202903-8850e47774f5
-	github.com/gobuffalo/packd v0.0.0-20181114190715-f25c5d2471d7
-	github.com/gobuffalo/packr v1.21.3
-	github.com/gobuffalo/plush v3.7.22+incompatible
+	github.com/gobuffalo/meta v0.0.0-20181127070345-0d7e59dd540b
+	github.com/gobuffalo/packd v0.0.0-20181124090624-311c6248e5fb
+	github.com/gobuffalo/packr v1.21.5
+	github.com/gobuffalo/plush v3.7.23+incompatible
 	github.com/gobuffalo/pop v4.9.2+incompatible
 	github.com/gobuffalo/tags v2.0.11+incompatible
 	github.com/gobuffalo/x v0.0.0-20181110221217-14085ca3e1a9
@@ -41,10 +41,9 @@ require (
 	github.com/spf13/pflag v1.0.3
 	github.com/spf13/viper v1.2.1
 	github.com/stretchr/testify v1.2.2
-	golang.org/x/crypto v0.0.0-20181112202954-3d3f9f413869
+	golang.org/x/crypto v0.0.0-20181127143415-eb0de9b17e85
 	golang.org/x/net v0.0.0-20181114220301-adae6a3d119a // indirect
 	golang.org/x/sync v0.0.0-20181108010431-42b317875d0f
-	golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8 // indirect
-	golang.org/x/tools v0.0.0-20181120173833-b6bf29589316
+	golang.org/x/tools v0.0.0-20181122213734-04b5d21e00f1
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc
 )