Skip to content

[Blazor] Auto render mode improvements #53159

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.

Sign up for GitHub

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

Merged
MackinnonBuck merged 7 commits into from
Jan 10, 2024
Merged

[Blazor] Auto render mode improvements #53159

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
954794f
Throttle wasm resource download
MackinnonBuck Jan 4, 2024
0cb83c5
Update tests
MackinnonBuck Jan 4, 2024
f1fecf4
Fix tests
MackinnonBuck Jan 5, 2024
7608b3e
Fix another flaky test
MackinnonBuck Jan 8, 2024
53f6bc5
Merge branch 'main' into mbuck/auto-improvements
MackinnonBuck Jan 8, 2024
1f456f9
Add tests
MackinnonBuck Jan 9, 2024
1187e3c
Merge remote-tracking branch 'origin/main' into mbuck/auto-improvements
MackinnonBuck Jan 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update tests
  • Loading branch information
@MackinnonBuck
MackinnonBuck committed Jan 4, 2024
commit 0cb83c5d032f1d13c6763842bf23bbafa33a2f76
2 changes: 1 addition & 1 deletion src/Components/Web.JS/dist/Release/blazor.web.js
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion src/Components/Web.JS/src/Services/WebRootComponentManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,6 @@ export class WebRootComponentManager implements DescriptorHandler, RootComponent
setTimeout(() => {
this._isComponentRefreshPending = false;
this.refreshRootComponents(this._rootComponentsBySsrComponentId.values());
this.circuitMayHaveNoRootComponents();
}, 0);
}

Expand Down Expand Up @@ -299,6 +298,8 @@ export class WebRootComponentManager implements DescriptorHandler, RootComponent
this.updateWebAssemblyRootComponents(batchJson);
}
}

this.circuitMayHaveNoRootComponents();
}

private updateWebAssemblyRootComponents(operationsJson: string) {
Expand Down
11 changes: 0 additions & 11 deletions src/Components/test/E2ETest/ServerRenderingTests/InteractivityTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,6 @@ public void AutoRenderMode_UsesBlazorServerOnFirstLoad_ThenWebAssemblyOnSuccessi
Navigate(ServerPathBase);
Browser.Equal("Hello", () => Browser.Exists(By.TagName("h1")).Text);
BlockWebAssemblyResourceLoad();
UseLongWebAssemblyLoadTimeout();
ForceWebAssemblyResourceCacheMiss();

Navigate($"{ServerPathBase}/streaming-interactivity");
Expand Down Expand Up @@ -697,7 +696,6 @@ public void AutoRenderMode_UsesBlazorServer_IfBootResourceHashChanges()
Navigate(ServerPathBase);
Browser.Equal("Hello", () => Browser.Exists(By.TagName("h1")).Text);
BlockWebAssemblyResourceLoad();
UseLongWebAssemblyLoadTimeout();
ForceWebAssemblyResourceCacheMiss();

Navigate($"{ServerPathBase}/streaming-interactivity");
Expand All @@ -715,14 +713,11 @@ public void AutoRenderMode_UsesBlazorServer_IfBootResourceHashChanges()
Browser.Click(By.Id($"remove-counter-link-1"));
Browser.DoesNotExist(By.Id("is-interactive-1"));

UseLongWebAssemblyLoadTimeout();
Browser.Navigate().Refresh();

Browser.Equal("True", () => Browser.FindElement(By.Id("is-interactive-0")).Text);
Browser.Equal("WebAssembly", () => Browser.FindElement(By.Id("render-mode-0")).Text);

BlockWebAssemblyResourceLoad();
UseLongWebAssemblyLoadTimeout();
ForceWebAssemblyResourceCacheMiss("dummy hash");
Browser.Navigate().Refresh();

Expand Down Expand Up @@ -766,7 +761,6 @@ public void AutoRenderMode_CanUseBlazorServer_WhenMultipleAutoComponentsAreAdded
Navigate(ServerPathBase);
Browser.Equal("Hello", () => Browser.Exists(By.TagName("h1")).Text);
BlockWebAssemblyResourceLoad();
UseLongWebAssemblyLoadTimeout();
ForceWebAssemblyResourceCacheMiss();

Navigate($"{ServerPathBase}/streaming-interactivity");
Expand Down Expand Up @@ -1146,11 +1140,6 @@ private void UnblockWebAssemblyResourceLoad()
((IJavaScriptExecutor)Browser).ExecuteScript("window.unblockLoadBootResource()");
}

private void UseLongWebAssemblyLoadTimeout()
{
((IJavaScriptExecutor)Browser).ExecuteScript("sessionStorage.setItem('use-long-auto-timeout', 'true')");
}

private void ForceWebAssemblyResourceCacheMiss(string resourceHash = null)
{
if (resourceHash is not null)
Expand Down
6 changes: 0 additions & 6 deletions src/Components/test/testassets/Components.TestServer/RazorComponents/App.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,8 @@
const enableClassicInitializers = sessionStorage.getItem('enable-classic-initializers') === 'true';
const suppressEnhancedNavigation = sessionStorage.getItem('suppress-enhanced-navigation') === 'true';
const blockLoadBootResource = sessionStorage.getItem('block-load-boot-resource') === 'true';
const useLongWebAssemblyTimeout = sessionStorage.getItem('use-long-auto-timeout') === 'true';
sessionStorage.removeItem('suppress-enhanced-navigation');
sessionStorage.removeItem('block-load-boot-resource');
sessionStorage.removeItem('use-long-auto-timeout');
sessionStorage.removeItem('enable-classic-initializers');

let loadBootResourceUnblocked = null;
Expand Down Expand Up @@ -64,10 +62,6 @@
}
},
},
}).then(() => {
if (useLongWebAssemblyTimeout) {
Blazor._internal.loadWebAssemblyQuicklyTimeout = 10000000;
}
}).then(() => {
const startedParagraph = document.createElement('p');
startedParagraph.id = 'blazor-started';
Expand Down