Replace all usages of graphql-tag

exchanges/auth/package.json

@@ -58,8 +58,7 @@
     "graphql": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
   },
   "devDependencies": {
-    "graphql": "^15.4.0",
-    "graphql-tag": "^2.10.1"
+    "graphql": "^15.4.0"
   },
   "publishConfig": {
     "access": "public"

exchanges/execute/package.json

@@ -58,8 +58,7 @@
     "graphql": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
   },
   "devDependencies": {
-    "graphql": "^15.4.0",
-    "graphql-tag": "^2.10.1"
+    "graphql": "^15.4.0"
   },
   "publishConfig": {
     "access": "public"

exchanges/graphcache/package.json

@@ -72,8 +72,7 @@
     "graphql": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
   },
   "devDependencies": {
-    "graphql": "^15.4.0",
-    "graphql-tag": "^2.10.1"
+    "graphql": "^15.4.0"
   },
   "publishConfig": {
     "access": "public"

exchanges/graphcache/src/ast/traversal.test.ts

@@ -1,4 +1,4 @@
-import gql from 'graphql-tag';
+import { gql } from '@urql/core';
 import { getSelectionSet } from './node';
 
 import { getMainOperation, shouldInclude } from './traversal';

exchanges/graphcache/src/ast/variables.test.ts

@@ -1,4 +1,4 @@
-import gql from 'graphql-tag';
+import { gql } from '@urql/core';
 import { getMainOperation } from './traversal';
 import { normalizeVariables, filterVariables } from './variables';
 

exchanges/graphcache/src/cacheExchange.test.ts

@@ -1,6 +1,5 @@
-import gql from 'graphql-tag';
-
 import {
+  gql,
   createClient,
   ExchangeIO,
   Operation,

exchanges/graphcache/src/extras/relayPagination.test.ts

@@ -1,4 +1,4 @@
-import gql from 'graphql-tag';
+import { gql } from '@urql/core';
 import { query, write } from '../operations';
 import { Store } from '../store';
 import { relayPagination } from './relayPagination';

exchanges/graphcache/src/extras/simplePagination.test.ts

@@ -1,4 +1,4 @@
-import gql from 'graphql-tag';
+import { gql } from '@urql/core';
 import { query, write } from '../operations';
 import { Store } from '../store';
 import { simplePagination } from './simplePagination';

exchanges/graphcache/src/offlineExchange.test.ts

@@ -1,12 +1,12 @@
 import {
+  gql,
   createClient,
   ExchangeIO,
   Operation,
   OperationResult,
   formatDocument,
 } from '@urql/core';
 
-import gql from 'graphql-tag';
 import { pipe, map, makeSubject, tap, publish } from 'wonka';
 import { offlineExchange } from './offlineExchange';
 

exchanges/graphcache/src/operations/query.test.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 
-import gql from 'graphql-tag';
+import { gql } from '@urql/core';
 import { minifyIntrospectionQuery } from '@urql/introspection';
 
 import { Store } from '../store';

exchanges/graphcache/src/operations/write.test.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 
-import gql from 'graphql-tag';
+import { gql } from '@urql/core';
 import { minifyIntrospectionQuery } from '@urql/introspection';
 
 import { write } from './write';

exchanges/graphcache/src/store/store.test.ts

@@ -1,8 +1,7 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 
-import gql from 'graphql-tag';
 import { minifyIntrospectionQuery } from '@urql/introspection';
-import { maskTypename } from '@urql/core';
+import { gql, maskTypename } from '@urql/core';
 import { mocked } from 'ts-jest/utils';
 
 import { Data, StorageAdapter } from '../types';

exchanges/graphcache/src/test-utils/examples-1.test.ts

@@ -1,4 +1,4 @@
-import gql from 'graphql-tag';
+import { gql } from '@urql/core';
 import { query, write, writeOptimistic } from '../operations';
 import * as InMemoryData from '../store/data';
 import { Store } from '../store';

exchanges/graphcache/src/test-utils/examples-2.test.ts

@@ -1,4 +1,4 @@
-import gql from 'graphql-tag';
+import { gql } from '@urql/core';
 import { query, write } from '../operations';
 import { Store } from '../store';
 

exchanges/graphcache/src/test-utils/examples-3.test.ts

@@ -1,4 +1,4 @@
-import gql from 'graphql-tag';
+import { gql } from '@urql/core';
 import { query, write } from '../operations';
 import { Store } from '../store';
 

exchanges/graphcache/src/test-utils/suite.test.ts

@@ -1,5 +1,5 @@
 import { DocumentNode } from 'graphql';
-import gql from 'graphql-tag';
+import { gql } from '@urql/core';
 import { query, write } from '../operations';
 import { Store } from '../store';
 

exchanges/multipart-fetch/package.json

@@ -57,8 +57,7 @@
     "graphql": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
   },
   "devDependencies": {
-    "graphql": "^15.4.0",
-    "graphql-tag": "^2.10.1"
+    "graphql": "^15.4.0"
   },
   "publishConfig": {
     "access": "public"

exchanges/multipart-fetch/src/test-utils.ts

@@ -1,10 +1,10 @@
 import {
+  gql,
   GraphQLRequest,
   OperationContext,
   Operation,
   makeOperation,
 } from '@urql/core';
-import gql from 'graphql-tag';
 
 const context: OperationContext = {
   fetchOptions: {

exchanges/persisted-fetch/package.json

@@ -56,8 +56,7 @@
     "graphql": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
   },
   "devDependencies": {
-    "graphql": "^15.4.0",
-    "graphql-tag": "^2.10.1"
+    "graphql": "^15.4.0"
   },
   "publishConfig": {
     "access": "public"

exchanges/persisted-fetch/src/test-utils.ts

@@ -1,10 +1,10 @@
 import {
+  gql,
   GraphQLRequest,
   OperationContext,
   Operation,
   makeOperation,
 } from '@urql/core';
-import gql from 'graphql-tag';
 
 const context: OperationContext = {
   fetchOptions: {

exchanges/populate/package.json

@@ -56,8 +56,7 @@
     "graphql": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
   },
   "devDependencies": {
-    "graphql": "^15.4.0",
-    "graphql-tag": "^2.10.1"
+    "graphql": "^15.4.0"
   },
   "publishConfig": {
     "access": "public"

exchanges/populate/src/populateExchange.test.ts

@@ -7,9 +7,8 @@ import {
   ASTKindToNode,
 } from 'graphql';
 
-import gql from 'graphql-tag';
 import { fromValue, pipe, fromArray, toArray } from 'wonka';
-import { Client, Operation, OperationContext, makeOperation } from '@urql/core';
+import { gql, Client, Operation, OperationContext, makeOperation } from '@urql/core';
 
 import { populateExchange } from './populateExchange';
 

exchanges/refocus/src/refocusExchange.test.ts

@@ -1,13 +1,13 @@
-import gql from 'graphql-tag';
-
 import { pipe, map, makeSubject, publish, tap } from 'wonka';
 
 import {
+  gql,
   createClient,
   Operation,
   OperationResult,
   ExchangeIO,
 } from '@urql/core';
+
 import { refocusExchange } from './refocusExchange';
 
 const dispatchDebug = jest.fn();

exchanges/request-policy/src/requestPolicyExchange.test.ts

@@ -1,13 +1,13 @@
-import gql from 'graphql-tag';
-
 import { pipe, map, makeSubject, publish, tap } from 'wonka';
 
 import {
+  gql,
   createClient,
   Operation,
   OperationResult,
   ExchangeIO,
 } from '@urql/core';
+
 import { requestPolicyExchange } from './requestPolicyExchange';
 
 const dispatchDebug = jest.fn();

exchanges/retry/src/retryExchange.test.ts

@@ -1,13 +1,13 @@
-import gql from 'graphql-tag';
-
 import { pipe, map, makeSubject, publish, tap } from 'wonka';
 
 import {
+  gql,
   createClient,
   Operation,
   OperationResult,
   ExchangeIO,
 } from '@urql/core';
+
 import { retryExchange } from './retryExchange';
 
 const dispatchDebug = jest.fn();

package.json

@@ -74,7 +74,6 @@
     "execa": "^4.1.0",
     "glob": "^7.1.6",
     "graphql": "^15.4.0",
-    "graphql-tag": "^2.11.0",
     "husky": "^4.3.0",
     "invariant": "^2.2.4",
     "jest": "^26.6.3",

packages/core/src/client.test.ts

@@ -1,9 +1,9 @@
 import { print } from 'graphql';
-import gql from 'graphql-tag';
 
 /** NOTE: Testing in this file is designed to test both the client and its interaction with default Exchanges */
 
 import { Source, map, pipe, subscribe, filter, toArray, tap } from 'wonka';
+import { gql } from './gql';
 import { Exchange, Operation, OperationResult } from './types';
 import { createClient } from './client';
 import { queryOperation } from './test-utils';

packages/introspection/package.json

@@ -48,8 +48,7 @@
     "preset": "../../scripts/jest/preset"
   },
   "devDependencies": {
-    "graphql": "^15.4.0",
-    "graphql-tag": "^2.10.1"
+    "graphql": "^15.4.0"
   },
   "peerDependencies": {
     "graphql": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"

packages/next-urql/package.json

@@ -42,7 +42,6 @@
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-16": "^1.15.2",
     "graphql": "^15.4.0",
-    "graphql-tag": "^2.10.3",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",
     "react-is": "^17.0.1"

packages/preact-urql/package.json

@@ -53,7 +53,6 @@
   "devDependencies": {
     "@testing-library/preact": "^2.0.0",
     "graphql": "^15.4.0",
-    "graphql-tag": "^2.10.1",
     "preact": "^10.5.5"
   },
   "peerDependencies": {

packages/preact-urql/src/hooks/useMutation.test.tsx

@@ -1,7 +1,7 @@
 import { FunctionalComponent as FC, h } from 'preact';
 import { render, cleanup, act } from '@testing-library/preact';
 import { print } from 'graphql';
-import gql from 'graphql-tag';
+import { gql } from '@urql/core';
 import { useMutation } from './useMutation';
 import { fromValue, delay, pipe } from 'wonka';
 import { Provider } from '../context';
@@ -62,7 +62,7 @@ describe('useMutation', () => {
     const call = client.executeMutation.mock.calls[0][0];
     expect(state).toHaveProperty('fetching', true);
     expect(client.executeMutation).toBeCalledTimes(1);
-    expect(print(call.query)).toBe(print(gql([props.query])));
+    expect(print(call.query)).toBe(print(gql(props.query)));
     expect(call).toHaveProperty('variables', vars);
   });
 

packages/react-urql/package.json

@@ -47,7 +47,6 @@
     "@types/react": "^16.9.56",
     "@types/react-test-renderer": "^16.9.3",
     "graphql": "^15.4.0",
-    "graphql-tag": "^2.10.1",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",
     "react-is": "^17.0.1",

packages/react-urql/src/hooks/useMutation.test.tsx

@@ -16,7 +16,7 @@ jest.mock('../context', () => {
 });
 
 import { print } from 'graphql';
-import gql from 'graphql-tag';
+import { gql } from '@urql/core';
 import React, { FC } from 'react';
 import renderer, { act } from 'react-test-renderer';
 
@@ -89,7 +89,7 @@ describe('on execute', () => {
     });
 
     const call = client.executeMutation.mock.calls[0][0];
-    expect(print(call.query)).toBe(print(gql([props.query])));
+    expect(print(call.query)).toBe(print(gql(props.query)));
   });
 
   it('calls executeMutation with variables', () => {

packages/react-urql/src/hooks/useRequest.test.ts

@@ -1,4 +1,4 @@
-import gql from 'graphql-tag';
+import { gql } from '@urql/core';
 import { renderHook } from '@testing-library/react-hooks';
 import { useRequest } from './useRequest';
 

packages/react-urql/src/test-utils/ssr.test.tsx

@@ -1,9 +1,9 @@
 import React from 'react';
-import gql from 'graphql-tag';
 import prepass from 'react-ssr-prepass';
 import { never, publish, filter, delay, pipe, map } from 'wonka';
 
 import {
+  gql,
   createClient,
   Exchange,
   dedupExchange,

yarn.lock

@@ -8123,11 +8123,6 @@ grapheme-splitter@^1.0.4:
   resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
   integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
 
-graphql-tag@^2.10.1, graphql-tag@^2.10.3, graphql-tag@^2.11.0:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.11.0.tgz#1deb53a01c46a7eb401d6cb59dec86fa1cccbffd"
-  integrity sha512-VmsD5pJqWJnQZMUeRwrDhfgoyqcfwEkvtpANqcoUG8/tOLkwNgU9mzub/Mc78OJMhHjx7gfAMTxzdG43VGg3bA==
-
 graphql@^15.1.0, graphql@^15.4.0:
   version "15.4.0"
   resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.4.0.tgz#e459dea1150da5a106486ba7276518b5295a4347"