Merge pull request #68 from janglad/bug/next-redirect

Fix client error when redirecting in action
janglad · Oct 3, 2024 · 407e0aa · 407e0aa
2 parents 66e261d + daf1a07
commit 407e0aa
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/.changeset/brown-hairs-travel.md b/.changeset/brown-hairs-travel.md
@@ -0,0 +1,5 @@
+---
+"safe-fn-react": patch
+---
+
+- Fix possible client side type error when redirecting in server action
diff --git a/packages/safe-fn-react/src/useServerAction.ts b/packages/safe-fn-react/src/useServerAction.ts
@@ -56,7 +56,13 @@ export const useServerAction = <TAction extends AnySafeFnAction>(
         void ResultAsync.fromThrowable(callbacks.onStart, callbackCatch)(args);
       }
 
-      const actionResult = (await action(args)) as ActionReturnActionResult;
+      // Undefined return happens when action redirects/has uncaught error.
+      const actionResult = (await action(args)) as
+        | ActionReturnActionResult
+        | undefined;
+      if (actionResult === undefined) {
+        return;
+      }
       const res = actionResultToResult(actionResult) as ActionReturnResult;
 
       setResult(res);