Fix node@16 tests

elbywan · Jun 1, 2024 · 71aa327 · 71aa327
1 parent 4693837
commit 71aa327
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/core.ts b/src/core.ts
@@ -51,9 +51,9 @@ export const core: Wretch = {
   headers(headerValues) {
     const headers =
       !headerValues ? {} :
-      Array.isArray(headerValues) ? Object.fromEntries(headerValues) :
-      "entries" in headerValues ? Object.fromEntries((headerValues as Headers).entries()) :
-      headerValues
+        Array.isArray(headerValues) ? Object.fromEntries(headerValues) :
+          "entries" in headerValues ? Object.fromEntries((headerValues as Headers).entries()) :
+            headerValues
     return { ...this, _options: mix(this._options, { headers }) }
   },
   accept(headerValue) {
@@ -92,11 +92,11 @@ export const core: Wretch = {
     let base = this.url(url).options({ method })
     // "Jsonify" the body if it is an object and if it is likely that the content type targets json.
     const contentType = extractContentType(base._options.headers)
-    const isFormDataInstance = body => {
-      const formData = this._config.polyfill("FormData", false)
-      return formData !== null && body instanceof formData
-    }
-    const jsonify = typeof body === "object" && !isFormDataInstance(body) && (!base._options.headers || !contentType || isLikelyJsonMime(contentType))
+    const formDataClass = this._config.polyfill("FormData", false)
+    const jsonify =
+      typeof body === "object" &&
+      !(formDataClass && body instanceof formDataClass) &&
+      (!base._options.headers || !contentType || isLikelyJsonMime(contentType))
     base =
       !body ? base :
         jsonify ? base.json(body, contentType) :

diff --git a/test/node/wretch.spec.ts b/test/node/wretch.spec.ts
@@ -257,7 +257,7 @@ describe("Wretch", function () {
       false
     );
 
-    let formData = new FormData()
+    let formData: any = new FormData()
     formData.append("hello", "world")
     formData.append("duck", "Muscovy")
     formData.append("duckImage", fs.createReadStream(duckImagePath))