__next_rsc__.server

vercel · Mar 28, 2022 · 6f7059f · 6f7059f
1 parent ae15161
commit 6f7059f
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 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
@@ -174,19 +174,19 @@ export default async function transformSource(
    *
    * Server compilation output:
    *   (The content of the Server Component module will be kept.)
-   *   export const __next_rsc__ = { __webpack_require__, _: () => { ... } }
+   *   export const __next_rsc__ = { __webpack_require__, _: () => { ... }, server: true }
    *
    * Client compilation output:
    *   (The content of the Server Component module will be removed.)
-   *   export const __next_rsc__ = { __webpack_require__, _: () => { ... } }
+   *   export const __next_rsc__ = { __webpack_require__, _: () => { ... }, server: false }
    */
 
   const rscExports: any = {
     __next_rsc__: `{
       __webpack_require__,
-      _: () => {\n${imports}\n}
+      _: () => {\n${imports}\n},
+      server: ${isServerComponent(resourcePath) ? 'true' : 'false'}
     }`,
-    __next_rsc_server__: isServerComponent(resourcePath) ? 'true' : 'false',
   }
 
   if (isClientCompilation) {

diff --git a/packages/next/client/index.tsx b/packages/next/client/index.tsx
@@ -648,7 +648,6 @@ function AppContainer({
 }
 
 function renderApp(App: AppComponent, appProps: AppProps) {
-  console.log('isRSCPage', isRSCPage)
   if (process.env.__NEXT_RSC && isRSCPage) {
     const { Component, err: _, router: __, ...props } = appProps
     return <Component {...props} />

diff --git a/packages/next/server/dev/next-dev-server.ts b/packages/next/server/dev/next-dev-server.ts
@@ -686,7 +686,6 @@ export default class DevServer extends Server {
       }
     }
 
-    console.error(err)
     if (!usedOriginalStack) {
       if (type === 'warning') {
         Log.warn(err + '')

diff --git a/packages/next/server/load-components.ts b/packages/next/server/load-components.ts
@@ -58,7 +58,7 @@ export async function loadDefaultErrorComponents(distDir: string) {
     reactLoadableManifest: {},
     ComponentMod,
     AppMod,
-    // TODO detect server components
+    // Use App for fallback
     AppServerMod: AppMod,
   }
 }

diff --git a/packages/next/server/render.tsx b/packages/next/server/render.tsx
@@ -364,9 +364,7 @@ const useFlightResponse = createFlightHook()
 
 // Create the wrapper component for a Flight stream.
 function createServerComponentRenderer(
-  // OriginalComponent: React.ComponentType,
   AppMod: any,
-  // App: any,
   ComponentMod: any,
   {
     cachePrefix,
@@ -472,7 +470,7 @@ export async function renderToHTML(
   const isServerComponent =
     hasConcurrentFeatures &&
     !!serverComponentManifest &&
-    !!ComponentMod.__next_rsc_server__
+    !!ComponentMod.__next_rsc__?.server
 
   let Component: React.ComponentType<{}> | ((props: any) => JSX.Element) =
     renderOpts.Component