{"body":"Similar to #28698, this removes the `unstable_getCacheSignal()` API\r\nsince we don't intend to ship this to stable.","files":[{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberCache.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactInternalTypes.js"},{"status":"M","path":"packages\/react-server\/src\/ReactFizzCache.js"},{"status":"M","path":"packages\/react-server\/src\/flight\/ReactFlightServerCache.js"},{"status":"M","path":"packages\/react-suspense-test-utils\/src\/ReactSuspenseTestUtils.js"},{"status":"M","path":"packages\/react\/index.classic.fb.js"},{"status":"M","path":"packages\/react\/index.experimental.js"},{"status":"M","path":"packages\/react\/index.js"},{"status":"M","path":"packages\/react\/index.modern.fb.js"},{"status":"M","path":"packages\/react\/src\/ReactClient.js"},{"status":"M","path":"packages\/react\/src\/ReactFetch.js"},{"status":"M","path":"packages\/react\/src\/ReactHooks.js"},{"status":"M","path":"packages\/react\/src\/ReactServer.experimental.js"}],"commit":{"authorEmail":"josephsavona@users.noreply.github.com","authoredAt":"2024-04-02T10:54:31-07:00","subject":"[be] Remove unused, experimental getCacheSignal API (#28706)","shortRevision":"8cb6a1c034","revision":"8cb6a1c0347a69ad4c580c5cf5f28d8be544d6d4","authorName":"Joseph Savona"},"parents":["48ec17b865f439754fcdaa289ef0aa98f15a05c2"],"patch":"diff --git a\/packages\/react-reconciler\/src\/ReactFiberCache.js b\/packages\/react-reconciler\/src\/ReactFiberCache.js\nindex 5e03bb1a40..3f465d8b88 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberCache.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberCache.js\n@@ -14,14 +14,6 @@ import {enableCache} from 'shared\/ReactFeatureFlags';\n import {readContext} from '.\/ReactFiberNewContext';\n import {CacheContext} from '.\/ReactFiberCacheComponent';\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@@ -36,6 +28,5 @@ function getCacheForType(resourceType: () => T): T {\n }\n \n export const DefaultCacheDispatcher: CacheDispatcher = {\n- getCacheSignal,\n getCacheForType,\n };\ndiff --git a\/packages\/react-reconciler\/src\/ReactInternalTypes.js b\/packages\/react-reconciler\/src\/ReactInternalTypes.js\nindex dac96a66dc..3b82dc40c8 100644\n--- a\/packages\/react-reconciler\/src\/ReactInternalTypes.js\n+++ b\/packages\/react-reconciler\/src\/ReactInternalTypes.js\n@@ -434,6 +434,5 @@ export type Dispatcher = {\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\nindex 4de18d4d55..10ff0ed7c0 100644\n--- a\/packages\/react-server\/src\/ReactFizzCache.js\n+++ b\/packages\/react-server\/src\/ReactFizzCache.js\n@@ -9,15 +9,10 @@\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\/flight\/ReactFlightServerCache.js b\/packages\/react-server\/src\/flight\/ReactFlightServerCache.js\nindex d386dbb9f2..5c2469a2a9 100644\n--- a\/packages\/react-server\/src\/flight\/ReactFlightServerCache.js\n+++ b\/packages\/react-server\/src\/flight\/ReactFlightServerCache.js\n@@ -11,10 +11,6 @@ import type {CacheDispatcher} from 'react-reconciler\/src\/ReactInternalTypes';\n \n import {resolveRequest, getCache} from '..\/ReactFlightServer';\n \n-function createSignal(): AbortSignal {\n- return new AbortController().signal;\n-}\n-\n function resolveCache(): Map {\n const request = resolveRequest();\n if (request) {\n@@ -24,15 +20,6 @@ function resolveCache(): Map {\n }\n \n export const DefaultCacheDispatcher: CacheDispatcher = {\n- getCacheSignal(): AbortSignal {\n- const cache = resolveCache();\n- let entry: AbortSignal | void = (cache.get(createSignal): any);\n- if (entry === undefined) {\n- entry = createSignal();\n- cache.set(createSignal, entry);\n- }\n- return entry;\n- },\n getCacheForType(resourceType: () => T): T {\n const cache = resolveCache();\n let entry: T | void = (cache.get(resourceType): any);\ndiff --git a\/packages\/react-suspense-test-utils\/src\/ReactSuspenseTestUtils.js b\/packages\/react-suspense-test-utils\/src\/ReactSuspenseTestUtils.js\nindex c851e87a2f..1f0c650dec 100644\n--- a\/packages\/react-suspense-test-utils\/src\/ReactSuspenseTestUtils.js\n+++ b\/packages\/react-suspense-test-utils\/src\/ReactSuspenseTestUtils.js\n@@ -12,14 +12,9 @@ import ReactSharedInternals from 'shared\/ReactSharedInternals';\n \n const ReactCurrentCache = ReactSharedInternals.ReactCurrentCache;\n \n-function unsupported() {\n- throw new Error('This feature is not supported by ReactSuspenseTestUtils.');\n-}\n-\n export function waitForSuspense(fn: () => T): Promise {\n const cache: Map = new Map();\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) {\ndiff --git a\/packages\/react\/index.classic.fb.js b\/packages\/react\/index.classic.fb.js\nindex 8c670383b6..00e6ee8a40 100644\n--- a\/packages\/react\/index.classic.fb.js\n+++ b\/packages\/react\/index.classic.fb.js\n@@ -34,7 +34,6 @@ export {\n unstable_LegacyHidden,\n unstable_Scope,\n unstable_SuspenseList,\n- unstable_getCacheSignal,\n unstable_getCacheForType,\n unstable_useCacheRefresh,\n unstable_useMemoCache,\ndiff --git a\/packages\/react\/index.experimental.js b\/packages\/react\/index.experimental.js\nindex e62e7853c5..a7cb3e3cdf 100644\n--- a\/packages\/react\/index.experimental.js\n+++ b\/packages\/react\/index.experimental.js\n@@ -31,7 +31,6 @@ export {\n unstable_DebugTracingMode,\n unstable_Activity,\n unstable_postpone,\n- unstable_getCacheSignal,\n unstable_getCacheForType,\n unstable_SuspenseList,\n unstable_useCacheRefresh,\ndiff --git a\/packages\/react\/index.js b\/packages\/react\/index.js\nindex e8f7b10788..ba3a705cac 100644\n--- a\/packages\/react\/index.js\n+++ b\/packages\/react\/index.js\n@@ -55,7 +55,6 @@ export {\n unstable_Scope,\n unstable_SuspenseList,\n unstable_TracingMarker,\n- unstable_getCacheSignal,\n unstable_getCacheForType,\n unstable_useCacheRefresh,\n unstable_useMemoCache,\ndiff --git a\/packages\/react\/index.modern.fb.js b\/packages\/react\/index.modern.fb.js\nindex 671b156214..f0b5e03925 100644\n--- a\/packages\/react\/index.modern.fb.js\n+++ b\/packages\/react\/index.modern.fb.js\n@@ -33,7 +33,6 @@ export {\n unstable_Activity,\n unstable_Scope,\n unstable_SuspenseList,\n- unstable_getCacheSignal,\n unstable_getCacheForType,\n unstable_useCacheRefresh,\n unstable_useMemoCache,\ndiff --git a\/packages\/react\/src\/ReactClient.js b\/packages\/react\/src\/ReactClient.js\nindex 4f9e7cbc0a..99492359fc 100644\n--- a\/packages\/react\/src\/ReactClient.js\n+++ b\/packages\/react\/src\/ReactClient.js\n@@ -36,7 +36,6 @@ import {memo} from '.\/ReactMemo';\n import {cache} from '.\/ReactCacheClient';\n import {postpone} from '.\/ReactPostpone';\n import {\n- getCacheSignal,\n getCacheForType,\n useCallback,\n useContext,\n@@ -115,7 +114,6 @@ export {\n REACT_SUSPENSE_LIST_TYPE as unstable_SuspenseList,\n REACT_LEGACY_HIDDEN_TYPE as unstable_LegacyHidden,\n REACT_OFFSCREEN_TYPE as unstable_Activity,\n- getCacheSignal as unstable_getCacheSignal,\n getCacheForType as unstable_getCacheForType,\n useCacheRefresh as unstable_useCacheRefresh,\n use,\ndiff --git a\/packages\/react\/src\/ReactFetch.js b\/packages\/react\/src\/ReactFetch.js\nindex b9e54169c2..31678d9327 100644\n--- a\/packages\/react\/src\/ReactFetch.js\n+++ b\/packages\/react\/src\/ReactFetch.js\n@@ -51,12 +51,8 @@ if (enableCache && enableFetchInstrumentation) {\n \/\/ We're outside a cached scope.\n return originalFetch(resource, options);\n }\n- if (\n- options &&\n- options.signal &&\n- options.signal !== dispatcher.getCacheSignal()\n- ) {\n- \/\/ If we're passed a signal that is not ours, then we assume that\n+ if (options && options.signal) {\n+ \/\/ If we're passed a signal, then we assume that\n \/\/ someone else controls the lifetime of this object and opts out of\n \/\/ caching. It's effectively the opt-out mechanism.\n \/\/ Ideally we should be able to check this on the Request but\ndiff --git a\/packages\/react\/src\/ReactHooks.js b\/packages\/react\/src\/ReactHooks.js\nindex fada4c9c8c..4c10256963 100644\n--- a\/packages\/react\/src\/ReactHooks.js\n+++ b\/packages\/react\/src\/ReactHooks.js\n@@ -43,26 +43,6 @@ function resolveDispatcher() {\n return ((dispatcher: any): Dispatcher);\n }\n \n-export function getCacheSignal(): AbortSignal {\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- controller.abort(reason);\n- return controller.signal;\n- }\n- return dispatcher.getCacheSignal();\n-}\n-\n export function getCacheForType(resourceType: () => T): T {\n const dispatcher = ReactCurrentCache.current;\n if (!dispatcher) {\ndiff --git a\/packages\/react\/src\/ReactServer.experimental.js b\/packages\/react\/src\/ReactServer.experimental.js\nindex fb90fd18e7..7db8332da9 100644\n--- a\/packages\/react\/src\/ReactServer.experimental.js\n+++ b\/packages\/react\/src\/ReactServer.experimental.js\n@@ -35,7 +35,6 @@ import {\n useDebugValue,\n useMemo,\n useActionState,\n- getCacheSignal,\n getCacheForType,\n } from '.\/ReactHooks';\n import {forwardRef} from '.\/ReactForwardRef';\n@@ -78,7 +77,6 @@ export {\n startTransition,\n REACT_DEBUG_TRACING_MODE_TYPE as unstable_DebugTracingMode,\n REACT_SUSPENSE_TYPE as unstable_SuspenseList,\n- getCacheSignal as unstable_getCacheSignal,\n getCacheForType as unstable_getCacheForType,\n postpone as unstable_postpone,\n useId,\n"}

dillon1000/react

Files changed