diff --git a/packages/redux-devtools-cli/package.json b/packages/redux-devtools-cli/package.json index 6d054c7d..7c4f665c 100644 --- a/packages/redux-devtools-cli/package.json +++ b/packages/redux-devtools-cli/package.json @@ -40,9 +40,9 @@ "node": ">=14.15.0" }, "dependencies": { + "@apollo/server": "^4.3.0", "@redux-devtools/app": "^2.1.3", "@types/react": "^18.0.26", - "apollo-server-express": "^3.11.1", "body-parser": "^1.20.1", "chalk": "^4.1.2", "cors": "^2.8.5", diff --git a/packages/redux-devtools-cli/src/middleware/graphql.ts b/packages/redux-devtools-cli/src/middleware/graphql.ts deleted file mode 100644 index e5c3e45a..00000000 --- a/packages/redux-devtools-cli/src/middleware/graphql.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { ApolloServer } from 'apollo-server-express'; -import { schema, resolvers } from '../api/schema'; -import { Store } from '../store'; - -export default function (store: Store) { - return new ApolloServer({ - typeDefs: schema, - resolvers, - context: { - store: store, - }, - }); -} diff --git a/packages/redux-devtools-cli/src/routes.ts b/packages/redux-devtools-cli/src/routes.ts index 9ea4766a..77045ce9 100644 --- a/packages/redux-devtools-cli/src/routes.ts +++ b/packages/redux-devtools-cli/src/routes.ts @@ -6,7 +6,8 @@ import * as http from 'http'; import bodyParser from 'body-parser'; import cors from 'cors'; import { AGServer } from 'socketcluster-server'; -import { ApolloServer } from 'apollo-server-express'; +import { ApolloServer } from '@apollo/server'; +import { expressMiddleware } from '@apollo/server/express4'; import { AddData, ReportBaseFields, Store } from './store'; import { resolvers, schema } from './api/schema'; @@ -20,6 +21,10 @@ function serveUmdModule(name: string) { ); } +interface Context { + store?: Store; +} + function routes( options: AGServer.AGServerOptions, store: Store, @@ -42,19 +47,19 @@ function routes( else app.use(morgan('combined')); } - const server = new ApolloServer({ + const server = new ApolloServer({ typeDefs: schema, resolvers, - context: { - store: store, - }, }); server .start() .then(() => { - server.applyMiddleware({ app } as { - app: express.Application; - }); + app.use( + '/graphql', + cors(), + bodyParser.json(), + expressMiddleware(server, { context: () => Promise.resolve({ store }) }) + ); }) .catch((error) => { console.error(error); // eslint-disable-line no-console diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c177fe35..badc82c1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -922,6 +922,7 @@ importers: packages/redux-devtools-cli: specifiers: + '@apollo/server': ^4.3.0 '@redux-devtools/app': ^2.1.3 '@types/body-parser': ^1.19.2 '@types/cors': ^2.8.13 @@ -941,7 +942,6 @@ importers: '@types/uuid': ^9.0.0 '@typescript-eslint/eslint-plugin': ^5.47.0 '@typescript-eslint/parser': ^5.47.0 - apollo-server-express: ^3.11.1 body-parser: ^1.20.1 chalk: ^4.1.2 cors: ^2.8.5 @@ -974,9 +974,9 @@ importers: typescript: ~4.9.4 uuid: ^9.0.0 dependencies: + '@apollo/server': 4.3.0_graphql@16.6.0 '@redux-devtools/app': link:../redux-devtools-app '@types/react': 18.0.26 - apollo-server-express: 3.11.1_5ha345eiak62qiwwva5z4dp6gu body-parser: 1.20.1 chalk: 4.1.2 cors: 2.8.5 @@ -2439,24 +2439,12 @@ packages: '@jridgewell/gen-mapping': 0.1.1 '@jridgewell/trace-mapping': 0.3.17 - /@apollo/protobufjs/1.2.6: - resolution: {integrity: sha512-Wqo1oSHNUj/jxmsVp4iR3I480p6qdqHikn38lKrFhfzcDJ7lwd7Ck7cHRl4JE81tWNArl77xhnG/OkZhxKBYOw==} - hasBin: true - requiresBuild: true + /@apollo/cache-control-types/1.0.2_graphql@16.6.0: + resolution: {integrity: sha512-Por80co1eUm4ATsvjCOoS/tIR8PHxqVjsA6z76I6Vw0rFn4cgyVElQcmQDIZiYsy41k8e5xkrMRECkM2WR8pNw==} + peerDependencies: + graphql: 14.x || 15.x || 16.x dependencies: - '@protobufjs/aspromise': 1.1.2 - '@protobufjs/base64': 1.1.2 - '@protobufjs/codegen': 2.0.4 - '@protobufjs/eventemitter': 1.1.0 - '@protobufjs/fetch': 1.1.0 - '@protobufjs/float': 1.0.2 - '@protobufjs/inquire': 1.1.0 - '@protobufjs/path': 1.1.2 - '@protobufjs/pool': 1.1.0 - '@protobufjs/utf8': 1.1.0 - '@types/long': 4.0.2 - '@types/node': 10.17.60 - long: 4.0.0 + graphql: 16.6.0 dev: false /@apollo/protobufjs/1.2.7: @@ -2478,53 +2466,123 @@ packages: long: 4.0.0 dev: false + /@apollo/server-gateway-interface/1.0.7_graphql@16.6.0: + resolution: {integrity: sha512-Eas36z851D0B0Hw8Ihpig2thHcoVAcFE7/I0+DAOaXr70r8kajPq5QHhngqFrlSTVl4AlJ7Yw1SGaWdvuSmDPQ==} + peerDependencies: + graphql: 14.x || 15.x || 16.x + dependencies: + '@apollo/usage-reporting-protobuf': 4.0.2 + '@apollo/utils.fetcher': 2.0.0 + '@apollo/utils.keyvaluecache': 2.1.0 + '@apollo/utils.logger': 2.0.0 + graphql: 16.6.0 + dev: false + + /@apollo/server/4.3.0_graphql@16.6.0: + resolution: {integrity: sha512-M30z/hExJtvqGE4UFJTa0W7FoRPPXmEjrrHK16+v63hE+deH1gYiXq0MdXKvMdoQhQQqnv09jo9mDDEpMBJvjg==} + engines: {node: '>=14.16.0'} + peerDependencies: + graphql: ^16.6.0 + dependencies: + '@apollo/cache-control-types': 1.0.2_graphql@16.6.0 + '@apollo/server-gateway-interface': 1.0.7_graphql@16.6.0 + '@apollo/usage-reporting-protobuf': 4.0.2 + '@apollo/utils.createhash': 2.0.0 + '@apollo/utils.fetcher': 2.0.0 + '@apollo/utils.isnodelike': 2.0.0 + '@apollo/utils.keyvaluecache': 2.1.0 + '@apollo/utils.logger': 2.0.0 + '@apollo/utils.usagereporting': 2.0.0_graphql@16.6.0 + '@apollo/utils.withrequired': 2.0.0 + '@graphql-tools/schema': 9.0.12_graphql@16.6.0 + '@josephg/resolvable': 1.0.1 + '@types/express': 4.17.15 + '@types/express-serve-static-core': 4.17.31 + '@types/node-fetch': 2.6.2 + async-retry: 1.3.3 + body-parser: 1.20.1 + cors: 2.8.5 + express: 4.18.2 + graphql: 16.6.0 + loglevel: 1.8.1 + lru-cache: 7.13.1 + negotiator: 0.6.3 + node-abort-controller: 3.0.1 + node-fetch: 2.6.7 + uuid: 9.0.0 + whatwg-mimetype: 3.0.0 + transitivePeerDependencies: + - encoding + - supports-color + dev: false + /@apollo/usage-reporting-protobuf/4.0.2: resolution: {integrity: sha512-GfE8aDqi/lAFut95pjH9IRvH0zGsQ5G/2lYL0ZLZfML7ArX+A4UVHFANQcPCcUYGE6bI6OPhLekg4Vsjf6B1cw==} dependencies: '@apollo/protobufjs': 1.2.7 dev: false - /@apollo/utils.dropunuseddefinitions/1.1.0_graphql@16.6.0: - resolution: {integrity: sha512-jU1XjMr6ec9pPoL+BFWzEPW7VHHulVdGKMkPAMiCigpVIT11VmCbnij0bWob8uS3ODJ65tZLYKAh/55vLw2rbg==} - engines: {node: '>=12.13.0'} + /@apollo/utils.createhash/2.0.0: + resolution: {integrity: sha512-9GhGGD3J0HJF/VC+odwYpKi3Cg1NWrsO8GQvyGwDS5v/78I3154Hn8s4tpW+nqoaQ/lAvxdQQr3HM1b5HLM6Ww==} + engines: {node: '>=14'} + dependencies: + '@apollo/utils.isnodelike': 2.0.0 + sha.js: 2.4.11 + dev: false + + /@apollo/utils.dropunuseddefinitions/2.0.0_graphql@16.6.0: + resolution: {integrity: sha512-BoPW+Z3kA8kLh0FCWyzOt+R77W5mVZWer5s6UyvVwZ/qROGiEgcHXFcI5TMMndpXoDo0xBSvQV0lIKYHbJQ7+g==} + engines: {node: '>=14'} peerDependencies: graphql: 14.x || 15.x || 16.x dependencies: graphql: 16.6.0 dev: false - /@apollo/utils.keyvaluecache/1.0.2: - resolution: {integrity: sha512-p7PVdLPMnPzmXSQVEsy27cYEjVON+SH/Wb7COyW3rQN8+wJgT1nv9jZouYtztWW8ZgTkii5T6tC9qfoDREd4mg==} + /@apollo/utils.fetcher/2.0.0: + resolution: {integrity: sha512-RC0twEwwBKbhk/y4B2X4YEciRG1xoKMgiPy5xQqNMd3pG78sR+ybctG/m7c/8+NaaQOS22UPUCBd6yS6WihBIg==} + engines: {node: '>=14'} + dev: false + + /@apollo/utils.isnodelike/2.0.0: + resolution: {integrity: sha512-77CiAM2qDXn0haQYrgX0UgrboQykb+bOHaz5p3KKItMwUZ/EFphzuB2vqHvubneIc9dxJcTx2L7MFDswRw/JAQ==} + engines: {node: '>=14'} + dev: false + + /@apollo/utils.keyvaluecache/2.1.0: + resolution: {integrity: sha512-WBNI4H1dGX2fHMk5j4cJo7mlXWn1X6DYCxQ50IvmI7Xv7Y4QKiA5EwbLOCITh9OIZQrVX7L0ASBSgTt6jYx/cg==} + engines: {node: '>=14'} dependencies: - '@apollo/utils.logger': 1.0.1 - lru-cache: 7.13.1 + '@apollo/utils.logger': 2.0.0 + lru-cache: 7.14.1 dev: false - /@apollo/utils.logger/1.0.1: - resolution: {integrity: sha512-XdlzoY7fYNK4OIcvMD2G94RoFZbzTQaNP0jozmqqMudmaGo2I/2Jx71xlDJ801mWA/mbYRihyaw6KJii7k5RVA==} + /@apollo/utils.logger/2.0.0: + resolution: {integrity: sha512-o8qYwgV2sYg+PcGKIfwAZaZsQOTEfV8q3mH7Pw8GB/I/Uh2L9iaHdpiKuR++j7oe1K87lFm0z/JAezMOR9CGhg==} + engines: {node: '>=14'} dev: false - /@apollo/utils.printwithreducedwhitespace/1.1.0_graphql@16.6.0: - resolution: {integrity: sha512-GfFSkAv3n1toDZ4V6u2d7L4xMwLA+lv+6hqXicMN9KELSJ9yy9RzuEXaX73c/Ry+GzRsBy/fdSUGayGqdHfT2Q==} - engines: {node: '>=12.13.0'} + /@apollo/utils.printwithreducedwhitespace/2.0.0_graphql@16.6.0: + resolution: {integrity: sha512-S+wyxFyuO0LJ8v+mg8c7rRwyKZ+9xlO5wXD/UgaysH3rcCe9NBHRWx/9cmdZ9nTqgKC5X01uHZ6Gsi6pOrUGgw==} + engines: {node: '>=14'} peerDependencies: graphql: 14.x || 15.x || 16.x dependencies: graphql: 16.6.0 dev: false - /@apollo/utils.removealiases/1.0.0_graphql@16.6.0: - resolution: {integrity: sha512-6cM8sEOJW2LaGjL/0vHV0GtRaSekrPQR4DiywaApQlL9EdROASZU5PsQibe2MWeZCOhNrPRuHh4wDMwPsWTn8A==} - engines: {node: '>=12.13.0'} + /@apollo/utils.removealiases/2.0.0_graphql@16.6.0: + resolution: {integrity: sha512-PT5ICz2SfrMCRsR3DhW2E1anX6hcqVXE/uHpmRHbhqSoQODZKG34AlFm1tC8u3MC3eK5gcvtpGvPHF/cwVfakg==} + engines: {node: '>=14'} peerDependencies: graphql: 14.x || 15.x || 16.x dependencies: graphql: 16.6.0 dev: false - /@apollo/utils.sortast/1.1.0_graphql@16.6.0: - resolution: {integrity: sha512-VPlTsmUnOwzPK5yGZENN069y6uUHgeiSlpEhRnLFYwYNoJHsuJq2vXVwIaSmts015WTPa2fpz1inkLYByeuRQA==} - engines: {node: '>=12.13.0'} + /@apollo/utils.sortast/2.0.0_graphql@16.6.0: + resolution: {integrity: sha512-VKoVOh8xkvh5HabtyGTekIYbwXdyYFPodFuHpWp333Fo2KBmpczLY+RBMHEr3v2MLoXDn/WUMtR3JZmvFJ45zw==} + engines: {node: '>=14'} peerDependencies: graphql: 14.x || 15.x || 16.x dependencies: @@ -2532,43 +2590,33 @@ packages: lodash.sortby: 4.7.0 dev: false - /@apollo/utils.stripsensitiveliterals/1.2.0_graphql@16.6.0: - resolution: {integrity: sha512-E41rDUzkz/cdikM5147d8nfCFVKovXxKBcjvLEQ7bjZm/cg9zEcXvS6vFY8ugTubI3fn6zoqo0CyU8zT+BGP9w==} - engines: {node: '>=12.13.0'} + /@apollo/utils.stripsensitiveliterals/2.0.0_graphql@16.6.0: + resolution: {integrity: sha512-pzj1XINetE54uxIjc4bN6gVzDWYP8OZ/yB0xMTgvzttu1VLgXf3BTV76d9hlqLoe8cV0JiD+xLpJktrHOzmBJQ==} + engines: {node: '>=14'} peerDependencies: graphql: 14.x || 15.x || 16.x dependencies: graphql: 16.6.0 dev: false - /@apollo/utils.usagereporting/1.0.1_graphql@16.6.0: - resolution: {integrity: sha512-6dk+0hZlnDbahDBB2mP/PZ5ybrtCJdLMbeNJD+TJpKyZmSY6bA3SjI8Cr2EM9QA+AdziywuWg+SgbWUF3/zQqQ==} - engines: {node: '>=12.13.0'} + /@apollo/utils.usagereporting/2.0.0_graphql@16.6.0: + resolution: {integrity: sha512-9VvVgA/LzKkBEYEGwE9doL1Sl+VRULkbB3D7W+ImJ028jJuTllvlQsh4Xpqz8mJWprfKx4m/i2DwHtElHWU2vg==} + engines: {node: '>=14'} peerDependencies: graphql: 14.x || 15.x || 16.x dependencies: '@apollo/usage-reporting-protobuf': 4.0.2 - '@apollo/utils.dropunuseddefinitions': 1.1.0_graphql@16.6.0 - '@apollo/utils.printwithreducedwhitespace': 1.1.0_graphql@16.6.0 - '@apollo/utils.removealiases': 1.0.0_graphql@16.6.0 - '@apollo/utils.sortast': 1.1.0_graphql@16.6.0 - '@apollo/utils.stripsensitiveliterals': 1.2.0_graphql@16.6.0 + '@apollo/utils.dropunuseddefinitions': 2.0.0_graphql@16.6.0 + '@apollo/utils.printwithreducedwhitespace': 2.0.0_graphql@16.6.0 + '@apollo/utils.removealiases': 2.0.0_graphql@16.6.0 + '@apollo/utils.sortast': 2.0.0_graphql@16.6.0 + '@apollo/utils.stripsensitiveliterals': 2.0.0_graphql@16.6.0 graphql: 16.6.0 dev: false - /@apollographql/apollo-tools/0.5.4_graphql@16.6.0: - resolution: {integrity: sha512-shM3q7rUbNyXVVRkQJQseXv6bnYM3BUma/eZhwXR4xsuM+bqWnJKvW7SAfRjP7LuSCocrexa5AXhjjawNHrIlw==} - engines: {node: '>=8', npm: '>=6'} - peerDependencies: - graphql: ^14.2.1 || ^15.0.0 || ^16.0.0 - dependencies: - graphql: 16.6.0 - dev: false - - /@apollographql/graphql-playground-html/1.6.29: - resolution: {integrity: sha512-xCcXpoz52rI4ksJSdOCxeOCn2DLocxwHf9dVT/Q90Pte1LX+LY+91SFtJF3KXVHH8kEin+g1KKCQPKBjZJfWNA==} - dependencies: - xss: 1.0.14 + /@apollo/utils.withrequired/2.0.0: + resolution: {integrity: sha512-+djpTu6AEE/A1etryZs9tmXRyDY6XXGe3G29MS/LB09uHq3pcl3n4Q5lvDTL5JWKuJixrulg5djePLDAooG8dQ==} + engines: {node: '>=14'} dev: false /@babel/cli/7.19.3_@babel+core@7.20.5: @@ -5526,40 +5574,6 @@ packages: tslib: 2.4.1 dev: false - /@graphql-tools/merge/8.3.1_graphql@16.6.0: - resolution: {integrity: sha512-BMm99mqdNZbEYeTPK3it9r9S6rsZsQKtlqJsSBknAclXq2pGEfOxjcIZi+kBSkHZKPKCRrYDd5vY0+rUmIHVLg==} - peerDependencies: - graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 - dependencies: - '@graphql-tools/utils': 8.9.0_graphql@16.6.0 - graphql: 16.6.0 - tslib: 2.4.1 - dev: false - - /@graphql-tools/mock/8.7.14_graphql@16.6.0: - resolution: {integrity: sha512-kIYirhGqhhSI6p/5qj95U8Lngm4mml5B3Z/r7ShI4+/EACyOOV+wUlql45+Y21b9NRUxJbsNHpztGxzgCSyviQ==} - peerDependencies: - graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 - dependencies: - '@graphql-tools/schema': 9.0.12_graphql@16.6.0 - '@graphql-tools/utils': 9.1.3_graphql@16.6.0 - fast-json-stable-stringify: 2.1.0 - graphql: 16.6.0 - tslib: 2.4.1 - dev: false - - /@graphql-tools/schema/8.5.1_graphql@16.6.0: - resolution: {integrity: sha512-0Esilsh0P/qYcB5DKQpiKeQs/jevzIadNTaT0jeWklPMwNbT7yMX4EqZany7mbeRRlSRwMzNzL5olyFdffHBZg==} - peerDependencies: - graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 - dependencies: - '@graphql-tools/merge': 8.3.1_graphql@16.6.0 - '@graphql-tools/utils': 8.9.0_graphql@16.6.0 - graphql: 16.6.0 - tslib: 2.4.1 - value-or-promise: 1.0.11 - dev: false - /@graphql-tools/schema/9.0.12_graphql@16.6.0: resolution: {integrity: sha512-DmezcEltQai0V1y96nwm0Kg11FDS/INEFekD4nnVgzBqawvznWqK6D6bujn+cw6kivoIr3Uq//QmU/hBlBzUlQ==} peerDependencies: @@ -5572,15 +5586,6 @@ packages: value-or-promise: 1.0.11 dev: false - /@graphql-tools/utils/8.9.0_graphql@16.6.0: - resolution: {integrity: sha512-pjJIWH0XOVnYGXCqej8g/u/tsfV4LvLlj0eATKQu5zwnxd/TiTHq7Cg313qUPTFFHZ3PP5wJ15chYVtLDwaymg==} - peerDependencies: - graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 - dependencies: - graphql: 16.6.0 - tslib: 2.4.1 - dev: false - /@graphql-tools/utils/9.1.3_graphql@16.6.0: resolution: {integrity: sha512-bbJyKhs6awp1/OmP+WKA1GOyu9UbgZGkhIj5srmiMGLHohEOKMjW784Sk0BZil1w2x95UPu0WHw6/d/HVCACCg==} peerDependencies: @@ -7976,12 +7981,6 @@ packages: resolution: {integrity: sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==} dev: true - /@types/accepts/1.3.5: - resolution: {integrity: sha512-jOdnI/3qTpHABjM5cx1Hc0sKsPoYCp+DP/GJRGtDlPd7fiV9oXGGIcjW/ZOxLIvjGz8MA+uMZI9metHlgqbgwQ==} - dependencies: - '@types/node': 18.11.17 - dev: false - /@types/ag-auth/1.0.0: resolution: {integrity: sha512-9Zri8Apx8al2ZfqcsJ5X39GoirGiVcP7sp1I4mOgsRwXeAwPGadE//44jMHTpCpVDwQ4geGzmD2KMlZspAAcdA==} dependencies: @@ -8080,7 +8079,7 @@ packages: dependencies: '@types/http-cache-semantics': 4.0.1 '@types/keyv': 3.1.4 - '@types/node': 16.18.10 + '@types/node': 18.11.17 '@types/responselike': 1.0.0 /@types/chrome/0.0.206: @@ -8157,10 +8156,6 @@ packages: - webpack-cli dev: true - /@types/cors/2.8.12: - resolution: {integrity: sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==} - dev: false - /@types/cors/2.8.13: resolution: {integrity: sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA==} dependencies: @@ -8366,15 +8361,6 @@ packages: '@types/qs': 6.9.7 '@types/range-parser': 1.2.4 - /@types/express/4.17.14: - resolution: {integrity: sha512-TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg==} - dependencies: - '@types/body-parser': 1.19.2 - '@types/express-serve-static-core': 4.17.31 - '@types/qs': 6.9.7 - '@types/serve-static': 1.15.0 - dev: false - /@types/express/4.17.15: resolution: {integrity: sha512-Yv0k4bXGOH+8a+7bELd2PqHQsuiANB+A8a4gnQrkRWzrkKlb6KHaVvyXhqs04sVW/OWlbPyYxRgYlIXLfrufMQ==} dependencies: @@ -8382,7 +8368,6 @@ packages: '@types/express-serve-static-core': 4.17.31 '@types/qs': 6.9.7 '@types/serve-static': 1.15.0 - dev: true /@types/filesystem/0.0.32: resolution: {integrity: sha512-Yuf4jR5YYMR2DVgwuCiP11s0xuVRyPKmz8vo6HBY3CGdeMj8af93CFZX+T82+VD1+UqHOxTq31lO7MI7lepBtQ==} @@ -8530,7 +8515,7 @@ packages: /@types/keyv/3.1.4: resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==} dependencies: - '@types/node': 16.18.10 + '@types/node': 18.11.17 /@types/lodash.curry/4.1.7: resolution: {integrity: sha512-R+IkSvh7CI8klh7FkQuTAiAR+aPFqYrNEjw/hMxjCSO7TsAqBAxpR99PxxJN1lgE6YuvpHEoktqbh6V5VLzxZA==} @@ -8596,13 +8581,8 @@ packages: /@types/node-fetch/2.6.2: resolution: {integrity: sha512-DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A==} dependencies: - '@types/node': 16.18.10 + '@types/node': 18.11.17 form-data: 3.0.1 - dev: true - - /@types/node/10.17.60: - resolution: {integrity: sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==} - dev: false /@types/node/12.20.55: resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} @@ -8716,7 +8696,7 @@ packages: /@types/responselike/1.0.0: resolution: {integrity: sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==} dependencies: - '@types/node': 16.18.10 + '@types/node': 18.11.17 /@types/retry/0.12.0: resolution: {integrity: sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==} @@ -9725,134 +9705,6 @@ packages: normalize-path: 3.0.0 picomatch: 2.3.1 - /apollo-datasource/3.3.2: - resolution: {integrity: sha512-L5TiS8E2Hn/Yz7SSnWIVbZw0ZfEIXZCa5VUiVxD9P53JvSrf4aStvsFDlGWPvpIdCR+aly2CfoB79B9/JjKFqg==} - engines: {node: '>=12.0'} - deprecated: The `apollo-datasource` package is part of Apollo Server v2 and v3, which are now deprecated (end-of-life October 22nd 2023). See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details. - dependencies: - '@apollo/utils.keyvaluecache': 1.0.2 - apollo-server-env: 4.2.1 - transitivePeerDependencies: - - encoding - dev: false - - /apollo-reporting-protobuf/3.3.3: - resolution: {integrity: sha512-L3+DdClhLMaRZWVmMbBcwl4Ic77CnEBPXLW53F7hkYhkaZD88ivbCVB1w/x5gunO6ZHrdzhjq0FHmTsBvPo7aQ==} - deprecated: The `apollo-reporting-protobuf` package is part of Apollo Server v2 and v3, which are now deprecated (end-of-life October 22nd 2023). This package's functionality is now found in the `@apollo/usage-reporting-protobuf` package. See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details. - dependencies: - '@apollo/protobufjs': 1.2.6 - dev: false - - /apollo-server-core/3.11.1_graphql@16.6.0: - resolution: {integrity: sha512-t/eCKrRFK1lYZlc5pHD99iG7Np7CEm3SmbDiONA7fckR3EaB/pdsEdIkIwQ5QBBpT5JLp/nwvrZRVwhaWmaRvw==} - engines: {node: '>=12.0'} - deprecated: The `apollo-server-core` package is part of Apollo Server v2 and v3, which are now deprecated (end-of-life October 22nd 2023). This package's functionality is now found in the `@apollo/server` package. See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details. - peerDependencies: - graphql: ^15.3.0 || ^16.0.0 - dependencies: - '@apollo/utils.keyvaluecache': 1.0.2 - '@apollo/utils.logger': 1.0.1 - '@apollo/utils.usagereporting': 1.0.1_graphql@16.6.0 - '@apollographql/apollo-tools': 0.5.4_graphql@16.6.0 - '@apollographql/graphql-playground-html': 1.6.29 - '@graphql-tools/mock': 8.7.14_graphql@16.6.0 - '@graphql-tools/schema': 8.5.1_graphql@16.6.0 - '@josephg/resolvable': 1.0.1 - apollo-datasource: 3.3.2 - apollo-reporting-protobuf: 3.3.3 - apollo-server-env: 4.2.1 - apollo-server-errors: 3.3.1_graphql@16.6.0 - apollo-server-plugin-base: 3.7.1_graphql@16.6.0 - apollo-server-types: 3.7.1_graphql@16.6.0 - async-retry: 1.3.3 - fast-json-stable-stringify: 2.1.0 - graphql: 16.6.0 - graphql-tag: 2.12.6_graphql@16.6.0 - loglevel: 1.8.1 - lru-cache: 6.0.0 - node-abort-controller: 3.0.1 - sha.js: 2.4.11 - uuid: 9.0.0 - whatwg-mimetype: 3.0.0 - transitivePeerDependencies: - - encoding - dev: false - - /apollo-server-env/4.2.1: - resolution: {integrity: sha512-vm/7c7ld+zFMxibzqZ7SSa5tBENc4B0uye9LTfjJwGoQFY5xsUPH5FpO5j0bMUDZ8YYNbrF9SNtzc5Cngcr90g==} - engines: {node: '>=12.0'} - deprecated: The `apollo-server-env` package is part of Apollo Server v2 and v3, which are now deprecated (end-of-life October 22nd 2023). This package's functionality is now found in the `@apollo/utils.fetcher` package. See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details. - dependencies: - node-fetch: 2.6.7 - transitivePeerDependencies: - - encoding - dev: false - - /apollo-server-errors/3.3.1_graphql@16.6.0: - resolution: {integrity: sha512-xnZJ5QWs6FixHICXHxUfm+ZWqqxrNuPlQ+kj5m6RtEgIpekOPssH/SD9gf2B4HuWV0QozorrygwZnux8POvyPA==} - engines: {node: '>=12.0'} - deprecated: The `apollo-server-errors` package is part of Apollo Server v2 and v3, which are now deprecated (end-of-life October 22nd 2023). This package's functionality is now found in the `@apollo/server` package. See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details. - peerDependencies: - graphql: ^15.3.0 || ^16.0.0 - dependencies: - graphql: 16.6.0 - dev: false - - /apollo-server-express/3.11.1_5ha345eiak62qiwwva5z4dp6gu: - resolution: {integrity: sha512-x9ngcpXbBlt4naCXTwNtBFb/mOd9OU0wtFXvJkObHF26NsRazu3DxDfEuekA6V1NFOocD+A9jmVMQeQWug5MgA==} - engines: {node: '>=12.0'} - deprecated: The `apollo-server-express` package is part of Apollo Server v2 and v3, which are now deprecated (end-of-life October 22nd 2023). This package's functionality is now found in the `@apollo/server` package. See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details. - peerDependencies: - express: ^4.17.1 - graphql: ^15.3.0 || ^16.0.0 - dependencies: - '@types/accepts': 1.3.5 - '@types/body-parser': 1.19.2 - '@types/cors': 2.8.12 - '@types/express': 4.17.14 - '@types/express-serve-static-core': 4.17.31 - accepts: 1.3.8 - apollo-server-core: 3.11.1_graphql@16.6.0 - apollo-server-types: 3.7.1_graphql@16.6.0 - body-parser: 1.20.1 - cors: 2.8.5 - express: 4.18.2 - graphql: 16.6.0 - parseurl: 1.3.3 - transitivePeerDependencies: - - encoding - - supports-color - dev: false - - /apollo-server-plugin-base/3.7.1_graphql@16.6.0: - resolution: {integrity: sha512-g3vJStmQtQvjGI289UkLMfThmOEOddpVgHLHT2bNj0sCD/bbisj4xKbBHETqaURokteqSWyyd4RDTUe0wAUDNQ==} - engines: {node: '>=12.0'} - deprecated: The `apollo-server-plugin-base` package is part of Apollo Server v2 and v3, which are now deprecated (end-of-life October 22nd 2023). This package's functionality is now found in the `@apollo/server` package. See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details. - peerDependencies: - graphql: ^15.3.0 || ^16.0.0 - dependencies: - apollo-server-types: 3.7.1_graphql@16.6.0 - graphql: 16.6.0 - transitivePeerDependencies: - - encoding - dev: false - - /apollo-server-types/3.7.1_graphql@16.6.0: - resolution: {integrity: sha512-aE9RDVplmkaOj/OduNmGa+0a1B5RIWI0o3zC1zLvBTVWMKTpo0ifVf11TyMkLCY+T7cnZqVqwyShziOyC3FyUw==} - engines: {node: '>=12.0'} - deprecated: The `apollo-server-types` package is part of Apollo Server v2 and v3, which are now deprecated (end-of-life October 22nd 2023). This package's functionality is now found in the `@apollo/server` package. See https://www.apollographql.com/docs/apollo-server/previous-versions/ for more details. - peerDependencies: - graphql: ^15.3.0 || ^16.0.0 - dependencies: - '@apollo/utils.keyvaluecache': 1.0.2 - '@apollo/utils.logger': 1.0.1 - apollo-reporting-protobuf: 3.3.3 - apollo-server-env: 4.2.1 - graphql: 16.6.0 - transitivePeerDependencies: - - encoding - dev: false - /app-root-dir/1.0.2: resolution: {integrity: sha512-jlpIfsOoNoafl92Sz//64uQHGSyMrD2vYG5d8o2a4qGvyNCvXur7bzIsWtAC/6flI2RYAp3kv8rsfBtaLm7w0g==} dev: true @@ -10114,7 +9966,6 @@ packages: /asynckit/0.4.0: resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==} - dev: true /at-least-node/1.0.0: resolution: {integrity: sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==} @@ -11332,7 +11183,6 @@ packages: engines: {node: '>= 0.8'} dependencies: delayed-stream: 1.0.0 - dev: true /comma-separated-tokens/1.0.8: resolution: {integrity: sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw==} @@ -11340,6 +11190,7 @@ packages: /commander/2.20.3: resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==} + dev: true /commander/4.1.1: resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==} @@ -11860,10 +11711,6 @@ packages: hasBin: true dev: true - /cssfilter/0.0.10: - resolution: {integrity: sha512-FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw==} - dev: false - /cssom/0.3.8: resolution: {integrity: sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==} dev: true @@ -12354,7 +12201,6 @@ packages: /delayed-stream/1.0.0: resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==} engines: {node: '>=0.4.0'} - dev: true /delegates/1.0.0: resolution: {integrity: sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==} @@ -13825,7 +13671,6 @@ packages: asynckit: 0.4.0 combined-stream: 1.0.8 mime-types: 2.1.35 - dev: true /form-data/4.0.0: resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==} @@ -14289,16 +14134,6 @@ packages: resolution: {integrity: sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==} dev: true - /graphql-tag/2.12.6_graphql@16.6.0: - resolution: {integrity: sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg==} - engines: {node: '>=10'} - peerDependencies: - graphql: ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 - dependencies: - graphql: 16.6.0 - tslib: 2.4.1 - dev: false - /graphql/15.8.0: resolution: {integrity: sha512-5gghUc24tP9HRznNpV2+FIoq3xKkj5dTQqf4v0CpdPbFVwFkWoxOM+o+2OC9ZSvjEMTjfmG9QT+gcvggTwW1zw==} engines: {node: '>= 10.x'} @@ -16964,6 +16799,11 @@ packages: engines: {node: '>=12'} dev: false + /lru-cache/7.14.1: + resolution: {integrity: sha512-ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA==} + engines: {node: '>=12'} + dev: false + /lz-string/1.4.4: resolution: {integrity: sha512-0ckx7ZHRPqb0oUm8zNr+90mtf9DQB60H1wMCjBtfi62Kl3a7JbHob6gA2bC+xRvZoOL+1hzUK8jeuEIQE8svEQ==} hasBin: true @@ -22885,15 +22725,6 @@ packages: resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==} dev: true - /xss/1.0.14: - resolution: {integrity: sha512-og7TEJhXvn1a7kzZGQ7ETjdQVS2UfZyTlsEdDOqvQF7GoxNfY+0YLCzBy1kPdsDDx4QuNAonQPddpsn6Xl/7sw==} - engines: {node: '>= 0.10.0'} - hasBin: true - dependencies: - commander: 2.20.3 - cssfilter: 0.0.10 - dev: false - /xtend/4.0.2: resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==} engines: {node: '>=0.4'}