Replace cross-undici-fetch with @whatwg-node/fetch

Author: ardatan

benchmark/hello-world/check-server.js

@@ -1,4 +1,4 @@
-require('cross-undici-fetch')
+require('@whatwg-node/fetch')
   .fetch(
     `http://localhost:4000/graphql?query=${encodeURIComponent(
       '{ greetings }',

examples/azure-function/src/index.ts

@@ -1,6 +1,6 @@
 import { AzureFunction, Context, HttpRequest } from '@azure/functions'
 import { createServer } from '@graphql-yoga/common'
-import { Request } from 'cross-undici-fetch'
+import { Request } from '@whatwg-node/fetch'
 
 const httpTrigger: AzureFunction = async function (
   context: Context,

examples/cloudflare-modules/test/index.spec.ts

@@ -1,5 +1,5 @@
 import worker from '../src/index.js'
-import { Request } from 'cross-undici-fetch'
+import { Request } from '@whatwg-node/fetch'
 import { getIntrospectionQuery } from 'graphql'
 
 test('should render GraphiQL', async () => {

examples/error-handling/package.json

@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "@graphql-yoga/node": "2.13.4",
-    "cross-undici-fetch": "^0.4.13",
+    "@whatwg-node/fetch": "^0.0.2",
     "graphql": "^16.1.0"
   },
   "devDependencies": {

examples/error-handling/src/index.ts

@@ -1,5 +1,5 @@
 import { createServer, GraphQLYogaError } from '@graphql-yoga/node'
-import { fetch } from 'cross-undici-fetch'
+import { fetch } from '@whatwg-node/fetch'
 
 const users = [
   {

examples/service-worker/test/integration.test.ts

@@ -1,6 +1,6 @@
 import { getIntrospectionQuery } from 'graphql'
 import { createServer } from '@graphql-yoga/common'
-import { Request } from 'cross-undici-fetch'
+import { Request } from '@whatwg-node/fetch'
 
 const listenerMap = new Map<string, Set<EventListenerOrEventListenerObject>>()
 

package.json

@@ -78,7 +78,6 @@
   "resolutions": {
     "@changesets/apply-release-plan": "6.0.0",
     "graphql": "16.5.0",
-    "cross-undici-fetch": "0.4.14",
     "@types/react": "17.0.39",
     "@types/react-dom": "17.0.17",
     "react": "17.0.2",

packages/common/__tests__/cors.test.ts

@@ -1,4 +1,4 @@
-import { Request } from 'cross-undici-fetch'
+import { Request } from '@whatwg-node/fetch'
 import {
   getCORSHeadersByRequestAndOptions,
   CORSOptions,

packages/common/package.json

@@ -71,7 +71,7 @@
     "@graphql-tools/schema": "^8.5.0",
     "@graphql-tools/utils": "^8.8.0",
     "@graphql-yoga/subscription": "^2.2.2",
-    "cross-undici-fetch": "^0.4.13",
+    "@whatwg-node/fetch": "^0.0.2",
     "dset": "^3.1.1",
     "tslib": "^2.3.1"
   },

packages/common/src/plugins/requestParser/POSTMultipart.ts

@@ -17,7 +17,7 @@ export async function parsePOSTMultipartRequest(
   try {
     requestBody = await request.formData()
   } catch (e: unknown) {
-    // Trick for cross-undici-fetch errors on Node.js
+    // Trick for @whatwg-node/fetch errors on Node.js
     // TODO: This needs a better solution
     if (
       e instanceof Error &&

packages/common/src/server.ts

@@ -31,7 +31,7 @@ import {
   RequestParser,
   ResultProcessor,
 } from './plugins/types.js'
-import * as crossUndiciFetch from 'cross-undici-fetch'
+import * as crossUndiciFetch from '@whatwg-node/fetch'
 import { processRequest as processGraphQLParams } from './processRequest.js'
 import { defaultYogaLogger, titleBold, YogaLogger } from './logger.js'
 import { CORSPluginOptions, useCORS } from './plugins/useCORS.js'

packages/common/src/types.ts

@@ -116,25 +116,25 @@ export type FetchEvent = Event & {
 export type FetchAPI = {
   /**
    * WHATWG compliant Request object constructor
-   * Default: `Request` from `cross-undici-fetch`
+   * Default: `Request` from `@whatwg-node/fetch`
    * @see https://developer.mozilla.org/en-US/docs/Web/API/Request
    */
   Request: typeof Request
   /**
    * WHATWG compliant Response object constructor
-   * Default: `Response` from `cross-undici-fetch`
+   * Default: `Response` from `@whatwg-node/fetch`
    * @see https://developer.mozilla.org/en-US/docs/Web/API/Response
    */
   Response: typeof Response
   /**
    * WHATWG compliant fetch function
-   * Default: `fetch` from `cross-undici-fetch`
+   * Default: `fetch` from `@whatwg-node/fetch`
    * @see https://developer.mozilla.org/en-US/docs/Web/API/WindowOrWorkerGlobalScope/fetch
    */
   fetch: typeof fetch
   /**
    * WHATWG compliant ReadableStream object constructor
-   * Default: `ReadableStream` from `cross-undici-fetch`
+   * Default: `ReadableStream` from `@whatwg-node/fetch`
    * @see https://developer.mozilla.org/en-US/docs/Web/API/ReadableStream
    */
   ReadableStream: typeof ReadableStream

packages/graphiql/package.json

@@ -28,15 +28,15 @@
     "vite": "2.9.14"
   },
   "dependencies": {
-    "@graphql-tools/url-loader": "^7.11.0",
-    "copy-to-clipboard": "^3.3.1",
-    "graphiql": "^1.8.8",
-    "graphiql-explorer": "^0.9.0",
-    "graphql": "^16.3.0",
+    "@graphql-tools/url-loader": "7.13.0",
+    "copy-to-clipboard": "3.3.1",
+    "graphiql": "1.8.8",
+    "graphiql-explorer": "0.9.0",
+    "graphql": "16.3.0",
     "react": "17.0.2",
     "react-dom": "17.0.2",
-    "use-url-search-params": "^2.5.1",
-    "json-bigint-patch": "^0.0.8"
+    "use-url-search-params": "2.5.1",
+    "json-bigint-patch": "0.0.8"
   },
   "main": "dist/yoga-graphiql.umd.js",
   "module": "dist/yoga-graphiql.es.js",

packages/graphiql/src/YogaGraphiQL.tsx

@@ -23,7 +23,7 @@ import 'json-bigint-patch'
 
 const getOperationWithFragments = (
   document: DocumentNode,
-  operationName: string,
+  operationName?: string,
 ): DocumentNode => {
   const definitions = document.definitions.filter((definition) => {
     if (
@@ -121,12 +121,11 @@ export function YogaGraphiQL(props: YogaGraphiQLProps): React.ReactElement {
     return function fetcher(graphQLParams: FetcherParams, opts?: FetcherOpts) {
       const document = getOperationWithFragments(
         parse(graphQLParams.query),
-        graphQLParams.operationName,
+        graphQLParams.operationName ?? undefined,
       )
-
       return executor({
         document,
-        operationName: graphQLParams.operationName,
+        operationName: graphQLParams.operationName ?? undefined,
         variables: graphQLParams.variables,
         extensions: {
           headers: opts?.headers,

packages/node/CHANGELOG.md

@@ -286,7 +286,7 @@
   So Yoga now uses `node-fetch` by default which doesn't affect the existing users. User can configure `cross-undici-fetch` to revert back this behavior;
 
   ```ts
-  import { create } from 'cross-undici-fetch'
+  import { create } from '@whatwg-node/fetch'
 
   createServer({
     fetchAPI: create({ useNodeFetch: false }),

packages/node/__tests__/integration.spec.ts

@@ -15,7 +15,7 @@ import 'json-bigint-patch'
 import http from 'http'
 import { useLiveQuery } from '@envelop/live-query'
 import { InMemoryLiveQueryStore } from '@n1ru4l/in-memory-live-query-store'
-import { AbortController, fetch, File, FormData } from 'cross-undici-fetch'
+import { AbortController, fetch, File, FormData } from '@whatwg-node/fetch'
 import { Plugin } from '@graphql-yoga/common'
 import { ExecutionResult } from '@graphql-tools/utils'
 

packages/node/package.json

@@ -67,7 +67,7 @@
     "@graphql-tools/utils": "^8.8.0",
     "@graphql-yoga/common": "^2.12.3",
     "@graphql-yoga/subscription": "^2.2.2",
-    "cross-undici-fetch": "^0.4.13",
+    "@whatwg-node/fetch": "^0.0.2",
     "tslib": "^2.3.1"
   },
   "devDependencies": {

packages/node/src/index.ts

@@ -10,7 +10,7 @@ import { getNodeRequest, NodeRequest, sendNodeResponse } from './http-utils.js'
 import { YogaServer } from '@graphql-yoga/common'
 import type { YogaNodeServerOptions, AddressInfo } from './types.js'
 import { platform, release } from 'os'
-import { create } from 'cross-undici-fetch'
+import { createFetch } from '@whatwg-node/fetch'
 
 class YogaNodeServer<
   TServerContext extends Record<string, any>,
@@ -35,7 +35,7 @@ class YogaNodeServer<
       multipart: options?.multipart !== false,
       fetchAPI:
         options?.fetchAPI ??
-        create({
+        createFetch({
           useNodeFetch: true,
           formDataLimits:
             typeof options?.multipart === 'object'

packages/node/src/types.ts

@@ -1,5 +1,5 @@
 import type { YogaServerOptions } from '@graphql-yoga/common'
-import type { FormDataLimits } from 'cross-undici-fetch'
+import type { FormDataLimits } from '@whatwg-node/fetch'
 import type { ServerOptions as HttpsServerOptions } from 'https'
 
 /**

patches/@changesets+assemble-release-plan+5.1.2.patch patches/@changesets+assemble-release-plan+5.1.3.patch

@@ -1,5 +1,5 @@
 diff --git a/node_modules/@changesets/assemble-release-plan/dist/assemble-release-plan.cjs.dev.js b/node_modules/@changesets/assemble-release-plan/dist/assemble-release-plan.cjs.dev.js
-index 8c8f6fd..174fd69 100644
+index f05ea74..9a0ed16 100644
 --- a/node_modules/@changesets/assemble-release-plan/dist/assemble-release-plan.cjs.dev.js
 +++ b/node_modules/@changesets/assemble-release-plan/dist/assemble-release-plan.cjs.dev.js
 @@ -130,18 +130,9 @@ function determineDependents({

patches/@changesets+cli+2.22.0.patch patches/@changesets+cli+2.23.2.patch

@@ -1,8 +1,8 @@
 diff --git a/node_modules/@changesets/cli/dist/cli.cjs.dev.js b/node_modules/@changesets/cli/dist/cli.cjs.dev.js
-index 129ae05..9b5daeb 100644
+index 4b68b5d..55e34bc 100644
 --- a/node_modules/@changesets/cli/dist/cli.cjs.dev.js
 +++ b/node_modules/@changesets/cli/dist/cli.cjs.dev.js
-@@ -639,7 +639,7 @@ const getLastJsonObjectFromString = str => {
+@@ -649,7 +649,7 @@ const getLastJsonObjectFromString = str => {
    return null;
  };
 
@@ -12,10 +12,10 @@ index 129ae05..9b5daeb 100644
 
  function jsonParse(input) {
 diff --git a/node_modules/@changesets/cli/dist/cli.cjs.prod.js b/node_modules/@changesets/cli/dist/cli.cjs.prod.js
-index ee3d78e..dc2a8c7 100644
+index 5c4828d..3694ebf 100644
 --- a/node_modules/@changesets/cli/dist/cli.cjs.prod.js
 +++ b/node_modules/@changesets/cli/dist/cli.cjs.prod.js
-@@ -354,7 +354,7 @@ const getLastJsonObjectFromString = str => {
+@@ -359,7 +359,7 @@ const getLastJsonObjectFromString = str => {
      }
    }
    return null;
@@ -25,10 +25,10 @@ index ee3d78e..dc2a8c7 100644
  function jsonParse(input) {
    try {
 diff --git a/node_modules/@changesets/cli/dist/cli.esm.js b/node_modules/@changesets/cli/dist/cli.esm.js
-index 19806a8..72859ff 100644
+index d715066..bad525f 100644
 --- a/node_modules/@changesets/cli/dist/cli.esm.js
 +++ b/node_modules/@changesets/cli/dist/cli.esm.js
-@@ -616,7 +616,7 @@ const getLastJsonObjectFromString = str => {
+@@ -626,7 +626,7 @@ const getLastJsonObjectFromString = str => {
    return null;
  };
 

website/docs/features/error-masking.mdx

@@ -16,7 +16,7 @@ Let's setup a simple schema that calls a remote service that is unavailable.
 
 ```ts
 import { createServer } from '@graphql-yoga/node'
-import { fetch } from 'cross-undici-fetch'
+import { fetch } from '@whatwg-node/fetch'
 
 // Provide your schema
 const server = createServer({
@@ -99,7 +99,7 @@ node server.js
 
 ```ts
 import { createServer } from '@graphql-yoga/node'
-import { fetch } from 'cross-undici-fetch'
+import { fetch } from '@whatwg-node/fetch'
 
 // Provide your schema
 const server = createServer({

website/docs/integrations/z-other-environments.mdx

@@ -11,7 +11,7 @@ GraphQL Yoga understands [WHATWG `Request` object](https://developer.mozilla.org
 
 ```ts
 import { createServer } from '@graphql-yoga/common'
-import { Request } from 'cross-undici-fetch' // or fetch-like library
+import { Request } from '@whatwg-node/fetch' // or fetch-like library
 
 const yoga = createServer<MyRandomCtx>()