[browser] Unify boot config schema and output layout (#86255)

- Update `WasmAppBuilder` to produce the same boot config schema as `GenerateWasmBootJson`
- Update AppBundle layout to match blazor layout. 
    - All the runtime files (js, wasm, icu) are deployed to `_framework` folder.
    - This behavior can be overriden by setting `<WasmRuntimeAssetsLocation>` property. The empty value is overriden to default `_framework`, but `./` can be used to flatten the output structure.
    - WBT test with flat output
    - The only remaining difference is `AppBundle` vs `wwwrooot` folder name.
- `JSHost.ImportAsync` now requires the same relative paths as in blazor (`./module.js` => `../module.js`)

Contributes to #70762
---------

Co-authored-by: Ankit Jain <radical@gmail.com>

src/libraries/System.Runtime.InteropServices.JavaScript/tests/System.Runtime.InteropServices.JavaScript.Legacy.UnitTests/System/Runtime/InteropServices/JavaScript/TimerTests.cs

@@ -90,7 +90,7 @@ public async Task InitializeAsync()
  {
  if (_module == null)
  {
- _module = await JSHost.ImportAsync("Timers", "./timers.mjs");
+ _module = await JSHost.ImportAsync("Timers", "../timers.mjs");
  }
  }
 

src/libraries/System.Runtime.InteropServices.JavaScript/tests/System.Runtime.InteropServices.JavaScript.UnitTests/System/Runtime/InteropServices/JavaScript/JSImportExportTest.cs

@@ -22,8 +22,8 @@ public unsafe void StructSize()
  [Fact]
  public async Task MultipleImportAsync()
  {
- var first = await JSHost.ImportAsync("JavaScriptTestHelper", "./JavaScriptTestHelper.mjs");
- var second = await JSHost.ImportAsync("JavaScriptTestHelper", "./JavaScriptTestHelper.mjs");
+ var first = await JSHost.ImportAsync("JavaScriptTestHelper", "../JavaScriptTestHelper.mjs");
+ var second = await JSHost.ImportAsync("JavaScriptTestHelper", "../JavaScriptTestHelper.mjs");
  Assert.NotNull(first);
  Assert.NotNull(second);
  Assert.Equal("object", first.GetTypeOfProperty("instance"));
@@ -36,12 +36,12 @@ public async Task MultipleImportAsync()
  public async Task CancelableImportAsync()
  {
  var cts = new CancellationTokenSource();
- var exTask = Assert.ThrowsAsync<JSException>(async () => await JSHost.ImportAsync("JavaScriptTestHelper", "./JavaScriptTestHelper.mjs", cts.Token));
+ var exTask = Assert.ThrowsAsync<JSException>(async () => await JSHost.ImportAsync("JavaScriptTestHelper", "../JavaScriptTestHelper.mjs", cts.Token));
  cts.Cancel();
  var actualEx2 = await exTask;
  Assert.Equal("OperationCanceledException", actualEx2.Message);
 
- var actualEx = await Assert.ThrowsAsync<JSException>(async () => await JSHost.ImportAsync("JavaScriptTestHelper", "./JavaScriptTestHelper.mjs", new CancellationToken(true)));
+ var actualEx = await Assert.ThrowsAsync<JSException>(async () => await JSHost.ImportAsync("JavaScriptTestHelper", "../JavaScriptTestHelper.mjs", new CancellationToken(true)));
  Assert.Equal("OperationCanceledException", actualEx.Message);
  }
 
@@ -300,7 +300,7 @@ public static IEnumerable<object[]> MarshalObjectArrayCases()
  yield return new object[] { new object[] { "JSData" } }; // special cased, so we call createData in the test itself
  yield return new object[] { new object[] { new byte[] { }, new int[] { }, new double[] { }, new string[] { }, new object[] { } } };
  yield return new object[] { new object[] { new byte[] { 1, 2, 3 }, new int[] { 1, 2, 3 }, new double[] { 1, 2, 3 }, new string[] { "a", "b", "c" }, new object[] { } } };
- yield return new object[] { new object[] { new object[] { new byte[] { 1, 2, 3 }, new int[] { 1, 2, 3 }, new double[] { 1, 2, 3 }, new string[] { "a", "b", "c" } , new object(), new SomethingRef(), new SomethingStruct(), new Exception("test") } } };
+ yield return new object[] { new object[] { new object[] { new byte[] { 1, 2, 3 }, new int[] { 1, 2, 3 }, new double[] { 1, 2, 3 }, new string[] { "a", "b", "c" }, new object(), new SomethingRef(), new SomethingStruct(), new Exception("test") } } };
  yield return new object[] { new object[] { } };
  yield return new object[] { null };
  }
@@ -317,10 +317,10 @@ public unsafe void JsImportObjectArray(object[]? expected)
  Assert.Equal(expected, actual);
 
  if (expected != null) for (int i = 0; i < expected.Length; i++)
- {
- var actualI = JavaScriptTestHelper.store_ObjectArray(expected, i);
- Assert.Equal(expected[i], actualI);
- }
+  {
+  var actualI = JavaScriptTestHelper.store_ObjectArray(expected, i);
+  Assert.Equal(expected[i], actualI);
+  }
  }
 
  public static IEnumerable<object[]> MarshalObjectArrayCasesToDouble()
