feat(remix-node)!: don't export fetch API (#7293)

Co-authored-by: Matt Brophy <matt@brophy.org>
remix-run · Sep 6, 2023 · edffccb · edffccb
1 parent 2279d7e
commit edffccb
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 248 deletions.
diff --git a/.changeset/heavy-items-search.md b/.changeset/heavy-items-search.md
@@ -0,0 +1,5 @@
+---
+"@remix-run/node": major
+---
+
+Stop exporting the `fetch` API in favor of using the version in the global scope - which is polyfilled via `installGlobals`
diff --git a/packages/remix-architect/__tests__/server-test.ts b/packages/remix-architect/__tests__/server-test.ts
@@ -2,10 +2,7 @@ import fsp from "node:fs/promises";
 import path from "node:path";
 import lambdaTester from "lambda-tester";
 import type { APIGatewayProxyEventV2 } from "aws-lambda";
-import {
-  createRequestHandler as createRemixRequestHandler,
-  Response as NodeResponse,
-} from "@remix-run/node";
+import { createRequestHandler as createRemixRequestHandler } from "@remix-run/node";
 
 import {
   createRequestHandler,
@@ -251,14 +248,14 @@ describe("architect createRemixRequest", () => {
 
 describe("sendRemixResponse", () => {
   it("handles regular responses", async () => {
-    let response = new NodeResponse("anything");
+    let response = new Response("anything");
     let result = await sendRemixResponse(response);
     expect(result.body).toBe("anything");
   });
 
   it("handles resource routes with regular data", async () => {
     let json = JSON.stringify({ foo: "bar" });
-    let response = new NodeResponse(json, {
+    let response = new Response(json, {
       headers: {
         "Content-Type": "application/json",
         "content-length": json.length.toString(),
@@ -273,7 +270,7 @@ describe("sendRemixResponse", () => {
   it("handles resource routes with binary data", async () => {
     let image = await fsp.readFile(path.join(__dirname, "554828.jpeg"));
 
-    let response = new NodeResponse(image, {
+    let response = new Response(image, {
       headers: {
         "content-type": "image/jpeg",
         "content-length": image.length.toString(),

diff --git a/packages/remix-express/__tests__/server-test.ts b/packages/remix-express/__tests__/server-test.ts
@@ -1,11 +1,8 @@
+import { Readable } from "node:stream";
+import { createRequestHandler as createRemixRequestHandler } from "@remix-run/node";
 import express from "express";
-import supertest from "supertest";
 import { createRequest, createResponse } from "node-mocks-http";
-import {
-  createRequestHandler as createRemixRequestHandler,
-  Response as NodeResponse,
-} from "@remix-run/node";
-import { Readable } from "node:stream";
+import supertest from "supertest";
 
 import {
   createRemixHeaders,
@@ -103,7 +100,8 @@ describe("express createRequestHandler", () => {
     it("handles body as stream", async () => {
       mockedCreateRequestHandler.mockImplementation(() => async () => {
         let stream = Readable.from("hello world");
-        return new NodeResponse(stream, { status: 200 }) as unknown as Response;
+        let webStream = Readable.toWeb(stream);
+        return new Response(webStream as ReadableStream, { status: 200 });
       });
 
       let request = supertest(createApp());

diff --git a/packages/remix-node/__tests__/fetch-test.ts b/packages/remix-node/__tests__/fetch-test.ts
diff --git a/packages/remix-node/fetch.ts b/packages/remix-node/fetch.ts
diff --git a/packages/remix-node/globals.ts b/packages/remix-node/globals.ts
@@ -1,3 +1,11 @@
+import {
+  fetch as nodeFetch,
+  FormData as NodeFormData,
+  Headers as NodeHeaders,
+  Request as NodeRequest,
+  Response as NodeResponse,
+} from "@remix-run/web-fetch";
+import { Blob as NodeBlob, File as NodeFile } from "@remix-run/web-file";
 import {
   ByteLengthQueuingStrategy as NodeByteLengthQueuingStrategy,
   CountQueuingStrategy as NodeCountQueuingStrategy,
@@ -14,16 +22,6 @@ import {
   WritableStreamDefaultWriter as NodeWritableStreamDefaultWriter,
 } from "@remix-run/web-stream";
 
-import {
-  Blob as NodeBlob,
-  File as NodeFile,
-  FormData as NodeFormData,
-  Headers as NodeHeaders,
-  Request as NodeRequest,
-  Response as NodeResponse,
-  fetch as nodeFetch,
-} from "./fetch";
-
 declare global {
   namespace NodeJS {
     interface ProcessEnv {

diff --git a/packages/remix-node/index.ts b/packages/remix-node/index.ts
@@ -1,11 +1,3 @@
-export type {
-  HeadersInit,
-  RequestInfo,
-  RequestInit,
-  ResponseInit,
-} from "./fetch";
-export { fetch, FormData, Headers, Request, Response } from "./fetch";
-
 export { installGlobals } from "./globals";
 
 export { createFileSessionStorage } from "./sessions/fileStorage";