From dda4d75de1ff30ffe6579067b7d1d637a4b9a405 Mon Sep 17 00:00:00 2001
From: Jonathan Ho <heiheiho000@gmail.com>
Date: Thu, 13 Apr 2023 15:05:18 -0700
Subject: [PATCH] fix(rest,utils): reverse "refactor: use node-fetch" 6a6a334
 (#2995)

---
 denoImportMap.json                | 3 +--
 packages/rest/package.json        | 3 +--
 packages/rest/src/manager.ts      | 5 ++---
 packages/utils/package.json       | 1 -
 packages/utils/src/urlToBase64.ts | 1 -
 yarn.lock                         | 2 --
 6 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/denoImportMap.json b/denoImportMap.json
index a2c52b31d..a4e4110fc 100644
--- a/denoImportMap.json
+++ b/denoImportMap.json
@@ -4,7 +4,6 @@
     "node:fs": "https://deno.land/std@0.176.0/node/fs.ts",
     "node:events": "https://deno.land/std@0.176.0/node/events.ts",
     "tweetnacl": "npm:tweetnacl",
-    "node-fetch": "npm:node-fetch",
     "ws": "npm:ws",
     "mocha": "https://deno.land/std@0.168.0/testing/bdd.ts",
     "chai": "https://cdn.skypack.dev/chai@4.3.4?dts",
@@ -19,4 +18,4 @@
     "@discordeno/gateway": "./packages/gateway/dist/index.js",
     "@discordeno/bot": "./packages/bot/dist/index.js"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/rest/package.json b/packages/rest/package.json
index 6103d4861..5baafb685 100644
--- a/packages/rest/package.json
+++ b/packages/rest/package.json
@@ -26,8 +26,7 @@
   "dependencies": {
     "@discordeno/types": "19.0.0-alpha.1",
     "@discordeno/utils": "19.0.0-alpha.1",
-    "dotenv": "^16.0.3",
-    "node-fetch": "^3.3.1"
+    "dotenv": "^16.0.3"
   },
   "devDependencies": {
     "@swc/cli": "^0.1.62",
diff --git a/packages/rest/src/manager.ts b/packages/rest/src/manager.ts
index 8dda9ed54..5a2522997 100644
--- a/packages/rest/src/manager.ts
+++ b/packages/rest/src/manager.ts
@@ -2,7 +2,6 @@
 /* eslint-disable no-const-assign */
 import { InteractionResponseTypes } from '@discordeno/types'
 import { calculateBits, camelize, camelToSnakeCase, delay, getBotIdFromToken, logger, processReactionString, urlToBase64 } from '@discordeno/utils'
-import fetch from 'node-fetch'
 
 import { createInvalidRequestBucket } from './invalidBucket.js'
 import { Queue } from './queue.js'
@@ -48,8 +47,8 @@ import type {
   MfaLevels,
   ModifyGuildTemplate,
 } from '@discordeno/types'
-import type { CreateRequestBodyOptions, CreateRestManagerOptions, RestManager, SendRequestOptions } from './types.js'
 import { createRoutes } from './routes.js'
+import type { CreateRequestBodyOptions, CreateRestManagerOptions, RestManager, SendRequestOptions } from './types.js'
 
 // TODO: make dynamic based on package.json file
 const version = '19.0.0-alpha.1'
@@ -417,7 +416,7 @@ export function createRestManager(options: CreateRestManagerOptions): RestManage
           throw new Error(JSON.stringify(err))
         }
 
-        return result.status !== 204 ? ((await result.json()) as any) : undefined
+        return result.status !== 204 ? await result.json() : undefined
       }
 
       // eslint-disable-next-line no-async-promise-executor
diff --git a/packages/utils/package.json b/packages/utils/package.json
index 0ca9c8ada..aa97eaa0c 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -24,7 +24,6 @@
   },
   "dependencies": {
     "@discordeno/types": "19.0.0-alpha.1",
-    "node-fetch": "^3.3.1",
     "tweetnacl": "^1.0.3"
   },
   "devDependencies": {
diff --git a/packages/utils/src/urlToBase64.ts b/packages/utils/src/urlToBase64.ts
index ee7085d8c..68c54bd31 100644
--- a/packages/utils/src/urlToBase64.ts
+++ b/packages/utils/src/urlToBase64.ts
@@ -1,4 +1,3 @@
-import fetch from 'node-fetch'
 import { encode } from './base64.js'
 
 /** Converts a url to base 64. Useful for example, uploading/creating server emojis. */
diff --git a/yarn.lock b/yarn.lock
index 77a78c06a..e0cca8fd3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -117,7 +117,6 @@ __metadata:
     eslint: ^8.36.0
     eslint-config-discordeno: "*"
     mocha: ^10.2.0
-    node-fetch: ^3.3.1
     sinon: ^15.0.2
     ts-node: ^10.9.1
     tsconfig: "*"
@@ -182,7 +181,6 @@ __metadata:
     eslint: ^8.36.0
     eslint-config-discordeno: "*"
     mocha: ^10.2.0
-    node-fetch: ^3.3.1
     sinon: ^15.0.2
     ts-node: ^10.9.1
     tsconfig: "*"