.',\n-              );\n-            }\n-            break;\n-          }\n-          \/\/ defaultValue is ignored by setProp\n-          default: {\n-            setProp(\n-              domElement,\n-              tag,\n-              propKey,\n-              propValue,\n-              nextProps,\n-              lastProps[propKey],\n-            );\n-          }\n-        }\n-      }\n-      updateTextarea(domElement, value, defaultValue);\n-      return;\n-    }\n-    case 'option': {\n-      for (let i = 0; i < updatePayload.length; i += 2) {\n-        const propKey = updatePayload[i];\n-        const propValue = updatePayload[i + 1];\n-        switch (propKey) {\n-          case 'selected': {\n-            \/\/ TODO: Remove support for selected on option.\n-            (domElement: any).selected =\n-              propValue &&\n-              typeof propValue !== 'function' &&\n-              typeof propValue !== 'symbol';\n-            break;\n-          }\n-          default: {\n-            setProp(\n-              domElement,\n-              tag,\n-              propKey,\n-              propValue,\n-              nextProps,\n-              lastProps[propKey],\n-            );\n-          }\n-        }\n-      }\n-      return;\n-    }\n-    case 'img':\n-    case 'link':\n-    case 'area':\n-    case 'base':\n-    case 'br':\n-    case 'col':\n-    case 'embed':\n-    case 'hr':\n-    case 'keygen':\n-    case 'meta':\n-    case 'param':\n-    case 'source':\n-    case 'track':\n-    case 'wbr':\n-    case 'menuitem': {\n-      \/\/ Void elements\n-      for (let i = 0; i < updatePayload.length; i += 2) {\n-        const propKey = updatePayload[i];\n-        const propValue = updatePayload[i + 1];\n-        switch (propKey) {\n-          case 'children':\n-          case 'dangerouslySetInnerHTML': {\n-            if (propValue != null) {\n-              \/\/ TODO: Can we make this a DEV warning to avoid this deny list?\n-              throw new Error(\n-                `${tag} is a void element tag and must neither have \\`children\\` nor ` +\n-                  'use `dangerouslySetInnerHTML`.',\n-              );\n-            }\n-            break;\n-          }\n-          \/\/ defaultChecked and defaultValue are ignored by setProp\n-          default: {\n-            setProp(\n-              domElement,\n-              tag,\n-              propKey,\n-              propValue,\n-              nextProps,\n-              lastProps[propKey],\n-            );\n-          }\n-        }\n-      }\n-      return;\n-    }\n-    default: {\n-      if (isCustomElement(tag, nextProps)) {\n-        for (let i = 0; i < updatePayload.length; i += 2) {\n-          const propKey = updatePayload[i];\n-          const propValue = updatePayload[i + 1];\n-          setPropOnCustomElement(\n-            domElement,\n-            tag,\n-            propKey,\n-            propValue,\n-            nextProps,\n-            lastProps[propKey],\n-          );\n-        }\n-        return;\n-      }\n-    }\n-  }\n-\n-  \/\/ Apply the diff.\n-  for (let i = 0; i < updatePayload.length; i += 2) {\n-    const propKey = updatePayload[i];\n-    const propValue = updatePayload[i + 1];\n-    setProp(domElement, tag, propKey, propValue, nextProps, lastProps[propKey]);\n-  }\n-}\n-\n function getPossibleStandardName(propName: string): string | null {\n   if (__DEV__) {\n     const lowerCasedName = propName.toLowerCase();\n@@ -3094,7 +2680,7 @@ export function diffHydratedProperties(\n   isConcurrentMode: boolean,\n   shouldWarnDev: boolean,\n   hostContext: HostContext,\n-): null | Array<mixed> {\n+): void {\n   if (__DEV__) {\n     validatePropertiesInDevelopment(tag, props);\n   }\n@@ -3192,8 +2778,6 @@ export function diffHydratedProperties(\n       break;\n   }\n \n-  let updatePayload = null;\n-\n   const children = props.children;\n   \/\/ For text content children we compare against textContent. This\n   \/\/ might match additional HTML that is hidden when we read it using\n@@ -3215,17 +2799,13 @@ export function diffHydratedProperties(\n         );\n       }\n       if (!isConcurrentMode || !enableClientRenderFallbackOnTextMismatch) {\n-        if (diffInCommitPhase) {\n-          \/\/ We really should be patching this in the commit phase but since\n-          \/\/ this only affects legacy mode hydration which is deprecated anyway\n-          \/\/ we can get away with it.\n-          \/\/ Host singletons get their children appended and don't use the text\n-          \/\/ content mechanism.\n-          if (!enableHostSingletons || tag !== 'body') {\n-            domElement.textContent = (children: any);\n-          }\n-        } else {\n-          updatePayload = ['children', children];\n+        \/\/ We really should be patching this in the commit phase but since\n+        \/\/ this only affects legacy mode hydration which is deprecated anyway\n+        \/\/ we can get away with it.\n+        \/\/ Host singletons get their children appended and don't use the text\n+        \/\/ content mechanism.\n+        if (!enableHostSingletons || tag !== 'body') {\n+          domElement.textContent = (children: any);\n         }\n       }\n     }\n@@ -3281,8 +2861,6 @@ export function diffHydratedProperties(\n       warnForExtraAttributes(extraAttributes);\n     }\n   }\n-\n-  return updatePayload;\n }\n \n export function diffHydratedText(\ndiff --git a\/packages\/react-dom-bindings\/src\/client\/ReactFiberConfigDOM.js b\/packages\/react-dom-bindings\/src\/client\/ReactFiberConfigDOM.js\nindex 6a4b33a107..0e42d00847 100644\n--- a\/packages\/react-dom-bindings\/src\/client\/ReactFiberConfigDOM.js\n+++ b\/packages\/react-dom-bindings\/src\/client\/ReactFiberConfigDOM.js\n@@ -54,9 +54,7 @@ export {detachDeletedInstance};\n import {hasRole} from '.\/DOMAccessibilityRoles';\n import {\n   setInitialProperties,\n-  diffProperties,\n   updateProperties,\n-  updatePropertiesWithDiff,\n   diffHydratedProperties,\n   diffHydratedText,\n   trapClickOnNonInteractiveElement,\n@@ -96,7 +94,6 @@ import {\n   enableFloat,\n   enableHostSingletons,\n   enableTrustedTypesIntegration,\n-  diffInCommitPhase,\n   enableFormActions,\n   enableAsyncActions,\n } from 'shared\/ReactFeatureFlags';\n@@ -546,20 +543,6 @@ export function finalizeInitialChildren(\n   }\n }\n \n-export function prepareUpdate(\n-  domElement: Instance,\n-  type: string,\n-  oldProps: Props,\n-  newProps: Props,\n-  hostContext: HostContext,\n-): null | Array<mixed> {\n-  if (diffInCommitPhase) {\n-    \/\/ TODO: Figure out how to validateDOMNesting when children turn into a string.\n-    return null;\n-  }\n-  return diffProperties(domElement, type, oldProps, newProps);\n-}\n-\n export function shouldSetTextContent(type: string, props: Props): boolean {\n   return (\n     type === 'textarea' ||\n@@ -712,19 +695,8 @@ export function commitUpdate(\n   newProps: Props,\n   internalInstanceHandle: Object,\n ): void {\n-  if (diffInCommitPhase) {\n-    \/\/ Diff and update the properties.\n-    updateProperties(domElement, type, oldProps, newProps);\n-  } else {\n-    \/\/ Apply the diff to the DOM node.\n-    updatePropertiesWithDiff(\n-      domElement,\n-      updatePayload,\n-      type,\n-      oldProps,\n-      newProps,\n-    );\n-  }\n+  \/\/ Diff and update the properties.\n+  updateProperties(domElement, type, oldProps, newProps);\n \n   \/\/ Update the props handle so that we know which props are the ones with\n   \/\/ with current event handlers.\n@@ -1384,7 +1356,7 @@ export function hydrateInstance(\n   hostContext: HostContext,\n   internalInstanceHandle: Object,\n   shouldWarnDev: boolean,\n-): null | Array<mixed> {\n+): void {\n   precacheFiberNode(internalInstanceHandle, instance);\n   \/\/ TODO: Possibly defer this until the commit phase where all the events\n   \/\/ get attached.\n@@ -1395,7 +1367,7 @@ export function hydrateInstance(\n   const isConcurrentMode =\n     ((internalInstanceHandle: Fiber).mode & ConcurrentMode) !== NoMode;\n \n-  return diffHydratedProperties(\n+  diffHydratedProperties(\n     instance,\n     type,\n     props,\ndiff --git a\/packages\/react-native-renderer\/src\/ReactFiberConfigFabric.js b\/packages\/react-native-renderer\/src\/ReactFiberConfigFabric.js\nindex d1d669ee82..d08f94d148 100644\n--- a\/packages\/react-native-renderer\/src\/ReactFiberConfigFabric.js\n+++ b\/packages\/react-native-renderer\/src\/ReactFiberConfigFabric.js\n@@ -34,7 +34,6 @@ import {\n \n const {\n   createNode,\n-  cloneNode,\n   cloneNodeWithNewChildren,\n   cloneNodeWithNewChildrenAndProps,\n   cloneNodeWithNewProps,\n@@ -48,8 +47,6 @@ const {\n   unstable_getCurrentEventPriority: fabricGetCurrentEventPriority,\n } = nativeFabricUIManager;\n \n-import {diffInCommitPhase} from 'shared\/ReactFeatureFlags';\n-\n const {get: getViewConfigForType} = ReactNativeViewConfigRegistry;\n \n \/\/ Counter for uniquely identifying views.\n@@ -291,25 +288,6 @@ export function prepareForCommit(containerInfo: Container): null | Object {\n   return null;\n }\n \n-export function prepareUpdate(\n-  instance: Instance,\n-  type: string,\n-  oldProps: Props,\n-  newProps: Props,\n-  hostContext: HostContext,\n-): null | Object {\n-  if (diffInCommitPhase) {\n-    return null;\n-  }\n-  const viewConfig = instance.canonical.viewConfig;\n-  const updatePayload = diff(oldProps, newProps, viewConfig.validAttributes);\n-  \/\/ TODO: If the event handlers have changed, we need to update the current props\n-  \/\/ in the commit phase but there is no host config hook to do it yet.\n-  \/\/ So instead we hack it by updating it in the render phase.\n-  instance.canonical.currentProps = newProps;\n-  return updatePayload;\n-}\n-\n export function resetAfterCommit(containerInfo: Container): void {\n   \/\/ Noop\n }\n@@ -364,7 +342,6 @@ export const supportsPersistence = true;\n \n export function cloneInstance(\n   instance: Instance,\n-  updatePayload: null | Object,\n   type: string,\n   oldProps: Props,\n   newProps: Props,\n@@ -372,14 +349,12 @@ export function cloneInstance(\n   keepChildren: boolean,\n   recyclableInstance: null | Instance,\n ): Instance {\n-  if (diffInCommitPhase) {\n-    const viewConfig = instance.canonical.viewConfig;\n-    updatePayload = diff(oldProps, newProps, viewConfig.validAttributes);\n-    \/\/ TODO: If the event handlers have changed, we need to update the current props\n-    \/\/ in the commit phase but there is no host config hook to do it yet.\n-    \/\/ So instead we hack it by updating it in the render phase.\n-    instance.canonical.currentProps = newProps;\n-  }\n+  const viewConfig = instance.canonical.viewConfig;\n+  const updatePayload = diff(oldProps, newProps, viewConfig.validAttributes);\n+  \/\/ TODO: If the event handlers have changed, we need to update the current props\n+  \/\/ in the commit phase but there is no host config hook to do it yet.\n+  \/\/ So instead we hack it by updating it in the render phase.\n+  instance.canonical.currentProps = newProps;\n \n   const node = instance.node;\n   let clone;\n@@ -387,12 +362,8 @@ export function cloneInstance(\n     if (updatePayload !== null) {\n       clone = cloneNodeWithNewProps(node, updatePayload);\n     } else {\n-      if (diffInCommitPhase) {\n-        \/\/ No changes\n-        return instance;\n-      } else {\n-        clone = cloneNode(node);\n-      }\n+      \/\/ No changes\n+      return instance;\n     }\n   } else {\n     if (updatePayload !== null) {\ndiff --git a\/packages\/react-native-renderer\/src\/ReactFiberConfigNative.js b\/packages\/react-native-renderer\/src\/ReactFiberConfigNative.js\nindex 6c14b62fde..b61c8ef292 100644\n--- a\/packages\/react-native-renderer\/src\/ReactFiberConfigNative.js\n+++ b\/packages\/react-native-renderer\/src\/ReactFiberConfigNative.js\n@@ -61,11 +61,6 @@ export type RendererInspectionConfig = $ReadOnly<{\n   ) => void,\n }>;\n \n-const UPDATE_SIGNAL = {};\n-if (__DEV__) {\n-  Object.freeze(UPDATE_SIGNAL);\n-}\n-\n \/\/ Counter for uniquely identifying views.\n \/\/ % 10 === 1 means it is a rootTag.\n \/\/ % 2 === 0 means it is a Fabric tag.\n@@ -237,16 +232,6 @@ export function prepareForCommit(containerInfo: Container): null | Object {\n   return null;\n }\n \n-export function prepareUpdate(\n-  instance: Instance,\n-  type: string,\n-  oldProps: Props,\n-  newProps: Props,\n-  hostContext: HostContext,\n-): null | Object {\n-  return UPDATE_SIGNAL;\n-}\n-\n export function resetAfterCommit(containerInfo: Container): void {\n   \/\/ Noop\n }\ndiff --git a\/packages\/react-noop-renderer\/src\/createReactNoop.js b\/packages\/react-noop-renderer\/src\/createReactNoop.js\nindex 520b1278c5..78249d5000 100644\n--- a\/packages\/react-noop-renderer\/src\/createReactNoop.js\n+++ b\/packages\/react-noop-renderer\/src\/createReactNoop.js\n@@ -82,10 +82,8 @@ export type TransitionStatus = mixed;\n \n const NO_CONTEXT = {};\n const UPPERCASE_CONTEXT = {};\n-const UPDATE_SIGNAL = {};\n if (__DEV__) {\n   Object.freeze(NO_CONTEXT);\n-  Object.freeze(UPDATE_SIGNAL);\n }\n \n function createReactNoop(reconciler: Function, useMutation: boolean) {\n@@ -222,7 +220,6 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {\n \n   function cloneInstance(\n     instance: Instance,\n-    updatePayload: null | Object,\n     type: string,\n     oldProps: Props,\n     newProps: Props,\n@@ -453,21 +450,6 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {\n       return false;\n     },\n \n-    prepareUpdate(\n-      instance: Instance,\n-      type: string,\n-      oldProps: Props,\n-      newProps: Props,\n-    ): null | {...} {\n-      if (oldProps === null) {\n-        throw new Error('Should have old props');\n-      }\n-      if (newProps === null) {\n-        throw new Error('Should have new props');\n-      }\n-      return UPDATE_SIGNAL;\n-    },\n-\n     shouldSetTextContent,\n \n     createTextInstance(\n@@ -764,7 +746,6 @@ function createReactNoop(reconciler: Function, useMutation: boolean) {\n         ): Instance {\n           const clone = cloneInstance(\n             instance,\n-            null,\n             type,\n             props,\n             props,\ndiff --git a\/packages\/react-reconciler\/README.md b\/packages\/react-reconciler\/README.md\nindex 546e442583..83520bb208 100644\n--- a\/packages\/react-reconciler\/README.md\n+++ b\/packages\/react-reconciler\/README.md\n@@ -129,14 +129,6 @@ There is a second purpose to this method. It lets you specify whether there is s\n \n If you don't want to do anything here, you should return `false`.\n \n-#### `prepareUpdate(instance, type, oldProps, newProps, rootContainer, hostContext)`\n-\n-React calls this method so that you can compare the previous and the next props, and decide whether you need to update the underlying instance or not. If you don't need to update it, return `null`. If you need to update it, you can return an arbitrary object representing the changes that need to happen. Then in `commitUpdate` you would need to apply those changes to the instance.\n-\n-This method happens **in the render phase**. It should only *calculate* the update — but not apply it! For example, the DOM renderer returns an array that looks like `[prop1, value1, prop2, value2, ...]` for all props that have actually changed. And only in `commitUpdate` it applies those changes. You should calculate as much as you can in `prepareUpdate` so that `commitUpdate` can be very fast and straightforward.\n-\n-See the meaning of `rootContainer` and `hostContext` in the `createInstance` documentation.\n-\n #### `shouldSetTextContent(type, props)`\n \n Some target platforms support setting an instance's text content without manually creating a text node. For example, in the DOM, you can set `node.textContent` instead of creating a text node and appending it.\n@@ -300,9 +292,9 @@ The `internalHandle` data structure is meant to be opaque. If you bend the rules\n \n If you never return `true` from `finalizeInitialChildren`, you can leave it empty.\n \n-#### `commitUpdate(instance, updatePayload, type, prevProps, nextProps, internalHandle)`\n+#### `commitUpdate(instance, type, prevProps, nextProps, internalHandle)`\n \n-This method should mutate the `instance` according to the set of changes in `updatePayload`. Here, `updatePayload` is the object that you've returned from `prepareUpdate` and has an arbitrary structure that makes sense for your renderer. For example, the DOM renderer returns an update payload like `[prop1, value1, prop2, value2, ...]` from `prepareUpdate`, and that structure gets passed into `commitUpdate`. Ideally, all the diffing and calculation should happen inside `prepareUpdate` so that `commitUpdate` can be fast and straightforward.\n+This method should mutate the `instance` to match `nextProps`.\n \n The `internalHandle` data structure is meant to be opaque. If you bend the rules and rely on its internal fields, be aware that it may change significantly between versions. You're taking on additional maintenance risk by reading from it, and giving up all guarantees if you write something to it.\n \ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberCommitWork.js b\/packages\/react-reconciler\/src\/ReactFiberCommitWork.js\nindex 93cd97e8ad..96ba1d5963 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberCommitWork.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberCommitWork.js\n@@ -54,7 +54,6 @@ import {\n   enableFloat,\n   enableLegacyHidden,\n   enableHostSingletons,\n-  diffInCommitPhase,\n   alwaysThrottleRetries,\n } from 'shared\/ReactFeatureFlags';\n import {\n@@ -2693,23 +2692,17 @@ function commitMutationEffectsOnFiber(\n             const updatePayload: null | UpdatePayload =\n               (finishedWork.updateQueue: any);\n             finishedWork.updateQueue = null;\n-            if (updatePayload !== null || diffInCommitPhase) {\n-              try {\n-                commitUpdate(\n-                  finishedWork.stateNode,\n-                  updatePayload,\n-                  finishedWork.type,\n-                  current.memoizedProps,\n-                  finishedWork.memoizedProps,\n-                  finishedWork,\n-                );\n-              } catch (error) {\n-                captureCommitPhaseError(\n-                  finishedWork,\n-                  finishedWork.return,\n-                  error,\n-                );\n-              }\n+            try {\n+              commitUpdate(\n+                finishedWork.stateNode,\n+                updatePayload,\n+                finishedWork.type,\n+                current.memoizedProps,\n+                finishedWork.memoizedProps,\n+                finishedWork,\n+              );\n+            } catch (error) {\n+              captureCommitPhaseError(finishedWork, finishedWork.return, error);\n             }\n           }\n         }\n@@ -2777,23 +2770,17 @@ function commitMutationEffectsOnFiber(\n             const updatePayload: null | UpdatePayload =\n               (finishedWork.updateQueue: any);\n             finishedWork.updateQueue = null;\n-            if (updatePayload !== null || diffInCommitPhase) {\n-              try {\n-                commitUpdate(\n-                  instance,\n-                  updatePayload,\n-                  type,\n-                  oldProps,\n-                  newProps,\n-                  finishedWork,\n-                );\n-              } catch (error) {\n-                captureCommitPhaseError(\n-                  finishedWork,\n-                  finishedWork.return,\n-                  error,\n-                );\n-              }\n+            try {\n+              commitUpdate(\n+                instance,\n+                updatePayload,\n+                type,\n+                oldProps,\n+                newProps,\n+                finishedWork,\n+              );\n+            } catch (error) {\n+              captureCommitPhaseError(finishedWork, finishedWork.return, error);\n             }\n           }\n         }\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberCompleteWork.js b\/packages\/react-reconciler\/src\/ReactFiberCompleteWork.js\nindex 7071b211fa..ec46a5932f 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberCompleteWork.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberCompleteWork.js\n@@ -38,7 +38,6 @@ import {\n   enableCache,\n   enableTransitionTracing,\n   enableFloat,\n-  diffInCommitPhase,\n } from 'shared\/ReactFeatureFlags';\n \n import {now} from '.\/Scheduler';\n@@ -97,7 +96,6 @@ import {\n   resolveSingletonInstance,\n   appendInitialChild,\n   finalizeInitialChildren,\n-  prepareUpdate,\n   supportsMutation,\n   supportsPersistence,\n   supportsResources,\n@@ -431,33 +429,7 @@ function updateHostComponent(\n       return;\n     }\n \n-    if (diffInCommitPhase) {\n-      markUpdate(workInProgress);\n-    } else {\n-      \/\/ If we get updated because one of our children updated, we don't\n-      \/\/ have newProps so we'll have to reuse them.\n-      \/\/ TODO: Split the update API as separate for the props vs. children.\n-      \/\/ Even better would be if children weren't special cased at all tho.\n-      const instance: Instance = workInProgress.stateNode;\n-      \/\/ TODO: Experiencing an error where oldProps is null. Suggests a host\n-      \/\/ component is hitting the resume path. Figure out why. Possibly\n-      \/\/ related to `hidden`.\n-      const currentHostContext = getHostContext();\n-      const updatePayload = prepareUpdate(\n-        instance,\n-        type,\n-        oldProps,\n-        newProps,\n-        currentHostContext,\n-      );\n-      \/\/ TODO: Type this specific to this type of component.\n-      workInProgress.updateQueue = (updatePayload: any);\n-      \/\/ If the update payload indicates that there is a change or if there\n-      \/\/ is a new ref we mark this as an update. All the work is done in commitWork.\n-      if (updatePayload) {\n-        markUpdate(workInProgress);\n-      }\n-    }\n+    markUpdate(workInProgress);\n   } else if (supportsPersistence) {\n     const currentInstance = current.stateNode;\n     const oldProps = current.memoizedProps;\n@@ -472,27 +444,8 @@ function updateHostComponent(\n     }\n     const recyclableInstance: Instance = workInProgress.stateNode;\n     const currentHostContext = getHostContext();\n-    let updatePayload = null;\n-    if (!diffInCommitPhase) {\n-      if (oldProps !== newProps) {\n-        updatePayload = prepareUpdate(\n-          recyclableInstance,\n-          type,\n-          oldProps,\n-          newProps,\n-          currentHostContext,\n-        );\n-      }\n-      if (childrenUnchanged && updatePayload === null) {\n-        \/\/ No changes, just reuse the existing instance.\n-        \/\/ Note that this might release a previous clone.\n-        workInProgress.stateNode = currentInstance;\n-        return;\n-      }\n-    }\n     const newInstance = cloneInstance(\n       currentInstance,\n-      updatePayload,\n       type,\n       oldProps,\n       newProps,\n@@ -500,7 +453,7 @@ function updateHostComponent(\n       childrenUnchanged,\n       recyclableInstance,\n     );\n-    if (diffInCommitPhase && newInstance === currentInstance) {\n+    if (newInstance === currentInstance) {\n       \/\/ No changes, just reuse the existing instance.\n       \/\/ Note that this might release a previous clone.\n       workInProgress.stateNode = currentInstance;\n@@ -1158,7 +1111,7 @@ function completeWork(\n           } else {\n             \/\/ This is a Hoistable Instance\n             \/\/ We may have props to update on the Hoistable instance.\n-            if (diffInCommitPhase && supportsMutation) {\n+            if (supportsMutation) {\n               const oldProps = current.memoizedProps;\n               if (oldProps !== newProps) {\n                 markUpdate(workInProgress);\n@@ -1195,7 +1148,7 @@ function completeWork(\n         const rootContainerInstance = getRootHostContainer();\n         const type = workInProgress.type;\n         if (current !== null && workInProgress.stateNode != null) {\n-          if (diffInCommitPhase && supportsMutation) {\n+          if (supportsMutation) {\n             const oldProps = current.memoizedProps;\n             if (oldProps !== newProps) {\n               markUpdate(workInProgress);\n@@ -1296,13 +1249,7 @@ function completeWork(\n         if (wasHydrated) {\n           \/\/ TODO: Move this and createInstance step into the beginPhase\n           \/\/ to consolidate.\n-          if (\n-            prepareToHydrateHostInstance(workInProgress, currentHostContext)\n-          ) {\n-            \/\/ If changes to the hydrated node need to be applied at the\n-            \/\/ commit-phase we mark this as such.\n-            markUpdate(workInProgress);\n-          }\n+          prepareToHydrateHostInstance(workInProgress, currentHostContext);\n         } else {\n           const rootContainerInstance = getRootHostContainer();\n           const instance = createInstance(\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberHydrationContext.js b\/packages\/react-reconciler\/src\/ReactFiberHydrationContext.js\nindex dac3d5f2de..c1ee83c2c8 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberHydrationContext.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberHydrationContext.js\n@@ -38,7 +38,6 @@ import {\n import {\n   enableHostSingletons,\n   enableClientRenderFallbackOnTextMismatch,\n-  diffInCommitPhase,\n } from 'shared\/ReactFeatureFlags';\n \n import {\n@@ -628,7 +627,7 @@ export function tryToClaimNextHydratableFormMarkerInstance(\n function prepareToHydrateHostInstance(\n   fiber: Fiber,\n   hostContext: HostContext,\n-): boolean {\n+): void {\n   if (!supportsHydration) {\n     throw new Error(\n       'Expected prepareToHydrateHostInstance() to never be called. ' +\n@@ -638,7 +637,7 @@ function prepareToHydrateHostInstance(\n \n   const instance: Instance = fiber.stateNode;\n   const shouldWarnIfMismatchDev = !didSuspendOrErrorDEV;\n-  const updatePayload = hydrateInstance(\n+  hydrateInstance(\n     instance,\n     fiber.type,\n     fiber.memoizedProps,\n@@ -646,17 +645,6 @@ function prepareToHydrateHostInstance(\n     fiber,\n     shouldWarnIfMismatchDev,\n   );\n-\n-  \/\/ TODO: Type this specific to this type of component.\n-  if (!diffInCommitPhase) {\n-    fiber.updateQueue = (updatePayload: any);\n-    \/\/ If the update payload indicates that there is a change or if there\n-    \/\/ is a new ref we mark this as an update.\n-    if (updatePayload !== null) {\n-      return true;\n-    }\n-  }\n-  return false;\n }\n \n function prepareToHydrateHostTextInstance(fiber: Fiber): boolean {\ndiff --git a\/packages\/react-reconciler\/src\/forks\/ReactFiberConfig.custom.js b\/packages\/react-reconciler\/src\/forks\/ReactFiberConfig.custom.js\nindex 13b7a8bd96..dcb402013f 100644\n--- a\/packages\/react-reconciler\/src\/forks\/ReactFiberConfig.custom.js\n+++ b\/packages\/react-reconciler\/src\/forks\/ReactFiberConfig.custom.js\n@@ -49,7 +49,6 @@ export const resetAfterCommit = $$$config.resetAfterCommit;\n export const createInstance = $$$config.createInstance;\n export const appendInitialChild = $$$config.appendInitialChild;\n export const finalizeInitialChildren = $$$config.finalizeInitialChildren;\n-export const prepareUpdate = $$$config.prepareUpdate;\n export const shouldSetTextContent = $$$config.shouldSetTextContent;\n export const createTextInstance = $$$config.createTextInstance;\n export const scheduleTimeout = $$$config.scheduleTimeout;\ndiff --git a\/packages\/react-test-renderer\/src\/ReactFiberConfigTestHost.js b\/packages\/react-test-renderer\/src\/ReactFiberConfigTestHost.js\nindex 2fb448d63c..e374b25922 100644\n--- a\/packages\/react-test-renderer\/src\/ReactFiberConfigTestHost.js\n+++ b\/packages\/react-test-renderer\/src\/ReactFiberConfigTestHost.js\n@@ -54,12 +54,10 @@ export * from 'react-reconciler\/src\/ReactFiberConfigWithNoResources';\n export * from 'react-reconciler\/src\/ReactFiberConfigWithNoSingletons';\n \n const NO_CONTEXT = {};\n-const UPDATE_SIGNAL = {};\n const nodeToInstanceMap = new WeakMap<any, Instance>();\n \n if (__DEV__) {\n   Object.freeze(NO_CONTEXT);\n-  Object.freeze(UPDATE_SIGNAL);\n }\n \n export function getPublicInstance(inst: Instance | TextInstance): $FlowFixMe {\n@@ -186,17 +184,6 @@ export function finalizeInitialChildren(\n   return false;\n }\n \n-export function prepareUpdate(\n-  testElement: Instance,\n-  type: string,\n-  oldProps: Props,\n-  newProps: Props,\n-  rootContainerInstance: Container,\n-  hostContext: Object,\n-): null | {...} {\n-  return UPDATE_SIGNAL;\n-}\n-\n export function shouldSetTextContent(type: string, props: Props): boolean {\n   return false;\n }\ndiff --git a\/packages\/shared\/ReactFeatureFlags.js b\/packages\/shared\/ReactFeatureFlags.js\nindex 44dc2ce07c..0a70b8cbe3 100644\n--- a\/packages\/shared\/ReactFeatureFlags.js\n+++ b\/packages\/shared\/ReactFeatureFlags.js\n@@ -118,9 +118,6 @@ export const enableUseEffectEventHook = __EXPERIMENTAL__;\n \/\/ (handled with an MutationObserver) instead of inline-scripts\n export const enableFizzExternalRuntime = true;\n \n-\/\/ Performance related test\n-export const diffInCommitPhase = __EXPERIMENTAL__;\n-\n export const enableAsyncActions = __EXPERIMENTAL__;\n \n export const alwaysThrottleRetries = true;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js b\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js\nindex ec7d4e6cf5..299fd43418 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js\n@@ -85,7 +85,6 @@ export const useModernStrictMode = false;\n export const enableDO_NOT_USE_disableStrictPassiveEffect = false;\n export const enableFizzExternalRuntime = false;\n \n-export const diffInCommitPhase = true;\n export const enableAsyncActions = false;\n \n \/\/ Flow magic to verify the exports of this file match the original version.\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js b\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\nindex c70b20b57f..6eec17ea53 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\n@@ -73,7 +73,6 @@ export const enableDO_NOT_USE_disableStrictPassiveEffect = false;\n export const enableFizzExternalRuntime = false;\n export const enableDeferRootSchedulingToMicrotask = true;\n \n-export const diffInCommitPhase = true;\n export const enableAsyncActions = false;\n \n export const alwaysThrottleRetries = true;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js\nindex 86f2d6ff6d..7bc3b64e0f 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js\n@@ -73,7 +73,6 @@ export const enableDO_NOT_USE_disableStrictPassiveEffect = false;\n export const enableFizzExternalRuntime = false;\n export const enableDeferRootSchedulingToMicrotask = true;\n \n-export const diffInCommitPhase = true;\n export const enableAsyncActions = false;\n \n export const alwaysThrottleRetries = true;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native.js b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native.js\nindex 5071788664..e54353abd6 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native.js\n@@ -70,7 +70,6 @@ export const useModernStrictMode = false;\n export const enableDO_NOT_USE_disableStrictPassiveEffect = false;\n export const enableDeferRootSchedulingToMicrotask = true;\n \n-export const diffInCommitPhase = true;\n export const enableAsyncActions = false;\n \n export const alwaysThrottleRetries = true;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\nindex 7ac6b230bc..dc90c6f837 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\n@@ -73,7 +73,6 @@ export const enableDO_NOT_USE_disableStrictPassiveEffect = false;\n export const enableFizzExternalRuntime = false;\n export const enableDeferRootSchedulingToMicrotask = true;\n \n-export const diffInCommitPhase = true;\n export const enableAsyncActions = false;\n \n export const alwaysThrottleRetries = true;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.www-dynamic.js b\/packages\/shared\/forks\/ReactFeatureFlags.www-dynamic.js\nindex a1197be405..db3adeb56d 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.www-dynamic.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.www-dynamic.js\n@@ -25,7 +25,6 @@ export const enableUnifiedSyncLane = __VARIANT__;\n export const enableTransitionTracing = __VARIANT__;\n export const enableCustomElementPropertySupport = __VARIANT__;\n export const enableDeferRootSchedulingToMicrotask = __VARIANT__;\n-export const diffInCommitPhase = __VARIANT__;\n export const enableAsyncActions = __VARIANT__;\n export const alwaysThrottleRetries = __VARIANT__;\n export const enableDO_NOT_USE_disableStrictPassiveEffect = __VARIANT__;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.www.js b\/packages\/shared\/forks\/ReactFeatureFlags.www.js\nindex 466e0a5aa1..ef2ef9d933 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.www.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.www.js\n@@ -27,7 +27,6 @@ export const {\n   enableTransitionTracing,\n   enableCustomElementPropertySupport,\n   enableDeferRootSchedulingToMicrotask,\n-  diffInCommitPhase,\n   enableAsyncActions,\n   alwaysThrottleRetries,\n   enableDO_NOT_USE_disableStrictPassiveEffect,\n","body":"Performance tests at Meta showed neutral results.","commit":{"subject":"Ship diffInCommitPhase (#27409)","shortRevision":"7f6201889e","revision":"7f6201889e8e628eeb53e05d8850ddffa3c2e74a","authorEmail":"git@sophiebits.com","authoredAt":"2023-09-22T20:24:42-07:00","authorName":"Sophie Alpert"}}</article></body></html>

dillon1000/react

Files changed