Skip to content

Commit 11e5394

Browse files
cipolleschifacebook-github-bot
authored andcommitted
Revert D58288489: Multisect successfully blamed "D58288489: [RN][Fusebox][iOS] Implement new HostTargetMetadata fields (iOS)" for one test failure (#44911)
Summary: Pull Request resolved: #44911 This diff reverts D58288489 D58288489: [RN][Fusebox][iOS] Implement new HostTargetMetadata fields (iOS) by huntie causes the following test failure: Tests affected: - [fbsource//xplat/js/react-native-github/packages/react-native/ReactCommon/jsinspector-modern:testsAndroid - main](https://www.internalfb.com/intern/test/844425054538351/) Here's the Multisect link: https://www.internalfb.com/multisect/5466028 Here are the tasks that are relevant to this breakage: T191385299: 50+ tests unhealthy for react_native The backout may land if someone accepts it. If this diff has been generated in error, you can Commandeer and Abandon it. Changelog: [Internal] Reviewed By: NickGerleman Differential Revision: D58475289 fbshipit-source-id: 3a4476d1350c4986cdb673bdb4ac52af353a00ea
1 parent 297ded9 commit 11e5394

File tree

6 files changed

+1
-89
lines changed

6 files changed

+1
-89
lines changed

packages/react-native/React/Base/RCTBridge.mm

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#import <jsinspector-modern/ReactCdp.h>
2121
#import <optional>
2222
#import "RCTDevLoadingViewProtocol.h"
23-
#import "RCTInspectorUtils.h"
2423
#import "RCTJSThread.h"
2524
#import "RCTLog.h"
2625
#import "RCTModuleData.h"
@@ -200,14 +199,8 @@ void RCTUIManagerSetDispatchAccessibilityManagerInitOntoMain(BOOL enabled)
200199

201200
facebook::react::jsinspector_modern::HostTargetMetadata getMetadata() override
202201
{
203-
auto metadata = [RCTInspectorUtils getHostMetadata];
204-
205202
return {
206-
.appIdentifier = metadata.appIdentifier,
207-
.deviceName = metadata.deviceName,
208203
.integrationName = "iOS Bridge (RCTBridge)",
209-
.platform = metadata.platform,
210-
.reactNativeVersion = metadata.reactNativeVersion,
211204
};
212205
}
213206

packages/react-native/React/DevSupport/RCTInspectorUtils.h

Lines changed: 0 additions & 23 deletions
This file was deleted.

packages/react-native/React/DevSupport/RCTInspectorUtils.mm

Lines changed: 0 additions & 42 deletions
This file was deleted.

packages/react-native/ReactCommon/jsinspector-modern/HostTarget.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -223,11 +223,7 @@ bool HostTargetController::decrementPauseOverlayCounter() {
223223
folly::dynamic hostMetadataToDynamic(const HostTargetMetadata& metadata) {
224224
folly::dynamic result = folly::dynamic::object;
225225

226-
result["appIdentifier"] = metadata.appIdentifier.value_or(nullptr);
227-
result["deviceName"] = metadata.deviceName.value_or(nullptr);
228226
result["integrationName"] = metadata.integrationName.value_or(nullptr);
229-
result["platform"] = metadata.platform.value_or(nullptr);
230-
result["reactNativeVersion"] = metadata.reactNativeVersion.value_or(nullptr);
231227

232228
return result;
233229
}

packages/react-native/ReactCommon/jsinspector-modern/HostTarget.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,7 @@ class HostCommandSender;
3737
class HostTarget;
3838

3939
struct HostTargetMetadata {
40-
std::optional<std::string> appIdentifier;
41-
std::optional<std::string> deviceName;
4240
std::optional<std::string> integrationName;
43-
std::optional<std::string> platform;
44-
std::optional<std::string> reactNativeVersion;
4541
};
4642

4743
/**
@@ -94,8 +90,7 @@ class HostTargetDelegate {
9490
virtual ~HostTargetDelegate();
9591

9692
/**
97-
* Returns a metadata object describing the host. This is called on an
98-
* initial response to @cdp ReactNativeApplication.enable.
93+
* Returns a metadata object describing the host.
9994
*/
10095
virtual HostTargetMetadata getMetadata() = 0;
10196

packages/react-native/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTHost.mm

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#import <React/RCTConvert.h>
1414
#import <React/RCTFabricSurface.h>
1515
#import <React/RCTInspectorDevServerHelper.h>
16-
#import <React/RCTInspectorUtils.h>
1716
#import <React/RCTJSThread.h>
1817
#import <React/RCTLog.h>
1918
#import <React/RCTMockDef.h>
@@ -43,14 +42,8 @@ @interface RCTHost () <RCTReloadListener, RCTInstanceDelegate>
4342

4443
jsinspector_modern::HostTargetMetadata getMetadata() override
4544
{
46-
auto metadata = [RCTInspectorUtils getHostMetadata];
47-
4845
return {
49-
.appIdentifier = metadata.appIdentifier,
50-
.deviceName = metadata.deviceName,
5146
.integrationName = "iOS Bridgeless (RCTHost)",
52-
.platform = metadata.platform,
53-
.reactNativeVersion = metadata.reactNativeVersion,
5447
};
5548
}
5649

0 commit comments

Comments
 (0)