Sync fork with chromium/7103#172
Merged
Merged
Conversation
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Re-land of #170, because I've accidentally squashed commits.
Summary
Upgrades the
react-native-devtools-frontendfork fromchromium/6613to the upstreamchromium/7103branch.There were a total of ~51 conflicts, resolved as below:
File conflicts
.gitignore— Merge changesREADME.md— Keep oursCONTRIBUTING.md— Both added, keep oursconfig/gni/devtools_grd_files.gni— Merge changesfront_end/BUILD.gn— Merge changesfront_end/core/root/Runtime.ts— Merge changesfront_end/core/sdk/Connections.ts— Merge changesonConnectionLostintroduced in Report WebSocket connection termination error code and message #156.front_end/core/sdk/PageResourceLoader.ts— Merge changesfront_end/core/sdk/sdk-meta.ts— Merge changesskip-stack-frames-patterndefault (Restore skip-stack-frames-pattern setting with empty default #137)front_end/core/sdk/sdk.ts— Keep bothfront_end/entrypoints/inspector_main/BUILD.gn— Keep bothfront_end/entrypoints/main/BUILD.gn— Keep bothfront_end/entrypoints/main/MainImpl.ts— mergefront_end/entrypoints/shell/BUILD.gn— Keep bothfront_end/models/source_map_scopes/NamesResolver.test.ts— Use upstream, then reapply Performance: hide more unsupported features #150front_end/models/source_map_scopes/NamesResolver.ts— Use upstream, then reapply Performance: hide more unsupported features #150front_end/models/trace/handlers/RendererHandler.ts— Mergefront_end/models/trace/handlers/WarningsHandler.test.ts— Use upstream, then reapply Performance: hide more unsupported features #150front_end/models/trace/helpers/SyntheticEvents.test.ts— Use upstream, then reapply Performance: hide more unsupported features #150front_end/models/trace/insights/DocumentLatency.test.ts— Use upstream, then reapply Performance: hide more unsupported features #150front_end/models/trace/insights/InteractionToNextPaint.test.ts— Use upstream, then reapply Performance: hide more unsupported features #150front_end/models/trace/lantern/core/NetworkAnalyzer.test.ts— Use upstream, then reapply Performance: hide more unsupported features #150front_end/panels/console/ConsolePrompt.ts- Use upstream, then reapply Disable console-eager-eval and Live Expressions panel #164front_end/panels/console/ConsoleView.ts- Use upstream, then reapply Disable console-eager-eval and Live Expressions panel #164front_end/panels/console/console-meta.ts- Use upstream, then reapply Disable console-eager-eval and Live Expressions panel #164front_end/panels/console/consoleView.css— Keep both CSS additionsfront_end/panels/console/ErrorStackParser.test.ts— Use upstream, then reapply Performance: hide more unsupported features #150front_end/panels/network/network-meta.ts— Keep oursfront_end/panels/network/NetworkLogView.ts— Keep our customisationsfront_end/panels/network/NetworkPanel.ts— Keep our customisationsfront_end/panels/profiler/HeapSnapshotView.ts— MergernPerfMetricscalls.front_end/panels/sources/SourcesView.ts— Use upstreamfront_end/panels/sources/UISourceCodeFrame.ts— Keep our customisationsfront_end/panels/timeline/EntriesFilter.test.ts— Use upstream, then reapply Performance: hide more unsupported features #150front_end/panels/timeline/Initiators.test.ts— Use upstream, then reapply Performance: hide more unsupported features #150front_end/panels/timeline/ModificationsManager.test.ts— Use upstream, then reapply Performance: hide more unsupported features #150front_end/panels/timeline/TimelineFlameChartDataProvider.ts— Keep our customisationsfront_end/panels/timeline/TimelinePanel.ts— Mergefront_end/panels/timeline/TimelineLandingPage.ts— Deleted upstreamfront_end/panels/timeline/TimingsTrackAppender.ts— Use upstreamfront_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 upstreamfront_end/ui/legacy/ActionRegistration.ts— Keep our extra iconsfront_end/ui/legacy/BUILD.gn— Mergefront_end/ui/legacy/components/utils/TargetDetachedDialog.ts— Merge changesconnectionLostintroduced in Report WebSocket connection termination error code and message #156.front_end/ui/legacy/inspectorCommon.css— Use upstream (not modified by us)front_end/ui/legacy/remoteDebuggingTerminatedScreen.css— Keep oursfront_end/ui/legacy/RemoteDebuggingTerminatedScreen.ts— Mergedlit-html->lit.front_end/ui/legacy/theme_support/ThemeSupport.ts— Mergethird_party/node/node.py— Use upstream (includes our fix)Linter
npm run lintnow succeeds.Tests
ProtocolMonitor.test.ts, because we changed the order or domains by addingReactNativeApplicationdomain, which is always declared first.UserActionRow.test.ts, because of unknown 2.88% difference. This is used for AI features, which are disabled by default, and which we don't currently support.npm run test -- front_endsucceeds on CI. I had to downgrade our Ubuntu because of this - [Bug]: "No usable sandbox!" with user namespace cloning enabled puppeteer/puppeteer#12818, https://issues.chromium.org/issues/373753919.npm run test -- front_endwork locally on Mac, for some reason tests insidepanels/recorderare failing.Test plan
Smoke testing
main.main.Upstreaming plan
devtools-frontendrepo. I've reviewed the contribution guide.