From 21b28bf2fb87354e8d8f045b36101a0363d78e06 Mon Sep 17 00:00:00 2001 From: veeramarni Date: Tue, 21 Nov 2023 12:16:15 -0500 Subject: [PATCH 1/2] Update Project_Setup.md --- docs/development/CodeContribution/Project_Setup.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/development/CodeContribution/Project_Setup.md b/docs/development/CodeContribution/Project_Setup.md index bc08856f0..8546cb5a3 100644 --- a/docs/development/CodeContribution/Project_Setup.md +++ b/docs/development/CodeContribution/Project_Setup.md @@ -20,7 +20,7 @@ cd fullstack-pro e. Insall and build packages using following command. Run from the root folder of this project. ``` - yarn global add lerna + yarn global add lerna@6 yarn bootstrap ``` From 202a1b22d8dde3a2a7944340ee708e1c45220355 Mon Sep 17 00:00:00 2001 From: Raheel Riaz Date: Sat, 4 May 2024 00:26:04 +0500 Subject: [PATCH 2/2] feat: upgrade apollo --- package.json | 6 +- .../counter/browser/src/generated-models.ts | 12 +- .../server/src/containers/containers.ts | 2 +- .../src/dataloader/counter-dataloader.ts | 37 +- packages-modules/counter/server/src/module.ts | 22 +- .../counter/server/src/resolvers/resolver.ts | 1 + .../browser-extension/package.json | 10 +- portable-devices/desktop/package.json | 12 +- portable-devices/mobile/package.json | 6 +- servers/backend-server/package.json | 20 +- .../src/server-setup/graphql-server.ts | 166 ++++--- .../src/server-setup/graphql-ws.ts | 7 +- servers/backend-server/src/stack-server.ts | 13 +- servers/frontend-server/package.json | 12 +- servers/moleculer-server/package.json | 12 +- yarn.lock | 447 +++++++++++++----- 16 files changed, 514 insertions(+), 271 deletions(-) diff --git a/package.json b/package.json index 834fe34bd..faec83a95 100755 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "db:seed": "yarn db:migrate && knex seed:run --cwd . --knexfile ./servers/backend-server/knexfile.js", "setBranchEnv": "cross-env REPOSITORY_BRANCH=${1:-$REPOSITORY_BRANCH} PUBLISH_BRANCH=${2:-$PUBLISH_BRANCH}", "predevpublish": "if ! git show-ref --verify --quiet refs/remotes/origin/$PUBLISH_BRANCH; then git checkout -b $PUBLISH_BRANCH && git push -u origin $PUBLISH_BRANCH; fi && git fetch origin $PUBLISH_BRANCH && git checkout $PUBLISH_BRANCH && git pull origin $PUBLISH_BRANCH && git merge -s recursive -X theirs $REPOSITORY_BRANCH -m \"merge from $REPOSITORY_BRANCH\" && yarn gitcommit && node tools/update-dependency-version.js && yarn gitcommit", - "devpublish": "lerna publish prerelease --ignore-scripts --exact", + "devpublish": "lerna publish prerelease --ignore-scripts --exact", "postdevpublish": "git checkout $REPOSITORY_BRANCH", "devpublish:auto": "yarn devpublish -- --yes", "devpublish:force": "yarn devpublish -- --force-publish=* --yes", @@ -120,7 +120,7 @@ }, "dependencies": { "dataloader": "^2.1.0", - "graphql": "^15.0.0", + "graphql": "^16.8.1", "graphql-tag": "^2.12.6" }, "devDependencies": { @@ -354,4 +354,4 @@ "cacheDirectories": [ ".cache" ] -} \ No newline at end of file +} diff --git a/packages-modules/counter/browser/src/generated-models.ts b/packages-modules/counter/browser/src/generated-models.ts index 838d24835..b7dee4e9b 100755 --- a/packages-modules/counter/browser/src/generated-models.ts +++ b/packages-modules/counter/browser/src/generated-models.ts @@ -247,24 +247,24 @@ export type DirectiveResolverFn; - Counter: ResolverTypeWrapper; - Int: ResolverTypeWrapper; ClientCounter: ResolverTypeWrapper; + Int: ResolverTypeWrapper; + Counter: ResolverTypeWrapper; Mutation: ResolverTypeWrapper<{}>; Boolean: ResolverTypeWrapper; + Query: ResolverTypeWrapper<{}>; Subscription: ResolverTypeWrapper<{}>; String: ResolverTypeWrapper; }; /** Mapping between all available schema types and the resolvers parents */ export type ResolversParentTypes = { - Query: {}; - Counter: Counter; - Int: Scalars['Int']; ClientCounter: ClientCounter; + Int: Scalars['Int']; + Counter: Counter; Mutation: {}; Boolean: Scalars['Boolean']; + Query: {}; Subscription: {}; String: Scalars['String']; }; diff --git a/packages-modules/counter/server/src/containers/containers.ts b/packages-modules/counter/server/src/containers/containers.ts index e3bc82585..422b7558c 100644 --- a/packages-modules/counter/server/src/containers/containers.ts +++ b/packages-modules/counter/server/src/containers/containers.ts @@ -1,5 +1,5 @@ import { ContainerModule, interfaces } from 'inversify'; -import { CounterMockService, CounterMockProxyService } from '../services'; +import { CounterMockProxyService, CounterMockService } from '../services'; import { TYPES } from '../constants'; import { ICounterService } from '../interfaces'; diff --git a/packages-modules/counter/server/src/dataloader/counter-dataloader.ts b/packages-modules/counter/server/src/dataloader/counter-dataloader.ts index 4f7301a0a..e8ef8fd56 100644 --- a/packages-modules/counter/server/src/dataloader/counter-dataloader.ts +++ b/packages-modules/counter/server/src/dataloader/counter-dataloader.ts @@ -1,25 +1,30 @@ -import { DataSource, DataSourceConfig } from 'apollo-datasource'; +import { Container } from 'inversify'; +import type { KeyValueCache } from '@apollo/utils.keyvaluecache'; import { ApolloError } from 'apollo-server-errors'; -import { InMemoryLRUCache } from 'apollo-server-caching'; -// import { setupCaching } from './cache'; -import { KeyValueCache } from 'apollo-server-caching'; -import { IService, IContext, ICounterService } from '../interfaces'; +import { ICounterService } from '../interfaces'; import { setupCaching } from './cache'; import { Counter } from '../generated-models'; +import { TYPES } from '../constants'; export interface CacheOptions { ttl?: number; } -export class CounterDataSource extends DataSource implements ICounterService { - private context!: IContext; +type Options = { + cache: KeyValueCache; + context: { + container: Container; + }; +}; - private cacheCounterService: ICounterService; - - constructor() { - super(); +export class CounterDataSource implements ICounterService { + // eslint-disable-next-line no-useless-constructor + constructor(private readonly options: Options) { + this.initialize(); } + private cacheCounterService: ICounterService; + public counterQuery(): Counter | Promise | PromiseLike { return this.cacheCounterService.counterQuery(); } @@ -28,14 +33,14 @@ export class CounterDataSource extends DataSource implements ICounterS return this.cacheCounterService.addCounter(); } - public initialize(config: DataSourceConfig) { - this.context = config.context; - if (!this.context.counterMockService) { + public initialize() { + const { context, cache } = this.options; + const counterService = context.container.getNamed(TYPES.CounterMockService, 'proxy'); + if (!counterService) { throw new ApolloError('Missing TextFileService in the context!'); } try { - const cache = config.cache || new InMemoryLRUCache(); - this.cacheCounterService = setupCaching({ counterService: config.context.counterMockService, cache }); + this.cacheCounterService = setupCaching({ counterService, cache }); } catch (err) { throw new ApolloError(`Setting up cache in the FilesDataSource failed due to ${err}`); } diff --git a/packages-modules/counter/server/src/module.ts b/packages-modules/counter/server/src/module.ts index 95528b17e..bb83eabc2 100755 --- a/packages-modules/counter/server/src/module.ts +++ b/packages-modules/counter/server/src/module.ts @@ -3,32 +3,24 @@ import { interfaces } from 'inversify'; import schema from './schema/schema.graphql'; import { ICounterService, IService } from './interfaces'; import { resolver } from './resolvers'; -import { localCounterModule, externalCounterModule } from './containers'; +import { externalCounterModule, localCounterModule } from './containers'; import { CounterMockMoleculerService } from './services'; import { TYPES } from './constants'; import { CounterDataSource } from './dataloader'; -const counterServiceGen = (container: interfaces.Container): IService => { - return { - counterMockService: container.getNamed(TYPES.CounterMockService, 'proxy'), - }; -}; - -const dataSources: (container: interfaces.Container) => any = () => { - return { - counterCache: new CounterDataSource(), - }; -}; +const counterServiceGen = (container: interfaces.Container): IService => ({ + counterMockService: container.getNamed(TYPES.CounterMockService, 'proxy'), +}); export default new Feature({ schema, createContainerFunc: [localCounterModule], createResolversFunc: resolver, createServiceFunc: counterServiceGen, - // createContextFunc: () => ({ counterMock: counterMock }), // note anything set here should be singleton. - createDataSourceFunc: dataSources, + createDataSourceFunc: (options) => ({ + counterCache: new CounterDataSource(options), + }), createHemeraContainerFunc: [externalCounterModule], addBrokerClientServiceClass: [CounterMockMoleculerService], addBrokerMainServiceClass: [], }); - diff --git a/packages-modules/counter/server/src/resolvers/resolver.ts b/packages-modules/counter/server/src/resolvers/resolver.ts index 87436f683..4b3d48ce2 100755 --- a/packages-modules/counter/server/src/resolvers/resolver.ts +++ b/packages-modules/counter/server/src/resolvers/resolver.ts @@ -17,6 +17,7 @@ export const resolver: (options: any) => IResolvers = (options) => ({ }, Mutation: { async addCounter(obj, { amount }, context) { + console.log(context); await context.counterMockService.addCounter(amount); const counter = await context.counterMockService.counterQuery(); diff --git a/portable-devices/browser-extension/package.json b/portable-devices/browser-extension/package.json index ed18b5679..062a37605 100644 --- a/portable-devices/browser-extension/package.json +++ b/portable-devices/browser-extension/package.json @@ -37,11 +37,11 @@ "@apollo/client": "~3.7.1", "@apollo/react-common": "^3.1.4", "@cdm-logger/client": "^7.0.12", - "@common-stack/client-core": "0.2.33", - "@common-stack/client-react": "0.2.33", - "@common-stack/components-pro": "^0.3.1-alpha.1", - "@common-stack/core": "0.2.32", - "@common-stack/env-list-loader": "0.5.1-alpha.1", + "@common-stack/client-core": "0.5.34", + "@common-stack/client-react": "0.5.36", + "@common-stack/components-pro": "^0.5.34", + "@common-stack/core": "0.5.34", + "@common-stack/env-list-loader": "0.6.1-alpha.4", "@workbench-stack/components": "^2.2.1-alpha.3", "antd": "~4.24.1", "apollo-link-debounce": "^2.1.0", diff --git a/portable-devices/desktop/package.json b/portable-devices/desktop/package.json index 9525b6098..349cd1606 100644 --- a/portable-devices/desktop/package.json +++ b/portable-devices/desktop/package.json @@ -44,10 +44,10 @@ "@cdm-logger/client": "^7.0.12", "@cdm-logger/electron": "^7.0.12", "@cdm-logger/server": "^7.0.12", - "@common-stack/client-core": "0.5.1", - "@common-stack/client-react": "0.5.6", - "@common-stack/core": "0.5.1", - "@common-stack/server-core": "0.5.1", + "@common-stack/client-core": "0.5.34", + "@common-stack/client-react": "0.5.36", + "@common-stack/core": "0.5.34", + "@common-stack/server-core": "0.5.35", "@sample-stack/core": "0.0.1", "@sample-stack/counter-module-browser": "0.0.1", "@sample-stack/counter-module-electron": "0.0.1", @@ -68,7 +68,7 @@ "electron-updater": "4.3.9", "envalid": "~7.2.2", "esm": "^3.2.25", - "graphql": "^15.0.0", + "graphql": "^16.8.1", "graphql-tag": "^2.11.0", "graphql-ws": "^5.11.2", "history": "^4.10.1", @@ -123,4 +123,4 @@ "appName": "Fullstack-Pro", "apiApp": "https://time-tracker-api.herokuapp.com/" } -} \ No newline at end of file +} diff --git a/portable-devices/mobile/package.json b/portable-devices/mobile/package.json index 29b9ff568..77a091ed9 100644 --- a/portable-devices/mobile/package.json +++ b/portable-devices/mobile/package.json @@ -60,9 +60,9 @@ "dependencies": { "@apollo/client": "~3.7.1", "@cdm-logger/client": "^7.0.12", - "@common-stack/client-core": "^0.5.1", - "@common-stack/client-react": "^0.5.6", - "@common-stack/core": "^0.5.1", + "@common-stack/client-core": "^0.5.34", + "@common-stack/client-react": "^0.5.36", + "@common-stack/core": "^0.5.34", "@expo/vector-icons": "~13.0.0", "@react-native-async-storage/async-storage": "~1.17.3", "@react-native-community/cameraroll": "~4.1.2", diff --git a/servers/backend-server/package.json b/servers/backend-server/package.json index c4867554b..5d48861fc 100755 --- a/servers/backend-server/package.json +++ b/servers/backend-server/package.json @@ -64,9 +64,9 @@ "dependencies": { "@apollo/client": "~3.7.1", "@cdm-logger/server": "^7.0.12", - "@common-stack/core": "0.5.1", - "@common-stack/server-core": "0.5.1", - "@common-stack/store-mongo": "0.5.3", + "@common-stack/core": "0.5.34", + "@common-stack/server-core": "0.5.35", + "@common-stack/store-mongo": "0.5.34", "@babel/runtime": "^7.20.1", "@graphql-tools/links": "^8.3.21", "@graphql-tools/utils": "^8.0.0", @@ -78,15 +78,15 @@ "@sample-stack/platform-server": "0.0.1", "@sample-stack/store": "0.0.1", "apollo-datasource": "^3.3.1", - "apollo-datasource-rest": "^3.3.1", + "@apollo/datasource-rest": "^6.2.2", "apollo-errors": "^1.9.0", "apollo-server-cache-memcached": "^3.3.1", "apollo-server-cache-redis": "^3.3.1", "apollo-server-caching": "^3.3.0", "apollo-server-core": "^3.11.1", "apollo-server-errors": "^3.3.1", - "apollo-server-express": "^3.11.1", - "apollo-server-plugin-response-cache": "^3.8.1", + "@apollo/server": "^4.10.4", + "@apollo/server-plugin-response-cache": "^4.1.3", "app-root-path": "^3.0.0", "body-parser": "^1.19.0", "cors": "^2.8.5", @@ -95,7 +95,7 @@ "envalid": "~7.2.2", "esm": "^3.2.25", "express": "^4.17.1", - "graphql": "^15.0.0", + "graphql": "^16.8.1", "graphql-ws": "^5.11.2", "graphql-bigint": "^1.0.0", "graphql-nats-subscriptions": "^1.5.0", @@ -117,7 +117,9 @@ "rxjs-compat": "^6.5.3", "subscriptions-transport-ws": "^0.11.0", "universal-cookie-express": "^4.0.1", - "ws": "^8.11.0" + "ws": "^8.11.0", + "@keyv/redis": "^2.8.4", + "@apollo/utils.keyvadapter": "^3.1.0" }, "devDependencies": { "cross-env": "^7.0.3", @@ -130,4 +132,4 @@ "typescript": { "definition": "dist/main.d.ts" } -} \ No newline at end of file +} diff --git a/servers/backend-server/src/server-setup/graphql-server.ts b/servers/backend-server/src/server-setup/graphql-server.ts index 39409ed5f..582c357fc 100755 --- a/servers/backend-server/src/server-setup/graphql-server.ts +++ b/servers/backend-server/src/server-setup/graphql-server.ts @@ -1,13 +1,22 @@ -import { ApolloServer, ApolloServerExpressConfig } from 'apollo-server-express'; +import { ApolloServer } from '@apollo/server'; +import { useServer } from 'graphql-ws/lib/use/ws'; +import { expressMiddleware } from '@apollo/server/express4'; +import { ApolloServerPluginDrainHttpServer } from '@apollo/server/plugin/drainHttpServer'; +import { ApolloServerPluginCacheControl } from '@apollo/server/plugin/cacheControl'; +import responseCachePlugin from '@apollo/server-plugin-response-cache'; import 'isomorphic-fetch'; -import { Express } from 'express'; +import express, { Express } from 'express'; import * as http from 'http'; -import { RedisClusterCache, RedisCache } from 'apollo-server-cache-redis'; +import cors from 'cors'; +import Keyv from 'keyv'; +import KeyvRedis from '@keyv/redis'; +import { KeyvAdapter } from '@apollo/utils.keyvadapter'; +import { RedisCache, RedisClusterCache } from 'apollo-server-cache-redis'; import { CdmLogger } from '@cdm-logger/core'; -import { ApolloServerPluginDrainHttpServer, ApolloServerPluginLandingPageDisabled } from 'apollo-server-core'; import { WebSocketServer } from 'ws'; import { IModuleService } from '../interfaces'; import { GraphqlWs } from './graphql-ws'; +import { config } from '../config'; type ILogger = CdmLogger.ILogger; @@ -50,21 +59,95 @@ export class GraphqlServer { path: __GRAPHQL_ENDPOINT__, }); const graphqlWs = new GraphqlWs(wsServer, this.moduleService, this.cache); - wsServerCleanup = graphqlWs.create(); - // wsServerCleanup = useServer({ schema: this.moduleService.schema}, wsServer) + wsServerCleanup = useServer( + { schema: this.moduleService.schema, context: this.createContext.bind(this) }, + wsServer, + ); } } + private async createContext({ + req, + res, + connection, + }: { + req: Express.Request; + res: Express.Response; + connection: any; + }) { + let context; + let addons = {}; + const dataSources = this.moduleService.dataSource; + try { + if (connection) { + context = connection.context; + if (!context.dataSources) { + addons = { + // @workaround for apollo server issue #1526 + dataSources: constructDataSourcesForSubscriptions(connection.context, this.cache, dataSources), + }; + } else { + console.log('Datasource'); + addons = { + // @workaround for apollo server issue #1526 + dataSources, + }; + } + } else { + const pureContext = await this.moduleService.createContext(req, res); + const contextServices = await this.moduleService.serviceContext(req, res); + context = { + ...pureContext, + ...contextServices, + preferences: this.moduleService.defaultPreferences, + // update: updateContainers, + }; + } + context.userIp = this.getUserIpAddress(req); + } catch (err) { + this.logger.error('adding context to graphql failed due to [%o]', err); + throw err; + } + return { + req, + res, + dataSources, + // token: req.headers.token, + ...context, + ...addons, + }; + } + public async initialize() { this.logger.info('GraphqlServer initializing...'); const apolloServer = this.configureApolloServer(); await apolloServer.start(); - apolloServer.applyMiddleware({ app: this.app }); - this.logger.info('GraphqlServer initialized'); + const corsOptions = { + origin: [config.CLIENT_URL], + credentials: true, + }; + + this.app.use( + __GRAPHQL_ENDPOINT__, + cors(corsOptions), + express.json(), + expressMiddleware(apolloServer, { + context: this.createContext.bind(this), + }), + ); + // apolloServer.applyMiddleware({ + // app: this.app, + // cors: corsOptions, + // path: __GRAPHQL_ENDPOINT__, + // }); + this.logger.info('GraphqlServer initialized - ', config.CLIENT_URL); } getUserIpAddress(req) { let ip = (req?.headers['x-forwarded-for'] || '').split(',')[0] || req?.connection?.remoteAddress; + if (ip?.substring(0, 7) === '::ffff:') { + ip = ip.substring(7); + } if (ip === '::1') { ip = '127.0.0.1'; } @@ -72,62 +155,13 @@ export class GraphqlServer { } private configureApolloServer(): ApolloServer { - const serverConfig: ApolloServerExpressConfig = { + const serverConfig = { debug, schema: this.moduleService.schema, - dataSources: () => this.moduleService.dataSource, - cache: this.cache, - context: async ({ - req, - res, - connection, - }: { - req: Express.Request; - res: Express.Response; - connection: any; - }) => { - let context; - let addons = {}; - try { - if (connection) { - context = connection.context; - if (!context.dataSources) { - addons = { - // @workaround for apollo server issue #1526 - dataSources: constructDataSourcesForSubscriptions( - connection.context, - this.cache, - this.moduleService.dataSource, - ), - }; - } else { - addons = { - // @workaround for apollo server issue #1526 - dataSources: context.dataSources, - }; - } - } else { - const pureContext = await this.moduleService.createContext(req, res); - const contextServices = await this.moduleService.serviceContext(req, res); - context = { - ...pureContext, - ...contextServices, - preferences: this.moduleService.defaultPreferences, - // update: updateContainers, - }; - } - context.userIp = this.getUserIpAddress(req); - } catch (err) { - this.logger.error('adding context to graphql failed due to [%o]', err); - throw err; - } - return { - req, - // res, - ...context, - ...addons, - }; - }, + allowBatchedHttpRequests: true, + cache: new KeyvAdapter(new Keyv({ store: new KeyvRedis(this.cache) }), { + disableBatchReads: true, + }), plugins: [ // process.env.NODE_ENV === 'production' // ? ApolloServerPluginLandingPageDisabled() @@ -135,13 +169,19 @@ export class GraphqlServer { // ApolloServerPluginLandingPageGraphQLPlayground(), // ApolloServerPluginLandingPageDisabled(), ApolloServerPluginDrainHttpServer({ httpServer: this.httpServer }), + ApolloServerPluginCacheControl({ + calculateHttpHeaders: false, + }), + responseCachePlugin({ + sessionId: (requestContext) => requestContext?.userContext?.accountId || null, + }), ], }; if (this.enableSubscription) { serverConfig.plugins.push({ async serverWillStart() { return { - drainServer: async () => { + async drainServer() { await wsServerCleanup.dispose(); }, }; diff --git a/servers/backend-server/src/server-setup/graphql-ws.ts b/servers/backend-server/src/server-setup/graphql-ws.ts index 8563a79bb..eca395b03 100644 --- a/servers/backend-server/src/server-setup/graphql-ws.ts +++ b/servers/backend-server/src/server-setup/graphql-ws.ts @@ -1,13 +1,10 @@ import { useServer } from 'graphql-ws/lib/use/ws'; -import { GraphQLSchema, parse, getOperationAST, GraphQLError, validate } from 'graphql'; -import { GraphQLServerOptions } from 'apollo-server-core/dist/graphqlOptions'; -import { Context } from 'apollo-server-core'; -import { RedisClusterCache, RedisCache } from 'apollo-server-cache-redis'; +import { getOperationAST, GraphQLError, GraphQLSchema, parse, validate } from 'graphql'; +import { RedisCache, RedisClusterCache } from 'apollo-server-cache-redis'; import { CdmLogger } from '@cdm-logger/core'; import { Disposable, SubscribeMessage } from 'graphql-ws'; import { WebSocketServer } from 'ws'; import { IModuleService } from '../interfaces'; -import { createContextFromConnectionParams } from './utils'; type ILogger = CdmLogger.ILogger; diff --git a/servers/backend-server/src/stack-server.ts b/servers/backend-server/src/stack-server.ts index e24923faa..3b7a0352d 100755 --- a/servers/backend-server/src/stack-server.ts +++ b/servers/backend-server/src/stack-server.ts @@ -181,10 +181,21 @@ export class StackServer { // set the service container this.serviceContainer = await allModules.createContainers({ ...settings, mongoConnection: mongoClient }); const createServiceContext = allModules.createServiceContext({ ...settings, mongoConnection: mongoClient }); + + const options = { + cache: redisClient, + context: { + logger: serverLogger, + container: this.serviceContainer, + }, + }; + const dataSource = allModules.createDataSource(options); + console.trace(); + console.log({ dataSource, options }); const serviceBroker: IModuleService = { serviceContainer: this.serviceContainer, serviceContext: createServiceContext, - dataSource: allModules.createDataSource(), + dataSource, defaultPreferences: allModules.createDefaultPreferences(), createContext: async (req, res) => allModules.createContext(req, res), logger: serverLogger, diff --git a/servers/frontend-server/package.json b/servers/frontend-server/package.json index 724822096..221f0a133 100755 --- a/servers/frontend-server/package.json +++ b/servers/frontend-server/package.json @@ -45,10 +45,10 @@ "@apollo/react-hoc": "^4.0.0", "@cdm-logger/client": "^7.0.12", "@cdm-logger/server": "^7.0.12", - "@common-stack/client-core": "0.5.1", - "@common-stack/client-react": "0.5.6", - "@common-stack/core": "0.5.1", - "@common-stack/server-core": "0.5.1", + "@common-stack/client-core": "0.5.34", + "@common-stack/client-react": "0.5.36", + "@common-stack/core": "0.5.34", + "@common-stack/server-core": "0.5.35", "@emotion/css": "^11.10.0", "@emotion/react": "^11.10.4", "@emotion/server": "^11.10.0", @@ -72,7 +72,7 @@ "error-stack-parser": "^2.0.4", "esm": "^3.2.25", "express": "^4.17.1", - "graphql": "^15.0.0", + "graphql": "^16.8.1", "graphql-tag": "^2.11.0", "graphql-ws": "^5.11.2", "history": "^4.10.1", @@ -116,4 +116,4 @@ "peerDependencies": { "body-parser": "*" } -} \ No newline at end of file +} diff --git a/servers/moleculer-server/package.json b/servers/moleculer-server/package.json index 1fb4476fb..3d7d4fd4a 100755 --- a/servers/moleculer-server/package.json +++ b/servers/moleculer-server/package.json @@ -36,10 +36,10 @@ "dependencies": { "@cdm-logger/client": "^7.0.12", "@cdm-logger/server": "^7.0.12", - "@common-stack/client-core": "0.5.1", - "@common-stack/core": "0.5.1", - "@common-stack/server-core": "0.5.1", - "@common-stack/store-mongo": "0.5.3", + "@common-stack/client-core": "0.5.34", + "@common-stack/core": "0.5.34", + "@common-stack/server-core": "0.5.35", + "@common-stack/store-mongo": "0.5.34", "@sample-stack/core": "0.0.1", "@sample-stack/counter-module-server": "0.0.1", "@sample-stack/platform-server": "0.0.1", @@ -51,7 +51,7 @@ "dotenv": "^8.2.0", "envalid": "~7.2.2", "esm": "^3.2.25", - "graphql": "^15.0.0", + "graphql": "^16.8.1", "graphql-bigint": "^1.0.0", "graphql-nats-subscriptions": "^1.5.0", "graphql-subscriptions": "^2.0.0", @@ -80,4 +80,4 @@ "engines": { "node": ">= 8.x.x" } -} \ No newline at end of file +} diff --git a/yarn.lock b/yarn.lock index 7a03f3955..b3d206d6e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -120,6 +120,11 @@ jsonpointer "^5.0.0" leven "^3.1.0" +"@apollo/cache-control-types@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@apollo/cache-control-types/-/cache-control-types-1.0.3.tgz#5da62cf64c3b4419dabfef4536b57a40c8ff0b47" + integrity sha512-F17/vCp7QVwom9eG7ToauIKdAxpSoadsJnqIfyryLFSkLSOEqu+eC5Z3N8OXcUVStuOMcNHlyraRsA6rRICu4g== + "@apollo/client@latest", "@apollo/client@~3.2.5 || ~3.3.0 || ~3.4.0 || ~3.5.0 || ~3.6.0 || ~3.7.0", "@apollo/client@~3.7.1": version "3.7.10" resolved "https://registry.yarnpkg.com/@apollo/client/-/client-3.7.10.tgz#addc5fcebaf016981d9476268a06d529be83f568" @@ -139,6 +144,21 @@ tslib "^2.3.0" zen-observable-ts "^1.2.5" +"@apollo/datasource-rest@^6.2.2": + version "6.2.2" + resolved "https://registry.yarnpkg.com/@apollo/datasource-rest/-/datasource-rest-6.2.2.tgz#a9c2285a7d0a904ef536d106b32d446ecebb982e" + integrity sha512-0rxlyAdlZ5n4zoPsME5TCzxZiyu/4m5dawatclr2ckwAewnGARcqdhFnckrhlOIgLQTtcl9lCmUit4DGoK47lw== + dependencies: + "@apollo/utils.fetcher" "^3.0.0" + "@apollo/utils.keyvaluecache" "^3.1.0" + "@apollo/utils.logger" "^3.0.0" + "@apollo/utils.withrequired" "^3.0.0" + "@types/http-cache-semantics" "^4.0.1" + http-cache-semantics "^4.1.1" + lodash.clonedeep "^4.5.0" + lodash.isplainobject "^4.0.6" + node-fetch "^2.6.7" + "@apollo/protobufjs@1.2.6": version "1.2.6" resolved "https://registry.yarnpkg.com/@apollo/protobufjs/-/protobufjs-1.2.6.tgz#d601e65211e06ae1432bf5993a1a0105f2862f27" @@ -198,6 +218,55 @@ dependencies: "@apollo/client" latest +"@apollo/server-gateway-interface@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@apollo/server-gateway-interface/-/server-gateway-interface-1.1.1.tgz#a79632aa921edefcd532589943f6b97c96fa4d3c" + integrity sha512-pGwCl/po6+rxRmDMFgozKQo2pbsSwE91TpsDBAOgf74CRDPXHHtM88wbwjab0wMMZh95QfR45GGyDIdhY24bkQ== + dependencies: + "@apollo/usage-reporting-protobuf" "^4.1.1" + "@apollo/utils.fetcher" "^2.0.0" + "@apollo/utils.keyvaluecache" "^2.1.0" + "@apollo/utils.logger" "^2.0.0" + +"@apollo/server-plugin-response-cache@^4.1.3": + version "4.1.3" + resolved "https://registry.yarnpkg.com/@apollo/server-plugin-response-cache/-/server-plugin-response-cache-4.1.3.tgz#18def5dec2be6f361559efedbf4422790dcbb439" + integrity sha512-8WaP4Xo9GGIbWn4ZG/TlYKZLo/YI8tuORvxzLOKnZa3EqUvt7iTCGHX491dWNiGkm93VgDDdo5r0WEvLDdHSmQ== + dependencies: + "@apollo/utils.createhash" "^2.0.0" + "@apollo/utils.keyvaluecache" "^2.1.0" + +"@apollo/server@^4.10.4": + version "4.10.4" + resolved "https://registry.yarnpkg.com/@apollo/server/-/server-4.10.4.tgz#98590173721b63bdec7ab2fe15179c8a04955233" + integrity sha512-HS12CUa1wq8f5zKXOKJRwRdESFp4por9AINecpcsEUV9jsCP/NqPILgx0hCOOFJuKxmnaL7070xO6l5xmOq4Fw== + dependencies: + "@apollo/cache-control-types" "^1.0.3" + "@apollo/server-gateway-interface" "^1.1.1" + "@apollo/usage-reporting-protobuf" "^4.1.1" + "@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.1.0" + "@apollo/utils.withrequired" "^2.0.0" + "@graphql-tools/schema" "^9.0.0" + "@josephg/resolvable" "^1.0.0" + "@types/express" "^4.17.13" + "@types/express-serve-static-core" "^4.17.30" + "@types/node-fetch" "^2.6.1" + async-retry "^1.2.1" + cors "^2.8.5" + express "^4.17.1" + loglevel "^1.6.8" + lru-cache "^7.10.1" + negotiator "^0.6.3" + node-abort-controller "^3.1.1" + node-fetch "^2.6.7" + uuid "^9.0.0" + whatwg-mimetype "^3.0.0" + "@apollo/usage-reporting-protobuf@^4.0.0": version "4.1.0" resolved "https://registry.yarnpkg.com/@apollo/usage-reporting-protobuf/-/usage-reporting-protobuf-4.1.0.tgz#b54b8c32702bbe81aa0e399076ddabaf75a13f9b" @@ -205,11 +274,55 @@ dependencies: "@apollo/protobufjs" "1.2.7" +"@apollo/usage-reporting-protobuf@^4.1.0", "@apollo/usage-reporting-protobuf@^4.1.1": + version "4.1.1" + resolved "https://registry.yarnpkg.com/@apollo/usage-reporting-protobuf/-/usage-reporting-protobuf-4.1.1.tgz#407c3d18c7fbed7a264f3b9a3812620b93499de1" + integrity sha512-u40dIUePHaSKVshcedO7Wp+mPiZsaU6xjv9J+VyxpoU/zL6Jle+9zWeG98tr/+SZ0nZ4OXhrbb8SNr0rAPpIDA== + dependencies: + "@apollo/protobufjs" "1.2.7" + +"@apollo/utils.createhash@^2.0.0": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@apollo/utils.createhash/-/utils.createhash-2.0.1.tgz#9d982a166833ce08265ff70f8ef781d65109bdaa" + integrity sha512-fQO4/ZOP8LcXWvMNhKiee+2KuKyqIcfHrICA+M4lj/h/Lh1H10ICcUtk6N/chnEo5HXu0yejg64wshdaiFitJg== + dependencies: + "@apollo/utils.isnodelike" "^2.0.1" + sha.js "^2.4.11" + "@apollo/utils.dropunuseddefinitions@^1.1.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@apollo/utils.dropunuseddefinitions/-/utils.dropunuseddefinitions-1.1.0.tgz#02b04006442eaf037f4c4624146b12775d70d929" integrity sha512-jU1XjMr6ec9pPoL+BFWzEPW7VHHulVdGKMkPAMiCigpVIT11VmCbnij0bWob8uS3ODJ65tZLYKAh/55vLw2rbg== +"@apollo/utils.dropunuseddefinitions@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@apollo/utils.dropunuseddefinitions/-/utils.dropunuseddefinitions-2.0.1.tgz#916cd912cbd88769d3b0eab2d24f4674eeda8124" + integrity sha512-EsPIBqsSt2BwDsv8Wu76LK5R1KtsVkNoO4b0M5aK0hx+dGg9xJXuqlr7Fo34Dl+y83jmzn+UvEW+t1/GP2melA== + +"@apollo/utils.fetcher@^2.0.0": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@apollo/utils.fetcher/-/utils.fetcher-2.0.1.tgz#2f6e3edc8ce79fbe916110d9baaddad7e13d955f" + integrity sha512-jvvon885hEyWXd4H6zpWeN3tl88QcWnHp5gWF5OPF34uhvoR+DFqcNxs9vrRaBBSY3qda3Qe0bdud7tz2zGx1A== + +"@apollo/utils.fetcher@^3.0.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@apollo/utils.fetcher/-/utils.fetcher-3.1.0.tgz#0639c30a5ac57e3e62784b180495023f5e886fe0" + integrity sha512-Z3QAyrsQkvrdTuHAFwWDNd+0l50guwoQUoaDQssLOjkmnmVuvXlJykqlEJolio+4rFwBnWdoY1ByFdKaQEcm7A== + +"@apollo/utils.isnodelike@^2.0.0", "@apollo/utils.isnodelike@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@apollo/utils.isnodelike/-/utils.isnodelike-2.0.1.tgz#08a7e50f08d2031122efa25af089d1c6ee609f31" + integrity sha512-w41XyepR+jBEuVpoRM715N2ZD0xMD413UiJx8w5xnAZD2ZkSJnMJBoIzauK83kJpSgNuR6ywbV29jG9NmxjK0Q== + +"@apollo/utils.keyvadapter@^3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@apollo/utils.keyvadapter/-/utils.keyvadapter-3.1.0.tgz#4393e59f22f72ab087af0ed3cb0ddece0fe29e09" + integrity sha512-q41MxH2gKwvXL28hUEfQHdSQ0F4u8KrPHUbvN/IkA7vh+KTRj0tG2eWLu42c438jjoV7hUhY1Ru/Dwq8zndEqg== + dependencies: + "@apollo/utils.keyvaluecache" "^3.1.0" + dataloader "^2.1.0" + keyv "^4.4.0" + "@apollo/utils.keyvaluecache@^1.0.1": version "1.0.2" resolved "https://registry.yarnpkg.com/@apollo/utils.keyvaluecache/-/utils.keyvaluecache-1.0.2.tgz#2bfe358c4d82f3a0950518451996758c52613f57" @@ -218,21 +331,57 @@ "@apollo/utils.logger" "^1.0.0" lru-cache "7.10.1 - 7.13.1" +"@apollo/utils.keyvaluecache@^2.1.0": + version "2.1.1" + resolved "https://registry.yarnpkg.com/@apollo/utils.keyvaluecache/-/utils.keyvaluecache-2.1.1.tgz#f3f79a2f00520c6ab7a77a680a4e1fec4d19e1a6" + integrity sha512-qVo5PvUUMD8oB9oYvq4ViCjYAMWnZ5zZwEjNF37L2m1u528x5mueMlU+Cr1UinupCgdB78g+egA1G98rbJ03Vw== + dependencies: + "@apollo/utils.logger" "^2.0.1" + lru-cache "^7.14.1" + +"@apollo/utils.keyvaluecache@^3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@apollo/utils.keyvaluecache/-/utils.keyvaluecache-3.1.0.tgz#acda4c4b1906233dcca3239d77c5d75b3058a81f" + integrity sha512-MM/DKIqpQQbuNG1gNPAlGc45THdWkroTmN8o/J09merFwf/LlZ7+lAfcHFDXIYIknwKmUjJrOMS3OxYbjrz2hA== + dependencies: + "@apollo/utils.logger" "^3.0.0" + lru-cache "^10.0.0" + "@apollo/utils.logger@^1.0.0": version "1.0.1" resolved "https://registry.yarnpkg.com/@apollo/utils.logger/-/utils.logger-1.0.1.tgz#aea0d1bb7ceb237f506c6bbf38f10a555b99a695" integrity sha512-XdlzoY7fYNK4OIcvMD2G94RoFZbzTQaNP0jozmqqMudmaGo2I/2Jx71xlDJ801mWA/mbYRihyaw6KJii7k5RVA== +"@apollo/utils.logger@^2.0.0", "@apollo/utils.logger@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@apollo/utils.logger/-/utils.logger-2.0.1.tgz#74faeb97d7ad9f22282dfb465bcb2e6873b8a625" + integrity sha512-YuplwLHaHf1oviidB7MxnCXAdHp3IqYV8n0momZ3JfLniae92eYqMIx+j5qJFX6WKJPs6q7bczmV4lXIsTu5Pg== + +"@apollo/utils.logger@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@apollo/utils.logger/-/utils.logger-3.0.0.tgz#5b67de1e476bdfa8be70bfaa05c7e65a6a427960" + integrity sha512-M8V8JOTH0F2qEi+ktPfw4RL7MvUycDfKp7aEap2eWXfL5SqWHN6jTLbj5f5fj1cceHpyaUSOZlvlaaryaxZAmg== + "@apollo/utils.printwithreducedwhitespace@^1.1.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@apollo/utils.printwithreducedwhitespace/-/utils.printwithreducedwhitespace-1.1.0.tgz#c466299a4766eef8577a2a64c8f27712e8bd7e30" integrity sha512-GfFSkAv3n1toDZ4V6u2d7L4xMwLA+lv+6hqXicMN9KELSJ9yy9RzuEXaX73c/Ry+GzRsBy/fdSUGayGqdHfT2Q== +"@apollo/utils.printwithreducedwhitespace@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@apollo/utils.printwithreducedwhitespace/-/utils.printwithreducedwhitespace-2.0.1.tgz#f4fadea0ae849af2c19c339cc5420d1ddfaa905e" + integrity sha512-9M4LUXV/fQBh8vZWlLvb/HyyhjJ77/I5ZKu+NBWV/BmYGyRmoEP9EVAy7LCVoY3t8BDcyCAGfxJaLFCSuQkPUg== + "@apollo/utils.removealiases@1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@apollo/utils.removealiases/-/utils.removealiases-1.0.0.tgz#75f6d83098af1fcae2d3beb4f515ad4a8452a8c1" integrity sha512-6cM8sEOJW2LaGjL/0vHV0GtRaSekrPQR4DiywaApQlL9EdROASZU5PsQibe2MWeZCOhNrPRuHh4wDMwPsWTn8A== +"@apollo/utils.removealiases@2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@apollo/utils.removealiases/-/utils.removealiases-2.0.1.tgz#2873c93d72d086c60fc0d77e23d0f75e66a2598f" + integrity sha512-0joRc2HBO4u594Op1nev+mUF6yRnxoUH64xw8x3bX7n8QBDYdeYgY4tF0vJReTy+zdn2xv6fMsquATSgC722FA== + "@apollo/utils.sortast@^1.1.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@apollo/utils.sortast/-/utils.sortast-1.1.0.tgz#93218c7008daf3e2a0725196085a33f5aab5ad07" @@ -240,11 +389,23 @@ dependencies: lodash.sortby "^4.7.0" +"@apollo/utils.sortast@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@apollo/utils.sortast/-/utils.sortast-2.0.1.tgz#58c90bb8bd24726346b61fa51ba7fcf06e922ef7" + integrity sha512-eciIavsWpJ09za1pn37wpsCGrQNXUhM0TktnZmHwO+Zy9O4fu/WdB4+5BvVhFiZYOXvfjzJUcc+hsIV8RUOtMw== + dependencies: + lodash.sortby "^4.7.0" + "@apollo/utils.stripsensitiveliterals@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@apollo/utils.stripsensitiveliterals/-/utils.stripsensitiveliterals-1.2.0.tgz#4920651f36beee8e260e12031a0c5863ad0c7b28" integrity sha512-E41rDUzkz/cdikM5147d8nfCFVKovXxKBcjvLEQ7bjZm/cg9zEcXvS6vFY8ugTubI3fn6zoqo0CyU8zT+BGP9w== +"@apollo/utils.stripsensitiveliterals@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@apollo/utils.stripsensitiveliterals/-/utils.stripsensitiveliterals-2.0.1.tgz#2f3350483be376a98229f90185eaf19888323132" + integrity sha512-QJs7HtzXS/JIPMKWimFnUMK7VjkGQTzqD9bKD1h3iuPAqLsxd0mUNVbkYOPTsDhUKgcvUOfOqOJWYohAKMvcSA== + "@apollo/utils.usagereporting@^1.0.0": version "1.0.1" resolved "https://registry.yarnpkg.com/@apollo/utils.usagereporting/-/utils.usagereporting-1.0.1.tgz#3c70b49e554771659576fe35381c7a4b321d27fd" @@ -257,6 +418,28 @@ "@apollo/utils.sortast" "^1.1.0" "@apollo/utils.stripsensitiveliterals" "^1.2.0" +"@apollo/utils.usagereporting@^2.1.0": + version "2.1.0" + resolved "https://registry.yarnpkg.com/@apollo/utils.usagereporting/-/utils.usagereporting-2.1.0.tgz#11bca6a61fcbc6e6d812004503b38916e74313f4" + integrity sha512-LPSlBrn+S17oBy5eWkrRSGb98sWmnEzo3DPTZgp8IQc8sJe0prDgDuppGq4NeQlpoqEHz0hQeYHAOA0Z3aQsxQ== + dependencies: + "@apollo/usage-reporting-protobuf" "^4.1.0" + "@apollo/utils.dropunuseddefinitions" "^2.0.1" + "@apollo/utils.printwithreducedwhitespace" "^2.0.1" + "@apollo/utils.removealiases" "2.0.1" + "@apollo/utils.sortast" "^2.0.1" + "@apollo/utils.stripsensitiveliterals" "^2.0.1" + +"@apollo/utils.withrequired@^2.0.0": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@apollo/utils.withrequired/-/utils.withrequired-2.0.1.tgz#e72bc512582a6f26af150439f7eb7473b46ba874" + integrity sha512-YBDiuAX9i1lLc6GeTy1m7DGLFn/gMnvXqlalOIMjM7DeOgIacEjjfwPqb0M1CQ2v11HhR15d1NmxJoRCfrNqcA== + +"@apollo/utils.withrequired@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@apollo/utils.withrequired/-/utils.withrequired-3.0.0.tgz#1342bab438528d09c41e43ce33cb976fa9c99e52" + integrity sha512-aaxeavfJ+RHboh7c2ofO5HHtQobGX4AgUujXP4CXpREHp9fQ9jPi6K9T1jrAKe7HIipoP0OJ1gd6JamSkFIpvA== + "@apollographql/apollo-tools@^0.5.3": version "0.5.4" resolved "https://registry.yarnpkg.com/@apollographql/apollo-tools/-/apollo-tools-0.5.4.tgz#cb3998c6cf12e494b90c733f44dd9935e2d8196c" @@ -2357,74 +2540,44 @@ dependencies: chalk "^4.1.0" -"@common-stack/client-core@0.2.33": - version "0.2.33" - resolved "https://registry.yarnpkg.com/@common-stack/client-core/-/client-core-0.2.33.tgz#51e56a16d05655987d80280db1b69c7a881c7f51" - integrity sha512-qSjZ+GsCX8BGFIT9IksKg+MjB+p/4kr+vl9u+w2wORfS8IzCWkoNIvEmO/RPiP+alsKslenA6DwAvgokhinb5Q== - dependencies: - "@common-stack/core" "0.2.32" - -"@common-stack/client-core@0.5.1", "@common-stack/client-core@^0.5.1": - version "0.5.1" - resolved "https://registry.yarnpkg.com/@common-stack/client-core/-/client-core-0.5.1.tgz#f7eed323feb73c1b719ef483cddaa89fe668e720" - integrity sha512-BC0jiB3yHdlUT2p00yVO19U9lAJkJCFYO26U9fSUVvWHH9Rax7v6UD0hJJhhzQjKnUHgaVrC14nWskRUAvdIiQ== - dependencies: - "@common-stack/core" "0.5.1" - -"@common-stack/client-react@0.2.33": - version "0.2.33" - resolved "https://registry.yarnpkg.com/@common-stack/client-react/-/client-react-0.2.33.tgz#dcaec5c14b0a2db9a528031db31b0d4977ce5809" - integrity sha512-rA4eze5Nh1a7qy8uSfk08cf/lvhbeqe1rGjdbJFGeqQC3dKBVzqrhvBA1XCicUGMsSrPI9V9PfFouiljAX7wpA== +"@common-stack/client-core@0.5.34", "@common-stack/client-core@^0.5.34": + version "0.5.34" + resolved "https://registry.yarnpkg.com/@common-stack/client-core/-/client-core-0.5.34.tgz#78603b72eafb0ef85482274ff1a185af30065563" + integrity sha512-oB0KMipHWPJ6B5S8bkvyeErzXoOsBPiG95DY2eiFFxYhdHmiq/KWbrOJoCMt7eICBzl+BZd3S0Q9I6+It5ignA== dependencies: - "@common-stack/client-core" "0.2.33" - "@common-stack/core" "0.2.32" - "@wordpress/hooks" "^2.10.0" - browser-bunyan "^1.6.3" - history-with-query "^4.10.4" - sort-keys "^4.1.0" + "@common-stack/core" "^0.5.34" -"@common-stack/client-react@0.5.6", "@common-stack/client-react@^0.5.6": - version "0.5.6" - resolved "https://registry.yarnpkg.com/@common-stack/client-react/-/client-react-0.5.6.tgz#8412b8c7f46535f5d2d2517effb8f82d27fcaeec" - integrity sha512-ndpXOLK1IFejSlyxrftEzJn7/jqMO2BpSoB91cxNU4VUXMH0/H36qTY83WjJtwOov8m1rEZLwBVrP8azFa/s6A== +"@common-stack/client-react@0.5.36", "@common-stack/client-react@^0.5.36": + version "0.5.36" + resolved "https://registry.yarnpkg.com/@common-stack/client-react/-/client-react-0.5.36.tgz#e07cd61b2b83e5111a7ce1019dabb6f9e409b34d" + integrity sha512-yLiopy2QBpeU0IX877mAg5aDd+thltWY1zHjPs4G8kZjvk3jFs7y8HQYirxL+Mk5Qznh1eaFFJseoXm9LPDvsg== dependencies: - "@common-stack/client-core" "0.5.1" - "@common-stack/core" "0.5.1" + "@common-stack/client-core" "^0.5.34" + "@common-stack/core" "^0.5.34" "@wordpress/hooks" "^2.10.0" browser-bunyan "^1.6.3" history-with-query "^4.10.4" sort-keys "^4.1.0" -"@common-stack/components-pro@^0.3.1-alpha.1": - version "0.3.1-alpha.2" - resolved "https://registry.yarnpkg.com/@common-stack/components-pro/-/components-pro-0.3.1-alpha.2.tgz#04ee1eb65bd2d8e56f2bd74d91c5bf487c318ecd" - integrity sha512-eD8UfeshAWpZ7v3TqPqrZBWrWSB+l5k4H76fJe8T2Tko2F+RBDzFIatZg86HKHXfOVPfsksOxAE5/eTpg6QGHQ== +"@common-stack/components-pro@^0.5.34": + version "0.5.34" + resolved "https://registry.yarnpkg.com/@common-stack/components-pro/-/components-pro-0.5.34.tgz#fe67383841f9424f2db92ce1d5c96a98646da6e1" + integrity sha512-duUv6riDzjYisImo5jBqlHrOB6KMSw0wKLtZJfJiHVZH4aNiXTM8+jOBTHcr5M1ouLBrYduWvo9UfUDEA/p/lA== dependencies: "@wordpress/compose" "~5.12.0" "@wordpress/element" "~4.12.0" "@wordpress/hooks" "~3.14.0" "@wordpress/is-shallow-equal" "~4.14.0" "@wordpress/warning" "~2.14.0" + cheerio "^1.0.0-rc.12" history-with-query "^4.10.4" sort-keys "^4.1.0" valtio "^1.7.0" -"@common-stack/core@0.2.32": - version "0.2.32" - resolved "https://registry.yarnpkg.com/@common-stack/core/-/core-0.2.32.tgz#9a9cb6827720ab8e06f25682a1394e1a7aff7718" - integrity sha512-U6ckOloQU7LhQmklL+vCjvup/ML+WXopvkJD/q4kasGBxCqcNS3skOVYmXuBVtyWjAQ1vsSCbOfA79PBv7O33g== - -"@common-stack/core@0.5.1", "@common-stack/core@^0.5.1": - version "0.5.1" - resolved "https://registry.yarnpkg.com/@common-stack/core/-/core-0.5.1.tgz#faf8690841cde252b780bea2866f17070dcdb27a" - integrity sha512-q0uw9WLyQDcs/kfoLEeUgRk+n+T8we/810djDZGIQlpf84OTOH3w1fSqf7Ohc4TBpHi4WwS74479VtVAOw+SCA== - -"@common-stack/env-list-loader@0.5.1-alpha.1": - version "0.5.1-alpha.1" - resolved "https://registry.yarnpkg.com/@common-stack/env-list-loader/-/env-list-loader-0.5.1-alpha.1.tgz#081f885961b00a3e0178186db271193dac2d6f89" - integrity sha512-KMe8vvsR8bMj2tXEYXDcOflaGunjtPr2RTgD57x8+SV+sB0XXx4+eV25KIOc6fInbZoRtNgfhI4dqdOJeMFt9Q== - dependencies: - strip-comments "^2.0.1" +"@common-stack/core@0.5.34", "@common-stack/core@^0.5.34": + version "0.5.34" + resolved "https://registry.yarnpkg.com/@common-stack/core/-/core-0.5.34.tgz#e87712394a921c1d386ac1f03fa8c30c29ec276f" + integrity sha512-F3p8n6Wu87kWPtV0YB/P9kRR8/rND+qlL6DP77ZIAXHwtGv9w5LrkeI1+gbXcKshi/+J3Hv6SflfJepOvaQWVw== "@common-stack/env-list-loader@0.5.8": version "0.5.8" @@ -2433,19 +2586,26 @@ dependencies: strip-comments "^2.0.1" -"@common-stack/server-core@0.5.1": - version "0.5.1" - resolved "https://registry.yarnpkg.com/@common-stack/server-core/-/server-core-0.5.1.tgz#fc666c24cec43aa0138ff4e3443414a5c3a02515" - integrity sha512-GWr4q6HtHdvSd8bQrqD+qn3Kc1V2jdH3GIYoCuESSmQO6lvDN5QnzEYvAl2ugdySXEa2G8PzjY5Bk42mAUCVXg== +"@common-stack/env-list-loader@0.6.1-alpha.4": + version "0.6.1-alpha.4" + resolved "https://registry.yarnpkg.com/@common-stack/env-list-loader/-/env-list-loader-0.6.1-alpha.4.tgz#730ab984a54e8ff428e46d20122fff04cddf7002" + integrity sha512-0ERjvLIXqdCs2YLvn8avruk7KWuKDNwcDqVbxmLsmcLi8MgQm5xLB2EbAWfOnM+MBUYoZzbhwM/juU/H8DAPig== dependencies: - "@common-stack/core" "0.5.1" + strip-comments "^2.0.1" -"@common-stack/store-mongo@0.5.3": - version "0.5.3" - resolved "https://registry.yarnpkg.com/@common-stack/store-mongo/-/store-mongo-0.5.3.tgz#ab89f3a4f0c710f8590aee316129928c9988e9b0" - integrity sha512-5TDxJbvxbo4mIR84pBoN9nXa0XSVgGOhirfCBsDz+KKHZMlEHIdBWC6FUK5LC4xeHyEOqeyhO/vg1BC8y0w35A== +"@common-stack/server-core@0.5.35": + version "0.5.35" + resolved "https://registry.yarnpkg.com/@common-stack/server-core/-/server-core-0.5.35.tgz#83397f0aa9e40071364a2dc9bef04394301e0d2a" + integrity sha512-A9VZH7KyyYRGxzMf5g2VoOje3SlaW8yjimhNbufC67tUzNA8h06ofpF+rG/N8igzXINiEoAmM2P1OqKg92ySbg== dependencies: - "@common-stack/core" "0.5.1" + "@common-stack/core" "^0.5.34" + +"@common-stack/store-mongo@0.5.34": + version "0.5.34" + resolved "https://registry.yarnpkg.com/@common-stack/store-mongo/-/store-mongo-0.5.34.tgz#c728ed8ff1c67d045b61d8778e7ee2bff6d2b6f1" + integrity sha512-XaPucC+hCGT3v9VgsqAXA/kqgTlpqHn7i6jk6z9hgz+C/2nVZ/6CIuU/kkaL6okdJjzxAlCuBd3oO11Wcikf3w== + dependencies: + "@common-stack/core" "^0.5.34" "@cspotcode/source-map-support@^0.8.0": version "0.8.1" @@ -3588,6 +3748,14 @@ "@graphql-tools/utils" "8.0.2" tslib "~2.3.0" +"@graphql-tools/merge@^8.4.1": + version "8.4.2" + resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-8.4.2.tgz#95778bbe26b635e8d2f60ce9856b388f11fe8288" + integrity sha512-XbrHAaj8yDuINph+sAfuq3QCZ/tKblrTLOpirK0+CAgNlZUCHs0Fa+xtMUURgwCVThLle1AF7svJCxFizygLsw== + dependencies: + "@graphql-tools/utils" "^9.2.1" + tslib "^2.4.0" + "@graphql-tools/mock@^8.1.2": version "8.7.19" resolved "https://registry.yarnpkg.com/@graphql-tools/mock/-/mock-8.7.19.tgz#b6c01ecc44074a01d6f472213de5f56fe0a3380c" @@ -3670,6 +3838,16 @@ tslib "~2.2.0" value-or-promise "1.0.6" +"@graphql-tools/schema@^9.0.0": + version "9.0.19" + resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-9.0.19.tgz#c4ad373b5e1b8a0cf365163435b7d236ebdd06e7" + integrity sha512-oBRPoNBtCkk0zbUsyP4GaIzCt8C0aCI4ycIRUL67KK5pOHljKLBBtGT+Jr6hkzA74C8Gco8bpZPe7aWFjiaK2w== + dependencies: + "@graphql-tools/merge" "^8.4.1" + "@graphql-tools/utils" "^9.2.1" + tslib "^2.4.0" + value-or-promise "^1.0.12" + "@graphql-tools/stitch@^8.7.29": version "8.7.44" resolved "https://registry.yarnpkg.com/@graphql-tools/stitch/-/stitch-8.7.44.tgz#b563073335b6fb400d5ee238e4bc0976595a094b" @@ -4386,6 +4564,13 @@ "@jridgewell/resolve-uri" "3.1.0" "@jridgewell/sourcemap-codec" "1.4.14" +"@keyv/redis@^2.8.4": + version "2.8.4" + resolved "https://registry.yarnpkg.com/@keyv/redis/-/redis-2.8.4.tgz#0d1afb74ef4588c849658509fb69051648ac17d9" + integrity sha512-osO4C+i+Gi844wHjvXuHwhl+sDx3289Of309ZlLcj6SJReTLmPXzNiVR81N88wOu5aC+lVFdmx9FUQkkjdbPRQ== + dependencies: + ioredis "^5.3.2" + "@kwsites/file-exists@^1.1.1": version "1.1.1" resolved "https://registry.yarnpkg.com/@kwsites/file-exists/-/file-exists-1.1.1.tgz#ad1efcac13e1987d8dbaf235ef3be5b0d96faa99" @@ -7074,13 +7259,6 @@ dependencies: minimatch "^7.4.2" -"@types/accepts@^1.3.5": - version "1.3.5" - resolved "https://registry.yarnpkg.com/@types/accepts/-/accepts-1.3.5.tgz#c34bec115cfc746e04fe5a059df4ce7e7b391575" - integrity sha512-jOdnI/3qTpHABjM5cx1Hc0sKsPoYCp+DP/GJRGtDlPd7fiV9oXGGIcjW/ZOxLIvjGz8MA+uMZI9metHlgqbgwQ== - dependencies: - "@types/node" "*" - "@types/aria-query@^5.0.1": version "5.0.1" resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-5.0.1.tgz#3286741fb8f1e1580ac28784add4c7a1d49bdfbc" @@ -7252,7 +7430,7 @@ resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40" integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ== -"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18", "@types/express-serve-static-core@^4.17.33": +"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.33": version "4.17.33" resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.33.tgz#de35d30a9d637dc1450ad18dd583d75d5733d543" integrity sha512-TPBqmR/HRYI3eC2E5hmiivIzv+bidAfXofM+sbonAGvyDhySGw9/PQZFt2BLOrjUUR++4eJVpx6KnLQK1Fk9tA== @@ -7261,14 +7439,15 @@ "@types/qs" "*" "@types/range-parser" "*" -"@types/express-serve-static-core@4.17.31": - version "4.17.31" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz#a1139efeab4e7323834bb0226e62ac019f474b2f" - integrity sha512-DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q== +"@types/express-serve-static-core@^4.17.30": + version "4.19.0" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.19.0.tgz#3ae8ab3767d98d0b682cda063c3339e1e86ccfaa" + integrity sha512-bGyep3JqPCRry1wq+O5n7oiBgGWmeIJXPjXXCo8EK0u8duZGSYar7cGqd3ML2JUsLGeB7fmc06KYo9fLGWqPvQ== dependencies: "@types/node" "*" "@types/qs" "*" "@types/range-parser" "*" + "@types/send" "*" "@types/express@*", "@types/express@^4.17.13", "@types/express@^4.17.14": version "4.17.17" @@ -7280,16 +7459,6 @@ "@types/qs" "*" "@types/serve-static" "*" -"@types/express@4.17.14": - version "4.17.14" - resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.14.tgz#143ea0557249bc1b3b54f15db4c81c3d4eb3569c" - integrity sha512-TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg== - dependencies: - "@types/body-parser" "*" - "@types/express-serve-static-core" "^4.17.18" - "@types/qs" "*" - "@types/serve-static" "*" - "@types/filesystem@*": version "0.0.32" resolved "https://registry.yarnpkg.com/@types/filesystem/-/filesystem-0.0.32.tgz#307df7cc084a2293c3c1a31151b178063e0a8edf" @@ -7371,6 +7540,11 @@ "@types/relateurl" "*" "@types/uglify-js" "*" +"@types/http-cache-semantics@^4.0.1": + version "4.0.4" + resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz#b979ebad3919799c979b17c72621c0bc0a31c6c4" + integrity sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA== + "@types/http-proxy-agent@^2.0.2": version "2.0.2" resolved "https://registry.yarnpkg.com/@types/http-proxy-agent/-/http-proxy-agent-2.0.2.tgz#942c1f35c7e1f0edd1b6ffae5d0f9051cfb32be1" @@ -7507,6 +7681,11 @@ resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.1.tgz#5f8f2bca0a5863cb69bc0b0acd88c96cb1d4ae10" integrity sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA== +"@types/mime@^1": + version "1.3.5" + resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.5.tgz#1ef302e01cf7d2b5a0fa526790c9123bf1d06690" + integrity sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w== + "@types/minimatch@*": version "5.1.2" resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca" @@ -7532,6 +7711,14 @@ resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197" integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== +"@types/node-fetch@^2.6.1": + version "2.6.11" + resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.11.tgz#9b39b78665dae0e82a08f02f4967d62c66f95d24" + integrity sha512-24xFj9R5+rfQJLRyM56qh+wnVSYhyXC2tkoBndtY0U+vubqNsYXGjufB2nn8Q6gt0LrARwL6UBtMCSVCwl4B1g== + dependencies: + "@types/node" "*" + form-data "^4.0.0" + "@types/node@*", "@types/node@^18.11.9": version "18.15.11" resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.11.tgz#b3b790f09cb1696cffcec605de025b088fa4225f" @@ -7760,6 +7947,14 @@ resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.13.tgz#da4bfd73f49bd541d28920ab0e2bf0ee80f71c91" integrity sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw== +"@types/send@*": + version "0.17.4" + resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.4.tgz#6619cd24e7270793702e4e6a4b958a9010cfc57a" + integrity sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA== + dependencies: + "@types/mime" "^1" + "@types/node" "*" + "@types/serve-index@^1.9.1": version "1.9.1" resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.1.tgz#1b5e85370a192c01ec6cec4735cf2917337a6278" @@ -8550,7 +8745,7 @@ absolute-path@^0.0.0: resolved "https://registry.yarnpkg.com/absolute-path/-/absolute-path-0.0.0.tgz#a78762fbdadfb5297be99b15d35a785b2f095bf7" integrity sha512-HQiug4c+/s3WOvEnDRxXVmNtSG5s2gJM9r19BTcqjp7BWcE48PB+Y2G6jE65kqI0LpsQeMZygt/b60Gi4KxGyA== -accepts@^1.3.5, accepts@^1.3.7, accepts@^1.3.8, accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7, accepts@~1.3.8: +accepts@^1.3.7, accepts@^1.3.8, accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7, accepts@~1.3.8: version "1.3.8" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw== @@ -8986,17 +9181,6 @@ anymatch@^3.0.0, anymatch@^3.0.3, anymatch@~3.1.2: normalize-path "^3.0.0" picomatch "^2.0.4" -apollo-datasource-rest@^3.3.1: - version "3.7.0" - resolved "https://registry.yarnpkg.com/apollo-datasource-rest/-/apollo-datasource-rest-3.7.0.tgz#ee81a72a14731227420ee285d6443e3099b5620d" - integrity sha512-MeORtXZtc9drAvsarAGAUI4GZKoYFVc1OXIvehIZ/6pJrOdKGziGbraos2s/A+u8mpNPfbpk7W6f7uKtmwV0AA== - dependencies: - "@apollo/utils.keyvaluecache" "^1.0.1" - apollo-datasource "^3.3.2" - apollo-server-env "^4.2.1" - apollo-server-errors "^3.3.1" - http-cache-semantics "^4.1.0" - apollo-datasource@^3.3.1, apollo-datasource@^3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/apollo-datasource/-/apollo-datasource-3.3.2.tgz#5711f8b38d4b7b53fb788cb4dbd4a6a526ea74c8" @@ -9086,7 +9270,7 @@ apollo-server-caching@^3.3.0: dependencies: lru-cache "^6.0.0" -apollo-server-core@^3.11.1, apollo-server-core@^3.12.0: +apollo-server-core@^3.11.1: version "3.12.0" resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-3.12.0.tgz#8aa2a7329ce6fe1823290c45168c749db01548df" integrity sha512-hq7iH6Cgldgmnjs9FVSZeKWRpi0/ZR+iJ1arzeD2VXGxxgk1mAm/cz1Tx0TYgegZI+FvvrRl0UhKEx7sLnIxIg== @@ -9127,23 +9311,6 @@ apollo-server-errors@^3.3.1: resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-3.3.1.tgz#ba5c00cdaa33d4cbd09779f8cb6f47475d1cd655" integrity sha512-xnZJ5QWs6FixHICXHxUfm+ZWqqxrNuPlQ+kj5m6RtEgIpekOPssH/SD9gf2B4HuWV0QozorrygwZnux8POvyPA== -apollo-server-express@^3.11.1: - version "3.12.0" - resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-3.12.0.tgz#a6e392bb0427544b8c7e5d841ef07f7691b0c105" - integrity sha512-m8FaGPUfDOEGSm7QRWRmUUGjG/vqvpQoorkId9/FXkC57fz/A59kEdrzkMt9538Xgsa5AV+X4MEWLJhTvlW3LQ== - 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.5" - apollo-server-core "^3.12.0" - apollo-server-types "^3.8.0" - body-parser "^1.19.0" - cors "^2.8.5" - parseurl "^1.3.3" - apollo-server-plugin-base@^3.7.2: version "3.7.2" resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-3.7.2.tgz#c19cd137bc4c993ba2490ba2b571b0f3ce60a0cd" @@ -9151,15 +9318,6 @@ apollo-server-plugin-base@^3.7.2: dependencies: apollo-server-types "^3.8.0" -apollo-server-plugin-response-cache@^3.8.1: - version "3.8.2" - resolved "https://registry.yarnpkg.com/apollo-server-plugin-response-cache/-/apollo-server-plugin-response-cache-3.8.2.tgz#131ce372c3e83d5eaf8c826283c8432fa74b90dd" - integrity sha512-1k9iGgE7QIUvjC9B0A1elGrV5YcZZQFl5wEVOS7URUfEuTr3GsIHBZSFCLAEFNKTQewzS5Spqhv13AmFsOaFmg== - dependencies: - "@apollo/utils.keyvaluecache" "^1.0.1" - apollo-server-plugin-base "^3.7.2" - apollo-server-types "^3.8.0" - apollo-server-types@^3.8.0: version "3.8.0" resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-3.8.0.tgz#d976b6967878681f715fe2b9e4dad9ba86b1346f" @@ -11153,7 +11311,7 @@ cheerio-select@^2.1.0: domhandler "^5.0.3" domutils "^3.0.1" -cheerio@^1.0.0-rc.3: +cheerio@^1.0.0-rc.12, cheerio@^1.0.0-rc.3: version "1.0.0-rc.12" resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.12.tgz#788bf7466506b1c6bf5fae51d24a2c4d62e47683" integrity sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q== @@ -16802,11 +16960,16 @@ graphql-ws@^5.11.2: resolved "https://registry.yarnpkg.com/graphql-ws/-/graphql-ws-5.12.0.tgz#d06fe38916334b4a4c827f73268cbf4359a32ed7" integrity sha512-PA3ImUp8utrpEjoxBMhvxsjkStvFEdU0E1gEBREt8HZIWkxOUymwJBhFnBL7t/iHhUq1GVPeZevPinkZFENxTw== -graphql@15.8.0, graphql@^15.0.0: +graphql@15.8.0: version "15.8.0" resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.8.0.tgz#33410e96b012fa3bdb1091cc99a94769db212b38" integrity sha512-5gghUc24tP9HRznNpV2+FIoq3xKkj5dTQqf4v0CpdPbFVwFkWoxOM+o+2OC9ZSvjEMTjfmG9QT+gcvggTwW1zw== +graphql@^16.8.1: + version "16.8.1" + resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.8.1.tgz#1930a965bef1170603702acdb68aedd3f3cf6f07" + integrity sha512-59LZHPdGZVh695Ud9lRzPBVTtlX9ZCV150Er2W43ro37wVof0ctenSaskPPjN7lVTIN8mSZt8PHUNKZuNQUuxw== + growly@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" @@ -17966,6 +18129,21 @@ ioredis@^4.14.0, ioredis@^4.14.1, ioredis@^4.17.3: redis-parser "^3.0.0" standard-as-callback "^2.1.0" +ioredis@^5.3.2: + version "5.4.1" + resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-5.4.1.tgz#1c56b70b759f01465913887375ed809134296f40" + integrity sha512-2YZsvl7jopIa1gaePkeMtd9rAcSjOOjPtpcLlOeusyO+XH2SK5ZcT+UCrElPP+WVIInh2TzeI4XW9ENaSLVVHA== + dependencies: + "@ioredis/commands" "^1.1.1" + cluster-key-slot "^1.1.0" + debug "^4.3.4" + denque "^2.1.0" + lodash.defaults "^4.2.0" + lodash.isarguments "^3.1.0" + redis-errors "^1.2.0" + redis-parser "^3.0.0" + standard-as-callback "^2.1.0" + ip-regex@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9" @@ -19969,6 +20147,11 @@ json-buffer@3.0.0: resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" integrity sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ== +json-buffer@3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13" + integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ== + json-parse-better-errors@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" @@ -20223,6 +20406,13 @@ keyv@^3.0.0: dependencies: json-buffer "3.0.0" +keyv@^4.4.0: + version "4.5.4" + resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93" + integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw== + dependencies: + json-buffer "3.0.1" + killable@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892" @@ -21142,6 +21332,11 @@ lowercase-keys@^2.0.0: resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.13.1.tgz#267a81fbd0881327c46a81c5922606a2cfe336c4" integrity sha512-CHqbAq7NFlW3RSnoWXLJBxCWaZVBrfa9UEHId2M3AW8iEBurbqduNexEUCGc3SHc6iCYXNJCDi903LajSVAEPQ== +lru-cache@^10.0.0: + version "10.2.2" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.2.2.tgz#48206bc114c1252940c41b25b41af5b545aca878" + integrity sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ== + lru-cache@^4.0.1: version "4.1.5" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" @@ -21164,7 +21359,7 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" -lru-cache@^7.14.1, lru-cache@^7.4.4, lru-cache@^7.5.1, lru-cache@^7.7.1: +lru-cache@^7.10.1, lru-cache@^7.14.1, lru-cache@^7.4.4, lru-cache@^7.5.1, lru-cache@^7.7.1: version "7.18.3" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89" integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA== @@ -22746,7 +22941,7 @@ nock@^13.2.9: lodash "^4.17.21" propagate "^2.0.0" -node-abort-controller@^3.0.1: +node-abort-controller@^3.0.1, node-abort-controller@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/node-abort-controller/-/node-abort-controller-3.1.1.tgz#a94377e964a9a37ac3976d848cb5c765833b8548" integrity sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ== @@ -24192,7 +24387,7 @@ parseley@^0.7.0: moo "^0.5.1" nearley "^2.20.1" -parseurl@^1.3.3, parseurl@~1.3.2, parseurl@~1.3.3: +parseurl@~1.3.2, parseurl@~1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==