@@ -362,7 +362,7 @@ public static IEnumerable<object[]> MarshalObjectArrayCasesThrow()
  yield return new object[] { new object[] { (ushort)0 } };
  yield return new object[] { new object[] { new SomethingStruct[] { } } };
  yield return new object[] { new object[] { new SomethingRef[] { }, } };
- yield return new object[] { new object[] { new ArraySegment<byte>(new byte[] { 11 }) , } };
+ yield return new object[] { new object[] { new ArraySegment<byte>(new byte[] { 11 }), } };
  }
  delegate void dummyDelegate();
  static void dummyDelegateA()

src/libraries/System.Runtime.InteropServices.JavaScript/tests/System.Runtime.InteropServices.JavaScript.UnitTests/System/Runtime/InteropServices/JavaScript/JavaScriptTestHelper.cs

@@ -68,7 +68,7 @@ public static void Optimized0V()
  [JSExport]
  public static void Optimized1V(int a1)
  {
- optimizedReached+= a1;
+ optimizedReached += a1;
  }
  [JSImport("invoke1V", "JavaScriptTestHelper")]
  public static partial void invoke1V(int a1);
@@ -85,8 +85,8 @@ public static int Optimized1R(int a1)
  [JSExport]
  public static int Optimized2R(int a1, int a2)
  {
- optimizedReached += a1+ a2;
- return a1 + a2 +1;
+ optimizedReached += a1 + a2;
+ return a1 + a2 + 1;
  }
  [JSImport("invoke2R", "JavaScriptTestHelper")]
  public static partial int invoke2R(int a1, int a2);
@@ -997,7 +997,7 @@ public static async Task InitializeAsync()
  if (_module == null)
  {
  // Log("JavaScriptTestHelper.mjs importing");
- _module = await JSHost.ImportAsync("JavaScriptTestHelper", "./JavaScriptTestHelper.mjs");
+ _module = await JSHost.ImportAsync("JavaScriptTestHelper", "../JavaScriptTestHelper.mjs");
  await Setup();
  // Log("JavaScriptTestHelper.mjs imported");
  }
