From 95bd5d101002124edee8544ea24c2eeaaf2860c9 Mon Sep 17 00:00:00 2001 From: vchikalkin Date: Tue, 20 Dec 2022 19:48:13 +0300 Subject: [PATCH] Revert "repo: move ./graphql to packages/graphql (gql)" This reverts commit 74af4fb4922cf84f297807b25c19a1ae9f40a9b5. --- .graphqlrc.yml | 21 +- .prettierignore | 2 +- .../Calculation/addons/currency-addon.tsx | 2 +- .../apollo.config.js => apollo.config.js | 2 +- .../graphql => graphql}/crm.schema.graphql | 0 {packages/graphql => graphql}/crm.types.ts | 0 package.json | 8 +- packages/graphql/.graphqlrc.yml | 21 -- packages/graphql/package.json | 18 - process/fingap/get-kp-data.ts | 2 +- process/fingap/reactions/common.ts | 2 +- process/init/get-data/get-owner-data.ts | 2 +- process/init/set-values/reactions.ts | 2 +- process/lead-opportunity/reactions/common.ts | 2 +- process/payments/get-kp-data.ts | 2 +- process/price/reactions/computed.ts | 2 +- .../supplier-agent/get-kp-values/get-sums.ts | 2 +- process/supplier-agent/get-kp-values/index.ts | 2 +- .../supplier-agent/lib/create-reactions.ts | 2 +- .../lib/fill-agents-from-lead.ts | 2 +- process/supplier-agent/reactions/agents.ts | 2 +- process/supplier-agent/reactions/leaseback.ts | 2 +- process/supplier-agent/reactions/supplier.ts | 2 +- yarn.lock | 310 ++++++------------ 24 files changed, 153 insertions(+), 259 deletions(-) rename packages/graphql/apollo.config.js => apollo.config.js (83%) rename {packages/graphql => graphql}/crm.schema.graphql (100%) rename {packages/graphql => graphql}/crm.types.ts (100%) delete mode 100644 packages/graphql/.graphqlrc.yml delete mode 100644 packages/graphql/package.json diff --git a/.graphqlrc.yml b/.graphqlrc.yml index 0208da7..427fcac 100644 --- a/.graphqlrc.yml +++ b/.graphqlrc.yml @@ -1,2 +1,21 @@ -schema: './packages/graphql/crm.schema.graphql' +overwrite: true +schema: './graphql/crm.schema.graphql' documents: '**/*.{graphql,js,ts,jsx,tsx}' +generates: + ./graphql/crm.types.ts: + plugins: + - typescript + - typescript-operations + config: + onlyOperationTypes: true + useTypeImports: true + avoidOptionals: + field: true + inputValue: false + object: true + defaultValue: true + scalars: + Uuid: string + Decimal: number + DateTime: string +# exclude: './graphql/crm.schema.graphql' diff --git a/.prettierignore b/.prettierignore index 6f953a6..2bd96bf 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,3 +1,3 @@ .next public -packages/graphql \ No newline at end of file +graphql \ No newline at end of file diff --git a/Components/Calculation/addons/currency-addon.tsx b/Components/Calculation/addons/currency-addon.tsx index 074133d..afdab0f 100644 --- a/Components/Calculation/addons/currency-addon.tsx +++ b/Components/Calculation/addons/currency-addon.tsx @@ -1,5 +1,5 @@ import { gql, useQuery } from '@apollo/client'; -import type * as CRMTypes from 'gql/crm.types'; +import type * as CRMTypes from 'graphql/crm.types'; import { observer } from 'mobx-react-lite'; import { useStore } from 'stores/hooks'; diff --git a/packages/graphql/apollo.config.js b/apollo.config.js similarity index 83% rename from packages/graphql/apollo.config.js rename to apollo.config.js index 0a1c20e..a8179d9 100644 --- a/packages/graphql/apollo.config.js +++ b/apollo.config.js @@ -4,7 +4,7 @@ module.exports = { service: { name: 'crmgraphql', url: process.env.NEXT_PUBLIC_URL_CRM_GRAPHQL_DIRECT, - localSchemaFile: './crm.schema.graphql', + localSchemaFile: './graphql/crm.schema.graphql', }, excludes: ['graphql/**/*'], includes: ['pages/**/*', 'process/**/*', 'Components/**/*'], diff --git a/packages/graphql/crm.schema.graphql b/graphql/crm.schema.graphql similarity index 100% rename from packages/graphql/crm.schema.graphql rename to graphql/crm.schema.graphql diff --git a/packages/graphql/crm.types.ts b/graphql/crm.types.ts similarity index 100% rename from packages/graphql/crm.types.ts rename to graphql/crm.types.ts diff --git a/package.json b/package.json index 65cd4b3..8b9ceea 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,8 @@ "lint:fix": "next lint -- --fix", "prettier": "prettier --write .", "precommit": "yarn prettier && yarn lint:fix && yarn test", + "graphql:codegen": "graphql-codegen --config .graphqlrc.yml", + "graphql:download-schema": "dotenv -e .env.local apollo client:download-schema graphql/crm.schema.graphql", "prepare": "husky install", "test": "jest", "test:watch": "jest --watch", @@ -29,7 +31,6 @@ "@trpc/server": "^10.0.0-rc.3", "axios": "^1.1.3", "dayjs": "^1.11.2", - "gql": "*", "less": "^4.1.3", "less-loader": "^11.0.0", "mobx": "^6.7.0", @@ -51,6 +52,9 @@ "zod": "^3.19.1" }, "devDependencies": { + "@graphql-codegen/cli": "2.12.0", + "@graphql-codegen/typescript": "2.7.3", + "@graphql-codegen/typescript-operations": "2.5.3", "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^13.4.0", "@testing-library/user-event": "^14.4.3", @@ -60,6 +64,8 @@ "@types/styled-components": "^5.1.25", "@typescript-eslint/eslint-plugin": "^5.37.0", "@typescript-eslint/parser": "^5.37.0", + "apollo": "^2.34.0", + "dotenv-cli": "^6.0.0", "eslint": "8.23.1", "eslint-config-airbnb": "^19.0.4", "eslint-config-airbnb-typescript": "^17.0.0", diff --git a/packages/graphql/.graphqlrc.yml b/packages/graphql/.graphqlrc.yml deleted file mode 100644 index d13f5af..0000000 --- a/packages/graphql/.graphqlrc.yml +++ /dev/null @@ -1,21 +0,0 @@ -overwrite: true -schema: './crm.schema.graphql' -documents: '**/*.{graphql,js,ts,jsx,tsx}' -generates: - ./graphql/crm.types.ts: - plugins: - - typescript - - typescript-operations - config: - onlyOperationTypes: true - useTypeImports: true - avoidOptionals: - field: true - inputValue: false - object: true - defaultValue: true - scalars: - Uuid: string - Decimal: number - DateTime: string -# exclude: './crm.schema.graphql' diff --git a/packages/graphql/package.json b/packages/graphql/package.json deleted file mode 100644 index a4e57b3..0000000 --- a/packages/graphql/package.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "gql", - "version": "0.0.0", - "main": "./index.tsx", - "types": "./index.tsx", - "license": "MIT", - "scripts": { - "codegen": "graphql-codegen --config .graphqlrc.yml", - "download-schema": "dotenv -e .env.local apollo client:download-schema crm.schema.graphql" - }, - "devDependencies": { - "@graphql-codegen/cli": "^2.16.1", - "@graphql-codegen/typescript": "^2.8.5", - "@graphql-codegen/typescript-operations": "^2.5.10", - "apollo": "^2.34.0", - "dotenv-cli": "^6.0.0" - } -} diff --git a/process/fingap/get-kp-data.ts b/process/fingap/get-kp-data.ts index 085e5ba..8ed68d0 100644 --- a/process/fingap/get-kp-data.ts +++ b/process/fingap/get-kp-data.ts @@ -1,7 +1,7 @@ import { gql } from '@apollo/client'; import initializeApollo from 'apollo/client'; import { defaultValues } from 'config/tables/insurance-table'; -import type * as CRMTypes from 'gql/crm.types'; +import type * as CRMTypes from 'graphql/crm.types'; import type { GetQuoteDataInput, GetQuoteDataOutput } from '../load-kp/types'; const DEFAULT_FINGAP_ROW = defaultValues.find((x) => x.key === 'fingap')!; diff --git a/process/fingap/reactions/common.ts b/process/fingap/reactions/common.ts index d7b7021..1519cc0 100644 --- a/process/fingap/reactions/common.ts +++ b/process/fingap/reactions/common.ts @@ -9,7 +9,7 @@ import type { Risk } from 'Components/Calculation/Form/Insurance/FinGAPTable/typ import { STALE_TIME } from 'constants/request'; import dayjs from 'dayjs'; import utc from 'dayjs/plugin/utc'; -import type * as CRMTypes from 'gql/crm.types'; +import type * as CRMTypes from 'graphql/crm.types'; import { comparer, reaction, toJS } from 'mobx'; import type { ReactionsContext } from 'process/types'; import { flatten } from 'tools/object'; diff --git a/process/init/get-data/get-owner-data.ts b/process/init/get-data/get-owner-data.ts index 42798d3..90ec863 100644 --- a/process/init/get-data/get-owner-data.ts +++ b/process/init/get-data/get-owner-data.ts @@ -3,7 +3,7 @@ import type { ApolloClient } from '@apollo/client'; import { gql } from '@apollo/client'; import type { User } from 'api/user/types'; -import type { GetOwnerDataQuery, GetOwnerDataQueryVariables } from 'gql/crm.types'; +import type { GetOwnerDataQuery, GetOwnerDataQueryVariables } from 'graphql/crm.types'; const QUERY_GET_OWNER_DATA = gql` query GetOwnerData($domainname: String) { diff --git a/process/init/set-values/reactions.ts b/process/init/set-values/reactions.ts index 3e338da..f62d6b8 100644 --- a/process/init/set-values/reactions.ts +++ b/process/init/set-values/reactions.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/naming-convention */ import { gql } from '@apollo/client'; -import type { GetTransactionCurrenciesQuery } from 'gql/crm.types'; +import type { GetTransactionCurrenciesQuery } from 'graphql/crm.types'; import { when } from 'mobx'; import type { ReactionsContext } from 'process/types'; diff --git a/process/lead-opportunity/reactions/common.ts b/process/lead-opportunity/reactions/common.ts index 374cd4f..06d2faa 100644 --- a/process/lead-opportunity/reactions/common.ts +++ b/process/lead-opportunity/reactions/common.ts @@ -1,6 +1,6 @@ /* eslint-disable implicit-arrow-linebreak */ import { gql } from '@apollo/client'; -import type * as CRMTypes from 'gql/crm.types'; +import type * as CRMTypes from 'graphql/crm.types'; import { reaction } from 'mobx'; import type { ReactionsContext } from 'process/types'; import { normalizeOptions } from 'tools/entity'; diff --git a/process/payments/get-kp-data.ts b/process/payments/get-kp-data.ts index d0f3ac3..a998ada 100644 --- a/process/payments/get-kp-data.ts +++ b/process/payments/get-kp-data.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/naming-convention */ import { gql } from '@apollo/client'; import initializeApollo from 'apollo/client'; -import type * as CRMTypes from 'gql/crm.types'; +import type * as CRMTypes from 'graphql/crm.types'; import { sort } from 'radash'; import type { GetQuoteDataInput, GetQuoteDataOutput } from '../load-kp/types'; diff --git a/process/price/reactions/computed.ts b/process/price/reactions/computed.ts index e94629b..a4bba6c 100644 --- a/process/price/reactions/computed.ts +++ b/process/price/reactions/computed.ts @@ -2,7 +2,7 @@ import { gql } from '@apollo/client'; import dayjs from 'dayjs'; import utc from 'dayjs/plugin/utc'; -import type * as CRMTypes from 'gql/crm.types'; +import type * as CRMTypes from 'graphql/crm.types'; import { autorun } from 'mobx'; import type { ReactionsContext } from 'process/types'; diff --git a/process/supplier-agent/get-kp-values/get-sums.ts b/process/supplier-agent/get-kp-values/get-sums.ts index c604b0f..bc8056c 100644 --- a/process/supplier-agent/get-kp-values/get-sums.ts +++ b/process/supplier-agent/get-kp-values/get-sums.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/naming-convention */ import { gql } from '@apollo/client'; import initializeApollo from 'apollo/client'; -import type * as CRMTypes from 'gql/crm.types'; +import type * as CRMTypes from 'graphql/crm.types'; import type { Quote } from './index'; const QUERY_GET_REWARD_RULES = gql` diff --git a/process/supplier-agent/get-kp-values/index.ts b/process/supplier-agent/get-kp-values/index.ts index 2a6d2fe..9429a3a 100644 --- a/process/supplier-agent/get-kp-values/index.ts +++ b/process/supplier-agent/get-kp-values/index.ts @@ -1,6 +1,6 @@ import { gql } from '@apollo/client'; import initializeApollo from 'apollo/client'; -import type * as CRMTypes from 'gql/crm.types'; +import type * as CRMTypes from 'graphql/crm.types'; import type { GetQuoteDataInput, GetQuoteDataOutput } from '../../load-kp/types'; import getSums from './get-sums'; diff --git a/process/supplier-agent/lib/create-reactions.ts b/process/supplier-agent/lib/create-reactions.ts index 1bd1d87..281676b 100644 --- a/process/supplier-agent/lib/create-reactions.ts +++ b/process/supplier-agent/lib/create-reactions.ts @@ -3,7 +3,7 @@ import type { ApolloClient } from '@apollo/client'; import { gql } from '@apollo/client'; import dayjs from 'dayjs'; import utc from 'dayjs/plugin/utc'; -import type * as CRMTypes from 'gql/crm.types'; +import type * as CRMTypes from 'graphql/crm.types'; import { reaction } from 'mobx'; import type RootStore from 'stores/root'; import ValidationHelper from 'stores/validation/helper'; diff --git a/process/supplier-agent/lib/fill-agents-from-lead.ts b/process/supplier-agent/lib/fill-agents-from-lead.ts index 5495eaf..d92aebd 100644 --- a/process/supplier-agent/lib/fill-agents-from-lead.ts +++ b/process/supplier-agent/lib/fill-agents-from-lead.ts @@ -2,7 +2,7 @@ import type { ApolloClient, DocumentNode } from '@apollo/client'; import { gql } from '@apollo/client'; import type { Elements } from 'Components/Calculation/config/map/values'; -import type { GetAgentQuery, GetAgentQueryVariables } from 'gql/crm.types'; +import type { GetAgentQuery, GetAgentQueryVariables } from 'graphql/crm.types'; import type RootStore from 'stores/root'; import { normalizeOptions } from 'tools/entity'; import { QUERY_GET_AGENT } from './query'; diff --git a/process/supplier-agent/reactions/agents.ts b/process/supplier-agent/reactions/agents.ts index 3ff85f2..b000f47 100644 --- a/process/supplier-agent/reactions/agents.ts +++ b/process/supplier-agent/reactions/agents.ts @@ -2,7 +2,7 @@ import { gql } from '@apollo/client'; import dayjs from 'dayjs'; import utc from 'dayjs/plugin/utc'; -import type * as CRMTypes from 'gql/crm.types'; +import type * as CRMTypes from 'graphql/crm.types'; import { reaction } from 'mobx'; import type { ReactionsContext } from 'process/types'; import { makeDisposable } from 'tools/mobx'; diff --git a/process/supplier-agent/reactions/leaseback.ts b/process/supplier-agent/reactions/leaseback.ts index dc7d1f5..fb644f9 100644 --- a/process/supplier-agent/reactions/leaseback.ts +++ b/process/supplier-agent/reactions/leaseback.ts @@ -1,5 +1,5 @@ import { gql } from '@apollo/client'; -import type * as CRMTypes from 'gql/crm.types'; +import type * as CRMTypes from 'graphql/crm.types'; import { reaction } from 'mobx'; import type { ReactionsContext } from 'process/types'; diff --git a/process/supplier-agent/reactions/supplier.ts b/process/supplier-agent/reactions/supplier.ts index d55ce32..435cadb 100644 --- a/process/supplier-agent/reactions/supplier.ts +++ b/process/supplier-agent/reactions/supplier.ts @@ -2,7 +2,7 @@ import { gql } from '@apollo/client'; import dayjs from 'dayjs'; import utc from 'dayjs/plugin/utc'; -import type * as CRMTypes from 'gql/crm.types'; +import type * as CRMTypes from 'graphql/crm.types'; import { reaction } from 'mobx'; import type { ReactionsContext } from 'process/types'; import { sift } from 'radash'; diff --git a/yarn.lock b/yarn.lock index e4908e1..f22f619 100644 --- a/yarn.lock +++ b/yarn.lock @@ -306,17 +306,6 @@ __metadata: languageName: node linkType: hard -"@babel/generator@npm:^7.18.13": - version: 7.20.5 - resolution: "@babel/generator@npm:7.20.5" - dependencies: - "@babel/types": ^7.20.5 - "@jridgewell/gen-mapping": ^0.3.2 - jsesc: ^2.5.1 - checksum: 31c10d1e122f08cf755a24bd6f5d197f47eceba03f1133759687d00ab72d210e60ba4011da42f368b6e9fa85cbfda7dc4adb9889c2c20cc5c34bb2d57c1deab7 - languageName: node - linkType: hard - "@babel/helper-annotate-as-pure@npm:^7.16.0": version: 7.16.7 resolution: "@babel/helper-annotate-as-pure@npm:7.16.7" @@ -685,17 +674,6 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-syntax-import-assertions@npm:7.20.0": - version: 7.20.0 - resolution: "@babel/plugin-syntax-import-assertions@npm:7.20.0" - dependencies: - "@babel/helper-plugin-utils": ^7.19.0 - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: 6a86220e0aae40164cd3ffaf80e7c076a1be02a8f3480455dddbae05fda8140f429290027604df7a11b3f3f124866e8a6d69dbfa1dda61ee7377b920ad144d5b - languageName: node - linkType: hard - "@babel/plugin-syntax-import-meta@npm:^7.8.3": version: 7.10.4 resolution: "@babel/plugin-syntax-import-meta@npm:7.10.4" @@ -1183,7 +1161,7 @@ __metadata: languageName: node linkType: hard -"@babel/types@npm:^7.18.13, @babel/types@npm:^7.20.5, @babel/types@npm:^7.8.3": +"@babel/types@npm:^7.8.3": version: 7.20.5 resolution: "@babel/types@npm:7.20.5" dependencies: @@ -1416,39 +1394,37 @@ __metadata: languageName: node linkType: hard -"@graphql-codegen/cli@npm:^2.16.1": - version: 2.16.1 - resolution: "@graphql-codegen/cli@npm:2.16.1" +"@graphql-codegen/cli@npm:2.12.0": + version: 2.12.0 + resolution: "@graphql-codegen/cli@npm:2.12.0" dependencies: - "@babel/generator": ^7.18.13 - "@babel/template": ^7.18.10 - "@babel/types": ^7.18.13 - "@graphql-codegen/core": 2.6.8 - "@graphql-codegen/plugin-helpers": ^3.1.1 + "@graphql-codegen/core": 2.6.2 + "@graphql-codegen/plugin-helpers": ^2.7.0 "@graphql-tools/apollo-engine-loader": ^7.3.6 - "@graphql-tools/code-file-loader": ^7.3.13 - "@graphql-tools/git-loader": ^7.2.13 - "@graphql-tools/github-loader": ^7.3.20 + "@graphql-tools/code-file-loader": ^7.3.1 + "@graphql-tools/git-loader": ^7.2.1 + "@graphql-tools/github-loader": ^7.3.6 "@graphql-tools/graphql-file-loader": ^7.5.0 "@graphql-tools/json-file-loader": ^7.4.1 - "@graphql-tools/load": 7.8.0 + "@graphql-tools/load": ^7.7.1 "@graphql-tools/prisma-loader": ^7.2.7 "@graphql-tools/url-loader": ^7.13.2 "@graphql-tools/utils": ^8.9.0 - "@whatwg-node/fetch": ^0.5.0 + "@whatwg-node/fetch": ^0.3.0 + ansi-escapes: ^4.3.1 chalk: ^4.1.0 chokidar: ^3.5.2 cosmiconfig: ^7.0.0 - cosmiconfig-typescript-loader: 4.1.1 + cosmiconfig-typescript-loader: ^4.0.0 debounce: ^1.2.0 detect-indent: ^6.0.0 - graphql-config: 4.3.6 + graphql-config: ^4.3.5 inquirer: ^8.0.0 is-glob: ^4.0.1 json-to-pretty-yaml: ^1.2.2 listr2: ^4.0.5 log-symbols: ^4.0.0 - shell-quote: ^1.7.3 + mkdirp: ^1.0.4 string-env-interpolation: ^1.0.1 ts-log: ^2.2.3 tslib: ^2.4.0 @@ -1461,100 +1437,100 @@ __metadata: graphql-code-generator: cjs/bin.js graphql-codegen: cjs/bin.js graphql-codegen-esm: esm/bin.js - checksum: 5b8adecc90af4594b6819d97173acbcb0edbd2dd3b35981dd0ef79bda722c91e4e3c581fffa68396640a9f09097f3e826fd2cf16dc1718a95ef180f934376df8 + checksum: f8010d651e7f7bec3ac04da0c250a7c9d863f0c175f923553b9701e99cb61d9feb7393fa11ff601bf31c6f6d4b40c81e28f39cd8797b611b5f0456c46cbd6045 languageName: node linkType: hard -"@graphql-codegen/core@npm:2.6.8": - version: 2.6.8 - resolution: "@graphql-codegen/core@npm:2.6.8" +"@graphql-codegen/core@npm:2.6.2": + version: 2.6.2 + resolution: "@graphql-codegen/core@npm:2.6.2" dependencies: - "@graphql-codegen/plugin-helpers": ^3.1.1 + "@graphql-codegen/plugin-helpers": ^2.6.2 "@graphql-tools/schema": ^9.0.0 - "@graphql-tools/utils": ^9.1.1 + "@graphql-tools/utils": ^8.8.0 tslib: ~2.4.0 peerDependencies: graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 - checksum: 33a222798fd99adcaf5d6d48fcd6949798a62d7a25e9b2af5b13e4def3de4338e5a743e5ea87661d2b32ae3279e3ad8b555d0e212efe86018088cb85a7d59d6a + checksum: 3d078e9caa11baf7ceaa4d67b29a6be32f50a183c1fa6f228a3ade62902b9b91cdea2c94d99adbadf10ec38a7f2df9f16cd366dc7b4febf95336e3b4a7eb9160 languageName: node linkType: hard -"@graphql-codegen/plugin-helpers@npm:^3.1.1": - version: 3.1.1 - resolution: "@graphql-codegen/plugin-helpers@npm:3.1.1" +"@graphql-codegen/plugin-helpers@npm:^2.6.2, @graphql-codegen/plugin-helpers@npm:^2.7.0": + version: 2.7.0 + resolution: "@graphql-codegen/plugin-helpers@npm:2.7.0" dependencies: "@graphql-tools/utils": ^8.8.0 - change-case-all: 1.0.15 + change-case-all: 1.0.14 common-tags: 1.8.2 import-from: 4.0.0 lodash: ~4.17.0 tslib: ~2.4.0 peerDependencies: graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 - checksum: 22a15d4638ad449f654dab7a1e4968a82a50e3ab38f3b0974ae767a0a80e251fece436933f575f158da67564331d6046223b83eb10e0f1b93e78a15d7d0f684e + checksum: 413099d58e99d4eb3a7d806f3b7eb5c7052e40a680cc2e9ced11eb0b8af0aede8a3fdcdeca937daf89614b6db9cf0a9235ad6f694d211f097c40c1cbf07b3c6a languageName: node linkType: hard -"@graphql-codegen/schema-ast@npm:^2.6.0": - version: 2.6.0 - resolution: "@graphql-codegen/schema-ast@npm:2.6.0" +"@graphql-codegen/schema-ast@npm:^2.5.1": + version: 2.5.1 + resolution: "@graphql-codegen/schema-ast@npm:2.5.1" dependencies: - "@graphql-codegen/plugin-helpers": ^3.1.1 + "@graphql-codegen/plugin-helpers": ^2.6.2 "@graphql-tools/utils": ^8.8.0 tslib: ~2.4.0 peerDependencies: graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 - checksum: a32e22fdd5cdab743ed7920249de6b00cbca0742633cfdbfed330c04c397bf1e0179ab141303a70cf733b6db27e537a67c6b6b50e70fb1d0767fc8d8de7a129f + checksum: a488c4a35e360f46444fb140ef3b5dffdea1e70549060ce6c2dad6f39c0b3c2cf2bcd797bcec8084f20a3ea4b5ab3e8221b1418e4195d9baf392819425bdd300 languageName: node linkType: hard -"@graphql-codegen/typescript-operations@npm:^2.5.10": - version: 2.5.10 - resolution: "@graphql-codegen/typescript-operations@npm:2.5.10" +"@graphql-codegen/typescript-operations@npm:2.5.3": + version: 2.5.3 + resolution: "@graphql-codegen/typescript-operations@npm:2.5.3" dependencies: - "@graphql-codegen/plugin-helpers": ^3.1.1 - "@graphql-codegen/typescript": ^2.8.5 - "@graphql-codegen/visitor-plugin-common": 2.13.5 + "@graphql-codegen/plugin-helpers": ^2.6.2 + "@graphql-codegen/typescript": ^2.7.3 + "@graphql-codegen/visitor-plugin-common": 2.12.1 auto-bind: ~4.0.0 tslib: ~2.4.0 peerDependencies: graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 - checksum: ddd3152cfefa3b17b25a708eed19c7b513b75b398f855aec37d9fe01c0c4f45487ca3d130f799a6361dd75579ca93582832300809b0ed1918ad04c01b79e56dd + checksum: b91ca8c994705c881226cb36095ef8707f24bcb07d0862a434ab02ff609787ea53ee7589cd5200190b8ad90a2d73a575088c4924feff525b559e1af8305bd57b languageName: node linkType: hard -"@graphql-codegen/typescript@npm:^2.8.5": - version: 2.8.5 - resolution: "@graphql-codegen/typescript@npm:2.8.5" +"@graphql-codegen/typescript@npm:2.7.3, @graphql-codegen/typescript@npm:^2.7.3": + version: 2.7.3 + resolution: "@graphql-codegen/typescript@npm:2.7.3" dependencies: - "@graphql-codegen/plugin-helpers": ^3.1.1 - "@graphql-codegen/schema-ast": ^2.6.0 - "@graphql-codegen/visitor-plugin-common": 2.13.5 + "@graphql-codegen/plugin-helpers": ^2.6.2 + "@graphql-codegen/schema-ast": ^2.5.1 + "@graphql-codegen/visitor-plugin-common": 2.12.1 auto-bind: ~4.0.0 tslib: ~2.4.0 peerDependencies: graphql: ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 - checksum: dd13cd82f202e82591262fd515b4cfd6a9d270b1d9447240ed75f0b374565e0c4a13297724bc94df5a7ad1a400cf63f83c439af9155fd95386d813481845bd01 + checksum: fa08ad7a379cfc05cf80d71509d1f8154919b8a0e89e8bf2c95a41856e0b42e3788b9225faf084a94cf900dab8893e42aa296bdb4725d5d20ce00c9e2e0bd707 languageName: node linkType: hard -"@graphql-codegen/visitor-plugin-common@npm:2.13.5": - version: 2.13.5 - resolution: "@graphql-codegen/visitor-plugin-common@npm:2.13.5" +"@graphql-codegen/visitor-plugin-common@npm:2.12.1": + version: 2.12.1 + resolution: "@graphql-codegen/visitor-plugin-common@npm:2.12.1" dependencies: - "@graphql-codegen/plugin-helpers": ^3.1.1 + "@graphql-codegen/plugin-helpers": ^2.6.2 "@graphql-tools/optimize": ^1.3.0 "@graphql-tools/relay-operation-optimizer": ^6.5.0 "@graphql-tools/utils": ^8.8.0 auto-bind: ~4.0.0 - change-case-all: 1.0.15 + change-case-all: 1.0.14 dependency-graph: ^0.11.0 graphql-tag: ^2.11.0 parse-filepath: ^1.0.2 tslib: ~2.4.0 peerDependencies: graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 - checksum: 130c82c63d647b5af55ce9e463765228e7aebc9c50a3670590c7bb409c997e8fabd10987d63f175a51ad3e3847d18c59ac3af6dc620d529b7e974dd80f15118e + checksum: 846d1c698b12863a25d36da761ff7c1904405e6a8ead450f95658db407bc007582eb9328f4ba57fe33129ff3e6ebce2b55347125c0bf980370480ffd47299d2e languageName: node linkType: hard @@ -1586,18 +1562,18 @@ __metadata: languageName: node linkType: hard -"@graphql-tools/code-file-loader@npm:^7.3.13": - version: 7.3.15 - resolution: "@graphql-tools/code-file-loader@npm:7.3.15" +"@graphql-tools/code-file-loader@npm:^7.3.1": + version: 7.3.6 + resolution: "@graphql-tools/code-file-loader@npm:7.3.6" dependencies: - "@graphql-tools/graphql-tag-pluck": 7.4.2 - "@graphql-tools/utils": 9.1.3 + "@graphql-tools/graphql-tag-pluck": 7.3.6 + "@graphql-tools/utils": 8.12.0 globby: ^11.0.3 tslib: ^2.4.0 unixify: ^1.0.0 peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 - checksum: b86441caf5b9292df10e562adbe39c0383687dbfae9e262df3f2ee4227613958c23f5cbceda410865ebe0d04498eefb9429a0f5177a27ffefcd14df071b0b599 + checksum: a63b0c512d1a6b56fc6aebc933a779d8b155aedc060ee37fcdcacd909341024db9546d5f93b49ad676ee348e3303b048c9ef190263f3747e016f818a04c49133 languageName: node linkType: hard @@ -1617,34 +1593,34 @@ __metadata: languageName: node linkType: hard -"@graphql-tools/git-loader@npm:^7.2.13": - version: 7.2.15 - resolution: "@graphql-tools/git-loader@npm:7.2.15" +"@graphql-tools/git-loader@npm:^7.2.1": + version: 7.2.6 + resolution: "@graphql-tools/git-loader@npm:7.2.6" dependencies: - "@graphql-tools/graphql-tag-pluck": 7.4.2 - "@graphql-tools/utils": 9.1.3 + "@graphql-tools/graphql-tag-pluck": 7.3.6 + "@graphql-tools/utils": 8.12.0 is-glob: 4.0.3 micromatch: ^4.0.4 tslib: ^2.4.0 unixify: ^1.0.0 peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 - checksum: 143dd3802175dcb73440fd8ae6f697457fe88d7a35629b02a53df73accd1d0e917a125058882957afbfe18f4bfed9b05a3b380b3db153ac1a3b97ab4a9914041 + checksum: e1e2bd75889b01e71b00b6f7c8af3b9ad38759248cdd1c7ecc82db0484a902fd2176e20488550914d06c540f60dcc271e6c21937297ba6f6c627f5f4231a3920 languageName: node linkType: hard -"@graphql-tools/github-loader@npm:^7.3.20": - version: 7.3.22 - resolution: "@graphql-tools/github-loader@npm:7.3.22" +"@graphql-tools/github-loader@npm:^7.3.6": + version: 7.3.13 + resolution: "@graphql-tools/github-loader@npm:7.3.13" dependencies: "@ardatan/sync-fetch": 0.0.1 - "@graphql-tools/graphql-tag-pluck": 7.4.2 - "@graphql-tools/utils": 9.1.3 - "@whatwg-node/fetch": ^0.5.0 + "@graphql-tools/graphql-tag-pluck": 7.3.6 + "@graphql-tools/utils": 8.12.0 + "@whatwg-node/fetch": ^0.4.0 tslib: ^2.4.0 peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 - checksum: bbdedb4f70c5768cf1f8441360ee47301696820a579c68a856457c1c37717d3ec496503c2b684b4112977ed330e106f497d33de792e1f07133a28606a58aa58e + checksum: 8a76e89df9cd2f9fa2a4cdfe3912e1857e634104152403d51b0395eb65aea656a08c1b44236ab93d6157eae0074d5428b9f3404edb4569b88c5668b6f9006763 languageName: node linkType: hard @@ -1663,19 +1639,18 @@ __metadata: languageName: node linkType: hard -"@graphql-tools/graphql-tag-pluck@npm:7.4.2": - version: 7.4.2 - resolution: "@graphql-tools/graphql-tag-pluck@npm:7.4.2" +"@graphql-tools/graphql-tag-pluck@npm:7.3.6": + version: 7.3.6 + resolution: "@graphql-tools/graphql-tag-pluck@npm:7.3.6" dependencies: "@babel/parser": ^7.16.8 - "@babel/plugin-syntax-import-assertions": 7.20.0 "@babel/traverse": ^7.16.8 "@babel/types": ^7.16.8 - "@graphql-tools/utils": 9.1.3 + "@graphql-tools/utils": 8.12.0 tslib: ^2.4.0 peerDependencies: graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 - checksum: a1eb89f172688235dd629f9ec4ca0d338df704ef348592c0bcacb1a59e314799b76f14b4383cca7a010bf8990fbad2f277392e8e95d5b599a6e81a469aa6fac7 + checksum: 3543a41a3b84dc014ce5d0824c8275b8d8592e55bbcd8f955a0968a6b9c00c11d82d90b6bbb533f2d09f94e07d10ec70d53696470ee32fad00d055767909d164 languageName: node linkType: hard @@ -1706,21 +1681,7 @@ __metadata: languageName: node linkType: hard -"@graphql-tools/load@npm:7.8.0": - version: 7.8.0 - resolution: "@graphql-tools/load@npm:7.8.0" - dependencies: - "@graphql-tools/schema": 9.0.4 - "@graphql-tools/utils": 8.12.0 - p-limit: 3.1.0 - tslib: ^2.4.0 - peerDependencies: - graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 - checksum: 24ade442e13429d087ceac905cef4e6a14d0961e2b231adf91180a4d674de08ac6de66e6103c3e118b6ccf24065492bb69f5c99cb336e71a579ab382c8574791 - languageName: node - linkType: hard - -"@graphql-tools/load@npm:^7.5.5": +"@graphql-tools/load@npm:^7.5.5, @graphql-tools/load@npm:^7.7.1": version: 7.7.7 resolution: "@graphql-tools/load@npm:7.7.7" dependencies: @@ -1848,17 +1809,6 @@ __metadata: languageName: node linkType: hard -"@graphql-tools/utils@npm:9.1.3, @graphql-tools/utils@npm:^9.1.1": - version: 9.1.3 - resolution: "@graphql-tools/utils@npm:9.1.3" - dependencies: - tslib: ^2.4.0 - peerDependencies: - graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 - checksum: 3b5acd41ae939e2811f496b1676e6219be61a95f3e502bb3783542a67e7703d7709d4ae87fc9deb7284280aea687fb4b0e596f538d7f1cdf5a8827a2952ee994 - languageName: node - linkType: hard - "@graphql-tools/wrap@npm:9.2.1": version: 9.2.1 resolution: "@graphql-tools/wrap@npm:9.2.1" @@ -3516,6 +3466,23 @@ __metadata: languageName: node linkType: hard +"@whatwg-node/fetch@npm:^0.3.0": + version: 0.3.2 + resolution: "@whatwg-node/fetch@npm:0.3.2" + dependencies: + "@peculiar/webcrypto": ^1.4.0 + abort-controller: ^3.0.0 + busboy: ^1.6.0 + event-target-polyfill: ^0.0.3 + form-data-encoder: ^1.7.1 + formdata-node: ^4.3.1 + node-fetch: ^2.6.7 + undici: ^5.8.0 + web-streams-polyfill: ^3.2.0 + checksum: d9cb1b1293694edf0d61889512e5b5a0b8b69db2cf8c4cca4acdbbe652f899742456d10954312ef96a8f7257a898d6275b50df03cc481e5a97740cb301930892 + languageName: node + linkType: hard + "@whatwg-node/fetch@npm:^0.4.0": version: 0.4.3 resolution: "@whatwg-node/fetch@npm:0.4.3" @@ -3533,22 +3500,6 @@ __metadata: languageName: node linkType: hard -"@whatwg-node/fetch@npm:^0.5.0": - version: 0.5.3 - resolution: "@whatwg-node/fetch@npm:0.5.3" - dependencies: - "@peculiar/webcrypto": ^1.4.0 - abort-controller: ^3.0.0 - busboy: ^1.6.0 - form-data-encoder: ^1.7.1 - formdata-node: ^4.3.1 - node-fetch: ^2.6.7 - undici: ^5.12.0 - web-streams-polyfill: ^3.2.0 - checksum: 73087779b3b0e70d0abf8b2a5d82919c29c26f8062e16db0cad413fe45c7b58c3c12cc2bcd5942aebdfdc4feee97b01cf1ff6c5d92d9507a140afdcafa410b12 - languageName: node - linkType: hard - "@wry/context@npm:^0.6.0": version: 0.6.1 resolution: "@wry/context@npm:0.6.1" @@ -3736,7 +3687,7 @@ __metadata: languageName: node linkType: hard -"ansi-escapes@npm:^4.2.1, ansi-escapes@npm:^4.3.0, ansi-escapes@npm:^4.3.2": +"ansi-escapes@npm:^4.2.1, ansi-escapes@npm:^4.3.0, ansi-escapes@npm:^4.3.1, ansi-escapes@npm:^4.3.2": version: 4.3.2 resolution: "ansi-escapes@npm:4.3.2" dependencies: @@ -4918,9 +4869,9 @@ __metadata: languageName: node linkType: hard -"change-case-all@npm:1.0.15": - version: 1.0.15 - resolution: "change-case-all@npm:1.0.15" +"change-case-all@npm:1.0.14": + version: 1.0.14 + resolution: "change-case-all@npm:1.0.14" dependencies: change-case: ^4.1.2 is-lower-case: ^2.0.2 @@ -4932,7 +4883,7 @@ __metadata: title-case: ^3.0.3 upper-case: ^2.0.2 upper-case-first: ^2.0.2 - checksum: e1dabdcd8447a3690f3faf15f92979dfbc113109b50916976e1d5e518e6cfdebee4f05f54d0ca24fb79a4bf835185b59ae25e967bb3dc10bd236a775b19ecc52 + checksum: 6ff893e005e1bf115cc2969cc5ca3610f7c6ece9e90b7927ed12c980c7d3ea9a565150d246c6dba0fee21aaacbd38d69b98a4670d96b892c76f66e46616506d3 languageName: node linkType: hard @@ -5414,18 +5365,6 @@ __metadata: languageName: node linkType: hard -"cosmiconfig-typescript-loader@npm:4.1.1": - version: 4.1.1 - resolution: "cosmiconfig-typescript-loader@npm:4.1.1" - peerDependencies: - "@types/node": "*" - cosmiconfig: ">=7" - ts-node: ">=10" - typescript: ">=3" - checksum: a774961868f0406d0fd75e448c2e1a0ddb95de27d477fa325a37369a2cbd892cf4d639a109082cd886840dea7707ea9bed5c38a468b52de18400c4f1d495d35a - languageName: node - linkType: hard - "cosmiconfig-typescript-loader@npm:^4.0.0": version: 4.0.0 resolution: "cosmiconfig-typescript-loader@npm:4.0.0" @@ -6584,6 +6523,9 @@ __metadata: dependencies: "@apollo/client": ^3.7.0 "@fontsource/montserrat": ^4.5.12 + "@graphql-codegen/cli": 2.12.0 + "@graphql-codegen/typescript": 2.7.3 + "@graphql-codegen/typescript-operations": 2.5.3 "@tanstack/react-query": ^4.14.1 "@testing-library/jest-dom": ^5.16.5 "@testing-library/react": ^13.4.0 @@ -6598,8 +6540,10 @@ __metadata: "@types/styled-components": ^5.1.25 "@typescript-eslint/eslint-plugin": ^5.37.0 "@typescript-eslint/parser": ^5.37.0 + apollo: ^2.34.0 axios: ^1.1.3 dayjs: ^1.11.2 + dotenv-cli: ^6.0.0 eslint: 8.23.1 eslint-config-airbnb: ^19.0.4 eslint-config-airbnb-typescript: ^17.0.0 @@ -6608,7 +6552,6 @@ __metadata: eslint-plugin-prettier: ^4.2.1 eslint-plugin-testing-library: ^5.6.4 eslint-plugin-unicorn: ^43.0.2 - gql: "*" husky: ^7.0.4 jest: ^29.0.3 jest-environment-jsdom: ^29.0.3 @@ -7380,18 +7323,6 @@ __metadata: languageName: node linkType: hard -"gql@*, gql@workspace:packages/graphql": - version: 0.0.0-use.local - resolution: "gql@workspace:packages/graphql" - dependencies: - "@graphql-codegen/cli": ^2.16.1 - "@graphql-codegen/typescript": ^2.8.5 - "@graphql-codegen/typescript-operations": ^2.5.10 - apollo: ^2.34.0 - dotenv-cli: ^6.0.0 - languageName: unknown - linkType: soft - "graceful-fs@npm:4.1.15": version: 4.1.15 resolution: "graceful-fs@npm:4.1.15" @@ -7413,9 +7344,9 @@ __metadata: languageName: node linkType: hard -"graphql-config@npm:4.3.6": - version: 4.3.6 - resolution: "graphql-config@npm:4.3.6" +"graphql-config@npm:^4.3.5": + version: 4.3.5 + resolution: "graphql-config@npm:4.3.5" dependencies: "@graphql-tools/graphql-file-loader": ^7.3.7 "@graphql-tools/json-file-loader": ^7.3.7 @@ -7432,7 +7363,7 @@ __metadata: tslib: ^2.4.0 peerDependencies: graphql: ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 - checksum: 528f69c2c3620b51fe3d609e65d13861bdc11ccfdfcb75d476f758dc6e3047c78117a260f69b5e7efa5f0b66da1980c352a8b4053532ffb3018377f784331e21 + checksum: 0b8ca47263b12b228db72d9abb663ab8e02e01c677d9ffe08f7be651617fdc93ff2ff6c342465544df43dc4d507293a66b8fc2b8237c2628ebdbc5c74311b1d8 languageName: node linkType: hard @@ -9757,20 +9688,13 @@ __metadata: languageName: node linkType: hard -"minimist@npm:^1.2.0, minimist@npm:^1.2.3, minimist@npm:^1.2.6": +"minimist@npm:^1.2.0, minimist@npm:^1.2.3, minimist@npm:^1.2.5, minimist@npm:^1.2.6": version: 1.2.6 resolution: "minimist@npm:1.2.6" checksum: d15428cd1e11eb14e1233bcfb88ae07ed7a147de251441d61158619dfb32c4d7e9061d09cab4825fdee18ecd6fce323228c8c47b5ba7cd20af378ca4048fb3fb languageName: node linkType: hard -"minimist@npm:^1.2.5": - version: 1.2.7 - resolution: "minimist@npm:1.2.7" - checksum: 7346574a1038ca23c32e02252f603801f09384dd1d78b69a943a4e8c2c28730b80e96193882d3d3b22a063445f460e48316b29b8a25addca2d7e5e8f75478bec - languageName: node - linkType: hard - "minipass-collect@npm:^1.0.2": version: 1.0.2 resolution: "minipass-collect@npm:1.0.2" @@ -12335,13 +12259,6 @@ __metadata: languageName: node linkType: hard -"shell-quote@npm:^1.7.3": - version: 1.7.4 - resolution: "shell-quote@npm:1.7.4" - checksum: 2874ea9c1a7c3ebfc9ec5734a897e16533d0d06f2e4cddc22ba3d1cab5cdc07d0f825364c1b1e39abe61236f44d8e60e933c7ad7349ce44de4f5dddc7b4354e9 - languageName: node - linkType: hard - "shelljs@npm:0.8.5": version: 0.8.5 resolution: "shelljs@npm:0.8.5" @@ -13590,15 +13507,6 @@ __metadata: languageName: node linkType: hard -"undici@npm:^5.12.0": - version: 5.14.0 - resolution: "undici@npm:5.14.0" - dependencies: - busboy: ^1.6.0 - checksum: 7a076e44d84b25844b4eb657034437b8b9bb91f17d347de474fdea1d4263ce7ae9406db79cd30de5642519277b4893f43073258bcc8fed420b295da3fdd11b26 - languageName: node - linkType: hard - "undici@npm:^5.8.0": version: 5.10.0 resolution: "undici@npm:5.10.0"