From c85078dfd88880ee0b3e8b527ab31a6186746cb5 Mon Sep 17 00:00:00 2001 From: Shu Ding Date: Mon, 28 Mar 2022 15:57:11 +0200 Subject: [PATCH] fix server component render condition --- .../next/build/webpack/loaders/next-flight-server-loader.ts | 1 + packages/next/server/render.tsx | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/next/build/webpack/loaders/next-flight-server-loader.ts b/packages/next/build/webpack/loaders/next-flight-server-loader.ts index b87f234690b1..7d29e270c862 100644 --- a/packages/next/build/webpack/loaders/next-flight-server-loader.ts +++ b/packages/next/build/webpack/loaders/next-flight-server-loader.ts @@ -184,6 +184,7 @@ export default async function transformSource( __webpack_require__, _: () => {\n${imports}\n} }`, + __next_rsc_server__: isServerComponent(resourcePath) ? 'true' : 'false', } if (isClientCompilation) { diff --git a/packages/next/server/render.tsx b/packages/next/server/render.tsx index c3d1b2849d31..dc182741f126 100644 --- a/packages/next/server/render.tsx +++ b/packages/next/server/render.tsx @@ -469,9 +469,9 @@ export async function renderToHTML( // We don't need to opt-into the flight inlining logic if the page isn't a RSC. const isServerComponent = - !!serverComponentManifest && hasConcurrentFeatures && - !!ComponentMod.__next_rsc__ + !!serverComponentManifest && + !!ComponentMod.__next_rsc_server__ let Component: React.ComponentType<{}> | ((props: any) => JSX.Element) = renderOpts.Component