-
Notifications
You must be signed in to change notification settings - Fork 5.2k
[browser] Preload dotnet.js #114534
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
Merged
Merged
[browser] Preload dotnet.js #114534
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
834f14d
WIP
maraf eaf7baf
wip
maraf 50d02f7
Merge remote-tracking branch 'upstream/main' into BrowserPreload
maraf 54cc0fc
Simplify to dotnet.js
maraf 39513c2
Fix typo
maraf 2ed8a0a
Fix filename to check
maraf e2fc0f9
Add Wasm.Build.Tests testing that preload picks correct endpoint
maraf b77e95b
Merge branch 'main' into BrowserPreload
maraf b1ce60b
Add PreloadingTests to Wasm.Build.Test job list
maraf File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| using System.IO; | ||
| using System.Linq; | ||
| using Xunit; | ||
| using Xunit.Abstractions; | ||
|
|
||
| #nullable enable | ||
|
|
||
| namespace Wasm.Build.Tests; | ||
|
|
||
| public class PreloadingTests : WasmTemplateTestsBase | ||
| { | ||
| public PreloadingTests(ITestOutputHelper output, SharedBuildPerTestClassFixture buildContext) | ||
| : base(output, buildContext) | ||
| { | ||
| } | ||
|
|
||
| [Theory] | ||
| [InlineData(false, false)] | ||
| [InlineData(false, true)] | ||
| [InlineData(true, false)] | ||
| [InlineData(true, true)] | ||
| public void PreloadAssets(bool isPublish, bool fingerprintAssets) | ||
| { | ||
| Configuration config = Configuration.Debug; | ||
| ProjectInfo info = CopyTestAsset(config, aot: false, TestAsset.WasmBasicTestApp, "PreloadAssets"); | ||
|
|
||
| // TODO: AssertAppBundle doesn't with fingerprinted dotnet.js at the moment | ||
| string extraMSBuildArgs = $"-p:OverrideHtmlAssetPlaceholders=true -p:WasmFingerprintAssets={fingerprintAssets}"; | ||
| if (isPublish) | ||
| PublishProject(info, config, new PublishOptions(ExtraMSBuildArgs: extraMSBuildArgs, AssertAppBundle: false)); | ||
| else | ||
| BuildProject(info, config, new BuildOptions(ExtraMSBuildArgs: extraMSBuildArgs, AssertAppBundle: false)); | ||
|
|
||
| string? indexHtmlPath = null; | ||
| if (isPublish) | ||
| { | ||
| indexHtmlPath = Path.Combine( | ||
| GetBinFrameworkDir(config, forPublish: isPublish), | ||
| "..", | ||
| "index.html" | ||
| ); | ||
| } | ||
| else | ||
| { | ||
| string objDir = Path.Combine(GetObjDir(config), "staticwebassets", "htmlassetplaceholders", "build"); | ||
| indexHtmlPath = Directory.EnumerateFiles(objDir, "*.html").SingleOrDefault(); | ||
| } | ||
|
|
||
| Assert.True(File.Exists(indexHtmlPath)); | ||
| string indexHtmlContent = File.ReadAllText(indexHtmlPath); | ||
|
|
||
| if (fingerprintAssets) | ||
| { | ||
| // Expect to find fingerprinted preload | ||
| Assert.Contains("<link href=\"_framework/dotnet", indexHtmlContent); | ||
| Assert.DoesNotContain("<link href=\"_framework/dotnet.js\"", indexHtmlContent); | ||
| } | ||
| else | ||
| { | ||
| // Expect to find non-fingerprinted preload | ||
| Assert.Contains("<link href=\"_framework/dotnet.js\"", indexHtmlContent); | ||
| } | ||
| } | ||
| } | ||
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
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
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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.