From 1e9118ce88e2f8a77592ef38fbcf475ca0869564 Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Thu, 22 Dec 2022 13:56:04 -0500
Subject: [PATCH 1/2] Fix shouldRevalidate on fetcher action redirect

---
 packages/router/__tests__/router-test.ts | 5 -----
 packages/router/router.ts                | 3 +--
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/packages/router/__tests__/router-test.ts b/packages/router/__tests__/router-test.ts
index 7dd5637d85..39d2c8aac2 100644
--- a/packages/router/__tests__/router-test.ts
+++ b/packages/router/__tests__/router-test.ts
@@ -2068,15 +2068,10 @@ describe("a router", () => {
           "currentParams": Object {},
           "currentUrl": "http://localhost/",
           "defaultShouldRevalidate": true,
-          "formAction": "/fetch",
-          "formData": FormData {},
-          "formEncType": "application/x-www-form-urlencoded",
-          "formMethod": "post",
           "nextParams": Object {},
           "nextUrl": "http://localhost/",
         }
       `);
-      expect(Object.fromEntries(arg.formData)).toEqual({ key: "value" });
 
       router.dispose();
     });
diff --git a/packages/router/router.ts b/packages/router/router.ts
index 81d8fdaf62..6365a49e58 100644
--- a/packages/router/router.ts
+++ b/packages/router/router.ts
@@ -1416,7 +1416,6 @@ export function createRouter(init: RouterInit): Router {
       updateState({ fetchers: new Map(state.fetchers) });
 
       return startRedirectNavigation(state, actionResult, {
-        submission,
         isFetchActionRedirect: true,
       });
     }
@@ -1512,7 +1511,7 @@ export function createRouter(init: RouterInit): Router {
 
     let redirect = findRedirect(results);
     if (redirect) {
-      return startRedirectNavigation(state, redirect, { submission });
+      return startRedirectNavigation(state, redirect);
     }
 
     // Process and commit output from loaders

From d8eab9ce5a51453870d8a56c8e7dc8ddc4ace0d8 Mon Sep 17 00:00:00 2001
From: Matt Brophy <matt@brophy.org>
Date: Thu, 22 Dec 2022 13:56:24 -0500
Subject: [PATCH 2/2] Add changeset

---
 .changeset/swift-bottles-cheat.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/swift-bottles-cheat.md

diff --git a/.changeset/swift-bottles-cheat.md b/.changeset/swift-bottles-cheat.md
new file mode 100644
index 0000000000..4b6bb491d1
--- /dev/null
+++ b/.changeset/swift-bottles-cheat.md
@@ -0,0 +1,5 @@
+---
+"@remix-run/router": patch
+---
+
+Fix fetcher shouldRevalidate