hide behind RCT_DEV_MENU

Author: coado

packages/react-native/React/Base/RCTBundleURLProvider.mm

@@ -18,7 +18,7 @@
 
 const NSUInteger kRCTBundleURLProviderDefaultPort = RCT_METRO_PORT;
 
-#if RCT_DEV_MENU | RCT_PACKAGER_LOADING_FUNCTIONALITY
+#if RCT_DEV | RCT_PACKAGER_LOADING_FUNCTIONALITY
 static BOOL kRCTAllowPackagerAccess = YES;
 void RCTBundleURLProviderAllowPackagerServerAccess(BOOL allowed)
 {
@@ -78,7 +78,7 @@ - (void)resetToDefaults
                                                          (unsigned long)kRCTBundleURLProviderDefaultPort]];
 }
 
-#if RCT_DEV_MENU | RCT_PACKAGER_LOADING_FUNCTIONALITY
+#if RCT_DEV | RCT_PACKAGER_LOADING_FUNCTIONALITY
 + (BOOL)isPackagerRunning:(NSString *)hostPort
 {
   return [RCTBundleURLProvider isPackagerRunning:hostPort scheme:nil];
@@ -155,14 +155,14 @@ - (NSString *)packagerServerHost
 
 - (NSString *)packagerServerHostPort
 {
-#if RCT_DEV_MENU | RCT_PACKAGER_LOADING_FUNCTIONALITY
+#if RCT_DEV | RCT_PACKAGER_LOADING_FUNCTIONALITY
   if (!kRCTAllowPackagerAccess) {
     RCTLogInfo(@"Packager server access is disabled in this environment");
     return nil;
   }
 #endif
   NSString *location = [self jsLocation];
-#if RCT_DEV_MENU
+#if RCT_DEV
   NSString *scheme = [self packagerScheme];
   if ([location length] && ![RCTBundleURLProvider isPackagerRunning:location scheme:scheme]) {
     location = nil;

packages/react-native/React/Base/RCTDevMenuConfigurationDecorator.h

@@ -8,8 +8,14 @@
 #import <React/RCTDevMenu.h>
 
 @interface RCTDevMenuConfigurationDecorator : NSObject
+
+#if RCT_DEV_MENU
+
 @property (nonatomic, strong, readonly) RCTDevMenuConfiguration *devMenuConfiguration;
 
-- (instancetype)initWithDevMenuConfiguration:(RCTDevMenuConfiguration *)devMenuConfiguration;
+- (instancetype)initWithDevMenuConfiguration:(RCTDevMenuConfiguration *__nullable)devMenuConfiguration;
 - (void)decorate:(RCTDevMenu *)devMenuModule;
+
+#endif
+
 @end

packages/react-native/React/Base/RCTDevMenuConfigurationDecorator.mm

@@ -6,6 +6,9 @@
  */
 
 #import <RCTDevMenuConfigurationDecorator.h>
+
+#if RCT_DEV_MENU
+
 #import <React/RCTDevSettings.h>
 
 @implementation RCTDevMenuConfigurationDecorator
@@ -41,3 +44,13 @@ - (void)decorate:(id<RCTBridgeModule>)bridgeModule
 }
 
 @end
+
+#else
+
+@implementation RCTDevMenuConfigurationDecorator : NSObject
+
+@end
+
+#endif
+
+

packages/react-native/React/CoreModules/RCTDevMenu.h

@@ -12,24 +12,26 @@
 #import <React/RCTBridgeProxy.h>
 #import <React/RCTDefines.h>
 
-#if RCT_DEV_MENU
-
 RCT_EXTERN NSString *const RCTShowDevMenuNotification;
 
-#endif
+@interface RCTDevMenuConfiguration : NSObject
 
-@class RCTDevMenuItem;
+#if RCT_DEV_MENU
 
-@interface RCTDevMenuConfiguration : NSObject
 @property (nonatomic, readonly) BOOL isDevMenuEnabled;
 @property (nonatomic, readonly) BOOL isShakeGestureEnabled;
 @property (nonatomic, readonly) BOOL areKeyboardShortcutsEnabled;
 
 - (instancetype)initWithDevMenuEnabled:(BOOL)isDevMenuEnabled
                    shakeGestureEnabled:(BOOL)isShakeGestureEnabled
               keyboardShortcutsEnabled:(BOOL)areKeyboardShortcutsEnabled;
+
+#endif
+
 @end
 
+@class RCTDevMenuItem;
+
 /**
  * Developer menu, useful for exposing extra functionality when debugging.
  */

packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleManager.mm

@@ -775,9 +775,13 @@ - (BOOL)_shouldCreateObjCModule:(Class)moduleClass
   if ([module respondsToSelector:@selector(initialize)]) {
     [(id<RCTInitializing>)module initialize];
   }
+  
+#if RCT_DEV_MENU
 
   [_devMenuConfigurationDecorator decorate:module];
 
+#endif
+
   /**
    * Attach method queue to id<RCTBridgeModule> object.
    * This is necessary because the id<RCTBridgeModule> object can be eagerly created/initialized before the method

packages/react-native/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTInstance.mm

@@ -150,7 +150,11 @@ - (instancetype)initWithDelegate:(id<RCTInstanceDelegate>)delegate
                                                                       bundleManager:bundleManager
                                                                   callableJSModules:[RCTCallableJSModules new]];
     _devMenuConfigurationDecorator =
+#if RCT_DEV_MENU
         [[RCTDevMenuConfigurationDecorator alloc] initWithDevMenuConfiguration:devMenuConfiguration];
+#else
+        nil;
+#endif
 
     _parentInspectorTarget = parentInspectorTarget;
     {
@@ -333,7 +337,7 @@ - (void)_start
                                                      bridgeModuleDecorator:_bridgeModuleDecorator
                                                                   delegate:self
                                                                  jsInvoker:jsCallInvoker
-                                                      devMenuConfigurationDecorator:_devMenuConfigurationDecorator];
+                                             devMenuConfigurationDecorator:_devMenuConfigurationDecorator];
 
 #if RCT_DEV
   /**

packages/rn-tester/Podfile.lock

@@ -2711,83 +2711,83 @@ SPEC CHECKSUMS:
   boost: 7e761d76ca2ce687f7cc98e698152abd03a18f90
   DoubleConversion: cb417026b2400c8f53ae97020b2be961b59470cb
   fast_float: b32c788ed9c6a8c584d114d0047beda9664e7cc6
-  FBLazyVector: 6a267bebd9b180b5081e5729fa276d98bcc8f30e
+  FBLazyVector: 2d105abf51f88d8e8917ff79754d83caac0cecf2
   fmt: a40bb5bd0294ea969aaaba240a927bd33d878cdd
   glog: 5683914934d5b6e4240e497e0f4a3b42d1854183
-  hermes-engine: ce9fa290c24402d914bacc05a5825d13564bbba5
+  hermes-engine: 16f20c324118032dd4c670ac6281b0ba438346f5
   MyNativeView: 26b517931cc8bfc7b602c410572b323348185461
   NativeCxxModuleExample: 6a9788a749d522f8b6cc55a56f4760a670e4e2eb
   OCMock: 589f2c84dacb1f5aaf6e4cec1f292551fe748e74
   RCT-Folly: 846fda9475e61ec7bcbf8a3fe81edfcaeb090669
   RCTDeprecation: 3808e36294137f9ee5668f4df2e73dc079cd1dcf
-  RCTRequired: 25f36254fda4b8c4bae9150e94a436d9539616bd
-  RCTTypeSafety: 6647ba3ae636c343bfe9c949884021522c080e8f
-  React: 7a9247e243cd3e3a7efbd0e89e167099081ce3ad
-  React-callinvoker: 56c8f17c0d3bee7ef30ea1ff529de4eafd0d5192
-  React-Core: d068f65ed510749a38b3fefdbed02e5a321eaa56
-  React-CoreModules: a3a331da7b7bb8864fd89ff517fe8c8db3784fd0
-  React-cxxreact: 16475fea3440ff06613345b1a5ac3971958f4e3f
-  React-debug: a9520e962d55285b3add02b615481d1b4be9c970
-  React-defaultsnativemodule: c172fed001657e1a21a55135a73b3f5f1c67c353
-  React-domnativemodule: dd2a5d10eec1bd424b154fe4a4dd1621036f83ba
-  React-Fabric: 3ec58c2997bc84f286c823cdf169d9a72a6c3b8f
-  React-FabricComponents: 85bf5526f6181f5592b654968b77ab7f4333c723
-  React-FabricImage: 5918e6188782c1ea9425a62986e61036d6ebd871
-  React-featureflags: f7cda0b11eee1be2e28344da0e3a3e80e3b6c1d1
-  React-featureflagsnativemodule: 0df4e2824c4f3f68b90ccdb137e79ca5d85bb702
-  React-graphics: a94947c1456c0cac7c65c6bde045d72369cfe62b
-  React-hermes: 7d8e9420cf7f468d16bae2dfd88967b8571d3161
-  React-idlecallbacksnativemodule: a442278daec791633e6b11465f18e51541fcaabc
-  React-ImageManager: e2adae0e6d15e4e87d6c0fe9a11faab6a1e7eef7
-  React-jserrorhandler: 1b270dd5881a518f40fcd7187b6a9b582a98ab0e
-  React-jsi: 40f9fd474433f6435f0e36c8fdc5a83a7e4d7b68
-  React-jsiexecutor: e449f20d90e4ed5e8504f71a3a39b77b41f6999b
-  React-jsinspector: 18218a060cfda107864a93430a2b24351e4afe8c
-  React-jsinspectorcdp: cead7b71bb780de5008e7d96fcafee068b3fd348
-  React-jsinspectornetwork: d843968bf116c79c568c9a7a73837e1d2ef7eb47
-  React-jsinspectortracing: 102ca0121a244830a259080e0372e8c3833622e5
-  React-jsitooling: 9be82221fa733e56dd56e97ac9bc8a7f3c2f5ca4
-  React-jsitracing: 10a7310f429e4075550634e9b8aa4dc9e59c1188
-  React-logger: 79f2690a555b612a129214e4ebe748ca9a70a13d
-  React-Mapbuffer: 5a4e1b741cd4c26ffb49944ac7ceeb1b649f0417
-  React-microtasksnativemodule: b7293239751b662b5e960769c263e04a46ec1956
-  React-NativeModulesApple: 6469ecb75ae9b0e07ca012d86c79697aefd6dd3f
-  React-oscompat: 7c5e21ee2a2ff315db78ecf6b8ff192bbfe8666b
-  React-perflogger: 3145fce8c71efc34b19db6fff8c299097592b20c
-  React-performancecdpmetrics: e393ce1b696c92b554c5588ab6e2c06f6fcd1e61
-  React-performancetimeline: 80453aee852d2cb49a5107900444b6e1af684188
-  React-RCTActionSheet: 8a26cb169cd50a6e7f4505c25ebcde4b765f5da3
-  React-RCTAnimation: 62c7bd807f1a7c0c0cc4661016e3c407010d60ca
-  React-RCTAppDelegate: 4fa49ba4c428c9695e1d57df0f3d89f8fc56eab7
-  React-RCTBlob: 797a94b668c7a27ae8a62fe9b698802ee6455783
-  React-RCTFabric: 9f839606dcb2439b48cd119e3e0f6bf867433382
-  React-RCTFBReactNativeSpec: b33ee2eb346f227fb7b9c64295c1b7f3d8e22085
-  React-RCTImage: f2c1da5758e94966ed16e337d5c89033e8d1dffb
-  React-RCTLinking: a4bba1ead6ddc5f6d7c64258729de12d2ca61b6a
-  React-RCTNetwork: f2734351a8cb42dfb3b6af7f1552625751b11647
-  React-RCTPushNotification: 43402603aa79b53b6a18a1e06bd13c29d62f582d
-  React-RCTRuntime: 5fa86323bf710f7ef6b939adb34b30be9f64880b
-  React-RCTSettings: eea79a596667f265fd3e9242c0b8235b04847a6e
-  React-RCTTest: 7342a5a223471d06cbd7c7dc6aacd5da273ff5e8
-  React-RCTText: d2adf2b79a23728cfcc5c8c8ddf76b4e8c50e911
-  React-RCTVibration: 89b754b3fd5f769b069e41e922343c02d6e12e7e
-  React-rendererconsistency: 7b3ed8131484973af6e08added4bb62511fddd66
-  React-renderercss: 84cc7009889ee9afe1791a705488dc225ab9d1a2
-  React-rendererdebug: 0060360a847f9a242aaccc22c515ebec371222a4
-  React-RuntimeApple: 5181619c7e83c0f4e63c6e4645ab332ff7047412
-  React-RuntimeCore: 4f4664b98969b84396799ba7c36443ec09c2d88b
-  React-runtimeexecutor: d4af7701d140cdda71654d5e2b85407fc4f24a30
-  React-RuntimeHermes: 10ab3c4eec51f5397d7baae48aa07b85c5df8603
-  React-runtimescheduler: eb87205c0410d33383603c8a4ffffdc73816d4f2
-  React-timing: 48686abe9648d83d03ea817a5b56b9b86151c6ca
-  React-utils: f38235dde9f55bda59699c8000403e4f21ed028f
-  ReactAppDependencyProvider: 1ec1a5c94f8cd596060e04c7340ccf6d4c8b41c7
+  RCTRequired: 0b98559c6d8d0e7fea7238731360843e2d8fa649
+  RCTTypeSafety: 3c661d128275407c85a9e852562986b0e16239bb
+  React: 414ff4a29e32a5ff84e437beb4747b0dd0faa1e9
+  React-callinvoker: 52c4f39441b1822efe685d3df77cd80b2cbce6be
+  React-Core: 46db2856c7b771261fd63e6f6c1c1cfe8e736372
+  React-CoreModules: 12250d540f179d9f369ef7d5e3a8c86d164c39d9
+  React-cxxreact: 395f1419b89831fbea52d2a36e6d3b2fb860a964
+  React-debug: 90d00df81936f49bfb9e6a44db52d8b7c9a40cf6
+  React-defaultsnativemodule: fb5267d0dab077f719d1b18cf8b7c49c58c1c35b
+  React-domnativemodule: 3d7cc2d7d00c81f75c23d3331d17b21fa6faeca0
+  React-Fabric: 9b3d05700948408d7a85e671f5bd91c8594f476b
+  React-FabricComponents: 9007703eacce007aaa1f0ba2cb58d4988ccf0b6a
+  React-FabricImage: 6a111877ddce3d1fdd61687f6ff71dee478187d3
+  React-featureflags: ed41e376ea39a50b01d8fe2c11d5482bffbef6b2
+  React-featureflagsnativemodule: 3834daf9ed3884ab3365d101b9d7c6fac087d4f7
+  React-graphics: 4fbee81fffc73081cb23e2c809646e913bf48515
+  React-hermes: 61173f509d7dcd78d1b3accf04b129753f46f5aa
+  React-idlecallbacksnativemodule: 1555a8160a9b83d69494b196c4898559b5819fa7
+  React-ImageManager: b9a9be45cbae631e9040a12830aa928a303e1553
+  React-jserrorhandler: fd7f615063616def86265d9cfb110bc3afb20ba0
+  React-jsi: 0c8532666a4a19d66182a4445d18ec0f0c24b38f
+  React-jsiexecutor: 5716536dd6f9b048828845d9d9a7106b62569cf3
+  React-jsinspector: d9de5de285133edafd0d416fd647f3dbbcb37c01
+  React-jsinspectorcdp: 4e1c669c9ae275293a7056311fa82d0200680be0
+  React-jsinspectornetwork: f2afdb0535af11fa40361be2d71a602381385123
+  React-jsinspectortracing: 76a8942c14bf53926b26f3d6ce7d8632c4207f33
+  React-jsitooling: 3db6c89cf1de6308fa9b00a3bb6174a1f36ed936
+  React-jsitracing: d1e537559cf9ca12a1db16dc9f937f6abe33d660
+  React-logger: 9a653c5addbdc26cff344aeae2609dcac18be2e1
+  React-Mapbuffer: b8317e64d87f91a9d5aefd763c56d64647b2d3af
+  React-microtasksnativemodule: 4b7ee46a4aea78c9d3a9860171a6afb068e58db4
+  React-NativeModulesApple: 113a286dcb74949aba50d703bb321fd5bad03883
+  React-oscompat: 1d2cec6dd16180f599c87e576909894bc9167cd5
+  React-perflogger: 46d045d9de38cec29e7fe5a48aba665cda877154
+  React-performancecdpmetrics: 483a43f957ec296de820622a1c920f9e2c34cbe4
+  React-performancetimeline: f4ec50e0be083145e86d975b8d92fe65a660058b
+  React-RCTActionSheet: 9f65b77d35d727e74165a6a9fa14dc8bdf1a54e1
+  React-RCTAnimation: 3647b33256b58c0d29a17ea4fefe6d287cf31f4e
+  React-RCTAppDelegate: 3273ead812ebaddda0ee364e94317901fc52343a
+  React-RCTBlob: 72b5e95e99c22dd713ffef2dc9778c3f4df9f9fa
+  React-RCTFabric: 2f421242ceb4c926bb1a38dff343ae253ce8d4c1
+  React-RCTFBReactNativeSpec: 9818f31466be15964fd4c0a536a71ef3cb8b9abe
+  React-RCTImage: a30a56f2f45f5d2e1123b465c510c36a2910a67c
+  React-RCTLinking: 0928900f0f9d84bcb30fc9e4eee415d288c08714
+  React-RCTNetwork: 7bbe4932019cf5530f7407e356f7d09c337923bb
+  React-RCTPushNotification: b2cde0d2962b7352fb2429e8b4ebf8e5a4c6761b
+  React-RCTRuntime: 6190f62d39e6794583d6b5e215061dc9171e60dd
+  React-RCTSettings: 178dfde7f40e437d3eef8abe980ee9967b1e2146
+  React-RCTTest: 344c9ea4c2dae1a3bf363ca978e18965250bec1e
+  React-RCTText: c21dff6c22c15afbaca95df9a0addcf447bbd2dc
+  React-RCTVibration: 39c2aaf4f76eb884fce0a0278ce4f72e3ce9b266
+  React-rendererconsistency: 51d6aba40184896668a61bda60f7e9599b414a02
+  React-renderercss: 216e3f37e364dfc879b689a4d4fc4c6c9a23d252
+  React-rendererdebug: e2b6133a69d35e2c582e50a3dae5ba311f1ad060
+  React-RuntimeApple: e7e716635b24e466b3cbba6f51cfc54cd20148b5
+  React-RuntimeCore: 65f6cad5d8b74ae1dbe8432ff155ab57dca3500e
+  React-runtimeexecutor: 6fb49a99b7939094990297eebbf054fbbbef611a
+  React-RuntimeHermes: 60cba0c0b5303389606b7211e9dc92a83363ef4e
+  React-runtimescheduler: 78435ccb92e7986ef77baa3fbacf03fd682d8c0a
+  React-timing: af6dbf22aa4e009cf193f21baa6ecc9400f1fd4b
+  React-utils: 6df0bded87e8dc5fc46e9ec4455dbb92c5a09a7e
+  ReactAppDependencyProvider: e70043af3b91778bda44281f8e3064846011640e
   ReactCodegen: 5a2d9dbe44f2b16e06cbe68d2215d71776ae5c8b
-  ReactCommon: fdfb78bbe4fc6d22633e157584284c8cec3f3607
-  ReactCommon-Samples: 96816262c4196d20d061011da3534e7b9a4ada90
+  ReactCommon: 0719018d963dccecd0044dc98f5e17bbe7c09740
+  ReactCommon-Samples: 93117c38e925bd281cda322931f96348262e5af8
   ScreenshotManager: 370045f403c555760ae26d85a01dda89d257fa7b
   SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
-  Yoga: d88003b641719d7fa37c841e838af1efddb742dc
+  Yoga: 074be093e7680cf5122ad47abf6a9786a17c0545
 
 PODFILE CHECKSUM: 995beda3236c2c76801e7a4efc7fedcd390220e6