fix: Revert "fix: use @supabase/node-fetch"

This reverts commit f290bb3.
lucacasonato · Aug 28, 2023 · ae31b44 · ae31b44
1 parent f290bb3
commit ae31b44
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 46 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
   },
   "homepage": "https://github.com/supabase/functions-js#readme",
   "dependencies": {
-    "@supabase/node-fetch": "^2.6.13"
+    "cross-fetch": "^3.1.5"
   },
   "devDependencies": {
     "@types/jest": "^28.1.0",

diff --git a/src/helper.ts b/src/helper.ts
@@ -5,8 +5,7 @@ export const resolveFetch = (customFetch?: Fetch): Fetch => {
   if (customFetch) {
     _fetch = customFetch
   } else if (typeof fetch === 'undefined') {
-    _fetch = (...args) =>
-      import('@supabase/node-fetch' as any).then(({ default: fetch }) => fetch(...args))
+    _fetch = async (...args) => await (await import('cross-fetch')).fetch(...args)
   } else {
     _fetch = fetch
   }

diff --git a/src/types.ts b/src/types.ts
@@ -49,7 +49,7 @@ export type FunctionInvokeOptions = {
   /**
    * The HTTP verb of the request
    */
-  method?: "POST" | "GET" | "PUT" | "PATCH" | "DELETE"
+  method?: "POST"| "GET"| "PUT" | "PATCH" | "DELETE"
   /**
    * The body of the request.
    */

diff --git a/test/functions/hijack/index.ts b/test/functions/hijack/index.ts
@@ -1,20 +1,22 @@
 import { serve } from 'https://deno.land/[email protected]/http/server.ts'
 
 serve((req) => {
-  const p = Deno.upgradeHttp(req)
-
-  // Run this async IIFE concurrently, first packet won't arrive
-  // until we return HTTP101 response.
-  ;(async () => {
-    const [conn, firstPacket] = await p
-    const decoder = new TextDecoder()
-    const text = decoder.decode(firstPacket)
-    console.log(text)
-    // Hello
-    const uint8Array = new Uint8Array([72, 101, 108, 108, 111])
-    conn.write(uint8Array)
-    conn.close()
-  })()
+  const p = Deno.upgradeHttp(req);
+
+  (
+    // Run this async IIFE concurrently, first packet won't arrive
+    // until we return HTTP101 response.
+    async () => {
+      const [conn, firstPacket] = await p
+      const decoder = new TextDecoder()
+      const text = decoder.decode(firstPacket)
+      console.log(text)
+      // Hello
+      const uint8Array = new Uint8Array([72, 101, 108, 108, 111])
+      conn.write(uint8Array)
+      conn.close()
+    }
+  )()
 
   // HTTP101 - Switching Protocols
   return new Response(null, { status: 101 })

diff --git a/test/relay/container.ts b/test/relay/container.ts
@@ -1,7 +1,6 @@
 import * as fs from 'fs'
 import { nanoid } from 'nanoid'
-// @ts-ignore
-import nodeFetch from '@supabase/node-fetch'
+import crossFetch from 'cross-fetch'
 import { sign } from 'jsonwebtoken'
 import { GenericContainer, Network, StartedTestContainer, Wait } from 'testcontainers'
 import { ExecResult } from 'testcontainers/dist/docker/types'
@@ -88,7 +87,7 @@ export async function runRelay(
   log(`check function is healthy: ${slug + '-' + id}`)
   for (let ctr = 0; ctr < 30; ctr++) {
     try {
-      const healthCheck = await nodeFetch(
+      const healthCheck = await crossFetch(
         `http://localhost:${startedRelay.getMappedPort(8081)}/${slug}`,
         {
           method: 'POST',

diff --git a/test/utils/fetch.ts b/test/utils/fetch.ts
@@ -1,5 +1,4 @@
-// @ts-ignore
-import nodeFetch from '@supabase/node-fetch'
+import crossFetch from 'cross-fetch'
 
 /**
  * It returns a crossFetch function that uses overridden input: RequestInfo and init?: RequestInit for
@@ -12,5 +11,5 @@ export function getCustomFetch(
   reqInfo: RequestInfo | URL,
   reqInit?: RequestInit | undefined
 ): (input: RequestInfo | URL, init?: RequestInit | undefined) => Promise<Response> {
-  return (input, init) => nodeFetch(reqInfo, reqInit)
+  return (input, init) => crossFetch(reqInfo, reqInit)
 }