From 52e8b9d7f8d8c6d15f88ec9f75afa3b7d3ddd6df Mon Sep 17 00:00:00 2001 From: chenshoo Date: Thu, 11 Jun 2020 16:26:46 +0300 Subject: [PATCH 1/2] fix: update apollo server --- package-lock.json | 283 +++++++++--------- package.json | 16 +- src/config/create-apollo-config-util.ts | 21 +- src/config/polaris-server-config.ts | 11 +- src/config/polaris-server-options.ts | 2 +- src/index.ts | 3 +- src/plugins/snapshot/snapshot-listener.ts | 3 +- src/server/configurations-manager.ts | 17 +- src/server/polaris-server.ts | 15 +- src/snapshot/snapshot-cleaner.ts | 2 +- .../tests/concurrent-mutations.test.ts | 7 +- test/integration/tests/custom-context.test.ts | 6 +- test/integration/tests/data-version.test.ts | 2 +- test/integration/tests/directives.test.ts | 2 +- .../tests/irrelevant-entities.test.ts | 10 +- .../tests/query-without-connection.test.ts | 4 +- test/integration/tests/query.test.ts | 4 +- test/integration/tests/realities.test.ts | 8 +- .../tests/snapshot-auto-with-max-3.test.ts | 4 +- test/integration/tests/soft-delete.test.ts | 8 +- .../tests/transactional-mutations.test.ts | 2 +- 21 files changed, 213 insertions(+), 217 deletions(-) diff --git a/package-lock.json b/package-lock.json index 82276c1..fe8fa26 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2326,9 +2326,9 @@ } }, "@jest/types": { - "version": "25.2.6", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.2.6.tgz", - "integrity": "sha512-myJTTV37bxK7+3NgKc4Y/DlQ5q92/NOwZsZ+Uch7OXdElxOg61QYc72fPYNAjlvbnJ2YvbXLamIsa9tj48BmyQ==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz", + "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -2435,35 +2435,35 @@ } }, "@octokit/auth-token": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.0.tgz", - "integrity": "sha512-eoOVMjILna7FVQf96iWc3+ZtE/ZT6y8ob8ZzcqKY1ibSQCnu4O/B7pJvzMx5cyZ/RjAff6DAdEb0O0Cjcxidkg==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.2.tgz", + "integrity": "sha512-jE/lE/IKIz2v1+/P0u4fJqv0kYwXOTujKemJMFr6FeopsxlIK3+wKDCJGnysg81XID5TgZQbIfuJ5J0lnTiuyQ==", "dev": true, "requires": { - "@octokit/types": "^2.0.0" + "@octokit/types": "^5.0.0" } }, "@octokit/core": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/@octokit/core/-/core-2.5.0.tgz", - "integrity": "sha512-uvzmkemQrBgD8xuGbjhxzJN1darJk9L2cS+M99cHrDG2jlSVpxNJVhoV86cXdYBqdHCc9Z995uLCczaaHIYA6Q==", + "version": "2.5.4", + "resolved": "https://registry.npmjs.org/@octokit/core/-/core-2.5.4.tgz", + "integrity": "sha512-HCp8yKQfTITYK+Nd09MHzAlP1v3Ii/oCohv0/TW9rhSLvzb98BOVs2QmVYuloE6a3l6LsfyGIwb6Pc4ycgWlIQ==", "dev": true, "requires": { "@octokit/auth-token": "^2.4.0", "@octokit/graphql": "^4.3.1", "@octokit/request": "^5.4.0", - "@octokit/types": "^2.0.0", + "@octokit/types": "^5.0.0", "before-after-hook": "^2.1.0", "universal-user-agent": "^5.0.0" } }, "@octokit/endpoint": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.1.tgz", - "integrity": "sha512-pOPHaSz57SFT/m3R5P8MUu4wLPszokn5pXcB/pzavLTQf2jbU+6iayTvzaY6/BiotuRS0qyEUkx3QglT4U958A==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.3.tgz", + "integrity": "sha512-Y900+r0gIz+cWp6ytnkibbD95ucEzDSKzlEnaWS52hbCDNcCJYO5mRmWW7HRAnDc7am+N/5Lnd8MppSaTYx1Yg==", "dev": true, "requires": { - "@octokit/types": "^2.11.1", + "@octokit/types": "^5.0.0", "is-plain-object": "^3.0.0", "universal-user-agent": "^5.0.0" }, @@ -2486,34 +2486,23 @@ } }, "@octokit/graphql": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.3.1.tgz", - "integrity": "sha512-hCdTjfvrK+ilU2keAdqNBWOk+gm1kai1ZcdjRfB30oA3/T6n53UVJb7w0L5cR3/rhU91xT3HSqCd+qbvH06yxA==", + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.5.1.tgz", + "integrity": "sha512-qgMsROG9K2KxDs12CO3bySJaYoUu2aic90qpFrv7A8sEBzZ7UFGvdgPKiLw5gOPYEYbS0Xf8Tvf84tJutHPulQ==", "dev": true, "requires": { "@octokit/request": "^5.3.0", - "@octokit/types": "^2.0.0", - "universal-user-agent": "^4.0.0" - }, - "dependencies": { - "universal-user-agent": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-4.0.1.tgz", - "integrity": "sha512-LnST3ebHwVL2aNe4mejI9IQh2HfZ1RLo8Io2HugSif8ekzD1TlWpHpColOB/eh8JHMLkGH3Akqf040I+4ylNxg==", - "dev": true, - "requires": { - "os-name": "^3.1.0" - } - } + "@octokit/types": "^5.0.0", + "universal-user-agent": "^5.0.0" } }, "@octokit/plugin-paginate-rest": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.2.0.tgz", - "integrity": "sha512-KoNxC3PLNar8UJwR+1VMQOw2IoOrrFdo5YOiDKnBhpVbKpw+zkBKNMNKwM44UWL25Vkn0Sl3nYIEGKY+gW5ebw==", + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.2.2.tgz", + "integrity": "sha512-3OO/SjB5BChRTVRRQcZzpL0ZGcDGEB2dBzNhfqVqqMs6WDwo7cYW8cDwxqW8+VvA78mDK/abXgR/UrYg4HqrQg==", "dev": true, "requires": { - "@octokit/types": "^2.12.1" + "@octokit/types": "^5.0.0" } }, "@octokit/plugin-request-log": { @@ -2523,24 +2512,35 @@ "dev": true }, "@octokit/plugin-rest-endpoint-methods": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-3.8.0.tgz", - "integrity": "sha512-LUkTgZ53adPFC/Hw6mxvAtShUtGy3zbpcfCAJMWAN7SvsStV4p6TK7TocSv0Aak4TNmDLhbShTagGhpgz9mhYw==", + "version": "3.17.0", + "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-3.17.0.tgz", + "integrity": "sha512-NFV3vq7GgoO2TrkyBRUOwflkfTYkFKS0tLAPym7RNpkwLCttqShaEGjthOsPEEL+7LFcYv3mU24+F2yVd3npmg==", "dev": true, "requires": { - "@octokit/types": "^2.12.1", + "@octokit/types": "^4.1.6", "deprecation": "^2.3.1" + }, + "dependencies": { + "@octokit/types": { + "version": "4.1.10", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-4.1.10.tgz", + "integrity": "sha512-/wbFy1cUIE5eICcg0wTKGXMlKSbaAxEr00qaBXzscLXpqhcwgXeS6P8O0pkysBhRfyjkKjJaYrvR1ExMO5eOXQ==", + "dev": true, + "requires": { + "@types/node": ">= 8" + } + } } }, "@octokit/request": { - "version": "5.4.2", - "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.4.2.tgz", - "integrity": "sha512-zKdnGuQ2TQ2vFk9VU8awFT4+EYf92Z/v3OlzRaSh4RIP0H6cvW1BFPXq4XYvNez+TPQjqN+0uSkCYnMFFhcFrw==", + "version": "5.4.5", + "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.4.5.tgz", + "integrity": "sha512-atAs5GAGbZedvJXXdjtKljin+e2SltEs48B3naJjqWupYl2IUBbB/CJisyjbNHcKpHzb3E+OYEZ46G8eakXgQg==", "dev": true, "requires": { "@octokit/endpoint": "^6.0.1", "@octokit/request-error": "^2.0.0", - "@octokit/types": "^2.11.1", + "@octokit/types": "^5.0.0", "deprecation": "^2.0.0", "is-plain-object": "^3.0.0", "node-fetch": "^2.3.0", @@ -2566,32 +2566,43 @@ } }, "@octokit/request-error": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.0.tgz", - "integrity": "sha512-rtYicB4Absc60rUv74Rjpzek84UbVHGHJRu4fNVlZ1mCcyUPPuzFfG9Rn6sjHrd95DEsmjSt1Axlc699ZlbDkw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.1.tgz", + "integrity": "sha512-5lqBDJ9/TOehK82VvomQ6zFiZjPeSom8fLkFVLuYL3sKiIb5RB8iN/lenLkY7oBmyQcGP7FBMGiIZTO8jufaRQ==", "dev": true, "requires": { - "@octokit/types": "^2.0.0", + "@octokit/types": "^4.0.1", "deprecation": "^2.0.0", "once": "^1.4.0" + }, + "dependencies": { + "@octokit/types": { + "version": "4.1.10", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-4.1.10.tgz", + "integrity": "sha512-/wbFy1cUIE5eICcg0wTKGXMlKSbaAxEr00qaBXzscLXpqhcwgXeS6P8O0pkysBhRfyjkKjJaYrvR1ExMO5eOXQ==", + "dev": true, + "requires": { + "@types/node": ">= 8" + } + } } }, "@octokit/rest": { - "version": "17.6.0", - "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-17.6.0.tgz", - "integrity": "sha512-knh+4hPBA26AMXflFRupTPT3u9NcQmQzeBJl4Gcuf14Gn7dUh6Loc1ICWF0Pz18A6ElFZQt+wB9tFINSruIa+g==", + "version": "17.11.0", + "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-17.11.0.tgz", + "integrity": "sha512-WqXmm37uCGP1NxYxSc27hd5pYNLdksuUsjR8vaNS8fCy6kyxZFy+Dbh/AzqKGj2mOdbnt7dILoGHfzsA4IIm4A==", "dev": true, "requires": { "@octokit/core": "^2.4.3", "@octokit/plugin-paginate-rest": "^2.2.0", "@octokit/plugin-request-log": "^1.0.0", - "@octokit/plugin-rest-endpoint-methods": "3.8.0" + "@octokit/plugin-rest-endpoint-methods": "3.17.0" } }, "@octokit/types": { - "version": "2.12.1", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-2.12.1.tgz", - "integrity": "sha512-LRLR1tjbcCfAmUElvTmMvLEzstpx6Xt/aQVTg2xvd+kHA2Ekp1eWl5t+gU7bcwjXHYEAzh4hH4WH+kS3vh+wRw==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-5.0.0.tgz", + "integrity": "sha512-3LVS+MbeqwSd5G4KS8123cZz+hWomsiGeMnQ/QJIBFDwL/YHX8kkr0FZXrgWEMO7Fgi2/VOrhbiFnk9sZ+s4qA==", "dev": true, "requires": { "@types/node": ">= 8" @@ -2709,9 +2720,9 @@ }, "dependencies": { "conventional-changelog-angular": { - "version": "5.0.6", - "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.6.tgz", - "integrity": "sha512-QDEmLa+7qdhVIv8sFZfVxU1VSyVvnXPsxq8Vam49mKUcO1Z8VTLEJk9uI21uiJUsnmm0I4Hrsdc9TgkOQo9WSA==", + "version": "5.0.10", + "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.10.tgz", + "integrity": "sha512-k7RPPRs0vp8+BtPsM9uDxRl6KcgqtCJmzRD1wRtgqmhQ96g8ifBGo9O/TZBG23jqlXS/rg8BKRDELxfnQQGiaA==", "dev": true, "requires": { "compare-func": "^1.3.1", @@ -2743,9 +2754,9 @@ } }, "@semantic-release/github": { - "version": "7.0.5", - "resolved": "https://registry.npmjs.org/@semantic-release/github/-/github-7.0.5.tgz", - "integrity": "sha512-1nJCMeomspRIXKiFO3VXtkUMbIBEreYLFNBdWoLjvlUNcEK0/pEbupEZJA3XHfJuSzv43u3OLpPhF/JBrMuv+A==", + "version": "7.0.7", + "resolved": "https://registry.npmjs.org/@semantic-release/github/-/github-7.0.7.tgz", + "integrity": "sha512-Sai2UucYQ+5rJzKVEVJ4eiZNDdoo0/CzfpValBdeU5h97uJE7t4CoBTmUWkiXlPOx46CSw1+JhI+PHC1PUxVZw==", "dev": true, "requires": { "@octokit/rest": "^17.0.0", @@ -2767,9 +2778,9 @@ }, "dependencies": { "mime": { - "version": "2.4.4", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz", - "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==", + "version": "2.4.6", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz", + "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==", "dev": true }, "p-retry": { @@ -2871,9 +2882,9 @@ }, "dependencies": { "conventional-changelog-angular": { - "version": "5.0.6", - "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.6.tgz", - "integrity": "sha512-QDEmLa+7qdhVIv8sFZfVxU1VSyVvnXPsxq8Vam49mKUcO1Z8VTLEJk9uI21uiJUsnmm0I4Hrsdc9TgkOQo9WSA==", + "version": "5.0.10", + "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.10.tgz", + "integrity": "sha512-k7RPPRs0vp8+BtPsM9uDxRl6KcgqtCJmzRD1wRtgqmhQ96g8ifBGo9O/TZBG23jqlXS/rg8BKRDELxfnQQGiaA==", "dev": true, "requires": { "compare-func": "^1.3.1", @@ -3187,9 +3198,9 @@ } }, "@types/jest": { - "version": "25.2.1", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-25.2.1.tgz", - "integrity": "sha512-msra1bCaAeEdkSyA0CZ6gW1ukMIvZ5YoJkdXw/qhQdsuuDlFTcEUrUw8CLCPt2rVRUfXlClVvK2gvPs9IokZaA==", + "version": "25.2.3", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-25.2.3.tgz", + "integrity": "sha512-JXc1nK/tXHiDhV55dvfzqtmP4S3sy3T3ouV2tkViZgxY/zeUkcpQcQPGRlgF4KmWzWW5oiWYSZwtCB+2RsE4Fw==", "dev": true, "requires": { "jest-diff": "^25.2.1", @@ -3223,9 +3234,9 @@ } }, "@types/lodash": { - "version": "4.14.150", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.150.tgz", - "integrity": "sha512-kMNLM5JBcasgYscD9x/Gvr6lTAv2NVgsKtet/hm93qMyf/D1pt+7jeEZklKJKxMVmXjxbRVQQGfqDSfipYCO6w==", + "version": "4.14.155", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.155.tgz", + "integrity": "sha512-vEcX7S7aPhsBCivxMwAANQburHBtfN9RdyXFk84IJmu2Z4Hkg1tOFgaslRiEqqvoLtbCBi6ika1EMspE+NZ9Lg==", "dev": true }, "@types/long": { @@ -5213,16 +5224,6 @@ } } }, - "conventional-commits-filter": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.6.tgz", - "integrity": "sha512-4g+sw8+KA50/Qwzfr0hL5k5NWxqtrOVw4DDk3/h6L85a9Gz0/Eqp3oP+CWCNfesBvZZZEFHF7OTEbRe+yYSyKw==", - "dev": true, - "requires": { - "lodash.ismatch": "^4.4.0", - "modify-values": "^1.0.0" - } - }, "find-up": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", @@ -5433,9 +5434,9 @@ } }, "conventional-commits-filter": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.2.tgz", - "integrity": "sha512-WpGKsMeXfs21m1zIw4s9H5sys2+9JccTzpN6toXtxhpw2VNF2JUXwIakthKBy+LN4DvJm+TzWhxOMWOs1OFCFQ==", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.6.tgz", + "integrity": "sha512-4g+sw8+KA50/Qwzfr0hL5k5NWxqtrOVw4DDk3/h6L85a9Gz0/Eqp3oP+CWCNfesBvZZZEFHF7OTEbRe+yYSyKw==", "dev": true, "requires": { "lodash.ismatch": "^4.4.0", @@ -6931,9 +6932,9 @@ "integrity": "sha512-8S4f4WsCryNw2mJJchi46YgB6CR5Ze+4L1h8ewl9tEpL4SJ3ZO+c/bS4BWhB8bK+O3TMqhuZarTitd0S0eh2pA==" }, "fs-extra": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.0.tgz", - "integrity": "sha512-pmEYSk3vYsG/bF651KPUXZ+hvjpgWYw/Gc7W9NFUe3ZVLczKKWIij3IKpOrQcdw4TILtibFslZ0UmR8Vvzig4g==", + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.1.tgz", + "integrity": "sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==", "dev": true, "requires": { "at-least-node": "^1.0.0", @@ -8967,15 +8968,15 @@ } }, "jest-diff": { - "version": "25.2.6", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.2.6.tgz", - "integrity": "sha512-KuadXImtRghTFga+/adnNrv9s61HudRMR7gVSbP35UKZdn4IK2/0N0PpGZIqtmllK9aUyye54I3nu28OYSnqOg==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.5.0.tgz", + "integrity": "sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A==", "dev": true, "requires": { "chalk": "^3.0.0", "diff-sequences": "^25.2.6", "jest-get-type": "^25.2.6", - "pretty-format": "^25.2.6" + "pretty-format": "^25.5.0" }, "dependencies": { "ansi-styles": { @@ -11316,9 +11317,9 @@ } }, "marked": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/marked/-/marked-1.0.0.tgz", - "integrity": "sha512-Wo+L1pWTVibfrSr+TTtMuiMfNzmZWiOPeO7rZsQUY5bgsxpHesBEcIWJloWVTFnrMXnf/TL30eTFSGJddmQAng==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/marked/-/marked-1.1.0.tgz", + "integrity": "sha512-EkE7RW6KcXfMHy2PA7Jg0YJE1l8UPEZE8k45tylzmZM30/r1M1MUXWQfJlrSbsTeh7m/XTwHbWUENvAJZpp1YA==", "dev": true }, "marked-terminal": { @@ -11346,9 +11347,9 @@ } }, "chalk": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz", - "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", "dev": true, "requires": { "ansi-styles": "^4.1.0", @@ -11749,9 +11750,9 @@ "dev": true }, "npm": { - "version": "6.14.4", - "resolved": "https://registry.npmjs.org/npm/-/npm-6.14.4.tgz", - "integrity": "sha512-B8UDDbWvdkW6RgXFn8/h2cHJP/u/FPa4HWeGzW23aNEBARN3QPrRaHqPIZW2NSN3fW649gtgUDNZpaRs0zTMPw==", + "version": "6.14.5", + "resolved": "https://registry.npmjs.org/npm/-/npm-6.14.5.tgz", + "integrity": "sha512-CDwa3FJd0XJpKDbWCST484H+mCNjF26dPrU+xnREW+upR0UODjMEfXPl3bxWuAwZIX6c2ASg1plLO7jP8ehWeA==", "dev": true, "requires": { "JSONStream": "^1.3.5", @@ -11783,7 +11784,7 @@ "fs-write-stream-atomic": "~1.0.10", "gentle-fs": "^2.3.0", "glob": "^7.1.6", - "graceful-fs": "^4.2.3", + "graceful-fs": "^4.2.4", "has-unicode": "~2.0.1", "hosted-git-info": "^2.8.8", "iferr": "^1.0.2", @@ -11820,10 +11821,10 @@ "lru-cache": "^5.1.1", "meant": "~1.0.1", "mississippi": "^3.0.0", - "mkdirp": "^0.5.4", + "mkdirp": "^0.5.5", "move-concurrently": "^1.0.1", "node-gyp": "^5.1.0", - "nopt": "~4.0.1", + "nopt": "^4.0.3", "normalize-package-data": "^2.5.0", "npm-audit-report": "^1.3.2", "npm-cache-filename": "~1.0.2", @@ -11833,7 +11834,7 @@ "npm-packlist": "^1.4.8", "npm-pick-manifest": "^3.0.2", "npm-profile": "^4.0.4", - "npm-registry-fetch": "^4.0.3", + "npm-registry-fetch": "^4.0.4", "npm-user-validate": "~1.0.0", "npmlog": "~4.1.2", "once": "~1.4.0", @@ -13006,7 +13007,7 @@ } }, "graceful-fs": { - "version": "4.2.3", + "version": "4.2.4", "bundled": true, "dev": true }, @@ -13769,7 +13770,7 @@ } }, "mkdirp": { - "version": "0.5.4", + "version": "0.5.5", "bundled": true, "dev": true, "requires": { @@ -13847,7 +13848,7 @@ } }, "nopt": { - "version": "4.0.1", + "version": "4.0.3", "bundled": true, "dev": true, "requires": { @@ -13973,7 +13974,7 @@ } }, "npm-registry-fetch": { - "version": "4.0.3", + "version": "4.0.4", "bundled": true, "dev": true, "requires": { @@ -16066,12 +16067,12 @@ "dev": true }, "pretty-format": { - "version": "25.2.6", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.2.6.tgz", - "integrity": "sha512-DEiWxLBaCHneffrIT4B+TpMvkV9RNvvJrd3lY9ew1CEQobDzEXmYT1mg0hJhljZty7kCc10z13ohOFAE8jrUDg==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz", + "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==", "dev": true, "requires": { - "@jest/types": "^25.2.6", + "@jest/types": "^25.5.0", "ansi-regex": "^5.0.0", "ansi-styles": "^4.0.0", "react-is": "^16.12.0" @@ -16848,9 +16849,9 @@ } }, "semantic-release": { - "version": "17.0.7", - "resolved": "https://registry.npmjs.org/semantic-release/-/semantic-release-17.0.7.tgz", - "integrity": "sha512-F6FzJI1yiGavzCTXir4yPthK/iozZPJ4myUYndiHhSHbmOcCSJ2m7V+P6sFwVpDpQKQp1Q31M68sTJ/Q/27Bow==", + "version": "17.0.8", + "resolved": "https://registry.npmjs.org/semantic-release/-/semantic-release-17.0.8.tgz", + "integrity": "sha512-9KcdidiJ4xchrJXxPdaDQVlybgX0xTeKyVjRySYk5u9GpjibXD7E5F8cB0BvFLMDmMyrkCwcem0kFiaLD2VNPg==", "dev": true, "requires": { "@semantic-release/commit-analyzer": "^8.0.0", @@ -18404,9 +18405,9 @@ } }, "ts-jest": { - "version": "25.4.0", - "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-25.4.0.tgz", - "integrity": "sha512-+0ZrksdaquxGUBwSdTIcdX7VXdwLIlSRsyjivVA9gcO+Cvr6ByqDhu/mi5+HCcb6cMkiQp5xZ8qRO7/eCqLeyw==", + "version": "25.5.1", + "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-25.5.1.tgz", + "integrity": "sha512-kHEUlZMK8fn8vkxDjwbHlxXRB9dHYpyzqKIGDNxbzs+Rz+ssNDSDNusEK8Fk/sDd4xE6iKoQLfFkFVaskmTJyw==", "dev": true, "requires": { "bs-logger": "0.x", @@ -18416,8 +18417,7 @@ "lodash.memoize": "4.x", "make-error": "1.x", "micromatch": "4.x", - "mkdirp": "1.x", - "resolve": "1.x", + "mkdirp": "0.x", "semver": "6.x", "yargs-parser": "18.x" }, @@ -18428,12 +18428,6 @@ "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", "dev": true }, - "mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "dev": true - }, "yargs-parser": { "version": "18.1.3", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", @@ -18447,9 +18441,9 @@ } }, "ts-node": { - "version": "8.10.1", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.10.1.tgz", - "integrity": "sha512-bdNz1L4ekHiJul6SHtZWs1ujEKERJnHs4HxN7rjTyyVOFf3HaJ6sLqe6aPG62XTzAB/63pKRh5jTSWL0D7bsvw==", + "version": "8.10.2", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.10.2.tgz", + "integrity": "sha512-ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA==", "requires": { "arg": "^4.1.0", "diff": "^4.0.1", @@ -18650,9 +18644,9 @@ } }, "typescript": { - "version": "3.8.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz", - "integrity": "sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==", + "version": "3.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.5.tgz", + "integrity": "sha512-hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ==", "dev": true }, "uglify-js": { @@ -19046,9 +19040,9 @@ } }, "windows-release": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-3.3.0.tgz", - "integrity": "sha512-2HetyTg1Y+R+rUgrKeUEhAG/ZuOmTrI1NBb3ZyAGQMYmOJjBBPe4MTodghRkmLJZHwkuPi02anbeGP+Zf401LQ==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-3.3.1.tgz", + "integrity": "sha512-Pngk/RDCaI/DkuHPlGTdIkDiTAnAkyMjoQMZqRsxydNl1qGXNIoZrB7RK8g53F2tEgQBMqQJHQdYZuQEEAu54A==", "dev": true, "requires": { "execa": "^1.0.0" @@ -19295,9 +19289,9 @@ } }, "ws": { - "version": "7.2.5", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.5.tgz", - "integrity": "sha512-C34cIU4+DB2vMyAbmEKossWq2ZQDr6QEyuuCzWrM9zfw1sGc0mYiJ0UnG9zzNykt49C2Fi34hvr2vssFQRS6EA==", + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.0.tgz", + "integrity": "sha512-iFtXzngZVXPGgpTlP1rBqsUK82p9tKqsWRPg5L56egiljujJT3vGAYnHANvFxBieXrTFavhzhxW52jnaWV+w2w==", "dev": true }, "xdg-basedir": { @@ -19350,13 +19344,10 @@ "dev": true }, "yaml": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.9.2.tgz", - "integrity": "sha512-HPT7cGGI0DuRcsO51qC1j9O16Dh1mZ2bnXwsi0jrSpsLz0WxOLSLXfkABVl6bZO629py3CU+OMJtpNHDLB97kg==", - "dev": true, - "requires": { - "@babel/runtime": "^7.9.2" - } + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.0.tgz", + "integrity": "sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==", + "dev": true }, "yargonaut": { "version": "1.1.4", diff --git a/package.json b/package.json index 47e2e60..5f25704 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "@enigmatis/polaris-middlewares": "^1.4.5", "@enigmatis/polaris-schema": "^1.1.1", "@enigmatis/polaris-typeorm": "^2.3.4", - "apollo-server-express": "2.11.0", + "apollo-server-express": "^2.14.3", "apollo-server-plugin-base": "^0.6.10", "express": "^4.17.1", "graphql": "^14.6.0", @@ -82,7 +82,7 @@ "http-status": "^1.4.2", "lodash": "^4.17.15", "subscriptions-transport-ws": "^0.9.16", - "ts-node": "^8.10.1", + "ts-node": "^8.10.2", "uuid": "^3.4.0" }, "devDependencies": { @@ -92,8 +92,8 @@ "@semantic-release/git": "^9.0.0", "@types/express": "4.17.4", "@types/graphql": "^14.5.0", - "@types/jest": "^25.2.1", - "@types/lodash": "^4.14.150", + "@types/jest": "^25.2.3", + "@types/lodash": "^4.14.155", "@types/uuid": "^3.4.9", "axios": "^0.19.2", "graphql-request": "^1.8.2", @@ -102,16 +102,16 @@ "pg": "^7.18.2", "prettier": "^1.19.1", "rimraf": "^3.0.2", - "semantic-release": "^17.0.7", + "semantic-release": "^17.0.8", "travis-deploy-once": "^5.0.11", - "ts-jest": "^25.4.0", + "ts-jest": "^25.5.1", "tslint": "^5.20.1", "tslint-config-prettier": "^1.18.0", "tslint-consistent-codestyle": "^1.16.0", "tslint-eslint-rules": "^5.4.0", "tslint-plugin-prettier": "^2.3.0", - "typescript": "^3.8.3", - "ws": "^7.2.5" + "typescript": "^3.9.5", + "ws": "^7.3.0" }, "husky": { "hooks": { diff --git a/src/config/create-apollo-config-util.ts b/src/config/create-apollo-config-util.ts index 2b24236..52e5106 100644 --- a/src/config/create-apollo-config-util.ts +++ b/src/config/create-apollo-config-util.ts @@ -1,4 +1,5 @@ import { + ApplicationProperties, DATA_VERSION, INCLUDE_LINKED_OPER, OICD_CLAIM_UPN, @@ -30,23 +31,21 @@ import { SnapshotListener } from '../plugins/snapshot/snapshot-listener'; import { SnapshotPlugin } from '../plugins/snapshot/snapshot-plugin'; import { PolarisServerConfig } from './polaris-server-config'; -export function createPolarisLoggerFromPolarisServerConfig( - config: PolarisServerConfig, -): AbstractPolarisLogger { - return config.logger instanceof PolarisGraphQLLogger - ? config.logger - : new PolarisGraphQLLogger( - config.logger as LoggerConfiguration, - config.applicationProperties, - ); +export function createPolarisLoggerFromPolarisServerOptions( + loggerDef: LoggerConfiguration | PolarisGraphQLLogger, + applicationProperties: ApplicationProperties, +): PolarisGraphQLLogger { + return loggerDef instanceof PolarisGraphQLLogger + ? loggerDef + : new PolarisGraphQLLogger(loggerDef as LoggerConfiguration, applicationProperties); } export function createPolarisPlugins( polarisLogger: PolarisGraphQLLogger, config: PolarisServerConfig, connectionManager?: PolarisConnectionManager, -): Array ApolloServerPlugin)> { - const plugins: Array ApolloServerPlugin)> = [ +): any[] { + const plugins: any[] = [ new ExtensionsPlugin(polarisLogger, config.shouldAddWarningsToExtensions), new ResponseHeadersPlugin(polarisLogger), new PolarisLoggerPlugin(polarisLogger), diff --git a/src/config/polaris-server-config.ts b/src/config/polaris-server-config.ts index fe0fb9c..355adc0 100644 --- a/src/config/polaris-server-config.ts +++ b/src/config/polaris-server-config.ts @@ -1,9 +1,6 @@ import { RealitiesHolder } from '@enigmatis/polaris-common'; -import { - AbstractPolarisLogger, - ApplicationProperties, - LoggerConfiguration, -} from '@enigmatis/polaris-logs'; +import { PolarisGraphQLLogger } from '@enigmatis/polaris-graphql-logger'; +import { ApplicationProperties } from '@enigmatis/polaris-logs'; import { PolarisConnectionManager } from '@enigmatis/polaris-typeorm'; import { ApolloServerExpressConfig } from 'apollo-server-express'; import { DocumentNode } from 'graphql'; @@ -12,12 +9,12 @@ import { ExpressContext } from '..'; import { MiddlewareConfiguration } from '../index'; import { SnapshotConfiguration } from './snapshot-configuration'; -export interface PolarisServerConfig extends ApolloServerExpressConfig { +export interface PolarisServerConfig extends Omit { typeDefs: DocumentNode | DocumentNode[] | string | string[]; resolvers: IResolvers | IResolvers[]; port: number; applicationProperties: ApplicationProperties; - logger: LoggerConfiguration | AbstractPolarisLogger; + logger: PolarisGraphQLLogger; middlewareConfiguration: MiddlewareConfiguration; allowSubscription: boolean; customMiddlewares?: any[]; diff --git a/src/config/polaris-server-options.ts b/src/config/polaris-server-options.ts index 7c5ec2c..ecdb088 100644 --- a/src/config/polaris-server-options.ts +++ b/src/config/polaris-server-options.ts @@ -8,7 +8,7 @@ import { IResolvers } from 'graphql-tools'; import { ExpressContext, MiddlewareConfiguration } from '..'; import { SnapshotConfiguration } from './snapshot-configuration'; -export interface PolarisServerOptions extends ApolloServerExpressConfig { +export interface PolarisServerOptions extends Omit { typeDefs: DocumentNode | DocumentNode[] | string | string[]; resolvers: IResolvers | IResolvers[]; port: number; diff --git a/src/index.ts b/src/index.ts index f7df1ba..fbe5b8e 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,3 +1,4 @@ +import { Entity } from '@enigmatis/polaris-typeorm'; export { ExpressContext } from './server/express-context'; export { PolarisServer, app } from './server/polaris-server'; export * from './config/create-apollo-config-util'; @@ -15,7 +16,7 @@ export * from '@enigmatis/polaris-graphql-logger'; export * from '@enigmatis/polaris-middlewares'; export * from '@enigmatis/polaris-schema'; export * from '@enigmatis/polaris-typeorm'; -export { Entity } from '@enigmatis/polaris-typeorm'; +export { Entity }; export { getPolarisServerConfigFromOptions } from './server/configurations-manager'; export { IResolvers, diff --git a/src/plugins/snapshot/snapshot-listener.ts b/src/plugins/snapshot/snapshot-listener.ts index aa03af8..eb93378 100644 --- a/src/plugins/snapshot/snapshot-listener.ts +++ b/src/plugins/snapshot/snapshot-listener.ts @@ -7,7 +7,6 @@ import { SnapshotPage, } from '@enigmatis/polaris-typeorm'; import { runHttpQuery } from 'apollo-server-core'; -import { GraphQLOptions } from 'apollo-server-express'; import { GraphQLRequestContext, GraphQLRequestListener, @@ -16,7 +15,7 @@ import { import { SnapshotConfiguration } from '../..'; export class SnapshotListener implements GraphQLRequestListener { - public static graphQLOptions: GraphQLOptions; + public static graphQLOptions: any; public constructor( private readonly logger: PolarisGraphQLLogger, diff --git a/src/server/configurations-manager.ts b/src/server/configurations-manager.ts index 55bb4dc..3ad9ec1 100644 --- a/src/server/configurations-manager.ts +++ b/src/server/configurations-manager.ts @@ -1,7 +1,12 @@ import { RealitiesHolder } from '@enigmatis/polaris-common'; import { LoggerConfiguration } from '@enigmatis/polaris-logs'; -import { MiddlewareConfiguration, PolarisServerOptions, SnapshotConfiguration } from '..'; -import { PolarisServerConfig } from '../config/polaris-server-config'; +import { + createPolarisLoggerFromPolarisServerOptions, + MiddlewareConfiguration, + PolarisServerConfig, + PolarisServerOptions, + SnapshotConfiguration, +} from '..'; export const getDefaultMiddlewareConfiguration = (): MiddlewareConfiguration => { return { @@ -49,12 +54,16 @@ export function getSupportedRealities(options: PolarisServerOptions): RealitiesH export const getPolarisServerConfigFromOptions = ( options: PolarisServerOptions, ): PolarisServerConfig => { + const applicationProperties = options.applicationProperties || { version: 'v1' }; return { ...options, middlewareConfiguration: options.middlewareConfiguration || getDefaultMiddlewareConfiguration(), - logger: options.logger || getDefaultLoggerConfiguration(), - applicationProperties: options.applicationProperties || { version: 'v1' }, + logger: createPolarisLoggerFromPolarisServerOptions( + options.logger || getDefaultLoggerConfiguration(), + applicationProperties, + ), + applicationProperties, allowSubscription: options.allowSubscription || false, shouldAddWarningsToExtensions: options.shouldAddWarningsToExtensions === undefined diff --git a/src/server/polaris-server.ts b/src/server/polaris-server.ts index 98c8316..d787ce9 100644 --- a/src/server/polaris-server.ts +++ b/src/server/polaris-server.ts @@ -1,5 +1,4 @@ import { REALITY_ID } from '@enigmatis/polaris-common'; -import { PolarisGraphQLLogger } from '@enigmatis/polaris-graphql-logger'; import { AbstractPolarisLogger } from '@enigmatis/polaris-logs'; import { makeExecutablePolarisSchema } from '@enigmatis/polaris-schema'; import { @@ -16,15 +15,14 @@ import { createIntrospectionConfig, createPlaygroundConfig, createPolarisContext, - createPolarisLoggerFromPolarisServerConfig, createPolarisPlugins, createPolarisSchemaWithMiddlewares, createPolarisSubscriptionsConfig, initSnapshotGraphQLOptions, polarisFormatError, + PolarisServerConfig, PolarisServerOptions, } from '..'; -import { PolarisServerConfig } from '../config/polaris-server-config'; import { clearSnapshotCleanerInterval, setSnapshotCleanerInterval, @@ -42,12 +40,12 @@ export class PolarisServer { public constructor(config: PolarisServerOptions) { this.polarisServerConfig = getPolarisServerConfigFromOptions(config); - this.polarisLogger = createPolarisLoggerFromPolarisServerConfig(this.polarisServerConfig); + this.polarisLogger = this.polarisServerConfig.logger; this.apolloServerConfiguration = this.getApolloServerConfigurations(); this.apolloServer = new ApolloServer(this.apolloServerConfiguration); if (config.connectionManager) { initSnapshotGraphQLOptions( - this.polarisLogger as PolarisGraphQLLogger, + this.polarisServerConfig.logger, this.polarisServerConfig, this.apolloServer, this.createSchemaWithMiddlewares(), @@ -113,12 +111,13 @@ export class PolarisServer { private getApolloServerConfigurations(): ApolloServerExpressConfig { const schema: GraphQLSchema = this.createSchemaWithMiddlewares(); + const config: Omit = this.polarisServerConfig; return { - ...this.polarisServerConfig, + ...config, schema, context: createPolarisContext(this.polarisLogger, this.polarisServerConfig), plugins: createPolarisPlugins( - this.polarisLogger as PolarisGraphQLLogger, + this.polarisServerConfig.logger, this.polarisServerConfig, this.polarisServerConfig.connectionManager, ), @@ -137,7 +136,7 @@ export class PolarisServer { ); return createPolarisSchemaWithMiddlewares( schema, - this.polarisLogger as PolarisGraphQLLogger, + this.polarisServerConfig.logger, this.polarisServerConfig, this.polarisServerConfig.connectionManager, ); diff --git a/src/snapshot/snapshot-cleaner.ts b/src/snapshot/snapshot-cleaner.ts index 76910ce..8b53096 100644 --- a/src/snapshot/snapshot-cleaner.ts +++ b/src/snapshot/snapshot-cleaner.ts @@ -15,7 +15,7 @@ export const setSnapshotCleanerInterval = ( logger: AbstractPolarisLogger, connectionManager: PolarisConnectionManager, ): void => { - snapshotCleanerInterval = setInterval( + snapshotCleanerInterval = global.setInterval( () => deleteOutdatedSnapshotPages( realitiesHolder, diff --git a/test/integration/tests/concurrent-mutations.test.ts b/test/integration/tests/concurrent-mutations.test.ts index e756e35..319be6e 100644 --- a/test/integration/tests/concurrent-mutations.test.ts +++ b/test/integration/tests/concurrent-mutations.test.ts @@ -4,7 +4,6 @@ import { startTestServer, stopTestServer } from '../server/test-server'; import { graphqlRawRequest, graphQLRequest } from '../server/utils/graphql-client'; import * as concurrentMutations from './jsonRequestsAndHeaders/concurrentMutations.json'; import * as simpleQuery from './jsonRequestsAndHeaders/simpleQuery.json'; -import validate = WebAssembly.validate; let polarisServer: PolarisServer; @@ -31,7 +30,7 @@ describe('concurrent mutations tests', () => { concurrentMutations.request, concurrentMutations.headers, concurrentMutations.variables, - ).then(res => { + ).then((res: any) => { expect(res.createAuthor).toBeDefined(); expect(res.createAuthor.firstName).toBe(concurrentMutations.variables.firstName); expect(res.createAuthor.lastName).toBe(concurrentMutations.variables.lastName); @@ -48,7 +47,7 @@ describe('concurrent mutations tests', () => { concurrentMutations.requestTwo, concurrentMutations.headers, concurrentMutations.variables, - ).then(res => { + ).then((res: any) => { expect(res.createAuthor).toBeDefined(); expect(res.createAuthor.firstName).toBe(concurrentMutations.variables.fName); expect(res.createAuthor.lastName).toBe(concurrentMutations.variables.lName); @@ -65,7 +64,7 @@ describe('concurrent mutations tests', () => { concurrentMutations.requestThree, concurrentMutations.headers, concurrentMutations.variables, - ).then(res => { + ).then((res: any) => { expect(res.createAuthor).toBeDefined(); expect(res.createAuthor.firstName).toBe(concurrentMutations.variables.first); expect(res.createAuthor.lastName).toBe(concurrentMutations.variables.last); diff --git a/test/integration/tests/custom-context.test.ts b/test/integration/tests/custom-context.test.ts index b3c4e6f..1ab250b 100644 --- a/test/integration/tests/custom-context.test.ts +++ b/test/integration/tests/custom-context.test.ts @@ -20,7 +20,7 @@ afterEach(async () => { describe('custom context tests', () => { test('querying author by custom header in the custom context', async () => { - const result = await graphQLRequest( + const result: any = await graphQLRequest( customHeadersRequest.query, customHeadersRequest.headers, ); @@ -30,7 +30,7 @@ describe('custom context tests', () => { }); test('querying custom field in the custom context', async () => { - const result = await graphQLRequest( + const result: any = await graphQLRequest( customContextCustomFieldRequest.query, customContextCustomFieldRequest.headers, ); @@ -39,7 +39,7 @@ describe('custom context tests', () => { }); test('querying method of a TestClassInContext instance in the custom context', async () => { - const result = await graphQLRequest( + const result: any = await graphQLRequest( customContextInstanceMethodRequest.query, customContextInstanceMethodRequest.headers, ); diff --git a/test/integration/tests/data-version.test.ts b/test/integration/tests/data-version.test.ts index f79c476..35bfacf 100644 --- a/test/integration/tests/data-version.test.ts +++ b/test/integration/tests/data-version.test.ts @@ -53,7 +53,7 @@ describe('data version tests', () => { }); describe('data version filtering', () => { it('should filter entities below the requested data version', async () => { - const response = await graphQLRequest( + const response: any = await graphQLRequest( dataVersionFiltering.request, dataVersionFiltering.headers, ); diff --git a/test/integration/tests/directives.test.ts b/test/integration/tests/directives.test.ts index 90cd2f6..7942ba6 100644 --- a/test/integration/tests/directives.test.ts +++ b/test/integration/tests/directives.test.ts @@ -14,7 +14,7 @@ afterEach(async () => { describe('directives tests', () => { it('query a field with directive, directive logic activated', async () => { - const result = await graphQLRequest( + const result: any = await graphQLRequest( ` { allBooks { diff --git a/test/integration/tests/irrelevant-entities.test.ts b/test/integration/tests/irrelevant-entities.test.ts index f53d8f7..d27f209 100644 --- a/test/integration/tests/irrelevant-entities.test.ts +++ b/test/integration/tests/irrelevant-entities.test.ts @@ -19,12 +19,14 @@ afterEach(() => { describe('irrelevant entities in response', () => { it('should have irrelevant entities if the response is partial', async () => { - const result = await graphqlRawRequest( + const result: any = await graphqlRawRequest( irrelevantEntities.request, irrelevantEntities.headers, ); - const irrelevantId = (await graphQLRequest(simpleQuery.request, simpleQuery.headers)) - .allBooks[1].id; + const irrelevantId = ((await graphQLRequest( + simpleQuery.request, + simpleQuery.headers, + )) as any).allBooks[1].id; expect(result.extensions.irrelevantEntities.bookByTitle).toContain(irrelevantId); }); @@ -34,7 +36,7 @@ describe('irrelevant entities in response', () => { }); it('should place irrelevant response in the specific field info', async () => { - const result = await graphqlRawRequest( + const result: any = await graphqlRawRequest( multipleIrrelevantEntities.request, multipleIrrelevantEntities.headers, ); diff --git a/test/integration/tests/query-without-connection.test.ts b/test/integration/tests/query-without-connection.test.ts index 7afba3d..10f7e71 100644 --- a/test/integration/tests/query-without-connection.test.ts +++ b/test/integration/tests/query-without-connection.test.ts @@ -16,13 +16,13 @@ afterEach(async () => { describe('simple queries without connection', () => { it('all entities query', async () => { - const result = await graphQLRequest(simpleQuery.request, simpleQuery.headers); + const result: any = await graphQLRequest(simpleQuery.request, simpleQuery.headers); expect(result.allBooks[0].title).toEqual('Book1'); expect(result.allBooks[1].title).toEqual('Book2'); }); it('query with arguments', async () => { - const result = await graphQLRequest(argsQuery.request, argsQuery.headers); + const result: any = await graphQLRequest(argsQuery.request, argsQuery.headers); expect(result.bookByTitle[0].title).toEqual('Book3'); }); }); diff --git a/test/integration/tests/query.test.ts b/test/integration/tests/query.test.ts index 8b5334d..5ddff53 100644 --- a/test/integration/tests/query.test.ts +++ b/test/integration/tests/query.test.ts @@ -18,13 +18,13 @@ afterEach(() => { describe('simple queries', () => { it('all entities query', async () => { - const result = await graphQLRequest(simpleQuery.request, simpleQuery.headers); + const result: any = await graphQLRequest(simpleQuery.request, simpleQuery.headers); expect(result.allBooks[0].title).toEqual('Book1'); expect(result.allBooks[1].title).toEqual('Book2'); }); it('query with arguments', async () => { - const result = await graphQLRequest(argsQuery.request, argsQuery.headers); + const result: any = await graphQLRequest(argsQuery.request, argsQuery.headers); expect(result.bookByTitle[0].title).toEqual('Book3'); }); }); diff --git a/test/integration/tests/realities.test.ts b/test/integration/tests/realities.test.ts index a873967..85b03c1 100644 --- a/test/integration/tests/realities.test.ts +++ b/test/integration/tests/realities.test.ts @@ -19,7 +19,7 @@ afterEach(() => { describe('reality is specified in the headers', () => { it('should set reality of the entity from the header', async () => { - const result = await graphQLRequest( + const result: any = await graphQLRequest( mutation.request, { 'reality-id': 3 }, { @@ -32,7 +32,7 @@ describe('reality is specified in the headers', () => { }); it('should filter entities for the specific reality', async () => { - const result = await graphQLRequest( + const result: any = await graphQLRequest( includeLinkedOperDisabled.request, includeLinkedOperDisabled.headers, ); @@ -43,7 +43,7 @@ describe('reality is specified in the headers', () => { describe('include linked operational entities', () => { it('should link operational entities if set to true', async () => { - const result = await graphQLRequest( + const result: any = await graphQLRequest( includeLinkedOperEnabled.request, includeLinkedOperEnabled.headers, ); @@ -57,7 +57,7 @@ describe('reality is specified in the headers', () => { }); it('should filter operational entities if set to false', async () => { - const result = await graphQLRequest( + const result: any = await graphQLRequest( includeLinkedOperDisabled.request, includeLinkedOperDisabled.headers, ); diff --git a/test/integration/tests/snapshot-auto-with-max-3.test.ts b/test/integration/tests/snapshot-auto-with-max-3.test.ts index 712540d..dca50dd 100644 --- a/test/integration/tests/snapshot-auto-with-max-3.test.ts +++ b/test/integration/tests/snapshot-auto-with-max-3.test.ts @@ -25,7 +25,7 @@ describe('snapshot pagination tests with auto enabled', () => { describe('max page size is 3', () => { describe('snap request is true', () => { it('should not paginate if total count is smaller than minimal page size', async () => { - const paginatedResult = await graphqlRawRequest(paginatedQuery.request, { + const paginatedResult: any = await graphqlRawRequest(paginatedQuery.request, { ...paginatedQuery.headers, 'snap-page-size': 10, }); @@ -46,7 +46,7 @@ describe('snapshot pagination tests with auto enabled', () => { }); it('should not paginate if total count is smaller than minimal page size', async () => { - const paginatedResult = await graphqlRawRequest(paginatedQuery.request, { + const paginatedResult: any = await graphqlRawRequest(paginatedQuery.request, { ...paginatedQuery.headers, 'snap-request': false, 'snap-page-size': 10, diff --git a/test/integration/tests/soft-delete.test.ts b/test/integration/tests/soft-delete.test.ts index 998f115..85821e4 100644 --- a/test/integration/tests/soft-delete.test.ts +++ b/test/integration/tests/soft-delete.test.ts @@ -23,7 +23,7 @@ describe('soft delete tests', () => { const bookDeletionCriteria = { title: '4', }; - const bookToDelete = await graphQLRequest( + const bookToDelete: any = await graphQLRequest( bookByTitle.request, bookByTitle.headers, bookDeletionCriteria, @@ -31,7 +31,7 @@ describe('soft delete tests', () => { await graphQLRequest(deleteBook.request, deleteBook.headers, { id: bookToDelete.bookByTitle[0].id, }); - const afterBookDeletionResponse = await graphQLRequest( + const afterBookDeletionResponse: any = await graphQLRequest( bookByTitle.request, bookByTitle.headers, bookDeletionCriteria, @@ -48,7 +48,7 @@ describe('soft delete tests', () => { title: '1', }; - const authorToDelete = await graphQLRequest( + const authorToDelete: any = await graphQLRequest( authorsByName.request, authorsByName.headers, authorDeletionCriteria, @@ -56,7 +56,7 @@ describe('soft delete tests', () => { await graphQLRequest(deleteAuthor.request, deleteAuthor.headers, { id: authorToDelete.authorsByName[0].id, }); - const afterBookDeletionResponse = await graphQLRequest( + const afterBookDeletionResponse: any = await graphQLRequest( bookByTitle.request, bookByTitle.headers, bookDeletionCriteria, diff --git a/test/integration/tests/transactional-mutations.test.ts b/test/integration/tests/transactional-mutations.test.ts index 8a96401..d25e580 100644 --- a/test/integration/tests/transactional-mutations.test.ts +++ b/test/integration/tests/transactional-mutations.test.ts @@ -44,7 +44,7 @@ describe('transactional mutations enabled integration tests', () => { multipleMutationsWithBrokenOne.variables, ); } catch (err) { - const result = await graphqlRawRequest( + const result: any = await graphqlRawRequest( multipleMutationsWithBrokenOne.dataValidateRequest, undefined, multipleMutationsWithBrokenOne.variables, From 9e55809a0fc836522b87deaca806734639d17c05 Mon Sep 17 00:00:00 2001 From: chenshoo Date: Thu, 11 Jun 2020 16:34:52 +0300 Subject: [PATCH 2/2] fix: update apollo server --- package-lock.json | 385 +++++++++++++++++++++++++++++++--------------- package.json | 2 +- 2 files changed, 261 insertions(+), 126 deletions(-) diff --git a/package-lock.json b/package-lock.json index fe8fa26..58f24e1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1276,9 +1276,9 @@ } }, "@enigmatis/polaris-common": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/@enigmatis/polaris-common/-/polaris-common-1.4.3.tgz", - "integrity": "sha512-tLc1ZYyYVZWhWDcvies0WUsIXzzvd1s/AK4NI5sMT1Dyvafun5Q62TXDqrQ3BiKf7VomBQqVYb/aW+E+g+0kRw==", + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/@enigmatis/polaris-common/-/polaris-common-1.4.4.tgz", + "integrity": "sha512-NS1QY3d/8mZer1DN8Ckr5V8ezQaF8ZWydBj6AsSJvjxWLlzRL+eNz96e3feGAcMENkkIgMsSRiINAZOKI3cjTA==", "requires": { "apollo-server-errors": "^2.4.0", "graphql": "^14.6.0" @@ -3092,6 +3092,11 @@ "@types/node": "*" } }, + "@types/content-disposition": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/@types/content-disposition/-/content-disposition-0.5.3.tgz", + "integrity": "sha512-P1bffQfhD3O4LW0ioENXUhZ9OIa0Zn+P7M+pWgkCKaT53wVLSq0mrKksCID/FGHpFhRSxRGhgrQmfhRuzwtKdg==" + }, "@types/cookies": { "version": "0.7.4", "resolved": "https://registry.npmjs.org/@types/cookies/-/cookies-0.7.4.tgz", @@ -3213,11 +3218,12 @@ "integrity": "sha512-GJhpTepz2udxGexqos8wgaBx4I/zWIDPh/KOGEwAqtuGDkOUJu5eFvwmdBX4AmB8Odsr+9pHCQqiAqDL/yKMKw==" }, "@types/koa": { - "version": "2.11.2", - "resolved": "https://registry.npmjs.org/@types/koa/-/koa-2.11.2.tgz", - "integrity": "sha512-2UPelagNNW6bnc1I5kIzluCaheXRA9S+NyOdXEFFj9Az7jc15ek5V03kb8OTbb3tdZ5i2BIJObe86PhHvpMolg==", + "version": "2.11.3", + "resolved": "https://registry.npmjs.org/@types/koa/-/koa-2.11.3.tgz", + "integrity": "sha512-ABxVkrNWa4O/Jp24EYI/hRNqEVRlhB9g09p48neQp4m3xL1TJtdWk2NyNQSMCU45ejeELMQZBYyfstyVvO2H3Q==", "requires": { "@types/accepts": "*", + "@types/content-disposition": "*", "@types/cookies": "*", "@types/http-assert": "*", "@types/keygrip": "*", @@ -3349,9 +3355,9 @@ } }, "@types/ws": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-6.0.4.tgz", - "integrity": "sha512-PpPrX7SZW9re6+Ha8ojZG4Se8AZXgf0GK6zmfqEuCsY49LFDNXO3SByp44X3dFEqtB73lkCDAdUazhAjVPiNwg==", + "version": "7.2.5", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-7.2.5.tgz", + "integrity": "sha512-4UEih9BI1nBKii385G9id1oFrSkLcClbwtDfcYj8HJLQqZVAtb/42vXVrYvRWCcufNF/a+rZD3MxNwghA7UmCg==", "requires": { "@types/node": "*" } @@ -3567,79 +3573,131 @@ } }, "apollo-cache-control": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.9.0.tgz", - "integrity": "sha512-iLT6IT4Ul5cMfBcJAvhpk3a7AD6fXqvFxNmJEPVapVJHbSKYIjra4PTis13sOyN5Y3WQS6a+NRFxAW8+hL3q3Q==", + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.11.0.tgz", + "integrity": "sha512-dmRnQ9AXGw2SHahVGLzB/p4UW/taFBAJxifxubp8hqY5p9qdlSu4MPRq8zvV2ULMYf50rBtZyC4C+dZLqmHuHQ==", "requires": { - "apollo-server-env": "^2.4.3", - "graphql-extensions": "^0.11.0" + "apollo-server-env": "^2.4.4", + "apollo-server-plugin-base": "^0.9.0" }, "dependencies": { - "apollo-server-types": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.3.0.tgz", - "integrity": "sha512-FMo7kbTkhph9dfIQ3xDbRLObqmdQH9mwSjxhGsX+JxGMRPPXgd3+GZvCeVKOi/udxh//w1otSeAqItjvbj0tfQ==", + "apollo-engine-reporting-protobuf": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.5.1.tgz", + "integrity": "sha512-TSfr9iAaInV8dhXkesdcmqsthRkVcJkzznmiM+1Ob/GScK7r6hBYCjVDt2613EHAg9SUzTOltIKlGD+N+GJRUw==", "requires": { - "apollo-engine-reporting-protobuf": "^0.4.4", - "apollo-server-caching": "^0.5.1", - "apollo-server-env": "^2.4.3" + "@apollo/protobufjs": "^1.0.3" } }, - "graphql-extensions": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.11.0.tgz", - "integrity": "sha512-zd4qfUiJoYBx2MwJusM36SEJ+YmJ1ki8YF8nlm9mgaPDUzsnmFq4lxULxUfhLAXFwZw7MbEN2vV4V6WiNgSJLg==", + "apollo-server-env": { + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.4.4.tgz", + "integrity": "sha512-c2oddDS3lwAl6QNCIKCLEzt/dF9M3/tjjYRVdxOVN20TidybI7rAbnT4QOzf4tORnGXtiznEAvr/Kc9ahhKADg==", "requires": { - "@apollographql/apollo-tools": "^0.4.3", - "apollo-server-env": "^2.4.3", - "apollo-server-types": "^0.3.0" + "node-fetch": "^2.1.2", + "util.promisify": "^1.0.0" + } + }, + "apollo-server-plugin-base": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.9.0.tgz", + "integrity": "sha512-LWcPrsy2+xqwlNseh/QaGa/MPNopS8c4qGgh0g0cAn0lZBRrJ9Yab7dq+iQ6vdUBwIhUWYN6s9dwUWCZw2SL8g==", + "requires": { + "apollo-server-types": "^0.5.0" + } + }, + "apollo-server-types": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.5.0.tgz", + "integrity": "sha512-zhtsqqqfdeoJQAfc41Sy6WnnBVxKNgZ34BKXf/Q+kXmw7rbZ/B5SG3SJMvj1iFsbzZxILmWdUsE9aD20lEr0bg==", + "requires": { + "apollo-engine-reporting-protobuf": "^0.5.1", + "apollo-server-caching": "^0.5.1", + "apollo-server-env": "^2.4.4" } } } }, "apollo-datasource": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.7.0.tgz", - "integrity": "sha512-Yja12BgNQhzuFGG/5Nw2MQe0hkuQy2+9er09HxeEyAf2rUDIPnhPrn1MDoZTB8MU7UGfjwITC+1ofzKkkrZobA==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.7.1.tgz", + "integrity": "sha512-h++/jQAY7GA+4TBM+7ezvctFmmGNLrAPf51KsagZj+NkT9qvxp585rdsuatynVbSl59toPK2EuVmc6ilmQHf+g==", "requires": { "apollo-server-caching": "^0.5.1", - "apollo-server-env": "^2.4.3" + "apollo-server-env": "^2.4.4" + }, + "dependencies": { + "apollo-server-env": { + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.4.4.tgz", + "integrity": "sha512-c2oddDS3lwAl6QNCIKCLEzt/dF9M3/tjjYRVdxOVN20TidybI7rAbnT4QOzf4tORnGXtiznEAvr/Kc9ahhKADg==", + "requires": { + "node-fetch": "^2.1.2", + "util.promisify": "^1.0.0" + } + } } }, "apollo-engine-reporting": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.7.0.tgz", - "integrity": "sha512-jsjSnoHrRmk4XXK4aFU17YSJILmWsilKRwIeN74QJsSxjn5SCVF4EI/ebf/MNrTHpft8EhShx+wdkAcOD9ivqA==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-2.0.0.tgz", + "integrity": "sha512-FvNwORsh3nxEfvQqd2xbd468a0q/R3kYar/Bk6YQdBX5qwqUhqmOcOSxLFk8Zb77HpwHij5CPpPWJb53TU1zcA==", "requires": { - "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" }, "dependencies": { - "apollo-server-types": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.3.0.tgz", - "integrity": "sha512-FMo7kbTkhph9dfIQ3xDbRLObqmdQH9mwSjxhGsX+JxGMRPPXgd3+GZvCeVKOi/udxh//w1otSeAqItjvbj0tfQ==", + "apollo-engine-reporting-protobuf": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.5.1.tgz", + "integrity": "sha512-TSfr9iAaInV8dhXkesdcmqsthRkVcJkzznmiM+1Ob/GScK7r6hBYCjVDt2613EHAg9SUzTOltIKlGD+N+GJRUw==", "requires": { - "apollo-engine-reporting-protobuf": "^0.4.4", - "apollo-server-caching": "^0.5.1", - "apollo-server-env": "^2.4.3" + "@apollo/protobufjs": "^1.0.3" } }, - "graphql-extensions": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.11.0.tgz", - "integrity": "sha512-zd4qfUiJoYBx2MwJusM36SEJ+YmJ1ki8YF8nlm9mgaPDUzsnmFq4lxULxUfhLAXFwZw7MbEN2vV4V6WiNgSJLg==", + "apollo-server-env": { + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.4.4.tgz", + "integrity": "sha512-c2oddDS3lwAl6QNCIKCLEzt/dF9M3/tjjYRVdxOVN20TidybI7rAbnT4QOzf4tORnGXtiznEAvr/Kc9ahhKADg==", "requires": { - "@apollographql/apollo-tools": "^0.4.3", - "apollo-server-env": "^2.4.3", - "apollo-server-types": "^0.3.0" + "node-fetch": "^2.1.2", + "util.promisify": "^1.0.0" + } + }, + "apollo-server-errors": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.4.1.tgz", + "integrity": "sha512-7oEd6pUxqyWYUbQ9TA8tM0NU/3aGtXSEibo6+txUkuHe7QaxfZ2wHRp+pfT1LC1K3RXYjKj61/C2xEO19s3Kdg==" + }, + "apollo-server-plugin-base": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.9.0.tgz", + "integrity": "sha512-LWcPrsy2+xqwlNseh/QaGa/MPNopS8c4qGgh0g0cAn0lZBRrJ9Yab7dq+iQ6vdUBwIhUWYN6s9dwUWCZw2SL8g==", + "requires": { + "apollo-server-types": "^0.5.0" + } + }, + "apollo-server-types": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.5.0.tgz", + "integrity": "sha512-zhtsqqqfdeoJQAfc41Sy6WnnBVxKNgZ34BKXf/Q+kXmw7rbZ/B5SG3SJMvj1iFsbzZxILmWdUsE9aD20lEr0bg==", + "requires": { + "apollo-engine-reporting-protobuf": "^0.5.1", + "apollo-server-caching": "^0.5.1", + "apollo-server-env": "^2.4.4" } + }, + "uuid": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.1.0.tgz", + "integrity": "sha512-CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg==" } } }, @@ -3670,12 +3728,39 @@ } }, "apollo-graphql": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.4.1.tgz", - "integrity": "sha512-dz2wtGeCqUDAKAj4KXLKLZiFY791aoXduul3KcLo8/6SwqWlsuZiPe0oB8mENHZZc/EchCpTMTJZX2ZENsOt2A==", + "version": "0.4.5", + "resolved": "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.4.5.tgz", + "integrity": "sha512-0qa7UOoq7E71kBYE7idi6mNQhHLVdMEDInWk6TNw3KsSWZE2/I68gARP84Mj+paFTO5NYuw1Dht66PVX76Cc2w==", "requires": { - "apollo-env": "^0.6.2", + "apollo-env": "^0.6.5", "lodash.sortby": "^4.7.0" + }, + "dependencies": { + "@types/node-fetch": { + "version": "2.5.7", + "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.7.tgz", + "integrity": "sha512-o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw==", + "requires": { + "@types/node": "*", + "form-data": "^3.0.0" + } + }, + "apollo-env": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/apollo-env/-/apollo-env-0.6.5.tgz", + "integrity": "sha512-jeBUVsGymeTHYWp3me0R2CZRZrFeuSZeICZHCeRflHTfnQtlmbSXdy5E0pOyRM9CU4JfQkKDC98S1YglQj7Bzg==", + "requires": { + "@types/node-fetch": "2.5.7", + "core-js": "^3.0.1", + "node-fetch": "^2.2.0", + "sha.js": "^2.4.11" + } + }, + "core-js": { + "version": "3.6.5", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz", + "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==" + } } }, "apollo-link": { @@ -3745,59 +3830,82 @@ } }, "apollo-server-core": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.11.0.tgz", - "integrity": "sha512-jHLOqwTRlyWzqWNRlwr2M/xfrt+lw2pHtKYyxUGRjWFo8EM5TX1gDcTKtbtvx9p5m+ZBDAhcWp/rpq0vSz4tqg==", + "version": "2.14.3", + "resolved": "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.14.3.tgz", + "integrity": "sha512-A9RkWuHFZ04uEnXof5V02T7wfhUel7Hx9LpEN4N59mXTpb7ewW+cb0u+J+SP+Y4vDhVqaHCGoveRVKy6X2kLhw==", "requires": { "@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" }, "dependencies": { + "apollo-engine-reporting-protobuf": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.5.1.tgz", + "integrity": "sha512-TSfr9iAaInV8dhXkesdcmqsthRkVcJkzznmiM+1Ob/GScK7r6hBYCjVDt2613EHAg9SUzTOltIKlGD+N+GJRUw==", + "requires": { + "@apollo/protobufjs": "^1.0.3" + } + }, + "apollo-server-env": { + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.4.4.tgz", + "integrity": "sha512-c2oddDS3lwAl6QNCIKCLEzt/dF9M3/tjjYRVdxOVN20TidybI7rAbnT4QOzf4tORnGXtiznEAvr/Kc9ahhKADg==", + "requires": { + "node-fetch": "^2.1.2", + "util.promisify": "^1.0.0" + } + }, + "apollo-server-errors": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.4.1.tgz", + "integrity": "sha512-7oEd6pUxqyWYUbQ9TA8tM0NU/3aGtXSEibo6+txUkuHe7QaxfZ2wHRp+pfT1LC1K3RXYjKj61/C2xEO19s3Kdg==" + }, "apollo-server-plugin-base": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.7.0.tgz", - "integrity": "sha512-//xgYrBYLQSr92W0z3mYsFGoVz3wxKNsv3KcOUBhbOCGTbjZgP7vHOE1vhHhRcpZKKXmjXTVONdrnNJ+XVGi6A==", + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.9.0.tgz", + "integrity": "sha512-LWcPrsy2+xqwlNseh/QaGa/MPNopS8c4qGgh0g0cAn0lZBRrJ9Yab7dq+iQ6vdUBwIhUWYN6s9dwUWCZw2SL8g==", "requires": { - "apollo-server-types": "^0.3.0" + "apollo-server-types": "^0.5.0" } }, "apollo-server-types": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.3.0.tgz", - "integrity": "sha512-FMo7kbTkhph9dfIQ3xDbRLObqmdQH9mwSjxhGsX+JxGMRPPXgd3+GZvCeVKOi/udxh//w1otSeAqItjvbj0tfQ==", + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.5.0.tgz", + "integrity": "sha512-zhtsqqqfdeoJQAfc41Sy6WnnBVxKNgZ34BKXf/Q+kXmw7rbZ/B5SG3SJMvj1iFsbzZxILmWdUsE9aD20lEr0bg==", "requires": { - "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" } }, "graphql-extensions": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.11.0.tgz", - "integrity": "sha512-zd4qfUiJoYBx2MwJusM36SEJ+YmJ1ki8YF8nlm9mgaPDUzsnmFq4lxULxUfhLAXFwZw7MbEN2vV4V6WiNgSJLg==", + "version": "0.12.2", + "resolved": "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.12.2.tgz", + "integrity": "sha512-vFaZua5aLiCOOzxfY5qzHZ6S52BCqW7VVOwzvV52Wb5edRm3dn6u+1MR9yYyEqUHSf8LvdhEojYlOkKiaQ4ghA==", "requires": { "@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" } }, "ws": { @@ -3820,23 +3928,23 @@ } }, "apollo-server-errors": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.4.0.tgz", - "integrity": "sha512-ZouZfr2sGavvI18rgdRcyY2ausRAlVtWNOax9zca8ZG2io86dM59jXBmUVSNlVZSmBsIh45YxYC0eRvr2vmRdg==" + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.4.1.tgz", + "integrity": "sha512-7oEd6pUxqyWYUbQ9TA8tM0NU/3aGtXSEibo6+txUkuHe7QaxfZ2wHRp+pfT1LC1K3RXYjKj61/C2xEO19s3Kdg==" }, "apollo-server-express": { - "version": "2.11.0", - "resolved": "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.11.0.tgz", - "integrity": "sha512-9bbiD+zFAx+xyurc9lxYmNa9y79k/gsA1vEyPFVcv7jxzCFC5wc0tcbV7NPX2qi1Nn7K76fxo2fPNYbPFX/y0g==", + "version": "2.14.3", + "resolved": "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.14.3.tgz", + "integrity": "sha512-35PZXG6sQYB0YT+TBZ5KRxyWqknVnevuHyPG5XSAhMtWsVF2ySMzRPs6JdQTi0p2jlFTo5pt4P6FT3hRu0EFUw==", "requires": { "@apollographql/graphql-playground-html": "1.6.24", "@types/accepts": "^1.3.5", "@types/body-parser": "1.19.0", "@types/cors": "^2.8.4", - "@types/express": "4.17.2", + "@types/express": "4.17.4", "accepts": "^1.3.5", - "apollo-server-core": "^2.11.0", - "apollo-server-types": "^0.3.0", + "apollo-server-core": "^2.14.3", + "apollo-server-types": "^0.5.0", "body-parser": "^1.18.3", "cors": "^2.8.4", "express": "^4.17.1", @@ -3847,24 +3955,31 @@ "type-is": "^1.6.16" }, "dependencies": { - "@types/express": { - "version": "4.17.2", - "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.2.tgz", - "integrity": "sha512-5mHFNyavtLoJmnusB8OKJ5bshSzw+qkMIBAobLrIM48HJvunFva9mOa6aBwh64lBFyNwBbs0xiEFuj4eU/NjCA==", + "apollo-engine-reporting-protobuf": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.5.1.tgz", + "integrity": "sha512-TSfr9iAaInV8dhXkesdcmqsthRkVcJkzznmiM+1Ob/GScK7r6hBYCjVDt2613EHAg9SUzTOltIKlGD+N+GJRUw==", "requires": { - "@types/body-parser": "*", - "@types/express-serve-static-core": "*", - "@types/serve-static": "*" + "@apollo/protobufjs": "^1.0.3" + } + }, + "apollo-server-env": { + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.4.4.tgz", + "integrity": "sha512-c2oddDS3lwAl6QNCIKCLEzt/dF9M3/tjjYRVdxOVN20TidybI7rAbnT4QOzf4tORnGXtiznEAvr/Kc9ahhKADg==", + "requires": { + "node-fetch": "^2.1.2", + "util.promisify": "^1.0.0" } }, "apollo-server-types": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.3.0.tgz", - "integrity": "sha512-FMo7kbTkhph9dfIQ3xDbRLObqmdQH9mwSjxhGsX+JxGMRPPXgd3+GZvCeVKOi/udxh//w1otSeAqItjvbj0tfQ==", + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.5.0.tgz", + "integrity": "sha512-zhtsqqqfdeoJQAfc41Sy6WnnBVxKNgZ34BKXf/Q+kXmw7rbZ/B5SG3SJMvj1iFsbzZxILmWdUsE9aD20lEr0bg==", "requires": { - "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" } } } @@ -3888,32 +4003,47 @@ } }, "apollo-tracing": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.9.0.tgz", - "integrity": "sha512-oqspTrf4BLGbKkIk1vF+I31C2v7PPJmF36TFpT/+zJxNvJw54ji4ZMhtytgVqbVldQEintJmdHQIidYBGKmu+g==", + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.11.0.tgz", + "integrity": "sha512-I9IFb/8lkBW8ZwOAi4LEojfT7dMfUSkpnV8LHQI8Rcj0HtzL9HObQ3woBmzyGHdGHLFuD/6/VHyFD67SesSrJg==", "requires": { - "apollo-server-env": "^2.4.3", - "graphql-extensions": "^0.11.0" + "apollo-server-env": "^2.4.4", + "apollo-server-plugin-base": "^0.9.0" }, "dependencies": { - "apollo-server-types": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.3.0.tgz", - "integrity": "sha512-FMo7kbTkhph9dfIQ3xDbRLObqmdQH9mwSjxhGsX+JxGMRPPXgd3+GZvCeVKOi/udxh//w1otSeAqItjvbj0tfQ==", + "apollo-engine-reporting-protobuf": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.5.1.tgz", + "integrity": "sha512-TSfr9iAaInV8dhXkesdcmqsthRkVcJkzznmiM+1Ob/GScK7r6hBYCjVDt2613EHAg9SUzTOltIKlGD+N+GJRUw==", "requires": { - "apollo-engine-reporting-protobuf": "^0.4.4", - "apollo-server-caching": "^0.5.1", - "apollo-server-env": "^2.4.3" + "@apollo/protobufjs": "^1.0.3" } }, - "graphql-extensions": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.11.0.tgz", - "integrity": "sha512-zd4qfUiJoYBx2MwJusM36SEJ+YmJ1ki8YF8nlm9mgaPDUzsnmFq4lxULxUfhLAXFwZw7MbEN2vV4V6WiNgSJLg==", + "apollo-server-env": { + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-2.4.4.tgz", + "integrity": "sha512-c2oddDS3lwAl6QNCIKCLEzt/dF9M3/tjjYRVdxOVN20TidybI7rAbnT4QOzf4tORnGXtiznEAvr/Kc9ahhKADg==", "requires": { - "@apollographql/apollo-tools": "^0.4.3", - "apollo-server-env": "^2.4.3", - "apollo-server-types": "^0.3.0" + "node-fetch": "^2.1.2", + "util.promisify": "^1.0.0" + } + }, + "apollo-server-plugin-base": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.9.0.tgz", + "integrity": "sha512-LWcPrsy2+xqwlNseh/QaGa/MPNopS8c4qGgh0g0cAn0lZBRrJ9Yab7dq+iQ6vdUBwIhUWYN6s9dwUWCZw2SL8g==", + "requires": { + "apollo-server-types": "^0.5.0" + } + }, + "apollo-server-types": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.5.0.tgz", + "integrity": "sha512-zhtsqqqfdeoJQAfc41Sy6WnnBVxKNgZ34BKXf/Q+kXmw7rbZ/B5SG3SJMvj1iFsbzZxILmWdUsE9aD20lEr0bg==", + "requires": { + "apollo-engine-reporting-protobuf": "^0.5.1", + "apollo-server-caching": "^0.5.1", + "apollo-server-env": "^2.4.4" } } } @@ -11185,6 +11315,11 @@ "triple-beam": "^1.3.0" } }, + "loglevel": { + "version": "1.6.8", + "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.8.tgz", + "integrity": "sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA==" + }, "lolex": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/lolex/-/lolex-5.1.2.tgz", diff --git a/package.json b/package.json index 5f25704..bd811c2 100644 --- a/package.json +++ b/package.json @@ -68,7 +68,7 @@ }, "homepage": "https://github.com/Enigmatis/polaris-core#readme", "dependencies": { - "@enigmatis/polaris-common": "^1.4.3", + "@enigmatis/polaris-common": "^1.4.4", "@enigmatis/polaris-graphql-logger": "^1.4.2", "@enigmatis/polaris-logs": "^2.8.2", "@enigmatis/polaris-middlewares": "^1.4.5",