fix: Apply changes to new content from master

examples/conflicts/server.js

@@ -1,6 +1,5 @@
 const express = require('express')
-const { makeExecutableSchema } = require('graphql-tools')
-const queries = require("./queries")
+const queries = require('./queries')
 const { VoyagerServer, gql } = require('@aerogear/voyager-server')
 
 const { conflictHandler } = require('@aerogear/voyager-conflicts')
@@ -75,8 +74,6 @@ const resolvers = {
   }
 }
 
-const schema = makeExecutableSchema({ typeDefs, resolvers })
-
 // The context is a function or object that can add some extra data
 // That will be available via the `context` argument the resolver functions
 const context = ({ req }) => {
@@ -87,14 +84,15 @@ const context = ({ req }) => {
 
 // Initialize the voyager server with our schema and context
 const server = VoyagerServer({
+  typeDefs,
+  resolvers,
   playground: {
     tabs: [{
       endpoint: '/graphql',
       variables: {},
       query: queries
     }]
   },
-  schema,
   context
 })
 

examples/package.json

@@ -12,6 +12,7 @@
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
+    "@aerogear/voyager-tools": "^0.3.0",
     "@aerogear/voyager-audit": "^0.3.0",
     "@aerogear/voyager-conflicts": "^0.3.0",
     "@aerogear/voyager-keycloak": "^0.3.0",

examples/restapi/server.js

@@ -1,11 +1,10 @@
-const express = require("express");
-const { makeExecutableSchema } = require("graphql-tools");
-const queries = require("./queries");
-const axios = require("axios");
+const express = require('express')
+const queries = require('./queries')
+const axios = require('axios')
 const {
-  ApolloVoyagerServer,
+  VoyagerServer,
   gql
-} = require("../../packages/apollo-voyager-server");
+} = require('@aerogear/voyager-server')
 
 // Types
 const typeDefs = gql`
@@ -18,7 +17,7 @@ const typeDefs = gql`
   type Query {
     getCarModels(brand: String!): [ModelInfo]
   }
-`;
+`
 
 // Resolver functions. This is our business logic
 const resolvers = {
@@ -28,42 +27,32 @@ const resolvers = {
       const response = await axios.get(
         `https://vpic.nhtsa.dot.gov/api/vehicles/getmodelsformake/${args.brand}`,
         {
-          responseType: "json",
-          params: { format: "json" }
+          responseType: 'json',
+          params: { format: 'json' }
         }
-      );
-      const { data } = response;
-      return data.Results;
+      )
+      const { data } = response
+      return data.Results
     }
   }
-};
+}
 
-const schema = makeExecutableSchema({ typeDefs, resolvers });
-
-// The context is a function or object that can add some extra data
-// That will be available via the `context` argument the resolver functions
-const context = ({ req }) => {
-  return {
-    serverName: "Voyager Server"
-  };
-};
-
-// Initialize the apollo voyager server with our schema and context
-const server = ApolloVoyagerServer({
+// Initialize the voyager server with our schema and context
+const server = VoyagerServer({
+  typeDefs,
+  resolvers,
   playground: {
     tabs: [
       {
-        endpoint: "/graphql",
+        endpoint: '/graphql',
         variables: {},
         query: queries
       }
     ]
-  },
-  schema,
-  context
-});
+  }
+})
 
-const app = express();
-server.applyMiddleware({ app });
+const app = express()
+server.applyMiddleware({ app })
 
-module.exports = { app, server };
+module.exports = { app, server }