Merge rsc queries handling

vercel · Mar 23, 2022 · 9f4eeac · 9f4eeac
1 parent 72478c5
commit 9f4eeac
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 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
@@ -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
@@ -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
@@ -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)
+  // }
 }