[next] Ensure all prerenders have matching .action output (#11719)

This ensures we create `.action` outputs for all prerendered paths that
point to a streaming serverless function when enabled so that our
routing rules have the expected destination available.

---------

Co-authored-by: Zack Tanner <1939140+ztanner@users.noreply.github.com>

.changeset/quiet-llamas-behave.md

@@ -0,0 +1,5 @@
+---
+'@vercel/next': patch
+---
+
+Ensure all prerenders have matching .action output

packages/next/src/server-build.ts

@@ -1364,6 +1364,7 @@ export async function serverBuild({
     isCorrectNotFoundRoutes,
     isEmptyAllowQueryForPrendered,
     isAppPPREnabled,
+    hasActionOutputSupport,
   });
 
   await Promise.all(

packages/next/src/utils.ts

@@ -1953,6 +1953,7 @@ type OnPrerenderRouteArgs = {
   isCorrectNotFoundRoutes?: boolean;
   isEmptyAllowQueryForPrendered?: boolean;
   isAppPPREnabled: boolean;
+  hasActionOutputSupport?: boolean;
 };
 let prerenderGroup = 1;
 
@@ -1990,6 +1991,7 @@ export const onPrerenderRoute =
       isCorrectNotFoundRoutes,
       isEmptyAllowQueryForPrendered,
       isAppPPREnabled,
+      hasActionOutputSupport,
     } = prerenderRouteArgs;
 
     if (isBlocking && isFallback) {
@@ -2474,6 +2476,13 @@ export const onPrerenderRoute =
           : {}),
       });
 
