Skip to content

Commit

Permalink
fix(warn): Apollo warning fix
Browse files Browse the repository at this point in the history
  • Loading branch information
maticzav committed Apr 21, 2018
1 parent ba7c36f commit 8f02bc0
Show file tree
Hide file tree
Showing 2 changed files with 79 additions and 62 deletions.
134 changes: 73 additions & 61 deletions examples/logging/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,21 @@
"@types/express-serve-static-core" "*"
"@types/serve-static" "*"

"@types/graphql@^0.12.5":
version "0.12.7"
resolved "https://registry.yarnpkg.com/@types/graphql/-/graphql-0.12.7.tgz#392e46d6c1bceb7d68c117233cea787dde72780c"
"@types/graphql@0.12.6":
version "0.12.6"
resolved "https://registry.yarnpkg.com/@types/graphql/-/graphql-0.12.6.tgz#3d619198585fcabe5f4e1adfb5cf5f3388c66c13"

"@types/graphql@^0.13.0":
version "0.13.0"
resolved "https://registry.yarnpkg.com/@types/graphql/-/graphql-0.13.0.tgz#78a33a7f429a06a64714817d9130d578e0f35ecb"

"@types/mime@*":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.0.tgz#5a7306e367c539b9f6543499de8dd519fac37a8b"

"@types/node@*", "@types/node@^9.4.6":
version "9.6.2"
resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.2.tgz#e49ac1adb458835e95ca6487bc20f916b37aff23"
"@types/node@*":
version "9.6.6"
resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.6.tgz#439b91f9caf3983cad2eef1e11f6bedcbf9431d2"

"@types/serve-static@*":
version "1.13.1"
Expand All @@ -72,42 +76,42 @@ accepts@~1.3.5:
negotiator "0.6.1"

apollo-cache-control@^0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.1.0.tgz#0c7c9abc312dea3a60e1cb70e0869df2cd970688"
version "0.1.1"
resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.1.1.tgz#173d14ceb3eb9e7cb53de7eb8b61bee6159d4171"
dependencies:
graphql-extensions "^0.0.x"

apollo-link@^1.2.1:
version "1.2.1"
resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.1.tgz#c120b16059f9bd93401b9f72b94d2f80f3f305d2"
version "1.2.2"
resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.2.tgz#54c84199b18ac1af8d63553a68ca389c05217a03"
dependencies:
"@types/node" "^9.4.6"
"@types/graphql" "0.12.6"
apollo-utilities "^1.0.0"
zen-observable-ts "^0.8.6"
zen-observable-ts "^0.8.9"

apollo-server-core@^1.3.2, apollo-server-core@^1.3.4:
version "1.3.4"
resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-1.3.4.tgz#06715290b32375236d90701acb42f415ab78497f"
apollo-server-core@^1.3.4, apollo-server-core@^1.3.5:
version "1.3.5"
resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-1.3.5.tgz#36da3a6ee52b92fc4bb5710d44ced6b8fafebe2d"
dependencies:
apollo-cache-control "^0.1.0"
apollo-tracing "^0.1.0"
graphql-extensions "^0.0.x"

apollo-server-express@^1.3.2:
version "1.3.4"
resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-1.3.4.tgz#0ca0d0aa84f4a5489037d834e3c4b619a1a85237"
apollo-server-express@^1.3.4:
version "1.3.5"
resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-1.3.5.tgz#7cd010f7921356cd9b832032828aa0add36cb7ed"
dependencies:
apollo-server-core "^1.3.4"
apollo-server-core "^1.3.5"
apollo-server-module-graphiql "^1.3.4"

apollo-server-lambda@1.3.2:
version "1.3.2"
resolved "https://registry.yarnpkg.com/apollo-server-lambda/-/apollo-server-lambda-1.3.2.tgz#bcf75f3d7115d11cc9892ad3b17427b3d536df0f"
apollo-server-lambda@1.3.4:
version "1.3.4"
resolved "https://registry.yarnpkg.com/apollo-server-lambda/-/apollo-server-lambda-1.3.4.tgz#fc168891e0034e2884f259b573f6ed208abc2fc2"
dependencies:
apollo-server-core "^1.3.2"
apollo-server-module-graphiql "^1.3.0"
apollo-server-core "^1.3.4"
apollo-server-module-graphiql "^1.3.4"

