expo-modules-core 1.12.17 → 1.12.19

package/CHANGELOG.md

@@ -10,6 +10,19 @@
 
 ### 💡 Others
 
+## 1.12.19 — 2024-07-11
+
+### 💡 Others
+
+- [iOS] Added `customizeRootView:` support to `EXAppDelegateWrapper.createRCTRootViewFactory`. ([#30245](https://github.com/expo/expo/pull/30245) by [@kudo](https://github.com/kudo))
+
+## 1.12.18 — 2024-06-28
+
+### 🐛 Bug fixes
+
+- Fixed `RCTTriggerReloadCommandListeners` not found build error on iOS. ([#30014](https://github.com/expo/expo/pull/30014) by [@kudo](https://github.com/kudo))
+- Fixed blocking SSE responses from network interceptor on Android. ([#30062](https://github.com/expo/expo/pull/30062) by [@kudo](https://github.com/kudo))
+
 ## 1.12.17 — 2024-06-27
 
 ### 🐛 Bug fixes

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'host.exp.exponent'
-version = '1.12.17'
+version = '1.12.19'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -63,7 +63,7 @@ android {
   defaultConfig {
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "1.12.17"
+    versionName "1.12.19"
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled.toString()
 
     testInstrumentationRunner "expo.modules.TestRunner"

package/android/src/main/java/expo/modules/kotlin/devtools/ExpoNetworkInspectOkHttpInterceptors.kt

@@ -36,7 +36,7 @@ class ExpoNetworkInspectOkHttpNetworkInterceptor : Interceptor {
           it.priorResponse = response
         }
       } else {
-        val body = peekResponseBody(response)
+        val body = if (shouldParseBody(response)) peekResponseBody(response) else null
         delegate.didReceiveResponse(requestId, request, response, body)
         body?.close()
       }
@@ -123,3 +123,27 @@ internal fun peekResponseBody(
   buffer.write(source, minOf(byteCount, source.buffer.size))
   return buffer.asResponseBody(body.contentType(), buffer.size)
 }
+
+internal fun shouldParseBody(response: Response): Boolean {
+  // Check for Content-Type
+  val skipContentTypes = listOf(
+    "text/event-stream", // Server Sent Events
+    "text/x-component", // React Server Components
+    "audio", // Media might be streaming and not inspectable in DevTools
+    "video" // Media might be streaming and not inspectable in DevTools
+  )
+  val contentType = response.header("Content-Type") ?: ""
+  if (skipContentTypes.any { contentType.startsWith(it) }) {
+    return false
+  }
+
+  // HTTP 1.1 chunked encoding
+  val transferEncoding = response.header("Transfer-Encoding")
+  if ("chunked".equals(transferEncoding, ignoreCase = true)) {
+    return false
+  }
+
+  // If Content-Length is known to exceed the limit
+  val contentLength = response.header("Content-Length")?.toLong() ?: -1
+  return contentLength < 1 || contentLength <= ExpoNetworkInspectOkHttpNetworkInterceptor.MAX_BODY_SIZE
+}

package/ios/AppDelegates/EXAppDelegateWrapper.mm

@@ -17,6 +17,12 @@
 @interface RCTAppDelegate () <RCTTurboModuleManagerDelegate>
 @end
 
+@interface RCTRootViewFactoryConfiguration ()
+
+- (void)setCustomizeRootView:(void (^)(UIView *rootView))customizeRootView;
+
+@end
+
 @interface EXAppDelegateWrapper()
 
 @property (nonatomic, strong) EXReactDelegateWrapper *reactDelegate;
@@ -73,13 +79,18 @@
 
 - (RCTRootViewFactory *)createRCTRootViewFactory
 {
+  __weak __typeof(self) weakSelf = self;
+  RCTBundleURLBlock bundleUrlBlock = ^{
+    RCTAppDelegate *strongSelf = weakSelf;
+    return strongSelf.bundleURL;
+  };
+
   RCTRootViewFactoryConfiguration *configuration =
-      [[RCTRootViewFactoryConfiguration alloc] initWithBundleURL:self.bundleURL
-                                                  newArchEnabled:self.fabricEnabled
-                                              turboModuleEnabled:self.turboModuleEnabled
-                                               bridgelessEnabled:self.bridgelessEnabled];
+      [[RCTRootViewFactoryConfiguration alloc] initWithBundleURLBlock:bundleUrlBlock
+                                                       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];
@@ -90,6 +101,13 @@
     return [weakSelf createBridgeWithDelegate:delegate launchOptions:launchOptions];
   };
 
+  // TODO(kudo,20240706): Remove respondsToSelector and set the property directly when we upgrade to react-native 0.75
+  if ([configuration respondsToSelector:@selector(setCustomizeRootView:)]) {
+    [configuration setCustomizeRootView:^(UIView *_Nonnull rootView) {
+      [weakSelf customizeRootView:(RCTRootView *)rootView];
+    }];
+  }
+
   return [[EXReactRootViewFactory alloc] initWithReactDelegate:self.reactDelegate configuration:configuration turboModuleManagerDelegate:self];
 }
 

package/ios/Core/Modules/CoreModule.swift

@@ -1,3 +1,7 @@
+// Copyright 2015-present 650 Industries. All rights reserved.
+
+import React
+
 // The core module that describes the `global.expo` object.
 internal final class CoreModule: Module {
   internal func definition() -> ModuleDefinition {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "1.12.17",
+  "version": "1.12.19",
   "description": "The core of Expo Modules architecture",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -44,5 +44,5 @@
     "@testing-library/react-hooks": "^7.0.1",
     "expo-module-scripts": "^3.0.0"
   },
-  "gitHead": "09b2d97bbc0f70f7c811ff9b6c9ad8808c5ad84b"
+  "gitHead": "f83423bebc947ad7e328daaa56b2e327912ae580"
 }