chore: Update runtime for require support

unoplatform · May 16, 2023 · 0cf6322 · 0cf6322
1 parent 199f0d2
commit 0cf6322
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/src/Uno.Wasm.Bootstrap/Constants.cs b/src/Uno.Wasm.Bootstrap/Constants.cs
@@ -7,7 +7,7 @@ namespace Uno.Wasm.Bootstrap
  internal class Constants
  {
  public const string DefaultDotnetRuntimeSdkUrl = "https://unowasmbootstrap.azureedge.net/runtime/"
- + "dotnet-runtime-wasm-linux-dc15616-8adbca4855b-4963807262-Release.zip";
+ + "dotnet-runtime-wasm-linux-6f9021c-8adbca4855b-4993542190-Release.zip";
 
  /// <summary>
  /// Min version of the emscripten SDK. Must be aligned with dotnet/runtime SDK build in <see cref="NetCoreWasmSDKUri"/>.

diff --git a/src/Uno.Wasm.StaticLinking.Aot.UITests/app.js b/src/Uno.Wasm.StaticLinking.Aot.UITests/app.js
diff --git a/src/Uno.Wasm.StaticLinking.Aot.UITests/app.ts b/src/Uno.Wasm.StaticLinking.Aot.UITests/app.ts
@@ -42,7 +42,7 @@ const path = require("path");
  console.log(`Results: ${value}`);
  }
 
- const expected = "InterpreterAndAOT;42;42.30;42.7;e42;True;true;True;1.3;1.4;3.1;0;42;requireJs:true;jsInterop:Invoked;gl:true;sat:True;";
+ const expected = "InterpreterAndAOT;42;42.30;42.7;e42;True;true;True;1.3;1.4;3.1;0;42;requireJs:true;requireAvailableFromEval:true;jsInterop:Invoked;gl:true;sat:True;";
 
  if (value !== expected) {
  console.log(`Invalid results got ${value}, expected ${expected}`);

diff --git a/src/Uno.Wasm.StaticLinking.Shared/Program.cs b/src/Uno.Wasm.StaticLinking.Shared/Program.cs
@@ -51,6 +51,9 @@ static void Main()
  var requireAvailable = Imports.RequireAvailable();
  Console.WriteLine($"requireAvailable: {requireAvailable}");
 
+ var requireAvailableFromEval = Runtime.InvokeJS($"\"\" + (typeof require.config !== 'undefined')");
+ Console.WriteLine($"requireAvailableFromEval: {requireAvailableFromEval}");
+
  var glAvailable = Imports.GLAvailable();
  Console.WriteLine($"glAvailable: {glAvailable}");
 
@@ -103,6 +106,7 @@ static void Main()
  $"{chmodRes};" +
  $"{additionalNativeAdd};" +
  $"requireJs:{requireAvailable};" +
+ $"requireAvailableFromEval:{requireAvailableFromEval};" +
  $"jsInterop:{jsInteropResult};" +
  $"gl:{glAvailable};"+
  $"sat:{satelliteValidation};"