Merge branch 'beta'

Author: mavilein

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "prisma-query"]
-	path = server/prisma-rs/libs/prisma-query
-	url = https://github.com/prisma/prisma-query.git
 [submodule "server/.buildkite/build-cli"]
 	path = server/.buildkite/build-cli
 	url = https://github.com/prisma/build-cli.git

cli/packages/prisma-cli-core/package.json

@@ -11,7 +11,7 @@
   "devDependencies": {
     "@types/aws-lambda": "^0.0.17",
     "@types/fs-extra": "^5.0.0",
-    "@types/graphql": "14.0.3",
+    "@types/graphql": "14.2.0",
     "@types/node": "^8.0.22",
     "@types/semver": "^5.5.0",
     "faker": "^4.1.0",
@@ -89,7 +89,7 @@
     "figures": "^2.0.0",
     "fs-extra": "^7.0.0",
     "globby": "^8.0.1",
-    "graphql": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0",
+    "graphql": "^14.3.0",
     "graphql-config": "2.2.1",
     "graphql-config-extension-prisma": "0.2.5",
     "graphql-playground-middleware-express": "^1.6.2",

cli/packages/prisma-cli-engine/package.json

@@ -78,12 +78,11 @@
     "chalk": "^2.3.0",
     "charm": "^1.0.2",
     "debug": "^3.1.0",
-    "graphql": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0",
     "directory-tree": "2.2.1",
     "figures": "^2.0.0",
     "find-up": "^3.0.0",
     "fs-extra": "^7.0.0",
-    "graphql": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0",
+    "graphql": "^14.3.0",
     "graphql-request": "^1.5.0",
     "inquirer": "^6.2.0",
     "isomorphic-fetch": "^2.2.1",

cli/packages/prisma-cli-engine/src/StatusChecker.ts

@@ -178,7 +178,7 @@ export function getFid() {
     return fidCache
   }
   const mac = getMac()
-  const fidSecret = 'yeiB6sooy6eedahgooj0shiez'
+  const fidSecret = 'AhTheeR7Pee0haebui1viemoe'
   const fid = mac
     ? crypto
         .createHmac('sha256', fidSecret)

cli/packages/prisma-client-lib/package.json

@@ -38,10 +38,10 @@
     "zen-observable": "^0.8.10"
   },
   "devDependencies": {
-    "@types/graphql": "14.0.3",
+    "@types/graphql": "14.2.0",
     "@types/prettier": "1.16.1",
     "ava": "^0.25.0",
-    "graphql": "^14.0.2",
+    "graphql": "^14.3.0",
     "semantic-release": "^15.10.4",
     "tslint": "5.11.0",
     "tslint-config-standard": "8.0.1",

cli/packages/prisma-client-lib/src/utils/index.ts

@@ -13,6 +13,8 @@ import {
   GraphQLResolveInfo,
   GraphQLOutputType,
   print,
+  Kind,
+  ASTNode,
 } from 'graphql'
 
 import { Operation } from '../types'
@@ -77,13 +79,13 @@ export function printDocumentFromInfo(info: GraphQLResolveInfo) {
   const fragments = Object.keys(info.fragments).map(
     fragment => info.fragments[fragment],
   )
-  const doc = {
-    kind: 'Document',
+  const doc: ASTNode = {
+    kind: Kind.DOCUMENT,
     definitions: [
       {
-        kind: 'OperationDefinition',
+        kind: Kind.OPERATION_DEFINITION,
         operation: 'query',
-        selectionSet: info.fieldNodes[0].selectionSet,
+        selectionSet: info.fieldNodes[0].selectionSet!,
       },
       ...fragments,
     ],

cli/packages/prisma-datamodel/package.json

@@ -23,7 +23,7 @@
     "typescript": "^3.2.2"
   },
   "dependencies": {
-    "graphql": "^14.0.2",
+    "graphql": "^14.3.0",
     "pluralize": "^7.0.0",
     "popsicle": "10"
   },

cli/packages/prisma-generate-schema/package.json

@@ -24,7 +24,7 @@
     "typescript": "^3.2.2"
   },
   "dependencies": {
-    "graphql": "^14.0.2",
+    "graphql": "^14.3.0",
     "pluralize": "^7.0.0",
     "popsicle": "10",
     "prisma-datamodel": "1.23.0-alpha.1"

cli/scripts/test.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e
+set -ex
 
 cd cli/packages/prisma-datamodel
 yarn

cli/scripts/test_ci.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e
+set -ex
 
 #
 # Detect change