diff --git a/packages/react-dom/src/__tests__/ReactDOMFizzShellHydration-test.js b/packages/react-dom/src/__tests__/ReactDOMFizzShellHydration-test.js index d21059ba6cf..fb2f33a4bad 100644 --- a/packages/react-dom/src/__tests__/ReactDOMFizzShellHydration-test.js +++ b/packages/react-dom/src/__tests__/ReactDOMFizzShellHydration-test.js @@ -255,7 +255,6 @@ describe('ReactDOMFizzShellHydration', () => { }, ); - // @gate enableHydrationLaneScheduling it( 'updating the root at same priority as initial hydration does not ' + 'force a client render', diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js index 2cbd670a7ff..4ea1a152637 100644 --- a/packages/react-reconciler/src/ReactFiberBeginWork.js +++ b/packages/react-reconciler/src/ReactFiberBeginWork.js @@ -117,7 +117,6 @@ import { enableLegacyHidden, enableCPUSuspense, disableLegacyMode, - enableHydrationLaneScheduling, enableViewTransition, enableFragmentRefs, } from 'shared/ReactFeatureFlags'; @@ -155,7 +154,6 @@ import { NoLanes, OffscreenLane, DefaultLane, - DefaultHydrationLane, SomeRetryLane, includesSomeLane, includesOnlyRetries, @@ -2919,9 +2917,7 @@ function mountDehydratedSuspenseComponent( // wrong priority associated with it and will prevent hydration of parent path. // Instead, we'll leave work left on it to render it in a separate commit. // Schedule a normal pri update to render this content. - workInProgress.lanes = laneToLanes( - enableHydrationLaneScheduling ? DefaultLane : DefaultHydrationLane, - ); + workInProgress.lanes = laneToLanes(DefaultLane); } else { // We'll continue hydrating the rest at offscreen priority since we'll already // be showing the right content coming from the server, it is no rush. diff --git a/packages/react-reconciler/src/ReactFiberReconciler.js b/packages/react-reconciler/src/ReactFiberReconciler.js index 65eebf04e48..4a36b39c43c 100644 --- a/packages/react-reconciler/src/ReactFiberReconciler.js +++ b/packages/react-reconciler/src/ReactFiberReconciler.js @@ -42,7 +42,6 @@ import getComponentNameFromFiber from 'react-reconciler/src/getComponentNameFrom import isArray from 'shared/isArray'; import { enableSchedulingProfiler, - enableHydrationLaneScheduling, disableLegacyMode, } from 'shared/ReactFeatureFlags'; import ReactSharedInternals from 'shared/ReactSharedInternals'; @@ -340,9 +339,7 @@ export function createHydrationContainer( // enqueue the callback if one is provided). const current = root.current; let lane = requestUpdateLane(current); - if (enableHydrationLaneScheduling) { - lane = getBumpedLaneForHydrationByLane(lane); - } + lane = getBumpedLaneForHydrationByLane(lane); const update = createUpdate(lane); update.callback = callback !== undefined && callback !== null ? callback : null; @@ -557,9 +554,7 @@ export function attemptHydrationAtCurrentPriority(fiber: Fiber): void { return; } let lane = requestUpdateLane(fiber); - if (enableHydrationLaneScheduling) { - lane = getBumpedLaneForHydrationByLane(lane); - } + lane = getBumpedLaneForHydrationByLane(lane); const root = enqueueConcurrentRenderForLane(fiber, lane); if (root !== null) { scheduleUpdateOnFiber(root, fiber, lane); diff --git a/packages/shared/ReactFeatureFlags.js b/packages/shared/ReactFeatureFlags.js index 587e4e6a1da..08d4b1fc33d 100644 --- a/packages/shared/ReactFeatureFlags.js +++ b/packages/shared/ReactFeatureFlags.js @@ -22,8 +22,6 @@ // when it rolls out to prod. We should remove these as soon as possible. // ----------------------------------------------------------------------------- -export const enableHydrationLaneScheduling: boolean = true; - // ----------------------------------------------------------------------------- // Land or remove (moderate effort) // diff --git a/packages/shared/forks/ReactFeatureFlags.native-fb.js b/packages/shared/forks/ReactFeatureFlags.native-fb.js index e2674b70fee..bc5d05c83d9 100644 --- a/packages/shared/forks/ReactFeatureFlags.native-fb.js +++ b/packages/shared/forks/ReactFeatureFlags.native-fb.js @@ -67,7 +67,6 @@ export const enableUpdaterTracking: boolean = __PROFILE__; export const retryLaneExpirationMs = 5000; export const syncLaneExpirationMs = 250; export const transitionLaneExpirationMs = 5000; -export const enableHydrationLaneScheduling: boolean = true; export const enableYieldingBeforePassive: boolean = false; export const enableThrottledScheduling: boolean = false; export const enableViewTransition: boolean = false; diff --git a/packages/shared/forks/ReactFeatureFlags.native-oss.js b/packages/shared/forks/ReactFeatureFlags.native-oss.js index 672c3755108..be77de267ff 100644 --- a/packages/shared/forks/ReactFeatureFlags.native-oss.js +++ b/packages/shared/forks/ReactFeatureFlags.native-oss.js @@ -56,7 +56,6 @@ export const renameElementSymbol: boolean = true; export const retryLaneExpirationMs = 5000; export const syncLaneExpirationMs = 250; export const transitionLaneExpirationMs = 5000; -export const enableHydrationLaneScheduling: boolean = true; export const enableYieldingBeforePassive: boolean = false; diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.js index 67c08d94367..f033e130bdb 100644 --- a/packages/shared/forks/ReactFeatureFlags.test-renderer.js +++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.js @@ -35,7 +35,6 @@ export const enableNoCloningMemoCache: boolean = false; export const enableLegacyFBSupport: boolean = false; export const enableMoveBefore: boolean = false; export const enableHiddenSubtreeInsertionEffectCleanup: boolean = false; -export const enableHydrationLaneScheduling: boolean = true; export const enableRetryLaneExpiration: boolean = false; export const retryLaneExpirationMs = 5000; diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.native-fb.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.native-fb.js index a0ee01baa7d..1b6f65544ce 100644 --- a/packages/shared/forks/ReactFeatureFlags.test-renderer.native-fb.js +++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.native-fb.js @@ -54,7 +54,6 @@ export const renameElementSymbol = false; export const retryLaneExpirationMs = 5000; export const syncLaneExpirationMs = 250; export const transitionLaneExpirationMs = 5000; -export const enableHydrationLaneScheduling = true; export const enableYieldingBeforePassive = false; export const enableThrottledScheduling = false; export const enableViewTransition = false; diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js index 058fd752d6e..3916e82e16b 100644 --- a/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js +++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js @@ -65,8 +65,6 @@ export const renameElementSymbol: boolean = false; export const enableObjectFiber: boolean = false; export const enableEagerAlternateStateNodeCleanup: boolean = true; -export const enableHydrationLaneScheduling: boolean = true; - export const enableYieldingBeforePassive: boolean = false; export const enableThrottledScheduling: boolean = false; diff --git a/packages/shared/forks/ReactFeatureFlags.www.js b/packages/shared/forks/ReactFeatureFlags.www.js index 0752f266afc..0c457d31e89 100644 --- a/packages/shared/forks/ReactFeatureFlags.www.js +++ b/packages/shared/forks/ReactFeatureFlags.www.js @@ -57,8 +57,6 @@ export const enableYieldingBeforePassive: boolean = false; export const enableThrottledScheduling: boolean = false; -export const enableHydrationLaneScheduling: boolean = true; - export const enablePerformanceIssueReporting: boolean = false; // Logs additional User Timing API marks for use with an experimental profiling tool.