chore: remove node-fetch

bench/nested-deps-app-router/bench.mjs

@@ -1,7 +1,6 @@
 import { execSync, spawn } from 'child_process'
 import { join } from 'path'
 import { fileURLToPath } from 'url'
-import fetch from 'node-fetch'
 import {
   existsSync,
   readFileSync,

bench/nested-deps/bench.mjs

@@ -1,7 +1,6 @@
 import { execSync, spawn } from 'child_process'
 import { join } from 'path'
 import { fileURLToPath } from 'url'
-import fetch from 'node-fetch'
 import {
   existsSync,
   readFileSync,

bench/vercel/project-utils.js

@@ -1,6 +1,5 @@
 import { config } from 'dotenv'
 
-import fetch from 'node-fetch'
 import execa from 'execa'
 import path from 'path'
 import url from 'url'

package.json

@@ -99,7 +99,6 @@
     "@types/http-proxy": "1.17.3",
     "@types/jest": "29.5.5",
     "@types/node": "20.2.5",
-    "@types/node-fetch": "2.6.1",
     "@types/react": "18.2.28",
     "@types/react-dom": "18.2.13",
     "@types/relay-runtime": "14.1.13",
@@ -172,7 +171,6 @@
     "moment": "^2.24.0",
     "nanoid": "3.1.30",
     "next": "workspace:*",
-    "node-fetch": "2.6.7",
     "npm-run-all": "4.1.5",
     "nprogress": "0.2.0",
     "octokit": "3.1.0",

packages/font/src/google/fetch-css-from-google-fonts.ts

@@ -1,5 +1,3 @@
-// @ts-ignore
-import fetch from 'next/dist/compiled/node-fetch'
 import { nextFontError } from '../next-font-error'
 import { getProxyAgent } from './get-proxy-agent'
 
@@ -60,7 +58,8 @@ export async function fetchCSSFromGoogleFonts(
         : undefined
 
       const res = await fetch(url, {
-        agent: getProxyAgent(),
+        // @ts-expect-error `undici`/Node.js type mismatch with the Web API
+        dispatcher: getProxyAgent(),
         // Add a timeout in dev
         signal,
         headers: {

packages/font/src/google/fetch-font-file.ts

@@ -1,5 +1,3 @@
-// @ts-ignore
-import fetch from 'next/dist/compiled/node-fetch'
 import { getProxyAgent } from './get-proxy-agent'
 
 /**
@@ -19,7 +17,8 @@ export async function fetchFontFile(url: string, isDev: boolean) {
   const controller = new AbortController()
   const timeoutId = setTimeout(() => controller.abort(), 3000)
   const arrayBuffer = await fetch(url, {
-    agent: getProxyAgent(),
+    // @ts-expect-error `undici`/Node.js type mismatch with the Web API
+    dispatcher: getProxyAgent(),
     // Add a timeout in dev
     signal: isDev ? controller.signal : undefined,
   })

packages/font/src/google/get-proxy-agent.ts

@@ -1,20 +1,11 @@
-// @ts-ignore
-import HttpsProxyAgent from 'next/dist/compiled/https-proxy-agent'
-// @ts-ignore
-import HttpProxyAgent from 'next/dist/compiled/http-proxy-agent'
-import type { Agent } from 'https'
+import { Agent as HttpAgent } from 'node:http'
+import { Agent as HttpsAgent } from 'node:https'
 
-/**
- * If the http(s)_proxy environment variables is set, return a proxy agent.
- */
-export function getProxyAgent(): Agent | undefined {
-  const httpsProxy = process.env['https_proxy'] || process.env['HTTPS_PROXY']
-  if (httpsProxy) {
-    return new HttpsProxyAgent(httpsProxy)
-  }
+/* If the http(s)_proxy environment variables are set, return a proxy agent. */
+export function getProxyAgent() {
+  const httpProxy = process.env['http_proxy'] ?? process.env['HTTP_PROXY']
+  const httpsProxy = process.env['https_proxy'] ?? process.env['HTTPS_PROXY']
 
-  const httpProxy = process.env['http_proxy'] || process.env['HTTP_PROXY']
-  if (httpProxy) {
-    return new HttpProxyAgent(httpProxy)
-  }
+  if (httpsProxy) return new HttpsAgent({ host: httpsProxy })
+  return new HttpAgent({ host: httpProxy })
 }

packages/font/src/google/index.ts

@@ -7,6 +7,7 @@ import type {
   NextFontWithVariable,
   Display,
 } from '../types'
+
 export declare function ABeeZee<
   T extends CssVariable | undefined = undefined
 >(options: {

packages/font/src/google/loader.test.ts

@@ -1,8 +1,4 @@
 import nextFontGoogleFontLoader from './loader'
-// @ts-ignore
-import fetch from 'next/dist/compiled/node-fetch'
-
-jest.mock('next/dist/compiled/node-fetch')
 
 describe('next/font/google loader', () => {
   afterEach(() => {
@@ -120,7 +116,7 @@ describe('next/font/google loader', () => {
         fontFunctionArguments: any,
         expectedUrl: any
       ) => {
-        fetch.mockResolvedValue({
+        globalThis.fetch = jest.fn().mockResolvedValue({
           ok: true,
           text: async () => 'OK',
         })

packages/font/tsconfig.json

@@ -9,5 +9,5 @@
     "rootDir": "src"
   },
   "include": ["src/**/*.ts"],
-  "exclude": ["node_modules"]
+  "exclude": ["node_modules", "src/**/*.test.ts"]
 }

packages/next/package.json

@@ -234,9 +234,7 @@
     "glob": "7.1.7",
     "gzip-size": "5.1.1",
     "http-proxy": "1.18.1",
-    "http-proxy-agent": "5.0.0",
     "https-browserify": "1.0.0",
-    "https-proxy-agent": "5.0.1",
     "icss-utils": "5.1.0",
     "ignore-loader": "0.1.2",
     "image-size": "1.0.0",