fix: resolve upstream conflicts

Author: acao

package.json

@@ -73,11 +73,11 @@
     "@commitlint/config-lerna-scopes": "^8.1.0",
     "@strictsoftware/typedoc-plugin-monorepo": "^0.2.1",
     "@testing-library/jest-dom": "^5.1.1",
-    "@types/codemirror": "^0.0.84",
+    "@types/codemirror": "^0.0.85",
     "@types/fetch-mock": "^7.3.2",
     "@types/jest": "^25.1.1",
     "@types/node": "^13.7.1",
-    "@typescript-eslint/eslint-plugin": "^2.16.0",
+    "@typescript-eslint/eslint-plugin": "^2.19.2",
     "@typescript-eslint/parser": "^2.18.0",
     "babel-eslint": "^10.0.1",
     "babel-jest": "^25.1.0",
@@ -86,17 +86,17 @@
     "conventional-changelog-conventionalcommits": "^4.1.0",
     "copy": "^0.3.2",
     "cross-env": "^7.0.0",
-    "cypress": "^4.0.1",
+    "cypress": "^4.0.2",
     "eslint": "^6.8.0",
     "eslint-config-prettier": "6.10.0",
     "eslint-plugin-babel": "5.3.0",
-    "eslint-plugin-cypress": "^2.7.0",
+    "eslint-plugin-cypress": "^2.10.1",
     "eslint-plugin-flowtype": "4.6.0",
     "eslint-plugin-import": "^2.20.0",
     "eslint-plugin-jest": "^23.1.1",
     "eslint-plugin-prefer-object-spread": "1.2.1",
-    "eslint-plugin-react": "7.18.1",
-    "fetch-mock": "^6.0.0",
+    "eslint-plugin-react": "7.18.3",
+    "fetch-mock": "6.5.2",
     "flow-bin": "^0.118.0",
     "graphql": "^14.6.0",
     "husky": "^4.0.7",
@@ -110,7 +110,7 @@
     "prettier": "^1.18.2",
     "rimraf": "^3.0.2",
     "ts-jest": "^25.2.0",
-    "typedoc": "^0.15.6",
+    "typedoc": "^0.16.9",
     "typescript": "^3.6.3"
   }
 }

packages/graphql-language-service-types/src/index.ts

@@ -35,8 +35,6 @@ export type Maybe<T> = T | null | undefined;
 export { GraphQLConfig, GraphQLProjectConfig };
 import { GraphQLConfig, GraphQLProjectConfig } from 'graphql-config';
 
-export type Maybe<T> = null | T;
-
 export type TokenPattern = string | ((char: string) => boolean) | RegExp;
 
 export interface CharacterStream {