Merge pull request #731 from unoplatform/dev/jela/exports-fix

fix: Adjust aot profile generation
unoplatform · May 24, 2023 · 793ddd1 · 793ddd1
2 parents 7de8917 + ee18f51
commit 793ddd1
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 12 deletions.
diff --git a/src/Uno.Wasm.Bootstrap/ts/Uno/WebAssembly/AotProfilerSupport.ts b/src/Uno.Wasm.Bootstrap/ts/Uno/WebAssembly/AotProfilerSupport.ts
@@ -24,7 +24,7 @@
  }
 
  public static initialize(context: DotnetPublicAPI, unoConfig: Uno.WebAssembly.Bootstrap.UnoConfig): AotProfilerSupport {
- if (context.Module.ENVIRONMENT_IS_WEB && unoConfig.generate_aot_profile) {
+ if (Bootstrapper.ENVIRONMENT_IS_WEB && unoConfig.generate_aot_profile) {
  return new AotProfilerSupport(context, unoConfig);
  }
  return null;

diff --git a/src/Uno.Wasm.Bootstrap/ts/Uno/WebAssembly/Bootstrapper.ts b/src/Uno.Wasm.Bootstrap/ts/Uno/WebAssembly/Bootstrapper.ts
@@ -160,9 +160,6 @@ namespace Uno.WebAssembly.Bootstrap {
  // Module may not be initialized yet (.NET 8 and later)
  (<any>this._context).Module = this._context.Module || {};
 
- this._context.Module.ENVIRONMENT_IS_WEB = Bootstrapper.ENVIRONMENT_IS_WEB;
- this._context.Module.ENVIRONMENT_IS_NODE = Bootstrapper.ENVIRONMENT_IS_NODE;
-
  this.setupRequire();
  this.setupEmscriptenPreRun();
 
@@ -174,7 +171,7 @@ namespace Uno.WebAssembly.Bootstrap {
  }
 
  private async setupHotReload() {
- if (this._context.Module.ENVIRONMENT_IS_WEB && this.hasDebuggingEnabled()) {
+ if (Bootstrapper.ENVIRONMENT_IS_WEB && this.hasDebuggingEnabled()) {
  await HotReloadSupport.tryInitializeExports(this._getAssemblyExports);
 
  this._hotReloadSupport = new HotReloadSupport(this._context, this._unoConfig);
@@ -527,7 +524,7 @@ namespace Uno.WebAssembly.Bootstrap {
 
  asset = asset.replace("/managed/", `/${this._unoConfig.uno_remote_managedpath}/`);
 
- if (this._context.Module.ENVIRONMENT_IS_NODE) {
+ if (Bootstrapper.ENVIRONMENT_IS_NODE) {
  var fs = require('fs');
 
  console.log('Loading... ' + asset);
@@ -572,7 +569,7 @@ namespace Uno.WebAssembly.Bootstrap {
 
  // Uno.Wasm.Bootstrap is using "requirejs" by default, which is an AMD implementation
  // But when run with NodeJS or Electron, it's using CommonJS instead of AMD
- this._isUsingCommonJS = this._unoConfig.uno_shell_mode !== "BrowserEmbedded" && (this._context.Module.ENVIRONMENT_IS_NODE || this.isElectron());
+ this._isUsingCommonJS = this._unoConfig.uno_shell_mode !== "BrowserEmbedded" && (Bootstrapper.ENVIRONMENT_IS_NODE || this.isElectron());
 
  if (this._unoConfig.enable_debugging) console.log("Done loading the BCL");
 
@@ -646,7 +643,7 @@ namespace Uno.WebAssembly.Bootstrap {
  }
 
  private attachDebuggerHotkey() {
- if (this._context.Module.ENVIRONMENT_IS_WEB) {
+ if (Bootstrapper.ENVIRONMENT_IS_WEB) {
 
  let loadAssemblyUrls = this._monoConfig.assets.map(a => a.name);
 

diff --git a/src/Uno.Wasm.Bootstrap/ts/Uno/WebAssembly/LogProfilerSupport.ts b/src/Uno.Wasm.Bootstrap/ts/Uno/WebAssembly/LogProfilerSupport.ts
@@ -39,7 +39,7 @@
 
  private attachHotKey() {
 
- if (this._context.Module.ENVIRONMENT_IS_WEB) {
+ if (Bootstrapper.ENVIRONMENT_IS_WEB) {
 
  if (LogProfilerSupport._logProfilerEnabled) {
  // Use the combination shift+alt+D because it isn't used by the major browsers

diff --git a/src/Uno.Wasm.Bootstrap/ts/types/dotnet/index.d.ts b/src/Uno.Wasm.Bootstrap/ts/types/dotnet/index.d.ts
@@ -56,8 +56,6 @@ declare interface EmscriptenModule {
  /**
  * BEGIN UNO SPECIFIC
  */
- ENVIRONMENT_IS_NODE: boolean;
- ENVIRONMENT_IS_WEB: boolean;
  aotProfileData: any;
  /**
  * END UNO SPECIFIC

diff --git a/src/Uno.Wasm.StaticLinking.Shared/Uno.Wasm.StaticLinking.Shared.projitems b/src/Uno.Wasm.StaticLinking.Shared/Uno.Wasm.StaticLinking.Shared.projitems
@@ -30,7 +30,7 @@
  <None Include="$(MSBuildThisFileDirectory)side_module\side.wasm" />
  <None Include="$(MSBuildThisFileDirectory)test.cpp" />
  </ItemGroup>
- <ItemGroup Condition="'$(UseAOT)'=='true' or '$(WasmShellGenerateAOTProfile)'=='true'">
+ <ItemGroup Condition="'$(UseAOT)'=='true' or '$(WasmShellGenerateAOTProfile)'=='true' or '$(WasmShellEnableLogProfiler)'=='true'">
  <Content Include="$(MSBuildThisFileDirectory)native/**/*.bc" />
  <WasmShellNativeCompile Include="$(MSBuildThisFileDirectory)test.cpp" />
  </ItemGroup>