{"files":[{"status":"M","path":"packages\/react-debug-tools\/src\/ReactDebugHooks.js"},{"status":"A","path":"packages\/react-reconciler\/src\/ReactFiberCache.new.js"},{"status":"A","path":"packages\/react-reconciler\/src\/ReactFiberCache.old.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberHooks.new.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberHooks.old.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberWorkLoop.new.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberWorkLoop.old.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactInternalTypes.js"},{"status":"A","path":"packages\/react-server\/src\/ReactFizzCache.js"},{"status":"M","path":"packages\/react-server\/src\/ReactFizzHooks.js"},{"status":"M","path":"packages\/react-server\/src\/ReactFizzServer.js"},{"status":"A","path":"packages\/react-server\/src\/ReactFlightCache.js"},{"status":"M","path":"packages\/react-server\/src\/ReactFlightHooks.js"},{"status":"M","path":"packages\/react-server\/src\/ReactFlightServer.js"},{"status":"M","path":"packages\/react-suspense-test-utils\/src\/ReactSuspenseTestUtils.js"},{"status":"A","path":"packages\/react\/src\/ReactCurrentCache.js"},{"status":"M","path":"packages\/react\/src\/ReactCurrentDispatcher.js"},{"status":"M","path":"packages\/react\/src\/ReactHooks.js"},{"status":"M","path":"packages\/react\/src\/ReactSharedInternals.js"},{"status":"D","path":"packages\/react\/src\/forks\/ReactCurrentDispatcher.www.js"},{"status":"D","path":"packages\/react\/src\/forks\/ReactCurrentOwner.www.js"},{"status":"M","path":"packages\/react\/src\/forks\/ReactSharedInternals.umd.js"},{"status":"M","path":"scripts\/error-codes\/codes.json"},{"status":"M","path":"scripts\/rollup\/forks.js"}],"patch":"diff --git a\/packages\/react-debug-tools\/src\/ReactDebugHooks.js b\/packages\/react-debug-tools\/src\/ReactDebugHooks.js\nindex 2bd458d067..74ca5568f1 100644\n--- a\/packages\/react-debug-tools\/src\/ReactDebugHooks.js\n+++ b\/packages\/react-debug-tools\/src\/ReactDebugHooks.js\n@@ -101,10 +101,6 @@ function nextHook(): null | Hook {\n return hook;\n }\n \n-function getCacheForType(resourceType: () => T): T {\n- throw new Error('Not implemented.');\n-}\n-\n function readContext(context: ReactContext): T {\n \/\/ For now we don't expose readContext usage in the hooks debugging info.\n return context._currentValue;\n@@ -331,7 +327,6 @@ function useId(): string {\n }\n \n const Dispatcher: DispatcherType = {\n- getCacheForType,\n readContext,\n useCacheRefresh,\n useCallback,\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberCache.new.js b\/packages\/react-reconciler\/src\/ReactFiberCache.new.js\nnew file mode 100644\nindex 0000000000..c0ee28b855\n--- \/dev\/null\n+++ b\/packages\/react-reconciler\/src\/ReactFiberCache.new.js\n@@ -0,0 +1,41 @@\n+\/**\n+ * Copyright (c) Facebook, Inc. and its affiliates.\n+ *\n+ * This source code is licensed under the MIT license found in the\n+ * LICENSE file in the root directory of this source tree.\n+ *\n+ * @flow\n+ *\/\n+\n+import type {CacheDispatcher} from '.\/ReactInternalTypes';\n+import type {Cache} from '.\/ReactFiberCacheComponent.new';\n+\n+import {enableCache} from 'shared\/ReactFeatureFlags';\n+import {readContext} from '.\/ReactFiberNewContext.new';\n+import {CacheContext} from '.\/ReactFiberCacheComponent.new';\n+\n+function getCacheSignal(): AbortSignal {\n+ if (!enableCache) {\n+ throw new Error('Not implemented.');\n+ }\n+ const cache: Cache = readContext(CacheContext);\n+ return cache.controller.signal;\n+}\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) {\n+ cacheForType = resourceType();\n+ cache.data.set(resourceType, cacheForType);\n+ }\n+ return cacheForType;\n+}\n+\n+export const DefaultCacheDispatcher: CacheDispatcher = {\n+ getCacheSignal,\n+ getCacheForType,\n+};\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberCache.old.js b\/packages\/react-reconciler\/src\/ReactFiberCache.old.js\nnew file mode 100644\nindex 0000000000..507fccbc93\n--- \/dev\/null\n+++ b\/packages\/react-reconciler\/src\/ReactFiberCache.old.js\n@@ -0,0 +1,41 @@\n+\/**\n+ * Copyright (c) Facebook, Inc. and its affiliates.\n+ *\n+ * This source code is licensed under the MIT license found in the\n+ * LICENSE file in the root directory of this source tree.\n+ *\n+ * @flow\n+ *\/\n+\n+import type {CacheDispatcher} from '.\/ReactInternalTypes';\n+import type {Cache} from '.\/ReactFiberCacheComponent.old';\n+\n+import {enableCache} from 'shared\/ReactFeatureFlags';\n+import {readContext} from '.\/ReactFiberNewContext.old';\n+import {CacheContext} from '.\/ReactFiberCacheComponent.old';\n+\n+function getCacheSignal(): AbortSignal {\n+ if (!enableCache) {\n+ throw new Error('Not implemented.');\n+ }\n+ const cache: Cache = readContext(CacheContext);\n+ return cache.controller.signal;\n+}\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) {\n+ cacheForType = resourceType();\n+ cache.data.set(resourceType, cacheForType);\n+ }\n+ return cacheForType;\n+}\n+\n+export const DefaultCacheDispatcher: CacheDispatcher = {\n+ getCacheSignal,\n+ getCacheForType,\n+};\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberHooks.new.js b\/packages\/react-reconciler\/src\/ReactFiberHooks.new.js\nindex f430a4cad6..2f854410af 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberHooks.new.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberHooks.new.js\n@@ -26,7 +26,6 @@ import type {\n import type {Lanes, Lane} from '.\/ReactFiberLane.new';\n import type {HookFlags} from '.\/ReactHookEffectTags';\n import type {FiberRoot} from '.\/ReactInternalTypes';\n-import type {Cache} from '.\/ReactFiberCacheComponent.new';\n import type {Flags} from '.\/ReactFiberFlags';\n \n import ReactSharedInternals from 'shared\/ReactSharedInternals';\n@@ -122,7 +121,7 @@ import {\n } from '.\/ReactMutableSource.new';\n import {logStateUpdateScheduled} from '.\/DebugTracing';\n import {markStateUpdateScheduled} from '.\/ReactFiberDevToolsHook.new';\n-import {createCache, CacheContext} from '.\/ReactFiberCacheComponent.new';\n+import {createCache} from '.\/ReactFiberCacheComponent.new';\n import {\n createUpdate as createLegacyQueueUpdate,\n enqueueUpdate as enqueueLegacyQueueUpdate,\n@@ -2600,27 +2599,6 @@ function markUpdateInDevTools(fiber, lane, action: A) {\n }\n }\n \n-function getCacheSignal(): AbortSignal {\n- if (!enableCache) {\n- throw new Error('Not implemented.');\n- }\n- const cache: Cache = readContext(CacheContext);\n- return cache.controller.signal;\n-}\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) {\n- cacheForType = resourceType();\n- cache.data.set(resourceType, cacheForType);\n- }\n- return cacheForType;\n-}\n-\n export const ContextOnlyDispatcher: Dispatcher = {\n readContext,\n \n@@ -2644,8 +2622,6 @@ export const ContextOnlyDispatcher: Dispatcher = {\n unstable_isNewReconciler: enableNewReconciler,\n };\n if (enableCache) {\n- (ContextOnlyDispatcher: Dispatcher).getCacheSignal = getCacheSignal;\n- (ContextOnlyDispatcher: Dispatcher).getCacheForType = getCacheForType;\n (ContextOnlyDispatcher: Dispatcher).useCacheRefresh = throwInvalidHookError;\n }\n if (enableUseHook) {\n@@ -2681,8 +2657,6 @@ const HooksDispatcherOnMount: Dispatcher = {\n unstable_isNewReconciler: enableNewReconciler,\n };\n if (enableCache) {\n- (HooksDispatcherOnMount: Dispatcher).getCacheSignal = getCacheSignal;\n- (HooksDispatcherOnMount: Dispatcher).getCacheForType = getCacheForType;\n \/\/ $FlowFixMe[escaped-generic] discovered when updating Flow\n (HooksDispatcherOnMount: Dispatcher).useCacheRefresh = mountRefresh;\n }\n@@ -2718,8 +2692,6 @@ const HooksDispatcherOnUpdate: Dispatcher = {\n unstable_isNewReconciler: enableNewReconciler,\n };\n if (enableCache) {\n- (HooksDispatcherOnUpdate: Dispatcher).getCacheSignal = getCacheSignal;\n- (HooksDispatcherOnUpdate: Dispatcher).getCacheForType = getCacheForType;\n (HooksDispatcherOnUpdate: Dispatcher).useCacheRefresh = updateRefresh;\n }\n if (enableUseMemoCacheHook) {\n@@ -2755,8 +2727,6 @@ const HooksDispatcherOnRerender: Dispatcher = {\n unstable_isNewReconciler: enableNewReconciler,\n };\n if (enableCache) {\n- (HooksDispatcherOnRerender: Dispatcher).getCacheSignal = getCacheSignal;\n- (HooksDispatcherOnRerender: Dispatcher).getCacheForType = getCacheForType;\n (HooksDispatcherOnRerender: Dispatcher).useCacheRefresh = updateRefresh;\n }\n if (enableUseHook) {\n@@ -2935,8 +2905,6 @@ if (__DEV__) {\n unstable_isNewReconciler: enableNewReconciler,\n };\n if (enableCache) {\n- (HooksDispatcherOnMountInDEV: Dispatcher).getCacheSignal = getCacheSignal;\n- (HooksDispatcherOnMountInDEV: Dispatcher).getCacheForType = getCacheForType;\n (HooksDispatcherOnMountInDEV: Dispatcher).useCacheRefresh = function useCacheRefresh() {\n currentHookNameInDev = 'useCacheRefresh';\n mountHookTypesDev();\n@@ -3094,8 +3062,6 @@ if (__DEV__) {\n unstable_isNewReconciler: enableNewReconciler,\n };\n if (enableCache) {\n- (HooksDispatcherOnMountWithHookTypesInDEV: Dispatcher).getCacheSignal = getCacheSignal;\n- (HooksDispatcherOnMountWithHookTypesInDEV: Dispatcher).getCacheForType = getCacheForType;\n (HooksDispatcherOnMountWithHookTypesInDEV: Dispatcher).useCacheRefresh = function useCacheRefresh() {\n currentHookNameInDev = 'useCacheRefresh';\n updateHookTypesDev();\n@@ -3253,8 +3219,6 @@ if (__DEV__) {\n unstable_isNewReconciler: enableNewReconciler,\n };\n if (enableCache) {\n- (HooksDispatcherOnUpdateInDEV: Dispatcher).getCacheSignal = getCacheSignal;\n- (HooksDispatcherOnUpdateInDEV: Dispatcher).getCacheForType = getCacheForType;\n (HooksDispatcherOnUpdateInDEV: Dispatcher).useCacheRefresh = function useCacheRefresh() {\n currentHookNameInDev = 'useCacheRefresh';\n updateHookTypesDev();\n@@ -3413,8 +3377,6 @@ if (__DEV__) {\n unstable_isNewReconciler: enableNewReconciler,\n };\n if (enableCache) {\n- (HooksDispatcherOnRerenderInDEV: Dispatcher).getCacheSignal = getCacheSignal;\n- (HooksDispatcherOnRerenderInDEV: Dispatcher).getCacheForType = getCacheForType;\n (HooksDispatcherOnRerenderInDEV: Dispatcher).useCacheRefresh = function useCacheRefresh() {\n currentHookNameInDev = 'useCacheRefresh';\n updateHookTypesDev();\n@@ -3589,8 +3551,6 @@ if (__DEV__) {\n unstable_isNewReconciler: enableNewReconciler,\n };\n if (enableCache) {\n- (InvalidNestedHooksDispatcherOnMountInDEV: Dispatcher).getCacheSignal = getCacheSignal;\n- (InvalidNestedHooksDispatcherOnMountInDEV: Dispatcher).getCacheForType = getCacheForType;\n (InvalidNestedHooksDispatcherOnMountInDEV: Dispatcher).useCacheRefresh = function useCacheRefresh() {\n currentHookNameInDev = 'useCacheRefresh';\n mountHookTypesDev();\n@@ -3776,8 +3736,6 @@ if (__DEV__) {\n unstable_isNewReconciler: enableNewReconciler,\n };\n if (enableCache) {\n- (InvalidNestedHooksDispatcherOnUpdateInDEV: Dispatcher).getCacheSignal = getCacheSignal;\n- (InvalidNestedHooksDispatcherOnUpdateInDEV: Dispatcher).getCacheForType = getCacheForType;\n (InvalidNestedHooksDispatcherOnUpdateInDEV: Dispatcher).useCacheRefresh = function useCacheRefresh() {\n currentHookNameInDev = 'useCacheRefresh';\n updateHookTypesDev();\n@@ -3964,8 +3922,6 @@ if (__DEV__) {\n unstable_isNewReconciler: enableNewReconciler,\n };\n if (enableCache) {\n- (InvalidNestedHooksDispatcherOnRerenderInDEV: Dispatcher).getCacheSignal = getCacheSignal;\n- (InvalidNestedHooksDispatcherOnRerenderInDEV: Dispatcher).getCacheForType = getCacheForType;\n (InvalidNestedHooksDispatcherOnRerenderInDEV: Dispatcher).useCacheRefresh = function useCacheRefresh() {\n currentHookNameInDev = 'useCacheRefresh';\n updateHookTypesDev();\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberHooks.old.js b\/packages\/react-reconciler\/src\/ReactFiberHooks.old.js\nindex d5add2ffec..bbdb1e2478 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberHooks.old.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberHooks.old.js\n@@ -26,7 +26,6 @@ import type {\n import type {Lanes, Lane} from '.\/ReactFiberLane.old';\n import type {HookFlags} from '.\/ReactHookEffectTags';\n import type {FiberRoot} from '.\/ReactInternalTypes';\n-import type {Cache} from '.\/ReactFiberCacheComponent.old';\n import type {Flags} from '.\/ReactFiberFlags';\n \n import ReactSharedInternals from 'shared\/ReactSharedInternals';\n@@ -122,7 +121,7 @@ import {\n } from '.\/ReactMutableSource.old';\n import {logStateUpdateScheduled} from '.\/DebugTracing';\n import {markStateUpdateScheduled} from '.\/ReactFiberDevToolsHook.old';\n-import {createCache, CacheContext} from '.\/ReactFiberCacheComponent.old';\n+import {createCache} from '.\/ReactFiberCacheComponent.old';\n import {\n createUpdate as createLegacyQueueUpdate,\n enqueueUpdate as enqueueLegacyQueueUpdate,\n@@ -2600,27 +2599,6 @@ function markUpdateInDevTools (fiber, lane, action: A) {\n }\n }\n \n-function getCacheSignal(): AbortSignal {\n- if (!enableCache) {\n- throw new Error('Not implemented.');\n- }\n- const cache: Cache = readContext(CacheContext);\n- return cache.controller.signal;\n-}\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) {\n- cacheForType = resourceType();\n- cache.data.set(resourceType, cacheForType);\n- }\n- return cacheForType;\n-}\n-\n export const ContextOnlyDispatcher: Dispatcher = {\n readContext,\n \n@@ -2644,8 +2622,6 @@ export const ContextOnlyDispatcher: Dispatcher = {\n unstable_isNewReconciler: enableNewReconciler,\n };\n if (enableCache) {\n- (ContextOnlyDispatcher: Dispatcher).getCacheSignal = getCacheSignal;\n- (ContextOnlyDispatcher: Dispatcher).getCacheForType = getCacheForType;\n (ContextOnlyDispatcher: Dispatcher).useCacheRefresh = throwInvalidHookError;\n }\n if (enableUseHook) {\n@@ -2681,8 +2657,6 @@ const HooksDispatcherOnMount: Dispatcher = {\n unstable_isNewReconciler: enableNewReconciler,\n };\n if (enableCache) {\n- (HooksDispatcherOnMount: Dispatcher).getCacheSignal = getCacheSignal;\n- (HooksDispatcherOnMount: Dispatcher).getCacheForType = getCacheForType;\n \/\/ $FlowFixMe[escaped-generic] discovered when updating Flow\n (HooksDispatcherOnMount: Dispatcher).useCacheRefresh = mountRefresh;\n }\n@@ -2718,8 +2692,6 @@ const HooksDispatcherOnUpdate: Dispatcher = {\n unstable_isNewReconciler: enableNewReconciler,\n };\n if (enableCache) {\n- (HooksDispatcherOnUpdate: Dispatcher).getCacheSignal = getCacheSignal;\n- (HooksDispatcherOnUpdate: Dispatcher).getCacheForType = getCacheForType;\n (HooksDispatcherOnUpdate: Dispatcher).useCacheRefresh = updateRefresh;\n }\n if (enableUseMemoCacheHook) {\n@@ -2755,8 +2727,6 @@ const HooksDispatcherOnRerender: Dispatcher = {\n unstable_isNewReconciler: enableNewReconciler,\n };\n if (enableCache) {\n- (HooksDispatcherOnRerender: Dispatcher).getCacheSignal = getCacheSignal;\n- (HooksDispatcherOnRerender: Dispatcher).getCacheForType = getCacheForType;\n (HooksDispatcherOnRerender: Dispatcher).useCacheRefresh = updateRefresh;\n }\n if (enableUseHook) {\n@@ -2935,8 +2905,6 @@ if (__DEV__) {\n unstable_isNewReconciler: enableNewReconciler,\n };\n if (enableCache) {\n- (HooksDispatcherOnMountInDEV: Dispatcher).getCacheSignal = getCacheSignal;\n- (HooksDispatcherOnMountInDEV: Dispatcher).getCacheForType = getCacheForType;\n (HooksDispatcherOnMountInDEV: Dispatcher).useCacheRefresh = function useCacheRefresh() {\n currentHookNameInDev = 'useCacheRefresh';\n mountHookTypesDev();\n@@ -3094,8 +3062,6 @@ if (__DEV__) {\n unstable_isNewReconciler: enableNewReconciler,\n };\n if (enableCache) {\n- (HooksDispatcherOnMountWithHookTypesInDEV: Dispatcher).getCacheSignal = getCacheSignal;\n- (HooksDispatcherOnMountWithHookTypesInDEV: Dispatcher).getCacheForType = getCacheForType;\n (HooksDispatcherOnMountWithHookTypesInDEV: Dispatcher).useCacheRefresh = function useCacheRefresh() {\n currentHookNameInDev = 'useCacheRefresh';\n updateHookTypesDev();\n@@ -3253,8 +3219,6 @@ if (__DEV__) {\n unstable_isNewReconciler: enableNewReconciler,\n };\n if (enableCache) {\n- (HooksDispatcherOnUpdateInDEV: Dispatcher).getCacheSignal = getCacheSignal;\n- (HooksDispatcherOnUpdateInDEV: Dispatcher).getCacheForType = getCacheForType;\n (HooksDispatcherOnUpdateInDEV: Dispatcher).useCacheRefresh = function useCacheRefresh() {\n currentHookNameInDev = 'useCacheRefresh';\n updateHookTypesDev();\n@@ -3413,8 +3377,6 @@ if (__DEV__) {\n unstable_isNewReconciler: enableNewReconciler,\n };\n if (enableCache) {\n- (HooksDispatcherOnRerenderInDEV: Dispatcher).getCacheSignal = getCacheSignal;\n- (HooksDispatcherOnRerenderInDEV: Dispatcher).getCacheForType = getCacheForType;\n (HooksDispatcherOnRerenderInDEV: Dispatcher).useCacheRefresh = function useCacheRefresh() {\n currentHookNameInDev = 'useCacheRefresh';\n updateHookTypesDev();\n@@ -3589,8 +3551,6 @@ if (__DEV__) {\n unstable_isNewReconciler: enableNewReconciler,\n };\n if (enableCache) {\n- (InvalidNestedHooksDispatcherOnMountInDEV: Dispatcher).getCacheSignal = getCacheSignal;\n- (InvalidNestedHooksDispatcherOnMountInDEV: Dispatcher).getCacheForType = getCacheForType;\n (InvalidNestedHooksDispatcherOnMountInDEV: Dispatcher).useCacheRefresh = function useCacheRefresh() {\n currentHookNameInDev = 'useCacheRefresh';\n mountHookTypesDev();\n@@ -3776,8 +3736,6 @@ if (__DEV__) {\n unstable_isNewReconciler: enableNewReconciler,\n };\n if (enableCache) {\n- (InvalidNestedHooksDispatcherOnUpdateInDEV: Dispatcher).getCacheSignal = getCacheSignal;\n- (InvalidNestedHooksDispatcherOnUpdateInDEV: Dispatcher).getCacheForType = getCacheForType;\n (InvalidNestedHooksDispatcherOnUpdateInDEV: Dispatcher).useCacheRefresh = function useCacheRefresh() {\n currentHookNameInDev = 'useCacheRefresh';\n updateHookTypesDev();\n@@ -3964,8 +3922,6 @@ if (__DEV__) {\n unstable_isNewReconciler: enableNewReconciler,\n };\n if (enableCache) {\n- (InvalidNestedHooksDispatcherOnRerenderInDEV: Dispatcher).getCacheSignal = getCacheSignal;\n- (InvalidNestedHooksDispatcherOnRerenderInDEV: Dispatcher).getCacheForType = getCacheForType;\n (InvalidNestedHooksDispatcherOnRerenderInDEV: Dispatcher).useCacheRefresh = function useCacheRefresh() {\n currentHookNameInDev = 'useCacheRefresh';\n updateHookTypesDev();\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.new.js b\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.new.js\nindex ff1f2d0236..38994cdef5 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.new.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.new.js\n@@ -207,6 +207,7 @@ import {\n ContextOnlyDispatcher,\n getIsUpdatingOpaqueValueInRenderPhaseInDEV,\n } from '.\/ReactFiberHooks.new';\n+import {DefaultCacheDispatcher} from '.\/ReactFiberCache.new';\n import {\n createCapturedValueAtFiber,\n type CapturedValue,\n@@ -279,6 +280,7 @@ const PossiblyWeakMap = typeof WeakMap === 'function' ? WeakMap : Map;\n \n const {\n ReactCurrentDispatcher,\n+ ReactCurrentCache,\n ReactCurrentOwner,\n ReactCurrentBatchConfig,\n ReactCurrentActQueue,\n@@ -1790,6 +1792,22 @@ function popDispatcher(prevDispatcher) {\n ReactCurrentDispatcher.current = prevDispatcher;\n }\n \n+function pushCacheDispatcher() {\n+ if (enableCache) {\n+ const prevCacheDispatcher = ReactCurrentCache.current;\n+ ReactCurrentCache.current = DefaultCacheDispatcher;\n+ return prevCacheDispatcher;\n+ } else {\n+ return null;\n+ }\n+}\n+\n+function popCacheDispatcher(prevCacheDispatcher) {\n+ if (enableCache) {\n+ ReactCurrentCache.current = prevCacheDispatcher;\n+ }\n+}\n+\n export function markCommitTimeOfFallback() {\n globalMostRecentFallbackTime = now();\n }\n@@ -1857,6 +1875,7 @@ function renderRootSync(root: FiberRoot, lanes: Lanes) {\n const prevExecutionContext = executionContext;\n executionContext |= RenderContext;\n const prevDispatcher = pushDispatcher(root.containerInfo);\n+ const prevCacheDispatcher = pushCacheDispatcher();\n \n \/\/ If the root or lanes have changed, throw out the existing stack\n \/\/ and prepare a fresh one. Otherwise we'll continue where we left off.\n@@ -1903,6 +1922,7 @@ function renderRootSync(root: FiberRoot, lanes: Lanes) {\n \n executionContext = prevExecutionContext;\n popDispatcher(prevDispatcher);\n+ popCacheDispatcher(prevCacheDispatcher);\n \n if (workInProgress !== null) {\n \/\/ This is a sync render, so we should have finished the whole tree.\n@@ -1957,6 +1977,7 @@ function renderRootConcurrent(root: FiberRoot, lanes: Lanes) {\n const prevExecutionContext = executionContext;\n executionContext |= RenderContext;\n const prevDispatcher = pushDispatcher(root.containerInfo);\n+ const prevCacheDispatcher = pushCacheDispatcher();\n \n \/\/ If the root or lanes have changed, throw out the existing stack\n \/\/ and prepare a fresh one. Otherwise we'll continue where we left off.\n@@ -2009,6 +2030,7 @@ function renderRootConcurrent(root: FiberRoot, lanes: Lanes) {\n resetContextDependencies();\n \n popDispatcher(prevDispatcher);\n+ popCacheDispatcher(prevCacheDispatcher);\n executionContext = prevExecutionContext;\n \n if (__DEV__) {\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.old.js b\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.old.js\nindex 9f9c70ff2c..1dacb1fd56 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.old.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberWorkLoop.old.js\n@@ -207,6 +207,7 @@ import {\n ContextOnlyDispatcher,\n getIsUpdatingOpaqueValueInRenderPhaseInDEV,\n } from '.\/ReactFiberHooks.old';\n+import {DefaultCacheDispatcher} from '.\/ReactFiberCache.old';\n import {\n createCapturedValueAtFiber,\n type CapturedValue,\n@@ -279,6 +280,7 @@ const PossiblyWeakMap = typeof WeakMap === 'function' ? WeakMap : Map;\n \n const {\n ReactCurrentDispatcher,\n+ ReactCurrentCache,\n ReactCurrentOwner,\n ReactCurrentBatchConfig,\n ReactCurrentActQueue,\n@@ -1790,6 +1792,22 @@ function popDispatcher(prevDispatcher) {\n ReactCurrentDispatcher.current = prevDispatcher;\n }\n \n+function pushCacheDispatcher() {\n+ if (enableCache) {\n+ const prevCacheDispatcher = ReactCurrentCache.current;\n+ ReactCurrentCache.current = DefaultCacheDispatcher;\n+ return prevCacheDispatcher;\n+ } else {\n+ return null;\n+ }\n+}\n+\n+function popCacheDispatcher(prevCacheDispatcher) {\n+ if (enableCache) {\n+ ReactCurrentCache.current = prevCacheDispatcher;\n+ }\n+}\n+\n export function markCommitTimeOfFallback() {\n globalMostRecentFallbackTime = now();\n }\n@@ -1857,6 +1875,7 @@ function renderRootSync(root: FiberRoot, lanes: Lanes) {\n const prevExecutionContext = executionContext;\n executionContext |= RenderContext;\n const prevDispatcher = pushDispatcher(root.containerInfo);\n+ const prevCacheDispatcher = pushCacheDispatcher();\n \n \/\/ If the root or lanes have changed, throw out the existing stack\n \/\/ and prepare a fresh one. Otherwise we'll continue where we left off.\n@@ -1903,6 +1922,7 @@ function renderRootSync(root: FiberRoot, lanes: Lanes) {\n \n executionContext = prevExecutionContext;\n popDispatcher(prevDispatcher);\n+ popCacheDispatcher(prevCacheDispatcher);\n \n if (workInProgress !== null) {\n \/\/ This is a sync render, so we should have finished the whole tree.\n@@ -1957,6 +1977,7 @@ function renderRootConcurrent(root: FiberRoot, lanes: Lanes) {\n const prevExecutionContext = executionContext;\n executionContext |= RenderContext;\n const prevDispatcher = pushDispatcher(root.containerInfo);\n+ const prevCacheDispatcher = pushCacheDispatcher();\n \n \/\/ If the root or lanes have changed, throw out the existing stack\n \/\/ and prepare a fresh one. Otherwise we'll continue where we left off.\n@@ -2009,6 +2030,7 @@ function renderRootConcurrent(root: FiberRoot, lanes: Lanes) {\n resetContextDependencies();\n \n popDispatcher(prevDispatcher);\n+ popCacheDispatcher(prevCacheDispatcher);\n executionContext = prevExecutionContext;\n \n if (__DEV__) {\ndiff --git a\/packages\/react-reconciler\/src\/ReactInternalTypes.js b\/packages\/react-reconciler\/src\/ReactInternalTypes.js\nindex 2ee501d2a4..e7b274c3ff 100644\n--- a\/packages\/react-reconciler\/src\/ReactInternalTypes.js\n+++ b\/packages\/react-reconciler\/src\/ReactInternalTypes.js\n@@ -377,8 +377,6 @@ type Dispatch = A => void;\n \n export type Dispatcher = {\n use?: (Usable) => T,\n- getCacheSignal?: () => AbortSignal,\n- getCacheForType?: (resourceType: () => T) => T,\n readContext(context: ReactContext): T,\n useState(initialState: (() => S) | S): [S, Dispatch>],\n useReducer(\n@@ -432,3 +430,8 @@ export type Dispatcher = {\n \n unstable_isNewReconciler?: boolean,\n };\n+\n+export type CacheDispatcher = {\n+ getCacheSignal: () => AbortSignal,\n+ getCacheForType: (resourceType: () => T) => T,\n+};\ndiff --git a\/packages\/react-server\/src\/ReactFizzCache.js b\/packages\/react-server\/src\/ReactFizzCache.js\nnew file mode 100644\nindex 0000000000..f195423e40\n--- \/dev\/null\n+++ b\/packages\/react-server\/src\/ReactFizzCache.js\n@@ -0,0 +1,23 @@\n+\/**\n+ * Copyright (c) Facebook, Inc. and its affiliates.\n+ *\n+ * This source code is licensed under the MIT license found in the\n+ * LICENSE file in the root directory of this source tree.\n+ *\n+ * @flow\n+ *\/\n+\n+import type {CacheDispatcher} from 'react-reconciler\/src\/ReactInternalTypes';\n+\n+function getCacheSignal(): AbortSignal {\n+ throw new Error('Not implemented.');\n+}\n+\n+function getCacheForType(resourceType: () => T): T {\n+ throw new Error('Not implemented.');\n+}\n+\n+export const DefaultCacheDispatcher: CacheDispatcher = {\n+ getCacheSignal,\n+ getCacheForType,\n+};\ndiff --git a\/packages\/react-server\/src\/ReactFizzHooks.js b\/packages\/react-server\/src\/ReactFizzHooks.js\nindex 8db3f319e3..bd0be42d14 100644\n--- a\/packages\/react-server\/src\/ReactFizzHooks.js\n+++ b\/packages\/react-server\/src\/ReactFizzHooks.js\n@@ -8,7 +8,7 @@\n *\/\n \n import type {\n- Dispatcher as DispatcherType,\n+ Dispatcher,\n EventFunctionWrapper,\n } from 'react-reconciler\/src\/ReactInternalTypes';\n \n@@ -274,12 +274,6 @@ export function resetHooksState(): void {\n workInProgressHook = null;\n }\n \n-function getCacheForType(resourceType: () => T): T {\n- \/\/ TODO: This should silently mark this as client rendered since it's not necessarily\n- \/\/ considered an error. It needs to work for things like Flight though.\n- throw new Error('Not implemented.');\n-}\n-\n function readContext(context: ReactContext): T {\n if (__DEV__) {\n if (isInHookUserCodeInDev) {\n@@ -677,7 +671,7 @@ function useMemoCache(size: number): Array {\n \n function noop(): void {}\n \n-export const Dispatcher: DispatcherType = {\n+export const HooksDispatcher: Dispatcher = {\n readContext,\n useContext,\n useMemo,\n@@ -702,17 +696,16 @@ export const Dispatcher: DispatcherType = {\n };\n \n if (enableCache) {\n- Dispatcher.getCacheForType = getCacheForType;\n- Dispatcher.useCacheRefresh = useCacheRefresh;\n+ HooksDispatcher.useCacheRefresh = useCacheRefresh;\n }\n if (enableUseEventHook) {\n- Dispatcher.useEvent = useEvent;\n+ HooksDispatcher.useEvent = useEvent;\n }\n if (enableUseMemoCacheHook) {\n- Dispatcher.useMemoCache = useMemoCache;\n+ HooksDispatcher.useMemoCache = useMemoCache;\n }\n if (enableUseHook) {\n- Dispatcher.use = use;\n+ HooksDispatcher.use = use;\n }\n \n export let currentResponseState: null | ResponseState = (null: any);\ndiff --git a\/packages\/react-server\/src\/ReactFizzServer.js b\/packages\/react-server\/src\/ReactFizzServer.js\nindex 0da6a37ca4..fe42ccf1cf 100644\n--- a\/packages\/react-server\/src\/ReactFizzServer.js\n+++ b\/packages\/react-server\/src\/ReactFizzServer.js\n@@ -97,11 +97,12 @@ import {\n finishHooks,\n checkDidRenderIdHook,\n resetHooksState,\n- Dispatcher,\n+ HooksDispatcher,\n currentResponseState,\n setCurrentResponseState,\n getThenableStateAfterSuspending,\n } from '.\/ReactFizzHooks';\n+import {DefaultCacheDispatcher} from '.\/ReactFizzCache';\n import {getStackByComponentStackNode} from '.\/ReactFizzComponentStack';\n import {emptyTreeContext, pushTreeContext} from '.\/ReactFizzTreeContext';\n \n@@ -132,6 +133,7 @@ import {\n enableScopeAPI,\n enableSuspenseAvoidThisFallbackFizz,\n enableFloat,\n+ enableCache,\n } from 'shared\/ReactFeatureFlags';\n \n import assign from 'shared\/assign';\n@@ -140,6 +142,7 @@ import isArray from 'shared\/isArray';\n import {trackSuspendedWakeable} from '.\/ReactFizzWakeable';\n \n const ReactCurrentDispatcher = ReactSharedInternals.ReactCurrentDispatcher;\n+const ReactCurrentCache = ReactSharedInternals.ReactCurrentCache;\n const ReactDebugCurrentFrame = ReactSharedInternals.ReactDebugCurrentFrame;\n \n type LegacyContext = {\n@@ -1901,7 +1904,13 @@ export function performWork(request: Request): void {\n }\n const prevContext = getActiveContext();\n const prevDispatcher = ReactCurrentDispatcher.current;\n- ReactCurrentDispatcher.current = Dispatcher;\n+ ReactCurrentDispatcher.current = HooksDispatcher;\n+ let prevCacheDispatcher;\n+ if (enableCache) {\n+ prevCacheDispatcher = ReactCurrentCache.current;\n+ ReactCurrentCache.current = DefaultCacheDispatcher;\n+ }\n+\n const previousHostDispatcher = prepareToRender(request.resources);\n let prevGetCurrentStackImpl;\n if (__DEV__) {\n@@ -1927,12 +1936,15 @@ export function performWork(request: Request): void {\n } finally {\n setCurrentResponseState(prevResponseState);\n ReactCurrentDispatcher.current = prevDispatcher;\n+ if (enableCache) {\n+ ReactCurrentCache.current = prevCacheDispatcher;\n+ }\n cleanupAfterRender(previousHostDispatcher);\n \n if (__DEV__) {\n ReactDebugCurrentFrame.getCurrentStack = prevGetCurrentStackImpl;\n }\n- if (prevDispatcher === Dispatcher) {\n+ if (prevDispatcher === HooksDispatcher) {\n \/\/ This means that we were in a reentrant work loop. This could happen\n \/\/ in a renderer that supports synchronous work like renderToString,\n \/\/ when it's called from within another renderer.\ndiff --git a\/packages\/react-server\/src\/ReactFlightCache.js b\/packages\/react-server\/src\/ReactFlightCache.js\nnew file mode 100644\nindex 0000000000..4f133c858f\n--- \/dev\/null\n+++ b\/packages\/react-server\/src\/ReactFlightCache.js\n@@ -0,0 +1,43 @@\n+\/**\n+ * Copyright (c) Facebook, Inc. and its affiliates.\n+ *\n+ * This source code is licensed under the MIT license found in the\n+ * LICENSE file in the root directory of this source tree.\n+ *\n+ * @flow\n+ *\/\n+\n+import type {CacheDispatcher} from 'react-reconciler\/src\/ReactInternalTypes';\n+\n+export const DefaultCacheDispatcher: CacheDispatcher = {\n+ getCacheSignal(): AbortSignal {\n+ throw new Error('Not implemented.');\n+ },\n+ getCacheForType(resourceType: () => T): T {\n+ if (!currentCache) {\n+ throw new Error('Reading the cache is only supported while rendering.');\n+ }\n+\n+ let entry: T | void = (currentCache.get(resourceType): any);\n+ if (entry === undefined) {\n+ entry = resourceType();\n+ \/\/ TODO: Warn if undefined?\n+ \/\/ $FlowFixMe[incompatible-use] found when upgrading Flow\n+ currentCache.set(resourceType, entry);\n+ }\n+ return entry;\n+ },\n+};\n+\n+let currentCache: Map | null = null;\n+\n+export function setCurrentCache(\n+ cache: Map | null,\n+): Map | null {\n+ currentCache = cache;\n+ return currentCache;\n+}\n+\n+export function getCurrentCache(): Map | null {\n+ return currentCache;\n+}\ndiff --git a\/packages\/react-server\/src\/ReactFlightHooks.js b\/packages\/react-server\/src\/ReactFlightHooks.js\nindex 07de6602e6..a25a5f4b16 100644\n--- a\/packages\/react-server\/src\/ReactFlightHooks.js\n+++ b\/packages\/react-server\/src\/ReactFlightHooks.js\n@@ -7,7 +7,7 @@\n * @flow\n *\/\n \n-import type {Dispatcher as DispatcherType} from 'react-reconciler\/src\/ReactInternalTypes';\n+import type {Dispatcher} from 'react-reconciler\/src\/ReactInternalTypes';\n import type {Request} from '.\/ReactFlightServer';\n import type {ReactServerContext, Thenable, Usable} from 'shared\/ReactTypes';\n import type {ThenableState} from '.\/ReactFlightWakeable';\n@@ -52,7 +52,7 @@ function readContext(context: ReactServerContext): T {\n 'Only createServerContext is supported in Server Components.',\n );\n }\n- if (currentCache === null) {\n+ if (currentRequest === null) {\n console.error(\n 'Context can only be read while React is rendering. ' +\n 'In classes, you can read it in the render method or getDerivedStateFromProps. ' +\n@@ -64,7 +64,7 @@ function readContext(context: ReactServerContext): T {\n return readContextImpl(context);\n }\n \n-export const Dispatcher: DispatcherType = {\n+export const HooksDispatcher: Dispatcher = {\n useMemo(nextCreate: () => T): T {\n return nextCreate();\n },\n@@ -74,20 +74,6 @@ export const Dispatcher: DispatcherType = {\n useDebugValue(): void {},\n useDeferredValue: (unsupportedHook: any),\n useTransition: (unsupportedHook: any),\n- getCacheForType(resourceType: () => T): T {\n- if (!currentCache) {\n- throw new Error('Reading the cache is only supported while rendering.');\n- }\n-\n- let entry: T | void = (currentCache.get(resourceType): any);\n- if (entry === undefined) {\n- entry = resourceType();\n- \/\/ TODO: Warn if undefined?\n- \/\/ $FlowFixMe[incompatible-use] found when upgrading Flow\n- currentCache.set(resourceType, entry);\n- }\n- return entry;\n- },\n readContext,\n useContext: readContext,\n useReducer: (unsupportedHook: any),\n@@ -114,24 +100,9 @@ function unsupportedHook(): void {\n }\n \n function unsupportedRefresh(): void {\n- if (!currentCache) {\n- throw new Error(\n- 'Refreshing the cache is not supported in Server Components.',\n- );\n- }\n-}\n-\n-let currentCache: Map | null = null;\n-\n-export function setCurrentCache(\n- cache: Map | null,\n-): Map | null {\n- currentCache = cache;\n- return currentCache;\n-}\n-\n-export function getCurrentCache(): Map | null {\n- return currentCache;\n+ throw new Error(\n+ 'Refreshing the cache is not supported in Server Components.',\n+ );\n }\n \n function useId(): string {\ndiff --git a\/packages\/react-server\/src\/ReactFlightServer.js b\/packages\/react-server\/src\/ReactFlightServer.js\nindex 02823183ea..a4b1d8d7ea 100644\n--- a\/packages\/react-server\/src\/ReactFlightServer.js\n+++ b\/packages\/react-server\/src\/ReactFlightServer.js\n@@ -44,14 +44,17 @@ import {\n } from '.\/ReactFlightServerConfig';\n \n import {\n- Dispatcher,\n- getCurrentCache,\n+ HooksDispatcher,\n prepareToUseHooksForRequest,\n prepareToUseHooksForComponent,\n getThenableStateAfterSuspending,\n resetHooksForRequest,\n- setCurrentCache,\n } from '.\/ReactFlightHooks';\n+import {\n+ DefaultCacheDispatcher,\n+ getCurrentCache,\n+ setCurrentCache,\n+} from '.\/ReactFlightCache';\n import {\n pushProvider,\n popProvider,\n@@ -131,6 +134,7 @@ export type Request = {\n };\n \n const ReactCurrentDispatcher = ReactSharedInternals.ReactCurrentDispatcher;\n+const ReactCurrentCache = ReactSharedInternals.ReactCurrentCache;\n \n function defaultErrorHandler(error: mixed) {\n console['error'](error);\n@@ -1002,8 +1006,10 @@ function retryTask(request: Request, task: Task): void {\n \n function performWork(request: Request): void {\n const prevDispatcher = ReactCurrentDispatcher.current;\n+ const prevCacheDispatcher = ReactCurrentCache.current;\n const prevCache = getCurrentCache();\n- ReactCurrentDispatcher.current = Dispatcher;\n+ ReactCurrentDispatcher.current = HooksDispatcher;\n+ ReactCurrentCache.current = DefaultCacheDispatcher;\n setCurrentCache(request.cache);\n prepareToUseHooksForRequest(request);\n \n@@ -1022,6 +1028,7 @@ function performWork(request: Request): void {\n fatalError(request, error);\n } finally {\n ReactCurrentDispatcher.current = prevDispatcher;\n+ ReactCurrentCache.current = prevCacheDispatcher;\n setCurrentCache(prevCache);\n resetHooksForRequest();\n }\ndiff --git a\/packages\/react-suspense-test-utils\/src\/ReactSuspenseTestUtils.js b\/packages\/react-suspense-test-utils\/src\/ReactSuspenseTestUtils.js\nindex abd6cb5779..b47a3c044f 100644\n--- a\/packages\/react-suspense-test-utils\/src\/ReactSuspenseTestUtils.js\n+++ b\/packages\/react-suspense-test-utils\/src\/ReactSuspenseTestUtils.js\n@@ -7,10 +7,10 @@\n * @flow\n *\/\n \n-import type {Dispatcher} from 'react-reconciler\/src\/ReactInternalTypes';\n+import type {CacheDispatcher} from 'react-reconciler\/src\/ReactInternalTypes';\n import ReactSharedInternals from 'shared\/ReactSharedInternals';\n \n-const ReactCurrentDispatcher = ReactSharedInternals.ReactCurrentDispatcher;\n+const ReactCurrentCache = ReactSharedInternals.ReactCurrentCache;\n \n function unsupported() {\n throw new Error('This feature is not supported by ReactSuspenseTestUtils.');\n@@ -18,7 +18,8 @@ function unsupported() {\n \n export function waitForSuspense(fn: () => T): Promise {\n const cache: Map = new Map();\n- const testDispatcher: Dispatcher = {\n+ const testDispatcher: CacheDispatcher = {\n+ getCacheSignal: unsupported,\n getCacheForType(resourceType: () => R): R {\n let entry: R | void = (cache.get(resourceType): any);\n if (entry === undefined) {\n@@ -28,31 +29,12 @@ export function waitForSuspense(fn: () => T): Promise {\n }\n return entry;\n },\n- readContext: unsupported,\n- useContext: unsupported,\n- useMemo: unsupported,\n- useReducer: unsupported,\n- useRef: unsupported,\n- useState: unsupported,\n- useInsertionEffect: unsupported,\n- useLayoutEffect: unsupported,\n- useCallback: unsupported,\n- useImperativeHandle: unsupported,\n- useEffect: unsupported,\n- useDebugValue: unsupported,\n- useDeferredValue: unsupported,\n- useTransition: unsupported,\n- useId: unsupported,\n- useMutableSource: unsupported,\n- useSyncExternalStore: unsupported,\n- useCacheRefresh: unsupported,\n- useMemoCache: unsupported,\n };\n \/\/ Not using async\/await because we don't compile it.\n return new Promise((resolve, reject) => {\n function retry() {\n- const prevDispatcher = ReactCurrentDispatcher.current;\n- ReactCurrentDispatcher.current = testDispatcher;\n+ const prevDispatcher = ReactCurrentCache.current;\n+ ReactCurrentCache.current = testDispatcher;\n try {\n const result = fn();\n resolve(result);\n@@ -63,7 +45,7 @@ export function waitForSuspense(fn: () => T): Promise {\n reject(thrownValue);\n }\n } finally {\n- ReactCurrentDispatcher.current = prevDispatcher;\n+ ReactCurrentCache.current = prevDispatcher;\n }\n }\n retry();\ndiff --git a\/packages\/react\/src\/ReactCurrentCache.js b\/packages\/react\/src\/ReactCurrentCache.js\nnew file mode 100644\nindex 0000000000..6dd825e46f\n--- \/dev\/null\n+++ b\/packages\/react\/src\/ReactCurrentCache.js\n@@ -0,0 +1,19 @@\n+\/**\n+ * Copyright (c) Facebook, Inc. and its affiliates.\n+ *\n+ * This source code is licensed under the MIT license found in the\n+ * LICENSE file in the root directory of this source tree.\n+ *\n+ * @flow\n+ *\/\n+\n+import type {CacheDispatcher} from 'react-reconciler\/src\/ReactInternalTypes';\n+\n+\/**\n+ * Keeps track of the current Cache dispatcher.\n+ *\/\n+const ReactCurrentCache = {\n+ current: (null: null | CacheDispatcher),\n+};\n+\n+export default ReactCurrentCache;\ndiff --git a\/packages\/react\/src\/ReactCurrentDispatcher.js b\/packages\/react\/src\/ReactCurrentDispatcher.js\nindex 0d95d59691..96e5829f73 100644\n--- a\/packages\/react\/src\/ReactCurrentDispatcher.js\n+++ b\/packages\/react\/src\/ReactCurrentDispatcher.js\n@@ -13,10 +13,6 @@ import type {Dispatcher} from 'react-reconciler\/src\/ReactInternalTypes';\n * Keeps track of the current dispatcher.\n *\/\n const ReactCurrentDispatcher = {\n- \/**\n- * @internal\n- * @type {ReactComponent}\n- *\/\n current: (null: null | Dispatcher),\n };\n \ndiff --git a\/packages\/react\/src\/ReactHooks.js b\/packages\/react\/src\/ReactHooks.js\nindex 271a3bae9e..64e2e56151 100644\n--- a\/packages\/react\/src\/ReactHooks.js\n+++ b\/packages\/react\/src\/ReactHooks.js\n@@ -18,6 +18,7 @@ import type {\n } from 'shared\/ReactTypes';\n \n import ReactCurrentDispatcher from '.\/ReactCurrentDispatcher';\n+import ReactCurrentCache from '.\/ReactCurrentCache';\n \n type BasicStateAction ~~= (S => S) | S;\n type Dispatch~~ = A => void;\n@@ -43,14 +44,32 @@ function resolveDispatcher() {\n }\n \n export function getCacheSignal(): AbortSignal {\n- const dispatcher = resolveDispatcher();\n- \/\/ $FlowFixMe This is unstable, thus optional\n+ const dispatcher = ReactCurrentCache.current;\n+ if (!dispatcher) {\n+ \/\/ If we have no cache to associate with this call, then we don't know\n+ \/\/ its lifetime. We abort early since that's safer than letting it live\n+ \/\/ for ever. Unlike just caching which can be a functional noop outside\n+ \/\/ of React, these should generally always be associated with some React\n+ \/\/ render but we're not limiting quite as much as making it a Hook.\n+ \/\/ It's safer than erroring early at runtime.\n+ const controller = new AbortController();\n+ const reason = new Error(\n+ 'This CacheSignal was requested outside React which means that it is ' +\n+ 'immediately aborted.',\n+ );\n+ \/\/ $FlowFixMe Flow doesn't yet know about this argument.\n+ controller.abort(reason);\n+ return controller.signal;\n+ }\n return dispatcher.getCacheSignal();\n }\n \n export function getCacheForType(resourceType: () => T): T {\n- const dispatcher = resolveDispatcher();\n- \/\/ $FlowFixMe This is unstable, thus optional\n+ const dispatcher = ReactCurrentCache.current;\n+ if (!dispatcher) {\n+ \/\/ If there is no dispatcher, then we treat this as not being cached.\n+ return resourceType();\n+ }\n return dispatcher.getCacheForType(resourceType);\n }\n \ndiff --git a\/packages\/react\/src\/ReactSharedInternals.js b\/packages\/react\/src\/ReactSharedInternals.js\nindex 6f160b96ec..aa86af8b44 100644\n--- a\/packages\/react\/src\/ReactSharedInternals.js\n+++ b\/packages\/react\/src\/ReactSharedInternals.js\n@@ -6,6 +6,7 @@\n *\/\n \n import ReactCurrentDispatcher from '.\/ReactCurrentDispatcher';\n+import ReactCurrentCache from '.\/ReactCurrentCache';\n import ReactCurrentBatchConfig from '.\/ReactCurrentBatchConfig';\n import ReactCurrentActQueue from '.\/ReactCurrentActQueue';\n import ReactCurrentOwner from '.\/ReactCurrentOwner';\n@@ -15,6 +16,7 @@ import {ContextRegistry} from '.\/ReactServerContextRegistry';\n \n const ReactSharedInternals = {\n ReactCurrentDispatcher,\n+ ReactCurrentCache,\n ReactCurrentBatchConfig,\n ReactCurrentOwner,\n };\ndiff --git a\/packages\/react\/src\/forks\/ReactCurrentDispatcher.www.js b\/packages\/react\/src\/forks\/ReactCurrentDispatcher.www.js\ndeleted file mode 100644\nindex d5a784ad64..0000000000\n--- a\/packages\/react\/src\/forks\/ReactCurrentDispatcher.www.js\n+++ \/dev\/null\n@@ -1,8 +0,0 @@\n-\/**\n- * Copyright (c) Facebook, Inc. and its affiliates.\n- *\n- * This source code is licensed under the MIT license found in the\n- * LICENSE file in the root directory of this source tree.\n- *\/\n-\n-export default require('ReactCurrentDispatcher');\ndiff --git a\/packages\/react\/src\/forks\/ReactCurrentOwner.www.js b\/packages\/react\/src\/forks\/ReactCurrentOwner.www.js\ndeleted file mode 100644\nindex c03d11b9de..0000000000\n--- a\/packages\/react\/src\/forks\/ReactCurrentOwner.www.js\n+++ \/dev\/null\n@@ -1,8 +0,0 @@\n-\/**\n- * Copyright (c) Facebook, Inc. and its affiliates.\n- *\n- * This source code is licensed under the MIT license found in the\n- * LICENSE file in the root directory of this source tree.\n- *\/\n-\n-export default require('ReactCurrentOwner');\ndiff --git a\/packages\/react\/src\/forks\/ReactSharedInternals.umd.js b\/packages\/react\/src\/forks\/ReactSharedInternals.umd.js\nindex 57e96e6654..d4f8334017 100644\n--- a\/packages\/react\/src\/forks\/ReactSharedInternals.umd.js\n+++ b\/packages\/react\/src\/forks\/ReactSharedInternals.umd.js\n@@ -7,6 +7,7 @@\n \n import * as Scheduler from 'scheduler';\n import ReactCurrentDispatcher from '..\/ReactCurrentDispatcher';\n+import ReactCurrentCache from '..\/ReactCurrentCache';\n import ReactCurrentActQueue from '..\/ReactCurrentActQueue';\n import ReactCurrentOwner from '..\/ReactCurrentOwner';\n import ReactDebugCurrentFrame from '..\/ReactDebugCurrentFrame';\n@@ -16,6 +17,7 @@ import {ContextRegistry} from '..\/ReactServerContextRegistry';\n \n const ReactSharedInternals = {\n ReactCurrentDispatcher,\n+ ReactCurrentCache,\n ReactCurrentOwner,\n ReactCurrentBatchConfig,\n \ndiff --git a\/scripts\/error-codes\/codes.json b\/scripts\/error-codes\/codes.json\nindex db795a516f..278c8d4640 100644\n--- a\/scripts\/error-codes\/codes.json\n+++ b\/scripts\/error-codes\/codes.json\n@@ -439,5 +439,6 @@\n \"451\": \"resolveSingletonInstance was called with an element type that is not supported. This is a bug in React.\",\n \"452\": \"React expected an element (document.documentElement) to exist in the Document but one was not found. React never removes the documentElement for any Document it renders into so the cause is likely in some other script running on this page.\",\n \"453\": \"React expected a element (document.head) to exist in the Document but one was not found. React never removes the head for any Document it renders into so the cause is likely in some other script running on this page.\",\n- \"454\": \"React expected a element (document.body) to exist in the Document but one was not found. React never removes the body for any Document it renders into so the cause is likely in some other script running on this page.\"\n-}\n+ \"454\": \"React expected a element (document.body) to exist in the Document but one was not found. React never removes the body for any Document it renders into so the cause is likely in some other script running on this page.\",\n+ \"455\": \"This CacheSignal was requested outside React which means that it is immediately aborted.\"\n+}\n\\ No newline at end of file\ndiff --git a\/scripts\/rollup\/forks.js b\/scripts\/rollup\/forks.js\nindex 15856230ba..484a1288f8 100644\n--- a\/scripts\/rollup\/forks.js\n+++ b\/scripts\/rollup\/forks.js\n@@ -208,32 +208,6 @@ const forks = Object.freeze({\n }\n },\n \n- \/\/ In FB bundles, we preserve an inline require to ReactCurrentOwner.\n- \/\/ See the explanation in FB version of ReactCurrentOwner in www:\n- '.\/packages\/react\/src\/ReactCurrentOwner.js': (bundleType, entry) => {\n- switch (bundleType) {\n- case FB_WWW_DEV:\n- case FB_WWW_PROD:\n- case FB_WWW_PROFILING:\n- return '.\/packages\/react\/src\/forks\/ReactCurrentOwner.www.js';\n- default:\n- return null;\n- }\n- },\n-\n- \/\/ Similarly, we preserve an inline require to ReactCurrentDispatcher.\n- \/\/ See the explanation in FB version of ReactCurrentDispatcher in www:\n- '.\/packages\/react\/src\/ReactCurrentDispatcher.js': (bundleType, entry) => {\n- switch (bundleType) {\n- case FB_WWW_DEV:\n- case FB_WWW_PROD:\n- case FB_WWW_PROFILING:\n- return '.\/packages\/react\/src\/forks\/ReactCurrentDispatcher.www.js';\n- default:\n- return null;\n- }\n- },\n-\n '.\/packages\/react\/src\/ReactSharedInternals.js': (bundleType, entry) => {\n switch (bundleType) {\n case UMD_DEV:\n","body":"* Missing Hooks\r\n\r\n* Remove www forks. These can use __SECRET... instead.\r\n\r\n* Move cache to separate dispatcher\r\n\r\nThese will be available in more contexts than just render.","commit":{"revision":"a8c16a00406a204f0153c21023a04ca9a68411da","shortRevision":"a8c16a0040","subject":"Split Cache into its own Dispatcher (#25474)","authoredAt":"2022-10-12T23:13:39-04:00","authorName":"Sebastian Markbåge","authorEmail":"sebastian@calyptus.eu"},"parents":["2cf4352e1c81a5b8c3528519a128c20e8e65531d"]}

dillon1000/react

Files changed