expo-dev-menu 5.0.2 → 5.0.4

package/CHANGELOG.md

@@ -10,6 +10,16 @@
 
 ### 💡 Others
 
+## 5.0.4 — 2024-04-24
+
+### 🐛 Bug fixes
+
+- [iOS] Fix JS Debugger not using the correct app target. ([#28373](https://github.com/expo/expo/pull/28373) by [@gabrieldonadel](https://github.com/gabrieldonadel))
+
+## 5.0.3 — 2024-04-23
+
+_This version does not introduce any user-facing changes._
+
 ## 5.0.2 — 2024-04-22
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'host.exp.exponent'
-version = '5.0.2'
+version = '5.0.4'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -20,7 +20,7 @@ android {
   namespace "expo.modules.devmenu"
   defaultConfig {
     versionCode 10
-    versionName '5.0.2'
+    versionName '5.0.4'
   }
 
   buildTypes {

package/ios/DevClientRootViewFactory.h

@@ -0,0 +1,18 @@
+  // Copyright 2018-present 650 Industries. All rights reserved.
+
+#pragma once
+
+#if __has_include(<React-RCTAppDelegate/RCTRootViewFactory.h>)
+#import <React-RCTAppDelegate/RCTRootViewFactory.h>
+#elif __has_include(<React_RCTAppDelegate/RCTRootViewFactory.h>)
+// for importing the header from framework, the dash will be transformed to underscore
+#import <React_RCTAppDelegate/RCTRootViewFactory.h>
+#endif
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface DevClientRootViewFactory : RCTRootViewFactory
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/DevClientRootViewFactory.mm

@@ -0,0 +1,51 @@
+// Copyright 2018-present 650 Industries. All rights reserved.
+
+#import "DevClientRootViewFactory.h"
+
+#if __has_include(<React-RCTAppDelegate/RCTAppDelegate.h>)
+#import <React-RCTAppDelegate/RCTAppDelegate.h>
+#elif __has_include(<React_RCTAppDelegate/RCTAppDelegate.h>)
+// for importing the header from framework, the dash will be transformed to underscore
+#import <React_RCTAppDelegate/RCTAppDelegate.h>
+#endif
+#if __has_include(<reacthermes/HermesExecutorFactory.h>)
+#import <reacthermes/HermesExecutorFactory.h>
+#endif
+
+#import <React/RCTCxxBridgeDelegate.h>
+#import <react/renderer/runtimescheduler/RuntimeScheduler.h>
+#import <react/renderer/runtimescheduler/RuntimeSchedulerCallInvoker.h>
+
+@interface RCTRootViewFactory () <RCTCxxBridgeDelegate> {
+  std::shared_ptr<facebook::react::RuntimeScheduler> _runtimeScheduler;
+}
+@end
+
+@implementation DevClientRootViewFactory
+
+- (void)createBridgeIfNeeded:(NSDictionary *)launchOptions
+{
+  if (self.bridge != nil) {
+    return;
+  }
+
+  self.bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
+}
+
+#pragma mark - RCTCxxBridgeDelegate
+- (std::unique_ptr<facebook::react::JSExecutorFactory>)jsExecutorFactoryForBridge:(RCTBridge *)bridge
+{
+  std::unique_ptr<facebook::react::JSExecutorFactory> executorFactory  = [super jsExecutorFactoryForBridge:bridge];
+
+#if __has_include(<reacthermes/HermesExecutorFactory.h>)
+  auto rawExecutorFactory = executorFactory.get();
+  auto hermesExecFactory = dynamic_cast<facebook::react::HermesExecutorFactory*>(rawExecutorFactory);
+  if (hermesExecFactory != nullptr) {
+    hermesExecFactory->setEnableDebugger(false);
+  }
+#endif
+
+  return executorFactory;
+}
+
+@end

package/ios/DevMenuRCTBridge.mm

@@ -123,9 +123,6 @@
 
 @interface DevClientAppDelegate (DevMenuRCTAppDelegate)
 
-#ifdef __cplusplus
-- (std::unique_ptr<facebook::react::JSExecutorFactory>)jsExecutorFactoryForBridge:(RCTBridge *)bridge;
-#endif
 @end
 
 @implementation DevMenuRCTAppDelegate
@@ -136,20 +133,4 @@
   return [[DevMenuRCTBridge alloc] initWithDelegate:delegate launchOptions:launchOptions];
 }
 
-#pragma mark - RCTCxxBridgeDelegate
-- (std::unique_ptr<facebook::react::JSExecutorFactory>)jsExecutorFactoryForBridge:(RCTBridge *)bridge
-{
-    std::unique_ptr<facebook::react::JSExecutorFactory> executorFactory  = [super jsExecutorFactoryForBridge:bridge];
-
-    #if __has_include(<reacthermes/HermesExecutorFactory.h>)
-        auto rawExecutorFactory = executorFactory.get();
-        auto hermesExecFactory = dynamic_cast<facebook::react::HermesExecutorFactory*>(rawExecutorFactory);
-        if (hermesExecFactory != nullptr) {
-            hermesExecFactory->setEnableDebugger(false);
-        }
-    #endif
-
-    return executorFactory;
-}
-
 @end

package/ios/EXDevMenuDevSettings.swift

@@ -35,9 +35,7 @@ class EXDevMenuDevSettings: NSObject {
       devSettings["isRemoteDebuggingAvailable"] = bridgeSettings.isRemoteDebuggingAvailable
       devSettings["isHotLoadingAvailable"] = bridgeSettings.isHotLoadingAvailable
       devSettings["isPerfMonitorAvailable"] = isPerfMonitorAvailable
-
-      // bridge mode has the `bridge.batched` and the bridgeless mode references the later.
-      devSettings["isJSInspectorAvailable"] = bridge.batched?.isInspectable ?? bridge.isInspectable
+      devSettings["isJSInspectorAvailable"] = bridgeSettings.isDeviceDebuggingAvailable
 
       let isElementInspectorAvailable = manager.currentManifest?.isDevelopmentMode()
       devSettings["isElementInspectorAvailable"] = isElementInspectorAvailable

package/ios/ReactNativeCompatibles/ReactNative/DevClientAppDelegate.mm

@@ -1,4 +1,5 @@
 #import <EXDevMenu/DevClientAppDelegate.h>
+#import <EXDevMenu/DevClientRootViewFactory.h>
 
 #import <React/RCTBundleURLProvider.h>
 #import <React/RCTCxxBridgeDelegate.h>
@@ -28,12 +29,31 @@
 
 @interface RCTAppDelegate () <RCTComponentViewFactoryComponentProvider, RCTTurboModuleManagerDelegate>
 
-- (RCTRootViewFactory *)createRCTRootViewFactory;
-
 @end
 
 @implementation DevClientAppDelegate
 
+- (RCTRootViewFactory *)createRCTRootViewFactory
+{
+  RCTRootViewFactoryConfiguration *configuration =
+  [[RCTRootViewFactoryConfiguration alloc] initWithBundleURL:self.bundleURL
+                                              newArchEnabled:self.fabricEnabled
+                                          turboModuleEnabled:self.turboModuleEnabled
+                                           bridgelessEnabled:self.bridgelessEnabled];
+
+  __weak __typeof(self) weakSelf = self;
+  configuration.createRootViewWithBridge = ^UIView *(RCTBridge *bridge, NSString *moduleName, NSDictionary *initProps)
+  {
+    return [weakSelf createRootViewWithBridge:bridge moduleName:moduleName initProps:initProps];
+  };
+
+  configuration.createBridgeWithDelegate = ^RCTBridge *(id<RCTBridgeDelegate> bridge, NSDictionary *launchOptions)
+  {
+    return [weakSelf createBridgeWithDelegate:bridge launchOptions:launchOptions];
+  };
+
+  return [[DevClientRootViewFactory alloc] initWithConfiguration:configuration andTurboModuleManagerDelegate:self];
+}
 
 - (void)initRootViewFactory {
   RCTSetNewArchEnabled([self newArchEnabled]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-dev-menu",
-  "version": "5.0.2",
+  "version": "5.0.4",
   "description": "Expo/React Native module with the developer menu.",
   "main": "build/DevMenu.js",
   "types": "build/DevMenu.d.ts",
@@ -70,5 +70,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "0897aeadb926491a457bcd67d83360956994ee82"
+  "gitHead": "f8f9d041c6467f325b58c7913e0f5ed1af102e11"
 }