') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); [browser] Migrate more Blazor features, prepare JavaScript API for Blazor cleanup by maraf · Pull Request #87959 · dotnet/runtime · GitHub
Skip to content

[browser] Migrate more Blazor features, prepare JavaScript API for Blazor cleanup - #87959

Merged
maraf merged 64 commits into
dotnet:mainfrom
maraf:WasmSatelliteLazyLoad
Jul 13, 2023
Merged

[browser] Migrate more Blazor features, prepare JavaScript API for Blazor cleanup#87959
maraf merged 64 commits into
dotnet:mainfrom
maraf:WasmSatelliteLazyLoad

Conversation

@maraf

@marafmaraf commented Jun 23, 2023•
edited
Loading

Copy link
Copy Markdown
Member

Goal of this PR is to prepare everything needed to clean-up startup on Blazor side to the final shape.
Changes needs to be backward compatible with Blazor.

  • GlobalizationMode & ICUDataMode merged
    • Resulting type is string based enum
    • Contains separate values for different ICU modes ("all", "sharded", "custom" instead of "icu")
    • Value "auto" has been removed
  • Integrate library initializers
    • Allows for nuget packages to hook into application startup
    • Nuget package can contains files in name pattern *.lib.module.js in wwwroot
    • Such es6 modules are imported during startup
    • They can export various callbacks
      • On runtime side we call onRuntimeConfigLoaded(config: MonoConfig) and onRuntimeReady(api: RuntimeAPI)
      • On blazor side, beforeStart and afterStarted are called
    • Library initializers can be downloaded either right after config is loaded or before runtime ready promise resolved. By default boot json generator checks for content to see if library initializer must be downloaded earlier. This behavior can be overriden by putting library initializer in @(WasmLibraryInitializerOnRuntimeConfigLoaded) or @(WasmLibraryInitializerOnRuntimeReady)
    • Library initializers can invoked using invokeLibraryInitializers
  • New set of Wasm.Build.Tests using prepared wasm app
    • The purpose is to have a coded application and test behavior/interaction with it using playwright
    • Test lazy assembly loading
    • Test loading satellite assembly
    • Test library initializer
    • Test appsettings based on app environment
  • Run all Wasm.Build.Tests in specified namespace using XunitNamespace msbuild property
  • Set debug level in Wasm SDK apps
    • Use WasmDebugLevel to specify debug level (the same as WasmApp.targets)
    • Default values (when WasmDebugLevel is not set) for .NET >= 8.0
      • Build (debug) => debugBuild=true & debugLevel=-1 => -1
      • Build (release) => debugBuild=true & debugLevel=0 => 0
      • Publish (debug) => debugBuild=false & debugLevel=-1 => 0
      • Publish (release) => debugBuild=false & debugLevel=0 => 0
  • Fix resolving URL (config, library initializer) when baseURI contains query string

Finalize

  • Run Blazor E2E to verify no breaking changes

Contributes to #70762
Contributes to #87178

@marafmaraf added arch-wasm WebAssembly architecture area-System.Runtime.InteropServices.JavaScript os-browser Browser variant of arch-wasm labels Jun 23, 2023
@marafmaraf added this to the 8.0.0 milestone Jun 23, 2023
@marafmaraf self-assigned this Jun 23, 2023
@ghost

ghost commented Jun 23, 2023

Copy link
Copy Markdown

Tagging subscribers to 'arch-wasm': @lewing
See info in area-owners.md if you want to be subscribed.

Issue Details

TODO

  • Migrate lazy loading
  • Test lazy loading
  • Migrate satellite assemblies
  • Test satellite assemblies
  • Properly set debug build
  • Add alternatives to withStartupOptions
Author:maraf
Assignees:maraf
Labels:

arch-wasm, area-System.Runtime.InteropServices.JavaScript, os-browser

Milestone:8.0.0

maraf added 16 commits June 23, 2023 12:23
@maraf
Dissolve startupOptions
54b2c90
@maraf
Merge remote-tracking branch 'upstream/main' into WasmSatelliteLazyLoad
968829d
# Conflicts:
#	src/mono/wasm/runtime/loader/blazor/_Integration.ts
#	src/mono/wasm/runtime/loader/config.ts
#	src/mono/wasm/runtime/types/internal.ts
@maraf
WBT test for lazy loading
12ecc3d
@maraf
WBT for satellite loading.
b44c755
@maraf
Refactor tests
b792851
- Integrate them in a single test app
- Create base class for such tests
@maraf
Merge remote-tracking branch 'upstream/main' into WasmSatelliteLazyLoad
3a48997
@maraf
Fix checking is lazy assembly was already loaded
e860e40
@maraf
Introduce WasmDebugLevel to Wasm SDK.
3ceaf94
 Default values (when WasmDebugLevel is not set)
