react-native 0.89.0-rc.0 → 0.89.0-rc.1

package/Libraries/Core/ReactNativeVersion.js

@@ -29,7 +29,7 @@ export default class ReactNativeVersion {
   static major: number = 0;
   static minor: number = 89;
   static patch: number = 0;
-  static prerelease: string | null = 'rc.0';
+  static prerelease: string | null = 'rc.1';
 
   static getVersionString(): string {
     return `${this.major}.${this.minor}.${this.patch}${this.prerelease != null ? `-${this.prerelease}` : ''}`;

package/Libraries/WebSocket/WebSocket.js

@@ -143,8 +143,10 @@ class WebSocket extends EventTarget {
     );
     this._socketId = nextWebSocketId++;
     this._registerEvents();
+    // Skip this constructor's own frame so that the request initiator stack
+    // starts at the caller of `new WebSocket()`.
     const devToolsRequestId =
-      global.__NETWORK_REPORTER__?.createDevToolsRequestId();
+      global.__NETWORK_REPORTER__?.createDevToolsRequestId(1);
     NativeWebSocketModule.connect(
       url,
       protocolList,

package/React/Base/RCTVersion.m

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

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.89.0-rc.0
+VERSION_NAME=0.89.0-rc.1
 react.internal.publishingGroup=com.facebook.react
 react.internal.hermesPublishingGroup=com.facebook.hermes
 

package/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/SurfaceMountingManager.kt

@@ -335,7 +335,11 @@ internal constructor(
       logViewHierarchy(parentView, false)
     }
 
-    val currParentView = view.parent
+    var currParentView = view.parent
+    if (currParentView is ViewGroup && currParentView.indexOfChild(view) == -1) {
+      currParentView.endViewTransition(view)
+      currParentView = view.parent
+    }
     if (currParentView != null) {
       val actualParentId = if (currParentView is ViewGroup) currParentView.id else View.NO_ID
       ReactSoftExceptionLogger.logSoftException(

package/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsDefaults.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<a1368426dd823245c54b4312ae7b14e6>>
+ * @generated SignedSource<<a6e126a832b5fd1f74aa8f2d02280f2e>>
  */
 
 /**
@@ -157,7 +157,7 @@ public open class ReactNativeFeatureFlagsDefaults : ReactNativeFeatureFlagsProvi
 
   override fun fuseboxScreenshotCaptureEnabled(): Boolean = true
 
-  override fun fuseboxWebSocketEventsEnabled(): Boolean = false
+  override fun fuseboxWebSocketEventsEnabled(): Boolean = true
 
   override fun keepTimersRunningWhileHostPausedAndroid(): Boolean = false
 

package/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeFeatureFlagsOverrides_RNOSS_Canary_Android.kt

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<c82895ef7e5cee6ba387620a43aa88b8>>
+ * @generated SignedSource<<fd455a2209f9998345d96f9e81697113>>
  */
 
 /**
@@ -37,8 +37,6 @@ public open class ReactNativeFeatureFlagsOverrides_RNOSS_Canary_Android : ReactN
 
   override fun fuseboxFrameRecordingEnabled(): Boolean = true
 
-  override fun fuseboxWebSocketEventsEnabled(): Boolean = true
-
   override fun useNativeViewConfigsInBridgelessMode(): Boolean = true
 
   override fun useTurboModuleInterop(): Boolean = true

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

@@ -15,6 +15,6 @@ public object ReactNativeVersion {
     "major" to 0,
     "minor" to 89,
     "patch" to 0,
-    "prerelease" to "rc.0"
+    "prerelease" to "rc.1"
   )
 }

package/ReactCommon/jsinspector-modern/RuntimeTargetNetwork.cpp

@@ -11,6 +11,8 @@
 
 #include <react/utils/Uuid.h>
 
+#include <algorithm>
+
 using namespace facebook::jsi;
 using namespace std::string_literals;
 
@@ -44,8 +46,16 @@ void RuntimeTarget::installNetworkReporterAPI() {
   auto jsiCreateDevToolsRequestId = [selfWeak = weak_from_this()](
                                         Runtime& runtime,
                                         const Value& /*thisVal*/,
-                                        const Value* /*args*/,
-                                        size_t /*count*/) -> Value {
+                                        const Value* args,
+                                        size_t count) -> Value {
+    // Optional `framesToSkip` argument: the number of leading JS call frames
+    // that belong to the calling API's own implementation (e.g. the `WebSocket`
+    // constructor), which are omitted from the recorded initiator stack so
+    // that its top frame is the code that invoked the API.
+    size_t framesToSkip = 0;
+    if (count > 0 && args[0].isNumber()) {
+      framesToSkip = static_cast<size_t>(std::max(0.0, args[0].asNumber()));
+    }
     std::optional<std::string> devToolsRequestId;
     tryExecuteSync(selfWeak, [&](RuntimeTarget& self) {
       devToolsRequestId = self.createNetworkRequestId();
@@ -58,6 +68,15 @@ void RuntimeTarget::installNetworkReporterAPI() {
         auto stackTrace = self.delegate_.captureStackTrace(runtime);
         auto cdpStackTrace = self.delegate_.serializeStackTrace(*stackTrace);
         if (cdpStackTrace) {
+          if (framesToSkip > 0) {
+            if (auto* callFrames = cdpStackTrace->get_ptr("callFrames");
+                callFrames != nullptr && callFrames->isArray()) {
+              callFrames->erase(
+                  callFrames->begin(),
+                  callFrames->begin() +
+                      std::min(framesToSkip, callFrames->size()));
+            }
+          }
           NetworkHandler::getInstance().recordRequestInitiatorStack(
               *devToolsRequestId, std::move(*cdpStackTrace));
         }
@@ -81,7 +100,7 @@ void RuntimeTarget::installNetworkReporterAPI() {
         Function::createFromHostFunction(
             runtime,
             PropNameID::forAscii(runtime, "createDevToolsRequestId"),
-            0,
+            1,
             jsiCreateDevToolsRequestId));
     networkReporterApi = objectFreeze(runtime, std::move(networkReporterApi));
     globalObj.setProperty(runtime, "__NETWORK_REPORTER__", networkReporterApi);

package/ReactCommon/jsinspector-modern/tests/NetworkReporterTest.cpp

@@ -625,6 +625,75 @@ TEST_P(NetworkReporterTest, testWebSocketCreatedWithInitiator) {
                                 })");
 }
 
+TEST_P(NetworkReporterTest, testWebSocketCreatedWithInitiatorFramesToSkip) {
+  InSequence s;
+
+  this->expectMessageFromPage(JsonEq(R"({
+                                          "id": 0,
+                                          "result": {}
+                                      })"));
+  this->toPage_->sendMessage(R"({
+                                  "id": 0,
+                                  "method": "Debugger.enable"
+                              })");
+
+  this->expectMessageFromPage(JsonEq(R"({
+                                          "id": 1,
+                                          "result": {}
+                                        })"));
+  this->toPage_->sendMessage(R"({
+                                  "id": 1,
+                                  "method": "Network.enable"
+                                })");
+
+  auto& runtime = engineAdapter_->getRuntime();
+
+  // `apiShim` stands in for an API implementation (such as the `WebSocket`
+  // constructor) that asks for its own frame to be omitted.
+  auto requestId = this->eval(R"( // line 0
+    function apiShim() { // line 1
+      return globalThis.__NETWORK_REPORTER__.createDevToolsRequestId(1); // line 2
+    } // line 3
+    function openSocket() { // line 4
+      return apiShim(); // line 5
+    } // line 6
+    openSocket(); // line 7
+
+    //# sourceURL=webSocketInitiatorFramesToSkipTest.js
+  )")
+                       .asString(runtime)
+                       .utf8(runtime);
+
+  this->expectMessageFromPage(JsonParsed(AllOf(
+      AtJsonPtr("/method", "Network.webSocketCreated"),
+      AtJsonPtr("/params/requestId", requestId),
+      AtJsonPtr("/params/url", "wss://example.com/frames-to-skip"),
+      AtJsonPtr("/params/initiator/type", "script"),
+      AtJsonPtr(
+          "/params/initiator/stack/callFrames",
+          AllOf(
+              Each(AtJsonPtr("/url", "webSocketInitiatorFramesToSkipTest.js")),
+              ElementsAre(
+                  AllOf(
+                      AtJsonPtr("/functionName", "openSocket"),
+                      AtJsonPtr("/lineNumber", 5)),
+                  AllOf(
+                      AtJsonPtr("/functionName", "global"),
+                      AtJsonPtr("/lineNumber", 7))))))));
+
+  NetworkReporter::getInstance().reportWebSocketCreated(
+      requestId, "wss://example.com/frames-to-skip");
+
+  this->expectMessageFromPage(JsonEq(R"({
+                                          "id": 2,
+                                          "result": {}
+                                        })"));
+  this->toPage_->sendMessage(R"({
+                                  "id": 2,
+                                  "method": "Network.disable"
+                                })");
+}
+
 TEST_P(NetworkReporterTest, testNetworkEventsWhenDisabled) {
   EXPECT_FALSE(NetworkReporter::getInstance().isDebuggingEnabled());
 

package/ReactCommon/react/featureflags/ReactNativeFeatureFlagsDefaults.h

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<35e8175277baa31d135d802ef5a5e6f1>>
+ * @generated SignedSource<<0218b6cf490454e1ccd93001208a58be>>
  */
 
 /**
@@ -298,7 +298,7 @@ class ReactNativeFeatureFlagsDefaults : public ReactNativeFeatureFlagsProvider {
   }
 
   bool fuseboxWebSocketEventsEnabled() override {
-    return false;
+    return true;
   }
 
   bool keepTimersRunningWhileHostPausedAndroid() override {

package/ReactCommon/react/featureflags/ReactNativeFeatureFlagsOverridesOSSCanary.h

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<4b66991416806affd46aab79e36c4a45>>
+ * @generated SignedSource<<739fbf5a89bc456157ea470c43745e9d>>
  */
 
 /**
@@ -57,10 +57,6 @@ class ReactNativeFeatureFlagsOverridesOSSCanary : public ReactNativeFeatureFlags
     return true;
   }
 
-  bool fuseboxWebSocketEventsEnabled() override {
-    return true;
-  }
-
   bool useNativeViewConfigsInBridgelessMode() override {
     return true;
   }

package/ReactCommon/react/utils/ReactNativeVersion.h

@@ -24,7 +24,7 @@ struct ReactNativeVersionType {
   int32_t Major = 0;
   int32_t Minor = 89;
   int32_t Patch = 0;
-  std::string_view Prerelease = "rc.0";
+  std::string_view Prerelease = "rc.1";
 };
 
 constexpr ReactNativeVersionType ReactNativeVersion;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.89.0-rc.0",
+  "version": "0.89.0-rc.1",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -150,22 +150,22 @@
     }
   },
   "dependencies": {
-    "@react-native/asset-utils": "0.89.0-rc.0",
-    "@react-native/codegen": "0.89.0-rc.0",
-    "@react-native/community-cli-plugin": "0.89.0-rc.0",
-    "@react-native/gradle-plugin": "0.89.0-rc.0",
-    "@react-native/normalize-colors": "0.89.0-rc.0",
-    "@react-native/virtualized-lists": "0.89.0-rc.0",
+    "@react-native/asset-utils": "0.89.0-rc.1",
+    "@react-native/codegen": "0.89.0-rc.1",
+    "@react-native/community-cli-plugin": "0.89.0-rc.1",
+    "@react-native/gradle-plugin": "0.89.0-rc.1",
+    "@react-native/normalize-colors": "0.89.0-rc.1",
+    "@react-native/virtualized-lists": "0.89.0-rc.1",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",
     "flow-parser": "0.336.0",
     "base64-js": "^1.5.1",
     "flow-enums-runtime": "^0.0.6",
-    "hermes-compiler": "260318099.0.6",
+    "hermes-compiler": "260318099.0.7",
     "invariant": "^2.2.4",
     "memoize-one": "^6.0.0",
-    "metro-runtime": "^0.87.2",
-    "metro-source-map": "^0.87.2",
+    "metro-runtime": "^0.88.0",
+    "metro-source-map": "^0.88.0",
     "nullthrows": "^1.1.1",
     "pretty-format": "^29.7.0",
     "promise": "^8.3.0",

package/sdks/.hermesv1version

@@ -1 +1 @@
-hermes-v260318099.0.6
+hermes-v260318099.0.7

package/sdks/hermes-engine/version.properties

@@ -1 +1 @@
-HERMES_VERSION_NAME=260318099.0.6
+HERMES_VERSION_NAME=260318099.0.7

package/src/private/featureflags/ReactNativeFeatureFlags.js

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<674f975884ae746e067e614523f2bfc3>>
+ * @generated SignedSource<<368361a1c35df89a29ec93fa18761f79>>
  * @flow strict
  * @noformat
  */
@@ -493,7 +493,7 @@ export const fuseboxScreenshotCaptureEnabled: Getter<boolean> = createNativeFlag
 /**
  * Enable reporting of WebSocket network events (`Network.webSocket*` CDP events) to the React Native DevTools CDP backend.
  */
-export const fuseboxWebSocketEventsEnabled: Getter<boolean> = createNativeFlagGetter('fuseboxWebSocketEventsEnabled', false);
+export const fuseboxWebSocketEventsEnabled: Getter<boolean> = createNativeFlagGetter('fuseboxWebSocketEventsEnabled', true);
 /**
  * Keep JS timers running on Android while the React host is paused, stopping them only when the React instance is destroyed. Matches iOS, where timers do not depend on host lifecycle.
  */