apollo-server-module-graphiql@^1.3.0, apollo-server-module-graphiql@^1.3.4:
apollo-server-module-graphiql@^1.3.4:
version "1.3.4"
resolved "https://registry.yarnpkg.com/apollo-server-module-graphiql/-/apollo-server-module-graphiql-1.3.4.tgz#50399b7c51b7267d0c841529f5173e5fc7304de4"

Expand Down Expand Up @@ -152,8 +156,8 @@ aws-lambda@^0.1.2:
dotenv "^0.4.0"

aws-sdk@^*:
version "2.222.1"
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.222.1.tgz#d84c34003bb882d1fec17c41c74cb817bda84914"
version "2.226.1"
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.226.1.tgz#8e6e2b466aaf26cb35714905d5f934e6c8317a99"
dependencies:
buffer "4.9.1"
events "1.1.1"
Expand All @@ -175,8 +179,8 @@ balanced-match@^1.0.0:
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"

base64-js@^1.0.2:
version "1.2.3"
resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.3.tgz#fb13668233d9614cf5fb4bce95a9ba4096cdf801"
version "1.3.0"
resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"

body-parser-graphql@1.0.0:
version "1.0.0"
Expand Down Expand Up @@ -250,8 +254,8 @@ cookie@0.3.1:
resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"

core-js@^2.5.3:
version "2.5.4"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.4.tgz#f2c8bf181f2a80b92f360121429ce63a2f0aeae0"
version "2.5.5"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.5.tgz#b14dde936c640c0579a6b50cabcc132dd6127e3b"

core-util-is@~1.0.0:
version "1.0.2"
Expand Down Expand Up @@ -404,31 +408,39 @@ graphql-extensions@^0.0.x, graphql-extensions@~0.0.9:
core-js "^2.5.3"
source-map-support "^0.5.1"

graphql-import@^0.4.0, graphql-import@^0.4.5:
graphql-import@^0.4.0:
version "0.4.5"
resolved "https://registry.yarnpkg.com/graphql-import/-/graphql-import-0.4.5.tgz#e2f18c28d335733f46df8e0733d8deb1c6e2a645"
dependencies:
lodash "^4.17.4"

graphql-import@^0.5.0:
version "0.5.0"
resolved "https://registry.yarnpkg.com/graphql-import/-/graphql-import-0.5.0.tgz#5f678a6d4636d02a829308884aa1f2fa2197f06d"
dependencies:
lodash "^4.17.4"

graphql-middleware@latest:
version "0.1.1"
resolved "https://registry.yarnpkg.com/graphql-middleware/-/graphql-middleware-0.1.1.tgz#a1fe8d854003832b996f24370cbedf98f98b91f0"
version "1.0.1"
resolved "https://registry.yarnpkg.com/graphql-middleware/-/graphql-middleware-1.0.1.tgz#e7a3d784bc2fb708bebfa9ca505aedbc3e27fdec"
dependencies:
graphql-tools "^2.23.1"

graphql-playground-html@1.5.5:
version "1.5.5"
resolved "https://registry.yarnpkg.com/graphql-playground-html/-/graphql-playground-html-1.5.5.tgz#e2aca543eb66b435ead495b45244b2604d6b2d48"
dependencies:
graphql-config "2.0.0"

graphql-playground-middleware-express@1.5.7:
version "1.5.7"
resolved "https://registry.yarnpkg.com/graphql-playground-middleware-express/-/graphql-playground-middleware-express-1.5.7.tgz#a07418791d9f3728b2bda18fc2c6edcaf997cc93"
graphql-playground-middleware-express@1.6.1:
version "1.6.1"
resolved "https://registry.yarnpkg.com/graphql-playground-middleware-express/-/graphql-playground-middleware-express-1.6.1.tgz#d6287d124a1c55845a52a7d727c371da99cdf0b0"
dependencies:
graphql-playground-html "1.5.5"

graphql-playground-middleware-lambda@1.4.3:
version "1.4.3"
resolved "https://registry.yarnpkg.com/graphql-playground-middleware-lambda/-/graphql-playground-middleware-lambda-1.4.3.tgz#017ed8124eac7360f676ccc6a23b1e4e24a04c50"
graphql-playground-middleware-lambda@1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/graphql-playground-middleware-lambda/-/graphql-playground-middleware-lambda-1.5.0.tgz#41a06faf185103660a324257c5293e9f50839fce"
dependencies:
graphql-playground-html "1.5.5"

Expand All @@ -445,8 +457,8 @@ graphql-subscriptions@^0.5.8:
iterall "^1.2.1"

