From be25aaefb4141a438d7d147503bcd35636c4e359 Mon Sep 17 00:00:00 2001
From: Jack Pope <jackpope@meta.com>
Date: Thu, 29 Feb 2024 11:29:36 +0100
Subject: [PATCH] Remove unstable_concurrentUpdateByDefault option from RTR

---
 .../react-test-renderer/src/ReactTestRenderer.js | 16 ++--------------
 .../ReactFeatureFlags.test-renderer.native.js    |  2 +-
 .../forks/ReactFeatureFlags.test-renderer.www.js |  2 +-
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/packages/react-test-renderer/src/ReactTestRenderer.js b/packages/react-test-renderer/src/ReactTestRenderer.js
index d0494de7293e..c5c23290acd6 100644
--- a/packages/react-test-renderer/src/ReactTestRenderer.js
+++ b/packages/react-test-renderer/src/ReactTestRenderer.js
@@ -52,10 +52,7 @@ import {checkPropStringCoercion} from 'shared/CheckStringCoercion';
 
 import {getPublicInstance} from './ReactFiberConfigTestHost';
 import {ConcurrentRoot, LegacyRoot} from 'react-reconciler/src/ReactRootTags';
-import {
-  allowConcurrentByDefault,
-  enableReactTestRendererWarning,
-} from 'shared/ReactFeatureFlags';
+import {enableReactTestRendererWarning} from 'shared/ReactFeatureFlags';
 
 const act = React.act;
 
@@ -66,8 +63,6 @@ type TestRendererOptions = {
   isConcurrent: boolean,
   unstable_isConcurrent: boolean,
   unstable_strictMode: boolean,
-  unstable_concurrentUpdatesByDefault: boolean,
-  ...
 };
 
 type ReactTestRendererJSON = {
@@ -485,7 +480,6 @@ function create(
   let createNodeMock = defaultTestOptions.createNodeMock;
   let isConcurrent = false;
   let isStrictMode = false;
-  let concurrentUpdatesByDefault = null;
   if (typeof options === 'object' && options !== null) {
     if (typeof options.createNodeMock === 'function') {
       // $FlowFixMe[incompatible-type] found when upgrading Flow
@@ -500,12 +494,6 @@ function create(
     if (options.unstable_strictMode === true) {
       isStrictMode = true;
     }
-    if (allowConcurrentByDefault) {
-      if (options.unstable_concurrentUpdatesByDefault !== undefined) {
-        concurrentUpdatesByDefault =
-          options.unstable_concurrentUpdatesByDefault;
-      }
-    }
   }
   let container = {
     children: ([]: Array<Instance | TextInstance>),
@@ -517,7 +505,7 @@ function create(
     isConcurrent ? ConcurrentRoot : LegacyRoot,
     null,
     isStrictMode,
-    concurrentUpdatesByDefault,
+    false,
     '',
     onRecoverableError,
     null,
diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.native.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.native.js
index fd9531385971..0da7a95a8609 100644
--- a/packages/shared/forks/ReactFeatureFlags.test-renderer.native.js
+++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.native.js
@@ -61,9 +61,9 @@ export const enableLazyContextPropagation = false;
 export const enableLegacyHidden = false;
 export const forceConcurrentByDefaultForTesting = false;
 export const enableUnifiedSyncLane = true;
-export const allowConcurrentByDefault = true;
 export const enableCustomElementPropertySupport = true;
 export const enableNewBooleanProps = true;
+export const allowConcurrentByDefault = false;
 
 export const consoleManagedByDevToolsDuringStrictMode = false;
 
diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js
index f6b6be805460..55593c35fbb4 100644
--- a/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js
+++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js
@@ -61,7 +61,7 @@ export const enableLazyContextPropagation = false;
 export const enableLegacyHidden = false;
 export const forceConcurrentByDefaultForTesting = false;
 export const enableUnifiedSyncLane = true;
-export const allowConcurrentByDefault = true;
+export const allowConcurrentByDefault = false;
 export const enableCustomElementPropertySupport = false;
 export const enableNewBooleanProps = false;