continue: to be compatible with old versions

gobuffalo · Oct 1, 2022 · 0e3b085 · 0e3b085
1 parent ed7590d
commit 0e3b085
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/internal/genny/actions/actions.go b/internal/genny/actions/actions.go
@@ -68,6 +68,7 @@ func updateApp(pres *presenter) genny.RunFn {
 		if err != nil {
 			return err
 		}
+
 		var lines []string
 		body := f.String()
 		for _, a := range pres.Actions {
@@ -76,9 +77,19 @@ func updateApp(pres *presenter) genny.RunFn {
 				lines = append(lines, e)
 			}
 		}
+
 		f, err = gogen.AddInsideBlock(f, "appOnce.Do(func() {", strings.Join(lines, "\n\t\t"))
 		if err != nil {
-			return err
+			if strings.Contains(err.Error(), "could not find desired block") {
+				f, err = gogen.AddInsideBlock(f, "if app == nil {", strings.Join(lines, "\n\t\t"))
+				if err != nil {
+					return err
+				} else {
+					r.Logger.Warnf("This app was built with CLI v0.18.8 or older. See https://gobuffalo.io/documentation/known-issues/#cli-v0.18.8")
+				}
+			} else {
+				return err
+			}
 		}
 		return r.File(f)
 	}

diff --git a/internal/genny/resource/actions.go b/internal/genny/resource/actions.go
@@ -2,6 +2,7 @@ package resource
 
 import (
 	"fmt"
+	"strings"
 
 	"github.com/gobuffalo/flect/name"
 	"github.com/gobuffalo/genny/v2"
@@ -14,11 +15,22 @@ func addResource(pres presenter) genny.RunFn {
 		if err != nil {
 			return err
 		}
+
 		stmt := fmt.Sprintf("app.Resource(\"/%s\", %sResource{})", pres.Name.URL(), pres.Name.Resource())
 		f, err = gogen.AddInsideBlock(f, "appOnce.Do(func() {", stmt)
 		if err != nil {
-			return err
+			if strings.Contains(err.Error(), "could not find desired block") {
+				f, err = gogen.AddInsideBlock(f, "if app == nil {", stmt)
+				if err != nil {
+					return err
+				} else {
+					r.Logger.Warnf("This app was built with CLI v0.18.8 or older. See https://gobuffalo.io/documentation/known-issues/#cli-v0.18.8")
+				}
+			} else {
+				return err
+			}
 		}
+
 		return r.File(f)
 	}
 }