expo-dev-menu 6.0.19 → 6.0.21

package/CHANGELOG.md

@@ -10,6 +10,18 @@
 
 ### 💡 Others
 
+## 6.0.21 — 2025-03-13
+
+### 🐛 Bug fixes
+
+- Fixed compilation error (could not build module 'ReactCodegen') on iOS. ([#35473](https://github.com/expo/expo/pull/35473) by [@lukmccall](https://github.com/lukmccall))
+
+## 6.0.20 — 2025-03-11
+
+### 🐛 Bug fixes
+
+- use custom iOS dependencyProvider ([#35359](https://github.com/expo/expo/pull/35359) by [@vonovak](https://github.com/vonovak))
+
 ## 6.0.19 — 2025-02-06
 
 _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 = '6.0.19'
+version = '6.0.21'
 
 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 '6.0.19'
+    versionName '6.0.21'
   }
 
   buildTypes {

package/expo-dev-menu.podspec

@@ -117,6 +117,10 @@ Pod::Spec.new do |s|
     main.dependency 'ExpoModulesCore'
     main.dependency 'expo-dev-menu-interface'
     main.dependency "expo-dev-menu/Vendored"
+    if reactNativeTargetVersion >= 77
+      # for EXAppDependencyProvider
+      main.dependency 'ReactCodegen'
+    end
   end
 
   s.subspec 'ReactNativeCompatibles' do |ss|

package/ios/DevMenuAppInstance.swift

@@ -1,9 +1,6 @@
 // Copyright 2015-present 650 Industries. All rights reserved.
 
 import React
-#if canImport(ReactAppDependencyProvider)
-import ReactAppDependencyProvider
-#endif
 
 @objc
 class DevMenuAppInstance: DevMenuRCTAppDelegate {
@@ -17,7 +14,7 @@ class DevMenuAppInstance: DevMenuRCTAppDelegate {
 
     super.init()
 #if canImport(ReactAppDependencyProvider)
-	self.dependencyProvider = RCTAppDependencyProvider()
+    self.dependencyProvider = EXAppDependencyProvider()
 #endif
     super.initRootViewFactory()
   }

package/ios/EXAppDependencyProvider.h

@@ -0,0 +1,23 @@
+#import <Foundation/Foundation.h>
+
+#if __has_include(<React-RCTAppDelegate/RCTDependencyProvider.h>)
+#import <React-RCTAppDelegate/RCTDependencyProvider.h>
+#define HAS_RCT_DEPENDENCY_PROVIDER 1
+#elif __has_include(<React_RCTAppDelegate/RCTDependencyProvider.h>)
+#import <React_RCTAppDelegate/RCTDependencyProvider.h>
+#define HAS_RCT_DEPENDENCY_PROVIDER 1
+#else
+#define HAS_RCT_DEPENDENCY_PROVIDER 0
+#endif
+
+NS_ASSUME_NONNULL_BEGIN
+
+#if HAS_RCT_DEPENDENCY_PROVIDER
+@interface EXAppDependencyProvider : NSObject <RCTDependencyProvider>
+#else
+@interface EXAppDependencyProvider : NSObject
+#endif
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/EXAppDependencyProvider.mm

@@ -0,0 +1,35 @@
+// TODO vonovak 3/25 - remove this and replace instantiations with RCTAppDependencyProvider
+// when dispatch_once is removed from https://github.com/facebook/react-native/blob/f5feb73022f9340583ebcf576eaedd3ca5677e1a/packages/react-native/scripts/codegen/templates/RCTAppDependencyProviderMM.template#L51
+// also replace "ReactCodegen" dependency in podspec with RCTAppDependencyProvider
+
+#if __has_include(<React-RCTAppDelegate/RCTDependencyProvider.h>) || __has_include(<React_RCTAppDelegate/RCTDependencyProvider.h>)
+#import <EXDevMenu/EXAppDependencyProvider.h>
+#import <ReactCodegen/RCTModulesConformingToProtocolsProvider.h>
+#import <ReactCodegen/RCTThirdPartyComponentsProvider.h>
+
+@implementation EXAppDependencyProvider {
+  NSArray<NSString *> * _URLRequestHandlerClassNames;
+  NSArray<NSString *> * _imageDataDecoderClassNames;
+  NSArray<NSString *> * _imageURLLoaderClassNames;
+  NSDictionary<NSString *,Class<RCTComponentViewProtocol>> * _thirdPartyFabricComponents;
+}
+
+- (nonnull NSArray<NSString *> *)URLRequestHandlerClassNames {
+  return RCTModulesConformingToProtocolsProvider.URLRequestHandlerClassNames;
+}
+
+- (nonnull NSArray<NSString *> *)imageDataDecoderClassNames {
+  return RCTModulesConformingToProtocolsProvider.imageDataDecoderClassNames;
+}
+
+- (nonnull NSArray<NSString *> *)imageURLLoaderClassNames {
+  return RCTModulesConformingToProtocolsProvider.imageURLLoaderClassNames;;
+}
+
+- (nonnull NSDictionary<NSString *,Class<RCTComponentViewProtocol>> *)thirdPartyFabricComponents {
+  return RCTThirdPartyComponentsProvider.thirdPartyFabricComponents;
+}
+
+@end
+
+#endif

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-dev-menu",
-  "version": "6.0.19",
+  "version": "6.0.21",
   "description": "Expo/React Native module with the developer menu.",
   "main": "build/DevMenu.js",
   "types": "build/DevMenu.d.ts",
@@ -55,9 +55,9 @@
     "@testing-library/jest-native": "^4.0.4",
     "@testing-library/react-native": "^12.5.1",
     "babel-plugin-module-resolver": "^5.0.0",
-    "babel-preset-expo": "~12.0.7",
-    "expo-dev-client-components": "2.0.3",
-    "expo-module-scripts": "^4.0.3",
+    "babel-preset-expo": "~12.0.9",
+    "expo-dev-client-components": "2.0.4",
+    "expo-module-scripts": "^4.0.4",
     "fuse.js": "^6.4.6",
     "react": "18.3.1",
     "react-native": "0.76.7",
@@ -67,5 +67,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "9442f00874e0cd738030abae80e5bdef184a2581"
+  "gitHead": "8884ab74f87add3551675d0d0124d95c5626c57a"
 }