Merge branch 'master' into emilk/improve-demo-app

emilk · Dec 28, 2024 · 2c49667 · 2c49667
2 parents 817c133 + 820d428
commit 2c49667
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/crates/egui_extras/src/loaders/image_loader.rs b/crates/egui_extras/src/loaders/image_loader.rs
@@ -19,7 +19,10 @@ impl ImageCrateLoader {
 }
 
 fn is_supported_uri(uri: &str) -> bool {
-    let Some(ext) = Path::new(uri).extension().and_then(|ext| ext.to_str()) else {
+    let Some(ext) = Path::new(uri)
+        .extension()
+        .and_then(|ext| ext.to_str().map(|ext| ext.to_lowercase()))
+    else {
         // `true` because if there's no extension, assume that we support it
         return true;
     };

diff --git a/scripts/setup_web.sh b/scripts/setup_web.sh
@@ -3,8 +3,10 @@ set -eu
 script_path=$( cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P )
 cd "$script_path/.."
 
+set -x
+
 # Pre-requisites:
 rustup target add wasm32-unknown-unknown
 
 # For generating JS bindings:
-cargo install --quiet wasm-bindgen-cli --version 0.2.95
+cargo install --force --quiet wasm-bindgen-cli --version 0.2.95