Merge branch 'master' into jk/rework-desktop-crate

packages/desktop/src/protocol.rs

@@ -144,6 +144,11 @@ fn module_loader(root_id: &str, headless: bool) -> String {
 /// - [ ] Linux (deb)
 /// - [ ] iOS
 /// - [ ] Android
+#[allow(unreachable_code)]
+pub(crate) fn get_asset_root_or_default() -> PathBuf {
+    get_asset_root().unwrap_or_else(|| Path::new(".").to_path_buf())
+}
+
 #[allow(unreachable_code)]
 fn get_asset_root() -> Option<PathBuf> {
     // If running under cargo, there's no bundle!