Fix fetch (#80)

* Fix Jest + node-fetch

* v1.6.5

jest.config.json

@@ -3,7 +3,10 @@
 		{
 			"displayName": "src",
 			"clearMocks": true,
-			"preset": "ts-jest",
+			"preset": "ts-jest/presets/js-with-ts-esm",
+			"transformIgnorePatterns": [
+				"node_modules/(?!(data-uri-to-buffer|formdata-polyfill|fetch-blob|node-fetch|node:http)/)"
+			],
 			"setupFilesAfterEnv": ["jest-extended/all"],
 			"testEnvironment": "node",
 			"testPathIgnorePatterns": ["/node_modules/"],

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "gamgee",
-	"version": "1.6.4",
+	"version": "1.6.5",
 	"description": "A Discord bot for managing a song request queue.",
 	"private": true,
 	"scripts": {
@@ -48,7 +48,7 @@
 		"dotenv": "^16.0.1",
 		"humanize-duration": "^3.27.2",
 		"lodash": "^4.17.21",
-		"node-fetch-cjs": "^3.2.6",
+		"node-fetch": "^3.2.6",
 		"node-persist": "^3.1.0",
 		"reflect-metadata": "^0.1.13",
 		"soundcloud-scraper": "^5.0.2",

src/actions/getVideoDetails.ts

@@ -5,7 +5,7 @@ import { isString } from "../helpers/guards.js";
 import { richErrorMessage } from "../helpers/richErrorMessage.js";
 import { URL } from "url";
 import { useLogger } from "../logger.js";
-import fetch from "node-fetch-cjs";
+import fetch from "node-fetch";
 import SoundCloud from "soundcloud-scraper";
 import urlMetadata from "../helpers/urlMetadata/index.js";
 import ytdl from "ytdl-core";

src/helpers/getPonyFmTrackInfoFromId.ts

@@ -1,6 +1,6 @@
-import fetch from "node-fetch-cjs";
-import { VideoError } from "../errors/index.js";
+import fetch from "node-fetch";
 import { isObject, isString } from "./guards.js";
+import { VideoError } from "../errors/index.js";
 
 // Based on https://github.com/Poniverse/Pony.fm/blob/a1522f3cd73d849099e4a3d897656dc8c4795dd7/app/Http/Controllers/Api/V1/TracksController.php#L129
 export interface PonyFmTrackAPIResponse {

src/helpers/githubMetadata.ts

@@ -1,8 +1,8 @@
-import type { RequestInit } from "node-fetch-cjs";
+import type { RequestInit } from "node-fetch";
+import fetch from "node-fetch";
+import { isBoolean, isNumber, isObject, isString, isUrlString } from "./guards.js";
 import { URL } from "url";
 import { useLogger } from "../logger.js";
-import { isBoolean, isNumber, isObject, isString, isUrlString } from "./guards.js";
-import fetch from "node-fetch-cjs";
 
 export interface GitHubMetadata {
 	name: string;

src/helpers/urlMetadata/index.ts

@@ -1,9 +1,9 @@
 /* Adapted from https://github.com/laurengarcia/url-metadata */
 
 import type { Fields } from "./lib/metadataFields.js";
-import type { RequestInit } from "node-fetch-cjs";
+import type { RequestInit } from "node-fetch";
 import type { URL } from "url";
-import fetch from "node-fetch-cjs";
+import fetch from "node-fetch";
 import parse from "./lib/parse.js";
 import timeoutSignal from "timeout-signal";
 

tsconfig.base.json

@@ -6,7 +6,7 @@
 		"moduleResolution": "node",
 		"allowSyntheticDefaultImports": true,
 		"esModuleInterop": true,
-		"allowJs": false,
+		"allowJs": true,
 		"declaration": false,
 		"removeComments": true,
 		"sourceMap": true,