Merge pull request #157 from avivasyuta/remove_formdata_patch

remove FormData patching
jpillora · Aug 19, 2022 · caf3b91 · caf3b91
2 parents aa2df41 + 4b9d21a
commit caf3b91
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 67 deletions.
diff --git a/example/fetch-form-data.html b/example/fetch-form-data.html
@@ -18,8 +18,8 @@ <h5>Fetch with form data</h5>
     console.log("AFTER", request, response);
   });
   document.getElementById("submit").addEventListener("click", function() {
-    var username = document.getElementById("username").value;
-    var password = document.getElementById("password").value;
+    const username = document.getElementById("username").value;
+    const password = document.getElementById("password").value;
     const data = new FormData();
     data.append("username", username);
     data.append("password", password);

diff --git a/src/main.js b/src/main.js
@@ -4,7 +4,6 @@ import headers from "./misc/headers";
 //patchable types
 import XMLHttpRequest from "./patch/xmlhttprequest";
 import fetch from "./patch/fetch";
-import FormData from "./patch/formdata";
 
 //global state
 import hooks from "./misc/hooks";
@@ -30,17 +29,14 @@ xhook.after = function(handler, i) {
 xhook.enable = function() {
   XMLHttpRequest.patch();
   fetch.patch();
-  FormData.patch();
 };
 xhook.disable = function() {
   XMLHttpRequest.unpatch();
   fetch.unpatch();
-  FormData.unpatch();
 };
 //expose native objects
 xhook.XMLHttpRequest = XMLHttpRequest.Native;
 xhook.fetch = fetch.Native;
-xhook.FormData = FormData.Native;
 
 //expose helpers
 xhook.headers = headers.convert;
@@ -49,4 +45,4 @@ xhook.headers = headers.convert;
 xhook.enable();
 
 
-export default xhook;
+export default xhook;
diff --git a/src/patch/fetch.js b/src/patch/fetch.js
@@ -1,7 +1,6 @@
 import { windowRef } from "../misc/window";
 import { mergeObjects } from "../misc/events";
 import hooks from "../misc/hooks";
-import formData from "./formdata";
 
 //browser's fetch
 const Native = windowRef.fetch;
@@ -26,10 +25,6 @@ const Xhook = function(url, options) {
   return new Promise(function(resolve, reject) {
     let fullfiled = resolve
     const getRequest = function() {
-      if (options.body instanceof formData.Xhook) {
-        options.body = options.body.fd;
-      }
-
       if (options.headers) {
         options.headers = new Headers(options.headers);
       }

diff --git a/src/patch/formdata.js b/src/patch/formdata.js
diff --git a/src/patch/xmlhttprequest.js b/src/patch/xmlhttprequest.js
@@ -7,7 +7,6 @@ import {
 } from "../misc/events";
 import { EventEmitter } from "../misc/event-emitter";
 import headers from "../misc/headers";
-import formData from "./formdata";
 import hooks from "../misc/hooks";
 
 const nullify = res => (res === undefined ? null : res);
@@ -288,10 +287,6 @@ const Xhook = function() {
           xhr.setRequestHeader(header, value);
         }
       }
-      //extract real formdata
-      if (request.body instanceof formData.Xhook) {
-        request.body = request.body.fd;
-      }
       //real send!
       xhr.send(request.body);
     };