Merge branch 'master' into codegen

Author: schickling

package.json

@@ -22,8 +22,8 @@
   },
   "devDependencies": {
     "@types/graphql": "0.13.0",
-    "@types/node": "9.6.11",
     "graphql-cli": "^2.16.0-beta.6",
+    "@types/node": "10.0.6",
     "typescript": "2.8.3"
   },
   "repository": {

yarn.lock

@@ -42,9 +42,9 @@
   version "0.13.0"
   resolved "https://registry.yarnpkg.com/@types/graphql/-/graphql-0.13.0.tgz#78a33a7f429a06a64714817d9130d578e0f35ecb"
 
-"@types/node@9.6.11", "@types/node@^9.4.6":
-  version "9.6.11"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.11.tgz#3edd774dbf52aa19b5dca7f9d4b38f719c39167a"
+"@types/node@10.0.6":
+  version "10.0.6"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.0.6.tgz#c0bce8e539bf34c1b850c13ff46bead2fecc2e58"
 
 accepts@~1.3.5:
   version "1.3.5"