react-native-tvos 0.83.2-0 → 0.84.0-0

package/ReactAndroid/hermes-engine/build.gradle.kts

@@ -11,7 +11,6 @@ import de.undercouch.gradle.tasks.download.Download
 import org.apache.tools.ant.taskdefs.condition.Os
 
 plugins {
-  id("maven-publish")
   id("signing")
   alias(libs.plugins.android.library)
   alias(libs.plugins.download)
@@ -152,28 +151,55 @@ val installCMake by
       )
     }
 
+fun configureBuildForHermesCommandLineArgs(
+    hermesBuildDir: File,
+    jsiDir: File,
+    enableDebugger: Boolean,
+): List<String> {
+  var cmakeCommandLine =
+      windowsAwareCommandLine(
+          cmakeBinaryPath,
+          // Suppress all warnings as this is the Hermes build and we can't fix them.
+          "--log-level=ERROR",
+          "-Wno-dev",
+          "-S",
+          ".",
+          "-B",
+          hermesBuildDir.toString(),
+          "-DJSI_DIR=" + jsiDir.absolutePath,
+          "-DCMAKE_BUILD_TYPE=Release",
+      )
+  if (enableDebugger) {
+    cmakeCommandLine = cmakeCommandLine + "-DHERMES_ENABLE_DEBUGGER=True"
+  }
+  if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+    cmakeCommandLine = cmakeCommandLine + "-GNMake Makefiles"
+  }
+  if (hermesV1Enabled) {
+    cmakeCommandLine = cmakeCommandLine + "-DHERMESVM_HEAP_HV_MODE=HEAP_HV_PREFER32"
+  }
+
+  return cmakeCommandLine
+}
+
+fun buildHermesCCommandLineArgs() =
+    listOf(
+        cmakeBinaryPath,
+        "--build",
+        hermesBuildDir.toString(),
+        "--target",
+        "hermesc",
+        "-j",
+        ndkBuildJobs,
+    )
+
 val configureBuildForHermes by
     tasks.registering(CustomExecTask::class) {
       dependsOn(installCMake)
       workingDir(hermesDir)
       inputs.dir(hermesDir)
       outputs.files(hermesBuildOutputFileTree)
-      var cmakeCommandLine =
-          windowsAwareCommandLine(
-              cmakeBinaryPath,
-              // Suppress all warnings as this is the Hermes build and we can't fix them.
-              "--log-level=ERROR",
-              "-Wno-dev",
-              "-S",
-              ".",
-              "-B",
-              hermesBuildDir.toString(),
-              "-DJSI_DIR=" + jsiDir.absolutePath,
-              "-DCMAKE_BUILD_TYPE=Release",
-          )
-      if (Os.isFamily(Os.FAMILY_WINDOWS)) {
-        cmakeCommandLine = cmakeCommandLine + "-GNMake Makefiles"
-      }
+      val cmakeCommandLine = configureBuildForHermesCommandLineArgs(hermesBuildDir, jsiDir, false)
       commandLine(cmakeCommandLine)
       standardOutputFile.set(project.file("$buildDir/configure-hermesc.log"))
     }
@@ -184,22 +210,69 @@ val buildHermesC by
       workingDir(hermesDir)
       inputs.files(hermesBuildOutputFileTree)
       outputs.file(hermesCOutputBinary)