- Build (debug) => debugBuild=true & debugLevel=-1 => -1
- Build (release) => debugBuild=true & debugLevel=0 => 0
- Publish (debug) => debugBuild=false & debugLevel=-1 => 0
- Publish (release) => debugBuild=false & debugLevel=0 => 0
@maraf
bootConfig.aspnetCoreBrowserTools -> env:__ASPNETCORE_BROWSER_TOOLS
3fe3fc4
@maraf
Alternatives for withStartupOptions
1347c2d
@maraf
Import JS intializers
919f238
@maraf
Pass runtime API to onRuntimeReady library initializer
1e8ef5d
@maraf
Library initializer test
2c73ca2
@maraf
Merge remote-tracking branch 'upstream/main' into WasmSatelliteLazyLoad
3d17711
# Conflicts:
#	src/mono/wasm/runtime/loader/blazor/_Integration.ts
@maraf
Ensure loadedAssemblies has value
8fbb58f
@maraf
Register new WBT for CI run
3e8575d
@build-analysisbuild-analysisBot mentioned this pull request Jul 3, 2023
Closed
radical
radical reviewed Jul 12, 2023
View reviewed changes
Comment threadsrc/mono/wasm/testassets/WasmBasicTestApp/Common/Program.cs Outdated
radical
radical reviewed Jul 12, 2023
View reviewed changes
Comment threadsrc/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/GenerateWasmBootJson.cs Outdated
radical
radical reviewed Jul 12, 2023
View reviewed changes
Comment threadsrc/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/GenerateWasmBootJson.cs
radical
radical reviewed Jul 12, 2023
View reviewed changes
Comment threadsrc/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/GenerateWasmBootJson.cs Outdated
radical
radical reviewed Jul 12, 2023
View reviewed changes
Comment threadsrc/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/GenerateWasmBootJson.cs
Comment on lines +62 to +64
public ITaskItem[] LibraryInitializerOnRuntimeConfigLoaded { get; set; }

public ITaskItem[] LibraryInitializerOnRuntimeReady { get; set; }

@radicalradicalJul 12, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What are these? Add Paths to the name since these seem to be file paths.

@marafmarafJul 12, 2023

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, these are file paths. Resources and Configs also don't have paths suffix.

radical
radical reviewed Jul 12, 2023
View reviewed changes
Comment threadsrc/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/GenerateWasmBootJson.cs
radical
radical reviewed Jul 12, 2023
View reviewed changes
Comment threadsrc/tasks/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks/GenerateWasmBootJson.cs Outdated
radical
radical reviewed Jul 12, 2023
View reviewed changes
Comment threadsrc/mono/wasm/testassets/WasmBasicTestApp/Common/TestOutput.cs
radical
radical reviewed Jul 12, 2023
View reviewed changes
Comment threadsrc/mono/wasm/sln/WasmBuild.sln
This was referenced Jul 12, 2023
Closed
Closed
@maraf

maraf commented Jul 13, 2023

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-wasm

@azure-pipelines

azure-pipelinesBot commented Jul 13, 2023

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@marafmaraf mentioned this pull request Jul 13, 2023
Merged
@build-analysisbuild-analysisBot mentioned this pull request Jul 13, 2023
Closed
@maraf

maraf commented Jul 13, 2023

Copy link
Copy Markdown
MemberAuthor

Failures are unrelated.

@maraf
maraf merged commit acccc01 into dotnet:mainJul 13, 2023
@ghostghost locked as resolved and limited conversation to collaborators Aug 13, 2023
@maraf
maraf deleted the WasmSatelliteLazyLoad branch January 18, 2024 11:12
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@radicalradicalradical left review comments
@ilonatommyilonatommyilonatommy left review comments
@pavelsavarapavelsavarapavelsavara approved these changes
@lewinglewingAwaiting requested review from lewinglewing is a code owner
@kgkgAwaiting requested review from kg

Assignees

@marafmaraf

Labels

arch-wasmWebAssembly architecturearea-System.Runtime.InteropServices.JavaScriptos-browserBrowser variant of arch-wasm

Projects

None yet

Milestone

8.0.0

Development

Successfully merging this pull request may close these issues.

4 participants

@maraf@radical@pavelsavara@ilonatommy