From 0ea9a011106d4ee999bb44843f0fdc2cb5683c20 Mon Sep 17 00:00:00 2001 From: Ethan Arrowood Date: Thu, 15 Feb 2024 15:38:32 -0700 Subject: [PATCH 1/5] remove `__nextDataReq=1` --- packages/next/src/server/base-server.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/next/src/server/base-server.ts b/packages/next/src/server/base-server.ts index 2aeeaa6c3d06a..edb627e70910b 100644 --- a/packages/next/src/server/base-server.ts +++ b/packages/next/src/server/base-server.ts @@ -579,10 +579,6 @@ export default abstract class Server { return false } - // If we're here, this is a data request, as it didn't return and it matched - // either a RSC or a prefetch RSC request. - parsedUrl.query.__nextDataReq = '1' - if (req.url) { const parsed = parseUrl(req.url) parsed.pathname = parsedUrl.pathname From 0610963a30083f0d9c75b4b1fb5b37a6b10503e0 Mon Sep 17 00:00:00 2001 From: Ethan Arrowood Date: Fri, 16 Feb 2024 14:03:02 -0700 Subject: [PATCH 2/5] update base-server --- packages/next/src/server/base-server.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/next/src/server/base-server.ts b/packages/next/src/server/base-server.ts index edb627e70910b..5bc424a1ad6c5 100644 --- a/packages/next/src/server/base-server.ts +++ b/packages/next/src/server/base-server.ts @@ -579,6 +579,10 @@ export default abstract class Server { return false } + // If we're here, this is a data request, as it didn't return and it matched + // either a RSC or a prefetch RSC request. + parsedUrl.query.__nextDataReq = '1' + if (req.url) { const parsed = parseUrl(req.url) parsed.pathname = parsedUrl.pathname @@ -2808,7 +2812,7 @@ export default abstract class Server { res.setHeader(NEXT_DID_POSTPONE_HEADER, '1') } - if (isDataReq) { + if (isDataReq && !isPreviewMode) { // If this is a dynamic RSC request, then stream the response. if (isDynamicRSCRequest) { if (cachedData.pageData) { From dfe2b5bcf1f43850c656c02859bea7a1c35321f5 Mon Sep 17 00:00:00 2001 From: Ethan Arrowood Date: Mon, 19 Feb 2024 15:17:16 -0700 Subject: [PATCH 3/5] Update packages/next/src/server/base-server.ts Co-authored-by: JJ Kasper --- packages/next/src/server/base-server.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/next/src/server/base-server.ts b/packages/next/src/server/base-server.ts index d2218e52d02dc..e1894fe6c86c2 100644 --- a/packages/next/src/server/base-server.ts +++ b/packages/next/src/server/base-server.ts @@ -2831,6 +2831,10 @@ export default abstract class Server { res.setHeader(NEXT_DID_POSTPONE_HEADER, '1') } + // we don't go through this block when preview mode is true + // as preview mode is a dynamic request (bypasses cache) and doesn't data + // generate both HTML and payloads in the same request so continue to just + // return the generated payload if (isDataReq && !isPreviewMode) { // If this is a dynamic RSC request, then stream the response. if (isDynamicRSCRequest) { From 665e5fa0a7dabe26593157b432acfeff68da8cfe Mon Sep 17 00:00:00 2001 From: Ethan Arrowood Date: Mon, 19 Feb 2024 16:13:47 -0700 Subject: [PATCH 4/5] prettier --- packages/next/src/server/base-server.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/next/src/server/base-server.ts b/packages/next/src/server/base-server.ts index e1894fe6c86c2..f84cf735a31a4 100644 --- a/packages/next/src/server/base-server.ts +++ b/packages/next/src/server/base-server.ts @@ -2832,7 +2832,7 @@ export default abstract class Server { } // we don't go through this block when preview mode is true - // as preview mode is a dynamic request (bypasses cache) and doesn't data + // as preview mode is a dynamic request (bypasses cache) and doesn't data // generate both HTML and payloads in the same request so continue to just // return the generated payload if (isDataReq && !isPreviewMode) { From b8baba942ebff54709c764604da625ed2232ea11 Mon Sep 17 00:00:00 2001 From: Ethan Arrowood Date: Tue, 20 Feb 2024 20:47:26 -0800 Subject: [PATCH 5/5] Update packages/next/src/server/base-server.ts Co-authored-by: Zack Tanner --- packages/next/src/server/base-server.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/next/src/server/base-server.ts b/packages/next/src/server/base-server.ts index f84cf735a31a4..6be0683056d85 100644 --- a/packages/next/src/server/base-server.ts +++ b/packages/next/src/server/base-server.ts @@ -2832,7 +2832,7 @@ export default abstract class Server { } // we don't go through this block when preview mode is true - // as preview mode is a dynamic request (bypasses cache) and doesn't data + // as preview mode is a dynamic request (bypasses cache) and doesn't // generate both HTML and payloads in the same request so continue to just // return the generated payload if (isDataReq && !isPreviewMode) {