unoplatform
/
Uno.Wasm.Bootstrap
зеркало из https://github.com/unoplatform/Uno.Wasm.Bootstrap.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

chore: Adjust PWA, env vars

This commit is contained in:
Jerome Laban 2024-09-04 11:12:33 -04:00
Родитель 35b6220306
Коммит 12a666fdf2
2 изменённых файлов: 19 добавлений и 37 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

54
src/Uno.Wasm.Bootstrap/ShellTask.cs
Просмотреть файл

@ -91,12 +91,16 @@ namespace Uno.Wasm.Bootstrap
public string EmscriptenVersion { get; set; } = "";
public ITaskItem[]? EmccFlags { get; set; }
public ITaskItem[]? EmccExportedRuntimeMethod { get; set; }
public string? ContentExtensionsToExclude { get; set; }
public string CSPConfiguration { get; set; } = "";
public bool Optimize { get; set; }
public string AotProfile { get; set; } = "";
public bool RunAOTCompilation { get; set; }
@ -489,19 +493,10 @@ namespace Uno.Wasm.Bootstrap
&& !d.EndsWith("uno-bootstrap.js")
&& !d.EndsWith("service-worker.js"))
.Select(dep => BuildDependencyPath(dep, baseLookup)));
//var entryPoint = DiscoverEntryPoint();
var config = new StringBuilder();
//var (monoWasmFileName, monoWasmSize, totalAssembliesSize, assemblyFiles, filesIntegrity) = GetFilesDetails();
//var assembliesSize = string.Join(
// ",",
// assemblyFiles.Select(ass => $"\"{ass.fileName}\":{ass.length}"));
//var filesIntegrityStr = string.Join(
// ",",
// filesIntegrity.Select(f => $"\"{f.fileName}\":\"{f.integrity}\""));
//var enablePWA = !string.IsNullOrEmpty(PWAManifestFile);
var enablePWA = !string.IsNullOrEmpty(PWAManifestFile);
//var offlineFiles = enablePWA ? string.Join(", ", GetPWACacheableFiles().Select(f => $"\".{f}\"")) : "";
var emccExportedRuntimeMethodsParams = string.Join(
@ -512,24 +507,11 @@ namespace Uno.Wasm.Bootstrap
//config.AppendLine($"config.uno_remote_managedpath = \"{Path.GetFileName(_managedPath)}\";");
//config.AppendLine($"config.uno_app_base = \"{WebAppBasePath}{_remoteBasePackagePath}\";");
config.AppendLine($"config.uno_dependencies = [{dependencies}];");
//config.AppendLine($"config.uno_main = \"{entryPoint.DeclaringType.Module.Assembly.Name.Name}\";");
//config.AppendLine($"config.assemblyFileExtension = \"{AssembliesFileExtension}\";");
//config.AppendLine($"config.assemblyFileNameObfuscationMode = \"{_assembliesFileNameObfuscationMode}\";");
//config.AppendLine($"config.mono_wasm_runtime = \"{monoWasmFileName}\";");
//config.AppendLine($"config.mono_wasm_runtime_size = {monoWasmSize};");
//config.AppendLine($"config.assemblies_with_size = {{{assembliesSize}}};");
//config.AppendLine($"config.files_integrity = {{{filesIntegrityStr}}};");
//config.AppendLine($"config.total_assemblies_size = {totalAssembliesSize};");
//config.AppendLine($"config.enable_pwa = {enablePWA.ToString().ToLowerInvariant()};");
config.AppendLine($"config.enable_pwa = {enablePWA.ToString().ToLowerInvariant()};");
//config.AppendLine($"config.offline_files = ['{WebAppBasePath}', {offlineFiles}];");
config.AppendLine($"config.uno_shell_mode = \"{_shellMode}\";");
config.AppendLine($"config.emcc_exported_runtime_methods = [{emccExportedRuntimeMethodsParams}];");
//if (ObfuscateAssemblies)
//{
// config.AppendLine($"config.assemblyObfuscationKey = \"{Encoding.ASCII.GetString(_obfuscationKey)}\";");
//}
if (GenerateAOTProfile)
{
config.AppendLine($"config.generate_aot_profile = true;");
@ -552,22 +534,17 @@ namespace Uno.Wasm.Bootstrap
AddEnvironmentVariable("UNO_BOOTSTRAP_MONO_RUNTIME_MODE", _runtimeExecutionMode.ToString());
AddEnvironmentVariable("UNO_BOOTSTRAP_MONO_PROFILED_AOT", isProfiledAOT.ToString());
AddEnvironmentVariable("UNO_BOOTSTRAP_LINKER_ENABLED", PublishTrimmed.ToString());
//AddEnvironmentVariable("UNO_BOOTSTRAP_DEBUGGER_ENABLED", RuntimeDebuggerEnabled.ToString());
//AddEnvironmentVariable("UNO_BOOTSTRAP_MONO_RUNTIME_CONFIGURATION", RuntimeConfiguration);
//AddEnvironmentVariable("UNO_BOOTSTRAP_MONO_RUNTIME_FEATURES", BuildRuntimeFeatures());
AddEnvironmentVariable("UNO_BOOTSTRAP_DEBUGGER_ENABLED", (!Optimize).ToString());
AddEnvironmentVariable("UNO_BOOTSTRAP_MONO_RUNTIME_CONFIGURATION", "Release");
AddEnvironmentVariable("UNO_BOOTSTRAP_MONO_RUNTIME_FEATURES", BuildRuntimeFeatures());
AddEnvironmentVariable("UNO_BOOTSTRAP_APP_BASE", _remoteBasePackagePath);
AddEnvironmentVariable("UNO_BOOTSTRAP_WEBAPP_BASE_PATH", WebAppBasePath);
//if (EnableThreads)
//{
// AddEnvironmentVariable("UNO_BOOTSTRAP_MAX_THREADS", PThreadsPoolSize.ToString());
//}
//if (ExtraEmccFlags?.Any(f => f.ItemSpec?.Contains("MAXIMUM_MEMORY=4GB") ?? false) ?? false)
//{
// // Detects the use of the 4GB flag: https://v8.dev/blog/4gb-wasm-memory
// AddEnvironmentVariable("UNO_BOOTSTRAP_EMSCRIPTEN_MAXIMUM_MEMORY", "4GB");
//}
if (EmccFlags?.Any(f => f.ItemSpec?.Contains("MAXIMUM_MEMORY=4GB") ?? false) ?? false)
{
// Detects the use of the 4GB flag: https://v8.dev/blog/4gb-wasm-memory
AddEnvironmentVariable("UNO_BOOTSTRAP_EMSCRIPTEN_MAXIMUM_MEMORY", "4GB");
}
//if (EnableLogProfiler)
//{
@ -835,6 +812,9 @@ namespace Uno.Wasm.Bootstrap
? @"\\?\" + path
: path;
private string BuildRuntimeFeatures()
=> EnableThreads ? "threads" : "";
private void ParseEnumProperty<TEnum>(string name, string stringValue, out TEnum value) where TEnum : struct
{
if (Enum.TryParse(stringValue, true, out value))

2
src/Uno.Wasm.Bootstrap/build/Uno.Wasm.Bootstrap.targets
Просмотреть файл

@ -188,6 +188,7 @@
CurrentProjectPath="$(MSBuildProjectDirectory)"
EmbeddedResources="@(EmbeddedResource)"
EmccExportedRuntimeMethod="@(EmccExportedRuntimeMethod)"
EmccFlags="@(EmccFlags)"
EmscriptenVersion="$(EmscriptenVersion)"
EnableThreads="@(WasmEnableThreads)"
GenerateAOTProfile="$(WasmShellGenerateAOTProfile)"
@ -198,6 +199,7 @@
PWAManifestFile="$(WasmPWAManifestFile)"
ReferencePath="@(_UnoWasmBootstrapAssembliesForReferenceCopyLocalPaths)"
RunAOTCompilation="$(RunAOTCompilation)"
Optimize="$(Optimize)"
WasmBuildNative="$(WasmBuildNative)"
WasmShellMode="$(WasmShellMode)"
WebAppBasePath="$(WasmShellWebAppBasePath)"