From f5b44015f35ce59980fc2cb31ced9c919b97280c Mon Sep 17 00:00:00 2001
From: Shu Ding <g@shud.in>
Date: Tue, 25 Jan 2022 20:51:56 +0100
Subject: [PATCH] clean up

---
 packages/next/build/entries.ts                            | 1 -
 .../webpack/loaders/next-middleware-ssr-loader/render.ts  | 8 ++++----
 packages/next/server/dev/hot-reloader.ts                  | 8 --------
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/packages/next/build/entries.ts b/packages/next/build/entries.ts
index ee7c58e45bec620..8fed6c672fd14b2 100644
--- a/packages/next/build/entries.ts
+++ b/packages/next/build/entries.ts
@@ -181,7 +181,6 @@ export function createEntrypoints(
           absolute500Path: pages['/500'] || '',
           absolutePagePath,
           isServerComponent: isFlight,
-          serverComponents: hasServerComponents,
           ...defaultServerlessOptions,
         } as any)}!`,
         isServer: false,
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
index 5211140af5511e5..a56c33a3a7319de 100644
--- a/packages/next/build/webpack/loaders/next-middleware-ssr-loader/render.ts
+++ b/packages/next/build/webpack/loaders/next-middleware-ssr-loader/render.ts
@@ -29,7 +29,7 @@ export function getRender({
   isServerComponent: boolean
   config: NextConfig
 }) {
-  // Used by `path-browserify`.
+  // Polyfilled for `path-browserify`.
   process.cwd = () => ''
   const server = new WebServer({
     conf: config,
@@ -55,6 +55,7 @@ export function getRender({
       })
     }
 
+    // @TODO: We should move this into server/render.
     if (Document.getInitialProps) {
       const err = new Error(
         '`getInitialProps` in Document component is not supported with `concurrentFeatures` enabled.'
@@ -71,15 +72,14 @@ export function getRender({
         ? JSON.parse(query.__props__)
         : undefined
 
-    // Extend the options.
+    // Extend the context.
     Object.assign((self as any).__server_context, {
       renderServerComponentData,
       serverComponentProps,
     })
 
     const extendedReq = new WebNextRequest(request)
-    const transformStream = new TransformStream()
-    const extendedRes = new WebNextResponse(transformStream)
+    const extendedRes = new WebNextResponse()
     requestHandler(extendedReq, extendedRes)
     return await extendedRes.toResponse()
   }
diff --git a/packages/next/server/dev/hot-reloader.ts b/packages/next/server/dev/hot-reloader.ts
index f668c834791d6ef..47b4b35822ffe2e 100644
--- a/packages/next/server/dev/hot-reloader.ts
+++ b/packages/next/server/dev/hot-reloader.ts
@@ -534,15 +534,7 @@ export default class HotReloader {
                     absolute404Path: this.pagesMapping['/404'] || '',
                     absolutePagePath,
                     isServerComponent,
-                    serverComponents: this.hasServerComponents,
                     buildId: this.buildId,
-                    basePath: this.config.basePath,
-                    assetPrefix: this.config.assetPrefix,
-                    generateEtags: this.config.generateEtags,
-                    poweredByHeader: this.config.poweredByHeader,
-                    canonicalBase: this.config.amp.canonicalBase,
-                    i18n: this.config.i18n,
-                    previewProps: this.previewProps,
                   } as any)}!`,
                   isServer: false,
                   isServerWeb: true,