From 1cf61d0bdbc63293698fa11c1a3ab1973f497d58 Mon Sep 17 00:00:00 2001
From: Alec Mev <alec@mev.earth>
Date: Thu, 29 Feb 2024 17:19:01 +0000
Subject: [PATCH] Sync types of NextNodeServer and BaseServer

Otherwise these don't pass with `exactOptionalPropertyTypes: true` and
`skipLibCheck: false`.
---
 packages/next/src/server/base-server.ts | 2 +-
 packages/next/src/server/next-server.ts | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/next/src/server/base-server.ts b/packages/next/src/server/base-server.ts
index 1883d99687ed..10bb41bd7dcf 100644
--- a/packages/next/src/server/base-server.ts
+++ b/packages/next/src/server/base-server.ts
@@ -280,7 +280,7 @@ export class WrappedBuildError extends Error {
 type ResponsePayload = {
   type: 'html' | 'json' | 'rsc'
   body: RenderResult
-  revalidate?: Revalidate
+  revalidate?: Revalidate | undefined
 }
 
 export type NextEnabledDirectories = {
diff --git a/packages/next/src/server/next-server.ts b/packages/next/src/server/next-server.ts
index ea8f4f27f84c..a9982c844704 100644
--- a/packages/next/src/server/next-server.ts
+++ b/packages/next/src/server/next-server.ts
@@ -466,11 +466,11 @@ export default class NextNodeServer extends BaseServer<
     res: NodeNextResponse,
     options: {
       result: RenderResult
-      type: 'html' | 'json'
+      type: 'html' | 'json' | 'rsc'
       generateEtags: boolean
       poweredByHeader: boolean
-      revalidate: Revalidate | undefined
-      swrDelta: SwrDelta | undefined
+      revalidate?: Revalidate | undefined
+      swrDelta?: SwrDelta | undefined
     }
   ): Promise<void> {
     return sendRenderResult({