Skip to content

Sync fork with chromium/7103#161

Closed
huntie wants to merge 4071 commits into
mainfrom
repo-sync
Closed

Sync fork with chromium/7103#161
huntie wants to merge 4071 commits into
mainfrom
repo-sync

Conversation

@huntie

@huntie huntie commented May 9, 2025

Copy link
Copy Markdown
Member

Summary

Syncs the react-native-devtools-frontend fork with the upstream chromium/7103 branch (most recent stable from https://chromiumdash.appspot.com/branches).

There were a total of ~52 conflicts, resolved as below:

File conflicts

  • .gitignore — Merge changes
  • README.md — Keep ours
  • CONTRIBUTING.md — Both added, keep ours
  • config/gni/devtools_grd_files.gni — Merge changes
  • front_end/BUILD.gn — Merge changes
  • front_end/core/root/Runtime.ts — Merge changes
  • front_end/core/sdk/Connections.ts — Merge changes
  • front_end/core/sdk/PageResourceLoader.ts — Merge changes
    • Use upstream renamed enum keys.
  • front_end/core/sdk/sdk-meta.ts — Merge changes
  • front_end/core/sdk/sdk.ts — Keep both
  • front_end/entrypoints/inspector_main/BUILD.gn — Keep both
  • front_end/entrypoints/main/BUILD.gn — Keep both
  • front_end/entrypoints/main/MainImpl.ts — merge
  • front_end/entrypoints/shell/BUILD.gn — Keep both
  • front_end/models/source_map_scopes/NamesResolver.test.ts — Use upstream, then reapply Performance: hide more unsupported features #150
  • front_end/models/source_map_scopes/NamesResolver.ts — Use upstream, then reapply Performance: hide more unsupported features #150
  • front_end/models/trace/handlers/RendererHandler.ts — Merge
  • front_end/models/trace/handlers/WarningsHandler.test.ts — Use upstream, then reapply Performance: hide more unsupported features #150
  • front_end/models/trace/helpers/SyntheticEvents.test.ts — Use upstream, then reapply Performance: hide more unsupported features #150
  • front_end/models/trace/insights/DocumentLatency.test.ts — Use upstream, then reapply Performance: hide more unsupported features #150
  • front_end/models/trace/insights/InteractionToNextPaint.test.ts — Use upstream, then reapply Performance: hide more unsupported features #150
  • front_end/models/trace/lantern/core/NetworkAnalyzer.test.ts — Use upstream, then reapply Performance: hide more unsupported features #150
  • front_end/panels/console/consoleView.css — Keep both CSS additions
  • front_end/panels/console/ErrorStackParser.test.ts — Use upstream, then reapply Performance: hide more unsupported features #150
  • front_end/panels/network/network-meta.ts — Keep ours
  • front_end/panels/network/NetworkLogView.ts — Keep our customisations
  • front_end/panels/network/NetworkPanel.ts — Keep our customisations
  • front_end/panels/profiler/HeapSnapshotView.ts — Merge
    • Preserve our rnPerfMetrics calls.
  • front_end/panels/sources/SourcesView.ts — Use upstream
    • Conditionally hidden UI no longer present.
  • front_end/panels/sources/UISourceCodeFrame.ts — Keep our customisations
  • front_end/panels/timeline/EntriesFilter.test.ts — Use upstream, then reapply Performance: hide more unsupported features #150
  • front_end/panels/timeline/Initiators.test.ts — Use upstream, then reapply Performance: hide more unsupported features #150
  • front_end/panels/timeline/ModificationsManager.test.ts — Use upstream, then reapply Performance: hide more unsupported features #150
  • front_end/panels/timeline/TimelineFlameChartDataProvider.ts — Keep our customisations
  • front_end/panels/timeline/TimelinePanel.ts — Merge
    • Preserve our disabled Performance features.
  • front_end/panels/timeline/TimelineLandingPage.ts — Deleted upstream
  • front_end/panels/timeline/TimingsTrackAppender.ts — Use upstream
  • front_end/testing/EnvironmentHelpers.ts — Keep both (experiment keys)
  • front_end/third_party/additional_readme_paths.json — Keep both (manifest file)
  • front_end/ui/components/input/checkbox.css — Use upstream
  • front_end/ui/legacy/ActionRegistration.ts — Keep our extra icons
  • front_end/ui/legacy/BUILD.gn — Merge
  • front_end/ui/legacy/components/utils/TargetDetachedDialog.ts — Merge changes
  • front_end/ui/legacy/inspectorCommon.css — Use upstream (not modified by us)
  • front_end/ui/legacy/remoteDebuggingTerminatedScreen.css — Keep ours
  • front_end/ui/legacy/RemoteDebuggingTerminatedScreen.ts — Merged
    • Keep our dialog design, lit-html -> lit.
  • front_end/ui/legacy/theme_support/ThemeSupport.ts — Merge
    • Preserve our baseline-greyscale override.
  • third_party/node/node.py — Use upstream (includes our fix)

Test plan

To dos

[Incoming]

Upstreaming plan

  • This commit should be sent as a patch to the upstream devtools-frontend repo. I've reviewed the contribution guide.
  • This commit is React Native-specific and cannot be upstreamed.

Loading
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.