From 9e7e96b2a27dee99ee17b071edf23a4096102ee0 Mon Sep 17 00:00:00 2001 From: "mirlan.maksitaliev" Date: Fri, 5 Jun 2020 13:00:41 +0600 Subject: [PATCH] refactor(ott-67): removed gql config --- .eslintignore | 4 ---- codegen.yml | 22 ---------------------- commitlint.config.js | 2 +- package.json | 12 ------------ src/api/operations/User/queries.graphql | 8 -------- src/api/operations/User/queries.tsx | 3 --- src/config/routes.tsx | 2 +- src/index.tsx | 11 +---------- src/react-app-env.d.ts | 1 + src/{api => }/requests/index.tsx | 0 src/{api => }/requests/login.tsx | 0 src/serviceWorker.ts | 1 + src/types/index.tsx | 3 --- 13 files changed, 5 insertions(+), 64 deletions(-) delete mode 100644 .eslintignore delete mode 100644 codegen.yml delete mode 100644 src/api/operations/User/queries.graphql delete mode 100644 src/api/operations/User/queries.tsx rename src/{api => }/requests/index.tsx (100%) rename src/{api => }/requests/login.tsx (100%) delete mode 100644 src/types/index.tsx diff --git a/.eslintignore b/.eslintignore deleted file mode 100644 index ff53e248..00000000 --- a/.eslintignore +++ /dev/null @@ -1,4 +0,0 @@ -src/types/* -src/api/operations/**/*.tsx -src/react-app-env.d.ts -src/serviceWorker.ts diff --git a/codegen.yml b/codegen.yml deleted file mode 100644 index 7801e848..00000000 --- a/codegen.yml +++ /dev/null @@ -1,22 +0,0 @@ -overwrite: true -schema: '' -documents: src/api/operations/**/*.graphql -generates: - src/types/index.tsx: - plugins: - - typescript - src/: - preset: - near-operation-file - presetConfig: - extension: .tsx - baseTypesPath: types - plugins: - - typescript-operations - - typescript-react-apollo - config: - withComponent: false - withHOC: false - withHooks: true -config: - typesPrefix: T diff --git a/commitlint.config.js b/commitlint.config.js index c0dfabc3..df2285be 100644 --- a/commitlint.config.js +++ b/commitlint.config.js @@ -2,7 +2,7 @@ const Configuration = { extends: ['@commitlint/config-conventional'], /** Any rules defined here will override rules from - * @commitlint/config-conventional **/ + * @commitlint/config-conventional */ rules: { 'body-max-length': [2, 'always', 120], 'body-min-length': [2, 'always', 3], diff --git a/package.json b/package.json index 226771b8..4fdba62a 100644 --- a/package.json +++ b/package.json @@ -3,22 +3,16 @@ "version": "0.1.0", "private": true, "scripts": { - "prestart ": "yarn generate", "start": "react-scripts start", "build": "GENERATE_SOURCEMAP=false react-scripts build && gzipper --verbose ./build", "test": "react-scripts test --testMatch '**/__tests__/*' --passWithNoTests --watchAll=false", "test:watch": "react-scripts test --testMatch '**/__tests__/*'", "eject": "react-scripts eject", - "generate": "graphql-codegen --config codegen.yml", "lint": "eslint 'src/**/*.{ts,tsx}'", "storybook": "start-storybook -p 9009 -s public", "build-storybook": "build-storybook -s public" }, "dependencies": { - "@apollo/react-common": "^3.1.4", - "@apollo/react-hooks": "^3.1.5", - "apollo-boost": "^0.4.9", - "graphql": "^15.0.0", "lodash": "^4.17.15", "react": "^16.13.1", "react-dom": "^16.13.1", @@ -27,12 +21,6 @@ "devDependencies": { "@commitlint/cli": "^8.3.5", "@commitlint/config-conventional": "^8.3.4", - "@graphql-codegen/cli": "1.15.0", - "@graphql-codegen/import-types-preset": "^1.15.0", - "@graphql-codegen/near-operation-file-preset": "^1.15.0", - "@graphql-codegen/typescript": "1.15.0", - "@graphql-codegen/typescript-operations": "1.15.0", - "@graphql-codegen/typescript-react-apollo": "1.15.0", "@storybook/addon-actions": "^5.3.19", "@storybook/addon-docs": "^5.3.19", "@storybook/addon-links": "^5.3.19", diff --git a/src/api/operations/User/queries.graphql b/src/api/operations/User/queries.graphql deleted file mode 100644 index 14ec1c2c..00000000 --- a/src/api/operations/User/queries.graphql +++ /dev/null @@ -1,8 +0,0 @@ -query User { - __schema { - types { - name - kind - } - } -} diff --git a/src/api/operations/User/queries.tsx b/src/api/operations/User/queries.tsx deleted file mode 100644 index bbbcc5b7..00000000 --- a/src/api/operations/User/queries.tsx +++ /dev/null @@ -1,3 +0,0 @@ -// autgenerated using https://graphql-code-generator.com/ - -export {} diff --git a/src/config/routes.tsx b/src/config/routes.tsx index 2f03b423..7cc14d50 100644 --- a/src/config/routes.tsx +++ b/src/config/routes.tsx @@ -1,2 +1,2 @@ export const API_ROOT = '' -export const GRAPHQL = `${API_ROOT}/graphql` +export const DATA_URL = `${API_ROOT}/data` diff --git a/src/index.tsx b/src/index.tsx index 93c34645..519bd6e4 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -1,22 +1,13 @@ import React from 'react' import ReactDOM from 'react-dom' -import ApolloClient from 'apollo-boost' -import { ApolloProvider } from '@apollo/react-hooks' -import { GRAPHQL } from 'config' import { App } from 'features/App' import * as serviceWorker from './serviceWorker' -const client = new ApolloClient({ - uri: GRAPHQL, -}) - ReactDOM.render( - - - + , document.getElementById('root'), ) diff --git a/src/react-app-env.d.ts b/src/react-app-env.d.ts index 6431bc5f..d3e30f32 100644 --- a/src/react-app-env.d.ts +++ b/src/react-app-env.d.ts @@ -1 +1,2 @@ +// eslint-disable-next-line spaced-comment /// diff --git a/src/api/requests/index.tsx b/src/requests/index.tsx similarity index 100% rename from src/api/requests/index.tsx rename to src/requests/index.tsx diff --git a/src/api/requests/login.tsx b/src/requests/login.tsx similarity index 100% rename from src/api/requests/login.tsx rename to src/requests/login.tsx diff --git a/src/serviceWorker.ts b/src/serviceWorker.ts index 425d17b1..5656739b 100644 --- a/src/serviceWorker.ts +++ b/src/serviceWorker.ts @@ -1,3 +1,4 @@ +/* eslint-disable */ // This optional code is used to register a service worker. // register() is not called by default. diff --git a/src/types/index.tsx b/src/types/index.tsx deleted file mode 100644 index bbbcc5b7..00000000 --- a/src/types/index.tsx +++ /dev/null @@ -1,3 +0,0 @@ -// autgenerated using https://graphql-code-generator.com/ - -export {}