Skip to content

Commit 930c114

Browse files
committed
fix(deps): updated dependencies
1 parent dd31c34 commit 930c114

File tree

3 files changed

+74
-52
lines changed

3 files changed

+74
-52
lines changed

package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,30 +36,30 @@
3636
"dependencies": {
3737
"@types/cors": "^2.8.3",
3838
"@types/express": "^4.11.1",
39-
"@types/graphql": "^0.12.5",
39+
"@types/graphql": "^0.13.0",
4040
"@types/zen-observable": "^0.5.3",
41-
"apollo-server-express": "^1.3.2",
42-
"apollo-server-lambda": "1.3.2",
41+
"apollo-server-express": "^1.3.4",
42+
"apollo-server-lambda": "1.3.4",
4343
"apollo-upload-server": "^5.0.0",
4444
"aws-lambda": "^0.1.2",
4545
"body-parser-graphql": "1.0.0",
4646
"cors": "^2.8.4",
4747
"express": "^4.16.3",
4848
"graphql": "^0.11.0 || ^0.12.0 || ^0.13.0",
49-
"graphql-import": "^0.4.5",
50-
"graphql-playground-middleware-express": "1.5.8",
51-
"graphql-playground-middleware-lambda": "1.4.3",
49+
"graphql-import": "^0.5.0",
50+
"graphql-playground-middleware-express": "1.6.0",
51+
"graphql-playground-middleware-lambda": "1.5.0",
5252
"graphql-subscriptions": "^0.5.8",
5353
"graphql-tools": "^2.23.1",
54-
"subscriptions-transport-ws": "^0.9.6"
54+
"subscriptions-transport-ws": "^0.9.7"
5555
},
5656
"devDependencies": {
57-
"@types/aws-lambda": "0.0.33",
57+
"@types/aws-lambda": "8.10.0",
5858
"prettier": "1.11.1",
5959
"prettier-check": "2.0.0",
6060
"tslint": "5.9.1",
6161
"tslint-config-prettier": "1.10.0",
6262
"tslint-config-standard": "7.0.0",
63-
"typescript": "2.7.2"
63+
"typescript": "2.8.1"
6464
}
6565
}

src/index.ts

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,15 @@ import {
99
RequestHandlerParams,
1010
} from 'express-serve-static-core'
1111
import * as fs from 'fs'
12-
import { execute, GraphQLSchema, subscribe, DocumentNode, print } from 'graphql'
12+
import {
13+
execute,
14+
GraphQLSchema,
15+
subscribe,
16+
DocumentNode,
17+
print,
18+
GraphQLFieldResolver,
19+
ExecutionResult,
20+
} from 'graphql'
1321
import { importSchema } from 'graphql-import'
1422
import expressPlayground from 'graphql-playground-middleware-express'
1523
import { makeExecutableSchema } from 'graphql-tools'
@@ -27,6 +35,19 @@ export { PubSub, withFilter } from 'graphql-subscriptions'
2735
export { Options }
2836
export { GraphQLServerLambda } from './lambda'
2937