+      val cmakeCommandLine = buildHermesCCommandLineArgs()
+      commandLine(cmakeCommandLine)
+      standardOutputFile.set(project.file("$buildDir/build-hermesc.log"))
+      errorOutputFile.set(project.file("$buildDir/build-hermesc.error.log"))
+    }
+
+val prepareHeadersForPrefab by
+    tasks.registering(Copy::class) {
+      dependsOn(buildHermesC)
+      from("$hermesDir/API")
+      from("$hermesDir/public")
+      include("**/*.h")
+      exclude("jsi/**")
+      into(prefabHeadersDir)
+    }
+
+val buildHermesLib by
+    tasks.registering(CustomExecTask::class) {
+      dependsOn(buildHermesC)
+      workingDir(hermesDir)
+      inputs.files(hermesBuildOutputFileTree)
       commandLine(
           cmakeBinaryPath,
           "--build",
           hermesBuildDir.toString(),
           "--target",
-          "hermesc",
+          "hermesvm",
           "-j",
           ndkBuildJobs,
       )
+      standardOutputFile.set(project.file("$buildDir/build-hermes-lib.log"))
+      errorOutputFile.set(project.file("$buildDir/build-hermes-lib.error.log"))
+    }
+
+// The repeated tasks below named "*WithDebugger" are required by Fantom.
+// Hermes V1 by default builds with the debugger disabled, while Fantom needs
+// it to be enabled as it does a debug build of React Native.
+val configureBuildForHermesWithDebugger by
+    tasks.registering(CustomExecTask::class) {
+      dependsOn(installCMake)
+      workingDir(hermesDir)
+      inputs.dir(hermesDir)
+      outputs.files(hermesBuildOutputFileTree)
+      val cmakeCommandLine = configureBuildForHermesCommandLineArgs(hermesBuildDir, jsiDir, true)
+      commandLine(cmakeCommandLine)
+      standardOutputFile.set(project.file("$buildDir/configure-hermesc.log"))
+    }
+
+val buildHermesCWithDebugger by
+    tasks.registering(CustomExecTask::class) {
+      dependsOn(configureBuildForHermesWithDebugger)
+      workingDir(hermesDir)
+      inputs.files(hermesBuildOutputFileTree)
+      outputs.file(hermesCOutputBinary)
+      val cmakeCommandLine = buildHermesCCommandLineArgs()
+      commandLine(cmakeCommandLine)
       standardOutputFile.set(project.file("$buildDir/build-hermesc.log"))
       errorOutputFile.set(project.file("$buildDir/build-hermesc.error.log"))
     }
 
-val prepareHeadersForPrefab by
+val prepareHeadersForPrefabWithDebugger by
     tasks.registering(Copy::class) {
-      dependsOn(buildHermesC)
+      dependsOn(buildHermesCWithDebugger)
       from("$hermesDir/API")
       from("$hermesDir/public")
       include("**/*.h")
@@ -207,9 +280,9 @@ val prepareHeadersForPrefab by
       into(prefabHeadersDir)
     }
 
