react-native 0.75.0-rc.2 → 0.75.0-rc.4

package/Libraries/Core/ReactNativeVersion.js

@@ -17,7 +17,7 @@ const version: $ReadOnly<{
   major: 0,
   minor: 75,
   patch: 0,
-  prerelease: 'rc.2',
+  prerelease: 'rc.4',
 };
 
 module.exports = {version};

package/React/Base/RCTVersion.m

@@ -24,7 +24,7 @@ NSDictionary* RCTGetReactNativeVersion(void)
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(75),
                   RCTVersionPatch: @(0),
-                  RCTVersionPrerelease: @"rc.2",
+                  RCTVersionPrerelease: @"rc.4",
                   };
   });
   return __rnVersion;

package/ReactAndroid/api/ReactAndroid.api

@@ -2323,12 +2323,19 @@ public class com/facebook/react/devsupport/ReleaseDevSupportManager : com/facebo
 
 public class com/facebook/react/devsupport/StackTraceHelper {
 	public static final field COLUMN_KEY Ljava/lang/String;
+	public static final field FILE_KEY Ljava/lang/String;
+	public static final field ID_KEY Ljava/lang/String;
+	public static final field IS_FATAL_KEY Ljava/lang/String;
 	public static final field LINE_NUMBER_KEY Ljava/lang/String;
+	public static final field MESSAGE_KEY Ljava/lang/String;
+	public static final field METHOD_NAME_KEY Ljava/lang/String;
+	public static final field STACK_KEY Ljava/lang/String;
 	public fun <init> ()V
 	public static fun convertJavaStackTrace (Ljava/lang/Throwable;)[Lcom/facebook/react/devsupport/interfaces/StackFrame;
 	public static fun convertJsStackTrace (Lcom/facebook/react/bridge/ReadableArray;)[Lcom/facebook/react/devsupport/interfaces/StackFrame;
 	public static fun convertJsStackTrace (Ljava/lang/String;)[Lcom/facebook/react/devsupport/interfaces/StackFrame;
 	public static fun convertJsStackTrace (Lorg/json/JSONArray;)[Lcom/facebook/react/devsupport/interfaces/StackFrame;
+	public static fun convertParsedError (Lcom/facebook/react/interfaces/exceptionmanager/ReactJsExceptionHandler$ParsedError;)Lcom/facebook/react/bridge/JavaOnlyMap;
 	public static fun formatFrameSource (Lcom/facebook/react/devsupport/interfaces/StackFrame;)Ljava/lang/String;
 	public static fun formatStackTrace (Ljava/lang/String;[Lcom/facebook/react/devsupport/interfaces/StackFrame;)Ljava/lang/String;
 }
@@ -3779,8 +3786,8 @@ public abstract class com/facebook/react/runtime/JSRuntimeFactory {
 }
 
 public class com/facebook/react/runtime/ReactHostImpl : com/facebook/react/ReactHost {
-	public fun <init> (Landroid/content/Context;Lcom/facebook/react/runtime/ReactHostDelegate;Lcom/facebook/react/fabric/ComponentFactory;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;Lcom/facebook/react/interfaces/exceptionmanager/ReactJsExceptionHandler;ZZ)V
-	public fun <init> (Landroid/content/Context;Lcom/facebook/react/runtime/ReactHostDelegate;Lcom/facebook/react/fabric/ComponentFactory;ZLcom/facebook/react/interfaces/exceptionmanager/ReactJsExceptionHandler;Z)V
+	public fun <init> (Landroid/content/Context;Lcom/facebook/react/runtime/ReactHostDelegate;Lcom/facebook/react/fabric/ComponentFactory;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;ZZ)V
+	public fun <init> (Landroid/content/Context;Lcom/facebook/react/runtime/ReactHostDelegate;Lcom/facebook/react/fabric/ComponentFactory;ZZ)V
 	public fun addBeforeDestroyListener (Lkotlin/jvm/functions/Function0;)V
 	public fun addReactInstanceEventListener (Lcom/facebook/react/ReactInstanceEventListener;)V
 	public fun createSurface (Landroid/content/Context;Ljava/lang/String;Landroid/os/Bundle;)Lcom/facebook/react/interfaces/fabric/ReactSurface;

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.75.0-rc.2
+VERSION_NAME=0.75.0-rc.4
 react.internal.publishingGroup=com.facebook.react
 
 android.useAndroidX=true

package/ReactAndroid/src/main/java/com/facebook/hermes/unicode/AndroidUnicodeUtils.kt

@@ -20,12 +20,14 @@ import java.util.Locale
 public object AndroidUnicodeUtils {
 
   @DoNotStrip
+  @JvmStatic
   public fun localeCompare(left: String?, right: String?): Int {
     val collator = Collator.getInstance()
     return collator.compare(left, right)
   }
 
   @DoNotStrip
+  @JvmStatic
   public fun dateFormat(unixtimeMs: Double, formatDate: Boolean, formatTime: Boolean): String {
     val format =
         when {
@@ -39,6 +41,7 @@ public object AndroidUnicodeUtils {
   }
 
   @DoNotStrip
+  @JvmStatic
   public fun convertToCase(input: String, targetCase: Int, useCurrentLocale: Boolean): String {
     // Note Java's case conversions use the user's locale. For example "I".toLowerCase()
     // will produce a dotless i. From Java's docs: "To obtain correct results for locale
@@ -52,6 +55,7 @@ public object AndroidUnicodeUtils {
   }
 
   @DoNotStrip
+  @JvmStatic
   public fun normalize(input: String?, form: Int): String =
       when (form) {
         FORM_C -> Normalizer.normalize(input, Normalizer.Form.NFC)

package/ReactAndroid/src/main/java/com/facebook/react/common/build/ReactBuildConfig.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.common.build;
+
+import com.facebook.react.BuildConfig;
+
+/**
+ * Convenience class for accessing auto-generated BuildConfig so that a) other modules can just
+ * depend on this module instead of having to manually depend on generating their own build config
+ * and b) we don't have to deal with IntelliJ getting confused about the autogenerated BuildConfig
+ * class all over the place.
+ */
+public class ReactBuildConfig {
+
+  public static final boolean DEBUG = BuildConfig.DEBUG;
+  public static final boolean IS_INTERNAL_BUILD = BuildConfig.IS_INTERNAL_BUILD;
+  public static final int EXOPACKAGE_FLAGS = BuildConfig.EXOPACKAGE_FLAGS;
+}

package/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultReactHost.kt

@@ -17,7 +17,6 @@ import com.facebook.react.bridge.ReactContext
 import com.facebook.react.common.annotations.UnstableReactNativeAPI
 import com.facebook.react.common.build.ReactBuildConfig
 import com.facebook.react.fabric.ComponentFactory
-import com.facebook.react.interfaces.exceptionmanager.ReactJsExceptionHandler
 import com.facebook.react.runtime.JSCInstance
 import com.facebook.react.runtime.ReactHostImpl
 import com.facebook.react.runtime.cxxreactpackage.CxxReactPackage
@@ -74,8 +73,6 @@ public object DefaultReactHost {
               reactPackages = packageList,
               jsRuntimeFactory = jsRuntimeFactory,
               turboModuleManagerDelegateBuilder = defaultTmmDelegateBuilder)
-      // TODO: T180971255 Improve default exception handler
-      val reactJsExceptionHandler = ReactJsExceptionHandler { _ -> }
       val componentFactory = ComponentFactory()
       DefaultComponentsRegistry.register(componentFactory)
       // TODO: T164788699 find alternative of accessing ReactHostImpl for initialising reactHost
@@ -85,7 +82,6 @@ public object DefaultReactHost {
                   defaultReactHostDelegate,
                   componentFactory,
                   true /* allowPackagerServerAccess */,
-                  reactJsExceptionHandler,
                   useDevSupport,
               )
               .apply {

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/StackTraceHelper.java

@@ -8,12 +8,17 @@
 package com.facebook.react.devsupport;
 
 import androidx.annotation.Nullable;
+import com.facebook.react.bridge.JavaOnlyArray;
+import com.facebook.react.bridge.JavaOnlyMap;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableType;
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.devsupport.interfaces.StackFrame;
+import com.facebook.react.interfaces.exceptionmanager.ReactJsExceptionHandler.ParsedError;
 import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.json.JSONArray;
@@ -23,8 +28,15 @@ import org.json.JSONObject;
 /** Helper class converting JS and Java stack traces into arrays of {@link StackFrame} objects. */
 public class StackTraceHelper {
 
-  public static final java.lang.String COLUMN_KEY = "column";
-  public static final java.lang.String LINE_NUMBER_KEY = "lineNumber";
+  public static final String COLUMN_KEY = "column";
+  public static final String LINE_NUMBER_KEY = "lineNumber";
+  public static final String FILE_KEY = "file";
+  public static final String METHOD_NAME_KEY = "methodName";
+
+  public static final String MESSAGE_KEY = "message";
+  public static final String STACK_KEY = "stack";
+  public static final String ID_KEY = "id";
+  public static final String IS_FATAL_KEY = "isFatal";
 
   private static final Pattern STACK_FRAME_PATTERN1 =
       Pattern.compile("^(?:(.*?)@)?(.*?)\\:([0-9]+)\\:([0-9]+)$");
@@ -246,4 +258,25 @@ public class StackTraceHelper {
 
     return stackTrace.toString();
   }
+
+  public static JavaOnlyMap convertParsedError(ParsedError error) {
+    List<ParsedError.StackFrame> frames = error.getFrames();
+    List<ReadableMap> readableMapList = new ArrayList<>();
+    for (ParsedError.StackFrame frame : frames) {
+      JavaOnlyMap map = new JavaOnlyMap();
+      map.putDouble(COLUMN_KEY, frame.getColumnNumber());
+      map.putDouble(LINE_NUMBER_KEY, frame.getLineNumber());
+      map.putString(FILE_KEY, (String) frame.getFileName());
+      map.putString(METHOD_NAME_KEY, (String) frame.getMethodName());
+      readableMapList.add(map);
+    }
+
+    JavaOnlyMap data = new JavaOnlyMap();
+    data.putString(MESSAGE_KEY, error.getMessage());
+    data.putArray(STACK_KEY, JavaOnlyArray.from(readableMapList));
+    data.putInt(ID_KEY, error.getExceptionId());
+    data.putBoolean(IS_FATAL_KEY, error.isFatal());
+
+    return data;
+  }
 }

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

@@ -18,5 +18,5 @@ public class ReactNativeVersion {
       "major", 0,
       "minor", 75,
       "patch", 0,
-      "prerelease", "rc.2");
+      "prerelease", "rc.4");
 }

package/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.java

@@ -57,7 +57,6 @@ import com.facebook.react.devsupport.interfaces.DevSupportManager.PausedInDebugg
 import com.facebook.react.fabric.ComponentFactory;
 import com.facebook.react.fabric.FabricUIManager;
 import com.facebook.react.interfaces.TaskInterface;
-import com.facebook.react.interfaces.exceptionmanager.ReactJsExceptionHandler;
 import com.facebook.react.interfaces.fabric.ReactSurface;
 import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
 import com.facebook.react.modules.appearance.AppearanceModule;
@@ -102,7 +101,6 @@ public class ReactHostImpl implements ReactHost {
   private final Context mContext;
   private final ReactHostDelegate mReactHostDelegate;
   private final ComponentFactory mComponentFactory;
-  private final ReactJsExceptionHandler mReactJsExceptionHandler;
   private final DevSupportManager mDevSupportManager;
   private final Executor mBGExecutor;
   private final Executor mUIExecutor;
@@ -145,7 +143,6 @@ public class ReactHostImpl implements ReactHost {
       ReactHostDelegate delegate,
       ComponentFactory componentFactory,
       boolean allowPackagerServerAccess,
-      ReactJsExceptionHandler reactJsExceptionHandler,
       boolean useDevSupport) {
     this(
         context,
@@ -153,7 +150,6 @@ public class ReactHostImpl implements ReactHost {
         componentFactory,
         Executors.newSingleThreadExecutor(),
         Task.UI_THREAD_EXECUTOR,
-        reactJsExceptionHandler,
         allowPackagerServerAccess,
         useDevSupport);
   }
@@ -164,7 +160,6 @@ public class ReactHostImpl implements ReactHost {
       ComponentFactory componentFactory,
       Executor bgExecutor,
       Executor uiExecutor,
-      ReactJsExceptionHandler reactJsExceptionHandler,
       boolean allowPackagerServerAccess,
       boolean useDevSupport) {
     mContext = context;
@@ -172,7 +167,6 @@ public class ReactHostImpl implements ReactHost {
     mComponentFactory = componentFactory;
     mBGExecutor = bgExecutor;
     mUIExecutor = uiExecutor;
-    mReactJsExceptionHandler = reactJsExceptionHandler;
     mQueueThreadExceptionHandler = ReactHostImpl.this::handleHostException;
     mMemoryPressureRouter = new MemoryPressureRouter(context);
     mAllowPackagerServerAccess = allowPackagerServerAccess;
@@ -1074,7 +1068,6 @@ public class ReactHostImpl implements ReactHost {
                             mComponentFactory,
                             devSupportManager,
                             mQueueThreadExceptionHandler,
-                            mReactJsExceptionHandler,
                             mUseDevSupport,
                             getOrCreateReactHostInspectorTarget());
                     mReactInstance = instance;

package/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactInstance.java

@@ -10,6 +10,8 @@ package com.facebook.react.runtime;
 import android.content.res.AssetManager;
 import android.view.View;
 import com.facebook.common.logging.FLog;
+import com.facebook.fbreact.specs.NativeExceptionsManagerSpec;
+import com.facebook.infer.annotation.Assertions;
 import com.facebook.infer.annotation.Nullsafe;
 import com.facebook.infer.annotation.ThreadConfined;
 import com.facebook.infer.annotation.ThreadSafe;
@@ -21,6 +23,7 @@ import com.facebook.react.ViewManagerOnDemandReactPackage;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.JSBundleLoader;
 import com.facebook.react.bridge.JSBundleLoaderDelegate;
+import com.facebook.react.bridge.JavaOnlyMap;
 import com.facebook.react.bridge.JavaScriptContextHolder;
 import com.facebook.react.bridge.NativeArray;
 import com.facebook.react.bridge.NativeMap;
@@ -35,6 +38,7 @@ import com.facebook.react.bridge.queue.QueueThreadExceptionHandler;
 import com.facebook.react.bridge.queue.ReactQueueConfiguration;
 import com.facebook.react.bridge.queue.ReactQueueConfigurationImpl;
 import com.facebook.react.bridge.queue.ReactQueueConfigurationSpec;
+import com.facebook.react.devsupport.StackTraceHelper;
 import com.facebook.react.devsupport.interfaces.DevSupportManager;
 import com.facebook.react.fabric.Binding;
 import com.facebook.react.fabric.BindingImpl;
@@ -110,7 +114,6 @@ final class ReactInstance {
       ComponentFactory componentFactory,
       DevSupportManager devSupportManager,
       QueueThreadExceptionHandler exceptionHandler,
-      ReactJsExceptionHandler reactExceptionManager,
       boolean useDevSupport,
       @Nullable ReactHostInspectorTarget reactHostInspectorTarget) {
     mBridgelessReactContext = bridgelessReactContext;
@@ -154,6 +157,7 @@ final class ReactInstance {
     // Notify JS if profiling is enabled
     boolean isProfiling =
         Systrace.isTracing(Systrace.TRACE_TAG_REACT_APPS | Systrace.TRACE_TAG_REACT_JS_VM_CALLS);
+
     mHybridData =
         initHybrid(
             jsRuntimeFactory,
@@ -161,7 +165,7 @@ final class ReactInstance {
             nativeModulesMessageQueueThread,
             mJavaTimerManager,
             jsTimerExecutor,
-            reactExceptionManager,
+            new ReactJsExceptionHandlerImpl(nativeModulesMessageQueueThread),
             bindingsInstaller,
             isProfiling,
             reactHostInspectorTarget);
@@ -313,6 +317,29 @@ final class ReactInstance {
     return mQueueConfiguration;
   }
 
+  private class ReactJsExceptionHandlerImpl implements ReactJsExceptionHandler {
+    private final MessageQueueThread mNativemodulesmessagequeuethread;
+
+    ReactJsExceptionHandlerImpl(MessageQueueThread nativeModulesMessageQueueThread) {
+      this.mNativemodulesmessagequeuethread = nativeModulesMessageQueueThread;
+    }
+
+    @Override
+    public void reportJsException(ParsedError error) {
+      JavaOnlyMap data = StackTraceHelper.convertParsedError(error);
+
+      // Simulate async native module method call
+      mNativemodulesmessagequeuethread.runOnQueue(
+          () -> {
+            NativeExceptionsManagerSpec exceptionsManager =
+                (NativeExceptionsManagerSpec)
+                    Assertions.assertNotNull(
+                        mTurboModuleManager.getModule(NativeExceptionsManagerSpec.NAME));
+            exceptionsManager.reportException(data);
+          });
+    }
+  }
+
   public void loadJSBundle(JSBundleLoader bundleLoader) {
     // Load the JS bundle
     Systrace.beginSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "ReactInstance.loadJSBundle");

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -18,7 +18,7 @@ constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 75;
   int32_t Patch = 0;
-  std::string_view Prerelease = "rc.2";
+  std::string_view Prerelease = "rc.4";
 } ReactNativeVersion;
 
 } // namespace facebook::react

package/ReactCommon/jsi/jsi/decorator.h

@@ -654,6 +654,20 @@ class WithRuntimeDecorator : public RuntimeDecorator<Plain, Base> {
     return RD::getHostFunction(f);
   };
 
+  bool hasNativeState(const Object& o) override {
+    Around around{with_};
+    return RD::hasNativeState(o);
+  };
+  std::shared_ptr<NativeState> getNativeState(const Object& o) override {
+    Around around{with_};
+    return RD::getNativeState(o);
+  };
+  void setNativeState(const Object& o, std::shared_ptr<NativeState> state)
+      override {
+    Around around{with_};
+    RD::setNativeState(o, state);
+  };
+
   Value getProperty(const Object& o, const PropNameID& name) override {
     Around around{with_};
     return RD::getProperty(o, name);

package/ReactCommon/react/renderer/core/ShadowNode.cpp

@@ -410,4 +410,10 @@ SharedDebugStringConvertibleList ShadowNode::getDebugProps() const {
 }
 #endif
 
+// Explicitly define destructors here, as they need to exist in order to act as
+// a "key function" for the ShadowNodeWrapper class -- this allows for RTTI to
+// work properly across dynamic library boundaries (i.e. dynamic_cast that is
+// used by getNativeState method)
+ShadowNodeWrapper::~ShadowNodeWrapper() = default;
+
 } // namespace facebook::react

package/ReactCommon/react/renderer/core/ShadowNode.h

@@ -282,6 +282,11 @@ struct ShadowNodeWrapper : public jsi::NativeState {
   explicit ShadowNodeWrapper(ShadowNode::Shared shadowNode)
       : shadowNode(std::move(shadowNode)) {}
 
+  // The below method needs to be implemented out-of-line in order for the class
+  // to have at least one "key function" (see
+  // https://itanium-cxx-abi.github.io/cxx-abi/abi.html#vague-vtable)
+  ~ShadowNodeWrapper() override;
+
   ShadowNode::Shared shadowNode;
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.75.0-rc.2",
+  "version": "0.75.0-rc.4",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -112,13 +112,13 @@
     "@react-native-community/cli": "14.0.0-alpha.11",
     "@react-native-community/cli-platform-android": "14.0.0-alpha.11",
     "@react-native-community/cli-platform-ios": "14.0.0-alpha.11",
-    "@react-native/assets-registry": "0.75.0-rc.2",
-    "@react-native/codegen": "0.75.0-rc.2",
-    "@react-native/community-cli-plugin": "0.75.0-rc.2",
-    "@react-native/gradle-plugin": "0.75.0-rc.2",
-    "@react-native/js-polyfills": "0.75.0-rc.2",
-    "@react-native/normalize-colors": "0.75.0-rc.2",
-    "@react-native/virtualized-lists": "0.75.0-rc.2",
+    "@react-native/assets-registry": "0.75.0-rc.4",
+    "@react-native/codegen": "0.75.0-rc.4",
+    "@react-native/community-cli-plugin": "0.75.0-rc.4",
+    "@react-native/gradle-plugin": "0.75.0-rc.4",
+    "@react-native/js-polyfills": "0.75.0-rc.4",
+    "@react-native/normalize-colors": "0.75.0-rc.4",
+    "@react-native/virtualized-lists": "0.75.0-rc.4",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",
@@ -137,7 +137,7 @@
     "nullthrows": "^1.1.1",
     "pretty-format": "^26.5.2",
     "promise": "^8.3.0",
-    "react-devtools-core": "5.1.0",
+    "react-devtools-core": "^5.3.1",
     "react-refresh": "^0.14.0",
     "regenerator-runtime": "^0.13.2",
     "scheduler": "0.25.0-rc-fb9a90fa48-20240614",

package/scripts/cocoapods/autolinking.rb

@@ -168,7 +168,7 @@ def link_native_modules!(config)
 
         # Support passing in a path relative to the root of the package
         if phase["path"]
-          phase["script"] = File.read(File.expand_path(phase["path"], package["root"]))
+          phase["script"] = File.read(File.expand_path(phase["path"], package[:path]))
           phase.delete("path")
         end
 

package/scripts/codegen/generate-artifacts-executor.js

@@ -365,7 +365,7 @@ function computeOutputPath(projectRoot, baseOutputPath, pkgJson, platform) {
   if (baseOutputPath == null) {
     const outputDirFromPkgJson = readOutputDirFromPkgJson(pkgJson, platform);
     if (outputDirFromPkgJson != null) {
-      baseOutputPath = outputDirFromPkgJson;
+      baseOutputPath = path.join(projectRoot, outputDirFromPkgJson);
     } else {
       baseOutputPath = projectRoot;
     }

package/sdks/.hermesversion

@@ -1 +1 @@
-hermes-2024-06-17-RNv0.75.0-c2c4ee7dfcf4b006268ee215b63f79e9cbeedcf4
+hermes-2024-07-01-RNv0.75.0-1edbe36ce92fef2c4d427f5c4e104f2758f4b692