-
Notifications
You must be signed in to change notification settings - Fork 10.3k
Follow-up: Improve stopping renderer, fix identity template #61633
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
ilonatommy
wants to merge
9
commits into
dotnet:main
Choose a base branch
from
ilonatommy:improve-stopping-renderer
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
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
/backport to release/10.0-preview4 |
Started backporting to release/10.0-preview4: https://github.com/dotnet/aspnetcore/actions/runs/14759993828 |
@lewing backporting to "release/10.0-preview4" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Remove the hard stop - the whole batch has to finish its rendering.
Using index info to reconstruct a base tree...
M src/Components/Components/src/PublicAPI.Unshipped.txt
M src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.EventDispatch.cs
M src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.cs
CONFLICT (content): Merge conflict in src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.cs
Auto-merging src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.EventDispatch.cs
CONFLICT (content): Merge conflict in src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.EventDispatch.cs
Auto-merging src/Components/Components/src/PublicAPI.Unshipped.txt
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Remove the hard stop - the whole batch has to finish its rendering.
Error: The process '/usr/bin/git' failed with exit code 128 Please backport manually! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
area-blazor
Includes: Blazor, Razor Components
feature-blazor-navigation
feature-prerendering
Issues related to prerendering blazor components
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.
Follow up for #61306 and #60970.
Feedback
NotFoundPage
toRouter
#60970.Templates
-auth Individual
) were expectingNavigateTo
to throw. We should remove this expectation for the new way of navigation.Framework
SignalRendererToFinishRendering
public API proposal.Testing
RenderBatchQueuedAfterRedirectionIsNotProcessed
makes sure that no renders connected with async child component are done when the parent triggered redirection in prerendering. Because more than one render mode is tested, I found it useful to reuse the code fromInteractiveStreamingRenderingComponent.razor
for getting available render modes. The common bits got moved toRenderModeHelper.cs
.CanRedirectDuringPrerendering
was removed - its expected behavior changed and the tested scenario overlaps with these covered byRenderBatchQueuedAfterRedirectionIsNotProcessed
.