Skip to content

Commit

Permalink
fix(deps): update deps (libnyanpasu#294)
Browse files Browse the repository at this point in the history
* fix(deps): update rust crate sysinfo to v0.30

* fix(deps): update rust crate windows-sys and winreg to v0.52

* fix(deps): update rust crate which to v6

* fix(renovate): pin npm dependencies

* fix: lint
  • Loading branch information
greenhat616 authored Jan 21, 2024
1 parent a7893cb commit 42ec60b
Show file tree
Hide file tree
Showing 9 changed files with 525 additions and 875 deletions.
271 changes: 136 additions & 135 deletions backend/Cargo.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions backend/sysproxy-rs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ keywords = ["system-proxy", "proxy", "networksetup", "gsettings"]
description = "A library for set/get system proxy. Supports Windows, macOS and linux (via gsettings)."

[dependencies]
thiserror = { workspace = true, version = "1.0" }
thiserror = { workspace = true }

[target.'cfg(target_os = "macos")'.dependencies]
interfaces = "0.0.9"

[target.'cfg(target_os = "windows")'.dependencies]
iptools = "0.2.4"
winreg = { version = "0.10", features = ["transactions"] }
winreg = { version = "0.52", features = ["transactions"] }

[target.'cfg(target_os = "windows")'.dependencies.windows]
version = "0.52"
Expand Down
10 changes: 5 additions & 5 deletions backend/tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ simd-json = "0.13"

[dependencies]
warp = "0.3"
which = "4.4.2"
which = "6"
anyhow = "1.0"
dirs = "5.0.1"
open = "5.0.1"
Expand All @@ -26,7 +26,7 @@ dunce = "1.0.4"
log4rs = "1.2.0"
nanoid = "0.4.0"
chrono = "0.4.31"
sysinfo = "0.29"
sysinfo = "0.30"
sysproxy = { path = "../sysproxy-rs", version = "0.3" }
rquickjs = "0.4.0"
serde_json = "1.0"
Expand Down Expand Up @@ -62,14 +62,14 @@ async-trait = "0.1.77"
dyn-clone = "1.0.16"
rs-snowflake = "0.6"
rocksdb = "0.21"
thiserror = { workspace = true, version = "1.0" }
thiserror = { workspace = true }
simd-json = "0.13.6"
runas = "=1.0.0" # blocked by https://github.com/mitsuhiko/rust-runas/issues/13

[target.'cfg(windows)'.dependencies]
deelevate = "0.2.0"
winreg = { version = "0.50", features = ["transactions"] }
windows-sys = { version = "0.48", features = [
winreg = { version = "0.52", features = ["transactions"] }
windows-sys = { version = "0.52", features = [
"Win32_System_LibraryLoader",
"Win32_System_SystemInformation",
] }
Expand Down
2 changes: 1 addition & 1 deletion backend/tauri/src/core/core.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use anyhow::{bail, Context, Result};
use once_cell::sync::OnceCell;
use parking_lot::Mutex;
use std::{fs, io::Write, sync::Arc, time::Duration};
use sysinfo::{Pid, PidExt, ProcessExt, System, SystemExt};
use sysinfo::{Pid, System};
use tauri::api::process::{Command, CommandChild, CommandEvent};
use tokio::time::sleep;

Expand Down
66 changes: 33 additions & 33 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,49 +47,49 @@
"@dnd-kit/core": "^6.1.0",
"@dnd-kit/sortable": "^8.0.0",
"@dnd-kit/utilities": "^3.2.2",
"@emotion/react": "^11.11.1",
"@emotion/react": "^11.11.3",
"@emotion/styled": "^11.11.0",
"@juggle/resize-observer": "^3.4.0",
"@mui/icons-material": "^5.14.14",
"@mui/lab": "5.0.0-alpha.155",
"@mui/material": "^5.14.14",
"@mui/x-data-grid": "^6.16.3",
"@tauri-apps/api": "^1.5.1",
"ahooks": "^3.7.2",
"axios": "^1.1.3",
"@mui/icons-material": "^5.15.5",
"@mui/material": "^5.15.5",
"@mui/x-data-grid": "^6.19.1",
"@mui/lab": "5.0.0-alpha.161",
"@tauri-apps/api": "^1.5.3",
"ahooks": "^3.7.8",
"axios": "^1.6.5",
"dayjs": "1.11.10",
"framer-motion": "10.18.0",
"i18next": "^23.0.0",
"i18next": "^23.7.18",
"lodash-es": "^4.17.21",
"monaco-editor": "^0.45.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-error-boundary": "^4.0.0",
"react-hook-form": "^7.39.5",
"react-i18next": "^14.0.0",
"react-router-dom": "^6.4.3",
"react-error-boundary": "^4.0.12",
"react-hook-form": "^7.49.3",
"react-i18next": "^14.0.1",
"react-router-dom": "^6.21.3",
"react-transition-group": "^4.4.5",
"react-virtuoso": "^4.0.0",
"recoil": "^0.7.6",
"react-virtuoso": "^4.6.2",
"recoil": "^0.7.7",
"snarkdown": "^2.0.0",
"swr": "^2.0.0"
"swr": "^2.2.4"
},
"devDependencies": {
"@actions/github": "^6.0.0",
"@commitlint/cli": "18.4.4",
"@commitlint/config-conventional": "18.4.4",
"@tauri-apps/cli": "^1.5.7",
"@types/fs-extra": "^11.0.0",
"@types/js-cookie": "^3.0.2",
"@types/lodash": "^4.14.180",
"@types/lodash-es": "^4.17.7",
"@types/react": "^18.2.37",
"@types/react-dom": "^18.0.11",
"@types/react-transition-group": "^4.4.9",
"@tauri-apps/cli": "^1.5.9",
"@types/fs-extra": "^11.0.4",
"@types/js-cookie": "^3.0.6",
"@types/lodash": "^4.14.202",
"@types/lodash-es": "^4.17.12",
"@types/react": "^18.2.48",
"@types/react-dom": "^18.2.18",
"@types/react-transition-group": "^4.4.10",
"@typescript-eslint/eslint-plugin": "6.19.0",
"@typescript-eslint/parser": "6.19.0",
"@vitejs/plugin-react": "^4.2.1",
"adm-zip": "^0.5.9",
"adm-zip": "^0.5.10",
"autoprefixer": "10.4.17",
"colorize-template": "1.0.0",
"consola": "3.2.3",
Expand All @@ -105,20 +105,20 @@
"eslint-plugin-prettier": "5.1.3",
"eslint-plugin-promise": "6.1.1",
"eslint-plugin-react": "7.33.2",
"fs-extra": "^11.0.0",
"https-proxy-agent": "^7.0.0",
"husky": "^8.0.0",
"fs-extra": "^11.2.0",
"https-proxy-agent": "^7.0.2",
"husky": "^8.0.3",
"lint-staged": "15.2.0",
"node-fetch": "^3.2.6",
"node-fetch": "^3.3.2",
"npm-run-all": "4.1.5",
"picocolors": "1.0.0",
"postcss": "8.4.33",
"postcss-html": "1.6.0",
"postcss-import": "16.0.0",
"postcss-scss": "4.0.9",
"prettier": "^3.1.0",
"prettier": "^3.2.4",
"prettier-plugin-toml": "2.0.1",
"sass": "^1.54.0",
"sass": "^1.70.0",
"shikiji": "0.9.19",
"stylelint": "16.2.0",
"stylelint-config-html": "1.1.0",
Expand All @@ -128,8 +128,8 @@
"stylelint-order": "6.0.4",
"stylelint-scss": "6.0.0",
"tsx": "4.7.0",
"typescript": "^5.3.2",
"vite": "^5.0.0",
"typescript": "^5.3.3",
"vite": "^5.0.12",
"vite-plugin-monaco-editor": "^1.1.0",
"vite-plugin-svgr": "^4.2.0"
}
Expand Down
Loading

0 comments on commit 42ec60b

Please sign in to comment.