Don't log thrown response stubs

remix-run · May 3, 2024 · d516612 · d516612
1 parent b6ff71f
commit d516612
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 5 deletions.
diff --git a/.changeset/rare-dodos-push.md b/.changeset/rare-dodos-push.md
@@ -2,4 +2,4 @@
 "@remix-run/server-runtime": patch
 ---
 
-Don't log throw redirect response stubs via handleError in Single Fetch
+Don't log thrown response stubs via `handleError` in Single Fetch
diff --git a/integration/single-fetch-test.ts b/integration/single-fetch-test.ts
@@ -1687,7 +1687,7 @@ test.describe("single-fetch", () => {
             response.headers.set("Location", "/data");
             throw response;
           }
-          export default function  Component() {
+          export default function Component() {
             return <h1>Should not see me</h1>;
           }
         `,
@@ -1705,6 +1705,43 @@ test.describe("single-fetch", () => {
     expect(errorLogs.length).toBe(0);
   });
 
+  test("does not log thrown non-redirect response stubs via handleError", async () => {
+    let fixture = await createFixture({
+      config: {
+        future: {
+          unstable_singleFetch: true,
+        },
+      },
+      files: {
+        ...files,
+        "app/routes/redirect.tsx": js`
+          export function action({ response }) {
+            response.status = 400;
+            throw response;
+          }
+          export function loader({ response }) {
+            response.status = 400;
+            throw response;
+          }
+          export default function Component() {
+            return <h1>Should not see me</h1>;
+          }
+        `,
+      },
+    });
+
+    let errorLogs = [];
+    console.error = (e) => errorLogs.push(e);
+    await fixture.requestDocument("/redirect");
+    expect(errorLogs.length).toBe(1); // ErrorBoundary render logs this
+    await fixture.requestSingleFetchData("/redirect.data");
+    await fixture.requestSingleFetchData("/redirect.data", {
+      method: "post",
+      body: null,
+    });
+    expect(errorLogs.length).toBe(1);
+  });
+
   test.describe("client loaders", () => {
     test("when no routes have client loaders", async ({ page }) => {
       let fixture = await createFixture(

diff --git a/packages/remix-server-runtime/server.ts b/packages/remix-server-runtime/server.ts
@@ -40,6 +40,7 @@ import {
   getSingleFetchDataStrategy,
   getSingleFetchRedirect,
   getSingleFetchResourceRouteDataStrategy,
+  isResponseStub,
   mergeResponseStubs,
   singleFetchAction,
   singleFetchLoaders,
@@ -430,7 +431,7 @@ async function handleDocumentRequest(
   if (context.errors) {
     Object.values(context.errors).forEach((err) => {
       // @ts-expect-error `err.error` is "private" from users but intended for internal use
-      if (!isRouteErrorResponse(err) || err.error) {
+      if ((!isRouteErrorResponse(err) || err.error) && !isResponseStub(err)) {
         handleError(err);
       }
     });

diff --git a/packages/remix-server-runtime/single-fetch.ts b/packages/remix-server-runtime/single-fetch.ts
@@ -184,7 +184,7 @@ export async function singleFetchAction(
     if (context.errors) {
       Object.values(context.errors).forEach((err) => {
         // @ts-expect-error This is "private" from users but intended for internal use
-        if (!isRouteErrorResponse(err) || err.error) {
+        if ((!isRouteErrorResponse(err) || err.error) && !isResponseStub(err)) {
           handleError(err);
         }
       });
@@ -273,7 +273,7 @@ export async function singleFetchLoaders(
     if (context.errors) {
       Object.values(context.errors).forEach((err) => {
         // @ts-expect-error This is "private" from users but intended for internal use
-        if (!isRouteErrorResponse(err) || err.error) {
+        if ((!isRouteErrorResponse(err) || err.error) && !isResponseStub(err)) {
           handleError(err);
         }
       });