Skip to content

Commit

Permalink
fixed for newer tauri commands
Browse files Browse the repository at this point in the history
  • Loading branch information
doomy committed Oct 29, 2023
1 parent 4b1c8c4 commit 6f7848c
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
3 changes: 2 additions & 1 deletion src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[build-dependencies]
tauri-build = { version = "1.4", features = [] }
tauri-build = { version = "2.0.0-alpha", features = [] }

[dependencies]
tauri = { version = "2.0.0-alpha", features = [] }

serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
# tatoebars = { path = "../../doomybotv2/lib/tatoebars", features = ["cnm"] }
Expand Down
2 changes: 0 additions & 2 deletions src-tauri/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@ async fn main() {
sqlx::Sqlite::create_database(database_path).await.unwrap();
}

// let crate_dir = std::env::var("CARGO_MANIFEST_DIR").unwrap();

let pool = SqlitePoolOptions::new()
.connect(database_path)
.await
Expand Down
4 changes: 2 additions & 2 deletions src-web/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ pub struct Sentence {

#[wasm_bindgen]
extern "C" {
#[wasm_bindgen(js_namespace = ["window", "__TAURI__", "tauri"])]
pub(crate) async fn invoke(cmd: &str, args: JsValue) -> JsValue;
#[wasm_bindgen(js_namespace = ["window", "__TAURI__", "primitives"])]
async fn invoke(cmd: &str, args: JsValue) -> JsValue;
}

#[derive(Debug, Clone, PartialEq, yew_router::Routable)]
Expand Down

0 comments on commit 6f7848c

Please sign in to comment.