Skip to content

[release/6.0] Backport Blazor boot config fix #41992

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 1 commit into from
Jun 9, 2022
Merged

[release/6.0] Backport Blazor boot config fix #41992

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 9 additions & 3 deletions src/Components/Web.JS/src/Platform/BootConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,15 @@ export class BootConfigResult {
loadBootResource('manifest', 'blazor.boot.json', '_framework/blazor.boot.json', '') :
defaultLoadBlazorBootJson('_framework/blazor.boot.json');

const bootConfigResponse = loaderResponse instanceof Promise ?
await loaderResponse :
await defaultLoadBlazorBootJson(loaderResponse ?? '_framework/blazor.boot.json');
let bootConfigResponse: Response;

if (!loaderResponse) {
bootConfigResponse = await defaultLoadBlazorBootJson('_framework/blazor.boot.json');
} else if (typeof loaderResponse === 'string') {
bootConfigResponse = await defaultLoadBlazorBootJson(loaderResponse);
} else {
bootConfigResponse = await loaderResponse;
}

// While we can expect an ASP.NET Core hosted application to include the environment, other
// hosts may not. Assume 'Production' in the absence of any specified value.
Expand Down