wip: no-revalidate server actions

Author: jacob-ebey

integration/rsc/rsc-test.ts

@@ -1,4 +1,8 @@
-import { test, expect } from "@playwright/test";
+import {
+  test,
+  expect,
+  type Response as PlaywrightResponse,
+} from "@playwright/test";
 import getPort from "get-port";
 
 import { implementations, js, setupRscTest, validateRSCHtml } from "./utils";
@@ -1074,6 +1078,13 @@ implementations.forEach((implementation) => {
 
             "src/routes/hydrate-fallback-props/home.tsx": js`
               export { default, clientLoader, HydrateFallback } from "./home.client";
+
+              export const unstable_middleware = [
+                async (_, next) => {
+                  const response = await next();
+                  return response.headers.set("x-test", "test");
+                }
+              ];
             `,
             "src/routes/hydrate-fallback-props/home.client.tsx": js`
               "use client";
@@ -1124,6 +1135,10 @@ implementations.forEach((implementation) => {
             "src/routes/no-revalidate-server-action/home.tsx": js`
               import ClientHomeRoute from "./home.client";
 
+              export function loader() {
+                console.log("loader");
+              }
+
               export default function HomeRoute() {
                 return <ClientHomeRoute identity={{}} />;
               }
@@ -1568,21 +1583,34 @@ implementations.forEach((implementation) => {
           validateRSCHtml(await page.content());
         });
 
-        test("Supports server actions that disable revalidation", async ({
+        test.only("Supports server actions that disable revalidation", async ({
           page,
         }) => {
           await page.goto(
             `http://localhost:${port}/no-revalidate-server-action`,
             { waitUntil: "networkidle" },
           );
 
+          const actionResponsePromise = new Promise<PlaywrightResponse>(
+            (resolve) => {
+              page.on("response", async (response) => {
+                if (!!(await response.request().headerValue("rsc-action-id"))) {
+                  resolve(response);
+                }
+              });
+            },
+          );
+
           await page.click("[data-submit]");
           await page.waitForSelector("[data-state]");
           await page.waitForSelector("[data-pending]", { state: "hidden" });
           await page.waitForSelector("[data-revalidated]", { state: "hidden" });
           expect(await page.locator("[data-state]").textContent()).toBe(
             "no revalidate",
           );
+
+          const actionResponse = await actionResponsePromise;
+          expect(await actionResponse.headerValue("x-test")).toBe("test");
         });
       });
 

packages/react-router/lib/router/router.ts

@@ -432,7 +432,7 @@ export interface StaticHandler {
       requestContext?: unknown;
       filterMatchesToLoad?: (match: AgnosticDataRouteMatch) => boolean;
       skipLoaderErrorBubbling?: boolean;
-      skipRevalidation?: boolean;
+      skipRevalidation?: boolean | (() => boolean);
       dataStrategy?: DataStrategyFunction<unknown>;
       unstable_generateMiddlewareResponse?: (
         query: (r: Request) => Promise<StaticHandlerContext | Response>,
@@ -3631,7 +3631,9 @@ export function createStaticHandler(
                   skipLoaderErrorBubbling === true,
                   null,
                   filterMatchesToLoad || null,
-                  skipRevalidation === true,
+                  skipRevalidation === true ||
+                    (typeof skipRevalidation === "function" &&
+                      skipRevalidation() === true),
                 );
 
                 if (isResponse(result)) {
@@ -3729,7 +3731,8 @@ export function createStaticHandler(
       skipLoaderErrorBubbling === true,
       null,
       filterMatchesToLoad || null,
-      skipRevalidation === true,
+      skipRevalidation === true ||
+        (typeof skipRevalidation === "function" && skipRevalidation() === true),
     );
 
     if (isResponse(result)) {
@@ -3912,7 +3915,7 @@ export function createStaticHandler(
     skipLoaderErrorBubbling: boolean,
     routeMatch: AgnosticDataRouteMatch | null,
     filterMatchesToLoad: ((m: AgnosticDataRouteMatch) => boolean) | null,
-    skipRevalidation: boolean,
+    skipRevalidation: boolean | (() => boolean),
   ): Promise<Omit<StaticHandlerContext, "location" | "basename"> | Response> {
     invariant(
       request.signal,
@@ -3979,7 +3982,7 @@ export function createStaticHandler(
     skipLoaderErrorBubbling: boolean,
     isRouteRequest: boolean,
     filterMatchesToLoad: ((m: AgnosticDataRouteMatch) => boolean) | null,
-    skipRevalidation: boolean,
+    skipRevalidation: boolean | (() => boolean),
   ): Promise<Omit<StaticHandlerContext, "location" | "basename"> | Response> {
     let result: DataResult;
 
@@ -4054,7 +4057,10 @@ export function createStaticHandler(
       };
     }
 
-    if (skipRevalidation) {
+    if (
+      skipRevalidation === true ||
+      (typeof skipRevalidation === "function" && skipRevalidation() === true)
+    ) {
       if (isErrorResult(result)) {
         let boundaryMatch = skipLoaderErrorBubbling
           ? actionMatch

packages/react-router/lib/rsc/server.rsc.ts

@@ -721,14 +721,18 @@ async function generateRenderResponse(
   });
 
   let actionResult: Promise<unknown> | undefined;
+  let skipRevalidation = false;
   const ctx: ServerContext = {
     runningAction: false,
   };
   const result = await ServerStorage.run(ctx, () =>
     staticHandler.query(request, {
       requestContext,
       skipLoaderErrorBubbling: isDataRequest,
-      skipRevalidation: isSubmission,
+      skipRevalidation: () => {
+        // TODO: This should opt out of loader calls but is not at the moment.
+        return isSubmission || skipRevalidation;
+      },
       ...(routeIdsToLoad
         ? { filterMatchesToLoad: (m) => routeIdsToLoad!.includes(m.route.id) }
         : null),
@@ -764,6 +768,7 @@ async function generateRenderResponse(
             );
           }
 
+          skipRevalidation = result?.revalidate === false;
           actionResult = result?.actionResult;
           formState = result?.formState;
           request = result?.revalidationRequest ?? request;
@@ -779,20 +784,6 @@ async function generateRenderResponse(
               undefined,
             );
           }
-
-          if (result && result.revalidate === false) {
-            return generateResponse(
-              {
-                headers: new Headers(),
-                statusCode: 200,
-                payload: {
-                  type: "action",
-                  actionResult: Promise.resolve(result.actionResult),
-                },
-              },
-              { temporaryReferences },
-            );
-          }
         }
 
         let staticContext = await query(request);
@@ -819,6 +810,7 @@ async function generateRenderResponse(
           isSubmission,
           actionResult,
           formState,
+          skipRevalidation,
           staticContext,
           temporaryReferences,
           ctx.redirect?.headers,
@@ -910,6 +902,7 @@ async function generateStaticContextResponse(
   isSubmission: boolean,
   actionResult: Promise<unknown> | undefined,
   formState: unknown | undefined,
+  skipRevalidation: boolean,
   staticContext: StaticHandlerContext,
   temporaryReferences: unknown,
   sideEffectRedirectHeaders: Headers | undefined,
@@ -986,7 +979,7 @@ async function generateStaticContextResponse(
     payload = {
       type: "action",
       actionResult,
-      rerender: renderPayloadPromise(),
+      rerender: skipRevalidation ? undefined : renderPayloadPromise(),
     };
   } else if (isSubmission && isDataRequest) {
     // Short circuit without matches on non server-action submissions since