Skip to content

Commit e2b33cb

Browse files
authored
Merge branch 'main' into users/devanb/frames
2 parents e4887b2 + e1dd7af commit e2b33cb

32 files changed

Lines changed: 990 additions & 138 deletions

config/gni/devtools_grd_files.gni

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -995,7 +995,7 @@ grd_files_debug_sources = [
995995
"front_end/entrypoints/node_app/NodeMain.js",
996996
"front_end/entrypoints/node_app/nodeConnectionsPanel.css.js",
997997
"front_end/entrypoints/rn_fusebox/FuseboxAppMetadataObserver.js",
998-
"front_end/entrypoints/rn_fusebox/FuseboxExperimentsObserver.js",
998+
"front_end/entrypoints/rn_fusebox/FuseboxFeatureObserver.js",
999999
"front_end/entrypoints/rn_fusebox/FuseboxReconnectDeviceButton.js",
10001000
"front_end/entrypoints/rn_fusebox/FuseboxWindowTitleManager.js",
10011001
"front_end/entrypoints/shell/browser_compatibility_guard.js",
@@ -1941,9 +1941,12 @@ grd_files_debug_sources = [
19411941
"front_end/panels/timeline/components/NetworkThrottlingSelector.js",
19421942
"front_end/panels/timeline/components/OriginMap.js",
19431943
"front_end/panels/timeline/components/RelatedInsightChips.js",
1944+
"front_end/panels/timeline/components/RNPerfIssueTypes.js",
19441945
"front_end/panels/timeline/components/Sidebar.js",
19451946
"front_end/panels/timeline/components/SidebarAnnotationsTab.js",
19461947
"front_end/panels/timeline/components/SidebarInsightsTab.js",
1948+
"front_end/panels/timeline/components/SidebarRNPerfSignalsTab.js",
1949+
"front_end/panels/timeline/components/SidebarRNPerfIssueItem.js",
19471950
"front_end/panels/timeline/components/SidebarSingleInsightSet.js",
19481951
"front_end/panels/timeline/components/TimelineSummary.js",
19491952
"front_end/panels/timeline/components/Utils.js",
@@ -1994,6 +1997,8 @@ grd_files_debug_sources = [
19941997
"front_end/panels/timeline/components/relatedInsightChips.css.js",
19951998
"front_end/panels/timeline/components/sidebarAnnotationsTab.css.js",
19961999
"front_end/panels/timeline/components/sidebarInsightsTab.css.js",
2000+
"front_end/panels/timeline/components/sidebarRNPerfIssuesTab.css.js",
2001+
"front_end/panels/timeline/components/sidebarRNPerfIssueItem.css.js",
19972002
"front_end/panels/timeline/components/sidebarSingleInsightSet.css.js",
19982003
"front_end/panels/timeline/components/timelineSummary.css.js",
19992004
"front_end/panels/timeline/extensions/ExtensionUI.js",

front_end/core/common/SettingRegistration.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ export const enum SettingCategory {
136136
APPEARANCE = 'APPEARANCE',
137137
SOURCES = 'SOURCES',
138138
NETWORK = 'NETWORK',
139+
NETWORK_UNLESS_RN = '',
139140
PERFORMANCE = 'PERFORMANCE',
140141
CONSOLE = 'CONSOLE',
141142
PERSISTENCE = 'PERSISTENCE',

front_end/core/host/RNPerfMetrics.ts

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,10 @@ class RNPerfMetrics {
216216
}
217217
}
218218

219+
traceRequested(): void {
220+
this.sendEvent({eventName: 'Tracing.TraceRequested'});
221+
}
222+
219223
heapSnapshotStarted(): void {
220224
this.sendEvent({
221225
eventName: 'MemoryPanelActionStarted',
@@ -539,12 +543,17 @@ export type ManualBreakpointSetSucceeded = Readonly<{
539543
}>,
540544
}>;
541545

546+
export type TracingTraceRequestedEvent = Readonly<{
547+
eventName: 'Tracing.TraceRequested',
548+
}>;
549+
542550
export type ReactNativeChromeDevToolsEvent =
543551
EntrypointLoadingStartedEvent|EntrypointLoadingFinishedEvent|DebuggerReadyEvent|BrowserVisibilityChangeEvent|
544552
BrowserErrorEvent|RemoteDebuggingTerminatedEvent|DeveloperResourcesStartupLoadingFinishedEvent|
545553
DeveloperResourceLoadingStartedEvent|DeveloperResourceLoadingFinishedEvent|FuseboxSetClientMetadataStartedEvent|
546-
FuseboxSetClientMetadataFinishedEvent|MemoryPanelActionStartedEvent|MemoryPanelActionFinishedEvent|PanelShownEvent|
547-
PanelClosedEvent|StackTraceSymbolicationSucceeded|StackTraceSymbolicationFailed|StackTraceFrameUrlResolutionSucceeded|
548-
StackTraceFrameUrlResolutionFailed|ManualBreakpointSetSucceeded|StackTraceFrameClicked;
554+
FuseboxSetClientMetadataFinishedEvent|TracingTraceRequestedEvent|MemoryPanelActionStartedEvent|MemoryPanelActionFinishedEvent|
555+
PanelShownEvent|PanelClosedEvent|StackTraceSymbolicationSucceeded|StackTraceSymbolicationFailed|
556+
StackTraceFrameUrlResolutionSucceeded|StackTraceFrameUrlResolutionFailed|ManualBreakpointSetSucceeded|
557+
StackTraceFrameClicked;
549558

550559
export type DecoratedReactNativeChromeDevToolsEvent = CommonEventFields&ReactNativeChromeDevToolsEvent;

front_end/core/root/Runtime.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,6 @@ export const experiments = new ExperimentsSupport();
305305
export enum RNExperimentName {
306306
REACT_NATIVE_SPECIFIC_UI = 'react-native-specific-ui',
307307
JS_HEAP_PROFILER_ENABLE = 'js-heap-profiler-enable',
308-
ENABLE_NETWORK_PANEL = 'enable-network-panel',
309-
ENABLE_TIMELINE_FRAMES = 'enable-timeline-frames',
310308
}
311309

312310
export enum ConditionName {
@@ -517,7 +515,5 @@ export type Condition = (config?: HostConfig) => boolean;
517515
export const conditions = {
518516
canDock: () => Boolean(Runtime.queryParam('can_dock')),
519517
notSourcesHideAddFolder: () => Boolean(Runtime.queryParam(ConditionName.NOT_SOURCES_HIDE_ADD_FOLDER)),
520-
reactNativeUnstableNetworkPanel: () =>
521-
Boolean(Runtime.queryParam(ConditionName.REACT_NATIVE_UNSTABLE_NETWORK_PANEL)) ||
522-
experiments.isEnabled(ExperimentName.ENABLE_NETWORK_PANEL),
518+
reactNativeExpoNetworkPanel: () => Boolean(Runtime.queryParam(ConditionName.REACT_NATIVE_UNSTABLE_NETWORK_PANEL)),
523519
};

front_end/core/sdk/ReactNativeApplicationModel.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,24 @@ export class ReactNativeApplicationModel extends SDKModel<EventTypes> implements
5252
this.dispatchEventToListeners(Events.METADATA_UPDATED, metadata);
5353
}
5454

55+
systemStateChanged(params: Protocol.ReactNativeApplication.SystemStateChangedEvent): void {
56+
this.dispatchEventToListeners(Events.SYSTEM_STATE_CHANGED, params);
57+
}
58+
5559
traceRequested(): void {
60+
Host.rnPerfMetrics.traceRequested();
5661
this.dispatchEventToListeners(Events.TRACE_REQUESTED);
5762
}
5863
}
5964

6065
export const enum Events {
6166
METADATA_UPDATED = 'MetadataUpdated',
67+
SYSTEM_STATE_CHANGED = 'SystemStateChanged',
6268
TRACE_REQUESTED = 'TraceRequested',
6369
}
6470

6571
export interface EventTypes {
6672
[Events.METADATA_UPDATED]: Protocol.ReactNativeApplication.MetadataUpdatedEvent;
73+
[Events.SYSTEM_STATE_CHANGED]: Protocol.ReactNativeApplication.SystemStateChangedEvent;
6774
[Events.TRACE_REQUESTED]: void;
6875
}

front_end/core/sdk/sdk-meta.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1009,7 +1009,7 @@ Common.Settings.registerSettingExtension({
10091009
});
10101010

10111011
Common.Settings.registerSettingExtension({
1012-
category: Common.Settings.SettingCategory.NETWORK,
1012+
category: Common.Settings.SettingCategory.NETWORK_UNLESS_RN,
10131013
title: i18nLazyString(UIStrings.networkRequestBlocking),
10141014
settingName: 'request-blocking-enabled',
10151015
settingType: Common.Settings.SettingType.BOOLEAN,

front_end/entrypoints/inspector_main/inspector_main-meta.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ UI.ActionRegistration.registerActionExtension({
207207
});
208208

209209
Common.Settings.registerSettingExtension({
210-
category: Common.Settings.SettingCategory.NETWORK,
210+
category: Common.Settings.SettingCategory.NETWORK_UNLESS_RN,
211211
title: i18nLazyString(UIStrings.forceAdBlocking),
212212
settingName: 'network.ad-blocking-enabled',
213213
settingType: Common.Settings.SettingType.BOOLEAN,

front_end/entrypoints/rn_fusebox/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ devtools_module("rn_fusebox") {
1111
sources = [
1212
"FuseboxAppMetadataObserver.ts",
1313
"FuseboxReconnectDeviceButton.ts",
14-
"FuseboxExperimentsObserver.ts",
14+
"FuseboxFeatureObserver.ts",
1515
"FuseboxWindowTitleManager.ts",
1616
]
1717

front_end/entrypoints/rn_fusebox/FuseboxExperimentsObserver.ts

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

0 commit comments

Comments
 (0)