Inject reconciler functions to avoid importing src/

packages/react-dom/src/client/ReactDOM.js

@@ -36,6 +36,7 @@ import {
   attemptContinuousHydration,
   attemptHydrationAtCurrentPriority,
   runWithPriority,
+  getCurrentUpdatePriority,
 } from 'react-reconciler/src/ReactFiberReconciler';
 import {createPortal as createPortalImpl} from 'react-reconciler/src/ReactPortal';
 import {canUseDOM} from 'shared/ExecutionEnvironment';
@@ -59,6 +60,8 @@ import {
   setAttemptContinuousHydration,
   setAttemptHydrationAtCurrentPriority,
   queueExplicitHydrationTarget,
+  setGetCurrentUpdatePriority,
+  setAttemptHydrationAtPriority,
 } from '../events/ReactDOMEventReplaying';
 import {setBatchingImplementation} from '../events/ReactDOMUpdateBatching';
 import {
@@ -71,6 +74,8 @@ setAttemptSynchronousHydration(attemptSynchronousHydration);
 setAttemptUserBlockingHydration(attemptUserBlockingHydration);
 setAttemptContinuousHydration(attemptContinuousHydration);
 setAttemptHydrationAtCurrentPriority(attemptHydrationAtCurrentPriority);
+setGetCurrentUpdatePriority(getCurrentUpdatePriority);
+setAttemptHydrationAtPriority(runWithPriority);
 
 let didWarnAboutUnstableCreatePortal = false;
 let didWarnAboutUnstableRenderSubtreeIntoContainer = false;

packages/react-dom/src/events/ReactDOMEventReplaying.js

@@ -41,11 +41,6 @@ import {
 } from '../client/ReactDOMComponentTree';
 import {unsafeCastDOMTopLevelTypeToString} from '../events/TopLevelEventTypes';
 import {HostRoot, SuspenseComponent} from 'react-reconciler/src/ReactWorkTags';
-import {
-  getCurrentUpdateLanePriority,
-  setCurrentUpdateLanePriority,
-} from 'react-reconciler/src/ReactFiberLane';
-import type {LanePriority} from 'react-reconciler/src/ReactFiberLane';
 
 let attemptSynchronousHydration: (fiber: Object) => void;
 
@@ -173,7 +168,7 @@ type QueuedHydrationTarget = {|
   blockedOn: null | Container | SuspenseInstance,
   target: Node,
   priority: number,
-  lanePriority: LanePriority,
+  lanePriority: ReactPriorityLevel,
 |};
 const queuedExplicitHydrationTargets: Array<QueuedHydrationTarget> = [];
 
@@ -535,17 +530,11 @@ function attemptExplicitHydrationTarget(
           // We're blocked on hydrating this boundary.
           // Increase its priority.
           queuedTarget.blockedOn = instance;
-          const previousLanePriority = getCurrentUpdateLanePriority();
-          try {
-            setCurrentUpdateLanePriority(queuedTarget.lanePriority);
-
-            // TODO: Double wrapping is temporary while we remove Scheduler runWithPriority.
+          attemptHydrationAtPriority(queuedTarget.lanePriority, () => {
             runWithPriority(queuedTarget.priority, () => {
               attemptHydrationAtCurrentPriority(nearestMounted);
             });
-          } finally {
-            setCurrentUpdateLanePriority(previousLanePriority);
-          }
+          });
 
           return;
         }
@@ -566,7 +555,7 @@ function attemptExplicitHydrationTarget(
 export function queueExplicitHydrationTarget(target: Node): void {
   if (enableSelectiveHydration) {
     const schedulerPriority = getCurrentPriorityLevel();
-    const updateLanePriority = getCurrentUpdateLanePriority();
+    const updateLanePriority = getCurrentUpdatePriority();
     const queuedTarget: QueuedHydrationTarget = {
       blockedOn: null,
       target: target,

packages/react-reconciler/src/ReactFiberReconciler.js

@@ -51,6 +51,7 @@ import {
   observeVisibleRects as observeVisibleRects_old,
   registerMutableSourceForHydration as registerMutableSourceForHydration_old,
   runWithPriority as runWithPriority_old,
+  getCurrentUpdatePriority as getCurrentUpdatePriority_old,
 } from './ReactFiberReconciler.old';
 
 import {
@@ -90,6 +91,7 @@ import {
   observeVisibleRects as observeVisibleRects_new,
   registerMutableSourceForHydration as registerMutableSourceForHydration_new,
   runWithPriority as runWithPriority_new,
+  getCurrentUpdatePriority as getCurrentUpdatePriority_new,
 } from './ReactFiberReconciler.new';
 
 export const createContainer = enableNewReconciler
@@ -141,6 +143,9 @@ export const attemptContinuousHydration = enableNewReconciler
 export const attemptHydrationAtCurrentPriority = enableNewReconciler
   ? attemptHydrationAtCurrentPriority_new
   : attemptHydrationAtCurrentPriority_old;
+export const getCurrentUpdatePriority = enableNewReconciler
+  ? getCurrentUpdatePriority_new
+  : getCurrentUpdatePriority_old;
 export const findHostInstance = enableNewReconciler
   ? findHostInstance_new
   : findHostInstance_old;

packages/react-reconciler/src/ReactFiberReconciler.new.js

@@ -86,6 +86,7 @@ import {
   getCurrentUpdateLanePriority,
   setCurrentUpdateLanePriority,
   schedulerPriorityToLanePriority,
+  lanePriorityToSchedulerPriority,
 } from './ReactFiberLane';
 import {requestCurrentSuspenseConfig} from './ReactFiberSuspenseConfig';
 import {
@@ -441,6 +442,10 @@ export function runWithPriority<T>(priority: ReactPriorityLevel, fn: () => T) {
   }
 }
 
+export function getCurrentUpdatePriority(): ReactPriorityLevel {
+  return lanePriorityToSchedulerPriority(getCurrentUpdateLanePriority());
+}
+
 export {findHostInstance};
 
 export {findHostInstanceWithWarning};

packages/react-reconciler/src/ReactFiberReconciler.old.js

@@ -86,6 +86,7 @@ import {
   getCurrentUpdateLanePriority,
   setCurrentUpdateLanePriority,
   schedulerPriorityToLanePriority,
+  lanePriorityToSchedulerPriority,
 } from './ReactFiberLane';
 import {requestCurrentSuspenseConfig} from './ReactFiberSuspenseConfig';
 import {
@@ -441,6 +442,10 @@ export function runWithPriority<T>(priority: ReactPriorityLevel, fn: () => T) {
   }
 }
 
+export function getCurrentUpdatePriority(): ReactPriorityLevel {
+  return lanePriorityToSchedulerPriority(getCurrentUpdateLanePriority());
+}
+
 export {findHostInstance};
 
 export {findHostInstanceWithWarning};