From b5168c7bbe156c450a8ff05f28d09d8d3ddca918 Mon Sep 17 00:00:00 2001
From: Jiachi Liu <inbox@huozhi.im>
Date: Wed, 3 Aug 2022 23:59:08 +0200
Subject: [PATCH] Enable concurrent mode by default in app-render

---
 packages/next/server/app-render.tsx           | 5 +----
 test/e2e/app-dir/app-rendering/next.config.js | 1 -
 test/e2e/app-dir/app/next.config.js           | 1 -
 test/e2e/app-dir/rsc-basic/next.config.js     | 1 -
 4 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/packages/next/server/app-render.tsx b/packages/next/server/app-render.tsx
index 57d2191d2232..e947063a7e82 100644
--- a/packages/next/server/app-render.tsx
+++ b/packages/next/server/app-render.tsx
@@ -413,7 +413,6 @@ export async function renderToHTMLOrFlight(
     buildManifest,
     serverComponentManifest,
     supportsDynamicHTML,
-    runtime,
     ComponentMod,
   } = renderOpts
 
@@ -1046,11 +1045,9 @@ export async function renderToHTMLOrFlight(
       },
     })
 
-    const hasConcurrentFeatures = !!runtime
-
     return await continueFromInitialStream(renderStream, {
       dataStream: serverComponentsInlinedTransformStream?.readable,
-      generateStaticHTML: generateStaticHTML || !hasConcurrentFeatures,
+      generateStaticHTML: generateStaticHTML,
       flushEffectHandler,
       flushEffectsToHead: true,
       initialStylesheets,
diff --git a/test/e2e/app-dir/app-rendering/next.config.js b/test/e2e/app-dir/app-rendering/next.config.js
index b6e52ffc6acd..3f98f92f3198 100644
--- a/test/e2e/app-dir/app-rendering/next.config.js
+++ b/test/e2e/app-dir/app-rendering/next.config.js
@@ -1,7 +1,6 @@
 module.exports = {
   experimental: {
     appDir: true,
-    runtime: 'nodejs',
     serverComponents: true,
   },
 }
diff --git a/test/e2e/app-dir/app/next.config.js b/test/e2e/app-dir/app/next.config.js
index a908886893f7..087742808cea 100644
--- a/test/e2e/app-dir/app/next.config.js
+++ b/test/e2e/app-dir/app/next.config.js
@@ -1,7 +1,6 @@
 module.exports = {
   experimental: {
     appDir: true,
-    runtime: 'nodejs',
     serverComponents: true,
     legacyBrowsers: false,
     browsersListForSwc: true,
diff --git a/test/e2e/app-dir/rsc-basic/next.config.js b/test/e2e/app-dir/rsc-basic/next.config.js
index c675a5b2757a..ca13fceaff38 100644
--- a/test/e2e/app-dir/rsc-basic/next.config.js
+++ b/test/e2e/app-dir/rsc-basic/next.config.js
@@ -5,7 +5,6 @@ module.exports = {
   },
   experimental: {
     appDir: true,
-    runtime: 'nodejs',
     serverComponents: true,
   },
 }