fix(deps): remove node-fetch and abortcontroller-polyfill, upgrade uuid

Author: talentlessguy

plugin/package-lock.json

@@ -42,21 +42,19 @@
   "dependencies": {
     "@netlify/functions": "^1.6.0",
     "@netlify/ipx": "^1.4.6",
-    "abortcontroller-polyfill": "^1.7.3",
     "chalk": "^4.1.2",
     "co-body": "^6.1.0",
     "cookie": "^0.7.0",
     "etag": "^1.8.1",
     "fs-extra": "^10.0.0",
     "linkfs": "^2.1.0",
     "multer": "^2.0.0",
-    "node-fetch": "^2.6.1",
     "node-stream-zip": "^1.15.0",
     "pathe": "^0.3.0",
     "pretty-bytes": "^5.6.0",
     "semver": "^7.3.5",
     "statuses": "^2.0.1",
-    "uuid": "^9.0.0"
+    "uuid": "^11.1.0"
   },
   "devDependencies": {
     "@gatsbyjs/reach-router": "^2.0.0",

plugin/package.json

@@ -1,11 +1,9 @@
 import path from 'path'
 import process from 'process'
-import 'abortcontroller-polyfill/dist/abortcontroller-polyfill-only'
 
 import { NetlifyPluginOptions } from '@netlify/build'
 import { stripIndent } from 'common-tags'
 import { existsSync } from 'fs-extra'
-import fetch from 'node-fetch'
 
 import { normalizedCacheDir, restoreCache, saveCache } from './helpers/cache'
 import {

plugin/src/index.ts

@@ -12,7 +12,6 @@ import {
 import cookie from 'cookie'
 import type { GatsbyFunctionResponse } from 'gatsby'
 import { GatsbyFunctionRequest } from 'gatsby'
-import fetch, { Headers } from 'node-fetch'
 import statuses from 'statuses'
 
 interface NetlifyFunctionParams {
@@ -311,6 +310,6 @@ export const proxyRequest = async (event: HandlerEvent, res) => {
     }
   }
 
-  res.write(await response.buffer())
+  res.write(Buffer.from(await response.arrayBuffer()))
   res.send()
 }

plugin/src/templates/api/utils.ts

@@ -1,9 +1,7 @@
 /* eslint-disable no-unused-vars */
-const fetch = require(`node-fetch`)
 const { readFileSync } = require('fs')
 const path = require('path')
 
-const FormData = require('form-data')
 // Based on Gatsby Functions integration tests
 // Source: https://github.com/gatsbyjs/gatsby/blob/master/integration-tests/functions/test-helpers.js
 

plugin/test/fixtures/v4/functions-without-gatsby-plugin/e2e-tests/test-helpers.js

@@ -1,9 +1,7 @@
 /* eslint-disable no-unused-vars */
-const fetch = require(`node-fetch`)
 const { readFileSync } = require('fs')
 const path = require('path')
 
-const FormData = require('form-data')
 // Based on Gatsby Functions integration tests
 // Source: https://github.com/gatsbyjs/gatsby/blob/master/integration-tests/functions/test-helpers.js
 

plugin/test/fixtures/v5/functions-without-gatsby-plugin/e2e-tests/test-helpers.js

@@ -1,9 +1,7 @@
 /* eslint-disable no-unused-vars */
-const fetch = require(`node-fetch`)
 const { readFileSync } = require('fs')
 const path = require('path')
 
-const FormData = require('form-data')
 // Based on Gatsby Functions integration tests
 // Source: https://github.com/gatsbyjs/gatsby/blob/master/integration-tests/functions/test-helpers.js
 

plugin/test/fixtures/v5/with-adapters/e2e-tests/test-helpers.js

@@ -7,11 +7,6 @@ import Chance from 'chance'
 import { onBuild, onSuccess } from '../../src/index'
 import { enableGatsbyExcludeDatastoreFromBundle } from '../helpers'
 
-jest.mock('node-fetch', () => ({
-  __esModule: true,
-  default: jest.fn(),
-}))
-
 jest.mock('../../src/helpers/config', () => {
   const configObj = jest.requireActual('../../src/helpers/config')
 
@@ -209,14 +204,18 @@ describe('plugin', () => {
   })
 
   describe('onSuccess', () => {
-    const fetch = require('node-fetch').default
+    const mockFetch = jest.fn()
+    const originalFetch = globalThis.fetch
 
     beforeEach(() => {
-      fetch.mockImplementation(mockFetchMethod)
+      globalThis.fetch = mockFetch
+      mockFetch.mockImplementation(mockFetchMethod)
       enableGatsbyExcludeDatastoreFromBundle()
     })
 
     afterEach(() => {
+      globalThis.fetch = originalFetch
+      jest.clearAllMocks()
       delete process.env.GATSBY_EXCLUDE_DATASTORE_FROM_BUNDLE
       delete process.env.DEPLOY_PRIME_URL
     })