38+
// TODO remove once `@types/graphql` is fixed for `execute`
39+
type ExecuteFunction = (
40+
schema: GraphQLSchema,
41+
document: DocumentNode,
42+
rootValue?: any,
43+
contextValue?: any,
44+
variableValues?: {
45+
[key: string]: any
46+
},
47+
operationName?: string,
48+
fieldResolver?: GraphQLFieldResolver<any, any>,
49+
) => Promise<ExecutionResult> | AsyncIterator<ExecutionResult>
50+
3051
export class GraphQLServer {
3152
express: express.Application
3253
subscriptionServer: SubscriptionServer | null
@@ -250,7 +271,8 @@ export class GraphQLServer {
250271
this.subscriptionServer = SubscriptionServer.create(
251272
{
252273
schema: this.executableSchema,
253-
execute,
274+
// TODO remove once `@types/graphql` is fixed for `execute`
275+
execute: execute as ExecuteFunction,
254276
subscribe,
255277
onConnect: subscriptionServerOptions.onConnect
256278
? subscriptionServerOptions.onConnect

yarn.lock

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
core-js "^2.5.3"
1010
regenerator-runtime "^0.11.1"
1111

12-
"@types/aws-lambda@0.0.33":
13-
version "0.0.33"
14-
resolved "https://registry.yarnpkg.com/@types/aws-lambda/-/aws-lambda-0.0.33.tgz#17083d9c569048792f4f33ef6cd6aaf54d5b22d3"
12+
"@types/aws-lambda@8.10.0":
13+
version "8.10.0"
14+
resolved "https://registry.yarnpkg.com/@types/aws-lambda/-/aws-lambda-8.10.0.tgz#064f6363b534c9a2a71c1818e925298d5c964774"
1515

1616
"@types/body-parser@*":
1717
version "1.16.8"
@@ -48,9 +48,9 @@
4848
"@types/express-serve-static-core" "*"
4949
"@types/serve-static" "*"
5050

51-
"@types/graphql@^0.12.5":
52-
version "0.12.5"
53-
resolved "https://registry.yarnpkg.com/@types/graphql/-/graphql-0.12.5.tgz#24993f51177a8afa2c5d49bed1d8fb6bf8d06ded"
51+
"@types/graphql@^0.13.0":
52+
version "0.13.0"
53+
resolved "https://registry.yarnpkg.com/@types/graphql/-/graphql-0.13.0.tgz#78a33a7f429a06a64714817d9130d578e0f35ecb"
5454

5555
"@types/mime@*":
5656
version "2.0.0"
@@ -96,9 +96,9 @@ ansi-styles@^3.1.0:
9696
dependencies:
9797
color-convert "^1.9.0"
9898

99-
apollo-cache-control@^0.0.x:
100-
version "0.0.7"
101-
resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.0.7.tgz#ffef56413a429a1ce204be5b78d248c4fe3b67ac"
99+
apollo-cache-control@^0.1.0:
100+
version "0.1.0"
101+
resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.1.0.tgz#0c7c9abc312dea3a60e1cb70e0869df2cd970688"
102102
dependencies:
103103
graphql-extensions "^0.0.x"
104104

@@ -110,31 +110,31 @@ apollo-link@^1.2.1:
110110
apollo-utilities "^1.0.0"
111111
zen-observable-ts "^0.8.6"
112112

113-
apollo-server-core@^1.3.2:
114-
version "1.3.2"
115-
resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-1.3.2.tgz#f36855a3ebdc2d77b8b9c454380bf1d706105ffc"
113+
apollo-server-core@^1.3.4:
114+
version "1.3.4"
115+
resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-1.3.4.tgz#06715290b32375236d90701acb42f415ab78497f"
116116
dependencies:
117-
apollo-cache-control "^0.0.x"
117+
apollo-cache-control "^0.1.0"
118118
apollo-tracing "^0.1.0"
119119
graphql-extensions "^0.0.x"
120120

121-
apollo-server-express@^1.3.2:
122-
version "1.3.2"
123-
resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-1.3.2.tgz#0ff8201c0bf362804a151e1399767dae6ab7e309"
121+
apollo-server-express@^1.3.4:
122+
version "1.3.4"
123+
resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-1.3.4.tgz#0ca0d0aa84f4a5489037d834e3c4b619a1a85237"
124124
dependencies:
125-
apollo-server-core "^1.3.2"
126-
apollo-server-module-graphiql "^1.3.0"
125+
apollo-server-core "^1.3.4"
126+
apollo-server-module-graphiql "^1.3.4"
127127

128-
apollo-server-lambda@1.3.2:
129-
version "1.3.2"
130-
resolved "https://registry.yarnpkg.com/apollo-server-lambda/-/apollo-server-lambda-1.3.2.tgz#bcf75f3d7115d11cc9892ad3b17427b3d536df0f"
128+
apollo-server-lambda@1.3.4:
129+
version "1.3.4"
130+
resolved "https://registry.yarnpkg.com/apollo-server-lambda/-/apollo-server-lambda-1.3.4.tgz#fc168891e0034e2884f259b573f6ed208abc2fc2"
131131
dependencies:
132-
apollo-server-core "^1.3.2"
133-
apollo-server-module-graphiql "^1.3.0"
132+
apollo-server-core "^1.3.4"
133+
apollo-server-module-graphiql "^1.3.4"
134134

135-
apollo-server-module-graphiql@^1.3.0:
136-
version "1.3.0"
137-
resolved "https://registry.yarnpkg.com/apollo-server-module-graphiql/-/apollo-server-module-graphiql-1.3.0.tgz#077bb8c7bf292f6128c6c96d59c2096445b084ef"
135+
apollo-server-module-graphiql@^1.3.4:
136+
version "1.3.4"
137+
resolved "https://registry.yarnpkg.com/apollo-server-module-graphiql/-/apollo-server-module-graphiql-1.3.4.tgz#50399b7c51b7267d0c841529f5173e5fc7304de4"
138138

139139
apollo-tracing@^0.1.0:
140140
version "0.1.1"
@@ -551,9 +551,9 @@ graphql-import@^0.4.0:
551551
graphql "^0.12.3"
552552
lodash "^4.17.4"
553553

554-
graphql-import@^0.4.5:
555-
version "0.4.5"
556-
resolved "https://registry.yarnpkg.com/graphql-import/-/graphql-import-0.4.5.tgz#e2f18c28d335733f46df8e0733d8deb1c6e2a645"
554+
graphql-import@^0.5.0:
555+
version "0.5.0"
556+
resolved "https://registry.yarnpkg.com/graphql-import/-/graphql-import-0.5.0.tgz#5f678a6d4636d02a829308884aa1f2fa2197f06d"
557557
dependencies:
558558
lodash "^4.17.4"
559559

@@ -563,15 +563,15 @@ graphql-playground-html@1.5.5:
563563
dependencies:
564564
graphql-config "2.0.0"
565565

566-
graphql-playground-middleware-express@1.5.8:
567-
version "1.5.8"
568-
resolved "https://registry.yarnpkg.com/graphql-playground-middleware-express/-/graphql-playground-middleware-express-1.5.8.tgz#e7d28ad3ec4a5e102be57b76742d83588631365b"
566+
graphql-playground-middleware-express@1.6.0:
567+
version "1.6.0"
568+
resolved "https://registry.yarnpkg.com/graphql-playground-middleware-express/-/graphql-playground-middleware-express-1.6.0.tgz#2a9da3a397ea63573c0186cb7b61f300d45794a0"
569569
dependencies:
570570
graphql-playground-html "1.5.5"
571571

572-
graphql-playground-middleware-lambda@1.4.3:
573-
version "1.4.3"
574-
resolved "https://registry.yarnpkg.com/graphql-playground-middleware-lambda/-/graphql-playground-middleware-lambda-1.4.3.tgz#017ed8124eac7360f676ccc6a23b1e4e24a04c50"
572+
graphql-playground-middleware-lambda@1.5.0:
573+
version "1.5.0"
574+
resolved "https://registry.yarnpkg.com/graphql-playground-middleware-lambda/-/graphql-playground-middleware-lambda-1.5.0.tgz#41a06faf185103660a324257c5293e9f50839fce"
575575
dependencies:
576576
graphql-playground-html "1.5.5"
577577

@@ -990,9 +990,9 @@ strip-eof@^1.0.0:
990990
version "1.0.0"
991991
resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
992992

993-
subscriptions-transport-ws@^0.9.6:
994-
version "0.9.6"
995-
resolved "https://registry.yarnpkg.com/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.6.tgz#5ff86a0746316ca3eb2423b118b8bc74a6793e1b"
993+
subscriptions-transport-ws@^0.9.7:
994+
version "0.9.7"
995+
resolved "https://registry.yarnpkg.com/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.7.tgz#9be456d6e188c96a53c91f570850e59bee5840ac"
996996
dependencies:
997997
backo2 "^1.0.2"
998998
eventemitter3 "^2.0.3"
@@ -1084,9 +1084,9 @@ type-is@~1.6.16:
10841084
media-typer "0.3.0"
10851085
mime-types "~2.1.18"
10861086

1087-
typescript@2.7.2:
1088-
version "2.7.2"
1089-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.7.2.tgz#2d615a1ef4aee4f574425cdff7026edf81919836"
1087+
typescript@2.8.1:
1088+
version "2.8.1"
1089+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.8.1.tgz#6160e4f8f195d5ba81d4876f9c0cc1fbc0820624"
10901090

10911091
ultron@~1.1.0:
10921092
version "1.1.0"

0 commit comments

Comments
 (0)