feat: adopt undici as fetch polyfill

package.json

@@ -83,7 +83,6 @@
     "@commitlint/config-conventional": "^16.0.0",
     "@open-draft/test-server": "^0.4.2",
     "@ossjs/release": "^0.4.0",
-    "@remix-run/web-fetch": "^4.3.1",
     "@types/cors": "^2.8.12",
     "@types/express": "^4.17.13",
     "@types/express-rate-limit": "^6.0.0",
@@ -112,6 +111,7 @@
     "ts-jest": "^27.1.1",
     "tsup": "^6.5.0",
     "typescript": "^4.9.4",
+    "undici": "^5.20.0",
     "wait-for-expect": "^3.0.2",
     "web-encoding": "^1.1.5"
   },
@@ -141,4 +141,4 @@
       "path": "./node_modules/cz-conventional-changelog"
     }
   }
-}
+}

src/RemoteHttpInterceptor.ts

@@ -1,6 +1,6 @@
 import { ChildProcess } from 'child_process'
-import { Request, Response } from '@remix-run/web-fetch'
-import { Headers, HeadersObject, headersToObject } from 'headers-polyfill'
+import { Request, Response, Headers } from 'undici'
+import { HeadersObject, headersToObject } from 'headers-polyfill'
 import { HttpRequestEventMap } from './glossary'
 import { Interceptor } from './Interceptor'
 import { BatchInterceptor } from './BatchInterceptor'

src/interceptors/ClientRequest/NodeClientRequest.test.ts

@@ -4,7 +4,7 @@
 import { debug } from 'debug'
 import * as express from 'express'
 import { HttpServer } from '@open-draft/test-server/http'
-import { Response } from '@remix-run/web-fetch'
+import { Response } from 'undici'
 import { NodeClientRequest } from './NodeClientRequest'
 import { getIncomingMessageBody } from './utils/getIncomingMessageBody'
 import { normalizeClientRequestArgs } from './utils/normalizeClientRequestArgs'

src/interceptors/ClientRequest/index.test.ts

@@ -1,6 +1,6 @@
 import * as http from 'http'
 import { HttpServer } from '@open-draft/test-server/http'
