{"body":"Based off https:\/\/github.com\/facebook\/react\/pull\/31766\n\nThis has already landed everywhere.","files":[{"path":"packages\/react-debug-tools\/src\/__tests__\/ReactHooksInspectionIntegration-test.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactFiberHooks.js","status":"M"},{"path":"packages\/react-reconciler\/src\/__tests__\/useMemoCache-test.js","status":"M"},{"path":"packages\/react-server\/src\/ReactFizzHooks.js","status":"M"},{"path":"packages\/shared\/ReactFeatureFlags.js","status":"M"},{"path":"packages\/shared\/forks\/ReactFeatureFlags.native-fb.js","status":"M"},{"path":"packages\/shared\/forks\/ReactFeatureFlags.native-oss.js","status":"M"},{"path":"packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js","status":"M"},{"path":"packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native-fb.js","status":"M"},{"path":"packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js","status":"M"},{"path":"packages\/shared\/forks\/ReactFeatureFlags.www.js","status":"M"}],"parents":["a1b3bd0da0357bdd4b5ecfc26ea6ca3fad0e2f20"],"commit":{"shortRevision":"2e25ee373d","authorEmail":"rickhanlonii@gmail.com","authorName":"Ricky","authoredAt":"2024-12-14T11:11:04-05:00","subject":"[flags] Cleanup enableUseMemoCacheHook (#31767)","revision":"2e25ee373d96a882cee9a1ee3d7fee3f498bde2d"},"patch":"diff --git a\/packages\/react-debug-tools\/src\/__tests__\/ReactHooksInspectionIntegration-test.js b\/packages\/react-debug-tools\/src\/__tests__\/ReactHooksInspectionIntegration-test.js\nindex fcd84fedfe..ff8e7e1ac8 100644\n--- a\/packages\/react-debug-tools\/src\/__tests__\/ReactHooksInspectionIntegration-test.js\n+++ b\/packages\/react-debug-tools\/src\/__tests__\/ReactHooksInspectionIntegration-test.js\n@@ -1573,7 +1573,6 @@ describe('ReactHooksInspectionIntegration', () => {\n });\n \n describe('useMemoCache', () => {\n- \/\/ @gate enableUseMemoCacheHook\n it('should not be inspectable', async () => {\n function Foo() {\n const $ = useMemoCache(1);\n@@ -1601,7 +1600,6 @@ describe('ReactHooksInspectionIntegration', () => {\n expect(tree.length).toEqual(0);\n });\n \n- \/\/ @gate enableUseMemoCacheHook\n it('should work in combination with other hooks', async () => {\n function useSomething() {\n const [something] = React.useState(null);\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberHooks.js b\/packages\/react-reconciler\/src\/ReactFiberHooks.js\nindex 033e71610f..d2df61063f 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberHooks.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberHooks.js\n@@ -40,7 +40,6 @@ import {\n enableCache,\n enableLazyContextPropagation,\n enableTransitionTracing,\n- enableUseMemoCacheHook,\n enableUseEffectEventHook,\n enableLegacyCache,\n debugRenderPhaseSideEffectsForStrictMode,\n@@ -277,8 +276,7 @@ export type FunctionComponentUpdateQueue = {\n lastEffect: Effect | null,\n events: Array> | null,\n stores: Array> | null,\n- \/\/ NOTE: optional, only set when enableUseMemoCacheHook is enabled\n- memoCache?: MemoCache | null,\n+ memoCache: MemoCache | null,\n };\n \n type BasicStateAction = (S => S) | S;\n@@ -1127,25 +1125,12 @@ function unstable_useContextWithBailout(\n return readContextAndCompare(context, select);\n }\n \n-\/\/ NOTE: defining two versions of this function to avoid size impact when this feature is disabled.\n-\/\/ Previously this function was inlined, the additional `memoCache` property makes it not inlined.\n-let createFunctionComponentUpdateQueue: () => FunctionComponentUpdateQueue;\n-if (enableUseMemoCacheHook) {\n- createFunctionComponentUpdateQueue = () => {\n- return {\n- lastEffect: null,\n- events: null,\n- stores: null,\n- memoCache: null,\n- };\n- };\n-} else {\n- createFunctionComponentUpdateQueue = () => {\n- return {\n- lastEffect: null,\n- events: null,\n- stores: null,\n- };\n+function createFunctionComponentUpdateQueue(): FunctionComponentUpdateQueue {\n+ return {\n+ lastEffect: null,\n+ events: null,\n+ stores: null,\n+ memoCache: null,\n };\n }\n \n@@ -1155,13 +1140,11 @@ function resetFunctionComponentUpdateQueue(\n updateQueue.lastEffect = null;\n updateQueue.events = null;\n updateQueue.stores = null;\n- if (enableUseMemoCacheHook) {\n- if (updateQueue.memoCache != null) {\n- \/\/ NOTE: this function intentionally does not reset memoCache data. We reuse updateQueue for the memo\n- \/\/ cache to avoid increasing the size of fibers that don't need a cache, but we don't want to reset\n- \/\/ the cache when other properties are reset.\n- updateQueue.memoCache.index = 0;\n- }\n+ if (updateQueue.memoCache != null) {\n+ \/\/ NOTE: this function intentionally does not reset memoCache data. We reuse updateQueue for the memo\n+ \/\/ cache to avoid increasing the size of fibers that don't need a cache, but we don't want to reset\n+ \/\/ the cache when other properties are reset.\n+ updateQueue.memoCache.index = 0;\n }\n }\n \n@@ -3982,13 +3965,11 @@ export const ContextOnlyDispatcher: Dispatcher = {\n useFormState: throwInvalidHookError,\n useActionState: throwInvalidHookError,\n useOptimistic: throwInvalidHookError,\n+ useMemoCache: throwInvalidHookError,\n };\n if (enableCache) {\n (ContextOnlyDispatcher: Dispatcher).useCacheRefresh = throwInvalidHookError;\n }\n-if (enableUseMemoCacheHook) {\n- (ContextOnlyDispatcher: Dispatcher).useMemoCache = throwInvalidHookError;\n-}\n if (enableUseEffectEventHook) {\n (ContextOnlyDispatcher: Dispatcher).useEffectEvent = throwInvalidHookError;\n }\n@@ -4023,13 +4004,11 @@ const HooksDispatcherOnMount: Dispatcher = {\n useFormState: mountActionState,\n useActionState: mountActionState,\n useOptimistic: mountOptimistic,\n+ useMemoCache,\n };\n if (enableCache) {\n (HooksDispatcherOnMount: Dispatcher).useCacheRefresh = mountRefresh;\n }\n-if (enableUseMemoCacheHook) {\n- (HooksDispatcherOnMount: Dispatcher).useMemoCache = useMemoCache;\n-}\n if (enableUseEffectEventHook) {\n (HooksDispatcherOnMount: Dispatcher).useEffectEvent = mountEvent;\n }\n@@ -4064,13 +4043,11 @@ const HooksDispatcherOnUpdate: Dispatcher = {\n useFormState: updateActionState,\n useActionState: updateActionState,\n useOptimistic: updateOptimistic,\n+ useMemoCache,\n };\n if (enableCache) {\n (HooksDispatcherOnUpdate: Dispatcher).useCacheRefresh = updateRefresh;\n }\n-if (enableUseMemoCacheHook) {\n- (HooksDispatcherOnUpdate: Dispatcher).useMemoCache = useMemoCache;\n-}\n if (enableUseEffectEventHook) {\n (HooksDispatcherOnUpdate: Dispatcher).useEffectEvent = updateEvent;\n }\n@@ -4106,13 +4083,11 @@ const HooksDispatcherOnRerender: Dispatcher = {\n useFormState: rerenderActionState,\n useActionState: rerenderActionState,\n useOptimistic: rerenderOptimistic,\n+ useMemoCache,\n };\n if (enableCache) {\n (HooksDispatcherOnRerender: Dispatcher).useCacheRefresh = updateRefresh;\n }\n-if (enableUseMemoCacheHook) {\n- (HooksDispatcherOnRerender: Dispatcher).useMemoCache = useMemoCache;\n-}\n if (enableUseEffectEventHook) {\n (HooksDispatcherOnRerender: Dispatcher).useEffectEvent = updateEvent;\n }\n@@ -4307,6 +4282,7 @@ if (__DEV__) {\n return mountOptimistic(passthrough, reducer);\n },\n useHostTransitionStatus,\n+ useMemoCache,\n };\n if (enableCache) {\n (HooksDispatcherOnMountInDEV: Dispatcher).useCacheRefresh =\n@@ -4316,9 +4292,6 @@ if (__DEV__) {\n return mountRefresh();\n };\n }\n- if (enableUseMemoCacheHook) {\n- (HooksDispatcherOnMountInDEV: Dispatcher).useMemoCache = useMemoCache;\n- }\n if (enableUseEffectEventHook) {\n (HooksDispatcherOnMountInDEV: Dispatcher).useEffectEvent =\n function useEffectEvent) => Return>(\n@@ -4511,6 +4484,7 @@ if (__DEV__) {\n return mountOptimistic(passthrough, reducer);\n },\n useHostTransitionStatus,\n+ useMemoCache,\n };\n if (enableCache) {\n (HooksDispatcherOnMountWithHookTypesInDEV: Dispatcher).useCacheRefresh =\n@@ -4520,10 +4494,6 @@ if (__DEV__) {\n return mountRefresh();\n };\n }\n- if (enableUseMemoCacheHook) {\n- (HooksDispatcherOnMountWithHookTypesInDEV: Dispatcher).useMemoCache =\n- useMemoCache;\n- }\n if (enableUseEffectEventHook) {\n (HooksDispatcherOnMountWithHookTypesInDEV: Dispatcher).useEffectEvent =\n function useEffectEvent) => Return>(\n@@ -4715,6 +4685,7 @@ if (__DEV__) {\n return updateOptimistic(passthrough, reducer);\n },\n useHostTransitionStatus,\n+ useMemoCache,\n };\n if (enableCache) {\n (HooksDispatcherOnUpdateInDEV: Dispatcher).useCacheRefresh =\n@@ -4724,9 +4695,6 @@ if (__DEV__) {\n return updateRefresh();\n };\n }\n- if (enableUseMemoCacheHook) {\n- (HooksDispatcherOnUpdateInDEV: Dispatcher).useMemoCache = useMemoCache;\n- }\n if (enableUseEffectEventHook) {\n (HooksDispatcherOnUpdateInDEV: Dispatcher).useEffectEvent =\n function useEffectEvent) => Return>(\n@@ -4918,6 +4886,7 @@ if (__DEV__) {\n return rerenderOptimistic(passthrough, reducer);\n },\n useHostTransitionStatus,\n+ useMemoCache,\n };\n if (enableCache) {\n (HooksDispatcherOnRerenderInDEV: Dispatcher).useCacheRefresh =\n@@ -4927,9 +4896,6 @@ if (__DEV__) {\n return updateRefresh();\n };\n }\n- if (enableUseMemoCacheHook) {\n- (HooksDispatcherOnRerenderInDEV: Dispatcher).useMemoCache = useMemoCache;\n- }\n if (enableUseEffectEventHook) {\n (HooksDispatcherOnRerenderInDEV: Dispatcher).useEffectEvent =\n function useEffectEvent) => Return>(\n@@ -5141,6 +5107,10 @@ if (__DEV__) {\n mountHookTypesDev();\n return mountOptimistic(passthrough, reducer);\n },\n+ useMemoCache(size: number): Array {\n+ warnInvalidHookAccess();\n+ return useMemoCache(size);\n+ },\n useHostTransitionStatus,\n };\n if (enableCache) {\n@@ -5151,13 +5121,6 @@ if (__DEV__) {\n return mountRefresh();\n };\n }\n- if (enableUseMemoCacheHook) {\n- (InvalidNestedHooksDispatcherOnMountInDEV: Dispatcher).useMemoCache =\n- function (size: number): Array {\n- warnInvalidHookAccess();\n- return useMemoCache(size);\n- };\n- }\n if (enableUseEffectEventHook) {\n (InvalidNestedHooksDispatcherOnMountInDEV: Dispatcher).useEffectEvent =\n function useEffectEvent) => Return>(\n@@ -5372,6 +5335,10 @@ if (__DEV__) {\n updateHookTypesDev();\n return updateOptimistic(passthrough, reducer);\n },\n+ useMemoCache(size: number): Array {\n+ warnInvalidHookAccess();\n+ return useMemoCache(size);\n+ },\n useHostTransitionStatus,\n };\n if (enableCache) {\n@@ -5382,13 +5349,6 @@ if (__DEV__) {\n return updateRefresh();\n };\n }\n- if (enableUseMemoCacheHook) {\n- (InvalidNestedHooksDispatcherOnUpdateInDEV: Dispatcher).useMemoCache =\n- function (size: number): Array {\n- warnInvalidHookAccess();\n- return useMemoCache(size);\n- };\n- }\n if (enableUseEffectEventHook) {\n (InvalidNestedHooksDispatcherOnUpdateInDEV: Dispatcher).useEffectEvent =\n function useEffectEvent) => Return>(\n@@ -5603,6 +5563,10 @@ if (__DEV__) {\n updateHookTypesDev();\n return rerenderOptimistic(passthrough, reducer);\n },\n+ useMemoCache(size: number): Array {\n+ warnInvalidHookAccess();\n+ return useMemoCache(size);\n+ },\n useHostTransitionStatus,\n };\n if (enableCache) {\n@@ -5613,13 +5577,6 @@ if (__DEV__) {\n return updateRefresh();\n };\n }\n- if (enableUseMemoCacheHook) {\n- (InvalidNestedHooksDispatcherOnRerenderInDEV: Dispatcher).useMemoCache =\n- function (size: number): Array {\n- warnInvalidHookAccess();\n- return useMemoCache(size);\n- };\n- }\n if (enableUseEffectEventHook) {\n (InvalidNestedHooksDispatcherOnRerenderInDEV: Dispatcher).useEffectEvent =\n function useEffectEvent) => Return>(\ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/useMemoCache-test.js b\/packages\/react-reconciler\/src\/__tests__\/useMemoCache-test.js\nindex 520cd7cb72..c07d3a6d99 100644\n--- a\/packages\/react-reconciler\/src\/__tests__\/useMemoCache-test.js\n+++ b\/packages\/react-reconciler\/src\/__tests__\/useMemoCache-test.js\n@@ -58,7 +58,6 @@ describe('useMemoCache()', () => {\n ErrorBoundary = _ErrorBoundary;\n });\n \n- \/\/ @gate enableUseMemoCacheHook\n it('render component using cache', async () => {\n function Component(props) {\n const cache = useMemoCache(1);\n@@ -75,7 +74,6 @@ describe('useMemoCache()', () => {\n expect(root).toMatchRenderedOutput('Ok');\n });\n \n- \/\/ @gate enableUseMemoCacheHook\n it('update component using cache', async () => {\n let setX;\n let forceUpdate;\n@@ -145,7 +143,6 @@ describe('useMemoCache()', () => {\n expect(data).toBe(data1); \/\/ confirm that the cache persisted across renders\n });\n \n- \/\/ @gate enableUseMemoCacheHook\n it('update component using cache with setstate during render', async () => {\n let setN;\n function Component(props) {\n@@ -210,7 +207,6 @@ describe('useMemoCache()', () => {\n expect(data).toBe(data0);\n });\n \n- \/\/ @gate enableUseMemoCacheHook\n it('update component using cache with throw during render', async () => {\n let setN;\n let shouldFail = true;\n@@ -293,7 +289,6 @@ describe('useMemoCache()', () => {\n expect(data).toBe(data1); \/\/ confirm that the cache persisted across renders\n });\n \n- \/\/ @gate enableUseMemoCacheHook\n it('update component and custom hook with caches', async () => {\n let setX;\n let forceUpdate;\n@@ -370,7 +365,6 @@ describe('useMemoCache()', () => {\n expect(data).toBe(data1); \/\/ confirm that the cache persisted across renders\n });\n \n- \/\/ @gate enableUseMemoCacheHook\n it('reuses computations from suspended\/interrupted render attempts during an update', async () => {\n \/\/ This test demonstrates the benefit of a shared memo cache. By \"shared\" I\n \/\/ mean multiple concurrent render attempts of the same component\/hook use\n@@ -624,7 +618,6 @@ describe('useMemoCache()', () => {\n );\n });\n \n- \/\/ @gate enableUseMemoCacheHook\n it('(repro) infinite renders when used with setState during render', async () => {\n \/\/ Output of react compiler on `useUserMemo`\n function useCompilerMemo(value) {\ndiff --git a\/packages\/react-server\/src\/ReactFizzHooks.js b\/packages\/react-server\/src\/ReactFizzHooks.js\nindex e4e81af8fa..a163aa1151 100644\n--- a\/packages\/react-server\/src\/ReactFizzHooks.js\n+++ b\/packages\/react-server\/src\/ReactFizzHooks.js\n@@ -41,7 +41,6 @@ import {createFastHash} from '.\/ReactServerStreamConfig';\n import {\n enableCache,\n enableUseEffectEventHook,\n- enableUseMemoCacheHook,\n enableUseResourceEffectHook,\n } from 'shared\/ReactFeatureFlags';\n import is from 'shared\/objectIs';\n@@ -859,6 +858,7 @@ export const HooksDispatcher: Dispatcher = supportsClientAPIs\n useActionState,\n useFormState: useActionState,\n useHostTransitionStatus,\n+ useMemoCache,\n };\n \n if (enableCache) {\n@@ -867,9 +867,6 @@ if (enableCache) {\n if (enableUseEffectEventHook) {\n HooksDispatcher.useEffectEvent = useEffectEvent;\n }\n-if (enableUseMemoCacheHook) {\n- HooksDispatcher.useMemoCache = useMemoCache;\n-}\n if (enableUseResourceEffectHook) {\n HooksDispatcher.useResourceEffect = supportsClientAPIs\n ? noop\ndiff --git a\/packages\/shared\/ReactFeatureFlags.js b\/packages\/shared\/ReactFeatureFlags.js\nindex 8ac0fd86e2..212afaabc4 100644\n--- a\/packages\/shared\/ReactFeatureFlags.js\n+++ b\/packages\/shared\/ReactFeatureFlags.js\n@@ -115,9 +115,6 @@ export const enableCPUSuspense = __EXPERIMENTAL__;\n \n export const enableHydrationLaneScheduling = true;\n \n-\/\/ Enables useMemoCache hook, intended as a compilation target for\n-\/\/ auto-memoization.\n-export const enableUseMemoCacheHook = true;\n \/\/ Test this at Meta before enabling.\n export const enableNoCloningMemoCache = false;\n \ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js b\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js\nindex 1948a38163..7493a34494 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js\n@@ -80,7 +80,6 @@ export const enableTransitionTracing = false;\n export const enableTrustedTypesIntegration = false;\n export const enableUpdaterTracking = __PROFILE__;\n export const enableUseEffectEventHook = false;\n-export const enableUseMemoCacheHook = true;\n export const favorSafetyOverHydrationPerf = true;\n export const renameElementSymbol = false;\n export const retryLaneExpirationMs = 5000;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js b\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\nindex 12d1598e6a..e034a723d7 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\n@@ -69,7 +69,6 @@ export const enableTaint = true;\n export const enableTransitionTracing = false;\n export const enableTrustedTypesIntegration = false;\n export const enableUseEffectEventHook = false;\n-export const enableUseMemoCacheHook = true;\n export const favorSafetyOverHydrationPerf = true;\n export const passChildrenWhenCloningPersistedNodes = false;\n export const renameElementSymbol = true;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js\nindex 609c562806..fe518f955e 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js\n@@ -35,7 +35,6 @@ export const disableTextareaChildren = false;\n export const enableSuspenseAvoidThisFallback = false;\n export const enableSuspenseAvoidThisFallbackFizz = false;\n export const enableCPUSuspense = false;\n-export const enableUseMemoCacheHook = true;\n export const enableNoCloningMemoCache = false;\n export const enableUseEffectEventHook = false;\n export const favorSafetyOverHydrationPerf = true;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native-fb.js b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native-fb.js\nindex 169c5c9e28..0b0da8b8cb 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native-fb.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native-fb.js\n@@ -64,7 +64,6 @@ export const enableTransitionTracing = false;\n export const enableTrustedTypesIntegration = false;\n export const enableUpdaterTracking = false;\n export const enableUseEffectEventHook = false;\n-export const enableUseMemoCacheHook = true;\n export const favorSafetyOverHydrationPerf = true;\n export const passChildrenWhenCloningPersistedNodes = false;\n export const renameElementSymbol = false;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\nindex 6ecd34dfbd..63f76b4a3a 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\n@@ -37,7 +37,6 @@ export const disableTextareaChildren = false;\n export const enableSuspenseAvoidThisFallback = true;\n export const enableSuspenseAvoidThisFallbackFizz = false;\n export const enableCPUSuspense = false;\n-export const enableUseMemoCacheHook = true;\n export const enableNoCloningMemoCache = false;\n export const enableUseEffectEventHook = false;\n export const favorSafetyOverHydrationPerf = true;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.www.js b\/packages\/shared\/forks\/ReactFeatureFlags.www.js\nindex be91e1c8e4..f54c73a464 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.www.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.www.js\n@@ -54,7 +54,6 @@ export const enableSuspenseAvoidThisFallback = true;\n export const enableSuspenseAvoidThisFallbackFizz = false;\n \n export const enableCPUSuspense = true;\n-export const enableUseMemoCacheHook = true;\n export const enableUseEffectEventHook = true;\n export const enableMoveBefore = false;\n export const disableInputAttributeSyncing = false;\n"}

dillon1000/react

Files changed