From b5a3154607895604b52be694dc91ffc260c4ea1d Mon Sep 17 00:00:00 2001 From: Barry Low Date: Wed, 17 Oct 2018 22:19:47 -0700 Subject: [PATCH] Enable production introspection --- api/docker-compose.api.yml | 2 +- api/docker-compose.imagetest.yml | 4 +- api/package-lock.json | 335 ++++--------------------------- api/package.json | 5 +- api/src/ApolloServer.js | 1 + 5 files changed, 49 insertions(+), 298 deletions(-) diff --git a/api/docker-compose.api.yml b/api/docker-compose.api.yml index b13d67414..e670a0b68 100644 --- a/api/docker-compose.api.yml +++ b/api/docker-compose.api.yml @@ -1,7 +1,7 @@ version: '3' services: node: - image: advancedalgosteamsmodule/teammodule-api:v8 + image: advancedalgosteamsmodule/teammodule-api:v9 env_file: ./.env.prod container_name: aateamapi tty: true diff --git a/api/docker-compose.imagetest.yml b/api/docker-compose.imagetest.yml index c3cf6b98d..39f16113e 100644 --- a/api/docker-compose.imagetest.yml +++ b/api/docker-compose.imagetest.yml @@ -1,7 +1,7 @@ version: '3' services: api: - image: advancedalgosteamsmodule/teammodule-api:v8 + image: advancedalgosteamsmodule/teammodule-api:v9 env_file: ./.env.prod container_name: aateamapi-imagetest tty: true @@ -11,6 +11,6 @@ services: - /var/www/app/node_modules working_dir: /var/www/app restart: always - command: node -r dotenv/config src/index.js + command: node --require @babel/register --require dotenv/config src/index.js ports: - "4001:4001" diff --git a/api/package-lock.json b/api/package-lock.json index 9cd7c5913..7875d82ce 100644 --- a/api/package-lock.json +++ b/api/package-lock.json @@ -964,14 +964,6 @@ "source-map-support": "^0.5.9" } }, - "@babel/runtime": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.1.2.tgz", - "integrity": "sha512-Y3SCjmhSupzFB6wcv1KmmFucH6gDVnI30WjOcicV10ju0cZjak3Jcs67YLIXBrmZYw1xCrVeJPbycFwrqNyxpg==", - "requires": { - "regenerator-runtime": "^0.12.0" - } - }, "@babel/runtime-corejs2": { "version": "7.1.2", "resolved": "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.1.2.tgz", @@ -1321,11 +1313,6 @@ "resolved": "http://registry.npmjs.org/@types/graphql/-/graphql-0.12.6.tgz", "integrity": "sha512-wXAVyLfkG1UMkKOdMijVWFky39+OD/41KftzqfX1Oejd0Gm6dOIKjCihSVECg6X7PHjftxXmfOKA/d1H79ZfvQ==" }, - "@types/graphql-deduplicator": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@types/graphql-deduplicator/-/graphql-deduplicator-2.0.0.tgz", - "integrity": "sha512-swUwj5hWF1yFzbUXStLJrUa0ksAt11B8+SwhsAjQAX0LYJ1LLioAyuDcJ9bovWbsNzIXJYXLvljSPQw8nR728w==" - }, "@types/jest": { "version": "23.3.5", "resolved": "https://registry.npmjs.org/@types/jest/-/jest-23.3.5.tgz", @@ -1390,11 +1377,6 @@ "@types/node": "*" } }, - "@types/zen-observable": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/@types/zen-observable/-/zen-observable-0.5.4.tgz", - "integrity": "sha512-sW6xN96wUak4tgc89d0tbTg7QDGYhGv5hvQIS6h4mRCd8h2btiZ80loPU8cyLwsBbA4ZeQt0FjvUhJ4rNhdsGg==" - }, "abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", @@ -1483,14 +1465,6 @@ "normalize-path": "^2.1.1" } }, - "apollo-cache-control": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.1.1.tgz", - "integrity": "sha512-XJQs167e9u+e5ybSi51nGYr70NPBbswdvTEHtbtXbwkZ+n9t0SLPvUcoqceayOSwjK1XYOdU/EKPawNdb3rLQA==", - "requires": { - "graphql-extensions": "^0.0.x" - } - }, "apollo-codegen": { "version": "0.19.1", "resolved": "https://registry.npmjs.org/apollo-codegen/-/apollo-codegen-0.19.1.tgz", @@ -1644,7 +1618,7 @@ }, "apollo-link-error": { "version": "1.0.9", - "resolved": "https://registry.npmjs.org/apollo-link-error/-/apollo-link-error-1.0.9.tgz", + "resolved": "http://registry.npmjs.org/apollo-link-error/-/apollo-link-error-1.0.9.tgz", "integrity": "sha512-82qgIH0UC039kcvcFDJkY8GuUOgPFrkYe/0zNFkA0AXvuvL4RHxWb8SWRiPwtP8jKaKEOedyjopfyH84aLiu7Q==", "requires": { "apollo-link": "^1.2.2" @@ -1652,7 +1626,7 @@ }, "apollo-link-ws": { "version": "1.0.8", - "resolved": "https://registry.npmjs.org/apollo-link-ws/-/apollo-link-ws-1.0.8.tgz", + "resolved": "http://registry.npmjs.org/apollo-link-ws/-/apollo-link-ws-1.0.8.tgz", "integrity": "sha512-ucuGvr8CBBwCHl/Rbtyuv9Fn0FN5Qoyvy84KHtuMl2Uux2Sq+jt3bUum+pZ+hZntEd9k8M1OjrrXqRJ4PtEpyA==", "requires": { "apollo-link": "^1.2.2" @@ -1677,16 +1651,6 @@ } } }, - "apollo-server-core": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-1.4.0.tgz", - "integrity": "sha512-BP1Vh39krgEjkQxbjTdBURUjLHbFq1zeOChDJgaRsMxGtlhzuLWwwC6lLdPatN8jEPbeHq8Tndp9QZ3iQZOKKA==", - "requires": { - "apollo-cache-control": "^0.1.0", - "apollo-tracing": "^0.1.0", - "graphql-extensions": "^0.0.x" - } - }, "apollo-server-env": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.0.3.tgz", @@ -1793,38 +1757,6 @@ } } }, - "apollo-server-lambda": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/apollo-server-lambda/-/apollo-server-lambda-1.3.6.tgz", - "integrity": "sha1-varDfxQ8Z5jkC4rnVYC6ZzzqJg4=", - "requires": { - "apollo-server-core": "^1.3.6", - "apollo-server-module-graphiql": "^1.3.4" - } - }, - "apollo-server-module-graphiql": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/apollo-server-module-graphiql/-/apollo-server-module-graphiql-1.4.0.tgz", - "integrity": "sha512-GmkOcb5he2x5gat+TuiTvabnBf1m4jzdecal3XbXBh/Jg+kx4hcvO3TTDFQ9CuTprtzdcVyA11iqG7iOMOt7vA==" - }, - "apollo-tracing": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.1.4.tgz", - "integrity": "sha512-Uv+1nh5AsNmC3m130i2u3IqbS+nrxyVV3KYimH5QKsdPjxxIQB3JAT+jJmpeDxBel8gDVstNmCh82QSLxLSIdQ==", - "requires": { - "graphql-extensions": "~0.0.9" - } - }, - "apollo-upload-server": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/apollo-upload-server/-/apollo-upload-server-5.0.0.tgz", - "integrity": "sha512-CzbHvMo/6TO5XrovzmV/ojTft17s9Cd+vKLGngChpB0UW1ObxKlNLlcXRLD+yt6Nec32/Kt209HmA31hnwxB/g==", - "requires": { - "@babel/runtime": "^7.0.0-beta.40", - "busboy": "^0.2.14", - "object-path": "^0.11.4" - } - }, "apollo-utilities": { "version": "1.0.20", "resolved": "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.0.20.tgz", @@ -1878,6 +1810,7 @@ "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dev": true, "requires": { "sprintf-js": "~1.0.2" } @@ -2002,46 +1935,6 @@ "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==" }, - "aws-lambda": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/aws-lambda/-/aws-lambda-0.1.2.tgz", - "integrity": "sha1-GbFYUHXfMWeVl7l2pfHe9h8SzO4=", - "requires": { - "aws-sdk": "^*", - "commander": "^2.5.0", - "dotenv": "^0.4.0" - }, - "dependencies": { - "dotenv": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-0.4.0.tgz", - "integrity": "sha1-9vs1E2PC2SIHJFxzeALJq1rhSVo=" - } - } - }, - "aws-sdk": { - "version": "2.337.0", - "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.337.0.tgz", - "integrity": "sha512-Oqi7OQOxweQXNnbK6m3ealq/pjXPWgFI9adJ2Gls2343RtqUTHAr776dULHjFe5IrLdHjm2avlL7FgDuNVD3FQ==", - "requires": { - "buffer": "4.9.1", - "events": "1.1.1", - "ieee754": "1.1.8", - "jmespath": "0.15.0", - "querystring": "0.2.0", - "sax": "1.2.1", - "url": "0.10.3", - "uuid": "3.1.0", - "xml2js": "0.4.19" - }, - "dependencies": { - "uuid": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz", - "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==" - } - } - }, "aws-sign2": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", @@ -2142,7 +2035,8 @@ "base64-js": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz", - "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==" + "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==", + "dev": true }, "bcrypt-pbkdf": { "version": "1.0.2", @@ -2238,14 +2132,6 @@ } } }, - "body-parser-graphql": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/body-parser-graphql/-/body-parser-graphql-1.1.0.tgz", - "integrity": "sha512-bOBF4n1AnUjcY1SzLeibeIx4XOuYqEkjn/Lm4yKhnN6KedoXMv4hVqgcKHGRnxOMJP64tErqrQU+4cihhpbJXg==", - "requires": { - "body-parser": "^1.18.2" - } - }, "boxen": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz", @@ -2306,23 +2192,6 @@ "node-releases": "^1.0.0-alpha.14" } }, - "buffer": { - "version": "4.9.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", - "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", - "requires": { - "base64-js": "^1.0.2", - "ieee754": "^1.1.4", - "isarray": "^1.0.0" - }, - "dependencies": { - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" - } - } - }, "buffer-alloc": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz", @@ -3576,7 +3445,8 @@ "esprima": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "dev": true }, "esutils": { "version": "2.0.2", @@ -3607,11 +3477,6 @@ "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz", "integrity": "sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==" }, - "events": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz", - "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=" - }, "execa": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", @@ -5012,14 +4877,15 @@ "version": "0.13.2", "resolved": "http://registry.npmjs.org/graphql/-/graphql-0.13.2.tgz", "integrity": "sha512-QZ5BL8ZO/B20VA8APauGBg3GyEgZ19eduvpLWoq5x7gMmWnHoy8rlQWPLmWgFvo1yNgjSEFMesmS4R6pPr7xog==", + "dev": true, "requires": { "iterall": "^1.2.1" } }, "graphql-binding": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/graphql-binding/-/graphql-binding-2.2.2.tgz", - "integrity": "sha512-xPT3iBlAgK6NiwjL02/z/j6LRkh0mUzbc5n25Kic4Ayf/CP0ea2IpKIAJEd8Rr3T+47RowcppmtBzKhFDGZEdA==", + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/graphql-binding/-/graphql-binding-2.2.5.tgz", + "integrity": "sha512-fCcX4sOgM7/8+xdBGElIPURlFXq1bT+ri07NAmKJ4WLUqrsFVTdskqv3b1femiV1e4qEYEh71tYixi5c3cea1Q==", "requires": { "graphql-import": "^0.5.2", "graphql-tools": "3.1.0", @@ -5259,6 +5125,7 @@ "version": "2.2.1", "resolved": "https://registry.npmjs.org/graphql-config/-/graphql-config-2.2.1.tgz", "integrity": "sha512-U8+1IAhw9m6WkZRRcyj8ZarK96R6lQBQ0an4lp76Ps9FyhOXENC5YQOxOFGm5CxPrX2rD0g3Je4zG5xdNJjwzQ==", + "dev": true, "requires": { "graphql-import": "^0.7.1", "graphql-request": "^1.5.0", @@ -5271,6 +5138,7 @@ "version": "0.7.1", "resolved": "https://registry.npmjs.org/graphql-import/-/graphql-import-0.7.1.tgz", "integrity": "sha512-YpwpaPjRUVlw2SN3OPljpWbVRWAhMAyfSba5U47qGMOSsPLi2gYeJtngGpymjm9nk57RFWEpjqwh4+dpYuFAPw==", + "dev": true, "requires": { "lodash": "^4.17.4", "resolve-from": "^4.0.0" @@ -5279,7 +5147,8 @@ "resolve-from": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==" + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true } } }, @@ -5385,26 +5254,13 @@ } } }, - "graphql-deduplicator": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/graphql-deduplicator/-/graphql-deduplicator-2.0.1.tgz", - "integrity": "sha512-up9Bli3LEki/INLf+KyknHHf9mFKWjZBMIarfdI2YKvfWQPLsG4i2KwMCienzXoXmgbLx47aKVaUB5fswRNR2g==" - }, - "graphql-extensions": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.0.10.tgz", - "integrity": "sha512-TnQueqUDCYzOSrpQb3q1ngDSP2otJSF+9yNLrQGPzkMsvnQ+v6e2d5tl+B35D4y+XpmvVnAn4T3ZK28mkILveA==", - "requires": { - "core-js": "^2.5.3", - "source-map-support": "^0.5.1" - } - }, "graphql-import": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/graphql-import/-/graphql-import-0.6.0.tgz", - "integrity": "sha512-S6Aj4pTzehCwyh7hKUKlWLgE6soDdW/T6JPePC16exzFDNdZHXRj7lqv75yMWJCkBY0pBtWicMLinb4ni6QRyg==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/graphql-import/-/graphql-import-0.7.1.tgz", + "integrity": "sha512-YpwpaPjRUVlw2SN3OPljpWbVRWAhMAyfSba5U47qGMOSsPLi2gYeJtngGpymjm9nk57RFWEpjqwh4+dpYuFAPw==", "requires": { - "lodash": "^4.17.4" + "lodash": "^4.17.4", + "resolve-from": "^4.0.0" } }, "graphql-middleware": { @@ -5419,6 +5275,7 @@ "version": "1.6.4", "resolved": "https://registry.npmjs.org/graphql-playground-html/-/graphql-playground-html-1.6.4.tgz", "integrity": "sha512-mnpAVYSR3TesYsJ5OLJVJMA0muTCw4npsCI1cKMtW35lbA6KljZkLkz3ZWXhEIYPnHKIeUHEtbn1ZGkEXtAxLg==", + "dev": true, "requires": { "graphql-config": "2.2.1" } @@ -5427,14 +5284,7 @@ "version": "1.7.6", "resolved": "https://registry.npmjs.org/graphql-playground-middleware-express/-/graphql-playground-middleware-express-1.7.6.tgz", "integrity": "sha512-fICPxYGIdhCxtFlwCnP3uZ2uRWeQ9wj7OkcWUiHNwaFma2TbRD5nNKaPA2u21YWha9xv26qIDxxcdW27F/lcbQ==", - "requires": { - "graphql-playground-html": "1.6.4" - } - }, - "graphql-playground-middleware-lambda": { - "version": "1.7.6", - "resolved": "https://registry.npmjs.org/graphql-playground-middleware-lambda/-/graphql-playground-middleware-lambda-1.7.6.tgz", - "integrity": "sha512-C4XYi32UTwP4YpHBgK9hiuxGBULiNFTu7qeFjHGWoXQIg/lioydyKnd3hVWB06QRUoHWLQj/pAI9ay3bdzCx3w==", + "dev": true, "requires": { "graphql-playground-html": "1.6.4" } @@ -5443,6 +5293,7 @@ "version": "1.8.2", "resolved": "https://registry.npmjs.org/graphql-request/-/graphql-request-1.8.2.tgz", "integrity": "sha512-dDX2M+VMsxXFCmUX0Vo0TopIZIX4ggzOtiCsThgtrKR4niiaagsGTDIHj3fsOMFETpa064vzovI+4YV4QnMbcg==", + "dev": true, "requires": { "cross-fetch": "2.2.2" } @@ -5516,92 +5367,6 @@ } } }, - "graphql-yoga": { - "version": "1.16.4", - "resolved": "https://registry.npmjs.org/graphql-yoga/-/graphql-yoga-1.16.4.tgz", - "integrity": "sha512-1c6S+qA3q3TNrh4LXd9ssdxTv8uviYE9g+0JdZifcfOvzpu+tnzX9RDN0IXFY2LPElKS8bZGzROVylTvad/4jg==", - "requires": { - "@types/cors": "^2.8.4", - "@types/express": "^4.11.1", - "@types/graphql": "^0.13.0", - "@types/graphql-deduplicator": "^2.0.0", - "@types/zen-observable": "^0.5.3", - "apollo-server-express": "^1.3.6", - "apollo-server-lambda": "1.3.6", - "apollo-upload-server": "^5.0.0", - "aws-lambda": "^0.1.2", - "body-parser-graphql": "1.1.0", - "cors": "^2.8.4", - "express": "^4.16.3", - "graphql": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0", - "graphql-deduplicator": "^2.0.1", - "graphql-import": "^0.7.0", - "graphql-middleware": "1.6.6", - "graphql-playground-middleware-express": "1.7.6", - "graphql-playground-middleware-lambda": "1.7.6", - "graphql-subscriptions": "^0.5.8", - "graphql-tools": "^3.0.0", - "subscriptions-transport-ws": "^0.9.8" - }, - "dependencies": { - "@types/graphql": { - "version": "0.13.4", - "resolved": "https://registry.npmjs.org/@types/graphql/-/graphql-0.13.4.tgz", - "integrity": "sha512-B4yel4ro2nTb3v0pYO8vO6SjgvFJSrwUY+IO6TUSLdOSB+gQFslylrhRCHxvXMIhxB71mv5PEE9dAX+24S8sew==" - }, - "apollo-server-express": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-1.4.0.tgz", - "integrity": "sha512-zkH00nxhLnJfO0HgnNPBTfZw8qI5ILaPZ5TecMCI9+Y9Ssr2b0bFr9pBRsXy9eudPhI+/O4yqegSUsnLdF/CPw==", - "requires": { - "apollo-server-core": "^1.4.0", - "apollo-server-module-graphiql": "^1.4.0" - } - }, - "graphql-import": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/graphql-import/-/graphql-import-0.7.1.tgz", - "integrity": "sha512-YpwpaPjRUVlw2SN3OPljpWbVRWAhMAyfSba5U47qGMOSsPLi2gYeJtngGpymjm9nk57RFWEpjqwh4+dpYuFAPw==", - "requires": { - "lodash": "^4.17.4", - "resolve-from": "^4.0.0" - } - }, - "graphql-middleware": { - "version": "1.6.6", - "resolved": "https://registry.npmjs.org/graphql-middleware/-/graphql-middleware-1.6.6.tgz", - "integrity": "sha512-1rSSPEJOhBMwNCBCp5CCh3YZFvo8qN/pzQM8k50pd/w2hBsBvOx0AVU9Or6JQbTXxYrKFXvKFUxC5Lp+2oeUtw==", - "requires": { - "graphql-tools": "^3.0.5" - } - }, - "graphql-subscriptions": { - "version": "0.5.8", - "resolved": "http://registry.npmjs.org/graphql-subscriptions/-/graphql-subscriptions-0.5.8.tgz", - "integrity": "sha512-0CaZnXKBw2pwnIbvmVckby5Ge5e2ecmjofhYCdyeACbCly2j3WXDP/pl+s+Dqd2GQFC7y99NB+53jrt55CKxYQ==", - "requires": { - "iterall": "^1.2.1" - } - }, - "graphql-tools": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/graphql-tools/-/graphql-tools-3.1.1.tgz", - "integrity": "sha512-yHvPkweUB0+Q/GWH5wIG60bpt8CTwBklCSzQdEHmRUgAdEQKxw+9B7zB3dG7wB3Ym7M7lfrS4Ej+jtDZfA2UXg==", - "requires": { - "apollo-link": "^1.2.2", - "apollo-utilities": "^1.0.1", - "deprecated-decorator": "^0.1.6", - "iterall": "^1.1.3", - "uuid": "^3.1.0" - } - }, - "resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==" - } - } - }, "har-schema": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", @@ -5824,7 +5589,8 @@ "ieee754": { "version": "1.1.8", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz", - "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=" + "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=", + "dev": true }, "ignore-by-default": { "version": "1.0.1", @@ -6270,11 +6036,6 @@ "resolved": "https://registry.npmjs.org/iterall/-/iterall-1.2.2.tgz", "integrity": "sha512-yynBb1g+RFUPY64fTrFv7nsjRrENBQJaX2UL+2Szc9REFrSNm1rpSXHGzhmAy7a9uv3vlvgBlXnf9RqmPH1/DA==" }, - "jmespath": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz", - "integrity": "sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc=" - }, "js-base64": { "version": "2.4.9", "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.9.tgz", @@ -6295,6 +6056,7 @@ "version": "3.12.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz", "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==", + "dev": true, "requires": { "argparse": "^1.0.7", "esprima": "^4.0.0" @@ -8073,15 +7835,15 @@ } }, "prisma-binding": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/prisma-binding/-/prisma-binding-2.1.4.tgz", - "integrity": "sha512-ypP+Ss+HtIaBTUMtsm4aHjCvKWKs2m95o97Z8iRr273NBcwuNNXwDuuOVsVzaOEYcH4I4EwJ/SxZlq0+5L/LxA==", + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/prisma-binding/-/prisma-binding-2.1.6.tgz", + "integrity": "sha512-hnDjDFNRKqzmxu4E7uFFxOhH5Kpifk45m7F6bYdxMVaGUOxDdvJ+FLZDSvRqrgxa1O4w0jQyDAJaeoMRX3M3iw==", "requires": { "apollo-link": "1.2.2", "apollo-link-error": "1.0.9", "apollo-link-ws": "1.0.8", "cross-fetch": "2.1.1", - "graphql-binding": "2.2.2", + "graphql-binding": "2.2.5", "graphql-import": "0.5.2", "graphql-tools": "3.1.0", "http-link-dataloader": "^0.1.2", @@ -8126,7 +7888,7 @@ }, "jsonwebtoken": { "version": "8.2.1", - "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.2.1.tgz", + "resolved": "http://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.2.1.tgz", "integrity": "sha512-l8rUBr0fqYYwPc8/ZGrue7GiW7vWdZtZqelxo4Sd5lMvuEeCK8/wS54sEo6tJhdZ6hqfutsj6COgC0d1XdbHGw==", "requires": { "jws": "^3.1.4", @@ -8917,21 +8679,11 @@ "ps-tree": "^1.1.0" } }, - "punycode": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", - "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=" - }, "qs": { "version": "6.5.2", "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==" }, - "querystring": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", - "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=" - }, "randomatic": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.0.tgz", @@ -9304,6 +9056,13 @@ "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", "requires": { "resolve-from": "^3.0.0" + }, + "dependencies": { + "resolve-from": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", + "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=" + } } }, "resolve-dir": { @@ -9317,9 +9076,9 @@ } }, "resolve-from": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", - "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=" + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==" }, "resolve-url": { "version": "0.2.1", @@ -9877,7 +9636,8 @@ "sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", + "dev": true }, "sshpk": { "version": "1.14.2", @@ -10681,15 +10441,6 @@ "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=" }, - "url": { - "version": "0.10.3", - "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz", - "integrity": "sha1-Ah5NnHcF8hu/N9A861h2dAJ3TGQ=", - "requires": { - "punycode": "1.3.2", - "querystring": "0.2.0" - } - }, "url-join": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.0.tgz", diff --git a/api/package.json b/api/package.json index 322ea1497..6e4a74f8c 100644 --- a/api/package.json +++ b/api/package.json @@ -22,17 +22,16 @@ "express": "^4.16.4", "express-jwt": "^5.3.1", "fast-xml-parser": "^3.12.5", - "graphql-import": "^0.6.0", + "graphql-import": "^0.7.1", "graphql-middleware": "^1.7.7", "graphql-subscriptions": "^1.0.0", "graphql-tag": "^2.10.0", "graphql-tools": "^4.0.1", - "graphql-yoga": "^1.16.4", "jsonwebtoken": "^8.3.0", "jwks-rsa": "^1.3.0", "lodash.get": "^4.4.2", "nodemon": "^1.18.4", - "prisma-binding": "2.1.4", + "prisma-binding": "^2.1.6", "winston": "^3.1.0" }, "devDependencies": { diff --git a/api/src/ApolloServer.js b/api/src/ApolloServer.js index 3677505c6..6130a0432 100644 --- a/api/src/ApolloServer.js +++ b/api/src/ApolloServer.js @@ -52,6 +52,7 @@ export default function createApolloServer( schema: applyGraphQLMiddleware(schema, ...graphqlMiddlewares), tracing: true, cacheControl: true, + introspection: true, engine: engineKey ? { apiKey: engineKey } : false, dataSources, // Resolvers context in POST requests