Remove node-fetch

package.json

@@ -128,7 +128,6 @@
     "multiparty": "4.2.3",
     "nanospinner": "1.2.2",
     "netlify-redirector": "0.5.0",
-    "node-fetch": "3.3.2",
     "normalize-package-data": "7.0.1",
     "open": "10.2.0",
     "p-filter": "4.1.0",

src/commands/functions/functions-create.ts

@@ -10,7 +10,7 @@ import { OptionValues } from 'commander'
 import { findUp } from 'find-up'
 import fuzzy from 'fuzzy'
 import inquirer from 'inquirer'
-import fetch from 'node-fetch'
+
 import { createSpinner } from 'nanospinner'
 
 import { fileExistsAsync } from '../../lib/fs.js'
@@ -386,7 +386,13 @@ const downloadFromURL = async function (command, options, argumentName, function
         const res = await fetch(downloadUrl)
         const finalName = path.basename(name, '.js') === functionName ? `${nameToUse}.js` : name
         const dest = fs.createWriteStream(path.join(fnFolder, finalName))
-        res.body?.pipe(dest)
+        if (res.body) {
+          for await (const chunk of res.body) {
+            dest.write(chunk)
+          }
+
+          dest.end()
+        }
       } catch (error_) {
         throw new Error(`Error while retrieving ${downloadUrl} ${error_}`)
       }

src/commands/functions/functions-invoke.ts

@@ -4,7 +4,6 @@ import path from 'path'
 
 import { OptionValues } from 'commander'
 import inquirer from 'inquirer'
-import fetch from 'node-fetch'
 
 import { APIError, NETLIFYDEVWARN, chalk, logAndThrowError, exit } from '../../utils/command-helpers.js'
 import { BACKGROUND, CLOCKWORK_USERAGENT, getFunctions } from '../../utils/functions/index.js'

src/lib/geo-location.ts

@@ -1,4 +1,3 @@
-import fetch from 'node-fetch'
 import { type Geolocation, mockLocation } from '@netlify/dev-utils'
 
 const API_URL = 'https://netlifind.netlify.app'

src/utils/live-tunnel.ts

@@ -1,6 +1,5 @@
 import { platform } from 'process'
 
-import fetch from 'node-fetch'
 import pWaitFor from 'p-wait-for'
 import { v4 as uuidv4 } from 'uuid'
 

src/utils/read-repo-url.ts

@@ -1,7 +1,5 @@
 import URL from 'url'
 
-import fetch from 'node-fetch'
-
 // supported repo host types
 const GITHUB = 'GitHub'
 

src/utils/sites/utils.ts

@@ -1,4 +1,3 @@
-import fetch from 'node-fetch'
 import execa from 'execa'
 
 import { GitHubRepoResponse, logAndThrowError } from '../command-helpers.js'

src/utils/telemetry/request.ts

@@ -2,8 +2,6 @@
 // to run as a detached process
 import process from 'process'
 
-import fetch from 'node-fetch'
-
 import getPackageJson from '../get-cli-package-json.js'
 
 const { name, version } = await getPackageJson()

tests/integration/commands/deploy/deploy.test.ts

@@ -4,7 +4,7 @@ import { fileURLToPath } from 'url'
 
 import { load } from 'cheerio'
 import execa from 'execa'
-import fetch from 'node-fetch'
+
 import { afterAll, beforeAll, describe, expect, test } from 'vitest'
 
 import { callCli } from '../../utils/call-cli.js'

tests/integration/commands/dev/dev-forms-and-redirects.test.ts

@@ -4,9 +4,8 @@ import path from 'path'
 
 import type { HandlerEvent } from '@netlify/functions'
 import js from 'dedent'
-import FormData from 'form-data'
 import getPort from 'get-port'
-import fetch from 'node-fetch'
+
 import { describe, test } from 'vitest'
 
 import { withDevServer } from '../../utils/dev-server.js'