-val buildHermesLib by
+val buildHermesLibWithDebugger by
     tasks.registering(CustomExecTask::class) {
-      dependsOn(buildHermesC)
+      dependsOn(buildHermesCWithDebugger)
       workingDir(hermesDir)
       inputs.files(hermesBuildOutputFileTree)
       commandLine(
@@ -367,13 +440,6 @@ android {
     jniLibs.excludes.add("**/libfbjni.so")
   }
 
-  publishing {
-    multipleVariants {
-      withSourcesJar()
-      allVariants()
-    }
-  }
-
   prefab { create("hermesvm") { headers = prefabHeadersDir.absolutePath } }
 }
 
@@ -383,6 +449,8 @@ afterEvaluate {
     // download/unzip Hermes from Github then.
     tasks.getByName("configureBuildForHermes").dependsOn(unzipHermes)
     tasks.getByName("prepareHeadersForPrefab").dependsOn(unzipHermes)
+    tasks.getByName("configureBuildForHermesWithDebugger").dependsOn(unzipHermes)
+    tasks.getByName("prepareHeadersForPrefabWithDebugger").dependsOn(unzipHermes)
   }
   tasks.getByName("preBuild").dependsOn(buildHermesC)
   tasks.getByName("preBuild").dependsOn(prepareHeadersForPrefab)

package/ReactAndroid/src/main/java/com/facebook/react/NativeModuleRegistryBuilder.kt

@@ -41,10 +41,7 @@ public class NativeModuleRegistryBuilder(
     // We use an iterable instead of an iterator here to ensure thread safety, and that this list
     // cannot be modified
     val moduleHolders =
-        @Suppress("DEPRECATION")
-        if (reactPackage is LazyReactPackage) {
-          reactPackage.getNativeModuleIterator(reactApplicationContext)
-        } else if (reactPackage is BaseReactPackage) {
+        if (reactPackage is BaseReactPackage) {
           reactPackage.getNativeModuleIterator(reactApplicationContext)
         } else {
           ReactPackageHelper.getNativeModuleIterator(reactPackage, reactApplicationContext)

package/ReactAndroid/src/main/java/com/facebook/react/ReactActivity.java

@@ -124,6 +124,9 @@ public abstract class ReactActivity extends AppCompatActivity
     // as super.onBackPressed() will call all enabled callbacks in the dispatcher.
     mBackPressedCallback.setEnabled(false);
     super.onBackPressed();
+    // Re-enable callback to ensure custom back handling works after activity resume
+    // Without this, the callback remains disabled when the app returns from background
+    mBackPressedCallback.setEnabled(true);
   }
 
   @Override

package/ReactAndroid/src/main/java/com/facebook/react/ReactDelegate.kt

@@ -68,9 +68,9 @@ public open class ReactDelegate {
       launchOptions: Bundle?,
   ) {
     this.activity = activity
-    mainComponentName = appKey
+    this.mainComponentName = appKey
     this.launchOptions = launchOptions
-    doubleTapReloadRecognizer = DoubleTapReloadRecognizer()
+    this.doubleTapReloadRecognizer = DoubleTapReloadRecognizer()
     this.reactNativeHost = reactNativeHost
   }
 
@@ -81,9 +81,9 @@ public open class ReactDelegate {
       launchOptions: Bundle?,
   ) {
     this.activity = activity
-    mainComponentName = appKey
+    this.mainComponentName = appKey
     this.launchOptions = launchOptions
-    doubleTapReloadRecognizer = DoubleTapReloadRecognizer()
+    this.doubleTapReloadRecognizer = DoubleTapReloadRecognizer()
     this.reactHost = reactHost
   }
 
@@ -95,11 +95,11 @@ public open class ReactDelegate {
       launchOptions: Bundle?,
       fabricEnabled: Boolean,
   ) {
-    isFabricEnabled = fabricEnabled
+    this.isFabricEnabled = fabricEnabled
     this.activity = activity
-    mainComponentName = appKey
+    this.mainComponentName = appKey
     this.launchOptions = launchOptions
-    doubleTapReloadRecognizer = DoubleTapReloadRecognizer()
+    this.doubleTapReloadRecognizer = DoubleTapReloadRecognizer()
     this.reactNativeHost = reactNativeHost
   }
 
@@ -178,13 +178,10 @@ public open class ReactDelegate {
     if (
         ReactNativeNewArchitectureFeatureFlags.enableBridgelessArchitecture() && reactHost != null
     ) {
-      reactHost?.onBackPressed()
+      return reactHost?.onBackPressed() == true
+    } else if (reactNativeHost?.hasInstance() == true) {
+      reactNativeHost?.reactInstanceManager?.onBackPressed()
       return true
-    } else {
-      if (reactNativeHost?.hasInstance() == true) {
-        reactNativeHost?.reactInstanceManager?.onBackPressed()
-        return true
-      }
     }
     return false
   }

package/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java

@@ -57,11 +57,8 @@ import com.facebook.react.bridge.JSExceptionHandler;
 import com.facebook.react.bridge.JavaScriptExecutor;
 import com.facebook.react.bridge.JavaScriptExecutorFactory;
 import com.facebook.react.bridge.NativeModuleRegistry;
-import com.facebook.react.bridge.NotThreadSafeBridgeIdleDebugListener;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.bridge.ReactCxxErrorHandler;
-import com.facebook.react.bridge.ReactInstanceManagerInspectorTarget;
 import com.facebook.react.bridge.ReactMarker;
 import com.facebook.react.bridge.ReactMarkerConstants;
 import com.facebook.react.bridge.ReactNoCrashSoftException;
@@ -77,16 +74,11 @@ import com.facebook.react.common.SurfaceDelegateFactory;
 import com.facebook.react.common.annotations.internal.LegacyArchitecture;
 import com.facebook.react.common.annotations.internal.LegacyArchitectureLogLevel;
 import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger;
-import com.facebook.react.common.build.ReactBuildConfig;
 import com.facebook.react.devsupport.DevSupportManagerFactory;
-import com.facebook.react.devsupport.InspectorFlags;
 import com.facebook.react.devsupport.ReactInstanceDevHelper;
-import com.facebook.react.devsupport.inspector.InspectorNetworkHelper;
-import com.facebook.react.devsupport.inspector.InspectorNetworkRequestListener;
 import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
 import com.facebook.react.devsupport.interfaces.DevLoadingViewManager;
 import com.facebook.react.devsupport.interfaces.DevSupportManager;
-import com.facebook.react.devsupport.interfaces.DevSupportManager.PausedInDebuggerOverlayCommandListener;
 import com.facebook.react.devsupport.interfaces.PackagerStatusCallback;
 import com.facebook.react.devsupport.interfaces.PausedInDebuggerOverlayManager;
 import com.facebook.react.devsupport.interfaces.RedBoxHandler;
@@ -102,7 +94,6 @@ import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 import com.facebook.react.modules.core.ReactChoreographer;
 import com.facebook.react.modules.debug.interfaces.DeveloperSettings;
-import com.facebook.react.modules.systeminfo.AndroidInfoHelpers;
 import com.facebook.react.packagerconnection.RequestHandler;
 import com.facebook.react.uimanager.DisplayMetricsHolder;
 import com.facebook.react.uimanager.ReactRoot;
@@ -114,8 +105,6 @@ import com.facebook.react.views.imagehelper.ResourceDrawableIdHelper;
 import com.facebook.soloader.SoLoader;
 import com.facebook.systrace.Systrace;
 import com.facebook.systrace.SystraceMessage;
-import java.lang.ref.WeakReference;
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -183,13 +172,11 @@ public class ReactInstanceManager {
   private final boolean mUseDeveloperSupport;
   private final boolean mRequireActivity;
   private final boolean mKeepActivity;
-  private final @Nullable NotThreadSafeBridgeIdleDebugListener mBridgeIdleDebugListener;
   private final Object mReactContextLock = new Object();
   private @Nullable volatile ReactContext mCurrentReactContext;
   private final Context mApplicationContext;
   private @Nullable @ThreadConfined(UI) DefaultHardwareBackBtnHandler mDefaultBackButtonImpl;
   private @Nullable Activity mCurrentActivity;
-  private @Nullable ReactInstanceManagerInspectorTarget mInspectorTarget;
   private final Collection<com.facebook.react.ReactInstanceEventListener>
       mReactInstanceEventListeners =
           Collections.synchronizedList(
@@ -246,7 +233,6 @@ public class ReactInstanceManager {
       DevSupportManagerFactory devSupportManagerFactory,
       boolean requireActivity,
       boolean keepActivity,
-      @Nullable NotThreadSafeBridgeIdleDebugListener bridgeIdleDebugListener,
       LifecycleState initialLifecycleState,
       JSExceptionHandler jSExceptionHandler,
       @Nullable RedBoxHandler redBoxHandler,
@@ -292,7 +278,6 @@ public class ReactInstanceManager {
             devLoadingViewManager,
             pausedInDebuggerOverlayManager);
     Systrace.endSection(TRACE_TAG_REACT);
-    mBridgeIdleDebugListener = bridgeIdleDebugListener;
     mLifecycleState = initialLifecycleState;
     mMemoryPressureRouter = new MemoryPressureRouter(applicationContext);
     mJSExceptionHandler = jSExceptionHandler;
@@ -316,8 +301,6 @@ public class ReactInstanceManager {
       mDevSupportManager.startInspector();
     }
 
-    registerCxxErrorHandlerFunc();
-
     // Using `if (true)` just to prevent tests / lint errors.
     if (true) {
       // Legacy architecture of React Native is deprecated and can't be initialized anymore.
@@ -414,24 +397,6 @@ public class ReactInstanceManager {
     mDevSupportManager.handleException(e);
   }
 
-  private void registerCxxErrorHandlerFunc() {
-    if (!ReactBuildConfig.UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE) {
-      Class[] parameterTypes = new Class[1];
-      parameterTypes[0] = Exception.class;
-      Method handleCxxErrorFunc = null;
-      try {
-        handleCxxErrorFunc = ReactInstanceManager.class.getMethod("handleCxxError", parameterTypes);
-      } catch (NoSuchMethodException e) {
-        FLog.e("ReactInstanceHolder", "Failed to set cxx error handler function", e);
-      }
-      ReactCxxErrorHandler.setHandleErrorFunc(this, handleCxxErrorFunc);
-    }
-  }
-
-  private void unregisterCxxErrorHandlerFunc() {
-    ReactCxxErrorHandler.setHandleErrorFunc(null, null);
-  }
-
   static void initializeSoLoaderIfNecessary(Context applicationContext) {
     // Call SoLoader.initialize here, this is required for apps that does not use exopackage and
     // does not use SoLoader for loading other native code except from the one used by React Native
@@ -811,7 +776,6 @@ public class ReactInstanceManager {
 
     moveToBeforeCreateLifecycleState();
     mMemoryPressureRouter.destroy(mApplicationContext);
-    unregisterCxxErrorHandlerFunc();
 
     mCreateReactContextThread = null;
     synchronized (mAttachedReactRoots) {
@@ -830,15 +794,6 @@ public class ReactInstanceManager {
       }
     }
 
-    // If the host has been invalidated, now that the current context/instance
-    // has been destroyed, we can safely destroy the host's inspector target.
-    if (mInstanceManagerInvalidated) {
-      if (mInspectorTarget != null) {
-        mInspectorTarget.close();
-        mInspectorTarget = null;
-      }
-    }
-
     mHasStartedCreatingInitialContext = false;
     if (!mKeepActivity) {
       mCurrentActivity = null;
@@ -1462,8 +1417,7 @@ public class ReactInstanceManager {
             .setJSExecutor(jsExecutor)
             .setRegistry(nativeModuleRegistry)
             .setJSBundleLoader(jsBundleLoader)
-            .setJSExceptionHandler(exceptionHandler)
-            .setInspectorTarget(getOrCreateInspectorTarget());
+            .setJSExceptionHandler(exceptionHandler);
 
     ReactMarker.logMarker(CREATE_CATALYST_INSTANCE_START);
     // CREATE_CATALYST_INSTANCE_END is in JSCExecutor.cpp
@@ -1517,9 +1471,6 @@ public class ReactInstanceManager {
         catalystInstance.setFabricUIManager(uiManager);
       }
     }
-    if (mBridgeIdleDebugListener != null) {
-      catalystInstance.addBridgeIdleDebugListener(mBridgeIdleDebugListener);
-    }
     if (BuildConfig.ENABLE_PERFETTO || Systrace.isTracing(TRACE_TAG_REACT)) {
       catalystInstance.setGlobalVariable("__RCTProfileIsProfiling", "true");
     }
@@ -1572,73 +1523,4 @@ public class ReactInstanceManager {
     nativeModuleRegistryBuilder.processPackage(reactPackage);
     SystraceMessage.endSection(TRACE_TAG_REACT).flush();
   }
-
-  private static class InspectorTargetDelegateImpl
-      implements ReactInstanceManagerInspectorTarget.TargetDelegate {
-    // This weak reference breaks the cycle between the C++ HostTarget and the
-    // Java ReactInstanceManager, preventing memory leaks in apps that create
-    // multiple ReactInstanceManagers over time.
-    private WeakReference<ReactInstanceManager> mReactInstanceManagerWeak;
-
-    public InspectorTargetDelegateImpl(ReactInstanceManager inspectorTarget) {
-      mReactInstanceManagerWeak = new WeakReference<ReactInstanceManager>(inspectorTarget);
-    }
-
-    @Override
-    public Map<String, String> getMetadata() {
-      ReactInstanceManager reactInstanceManager = mReactInstanceManagerWeak.get();
-
-      return AndroidInfoHelpers.getInspectorHostMetadata(
-          reactInstanceManager != null ? reactInstanceManager.mApplicationContext : null);
-    }
-
-    @Override
-    public void onReload() {
-      UiThreadUtil.runOnUiThread(
-          () -> {
-            ReactInstanceManager reactInstanceManager = mReactInstanceManagerWeak.get();
-            if (reactInstanceManager != null) {
-              reactInstanceManager.mDevSupportManager.handleReloadJS();
-            }
-          });
-    }
-
-    @Override
-    public void onSetPausedInDebuggerMessage(@Nullable String message) {
-      ReactInstanceManager reactInstanceManager = mReactInstanceManagerWeak.get();
-      if (reactInstanceManager == null) {
-        return;
-      }
-      if (message == null) {
-        reactInstanceManager.mDevSupportManager.hidePausedInDebuggerOverlay();
-      } else {
-        reactInstanceManager.mDevSupportManager.showPausedInDebuggerOverlay(
-            message,
-            new PausedInDebuggerOverlayCommandListener() {
-              @Override
-              public void onResume() {
-                UiThreadUtil.assertOnUiThread();
-                if (reactInstanceManager.mInspectorTarget != null) {
-                  reactInstanceManager.mInspectorTarget.sendDebuggerResumeCommand();
-                }
-              }
-            });
-      }
-    }
-
-    @Override
-    public void loadNetworkResource(String url, InspectorNetworkRequestListener listener) {
-      InspectorNetworkHelper.loadNetworkResource(url, listener);
-    }
-  }
-
-  private @Nullable ReactInstanceManagerInspectorTarget getOrCreateInspectorTarget() {
-    if (mInspectorTarget == null && InspectorFlags.getFuseboxEnabled()) {
-
-      mInspectorTarget =
-          new ReactInstanceManagerInspectorTarget(new InspectorTargetDelegateImpl(this));
-    }
-
-    return mInspectorTarget;
-  }
 }

package/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManagerBuilder.kt

@@ -19,7 +19,6 @@ import com.facebook.react.ReactInstanceManager.initializeSoLoaderIfNecessary
 import com.facebook.react.bridge.JSBundleLoader
 import com.facebook.react.bridge.JSExceptionHandler
 import com.facebook.react.bridge.JavaScriptExecutorFactory
-import com.facebook.react.bridge.NotThreadSafeBridgeIdleDebugListener
 import com.facebook.react.bridge.UIManagerProvider
 import com.facebook.react.common.LifecycleState
 import com.facebook.react.common.SurfaceDelegateFactory
@@ -49,7 +48,6 @@ public class ReactInstanceManagerBuilder {
   private var jsBundleAssetUrl: String? = null
   private var jsBundleLoader: JSBundleLoader? = null
   private var jsMainModulePath: String? = null
-  private var bridgeIdleDebugListener: NotThreadSafeBridgeIdleDebugListener? = null
   private var application: Application? = null
   private var useDeveloperSupport = false
   private var devSupportManagerFactory: DevSupportManagerFactory? = null
@@ -145,13 +143,6 @@ public class ReactInstanceManagerBuilder {
     return this
   }
 
-  public fun setBridgeIdleDebugListener(
-      bridgeIdleDebugListener: NotThreadSafeBridgeIdleDebugListener
-  ): ReactInstanceManagerBuilder {
-    this.bridgeIdleDebugListener = bridgeIdleDebugListener
-    return this
-  }
-
   /** Required. This must be your `Application` instance. */
   public fun setApplication(application: Application): ReactInstanceManagerBuilder {
     this.application = application
@@ -359,7 +350,6 @@ public class ReactInstanceManagerBuilder {
         devSupportManagerFactory ?: DefaultDevSupportManagerFactory(),
         requireActivity,
         keepActivity,
-        bridgeIdleDebugListener,
         checkNotNull(initialLifecycleState) { "Initial lifecycle state was not set" },
         jsExceptionHandler,
         redBoxHandler,

package/ReactAndroid/src/main/java/com/facebook/react/ReactPackageHelper.kt

@@ -27,7 +27,7 @@ internal object ReactPackageHelper {
   ): Iterable<ModuleHolder> {
     FLog.d(
         ReactConstants.TAG,
-        "${reactPackage.javaClass.simpleName} is not a LazyReactPackage, falling back to old version.",
+        "${reactPackage.javaClass.simpleName} is not a BaseReactPackage, falling back to old version.",
     )
     @Suppress("DEPRECATION")
     val nativeModules = reactPackage.createNativeModules(reactApplicationContext)

package/ReactAndroid/src/main/java/com/facebook/react/ReactPackageTurboModuleManagerDelegate.kt

@@ -8,8 +8,6 @@
 package com.facebook.react
 
 import com.facebook.jni.HybridData
-import com.facebook.react.bridge.CxxModuleWrapper
-import com.facebook.react.bridge.ModuleSpec
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.internal.featureflags.ReactNativeNewArchitectureFeatureFlags
@@ -17,7 +15,6 @@ import com.facebook.react.internal.turbomodule.core.TurboModuleManagerDelegate
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.module.model.ReactModuleInfo
 import com.facebook.react.turbomodule.core.interfaces.TurboModule
-import javax.inject.Provider
 
 public abstract class ReactPackageTurboModuleManagerDelegate : TurboModuleManagerDelegate {
   internal fun interface ModuleProvider {
@@ -61,26 +58,6 @@ public abstract class ReactPackageTurboModuleManagerDelegate : TurboModuleManage
         continue
       }
 
-      @Suppress("DEPRECATION")
-      if (shouldSupportLegacyPackages() && reactPackage is LazyReactPackage) {
-        // TODO(T145105887): Output warnings that LazyReactPackage was used
-        val lazyPkg = reactPackage
-        val moduleSpecs: List<ModuleSpec> =
-            lazyPkg.internal_getNativeModules(reactApplicationContext)
-        val moduleSpecProviderMap: MutableMap<String?, Provider<out NativeModule>> = mutableMapOf()
-        for (moduleSpec in moduleSpecs) {
-          moduleSpecProviderMap[moduleSpec.getName()] = moduleSpec.getProvider()
-        }
-
-        val moduleProvider = ModuleProvider { moduleName: String ->
-          moduleSpecProviderMap[moduleName]?.get()
-        }
-
-        moduleProviders.add(moduleProvider)
-        packageModuleInfos[moduleProvider] = lazyPkg.reactModuleInfoProvider.getReactModuleInfos()
-        continue
-      }
-
       if (shouldSupportLegacyPackages()) {
         // TODO(T145105887): Output warnings that ReactPackage was used
         @Suppress("DEPRECATION")
@@ -103,7 +80,7 @@ public abstract class ReactPackageTurboModuleManagerDelegate : TurboModuleManage
                       moduleClass.name,
                       reactModule.canOverrideExistingModule,
                       true,
-                      reactModule.isCxxModule,
+                      false,
                       ReactModuleInfo.classIsTurboModule(moduleClass),
                   )
               else
@@ -112,7 +89,7 @@ public abstract class ReactPackageTurboModuleManagerDelegate : TurboModuleManage
                       moduleClass.name,
                       module.canOverrideExistingModule(),
                       true,
-                      CxxModuleWrapper::class.java.isAssignableFrom(moduleClass),
+                      false,
                       ReactModuleInfo.classIsTurboModule(moduleClass),
                   )
 
@@ -128,8 +105,6 @@ public abstract class ReactPackageTurboModuleManagerDelegate : TurboModuleManage
     }
   }
 
-  override fun unstable_shouldEnableLegacyModuleInterop(): Boolean = shouldEnableLegacyModuleInterop
-
   override fun getModule(moduleName: String): TurboModule? {
     var resolvedModule: NativeModule? = null
 
@@ -176,7 +151,7 @@ public abstract class ReactPackageTurboModuleManagerDelegate : TurboModuleManage
   }
 
   override fun getLegacyModule(moduleName: String): NativeModule? {
-    if (!unstable_shouldEnableLegacyModuleInterop()) {
+    if (!shouldEnableLegacyModuleInterop) {
       return null
     }
 
@@ -214,7 +189,7 @@ public abstract class ReactPackageTurboModuleManagerDelegate : TurboModuleManage
     }
   }
 
-  private fun shouldSupportLegacyPackages(): Boolean = unstable_shouldEnableLegacyModuleInterop()
+  private fun shouldSupportLegacyPackages(): Boolean = shouldEnableLegacyModuleInterop
 
   public abstract class Builder {
     private var packages: List<ReactPackage>? = null