-import { Response } from '@remix-run/web-fetch'
+import { Response } from 'undici'
 import { ClientRequestInterceptor } from '.'
 
 const httpServer = new HttpServer((app) => {

src/interceptors/ClientRequest/utils/createRequest.ts

@@ -1,4 +1,4 @@
-import { Request } from '@remix-run/web-fetch'
+import { Request } from 'undici'
 import { Headers } from 'headers-polyfill'
 import type { NodeClientRequest } from '../NodeClientRequest'
 

src/interceptors/ClientRequest/utils/createResponse.ts

@@ -1,5 +1,5 @@
 import type { IncomingMessage } from 'http'
-import { Response, ReadableStream } from '@remix-run/web-fetch'
+import { Response, ReadableStream } from 'undici'
 import { objectToHeaders } from 'headers-polyfill'
 
 /**

src/interceptors/XMLHttpRequest/XMLHttpRequestController.ts

@@ -1,5 +1,5 @@
 import type { Debugger } from 'debug'
-import { Headers, Request } from '@remix-run/web-fetch'
+import { Headers, Request } from 'undici'
 import { headersToString } from 'headers-polyfill'
 import { concatArrayBuffer } from './utils/concatArrayBuffer'
 import { createEvent } from './utils/createEvent'

src/interceptors/XMLHttpRequest/utils/createResponse.ts

@@ -1,4 +1,4 @@
-import { Response } from '@remix-run/web-fetch'
+import { Response } from 'undici'
 import { stringToHeaders } from 'headers-polyfill'
 
 export function createResponse(

src/interceptors/fetch/index.ts

@@ -1,5 +1,5 @@
 import { invariant } from 'outvariant'
-import type { Response as ResponsePolyfill } from '@remix-run/web-fetch'
+import type { Response as ResponsePolyfill } from 'undici'
 import { HttpRequestEventMap, IS_PATCHED_MODULE } from '../../glossary'
 import { Interceptor } from '../../Interceptor'
 import { uuidv4 } from '../../utils/uuid'

src/utils/toInteractiveRequest.ts

@@ -1,13 +1,15 @@
 import { format } from 'outvariant'
 import { createLazyCallback, LazyCallback } from './createLazyCallback'
 
-type LazyResponseCallback = (response: Response) => void
+type LazyResponseCallback = (response: globalThis.Response) => void
 
 export type InteractiveRequest = globalThis.Request & {
   respondWith: LazyCallback<LazyResponseCallback>
 }
 
-export function toInteractiveRequest(request: Request): InteractiveRequest {
+export function toInteractiveRequest(
+  request: globalThis.Request
+): InteractiveRequest {
   Object.defineProperty(request, 'respondWith', {
     writable: false,
     enumerable: true,

test/features/events/response.test.ts

@@ -4,7 +4,7 @@
 import * as https from 'https'
 import fetch from 'node-fetch'
 import waitForExpect from 'wait-for-expect'
-import { Response } from '@remix-run/web-fetch'
+import { Response } from 'undici'
 import { HttpServer, httpsAgent } from '@open-draft/test-server/http'
 import { HttpRequestEventMap } from '../../../src'
 import { createXMLHttpRequest, waitForClientRequest } from '../../helpers'

test/features/remote/remote.test.ts

@@ -3,7 +3,7 @@
  */
 import * as path from 'path'
 import { spawn } from 'child_process'
-import { Response } from '@remix-run/web-fetch'
+import { Response } from 'undici'
 import { RemoteHttpResolver } from '../../../src/RemoteHttpInterceptor'
 
 const CHILD_PATH = path.resolve(__dirname, 'child.js')

test/helpers.ts

@@ -2,7 +2,7 @@ import https from 'https'
 import http, { ClientRequest, IncomingMessage, RequestOptions } from 'http'
 import nodeFetch, { Response, RequestInfo, RequestInit } from 'node-fetch'
 import { objectToHeaders } from 'headers-polyfill'
-import { Request } from '@remix-run/web-fetch'
+import { Request } from 'undici'
 import { Page, ScenarioApi } from 'page-with'
 import { getRequestOptionsByUrl } from '../src/utils/getRequestOptionsByUrl'
 import { getIncomingMessageBody } from '../src/interceptors/ClientRequest/utils/getIncomingMessageBody'

test/modules/XMLHttpRequest/compliance/xhr-add-event-listener.test.ts

@@ -2,7 +2,7 @@
  * @jest-environment jsdom
  * @see https://github.com/mswjs/msw/issues/273
  */
-import { Response } from '@remix-run/web-fetch'
+import { Response } from 'undici'
 import { XMLHttpRequestInterceptor } from '../../../../src/interceptors/XMLHttpRequest'
 import { createXMLHttpRequest } from '../../../helpers'
 

test/modules/XMLHttpRequest/compliance/xhr-events-order.test.ts

@@ -3,7 +3,7 @@
  * @see https://xhr.spec.whatwg.org/#events
  */
 import { HttpServer } from '@open-draft/test-server/http'
-import { Response } from '@remix-run/web-fetch'
+import { Response } from 'undici'
 import { XMLHttpRequestInterceptor } from '../../../../src/interceptors/XMLHttpRequest'
 import { createXMLHttpRequest } from '../../../helpers'
 

test/modules/XMLHttpRequest/compliance/xhr-response-body-empty.test.ts

@@ -1,7 +1,7 @@
 /**
  * @jest-environment jsdom
  */
-import { Response } from '@remix-run/web-fetch'
+import { Response } from 'undici'
 import { XMLHttpRequestInterceptor } from '../../../../src/interceptors/XMLHttpRequest'
 import { createXMLHttpRequest } from '../../../helpers'
 

test/modules/XMLHttpRequest/compliance/xhr-response-body-json-invalid.test.ts

@@ -1,7 +1,7 @@
 /**
  * @jest-environment jsdom
  */
-import { Response } from '@remix-run/web-fetch'
+import { Response } from 'undici'
 import { XMLHttpRequestInterceptor } from '../../../../src/interceptors/XMLHttpRequest'
 import { createXMLHttpRequest } from '../../../helpers'
 

test/modules/XMLHttpRequest/compliance/xhr-response-body-xml.test.ts

@@ -1,7 +1,7 @@
 /**
  * @jest-environment jsdom
  */
-import { Response } from '@remix-run/web-fetch'
+import { Response } from 'undici'
 import { XMLHttpRequestInterceptor } from '../../../../src/interceptors/XMLHttpRequest'
 import { createXMLHttpRequest } from '../../../helpers'
 

test/modules/XMLHttpRequest/compliance/xhr-response-headers.test.ts

@@ -2,7 +2,7 @@
  * @jest-environment jsdom
  */
 import { HttpServer } from '@open-draft/test-server/http'
-import { Response } from '@remix-run/web-fetch'
+import { Response } from 'undici'
 import { XMLHttpRequestInterceptor } from '../../../../src/interceptors/XMLHttpRequest'
 import { createXMLHttpRequest } from '../../../helpers'
 

test/modules/XMLHttpRequest/compliance/xhr-response-type.test.ts

@@ -1,7 +1,7 @@
 /**
  * @jest-environment jsdom
  */
-import { Response } from '@remix-run/web-fetch'
+import { Response } from 'undici'
 import { encodeBuffer } from '../../../../src'
 import { XMLHttpRequestInterceptor } from '../../../../src/interceptors/XMLHttpRequest'
 import { toArrayBuffer } from '../../../../src/utils/bufferUtils'

test/modules/XMLHttpRequest/compliance/xhr-status.test.ts

@@ -2,7 +2,7 @@
  * @jest-environment jsdom
  * @see https://github.com/mswjs/interceptors/issues/281
  */
-import { Response } from '@remix-run/web-fetch'
+import { Response } from 'undici'
 import { XMLHttpRequestInterceptor } from '../../../../src/interceptors/XMLHttpRequest'
 import { createXMLHttpRequest } from '../../../helpers'
 

test/modules/XMLHttpRequest/features/events.test.ts

@@ -1,7 +1,7 @@
 /**
  * @jest-environment jsdom
  */
-import { Response } from '@remix-run/web-fetch'
+import { Response } from 'undici'
 import { HttpServer } from '@open-draft/test-server/http'
 import { XMLHttpRequestInterceptor } from '../../../../src/interceptors/XMLHttpRequest'
 import { createXMLHttpRequest } from '../../../helpers'

test/modules/XMLHttpRequest/response/xhr.test.ts

@@ -2,7 +2,7 @@
  * @jest-environment jsdom
  */
 import { HttpServer } from '@open-draft/test-server/http'
-import { Response } from '@remix-run/web-fetch'
+import { Response } from 'undici'
 import { XMLHttpRequestInterceptor } from '../../../../src/interceptors/XMLHttpRequest'
 import { createXMLHttpRequest } from '../../../helpers'
 

test/modules/fetch/response/fetch.test.ts

@@ -4,7 +4,7 @@
 import fetch from 'node-fetch'
 import { HttpServer, httpsAgent } from '@open-draft/test-server/http'
 import { ClientRequestInterceptor } from '../../../../src/interceptors/ClientRequest'
-import { Response } from '@remix-run/web-fetch'
+import { Response } from 'undici'
 
 const httpServer = new HttpServer((app) => {
   app.get('/', (req, res) => {

test/modules/http/compliance/http-rate-limit.test.ts

@@ -1,7 +1,7 @@
 import * as http from 'http'
 import rateLimit from 'express-rate-limit'
 import { HttpServer } from '@open-draft/test-server/http'
-import { Response } from '@remix-run/web-fetch'
+import { Response } from 'undici'
 import { ClientRequestInterceptor } from '../../../../src/interceptors/ClientRequest'
 
 const httpServer = new HttpServer((app) => {

test/modules/http/compliance/http-req-callback.test.ts

@@ -4,7 +4,7 @@
 import { IncomingMessage } from 'http'
 import * as https from 'https'
 import { HttpServer, httpsAgent } from '@open-draft/test-server/http'
-import { Response } from '@remix-run/web-fetch'
+import { Response } from 'undici'
 import { getRequestOptionsByUrl } from '../../../../src/utils/getRequestOptionsByUrl'
 import { ClientRequestInterceptor } from '../../../../src/interceptors/ClientRequest'
 

test/modules/http/compliance/http-res-set-encoding.test.ts

@@ -3,7 +3,7 @@
  */
 import * as http from 'http'
 import { HttpServer } from '@open-draft/test-server/http'
-import { Response } from '@remix-run/web-fetch'
+import { Response } from 'undici'
 import { ClientRequestInterceptor } from '../../../../src/interceptors/ClientRequest'
 
 const httpServer = new HttpServer((app) => {

test/modules/http/http-performance.test.ts

@@ -2,7 +2,7 @@
  * @jest-environment node
  */
 import { HttpServer } from '@open-draft/test-server/http'
-import { Response } from '@remix-run/web-fetch'
+import { Response } from 'undici'
 import { ClientRequestInterceptor } from '../../../src/interceptors/ClientRequest'
 import { httpGet, PromisifiedResponse } from '../../helpers'
 

test/modules/http/regressions/http-concurrent-different-response-source.test.ts

@@ -2,7 +2,7 @@
  * @jest-environment node
  */
 import { HttpServer } from '@open-draft/test-server/http'
-import { Response } from '@remix-run/web-fetch'
+import { Response } from 'undici'
 import { httpGet } from '../../../helpers'
 import { sleep } from '../../../../test/helpers'
 import { ClientRequestInterceptor } from '../../../../src/interceptors/ClientRequest'

test/modules/http/regressions/http-concurrent-same-host.test.ts

@@ -3,7 +3,7 @@
  * @see https://github.com/mswjs/interceptors/issues/2
  */
 import * as http from 'http'
-import { Response } from '@remix-run/web-fetch'
+import { Response } from 'undici'
 import { ClientRequestInterceptor } from '../../../../src/interceptors/ClientRequest'
 
 let requests: Array<Request> = []

test/modules/http/regressions/http-socket-timeout.ts

@@ -6,7 +6,7 @@
  */
 import * as http from 'http'
 import { HttpServer } from '@open-draft/test-server/http'
-import { Response } from '@remix-run/web-fetch'
+import { Response } from 'undici'
 import { ClientRequestInterceptor } from '../../../../src/interceptors/ClientRequest'
 
 jest.setTimeout(5000)

test/modules/http/response/http-https.test.ts

@@ -3,7 +3,7 @@
  */
 import * as http from 'http'
 import * as https from 'https'
-import { Response } from '@remix-run/web-fetch'
+import { Response } from 'undici'
 import { HttpServer, httpsAgent } from '@open-draft/test-server/http'
 import { waitForClientRequest } from '../../../helpers'
 import { ClientRequestInterceptor } from '../../../../src/interceptors/ClientRequest'

test/modules/http/response/http-response-patching.test.ts

@@ -3,7 +3,7 @@
  */
 import * as http from 'http'
 import { HttpServer } from '@open-draft/test-server/http'
-import { Response } from '@remix-run/web-fetch'
+import { Response } from 'undici'
 import { BatchInterceptor } from '../../../../src'
 import { ClientRequestInterceptor } from '../../../../src/interceptors/ClientRequest'
 import { XMLHttpRequestInterceptor } from '../../../../src/interceptors/XMLHttpRequest'

test/third-party/axios.test.ts

@@ -4,7 +4,7 @@
 import axios from 'axios'
 import { HttpServer } from '@open-draft/test-server/http'
 import { ClientRequestInterceptor } from '../../src/interceptors/ClientRequest'
-import { Response } from '@remix-run/web-fetch'
+import { Response } from 'undici'
 
 const httpServer = new HttpServer((app) => {
   app.get('/books', (req, res) => {

test/third-party/got.test.ts

@@ -4,7 +4,7 @@
 import got from 'got'
 import { HttpServer } from '@open-draft/test-server/http'
 import { ClientRequestInterceptor } from '../../src/interceptors/ClientRequest'
-import { Response } from '@remix-run/web-fetch'
+import { Response } from 'undici'
 
 const httpServer = new HttpServer((app) => {
   app.get('/user', (req, res) => {