react-native-tvos 0.87.1-0 → 0.88.0-0rc2

package/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.kt

@@ -10,8 +10,13 @@
 
 package com.facebook.react.modules.network
 
+import android.content.Context
+import android.content.pm.ApplicationInfo
+import android.content.pm.PackageInfo
+import android.content.pm.PackageManager
 import android.net.Uri
 import android.util.Base64
+import androidx.annotation.VisibleForTesting
 import com.facebook.common.logging.FLog
 import com.facebook.fbreact.specs.NativeNetworkingAndroidSpec
 import com.facebook.react.bridge.ReactApplicationContext
@@ -114,13 +119,18 @@ public class NetworkingModule(
         } else {
           null
         }
-    this.defaultUserAgent = defaultUserAgent
+    val resolvedUserAgent =
+        defaultUserAgent ?: createDefaultUserAgent(reactContext.applicationContext ?: reactContext)
+    this.defaultUserAgent = resolvedUserAgent
   }
 
   /**
    * @param context the ReactContext of the application
    * @param defaultUserAgent the User-Agent header that will be set for all requests where the
-   *   caller does not provide one explicitly
+   *   caller (JS) does not provide one explicitly. When `null`, a default is derived from the
+   *   application's label and version name (`AppName/versionName`). If neither the label nor the
+   *   package name can be resolved (e.g. no PackageManager), no default User-Agent is applied and
+   *   requests are sent without one unless JS supplies the header.
    * @param client the [OkHttpClient] to be used for networking
    */
   internal constructor(
@@ -131,7 +141,7 @@ public class NetworkingModule(
 
   /** @param context the ReactContext of the application */
   public constructor(
-      context: ReactApplicationContext
+      context: ReactApplicationContext,
   ) : this(context, null, OkHttpClientProvider.createClient(context.applicationContext), null)
 
   /**
@@ -152,7 +162,9 @@ public class NetworkingModule(
   /**
    * @param context the ReactContext of the application
    * @param defaultUserAgent the User-Agent header that will be set for all requests where the
-   *   caller does not provide one explicitly
+   *   caller (JS) does not provide one explicitly. When `null`, a default is derived from the
+   *   application's label and version name; see the [NetworkingModule] constructor taking a
+   *   `client` for the full null/fallback behavior.
    */
   public constructor(
       context: ReactApplicationContext,
@@ -166,7 +178,7 @@ public class NetworkingModule(
 
   @Deprecated(
       """To be removed in a future release. See
-        https://github.com/facebook/react-native/pull/37798#pullrequestreview-1518338914"""
+        https://github.com/facebook/react-native/pull/37798#pullrequestreview-1518338914""",
   )
   public interface CustomClientBuilder : com.facebook.react.modules.network.CustomClientBuilder
 
@@ -378,33 +390,32 @@ public class NetworkingModule(
       clientBuilder.addNetworkInterceptor { chain ->
         val originalResponse = chain.proceed(chain.request())
         val originalResponseBody = checkNotNull(originalResponse.body())
-        val responseBody =
-            ProgressResponseBody(
-                originalResponseBody,
-                object : ProgressListener {
-                  var last: Long = System.nanoTime()
-
-                  override fun onProgress(bytesWritten: Long, contentLength: Long, done: Boolean) {
-                    val now = System.nanoTime()
-                    if (!done && !shouldDispatch(now, last)) {
-                      return
-                    }
-                    if (responseType == "text") {
-                      // For 'text' responses we continuously send response data with progress
-                      // info to
-                      // JS below, so no need to do anything here.
-                      return
-                    }
-                    NetworkEventUtil.onDataReceivedProgress(
-                        reactApplicationContext,
-                        requestId,
-                        bytesWritten,
-                        contentLength,
-                    )
-                    last = now
-                  }
-                },
-            )
+        val responseBody = ProgressResponseBody(
+            originalResponseBody,
+            object : ProgressListener {
+              var last: Long = System.nanoTime()
+
+              override fun onProgress(bytesWritten: Long, contentLength: Long, done: Boolean) {
+                val now = System.nanoTime()
+                if (!done && !shouldDispatch(now, last)) {
+                  return
+                }
+                if (responseType == "text") {
+                  // For 'text' responses we continuously send response data with progress
+                  // info to
+                  // JS below, so no need to do anything here.
+                  return
+                }
+                NetworkEventUtil.onDataReceivedProgress(
+                    reactApplicationContext,
+                    requestId,
+                    bytesWritten,
+                    contentLength,
+                )
+                last = now
+              }
+            },
+        )
         originalResponse.newBuilder().body(responseBody).build()
       }
     }
@@ -783,7 +794,7 @@ public class NetworkingModule(
                   )
                 }
               }
-            }
+            },
         )
   }
 
