From 3f7cf5e963a034bf7efc4feef9a01f68dbb75579 Mon Sep 17 00:00:00 2001 From: Samuel Susla Date: Wed, 7 Feb 2024 12:06:16 +0000 Subject: [PATCH 1/6] Unify alwaysThrottleRetries --- packages/shared/forks/ReactFeatureFlags.native-oss.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/shared/forks/ReactFeatureFlags.native-oss.js b/packages/shared/forks/ReactFeatureFlags.native-oss.js index 82a903537ca9f..fb0235a18a09d 100644 --- a/packages/shared/forks/ReactFeatureFlags.native-oss.js +++ b/packages/shared/forks/ReactFeatureFlags.native-oss.js @@ -78,7 +78,7 @@ export const enableDeferRootSchedulingToMicrotask = true; export const enableAsyncActions = false; -export const alwaysThrottleRetries = true; +export const alwaysThrottleRetries = false; export const useMicrotasksForSchedulingInFabric = false; export const passChildrenWhenCloningPersistedNodes = false; From 7b6e3fb166f7a05416ee3424da7a034ede7888c3 Mon Sep 17 00:00:00 2001 From: Samuel Susla Date: Wed, 7 Feb 2024 13:49:49 +0000 Subject: [PATCH 2/6] unify enableDeferRootSchedulingToMicrotask --- packages/shared/forks/ReactFeatureFlags.native-oss.js | 2 +- packages/shared/forks/ReactFeatureFlags.test-renderer.native.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/shared/forks/ReactFeatureFlags.native-oss.js b/packages/shared/forks/ReactFeatureFlags.native-oss.js index fb0235a18a09d..fa54f1615204a 100644 --- a/packages/shared/forks/ReactFeatureFlags.native-oss.js +++ b/packages/shared/forks/ReactFeatureFlags.native-oss.js @@ -74,7 +74,7 @@ export const enableFloat = true; export const useModernStrictMode = false; export const enableDO_NOT_USE_disableStrictPassiveEffect = false; export const enableFizzExternalRuntime = false; -export const enableDeferRootSchedulingToMicrotask = true; +export const enableDeferRootSchedulingToMicrotask = false; export const enableAsyncActions = false; diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.native.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.native.js index ac23fa99c85c4..51a47ee52f2ac 100644 --- a/packages/shared/forks/ReactFeatureFlags.test-renderer.native.js +++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.native.js @@ -71,7 +71,7 @@ export const enableFloat = true; export const useModernStrictMode = false; export const enableDO_NOT_USE_disableStrictPassiveEffect = false; -export const enableDeferRootSchedulingToMicrotask = true; +export const enableDeferRootSchedulingToMicrotask = false; export const enableAsyncActions = true; From 79762fff36b9999c575e60f9c338dff5bef6091f Mon Sep 17 00:00:00 2001 From: Samuel Susla Date: Wed, 7 Feb 2024 12:22:04 +0000 Subject: [PATCH 3/6] unify debugRenderPhaseSideEffectsForStrictMode --- packages/shared/forks/ReactFeatureFlags.native-fb.js | 2 +- packages/shared/forks/ReactFeatureFlags.native-oss.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/shared/forks/ReactFeatureFlags.native-fb.js b/packages/shared/forks/ReactFeatureFlags.native-fb.js index 2ff22ed4053cf..1a4327ad69978 100644 --- a/packages/shared/forks/ReactFeatureFlags.native-fb.js +++ b/packages/shared/forks/ReactFeatureFlags.native-fb.js @@ -44,7 +44,7 @@ export const enableFormActions = true; // Doesn't affect Native export const enableBinaryFlight = true; export const enableTaint = true; export const enablePostpone = false; -export const debugRenderPhaseSideEffectsForStrictMode = true; +export const debugRenderPhaseSideEffectsForStrictMode = __DEV__; export const disableJavaScriptURLs = false; export const disableCommentsAsDOMContainers = true; export const disableInputAttributeSyncing = false; diff --git a/packages/shared/forks/ReactFeatureFlags.native-oss.js b/packages/shared/forks/ReactFeatureFlags.native-oss.js index fa54f1615204a..b9705b2762a5f 100644 --- a/packages/shared/forks/ReactFeatureFlags.native-oss.js +++ b/packages/shared/forks/ReactFeatureFlags.native-oss.js @@ -10,7 +10,7 @@ import typeof * as FeatureFlagsType from 'shared/ReactFeatureFlags'; import typeof * as ExportsType from './ReactFeatureFlags.native-oss'; -export const debugRenderPhaseSideEffectsForStrictMode = false; +export const debugRenderPhaseSideEffectsForStrictMode = __DEV__; export const enableDebugTracing = false; export const enableAsyncDebugInfo = false; export const enableSchedulingProfiler = false; From 0693ccb5a7ca25b256993f48a4ddcab1cd06ae5d Mon Sep 17 00:00:00 2001 From: Samuel Susla Date: Wed, 7 Feb 2024 12:39:49 +0000 Subject: [PATCH 4/6] unify enableUnifiedSyncLane --- packages/shared/forks/ReactFeatureFlags.native-fb-dynamic.js | 1 - packages/shared/forks/ReactFeatureFlags.native-fb.js | 2 +- scripts/flow/xplat.js | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/shared/forks/ReactFeatureFlags.native-fb-dynamic.js b/packages/shared/forks/ReactFeatureFlags.native-fb-dynamic.js index 91a518a905154..c87bda1f57c19 100644 --- a/packages/shared/forks/ReactFeatureFlags.native-fb-dynamic.js +++ b/packages/shared/forks/ReactFeatureFlags.native-fb-dynamic.js @@ -22,7 +22,6 @@ import typeof * as DynamicFlagsType from 'ReactNativeInternalFeatureFlags'; export const alwaysThrottleRetries = __VARIANT__; export const enableDeferRootSchedulingToMicrotask = __VARIANT__; -export const enableUnifiedSyncLane = __VARIANT__; export const enableUseRefAccessWarning = __VARIANT__; export const passChildrenWhenCloningPersistedNodes = __VARIANT__; export const useMicrotasksForSchedulingInFabric = __VARIANT__; diff --git a/packages/shared/forks/ReactFeatureFlags.native-fb.js b/packages/shared/forks/ReactFeatureFlags.native-fb.js index 1a4327ad69978..f8397a9674c33 100644 --- a/packages/shared/forks/ReactFeatureFlags.native-fb.js +++ b/packages/shared/forks/ReactFeatureFlags.native-fb.js @@ -20,7 +20,6 @@ import * as dynamicFlags from 'ReactNativeInternalFeatureFlags'; export const { alwaysThrottleRetries, enableDeferRootSchedulingToMicrotask, - enableUnifiedSyncLane, enableUseRefAccessWarning, passChildrenWhenCloningPersistedNodes, useMicrotasksForSchedulingInFabric, @@ -51,6 +50,7 @@ export const disableInputAttributeSyncing = false; export const disableIEWorkarounds = true; export const replayFailedUnitOfWorkWithInvokeGuardedCallback = __DEV__; export const enableScopeAPI = false; +export const enableUnifiedSyncLane = true; export const enableCreateEventHandleAPI = false; export const enableSuspenseCallback = false; export const disableLegacyContext = false; diff --git a/scripts/flow/xplat.js b/scripts/flow/xplat.js index b2c4709a3b566..223a5f7d90300 100644 --- a/scripts/flow/xplat.js +++ b/scripts/flow/xplat.js @@ -10,7 +10,6 @@ declare module 'ReactNativeInternalFeatureFlags' { declare export var alwaysThrottleRetries: boolean; declare export var enableDeferRootSchedulingToMicrotask: boolean; - declare export var enableUnifiedSyncLane: boolean; declare export var enableUseRefAccessWarning: boolean; declare export var passChildrenWhenCloningPersistedNodes: boolean; declare export var useMicrotasksForSchedulingInFabric: boolean; From 8178287015447c11b6fe87699bc700af6a6d5270 Mon Sep 17 00:00:00 2001 From: Samuel Susla Date: Thu, 8 Feb 2024 18:26:15 +0000 Subject: [PATCH 5/6] unify enableLegacyHidden --- packages/shared/forks/ReactFeatureFlags.native-fb.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/shared/forks/ReactFeatureFlags.native-fb.js b/packages/shared/forks/ReactFeatureFlags.native-fb.js index f8397a9674c33..162b26f6920dc 100644 --- a/packages/shared/forks/ReactFeatureFlags.native-fb.js +++ b/packages/shared/forks/ReactFeatureFlags.native-fb.js @@ -74,7 +74,7 @@ export const transitionLaneExpirationMs = 5000; export const disableSchedulerTimeoutInWorkLoop = false; export const enableLazyContextPropagation = false; -export const enableLegacyHidden = true; +export const enableLegacyHidden = false; export const forceConcurrentByDefaultForTesting = false; export const allowConcurrentByDefault = true; export const enableCustomElementPropertySupport = false; From 329f58d1e96fab9c68f4cb124197ef9d22d1f0db Mon Sep 17 00:00:00 2001 From: Samuel Susla Date: Wed, 7 Feb 2024 12:28:02 +0000 Subject: [PATCH 6/6] unify allowConcurrentByDefault --- packages/shared/forks/ReactFeatureFlags.native-fb.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/shared/forks/ReactFeatureFlags.native-fb.js b/packages/shared/forks/ReactFeatureFlags.native-fb.js index 162b26f6920dc..3d0c70ef5f8d6 100644 --- a/packages/shared/forks/ReactFeatureFlags.native-fb.js +++ b/packages/shared/forks/ReactFeatureFlags.native-fb.js @@ -76,7 +76,7 @@ export const disableSchedulerTimeoutInWorkLoop = false; export const enableLazyContextPropagation = false; export const enableLegacyHidden = false; export const forceConcurrentByDefaultForTesting = false; -export const allowConcurrentByDefault = true; +export const allowConcurrentByDefault = false; export const enableCustomElementPropertySupport = false; export const consoleManagedByDevToolsDuringStrictMode = false;