Skip to content

Commit

Permalink
Merge branch 'main' into aw/restyling
Browse files Browse the repository at this point in the history
  • Loading branch information
aumetra committed Nov 7, 2024
2 parents 2b88b8f + fbf3c42 commit 00911f0
Show file tree
Hide file tree
Showing 22 changed files with 1,218 additions and 1,215 deletions.
423 changes: 226 additions & 197 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ diesel-async = { version = "0.5.1", features = [
"tokio",
] }
diesel_full_text_search = { version = "2.2.0", default-features = false }
fred = { version = "9.3.0", features = [
fred = { version = "9.4.0", features = [
"enable-rustls-ring",
"full-tracing",
"i-scripts",
Expand Down
2 changes: 1 addition & 1 deletion crates/kitsune-activitypub/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ speedy-uuid = { workspace = true }
tracing = "0.1.40"
triomphe = { workspace = true }
typed-builder = "0.20.0"
url = "2.5.2"
url = "2.5.3"

[target.'cfg(not(target_env = "msvc"))'.dependencies]
sha2 = { version = "0.10.8", features = ["asm"] }
Expand Down
2 changes: 1 addition & 1 deletion crates/kitsune-derive/impl/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ proc-macro = true
[dependencies]
proc-macro2 = "1.0.89"
quote = "1.0.37"
syn = { version = "2.0.86", features = ["full"] }
syn = { version = "2.0.87", features = ["full"] }

[lints]
workspace = true
2 changes: 1 addition & 1 deletion crates/kitsune-federation-filter/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ kitsune-config = { workspace = true }
kitsune-derive = { workspace = true }
kitsune-error = { workspace = true }
kitsune-type = { workspace = true }
url = "2.5.2"
url = "2.5.3"

[lints]
workspace = true
2 changes: 1 addition & 1 deletion crates/kitsune-oidc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ openidconnect = { version = "4.0.0-rc.1", default-features = false, features = [
serde = { version = "1.0.214", features = ["derive"] }
sonic-rs = { workspace = true }
speedy-uuid = { workspace = true }
url = "2.5.2"
url = "2.5.3"

[dev-dependencies]
tokio = { version = "1.41.0", features = ["macros", "rt"] }
Expand Down
2 changes: 1 addition & 1 deletion crates/kitsune-service/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ tokio = { workspace = true, features = ["macros", "sync"] }
tracing = "0.1.40"
triomphe = { workspace = true }
typed-builder = "0.20.0"
url = "2.5.2"
url = "2.5.3"
zxcvbn = { version = "3.1.0", default-features = false }

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/kitsune-test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ rand = "0.8.5"
rusty-s3 = { version = "0.5.0", default-features = false }
tokio = { workspace = true, features = ["time"] }
triomphe = { workspace = true }
url = "2.5.2"
url = "2.5.3"
uuid = { version = "1.11.0", features = ["fast-rng", "v4"] }

[lints]
Expand Down
2 changes: 1 addition & 1 deletion crates/kitsune-util/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version.workspace = true
license.workspace = true

[dependencies]
bubble-bath = "0.2.0"
bubble-bath = "0.2.1"
iso8601-timestamp = { workspace = true }
kitsune-type = { workspace = true }
pulldown-cmark = { version = "0.12.2", default-features = false, features = [
Expand Down
4 changes: 2 additions & 2 deletions crates/kitsune-wasm-mrf/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ tokio = { workspace = true, features = ["fs"] }
tracing = "0.1.40"
triomphe = { workspace = true }
walkdir = "2.5.0"
wasmtime = { version = "26.0.0", default-features = false, features = [
wasmtime = { version = "26.0.1", default-features = false, features = [
"addr2line",
"async",
"component-model",
Expand All @@ -38,7 +38,7 @@ wasmtime = { version = "26.0.0", default-features = false, features = [
"pooling-allocator",
"runtime",
] }
wasmtime-wasi = { version = "26.0.0", default-features = false }
wasmtime-wasi = { version = "26.0.1", default-features = false }

[dev-dependencies]
tempfile = "3.13.0"
Expand Down
16 changes: 8 additions & 8 deletions kitsune-fe/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,25 +25,25 @@
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
"@types/eslint": "^9.6.1",
"autoprefixer": "^10.4.20",
"eslint": "^9.13.0",
"eslint": "^9.14.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-svelte": "^2.46.0",
"globals": "^15.11.0",
"globals": "^15.12.0",
"houdini": "1.3.0",
"houdini-svelte": "2.0.0",
"prettier": "^3.3.3",
"prettier-plugin-css-order": "^2.1.2",
"prettier-plugin-svelte": "^3.2.7",
"prettier-plugin-tailwindcss": "^0.6.5",
"sass": "^1.80.4",
"svelte": "^5.1.0",
"sass": "^1.80.6",
"svelte": "^5.1.12",
"svelte-check": "^4.0.5",
"tailwindcss": "^3.4.9",
"typescript": "^5.6.3",
"typescript-eslint": "^8.11.0",
"unplugin-icons": "^0.19.3",
"typescript-eslint": "^8.13.0",
"unplugin-icons": "^0.20.1",
"vite": "^5.4.10",
"vitest": "^2.1.3",
"vitest": "^2.1.4",
"zod": "^3.23.8"
}
}
}
969 changes: 490 additions & 479 deletions kitsune-fe/pnpm-lock.yaml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion kitsune/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ tracing = "0.1.40"
trials = { workspace = true }
triomphe = { workspace = true }
typed-builder = "0.20.0"
url = "2.5.2"
url = "2.5.3"

# --- Optional dependencies ---

Expand Down
2 changes: 1 addition & 1 deletion lib/athena/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ serde = { version = "1.0.214", features = ["derive"] }
smol_str = "0.3.2"
sonic-rs = { workspace = true, optional = true }
speedy-uuid = { workspace = true, features = ["redis"] }
thiserror = "1.0.66"
thiserror = "2.0.0"
tokio = { workspace = true, features = ["macros", "rt", "sync"] }
tokio-util = { version = "0.7.12", features = ["rt"] }
tracing = "0.1.40"
Expand Down
2 changes: 1 addition & 1 deletion lib/blowocking/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0"

[dependencies]
rayon = "1.10.0"
thiserror = "1.0.66"
thiserror = "2.0.0"
tokio = { workspace = true, features = ["sync"] }
tracing = "0.1.40"

Expand Down
2 changes: 1 addition & 1 deletion lib/geomjeungja/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ hickory-resolver = "0.25.0-alpha.2"
rand = "0.8.5"
serde = { version = "1.0.214", features = ["derive"] }
simdutf8 = { workspace = true }
thiserror = "1.0.66"
thiserror = "2.0.0"
tracing = "0.1.40"
triomphe = { workspace = true }
typed-builder = "0.20.0"
Expand Down
2 changes: 1 addition & 1 deletion lib/http-signatures/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ miette = "7.2.0"
pkcs8 = { version = "0.10.2", features = ["pem", "std"] }
ring = { version = "0.17.8", features = ["std"] }
scoped-futures = { version = "0.1.4", default-features = false }
thiserror = "1.0.66"
thiserror = "2.0.0"
tick-tock-mock = { workspace = true }
tracing = { version = "0.1.40", default-features = false, optional = true }

Expand Down
2 changes: 1 addition & 1 deletion lib/mrf-manifest/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ schemars = { version = "0.8.21", features = ["impl_json_schema", "semver"] }
semver = { version = "1.0.23", features = ["serde"] }
serde = { version = "1.0.214", features = ["derive"] }
sonic-rs = { workspace = true, optional = true }
thiserror = { version = "1.0.66", optional = true }
thiserror = { version = "2.0.0", optional = true }
wasm-encoder = { version = "0.219.1", optional = true }
wasmparser = { version = "0.219.1", optional = true }

Expand Down
2 changes: 1 addition & 1 deletion lib/schaber/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0"

[dependencies]
lol_html = "2.0.0"
thiserror = "1.0.66"
thiserror = "2.0.0"

[lints]
workspace = true
4 changes: 2 additions & 2 deletions lib/speedy-uuid/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ diesel = { version = "2.2.4", default-features = false, features = [
"postgres_backend",
"uuid",
], optional = true }
fred = { version = "9.3.0", default-features = false, optional = true }
fred = { version = "9.4.0", default-features = false, optional = true }
serde = { version = "1.0.214", optional = true }
thiserror = "1.0.66"
thiserror = "2.0.0"
uuid = { version = "1.11.0", features = ["fast-rng", "v7"] }
uuid-simd = { version = "0.8.0", features = ["uuid"] }

Expand Down
8 changes: 4 additions & 4 deletions website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
},
"dependencies": {
"@astrojs/check": "^0.9.4",
"@astrojs/starlight": "^0.28.3",
"astro": "^4.16.6",
"@astrojs/starlight": "^0.28.6",
"astro": "^4.16.10",
"sharp": "^0.33.5",
"starlight-links-validator": "^0.12.3",
"starlight-links-validator": "^0.13.0",
"typescript": "^5.6.3"
},
"devDependencies": {
"prettier": "^3.3.3",
"prettier-plugin-astro": "^0.14.1",
"sass": "^1.80.3"
"sass": "^1.80.6"
}
}
Loading

0 comments on commit 00911f0

Please sign in to comment.