Restore warning about combining server actions with export

vercel · Oct 20, 2023 · 664cc6a · 664cc6a
1 parent 586009a
commit 664cc6a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/packages/next/src/export/index.ts b/packages/next/src/export/index.ts
@@ -468,6 +468,25 @@ export async function exportAppImpl(
     }
   }
 
+  let serverActionsManifest
+  if (options.hasAppDir) {
+    serverActionsManifest = require(join(
+      distDir,
+      SERVER_DIRECTORY,
+      SERVER_REFERENCE_MANIFEST + '.json'
+    ))
+    if (options.isInvokedFromCli || isExportOutput) {
+      if (
+        Object.keys(serverActionsManifest.node).length > 0 ||
+        Object.keys(serverActionsManifest.edge).length > 0
+      ) {
+        throw new ExportError(
+          `Server Actions are not supported with static export.`
+        )
+      }
+    }
+  }
+
   // Start the rendering process
   const renderOpts: WorkerRenderOptsPartial = {
     previewProps: prerenderManifest?.preview,
@@ -504,11 +523,7 @@ export async function exportAppImpl(
     images: nextConfig.images,
     ...(options.hasAppDir
       ? {
-          serverActionsManifest: require(join(
-            distDir,
-            SERVER_DIRECTORY,
-            SERVER_REFERENCE_MANIFEST + '.json'
-          )),
+          serverActionsManifest,
         }
       : {}),
     strictNextHead: !!nextConfig.experimental.strictNextHead,

diff --git a/test/e2e/app-dir/actions/app-action-export.test.ts b/test/e2e/app-dir/actions/app-action-export.test.ts
@@ -33,6 +33,7 @@ createNextDescribe(
       } catch {}
     })
 
+    // @TODO turn this test back on whenw e
     it('should error when use export output for server actions', async () => {
       expect(next.cliOutput).toContain(
         `Server Actions are not supported with static export.`