{"body":"The flag is fully rolled out.","parents":["56408a5b12fa4099e9dbbeca7f6bc59e1307e507"],"patch":"diff --git a\/packages\/react-client\/src\/ReactFlightReplyClient.js b\/packages\/react-client\/src\/ReactFlightReplyClient.js\nindex 6a0a37b787..40de7ca51e 100644\n--- a\/packages\/react-client\/src\/ReactFlightReplyClient.js\n+++ b\/packages\/react-client\/src\/ReactFlightReplyClient.js\n@@ -18,13 +18,10 @@ import type {\n import type {LazyComponent} from 'react\/src\/ReactLazy';\n import type {TemporaryReferenceSet} from '.\/ReactFlightTemporaryReferences';\n \n-import {enableRenderableContext} from 'shared\/ReactFeatureFlags';\n-\n import {\n REACT_ELEMENT_TYPE,\n REACT_LAZY_TYPE,\n REACT_CONTEXT_TYPE,\n- REACT_PROVIDER_TYPE,\n getIteratorFn,\n ASYNC_ITERATOR,\n } from 'shared\/ReactSymbols';\n@@ -699,10 +696,7 @@ export function processReply(\n return serializeTemporaryReferenceMarker();\n }\n if (__DEV__) {\n- if (\n- (value: any).$$typeof ===\n- (enableRenderableContext ? REACT_CONTEXT_TYPE : REACT_PROVIDER_TYPE)\n- ) {\n+ if ((value: any).$$typeof === REACT_CONTEXT_TYPE) {\n console.error(\n 'React Context Providers cannot be passed to Server Functions from the Client.%s',\n describeObjectForErrorMessage(parent, key),\ndiff --git a\/packages\/react-devtools-shared\/src\/utils.js b\/packages\/react-devtools-shared\/src\/utils.js\nindex 0536a821c7..5d92a86e2e 100644\n--- a\/packages\/react-devtools-shared\/src\/utils.js\n+++ b\/packages\/react-devtools-shared\/src\/utils.js\n@@ -19,14 +19,12 @@ import {\n REACT_MEMO_TYPE,\n REACT_PORTAL_TYPE,\n REACT_PROFILER_TYPE,\n- REACT_PROVIDER_TYPE,\n REACT_STRICT_MODE_TYPE,\n REACT_SUSPENSE_LIST_TYPE,\n REACT_SUSPENSE_TYPE,\n REACT_TRACING_MARKER_TYPE,\n REACT_VIEW_TRANSITION_TYPE,\n } from 'shared\/ReactSymbols';\n-import {enableRenderableContext} from 'shared\/ReactFeatureFlags';\n import {\n TREE_OPERATION_ADD,\n TREE_OPERATION_REMOVE,\n@@ -87,6 +85,9 @@ const encodedStringCache: LRUCache> = new LRU({\n max: 1000,\n });\n \n+\/\/ Previously, the type of `Context.Provider`.\n+const LEGACY_REACT_PROVIDER_TYPE: symbol = Symbol.for('react.provider');\n+\n export function alphaSortKeys(\n a: string | number | symbol,\n b: string | number | symbol,\n@@ -712,14 +713,7 @@ function typeOfWithLegacyElementSymbol(object: any): mixed {\n case REACT_MEMO_TYPE:\n return $$typeofType;\n case REACT_CONSUMER_TYPE:\n- if (enableRenderableContext) {\n- return $$typeofType;\n- }\n- \/\/ Fall through\n- case REACT_PROVIDER_TYPE:\n- if (!enableRenderableContext) {\n- return $$typeofType;\n- }\n+ return $$typeofType;\n \/\/ Fall through\n default:\n return $$typeof;\n@@ -740,7 +734,7 @@ export function getDisplayNameForReactElement(\n switch (elementType) {\n case REACT_CONSUMER_TYPE:\n return 'ContextConsumer';\n- case REACT_PROVIDER_TYPE:\n+ case LEGACY_REACT_PROVIDER_TYPE:\n return 'ContextProvider';\n case REACT_CONTEXT_TYPE:\n return 'Context';\ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactDOMServerIntegrationNewContext-test.js b\/packages\/react-dom\/src\/__tests__\/ReactDOMServerIntegrationNewContext-test.js\nindex 24009f1eda..213e4ed138 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactDOMServerIntegrationNewContext-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactDOMServerIntegrationNewContext-test.js\n@@ -295,12 +295,6 @@ describe('ReactDOMServerIntegration', () => {\n });\n \n itRenders('should treat Context as Context.Provider', async render => {\n- \/\/ The `itRenders` helpers don't work with the gate pragma, so we have to do\n- \/\/ this instead.\n- if (gate(flags => !flags.enableRenderableContext)) {\n- return;\n- }\n-\n const Theme = React.createContext('dark');\n const Language = React.createContext('french');\n \ndiff --git a\/packages\/react-dom\/src\/__tests__\/ReactServerRendering-test.js b\/packages\/react-dom\/src\/__tests__\/ReactServerRendering-test.js\nindex 2bf917d3c3..86bdb1633f 100644\n--- a\/packages\/react-dom\/src\/__tests__\/ReactServerRendering-test.js\n+++ b\/packages\/react-dom\/src\/__tests__\/ReactServerRendering-test.js\n@@ -932,7 +932,6 @@ describe('ReactDOMServer', () => {\n ]);\n });\n \n- \/\/ @gate enableRenderableContext || !__DEV__\n it('should warn if an invalid contextType is defined', () => {\n const Context = React.createContext();\n class ComponentA extends React.Component {\ndiff --git a\/packages\/react-is\/src\/ReactIs.js b\/packages\/react-is\/src\/ReactIs.js\nindex a433e91bf1..ed70f0e68e 100644\n--- a\/packages\/react-is\/src\/ReactIs.js\n+++ b\/packages\/react-is\/src\/ReactIs.js\n@@ -18,7 +18,6 @@ import {\n REACT_MEMO_TYPE,\n REACT_PORTAL_TYPE,\n REACT_PROFILER_TYPE,\n- REACT_PROVIDER_TYPE,\n REACT_CONSUMER_TYPE,\n REACT_STRICT_MODE_TYPE,\n REACT_SUSPENSE_TYPE,\n@@ -30,7 +29,6 @@ import {\n } from 'shared\/ReactSymbols';\n \n import {\n- enableRenderableContext,\n enableScopeAPI,\n enableTransitionTracing,\n enableLegacyHidden,\n@@ -64,14 +62,7 @@ export function typeOf(object: any): mixed {\n case REACT_MEMO_TYPE:\n return $$typeofType;\n case REACT_CONSUMER_TYPE:\n- if (enableRenderableContext) {\n- return $$typeofType;\n- }\n- \/\/ Fall through\n- case REACT_PROVIDER_TYPE:\n- if (!enableRenderableContext) {\n- return $$typeofType;\n- }\n+ return $$typeofType;\n \/\/ Fall through\n default:\n return $$typeof;\n@@ -85,12 +76,8 @@ export function typeOf(object: any): mixed {\n return undefined;\n }\n \n-export const ContextConsumer: symbol = enableRenderableContext\n- ? REACT_CONSUMER_TYPE\n- : REACT_CONTEXT_TYPE;\n-export const ContextProvider: symbol = enableRenderableContext\n- ? REACT_CONTEXT_TYPE\n- : REACT_PROVIDER_TYPE;\n+export const ContextConsumer: symbol = REACT_CONSUMER_TYPE;\n+export const ContextProvider: symbol = REACT_CONTEXT_TYPE;\n export const Element = REACT_ELEMENT_TYPE;\n export const ForwardRef = REACT_FORWARD_REF_TYPE;\n export const Fragment = REACT_FRAGMENT_TYPE;\n@@ -127,8 +114,7 @@ export function isValidElementType(type: mixed): boolean {\n type.$$typeof === REACT_LAZY_TYPE ||\n type.$$typeof === REACT_MEMO_TYPE ||\n type.$$typeof === REACT_CONTEXT_TYPE ||\n- (!enableRenderableContext && type.$$typeof === REACT_PROVIDER_TYPE) ||\n- (enableRenderableContext && type.$$typeof === REACT_CONSUMER_TYPE) ||\n+ type.$$typeof === REACT_CONSUMER_TYPE ||\n type.$$typeof === REACT_FORWARD_REF_TYPE ||\n \/\/ This needs to include all possible module reference object\n \/\/ types supported by any Flight configuration anywhere since\n@@ -145,18 +131,10 @@ export function isValidElementType(type: mixed): boolean {\n }\n \n export function isContextConsumer(object: any): boolean {\n- if (enableRenderableContext) {\n- return typeOf(object) === REACT_CONSUMER_TYPE;\n- } else {\n- return typeOf(object) === REACT_CONTEXT_TYPE;\n- }\n+ return typeOf(object) === REACT_CONSUMER_TYPE;\n }\n export function isContextProvider(object: any): boolean {\n- if (enableRenderableContext) {\n- return typeOf(object) === REACT_CONTEXT_TYPE;\n- } else {\n- return typeOf(object) === REACT_PROVIDER_TYPE;\n- }\n+ return typeOf(object) === REACT_CONTEXT_TYPE;\n }\n export function isElement(object: any): boolean {\n return (\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiber.js b\/packages\/react-reconciler\/src\/ReactFiber.js\nindex 39dde1c593..65feabd8c0 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiber.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiber.js\n@@ -41,7 +41,6 @@ import {\n enableLegacyHidden,\n enableTransitionTracing,\n enableDO_NOT_USE_disableStrictPassiveEffect,\n- enableRenderableContext,\n disableLegacyMode,\n enableObjectFiber,\n enableViewTransition,\n@@ -101,7 +100,6 @@ import {\n REACT_FRAGMENT_TYPE,\n REACT_STRICT_MODE_TYPE,\n REACT_PROFILER_TYPE,\n- REACT_PROVIDER_TYPE,\n REACT_CONTEXT_TYPE,\n REACT_CONSUMER_TYPE,\n REACT_SUSPENSE_TYPE,\n@@ -638,25 +636,12 @@ export function createFiberFromTypeAndProps(\n default: {\n if (typeof type === 'object' && type !== null) {\n switch (type.$$typeof) {\n- case REACT_PROVIDER_TYPE:\n- if (!enableRenderableContext) {\n- fiberTag = ContextProvider;\n- break getTag;\n- }\n- \/\/ Fall through\n case REACT_CONTEXT_TYPE:\n- if (enableRenderableContext) {\n- fiberTag = ContextProvider;\n- break getTag;\n- } else {\n- fiberTag = ContextConsumer;\n- break getTag;\n- }\n+ fiberTag = ContextProvider;\n+ break getTag;\n case REACT_CONSUMER_TYPE:\n- if (enableRenderableContext) {\n- fiberTag = ContextConsumer;\n- break getTag;\n- }\n+ fiberTag = ContextConsumer;\n+ break getTag;\n \/\/ Fall through\n case REACT_FORWARD_REF_TYPE:\n fiberTag = ForwardRef;\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberBeginWork.js b\/packages\/react-reconciler\/src\/ReactFiberBeginWork.js\nindex 2b9e4e7fdb..10b10a74b9 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberBeginWork.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberBeginWork.js\n@@ -116,7 +116,6 @@ import {\n enableLegacyHidden,\n enableCPUSuspense,\n enablePostpone,\n- enableRenderableContext,\n disableLegacyMode,\n disableDefaultPropsExceptForClasses,\n enableHydrationLaneScheduling,\n@@ -3591,12 +3590,7 @@ function updateContextProvider(\n workInProgress: Fiber,\n renderLanes: Lanes,\n ) {\n- let context: ReactContext;\n- if (enableRenderableContext) {\n- context = workInProgress.type;\n- } else {\n- context = workInProgress.type._context;\n- }\n+ const context: ReactContext = workInProgress.type;\n const newProps = workInProgress.pendingProps;\n const newValue = newProps.value;\n \n@@ -3623,18 +3617,8 @@ function updateContextConsumer(\n workInProgress: Fiber,\n renderLanes: Lanes,\n ) {\n- let context: ReactContext;\n- if (enableRenderableContext) {\n- const consumerType: ReactConsumerType = workInProgress.type;\n- context = consumerType._context;\n- } else {\n- context = workInProgress.type;\n- if (__DEV__) {\n- if ((context: any)._context !== undefined) {\n- context = (context: any)._context;\n- }\n- }\n- }\n+ const consumerType: ReactConsumerType = workInProgress.type;\n+ const context: ReactContext = consumerType._context;\n const newProps = workInProgress.pendingProps;\n const render = newProps.children;\n \n@@ -3878,12 +3862,7 @@ function attemptEarlyBailoutIfNoScheduledUpdate(\n break;\n case ContextProvider: {\n const newValue = workInProgress.memoizedProps.value;\n- let context: ReactContext;\n- if (enableRenderableContext) {\n- context = workInProgress.type;\n- } else {\n- context = workInProgress.type._context;\n- }\n+ const context: ReactContext = workInProgress.type;\n pushProvider(workInProgress, context, newValue);\n break;\n }\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberCompleteWork.js b\/packages\/react-reconciler\/src\/ReactFiberCompleteWork.js\nindex a415e6217a..1e6ddd7595 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberCompleteWork.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberCompleteWork.js\n@@ -38,7 +38,6 @@ import {\n enablePersistedModeClonedFlag,\n enableProfilerTimer,\n enableTransitionTracing,\n- enableRenderableContext,\n passChildrenWhenCloningPersistedNodes,\n disableLegacyMode,\n enableViewTransition,\n@@ -1667,12 +1666,7 @@ function completeWork(\n return null;\n case ContextProvider:\n \/\/ Pop provider fiber\n- let context: ReactContext;\n- if (enableRenderableContext) {\n- context = workInProgress.type;\n- } else {\n- context = workInProgress.type._context;\n- }\n+ const context: ReactContext = workInProgress.type;\n popProvider(context, workInProgress);\n bubbleProperties(workInProgress);\n return null;\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberNewContext.js b\/packages\/react-reconciler\/src\/ReactFiberNewContext.js\nindex b10dc5ce54..02792d863a 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberNewContext.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberNewContext.js\n@@ -29,7 +29,6 @@ import {\n } from '.\/ReactFiberFlags';\n \n import is from 'shared\/objectIs';\n-import {enableRenderableContext} from 'shared\/ReactFeatureFlags';\n import {getHostTransitionProvider} from '.\/ReactFiberHostContext';\n \n const valueCursor: StackCursor = createCursor(null);\n@@ -389,13 +388,7 @@ function propagateParentContextChanges(\n \n const oldProps = currentParent.memoizedProps;\n if (oldProps !== null) {\n- let context: ReactContext;\n- if (enableRenderableContext) {\n- context = parent.type;\n- } else {\n- context = parent.type._context;\n- }\n-\n+ const context: ReactContext = parent.type;\n const newProps = parent.pendingProps;\n const newValue = newProps.value;\n \ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberScope.js b\/packages\/react-reconciler\/src\/ReactFiberScope.js\nindex 0cb1c62ba8..8f9f1cdea5 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberScope.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberScope.js\n@@ -22,10 +22,7 @@ import {\n import {isFiberSuspenseAndTimedOut} from '.\/ReactFiberTreeReflection';\n \n import {HostComponent, ScopeComponent, ContextProvider} from '.\/ReactWorkTags';\n-import {\n- enableScopeAPI,\n- enableRenderableContext,\n-} from 'shared\/ReactFeatureFlags';\n+import {enableScopeAPI} from 'shared\/ReactFeatureFlags';\n \n function getSuspenseFallbackChild(fiber: Fiber): Fiber | null {\n return ((((fiber.child: any): Fiber).sibling: any): Fiber).child;\n@@ -116,10 +113,7 @@ function collectNearestContextValues(\n context: ReactContext,\n childContextValues: Array,\n ): void {\n- if (\n- node.tag === ContextProvider &&\n- (enableRenderableContext ? node.type : node.type._context) === context\n- ) {\n+ if (node.tag === ContextProvider && node.type === context) {\n const contextValue = node.memoizedProps.value;\n childContextValues.push(contextValue);\n } else {\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberUnwindWork.js b\/packages\/react-reconciler\/src\/ReactFiberUnwindWork.js\nindex a1d3797cd1..6de76ee203 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberUnwindWork.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberUnwindWork.js\n@@ -36,7 +36,6 @@ import {NoMode, ProfileMode} from '.\/ReactTypeOfMode';\n import {\n enableProfilerTimer,\n enableTransitionTracing,\n- enableRenderableContext,\n } from 'shared\/ReactFeatureFlags';\n \n import {popHostContainer, popHostContext} from '.\/ReactFiberHostContext';\n@@ -189,12 +188,7 @@ function unwindWork(\n popHostContainer(workInProgress);\n return null;\n case ContextProvider:\n- let context: ReactContext;\n- if (enableRenderableContext) {\n- context = workInProgress.type;\n- } else {\n- context = workInProgress.type._context;\n- }\n+ const context: ReactContext = workInProgress.type;\n popProvider(context, workInProgress);\n return null;\n case OffscreenComponent:\n@@ -286,12 +280,7 @@ function unwindInterruptedWork(\n popSuspenseListContext(interruptedWork);\n break;\n case ContextProvider:\n- let context: ReactContext;\n- if (enableRenderableContext) {\n- context = interruptedWork.type;\n- } else {\n- context = interruptedWork.type._context;\n- }\n+ const context: ReactContext = interruptedWork.type;\n popProvider(context, interruptedWork);\n break;\n case OffscreenComponent:\ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/ReactLazy-test.internal.js b\/packages\/react-reconciler\/src\/__tests__\/ReactLazy-test.internal.js\nindex a6306bfcfe..a9c445477b 100644\n--- a\/packages\/react-reconciler\/src\/__tests__\/ReactLazy-test.internal.js\n+++ b\/packages\/react-reconciler\/src\/__tests__\/ReactLazy-test.internal.js\n@@ -941,15 +941,11 @@ describe('ReactLazy', () => {\n <\/Suspense>,\n );\n await waitForThrow(\n- gate('enableRenderableContext')\n- ? 'Element type is invalid. Received a promise that resolves to: Context.Provider. ' +\n- 'Lazy element type must resolve to a class or function.'\n- : 'Element type is invalid. Received a promise that resolves to: Context.Consumer. ' +\n- 'Lazy element type must resolve to a class or function.',\n+ 'Element type is invalid. Received a promise that resolves to: Context.Provider. ' +\n+ 'Lazy element type must resolve to a class or function.',\n );\n });\n \n- \/\/ @gate enableRenderableContext\n it('throws with a useful error when wrapping Context.Consumer with lazy()', async () => {\n const Context = React.createContext(null);\n const BadLazy = lazy(() => fakeImport(Context.Consumer));\ndiff --git a\/packages\/react-reconciler\/src\/__tests__\/ReactNewContext-test.js b\/packages\/react-reconciler\/src\/__tests__\/ReactNewContext-test.js\nindex 58cb2f9e64..2a61b1192d 100644\n--- a\/packages\/react-reconciler\/src\/__tests__\/ReactNewContext-test.js\n+++ b\/packages\/react-reconciler\/src\/__tests__\/ReactNewContext-test.js\n@@ -1358,7 +1358,6 @@ describe('ReactNewContext', () => {\n );\n });\n \n- \/\/ @gate enableRenderableContext || !__DEV__\n it('warns when passed a consumer', async () => {\n const Context = React.createContext(0);\n function Foo() {\n@@ -1657,7 +1656,6 @@ Context fuzz tester error! Copy and paste the following line into the test suite\n });\n });\n \n- \/\/ @gate enableRenderableContext\n it('should treat Context as Context.Provider', async () => {\n const BarContext = React.createContext({value: 'bar-initial'});\n expect(BarContext.Provider).toBe(BarContext);\ndiff --git a\/packages\/react-reconciler\/src\/getComponentNameFromFiber.js b\/packages\/react-reconciler\/src\/getComponentNameFromFiber.js\nindex 670475cdec..2ceed6ce4e 100644\n--- a\/packages\/react-reconciler\/src\/getComponentNameFromFiber.js\n+++ b\/packages\/react-reconciler\/src\/getComponentNameFromFiber.js\n@@ -13,7 +13,6 @@ import type {Fiber} from '.\/ReactInternalTypes';\n import {\n disableLegacyMode,\n enableLegacyHidden,\n- enableRenderableContext,\n enableViewTransition,\n } from 'shared\/ReactFeatureFlags';\n \n@@ -91,21 +90,11 @@ export default function getComponentNameFromFiber(fiber: Fiber): string | null {\n case CacheComponent:\n return 'Cache';\n case ContextConsumer:\n- if (enableRenderableContext) {\n- const consumer: ReactConsumerType = (type: any);\n- return getContextName(consumer._context) + '.Consumer';\n- } else {\n- const context: ReactContext = (type: any);\n- return getContextName(context) + '.Consumer';\n- }\n+ const consumer: ReactConsumerType = (type: any);\n+ return getContextName(consumer._context) + '.Consumer';\n case ContextProvider:\n- if (enableRenderableContext) {\n- const context: ReactContext = (type: any);\n- return getContextName(context) + '.Provider';\n- } else {\n- const provider = (type: any);\n- return getContextName(provider._context) + '.Provider';\n- }\n+ const context: ReactContext = (type: any);\n+ return getContextName(context) + '.Provider';\n case DehydratedFragment:\n return 'DehydratedFragment';\n case ForwardRef:\ndiff --git a\/packages\/react-server\/src\/ReactFizzServer.js b\/packages\/react-server\/src\/ReactFizzServer.js\nindex 2995b498f4..2bcc14cfa4 100644\n--- a\/packages\/react-server\/src\/ReactFizzServer.js\n+++ b\/packages\/react-server\/src\/ReactFizzServer.js\n@@ -163,7 +163,6 @@ import {\n REACT_FRAGMENT_TYPE,\n REACT_FORWARD_REF_TYPE,\n REACT_MEMO_TYPE,\n- REACT_PROVIDER_TYPE,\n REACT_CONTEXT_TYPE,\n REACT_CONSUMER_TYPE,\n REACT_SCOPE_TYPE,\n@@ -178,7 +177,6 @@ import {\n enableScopeAPI,\n enablePostpone,\n enableHalt,\n- enableRenderableContext,\n disableDefaultPropsExceptForClasses,\n enableAsyncIterableChildren,\n enableViewTransition,\n@@ -2959,38 +2957,16 @@ function renderElement(\n renderMemo(request, task, keyPath, type, props, ref);\n return;\n }\n- case REACT_PROVIDER_TYPE: {\n- if (!enableRenderableContext) {\n- const context: ReactContext = (type: any)._context;\n- renderContextProvider(request, task, keyPath, context, props);\n- return;\n- }\n- \/\/ Fall through\n- }\n case REACT_CONTEXT_TYPE: {\n- if (enableRenderableContext) {\n- const context = type;\n- renderContextProvider(request, task, keyPath, context, props);\n- return;\n- } else {\n- let context: ReactContext = (type: any);\n- if (__DEV__) {\n- if ((context: any)._context !== undefined) {\n- context = (context: any)._context;\n- }\n- }\n- renderContextConsumer(request, task, keyPath, context, props);\n- return;\n- }\n+ const context = type;\n+ renderContextProvider(request, task, keyPath, context, props);\n+ return;\n }\n case REACT_CONSUMER_TYPE: {\n- if (enableRenderableContext) {\n- const context: ReactContext = (type: ReactConsumerType)\n- ._context;\n- renderContextConsumer(request, task, keyPath, context, props);\n- return;\n- }\n- \/\/ Fall through\n+ const context: ReactContext = (type: ReactConsumerType)\n+ ._context;\n+ renderContextConsumer(request, task, keyPath, context, props);\n+ return;\n }\n case REACT_LAZY_TYPE: {\n renderLazyComponent(request, task, keyPath, type, props, ref);\ndiff --git a\/packages\/react\/src\/ReactContext.js b\/packages\/react\/src\/ReactContext.js\nindex 24461ebfbb..d5dbb433df 100644\n--- a\/packages\/react\/src\/ReactContext.js\n+++ b\/packages\/react\/src\/ReactContext.js\n@@ -7,14 +7,9 @@\n * @flow\n *\/\n \n-import {\n- REACT_PROVIDER_TYPE,\n- REACT_CONSUMER_TYPE,\n- REACT_CONTEXT_TYPE,\n-} from 'shared\/ReactSymbols';\n+import {REACT_CONSUMER_TYPE, REACT_CONTEXT_TYPE} from 'shared\/ReactSymbols';\n \n import type {ReactContext} from 'shared\/ReactTypes';\n-import {enableRenderableContext} from 'shared\/ReactFeatureFlags';\n \n export function createContext(defaultValue: T): ReactContext {\n \/\/ TODO: Second argument used to be an optional `calculateChangedBits`\n@@ -37,73 +32,11 @@ export function createContext(defaultValue: T): ReactContext {\n Consumer: (null: any),\n };\n \n- if (enableRenderableContext) {\n- context.Provider = context;\n- context.Consumer = {\n- $$typeof: REACT_CONSUMER_TYPE,\n- _context: context,\n- };\n- } else {\n- (context: any).Provider = {\n- $$typeof: REACT_PROVIDER_TYPE,\n- _context: context,\n- };\n- if (__DEV__) {\n- const Consumer: any = {\n- $$typeof: REACT_CONTEXT_TYPE,\n- _context: context,\n- };\n- Object.defineProperties(Consumer, {\n- Provider: {\n- get() {\n- return context.Provider;\n- },\n- set(_Provider: any) {\n- context.Provider = _Provider;\n- },\n- },\n- _currentValue: {\n- get() {\n- return context._currentValue;\n- },\n- set(_currentValue: T) {\n- context._currentValue = _currentValue;\n- },\n- },\n- _currentValue2: {\n- get() {\n- return context._currentValue2;\n- },\n- set(_currentValue2: T) {\n- context._currentValue2 = _currentValue2;\n- },\n- },\n- _threadCount: {\n- get() {\n- return context._threadCount;\n- },\n- set(_threadCount: number) {\n- context._threadCount = _threadCount;\n- },\n- },\n- Consumer: {\n- get() {\n- return context.Consumer;\n- },\n- },\n- displayName: {\n- get() {\n- return context.displayName;\n- },\n- set(displayName: void | string) {},\n- },\n- });\n- (context: any).Consumer = Consumer;\n- } else {\n- (context: any).Consumer = context;\n- }\n- }\n-\n+ context.Provider = context;\n+ context.Consumer = {\n+ $$typeof: REACT_CONSUMER_TYPE,\n+ _context: context,\n+ };\n if (__DEV__) {\n context._currentRenderer = null;\n context._currentRenderer2 = null;\ndiff --git a\/packages\/react\/src\/__tests__\/ReactContextValidator-test.js b\/packages\/react\/src\/__tests__\/ReactContextValidator-test.js\nindex 96e46fa528..ff8f2b4215 100644\n--- a\/packages\/react\/src\/__tests__\/ReactContextValidator-test.js\n+++ b\/packages\/react\/src\/__tests__\/ReactContextValidator-test.js\n@@ -490,7 +490,6 @@ describe('ReactContextValidator', () => {\n ]);\n });\n \n- \/\/ @gate enableRenderableContext || !__DEV__\n it('should warn if an invalid contextType is defined', async () => {\n const Context = React.createContext();\n class ComponentA extends React.Component {\ndiff --git a\/packages\/shared\/ReactFeatureFlags.js b\/packages\/shared\/ReactFeatureFlags.js\nindex 5b483297ee..a1ea476b56 100644\n--- a\/packages\/shared\/ReactFeatureFlags.js\n+++ b\/packages\/shared\/ReactFeatureFlags.js\n@@ -204,9 +204,6 @@ export const enableReactTestRendererWarning = true;\n \/\/ before removing them in stable in the next Major\n export const disableLegacyMode = true;\n \n-\/\/ Make equivalent to instead of \n-export const enableRenderableContext = true;\n-\n \/\/ -----------------------------------------------------------------------------\n \/\/ Chopping Block\n \/\/\ndiff --git a\/packages\/shared\/ReactSymbols.js b\/packages\/shared\/ReactSymbols.js\nindex 937c01cf75..2d478ffc67 100644\n--- a\/packages\/shared\/ReactSymbols.js\n+++ b\/packages\/shared\/ReactSymbols.js\n@@ -22,7 +22,6 @@ export const REACT_PORTAL_TYPE: symbol = Symbol.for('react.portal');\n export const REACT_FRAGMENT_TYPE: symbol = Symbol.for('react.fragment');\n export const REACT_STRICT_MODE_TYPE: symbol = Symbol.for('react.strict_mode');\n export const REACT_PROFILER_TYPE: symbol = Symbol.for('react.profiler');\n-export const REACT_PROVIDER_TYPE: symbol = Symbol.for('react.provider'); \/\/ TODO: Delete with enableRenderableContext\n export const REACT_CONSUMER_TYPE: symbol = Symbol.for('react.consumer');\n export const REACT_CONTEXT_TYPE: symbol = Symbol.for('react.context');\n export const REACT_FORWARD_REF_TYPE: symbol = Symbol.for('react.forward_ref');\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js b\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js\nindex 1fb2a24671..3dd11f4af4 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.native-fb.js\n@@ -58,7 +58,6 @@ export const enableProfilerCommitHooks = __PROFILE__;\n export const enableProfilerNestedUpdatePhase = __PROFILE__;\n export const enableProfilerTimer = __PROFILE__;\n export const enableReactTestRendererWarning = false;\n-export const enableRenderableContext = true;\n export const enableRetryLaneExpiration = false;\n export const enableSchedulingProfiler = __PROFILE__;\n export const enableComponentPerformanceTrack = false;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js b\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\nindex f514d53195..b1978f05a1 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.native-oss.js\n@@ -43,7 +43,6 @@ export const enableObjectFiber = false;\n export const enablePersistedModeClonedFlag = false;\n export const enablePostpone = false;\n export const enableReactTestRendererWarning = false;\n-export const enableRenderableContext = true;\n export const enableRetryLaneExpiration = false;\n export const enableSchedulingProfiler = __PROFILE__;\n export const enableComponentPerformanceTrack = false;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js\nindex e2e2bf1c86..4a49fb7316 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.js\n@@ -89,7 +89,6 @@ export const enableFragmentRefs = false;\n export const disableLegacyMode = true;\n export const disableLegacyContext = true;\n export const disableLegacyContextForFunctionComponents = true;\n-export const enableRenderableContext = true;\n export const enableReactTestRendererWarning = true;\n export const disableDefaultPropsExceptForClasses = true;\n \ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native-fb.js b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native-fb.js\nindex 410eff7f34..c001a68557 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native-fb.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.native-fb.js\n@@ -41,7 +41,6 @@ export const enableProfilerCommitHooks = __PROFILE__;\n export const enableProfilerNestedUpdatePhase = __PROFILE__;\n export const enableProfilerTimer = __PROFILE__;\n export const enableReactTestRendererWarning = false;\n-export const enableRenderableContext = true;\n export const enableRetryLaneExpiration = false;\n export const enableSchedulingProfiler = __PROFILE__;\n export const enableComponentPerformanceTrack = false;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\nindex f5772dd7aa..f58e154d02 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.test-renderer.www.js\n@@ -38,7 +38,6 @@ export const enableUseEffectEventHook = false;\n export const favorSafetyOverHydrationPerf = true;\n export const enableLegacyFBSupport = false;\n export const enableMoveBefore = false;\n-export const enableRenderableContext = false;\n export const enableHiddenSubtreeInsertionEffectCleanup = true;\n \n export const enableRetryLaneExpiration = false;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.www-dynamic.js b\/packages\/shared\/forks\/ReactFeatureFlags.www-dynamic.js\nindex 700aebb1cc..263d7ca048 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.www-dynamic.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.www-dynamic.js\n@@ -21,7 +21,6 @@ export const enableDO_NOT_USE_disableStrictPassiveEffect = __VARIANT__;\n export const enableHiddenSubtreeInsertionEffectCleanup = __VARIANT__;\n export const enableNoCloningMemoCache = __VARIANT__;\n export const enableObjectFiber = __VARIANT__;\n-export const enableRenderableContext = __VARIANT__;\n export const enableRetryLaneExpiration = __VARIANT__;\n export const enableTransitionTracing = __VARIANT__;\n export const favorSafetyOverHydrationPerf = __VARIANT__;\ndiff --git a\/packages\/shared\/forks\/ReactFeatureFlags.www.js b\/packages\/shared\/forks\/ReactFeatureFlags.www.js\nindex afe652ce3e..807e86da2b 100644\n--- a\/packages\/shared\/forks\/ReactFeatureFlags.www.js\n+++ b\/packages\/shared\/forks\/ReactFeatureFlags.www.js\n@@ -24,7 +24,6 @@ export const {\n enableInfiniteRenderLoopDetection,\n enableNoCloningMemoCache,\n enableObjectFiber,\n- enableRenderableContext,\n enableRetryLaneExpiration,\n enableTransitionTracing,\n enableTrustedTypesIntegration,\ndiff --git a\/packages\/shared\/getComponentNameFromType.js b\/packages\/shared\/getComponentNameFromType.js\nindex da5cba301e..7c7d5a4c10 100644\n--- a\/packages\/shared\/getComponentNameFromType.js\n+++ b\/packages\/shared\/getComponentNameFromType.js\n@@ -18,7 +18,6 @@ import {\n REACT_PORTAL_TYPE,\n REACT_MEMO_TYPE,\n REACT_PROFILER_TYPE,\n- REACT_PROVIDER_TYPE,\n REACT_STRICT_MODE_TYPE,\n REACT_SUSPENSE_TYPE,\n REACT_SUSPENSE_LIST_TYPE,\n@@ -30,7 +29,6 @@ import {\n \n import {\n enableTransitionTracing,\n- enableRenderableContext,\n enableViewTransition,\n } from '.\/ReactFeatureFlags';\n \n@@ -106,27 +104,12 @@ export default function getComponentNameFromType(type: mixed): string | null {\n switch (type.$$typeof) {\n case REACT_PORTAL_TYPE:\n return 'Portal';\n- case REACT_PROVIDER_TYPE:\n- if (enableRenderableContext) {\n- return null;\n- } else {\n- const provider = (type: any);\n- return getContextName(provider._context) + '.Provider';\n- }\n case REACT_CONTEXT_TYPE:\n const context: ReactContext = (type: any);\n- if (enableRenderableContext) {\n- return getContextName(context) + '.Provider';\n- } else {\n- return getContextName(context) + '.Consumer';\n- }\n+ return getContextName(context) + '.Provider';\n case REACT_CONSUMER_TYPE:\n- if (enableRenderableContext) {\n- const consumer: ReactConsumerType = (type: any);\n- return getContextName(consumer._context) + '.Consumer';\n- } else {\n- return null;\n- }\n+ const consumer: ReactConsumerType = (type: any);\n+ return getContextName(consumer._context) + '.Consumer';\n case REACT_FORWARD_REF_TYPE:\n return getWrappedName(type, type.render, 'ForwardRef');\n case REACT_MEMO_TYPE:\n","commit":{"subject":"Remove feature flag enableRenderableContext (#33505)","revision":"6c86e56a0fa3c8f253da133330cd5b7d1d20e7e5","authorName":"Jan Kassens","shortRevision":"6c86e56a0f","authorEmail":"jkassens@meta.com","authoredAt":"2025-06-11T11:53:04-04:00"},"files":[{"path":"packages\/react-client\/src\/ReactFlightReplyClient.js","status":"M"},{"path":"packages\/react-devtools-shared\/src\/utils.js","status":"M"},{"path":"packages\/react-dom\/src\/__tests__\/ReactDOMServerIntegrationNewContext-test.js","status":"M"},{"path":"packages\/react-dom\/src\/__tests__\/ReactServerRendering-test.js","status":"M"},{"path":"packages\/react-is\/src\/ReactIs.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactFiber.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactFiberBeginWork.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactFiberCompleteWork.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactFiberNewContext.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactFiberScope.js","status":"M"},{"path":"packages\/react-reconciler\/src\/ReactFiberUnwindWork.js","status":"M"},{"path":"packages\/react-reconciler\/src\/__tests__\/ReactLazy-test.internal.js","status":"M"},{"path":"packages\/react-reconciler\/src\/__tests__\/ReactNewContext-test.js","status":"M"},{"path":"packages\/react-reconciler\/src\/getComponentNameFromFiber.js","status":"M"},{"path":"packages\/react-server\/src\/ReactFizzServer.js","status":"M"},{"path":"packages\/react\/src\/ReactContext.js","status":"M"},{"path":"packages\/react\/src\/__tests__\/ReactContextValidator-test.js","status":"M"},{"path":"packages\/shared\/ReactFeatureFlags.js","status":"M"},{"path":"packages\/shared\/ReactSymbols.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-dynamic.js","status":"M"},{"path":"packages\/shared\/forks\/ReactFeatureFlags.www.js","status":"M"},{"path":"packages\/shared\/getComponentNameFromType.js","status":"M"}]}

dillon1000/react

Files changed