Skip to content

Commit

Permalink
feat: upgrade tauri 2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
dancixx committed Dec 8, 2024
1 parent 2694518 commit b3d5b72
Show file tree
Hide file tree
Showing 23 changed files with 10,109 additions and 850 deletions.
5 changes: 0 additions & 5 deletions .idea/.gitignore

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

13 changes: 5 additions & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,26 +1,23 @@
[package]
name = "rsql"
version = "1.0.0-beta.3"
version = "1.0.0"
edition = "2021"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
leptos = { version = "0.6", features = ["csr", "nightly"] }
leptos_devtools = { git = "https://github.com/luoxiaozero/leptos-devtools" }
serde = { version = "1.0.192", features = ["derive"] }
serde-wasm-bindgen = "0.6.3"
wasm-bindgen = { version ="0.2.91", features = ["serde-serialize"] }
js-sys = "0.3.68"
wasm-bindgen = { version = "0.2.91", features = ["serde-serialize"] }
leptos-use = { version = "^0.13.4" }
leptos_icons = "0.3.0" # https://carlosted.github.io/icondata/
serde_json = "1.0.113"
wasm-bindgen-futures = "0.4.39"
monaco = "0.4.0"
tauri-sys = { git = "https://github.com/JonasKruckenberg/tauri-sys", features = ["all"] }
tauri-sys = { git = "https://github.com/JonasKruckenberg/tauri-sys", features = [
"all",
], branch = "v2" }
thaw = { version = "0.3", features = ["csr"] }
common = { path = "common" }
futures = "0.3.30"
async-stream = "0.3.5"
icondata = "0.3.0"
ahash = { version = "0.8.11", features = ["serde"] }
leptos_toaster = { version = "0.1.6", features = ["builtin_toast"] }
Expand Down
4 changes: 1 addition & 3 deletions common/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
[package]
name = "common"
version = "1.0.0-beta.3"
version = "1.0.0"
edition = "2021"

[dependencies]
js-sys = "0.3.67"
serde = "1.0.193"
wasm-bindgen = "0.2.90"
2 changes: 1 addition & 1 deletion proc-macros/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "proc-macros"
version = "0.1.0"
version = "1.0.0"
edition = "2021"

[dependencies]
Expand Down
14 changes: 6 additions & 8 deletions src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "backend"
version = "1.0.0-beta.3"
version = "1.0.0"
description = "PostgreSQL GUI written in Rust"
authors = ["Daniel Boros"]
license = ""
Expand All @@ -10,23 +10,21 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[build-dependencies]
tauri-build = { version = "1.5.2", features = [] }
tauri-build = { version = "2", features = [] }

[dependencies]
common = { path = "../common" }
tauri = { version = "1.6.6", features = ["shell-open", "fs-all"] }
serde = { version = "1.0.193", features = ["derive"] }
serde_json = "1.0.108"
tauri = { version = "2", features = [] }
tokio = "1.37.0"
tokio-postgres = "0.7.10"
chrono = "0.4.31"
sled = "0.34.7"
anyhow = "1.0.83"
tracing = "0.1.40"
tracing-subscriber = { version = "0.3.18", features = ["fmt"] }
ahash = { version = "0.8.11", features = ["serde"] }
bincode = "1.3.3"

tauri-plugin-shell = "2"
tauri-plugin-fs = "2"
serde_json = "1.0.133"


[features]
Expand Down
29 changes: 29 additions & 0 deletions src-tauri/capabilities/migrated.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"identifier": "migrated",
"description": "permissions that were migrated from v1",
"local": true,
"windows": [
"main"
],
"permissions": [
"core:default",
"fs:allow-read-file",
"fs:allow-write-file",
"fs:allow-read-dir",
"fs:allow-copy-file",
"fs:allow-mkdir",
"fs:allow-remove",
"fs:allow-remove",
"fs:allow-rename",
"fs:allow-exists",
{
"identifier": "fs:scope",
"allow": [
"$APPDATA/*"
]
},
"shell:allow-open",
"shell:default",
"fs:default"
]
}
1 change: 1 addition & 0 deletions src-tauri/gen/schemas/acl-manifests.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src-tauri/gen/schemas/capabilities.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"migrated":{"identifier":"migrated","description":"permissions that were migrated from v1","local":true,"windows":["main"],"permissions":["core:default","fs:allow-read-file","fs:allow-write-file","fs:allow-read-dir","fs:allow-copy-file","fs:allow-mkdir","fs:allow-remove","fs:allow-remove","fs:allow-rename","fs:allow-exists",{"identifier":"fs:scope","allow":["$APPDATA/*"]},"shell:allow-open","shell:default","fs:default"]}}
Loading

0 comments on commit b3d5b72

Please sign in to comment.