graphql-tools@^2.23.1:
version "2.23.1"
resolved "https://registry.yarnpkg.com/graphql-tools/-/graphql-tools-2.23.1.tgz#23f43000e2b9dc5a89920fe846fc5f71a320efdb"
version "2.24.0"
resolved "https://registry.yarnpkg.com/graphql-tools/-/graphql-tools-2.24.0.tgz#bbacaad03924012a0edb8735a5e65df5d5563675"
dependencies:
apollo-link "^1.2.1"
apollo-utilities "^1.0.1"
Expand All @@ -455,27 +467,27 @@ graphql-tools@^2.23.1:
uuid "^3.1.0"

graphql-yoga@latest:
version "1.8.0"
resolved "https://registry.yarnpkg.com/graphql-yoga/-/graphql-yoga-1.8.0.tgz#53128012363736775dc94cc8dae78bdac9b6a620"
version "1.8.5"
resolved "https://registry.yarnpkg.com/graphql-yoga/-/graphql-yoga-1.8.5.tgz#e06c77fbfd6a186afeaf21baf9617bdf8636d502"
dependencies:
"@types/cors" "^2.8.3"
"@types/express" "^4.11.1"
"@types/graphql" "^0.12.5"
"@types/graphql" "^0.13.0"
"@types/zen-observable" "^0.5.3"
apollo-server-express "^1.3.2"
apollo-server-lambda "1.3.2"
apollo-server-express "^1.3.4"
apollo-server-lambda "1.3.4"
apollo-upload-server "^5.0.0"
aws-lambda "^0.1.2"
body-parser-graphql "1.0.0"
cors "^2.8.4"
express "^4.16.3"
graphql "^0.11.0 || ^0.12.0 || ^0.13.0"
graphql-import "^0.4.5"
graphql-playground-middleware-express "1.5.7"
graphql-playground-middleware-lambda "1.4.3"
graphql-import "^0.5.0"
graphql-playground-middleware-express "1.6.1"
graphql-playground-middleware-lambda "1.5.0"
graphql-subscriptions "^0.5.8"
graphql-tools "^2.23.1"
subscriptions-transport-ws "^0.9.6"
subscriptions-transport-ws "^0.9.7"

"graphql@^0.11.0 || ^0.12.0 || ^0.13.0":
version "0.13.2"
Expand Down Expand Up @@ -748,9 +760,9 @@ string_decoder@~0.10.x:
version "0.10.31"
resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"

subscriptions-transport-ws@^0.9.6:
version "0.9.7"
resolved "https://registry.yarnpkg.com/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.7.tgz#9be456d6e188c96a53c91f570850e59bee5840ac"
subscriptions-transport-ws@^0.9.7:
version "0.9.8"
resolved "https://registry.yarnpkg.com/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.8.tgz#3a26ab96e06f78cf4ace8d083f6227fa55970947"
dependencies:
backo2 "^1.0.2"
eventemitter3 "^2.0.3"
Expand Down Expand Up @@ -828,12 +840,12 @@ xmlbuilder@4.2.1, xmlbuilder@^4.1.0:
dependencies:
lodash "^4.0.0"

zen-observable-ts@^0.8.6:
version "0.8.8"
resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.8.tgz#1a586dc204fa5632a88057f879500e0d2ba06869"
zen-observable-ts@^0.8.9:
version "0.8.9"
resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.9.tgz#d3c97af08c0afdca37ebcadf7cc3ee96bda9bab1"
dependencies:
zen-observable "^0.7.0"
zen-observable "^0.8.0"

zen-observable@^0.7.0:
version "0.7.1"
resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.7.1.tgz#f84075c0ee085594d3566e1d6454207f126411b3"
zen-observable@^0.8.0:
version "0.8.8"
resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.8.tgz#1ea93995bf098754a58215a1e0a7309e5749ec42"
7 changes: 6 additions & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,12 @@ function addMiddlewareToSchema(
): GraphQLSchema {
const resolvers = generateResolverFromSchemaAndMiddleware(schema, middleware)

addResolveFunctionsToSchema(schema, resolvers)
addResolveFunctionsToSchema(schema, resolvers, {
allowResolversNotInSchema: false,
requireResolversForAllFields: false,
requireResolversForArgs: false,
requireResolversForNonScalar: false,
})

return schema
}
Expand Down

0 comments on commit 8f02bc0

Please sign in to comment.