@@ -1047,6 +1058,89 @@ public class NetworkingModule(
     return headersBuilder.build()
   }
 
+  /**
+   * Visible for testing so the null / fallback branches can be exercised without a real
+   * PackageManager.
+   */
+  @VisibleForTesting internal fun getDefaultUserAgentForTest(): String? = defaultUserAgent
+
+  private fun createDefaultUserAgent(context: Context): String? {
+    val pm = context.packageManager ?: return null
+    val packageName = context.packageName ?: return null
+    val packageInfo =
+        try {
+          pm.getPackageInfo(packageName, 0)
+        } catch (e: PackageManager.NameNotFoundException) {
+          null
+        }
+    val appInfo =
+        try {
+          pm.getApplicationInfo(packageName, 0)
+        } catch (e: PackageManager.NameNotFoundException) {
+          null
+        }
+    return createDefaultUserAgentInternal(pm, packageName, packageInfo, appInfo)
+  }
+
+  @VisibleForTesting
+  internal fun createDefaultUserAgentInternal(
+      pm: PackageManager?,
+      packageName: String?,
+      packageInfo: PackageInfo?,
+      appInfo: ApplicationInfo?,
+  ): String? {
+    if (pm == null || packageName == null) return null
+    // The application label is human-facing and may contain whitespace, punctuation, or
+    // non-ASCII characters (localized names, emoji, symbols like the (c) sign). OkHttp's
+    // Headers.Builder.add() rejects any value outside \u0020..\u007E, so an unsanitized label
+    // would throw on every request, and spaces/invalid chars would violate the RFC 7231
+    // User-Agent product-token syntax. Reduce the label to token-safe characters; if nothing
+    // usable remains, fall back to the package name, which is always a valid token.
+    val label = appInfo?.let { pm.getApplicationLabel(it)?.toString() }
+    val appName = sanitizeToUserAgentToken(label).ifEmpty { sanitizeToUserAgentToken(packageName) }
+    if (appName.isEmpty()) return null
+    val version =
+        packageInfo?.versionName?.let { sanitizeToUserAgentToken(it) }?.takeIf { it.isNotEmpty() }
+    return if (version != null) "$appName/$version" else appName
+  }
+
+  /**
+   * Reduces [value] to characters allowed in an RFC 7231 `token` (ASCII letters and digits plus
+   * `!#$%&'*+-.^_\`|~`). All other characters - whitespace, punctuation outside that set, and any
+   * non-ASCII character - are dropped, so the result is always a well-formed User-Agent product
+   * token that OkHttp will accept without throwing.
+   */
+  private fun sanitizeToUserAgentToken(value: String?): String {
+    if (value.isNullOrEmpty()) return ""
+    val sb = StringBuilder(value.length)
+    for (c in value) {
+      if (isUserAgentTokenChar(c)) {
+        sb.append(c)
+      }
+    }
+    return sb.toString()
+  }
+
+  private fun isUserAgentTokenChar(c: Char): Boolean =
+      c in 'a'..'z' ||
+          c in 'A'..'Z' ||
+          c in '0'..'9' ||
+          c == '!' ||
+          c == '#' ||
+          c == '\u0024' ||
+          c == '%' ||
+          c == '&' ||
+          c == '\'' ||
+          c == '*' ||
+          c == '+' ||
+          c == '-' ||
+          c == '.' ||
+          c == '^' ||
+          c == '_' ||
+          c == '`' ||
+          c == '|' ||
+          c == '~'
+
   public companion object {
     public const val NAME: String = NativeNetworkingAndroidSpec.NAME
     private const val TAG: String = NativeNetworkingAndroidSpec.NAME
@@ -1065,7 +1159,7 @@ public class NetworkingModule(
 
     @JvmStatic
     public fun setCustomClientBuilder(
-        ccb: com.facebook.react.modules.network.CustomClientBuilder?
+        ccb: com.facebook.react.modules.network.CustomClientBuilder?,
     ) {
       customClientBuilder = ccb
     }

package/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressRequestBody.kt

@@ -77,7 +77,7 @@ internal class ProgressRequestBody(
             val contentLength = contentLength()
             progressListener.onProgress(bytesWritten, contentLength, bytesWritten == contentLength)
           }
-        }
+        },
     )
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.kt

