Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions biome.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@
"bracketSpacing": true,
"expand": "auto",
"useEditorconfig": true,
"includes": [
"./src/**"
]
"includes": ["./src/**"]
},
"linter": {
"enabled": true,
Expand Down Expand Up @@ -70,9 +68,7 @@
"noArrayIndexKey": "off"
}
},
"includes": [
"src/**"
]
"includes": ["src/**"]
},
"javascript": {
"formatter": {
Expand All @@ -94,9 +90,7 @@
},
"overrides": [
{
"includes": [
"**/*.js"
]
"includes": ["**/*.js"]
}
],
"assist": {
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

78 changes: 71 additions & 7 deletions src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ authors = ["Defguard"]
edition = "2021"
homepage = "https://github.com/DefGuard/client"
license-file = "../LICENSE.md"
rust-version = "1.87"
rust-version = "1.95"
version = "1.6.9"

[package]
Expand Down Expand Up @@ -84,8 +84,9 @@ sqlx = { version = "0.8", features = [
"uuid",
"macros",
] }
struct-patch = "0.10"
struct-patch = "0.11"
strum = { version = "0.28", features = ["derive"] }
sysinfo = { version = "0.39", default-features = false, features = ["apple-app-store", "system"] }
tauri = { version = "2", features = [
"native-tls-vendored",
"image-png",
Expand Down Expand Up @@ -128,9 +129,6 @@ objc2 = "0.6"
objc2-foundation = "0.3"
objc2-network-extension = "0.3"

[target.'cfg(target_os = "macos")'.build-dependencies]
swift-rs = { version = "1.0", features = ["build"] }

[target.'cfg(unix)'.dependencies]
nix = { version = "0.31", features = ["user", "fs"] }
tokio-stream = "0.1"
Expand Down Expand Up @@ -164,6 +162,7 @@ windows-sys = { version = "0.61", features = [
# Network address change notifications (NotifyAddrChange)
"Win32_NetworkManagement_IpHelper",
] }
wmi = {version = "0.18", default-features = false}

[features]
# this feature is used for production builds or when `devPath` points to the filesystem and the built-in dev server is disabled.
Expand Down
9 changes: 7 additions & 2 deletions src-tauri/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,13 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
// Make all messages serde-serializable.
.type_attribute(".", "#[derive(serde::Serialize,serde::Deserialize)]")
.compile_protos(
&["proto/client/client.proto", "proto/core/proxy.proto"],
&["proto/client", "proto/core"],
&[
"proto/v1/client/client.proto",
"proto/v1/core/proxy.proto",
"proto/enterprise/v2/posture/posture.proto",
"proto/common/client_types.proto",
],
&["proto"],
)?;

tauri_build::build();
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/cli/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
)
// Make all messages serde-serializable.
.type_attribute(".", "#[derive(serde::Deserialize,serde::Serialize)]")
.compile_protos(&["../proto/core/proxy.proto"], &["../proto/core"])?;
.compile_protos(&["../proto/v1/core/proxy.proto"], &["../proto"])?;

Ok(())
}
Loading
Loading