@@ -1010,7 +1010,7 @@ namespace JavaScriptTestHelperNamespace
  public partial class JavaScriptTestHelper
  {
  [System.Runtime.InteropServices.JavaScript.JSExport]
- public static string EchoString(string message) 
+ public static string EchoString(string message)
  {
  return message + "11";
  }
@@ -1019,7 +1019,7 @@ private partial class NestedClass
  {
  [System.Runtime.InteropServices.JavaScript.JSExport]
  public static string EchoString(string message) => message + "12";
- 
+
  private partial class DoubleNestedClass
  {
  [System.Runtime.InteropServices.JavaScript.JSExport]

src/libraries/System.Runtime.InteropServices.JavaScript/tests/System.Runtime.InteropServices.JavaScript.UnitTests/System/Runtime/InteropServices/JavaScript/SecondRuntimeTest.cs

@@ -12,9 +12,9 @@ namespace System.Runtime.InteropServices.JavaScript.Tests
  public partial class SecondRuntimeTest
  {
  [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsBrowserDomSupportedOrNodeJS))]
- public static async Task RunSecondRuntimeAndTestStaticState() 
+ public static async Task RunSecondRuntimeAndTestStaticState()
  {
- await JSHost.ImportAsync("SecondRuntimeTest", "./SecondRuntimeTest.js");
+ await JSHost.ImportAsync("SecondRuntimeTest", "../SecondRuntimeTest.js");
 
  Interop.State = 42;
  var state2 = await Interop.RunSecondRuntimeAndTestStaticState();

src/libraries/System.Runtime.InteropServices.JavaScript/tests/System.Runtime.InteropServices.JavaScript.UnitTests/System/Runtime/InteropServices/JavaScript/SecondRuntimeTest.js

@@ -1,5 +1,5 @@
 export async function runSecondRuntimeAndTestStaticState() {
- const { dotnet: dotnet2 } = await import('./dotnet.js?instance=2');
+ const { dotnet: dotnet2 } = await import('./_framework/dotnet.js?instance=2');
  const runtime2 = await dotnet2
  .withStartupMemoryCache(false)
  .withConfig({

src/mono/sample/mbr/browser/main.js

@@ -1,4 +1,4 @@
-import { dotnet } from './dotnet.js'
+import { dotnet } from './_framework/dotnet.js'
 
 try {
  const { getAssemblyExports } = await dotnet
@@ -8,7 +8,7 @@ try {
  const exports = await getAssemblyExports("WasmDelta.dll");
  const update = exports.Sample.Test.Update;
  const testMeaning = exports.Sample.Test.TestMeaning;
- 
+
  const outElement = document.getElementById("out");
  document.getElementById("update").addEventListener("click", function () {
  update();

src/mono/sample/wasm/browser-advanced/Wasm.Advanced.Sample.csproj

@@ -14,6 +14,9 @@
  <_ServeHeaders>$(_ServeHeaders) -h &quot;Content-Security-Policy: default-src 'self' 'wasm-unsafe-eval'&quot;</_ServeHeaders>
  <!-- enable reporting to profiler in browser dev tools -->
  <WasmProfilers>browser;</WasmProfilers>
+
+ <!-- Put "framework" (dotnet.js, dlls, etc) files directly into the AppBundle -->
+ <WasmRuntimeAssetsLocation>./</WasmRuntimeAssetsLocation>
  </PropertyGroup>
  <ItemGroup>
  <WasmExtraFilesToDeploy Include="main.js" />

src/mono/sample/wasm/browser-advanced/index.html

@@ -9,7 +9,7 @@
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self' 'wasm-unsafe-eval';" />
  <script type='module' src="./main.js"></script>
- <script type='module' src="./dotnet.js"></script>
+ <script type='module' src="./_framework/dotnet.js"></script>
  <link rel="preload" href="./_framework/blazor.boot.json" as="fetch" crossorigin="anonymous">
  <link rel="prefetch" href="./dotnet.native.js" as="fetch" crossorigin="anonymous">
  <link rel="prefetch" href="./dotnet.runtime.js" as="fetch" crossorigin="anonymous">

src/mono/sample/wasm/browser-advanced/main.js

@@ -31,7 +31,7 @@ try {
  // here we show how emscripten could be further configured
  // It is preferred to use specific 'with***' methods instead in all other cases.
  .withModuleConfig({
- configSrc: "./_framework/blazor.boot.json",
+ configSrc: "./blazor.boot.json",
  onConfigLoaded: (config) => {
  // This is called during emscripten `dotnet.wasm` instantiation, after we fetched config.
  console.log('user code Module.onConfigLoaded');

src/mono/sample/wasm/browser-bench/appstart-frame.html

@@ -8,7 +8,7 @@
  <meta charset="UTF-8">
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  <script type="module" src="./frame-main.js"></script>
- <script type='module' src="./dotnet.js"></script>
+ <script type='module' src="./_framework/dotnet.js"></script>
  <link rel="preload" href="./_framework/blazor.boot.json" as="fetch" crossorigin="anonymous">
  <link rel="prefetch" href="./dotnet.native.js" as="fetch" crossorigin="anonymous">
  <link rel="prefetch" href="./dotnet.runtime.js" as="fetch" crossorigin="anonymous">

src/mono/sample/wasm/browser-bench/frame-main.js

@@ -3,7 +3,7 @@
 
 "use strict";
 
-import { dotnet, exit } from './dotnet.js'
+import { dotnet, exit } from './_framework/dotnet.js'
 
 class FrameApp {
  async init({ getAssemblyExports }) {

src/mono/sample/wasm/browser-bench/main.js

@@ -3,7 +3,7 @@
 
 "use strict";
 
-import { dotnet, exit } from './dotnet.js'
+import { dotnet, exit } from './_framework/dotnet.js'
 
 let runBenchmark;
 let setTasks;

src/mono/sample/wasm/browser-eventpipe/main.js

@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-import { dotnet, exit } from "./dotnet.js";
+import { dotnet, exit } from "./_framework/dotnet.js";
 
 const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms))
 

src/mono/sample/wasm/browser-profile/main.js

@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-import { dotnet, exit } from './dotnet.js'
+import { dotnet, exit } from './_framework/dotnet.js'
 
 function saveProfile(aotProfileData) {
  if (!aotProfileData) {