switch to swiftcarrot/gqlgen

swiftcarrot · May 22, 2021 · b5c59db · b5c59db
1 parent b75df40
commit b5c59db
Show file tree

Hide file tree

Showing 19 changed files with 36 additions and 34 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.5.2
+
+- switch to `github.com/swiftcarrot/gqlgen`
+
 ## 0.5.1
 
 - fix `defer` in database template

diff --git a/cmd/version.go b/cmd/version.go
@@ -6,7 +6,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var Version = "0.5.1"
+var Version = "0.5.2"
 
 var versionCmd = &cobra.Command{
 	Use:   "version",

diff --git a/generators/graphql/graphql.go b/generators/graphql/graphql.go
@@ -4,11 +4,11 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/99designs/gqlgen/api"
-	"github.com/99designs/gqlgen/codegen/config"
-	"github.com/99designs/gqlgen/plugin/modelgen"
 	"github.com/swiftcarrot/dashi/plugin/resolvergen"
 	"github.com/swiftcarrot/genny"
+	"github.com/swiftcarrot/gqlgen/api"
+	"github.com/swiftcarrot/gqlgen/codegen/config"
+	"github.com/swiftcarrot/gqlgen/plugin/modelgen"
 )
 
 func New() (*genny.Generator, error) {

diff --git a/generators/new/new.go b/generators/new/new.go
@@ -28,8 +28,8 @@ func New(opts *Options) (*genny.Group, error) {
 	g.Command(exec.Command("go", "mod", "init"))
 	// TODO: lock package version
 	g.Command(exec.Command("go", "get", "github.com/swiftcarrot/dashi"))
-	g.Command(exec.Command("go", "get", "github.com/99designs/gqlgen@5ad012e3d7be1127706b9c8a3da0378df3a98ec1"))
-	// g.Command(exec.Command("go", "mod", "edit", "-replace=github.com/99designs/gqlgen=github.com/swiftcarrot/gqlgen@master"))
+	g.Command(exec.Command("go", "get", "github.com/swiftcarrot/gqlgen"))
+	// g.Command(exec.Command("go", "mod", "edit", "-replace=github.com/swiftcarrot/gqlgen=github.com/swiftcarrot/gqlgen@master"))
 
 	g.Templates(&templates)
 

diff --git a/generators/new/templates/gqlgen.yml.tmpl b/generators/new/templates/gqlgen.yml.tmpl
@@ -24,7 +24,7 @@ models:
       - github.com/swiftcarrot/dashi/types.UUID
   Int:
     model:
-      - github.com/99designs/gqlgen/graphql.Int
+      - github.com/swiftcarrot/gqlgen/graphql.Int
   UUID:
     model:
       - github.com/swiftcarrot/dashi/types.UUID
@@ -33,11 +33,11 @@ models:
       - github.com/swiftcarrot/dashi/types.String
   Float:
     model:
-      - github.com/99designs/gqlgen/graphql.Float
+      - github.com/swiftcarrot/gqlgen/graphql.Float
   Time:
     model:
-      - github.com/99designs/gqlgen/graphql.Time
+      - github.com/swiftcarrot/gqlgen/graphql.Time
   Map:
     model:
-      - github.com/99designs/gqlgen/graphql.Map
+      - github.com/swiftcarrot/gqlgen/graphql.Map
       - github.com/swiftcarrot/dashi/types/slices.Map
diff --git a/generators/scaffold/dashboard/plugins/dashboardgen/dashboardgen.go b/generators/scaffold/dashboard/plugins/dashboardgen/dashboardgen.go
@@ -1,8 +1,8 @@
 package dashboardgen
 
 import (
-	"github.com/99designs/gqlgen/codegen"
-	"github.com/99designs/gqlgen/plugin"
+	"github.com/swiftcarrot/gqlgen/codegen"
+	"github.com/swiftcarrot/gqlgen/plugin"
 )
 
 type Plugin struct {

diff --git a/generators/server/templates/api/server.go.tmpl b/generators/server/templates/api/server.go.tmpl
@@ -6,8 +6,8 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/99designs/gqlgen/graphql"
-	"github.com/99designs/gqlgen/graphql/handler"
+	"github.com/swiftcarrot/gqlgen/graphql"
+	"github.com/swiftcarrot/gqlgen/graphql/handler"
 	"github.com/go-chi/chi"
 	"github.com/go-chi/chi/middleware"
 	"github.com/go-chi/cors"

diff --git a/go.mod b/go.mod
@@ -3,7 +3,6 @@ module github.com/swiftcarrot/dashi
 go 1.16
 
 require (
-	github.com/99designs/gqlgen v0.0.0-00010101000000-000000000000
 	github.com/cockroachdb/cockroach-go v2.0.1+incompatible // indirect
 	github.com/fatih/color v1.11.0 // indirect
 	github.com/gobuffalo/envy v1.9.0 // indirect
@@ -25,9 +24,8 @@ require (
 	github.com/stretchr/testify v1.6.1
 	github.com/swiftcarrot/flect v0.3.2
 	github.com/swiftcarrot/genny v0.1.0
+	github.com/swiftcarrot/gqlgen v0.14.1
 	golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 // indirect
 	golang.org/x/tools v0.0.0-20210106214847-113979e3529a
 	gopkg.in/yaml.v2 v2.3.0 // indirect
 )
-
-replace github.com/99designs/gqlgen => github.com/swiftcarrot/gqlgen v0.14.0
diff --git a/go.sum b/go.sum
@@ -309,8 +309,8 @@ github.com/swiftcarrot/flect v0.3.2 h1:WH26oFAfkyKYJQLlkN5Kw4XhwrHQTbMPIFLhjbuoW
 github.com/swiftcarrot/flect v0.3.2/go.mod h1:Q8fbWSjfLnhQtOnE3Q8OtvH9PPIJoZdHp7QcbQ3zAPY=
 github.com/swiftcarrot/genny v0.1.0 h1:jDCF8n/XZuQlEUr+TRVgfobDEe63xsRfIYobhftNrPg=
 github.com/swiftcarrot/genny v0.1.0/go.mod h1:qIFsKAH9sJyxmxPA1UUscLv2Cq+oET8l9TqrRrCPF6Q=
-github.com/swiftcarrot/gqlgen v0.14.0 h1:dCByJEX8B25brTmvHitEYuzVirePd77AiB1yrJu0izA=
-github.com/swiftcarrot/gqlgen v0.14.0/go.mod h1:Q0Cu0QKR99SnpBtxxj4162MGz3jSkMWvgQ79g2YT6lA=
+github.com/swiftcarrot/gqlgen v0.14.1 h1:Pix45lGD1weUf9m+Vwu3onw2vwjFa38bOlYffzRW9l0=
+github.com/swiftcarrot/gqlgen v0.14.1/go.mod h1:/WrflvR8UlB/BDPbseZWtrEsKPl79FQfIcFEyZpNIH8=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=

diff --git a/plugin/resolvergen/crud.go b/plugin/resolvergen/crud.go
@@ -6,9 +6,9 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/99designs/gqlgen/codegen"
-	"github.com/99designs/gqlgen/codegen/templates"
 	"github.com/swiftcarrot/flect"
+	"github.com/swiftcarrot/gqlgen/codegen"
+	"github.com/swiftcarrot/gqlgen/codegen/templates"
 )
 
 //go:embed crud.tmpl

diff --git a/plugin/resolvergen/resolver.go b/plugin/resolvergen/resolver.go
@@ -6,12 +6,12 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/99designs/gqlgen/codegen"
-	"github.com/99designs/gqlgen/codegen/config"
-	"github.com/99designs/gqlgen/codegen/templates"
-	"github.com/99designs/gqlgen/plugin"
 	"github.com/pkg/errors"
 	"github.com/swiftcarrot/dashi/generators/graphql/rewrite"
+	"github.com/swiftcarrot/gqlgen/codegen"
+	"github.com/swiftcarrot/gqlgen/codegen/config"
+	"github.com/swiftcarrot/gqlgen/codegen/templates"
+	"github.com/swiftcarrot/gqlgen/plugin"
 )
 
 //go:embed resolver.tmpl

diff --git a/plugin/resolvergen/resolver.tmpl b/plugin/resolvergen/resolver.tmpl
@@ -9,8 +9,8 @@
 
 {{ reserveImport "github.com/vektah/gqlparser/v2" }}
 {{ reserveImport "github.com/vektah/gqlparser/v2/ast" }}
-{{ reserveImport "github.com/99designs/gqlgen/graphql" }}
-{{ reserveImport "github.com/99designs/gqlgen/graphql/introspection" }}
+{{ reserveImport "github.com/swiftcarrot/gqlgen/graphql" }}
+{{ reserveImport "github.com/swiftcarrot/gqlgen/graphql/introspection" }}
 
 {{ .Imports }}
 

diff --git a/types/float.go b/types/float.go
@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/99designs/gqlgen/graphql"
 	"github.com/gobuffalo/nulls"
+	"github.com/swiftcarrot/gqlgen/graphql"
 )
 
 func MarshalNullsFloat(s nulls.Float64) graphql.Marshaler {

diff --git a/types/id.go b/types/id.go
@@ -6,7 +6,7 @@ import (
 	"io"
 	"strconv"
 
-	"github.com/99designs/gqlgen/graphql"
+	"github.com/swiftcarrot/gqlgen/graphql"
 )
 
 func MarshalID(s string) graphql.Marshaler {

diff --git a/types/int.go b/types/int.go
@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/99designs/gqlgen/graphql"
 	"github.com/gobuffalo/nulls"
+	"github.com/swiftcarrot/gqlgen/graphql"
 )
 
 func MarshalNullsInt(s nulls.Int) graphql.Marshaler {

diff --git a/types/slices/map.go b/types/slices/map.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/99designs/gqlgen/graphql"
+	"github.com/swiftcarrot/gqlgen/graphql"
 )
 
 // Map is a map[string]interface.

diff --git a/types/string.go b/types/string.go
@@ -3,9 +3,9 @@ package types
 import (
 	"fmt"
 
-	"github.com/99designs/gqlgen/graphql"
 	"github.com/gobuffalo/nulls"
 	"github.com/gobuffalo/pop/slices"
+	"github.com/swiftcarrot/gqlgen/graphql"
 )
 
 func MarshalString(s string) graphql.Marshaler {

diff --git a/types/time.go b/types/time.go
@@ -1,8 +1,8 @@
 package types
 
 import (
-	"github.com/99designs/gqlgen/graphql"
 	"github.com/gobuffalo/nulls"
+	"github.com/swiftcarrot/gqlgen/graphql"
 )
 
 func MarshalNullsTime(s nulls.Time) graphql.Marshaler {

diff --git a/types/uuid.go b/types/uuid.go
@@ -3,9 +3,9 @@ package types
 import (
 	"fmt"
 
-	"github.com/99designs/gqlgen/graphql"
 	"github.com/gobuffalo/nulls"
 	"github.com/gofrs/uuid"
+	"github.com/swiftcarrot/gqlgen/graphql"
 )
 
 func MarshalUUID(u uuid.UUID) graphql.Marshaler {