From f3e8959c7bd30342be586118fee95ab400bf20d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20De=20Boey?= <info@michaeldeboey.be>
Date: Mon, 21 Aug 2023 18:42:12 +0200
Subject: [PATCH] test(remix-server-runtime): remove polyfill references

---
 .../__tests__/formData-test.ts                | 30 ++++++++-----------
 .../remix-server-runtime/__tests__/setup.ts   |  1 +
 packages/remix-server-runtime/package.json    |  1 -
 3 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/packages/remix-server-runtime/__tests__/formData-test.ts b/packages/remix-server-runtime/__tests__/formData-test.ts
index 65299dc885f..430f9e0b3b8 100644
--- a/packages/remix-server-runtime/__tests__/formData-test.ts
+++ b/packages/remix-server-runtime/__tests__/formData-test.ts
@@ -1,9 +1,3 @@
-import {
-  Request as NodeRequest,
-  FormData as NodeFormData,
-} from "@remix-run/web-fetch";
-import { Blob, File } from "@remix-run/web-file";
-
 import { parseMultipartFormData } from "../formData";
 
 class CustomError extends Error {
@@ -14,12 +8,12 @@ class CustomError extends Error {
 
 describe("parseMultipartFormData", () => {
   it("can use a custom upload handler", async () => {
-    let formData = new NodeFormData();
+    let formData = new FormData();
     formData.set("a", "value");
     formData.set("blob", new Blob(["blob".repeat(1000)]), "blob.txt");
     formData.set("file", new File(["file".repeat(1000)], "file.txt"));
 
-    let req = new NodeRequest("https://test.com", {
+    let req = new Request("https://test.com", {
       method: "post",
       body: formData,
     });
@@ -48,12 +42,12 @@ describe("parseMultipartFormData", () => {
   });
 
   it("can return undefined", async () => {
-    let formData = new NodeFormData();
+    let formData = new FormData();
     formData.set("a", "value");
     formData.set("blob", new Blob(["blob".repeat(1000)]), "blob.txt");
     formData.set("file", new File(["file".repeat(1000)], "file.txt"));
 
-    let req = new NodeRequest("https://test.com", {
+    let req = new Request("https://test.com", {
       method: "post",
       body: formData,
     });
@@ -69,10 +63,10 @@ describe("parseMultipartFormData", () => {
   });
 
   it("can throw errors in upload handlers", async () => {
-    let formData = new NodeFormData();
+    let formData = new FormData();
     formData.set("blob", new Blob(["blob"]), "blob.txt");
 
-    let req = new NodeRequest("https://test.com", {
+    let req = new Request("https://test.com", {
       method: "post",
       body: formData,
     });
@@ -92,12 +86,12 @@ describe("parseMultipartFormData", () => {
 
   describe("stream should propagate events", () => {
     it("when controller errors", async () => {
-      let formData = new NodeFormData();
+      let formData = new FormData();
       formData.set("a", "value");
       formData.set("blob", new Blob(["blob".repeat(1000)]), "blob.txt");
       formData.set("file", new File(["file".repeat(1000)], "file.txt"));
 
-      let underlyingRequest = new NodeRequest("https://test.com", {
+      let underlyingRequest = new Request("https://test.com", {
         method: "post",
         body: formData,
       });
@@ -113,7 +107,7 @@ describe("parseMultipartFormData", () => {
         },
       });
 
-      let req = new NodeRequest("https://test.com", {
+      let req = new Request("https://test.com", {
         method: "post",
         body,
         headers: underlyingRequest.headers,
@@ -132,12 +126,12 @@ describe("parseMultipartFormData", () => {
     });
 
     it("when controller is closed", async () => {
-      let formData = new NodeFormData();
+      let formData = new FormData();
       formData.set("a", "value");
       formData.set("blob", new Blob(["blob".repeat(1000)]), "blob.txt");
       formData.set("file", new File(["file".repeat(1000)], "file.txt"));
 
-      let underlyingRequest = new NodeRequest("https://test.com", {
+      let underlyingRequest = new Request("https://test.com", {
         method: "post",
         body: formData,
       });
@@ -153,7 +147,7 @@ describe("parseMultipartFormData", () => {
         },
       });
 
-      let req = new NodeRequest("https://test.com", {
+      let req = new Request("https://test.com", {
         method: "post",
         body,
         headers: underlyingRequest.headers,
diff --git a/packages/remix-server-runtime/__tests__/setup.ts b/packages/remix-server-runtime/__tests__/setup.ts
index 917305ac938..451031301ac 100644
--- a/packages/remix-server-runtime/__tests__/setup.ts
+++ b/packages/remix-server-runtime/__tests__/setup.ts
@@ -1,2 +1,3 @@
 import { installGlobals } from "@remix-run/node";
+
 installGlobals();
diff --git a/packages/remix-server-runtime/package.json b/packages/remix-server-runtime/package.json
index 861045b0e95..2e25087ab98 100644
--- a/packages/remix-server-runtime/package.json
+++ b/packages/remix-server-runtime/package.json
@@ -25,7 +25,6 @@
     "type-fest": "^4.0.0"
   },
   "devDependencies": {
-    "@remix-run/web-file": "^3.0.3",
     "@types/set-cookie-parser": "^2.4.1",
     "typescript": "^5.1.6"
   },