+      if (hasActionOutputSupport) {
+        const actionOutputKey = `${path.join('./', srcRoute || '')}.action`;
+        if (srcRoute !== routeKey && lambdas[actionOutputKey]) {
+          lambdas[`${routeKey}.action`] = lambdas[actionOutputKey];
+        }
+      }
+
       const normalizePathData = (pathData: string) => {
         if (
           (srcRoute === '/' || srcRoute == '/index') &&

packages/next/test/fixtures/00-app-dir-actions-experimental-streaming/app/edge/rsc/static/generate-static-params/no-fallback/[slug]/page.js

@@ -0,0 +1,21 @@
+import { revalidatePath } from 'next/cache';
+
+export default async function Page() {
+  async function serverAction() {
+    'use server';
+    await new Promise(resolve => setTimeout(resolve, 1000));
+    revalidatePath('/dynamic');
+  }
+
+  return (
+    <form action={serverAction}>
+      <button>Submit</button>
+    </form>
+  );
+}
+
+export const dynamicParams = false;
+
+export function generateStaticParams() {
+  return [{ slug: 'pre-generated' }];
+}

packages/next/test/fixtures/00-app-dir-actions-experimental-streaming/app/rsc/static/generate-static-params/no-fallback/[slug]/page.js

@@ -0,0 +1,21 @@
+import { revalidatePath } from 'next/cache';
+
+export default async function Page() {
+  async function serverAction() {
+    'use server';
+    await new Promise(resolve => setTimeout(resolve, 1000));
+    revalidatePath('/dynamic');
+  }
+
+  return (
+    <form action={serverAction}>
+      <button>Submit</button>
+    </form>
+  );
+}
+
+export const dynamicParams = false;
+
+export function generateStaticParams() {
+  return [{ slug: 'pre-generated' }];
+}

packages/next/test/fixtures/00-app-dir-actions-experimental-streaming/index.test.js

@@ -208,44 +208,50 @@ describe(`${__dirname.split(path.sep).pop()}`, () => {
       });
 
       describe('generateStaticParams', () => {
-        it('should bypass the static cache for a server action when pre-generated', async () => {
-          const path = `${basePath}/rsc/static/generate-static-params/pre-generated`;
-          const dynamicPath = `${basePath}/rsc/static/generate-static-params/[slug]`;
-          const actionId = findActionId(dynamicPath, runtime);
-
-          const res = await fetch(
-            `${ctx.deploymentUrl}${path}`,
-            generateFormDataPayload(actionId)
-          );
-
-          expect(res.status).toEqual(200);
-          expect(res.headers.get('x-matched-path')).toBe(
-            dynamicPath + '.action'
-          );
-          expect(res.headers.get('content-type')).toBe('text/x-component');
-          if (runtime === 'node') {
-            expect(res.headers.get('x-vercel-cache')).toBe('MISS');
-          } else {
-            expect(res.headers.get('x-edge-runtime')).toBe('1');
-          }
-        });
-
-        it('should bypass the static cache for a server action when not pre-generated', async () => {
-          const page = `${basePath}/rsc/static/generate-static-params/[slug]`;
-          const actionId = findActionId(page, runtime);
-
-          const res = await fetch(
-            `${ctx.deploymentUrl}/${basePath}/rsc/static/generate-static-params/not-pre-generated`,
-            generateFormDataPayload(actionId)
-          );
-
-          expect(res.status).toEqual(200);
-          expect(res.headers.get('x-matched-path')).toBe(page + '.action');
-          expect(res.headers.get('content-type')).toBe('text/x-component');
-          if (runtime === 'node') {
-            expect(res.headers.get('x-vercel-cache')).toBe('MISS');
-          } else {
-            expect(res.headers.get('x-edge-runtime')).toBe('1');
+        describe.each(['no-fallback', 'fallback'])('%s', fallbackPath => {
+          it('should bypass the static cache for a server action when pre-generated', async () => {
+            const path = `${basePath}/rsc/static/generate-static-params/${fallbackPath}/pre-generated`;
+            const dynamicPath = `${basePath}/rsc/static/generate-static-params/${fallbackPath}/[slug]`;
+            const actionId = findActionId(dynamicPath, runtime);
+
+            const res = await fetch(
+              `${ctx.deploymentUrl}${path}`,
+              generateFormDataPayload(actionId)
+            );
+
+            expect(res.status).toEqual(200);
+            expect(res.headers.get('x-matched-path')).toBe(
+              (basePath ? dynamicPath : path) + '.action'
+            );
+            expect(res.headers.get('content-type')).toBe('text/x-component');
+            if (runtime === 'node') {
+              expect(res.headers.get('x-vercel-cache')).toBe('MISS');
+            } else {
+              expect(res.headers.get('x-edge-runtime')).toBe('1');
+            }
+          });
+
+          // if it's dynamicParams = false we have nothing to
+          // bypass to
+          if (fallbackPath !== 'no-fallback') {
+            it('should bypass the static cache for a server action when not pre-generated', async () => {
+              const page = `${basePath}/rsc/static/generate-static-params/${fallbackPath}/[slug]`;
+              const actionId = findActionId(page, runtime);
+
+              const res = await fetch(
+                `${ctx.deploymentUrl}/${basePath}/rsc/static/generate-static-params/${fallbackPath}/not-pre-generated`,
+                generateFormDataPayload(actionId)
+              );
+
+              expect(res.status).toEqual(200);
+              expect(res.headers.get('x-matched-path')).toBe(page + '.action');
+              expect(res.headers.get('content-type')).toBe('text/x-component');
+              if (runtime === 'node') {
+                expect(res.headers.get('x-vercel-cache')).toBe('MISS');
+              } else {
+                expect(res.headers.get('x-edge-runtime')).toBe('1');
+              }
+            });
           }
         });
       });

packages/next/test/fixtures/00-app-dir-catchall-index-handling/package.json

@@ -1,8 +1,8 @@
 {
   "dependencies": {
     "next": "canary",
-    "react": "19.0.0-rc-f994737d14-20240522",
-    "react-dom": "19.0.0-rc-f994737d14-20240522"
+    "react": "19.0.0-rc.0",
+    "react-dom": "19.0.0-rc.0"
   },
   "ignoreNextjsUpdates": true
 }

packages/next/test/fixtures/00-app-dir-catchall-pages/package.json

@@ -1,8 +1,8 @@
 {
   "dependencies": {
     "next": "canary",
-    "react": "19.0.0-rc-f994737d14-20240522",
-    "react-dom": "19.0.0-rc-f994737d14-20240522"
+    "react": "19.0.0-rc.0",
+    "react-dom": "19.0.0-rc.0"
   },
   "ignoreNextjsUpdates": true
 }

packages/next/test/fixtures/00-app-dir-dynamic-404/package.json

@@ -1,8 +1,8 @@
 {
   "dependencies": {
     "next": "canary",
-    "react": "19.0.0-rc-f994737d14-20240522",
-    "react-dom": "19.0.0-rc-f994737d14-20240522"
+    "react": "19.0.0-rc.0",
+    "react-dom": "19.0.0-rc.0"
   },
   "ignoreNextjsUpdates": true,
   "scripts": {

packages/next/test/fixtures/00-app-dir-edge-404/package.json

@@ -1,8 +1,8 @@
 {
   "dependencies": {
     "next": "canary",
-    "react": "19.0.0-rc-f994737d14-20240522",
-    "react-dom": "19.0.0-rc-f994737d14-20240522"
+    "react": "19.0.0-rc.0",
+    "react-dom": "19.0.0-rc.0"
   },
   "ignoreNextjsUpdates": true
 }

packages/next/test/fixtures/00-app-dir-edge/package.json

@@ -1,8 +1,8 @@
 {
   "dependencies": {
     "next": "canary",
-    "react": "19.0.0-rc-f994737d14-20240522",
-    "react-dom": "19.0.0-rc-f994737d14-20240522"
+    "react": "19.0.0-rc.0",
+    "react-dom": "19.0.0-rc.0"
   },
   "ignoreNextjsUpdates": true
 }

packages/next/test/fixtures/00-app-dir-i18n/package.json

@@ -7,8 +7,8 @@
   },
   "dependencies": {
     "next": "canary",
-    "react": "19.0.0-rc-f994737d14-20240522",
-    "react-dom": "19.0.0-rc-f994737d14-20240522"
+    "react": "19.0.0-rc.0",
+    "react-dom": "19.0.0-rc.0"
   },
   "ignoreNextjsUpdates": true
 }

packages/next/test/fixtures/00-app-dir-incremental-ppr/package.json

@@ -1,8 +1,8 @@
 {
   "dependencies": {
     "next": "canary",
-    "react": "19.0.0-rc-f994737d14-20240522",
-    "react-dom": "19.0.0-rc-f994737d14-20240522"
+    "react": "19.0.0-rc.0",
+    "react-dom": "19.0.0-rc.0"
   },
   "ignoreNextjsUpdates": true
 }

packages/next/test/fixtures/00-app-dir-middleware/package.json

@@ -1,8 +1,8 @@
 {
   "dependencies": {
     "next": "canary",
-    "react": "19.0.0-rc-f994737d14-20240522",
-    "react-dom": "19.0.0-rc-f994737d14-20240522"
+    "react": "19.0.0-rc.0",
+    "react-dom": "19.0.0-rc.0"
   },
   "ignoreNextjsUpdates": true
 }

packages/next/test/fixtures/00-app-dir-no-ppr/package.json

@@ -1,8 +1,8 @@
 {
   "dependencies": {
     "next": "canary",
-    "react": "19.0.0-rc-f994737d14-20240522",
-    "react-dom": "19.0.0-rc-f994737d14-20240522"
+    "react": "19.0.0-rc.0",
+    "react-dom": "19.0.0-rc.0"
   },
   "ignoreNextjsUpdates": true
 }

packages/next/test/fixtures/00-app-dir-not-found/package.json

@@ -7,8 +7,8 @@
   },
   "dependencies": {
     "next": "canary",
-    "react": "19.0.0-rc-f994737d14-20240522",
-    "react-dom": "19.0.0-rc-f994737d14-20240522"
+    "react": "19.0.0-rc.0",
+    "react-dom": "19.0.0-rc.0"
   },
   "devDependencies": {
     "@types/node": "20.4.5",

packages/next/test/fixtures/00-app-dir-ppr-full/package.json

@@ -1,8 +1,8 @@
 {
   "dependencies": {
     "next": "canary",
-    "react": "19.0.0-rc-f994737d14-20240522",
-    "react-dom": "19.0.0-rc-f994737d14-20240522"
+    "react": "19.0.0-rc.0",
+    "react-dom": "19.0.0-rc.0"
   },
   "ignoreNextjsUpdates": true
 }

packages/next/test/fixtures/00-app-dir-ppr/package.json

@@ -1,8 +1,8 @@
 {
   "dependencies": {
     "next": "canary",
-    "react": "19.0.0-rc-f994737d14-20240522",
-    "react-dom": "19.0.0-rc-f994737d14-20240522"
+    "react": "19.0.0-rc.0",
+    "react-dom": "19.0.0-rc.0"
   },
   "ignoreNextjsUpdates": true
 }

packages/next/test/fixtures/00-app-dir-root-catch-all/package.json

@@ -1,8 +1,8 @@
 {
   "dependencies": {
     "next": "canary",
-    "react": "19.0.0-rc-f994737d14-20240522",
-    "react-dom": "19.0.0-rc-f994737d14-20240522"
+    "react": "19.0.0-rc.0",
+    "react-dom": "19.0.0-rc.0"
   },
   "ignoreNextjsUpdates": true
 }

packages/next/test/fixtures/00-app-dir-segment-options/package.json

@@ -1,8 +1,8 @@
 {
   "dependencies": {
     "next": "canary",
-    "react": "19.0.0-rc-f994737d14-20240522",
-    "react-dom": "19.0.0-rc-f994737d14-20240522"
+    "react": "19.0.0-rc.0",
+    "react-dom": "19.0.0-rc.0"
   },
   "ignoreNextjsUpdates": true
 }

packages/next/test/fixtures/00-app-dir-static/package.json

@@ -1,8 +1,8 @@
 {
   "dependencies": {
     "next": "canary",
-    "react": "19.0.0-rc-f994737d14-20240522",
-    "react-dom": "19.0.0-rc-f994737d14-20240522"
+    "react": "19.0.0-rc.0",
+    "react-dom": "19.0.0-rc.0"
   },
   "ignoreNextjsUpdates": true
 }

packages/next/test/fixtures/00-app-dir-trailing-slash/package.json

@@ -1,8 +1,8 @@
 {
   "dependencies": {
     "next": "canary",
-    "react": "19.0.0-rc-f994737d14-20240522",
-    "react-dom": "19.0.0-rc-f994737d14-20240522"
+    "react": "19.0.0-rc.0",
+    "react-dom": "19.0.0-rc.0"
   },
   "ignoreNextjsUpdates": true
 }

packages/next/test/fixtures/00-base-path-index-revalidate/package.json

@@ -1,8 +1,8 @@
 {
   "dependencies": {
     "next": "canary",
-    "react": "19.0.0-rc-f994737d14-20240522",
-    "react-dom": "19.0.0-rc-f994737d14-20240522"
+    "react": "19.0.0-rc.0",
+    "react-dom": "19.0.0-rc.0"
   },
   "ignoreNextjsUpdates": true
 }

packages/next/test/fixtures/00-build-time-traces/package.json

@@ -10,8 +10,8 @@
   },
   "dependencies": {
     "next": "canary",
-    "react": "19.0.0-rc-f994737d14-20240522",
-    "react-dom": "19.0.0-rc-f994737d14-20240522"
+    "react": "19.0.0-rc.0",
+    "react-dom": "19.0.0-rc.0"
   },
   "ignoreNextjsUpdates": true
 }

packages/next/test/fixtures/00-edge-runtime/package.json

@@ -5,8 +5,8 @@
   },
   "dependencies": {
     "next": "canary",
-    "react": "19.0.0-rc-f994737d14-20240522",
-    "react-dom": "19.0.0-rc-f994737d14-20240522"
+    "react": "19.0.0-rc.0",
+    "react-dom": "19.0.0-rc.0"
   },
   "ignoreNextjsUpdates": true
 }

packages/next/test/fixtures/00-fallback-false-404/package.json

@@ -6,8 +6,8 @@
   },
   "dependencies": {
     "next": "canary",
-    "react": "19.0.0-rc-f994737d14-20240522",
-    "react-dom": "19.0.0-rc-f994737d14-20240522"
+    "react": "19.0.0-rc.0",
+    "react-dom": "19.0.0-rc.0"
   },
   "ignoreNextjsUpdates": true
 }