{"body":"This is landed everywhere","patch":"diff --git a\/packages\/react-dom\/src\/__tests__\/ReactCompositeComponent-test.js b\/packages\/react-dom\/src\/__tests__\/ReactCompositeComponent-test.js\nindex 4444076681..30b5ced5cf 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactCompositeComponent-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactCompositeComponent-test.js\n@@ -537,7 +537,6 @@ describe('ReactCompositeComponent', () => {\n });\n \n it('should cleanup even if render() fatals', async () => {\n- const dispatcherEnabled = __DEV__ || gate(flags => flags.enableCache);\n const ownerEnabled = __DEV__;\n \n let stashedDispatcher;\n@@ -551,7 +550,7 @@ describe('ReactCompositeComponent', () => {\n }\n \n const instance = ;\n- expect(ReactSharedInternals.A).toBe(dispatcherEnabled ? null : undefined);\n+ expect(ReactSharedInternals.A).toBe(null);\n \n const root = ReactDOMClient.createRoot(document.createElement('div'));\n await expect(async () => {\n@@ -560,15 +559,11 @@ describe('ReactCompositeComponent', () => {\n });\n }).rejects.toThrow();\n \n- expect(ReactSharedInternals.A).toBe(dispatcherEnabled ? null : undefined);\n- if (dispatcherEnabled) {\n- if (ownerEnabled) {\n- expect(stashedDispatcher.getOwner()).toBe(null);\n- } else {\n- expect(stashedDispatcher.getOwner).toBe(undefined);\n- }\n+ expect(ReactSharedInternals.A).toBe(null);\n+ if (ownerEnabled) {\n+ expect(stashedDispatcher.getOwner()).toBe(null);\n } else {\n- expect(stashedDispatcher).toBe(undefined);\n+ expect(stashedDispatcher.getOwner).toBe(undefined);\n }\n });\n \ndiff --git a\/packages\/react-markup\/src\/__tests__\/ReactMarkupServer-test.js b\/packages\/react-markup\/src\/__tests__\/ReactMarkupServer-test.js\nindex 1e0cce3c9a..afd6ea5df8 100644\n--- a\/packages\/react-markup\/src\/__tests__\/ReactMarkupServer-test.js\n+++ b\/packages\/react-markup\/src\/__tests__\/ReactMarkupServer-test.js\n@@ -209,7 +209,6 @@ if (!__EXPERIMENTAL__) {\n );\n });\n \n- \/\/ @gate enableCache\n it('supports cache', async () => {\n let counter = 0;\n const getCount = React.cache(() => {\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberAsyncDispatcher.js b\/packages\/react-reconciler\/src\/ReactFiberAsyncDispatcher.js\nindex 0d6856f5d0..4ff65fb900 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberAsyncDispatcher.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberAsyncDispatcher.js\n@@ -10,16 +10,12 @@\n import type {AsyncDispatcher, Fiber} from '.\/ReactInternalTypes';\n import type {Cache} from '.\/ReactFiberCacheComponent';\n \n-import {enableCache} from 'shared\/ReactFeatureFlags';\n import {readContext} from '.\/ReactFiberNewContext';\n import {CacheContext} from '.\/ReactFiberCacheComponent';\n \n import {current as currentOwner} from '.\/ReactCurrentFiber';\n \n function getCacheForType(resourceType: () => T): T {\n- if (!enableCache) {\n- throw new Error('Not implemented.');\n- }\n const cache: Cache = readContext(CacheContext);\n let cacheForType: T | void = (cache.data.get(resourceType): any);\n if (cacheForType === undefined) {\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberBeginWork.js b\/packages\/react-reconciler\/src\/ReactFiberBeginWork.js\nindex 0ae0e668d2..2d3e3c04c4 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberBeginWork.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberBeginWork.js\n@@ -100,7 +100,6 @@ import {\n enableProfilerCommitHooks,\n enableProfilerTimer,\n enableScopeAPI,\n- enableCache,\n enableLazyContextPropagation,\n enableSchedulingProfiler,\n enableTransitionTracing,\n@@ -714,12 +713,10 @@ function updateOffscreenComponent(\n cachePool: null,\n };\n workInProgress.memoizedState = nextState;\n- if (enableCache) {\n- \/\/ push the cache pool even though we're going to bail out\n- \/\/ because otherwise there'd be a context mismatch\n- if (current !== null) {\n- pushTransition(workInProgress, null, null);\n- }\n+ \/\/ push the cache pool even though we're going to bail out\n+ \/\/ because otherwise there'd be a context mismatch\n+ if (current !== null) {\n+ pushTransition(workInProgress, null, null);\n }\n reuseHiddenContextOnStack(workInProgress);\n pushOffscreenSuspenseHandler(workInProgress);\n@@ -753,7 +750,7 @@ function updateOffscreenComponent(\n cachePool: null,\n };\n workInProgress.memoizedState = nextState;\n- if (enableCache && current !== null) {\n+ if (current !== null) {\n \/\/ If the render that spawned this one accessed the cache pool, resume\n \/\/ using the same cache. Unless the parent changed, since that means\n \/\/ there was a refresh.\n@@ -776,12 +773,10 @@ function updateOffscreenComponent(\n if (prevState !== null) {\n \/\/ We're going from hidden -> visible.\n let prevCachePool = null;\n- if (enableCache) {\n- \/\/ If the render that spawned this one accessed the cache pool, resume\n- \/\/ using the same cache. Unless the parent changed, since that means\n- \/\/ there was a refresh.\n- prevCachePool = prevState.cachePool;\n- }\n+ \/\/ If the render that spawned this one accessed the cache pool, resume\n+ \/\/ using the same cache. Unless the parent changed, since that means\n+ \/\/ there was a refresh.\n+ prevCachePool = prevState.cachePool;\n \n let transitions = null;\n if (enableTransitionTracing) {\n@@ -806,13 +801,11 @@ function updateOffscreenComponent(\n \/\/ special to do. Need to push to the stack regardless, though, to avoid\n \/\/ a push\/pop misalignment.\n \n- if (enableCache) {\n- \/\/ If the render that spawned this one accessed the cache pool, resume\n- \/\/ using the same cache. Unless the parent changed, since that means\n- \/\/ there was a refresh.\n- if (current !== null) {\n- pushTransition(workInProgress, null, null);\n- }\n+ \/\/ If the render that spawned this one accessed the cache pool, resume\n+ \/\/ using the same cache. Unless the parent changed, since that means\n+ \/\/ there was a refresh.\n+ if (current !== null) {\n+ pushTransition(workInProgress, null, null);\n }\n \n \/\/ We're about to bail out, but we need to push this to the stack anyway\n@@ -835,15 +828,13 @@ function deferHiddenOffscreenComponent(\n const nextState: OffscreenState = {\n baseLanes: nextBaseLanes,\n \/\/ Save the cache pool so we can resume later.\n- cachePool: enableCache ? getOffscreenDeferredCache() : null,\n+ cachePool: getOffscreenDeferredCache(),\n };\n workInProgress.memoizedState = nextState;\n- if (enableCache) {\n- \/\/ push the cache pool even though we're going to bail out\n- \/\/ because otherwise there'd be a context mismatch\n- if (current !== null) {\n- pushTransition(workInProgress, null, null);\n- }\n+ \/\/ push the cache pool even though we're going to bail out\n+ \/\/ because otherwise there'd be a context mismatch\n+ if (current !== null) {\n+ pushTransition(workInProgress, null, null);\n }\n \n \/\/ We're about to bail out, but we need to push this to the stack anyway\n@@ -876,10 +867,6 @@ function updateCacheComponent(\n workInProgress: Fiber,\n renderLanes: Lanes,\n ) {\n- if (!enableCache) {\n- return null;\n- }\n-\n prepareToReadContext(workInProgress, renderLanes);\n const parentCache = readContext(CacheContext);\n \n@@ -1480,13 +1467,11 @@ function updateHostRoot(\n pushRootMarkerInstance(workInProgress);\n }\n \n- if (enableCache) {\n- const nextCache: Cache = nextState.cache;\n- pushCacheProvider(workInProgress, nextCache);\n- if (nextCache !== prevState.cache) {\n- \/\/ The root cache refreshed.\n- propagateContextChange(workInProgress, CacheContext, renderLanes);\n- }\n+ const nextCache: Cache = nextState.cache;\n+ pushCacheProvider(workInProgress, nextCache);\n+ if (nextCache !== prevState.cache) {\n+ \/\/ The root cache refreshed.\n+ propagateContextChange(workInProgress, CacheContext, renderLanes);\n }\n \n \/\/ This would ideally go inside processUpdateQueue, but because it suspends,\n@@ -1990,28 +1975,26 @@ function updateSuspenseOffscreenState(\n renderLanes: Lanes,\n ): OffscreenState {\n let cachePool: SpawnedCachePool | null = null;\n- if (enableCache) {\n- const prevCachePool: SpawnedCachePool | null = prevOffscreenState.cachePool;\n- if (prevCachePool !== null) {\n- const parentCache = isPrimaryRenderer\n- ? CacheContext._currentValue\n- : CacheContext._currentValue2;\n- if (prevCachePool.parent !== parentCache) {\n- \/\/ Detected a refresh in the parent. This overrides any previously\n- \/\/ suspended cache.\n- cachePool = {\n- parent: parentCache,\n- pool: parentCache,\n- };\n- } else {\n- \/\/ We can reuse the cache from last time. The only thing that would have\n- \/\/ overridden it is a parent refresh, which we checked for above.\n- cachePool = prevCachePool;\n- }\n+ const prevCachePool: SpawnedCachePool | null = prevOffscreenState.cachePool;\n+ if (prevCachePool !== null) {\n+ const parentCache = isPrimaryRenderer\n+ ? CacheContext._currentValue\n+ : CacheContext._currentValue2;\n+ if (prevCachePool.parent !== parentCache) {\n+ \/\/ Detected a refresh in the parent. This overrides any previously\n+ \/\/ suspended cache.\n+ cachePool = {\n+ parent: parentCache,\n+ pool: parentCache,\n+ };\n } else {\n- \/\/ If there's no previous cache pool, grab the current one.\n- cachePool = getSuspendedCache();\n+ \/\/ We can reuse the cache from last time. The only thing that would have\n+ \/\/ overridden it is a parent refresh, which we checked for above.\n+ cachePool = prevCachePool;\n }\n+ } else {\n+ \/\/ If there's no previous cache pool, grab the current one.\n+ cachePool = getSuspendedCache();\n }\n return {\n baseLanes: mergeLanes(prevOffscreenState.baseLanes, renderLanes),\n@@ -3599,7 +3582,7 @@ function attemptEarlyBailoutIfNoScheduledUpdate(\n \/\/ the begin phase. There's still some bookkeeping we that needs to be done\n \/\/ in this optimized path, mostly pushing stuff onto the stack.\n switch (workInProgress.tag) {\n- case HostRoot:\n+ case HostRoot: {\n pushHostRootContext(workInProgress);\n const root: FiberRoot = workInProgress.stateNode;\n pushRootTransition(workInProgress, root, renderLanes);\n@@ -3608,12 +3591,11 @@ function attemptEarlyBailoutIfNoScheduledUpdate(\n pushRootMarkerInstance(workInProgress);\n }\n \n- if (enableCache) {\n- const cache: Cache = current.memoizedState.cache;\n- pushCacheProvider(workInProgress, cache);\n- }\n+ const cache: Cache = current.memoizedState.cache;\n+ pushCacheProvider(workInProgress, cache);\n resetHydrationState();\n break;\n+ }\n case HostSingleton:\n case HostComponent:\n pushHostContext(workInProgress);\n@@ -3795,10 +3777,8 @@ function attemptEarlyBailoutIfNoScheduledUpdate(\n return updateOffscreenComponent(current, workInProgress, renderLanes);\n }\n case CacheComponent: {\n- if (enableCache) {\n- const cache: Cache = current.memoizedState.cache;\n- pushCacheProvider(workInProgress, cache);\n- }\n+ const cache: Cache = current.memoizedState.cache;\n+ pushCacheProvider(workInProgress, cache);\n break;\n }\n case TracingMarkerComponent: {\n@@ -4085,10 +4065,7 @@ function beginWork(\n break;\n }\n case CacheComponent: {\n- if (enableCache) {\n- return updateCacheComponent(current, workInProgress, renderLanes);\n- }\n- break;\n+ return updateCacheComponent(current, workInProgress, renderLanes);\n }\n case TracingMarkerComponent: {\n if (enableTransitionTracing) {\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberCacheComponent.js b\/packages\/react-reconciler\/src\/ReactFiberCacheComponent.js\nindex 64269c5785..c7e0c1a11d 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberCacheComponent.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberCacheComponent.js\n@@ -10,7 +10,6 @@\n import type {ReactContext} from 'shared\/ReactTypes';\n import type {Fiber} from 'react-reconciler\/src\/ReactInternalTypes';\n \n-import {enableCache} from 'shared\/ReactFeatureFlags';\n import {REACT_CONTEXT_TYPE} from 'shared\/ReactSymbols';\n \n import {pushProvider, popProvider} from '.\/ReactFiberNewContext';\n@@ -18,8 +17,8 @@ import * as Scheduler from 'scheduler';\n \n \/\/ In environments without AbortController (e.g. tests)\n \/\/ replace it with a lightweight shim that only has the features we use.\n-const AbortControllerLocal: typeof AbortController = enableCache\n- ? typeof AbortController !== 'undefined'\n+const AbortControllerLocal: typeof AbortController =\n+ typeof AbortController !== 'undefined'\n ? AbortController\n : \/\/ $FlowFixMe[missing-this-annot]\n \/\/ $FlowFixMe[prop-missing]\n@@ -36,9 +35,7 @@ const AbortControllerLocal: typeof AbortController = enableCache\n signal.aborted = true;\n listeners.forEach(listener => listener());\n };\n- }\n- : \/\/ $FlowFixMe[incompatible-type]\n- null;\n+ };\n \n export type Cache = {\n controller: AbortController,\n@@ -63,20 +60,18 @@ const {\n unstable_NormalPriority: NormalPriority,\n } = Scheduler;\n \n-export const CacheContext: ReactContext = enableCache\n- ? {\n- $$typeof: REACT_CONTEXT_TYPE,\n- \/\/ We don't use Consumer\/Provider for Cache components. So we'll cheat.\n- Consumer: (null: any),\n- Provider: (null: any),\n- \/\/ We'll initialize these at the root.\n- _currentValue: (null: any),\n- _currentValue2: (null: any),\n- _threadCount: 0,\n- }\n- : (null: any);\n+export const CacheContext: ReactContext = {\n+ $$typeof: REACT_CONTEXT_TYPE,\n+ \/\/ We don't use Consumer\/Provider for Cache components. So we'll cheat.\n+ Consumer: (null: any),\n+ Provider: (null: any),\n+ \/\/ We'll initialize these at the root.\n+ _currentValue: (null: any),\n+ _currentValue2: (null: any),\n+ _threadCount: 0,\n+};\n \n-if (__DEV__ && enableCache) {\n+if (__DEV__) {\n CacheContext._currentRenderer = null;\n CacheContext._currentRenderer2 = null;\n }\n@@ -85,22 +80,14 @@ if (__DEV__ && enableCache) {\n \/\/ for retaining the cache once it is in use (retainCache), and releasing the cache\n \/\/ once it is no longer needed (releaseCache).\n export function createCache(): Cache {\n- if (!enableCache) {\n- return (null: any);\n- }\n- const cache: Cache = {\n+ return {\n controller: new AbortControllerLocal(),\n data: new Map(),\n refCount: 0,\n };\n-\n- return cache;\n }\n \n export function retainCache(cache: Cache) {\n- if (!enableCache) {\n- return;\n- }\n if (__DEV__) {\n if (cache.controller.signal.aborted) {\n console.warn(\n@@ -114,9 +101,6 @@ export function retainCache(cache: Cache) {\n \n \/\/ Cleanup a cache instance, potentially freeing it if there are no more references\n export function releaseCache(cache: Cache) {\n- if (!enableCache) {\n- return;\n- }\n cache.refCount--;\n if (__DEV__) {\n if (cache.refCount < 0) {\n@@ -134,15 +118,9 @@ export function releaseCache(cache: Cache) {\n }\n \n export function pushCacheProvider(workInProgress: Fiber, cache: Cache) {\n- if (!enableCache) {\n- return;\n- }\n pushProvider(workInProgress, CacheContext, cache);\n }\n \n export function popCacheProvider(workInProgress: Fiber, cache: Cache) {\n- if (!enableCache) {\n- return;\n- }\n popProvider(CacheContext, workInProgress);\n }\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberCommitWork.js b\/packages\/react-reconciler\/src\/ReactFiberCommitWork.js\nindex 7887be44e4..df16eb96ef 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberCommitWork.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberCommitWork.js\n@@ -47,7 +47,6 @@ import {\n enableSuspenseCallback,\n enableScopeAPI,\n enableUpdaterTracking,\n- enableCache,\n enableTransitionTracing,\n enableUseEffectEventHook,\n enableLegacyHidden,\n@@ -2455,33 +2454,31 @@ function commitOffscreenPassiveMountEffects(\n finishedWork: Fiber,\n instance: OffscreenInstance,\n ) {\n- if (enableCache) {\n- let previousCache: Cache | null = null;\n- if (\n- current !== null &&\n- current.memoizedState !== null &&\n- current.memoizedState.cachePool !== null\n- ) {\n- previousCache = current.memoizedState.cachePool.pool;\n- }\n- let nextCache: Cache | null = null;\n- if (\n- finishedWork.memoizedState !== null &&\n- finishedWork.memoizedState.cachePool !== null\n- ) {\n- nextCache = finishedWork.memoizedState.cachePool.pool;\n+ let previousCache: Cache | null = null;\n+ if (\n+ current !== null &&\n+ current.memoizedState !== null &&\n+ current.memoizedState.cachePool !== null\n+ ) {\n+ previousCache = current.memoizedState.cachePool.pool;\n+ }\n+ let nextCache: Cache | null = null;\n+ if (\n+ finishedWork.memoizedState !== null &&\n+ finishedWork.memoizedState.cachePool !== null\n+ ) {\n+ nextCache = finishedWork.memoizedState.cachePool.pool;\n+ }\n+ \/\/ Retain\/release the cache used for pending (suspended) nodes.\n+ \/\/ Note that this is only reached in the non-suspended\/visible case:\n+ \/\/ when the content is suspended\/hidden, the retain\/release occurs\n+ \/\/ via the parent Suspense component (see case above).\n+ if (nextCache !== previousCache) {\n+ if (nextCache != null) {\n+ retainCache(nextCache);\n }\n- \/\/ Retain\/release the cache used for pending (suspended) nodes.\n- \/\/ Note that this is only reached in the non-suspended\/visible case:\n- \/\/ when the content is suspended\/hidden, the retain\/release occurs\n- \/\/ via the parent Suspense component (see case above).\n- if (nextCache !== previousCache) {\n- if (nextCache != null) {\n- retainCache(nextCache);\n- }\n- if (previousCache != null) {\n- releaseCache(previousCache);\n- }\n+ if (previousCache != null) {\n+ releaseCache(previousCache);\n }\n }\n \n@@ -2552,22 +2549,20 @@ function commitCachePassiveMountEffect(\n current: Fiber | null,\n finishedWork: Fiber,\n ) {\n- if (enableCache) {\n- let previousCache: Cache | null = null;\n- if (finishedWork.alternate !== null) {\n- previousCache = finishedWork.alternate.memoizedState.cache;\n- }\n- const nextCache = finishedWork.memoizedState.cache;\n- \/\/ Retain\/release the cache. In theory the cache component\n- \/\/ could be \"borrowing\" a cache instance owned by some parent,\n- \/\/ in which case we could avoid retaining\/releasing. But it\n- \/\/ is non-trivial to determine when that is the case, so we\n- \/\/ always retain\/release.\n- if (nextCache !== previousCache) {\n- retainCache(nextCache);\n- if (previousCache != null) {\n- releaseCache(previousCache);\n- }\n+ let previousCache: Cache | null = null;\n+ if (finishedWork.alternate !== null) {\n+ previousCache = finishedWork.alternate.memoizedState.cache;\n+ }\n+ const nextCache = finishedWork.memoizedState.cache;\n+ \/\/ Retain\/release the cache. In theory the cache component\n+ \/\/ could be \"borrowing\" a cache instance owned by some parent,\n+ \/\/ in which case we could avoid retaining\/releasing. But it\n+ \/\/ is non-trivial to determine when that is the case, so we\n+ \/\/ always retain\/release.\n+ if (nextCache !== previousCache) {\n+ retainCache(nextCache);\n+ if (previousCache != null) {\n+ releaseCache(previousCache);\n }\n }\n }\n@@ -2712,23 +2707,21 @@ function commitPassiveMountOnFiber(\n endTime,\n );\n if (flags & Passive) {\n- if (enableCache) {\n- let previousCache: Cache | null = null;\n- if (finishedWork.alternate !== null) {\n- previousCache = finishedWork.alternate.memoizedState.cache;\n- }\n- const nextCache = finishedWork.memoizedState.cache;\n- \/\/ Retain\/release the root cache.\n- \/\/ Note that on initial mount, previousCache and nextCache will be the same\n- \/\/ and this retain won't occur. To counter this, we instead retain the HostRoot's\n- \/\/ initial cache when creating the root itself (see createFiberRoot() in\n- \/\/ ReactFiberRoot.js). Subsequent updates that change the cache are reflected\n- \/\/ here, such that previous\/next caches are retained correctly.\n- if (nextCache !== previousCache) {\n- retainCache(nextCache);\n- if (previousCache != null) {\n- releaseCache(previousCache);\n- }\n+ let previousCache: Cache | null = null;\n+ if (finishedWork.alternate !== null) {\n+ previousCache = finishedWork.alternate.memoizedState.cache;\n+ }\n+ const nextCache = finishedWork.memoizedState.cache;\n+ \/\/ Retain\/release the root cache.\n+ \/\/ Note that on initial mount, previousCache and nextCache will be the same\n+ \/\/ and this retain won't occur. To counter this, we instead retain the HostRoot's\n+ \/\/ initial cache when creating the root itself (see createFiberRoot() in\n+ \/\/ ReactFiberRoot.js). Subsequent updates that change the cache are reflected\n+ \/\/ here, such that previous\/next caches are retained correctly.\n+ if (nextCache !== previousCache) {\n+ retainCache(nextCache);\n+ if (previousCache != null) {\n+ releaseCache(previousCache);\n }\n }\n \n@@ -2845,17 +2838,15 @@ function commitPassiveMountOnFiber(\n if (disableLegacyMode || finishedWork.mode & ConcurrentMode) {\n \/\/ The effects are currently disconnected. Since the tree is hidden,\n \/\/ don't connect them. This also applies to the initial render.\n- if (enableCache || enableTransitionTracing) {\n- \/\/ \"Atomic\" effects are ones that need to fire on every commit,\n- \/\/ even during pre-rendering. An example is updating the reference\n- \/\/ count on cache instances.\n- recursivelyTraverseAtomicPassiveEffects(\n- finishedRoot,\n- finishedWork,\n- committedLanes,\n- committedTransitions,\n- );\n- }\n+ \/\/ \"Atomic\" effects are ones that need to fire on every commit,\n+ \/\/ even during pre-rendering. An example is updating the reference\n+ \/\/ count on cache instances.\n+ recursivelyTraverseAtomicPassiveEffects(\n+ finishedRoot,\n+ finishedWork,\n+ committedLanes,\n+ committedTransitions,\n+ );\n } else {\n \/\/ Legacy Mode: Fire the effects even if the tree is hidden.\n instance._visibility |= OffscreenPassiveEffectsConnected;\n@@ -3065,17 +3056,15 @@ export function reconnectPassiveEffects(\n if (disableLegacyMode || finishedWork.mode & ConcurrentMode) {\n \/\/ The effects are currently disconnected. Since the tree is hidden,\n \/\/ don't connect them. This also applies to the initial render.\n- if (enableCache || enableTransitionTracing) {\n- \/\/ \"Atomic\" effects are ones that need to fire on every commit,\n- \/\/ even during pre-rendering. An example is updating the reference\n- \/\/ count on cache instances.\n- recursivelyTraverseAtomicPassiveEffects(\n- finishedRoot,\n- finishedWork,\n- committedLanes,\n- committedTransitions,\n- );\n- }\n+ \/\/ \"Atomic\" effects are ones that need to fire on every commit,\n+ \/\/ even during pre-rendering. An example is updating the reference\n+ \/\/ count on cache instances.\n+ recursivelyTraverseAtomicPassiveEffects(\n+ finishedRoot,\n+ finishedWork,\n+ committedLanes,\n+ committedTransitions,\n+ );\n } else {\n \/\/ Legacy Mode: Fire the effects even if the tree is hidden.\n instance._visibility |= OffscreenPassiveEffectsConnected;\n@@ -3618,27 +3607,23 @@ function commitPassiveUnmountInsideDeletedTreeOnFiber(\n \/\/ the cache instance owned by the root will never be freed.\n \/\/ When effects are run, the cache should be freed here:\n \/\/ case HostRoot: {\n- \/\/ if (enableCache) {\n- \/\/ const cache = current.memoizedState.cache;\n- \/\/ releaseCache(cache);\n- \/\/ }\n+ \/\/ const cache = current.memoizedState.cache;\n+ \/\/ releaseCache(cache);\n \/\/ break;\n \/\/ }\n case LegacyHiddenComponent:\n case OffscreenComponent: {\n- if (enableCache) {\n- if (\n- current.memoizedState !== null &&\n- current.memoizedState.cachePool !== null\n- ) {\n- const cache: Cache = current.memoizedState.cachePool.pool;\n- \/\/ Retain\/release the cache used for pending (suspended) nodes.\n- \/\/ Note that this is only reached in the non-suspended\/visible case:\n- \/\/ when the content is suspended\/hidden, the retain\/release occurs\n- \/\/ via the parent Suspense component (see case above).\n- if (cache != null) {\n- retainCache(cache);\n- }\n+ if (\n+ current.memoizedState !== null &&\n+ current.memoizedState.cachePool !== null\n+ ) {\n+ const cache: Cache = current.memoizedState.cachePool.pool;\n+ \/\/ Retain\/release the cache used for pending (suspended) nodes.\n+ \/\/ Note that this is only reached in the non-suspended\/visible case:\n+ \/\/ when the content is suspended\/hidden, the retain\/release occurs\n+ \/\/ via the parent Suspense component (see case above).\n+ if (cache != null) {\n+ retainCache(cache);\n }\n }\n break;\n@@ -3681,10 +3666,8 @@ function commitPassiveUnmountInsideDeletedTreeOnFiber(\n break;\n }\n case CacheComponent: {\n- if (enableCache) {\n- const cache = current.memoizedState.cache;\n- releaseCache(cache);\n- }\n+ const cache = current.memoizedState.cache;\n+ releaseCache(cache);\n break;\n }\n case TracingMarkerComponent: {\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberCompleteWork.js b\/packages\/react-reconciler\/src\/ReactFiberCompleteWork.js\nindex b24351ac38..b302b498fa 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberCompleteWork.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberCompleteWork.js\n@@ -37,7 +37,6 @@ import {\n enableScopeAPI,\n enablePersistedModeClonedFlag,\n enableProfilerTimer,\n- enableCache,\n enableTransitionTracing,\n enableRenderableContext,\n passChildrenWhenCloningPersistedNodes,\n@@ -985,18 +984,16 @@ function completeWork(\n }\n }\n \n- if (enableCache) {\n- let previousCache: Cache | null = null;\n- if (current !== null) {\n- previousCache = current.memoizedState.cache;\n- }\n- const cache: Cache = workInProgress.memoizedState.cache;\n- if (cache !== previousCache) {\n- \/\/ Run passive effects to retain\/release the cache.\n- workInProgress.flags |= Passive;\n- }\n- popCacheProvider(workInProgress, cache);\n+ let previousCache: Cache | null = null;\n+ if (current !== null) {\n+ previousCache = current.memoizedState.cache;\n+ }\n+ const cache: Cache = workInProgress.memoizedState.cache;\n+ if (cache !== previousCache) {\n+ \/\/ Run passive effects to retain\/release the cache.\n+ workInProgress.flags |= Passive;\n }\n+ popCacheProvider(workInProgress, cache);\n \n if (enableTransitionTracing) {\n popRootMarkerInstance(workInProgress);\n@@ -1384,7 +1381,7 @@ function completeWork(\n current !== null &&\n (current.memoizedState: null | SuspenseState) !== null;\n \n- if (enableCache && nextDidTimeout) {\n+ if (nextDidTimeout) {\n const offscreenFiber: Fiber = (workInProgress.child: any);\n let previousCache: Cache | null = null;\n if (\n@@ -1783,26 +1780,24 @@ function completeWork(\n scheduleRetryEffect(workInProgress, retryQueue);\n }\n \n- if (enableCache) {\n- let previousCache: Cache | null = null;\n- if (\n- current !== null &&\n- current.memoizedState !== null &&\n- current.memoizedState.cachePool !== null\n- ) {\n- previousCache = current.memoizedState.cachePool.pool;\n- }\n- let cache: Cache | null = null;\n- if (\n- workInProgress.memoizedState !== null &&\n- workInProgress.memoizedState.cachePool !== null\n- ) {\n- cache = workInProgress.memoizedState.cachePool.pool;\n- }\n- if (cache !== previousCache) {\n- \/\/ Run passive effects to retain\/release the cache.\n- workInProgress.flags |= Passive;\n- }\n+ let previousCache: Cache | null = null;\n+ if (\n+ current !== null &&\n+ current.memoizedState !== null &&\n+ current.memoizedState.cachePool !== null\n+ ) {\n+ previousCache = current.memoizedState.cachePool.pool;\n+ }\n+ let cache: Cache | null = null;\n+ if (\n+ workInProgress.memoizedState !== null &&\n+ workInProgress.memoizedState.cachePool !== null\n+ ) {\n+ cache = workInProgress.memoizedState.cachePool.pool;\n+ }\n+ if (cache !== previousCache) {\n+ \/\/ Run passive effects to retain\/release the cache.\n+ workInProgress.flags |= Passive;\n }\n \n popTransition(workInProgress, current);\n@@ -1810,19 +1805,17 @@ function completeWork(\n return null;\n }\n case CacheComponent: {\n- if (enableCache) {\n- let previousCache: Cache | null = null;\n- if (current !== null) {\n- previousCache = current.memoizedState.cache;\n- }\n- const cache: Cache = workInProgress.memoizedState.cache;\n- if (cache !== previousCache) {\n- \/\/ Run passive effects to retain\/release the cache.\n- workInProgress.flags |= Passive;\n- }\n- popCacheProvider(workInProgress, cache);\n- bubbleProperties(workInProgress);\n+ let previousCache: Cache | null = null;\n+ if (current !== null) {\n+ previousCache = current.memoizedState.cache;\n }\n+ const cache: Cache = workInProgress.memoizedState.cache;\n+ if (cache !== previousCache) {\n+ \/\/ Run passive effects to retain\/release the cache.\n+ workInProgress.flags |= Passive;\n+ }\n+ popCacheProvider(workInProgress, cache);\n+ bubbleProperties(workInProgress);\n return null;\n }\n case TracingMarkerComponent: {\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberHooks.js b\/packages\/react-reconciler\/src\/ReactFiberHooks.js\nindex 11851d213b..8affe4804b 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberHooks.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberHooks.js\n@@ -36,7 +36,6 @@ import {\n import ReactSharedInternals from 'shared\/ReactSharedInternals';\n import {\n enableSchedulingProfiler,\n- enableCache,\n enableLazyContextPropagation,\n enableTransitionTracing,\n enableUseEffectEventHook,\n@@ -3591,9 +3590,6 @@ function updateRefresh(): any {\n }\n \n function refreshCache(fiber: Fiber, seedKey: ?() => T, seedValue: T): void {\n- if (!enableCache) {\n- return;\n- }\n \/\/ TODO: Does Cache work in legacy mode? Should decide and write a test.\n \/\/ TODO: Consider warning if the refresh is at discrete priority, or if we\n \/\/ otherwise suspect that it wasn't batched properly.\n@@ -3954,10 +3950,8 @@ export const ContextOnlyDispatcher: Dispatcher = {\n useActionState: throwInvalidHookError,\n useOptimistic: throwInvalidHookError,\n useMemoCache: throwInvalidHookError,\n+ useCacheRefresh: throwInvalidHookError,\n };\n-if (enableCache) {\n- (ContextOnlyDispatcher: Dispatcher).useCacheRefresh = throwInvalidHookError;\n-}\n if (enableUseEffectEventHook) {\n (ContextOnlyDispatcher: Dispatcher).useEffectEvent = throwInvalidHookError;\n }\n@@ -3993,10 +3987,8 @@ const HooksDispatcherOnMount: Dispatcher = {\n useActionState: mountActionState,\n useOptimistic: mountOptimistic,\n useMemoCache,\n+ useCacheRefresh: mountRefresh,\n };\n-if (enableCache) {\n- (HooksDispatcherOnMount: Dispatcher).useCacheRefresh = mountRefresh;\n-}\n if (enableUseEffectEventHook) {\n (HooksDispatcherOnMount: Dispatcher).useEffectEvent = mountEvent;\n }\n@@ -4032,10 +4024,8 @@ const HooksDispatcherOnUpdate: Dispatcher = {\n useActionState: updateActionState,\n useOptimistic: updateOptimistic,\n useMemoCache,\n+ useCacheRefresh: updateRefresh,\n };\n-if (enableCache) {\n- (HooksDispatcherOnUpdate: Dispatcher).useCacheRefresh = updateRefresh;\n-}\n if (enableUseEffectEventHook) {\n (HooksDispatcherOnUpdate: Dispatcher).useEffectEvent = updateEvent;\n }\n@@ -4072,10 +4062,8 @@ const HooksDispatcherOnRerender: Dispatcher = {\n useActionState: rerenderActionState,\n useOptimistic: rerenderOptimistic,\n useMemoCache,\n+ useCacheRefresh: updateRefresh,\n };\n-if (enableCache) {\n- (HooksDispatcherOnRerender: Dispatcher).useCacheRefresh = updateRefresh;\n-}\n if (enableUseEffectEventHook) {\n (HooksDispatcherOnRerender: Dispatcher).useEffectEvent = updateEvent;\n }\n@@ -4271,15 +4259,12 @@ if (__DEV__) {\n },\n useHostTransitionStatus,\n useMemoCache,\n+ useCacheRefresh() {\n+ currentHookNameInDev = 'useCacheRefresh';\n+ mountHookTypesDev();\n+ return mountRefresh();\n+ },\n };\n- if (enableCache) {\n- (HooksDispatcherOnMountInDEV: Dispatcher).useCacheRefresh =\n- function useCacheRefresh() {\n- currentHookNameInDev = 'useCacheRefresh';\n- mountHookTypesDev();\n- return mountRefresh();\n- };\n- }\n if (enableUseEffectEventHook) {\n (HooksDispatcherOnMountInDEV: Dispatcher).useEffectEvent =\n function useEffectEvent) => Return>(\n@@ -4473,15 +4458,12 @@ if (__DEV__) {\n },\n useHostTransitionStatus,\n useMemoCache,\n+ useCacheRefresh() {\n+ currentHookNameInDev = 'useCacheRefresh';\n+ updateHookTypesDev();\n+ return mountRefresh();\n+ },\n };\n- if (enableCache) {\n- (HooksDispatcherOnMountWithHookTypesInDEV: Dispatcher).useCacheRefresh =\n- function useCacheRefresh() {\n- currentHookNameInDev = 'useCacheRefresh';\n- updateHookTypesDev();\n- return mountRefresh();\n- };\n- }\n if (enableUseEffectEventHook) {\n (HooksDispatcherOnMountWithHookTypesInDEV: Dispatcher).useEffectEvent =\n function useEffectEvent) => Return>(\n@@ -4674,15 +4656,12 @@ if (__DEV__) {\n },\n useHostTransitionStatus,\n useMemoCache,\n+ useCacheRefresh() {\n+ currentHookNameInDev = 'useCacheRefresh';\n+ updateHookTypesDev();\n+ return updateRefresh();\n+ },\n };\n- if (enableCache) {\n- (HooksDispatcherOnUpdateInDEV: Dispatcher).useCacheRefresh =\n- function useCacheRefresh() {\n- currentHookNameInDev = 'useCacheRefresh';\n- updateHookTypesDev();\n- return updateRefresh();\n- };\n- }\n if (enableUseEffectEventHook) {\n (HooksDispatcherOnUpdateInDEV: Dispatcher).useEffectEvent =\n function useEffectEvent) => Return>(\n@@ -4875,15 +4854,12 @@ if (__DEV__) {\n },\n useHostTransitionStatus,\n useMemoCache,\n+ useCacheRefresh() {\n+ currentHookNameInDev = 'useCacheRefresh';\n+ updateHookTypesDev();\n+ return updateRefresh();\n+ },\n };\n- if (enableCache) {\n- (HooksDispatcherOnRerenderInDEV: Dispatcher).useCacheRefresh =\n- function useCacheRefresh() {\n- currentHookNameInDev = 'useCacheRefresh';\n- updateHookTypesDev();\n- return updateRefresh();\n- };\n- }\n if (enableUseEffectEventHook) {\n (HooksDispatcherOnRerenderInDEV: Dispatcher).useEffectEvent =\n function useEffectEvent) => Return>(\n@@ -5100,15 +5076,12 @@ if (__DEV__) {\n return useMemoCache(size);\n },\n useHostTransitionStatus,\n+ useCacheRefresh() {\n+ currentHookNameInDev = 'useCacheRefresh';\n+ mountHookTypesDev();\n+ return mountRefresh();\n+ },\n };\n- if (enableCache) {\n- (InvalidNestedHooksDispatcherOnMountInDEV: Dispatcher).useCacheRefresh =\n- function useCacheRefresh() {\n- currentHookNameInDev = 'useCacheRefresh';\n- mountHookTypesDev();\n- return mountRefresh();\n- };\n- }\n if (enableUseEffectEventHook) {\n (InvalidNestedHooksDispatcherOnMountInDEV: Dispatcher).useEffectEvent =\n function useEffectEvent) => Return>(\n@@ -5328,15 +5301,12 @@ if (__DEV__) {\n return useMemoCache(size);\n },\n useHostTransitionStatus,\n+ useCacheRefresh() {\n+ currentHookNameInDev = 'useCacheRefresh';\n+ updateHookTypesDev();\n+ return updateRefresh();\n+ },\n };\n- if (enableCache) {\n- (InvalidNestedHooksDispatcherOnUpdateInDEV: Dispatcher).useCacheRefresh =\n- function useCacheRefresh() {\n- currentHookNameInDev = 'useCacheRefresh';\n- updateHookTypesDev();\n- return updateRefresh();\n- };\n- }\n if (enableUseEffectEventHook) {\n (InvalidNestedHooksDispatcherOnUpdateInDEV: Dispatcher).useEffectEvent =\n function useEffectEvent) => Return>(\n@@ -5556,15 +5526,12 @@ if (__DEV__) {\n return useMemoCache(size);\n },\n useHostTransitionStatus,\n+ useCacheRefresh() {\n+ currentHookNameInDev = 'useCacheRefresh';\n+ updateHookTypesDev();\n+ return updateRefresh();\n+ },\n };\n- if (enableCache) {\n- (InvalidNestedHooksDispatcherOnRerenderInDEV: Dispatcher).useCacheRefresh =\n- function useCacheRefresh() {\n- currentHookNameInDev = 'useCacheRefresh';\n- updateHookTypesDev();\n- return updateRefresh();\n- };\n- }\n if (enableUseEffectEventHook) {\n (InvalidNestedHooksDispatcherOnRerenderInDEV: Dispatcher).useEffectEvent =\n function useEffectEvent) => Return>(\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberRoot.js b\/packages\/react-reconciler\/src\/ReactFiberRoot.js\nindex 176c3846d1..29bc7923d8 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberRoot.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberRoot.js\n@@ -28,7 +28,6 @@ import {\n } from '.\/ReactFiberLane';\n import {\n enableSuspenseCallback,\n- enableCache,\n enableProfilerCommitHooks,\n enableProfilerTimer,\n enableUpdaterTracking,\n@@ -91,10 +90,8 @@ function FiberRootNode(\n this.onCaughtError = onCaughtError;\n this.onRecoverableError = onRecoverableError;\n \n- if (enableCache) {\n- this.pooledCache = null;\n- this.pooledCacheLanes = NoLanes;\n- }\n+ this.pooledCache = null;\n+ this.pooledCacheLanes = NoLanes;\n \n if (enableSuspenseCallback) {\n this.hydrationCallbacks = null;\n@@ -196,33 +193,24 @@ export function createFiberRoot(\n root.current = uninitializedFiber;\n uninitializedFiber.stateNode = root;\n \n- if (enableCache) {\n- const initialCache = createCache();\n- retainCache(initialCache);\n-\n- \/\/ The pooledCache is a fresh cache instance that is used temporarily\n- \/\/ for newly mounted boundaries during a render. In general, the\n- \/\/ pooledCache is always cleared from the root at the end of a render:\n- \/\/ it is either released when render commits, or moved to an Offscreen\n- \/\/ component if rendering suspends. Because the lifetime of the pooled\n- \/\/ cache is distinct from the main memoizedState.cache, it must be\n- \/\/ retained separately.\n- root.pooledCache = initialCache;\n- retainCache(initialCache);\n- const initialState: RootState = {\n- element: initialChildren,\n- isDehydrated: hydrate,\n- cache: initialCache,\n- };\n- uninitializedFiber.memoizedState = initialState;\n- } else {\n- const initialState: RootState = {\n- element: initialChildren,\n- isDehydrated: hydrate,\n- cache: (null: any), \/\/ not enabled yet\n- };\n- uninitializedFiber.memoizedState = initialState;\n- }\n+ const initialCache = createCache();\n+ retainCache(initialCache);\n+\n+ \/\/ The pooledCache is a fresh cache instance that is used temporarily\n+ \/\/ for newly mounted boundaries during a render. In general, the\n+ \/\/ pooledCache is always cleared from the root at the end of a render:\n+ \/\/ it is either released when render commits, or moved to an Offscreen\n+ \/\/ component if rendering suspends. Because the lifetime of the pooled\n+ \/\/ cache is distinct from the main memoizedState.cache, it must be\n+ \/\/ retained separately.\n+ root.pooledCache = initialCache;\n+ retainCache(initialCache);\n+ const initialState: RootState = {\n+ element: initialChildren,\n+ isDehydrated: hydrate,\n+ cache: initialCache,\n+ };\n+ uninitializedFiber.memoizedState = initialState;\n \n initializeUpdateQueue(uninitializedFiber);\n \ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberTransition.js b\/packages\/react-reconciler\/src\/ReactFiberTransition.js\nindex 8953ca1457..db4db58908 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberTransition.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberTransition.js\n@@ -16,7 +16,7 @@ import type {\n Transition,\n } from '.\/ReactFiberTracingMarkerComponent';\n \n-import {enableCache, enableTransitionTracing} from 'shared\/ReactFeatureFlags';\n+import {enableTransitionTracing} from 'shared\/ReactFeatureFlags';\n import {isPrimaryRenderer} from '.\/ReactFiberConfig';\n import {createCursor, push, pop} from '.\/ReactFiberStack';\n import {\n@@ -98,10 +98,6 @@ const transitionStack: StackCursor | null> =\n createCursor(null);\n \n function peekCacheFromPool(): Cache | null {\n- if (!enableCache) {\n- return (null: any);\n- }\n-\n \/\/ Check if the cache pool already has a cache we can use.\n \n \/\/ If we're rendering inside a Suspense boundary that is currently hidden,\n@@ -173,12 +169,10 @@ export function pushTransition(\n prevCachePool: SpawnedCachePool | null,\n newTransitions: Array | null,\n ): void {\n- if (enableCache) {\n- if (prevCachePool === null) {\n- push(resumedCache, resumedCache.current, offscreenWorkInProgress);\n- } else {\n- push(resumedCache, prevCachePool.pool, offscreenWorkInProgress);\n- }\n+ if (prevCachePool === null) {\n+ push(resumedCache, resumedCache.current, offscreenWorkInProgress);\n+ } else {\n+ push(resumedCache, prevCachePool.pool, offscreenWorkInProgress);\n }\n \n if (enableTransitionTracing) {\n@@ -202,9 +196,7 @@ export function popTransition(workInProgress: Fiber, current: Fiber | null) {\n pop(transitionStack, workInProgress);\n }\n \n- if (enableCache) {\n- pop(resumedCache, workInProgress);\n- }\n+ pop(resumedCache, workInProgress);\n }\n }\n \n@@ -217,9 +209,6 @@ export function getPendingTransitions(): Array | null {\n }\n \n export function getSuspendedCache(): SpawnedCachePool | null {\n- if (!enableCache) {\n- return null;\n- }\n \/\/ This function is called when a Suspense boundary suspends. It returns the\n \/\/ cache that would have been used to render fresh data during this render,\n \/\/ if there was any, so that we can resume rendering with the same cache when\n@@ -240,10 +229,6 @@ export function getSuspendedCache(): SpawnedCachePool | null {\n }\n \n export function getOffscreenDeferredCache(): SpawnedCachePool | null {\n- if (!enableCache) {\n- return null;\n- }\n-\n const cacheFromPool = peekCacheFromPool();\n if (cacheFromPool === null) {\n return null;\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberUnwindWork.js b\/packages\/react-reconciler\/src\/ReactFiberUnwindWork.js\nindex cc77647cb8..cdc887b5af 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberUnwindWork.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberUnwindWork.js\n@@ -33,7 +33,6 @@ import {DidCapture, NoFlags, ShouldCapture} from '.\/ReactFiberFlags';\n import {NoMode, ProfileMode} from '.\/ReactTypeOfMode';\n import {\n enableProfilerTimer,\n- enableCache,\n enableTransitionTracing,\n enableRenderableContext,\n } from 'shared\/ReactFeatureFlags';\n@@ -91,10 +90,8 @@ function unwindWork(\n }\n case HostRoot: {\n const root: FiberRoot = workInProgress.stateNode;\n- if (enableCache) {\n- const cache: Cache = workInProgress.memoizedState.cache;\n- popCacheProvider(workInProgress, cache);\n- }\n+ const cache: Cache = workInProgress.memoizedState.cache;\n+ popCacheProvider(workInProgress, cache);\n \n if (enableTransitionTracing) {\n popRootMarkerInstance(workInProgress);\n@@ -189,10 +186,8 @@ function unwindWork(\n return null;\n }\n case CacheComponent:\n- if (enableCache) {\n- const cache: Cache = workInProgress.memoizedState.cache;\n- popCacheProvider(workInProgress, cache);\n- }\n+ const cache: Cache = workInProgress.memoizedState.cache;\n+ popCacheProvider(workInProgress, cache);\n return null;\n case TracingMarkerComponent:\n if (enableTransitionTracing) {\n@@ -226,10 +221,8 @@ function unwindInterruptedWork(\n }\n case HostRoot: {\n const root: FiberRoot = interruptedWork.stateNode;\n- if (enableCache) {\n- const cache: Cache = interruptedWork.memoizedState.cache;\n- popCacheProvider(interruptedWork, cache);\n- }\n+ const cache: Cache = interruptedWork.memoizedState.cache;\n+ popCacheProvider(interruptedWork, cache);\n \n if (enableTransitionTracing) {\n popRootMarkerInstance(interruptedWork);\n@@ -271,10 +264,8 @@ function unwindInterruptedWork(\n popTransition(interruptedWork, current);\n break;\n case CacheComponent:\n- if (enableCache) {\n- const cache: Cache = interruptedWork.memoizedState.cache;\n- popCacheProvider(interruptedWork, cache);\n- }\n+ const cache: Cache = interruptedWork.memoizedState.cache;\n+ popCacheProvider(interruptedWork, cache);\n break;\n case TracingMarkerComponent:\n if (enableTransitionTracing) {\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.js b\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.js\nindex f2fc387d7e..9a002ce4b6 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.js\n@@ -31,7 +31,6 @@ import {\n enableProfilerNestedUpdatePhase,\n enableSchedulingProfiler,\n enableUpdaterTracking,\n- enableCache,\n enableTransitionTracing,\n useModernStrictMode,\n disableLegacyContext,\n@@ -2113,19 +2112,13 @@ function popDispatcher(prevDispatcher: any) {\n }\n \n function pushAsyncDispatcher() {\n- if (enableCache || __DEV__) {\n- const prevAsyncDispatcher = ReactSharedInternals.A;\n- ReactSharedInternals.A = DefaultAsyncDispatcher;\n- return prevAsyncDispatcher;\n- } else {\n- return null;\n- }\n+ const prevAsyncDispatcher = ReactSharedInternals.A;\n+ ReactSharedInternals.A = DefaultAsyncDispatcher;\n+ return prevAsyncDispatcher;\n }\n \n function popAsyncDispatcher(prevAsyncDispatcher: any) {\n- if (enableCache || __DEV__) {\n- ReactSharedInternals.A = prevAsyncDispatcher;\n- }\n+ ReactSharedInternals.A = prevAsyncDispatcher;\n }\n \n export function markCommitTimeOfFallback() {\n@@ -3587,16 +3580,14 @@ function makeErrorInfo(componentStack: ?string) {\n }\n \n function releaseRootPooledCache(root: FiberRoot, remainingLanes: Lanes) {\n- if (enableCache) {\n- const pooledCacheLanes = (root.pooledCacheLanes &= remainingLanes);\n- if (pooledCacheLanes === NoLanes) {\n- \/\/ None of the remaining work relies on the cache pool. Clear it so\n- \/\/ subsequent requests get a new cache\n- const pooledCache = root.pooledCache;\n- if (pooledCache != null) {\n- root.pooledCache = null;\n- releaseCache(pooledCache);\n- }\n+ const pooledCacheLanes = (root.pooledCacheLanes &= remainingLanes);\n+ if (pooledCacheLanes === NoLanes) {\n+ \/\/ None of the remaining work relies on the cache pool. Clear it so\n+ \/\/ subsequent requests get a new cache\n+ const pooledCache = root.pooledCache;\n+ if (pooledCache != null) {\n+ root.pooledCache = null;\n+ releaseCache(pooledCache);\n }\n }\n }\ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/ReactCache-test.js b\/packages\/react-reconciler\/src\/__tests__\/ReactCache-test.js\nindex 7fd43b0b36..e93b68cec3 100644\n--- a\/packages\/react-reconciler\/src\/__tests__\/ReactCache-test.js\n+++ b\/packages\/react-reconciler\/src\/__tests__\/ReactCache-test.js\n@@ -30,7 +30,6 @@ describe('ReactCache', () => {\n __unmockReact();\n });\n \n- \/\/ @gate enableCache\n it('cache objects and primitive arguments and a mix of them', async () => {\n const types = cache((a, b) => ({a: typeof a, b: typeof b}));\n function Print({a, b}) {\n@@ -170,7 +169,6 @@ describe('ReactCache', () => {\n ).toEqual('number number true false false false ');\n });\n \n- \/\/ @gate enableCache\n it('cached functions that throw should cache the error', async () => {\n const throws = cache(v => {\n throw new Error(v);\n@@ -203,7 +201,6 @@ describe('ReactCache', () => {\n expect(z).not.toBe(x);\n });\n \n- \/\/ @gate enableCache\n it('introspection of returned wrapper function is same on client and server', async () => {\n \/\/ When the variant flag is true, test the client version of `cache`.\n if (gate(flags => flags.variant)) {\ndiff --git a\/packages\/react-server\/src\/ReactFizzHooks.js b\/packages\/react-server\/src\/ReactFizzHooks.js\nindex a163aa1151..83f51c6fb2 100644\n--- a\/packages\/react-server\/src\/ReactFizzHooks.js\n+++ b\/packages\/react-server\/src\/ReactFizzHooks.js\n@@ -39,7 +39,6 @@ import {\n import {createFastHash} from '.\/ReactServerStreamConfig';\n \n import {\n- enableCache,\n enableUseEffectEventHook,\n enableUseResourceEffectHook,\n } from 'shared\/ReactFeatureFlags';\n@@ -859,11 +858,9 @@ export const HooksDispatcher: Dispatcher = supportsClientAPIs\n useFormState: useActionState,\n useHostTransitionStatus,\n useMemoCache,\n+ useCacheRefresh,\n };\n \n-if (enableCache) {\n- HooksDispatcher.useCacheRefresh = useCacheRefresh;\n-}\n if (enableUseEffectEventHook) {\n HooksDispatcher.useEffectEvent = useEffectEvent;\n }\ndiff --git a\/packages\/react-server\/src\/ReactFizzServer.js b\/packages\/react-server\/src\/ReactFizzServer.js\nindex f18b624a11..e0ff9593bc 100644\n--- a\/packages\/react-server\/src\/ReactFizzServer.js\n+++ b\/packages\/react-server\/src\/ReactFizzServer.js\n@@ -152,7 +152,6 @@ import {\n disableLegacyContext,\n disableLegacyContextForFunctionComponents,\n enableScopeAPI,\n- enableCache,\n enablePostpone,\n enableHalt,\n enableRenderableContext,\n@@ -4416,11 +4415,8 @@ export function performWork(request: Request): void {\n const prevContext = getActiveContext();\n const prevDispatcher = ReactSharedInternals.H;\n ReactSharedInternals.H = HooksDispatcher;\n- let prevAsyncDispatcher = null;\n- if (enableCache || __DEV__) {\n- prevAsyncDispatcher = ReactSharedInternals.A;\n- ReactSharedInternals.A = DefaultAsyncDispatcher;\n- }\n+ const prevAsyncDispatcher = ReactSharedInternals.A;\n+ ReactSharedInternals.A = DefaultAsyncDispatcher;\n \n const prevRequest = currentRequest;\n currentRequest = request;\n@@ -4450,9 +4446,7 @@ export function performWork(request: Request): void {\n } finally {\n setCurrentResumableState(prevResumableState);\n ReactSharedInternals.H = prevDispatcher;\n- if (enableCache) {\n- ReactSharedInternals.A = prevAsyncDispatcher;\n- }\n+ ReactSharedInternals.A = prevAsyncDispatcher;\n \n if (__DEV__) {\n ReactSharedInternals.getCurrentStack = prevGetCurrentStackImpl;\ndiff --git a\/packages\/shared\/ReactFeatureFlags.js b\/packages\/shared\/ReactFeatureFlags.js\nindex 5a1220d7f2..d1dc6cb7f7 100644\n--- a\/packages\/shared\/ReactFeatureFlags.js\n+++ b\/packages\/shared\/ReactFeatureFlags.js\n@@ -77,7 +77,6 @@ export const enableLegacyFBSupport = false;\n \/\/ likely to include in an upcoming release.\n \/\/ -----------------------------------------------------------------------------\n \n-export const enableCache = true;\n export const enableLegacyCache = __EXPERIMENTAL__;\n \n export const enableAsyncIterableChildren = __EXPERIMENTAL__;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js b\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js\nindex 0a9d33675d..498af214b0 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js\n@@ -44,7 +44,6 @@ export const disableSchedulerTimeoutInWorkLoop = false;\n export const disableTextareaChildren = false;\n export const enableAsyncDebugInfo = false;\n export const enableAsyncIterableChildren = false;\n-export const enableCache = true;\n export const enableCPUSuspense = true;\n export const enableCreateEventHandleAPI = false;\n export const enableDeferRootSchedulingToMicrotask = true;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js b\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\nindex 52b9a67f77..fb996a43ad 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\n@@ -31,7 +31,6 @@ export const disableSchedulerTimeoutInWorkLoop = false;\n export const disableTextareaChildren = false;\n export const enableAsyncDebugInfo = false;\n export const enableAsyncIterableChildren = false;\n-export const enableCache = true;\n export const enableCPUSuspense = false;\n export const enableCreateEventHandleAPI = false;\n export const enableDeferRootSchedulingToMicrotask = true;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js\nindex 201d659f65..6646a126a0 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js\n@@ -18,7 +18,6 @@ export const enableProfilerCommitHooks = __PROFILE__;\n export const enableProfilerNestedUpdatePhase = __PROFILE__;\n export const enableComponentPerformanceTrack = false;\n export const enableUpdaterTracking = false;\n-export const enableCache = true;\n export const enableLegacyCache = __EXPERIMENTAL__;\n export const enableAsyncIterableChildren = false;\n export const enableTaint = true;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native-fb.js b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native-fb.js\nindex 1b311a3ecf..8f71306c51 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native-fb.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native-fb.js\n@@ -23,7 +23,6 @@ export const disableSchedulerTimeoutInWorkLoop = false;\n export const disableTextareaChildren = false;\n export const enableAsyncDebugInfo = false;\n export const enableAsyncIterableChildren = false;\n-export const enableCache = true;\n export const enableCPUSuspense = true;\n export const enableCreateEventHandleAPI = false;\n export const enableDeferRootSchedulingToMicrotask = true;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\nindex b74d89a4b9..dae38936f8 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\n@@ -18,7 +18,6 @@ export const enableProfilerCommitHooks = __PROFILE__;\n export const enableProfilerNestedUpdatePhase = __PROFILE__;\n export const enableComponentPerformanceTrack = false;\n export const enableUpdaterTracking = false;\n-export const enableCache = true;\n export const enableLegacyCache = true;\n export const enableAsyncIterableChildren = false;\n export const enableTaint = true;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.www.js b\/packages\/shared\/forks\/ReactFeatureFlags.www.js\nindex e9ec691f08..060600286e 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.www.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.www.js\n@@ -69,7 +69,6 @@ export const enableSchedulingProfiler: boolean =\n export const disableLegacyContext = __EXPERIMENTAL__;\n export const enableGetInspectorDataForInstanceInProduction = false;\n \n-export const enableCache = true;\n export const enableLegacyCache = true;\n \n export const enableAsyncIterableChildren = false;\n","parents":["2d320563f35ad75419983f166431055b4e7ed9f6"],"commit":{"authorEmail":"rickhanlonii@gmail.com","subject":"[flags] Cleanup enableCache (#31778)","authorName":"Ricky","shortRevision":"e06c72fcf4","authoredAt":"2024-12-15T12:34:08-05:00","revision":"e06c72fcf4632ad3117add713a25f6354631f037"},"files":[{"status":"M","path":"packages\/react-dom\/src\/__tests__\/ReactCompositeComponent-test.js"},{"status":"M","path":"packages\/react-markup\/src\/__tests__\/ReactMarkupServer-test.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberAsyncDispatcher.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberBeginWork.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberCacheComponent.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberCommitWork.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberCompleteWork.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberHooks.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberRoot.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberTransition.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberUnwindWork.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberWorkLoop.js"},{"status":"M","path":"packages\/react-reconciler\/src\/__tests__\/ReactCache-test.js"},{"status":"M","path":"packages\/react-server\/src\/ReactFizzHooks.js"},{"status":"M","path":"packages\/react-server\/src\/ReactFizzServer.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"}]}

dillon1000/react

Files changed