From 2bf678534920a1b8bac55cfc2371d7dc34efae8c Mon Sep 17 00:00:00 2001
From: hwillson <hugh@octonary.com>
Date: Tue, 4 Feb 2020 05:59:38 -0500
Subject: [PATCH] Remove graphql-tag type overrides

The `graphql-tag` declaration file has been updated in
https://github.com/apollographql/graphql-tag/pull/285 so we no
longer need our own overrides.
---
 package-lock.json          |  6 +++---
 package.json               |  2 +-
 src/types/graphql-tag.d.ts | 16 ----------------
 tsconfig.json              |  6 +-----
 4 files changed, 5 insertions(+), 25 deletions(-)
 delete mode 100644 src/types/graphql-tag.d.ts

diff --git a/package-lock.json b/package-lock.json
index 61fd3cd7166..1e2ab29621b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2553,9 +2553,9 @@
       }
     },
     "graphql-tag": {
-      "version": "2.10.1",
-      "resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.10.1.tgz",
-      "integrity": "sha512-jApXqWBzNXQ8jYa/HLkZJaVw9jgwNqZkywa2zfFn16Iv1Zb7ELNHkJaXHR7Quvd5SIGsy6Ny7SUKATgnu05uEg=="
+      "version": "2.10.2",
+      "resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.10.2.tgz",
+      "integrity": "sha512-7rUuJkVGyedBiVJ/hPaxndDnzxANUZ+QhTu0KUzgTGtP3ibY/hSUl9em21aVh5BNMJsmMc4nVuOTBoiAUJ2xBQ=="
     },
     "growly": {
       "version": "1.3.0",
diff --git a/package.json b/package.json
index ba29fa580ef..a822bde795c 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
     "@types/zen-observable": "^0.8.0",
     "@wry/equality": "^0.1.9",
     "fast-json-stable-stringify": "^2.0.0",
-    "graphql-tag": "^2.10.1",
+    "graphql-tag": "^2.10.2",
     "optimism": "^0.11.5",
     "symbol-observable": "^1.2.0",
     "ts-invariant": "^0.4.4",
diff --git a/src/types/graphql-tag.d.ts b/src/types/graphql-tag.d.ts
deleted file mode 100644
index 6905b046853..00000000000
--- a/src/types/graphql-tag.d.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// The `graphql-tag` package currently ships with types that aren't quite
-// representative of how the package is setup, and its exports are handled.
-// This type file is intended to better reflect how the package is setup,
-// but should be considered temporary. At some point `graphql-tag` will
-// be fully updated to use Typescript, and these discrepancies will be fixed.
-
-declare module 'graphql-tag' {
-  function gql(literals: string[], ...placeholders: any[]): any;
-  namespace gql {
-    export function resetCaches(): void;
-    export function disableFragmentWarnings(): void;
-    export function enableExperimentalFragmentVariables(): void;
-    export function disableExperimentalFragmentVariables(): void;
-  }
-  export default gql;
-}
diff --git a/tsconfig.json b/tsconfig.json
index 484ac53fa1d..b8a2b1d354a 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -15,11 +15,7 @@
     "esModuleInterop": true,
     "outDir": "./dist",
     "lib": ["es2015", "esnext.asynciterable", "dom"],
-    "jsx": "react",
-    "typeRoots": [
-      "src/types",
-      "node_modules/@types"
-    ]
+    "jsx": "react"
   },
   "include": ["src/**/*.ts"],
   "exclude": [