Merge branch 'master' into madshall-patch-1

.github/workflows/ci.yml

@@ -25,6 +25,6 @@ jobs:
       - run: npm run test:coverage -- --silent
       - run: npm run check-types
       - run: npm run build
-      - uses: coverallsapp/github-action@v2.2.1
+      - uses: coverallsapp/github-action@v2.3.0
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}

examples/create-react-app/package.json

@@ -8,7 +8,7 @@
   "dependencies": {
     "graphql-hooks": "^7.0.0",
     "graphql-hooks-memcache": "^3.2.0",
-    "json-graphql-server": "^2.3.1",
+    "json-graphql-server": "^3.0.1",
     "prop-types": "^15.7.2",
     "react": "^18.0.0",
     "react-app-polyfill": "^2.0.0",

examples/fastify-ssr/package.json

@@ -24,7 +24,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@fastify/static": "^6.5.0",
+    "@fastify/static": "^7.0.4",
     "babel-plugin-dynamic-import-node": "^2.2.0",
     "fastify": "^4.2.0",
     "graphql-hooks": "^7.0.0",
@@ -44,7 +44,7 @@
     "@babel/preset-react": "^7.0.0",
     "babel-loader": "^9.1.0",
     "nodemon": "^3.0.1",
-    "pino-pretty": "^10.0.0",
+    "pino-pretty": "^11.1.0",
     "webpack": "^5.64.4",
     "webpack-cli": "^5.0.1",
     "webpack-manifest-plugin": "^4.0.2",

examples/persisted-queries/server/package.json

@@ -11,7 +11,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@fastify/cors": "^8.0.0",
+    "@fastify/cors": "^9.0.1",
     "apollo-server": "^3.6.7",
     "fastify": "^4.2.0",
     "graphql": "^16.6.0",

examples/subscription/package.json

@@ -15,14 +15,14 @@
     "build": "webpack"
   },
   "dependencies": {
-    "@fastify/cors": "^8.0.0",
-    "@fastify/static": "^6.5.0",
+    "@fastify/cors": "^9.0.1",
+    "@fastify/static": "^7.0.4",
     "babel-plugin-dynamic-import-node": "^2.2.0",
     "fastify": "^4.2.0",
     "graphql": "^16.6.0",
     "graphql-hooks": "^7.0.0",
     "graphql-hooks-memcache": "^3.2.0",
-    "lowdb": "^6.0.1",
+    "lowdb": "^7.0.1",
     "mercurius": "^14.0.0",
     "mqemitter-redis": "^5.0.0",
     "react": "^18.0.0",

examples/typescript/src/gql/fragment-masking.ts

@@ -1,3 +1,4 @@
+/* eslint-disable */
 import { ResultOf, DocumentTypeDecoration, TypedDocumentNode } from '@graphql-typed-document-node/core';
 import { FragmentDefinitionNode } from 'graphql';
 import { Incremental } from './graphql';

package.json

@@ -30,7 +30,7 @@
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-terser": "^0.4.4",
-    "@testing-library/cypress": "^9.0.0",
+    "@testing-library/cypress": "^10.0.2",
     "@types/jest": "^29.0.3",
     "babel-jest": "^29.0.1",
     "cross-env": "^7.0.3",

packages/babel-plugin-extract-gql/package.json

@@ -29,9 +29,9 @@
     "strings"
   ],
   "dependencies": {
-    "@fastify/cors": "^8.0.0",
+    "@fastify/cors": "^9.0.1",
     "fastify": "^4.2.0",
-    "pkg-dir": "^7.0.0"
+    "pkg-dir": "^8.0.0"
   },
   "repository": {
     "type": "git",

packages/graphql-hooks/package.json

@@ -33,19 +33,18 @@
   "author": "Brian Mullan <bmullan91@gmail.com>",
   "license": "Apache-2.0",
   "peerDependencies": {
-    "graphql": "^16.8.1",
     "react": "^17.0.0 || ^18.0.0"
   },
   "dependencies": {
+    "@0no-co/graphql.web": "^1.0.7",
     "@aws-crypto/sha256-browser": "^5.2.0",
-    "@graphql-typed-document-node/core": "^3.2.0",
     "buffer": "^6.0.3",
     "events": "^3.3.0",
     "extract-files": "^11.0.0",
     "use-deep-compare-effect": "^1.8.1"
   },
   "devDependencies": {
-    "@testing-library/react": "^14.0.0",
+    "@testing-library/react": "^15.0.7",
     "@types/extract-files": "^8.1.1",
     "cross-env": "^7.0.3",
     "formdata-node": "^4.3.2",

packages/graphql-hooks/src/createRefetchMutationsMap.ts

@@ -1,4 +1,4 @@
-import type { TypedDocumentNode } from '@graphql-typed-document-node/core'
+import type { TypedDocumentNode } from './types/typedDocumentNode'
 
 import {
   RefetchAfterMutationItem,

packages/graphql-hooks/src/types/typedDocumentNode.ts

@@ -0,0 +1,19 @@
+import { DocumentNode } from '@0no-co/graphql.web'
+
+export interface DocumentTypeDecoration<TResult, TVariables> {
+  /**
+   * This type is used to ensure that the variables you pass in to the query are assignable to Variables
+   * and that the Result is assignable to whatever you pass your result to. The method is never actually
+   * implemented, but the type is valid because we list it as optional
+   */
+  __apiType?: (variables: TVariables) => TResult
+}
+export interface TypedDocumentNode<
+  TResult = {
+    [key: string]: any
+  },
+  TVariables = {
+    [key: string]: any
+  }
+> extends DocumentNode,
+    DocumentTypeDecoration<TResult, TVariables> {}

packages/graphql-hooks/src/useClientRequest.ts

@@ -1,5 +1,5 @@
 import React from 'react'
-import { TypedDocumentNode } from '@graphql-typed-document-node/core'
+import { TypedDocumentNode } from './types/typedDocumentNode'
 
 import ClientContext from './ClientContext'
 import { Events } from './events'

packages/graphql-hooks/src/useManualQuery.ts

@@ -1,4 +1,4 @@
-import type { TypedDocumentNode } from '@graphql-typed-document-node/core'
+import type { TypedDocumentNode } from './types/typedDocumentNode'
 
 import {
   FetchData,

packages/graphql-hooks/src/useMutation.ts

@@ -1,4 +1,4 @@
-import type { TypedDocumentNode } from '@graphql-typed-document-node/core'
+import type { TypedDocumentNode } from './types/typedDocumentNode'
 
 import useClientRequest from './useClientRequest'
 import {

packages/graphql-hooks/src/useQuery.ts

@@ -1,5 +1,5 @@
 import React from 'react'
-import type { TypedDocumentNode } from '@graphql-typed-document-node/core'
+import type { TypedDocumentNode } from './types/typedDocumentNode'
 
 import ClientContext from './ClientContext'
 import createRefetchMutationsMap from './createRefetchMutationsMap'

packages/graphql-hooks/src/utils.ts

@@ -2,7 +2,7 @@ import type {
   DocumentNode,
   OperationDefinitionNode
 } from 'graphql/language/ast'
-import { Kind, print } from 'graphql'
+import { Kind, print } from '@0no-co/graphql.web'
 
 /**
  * Pipe with support for async functions