more fixxxesss

dotansimha · Jul 29, 2022 · ee9585a · ee9585a
1 parent e28277c
commit ee9585a
Show file tree

Hide file tree

Showing 11 changed files with 125 additions and 11 deletions.
diff --git a/examples/aws-lambda/lambda/graphql.ts b/examples/aws-lambda/lambda/graphql.ts
@@ -1,8 +1,25 @@
 import type { Handler } from '@aws-cdk/aws-lambda'
 import { createYoga } from 'graphql-yoga'
+import { createSchema } from 'graphql-yoga/schema'
 import { configure } from '@vendia/serverless-express'
 
-const app = createYoga()
+const app = createYoga({
+  graphqlEndpoint: '/graphql',
+  landingPage: false,
+  schema: createSchema({
+    typeDefs: /* GraphQL */ `
+      type Query {
+        greetings: String
+      }
+    `,
+    resolvers: {
+      Query: {
+        greetings: () =>
+          'This is the `greetings` field of the root `Query` type',
+      },
+    },
+  }),
+})
 
 export const handler: Handler = configure({
   app,

diff --git a/examples/aws-lambda/tsconfig.json b/examples/aws-lambda/tsconfig.json
@@ -1,4 +1,5 @@
 {
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
     "target": "ES2018",
     "module": "commonjs",

diff --git a/examples/azure-function/src/index.ts b/examples/azure-function/src/index.ts
@@ -1,5 +1,6 @@
 import { AzureFunction, Context, HttpRequest } from '@azure/functions'
 import { createYoga } from 'graphql-yoga'
+import { createSchema } from 'graphql-yoga/schema'
 import { Request } from '@whatwg-node/fetch'
 
 const httpTrigger: AzureFunction = async function (
@@ -14,6 +15,19 @@ const httpTrigger: AzureFunction = async function (
       warn: context.log.warn,
     },
     graphqlEndpoint: '/api/yoga',
+    schema: createSchema({
+      typeDefs: /* GraphQL */ `
+        type Query {
+          greetings: String
+        }
+      `,
+      resolvers: {
+        Query: {
+          greetings: () =>
+            'This is the `greetings` field of the root `Query` type',
+        },
+      },
+    }),
   })
   context.log('HTTP trigger function processed a request.')
 

diff --git a/examples/cloudflare-advanced/src/index.ts b/examples/cloudflare-advanced/src/index.ts
@@ -1,9 +1,10 @@
 import { createYoga } from 'graphql-yoga'
+import { createSchema } from 'graphql-yoga/schema'
 
 declare const EXAMPLE_KV: KVNamespace
 
 const yoga = createYoga({
-  schema: {
+  schema: createSchema({
     typeDefs: /* GraphQL */ `
       scalar File
       scalar JSON
@@ -99,7 +100,7 @@ const yoga = createYoga({
         },
       },
     },
-  },
+  }),
 })
 
 self.addEventListener('fetch', yoga)
diff --git a/examples/cloudflare-modules/src/index.ts b/examples/cloudflare-modules/src/index.ts
@@ -1,4 +1,21 @@
 // src/index.mjs
 import { createYoga } from 'graphql-yoga'
+import { createSchema } from 'graphql-yoga/schema'
 
-export default createYoga()
+export default createYoga({
+  graphqlEndpoint: '/graphql',
+  landingPage: false,
+  schema: createSchema({
+    typeDefs: /* GraphQL */ `
+      type Query {
+        greetings: String
+      }
+    `,
+    resolvers: {
+      Query: {
+        greetings: () =>
+          'This is the `greetings` field of the root `Query` type',
+      },
+    },
+  }),
+})
diff --git a/examples/nextjs/pages/api/graphql.ts b/examples/nextjs/pages/api/graphql.ts
@@ -1,5 +1,6 @@
 // Next.js API route support: https://nextjs.org/docs/api-routes/introduction
 import { createYoga } from 'graphql-yoga'
+import { createSchema } from 'graphql-yoga/schema'
 import type { NextApiRequest, NextApiResponse } from 'next'
 
 // Docs: https://vercel.com/docs/concepts/functions/serverless-functions
@@ -16,4 +17,17 @@ export default createYoga<{
   res: NextApiResponse
 }>({
   graphqlEndpoint: '/api/graphql',
+  schema: createSchema({
+    typeDefs: /* GraphQL */ `
+      type Query {
+        greetings: String
+      }
+    `,
+    resolvers: {
+      Query: {
+        greetings: () =>
+          'This is the `greetings` field of the root `Query` type',
+      },
+    },
+  }),
 })
diff --git a/examples/node-esm/yoga.mjs b/examples/node-esm/yoga.mjs
@@ -5,12 +5,12 @@ export const yoga = createYoga({
   schema: createSchema({
     typeDefs: /* GraphQL */ `
       type Query {
-        hello: String
+        greetings: String
       }
     `,
     resolvers: {
       Query: {
-        hello: () => 'Hello world!',
+        greetings: () => 'Hello world!',
       },
     },
   }),

diff --git a/examples/service-worker/src/index.ts b/examples/service-worker/src/index.ts
@@ -1,5 +1,6 @@
 import { createYoga } from 'graphql-yoga'
 import { createSchema } from 'graphql-yoga/schema'
+import { Repeater } from 'graphql-yoga/subscription'
 
 // We can define GraphQL Route dynamically using env vars.
 declare var GRAPHQL_ROUTE: string
@@ -9,13 +10,23 @@ const yoga = createYoga({
   schema: createSchema({
     typeDefs: /* GraphQL */ `
       type Query {
-        hello: String
+        greetings: String
+        time: String
       }
     `,
     resolvers: {
       Query: {
-        hello: () => 'Hello World!',
+        greetings: () =>
+          'This is the `greetings` field of the root `Query` type',
       },
+      Subscription: () =>
+        new Repeater(async (push, end) => {
+          const getTime = () => new Date().toISOString()
+          push(getTime())
+          const interval = setInterval(() => push(getTime()), 1000)
+          end.then(() => clearInterval(interval))
+          await end
+        }),
     },
   }),
 })

diff --git a/packages/plugins/apq/tests/automatic-persisted-queries.test.ts b/packages/plugins/apq/tests/automatic-persisted-queries.test.ts
@@ -1,6 +1,16 @@
-import { createYoga, YogaServerInstance } from 'graphql-yoga'
+import { createYoga } from 'graphql-yoga'
+import { createSchema } from 'graphql-yoga/schema'
+
 import request from 'supertest'
-import { createInMemoryAPQStore, useAPQ } from '../src'
+import { createInMemoryAPQStore, useAPQ } from '@graphql-yoga/plugin-apq'
+
+const schema = createSchema({
+  typeDefs: /* GraphQL */ `
+    type Query {
+      _: String
+    }
+  `,
+})
 
 describe('Automatic Persisted Queries', () => {
   it('should return not found error if persisted query is missing', async () => {
@@ -11,6 +21,7 @@ describe('Automatic Persisted Queries', () => {
           store,
         }),
       ],
+      schema,
     })
     const response = await request(yoga)
       .post('/graphql')
@@ -36,6 +47,7 @@ describe('Automatic Persisted Queries', () => {
           store,
         }),
       ],
+      schema,
     })
     const persistedQueryEntry = {
       version: 1,
@@ -63,6 +75,7 @@ describe('Automatic Persisted Queries', () => {
           store,
         }),
       ],
+      schema,
     })
 
     const persistedQueryEntry = {
@@ -95,6 +108,7 @@ describe('Automatic Persisted Queries', () => {
           store,
         }),
       ],
+      schema,
     })
     const query = `{__typename}`
     const response = await request(yoga)

diff --git a/packages/plugins/persisted-operations/tests/persisted-operations.test.ts b/packages/plugins/persisted-operations/tests/persisted-operations.test.ts
@@ -1,6 +1,15 @@
 import { createYoga } from 'graphql-yoga'
+import { createSchema } from 'graphql-yoga/schema'
 import request from 'supertest'
-import { usePersistedOperations } from '../src'
+import { usePersistedOperations } from '@graphql-yoga/plugin-persisted-operations'
+
+const schema = createSchema({
+  typeDefs: /* GraphQL */ `
+    type Query {
+      _: String
+    }
+  `,
+})
 
 describe('Automatic Persisted Queries', () => {
   it('should return not found error if persisted query is missing', async () => {
@@ -11,6 +20,7 @@ describe('Automatic Persisted Queries', () => {
           store,
         }),
       ],
+      schema,
     })
     const response = await request(yoga)
       .post('/graphql')
@@ -36,6 +46,7 @@ describe('Automatic Persisted Queries', () => {
           store,
         }),
       ],
+      schema,
     })
     const persistedQueryEntry = {
       version: 1,
@@ -64,6 +75,7 @@ describe('Automatic Persisted Queries', () => {
           store,
         }),
       ],
+      schema,
     })
     const persistedQueryEntry = {
       version: 1,
@@ -90,6 +102,7 @@ describe('Automatic Persisted Queries', () => {
           allowArbitraryOperations: true,
         }),
       ],
+      schema,
     })
     const persistedQueryEntry = {
       version: 1,
@@ -117,6 +130,7 @@ describe('Automatic Persisted Queries', () => {
             request.headers.get('foo') === 'bar',
         }),
       ],
+      schema,
     })
     const persistedQueryEntry = {
       version: 1,

diff --git a/packages/plugins/response-cache/__tests__/response-cache.spec.ts b/packages/plugins/response-cache/__tests__/response-cache.spec.ts
@@ -1,6 +1,15 @@
 import { createYoga } from 'graphql-yoga'
+import { createSchema } from 'graphql-yoga/schema'
 import { useResponseCache } from '@graphql-yoga/plugin-response-cache'
 
+const schema = createSchema({
+  typeDefs: /* GraphQL */ `
+    type Query {
+      _: String
+    }
+  `,
+})
+
 it('cache a query operation', async () => {
   const yoga = createYoga({
     plugins: [
@@ -9,6 +18,7 @@ it('cache a query operation', async () => {
         includeExtensionMetadata: true,
       }),
     ],
+    schema,
   })
   function fetch() {
     return yoga.fetch('http://localhost:3000/graphql', {
@@ -60,6 +70,7 @@ it('cache a query operation per session', async () => {
         includeExtensionMetadata: true,
       }),
     ],
+    schema,
   })
   function fetch(sessionId: string) {
     return yoga.fetch('http://localhost:3000/graphql', {