Merge pull request #50 from gobuffalo/development

v0.17.8

.github/dependabot.yml

@@ -0,0 +1,11 @@
+version: 2
+updates:
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "daily"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/release.yml

@@ -16,7 +16,7 @@ jobs:
         id: go
 
       - name: Checkout Code
-        uses: actions/checkout@master
+        uses: actions/checkout@v2
 
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2

.gitignore

@@ -1,3 +1,2 @@
 bin/
 dist/
-*-packr.go

.golangci.yml

@@ -0,0 +1,7 @@
+linters-settings:
+  errcheck:
+    exclude-functions:
+      - events.Emit
+      - events.EmitPayload
+      - events.EmitError
+      - events.NamedListen

Dockerfile.build

@@ -35,7 +35,7 @@ ADD . .
 RUN go install ./cmd/buffalo
 
 WORKDIR /
-RUN go install github.com/gobuffalo/buffalo-pop/v2@latest
+RUN go install github.com/gobuffalo/buffalo-pop/v3@latest
 
 RUN mkdir /src
 WORKDIR /src

Dockerfile.slim.build

@@ -22,7 +22,7 @@ ADD . .
 RUN go install ./cmd/buffalo
 
 WORKDIR /
-RUN go install github.com/gobuffalo/buffalo-pop/v2@latest
+RUN go install github.com/gobuffalo/buffalo-pop/v3@latest
 
 RUN mkdir /src
 WORKDIR /src

go.mod