@@ -13,8 +13,8 @@ public object ReactNativeVersion {
   @JvmField
   public val VERSION: Map<String, Any?> = mapOf(
     "major" to 0,
-    "minor" to 87,
-    "patch" to 1,
-    "prerelease" to "0"
+    "minor" to 88,
+    "patch" to 0,
+    "prerelease" to "0rc2"
   )
 }

package/ReactAndroid/src/main/java/com/facebook/react/modules/toast/ToastModule.kt

@@ -20,14 +20,13 @@ import com.facebook.react.module.annotations.ReactModule
 internal class ToastModule(reactContext: ReactApplicationContext) :
     NativeToastAndroidSpec(reactContext) {
 
-  override fun getTypedExportedConstants(): Map<String, Any> =
-      mutableMapOf(
-          DURATION_SHORT_KEY to Toast.LENGTH_SHORT,
-          DURATION_LONG_KEY to Toast.LENGTH_LONG,
-          GRAVITY_TOP_KEY to (Gravity.TOP or Gravity.CENTER_HORIZONTAL),
-          GRAVITY_BOTTOM_KEY to (Gravity.BOTTOM or Gravity.CENTER_HORIZONTAL),
-          GRAVITY_CENTER to (Gravity.CENTER_HORIZONTAL or Gravity.CENTER_VERTICAL),
-      )
+  override fun getTypedExportedConstants(): Map<String, Any> = mutableMapOf(
+      DURATION_SHORT_KEY to Toast.LENGTH_SHORT,
+      DURATION_LONG_KEY to Toast.LENGTH_LONG,
+      GRAVITY_TOP_KEY to (Gravity.TOP or Gravity.CENTER_HORIZONTAL),
+      GRAVITY_BOTTOM_KEY to (Gravity.BOTTOM or Gravity.CENTER_HORIZONTAL),
+      GRAVITY_CENTER to (Gravity.CENTER_HORIZONTAL or Gravity.CENTER_VERTICAL),
+  )
 
   override fun show(message: String?, durationDouble: Double) {
     val duration = durationDouble.toInt()

package/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/WebSocketModule.kt

@@ -6,6 +6,7 @@
  */
 
 @file:Suppress("DEPRECATION_ERROR") // Conflicting okhttp versions
+@file:OptIn(UnstableReactNativeAPI::class)
 
 package com.facebook.react.modules.websocket
 
@@ -19,14 +20,19 @@ import com.facebook.react.bridge.ReadableType
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.buildReadableMap
 import com.facebook.react.common.ReactConstants
+import com.facebook.react.common.annotations.UnstableReactNativeAPI
+import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.modules.network.CustomClientBuilder
 import com.facebook.react.modules.network.ForwardingCookieHandler
+import com.facebook.react.modules.network.InspectorNetworkReporter
+import com.facebook.react.modules.network.NetworkEventUtil
 import com.facebook.react.modules.network.OkHttpClientProvider
 import java.io.IOException
 import java.net.URI
 import java.net.URISyntaxException
 import java.util.HashMap
+import java.util.UUID
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.TimeUnit
 import okhttp3.CookieJar
@@ -51,12 +57,30 @@ public class WebSocketModule(context: ReactApplicationContext) :
   private val contentHandlers: MutableMap<Int, ContentHandler> = ConcurrentHashMap()
   private val cookieHandler: ForwardingCookieHandler = ForwardingCookieHandler()
 
+  /** CDP request IDs used to report each connection's events to the modern debugger server. */
+  private val inspectorRequestIds: MutableMap<Int, String> = ConcurrentHashMap()
+
   override fun invalidate() {
     for (socket in webSocketConnections.values) {
       socket.close(1_001 /* endpoint is going away */, null)
     }
     webSocketConnections.clear()
     contentHandlers.clear()
+    inspectorRequestIds.clear()
+  }
+
+  /** Whether WebSocket events should be reported to the modern debugger server. */
+  private fun isInspectorNetworkReportingEnabled(): Boolean =
+      ReactNativeFeatureFlags.fuseboxWebSocketEventsEnabled()
+
+  /**
+   * Run [block] with the connection's CDP request ID, when WebSocket event reporting to the modern
+   * debugger server is enabled.
+   */
+  private inline fun reportToInspector(id: Int, block: (requestId: String) -> Unit) {
+    if (isInspectorNetworkReportingEnabled()) {
+      inspectorRequestIds[id]?.let(block)
+    }
   }
 
   private fun sendEvent(eventName: String, params: ReadableMap) {
@@ -142,11 +166,41 @@ public class WebSocketModule(context: ReactApplicationContext) :
       }
     }
 
+    val request = builder.build()
+
+    if (isInspectorNetworkReportingEnabled()) {
+      // Prefer the DevTools request ID created by the JS caller, which carries
+      // the request initiator stack trace for CDP reporting.
+      val devToolsRequestId =
+          if (
+              options?.hasKey("unstable_devToolsRequestId") == true &&
+                  options.getType("unstable_devToolsRequestId") == ReadableType.String
+          ) {
+            options.getString("unstable_devToolsRequestId")
+          } else {
+            null
+          }
+      val requestId = devToolsRequestId ?: UUID.randomUUID().toString()
+      inspectorRequestIds[id] = requestId
+      InspectorNetworkReporter.reportWebSocketCreated(requestId, url)
+      InspectorNetworkReporter.reportWebSocketWillSendHandshakeRequest(
+          requestId,
+          NetworkEventUtil.okHttpHeadersToMap(request.headers()),
+      )
+    }
+
     client.newWebSocket(
-        builder.build(),
+        request,
         object : WebSocketListener() {
           override fun onOpen(webSocket: WebSocket, response: Response) {
             webSocketConnections[id] = webSocket
+            reportToInspector(id) { requestId ->
+              InspectorNetworkReporter.reportWebSocketHandshakeResponseReceived(
+                  requestId,
+                  response.code(),
+                  NetworkEventUtil.okHttpHeadersToMap(response.headers()),
+              )
+            }
             val params = buildReadableMap {
               put("id", id)
               put("protocol", response.header("Sec-WebSocket-Protocol", ""))
@@ -159,6 +213,10 @@ public class WebSocketModule(context: ReactApplicationContext) :
           }
 
           override fun onClosed(webSocket: WebSocket, code: Int, reason: String) {
+            reportToInspector(id) { requestId ->
+              InspectorNetworkReporter.reportWebSocketClosed(requestId)
+            }
+            inspectorRequestIds.remove(id)
             val params = buildReadableMap {
               put("id", id)
               put("code", code)
@@ -168,10 +226,17 @@ public class WebSocketModule(context: ReactApplicationContext) :
           }
 
           override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
+            reportToInspector(id) { requestId ->
+              InspectorNetworkReporter.reportWebSocketClosed(requestId)
+            }
+            inspectorRequestIds.remove(id)
             notifyWebSocketFailed(id, t.message)
           }
 
           override fun onMessage(webSocket: WebSocket, text: String) {
+            reportToInspector(id) { requestId ->
+              InspectorNetworkReporter.reportWebSocketMessageReceived(requestId, text)
+            }
             val params = Arguments.createMap()
             params.putInt("id", id)
             params.putString("type", "text")
@@ -186,6 +251,9 @@ public class WebSocketModule(context: ReactApplicationContext) :
           }
 
           override fun onMessage(webSocket: WebSocket, bytes: ByteString) {
+            reportToInspector(id) { requestId ->
+              InspectorNetworkReporter.reportWebSocketMessageReceived(requestId, bytes)
+            }
             val params = Arguments.createMap()
             params.putInt("id", id)
             params.putString("type", "binary")
@@ -240,9 +308,13 @@ public class WebSocketModule(context: ReactApplicationContext) :
       sendEvent("websocketClosed", params)
       webSocketConnections.remove(id)
       contentHandlers.remove(id)
+      inspectorRequestIds.remove(id)
       return
     }
     try {
+      reportToInspector(id) { requestId ->
+        InspectorNetworkReporter.reportWebSocketMessageSent(requestId, message)
+      }
       client.send(message)
     } catch (e: Exception) {
       notifyWebSocketFailed(id, e.message)
@@ -267,10 +339,14 @@ public class WebSocketModule(context: ReactApplicationContext) :
       sendEvent("websocketClosed", params)
       webSocketConnections.remove(id)
       contentHandlers.remove(id)
+      inspectorRequestIds.remove(id)
       return
     }
     try {
       val decodedString = checkNotNull(ByteString.decodeBase64(base64String)) { "bytes == null" }
+      reportToInspector(id) { requestId ->
+        InspectorNetworkReporter.reportWebSocketMessageSent(requestId, decodedString)
+      }
       client.send(decodedString)
     } catch (e: Exception) {
       notifyWebSocketFailed(id, e.message)
@@ -294,9 +370,13 @@ public class WebSocketModule(context: ReactApplicationContext) :
       sendEvent("websocketClosed", params)
       webSocketConnections.remove(id)
       contentHandlers.remove(id)
+      inspectorRequestIds.remove(id)
       return
     }
     try {
+      reportToInspector(id) { requestId ->
+        InspectorNetworkReporter.reportWebSocketMessageSent(requestId, byteString)
+      }
       client.send(byteString)
     } catch (e: Exception) {
       notifyWebSocketFailed(id, e.message)
@@ -321,6 +401,7 @@ public class WebSocketModule(context: ReactApplicationContext) :
       sendEvent("websocketClosed", params)
       webSocketConnections.remove(id)
       contentHandlers.remove(id)
+      inspectorRequestIds.remove(id)
       return
     }
     try {

package/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/PackagerConnectionSettings.kt

@@ -21,7 +21,7 @@ public open class PackagerConnectionSettings(private val appContext: Context) {
   public val packageName: String = appContext.packageName
 
   init {
-    resetDebugServerHost()
+    _cachedOrOverrideHost = null
   }
 
   public open var debugServerHost: String
@@ -50,13 +50,16 @@ public open class PackagerConnectionSettings(private val appContext: Context) {
     }
     set(host) {
       if (host.isEmpty()) {
+        preferences.edit().remove(PREFS_DEBUG_SERVER_HOST_KEY).apply()
         _cachedOrOverrideHost = null
       } else {
+        preferences.edit().putString(PREFS_DEBUG_SERVER_HOST_KEY, host).apply()
         _cachedOrOverrideHost = host
       }
     }
 
   public open fun resetDebugServerHost() {
+    preferences.edit().remove(PREFS_DEBUG_SERVER_HOST_KEY).apply()
     _cachedOrOverrideHost = null
   }
 

package/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessAtomicRef.kt

@@ -11,7 +11,7 @@ import android.annotation.SuppressLint
 import kotlin.concurrent.Volatile
 
 internal class BridgelessAtomicRef<T>(
-    @field:Volatile @get:Synchronized @get:JvmName("getNullable") var value: T? = null
+    @field:Volatile @get:Synchronized @get:JvmName("getNullable") var value: T? = null,
 ) {
 
   internal fun interface Provider<T> {
@@ -41,7 +41,7 @@ internal class BridgelessAtomicRef<T>(
       }
       if (state == State.Failure) {
         throw RuntimeException(
-            "BridgelessAtomicRef: Failed to create object. Reason: $failureMessage"
+            "BridgelessAtomicRef: Failed to create object. Reason: $failureMessage",
         )
       }
       if (state != State.Creating) {
@@ -90,7 +90,7 @@ internal class BridgelessAtomicRef<T>(
 
       if (state == State.Failure) {
         throw RuntimeException(
-            "BridgelessAtomicRef: Failed to create object. Reason: $failureMessage"
+            "BridgelessAtomicRef: Failed to create object. Reason: $failureMessage",
         )
       }
       return get()

package/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessCatalystInstance.kt

@@ -34,7 +34,7 @@ import com.facebook.react.turbomodule.core.interfaces.NativeMethodCallInvokerHol
 
 @Deprecated(
     message =
-        "This class is deprecated, please to migrate to new architecture using [com.facebook.react.defaults.DefaultReactHost] instead."
+        "This class is deprecated, please to migrate to new architecture using [com.facebook.react.defaults.DefaultReactHost] instead.",
 )
 @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR)
 @FrameworkAPI
@@ -111,7 +111,7 @@ internal class BridgelessCatalystInstance(private val reactHost: ReactHostImpl)
   override val nativeMethodCallInvokerHolder: NativeMethodCallInvokerHolder
     get() =
         throw UnsupportedOperationException(
-            "Unimplemented method 'getNativeMethodCallInvokerHolder'"
+            "Unimplemented method 'getNativeMethodCallInvokerHolder'",
         )
 
   override fun <T : NativeModule> hasNativeModule(nativeModuleInterface: Class<T>): Boolean =
@@ -156,7 +156,7 @@ internal class BridgelessCatalystInstance(private val reactHost: ReactHostImpl)
 
   @Deprecated(
       message =
-          "This class is deprecated, please migrate to new architecture using [com.facebook.react.defaults.DefaultReactHost] instead."
+          "This class is deprecated, please migrate to new architecture using [com.facebook.react.defaults.DefaultReactHost] instead.",
   )
   override fun setTurboModuleRegistry(turboModuleRegistry: TurboModuleRegistry) {
     throw UnsupportedOperationException("Unimplemented method 'setTurboModuleRegistry'")
@@ -164,7 +164,7 @@ internal class BridgelessCatalystInstance(private val reactHost: ReactHostImpl)
 
   @Deprecated(
       message =
-          "This class is deprecated, please migrate to new architecture using [com.facebook.react.defaults.DefaultReactHost] instead."
+          "This class is deprecated, please migrate to new architecture using [com.facebook.react.defaults.DefaultReactHost] instead.",
   )
   override fun setFabricUIManager(fabricUIManager: UIManager) {
     throw UnsupportedOperationException("Unimplemented method 'setFabricUIManager'")
@@ -172,7 +172,7 @@ internal class BridgelessCatalystInstance(private val reactHost: ReactHostImpl)
 
   @Deprecated(
       message =
-          "This class is deprecated, please to migrate to new architecture using [com.facebook.react.defaults.DefaultReactHost] instead."
+          "This class is deprecated, please to migrate to new architecture using [com.facebook.react.defaults.DefaultReactHost] instead.",
   )
   override fun getFabricUIManager(): UIManager {
     throw UnsupportedOperationException("Unimplemented method 'getFabricUIManager'")

package/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessReactContext.kt

@@ -77,12 +77,12 @@ internal class BridgelessReactContext(context: Context, private val reactHost: R
 
   @OptIn(FrameworkAPI::class)
   @Deprecated(
-      "This method is deprecated in the New Architecture. You should not be invoking directly as we're going to remove it in the future."
+      "This method is deprecated in the New Architecture. You should not be invoking directly as we're going to remove it in the future.",
   )
   override fun getCatalystInstance(): CatalystInstance {
     if (ReactBuildConfig.UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE) {
       throw UnsupportedOperationException(
-          "CatalystInstance is not supported when Bridgeless mode is enabled."
+          "CatalystInstance is not supported when Bridgeless mode is enabled.",
       )
     }
     Log.w(
@@ -94,7 +94,7 @@ internal class BridgelessReactContext(context: Context, private val reactHost: R
   }
 
   @Deprecated(
-      "This API has been deprecated due to naming consideration, please use hasActiveReactInstance() instead"
+      "This API has been deprecated due to naming consideration, please use hasActiveReactInstance() instead",
   )
   override fun hasActiveCatalystInstance(): Boolean = hasActiveReactInstance()
 
@@ -102,7 +102,7 @@ internal class BridgelessReactContext(context: Context, private val reactHost: R
   override fun isBridgeless(): Boolean = true
 
   @Deprecated(
-      "This API has been deprecated due to naming consideration, please use hasReactInstance() instead"
+      "This API has been deprecated due to naming consideration, please use hasReactInstance() instead",
   )
   override fun hasCatalystInstance(): Boolean = false
 
@@ -137,7 +137,7 @@ internal class BridgelessReactContext(context: Context, private val reactHost: R
         logSoftException(
             TAG,
             IllegalArgumentException(
-                "getJSModule(RCTEventEmitter) is not recommended in the new architecture and will stop working with interop disabled. Please use UIManagerHelper.getEventDispatcher instead"
+                "getJSModule(RCTEventEmitter) is not recommended in the new architecture and will stop working with interop disabled. Please use UIManagerHelper.getEventDispatcher instead",
             ),
         )
       }

package/ReactAndroid/src/main/java/com/facebook/react/runtime/CoreReactPackage.kt

@@ -40,7 +40,7 @@ import java.util.HashMap
             DeviceEventManagerModule::class,
             ExceptionsManagerModule::class,
             HeadlessJsTaskSupportModule::class,
-        ]
+        ],
 )
 internal class CoreReactPackage(
     private val devSupportManager: DevSupportManager,
@@ -89,18 +89,17 @@ internal class CoreReactPackage(
 
   private fun fallbackForMissingClass(): ReactModuleInfoProvider {
     // In OSS case, the annotation processor does not run. We fall back on creating this byhand
-    val moduleList: Array<Class<out NativeModule>> =
-        arrayOf<Class<out NativeModule>>(
-            AndroidInfoModule::class.java,
-            DeviceInfoModule::class.java,
-            SourceCodeModule::class.java,
-            DevMenuModule::class.java,
-            DevSettingsModule::class.java,
-            DeviceEventManagerModule::class.java,
-            LogBoxModule::class.java,
-            ExceptionsManagerModule::class.java,
-            HeadlessJsTaskSupportModule::class.java,
-        )
+    val moduleList: Array<Class<out NativeModule>> = arrayOf<Class<out NativeModule>>(
+        AndroidInfoModule::class.java,
+        DeviceInfoModule::class.java,
+        SourceCodeModule::class.java,
+        DevMenuModule::class.java,
+        DevSettingsModule::class.java,
+        DeviceEventManagerModule::class.java,
+        LogBoxModule::class.java,
+        ExceptionsManagerModule::class.java,
+        HeadlessJsTaskSupportModule::class.java,
+    )
     val reactModuleInfoMap: MutableMap<String, ReactModuleInfo> = HashMap()
     for (moduleClass in moduleList) {
       val reactModule = moduleClass.getAnnotation(ReactModule::class.java)

package/ReactAndroid/src/main/java/com/facebook/react/runtime/JSRuntimeFactory.kt

@@ -14,7 +14,7 @@ import com.facebook.soloader.SoLoader
 public abstract class JSRuntimeFactory(
     @Suppress("unused", "NoHungarianNotation", "NotAccessedPrivateField")
     @DoNotStrip
-    private val mHybridData: HybridData
+    private val mHybridData: HybridData,
 ) {
   private companion object {
     init {