@@ -113,7 +112,7 @@ describe.concurrent('commands/dev-forms-and-redirects', () => {
             data: {
               ip: '::ffff:127.0.0.1',
               some: 'thing',
-              user_agent: 'node-fetch',
+              user_agent: 'node',
             },
             human_fields: {
               Some: 'thing',
@@ -316,7 +315,7 @@ describe.concurrent('commands/dev-forms-and-redirects', () => {
       await builder.build()
 
       await withDevServer({ cwd: builder.directory }, async (server) => {
-        const response = await fetch(`${server.url}/foo.html`, { follow: 0 })
+        const response = await fetch(`${server.url}/foo.html`, { redirect: 'manual' })
         t.expect(response).not.toHaveProperty('headers.location')
         t.expect(await response.text()).toEqual('<html><h1>foo')
       })

tests/integration/commands/dev/dev-miscellaneous.test.ts

@@ -1,4 +1,3 @@
-import events from 'node:events'
 import { Buffer } from 'buffer'
 import path from 'path'
 import { platform } from 'process'
@@ -8,7 +7,7 @@
 import execa, { ExecaError } from 'execa'
 import getAvailablePort from 'get-port'
 import jwt from 'jsonwebtoken'
-import fetch from 'node-fetch'
+
 import { type TestContext, describe, test } from 'vitest'
 import type { HandlerEvent, HandlerContext } from '@netlify/functions'
 import type { Context as EdgeHandlerContext } from '@netlify/edge-functions'
@@ -595,12 +594,17 @@
         const stream = res.body
 
         expect(stream).not.toBeNull()
+        if (!stream) throw new Error('Expected a readable stream')
 
         let numberOfChunks = 0
-        stream!.on('data', () => {
+
+        const reader = stream.getReader()
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+        while (true) {
+          const { done } = await reader.read()
+          if (done) break
           numberOfChunks += 1
-        })
-        await events.once(stream!, 'end')
+        }
 
         // streamed responses arrive in more than one batch
         expect(numberOfChunks).not.toBe(1)
@@ -775,7 +779,7 @@
         .build()
 
       await withDevServer({ cwd: builder.directory }, async ({ port, url }) => {
         const response = await fetch(`${url.replace(port.toString(), functionsPort.toString())}/test`, {
           method: 'POST',
           headers: {
             'Content-Type': 'application/json',
@@ -804,7 +808,7 @@
         .build()
 
       await withDevServer({ cwd: builder.directory }, async ({ port, url }) => {
         const response = await fetch(
           `${url.replace(port.toString(), functionsPort.toString())}/.netlify/functions/exclamat!on`,
           {
             method: 'POST',

tests/integration/commands/dev/dev.config.test.ts

@@ -1,11 +1,9 @@
 import { Buffer } from 'node:buffer'
 import { version } from 'node:process'
-import events from 'node:events'
 
 import type { HandlerEvent } from '@netlify/functions'
-import FormData from 'form-data'
 import getPort from 'get-port'
-import fetch from 'node-fetch'
+
 import { gte } from 'semver'
 import { describe, test } from 'vitest'
 
@@ -437,9 +435,8 @@
       await withDevServer({ cwd: builder.directory }, async (server) => {
         const form = new FormData()
         form.append('some', 'thing')
-
-        const expectedBoundary = form.getBoundary()
-        const expectedResponseBody = form.getBuffer().toString('base64')
+        const rsp = new Response(form)
+        const expectedResponseBody = Buffer.from(await rsp.text()).toString('base64')
 
         const response = await fetch(`${server.url}/api/echo?ding=dong`, {
           method: 'POST',
@@ -448,13 +445,15 @@
         const body = await response.json()
 
         t.expect(body).toHaveProperty('headers.host', `${server.host}:${server.port.toString()}`)
-        t.expect(body).toHaveProperty('headers.content-type', `multipart/form-data;boundary=${expectedBoundary}`)
-        t.expect(body).toHaveProperty('headers.content-length', '164')
+        t.expect((body as { headers: { 'content-type': string } }).headers['content-type']).toMatch(
+          /^multipart\/form-data; ?boundary=.+/,
+        )
+        t.expect(body).toHaveProperty('headers.content-length', '126')
         t.expect(body).toHaveProperty('httpMethod', 'POST')
         t.expect(body).toHaveProperty('isBase64Encoded', true)
         t.expect(body).toHaveProperty('path', '/api/echo')
         t.expect(body).toHaveProperty('queryStringParameters', { ding: 'dong' })
         t.expect(body).toHaveProperty('body', expectedResponseBody)
       })
     })
   })
@@ -521,15 +520,12 @@
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         const body = res.body!
 
-        body.on('data', (chunk: Buffer) => {
+        for await (const chunk of body) {
           const now = Date.now()
-
           t.expect(now > lastTimestamp).toBe(true)
-
           lastTimestamp = now
-          chunks.push(chunk.toString())
-        })
-        await events.once(body, 'end')
+          chunks.push(Buffer.from(chunk).toString())
+        }
 
         t.expect(chunks).toStrictEqual(['one', 'two', 'three'])
       })

tests/integration/commands/dev/dev.test.ts

@@ -6,7 +6,7 @@
 
 import js from 'dedent'
 import jwt, { type JwtPayload } from 'jsonwebtoken'
-import fetch from 'node-fetch'
+
 import { describe, test } from 'vitest'
 
 import { withDevServer } from '../../utils/dev-server.js'
@@ -243,7 +243,7 @@
             'Content-Type': 'application/x-www-form-urlencoded',
           },
           body: 'param=value',
-          follow: 0,
+          redirect: 'manual',
         })
         const postBody = await postResponse.json()
         t.expect(postBody).toHaveProperty('body', { param: 'value' })
@@ -311,7 +311,7 @@
                   'Content-Type': 'application/x-www-form-urlencoded',
                 },
                 body: 'param=value',
-                follow: 0,
+                redirect: 'manual',
               }),
             ])
             const getBody = await getResponse.json()
@@ -348,7 +348,7 @@
 
       await withDevServer({ cwd: builder.directory }, async (server) => {
         const [response1, response2] = await Promise.all([
-          fetch(`${server.url}/api/ping`, { follow: 0, redirect: 'manual' }),
+          fetch(`${server.url}/api/ping`, { redirect: 'manual' }),
           fetch(`${server.url}/api/ping`),
         ])
         const response2Body = await response2.json()
@@ -417,7 +417,7 @@
         const response = await fetch(`${server.url}/api/echo`, {
           method: 'POST',
           body: 'param=value',
-          follow: 0,
+          redirect: 'manual',
         })
 
         // Method Not Allowed
@@ -867,7 +867,7 @@
             const data = (await response.json()) as { WITH_BRANCH_OVERRIDE: string; WITHOUT_OVERRIDE: string }
 
             t.expect(response).toHaveProperty('status', 200)
             t.expect(data).toHaveProperty('WITH_BRANCH_OVERRIDE', 'value from branch context')
             t.expect(data).toHaveProperty('WITHOUT_OVERRIDE', 'value from branch-deploy context')
           },
         )

tests/integration/commands/dev/edge-functions.test.ts

@@ -3,7 +3,7 @@ import { rename } from 'fs/promises'
 import { join } from 'path'
 
 import execa from 'execa'
-import fetch from 'node-fetch'
+
 import { describe, expect, test } from 'vitest'
 
 import { withDevServer } from '../../utils/dev-server.js'

tests/integration/commands/dev/images.test.ts

@@ -2,7 +2,6 @@
 import fs from 'fs'
 import path from 'path'
 
-import fetch from 'node-fetch'
 import { describe, test } from 'vitest'
 
 import { withDevServer } from '../../utils/dev-server.js'

tests/integration/commands/dev/redirects.test.ts

@@ -1,4 +1,3 @@
-import fetch from 'node-fetch'
 import { describe, expect, test } from 'vitest'
 
 import { withDevServer } from '../../utils/dev-server.js'

tests/integration/commands/dev/responses.dev.test.ts

@@ -2,7 +2,7 @@
 import path from 'path'
 
 import type { HandlerEvent } from '@netlify/functions'
-import fetch from 'node-fetch'
+
 import { describe, test } from 'vitest'
 
 import { withDevServer } from '../../utils/dev-server.js'

tests/integration/commands/dev/scheduled-functions.test.ts

@@ -1,7 +1,7 @@
 import { describe, expect, test } from 'vitest'
 
 import { FixtureTestContext, setupFixtureTests } from '../../utils/fixture.js'
-import fetch from 'node-fetch'
+
 import { pause } from '../../utils/pause.js'
 
 describe('scheduled functions', async () => {

tests/integration/commands/functions-invoke/functions-invoke.test.ts

@@ -1,4 +1,3 @@
-import fetch from 'node-fetch'
 import { describe, test } from 'vitest'
 
 import { FixtureTestContext, setupFixtureTests } from '../../utils/fixture.js'

tests/integration/commands/functions-serve/functions-serve.test.ts

@@ -2,7 +2,7 @@ import { killProcess } from '@netlify/dev-utils'
 import js from 'dedent'
 import execa from 'execa'
 import getPort from 'get-port'
-import fetch from 'node-fetch'
+
 import { describe, test } from 'vitest'
 import waitPort from 'wait-port'
 

tests/integration/commands/functions-with-args/functions-with-args.test.ts

@@ -2,7 +2,7 @@ import path from 'node:path'
 import { fileURLToPath } from 'node:url'
 
 import type { HandlerEvent } from '@netlify/functions'
-import fetch from 'node-fetch'
+
 import { describe, test } from 'vitest'
 import js from 'dedent'
 import ts from 'dedent'

tests/integration/framework-detection.test.ts

@@ -1,5 +1,5 @@
 import execa from 'execa'
-import fetch from 'node-fetch'
+
 import { describe, test } from 'vitest'
 
 import { cliPath } from './utils/cli-path.js'

tests/integration/frameworks/hugo.test.ts

@@ -1,7 +1,6 @@
 import { expect, test } from 'vitest'
 
 import { FixtureTestContext, setupFixtureTests } from '../utils/fixture.js'
-import fetch from 'node-fetch'
 
 setupFixtureTests('hugo-site', { devServer: true }, () => {
   test<FixtureTestContext>('should not infinite redirect when -d flag is passed', async ({ devServer }) => {

tests/integration/rules-proxy.test.ts

@@ -6,7 +6,6 @@ import { afterAll, beforeAll, describe, expect, test } from 'vitest'
 
 import { createRewriter, getWatchers } from '../../src/utils/rules-proxy.js'
 
-import fetch from 'node-fetch'
 import { createSiteBuilder, SiteBuilder } from './utils/site-builder.js'
 
 describe('rules-proxy', () => {

tests/integration/serve/functions-go.test.ts

@@ -1,4 +1,3 @@
-import fetch from 'node-fetch'
 import { describe, test } from 'vitest'
 
 import { tryAndLogOutput, withDevServer } from '../utils/dev-server.js'

tests/integration/serve/functions-rust.test.ts

@@ -1,4 +1,3 @@
-import fetch from 'node-fetch'
 import { test } from 'vitest'
 
 import { tryAndLogOutput, withDevServer } from '../utils/dev-server.js'

tests/unit/lib/functions/server.test.ts

@@ -6,7 +6,7 @@ import { join } from 'node:path'
 
 import { LocalState } from '@netlify/dev-utils'
 import express from 'express'
-import fetch from 'node-fetch'
+
 import { afterAll, beforeAll, describe, expect, test, vi } from 'vitest'
 
 import { FunctionsRegistry } from '../../../../src/lib/functions/registry.js'

tests/unit/utils/gh-auth.test.ts

@@ -1,5 +1,5 @@
 import { fibonacci } from 'backoff'
-import fetch from 'node-fetch'
+
 import { afterAll, describe, expect, test, vi } from 'vitest'
 
 import { authWithNetlify } from '../../../src/utils/gh-auth.js'