@@ -6,20 +6,17 @@ require (
 	github.com/BurntSushi/toml v0.4.1
 	github.com/fatih/color v1.13.0
 	github.com/gobuffalo/attrs v1.0.1
-	github.com/gobuffalo/buffalo-pop/v2 v2.3.0
-	github.com/gobuffalo/clara/v2 v2.0.2
+	github.com/gobuffalo/buffalo-pop/v3 v3.0.1
+	github.com/gobuffalo/clara/v2 v2.0.5
 	github.com/gobuffalo/envy v1.10.1
 	github.com/gobuffalo/events v1.4.2
 	github.com/gobuffalo/flect v0.2.4
-	github.com/gobuffalo/genny/v2 v2.0.6
+	github.com/gobuffalo/genny/v2 v2.0.8
 	github.com/gobuffalo/logger v1.0.6
 	github.com/gobuffalo/meta v0.3.1
-	github.com/gobuffalo/packd v1.0.1
-	github.com/gobuffalo/packr/v2 v2.8.1
-	github.com/gobuffalo/plush/v4 v4.1.8
-	github.com/gobuffalo/pop/v5 v5.3.4
+	github.com/gobuffalo/plush/v4 v4.1.9
+	github.com/gobuffalo/pop/v6 v6.0.0
 	github.com/google/go-cmp v0.5.6
-	github.com/karrick/godirwalk v1.16.1
 	github.com/markbates/grift v1.5.0
 	github.com/markbates/oncer v1.0.0
 	github.com/markbates/refresh v1.12.0

internal/cmd/build.go

@@ -10,7 +10,6 @@ import (
 	"time"
 
 	"github.com/gobuffalo/cli/internal/genny/build"
-
 	"github.com/gobuffalo/genny/v2"
 	"github.com/gobuffalo/logger"
 	"github.com/gobuffalo/meta"
@@ -37,7 +36,7 @@ var buildOptions = struct {
 var xbuildCmd = &cobra.Command{
 	Use:     "build",
 	Aliases: []string{"b", "bill", "install"},
-	Short:   "Build the application binary, including bundling of assets (packr & webpack)",
+	Short:   "Build the application binary, including bundling of webpack assets",
 	RunE: func(cmd *cobra.Command, args []string) error {
 		ctx, cancel := sigtx.WithCancel(context.Background(), os.Interrupt)
 		defer cancel()
@@ -63,7 +62,6 @@ var xbuildCmd = &cobra.Command{
 		if buildOptions.Verbose || buildOptions.Debug {
 			lg := logger.New(logger.DebugLevel)
 			run.Logger = lg
-			// plog.Logger = lg
 			buildOptions.BuildFlags = append(buildOptions.BuildFlags, "-v")
 		}
 
@@ -85,7 +83,7 @@ var xbuildCmd = &cobra.Command{
 		// defer clean(run)
 		defer func() {
 			if err := clean(run); err != nil {
-				log.Fatal("build:clean", err)
+				log.Fatalf("build:clean %s", err)
 			}
 		}()
 		if err := run.WithNew(build.New(opts)); err != nil {

internal/cmd/destroy/action.go

@@ -10,7 +10,7 @@ import (
 //ActionCmd destroys passed action file
 var ActionCmd = &cobra.Command{
 	Use: "action [name]",
-	//Example: "resource cars",
+	// Example: "resource cars",
 	Aliases: []string{"a"},
 	Short:   "Destroy action files",
 	RunE: func(cmd *cobra.Command, args []string) error {
@@ -20,10 +20,8 @@ var ActionCmd = &cobra.Command{
 
 		name := args[0]
 
-		//Generated actions keep the same name (not plural).
+		// Generated actions keep the same name (not plural).
 		fileName := flect.Underscore(name)
-
-		removeActions(fileName)
-		return nil
+		return removeActions(fileName)
 	},
 }

internal/cmd/dev.go

@@ -9,10 +9,9 @@ import (
 	"runtime"
 	"strings"
 
+	"github.com/fatih/color"
 	"github.com/gobuffalo/cli/internal/genny/assets/webpack"
 	rg "github.com/gobuffalo/cli/internal/genny/refresh"
-
-	"github.com/fatih/color"
 	"github.com/gobuffalo/events"
 	"github.com/gobuffalo/genny/v2"
 	"github.com/gobuffalo/meta"

internal/cmd/fix/deprecations.go

@@ -51,8 +51,6 @@ func DeprecrationsCheck(r *Runner) error {
 		if bytes.Contains(b, []byte("T.LanguageFinder=")) || bytes.Contains(b, []byte("T.LanguageFinder ")) {
 			r.Warnings = append(r.Warnings, fmt.Sprintf("i18n.Translator#LanguageFinder has been deprecated in v0.11.1, and has been removed in v0.12.0. Use i18n.Translator#LanguageExtractors instead. [%s]", path))
 		}
-		ioutil.WriteFile(path, b, 0664)
-
-		return nil
+		return ioutil.WriteFile(path, b, 0664)
 	})
 }

internal/cmd/fix/fix.go

@@ -16,7 +16,7 @@ var YesToAll bool
 var replace = map[string]string{
 	"github.com/gobuffalo/buffalo-plugins":         "github.com/gobuffalo/cli/internal/plugins",
 	"github.com/gobuffalo/genny":                   "github.com/gobuffalo/genny/v2",
-	"github.com/gobuffalo/pop":                     "github.com/gobuffalo/pop/v5",
+	"github.com/gobuffalo/pop":                     "github.com/gobuffalo/pop/v6",
 	"github.com/gobuffalo/pop/nulls":               "github.com/gobuffalo/nulls",
 	"github.com/gobuffalo/uuid":                    "github.com/gofrs/uuid",
 	"github.com/markbates/pop":                     "github.com/gobuffalo/pop/v5",
@@ -26,10 +26,11 @@ var replace = map[string]string{
 	"github.com/shurcooL/github_flavored_markdown": "github.com/gobuffalo/github_flavored_markdown",
 	"github.com/gobuffalo/validate":                "github.com/gobuffalo/validate/v3",
 	"github.com/gobuffalo/validate/validators":     "github.com/gobuffalo/validate/v3/validators",
-	"github.com/gobuffalo/suite":                   "github.com/gobuffalo/suite/v3",
-	"github.com/gobuffalo/buffalo-pop/":            "github.com/gobuffalo/buffalo-pop/v2",
-	"github.com/gobuffalo/buffalo-pop/pop/popmw":   "github.com/gobuffalo/buffalo-pop/v2/pop/popmw",
+	"github.com/gobuffalo/suite":                   "github.com/gobuffalo/suite/v4",
+	"github.com/gobuffalo/buffalo-pop/":            "github.com/gobuffalo/buffalo-pop/v3",
+	"github.com/gobuffalo/buffalo-pop/pop/popmw":   "github.com/gobuffalo/buffalo-pop/v3/pop/popmw",
 	"github.com/gobuffalo/plush":                   "github.com/gobuffalo/plush/v4",
+	"github.com/gobuffalo/mw-i18n":                 "github.com/gobuffalo/mw-i18n/v2",
 }
 
 var ic = ImportConverter{
@@ -57,7 +58,6 @@ var mr = MiddlewareTransformer{
 }
 
 var checks = []Check{
-	PackrClean,
 	ic.Process,
 	mr.transformPackages,
 	WebpackCheck,
@@ -78,7 +78,9 @@ func encodeApp(r *Runner) error {
 	if _, err := os.Stat(p); err == nil {
 		return nil
 	}
-	os.MkdirAll(filepath.Dir(p), 0755)
+	if err := os.MkdirAll(filepath.Dir(p), 0755); err != nil {
+		return err
+	}
 	f, err := os.Create(p)
 	if err != nil {
 		return err

internal/cmd/fix/middleware.go

@@ -78,7 +78,7 @@ func (mw MiddlewareTransformer) addMissingRootMiddlewareImports(fset *token.File
 	}
 
 	if strings.Contains(content, "popmw.Transaction") {
-		astutil.AddImport(fset, f, "github.com/gobuffalo/buffalo-pop/v2/pop/popmw")
+		astutil.AddImport(fset, f, "github.com/gobuffalo/buffalo-pop/v3/pop/popmw")
 	}
 
 	if strings.Contains(content, "contenttype.Add") || strings.Contains(content, "contenttype.Set") {

internal/cmd/fix/npm.go

@@ -59,10 +59,12 @@ func AddPackageJSONScripts(r *Runner) error {
 	if needRewrite {
 		b, err = json.MarshalIndent(packageJSON, "", "  ")
 		if err != nil {
-			return fmt.Errorf("could not rewrite package.json: %s", err.Error())
+			return fmt.Errorf("could not rewrite package.json: %w", err)
 		}
 
-		ioutil.WriteFile("package.json", b, 0644)
+		if err := ioutil.WriteFile("package.json", b, 0644); err != nil {
+			return fmt.Errorf("could not rewrite package.json: %w", err)
+		}
 	} else {
 		fmt.Println("~~~ package.json doesn't need to be patched, skipping. ~~~")
 	}
@@ -81,14 +83,12 @@ func PackageJSONCheck(r *Runner) error {
 		return nil
 	}
 
-	box := webpack.Templates
-
-	f, err := box.FindString("package.json.tmpl")
+	templates, err := webpack.Templates()
 	if err != nil {
 		return err
 	}
 
-	tmpl, err := template.New("package.json").Parse(f)
+	tmpl, err := template.New("package.json").ParseFS(templates, "package.json.tmpl")
 	if err != nil {
 		return err
 	}

internal/cmd/fix/plugins.go

@@ -2,6 +2,7 @@ package fix
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"os"
 	"path"
@@ -12,7 +13,6 @@ import (
 	cmdPlugins "github.com/gobuffalo/cli/internal/cmd/plugins"
 	"github.com/gobuffalo/cli/internal/plugins"
 	"github.com/gobuffalo/cli/internal/plugins/plugdeps"
-	"github.com/gobuffalo/cli/internal/takeon/github.com/markbates/errx"
 	"github.com/gobuffalo/genny/v2"
 	"github.com/gobuffalo/meta"
 )
@@ -31,7 +31,7 @@ func (pf Plugins) CleanCache(r *Runner) error {
 //Reinstall installs latest versions of the plugins
 func (pf Plugins) Reinstall(r *Runner) error {
 	plugs, err := plugdeps.List(r.App)
-	if err != nil && (errx.Unwrap(err) != plugdeps.ErrMissingConfig) {
+	if err != nil && !errors.Is(err, plugdeps.ErrMissingConfig) {
 		return err
 	}
 
@@ -57,7 +57,7 @@ func (pf Plugins) RemoveOld(r *Runner) error {
 	run := genny.WetRunner(context.Background())
 	app := meta.New(".")
 	plugs, err := plugdeps.List(app)
-	if err != nil && (errx.Unwrap(err) != plugdeps.ErrMissingConfig) {
+	if err != nil && !errors.Is(err, plugdeps.ErrMissingConfig) {
 		return err
 	}
 

internal/cmd/fix/tools.go

@@ -16,11 +16,13 @@ func installTools(r *Runner) error {
 	g := genny.New()
 	app := r.App
 	if app.WithPop {
-		rTools = append(rTools, "github.com/gobuffalo/buffalo-pop/v2")
+		rTools = append(rTools, "github.com/gobuffalo/buffalo-pop/v3")
 	}
 	for _, t := range rTools {
 		g.Command(exec.Command("go", "get", t))
 	}
-	run.With(g)
+	if err := run.With(g); err != nil {
+		return err
+	}
 	return run.Run()
 }

internal/cmd/fix/webpack.go

@@ -21,14 +21,12 @@ func WebpackCheck(r *Runner) error {
 		return nil
 	}
 
-	box := webpack.Templates
-
-	f, err := box.FindString("webpack.config.js.tmpl")
+	templates, err := webpack.Templates()
 	if err != nil {
 		return err
 	}
 
-	tmpl, err := template.New("webpack").Parse(f)
+	tmpl, err := template.New("webpack").ParseFS(templates, "webpack.config.js.tmpl")
 	if err != nil {
 		return err
 	}

internal/cmd/generate/action.go

@@ -46,7 +46,9 @@ var ActionCmd = &cobra.Command{
 		}
 
 		opts := actionOptions.Options
-		run.WithNew(actions.New(opts))
+		if err := run.WithNew(actions.New(opts)); err != nil {
+			return err
+		}
 		return run.Run()
 	},
 }

internal/cmd/generate/mailer.go

@@ -40,7 +40,9 @@ var MailCmd = &cobra.Command{
 		if err != nil {
 			return err
 		}
-		run.With(g)
+		if err := run.With(g); err != nil {
+			return err
+		}
 
 		gg.With(run)
 		return run.Run()

internal/cmd/info.go

@@ -5,9 +5,8 @@ import (
 	"os/exec"
 	"time"
 
-	"github.com/gobuffalo/cli/internal/genny/info"
-
 	"github.com/gobuffalo/clara/v2/genny/rx"
+	"github.com/gobuffalo/cli/internal/genny/info"
 	"github.com/gobuffalo/genny/v2"
 	"github.com/gobuffalo/meta"
 	"github.com/spf13/cobra"