Conversation
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes SSR/hydration issues for the React UnresolvedFile integration by ensuring client-side parsing/hydration matches the server-rendered output and by improving hydration setup for UnresolvedFile instances.
Changes:
- Pass
options.maxContextLinesthrough when parsing merge-conflict diffs in the ReactuseUnresolvedFileInstancehook (prevents SSR/client mismatch). - Rework
UnresolvedFile.hydrateto explicitly wire up shadow DOM nodes from prerendered HTML and perform the necessary renderer/manager setup. - Expose selected
FileDiffinternals asprotectedso subclasses (likeUnresolvedFile) can reuse them during hydration.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
| packages/diffs/src/react/utils/useUnresolvedFileInstance.ts | Syncs initial merge-conflict diff parsing with SSR via maxContextLines; updates the hook’s options typing. |
| packages/diffs/src/components/UnresolvedFile.ts | Custom hydration flow for SSR: prerender handling + node discovery + renderer/manager initialization + merge-conflict slot setup. |
| packages/diffs/src/components/FileDiff.ts | Changes several internal helpers from private to protected to support subclass orchestration during hydration. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
Fixes two UnresolveFile bugs
maxContextLinesnot getting synced through from SSR