fix(wasm): Fix invalid splash screen path resolution

jeromelaban · Jun 14, 2021 · 3f25381 · 3f25381
1 parent 65bdf55
commit 3f25381
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/Uno.UI/WasmScripts/Uno.UI.js b/src/Uno.UI/WasmScripts/Uno.UI.js
@@ -407,7 +407,12 @@ var Uno;
                     // created later on 
                     img.onload = loadingDone;
                     img.onerror = loadingDone;
-                    img.src = String(UnoAppManifest.splashScreenImage);
+                    const UNO_BOOTSTRAP_APP_BASE = config.environmentVariables["UNO_BOOTSTRAP_APP_BASE"] || "";
+                    const UNO_BOOTSTRAP_WEBAPP_BASE_PATH = config.environmentVariables["UNO_BOOTSTRAP_WEBAPP_BASE_PATH"] || "";
+                    const fullImagePath = UNO_BOOTSTRAP_APP_BASE !== ''
+                        ? `${UNO_BOOTSTRAP_WEBAPP_BASE_PATH}${UNO_BOOTSTRAP_APP_BASE}/${UnoAppManifest.splashScreenImage}`
+                        : String(UnoAppManifest.splashScreenImage);
+                    img.src = fullImagePath;
                     // If there's no response, skip the loading
                     setTimeout(loadingDone, 2000);
                 });

diff --git a/src/Uno.UI/ts/WindowManager.ts b/src/Uno.UI/ts/WindowManager.ts
@@ -107,7 +107,15 @@ namespace Uno.UI {
 				// created later on 
 				img.onload = loadingDone;
 				img.onerror = loadingDone;
-				img.src = String(UnoAppManifest.splashScreenImage);
+
+				const UNO_BOOTSTRAP_APP_BASE = config.environmentVariables["UNO_BOOTSTRAP_APP_BASE"] || "";
+				const UNO_BOOTSTRAP_WEBAPP_BASE_PATH = config.environmentVariables["UNO_BOOTSTRAP_WEBAPP_BASE_PATH"] || "";
+
+				const fullImagePath = UNO_BOOTSTRAP_APP_BASE !== ''
+					? `${UNO_BOOTSTRAP_WEBAPP_BASE_PATH}${UNO_BOOTSTRAP_APP_BASE}/${UnoAppManifest.splashScreenImage}`
+					: String(UnoAppManifest.splashScreenImage);
+
+				img.src = fullImagePath;
 
 				// If there's no response, skip the loading
 				setTimeout(loadingDone, 2000);