Skip to content

Remove await for WASM platform.callEntryPoint #31997

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
merged 2 commits into from
Apr 21, 2021
Merged

Remove await for WASM platform.callEntryPoint #31997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea136d0
Remove await for WASM `platform.callEntryPoint`
TanayParikh Apr 20, 2021
fa029e6
Update src/Components/test/E2ETest/Tests/StandaloneAppTest.cs
TanayParikh Apr 20, 2021
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
2 changes: 1 addition & 1 deletion src/Components/Web.JS/src/Boot.WebAssembly.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ async function boot(options?: Partial<WebAssemblyStartOptions>): Promise<void> {
}

// Start up the application
await platform.callEntryPoint(resourceLoader.bootConfig.entryAssembly);
platform.callEntryPoint(resourceLoader.bootConfig.entryAssembly);
}

function invokeJSFromDotNet(callInfo: Pointer, arg0: any, arg1: any, arg2: any): any {
Expand Down
9 changes: 8 additions & 1 deletion src/Components/WebAssembly/testassets/StandaloneApp/wwwroot/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@
<a class="dismiss">🗙</a>
</div>

<script src="_framework/blazor.webassembly.js"></script>
<script src="_framework/blazor.webassembly.js" autostart="false"></script>
<script>
(function(){
Blazor.start().then(function () {
window['__aspnetcore__testing__blazor_wasm__started__'] = true;
});
})();
</script>
</body>
</html>
16 changes: 16 additions & 0 deletions src/Components/test/E2ETest/Tests/StandaloneAppTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,22 @@ public void HasFetchDataPage()
}
}

[Fact]
public void IsStarted()
{
// Read from property
var jsExecutor = (IJavaScriptExecutor)Browser;

var isStarted = jsExecutor.ExecuteScript("return window['__aspnetcore__testing__blazor_wasm__started__'];");
if (isStarted is null)
{
throw new InvalidOperationException("Blazor wasm started value not set");
}

// Confirm server has started
Assert.True((bool)isStarted);
}

private void WaitUntilLoaded()
{
var app = Browser.Exists(By.TagName("app"));
Expand Down