From 95d7b5a647be36ff9dc130f64d8d2a2df9eb48b0 Mon Sep 17 00:00:00 2001
From: Jiachi Liu <inbox@huozhi.im>
Date: Sat, 16 Apr 2022 01:37:29 +0200
Subject: [PATCH] Fix missing _app in AppTree rendering

---
 packages/next/server/render.tsx | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/next/server/render.tsx b/packages/next/server/render.tsx
index b41e52f36539..f201a94c25ac 100644
--- a/packages/next/server/render.tsx
+++ b/packages/next/server/render.tsx
@@ -197,17 +197,21 @@ function enhanceComponents(
 
 function renderFlight(AppMod: any, ComponentMod: any, props: any) {
   const isServerComponent = !!ComponentMod.__next_rsc__
+  const isServerApp = !!AppMod.__next_rsc__
   const App = interopDefault(AppMod)
   const Component = interopDefault(ComponentMod)
   const AppServer = isServerComponent
     ? (App as React.ComponentType)
     : React.Fragment
 
-  return (
-    <AppServer>
-      <Component {...props} />
-    </AppServer>
-  )
+  if (isServerApp) {
+    return (
+      <AppServer>
+        <Component {...props} />
+      </AppServer>
+    )
+  }
+  return <App Component={Component} {...props} />
 }
 
 export type RenderOptsPartial = {