From 41b4714f195868193ddfb2a89d2373b1c61387f4 Mon Sep 17 00:00:00 2001 From: Ricky Date: Tue, 28 Mar 2023 09:46:26 -0400 Subject: [PATCH] Remove disableNativeComponentFrames (#26490) ## Overview I'm landing this flag internally so we can delete this --- packages/shared/ReactComponentStackFrame.js | 7 ++----- packages/shared/ReactFeatureFlags.js | 2 -- packages/shared/forks/ReactFeatureFlags.native-fb.js | 1 - packages/shared/forks/ReactFeatureFlags.native-oss.js | 1 - packages/shared/forks/ReactFeatureFlags.test-renderer.js | 1 - .../shared/forks/ReactFeatureFlags.test-renderer.native.js | 1 - .../shared/forks/ReactFeatureFlags.test-renderer.www.js | 1 - packages/shared/forks/ReactFeatureFlags.www-dynamic.js | 1 - packages/shared/forks/ReactFeatureFlags.www.js | 1 - 9 files changed, 2 insertions(+), 14 deletions(-) diff --git a/packages/shared/ReactComponentStackFrame.js b/packages/shared/ReactComponentStackFrame.js index b7b86b3efb5be..9f89bad3875e0 100644 --- a/packages/shared/ReactComponentStackFrame.js +++ b/packages/shared/ReactComponentStackFrame.js @@ -10,10 +10,7 @@ import type {Source} from 'shared/ReactElementType'; import type {LazyComponent} from 'react/src/ReactLazy'; -import { - enableComponentStackLocations, - disableNativeComponentFrames, -} from 'shared/ReactFeatureFlags'; +import {enableComponentStackLocations} from 'shared/ReactFeatureFlags'; import { REACT_SUSPENSE_TYPE, @@ -68,7 +65,7 @@ export function describeNativeComponentFrame( construct: boolean, ): string { // If something asked for a stack inside a fake render, it should get ignored. - if (disableNativeComponentFrames || !fn || reentry) { + if (!fn || reentry) { return ''; } diff --git a/packages/shared/ReactFeatureFlags.js b/packages/shared/ReactFeatureFlags.js index e2eb954817b7a..03a9aa32698c6 100644 --- a/packages/shared/ReactFeatureFlags.js +++ b/packages/shared/ReactFeatureFlags.js @@ -230,8 +230,6 @@ export const enableDebugTracing = false; // Track which Fiber(s) schedule render work. export const enableUpdaterTracking = __PROFILE__; -// Only enabled in RN, related to enableComponentStackLocations -export const disableNativeComponentFrames = false; export const enableServerContext = true; // Internal only. diff --git a/packages/shared/forks/ReactFeatureFlags.native-fb.js b/packages/shared/forks/ReactFeatureFlags.native-fb.js index f2ed0b48ff122..91a88e1432595 100644 --- a/packages/shared/forks/ReactFeatureFlags.native-fb.js +++ b/packages/shared/forks/ReactFeatureFlags.native-fb.js @@ -58,7 +58,6 @@ export const enableClientRenderFallbackOnTextMismatch = true; export const enableComponentStackLocations = false; export const enableLegacyFBSupport = false; export const enableFilterEmptyStringAttributesDOM = false; -export const disableNativeComponentFrames = false; export const skipUnmountedBoundaries = false; export const enableGetInspectorDataForInstanceInProduction = true; export const deferRenderPhaseUpdateToNextBatch = false; diff --git a/packages/shared/forks/ReactFeatureFlags.native-oss.js b/packages/shared/forks/ReactFeatureFlags.native-oss.js index 48a4750f59615..106703103584d 100644 --- a/packages/shared/forks/ReactFeatureFlags.native-oss.js +++ b/packages/shared/forks/ReactFeatureFlags.native-oss.js @@ -48,7 +48,6 @@ export const enableClientRenderFallbackOnTextMismatch = true; export const enableComponentStackLocations = false; export const enableLegacyFBSupport = false; export const enableFilterEmptyStringAttributesDOM = false; -export const disableNativeComponentFrames = false; export const skipUnmountedBoundaries = false; export const enableGetInspectorDataForInstanceInProduction = false; export const deferRenderPhaseUpdateToNextBatch = false; diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.js index e60068f3e1c67..ba3a6de6b6ba8 100644 --- a/packages/shared/forks/ReactFeatureFlags.test-renderer.js +++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.js @@ -48,7 +48,6 @@ export const enableClientRenderFallbackOnTextMismatch = true; export const enableComponentStackLocations = true; export const enableLegacyFBSupport = false; export const enableFilterEmptyStringAttributesDOM = false; -export const disableNativeComponentFrames = false; export const skipUnmountedBoundaries = false; export const enableGetInspectorDataForInstanceInProduction = false; export const deferRenderPhaseUpdateToNextBatch = false; diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.native.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.native.js index 5d94dc871e111..72fbe79a09856 100644 --- a/packages/shared/forks/ReactFeatureFlags.test-renderer.native.js +++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.native.js @@ -39,7 +39,6 @@ export const disableModulePatternComponents = false; export const enableComponentStackLocations = false; export const enableLegacyFBSupport = false; export const enableFilterEmptyStringAttributesDOM = false; -export const disableNativeComponentFrames = false; export const skipUnmountedBoundaries = false; export const enableGetInspectorDataForInstanceInProduction = false; export const deferRenderPhaseUpdateToNextBatch = false; diff --git a/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js b/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js index 7ac9d79271277..16abbea0bc0f5 100644 --- a/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js +++ b/packages/shared/forks/ReactFeatureFlags.test-renderer.www.js @@ -48,7 +48,6 @@ export const enableClientRenderFallbackOnTextMismatch = true; export const enableComponentStackLocations = true; export const enableLegacyFBSupport = false; export const enableFilterEmptyStringAttributesDOM = true; -export const disableNativeComponentFrames = false; export const skipUnmountedBoundaries = false; export const enableGetInspectorDataForInstanceInProduction = false; export const deferRenderPhaseUpdateToNextBatch = false; diff --git a/packages/shared/forks/ReactFeatureFlags.www-dynamic.js b/packages/shared/forks/ReactFeatureFlags.www-dynamic.js index 15d775e750e14..ef76f9129d1b0 100644 --- a/packages/shared/forks/ReactFeatureFlags.www-dynamic.js +++ b/packages/shared/forks/ReactFeatureFlags.www-dynamic.js @@ -59,6 +59,5 @@ export const revertRemovalOfSiblingPrerendering = false; // Update the tests so that they pass in either mode, then set these // to __VARIANT__. export const enableTrustedTypesIntegration = false; -export const disableNativeComponentFrames = false; // You probably *don't* want to add more hardcoded ones. // Instead, try to add them above with the __VARIANT__ value. diff --git a/packages/shared/forks/ReactFeatureFlags.www.js b/packages/shared/forks/ReactFeatureFlags.www.js index 5c4bf8cc3956d..01e4f197ab6bd 100644 --- a/packages/shared/forks/ReactFeatureFlags.www.js +++ b/packages/shared/forks/ReactFeatureFlags.www.js @@ -25,7 +25,6 @@ export const { enableDebugTracing, skipUnmountedBoundaries, enableUseRefAccessWarning, - disableNativeComponentFrames, disableSchedulerTimeoutInWorkLoop, enableLazyContextPropagation, enableUnifiedSyncLane,