Merge pull request #1958 from 99designs/cleanup-main

Cleanup main
99designs · Feb 9, 2022 · d7da5b0 · d7da5b0
2 parents 42f3243 + be16474
commit d7da5b0
Show file tree

Hide file tree

Showing 10 changed files with 285 additions and 359 deletions.
diff --git a/ambient.go b/ambient.go
@@ -0,0 +1,19 @@
+package main
+
+// Ambient imports
+//
+// These imports are referenced by the generated code.
+// Dependency managers like dep have been known to prune them,
+// so explicitly import them here.
+//
+// TODO: check if these imports are still necessary with go
+// modules, and if so move the ambient import to the files
+// where they are actually referenced
+import (
+	_ "github.com/99designs/gqlgen/graphql"
+	_ "github.com/99designs/gqlgen/graphql/handler"
+	_ "github.com/99designs/gqlgen/graphql/introspection"
+	_ "github.com/99designs/gqlgen/handler"
+	_ "github.com/vektah/gqlparser/v2"
+	_ "github.com/vektah/gqlparser/v2/ast"
+)
diff --git a/cmd/ambient.go b/cmd/ambient.go
diff --git a/cmd/gen.go b/cmd/gen.go
diff --git a/cmd/init.go b/cmd/init.go
diff --git a/cmd/init_test.go b/cmd/init_test.go
diff --git a/cmd/root.go b/cmd/root.go
diff --git a/cmd/testdata/init/.keep b/cmd/testdata/init/.keep
diff --git a/cmd/version.go b/cmd/version.go
diff --git a/codegen/generate.go b/codegen/generate.go
@@ -8,10 +8,9 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/vektah/gqlparser/v2/ast"
-
 	"github.com/99designs/gqlgen/codegen/config"
 	"github.com/99designs/gqlgen/codegen/templates"
+	"github.com/vektah/gqlparser/v2/ast"
 )
 
 func GenerateCode(data *Data) error {