Merge branch 'dev' into refactor/muda-migration

tauri-apps · Aug 13, 2023 · eed1878 · eed1878
2 parents 6842939 + ec82776
commit eed1878
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/core/tauri-runtime-wry/Cargo.toml b/core/tauri-runtime-wry/Cargo.toml
@@ -12,6 +12,9 @@ license = { workspace = true }
 edition = { workspace = true }
 rust-version = { workspace = true }
 
+[package.metadata.docs.rs]
+features = [ "dox" ]
+
 [dependencies]
 wry = { version = "0.31", default-features = false, features = [ "file-drop", "protocol" ] }
 tauri-runtime = { version = "0.13.0-alpha.6", path = "../tauri-runtime" }

diff --git a/core/tauri/src/manager.rs b/core/tauri/src/manager.rs
@@ -675,23 +675,23 @@ impl<R: Runtime> WindowManager<R> {
               };
               match template.render(asset.as_ref(), &Default::default()) {
                 Ok(asset) => HttpResponseBuilder::new()
-                  .mimetype("text/html")
+                  .mimetype(mime::TEXT_HTML.as_ref())
                   .body(asset.into_string().as_bytes().to_vec()),
                 Err(_) => HttpResponseBuilder::new()
                   .status(500)
-                  .mimetype("text/plain")
+                  .mimetype(mime::TEXT_PLAIN.as_ref())
                   .body(Vec::new()),
               }
             }
 
             None => HttpResponseBuilder::new()
               .status(404)
-              .mimetype("text/plain")
+              .mimetype(mime::TEXT_PLAIN.as_ref())
               .body(Vec::new()),
           },
           _ => HttpResponseBuilder::new()
             .status(404)
-            .mimetype("text/plain")
+            .mimetype(mime::TEXT_PLAIN.as_ref())
             .body(Vec::new()),
         }
       });
@@ -1135,7 +1135,7 @@ impl<R: Runtime> WindowManager<R> {
           if html.contains('<') && html.contains('>') {
             let mut document = tauri_utils::html::parse(html);
             tauri_utils::html::inject_csp(&mut document, &csp.to_string());
-            url.set_path(&format!("text/html,{}", document.to_string()));
+            url.set_path(&format!("{},{}", mime::TEXT_HTML, document.to_string()));
           }
         }
       }