From a197b3dfcbc34335105f00baff4f70325e414de5 Mon Sep 17 00:00:00 2001 From: Alex Hunt Date: Thu, 6 Mar 2025 11:44:51 -0800 Subject: [PATCH] Scope Network Inspection to the New Architecture Summary: Changelog: [Internal] Differential Revision: D70723808 --- .../react/internal/featureflags/ReactNativeFeatureFlags.kt | 6 +++--- .../ReactCommon/jsinspector-modern/InspectorFlags.cpp | 1 + .../react/featureflags/ReactNativeFeatureFlags.h | 6 +++--- .../scripts/featureflags/ReactNativeFeatureFlags.config.js | 4 ++-- .../src/private/featureflags/ReactNativeFeatureFlags.js | 6 +++--- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlags.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlags.kt index be938525905e..215d0b8cc477 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlags.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlags.kt @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @generated SignedSource<> + * @generated SignedSource<<7385ae14a1980ddefd036ba808459a11>> */ /** @@ -47,7 +47,7 @@ public object ReactNativeFeatureFlags { public fun enableAccumulatedUpdatesInRawPropsAndroid(): Boolean = accessor.enableAccumulatedUpdatesInRawPropsAndroid() /** - * Feature flag to enable the new bridgeless architecture. Note: Enabling this will force enable the following flags: `useTurboModules` & `enableFabricRenderer. + * Feature flag to enable the new bridgeless architecture. Note: Enabling this will force enable the following flags: `useTurboModules` & `enableFabricRenderer`. */ @JvmStatic public fun enableBridgelessArchitecture(): Boolean = accessor.enableBridgelessArchitecture() @@ -203,7 +203,7 @@ public object ReactNativeFeatureFlags { public fun fuseboxEnabledRelease(): Boolean = accessor.fuseboxEnabledRelease() /** - * Enable network inspection support in the React Native DevTools CDP backend. This flag is global and should not be changed across React Host lifetimes. + * Enable network inspection support in the React Native DevTools CDP backend. Requires `enableBridgelessArchitecture`. This flag is global and should not be changed across React Host lifetimes. */ @JvmStatic public fun fuseboxNetworkInspectionEnabled(): Boolean = accessor.fuseboxNetworkInspectionEnabled() diff --git a/packages/react-native/ReactCommon/jsinspector-modern/InspectorFlags.cpp b/packages/react-native/ReactCommon/jsinspector-modern/InspectorFlags.cpp index 3f5a049436a8..485aedaaa43c 100644 --- a/packages/react-native/ReactCommon/jsinspector-modern/InspectorFlags.cpp +++ b/packages/react-native/ReactCommon/jsinspector-modern/InspectorFlags.cpp @@ -63,6 +63,7 @@ const InspectorFlags::Values& InspectorFlags::loadFlagsAndAssertUnchanged() false, #endif .networkInspectionEnabled = + ReactNativeFeatureFlags::enableBridgelessArchitecture() && ReactNativeFeatureFlags::fuseboxNetworkInspectionEnabled(), }; diff --git a/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.h b/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.h index 9ad7f684fbda..c2e42f43934a 100644 --- a/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.h +++ b/packages/react-native/ReactCommon/react/featureflags/ReactNativeFeatureFlags.h @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @generated SignedSource<<40aa48c26d1a64f137e35b402db04091>> + * @generated SignedSource<<4b900e66889d8f2effc015e24ccaf929>> */ /** @@ -55,7 +55,7 @@ class ReactNativeFeatureFlags { RN_EXPORT static bool enableAccumulatedUpdatesInRawPropsAndroid(); /** - * Feature flag to enable the new bridgeless architecture. Note: Enabling this will force enable the following flags: `useTurboModules` & `enableFabricRenderer. + * Feature flag to enable the new bridgeless architecture. Note: Enabling this will force enable the following flags: `useTurboModules` & `enableFabricRenderer`. */ RN_EXPORT static bool enableBridgelessArchitecture(); @@ -185,7 +185,7 @@ class ReactNativeFeatureFlags { RN_EXPORT static bool fuseboxEnabledRelease(); /** - * Enable network inspection support in the React Native DevTools CDP backend. This flag is global and should not be changed across React Host lifetimes. + * Enable network inspection support in the React Native DevTools CDP backend. Requires `enableBridgelessArchitecture`. This flag is global and should not be changed across React Host lifetimes. */ RN_EXPORT static bool fuseboxNetworkInspectionEnabled(); diff --git a/packages/react-native/scripts/featureflags/ReactNativeFeatureFlags.config.js b/packages/react-native/scripts/featureflags/ReactNativeFeatureFlags.config.js index 8ce41b9c2cff..d2e090ec1b1a 100644 --- a/packages/react-native/scripts/featureflags/ReactNativeFeatureFlags.config.js +++ b/packages/react-native/scripts/featureflags/ReactNativeFeatureFlags.config.js @@ -86,7 +86,7 @@ const definitions: FeatureFlagDefinitions = { defaultValue: false, metadata: { description: - 'Feature flag to enable the new bridgeless architecture. Note: Enabling this will force enable the following flags: `useTurboModules` & `enableFabricRenderer.', + 'Feature flag to enable the new bridgeless architecture. Note: Enabling this will force enable the following flags: `useTurboModules` & `enableFabricRenderer`.', expectedReleaseValue: true, purpose: 'release', }, @@ -359,7 +359,7 @@ const definitions: FeatureFlagDefinitions = { metadata: { dateAdded: '2024-01-31', description: - 'Enable network inspection support in the React Native DevTools CDP backend. This flag is global and should not be changed across React Host lifetimes.', + 'Enable network inspection support in the React Native DevTools CDP backend. Requires `enableBridgelessArchitecture`. This flag is global and should not be changed across React Host lifetimes.', expectedReleaseValue: true, purpose: 'experimentation', }, diff --git a/packages/react-native/src/private/featureflags/ReactNativeFeatureFlags.js b/packages/react-native/src/private/featureflags/ReactNativeFeatureFlags.js index 31c844ebd2a5..a876989ea732 100644 --- a/packages/react-native/src/private/featureflags/ReactNativeFeatureFlags.js +++ b/packages/react-native/src/private/featureflags/ReactNativeFeatureFlags.js @@ -4,7 +4,7 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. * - * @generated SignedSource<<3fdb80ad17786b737c1ab000f6c88277>> + * @generated SignedSource<<28bf0120b44887b9cf23eeca6afdd945>> * @flow strict */ @@ -179,7 +179,7 @@ export const disableMountItemReorderingAndroid: Getter = createNativeFl */ export const enableAccumulatedUpdatesInRawPropsAndroid: Getter = createNativeFlagGetter('enableAccumulatedUpdatesInRawPropsAndroid', false); /** - * Feature flag to enable the new bridgeless architecture. Note: Enabling this will force enable the following flags: `useTurboModules` & `enableFabricRenderer. + * Feature flag to enable the new bridgeless architecture. Note: Enabling this will force enable the following flags: `useTurboModules` & `enableFabricRenderer`. */ export const enableBridgelessArchitecture: Getter = createNativeFlagGetter('enableBridgelessArchitecture', false); /** @@ -283,7 +283,7 @@ export const fixMountingCoordinatorReportedPendingTransactionsOnAndroid: Getter< */ export const fuseboxEnabledRelease: Getter = createNativeFlagGetter('fuseboxEnabledRelease', false); /** - * Enable network inspection support in the React Native DevTools CDP backend. This flag is global and should not be changed across React Host lifetimes. + * Enable network inspection support in the React Native DevTools CDP backend. Requires `enableBridgelessArchitecture`. This flag is global and should not be changed across React Host lifetimes. */ export const fuseboxNetworkInspectionEnabled: Getter = createNativeFlagGetter('fuseboxNetworkInspectionEnabled', false); /**