diff --git a/package.json b/package.json index 10b6368..20ae0ce 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "dependencies": { "@google-cloud/storage": "^2.4.2", "accesscontrol": "^2.2.1", - "apollo-server-koa": "^2.9.16", + "apollo-server-koa": "^2.14.2", "axios": "^0.18.0", "config": "^3.0.1", "connect-redis": "^3.4.0", diff --git a/yarn.lock b/yarn.lock index aefe1fc..d5816fd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1101,10 +1101,10 @@ resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-2.3.6.tgz#c880579e087d7a0db13777ff8af689f4ffc7b0d5" integrity sha512-wHNBMnkoEBiRAd3s8KTKwIuO9biFtTf0LehITzBhSco+HQI0xkXZbLOD55SW3Aqw3oUkHstkm5SPv58yaAdFPQ== -"@types/ws@^6.0.0": - version "6.0.4" - resolved "https://registry.yarnpkg.com/@types/ws/-/ws-6.0.4.tgz#7797707c8acce8f76d8c34b370d4645b70421ff1" - integrity sha512-PpPrX7SZW9re6+Ha8ojZG4Se8AZXgf0GK6zmfqEuCsY49LFDNXO3SByp44X3dFEqtB73lkCDAdUazhAjVPiNwg== +"@types/ws@^7.0.0": + version "7.2.5" + resolved "https://registry.yarnpkg.com/@types/ws/-/ws-7.2.5.tgz#513f28b04a1ea1aa9dc2cad3f26e8e37c88aae49" + integrity sha512-4UEih9BI1nBKii385G9id1oFrSkLcClbwtDfcYj8HJLQqZVAtb/42vXVrYvRWCcufNF/a+rZD3MxNwghA7UmCg== dependencies: "@types/node" "*" @@ -1284,13 +1284,13 @@ anymatch@^2.0.0: micromatch "^3.1.4" normalize-path "^2.1.1" -apollo-cache-control@^0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.9.0.tgz#43d2eec16d40248683f46b9b28937a89ad3b5c54" - integrity sha512-iLT6IT4Ul5cMfBcJAvhpk3a7AD6fXqvFxNmJEPVapVJHbSKYIjra4PTis13sOyN5Y3WQS6a+NRFxAW8+hL3q3Q== +apollo-cache-control@^0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.11.0.tgz#7075492d04c5424e7c6769380b503e8f75b39d61" + integrity sha512-dmRnQ9AXGw2SHahVGLzB/p4UW/taFBAJxifxubp8hqY5p9qdlSu4MPRq8zvV2ULMYf50rBtZyC4C+dZLqmHuHQ== dependencies: - apollo-server-env "^2.4.3" - graphql-extensions "^0.11.0" + apollo-server-env "^2.4.4" + apollo-server-plugin-base "^0.9.0" apollo-codegen-core@^0.36.4: version "0.36.4" @@ -1358,26 +1358,35 @@ apollo-datasource@^0.7.0: apollo-server-caching "^0.5.1" apollo-server-env "^2.4.3" -apollo-engine-reporting-protobuf@^0.4.4: - version "0.4.4" - resolved "https://registry.yarnpkg.com/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.4.4.tgz#73a064f8c9f2d6605192d1673729c66ec47d9cb7" - integrity sha512-SGrIkUR7Q/VjU8YG98xcvo340C4DaNUhg/TXOtGsMlfiJDzHwVau/Bv6zifAzBafp2lj0XND6Daj5kyT/eSI/w== +apollo-datasource@^0.7.1: + version "0.7.1" + resolved "https://registry.yarnpkg.com/apollo-datasource/-/apollo-datasource-0.7.1.tgz#0b06da999ace50b7f5fe509f2a03f7de97974334" + integrity sha512-h++/jQAY7GA+4TBM+7ezvctFmmGNLrAPf51KsagZj+NkT9qvxp585rdsuatynVbSl59toPK2EuVmc6ilmQHf+g== + dependencies: + apollo-server-caching "^0.5.1" + apollo-server-env "^2.4.4" + +apollo-engine-reporting-protobuf@^0.5.1: + version "0.5.1" + resolved "https://registry.yarnpkg.com/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.5.1.tgz#b6e66e6e382f9bcdc2ac8ed168b047eb1470c1a8" + integrity sha512-TSfr9iAaInV8dhXkesdcmqsthRkVcJkzznmiM+1Ob/GScK7r6hBYCjVDt2613EHAg9SUzTOltIKlGD+N+GJRUw== dependencies: "@apollo/protobufjs" "^1.0.3" -apollo-engine-reporting@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/apollo-engine-reporting/-/apollo-engine-reporting-1.7.0.tgz#34a54ef96da5cfe1dea3a4fdf02768d1cc7e154f" - integrity sha512-jsjSnoHrRmk4XXK4aFU17YSJILmWsilKRwIeN74QJsSxjn5SCVF4EI/ebf/MNrTHpft8EhShx+wdkAcOD9ivqA== +apollo-engine-reporting@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/apollo-engine-reporting/-/apollo-engine-reporting-2.0.0.tgz#af007b4a8a481fa97baef0eac51a7824f1ec3310" + integrity sha512-FvNwORsh3nxEfvQqd2xbd468a0q/R3kYar/Bk6YQdBX5qwqUhqmOcOSxLFk8Zb77HpwHij5CPpPWJb53TU1zcA== dependencies: - apollo-engine-reporting-protobuf "^0.4.4" + apollo-engine-reporting-protobuf "^0.5.1" apollo-graphql "^0.4.0" apollo-server-caching "^0.5.1" - apollo-server-env "^2.4.3" - apollo-server-errors "^2.4.0" - apollo-server-types "^0.3.0" + apollo-server-env "^2.4.4" + apollo-server-errors "^2.4.1" + apollo-server-plugin-base "^0.9.0" + apollo-server-types "^0.5.0" async-retry "^1.2.1" - graphql-extensions "^0.11.0" + uuid "^8.0.0" apollo-env@^0.6.2: version "0.6.2" @@ -1480,29 +1489,30 @@ apollo-server-caching@^0.5.1: dependencies: lru-cache "^5.0.0" -apollo-server-core@^2.11.0: - version "2.11.0" - resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.11.0.tgz#91a055ce6cf12a8b43e8a4811d465d97fa324eac" - integrity sha512-jHLOqwTRlyWzqWNRlwr2M/xfrt+lw2pHtKYyxUGRjWFo8EM5TX1gDcTKtbtvx9p5m+ZBDAhcWp/rpq0vSz4tqg== +apollo-server-core@^2.14.2: + version "2.14.2" + resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.14.2.tgz#4ab055b96b8be7821a726c81e8aa412deb7f3644" + integrity sha512-8G6Aoz+k+ecuQco1KNLFbMrxhe/8uR4AOaOYEvT/N5m/6lrkPYzvBAxbpRIub5AxEwpBPcIrI452rR3PD9DItA== dependencies: "@apollographql/apollo-tools" "^0.4.3" "@apollographql/graphql-playground-html" "1.6.24" "@types/graphql-upload" "^8.0.0" - "@types/ws" "^6.0.0" - apollo-cache-control "^0.9.0" - apollo-datasource "^0.7.0" - apollo-engine-reporting "^1.7.0" + "@types/ws" "^7.0.0" + apollo-cache-control "^0.11.0" + apollo-datasource "^0.7.1" + apollo-engine-reporting "^2.0.0" apollo-server-caching "^0.5.1" - apollo-server-env "^2.4.3" - apollo-server-errors "^2.4.0" - apollo-server-plugin-base "^0.7.0" - apollo-server-types "^0.3.0" - apollo-tracing "^0.9.0" + apollo-server-env "^2.4.4" + apollo-server-errors "^2.4.1" + apollo-server-plugin-base "^0.9.0" + apollo-server-types "^0.5.0" + apollo-tracing "^0.11.0" fast-json-stable-stringify "^2.0.0" - graphql-extensions "^0.11.0" + graphql-extensions "^0.12.2" graphql-tag "^2.9.2" graphql-tools "^4.0.0" graphql-upload "^8.0.2" + loglevel "^1.6.7" sha.js "^2.4.11" subscriptions-transport-ws "^0.9.11" ws "^6.0.0" @@ -1515,15 +1525,28 @@ apollo-server-env@^2.4.3: node-fetch "^2.1.2" util.promisify "^1.0.0" -apollo-server-errors@^2.0.2, apollo-server-errors@^2.4.0: +apollo-server-env@^2.4.4: + version "2.4.4" + resolved "https://registry.yarnpkg.com/apollo-server-env/-/apollo-server-env-2.4.4.tgz#12d2d0896dcb184478cba066c7a683ab18689ca1" + integrity sha512-c2oddDS3lwAl6QNCIKCLEzt/dF9M3/tjjYRVdxOVN20TidybI7rAbnT4QOzf4tORnGXtiznEAvr/Kc9ahhKADg== + dependencies: + node-fetch "^2.1.2" + util.promisify "^1.0.0" + +apollo-server-errors@^2.0.2: version "2.4.0" resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-2.4.0.tgz#3096db02b6ae8d434a6b2678f74eddaad8b98452" integrity sha512-ZouZfr2sGavvI18rgdRcyY2ausRAlVtWNOax9zca8ZG2io86dM59jXBmUVSNlVZSmBsIh45YxYC0eRvr2vmRdg== -apollo-server-koa@^2.9.16: - version "2.11.0" - resolved "https://registry.yarnpkg.com/apollo-server-koa/-/apollo-server-koa-2.11.0.tgz#6b87d0e19130633a6371f00df0ab8868421cf832" - integrity sha512-AW3tlbk7pEqv/iqdG87LoG/eM1SESaSD7lYfU6MSC7lcXayuIq8omY7a9aCdFVu26KhfanFxbPJG1Xumin49hA== +apollo-server-errors@^2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-2.4.1.tgz#16ad49de6c9134bfb2b7dede9842e73bb239dbe2" + integrity sha512-7oEd6pUxqyWYUbQ9TA8tM0NU/3aGtXSEibo6+txUkuHe7QaxfZ2wHRp+pfT1LC1K3RXYjKj61/C2xEO19s3Kdg== + +apollo-server-koa@^2.14.2: + version "2.14.2" + resolved "https://registry.yarnpkg.com/apollo-server-koa/-/apollo-server-koa-2.14.2.tgz#95d098dd6cf831e2e466908956c2dee8b8b6d59b" + integrity sha512-pQuQPQeIkUdsjn3anRN5y1nZSM+tu/H2rCLae3l2gBZknj8ABJ20EeBKFjnB2/6OuHo3FQJSZVt9zeRbMfWKSw== dependencies: "@apollographql/graphql-playground-html" "1.6.24" "@koa/cors" "^2.2.1" @@ -1534,39 +1557,39 @@ apollo-server-koa@^2.9.16: "@types/koa-compose" "^3.2.2" "@types/koa__cors" "^2.2.1" accepts "^1.3.5" - apollo-server-core "^2.11.0" - apollo-server-types "^0.3.0" + apollo-server-core "^2.14.2" + apollo-server-types "^0.5.0" graphql-subscriptions "^1.0.0" graphql-tools "^4.0.0" - koa "2.11.0" + koa "2.12.0" koa-bodyparser "^4.2.1" koa-compose "^4.1.0" koa-router "^7.4.0" type-is "^1.6.16" -apollo-server-plugin-base@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.7.0.tgz#5c52ee311c8ef884b8b17be1b7e9d4597966dae1" - integrity sha512-//xgYrBYLQSr92W0z3mYsFGoVz3wxKNsv3KcOUBhbOCGTbjZgP7vHOE1vhHhRcpZKKXmjXTVONdrnNJ+XVGi6A== +apollo-server-plugin-base@^0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.9.0.tgz#777f720a1ee827a66b8c159073ca30645f8bc625" + integrity sha512-LWcPrsy2+xqwlNseh/QaGa/MPNopS8c4qGgh0g0cAn0lZBRrJ9Yab7dq+iQ6vdUBwIhUWYN6s9dwUWCZw2SL8g== dependencies: - apollo-server-types "^0.3.0" + apollo-server-types "^0.5.0" -apollo-server-types@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-0.3.0.tgz#01732e5fc6c4a2a522f051d5685c57a8e3dc620e" - integrity sha512-FMo7kbTkhph9dfIQ3xDbRLObqmdQH9mwSjxhGsX+JxGMRPPXgd3+GZvCeVKOi/udxh//w1otSeAqItjvbj0tfQ== +apollo-server-types@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-0.5.0.tgz#51f39c5fa610ece8b07f1fbcf63c47d4ac150340" + integrity sha512-zhtsqqqfdeoJQAfc41Sy6WnnBVxKNgZ34BKXf/Q+kXmw7rbZ/B5SG3SJMvj1iFsbzZxILmWdUsE9aD20lEr0bg== dependencies: - apollo-engine-reporting-protobuf "^0.4.4" + apollo-engine-reporting-protobuf "^0.5.1" apollo-server-caching "^0.5.1" - apollo-server-env "^2.4.3" + apollo-server-env "^2.4.4" -apollo-tracing@^0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.9.0.tgz#673916ae674b9a8d72603f73af0b8561dfd38306" - integrity sha512-oqspTrf4BLGbKkIk1vF+I31C2v7PPJmF36TFpT/+zJxNvJw54ji4ZMhtytgVqbVldQEintJmdHQIidYBGKmu+g== +apollo-tracing@^0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.11.0.tgz#8821eb60692f77c06660fb6bc147446f600aecfe" + integrity sha512-I9IFb/8lkBW8ZwOAi4LEojfT7dMfUSkpnV8LHQI8Rcj0HtzL9HObQ3woBmzyGHdGHLFuD/6/VHyFD67SesSrJg== dependencies: - apollo-server-env "^2.4.3" - graphql-extensions "^0.11.0" + apollo-server-env "^2.4.4" + apollo-server-plugin-base "^0.9.0" apollo-utilities@^1.0.1, apollo-utilities@^1.3.0: version "1.3.3" @@ -2890,11 +2913,6 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -error-inject@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/error-inject/-/error-inject-1.0.0.tgz#e2b3d91b54aed672f309d950d154850fa11d4f37" - integrity sha1-4rPZG1Su1nLzCdlQ0VSFD6EdTzc= - es-abstract@^1.17.0-next.1, es-abstract@^1.17.2: version "1.17.4" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.4.tgz#e3aedf19706b20e7c2594c35fc0d57605a79e184" @@ -3437,14 +3455,14 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6 resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423" integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ== -graphql-extensions@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.11.0.tgz#2923b06f7452dad186d835327974b6c3ebb9c58f" - integrity sha512-zd4qfUiJoYBx2MwJusM36SEJ+YmJ1ki8YF8nlm9mgaPDUzsnmFq4lxULxUfhLAXFwZw7MbEN2vV4V6WiNgSJLg== +graphql-extensions@^0.12.2: + version "0.12.2" + resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.12.2.tgz#f22210e812939b7caa2127589f30e6a1c671540f" + integrity sha512-vFaZua5aLiCOOzxfY5qzHZ6S52BCqW7VVOwzvV52Wb5edRm3dn6u+1MR9yYyEqUHSf8LvdhEojYlOkKiaQ4ghA== dependencies: "@apollographql/apollo-tools" "^0.4.3" - apollo-server-env "^2.4.3" - apollo-server-types "^0.3.0" + apollo-server-env "^2.4.4" + apollo-server-types "^0.5.0" graphql-subscriptions@^1.0.0: version "1.1.0" @@ -4692,10 +4710,10 @@ koa-session@^5.10.1: is-type-of "^1.0.0" uuid "^3.3.2" -koa@2.11.0, koa@^2.7.0: - version "2.11.0" - resolved "https://registry.yarnpkg.com/koa/-/koa-2.11.0.tgz#fe5a51c46f566d27632dd5dc8fd5d7dd44f935a4" - integrity sha512-EpR9dElBTDlaDgyhDMiLkXrPwp6ZqgAIBvhhmxQ9XN4TFgW+gEz6tkcsNI6BnUbUftrKDjVFj4lW2/J2aNBMMA== +koa@2.12.0, koa@^2.7.0: + version "2.12.0" + resolved "https://registry.yarnpkg.com/koa/-/koa-2.12.0.tgz#c92bfb42defd86f365c31bf63fe918db11fc5c74" + integrity sha512-WlUBj6PXoVhjI5ljMmlyK+eqkbVFW5XQu8twz6bd4WM2E67IwKgPMu5wIFXGxAsZT7sW5xAB54KhY8WAEkLPug== dependencies: accepts "^1.3.5" cache-content-type "^1.0.0" @@ -4707,7 +4725,6 @@ koa@2.11.0, koa@^2.7.0: depd "^1.1.2" destroy "^1.0.4" encodeurl "^1.0.2" - error-inject "^1.0.0" escape-html "^1.0.3" fresh "~0.5.2" http-assert "^1.3.0" @@ -4954,6 +4971,11 @@ logform@^2.1.1: ms "^2.1.1" triple-beam "^1.3.0" +loglevel@^1.6.7: + version "1.6.8" + resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.8.tgz#8a25fb75d092230ecd4457270d80b54e28011171" + integrity sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA== + long@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" @@ -7237,6 +7259,11 @@ uuid@^3.1.0, uuid@^3.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== +uuid@^8.0.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.1.0.tgz#6f1536eb43249f473abc6bd58ff983da1ca30d8d" + integrity sha512-CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg== + validate-npm-package-license@^3.0.1: version "3.0.4" resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"