use defined variable as cond

vercel · Jan 11, 2022 · 6fe35eb · 6fe35eb
1 parent 7f5f55b
commit 6fe35eb
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 16 deletions.
diff --git a/packages/next/build/webpack/loaders/next-middleware-ssr-loader/index.ts b/packages/next/build/webpack/loaders/next-middleware-ssr-loader/index.ts
@@ -50,7 +50,7 @@ export default async function middlewareSSRLoader(this: any) {
       buildManifest,
       reactLoadableManifest,
       rscManifest,
-      isServerComponent: ${JSON.stringify(isServerComponent)},
+      isServerComponent: ${isServerComponent},
       restRenderOpts: ${JSON.stringify(restRenderOpts)}
     })
 

diff --git a/packages/next/client/index.tsx b/packages/next/client/index.tsx
@@ -634,11 +634,12 @@ function renderApp(
   appProps: AppProps
 ) {
   if (process.env.__NEXT_RSC) {
-    const { Component, router: _, err: __, ...props } = appProps
+    const { Component, ...props } = appProps
     const AppServerComponent = App as React.ComponentType
+    const ComponentType = Component as React.ComponentType<typeof props>
     return (
       <AppServerComponent>
-        <Component {...props} />
+        <ComponentType {...props} />
       </AppServerComponent>
     )
   } else {

diff --git a/packages/next/server/render.tsx b/packages/next/server/render.tsx
@@ -186,14 +186,13 @@ function renderApp(
   App: AppType | React.ComponentType,
   Component: React.ComponentType,
   router: ServerRouter,
-  props: any,
-  isServerComponent: boolean
+  props: any
 ) {
-  if (isServerComponent) {
+  if (process.env.__NEXT_RSC) {
     let AppServerComponent = App as React.ComponentType
     return (
       <AppServerComponent>
-        <Component {...props} router={router} />
+        <Component {...props.pageProps} router={router} />
       </AppServerComponent>
     )
   } else {
@@ -663,7 +662,7 @@ export async function renderToHTML(
     AppTree: (props: any) => {
       return (
         <AppContainerWithIsomorphicFiberStructure>
-          {renderApp(App, Component, router, props, isServerComponent)}
+          {renderApp(App, Component, router, props)}
         </AppContainerWithIsomorphicFiberStructure>
       )
     },
@@ -1181,13 +1180,7 @@ export async function renderToHTML(
         const html = ReactDOMServer.renderToString(
           <Body>
             <AppContainerWithIsomorphicFiberStructure>
-              {renderApp(
-                EnhancedApp,
-                EnhancedComponent,
-                router,
-                props,
-                isServerComponent
-              )}
+              {renderApp(EnhancedApp, EnhancedComponent, router, props)}
             </AppContainerWithIsomorphicFiberStructure>
           </Body>
         )
@@ -1228,7 +1221,7 @@ export async function renderToHTML(
         ) : (
           <Body>
             <AppContainerWithIsomorphicFiberStructure>
-              {renderApp(App, Component, router, props, isServerComponent)}
+              {renderApp(App, Component, router, props)}
             </AppContainerWithIsomorphicFiberStructure>
           </Body>
         )

diff --git a/...ng-and-server-components/app/pages/err.js → ...-server-components/app/pages/err/index.js b/...ng-and-server-components/app/pages/err.js → ...-server-components/app/pages/err/index.js