expo-dev-menu 5.0.3 → 5.0.5

package/CHANGELOG.md

@@ -10,6 +10,18 @@
 
 ### 💡 Others
 
+## 5.0.5 — 2024-04-24
+
+### 🐛 Bug fixes
+
+- Fixed "Missing transform.routerRoot option in Metro bundling request" error when loading the bundle. ([#28428](https://github.com/expo/expo/pull/28428) by [@kudo](https://github.com/kudo))
+
+## 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._

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'host.exp.exponent'
-version = '5.0.3'
+version = '5.0.5'
 
 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.3'
+    versionName '5.0.5'
   }
 
   buildTypes {

package/android/src/debug/java/expo/modules/devmenu/DevMenuReactHost.kt

@@ -23,6 +23,8 @@ import com.facebook.soloader.SoLoader
 import devmenu.com.th3rdwave.safeareacontext.SafeAreaProviderManager
 import expo.modules.adapters.react.ModuleRegistryAdapter
 import expo.modules.adapters.react.ReactModuleRegistryProvider
+import expo.modules.devmenu.helpers.getPrivateDeclaredFieldValue
+import expo.modules.devmenu.helpers.setPrivateDeclaredFieldValue
 import expo.modules.devmenu.modules.DevMenuInternalModule
 import expo.modules.devmenu.modules.DevMenuPreferences
 import expo.modules.kotlin.ModulesProvider
@@ -55,6 +57,10 @@ object DevMenuReactHost {
     val reactJsExceptionHandler = ReactJsExceptionHandler { _ -> }
     val componentFactory = ComponentFactory()
     DefaultComponentsRegistry.register(componentFactory)
+    var originalDevFlag: Boolean? = null
+    if (!useDeveloperSupport) {
+      originalDevFlag = injectDevFlag(false)
+    }
     val reactHost = ReactHostImpl(
       application,
       defaultReactHostDelegate,
@@ -66,6 +72,9 @@ object DevMenuReactHost {
       .apply {
         jsEngineResolutionAlgorithm = jsResolutionAlgorithm
       }
+    if (originalDevFlag != null) {
+      injectDevFlag(originalDevFlag)
+    }
     if (useDeveloperSupport) {
       injectDevServerSettings(application.applicationContext, reactHost)
     }
@@ -145,4 +154,19 @@ object DevMenuReactHost {
       Log.e(DEV_MENU_TAG, "Couldn't inject DevSettings object.", e)
     }
   }
+
+  /**
+   * TODO: Remove this after React Native 0.74.1
+   */
+  private fun injectDevFlag(devFlag: Boolean): Boolean {
+    val reactHostClass = ReactHostImpl::class.java
+    val originalDevFlag: Boolean =
+      reactHostClass.getPrivateDeclaredFieldValue("DEV", reactHostClass)
+    reactHostClass.setPrivateDeclaredFieldValue(
+      "DEV",
+      reactHostClass,
+      devFlag
+    )
+    return originalDevFlag
+  }
 }

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.3",
+  "version": "5.0.5",
   "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": "ee4f30ef3b5fa567ad1bf94794197f7683fdd481"
+  "gitHead": "8b4cb45563b85c2ec91b1b249d136661bf6e8981"
 }