From 8cc8721fbbff3c978fd67d162df833d6973c1860 Mon Sep 17 00:00:00 2001 From: Arda TANRIKULU Date: Tue, 9 Aug 2022 20:22:59 +0300 Subject: [PATCH] Fix Merge Schemas behavior and remove legacy signature in addResolversToSchema (#4463) * Fix Merge Schemas behavior and remove legacy signature in addResolversToSchema * Go * More improvements * Go * Satisfy Bob * Try to fix website * Try sth --- .changeset/fifty-experts-unite.md | 76 ++ .changeset/tiny-zoos-dance.md | 2 +- packages/load/src/schema.ts | 90 +- packages/merge/src/extensions.ts | 181 +-- .../extract-extensions-from-schema.spec.ts | 3 +- packages/mock/src/addMocksToSchema.ts | 7 +- .../mock/tests/mocking-compatibility.spec.ts | 50 +- packages/schema/src/addResolversToSchema.ts | 32 +- .../schema/src/extractExtensionsFromSchema.ts | 69 ++ packages/schema/src/index.ts | 1 + packages/schema/src/makeExecutableSchema.ts | 26 +- packages/schema/src/merge-schemas.ts | 49 +- packages/schema/src/types.ts | 20 +- packages/schema/tests/merge-schemas.spec.ts | 55 + packages/schema/tests/schemaGenerator.test.ts | 10 +- packages/stitch/src/stitchSchemas.ts | 6 +- packages/stitch/src/types.ts | 1 - packages/utils/src/types.ts | 43 + website/package.json | 18 +- yarn.lock | 1054 +++++++++-------- 20 files changed, 956 insertions(+), 837 deletions(-) create mode 100644 .changeset/fifty-experts-unite.md create mode 100644 packages/schema/src/extractExtensionsFromSchema.ts diff --git a/.changeset/fifty-experts-unite.md b/.changeset/fifty-experts-unite.md new file mode 100644 index 00000000000..1838b6d3f8f --- /dev/null +++ b/.changeset/fifty-experts-unite.md @@ -0,0 +1,76 @@ +--- +'@graphql-tools/schema': major +--- + +Thanks @mattkrick and @borisno2! + +## Breaking changes + +`addResolversToSchema`; + +If you are using the legacy parameters like below, you should update them to the new usage. Other than that, there is no functional change; + +```ts +// From +addResolversToSchema(schema, resolvers, resolverValidationOptions) + +// To +addResolversToSchema({ + schema, + resolvers, + resolverValidationOptions +}) +``` + +`mergeSchemas`; + +The provided `resolver` overrides the resolvers in the `schema` with the same name; + +The `hello` resolver in the `schema` would be overridden by the `hello` resolver in the `resolvers`. Before it was opposite which is not expected. + +```ts +const schema = makeExecutableSchema({ + typeDefs: ` + type Query { + hello: String + } + `, + resolvers: { + Query: { + hello: () => 'Hello world!' + } + } +}) + +mergeSchemas({ + schemas: [schema], + resolvers: { + Query: { + hello: () => 'New hello world' + } + } +}) +``` + +`makeExecutableSchema` no longer takes `parseOptions` and you can pass those options directly; + +```ts +makeExecutableSchema({ + typeDefs: ``, + parseOptions: { + assumeValid: true + } +}) + +// After +makeExecutableSchema({ + typeDefs: ``, + assumeValid: true +}) +``` + +`makeExecutableSchema` no longer does pruning and it doesn't take `pruningOptions` anymore. +You can use `pruneSchema` from `@graphql-tools/utils` if you need. + +`extractExtensionsFromSchema` moved from `@graphql-tools/merge` to `@graphql-tools/schema`. +And `travelSchemaPossibleExtensions` has been dropped in favor of `mapSchema`. diff --git a/.changeset/tiny-zoos-dance.md b/.changeset/tiny-zoos-dance.md index fc96a3c8df0..8d42c5567c8 100644 --- a/.changeset/tiny-zoos-dance.md +++ b/.changeset/tiny-zoos-dance.md @@ -3,7 +3,7 @@ '@graphql-tools/wrap': major --- -Breaking changes; +## Breaking changes **Schema generation optimization by removing `transfomedSchema` parameter** diff --git a/packages/load/src/schema.ts b/packages/load/src/schema.ts index d16f84049d5..15dbb97f607 100644 --- a/packages/load/src/schema.ts +++ b/packages/load/src/schema.ts @@ -1,19 +1,12 @@ import { loadTypedefs, LoadTypedefsOptions, UnnormalizedTypeDefPointer, loadTypedefsSync } from './load-typedefs.js'; -import { - GraphQLSchema, - BuildSchemaOptions, - DocumentNode, - Source as GraphQLSource, - print, - lexicographicSortSchema, -} from 'graphql'; -import { OPERATION_KINDS } from './documents.js'; -import { mergeSchemas, MergeSchemasConfig } from '@graphql-tools/schema'; -import { Source } from '@graphql-tools/utils'; +import { GraphQLSchema, BuildSchemaOptions, Source as GraphQLSource, print, lexicographicSortSchema } from 'graphql'; +import { OPERATION_KINDS } from './documents'; +import { IExecutableSchemaDefinition, mergeSchemas, extractExtensionsFromSchema } from '@graphql-tools/schema'; +import { getResolversFromSchema, IResolvers, SchemaExtensions, Source, TypeSource } from '@graphql-tools/utils'; export type LoadSchemaOptions = BuildSchemaOptions & LoadTypedefsOptions & - Partial & { + Partial & { /** * Adds a list of Sources in to `extensions.sources` * @@ -35,22 +28,7 @@ export async function loadSchema( ...options, filterKinds: OPERATION_KINDS, }); - - const { schemas, typeDefs } = collectSchemasAndTypeDefs(sources); - schemas.push(...(options.schemas ?? [])); - const mergeSchemasOptions: MergeSchemasConfig = { - ...options, - schemas: schemas.concat(options.schemas ?? []), - typeDefs, - }; - - const schema = typeDefs?.length === 0 && schemas?.length === 1 ? schemas[0] : mergeSchemas(mergeSchemasOptions); - - if (options?.includeSources) { - includeSources(schema, sources); - } - - return options.sort ? lexicographicSortSchema(schema) : schema; + return getSchemaFromSources(sources, options); } /** @@ -66,20 +44,7 @@ export function loadSchemaSync( filterKinds: OPERATION_KINDS, ...options, }); - - const { schemas, typeDefs } = collectSchemasAndTypeDefs(sources); - - const schema = mergeSchemas({ - schemas, - typeDefs, - ...options, - }); - - if (options?.includeSources) { - includeSources(schema, sources); - } - - return options.sort ? lexicographicSortSchema(schema) : schema; + return getSchemaFromSources(sources, options); } function includeSources(schema: GraphQLSchema, sources: Source[]) { @@ -98,20 +63,47 @@ function includeSources(schema: GraphQLSchema, sources: Source[]) { }; } -function collectSchemasAndTypeDefs(sources: Source[]) { - const schemas: GraphQLSchema[] = []; - const typeDefs: DocumentNode[] = []; +function getSchemaFromSources(sources: Source[], options: LoadSchemaOptions) { + if (sources.length === 1 && sources[0].schema != null && options.typeDefs == null && options.resolvers == null) { + return options.sort ? lexicographicSortSchema(sources[0].schema) : sources[0].schema; + } + const { typeDefs, resolvers, schemaExtensions } = collectSchemaParts(sources); + + const schema = mergeSchemas({ + ...options, + typeDefs, + resolvers, + schemaExtensions, + }); + + if (options?.includeSources) { + includeSources(schema, sources); + } + + return options.sort ? lexicographicSortSchema(schema) : schema; +} + +function collectSchemaParts(sources: Source[]) { + const typeDefs: TypeSource[] = []; + const resolvers: IResolvers[] = []; + const schemaExtensions: SchemaExtensions[] = []; for (const source of sources) { if (source.schema) { - schemas.push(source.schema); - } else if (source.document) { - typeDefs.push(source.document); + typeDefs.push(source.schema); + resolvers.push(getResolversFromSchema(source.schema)); + schemaExtensions.push(extractExtensionsFromSchema(source.schema)); + } else { + const typeDef = source.document || source.rawSDL; + if (typeDef) { + typeDefs.push(typeDef); + } } } return { - schemas, typeDefs, + resolvers, + schemaExtensions, }; } diff --git a/packages/merge/src/extensions.ts b/packages/merge/src/extensions.ts index 64816790318..2341b11f893 100644 --- a/packages/merge/src/extensions.ts +++ b/packages/merge/src/extensions.ts @@ -1,143 +1,5 @@ -import { - GraphQLSchema, - isObjectType, - isInterfaceType, - isInputObjectType, - GraphQLField, - GraphQLInputField, - isUnionType, - isScalarType, - isEnumType, - isSpecifiedScalarType, - isIntrospectionType, - GraphQLObjectType, - GraphQLInputObjectType, - GraphQLUnionType, - GraphQLScalarType, - GraphQLArgument, - GraphQLEnumType, - GraphQLEnumValue, - GraphQLInterfaceType, -} from 'graphql'; -import { Maybe, mergeDeep } from '@graphql-tools/utils'; - -export type ExtensionsObject = Record; - -export type ObjectTypeExtensions = { - type: 'object'; - fields: Record }>; -}; - -export type InputTypeExtensions = { - type: 'input'; - fields: Record; -}; - -export type InterfaceTypeExtensions = { - type: 'interface'; - fields: Record }>; -}; - -export type UnionTypeExtensions = { - type: 'union'; -}; - -export type ScalarTypeExtensions = { - type: 'scalar'; -}; - -export type EnumTypeExtensions = { - type: 'enum'; - values: Record; -}; - -export type PossibleTypeExtensions = - | InputTypeExtensions - | InterfaceTypeExtensions - | ObjectTypeExtensions - | UnionTypeExtensions - | ScalarTypeExtensions - | EnumTypeExtensions; -export type SchemaExtensions = { - schemaExtensions: ExtensionsObject; - types: Record; -}; - -export function travelSchemaPossibleExtensions( - schema: GraphQLSchema, - hooks: { - onSchema: (schema: GraphQLSchema) => any; - onObjectType: (type: GraphQLObjectType) => any; - onObjectField: (type: GraphQLObjectType, field: GraphQLField) => any; - onObjectFieldArg: (type: GraphQLObjectType, field: GraphQLField, arg: GraphQLArgument) => any; - onInterface: (type: GraphQLInterfaceType) => any; - onInterfaceField: (type: GraphQLInterfaceType, field: GraphQLField) => any; - onInterfaceFieldArg: (type: GraphQLInterfaceType, field: GraphQLField, arg: GraphQLArgument) => any; - onInputType: (type: GraphQLInputObjectType) => any; - onInputFieldType: (type: GraphQLInputObjectType, field: GraphQLInputField) => any; - onUnion: (type: GraphQLUnionType) => any; - onScalar: (type: GraphQLScalarType) => any; - onEnum: (type: GraphQLEnumType) => any; - onEnumValue: (type: GraphQLEnumType, value: GraphQLEnumValue) => any; - } -) { - hooks.onSchema(schema); - const typesMap = schema.getTypeMap(); - - for (const [, type] of Object.entries(typesMap)) { - const isPredefinedScalar = isScalarType(type) && isSpecifiedScalarType(type); - const isIntrospection = isIntrospectionType(type); - - if (isPredefinedScalar || isIntrospection) { - continue; - } - - if (isObjectType(type)) { - hooks.onObjectType(type); - - const fields = type.getFields(); - for (const [, field] of Object.entries(fields)) { - hooks.onObjectField(type, field); - - const args = field.args || []; - - for (const arg of args) { - hooks.onObjectFieldArg(type, field, arg); - } - } - } else if (isInterfaceType(type)) { - hooks.onInterface(type); - - const fields = type.getFields(); - for (const [, field] of Object.entries(fields)) { - hooks.onInterfaceField(type, field); - - const args = field.args || []; - - for (const arg of args) { - hooks.onInterfaceFieldArg(type, field, arg); - } - } - } else if (isInputObjectType(type)) { - hooks.onInputType(type); - - const fields = type.getFields(); - for (const [, field] of Object.entries(fields)) { - hooks.onInputFieldType(type, field); - } - } else if (isUnionType(type)) { - hooks.onUnion(type); - } else if (isScalarType(type)) { - hooks.onScalar(type); - } else if (isEnumType(type)) { - hooks.onEnum(type); - - for (const value of type.getValues()) { - hooks.onEnumValue(type, value); - } - } - } -} +import { GraphQLSchema, GraphQLObjectType, GraphQLEnumType } from 'graphql'; +import { ExtensionsObject, Maybe, mergeDeep, SchemaExtensions } from '@graphql-tools/utils'; export function mergeExtensions(extensions: SchemaExtensions[]): SchemaExtensions { return mergeDeep(extensions); @@ -194,42 +56,3 @@ export function applyExtensions(schema: GraphQLSchema, extensions: SchemaExtensi return schema; } - -export function extractExtensionsFromSchema(schema: GraphQLSchema): SchemaExtensions { - const result: SchemaExtensions = { - schemaExtensions: {}, - types: {}, - }; - - travelSchemaPossibleExtensions(schema, { - onSchema: schema => (result.schemaExtensions = schema.extensions || {}), - onObjectType: type => (result.types[type.name] = { fields: {}, type: 'object', extensions: type.extensions || {} }), - onObjectField: (type, field) => - ((result.types[type.name] as ObjectTypeExtensions).fields[field.name] = { - arguments: {}, - extensions: field.extensions || {}, - }), - onObjectFieldArg: (type, field, arg) => - ((result.types[type.name] as ObjectTypeExtensions).fields[field.name].arguments[arg.name] = arg.extensions || {}), - onInterface: type => - (result.types[type.name] = { fields: {}, type: 'interface', extensions: type.extensions || {} }), - onInterfaceField: (type, field) => - ((result.types[type.name] as InterfaceTypeExtensions).fields[field.name] = { - arguments: {}, - extensions: field.extensions || {}, - }), - onInterfaceFieldArg: (type, field, arg) => - ((result.types[type.name] as InterfaceTypeExtensions).fields[field.name].arguments[arg.name] = - arg.extensions || {}), - onEnum: type => (result.types[type.name] = { values: {}, type: 'enum', extensions: type.extensions || {} }), - onEnumValue: (type, value) => - ((result.types[type.name] as EnumTypeExtensions).values[value.name] = value.extensions || {}), - onScalar: type => (result.types[type.name] = { type: 'scalar', extensions: type.extensions || {} }), - onUnion: type => (result.types[type.name] = { type: 'union', extensions: type.extensions || {} }), - onInputType: type => (result.types[type.name] = { fields: {}, type: 'input', extensions: type.extensions || {} }), - onInputFieldType: (type, field) => - ((result.types[type.name] as InputTypeExtensions).fields[field.name] = { extensions: field.extensions || {} }), - }); - - return result; -} diff --git a/packages/merge/tests/extract-extensions-from-schema.spec.ts b/packages/merge/tests/extract-extensions-from-schema.spec.ts index 703e0ba89a1..45db96ad88b 100644 --- a/packages/merge/tests/extract-extensions-from-schema.spec.ts +++ b/packages/merge/tests/extract-extensions-from-schema.spec.ts @@ -8,7 +8,8 @@ import { assertGraphQLScalerType, } from '../../testing/assertion.js'; import { assertSome } from '@graphql-tools/utils'; -import { extractExtensionsFromSchema, mergeExtensions, applyExtensions } from '../src/extensions.js'; +import { mergeExtensions, applyExtensions } from '../src/extensions.js'; +import { extractExtensionsFromSchema } from '@graphql-tools/schema'; describe('extensions', () => { let schema: GraphQLSchema; diff --git a/packages/mock/src/addMocksToSchema.ts b/packages/mock/src/addMocksToSchema.ts index d82cc6daea0..2b891de4bcb 100644 --- a/packages/mock/src/addMocksToSchema.ts +++ b/packages/mock/src/addMocksToSchema.ts @@ -245,5 +245,10 @@ export function addMocksToSchema({ }, }); - return resolvers ? addResolversToSchema(schemaWithMocks, resolvers as any) : schemaWithMocks; + return resolvers + ? addResolversToSchema({ + schema: schemaWithMocks, + resolvers: resolvers as any, + }) + : schemaWithMocks; } diff --git a/packages/mock/tests/mocking-compatibility.spec.ts b/packages/mock/tests/mocking-compatibility.spec.ts index dd5b6f96ffe..120bf636deb 100644 --- a/packages/mock/tests/mocking-compatibility.spec.ts +++ b/packages/mock/tests/mocking-compatibility.spec.ts @@ -181,7 +181,10 @@ describe('Mock retro-compatibility', () => { returnString: () => 'someString', }, }; - jsSchema = addResolversToSchema(jsSchema, resolvers); + jsSchema = addResolversToSchema({ + schema: jsSchema, + resolvers, + }); const testQuery = /* GraphQL */ ` { returnInt @@ -266,7 +269,10 @@ describe('Mock retro-compatibility', () => { }, }, }; - jsSchema = addResolversToSchema(jsSchema, resolvers); + jsSchema = addResolversToSchema({ + schema: jsSchema, + resolvers, + }); jsSchema = addMocksToSchema({ schema: jsSchema, mocks: {}, @@ -625,7 +631,10 @@ describe('Mock retro-compatibility', () => { returnMockError: () => undefined, }, }; - jsSchema = addResolversToSchema(jsSchema, resolvers); + jsSchema = addResolversToSchema({ + schema: jsSchema, + resolvers, + }); const mockMap = {}; jsSchema = addMocksToSchema({ @@ -656,7 +665,10 @@ describe('Mock retro-compatibility', () => { returnMockError: () => '10-11-2012', }, }; - jsSchema = addResolversToSchema(jsSchema, resolvers); + jsSchema = addResolversToSchema({ + schema: jsSchema, + resolvers, + }); const mockMap = {}; addMocksToSchema({ @@ -875,7 +887,10 @@ describe('Mock retro-compatibility', () => { }, }, }; - jsSchema = addResolversToSchema(jsSchema, resolvers); + jsSchema = addResolversToSchema({ + schema: jsSchema, + resolvers, + }); const testQuery = /* GraphQL */ ` { returnListOfListOfObject { @@ -1064,7 +1079,10 @@ describe('Mock retro-compatibility', () => { returnString: () => Promise.resolve('bar'), // see c) }, }; - jsSchema = addResolversToSchema(jsSchema, resolvers); + jsSchema = addResolversToSchema({ + schema: jsSchema, + resolvers, + }); jsSchema = addMocksToSchema({ schema: jsSchema, mocks: mockMap, @@ -1129,7 +1147,10 @@ describe('Mock retro-compatibility', () => { }), }, }; - jsSchema = addResolversToSchema(jsSchema, resolvers); + jsSchema = addResolversToSchema({ + schema: jsSchema, + resolvers, + }); const mockMap = { returnListOfInt: () => [5, 6, 7], Bird: () => ({ @@ -1174,7 +1195,10 @@ describe('Mock retro-compatibility', () => { }), }, }; - jsSchema = addResolversToSchema(jsSchema, resolvers); + jsSchema = addResolversToSchema({ + schema: jsSchema, + resolvers, + }); const mockMap = { Bird: () => ({ returnInt: 3, // see a) @@ -1218,7 +1242,10 @@ describe('Mock retro-compatibility', () => { returnObject: () => objProxy, }, }; - jsSchema = addResolversToSchema(jsSchema, resolvers); + jsSchema = addResolversToSchema({ + schema: jsSchema, + resolvers, + }); const mockMap = { Bird: () => ({ returnInt: 3, // see a) @@ -1295,7 +1322,10 @@ describe('Mock retro-compatibility', () => { returnString: () => null, // a) resolve of a string }, }; - jsSchema = addResolversToSchema(jsSchema, resolvers); + jsSchema = addResolversToSchema({ + schema: jsSchema, + resolvers, + }); const mockMap = { Int: () => 666, // b) mock of Int. }; diff --git a/packages/schema/src/addResolversToSchema.ts b/packages/schema/src/addResolversToSchema.ts index c019f8ba948..becec011d78 100644 --- a/packages/schema/src/addResolversToSchema.ts +++ b/packages/schema/src/addResolversToSchema.ts @@ -1,7 +1,6 @@ import { GraphQLEnumType, GraphQLSchema, - isSchema, GraphQLScalarType, GraphQLUnionType, GraphQLInterfaceType, @@ -19,7 +18,6 @@ import { import { IResolvers, - IResolverValidationOptions, IAddResolversToSchemaOptions, mapSchema, MapperKind, @@ -33,28 +31,14 @@ import { import { checkForResolveTypeResolver } from './checkForResolveTypeResolver.js'; import { extendResolversFromInterfaces } from './extendResolversFromInterfaces.js'; -export function addResolversToSchema( - schemaOrOptions: GraphQLSchema | IAddResolversToSchemaOptions, - legacyInputResolvers?: IResolvers, - legacyInputValidationOptions?: IResolverValidationOptions -): GraphQLSchema { - const options: IAddResolversToSchemaOptions = isSchema(schemaOrOptions) - ? { - schema: schemaOrOptions, - resolvers: legacyInputResolvers ?? {}, - resolverValidationOptions: legacyInputValidationOptions, - } - : schemaOrOptions; - - let { - schema, - resolvers: inputResolvers, - defaultFieldResolver, - resolverValidationOptions = {}, - inheritResolversFromInterfaces = false, - updateResolversInPlace = false, - } = options; - +export function addResolversToSchema({ + schema, + resolvers: inputResolvers, + defaultFieldResolver, + resolverValidationOptions = {}, + inheritResolversFromInterfaces = false, + updateResolversInPlace = false, +}: IAddResolversToSchemaOptions): GraphQLSchema { const { requireResolversToMatchSchema = 'error', requireResolversForResolveType } = resolverValidationOptions; const resolvers = inheritResolversFromInterfaces diff --git a/packages/schema/src/extractExtensionsFromSchema.ts b/packages/schema/src/extractExtensionsFromSchema.ts new file mode 100644 index 00000000000..a5d7a588c30 --- /dev/null +++ b/packages/schema/src/extractExtensionsFromSchema.ts @@ -0,0 +1,69 @@ +import { + SchemaExtensions, + ObjectTypeExtensions, + EnumTypeExtensions, + InputTypeExtensions, + mapSchema, + MapperKind, +} from '@graphql-tools/utils'; +import { GraphQLFieldConfig, GraphQLSchema } from 'graphql'; + +export function extractExtensionsFromSchema(schema: GraphQLSchema): SchemaExtensions { + const result: SchemaExtensions = { + schemaExtensions: schema.extensions || {}, + types: {}, + }; + + mapSchema(schema, { + [MapperKind.OBJECT_TYPE]: type => { + result.types[type.name] = { fields: {}, type: 'object', extensions: type.extensions || {} }; + return type; + }, + [MapperKind.INTERFACE_TYPE]: type => { + result.types[type.name] = { fields: {}, type: 'interface', extensions: type.extensions || {} }; + return type; + }, + [MapperKind.FIELD]: (field, fieldName, typeName) => { + (result.types[typeName] as ObjectTypeExtensions).fields[fieldName] = { + arguments: {}, + extensions: field.extensions || {}, + }; + const args = (field as GraphQLFieldConfig).args; + if (args != null) { + for (const argName in args) { + (result.types[typeName] as ObjectTypeExtensions).fields[fieldName].arguments[argName] = + args[argName].extensions || {}; + } + } + return field; + }, + [MapperKind.ENUM_TYPE]: type => { + result.types[type.name] = { values: {}, type: 'enum', extensions: type.extensions || {} }; + return type; + }, + [MapperKind.ENUM_VALUE]: (value, typeName, _schema, valueName) => { + (result.types[typeName] as EnumTypeExtensions).values[valueName] = value.extensions || {}; + return value; + }, + [MapperKind.SCALAR_TYPE]: type => { + result.types[type.name] = { type: 'scalar', extensions: type.extensions || {} }; + return type; + }, + [MapperKind.UNION_TYPE]: type => { + result.types[type.name] = { type: 'union', extensions: type.extensions || {} }; + return type; + }, + [MapperKind.INPUT_OBJECT_TYPE]: type => { + result.types[type.name] = { fields: {}, type: 'input', extensions: type.extensions || {} }; + return type; + }, + [MapperKind.INPUT_OBJECT_FIELD]: (field, fieldName, typeName) => { + (result.types[typeName] as InputTypeExtensions).fields[fieldName] = { + extensions: field.extensions || {}, + }; + return field; + }, + }); + + return result; +} diff --git a/packages/schema/src/index.ts b/packages/schema/src/index.ts index ba12b322242..608efc971cc 100644 --- a/packages/schema/src/index.ts +++ b/packages/schema/src/index.ts @@ -6,3 +6,4 @@ export { extendResolversFromInterfaces } from './extendResolversFromInterfaces.j export * from './makeExecutableSchema.js'; export * from './types.js'; export * from './merge-schemas.js'; +export * from './extractExtensionsFromSchema.js'; diff --git a/packages/schema/src/makeExecutableSchema.ts b/packages/schema/src/makeExecutableSchema.ts index 96b84c07b14..ae0edc034ca 100644 --- a/packages/schema/src/makeExecutableSchema.ts +++ b/packages/schema/src/makeExecutableSchema.ts @@ -1,6 +1,6 @@ import { buildASTSchema, buildSchema, GraphQLSchema, isSchema } from 'graphql'; -import { asArray, pruneSchema } from '@graphql-tools/utils'; +import { asArray } from '@graphql-tools/utils'; import { addResolversToSchema } from './addResolversToSchema.js'; import { assertResolversPresent } from './assertResolversPresent.js'; @@ -15,12 +15,11 @@ import { applyExtensions, mergeExtensions, mergeResolvers, mergeTypeDefs } from * of these. If a function is provided, it will be passed no arguments and * should return an array of strings or `DocumentNode`s. * - * Note: You can use `graphql-tag` to not only parse a string into a - * `DocumentNode` but also to provide additional syntax highlighting in your - * editor (with the appropriate editor plugin). + * Note: You can use GraphQL magic comment provide additional syntax + * highlighting in your editor (with the appropriate editor plugin). * * ```js - * const typeDefs = gql` + * const typeDefs = /* GraphQL *\/ ` * type Query { * posts: [Post] * author(id: Int!): Author @@ -55,11 +54,10 @@ export function makeExecutableSchema({ typeDefs, resolvers = {}, resolverValidationOptions = {}, - parseOptions = {}, inheritResolversFromInterfaces = false, - pruningOptions, updateResolversInPlace = false, schemaExtensions, + ...otherOptions }: IExecutableSchemaDefinition) { // Validate and clean up arguments if (typeof resolverValidationOptions !== 'object') { @@ -74,19 +72,15 @@ export function makeExecutableSchema({ if (isSchema(typeDefs)) { schema = typeDefs; - } else if (parseOptions?.commentDescriptions) { + } else if (otherOptions?.commentDescriptions) { const mergedTypeDefs = mergeTypeDefs(typeDefs, { - ...parseOptions, + ...otherOptions, commentDescriptions: true, }); - schema = buildSchema(mergedTypeDefs, parseOptions); + schema = buildSchema(mergedTypeDefs, otherOptions); } else { - const mergedTypeDefs = mergeTypeDefs(typeDefs, parseOptions); - schema = buildASTSchema(mergedTypeDefs, parseOptions); - } - - if (pruningOptions) { - schema = pruneSchema(schema); + const mergedTypeDefs = mergeTypeDefs(typeDefs, otherOptions); + schema = buildASTSchema(mergedTypeDefs, otherOptions); } // We allow passing in an array of resolver maps, in which case we merge them diff --git a/packages/schema/src/merge-schemas.ts b/packages/schema/src/merge-schemas.ts index 3a5f55e8eab..cc8d14fdada 100644 --- a/packages/schema/src/merge-schemas.ts +++ b/packages/schema/src/merge-schemas.ts @@ -1,38 +1,51 @@ import { GraphQLSchema } from 'graphql'; -import { extractExtensionsFromSchema, SchemaExtensions } from '@graphql-tools/merge'; -import { IResolvers, asArray, getResolversFromSchema, TypeSource } from '@graphql-tools/utils'; +import { IResolvers, asArray, getResolversFromSchema, TypeSource, SchemaExtensions } from '@graphql-tools/utils'; import { makeExecutableSchema } from './makeExecutableSchema.js'; import { IExecutableSchemaDefinition } from './types.js'; +import { extractExtensionsFromSchema } from './extractExtensionsFromSchema.js'; /** * Configuration object for schema merging */ -export type MergeSchemasConfig = Partial> & - IExecutableSchemaDefinition['parseOptions'] & { - /** - * The schemas to be merged - */ - schemas?: GraphQLSchema[]; - }; +export type MergeSchemasConfig = Partial> & { + /** + * The schemas to be merged + */ + schemas?: GraphQLSchema[]; +}; /** * Synchronously merges multiple schemas, typeDefinitions and/or resolvers into a single schema. * @param config Configuration object */ export function mergeSchemas(config: MergeSchemasConfig) { - const extractedTypeDefs: TypeSource = asArray(config.typeDefs || []); - const extractedResolvers: IResolvers[] = asArray(config.resolvers || []); - const extractedSchemaExtensions: SchemaExtensions[] = asArray(config.schemaExtensions || []); + const extractedTypeDefs: TypeSource[] = []; + const extractedResolvers: IResolvers[] = []; + const extractedSchemaExtensions: SchemaExtensions[] = []; - const schemas = config.schemas || []; - for (const schema of schemas) { - extractedTypeDefs.push(schema); - extractedResolvers.push(getResolversFromSchema(schema, true)); - extractedSchemaExtensions.push(extractExtensionsFromSchema(schema)); + if (config.schemas != null) { + for (const schema of config.schemas) { + extractedTypeDefs.push(schema); + extractedResolvers.push(getResolversFromSchema(schema)); + extractedSchemaExtensions.push(extractExtensionsFromSchema(schema)); + } + } + + if (config.typeDefs != null) { + extractedTypeDefs.push(config.typeDefs); + } + + if (config.resolvers != null) { + const additionalResolvers = asArray(config.resolvers); + extractedResolvers.push(...additionalResolvers); + } + + if (config.schemaExtensions != null) { + const additionalSchemaExtensions = asArray(config.schemaExtensions); + extractedSchemaExtensions.push(...additionalSchemaExtensions); } return makeExecutableSchema({ - parseOptions: config, ...config, typeDefs: extractedTypeDefs, resolvers: extractedResolvers, diff --git a/packages/schema/src/types.ts b/packages/schema/src/types.ts index a5a917ddbb1..b6e502346f1 100644 --- a/packages/schema/src/types.ts +++ b/packages/schema/src/types.ts @@ -3,15 +3,18 @@ import { IResolvers, IResolverValidationOptions, GraphQLParseOptions, - PruneSchemaOptions, + SchemaExtensions, } from '@graphql-tools/utils'; -import { SchemaExtensions } from '@graphql-tools/merge'; -import { BuildSchemaOptions } from 'graphql'; +import { BuildSchemaOptions, GraphQLSchema } from 'graphql'; + +export interface GraphQLSchemaWithContext extends GraphQLSchema { + __context?: TContext; +} /** * Configuration object for creating an executable schema */ -export interface IExecutableSchemaDefinition { +export interface IExecutableSchemaDefinition extends BuildSchemaOptions, GraphQLParseOptions { /** * The type definitions used to create the schema */ @@ -24,20 +27,11 @@ export interface IExecutableSchemaDefinition { * Additional options for validating the provided resolvers */ resolverValidationOptions?: IResolverValidationOptions; - /** - * Additional options for parsing the type definitions if they are provided - * as a string - */ - parseOptions?: BuildSchemaOptions & GraphQLParseOptions; /** * GraphQL object types that implement interfaces will inherit any missing * resolvers from their interface types defined in the `resolvers` object */ inheritResolversFromInterfaces?: boolean; - /** - * Additional options for removing unused types from the schema - */ - pruningOptions?: PruneSchemaOptions; /** * Do not create a schema again and use the one from `buildASTSchema` */ diff --git a/packages/schema/tests/merge-schemas.spec.ts b/packages/schema/tests/merge-schemas.spec.ts index 416cd5dff55..82959360a88 100644 --- a/packages/schema/tests/merge-schemas.spec.ts +++ b/packages/schema/tests/merge-schemas.spec.ts @@ -40,6 +40,61 @@ describe('Merge Schemas', () => { expect(mergedSchema.extensions).toEqual({ schemaA: true, schemaB: true }); }); + it('should override resolver in schema with resolver passed into config', async () => { + const fooSchema = makeExecutableSchema({ + typeDefs: /* GraphQL */ ` + type Query { + foo: String + } + `, + resolvers: { + Query: { + foo: () => 'FOO', + }, + }, + }); + const barSchema = makeExecutableSchema({ + typeDefs: /* GraphQL */ ` + type Query { + bar: String + } + `, + resolvers: { + Query: { + bar: () => 'BAR', + }, + }, + }); + const { errors, data } = await graphql({ + schema: mergeSchemas({ + schemas: [fooSchema, barSchema], + typeDefs: /* GraphQL */ ` + type Query { + qux: String + } + `, + resolvers: { + Query: { + qux: () => 'QUX', + foo: () => 'FOO_BAR_QUX', + }, + }, + }), + source: ` + { + foo + bar + qux + } + `, + }); + expect(errors).toBeFalsy(); + assertSome(data); + expect(data['foo']).toBe('FOO_BAR_QUX'); + expect(data['bar']).toBe('BAR'); + expect(data['qux']).toBe('QUX'); + }); + it('should merge two valid executable schemas', async () => { const fooSchema = makeExecutableSchema({ typeDefs: /* GraphQL */ ` diff --git a/packages/schema/tests/schemaGenerator.test.ts b/packages/schema/tests/schemaGenerator.test.ts index 4d36a2fd5b3..375afd4007c 100644 --- a/packages/schema/tests/schemaGenerator.test.ts +++ b/packages/schema/tests/schemaGenerator.test.ts @@ -1961,9 +1961,7 @@ describe('can specify lexical parser options', () => { } `, resolvers: {}, - parseOptions: { - noLocation: true, - }, + noLocation: true, }); expect(schema.astNode!.loc).toBeUndefined(); @@ -1986,9 +1984,7 @@ describe('can specify lexical parser options', () => { makeExecutableSchema({ typeDefs, resolvers, - parseOptions: { - experimentalFragmentVariables: true, - }, + experimentalFragmentVariables: true, }); }).not.toThrowError(); }); @@ -2264,7 +2260,7 @@ describe('interface resolver inheritance', () => { }, }; const schema = makeExecutableSchema({ - parseOptions: { allowLegacySDLImplementsInterfaces: true }, + allowLegacySDLImplementsInterfaces: true, typeDefs: testSchemaWithInterfaceResolvers, resolvers, inheritResolversFromInterfaces: true, diff --git a/packages/stitch/src/stitchSchemas.ts b/packages/stitch/src/stitchSchemas.ts index 5574a6f6b12..465da7409c1 100644 --- a/packages/stitch/src/stitchSchemas.ts +++ b/packages/stitch/src/stitchSchemas.ts @@ -28,9 +28,9 @@ export function stitchSchemas = Record): GraphQLSchema { const transformedSubschemas: Array> = []; const subschemaMap: Map< @@ -63,8 +63,8 @@ export function stitchSchemas = Record> = ( declare module '@graphql-tools/utils' { interface IFieldResolverOptions { - fragment?: string; selectionSet?: string | ((node: FieldNode) => SelectionSetNode); } } diff --git a/packages/utils/src/types.ts b/packages/utils/src/types.ts index 2d65c4c2dcc..4d325d9e9b6 100644 --- a/packages/utils/src/types.ts +++ b/packages/utils/src/types.ts @@ -88,3 +88,46 @@ export enum DirectiveLocation { INPUT_OBJECT = 'INPUT_OBJECT', INPUT_FIELD_DEFINITION = 'INPUT_FIELD_DEFINITION', } + +export type ExtensionsObject = Record; + +export type ObjectTypeExtensions = { + type: 'object'; + fields: Record }>; +}; + +export type InputTypeExtensions = { + type: 'input'; + fields: Record; +}; + +export type InterfaceTypeExtensions = { + type: 'interface'; + fields: Record }>; +}; + +export type UnionTypeExtensions = { + type: 'union'; +}; + +export type ScalarTypeExtensions = { + type: 'scalar'; +}; + +export type EnumTypeExtensions = { + type: 'enum'; + values: Record; +}; + +export type PossibleTypeExtensions = + | InputTypeExtensions + | InterfaceTypeExtensions + | ObjectTypeExtensions + | UnionTypeExtensions + | ScalarTypeExtensions + | EnumTypeExtensions; + +export type SchemaExtensions = { + schemaExtensions: ExtensionsObject; + types: Record; +}; diff --git a/website/package.json b/website/package.json index 23e8868049e..f8cfb0fb780 100644 --- a/website/package.json +++ b/website/package.json @@ -37,15 +37,15 @@ "wait-on": "6.0.1" }, "dependencies": { - "@chakra-ui/icons": "2.0.6", - "@chakra-ui/react": "2.2.6", - "@chakra-ui/theme-tools": "2.0.7", - "@chakra-ui/utils": "2.0.6", - "@emotion/react": "11.10.0", - "@emotion/styled": "11.10.0", - "@guild-docs/client": "3.1.0", - "@guild-docs/server": "4.0.0", - "@mdx-js/react": "2.1.2", + "@chakra-ui/icons": "^1.1.5", + "@chakra-ui/react": "^1.8.3", + "@chakra-ui/theme-tools": "^1.3.4", + "@chakra-ui/utils": "^1.10.2", + "@emotion/react": "^11.7.1", + "@emotion/styled": "^11.6.0", + "@guild-docs/client": "^3.0.2", + "@guild-docs/server": "^4.0.0", + "@mdx-js/react": "^2.1.1", "@theguild/components": "1.12.0", "framer-motion": "6.5.1", "next": "12.2.4", diff --git a/yarn.lock b/yarn.lock index cbcfe9b9ea8..9f71f3c0546 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1365,567 +1365,563 @@ resolved "https://registry.yarnpkg.com/@braintree/sanitize-url/-/sanitize-url-3.1.0.tgz#8ff71d51053cd5ee4981e5a501d80a536244f7fd" integrity sha512-GcIY79elgB+azP74j8vqkiXz8xLFfIzbQJdlwOPisgbKT00tviJQuEghOXSMVxJ00HoYJbGswr4kcllUc4xCcg== -"@chakra-ui/accordion@2.0.8": - version "2.0.8" - resolved "https://registry.yarnpkg.com/@chakra-ui/accordion/-/accordion-2.0.8.tgz#e29f942b7a85b6736c6e9b128596dcc58cab05a2" - integrity sha512-KpZbVwPwoYuLUrWsxE85SsBv5c/jXLUEVTginR+7Z3bqjvLfP5cI0BlzzTq0KJgikdmhXoLnscookyZAKv1ixA== - dependencies: - "@chakra-ui/descendant" "3.0.5" - "@chakra-ui/hooks" "2.0.6" - "@chakra-ui/icon" "3.0.6" - "@chakra-ui/react-utils" "2.0.3" - "@chakra-ui/transition" "2.0.6" - "@chakra-ui/utils" "2.0.6" - -"@chakra-ui/alert@2.0.6": - version "2.0.6" - resolved "https://registry.yarnpkg.com/@chakra-ui/alert/-/alert-2.0.6.tgz#52674257b7101fee002ea92e4281beefbf244bf7" - integrity sha512-Y0bWgLAOGPn/x2SGr3oVMUy1nhdH+x7EuBO6FW8YpFIMukumfeZf9v2rr5MmqagrevSjHrGsSH9BnoaSDUK4gQ== +"@chakra-ui/accordion@1.4.11": + version "1.4.11" + resolved "https://registry.yarnpkg.com/@chakra-ui/accordion/-/accordion-1.4.11.tgz#31c0f17cd7b7c92f784307b87de73d8a8c4cf9f7" + integrity sha512-d/gvSgGwcZaJXxXqGmecpAgko/tUYb5vR0E0B2/V/z9AVbS8ei//fbiO9+8Ouyl/K46oWHWYj5vt8iTadlZleg== + dependencies: + "@chakra-ui/descendant" "2.1.3" + "@chakra-ui/hooks" "1.9.1" + "@chakra-ui/icon" "2.0.5" + "@chakra-ui/react-utils" "1.2.3" + "@chakra-ui/transition" "1.4.8" + "@chakra-ui/utils" "1.10.4" + +"@chakra-ui/alert@1.3.7": + version "1.3.7" + resolved "https://registry.yarnpkg.com/@chakra-ui/alert/-/alert-1.3.7.tgz#f36020ffc3b2c26be67025c56bccbf0639a81a67" + integrity sha512-fFpJYBpHOIK/BX4BVl/xafYiDBUW+Bq/gUYDOo4iAiO4vHgxo74oa+yOwSRNlNjAgIX7pi2ridsYQALKyWyxxQ== dependencies: - "@chakra-ui/icon" "3.0.6" - "@chakra-ui/react-utils" "2.0.3" - "@chakra-ui/spinner" "2.0.6" - "@chakra-ui/utils" "2.0.6" + "@chakra-ui/icon" "2.0.5" + "@chakra-ui/react-utils" "1.2.3" + "@chakra-ui/utils" "1.10.4" -"@chakra-ui/anatomy@2.0.3": - version "2.0.3" - resolved "https://registry.yarnpkg.com/@chakra-ui/anatomy/-/anatomy-2.0.3.tgz#60135d0d1d347d56e4b48a652f69fa334bf5ec79" - integrity sha512-3XiloxwYROE0c38SOJGEESBzYu/9MWFOp5Owi8mEYq+IpO8babtr1tMhDGqJQxa8K0/uVaCaiZz4iZLTJkX7eA== +"@chakra-ui/anatomy@1.3.0": + version "1.3.0" + resolved "https://registry.yarnpkg.com/@chakra-ui/anatomy/-/anatomy-1.3.0.tgz#38a40dd6f2bb076fe8bebe8fb8e4769ea005e03d" + integrity sha512-vj/lcHkCuq/dtbl69DkNsftZTnrGEegB90ODs1B6rxw8iVMdDSYkthPPFAkqzNs4ppv1y2IBjELuVzpeta1OHA== + dependencies: + "@chakra-ui/theme-tools" "^1.3.6" -"@chakra-ui/avatar@2.0.7": - version "2.0.7" - resolved "https://registry.yarnpkg.com/@chakra-ui/avatar/-/avatar-2.0.7.tgz#cb4abc18a4345b1555fe676d4e9e82ed1cc28d26" - integrity sha512-BCTRWlydewCeQmMSOT/9VfOl7lfsWljhUF+wDTsPAKclgWOgwcWNQErNPAVVp1PAI45DTuVcrXz8uvXFsnywZQ== +"@chakra-ui/avatar@1.3.11": + version "1.3.11" + resolved "https://registry.yarnpkg.com/@chakra-ui/avatar/-/avatar-1.3.11.tgz#abd8ffa9ad54756e549730f984fdae621ae51baa" + integrity sha512-/eRRK48Er92/QWAfWhxsJIN0gZBBvk+ew4Hglo+pxt3/NDnfTF2yPE7ZN29Dl6daPNbyTOpoksMwaU2mZIqLgA== dependencies: - "@chakra-ui/image" "2.0.7" - "@chakra-ui/react-utils" "2.0.3" - "@chakra-ui/utils" "2.0.6" + "@chakra-ui/image" "1.1.10" + "@chakra-ui/react-utils" "1.2.3" + "@chakra-ui/utils" "1.10.4" -"@chakra-ui/breadcrumb@2.0.6": - version "2.0.6" - resolved "https://registry.yarnpkg.com/@chakra-ui/breadcrumb/-/breadcrumb-2.0.6.tgz#b8b03fe02cf39c071f19c536a706e5f0c9dd72b1" - integrity sha512-cSA0aB5v2dQNicUEg7QSMNofCIUbVMNsr06ZXc0wWBz1hSY3qDpghhyIrJMPcWbUxxq9yk568jraCkExvMCtjg== +"@chakra-ui/breadcrumb@1.3.6": + version "1.3.6" + resolved "https://registry.yarnpkg.com/@chakra-ui/breadcrumb/-/breadcrumb-1.3.6.tgz#fe22e162c37add5830bd1292172bb11d859c6f35" + integrity sha512-iXxienBO6RUnJEcDvyDWyRt+mzPyl7/b6N8i0vrjGKGLpgtayJFvIdo33tFcvx6TCy7V9hiE3HTtZnNomWdR6A== dependencies: - "@chakra-ui/react-utils" "2.0.3" - "@chakra-ui/utils" "2.0.6" + "@chakra-ui/react-utils" "1.2.3" + "@chakra-ui/utils" "1.10.4" -"@chakra-ui/button@2.0.6": - version "2.0.6" - resolved "https://registry.yarnpkg.com/@chakra-ui/button/-/button-2.0.6.tgz#6924ca486f62f99d53dc77204f8b1603bdfed4f2" - integrity sha512-pPGj5uAdB37HAHZ4AACiY2F/Yl4p/vmw6ArXlr1FYsbK0dXXWk4E0ZwSELGKudRS6ylYP1ck6/UhT0SGMu6kUg== +"@chakra-ui/button@1.5.10": + version "1.5.10" + resolved "https://registry.yarnpkg.com/@chakra-ui/button/-/button-1.5.10.tgz#c339f78197b6bd63f109003177fd640ae6e6a632" + integrity sha512-IVEOrleI378CckAa3b3CTUHMPZRfpy6LPwn1Mx3sMpHEkDTKu8zJcjgEvCE8HYzNC1KbwBsa1PfTgk40ui6EtA== dependencies: - "@chakra-ui/hooks" "2.0.6" - "@chakra-ui/react-utils" "2.0.3" - "@chakra-ui/spinner" "2.0.6" - "@chakra-ui/utils" "2.0.6" + "@chakra-ui/hooks" "1.9.1" + "@chakra-ui/react-utils" "1.2.3" + "@chakra-ui/spinner" "1.2.6" + "@chakra-ui/utils" "1.10.4" -"@chakra-ui/checkbox@2.1.5": - version "2.1.5" - resolved "https://registry.yarnpkg.com/@chakra-ui/checkbox/-/checkbox-2.1.5.tgz#28a25afa2f3f7ec194ff49db03d22ee221b61fa3" - integrity sha512-E3FcEcjc3WQqbRB1SJ1Qozt+JHh8RpDXHFu8p2iwZ1V04n/uEx4VPIMEVSkXufC/rfV3oG+/+qsRbqw5eIOX4g== +"@chakra-ui/checkbox@1.7.1": + version "1.7.1" + resolved "https://registry.yarnpkg.com/@chakra-ui/checkbox/-/checkbox-1.7.1.tgz#cd733f177d88c477ae5ece228b81cddc67b70c0e" + integrity sha512-9Io97yn8OrdaIynCj+3Z/neJV7lTT1MtcdYh3BKMd7WnoJDkRY/GlBM8zsdgC5Wvm+ZQ1M83t0YvRPKLLzusyA== dependencies: - "@chakra-ui/form-control" "2.0.6" - "@chakra-ui/hooks" "2.0.6" - "@chakra-ui/react-utils" "2.0.3" - "@chakra-ui/utils" "2.0.6" - "@chakra-ui/visually-hidden" "2.0.6" - "@zag-js/focus-visible" "0.1.0" + "@chakra-ui/form-control" "1.6.0" + "@chakra-ui/hooks" "1.9.1" + "@chakra-ui/react-utils" "1.2.3" + "@chakra-ui/utils" "1.10.4" + "@chakra-ui/visually-hidden" "1.1.6" -"@chakra-ui/clickable@2.0.6": - version "2.0.6" - resolved "https://registry.yarnpkg.com/@chakra-ui/clickable/-/clickable-2.0.6.tgz#d4fe217d61422b5d624e1404dc8f0b864a08d32a" - integrity sha512-5efH3whvbLk7XH8CeO9IbGa1rTUuH2nsXRXExbG1PF1uBOxLv+bsMaY25+Hnfh894atavgbeLUPBCAfuyxeImA== +"@chakra-ui/clickable@1.2.6": + version "1.2.6" + resolved "https://registry.yarnpkg.com/@chakra-ui/clickable/-/clickable-1.2.6.tgz#7f3deef71580acf47c2395cac2c1734f43418a3f" + integrity sha512-89SsrQwwwAadcl/bN8nZqqaaVhVNFdBXqQnxVy1t07DL5ezubmNb5SgFh9LDznkm9YYPQhaGr3W6HFro7iAHMg== dependencies: - "@chakra-ui/react-utils" "2.0.3" - "@chakra-ui/utils" "2.0.6" + "@chakra-ui/react-utils" "1.2.3" + "@chakra-ui/utils" "1.10.4" -"@chakra-ui/close-button@2.0.6": - version "2.0.6" - resolved "https://registry.yarnpkg.com/@chakra-ui/close-button/-/close-button-2.0.6.tgz#a6c1eaa20a189260633c93d3bd8d6cca168a04c1" - integrity sha512-ocXD453uD2tLft1vKStBN/HcZc9ZHxthodyA/BIJx8gf88EgJi1vUbiERNoloww8Vv/8hBIIdNmv2Fwoj0jQQA== +"@chakra-ui/close-button@1.2.7": + version "1.2.7" + resolved "https://registry.yarnpkg.com/@chakra-ui/close-button/-/close-button-1.2.7.tgz#6f3073618ae777d7e36a80fb17bc00aaa790e7a5" + integrity sha512-cYTxfgrIlPU4IZm1sehZXxx/TNQBk9c3LBPvTpywEM8GVRGINh4YLq8WiMaPtO+TDNBnKoWS/jS4IHnR+abADw== dependencies: - "@chakra-ui/icon" "3.0.6" - "@chakra-ui/utils" "2.0.6" + "@chakra-ui/icon" "2.0.5" + "@chakra-ui/utils" "1.10.4" -"@chakra-ui/color-mode@2.1.4": - version "2.1.4" - resolved "https://registry.yarnpkg.com/@chakra-ui/color-mode/-/color-mode-2.1.4.tgz#e62d7563497d9bf2dc12f5e3378d5b5d9158647b" - integrity sha512-AoWZgKO1MSw9lb5+lURdaqi/NwaCNo50lOo1neCOVqxln8ntZzJHL4dHfYYlj6nIR6246LkRppkMeeceEg/W+A== +"@chakra-ui/color-mode@1.4.8": + version "1.4.8" + resolved "https://registry.yarnpkg.com/@chakra-ui/color-mode/-/color-mode-1.4.8.tgz#e5367b909f5b4c782b239f9d37d4cf1a44c28559" + integrity sha512-iD4126DVQi06c6ARr3uf3R2rtEu8aBVjW8rhZ+lOsV26Z15iCJA7OAut13Xu06fcZvgjSB/ChDy6Sx9sV9UjHA== dependencies: - "@chakra-ui/hooks" "2.0.6" - "@chakra-ui/utils" "2.0.6" + "@chakra-ui/hooks" "1.9.1" + "@chakra-ui/react-env" "1.1.6" + "@chakra-ui/utils" "1.10.4" -"@chakra-ui/control-box@2.0.6": - version "2.0.6" - resolved "https://registry.yarnpkg.com/@chakra-ui/control-box/-/control-box-2.0.6.tgz#ea9820432196181e6c661151ff0600bd721291c5" - integrity sha512-Vd89wKQCD+c0WDSaB5PFHRs133qm+vOB7Ay12h6tVCirnyk7nKEDNjBmmURK1v3WfSVMK3/IF2+2B+SSt+sHOQ== +"@chakra-ui/control-box@1.1.6": + version "1.1.6" + resolved "https://registry.yarnpkg.com/@chakra-ui/control-box/-/control-box-1.1.6.tgz#15a40a2cab525799988ae53948b61eed81a7f177" + integrity sha512-EUcq5f854puG6ZA6wAWl4107OPl8+bj4MMHJCa48BB0qec0U8HCEtxQGnFwJmaYLalIAjMfHuY3OwO2A3Hi9hA== dependencies: - "@chakra-ui/utils" "2.0.6" + "@chakra-ui/utils" "1.10.4" -"@chakra-ui/counter@2.0.6": - version "2.0.6" - resolved "https://registry.yarnpkg.com/@chakra-ui/counter/-/counter-2.0.6.tgz#3c395ab65494ae3360f3cea1a1419b7f31a582f6" - integrity sha512-tScL92j+D4dgkXQvMLqEwgz3PC2YSh6LcUr9eWjerPTVBsSPDmKSEKrMd9wrw6fwy+QmOBEZ7LF9kwqweCqllA== +"@chakra-ui/counter@1.2.10": + version "1.2.10" + resolved "https://registry.yarnpkg.com/@chakra-ui/counter/-/counter-1.2.10.tgz#544de1f53b783e8577cc74208ae1b0ca74385834" + integrity sha512-HQd09IuJ4z8M8vWajH+99jBWWSHDesQZmnN95jUg3HKOuNleLaipf2JFdrqbO1uWQyHobn2PM6u+B+JCAh2nig== dependencies: - "@chakra-ui/hooks" "2.0.6" - "@chakra-ui/utils" "2.0.6" + "@chakra-ui/hooks" "1.9.1" + "@chakra-ui/utils" "1.10.4" -"@chakra-ui/css-reset@2.0.3": - version "2.0.3" - resolved "https://registry.yarnpkg.com/@chakra-ui/css-reset/-/css-reset-2.0.3.tgz#78c9f3a8ddc760b72691fe5ae7e4e6c956e93997" - integrity sha512-ZmURbwIKmmVPNaw3FYi59/0YbuKCssrMI6KFt3DJGIIqqALP5gQDvlcmOll12BpfcYzASuEPdNUtODuOhGsXwg== +"@chakra-ui/css-reset@1.1.3": + version "1.1.3" + resolved "https://registry.yarnpkg.com/@chakra-ui/css-reset/-/css-reset-1.1.3.tgz#da65507ea1d69ed309bc34619881e23b5004ec7d" + integrity sha512-AgfrE7bRTJvNi/4zIfacI/kBHmHmHEIeQtHwCvk/0qM9V2gK1VM3ctYlnibf7BTh17F/UszweOGRb1lHSPfWjw== -"@chakra-ui/descendant@3.0.5": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@chakra-ui/descendant/-/descendant-3.0.5.tgz#749844684cfb43dab95b7736343e787fb6ffba91" - integrity sha512-Vd47q3Y+/ZmdTJnkvm9IssEozP8Ig1ug46kzxP4BMqY9xO1+Reuj/yur95eiyVlTn0hGVQM7p5yIA1+uL0Z7lw== +"@chakra-ui/descendant@2.1.3": + version "2.1.3" + resolved "https://registry.yarnpkg.com/@chakra-ui/descendant/-/descendant-2.1.3.tgz#6198ccce207b3d8697dedefff6886f18ca13b5ce" + integrity sha512-aNYNv99gEPENCdw2N5y3FvL5wgBVcLiOzJ2TxSwb4EVYszbgBZ8Ry1pf7lkoSfysdxD0scgy2cVyxO8TsYTU4g== dependencies: - "@chakra-ui/react-utils" "2.0.3" + "@chakra-ui/react-utils" "^1.2.3" -"@chakra-ui/editable@2.0.6": - version "2.0.6" - resolved "https://registry.yarnpkg.com/@chakra-ui/editable/-/editable-2.0.6.tgz#1ad756ab43abbf2647a243b0bdf8a2abcea2b90a" - integrity sha512-On4fBkQojrBSjQI6EQcBeOCqAxYZFdgCbc7EaVwl96fWB+Aw97u/P/a+y2OvEc7ZQ1A61lGLpNoVSYCNNy4wWA== +"@chakra-ui/editable@1.4.2": + version "1.4.2" + resolved "https://registry.yarnpkg.com/@chakra-ui/editable/-/editable-1.4.2.tgz#92d5266e737d52df1edc91c21a05c0a6048f881f" + integrity sha512-a5zKghA/IvG7yNkmFl7Z9c2KSsf0FgyijsNPTg/4S5jxyz13QJtoTg40tdpyaxHHCT25y25iUcV4FYCj6Jd01w== dependencies: - "@chakra-ui/hooks" "2.0.6" - "@chakra-ui/react-utils" "2.0.3" - "@chakra-ui/utils" "2.0.6" + "@chakra-ui/hooks" "1.9.1" + "@chakra-ui/react-utils" "1.2.3" + "@chakra-ui/utils" "1.10.4" -"@chakra-ui/focus-lock@2.0.7": - version "2.0.7" - resolved "https://registry.yarnpkg.com/@chakra-ui/focus-lock/-/focus-lock-2.0.7.tgz#1ded24e9b4e11b0677d924ccc004ddb31d2ac1f6" - integrity sha512-HQ1IMIDYM4PIHSh19ydU27WLRGnWNUjm6VYRGogDyWlRYG8wkEaQH6njVAG3KeIOAk/Dfj2/q80TJPob+3YYmQ== +"@chakra-ui/focus-lock@1.2.6": + version "1.2.6" + resolved "https://registry.yarnpkg.com/@chakra-ui/focus-lock/-/focus-lock-1.2.6.tgz#ecdc9688651c55c67f9059720f0885ea7c02b979" + integrity sha512-ZJNE1oNdUM1aGWuCJ+bxFa/d3EwxzfMWzTKzSvKDK50GWoUQQ10xFTT9nY/yFpkcwhBvx1KavxKf44mIhIbSog== dependencies: - "@chakra-ui/utils" "2.0.6" - react-focus-lock "^2.9.1" + "@chakra-ui/utils" "1.10.4" + react-focus-lock "2.5.2" -"@chakra-ui/form-control@2.0.6": - version "2.0.6" - resolved "https://registry.yarnpkg.com/@chakra-ui/form-control/-/form-control-2.0.6.tgz#65d0ca9a0ca11f36605800f1beeaf687f96b9625" - integrity sha512-NTrHD0mvRUtDW1IyoaEixLpyyfRgK0iDWTt34BVIx0RPVGqn1HWdUDm204sgBHaWQzK25zkqmnWbkz09Y0ECFg== +"@chakra-ui/form-control@1.6.0": + version "1.6.0" + resolved "https://registry.yarnpkg.com/@chakra-ui/form-control/-/form-control-1.6.0.tgz#a2a7b82a385f75fababf3947d39e227b4d073929" + integrity sha512-MtUE98aocP2QTgvyyJ/ABuG33mhT3Ox56phKreG3HzbUKByMwrbQSm1QcAgyYdqSZ9eKB2tXx+qgGNh+avAfDA== dependencies: - "@chakra-ui/hooks" "2.0.6" - "@chakra-ui/icon" "3.0.6" - "@chakra-ui/react-utils" "2.0.3" - "@chakra-ui/utils" "2.0.6" + "@chakra-ui/hooks" "1.9.1" + "@chakra-ui/icon" "2.0.5" + "@chakra-ui/react-utils" "1.2.3" + "@chakra-ui/utils" "1.10.4" -"@chakra-ui/hooks@2.0.6": - version "2.0.6" - resolved "https://registry.yarnpkg.com/@chakra-ui/hooks/-/hooks-2.0.6.tgz#3a1900b8310fdbe4fff2d340618fe440e141252c" - integrity sha512-Oix7y24cEUoGoQW+2u7nNCQcssbzS4wUhQhWOdbhc2kLHwdaInSru6vUqOPU66JHCP2TWn2fwlgzInL57oCAiA== +"@chakra-ui/hooks@1.9.1": + version "1.9.1" + resolved "https://registry.yarnpkg.com/@chakra-ui/hooks/-/hooks-1.9.1.tgz#7a00659e6bb4d56cf56022071eca0b77a7df1ac1" + integrity sha512-SEeh1alDKzrP9gMLWMnXOUDBQDKF/URL6iTmkumTn6vhawWNla6sPrcMyoCzWdMzwUhZp3QNtCKbUm7dxBXvPw== dependencies: - "@chakra-ui/react-utils" "2.0.3" - "@chakra-ui/utils" "2.0.6" + "@chakra-ui/react-utils" "1.2.3" + "@chakra-ui/utils" "1.10.4" compute-scroll-into-view "1.0.14" copy-to-clipboard "3.3.1" -"@chakra-ui/icon@3.0.6": - version "3.0.6" - resolved "https://registry.yarnpkg.com/@chakra-ui/icon/-/icon-3.0.6.tgz#eac3beaed9f63662d7eca60c96c697a06340eae3" - integrity sha512-H2vE6pmpCcnlM1ASDTjlkLiOaqDgCdRDIo4hWBCPbL68d26a6ftvQBu5RmbDbeZa2mNrN3EESA8/BSa970H1Fw== +"@chakra-ui/icon@2.0.5": + version "2.0.5" + resolved "https://registry.yarnpkg.com/@chakra-ui/icon/-/icon-2.0.5.tgz#d57f53e6a2c7ae1bae7292a1778fd466c02e2e29" + integrity sha512-ZrqRvCCIxGr4qFd/r1pmtd9tobRmv8KAxV7ygFoc/t4vOSKTcVIjhE12gsI3FzgvXM15ZFVwsxa1zodwgo5neQ== dependencies: - "@chakra-ui/utils" "2.0.6" + "@chakra-ui/utils" "1.10.4" -"@chakra-ui/icons@2.0.6": - version "2.0.6" - resolved "https://registry.yarnpkg.com/@chakra-ui/icons/-/icons-2.0.6.tgz#de60b0345d4a09037c275eb9e638e5ccf1496489" - integrity sha512-5NWrRhWvVSjGJIS4aJGJ6z2PVb/XDIpGMCqsS0aLhrVOkIHp1fv8hvXylTiR/nShRgZU9td/XyCBXJKHoE4BAA== +"@chakra-ui/icons@^1.1.5": + version "1.1.7" + resolved "https://registry.yarnpkg.com/@chakra-ui/icons/-/icons-1.1.7.tgz#f8c0c44a969c8654b90026b7d375b550c4bfbc49" + integrity sha512-YIHxey/B4M2PyFASlHXtAWFyW+tsAtGAChOJ8dsM2kpu1MbVUqm/6nMI1KIFd7Te5IWuNYA75rAHBdLI0Yu61A== dependencies: - "@chakra-ui/icon" "3.0.6" + "@chakra-ui/icon" "2.0.5" + "@types/react" "^17.0.15" -"@chakra-ui/image@2.0.7": - version "2.0.7" - resolved "https://registry.yarnpkg.com/@chakra-ui/image/-/image-2.0.7.tgz#07a101d0fb604a0020abda77adefa3438cff9b15" - integrity sha512-ctQku96p6KFxYQRcJfxDnr3A5pRPqNCUBkdDvbX/312eD+riVpitCV4wo5tamD3HZiWMaw0tnU+VjjCdiGLzHg== +"@chakra-ui/image@1.1.10": + version "1.1.10" + resolved "https://registry.yarnpkg.com/@chakra-ui/image/-/image-1.1.10.tgz#65bae4086559937d25c728660ae743bce9360cb2" + integrity sha512-PJZmhQ/R1PgdMyCRjALfoyq1FNh/WzMAw70sliHLtLcb9hBXniwQZuckYfUshCkUoFBj/ow9d4byn9Culdpk7Q== dependencies: - "@chakra-ui/hooks" "2.0.6" - "@chakra-ui/utils" "2.0.6" + "@chakra-ui/hooks" "1.9.1" + "@chakra-ui/utils" "1.10.4" -"@chakra-ui/input@2.0.6": - version "2.0.6" - resolved "https://registry.yarnpkg.com/@chakra-ui/input/-/input-2.0.6.tgz#ef4f2a3242e975711e23a031a71a05b49236552d" - integrity sha512-uJoDRVqKxClON+zEFLd7p/5FJC6yFzkq/lmx3Wk5BWfTlw/eMbpC6ucQkL/h1mz94i9TP9VXlfHVp/791uGEDw== +"@chakra-ui/input@1.4.6": + version "1.4.6" + resolved "https://registry.yarnpkg.com/@chakra-ui/input/-/input-1.4.6.tgz#455f24e7a3f401ef10b50b68d9b0537676fbfec5" + integrity sha512-Ljy/NbOhh9cNQxKTWQRsT4aQiXs2vVya+Cj5NpMAz08NFFjPZovsTawhI7m6ejT5Vsh76QYjh2rOLLI3fWqQQw== dependencies: - "@chakra-ui/form-control" "2.0.6" - "@chakra-ui/react-utils" "2.0.3" - "@chakra-ui/utils" "2.0.6" + "@chakra-ui/form-control" "1.6.0" + "@chakra-ui/react-utils" "1.2.3" + "@chakra-ui/utils" "1.10.4" -"@chakra-ui/layout@2.1.3": - version "2.1.3" - resolved "https://registry.yarnpkg.com/@chakra-ui/layout/-/layout-2.1.3.tgz#b86e96da3dba6ac7c0bd22c47cfcdaa3a0cbaf45" - integrity sha512-QD1s8fG+pmER3s9hugy0BHM/67YKk2+OOmUojvVrPITOdN04q81K0NKMrNLUolajm1tQQh498KPI/curltGloQ== +"@chakra-ui/layout@1.8.0": + version "1.8.0" + resolved "https://registry.yarnpkg.com/@chakra-ui/layout/-/layout-1.8.0.tgz#f95e78168644b45ac7327e4e0cfb1f0e6f7c3b4d" + integrity sha512-GJtEKez5AZu0XQTxI6a6jwA/hMDD36pP0HBxBOGuHP1hWCebDzMjraiMfWiP9w7hKERFE4j19kocHxIXyocfJA== dependencies: - "@chakra-ui/icon" "3.0.6" - "@chakra-ui/react-utils" "2.0.3" - "@chakra-ui/utils" "2.0.6" + "@chakra-ui/icon" "2.0.5" + "@chakra-ui/react-utils" "1.2.3" + "@chakra-ui/utils" "1.10.4" -"@chakra-ui/live-region@2.0.6": - version "2.0.6" - resolved "https://registry.yarnpkg.com/@chakra-ui/live-region/-/live-region-2.0.6.tgz#3f1cf41721203c1a25db0eb67bce802100c29ff4" - integrity sha512-RWKBRdjJt96A+ztWsf8047nUXwX8ITUhtpM8Igf6zC9slU2Qh94uYmWtd/pwaU1b+gXct/FHm0HlxWVMtfjYoA== +"@chakra-ui/live-region@1.1.6": + version "1.1.6" + resolved "https://registry.yarnpkg.com/@chakra-ui/live-region/-/live-region-1.1.6.tgz#135461a19ae2d479eefb012376ffa0f500b83b16" + integrity sha512-9gPQHXf7oW0jXyT5R/JzyDMfJ3hF70TqhN8bRH4fMyfNr2Se+SjztMBqCrv5FS5rPjcCeua+e0eArpoB3ROuWQ== dependencies: - "@chakra-ui/utils" "2.0.6" + "@chakra-ui/utils" "1.10.4" -"@chakra-ui/media-query@3.2.2": - version "3.2.2" - resolved "https://registry.yarnpkg.com/@chakra-ui/media-query/-/media-query-3.2.2.tgz#5b22b36450f84ac7008fcf98d1870fb3ebaaa41a" - integrity sha512-/X2iCYuUBykAaIvHbg1fqSIRPSPiLolvPOghd2jI2QZht0YitcEecKV1CuNm4a1ANguIO3mXdlhpVuQ9jepVAA== - dependencies: - "@chakra-ui/react-env" "2.0.6" - "@chakra-ui/utils" "2.0.6" - -"@chakra-ui/menu@2.0.8": - version "2.0.8" - resolved "https://registry.yarnpkg.com/@chakra-ui/menu/-/menu-2.0.8.tgz#f6847ba09c7cc1794852378e62b5f0cbd53fd9ad" - integrity sha512-UFEfm9wl9PjcBa57Gx9ozEHtGJnZz+xIL33FYJJwFEPeKjrt8KOAY1kQMSbAyL+WelR+F4uFCEJO1mvkexV8Ag== - dependencies: - "@chakra-ui/clickable" "2.0.6" - "@chakra-ui/descendant" "3.0.5" - "@chakra-ui/hooks" "2.0.6" - "@chakra-ui/popper" "3.0.4" - "@chakra-ui/react-utils" "2.0.3" - "@chakra-ui/transition" "2.0.6" - "@chakra-ui/utils" "2.0.6" - -"@chakra-ui/modal@2.1.4": - version "2.1.4" - resolved "https://registry.yarnpkg.com/@chakra-ui/modal/-/modal-2.1.4.tgz#7b265221d85f0be891cbd969c50f44a8f9e5445a" - integrity sha512-qFcCA7DKk1wOjEDjRD9LklK4d1kM8xuHH+xMceOS90tgK6mMbLVNBHQWb3TPuKtxOPN4qp1Wyz/NA1Lr8ShlhA== - dependencies: - "@chakra-ui/close-button" "2.0.6" - "@chakra-ui/focus-lock" "2.0.7" - "@chakra-ui/hooks" "2.0.6" - "@chakra-ui/portal" "2.0.6" - "@chakra-ui/react-utils" "2.0.3" - "@chakra-ui/transition" "2.0.6" - "@chakra-ui/utils" "2.0.6" +"@chakra-ui/media-query@2.0.4": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@chakra-ui/media-query/-/media-query-2.0.4.tgz#25e8074a19613d4ccce880a1f92c8e733708b079" + integrity sha512-kn6g/L0IFFUHz2v4yiCsBnhg9jUeA7525Z+AWl+BPtvryi7i9J+AJ27y/QAge7vUGy4dwDeFyxOZTs2oZ9/BsA== + dependencies: + "@chakra-ui/react-env" "1.1.6" + "@chakra-ui/utils" "1.10.4" + +"@chakra-ui/menu@1.8.11": + version "1.8.11" + resolved "https://registry.yarnpkg.com/@chakra-ui/menu/-/menu-1.8.11.tgz#a9508db5dd346f9ec02492536d93b7ab8db54319" + integrity sha512-8K65xItPsdMvSfuGWYIGigOF/QMcy7+D48UIEO/Hu0u0ckd11/JXbpSIFPddH5fYedclJ18PGRohTne487OVjQ== + dependencies: + "@chakra-ui/clickable" "1.2.6" + "@chakra-ui/descendant" "2.1.3" + "@chakra-ui/hooks" "1.9.1" + "@chakra-ui/popper" "2.4.3" + "@chakra-ui/react-utils" "1.2.3" + "@chakra-ui/transition" "1.4.8" + "@chakra-ui/utils" "1.10.4" + +"@chakra-ui/modal@1.11.1": + version "1.11.1" + resolved "https://registry.yarnpkg.com/@chakra-ui/modal/-/modal-1.11.1.tgz#fedd757726cbc7ec3b614e1b0c7b46c7244f988e" + integrity sha512-B2BBDonHb04vbPLAWgko1JYBwgW8ZNSLyhTJK+rbrCsRSgazuLTcwq4hdyJqrYNWtaQEfSwpAXqJ7joMZdv59A== + dependencies: + "@chakra-ui/close-button" "1.2.7" + "@chakra-ui/focus-lock" "1.2.6" + "@chakra-ui/hooks" "1.9.1" + "@chakra-ui/portal" "1.3.10" + "@chakra-ui/react-utils" "1.2.3" + "@chakra-ui/transition" "1.4.8" + "@chakra-ui/utils" "1.10.4" aria-hidden "^1.1.1" - react-remove-scroll "^2.5.4" - -"@chakra-ui/number-input@2.0.6": - version "2.0.6" - resolved "https://registry.yarnpkg.com/@chakra-ui/number-input/-/number-input-2.0.6.tgz#a1c89325408665f88dd53b7c68efa2794253fa01" - integrity sha512-Ba+bp5vbZXyBFT1sdfrghzwYDieizFwFsp9iWzbI8mPfFZJzHn/TpU1r0k9gXptpVFmaQQXklaYNderFu4R0fQ== - dependencies: - "@chakra-ui/counter" "2.0.6" - "@chakra-ui/form-control" "2.0.6" - "@chakra-ui/hooks" "2.0.6" - "@chakra-ui/icon" "3.0.6" - "@chakra-ui/react-utils" "2.0.3" - "@chakra-ui/utils" "2.0.6" - -"@chakra-ui/pin-input@2.0.8": - version "2.0.8" - resolved "https://registry.yarnpkg.com/@chakra-ui/pin-input/-/pin-input-2.0.8.tgz#606e178decf353168383d7999d573e464fc5f4ef" - integrity sha512-eUTdFgpA0xc7sGf2iHLHw3TpWIjYrpnkXjakRq1NLFhX78r+wAvQZzcqm8dXX7CNkH1tRboZHMBJBJ8SM1KTZg== - dependencies: - "@chakra-ui/descendant" "3.0.5" - "@chakra-ui/hooks" "2.0.6" - "@chakra-ui/react-utils" "2.0.3" - "@chakra-ui/utils" "2.0.6" - -"@chakra-ui/popover@2.0.6": - version "2.0.6" - resolved "https://registry.yarnpkg.com/@chakra-ui/popover/-/popover-2.0.6.tgz#3efbffe6333bd60b8d61adc5e2d6fac38c3942e0" - integrity sha512-v4P15wVSgvTalz0VU4K7pDtoqLm8FQEZ/+rUP03M+FTz9/XCJggjnfnx/eLuTr9l17PYGw7xivwHa8qG5j+zvQ== - dependencies: - "@chakra-ui/close-button" "2.0.6" - "@chakra-ui/hooks" "2.0.6" - "@chakra-ui/popper" "3.0.4" - "@chakra-ui/react-utils" "2.0.3" - "@chakra-ui/utils" "2.0.6" - -"@chakra-ui/popper@3.0.4": - version "3.0.4" - resolved "https://registry.yarnpkg.com/@chakra-ui/popper/-/popper-3.0.4.tgz#f01f796688e7f5b4884b384817a19406174c68d5" - integrity sha512-RU36E0h6y500d1oWjjJKQVnxWfWhDGvfzL2ml4baFk3m3u717GcfEdPaajzroQ6gwmf6wwGWR1+OWTpKysfOvw== + react-remove-scroll "2.4.1" + +"@chakra-ui/number-input@1.4.7": + version "1.4.7" + resolved "https://registry.yarnpkg.com/@chakra-ui/number-input/-/number-input-1.4.7.tgz#9d150c20a7d301e2ffe600251e68d9b6f70fcce0" + integrity sha512-LorGRZFMipom8vCUEbLi2s7bTHF2Fgiu766W0jTbzMje+8Z1ZoRQunH9OZWQnxnWQTUfUM2KBW8KwToYh1ojfQ== + dependencies: + "@chakra-ui/counter" "1.2.10" + "@chakra-ui/form-control" "1.6.0" + "@chakra-ui/hooks" "1.9.1" + "@chakra-ui/icon" "2.0.5" + "@chakra-ui/react-utils" "1.2.3" + "@chakra-ui/utils" "1.10.4" + +"@chakra-ui/pin-input@1.7.10": + version "1.7.10" + resolved "https://registry.yarnpkg.com/@chakra-ui/pin-input/-/pin-input-1.7.10.tgz#833bab2c0a283d835997e9db8b615f46865d5385" + integrity sha512-Uz5vFK+ZevQtdYHBkddSFCrY44bweXLanpSv9X/D0pWpdML09qfPiKX4ydGzfRoS2u4L8NUtN86IcvdOQLhHQg== + dependencies: + "@chakra-ui/descendant" "2.1.3" + "@chakra-ui/hooks" "1.9.1" + "@chakra-ui/react-utils" "1.2.3" + "@chakra-ui/utils" "1.10.4" + +"@chakra-ui/popover@1.11.9": + version "1.11.9" + resolved "https://registry.yarnpkg.com/@chakra-ui/popover/-/popover-1.11.9.tgz#283a52c969f27ee7119774c255b786af6c9b2766" + integrity sha512-hJ1/Lwukox3ryTN7W1wnj+nE44utfLwQYvfUSdatt5dznnh8k0P6Wx7Hmjm1cYffRavBhqzwua/QZDWjJN9N0g== + dependencies: + "@chakra-ui/close-button" "1.2.7" + "@chakra-ui/hooks" "1.9.1" + "@chakra-ui/popper" "2.4.3" + "@chakra-ui/react-utils" "1.2.3" + "@chakra-ui/utils" "1.10.4" + +"@chakra-ui/popper@2.4.3": + version "2.4.3" + resolved "https://registry.yarnpkg.com/@chakra-ui/popper/-/popper-2.4.3.tgz#fcdc917d13a56b9d44868c78a009e4dd692697a2" + integrity sha512-TGzFnYt3mtIVkIejtYIAu4Ka9DaYLzMR4NgcqI6EtaTvgK7Xep+6RTiY/Nq+ZT3l/eaNUwqHRFoNrDUg1XYasA== dependencies: - "@chakra-ui/react-utils" "2.0.3" + "@chakra-ui/react-utils" "1.2.3" "@popperjs/core" "^2.9.3" -"@chakra-ui/portal@2.0.6": - version "2.0.6" - resolved "https://registry.yarnpkg.com/@chakra-ui/portal/-/portal-2.0.6.tgz#d107894b0416d23524e38a628cd5be7bb3b34831" - integrity sha512-XDrr8m+oXiyNpAJo2Qcw0rD6Q3FR7TK/6iWcfOrUguDIlSvu/vqBFQut8BRIy9WfcT7aJsZBQ+JcykOi20Rvzw== - dependencies: - "@chakra-ui/hooks" "2.0.6" - "@chakra-ui/react-utils" "2.0.3" - "@chakra-ui/utils" "2.0.6" - -"@chakra-ui/progress@2.0.7": - version "2.0.7" - resolved "https://registry.yarnpkg.com/@chakra-ui/progress/-/progress-2.0.7.tgz#11fc29775233114ce27a2aab76a153d5bd9e464e" - integrity sha512-1r05btz7gU93D2PDZeKjlEwE+IvanFl0+42dDeXkha4OIc9dgMxlnfIxgqfr4dnWl9+oYHS+wWDcObjxDPmPwA== - dependencies: - "@chakra-ui/react-utils" "2.0.3" - "@chakra-ui/theme-tools" "2.0.7" - "@chakra-ui/utils" "2.0.6" - -"@chakra-ui/provider@2.0.11": - version "2.0.11" - resolved "https://registry.yarnpkg.com/@chakra-ui/provider/-/provider-2.0.11.tgz#ad6bdccfd0695cba7a798bbb36ae86961302b0a9" - integrity sha512-zaRpMQwuBCFxzgqPdFyXj8wrgyI18iOuysEgP41rbBRoSLOwKcwz87muExUN80ZSRv6k3/WkEeLcKC1C1vQAZQ== +"@chakra-ui/portal@1.3.10": + version "1.3.10" + resolved "https://registry.yarnpkg.com/@chakra-ui/portal/-/portal-1.3.10.tgz#d85b2cf1a8b3e2eca260d8e3ad485da0ee29856b" + integrity sha512-t2KQ6MXbyf1qFYxWw/bs//CnwD+Clq7mbsP1Y7g+THCz2FvlLlMj45BWocLB30NoNyA8WCS2zyMBszW2/qvDiA== dependencies: - "@chakra-ui/css-reset" "2.0.3" - "@chakra-ui/portal" "2.0.6" - "@chakra-ui/react-env" "2.0.6" - "@chakra-ui/system" "2.2.4" - "@chakra-ui/utils" "2.0.6" + "@chakra-ui/hooks" "1.9.1" + "@chakra-ui/react-utils" "1.2.3" + "@chakra-ui/utils" "1.10.4" -"@chakra-ui/radio@2.0.7": - version "2.0.7" - resolved "https://registry.yarnpkg.com/@chakra-ui/radio/-/radio-2.0.7.tgz#742ddd6d6ae9f2761da01eefe50d3e0d497476f8" - integrity sha512-0znhldCKQY9NriwTgumilSv3BlzMdOg0iXxLshhMRnI3XcqqKVCZ0Juf4NjGOblcLtafYFnmMDOJ/xvI9PT8DA== - dependencies: - "@chakra-ui/form-control" "2.0.6" - "@chakra-ui/hooks" "2.0.6" - "@chakra-ui/react-utils" "2.0.3" - "@chakra-ui/utils" "2.0.6" - "@chakra-ui/visually-hidden" "2.0.6" - "@zag-js/focus-visible" "0.1.0" - -"@chakra-ui/react-env@2.0.6": - version "2.0.6" - resolved "https://registry.yarnpkg.com/@chakra-ui/react-env/-/react-env-2.0.6.tgz#5fc94eff1941cf60f50533c9042a5b6513b4460f" - integrity sha512-gr+2oxQ/Hqh4h2Segk0lPexSJ5AE8sm7djYjaOg2d6CdfqJTk2fEkjQGGO0UnrJZWjBctl9NhhhhOXSLN/H6jQ== - dependencies: - "@chakra-ui/utils" "2.0.6" - -"@chakra-ui/react-utils@2.0.3": - version "2.0.3" - resolved "https://registry.yarnpkg.com/@chakra-ui/react-utils/-/react-utils-2.0.3.tgz#4b72d004fc9bbd8ead4e30267796f8725546752d" - integrity sha512-8noaFkqtUFrrd1oGE91/E1JBB0NG/wlFSCGKqZG1rZfF5VUtCDOIuvJBmj/Pq0oLTq2qJd+tGj82Muj1JeGSZg== +"@chakra-ui/progress@1.2.6": + version "1.2.6" + resolved "https://registry.yarnpkg.com/@chakra-ui/progress/-/progress-1.2.6.tgz#4a3a40e826c8c72160d3c8ff411e86244e280ebc" + integrity sha512-thaHRIYTVktgV78vJMNwzfCX+ickhSpn2bun6FtGVUphFx4tjV+ggz+IGohm6AH2hapskoR1mQU2iNZb6BK0hQ== dependencies: - "@chakra-ui/utils" "2.0.6" + "@chakra-ui/theme-tools" "1.3.6" + "@chakra-ui/utils" "1.10.4" -"@chakra-ui/react@2.2.6": - version "2.2.6" - resolved "https://registry.yarnpkg.com/@chakra-ui/react/-/react-2.2.6.tgz#4c56f94943756a6f0b778152e0ca3fb009f1653d" - integrity sha512-WKzSqc6VTOKEPBabZnGzBf1SYcO/b5/an0+LT4icuPddlraXHvgYM5SmwYI0z5N/jNqbspWlyDda6zoLW6JVxA== - dependencies: - "@chakra-ui/accordion" "2.0.8" - "@chakra-ui/alert" "2.0.6" - "@chakra-ui/avatar" "2.0.7" - "@chakra-ui/breadcrumb" "2.0.6" - "@chakra-ui/button" "2.0.6" - "@chakra-ui/checkbox" "2.1.5" - "@chakra-ui/close-button" "2.0.6" - "@chakra-ui/control-box" "2.0.6" - "@chakra-ui/counter" "2.0.6" - "@chakra-ui/css-reset" "2.0.3" - "@chakra-ui/editable" "2.0.6" - "@chakra-ui/form-control" "2.0.6" - "@chakra-ui/hooks" "2.0.6" - "@chakra-ui/icon" "3.0.6" - "@chakra-ui/image" "2.0.7" - "@chakra-ui/input" "2.0.6" - "@chakra-ui/layout" "2.1.3" - "@chakra-ui/live-region" "2.0.6" - "@chakra-ui/media-query" "3.2.2" - "@chakra-ui/menu" "2.0.8" - "@chakra-ui/modal" "2.1.4" - "@chakra-ui/number-input" "2.0.6" - "@chakra-ui/pin-input" "2.0.8" - "@chakra-ui/popover" "2.0.6" - "@chakra-ui/popper" "3.0.4" - "@chakra-ui/portal" "2.0.6" - "@chakra-ui/progress" "2.0.7" - "@chakra-ui/provider" "2.0.11" - "@chakra-ui/radio" "2.0.7" - "@chakra-ui/react-env" "2.0.6" - "@chakra-ui/select" "2.0.6" - "@chakra-ui/skeleton" "2.0.11" - "@chakra-ui/slider" "2.0.6" - "@chakra-ui/spinner" "2.0.6" - "@chakra-ui/stat" "2.0.6" - "@chakra-ui/switch" "2.0.8" - "@chakra-ui/system" "2.2.4" - "@chakra-ui/table" "2.0.6" - "@chakra-ui/tabs" "2.0.8" - "@chakra-ui/tag" "2.0.6" - "@chakra-ui/textarea" "2.0.7" - "@chakra-ui/theme" "2.1.5" - "@chakra-ui/toast" "3.0.4" - "@chakra-ui/tooltip" "2.0.7" - "@chakra-ui/transition" "2.0.6" - "@chakra-ui/utils" "2.0.6" - "@chakra-ui/visually-hidden" "2.0.6" - -"@chakra-ui/select@2.0.6": - version "2.0.6" - resolved "https://registry.yarnpkg.com/@chakra-ui/select/-/select-2.0.6.tgz#a3d0604137875da8eb0be1cdc4561aed3eefa482" - integrity sha512-aBsJiFSrv3sWMKCc0Jv8DyoKB0uNMRAjkGmoiyRKoZcPvZyU3oRu09VwIHwJTmE340UO385oSVif2x8DOlWyOg== +"@chakra-ui/provider@1.7.14": + version "1.7.14" + resolved "https://registry.yarnpkg.com/@chakra-ui/provider/-/provider-1.7.14.tgz#74d19e3066ab02f2c14fa32d22dc12f8367b56f7" + integrity sha512-FCA33CZy/jFzExglKMioeri8sr9NtDTcNVPnx95ZJiA7WpfFo0xuZ6/fMC4DwIQPkJKbSIZBXYLZ3U10Ntylrw== dependencies: - "@chakra-ui/form-control" "2.0.6" - "@chakra-ui/utils" "2.0.6" + "@chakra-ui/css-reset" "1.1.3" + "@chakra-ui/hooks" "1.9.1" + "@chakra-ui/portal" "1.3.10" + "@chakra-ui/react-env" "1.1.6" + "@chakra-ui/system" "1.12.1" + "@chakra-ui/utils" "1.10.4" -"@chakra-ui/skeleton@2.0.11": - version "2.0.11" - resolved "https://registry.yarnpkg.com/@chakra-ui/skeleton/-/skeleton-2.0.11.tgz#21d9b2edffb09a92bad1137c3ef256b69715e613" - integrity sha512-fzqGDWfZ3LkoaEvn+F6zNzT2HQ/d8y8tctO8vHnQ02HvBIZsrdY+0nmZIwkaS6oGasUZyuvrUAC+h+3MBoeXpA== +"@chakra-ui/radio@1.5.1": + version "1.5.1" + resolved "https://registry.yarnpkg.com/@chakra-ui/radio/-/radio-1.5.1.tgz#d2b691fde944c20eb594873f72eb61dfb84b15da" + integrity sha512-zO5eShz+j68A7935jJ2q5u3brX/bjPEGh9Pj2+bnKbmC9Vva6jEzBSJsAx9n4WbkAzR3xDMGWsbpivFp8X1tJw== dependencies: - "@chakra-ui/hooks" "2.0.6" - "@chakra-ui/media-query" "3.2.2" - "@chakra-ui/system" "2.2.4" - "@chakra-ui/utils" "2.0.6" + "@chakra-ui/form-control" "1.6.0" + "@chakra-ui/hooks" "1.9.1" + "@chakra-ui/react-utils" "1.2.3" + "@chakra-ui/utils" "1.10.4" + "@chakra-ui/visually-hidden" "1.1.6" -"@chakra-ui/slider@2.0.6": - version "2.0.6" - resolved "https://registry.yarnpkg.com/@chakra-ui/slider/-/slider-2.0.6.tgz#720a3dfc061df62b34d18f9ee68d5c0491949b5b" - integrity sha512-V8gcKqZGm5VDFCuR9XAxEhWpYm1daXHiNC2808ilNEFYgQ2nAbOoTIPLHgSZVYHpaC3rceThkjZPy3Z2EQ5fyg== +"@chakra-ui/react-env@1.1.6": + version "1.1.6" + resolved "https://registry.yarnpkg.com/@chakra-ui/react-env/-/react-env-1.1.6.tgz#9915b02fd1f8ca62ccf578eaec793f1c4dea78b0" + integrity sha512-L90LNvCfe04FTkN9OPok/o2e60zLJNBH8Im/5dUHvqy7dXLXok8ZDad5vEL46XmGbhe7O8fbxhG6FmAYdcCHrQ== dependencies: - "@chakra-ui/hooks" "2.0.6" - "@chakra-ui/react-utils" "2.0.3" - "@chakra-ui/utils" "2.0.6" + "@chakra-ui/utils" "1.10.4" -"@chakra-ui/spinner@2.0.6": - version "2.0.6" - resolved "https://registry.yarnpkg.com/@chakra-ui/spinner/-/spinner-2.0.6.tgz#2e124fac3da6a8b6a7e0f382e736e9ee9333e7e2" - integrity sha512-4EP3+zUnri7NHn8We67apZMSM0+hyIkWvqDIBldHHxDt78doXmahDcAIFzpkIY3fwOq7/yvXrOoOxGOjhyKjoQ== +"@chakra-ui/react-utils@1.2.3", "@chakra-ui/react-utils@^1.2.3": + version "1.2.3" + resolved "https://registry.yarnpkg.com/@chakra-ui/react-utils/-/react-utils-1.2.3.tgz#3356c9299bc8faada8fac6c5886ca65ec95bb5be" + integrity sha512-r8pUwCVVB7UPhb0AiRa9ZzSp4xkMz64yIeJ4O4aGy4WMw7TRH4j4QkbkE1YC9tQitrXrliOlvx4WWJR4VyiGpw== + dependencies: + "@chakra-ui/utils" "^1.10.4" + +"@chakra-ui/react@^1.8.3": + version "1.8.8" + resolved "https://registry.yarnpkg.com/@chakra-ui/react/-/react-1.8.8.tgz#ca697dea94d94138043ef6fd62836b39107b4abd" + integrity sha512-/XqL25J0i0h+usAXBngn/RTG2u1oQRzbhHe9tNHwFyNbx/izIADhQW/6ji06QU0KtaRIU77XvgSAyTtMJY1KmA== + dependencies: + "@chakra-ui/accordion" "1.4.11" + "@chakra-ui/alert" "1.3.7" + "@chakra-ui/avatar" "1.3.11" + "@chakra-ui/breadcrumb" "1.3.6" + "@chakra-ui/button" "1.5.10" + "@chakra-ui/checkbox" "1.7.1" + "@chakra-ui/close-button" "1.2.7" + "@chakra-ui/control-box" "1.1.6" + "@chakra-ui/counter" "1.2.10" + "@chakra-ui/css-reset" "1.1.3" + "@chakra-ui/editable" "1.4.2" + "@chakra-ui/form-control" "1.6.0" + "@chakra-ui/hooks" "1.9.1" + "@chakra-ui/icon" "2.0.5" + "@chakra-ui/image" "1.1.10" + "@chakra-ui/input" "1.4.6" + "@chakra-ui/layout" "1.8.0" + "@chakra-ui/live-region" "1.1.6" + "@chakra-ui/media-query" "2.0.4" + "@chakra-ui/menu" "1.8.11" + "@chakra-ui/modal" "1.11.1" + "@chakra-ui/number-input" "1.4.7" + "@chakra-ui/pin-input" "1.7.10" + "@chakra-ui/popover" "1.11.9" + "@chakra-ui/popper" "2.4.3" + "@chakra-ui/portal" "1.3.10" + "@chakra-ui/progress" "1.2.6" + "@chakra-ui/provider" "1.7.14" + "@chakra-ui/radio" "1.5.1" + "@chakra-ui/react-env" "1.1.6" + "@chakra-ui/select" "1.2.11" + "@chakra-ui/skeleton" "1.2.14" + "@chakra-ui/slider" "1.5.11" + "@chakra-ui/spinner" "1.2.6" + "@chakra-ui/stat" "1.2.7" + "@chakra-ui/switch" "1.3.10" + "@chakra-ui/system" "1.12.1" + "@chakra-ui/table" "1.3.6" + "@chakra-ui/tabs" "1.6.10" + "@chakra-ui/tag" "1.2.7" + "@chakra-ui/textarea" "1.2.11" + "@chakra-ui/theme" "1.14.1" + "@chakra-ui/toast" "1.5.9" + "@chakra-ui/tooltip" "1.5.1" + "@chakra-ui/transition" "1.4.8" + "@chakra-ui/utils" "1.10.4" + "@chakra-ui/visually-hidden" "1.1.6" + +"@chakra-ui/select@1.2.11": + version "1.2.11" + resolved "https://registry.yarnpkg.com/@chakra-ui/select/-/select-1.2.11.tgz#7762f2b7974a4587b4eb9536eb93b2295381aa9f" + integrity sha512-6Tis1+ZrRjQeWhQfziQn3ZdPphV5ccafpZOhiPdTcM2J1XcXOlII+9rHxvaW+jx7zQ5ly5o8kd7iXzalDgl5wA== + dependencies: + "@chakra-ui/form-control" "1.6.0" + "@chakra-ui/utils" "1.10.4" + +"@chakra-ui/skeleton@1.2.14": + version "1.2.14" + resolved "https://registry.yarnpkg.com/@chakra-ui/skeleton/-/skeleton-1.2.14.tgz#c2028b03a975c76b13aaecdbbe168872079177b8" + integrity sha512-R0v4DfQ2yjXCJf9SzhTmDb2PLx5//LxsRbjjgRa8qJCR4MZaGswPrekp4dP8YjY8aEYzuZbvHU12T3vqZBk2GA== + dependencies: + "@chakra-ui/hooks" "1.9.1" + "@chakra-ui/media-query" "2.0.4" + "@chakra-ui/system" "1.12.1" + "@chakra-ui/utils" "1.10.4" + +"@chakra-ui/slider@1.5.11": + version "1.5.11" + resolved "https://registry.yarnpkg.com/@chakra-ui/slider/-/slider-1.5.11.tgz#e03585188547dad3dafdb4a4cbd64bfbf8a4025b" + integrity sha512-THkGU2BsA6XMosXcEVQkWVRftqUIAKCb+y4iEpR3C2ztqL7Fl/CbIGwyr5majhPhKc275rb8dfxwp8R0L0ZIiQ== + dependencies: + "@chakra-ui/hooks" "1.9.1" + "@chakra-ui/react-utils" "1.2.3" + "@chakra-ui/utils" "1.10.4" + +"@chakra-ui/spinner@1.2.6": + version "1.2.6" + resolved "https://registry.yarnpkg.com/@chakra-ui/spinner/-/spinner-1.2.6.tgz#d85fb3d763a69d40570b591507c5087dba38e6c4" + integrity sha512-GoUCccN120fGRVgUtfuwcEjeoaxffB+XsgpxX7jhWloXf8b6lkqm68bsxX4Ybb2vGN1fANI98/45JmrnddZO/A== dependencies: - "@chakra-ui/utils" "2.0.6" - "@chakra-ui/visually-hidden" "2.0.6" + "@chakra-ui/utils" "1.10.4" + "@chakra-ui/visually-hidden" "1.1.6" -"@chakra-ui/stat@2.0.6": - version "2.0.6" - resolved "https://registry.yarnpkg.com/@chakra-ui/stat/-/stat-2.0.6.tgz#52cf2208b105c70c048902e3b937782e1a535de0" - integrity sha512-qJtW6XtQ59pU8S7JhLAQwXlogn4hvD4SrztDaZsEdpqRPzT6BiEEe7Ygk9VATRBQAT4MdxLlnTfUYaVc1PAu4A== +"@chakra-ui/stat@1.2.7": + version "1.2.7" + resolved "https://registry.yarnpkg.com/@chakra-ui/stat/-/stat-1.2.7.tgz#e173171d80f9e756966604e620987bbd7590d291" + integrity sha512-m76jumFW1N+mCG4ytrUz9Mh09nZtS4OQcADEvOslfdI5StwwuzasTA1tueaelPzdhBioMwFUWL05Fr1fXbPJ/Q== dependencies: - "@chakra-ui/icon" "3.0.6" - "@chakra-ui/react-utils" "2.0.3" - "@chakra-ui/utils" "2.0.6" - "@chakra-ui/visually-hidden" "2.0.6" + "@chakra-ui/icon" "2.0.5" + "@chakra-ui/utils" "1.10.4" + "@chakra-ui/visually-hidden" "1.1.6" -"@chakra-ui/styled-system@2.2.5": - version "2.2.5" - resolved "https://registry.yarnpkg.com/@chakra-ui/styled-system/-/styled-system-2.2.5.tgz#d1754d2117f554551b914ef060e81548c6cc9702" - integrity sha512-ksCkkMXDXyyAIbHMbiaAad8e3TpC0UgWH3Fd1FRMsGxbI4cv7pUHDaQsqSIZP0RGbYEBB9JfCV7LvwzkB3l9mw== +"@chakra-ui/styled-system@1.19.0": + version "1.19.0" + resolved "https://registry.yarnpkg.com/@chakra-ui/styled-system/-/styled-system-1.19.0.tgz#102fadaefc1a2dfd8e0c4837eafa660531a08419" + integrity sha512-z+bMfWs6jQGkpgarge1kmk78DuDhJIXRUMyRqZ3+CiIkze88bIIsww6mV2i8tEfUfTAvALeMnlYZ1DYsHsTTJw== dependencies: - "@chakra-ui/utils" "2.0.6" - csstype "^3.0.11" + "@chakra-ui/utils" "1.10.4" + csstype "3.0.9" -"@chakra-ui/switch@2.0.8": - version "2.0.8" - resolved "https://registry.yarnpkg.com/@chakra-ui/switch/-/switch-2.0.8.tgz#c2dec5bb3c846b12442df1d88257cd3045c328aa" - integrity sha512-2hme6MgeKkqz+LBJwi3RODPPcQPZ5T8pDdxLqPWW29OvjWg+nDwZNXDqp3tFG+Lt4LQScG+rIijLhuiT+eTuhQ== +"@chakra-ui/switch@1.3.10": + version "1.3.10" + resolved "https://registry.yarnpkg.com/@chakra-ui/switch/-/switch-1.3.10.tgz#6b0a3f199e6e654dbab6e01ccc762e1b29611c62" + integrity sha512-V6qDLY6oECCbPyu7alWWOAhSBI4+SAuT6XW/zEQbelkwuUOiGO1ax67rTXOmZ59A2AaV1gqQFxDh8AcbvwO5XQ== dependencies: - "@chakra-ui/checkbox" "2.1.5" - "@chakra-ui/utils" "2.0.6" + "@chakra-ui/checkbox" "1.7.1" + "@chakra-ui/utils" "1.10.4" -"@chakra-ui/system@2.2.4": - version "2.2.4" - resolved "https://registry.yarnpkg.com/@chakra-ui/system/-/system-2.2.4.tgz#fdd399a180584eb1ed81f98623f68cff04cae100" - integrity sha512-KAqnxW0MaiVYd28SJKYJ6x4qzlzEJZKOKZk/QtUb6UKPBWluusWVVRfXQc9KDhKwy3r0DLWP9pzfnDrp+D3Hpg== +"@chakra-ui/system@1.12.1": + version "1.12.1" + resolved "https://registry.yarnpkg.com/@chakra-ui/system/-/system-1.12.1.tgz#608655ef3f7cb82eedd8f20d2546458d90d77cce" + integrity sha512-Rp09/rMuPA3hF38OJxeQciGO9N0Ie1GxwHRAw1AFA/TY3fVyK9pNI5oN+J/1cAxq7v9yKdIr1YfnruJTI9xfEg== dependencies: - "@chakra-ui/color-mode" "2.1.4" - "@chakra-ui/react-utils" "2.0.3" - "@chakra-ui/styled-system" "2.2.5" - "@chakra-ui/utils" "2.0.6" + "@chakra-ui/color-mode" "1.4.8" + "@chakra-ui/react-utils" "1.2.3" + "@chakra-ui/styled-system" "1.19.0" + "@chakra-ui/utils" "1.10.4" react-fast-compare "3.2.0" -"@chakra-ui/table@2.0.6": - version "2.0.6" - resolved "https://registry.yarnpkg.com/@chakra-ui/table/-/table-2.0.6.tgz#7ee412e4852ab89fb5e62668be804db2fecbdb16" - integrity sha512-rzDNoDv/q1llfkWXQbR+XI9glLCJNqK0Aqvk1lbyk5cO3tvZMn1X3HRoxsU1Cm/bFcQKjk/e2CjR4ff5sSAyUg== +"@chakra-ui/table@1.3.6": + version "1.3.6" + resolved "https://registry.yarnpkg.com/@chakra-ui/table/-/table-1.3.6.tgz#e271676dc03cd4c684e4041df2cf394d86a28510" + integrity sha512-7agZAgAeDFKviqStvixqnLAH54+setzhx67EztioZTr5Xu+6hQ4rotfJbu8L4i587pcbNg98kCEXEkidjw0XRQ== dependencies: - "@chakra-ui/react-utils" "2.0.3" - "@chakra-ui/utils" "2.0.6" + "@chakra-ui/utils" "1.10.4" -"@chakra-ui/tabs@2.0.8": - version "2.0.8" - resolved "https://registry.yarnpkg.com/@chakra-ui/tabs/-/tabs-2.0.8.tgz#9e27761c11dac329a8732e00f3255e7f47fe5edc" - integrity sha512-7ce8ie/+zF+qyQRo+CcfeSreXLaQ3oJJ4Dn4Hkeg4mNcP1JMdajNWa4F8tpmBxyUcnrPTLu2KpYSia92bS8cUQ== +"@chakra-ui/tabs@1.6.10": + version "1.6.10" + resolved "https://registry.yarnpkg.com/@chakra-ui/tabs/-/tabs-1.6.10.tgz#503e528930f9ba467681279ee709c72ba24950b8" + integrity sha512-ClOOHT3Wnf3l9X4F2S6ysPsHMDgKSTgkXpB9Qe0odwpT49ZXNjSAYYaXzO16l+Eq/m2u1HzLkXVsL42HIeOiNQ== dependencies: - "@chakra-ui/clickable" "2.0.6" - "@chakra-ui/descendant" "3.0.5" - "@chakra-ui/hooks" "2.0.6" - "@chakra-ui/react-utils" "2.0.3" - "@chakra-ui/utils" "2.0.6" + "@chakra-ui/clickable" "1.2.6" + "@chakra-ui/descendant" "2.1.3" + "@chakra-ui/hooks" "1.9.1" + "@chakra-ui/react-utils" "1.2.3" + "@chakra-ui/utils" "1.10.4" -"@chakra-ui/tag@2.0.6": - version "2.0.6" - resolved "https://registry.yarnpkg.com/@chakra-ui/tag/-/tag-2.0.6.tgz#806687519a0e5854d4580bc9c34b00929accada6" - integrity sha512-bet5mMllbDq2xgHAYxM6Rj5V/E8010F9Z4ZeeYDHCzgqowFl6yU0EwxfKO480CGe0SiGmMyogildJyt9BStQ1A== +"@chakra-ui/tag@1.2.7": + version "1.2.7" + resolved "https://registry.yarnpkg.com/@chakra-ui/tag/-/tag-1.2.7.tgz#5861a92e83e63825f6fe563921d2704e921b585f" + integrity sha512-RKrKOol4i/CnpFfo3T9LMm1abaqM+5Bs0soQLbo1iJBbBACY09sWXrQYvveQ2GYzU/OrAUloHqqmKjyVGOlNtg== dependencies: - "@chakra-ui/icon" "3.0.6" - "@chakra-ui/react-utils" "2.0.3" - "@chakra-ui/utils" "2.0.6" + "@chakra-ui/icon" "2.0.5" + "@chakra-ui/utils" "1.10.4" -"@chakra-ui/textarea@2.0.7": - version "2.0.7" - resolved "https://registry.yarnpkg.com/@chakra-ui/textarea/-/textarea-2.0.7.tgz#10d53329473b1fcffe80dc3d7ddcd4994e9bf823" - integrity sha512-Ym3aHEawscvcgfun2StDK/oOBtmPnakm3ECQIvTd0caK0UpV3LP6XhCNyVT90SyLZ4WSPsoTof1G+y+AGBMWKA== +"@chakra-ui/textarea@1.2.11": + version "1.2.11" + resolved "https://registry.yarnpkg.com/@chakra-ui/textarea/-/textarea-1.2.11.tgz#24209862cf9227d79228222b7cff2c50f7ff0add" + integrity sha512-RDWbMyC87/AFRX98EnVum5eig/7hhcvS1BrqW5lvmTgrpr7KVr80Dfa8hUj58Iq37Z7AqZijDPkBn/zg7bPdIg== dependencies: - "@chakra-ui/form-control" "2.0.6" - "@chakra-ui/utils" "2.0.6" + "@chakra-ui/form-control" "1.6.0" + "@chakra-ui/utils" "1.10.4" -"@chakra-ui/theme-tools@2.0.7": - version "2.0.7" - resolved "https://registry.yarnpkg.com/@chakra-ui/theme-tools/-/theme-tools-2.0.7.tgz#9cccc312a95dc174c8ae62304b50a9224e37d81e" - integrity sha512-8brW2F/LbkSTYpCUAs49RnVw65Exbs+bDo3Kv/Q7TBrUO+peNPtwSdzZlK/NwSwk9mx1W19l4VEtPkSl86LFjg== +"@chakra-ui/theme-tools@1.3.6", "@chakra-ui/theme-tools@^1.3.4", "@chakra-ui/theme-tools@^1.3.6": + version "1.3.6" + resolved "https://registry.yarnpkg.com/@chakra-ui/theme-tools/-/theme-tools-1.3.6.tgz#2e5b5c192efd685c158e940a5cedcb0eb51f8602" + integrity sha512-Wxz3XSJhPCU6OwCHEyH44EegEDQHwvlsx+KDkUDGevOjUU88YuNqOVkKtgTpgMLNQcsrYZ93oPWZUJqqCVNRew== dependencies: - "@chakra-ui/anatomy" "2.0.3" - "@chakra-ui/utils" "2.0.6" + "@chakra-ui/utils" "1.10.4" "@ctrl/tinycolor" "^3.4.0" -"@chakra-ui/theme@2.1.5": - version "2.1.5" - resolved "https://registry.yarnpkg.com/@chakra-ui/theme/-/theme-2.1.5.tgz#4dee68d3444599ed631dfd4258da233c7f020df0" - integrity sha512-wUeXQLUrEgHuOLQi13r5ZP5Z348yVdIYfe7Ky7xXJ572pXc1ahNvJIJsTeDYmLrsRS2Knrv6DftCIYLWFiz4mw== - dependencies: - "@chakra-ui/anatomy" "2.0.3" - "@chakra-ui/theme-tools" "2.0.7" - "@chakra-ui/utils" "2.0.6" - -"@chakra-ui/toast@3.0.4": - version "3.0.4" - resolved "https://registry.yarnpkg.com/@chakra-ui/toast/-/toast-3.0.4.tgz#fed83c663e7a18b617a571aa13fa5d0c5627ca5d" - integrity sha512-q3h8mbG+4K3BIXd6I5UxWJCVhqjLr8lFJCc6rTtUB1UwW3JeYiKnSnG9iuKiqOlC3S9aAUnTaFpwJcWKKUVWug== - dependencies: - "@chakra-ui/alert" "2.0.6" - "@chakra-ui/close-button" "2.0.6" - "@chakra-ui/hooks" "2.0.6" - "@chakra-ui/portal" "2.0.6" - "@chakra-ui/react-utils" "2.0.3" - "@chakra-ui/theme" "2.1.5" - "@chakra-ui/transition" "2.0.6" - "@chakra-ui/utils" "2.0.6" - -"@chakra-ui/tooltip@2.0.7": - version "2.0.7" - resolved "https://registry.yarnpkg.com/@chakra-ui/tooltip/-/tooltip-2.0.7.tgz#879565602154911dc69e03fc64d3a1f8fc2b9ede" - integrity sha512-+WRffUg3kmCLeg8CNbLX6IbWyEHoslyrxs1SOWGN1sHAn6ZWljHVdczDENTRsozEoz/7zZz5b21Z9lehUZ9Bcg== +"@chakra-ui/theme@1.14.1": + version "1.14.1" + resolved "https://registry.yarnpkg.com/@chakra-ui/theme/-/theme-1.14.1.tgz#84ce1643d4d7c89509e714ac989bcf8acd5578b8" + integrity sha512-VeNZi+zD3yDwzvZm234Cy3vnalCzQ+dhAgpHdIYzGO1CYO8DPa+ROcQ70rUueL7dSvUz15KOiGTw6DAl7LXlGA== + dependencies: + "@chakra-ui/anatomy" "1.3.0" + "@chakra-ui/theme-tools" "1.3.6" + "@chakra-ui/utils" "1.10.4" + +"@chakra-ui/toast@1.5.9": + version "1.5.9" + resolved "https://registry.yarnpkg.com/@chakra-ui/toast/-/toast-1.5.9.tgz#45521dc521186ce88aad07a3796545d15a6f9697" + integrity sha512-rns04bGdMcG7Ijg45L+PfuEW4rCd0Ycraix4EJQhcl9RXI18G9sphmlp9feidhZAkI6Ukafq1YvyvkBfkKnIzQ== + dependencies: + "@chakra-ui/alert" "1.3.7" + "@chakra-ui/close-button" "1.2.7" + "@chakra-ui/hooks" "1.9.1" + "@chakra-ui/theme" "1.14.1" + "@chakra-ui/transition" "1.4.8" + "@chakra-ui/utils" "1.10.4" + "@reach/alert" "0.13.2" + +"@chakra-ui/tooltip@1.5.1": + version "1.5.1" + resolved "https://registry.yarnpkg.com/@chakra-ui/tooltip/-/tooltip-1.5.1.tgz#c338476aa0f00fc89f6357bc22725329f90d8d5d" + integrity sha512-EUAlDdlCBt63VpEVtj/RkFjHQVN/xA9gEAumngQdi1Sp+OXPYCBM9GwSY0NwrM1RfKBnhPSH9wz7FwredJWeaw== dependencies: - "@chakra-ui/hooks" "2.0.6" - "@chakra-ui/popper" "3.0.4" - "@chakra-ui/portal" "2.0.6" - "@chakra-ui/react-utils" "2.0.3" - "@chakra-ui/utils" "2.0.6" - "@chakra-ui/visually-hidden" "2.0.6" + "@chakra-ui/hooks" "1.9.1" + "@chakra-ui/popper" "2.4.3" + "@chakra-ui/portal" "1.3.10" + "@chakra-ui/react-utils" "1.2.3" + "@chakra-ui/utils" "1.10.4" + "@chakra-ui/visually-hidden" "1.1.6" -"@chakra-ui/transition@2.0.6": - version "2.0.6" - resolved "https://registry.yarnpkg.com/@chakra-ui/transition/-/transition-2.0.6.tgz#301a0c7fe155a22f494dd0dcfc214e218210663f" - integrity sha512-6zDZzYiCKZvZVkjOOCiFw8j56SSTMuVfmRT/yUfWzYNhZn6grS1yliNJLQ5UL2GW4SQb4Rp7GeMRVz3TCubnrg== +"@chakra-ui/transition@1.4.8": + version "1.4.8" + resolved "https://registry.yarnpkg.com/@chakra-ui/transition/-/transition-1.4.8.tgz#ac0f4675da929ae69fc9d6db6a1edf61e982772c" + integrity sha512-5uc8LEuCH7+0h++wqAav/EktTHOjbLDSTXQlU9fzPIlNNgyf2eXrHVN2AGMGKiMR9Z4gS7umQjZ54r0w/mZ/Fw== dependencies: - "@chakra-ui/utils" "2.0.6" + "@chakra-ui/utils" "1.10.4" -"@chakra-ui/utils@2.0.6": - version "2.0.6" - resolved "https://registry.yarnpkg.com/@chakra-ui/utils/-/utils-2.0.6.tgz#3a966647d5adc18852d6efb985bc01b3f6fbd955" - integrity sha512-ZjrHZo9GXZeAU1uvn/ZLU37avUz/3wsoqulRDSL//Kc/RrcmP1Ru6pmQ746qN3An+O29RFTQ4lj8M0R2T+I2uA== +"@chakra-ui/utils@1.10.4", "@chakra-ui/utils@^1.10.2", "@chakra-ui/utils@^1.10.4": + version "1.10.4" + resolved "https://registry.yarnpkg.com/@chakra-ui/utils/-/utils-1.10.4.tgz#40a32d4efd8684b2e7432a40b285796383eacfd3" + integrity sha512-AM91VQQxw8F4F1WDA28mqKY6NFIOuzc2Ekkna88imy2OiqqmYH0xkq8J16L2qj4cLiLozpYqba3C79pWioy6FA== dependencies: "@types/lodash.mergewith" "4.6.6" css-box-model "1.2.1" framesync "5.3.0" lodash.mergewith "4.6.2" -"@chakra-ui/visually-hidden@2.0.6": - version "2.0.6" - resolved "https://registry.yarnpkg.com/@chakra-ui/visually-hidden/-/visually-hidden-2.0.6.tgz#5f9a1b772e9ba18e39dbab4781c30d5abc2d0cc7" - integrity sha512-Gd5j4Q/VbOhiA7jKAEH7p/TIVIlkC6KdzSGPoSnevpXoy0pcZtzvTyvOYvd8WCjgLoATv+dDTK9hy6bWURO60w== +"@chakra-ui/visually-hidden@1.1.6": + version "1.1.6" + resolved "https://registry.yarnpkg.com/@chakra-ui/visually-hidden/-/visually-hidden-1.1.6.tgz#7a546a5aebe4779c8f18d65b1f0e56249720f28d" + integrity sha512-Xzy5bA0UA+IyMgwJizQYSEdgz8cC/tHdmFB3CniXzmpKTSK8mJddeEBl+cGbXHBzxEUhH7xF1eaS41O+0ezWEQ== dependencies: - "@chakra-ui/utils" "2.0.6" + "@chakra-ui/utils" "1.10.4" "@changesets/apply-release-plan@^6.0.4": version "6.0.4" @@ -2213,7 +2209,7 @@ resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.8.0.tgz#f580f9beb67176fa57aae70b08ed510e1b18980f" integrity sha512-G/YwXTkv7Den9mXDO7AhLWkE3q+I92B+VqAE+dYG4NGPaHZGvt3G8Q0p9vmE+sq7rTGphUbAvmQ9YpbfMQGGlA== -"@emotion/react@11.10.0", "@emotion/react@^11.7.1": +"@emotion/react@^11.7.1": version "11.10.0" resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.10.0.tgz#53c577f063f26493f68a05188fb87528d912ff2e" integrity sha512-K6z9zlHxxBXwN8TcpwBKcEsBsOw4JWCCmR+BeeOWgqp8GIU1yA2Odd41bwdAAr0ssbQrbJbVnndvv7oiv1bZeQ== @@ -2242,7 +2238,7 @@ resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.2.0.tgz#771b1987855839e214fc1741bde43089397f7be5" integrity sha512-OiTkRgpxescko+M51tZsMq7Puu/KP55wMT8BgpcXVG2hqXc0Vo0mfymJ/Uj24Hp0i083ji/o0aLddh08UEjq8w== -"@emotion/styled@11.10.0", "@emotion/styled@^11.6.0": +"@emotion/styled@^11.6.0": version "11.10.0" resolved "https://registry.yarnpkg.com/@emotion/styled/-/styled-11.10.0.tgz#c19484dab4206ae46727c07efb4316423dd21312" integrity sha512-V9oaEH6V4KePeQpgUE83i8ht+4Ri3E8Djp/ZPJ4DQlqWhSKITvgzlR3/YQE2hdfP4Jw3qVRkANJz01LLqK9/TA== @@ -2385,7 +2381,7 @@ lodash "^4.17.21" remove-markdown "0.5.0" -"@guild-docs/client@3.1.0": +"@guild-docs/client@^3.0.2": version "3.1.0" resolved "https://registry.yarnpkg.com/@guild-docs/client/-/client-3.1.0.tgz#1418fb607adeda5997053ec8b3aa7be6ccb6659e" integrity sha512-Uc2dv+30qYPNEg02PZ1r5PGZSPkgM7C5mblKEMUArqJhM6bxpFJG5JBi248f//O/y07/x7oEZaRbLn4Ktn0MPw== @@ -2418,7 +2414,7 @@ vfile "5.3.2" vfile-matter "3.0.1" -"@guild-docs/server@4.0.0": +"@guild-docs/server@^4.0.0": version "4.0.0" resolved "https://registry.yarnpkg.com/@guild-docs/server/-/server-4.0.0.tgz#f0ef566c95f2c47a20d10d3ca41b2156644f5989" integrity sha512-LlDr4U8LMwoE3LEmbMgUXlmFBUdHVKzGIOofKG1SR6VNwZEQ8/qAR5eEIdl3xA5VyOCs4PJ0lDJg5pzoECxq8w== @@ -2780,7 +2776,7 @@ unist-util-visit "^4.0.0" vfile "^5.0.0" -"@mdx-js/react@2.1.2": +"@mdx-js/react@^2.1.1": version "2.1.2" resolved "https://registry.yarnpkg.com/@mdx-js/react/-/react-2.1.2.tgz#02972f170cd3ad9113ce448245c5f636bb3e750d" integrity sha512-52e3DTJBrjsw3U51ZCdZ3N1IBaqnbzLIngCSXpKtiYiGr7PIqp3/P/+kym0MPTwBL/y9ZBmCieD8FyrXuEDrRw== @@ -3341,6 +3337,33 @@ "@babel/runtime" "^7.13.10" "@radix-ui/react-primitive" "0.1.4" +"@reach/alert@0.13.2": + version "0.13.2" + resolved "https://registry.yarnpkg.com/@reach/alert/-/alert-0.13.2.tgz#71c4a848d51341f1d6d9eaae060975391c224870" + integrity sha512-LDz83AXCrClyq/MWe+0vaZfHp1Ytqn+kgL5VxG7rirUvmluWaj/snxzfNPWn0Ma4K2YENmXXRC/iHt5X95SqIg== + dependencies: + "@reach/utils" "0.13.2" + "@reach/visually-hidden" "0.13.2" + prop-types "^15.7.2" + tslib "^2.1.0" + +"@reach/utils@0.13.2": + version "0.13.2" + resolved "https://registry.yarnpkg.com/@reach/utils/-/utils-0.13.2.tgz#87e8fef8ebfe583fa48250238a1a3ed03189fcc8" + integrity sha512-3ir6cN60zvUrwjOJu7C6jec/samqAeyAB12ZADK+qjnmQPdzSYldrFWwDVV5H0WkhbYXR3uh+eImu13hCetNPQ== + dependencies: + "@types/warning" "^3.0.0" + tslib "^2.1.0" + warning "^4.0.3" + +"@reach/visually-hidden@0.13.2": + version "0.13.2" + resolved "https://registry.yarnpkg.com/@reach/visually-hidden/-/visually-hidden-0.13.2.tgz#ee21de376a7e57e60dc92d95a671073796caa17e" + integrity sha512-sPZwNS0/duOuG0mYwE5DmgEAzW9VhgU3aIt1+mrfT/xiT9Cdncqke+kRBQgU708q/Ttm9tWsoHni03nn/SuPTQ== + dependencies: + prop-types "^15.7.2" + tslib "^2.1.0" + "@repeaterjs/repeater@^3.0.4": version "3.0.4" resolved "https://registry.yarnpkg.com/@repeaterjs/repeater/-/repeater-3.0.4.tgz#a04d63f4d1bf5540a41b01a921c9a7fddc3bd1ca" @@ -3895,6 +3918,15 @@ "@types/scheduler" "*" csstype "^3.0.2" +"@types/react@^17.0.15": + version "17.0.48" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.48.tgz#a4532a8b91d7b27b8768b6fc0c3bccb760d15a6c" + integrity sha512-zJ6IYlJ8cYYxiJfUaZOQee4lh99mFihBoqkOSEGV+dFi9leROW6+PgstzQ+w3gWTnUfskALtQPGHK6dYmPj+2A== + dependencies: + "@types/prop-types" "*" + "@types/scheduler" "*" + csstype "^3.0.2" + "@types/relay-compiler@8.0.3": version "8.0.3" resolved "https://registry.yarnpkg.com/@types/relay-compiler/-/relay-compiler-8.0.3.tgz#9534082fb06406c853293909f9afa8f7b4b81950" @@ -3948,6 +3980,11 @@ resolved "https://registry.yarnpkg.com/@types/valid-url/-/valid-url-1.0.3.tgz#a124389fb953559c7f889795a98620e91adb3687" integrity sha512-+33x29mg+ecU88ODdWpqaie2upIuRkhujVLA7TuJjM823cNMbeggfI6NhxewaRaRF8dy+g33e4uIg/m5Mb3xDQ== +"@types/warning@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/warning/-/warning-3.0.0.tgz#0d2501268ad8f9962b740d387c4654f5f8e23e52" + integrity sha512-t/Tvs5qR47OLOr+4E9ckN8AmP2Tf16gWq+/qA4iUGS/OOyHVO8wv2vjJuX8SNOUTJyWb+2t7wJm6cXILFnOROA== + "@types/webpack@5.28.0": version "5.28.0" resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-5.28.0.tgz#78dde06212f038d77e54116cfe69e88ae9ed2c03" @@ -4303,11 +4340,6 @@ resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31" integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ== -"@zag-js/focus-visible@0.1.0": - version "0.1.0" - resolved "https://registry.yarnpkg.com/@zag-js/focus-visible/-/focus-visible-0.1.0.tgz#9777bbaff8316d0b3a14a9095631e1494f69dbc7" - integrity sha512-PeaBcTmdZWcFf7n1aM+oiOdZc+sy14qi0emPIeUuGMTjbP0xLGrZu43kdpHnWSXy7/r4Ubp/vlg50MCV8+9Isg== - abort-controller@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392" @@ -5788,7 +5820,12 @@ cssfilter@0.0.10: resolved "https://registry.yarnpkg.com/cssfilter/-/cssfilter-0.0.10.tgz#c6d2672632a2e5c83e013e6864a42ce8defd20ae" integrity sha1-xtJnJjKi5cg+AT5oZKQs6N79IK4= -csstype@^3.0.11, csstype@^3.0.2, csstype@^3.0.6: +csstype@3.0.9: + version "3.0.9" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.9.tgz#6410af31b26bd0520933d02cbc64fce9ce3fbf0b" + integrity sha512-rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw== + +csstype@^3.0.2, csstype@^3.0.6: version "3.1.0" resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.0.tgz#4ddcac3718d787cf9df0d1b7d15033925c8f29f2" integrity sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA== @@ -7416,10 +7453,10 @@ flow-parser@0.*: resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.175.1.tgz#835a0ea46346c8bdd947e70b2814c2b613beb238" integrity sha512-gYes5/nxeLYiu02MMb+WH4KaOIYrVcTVIuV9M4aP/4hqJ+zULxxS/In+WEj/tEBsQ+8/wSHo9IDWKQL1FhrLmA== -focus-lock@^0.11.2: - version "0.11.2" - resolved "https://registry.yarnpkg.com/focus-lock/-/focus-lock-0.11.2.tgz#aeef3caf1cea757797ac8afdebaec8fd9ab243ed" - integrity sha512-pZ2bO++NWLHhiKkgP1bEXHhR1/OjVcSvlCJ98aNJDFeb7H5OOQaO+SKOZle6041O9rv2tmbrO4JzClAvDUHf0g== +focus-lock@^0.9.1: + version "0.9.2" + resolved "https://registry.yarnpkg.com/focus-lock/-/focus-lock-0.9.2.tgz#9d30918aaa99b1b97677731053d017f82a540d5b" + integrity sha512-YtHxjX7a0IC0ZACL5wsX8QdncXofWpGPNoVMuI/nZUrPGp6LmNI6+D5j0pPj+v8Kw5EpweA+T5yImK0rnWf7oQ== dependencies: tslib "^2.0.3" @@ -11651,7 +11688,7 @@ react-children-utilities@2.7.1: resolved "https://registry.yarnpkg.com/react-children-utilities/-/react-children-utilities-2.7.1.tgz#bf72e3b05f572fec75da66d003f3a22ab431841e" integrity sha512-olV2IcUcARN/VrgYnijbxEtvc2P07BcmAWKdLI0txZgAqs8YODxbYu68GMDv/uretA1sVlPMCQXRgY0Msh4dmA== -react-clientside-effect@^1.2.6: +react-clientside-effect@^1.2.5: version "1.2.6" resolved "https://registry.yarnpkg.com/react-clientside-effect/-/react-clientside-effect-1.2.6.tgz#29f9b14e944a376b03fb650eed2a754dd128ea3a" integrity sha512-XGGGRQAKY+q25Lz9a/4EPqom7WRjz3z9R2k4jhVKA/puQFH/5Nt27vFZYql4m4NVNdUvX8PS3O7r/Zzm7cjUlg== @@ -11671,17 +11708,17 @@ react-fast-compare@3.2.0, react-fast-compare@^3.0.0, react-fast-compare@^3.0.1: resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.0.tgz#641a9da81b6a6320f270e89724fb45a0b39e43bb" integrity sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA== -react-focus-lock@^2.9.1: - version "2.9.1" - resolved "https://registry.yarnpkg.com/react-focus-lock/-/react-focus-lock-2.9.1.tgz#094cfc19b4f334122c73bb0bff65d77a0c92dd16" - integrity sha512-pSWOQrUmiKLkffPO6BpMXN7SNKXMsuOakl652IBuALAu1esk+IcpJyM+ALcYzPTTFz1rD0R54aB9A4HuP5t1Wg== +react-focus-lock@2.5.2: + version "2.5.2" + resolved "https://registry.yarnpkg.com/react-focus-lock/-/react-focus-lock-2.5.2.tgz#f1e4db5e25cd8789351f2bd5ebe91e9dcb9c2922" + integrity sha512-WzpdOnEqjf+/A3EH9opMZWauag7gV0BxFl+EY4ElA4qFqYsUsBLnmo2sELbN5OC30S16GAWMy16B9DLPpdJKAQ== dependencies: "@babel/runtime" "^7.0.0" - focus-lock "^0.11.2" + focus-lock "^0.9.1" prop-types "^15.6.2" - react-clientside-effect "^1.2.6" - use-callback-ref "^1.3.0" - use-sidecar "^1.1.2" + react-clientside-effect "^1.2.5" + use-callback-ref "^1.2.5" + use-sidecar "^1.0.5" react-i18next@^11.18.0: version "11.18.1" @@ -11756,7 +11793,7 @@ react-player@^2.9.0: prop-types "^15.7.2" react-fast-compare "^3.0.1" -react-remove-scroll-bar@^2.3.3: +react-remove-scroll-bar@^2.1.0: version "2.3.3" resolved "https://registry.yarnpkg.com/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.3.tgz#e291f71b1bb30f5f67f023765b7435f4b2b2cd94" integrity sha512-i9GMNWwpz8XpUpQ6QlevUtFjHGqnPG4Hxs+wlIJntu/xcsZVEpJcIV71K3ZkqNy2q3GfgvkD7y6t/Sv8ofYSbw== @@ -11764,16 +11801,16 @@ react-remove-scroll-bar@^2.3.3: react-style-singleton "^2.2.1" tslib "^2.0.0" -react-remove-scroll@^2.5.4: - version "2.5.4" - resolved "https://registry.yarnpkg.com/react-remove-scroll/-/react-remove-scroll-2.5.4.tgz#afe6491acabde26f628f844b67647645488d2ea0" - integrity sha512-xGVKJJr0SJGQVirVFAUZ2k1QLyO6m+2fy0l8Qawbp5Jgrv3DeLalrfMNBFSlmz5kriGGzsVBtGVnf4pTKIhhWA== +react-remove-scroll@2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/react-remove-scroll/-/react-remove-scroll-2.4.1.tgz#e0af6126621083a5064591d367291a81b2d107f5" + integrity sha512-K7XZySEzOHMTq7dDwcHsZA6Y7/1uX5RsWhRXVYv8rdh+y9Qz2nMwl9RX/Mwnj/j7JstCGmxyfyC0zbVGXYh3mA== dependencies: - react-remove-scroll-bar "^2.3.3" - react-style-singleton "^2.2.1" - tslib "^2.1.0" - use-callback-ref "^1.3.0" - use-sidecar "^1.1.2" + react-remove-scroll-bar "^2.1.0" + react-style-singleton "^2.1.0" + tslib "^1.0.0" + use-callback-ref "^1.2.3" + use-sidecar "^1.0.1" react-sticky-box@1.0.2: version "1.0.2" @@ -11782,7 +11819,7 @@ react-sticky-box@1.0.2: dependencies: resize-observer-polyfill "^1.5.1" -react-style-singleton@^2.2.1: +react-style-singleton@^2.1.0, react-style-singleton@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/react-style-singleton/-/react-style-singleton-2.2.1.tgz#f99e420492b2d8f34d38308ff660b60d0b1205b4" integrity sha512-ZWj0fHEMyWkHzKYUr2Bs/4zU6XLmq9HsgBURm7g5pAVfyn49DgUiNgY2d4lXRlYSiCif9YBGpQleewkcqddc7g== @@ -13950,7 +13987,7 @@ urix@^0.1.0: resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= -use-callback-ref@^1.3.0: +use-callback-ref@^1.2.3, use-callback-ref@^1.2.5: version "1.3.0" resolved "https://registry.yarnpkg.com/use-callback-ref/-/use-callback-ref-1.3.0.tgz#772199899b9c9a50526fedc4993fc7fa1f7e32d5" integrity sha512-3FT9PRuRdbB9HfXhEq35u4oZkvpJ5kuYbpqhCfmiZyReuRgpnhDlbr2ZEnnuS0RrJAPn6l23xjFg9kpDM+Ms7w== @@ -13967,7 +14004,7 @@ use-immer@0.7.0: resolved "https://registry.yarnpkg.com/use-immer/-/use-immer-0.7.0.tgz#e3bfbb806b5e3ff6e37441be74c306d91c1e0962" integrity sha512-Re4hjrP3a/2ABZjAc0b7AK9s626bnO+H33RO2VUhiDZ2StBz5B663K6WNNlr4QtHWaGUmvLpwt3whFvvWuolQw== -use-sidecar@^1.1.2: +use-sidecar@^1.0.1, use-sidecar@^1.0.5: version "1.1.2" resolved "https://registry.yarnpkg.com/use-sidecar/-/use-sidecar-1.1.2.tgz#2f43126ba2d7d7e117aa5855e5d8f0276dfe73c2" integrity sha512-epTbsLuzZ7lPClpz2TyryBfztm7m+28DlEv2ZCQ3MDr5ssiwyOwGH/e5F9CkfWjJ1t4clvI58yF822/GUkjjhw== @@ -14125,6 +14162,13 @@ walker@^1.0.8: dependencies: makeerror "1.0.12" +warning@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3" + integrity sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w== + dependencies: + loose-envify "^1.0.0" + watchpack@^2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d"