From 9f4eeac58beae8b026b6d09f4f6947204233c616 Mon Sep 17 00:00:00 2001
From: Jiachi Liu <inbox@huozhi.im>
Date: Wed, 23 Mar 2022 13:29:43 +0100
Subject: [PATCH] Merge rsc queries handling

---
 .../next-middleware-ssr-loader/render.ts      | 19 ++-----------------
 packages/next/server/render.tsx               | 17 +++++++++--------
 packages/next/server/web-server.ts            |  6 +++---
 3 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/packages/next/build/webpack/loaders/next-middleware-ssr-loader/render.ts b/packages/next/build/webpack/loaders/next-middleware-ssr-loader/render.ts
index 77b553d2b6daf70..41d189cebd0a633 100644
--- a/packages/next/build/webpack/loaders/next-middleware-ssr-loader/render.ts
+++ b/packages/next/build/webpack/loaders/next-middleware-ssr-loader/render.ts
@@ -25,7 +25,7 @@ export function getRender({
   buildManifest,
   reactLoadableManifest,
   serverComponentManifest,
-  isServerComponent,
+  // isServerComponent,
   config,
   buildId,
 }: {
@@ -39,7 +39,7 @@ export function getRender({
   buildManifest: BuildManifest
   reactLoadableManifest: ReactLoadableManifest
   serverComponentManifest: any | null
-  isServerComponent: boolean
+  // isServerComponent: boolean
   config: NextConfig
   buildId: string
 }) {
@@ -123,21 +123,6 @@ export function getRender({
       })
     }
 
-    const renderServerComponentData = isServerComponent
-      ? query.__flight__ !== undefined
-      : false
-
-    const serverComponentProps =
-      isServerComponent && query.__props__
-        ? JSON.parse(query.__props__)
-        : undefined
-
-    // Extend the render options.
-    server.updateRenderOpts({
-      renderServerComponentData,
-      serverComponentProps,
-    })
-
     const extendedReq = new WebNextRequest(request)
     const extendedRes = new WebNextResponse()
     requestHandler(extendedReq, extendedRes)
diff --git a/packages/next/server/render.tsx b/packages/next/server/render.tsx
index c13d5ff65c1283e..a25d28263bb74db 100644
--- a/packages/next/server/render.tsx
+++ b/packages/next/server/render.tsx
@@ -231,8 +231,6 @@ export type RenderOptsPartial = {
   resolvedUrl?: string
   resolvedAsPath?: string
   serverComponentManifest?: any
-  renderServerComponentData?: boolean
-  serverComponentProps?: any
   distDir?: string
   locale?: string
   locales?: string[]
@@ -451,7 +449,7 @@ export async function renderToHTML(
     getStaticPaths,
     getServerSideProps,
     serverComponentManifest,
-    serverComponentProps,
+    // serverComponentProps,
     isDataReq,
     params,
     previewProps,
@@ -505,11 +503,14 @@ export async function renderToHTML(
     return ''
   }
 
-  let { renderServerComponentData } = renderOpts
-  if (isServerComponent && query.__flight__) {
-    renderServerComponentData = true
-    delete query.__flight__
-  }
+  let renderServerComponentData = isServerComponent
+    ? query.__flight__ !== undefined
+    : false
+
+  const serverComponentProps =
+    isServerComponent && query.__props__
+      ? JSON.parse(query.__props__ as string)
+      : undefined
 
   const callMiddleware = async (method: string, args: any[], props = false) => {
     let results: any = props ? {} : []
diff --git a/packages/next/server/web-server.ts b/packages/next/server/web-server.ts
index db88f5686bdf348..80449e80a7dd8cd 100644
--- a/packages/next/server/web-server.ts
+++ b/packages/next/server/web-server.ts
@@ -204,7 +204,7 @@ export default class NextWebServer extends BaseServer {
     }
   }
 
-  public updateRenderOpts(renderOpts: Partial<BaseServer['renderOpts']>) {
-    Object.assign(this.renderOpts, renderOpts)
-  }
+  // public updateRenderOpts(renderOpts: Partial<BaseServer['renderOpts']>) {
+  //   Object.assign(this.renderOpts, renderOpts)
+  // }
 }