Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into graph-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
ravenclaw900 committed Jul 3, 2023
2 parents d094277 + 1ddf6aa commit bbe3901
Show file tree
Hide file tree
Showing 21 changed files with 730 additions and 651 deletions.
71 changes: 38 additions & 33 deletions Cargo.lock

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

22 changes: 11 additions & 11 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,20 @@ psutil = "3.2.2"
ring = "0.16.20"
figment = { version = "0.10", features = ["toml", "env"] }
if-addrs = "0.10.1"
zip = { version = "0.6.4", default-features = false, features = ["time"] }
zip = { version = "0.6.6", default-features = false, features = ["time"] }
walkdir = "2.3.3"
jsonwebtoken = { version = "8.3.0", default-features = false }
serde = { version = "1.0.160", features = ["derive"] }
anyhow = "1.0.70"
once_cell = "1.17.1"
serde_json = "1.0.96"
tracing = { version = "0.1.37", features = ["release_max_level_debug"] }
serde = { version = "1.0.164", features = ["derive"] }
anyhow = "1.0.71"
once_cell = "1.18.0"
serde_json = "1.0.99"
tracing = { version = "0.1.38", features = ["release_max_level_debug"] }
tracing-subscriber = "0.3.17"
hyper = { version = "0.14.26", features = ["server", "http1", "tcp"] }
tokio-tungstenite = "0.18.0"
tokio-rustls = "0.24.0"
rustls-pemfile = "1.0.2"
getrandom = "0.2.9"
hyper = { version = "0.14.27", features = ["server", "http1", "tcp"] }
tokio-tungstenite = "0.19.0"
tokio-rustls = "0.24.1"
rustls-pemfile = "1.0.3"
getrandom = "0.2.10"
hex = "0.4.3"
vite-embed = { git = "https://github.com/ravenclaw900/vite-embed", version = "0.1.0", features = ["prod"], optional = true }
mime_guess = { version = "2.0.4", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion Justfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ dev:
pnpm install
pnpm dev &
cd ..
cargo run --quiet --features dev &
cargo run --features dev &
trap 'kill $(jobs -pr)' EXIT
wait
22 changes: 15 additions & 7 deletions frontend/.prettierrc.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
{
"trailingComma": "es5",
"tabWidth": 4,
"semi": true,
"arrowParens": "avoid",
"printWidth": 90,
"plugins": ["prettier-plugin-svelte"]
}
"trailingComma": "es5",
"tabWidth": 2,
"semi": true,
"arrowParens": "avoid",
"printWidth": 90,
"plugins": ["prettier-plugin-svelte"],
"overrides": [
{
"files": "*.svelte",
"options": {
"tabWidth": 4
}
}
]
}
23 changes: 12 additions & 11 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,27 @@
"devDependencies": {
"@iconify-json/fa6-solid": "^1.1.12",
"@iconify-json/svg-spinners": "^1.1.1",
"@sveltejs/vite-plugin-svelte": "^2.0.3",
"@tsconfig/svelte": "^4.0.1",
"@sveltejs/vite-plugin-svelte": "^2.4.1",
"@tsconfig/svelte": "^5.0.0",
"@types/autosize": "^4.0.1",
"@types/microlight": "^0.0.0",
"@types/semver-compare-multi": "^1.0.0",
"@unocss/extractor-svelte": "^0.53.4",
"postcss": "^8.4.21",
"prettier": "^2.8.7",
"prettier-plugin-svelte": "^2.10.0",
"svelte": "^3.57.0",
"svelte-check": "^3.1.4",
"prettier-plugin-svelte": "^2.10.1",
"svelte": "^4.0.0",
"svelte-check": "^3.4.4",
"svelte-language-server": "^0.15.8",
"svelte-preprocess": "^5.0.3",
"svelte-routing": "^1.6.0",
"svelte-preprocess": "^5.0.4",
"svelte-routing": "^1.11.0",
"tslib": "^2.5.0",
"typescript": "^5.0.2",
"unocss": "^0.51.0",
"unocss": "^0.53.0",
"vite": "^4.2.0"
},
"dependencies": {
"@unocss/reset": "^0.51.0",
"@unocss/reset": "^0.53.0",
"microlight": "^0.0.7",
"pretty-bytes": "^6.1.0",
"pretty-ms": "^8.0.0",
Expand All @@ -41,5 +42,5 @@
"xterm-addon-attach": "^0.8.0",
"xterm-addon-fit": "^0.7.0"
},
"packageManager": "pnpm@8.3.1"
}
"packageManager": "pnpm@8.6.5"
}
Loading

0 comments on commit bbe3901

Please sign in to comment.