From a86b9eae6868b761ec714ba3a8d4b6cfe32caea7 Mon Sep 17 00:00:00 2001 From: Aumetra Weisman Date: Tue, 26 Nov 2024 01:51:21 +0100 Subject: [PATCH] use pnpm workspaces --- kitsune-fe/.npmrc => .npmrc | 0 Cargo.lock | 62 ++++++++++++++++----------------- lib/fast-cjson/Cargo.toml | 2 +- lib/http-signatures/Cargo.toml | 2 +- lib/masto-id-convert/Cargo.toml | 2 +- lib/post-process/Cargo.toml | 2 +- lib/tick-tock-mock/Cargo.toml | 2 +- pnpm-workspace.yaml | 3 ++ website/.npmrc | 2 -- 9 files changed, 39 insertions(+), 38 deletions(-) rename kitsune-fe/.npmrc => .npmrc (100%) create mode 100644 pnpm-workspace.yaml delete mode 100644 website/.npmrc diff --git a/kitsune-fe/.npmrc b/.npmrc similarity index 100% rename from kitsune-fe/.npmrc rename to .npmrc diff --git a/Cargo.lock b/Cargo.lock index 0a461dd6f..2038039e9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -528,7 +528,7 @@ dependencies = [ "http-body-util", "hyper", "hyper-util", - "itoa 1.0.13", + "itoa 1.0.14", "matchit", "memchr", "mime", @@ -1082,7 +1082,7 @@ dependencies = [ "enum-primitive-derive", "hashbrown 0.14.5", "iso8601-timestamp", - "itoa 1.0.13", + "itoa 1.0.14", "num-traits", "paste", "rustc-hash", @@ -1160,7 +1160,7 @@ checksum = "f86b9c4c00838774a6d902ef931eff7470720c51d90c2e32cfe15dc304737b3f" dependencies = [ "castaway", "cfg-if", - "itoa 1.0.13", + "itoa 1.0.14", "ryu", "serde", "static_assertions", @@ -1722,7 +1722,7 @@ dependencies = [ "bitflags 2.6.0", "byteorder", "diesel_derives", - "itoa 1.0.13", + "itoa 1.0.14", "time", "uuid", ] @@ -1815,9 +1815,9 @@ dependencies = [ [[package]] name = "divan" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e05d17bd4ff1c1e7998ed4623d2efd91f72f1e24141ac33aac9377974270e1f" +checksum = "ccc40f214f0d9e897cfc72e2edfa5c225d3252f758c537f11ac0a80371c073a6" dependencies = [ "cfg-if", "clap", @@ -1829,9 +1829,9 @@ dependencies = [ [[package]] name = "divan-macros" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b4464d46ce68bfc7cb76389248c7c254def7baca8bece0693b02b83842c4c88" +checksum = "7bdb5411188f7f878a17964798c1264b6b0a9f915bd39b20bf99193c923e1b4e" dependencies = [ "proc-macro2", "quote", @@ -2428,9 +2428,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96512db27971c2c3eece70a1e106fbe6c87760234e31e8f7e5634912fe52794a" +checksum = "2cb8bc4c28d15ade99c7e90b219f30da4be5c88e586277e8cbe886beeb868ab2" dependencies = [ "typenum", ] @@ -2621,9 +2621,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" dependencies = [ "foldhash", ] @@ -2773,7 +2773,7 @@ checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", - "itoa 1.0.13", + "itoa 1.0.14", ] [[package]] @@ -2890,7 +2890,7 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa 1.0.13", + "itoa 1.0.14", "pin-project-lite", "smallvec", "tokio", @@ -3167,7 +3167,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown 0.15.1", + "hashbrown 0.15.2", "serde", ] @@ -3263,7 +3263,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f29aa7bddb1f0807e7340c46a6549ac1d23f798dd00f47d9d7782b020f11ac0b" dependencies = [ "diesel", - "generic-array 1.1.0", + "generic-array 1.1.1", "serde", "time", ] @@ -3313,9 +3313,9 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[package]] name = "itoa" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "540654e97a3f4470a492cd30ff187bc95d89557a903a2bbf112e2fae98104ef2" +checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "js-sys" @@ -4192,9 +4192,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.164" +version = "0.2.165" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f" +checksum = "fcb4d3d38eab6c5239a362fa8bae48c03baf980a6e7079f063942d563ef3533e" [[package]] name = "libm" @@ -4732,7 +4732,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ "crc32fast", - "hashbrown 0.15.1", + "hashbrown 0.15.2", "indexmap 2.6.0", "memchr", ] @@ -5873,7 +5873,7 @@ checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" dependencies = [ "bitflags 2.6.0", "errno", - "itoa 1.0.13", + "itoa 1.0.14", "libc", "linux-raw-sys", "once_cell", @@ -6171,7 +6171,7 @@ checksum = "8de514ef58196f1fc96dcaef80fe6170a1ce6215df9687a93fe8300e773fefc5" dependencies = [ "form_urlencoded", "indexmap 2.6.0", - "itoa 1.0.13", + "itoa 1.0.14", "ryu", "serde", ] @@ -6182,7 +6182,7 @@ version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" dependencies = [ - "itoa 1.0.13", + "itoa 1.0.14", "memchr", "ryu", "serde", @@ -6194,7 +6194,7 @@ version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" dependencies = [ - "itoa 1.0.13", + "itoa 1.0.14", "serde", ] @@ -6243,7 +6243,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 1.0.13", + "itoa 1.0.14", "ryu", "serde", ] @@ -6430,7 +6430,7 @@ source = "git+https://github.com/Lantern-chat/snowflake#28d05c604cadca0c1f843244 dependencies = [ "crossbeam-utils", "iso8601-timestamp", - "itoa 1.0.13", + "itoa 1.0.14", "serde", ] @@ -6453,7 +6453,7 @@ dependencies = [ "bytes", "cfg-if", "faststr", - "itoa 1.0.13", + "itoa 1.0.14", "parking_lot", "ryu", "serde", @@ -6842,7 +6842,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", - "itoa 1.0.13", + "itoa 1.0.14", "num-conv", "powerfmt", "serde", @@ -7259,9 +7259,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" dependencies = [ "once_cell", "valuable", diff --git a/lib/fast-cjson/Cargo.toml b/lib/fast-cjson/Cargo.toml index 0e8ea41b6..5df529e3d 100644 --- a/lib/fast-cjson/Cargo.toml +++ b/lib/fast-cjson/Cargo.toml @@ -16,7 +16,7 @@ serde = "1.0.215" sonic-rs = { workspace = true } [dev-dependencies] -divan = "0.1.15" +divan = "0.1.16" mimalloc = "0.1.43" olpc-cjson = "0.1.4" proptest = { version = "1.5.0", default-features = false, features = ["std"] } diff --git a/lib/http-signatures/Cargo.toml b/lib/http-signatures/Cargo.toml index 5903a0b1e..c7df6bf43 100644 --- a/lib/http-signatures/Cargo.toml +++ b/lib/http-signatures/Cargo.toml @@ -32,7 +32,7 @@ tick-tock-mock = { workspace = true } tracing = { version = "0.1.40", default-features = false, optional = true } [dev-dependencies] -divan = "0.1.15" +divan = "0.1.16" tokio = { workspace = true, features = ["macros", "rt"] } [features] diff --git a/lib/masto-id-convert/Cargo.toml b/lib/masto-id-convert/Cargo.toml index cf45625f8..5917d6cae 100644 --- a/lib/masto-id-convert/Cargo.toml +++ b/lib/masto-id-convert/Cargo.toml @@ -17,7 +17,7 @@ nanorand = { version = "0.7.0", default-features = false, features = [ uuid = { version = "1.11.0", default-features = false } [dev-dependencies] -divan = "0.1.15" +divan = "0.1.16" time = "0.3.36" uuid = { version = "1.11.0", features = ["v7"] } diff --git a/lib/post-process/Cargo.toml b/lib/post-process/Cargo.toml index b7fc12c4a..30259326b 100644 --- a/lib/post-process/Cargo.toml +++ b/lib/post-process/Cargo.toml @@ -13,7 +13,7 @@ harness = false logos = "0.14.2" [dev-dependencies] -divan = "0.1.15" +divan = "0.1.16" futures-executor = "0.3.31" insta = { version = "1.41.1", features = ["glob"] } pretty_assertions = "1.4.1" diff --git a/lib/tick-tock-mock/Cargo.toml b/lib/tick-tock-mock/Cargo.toml index f6e03dbd7..ce8fa1786 100644 --- a/lib/tick-tock-mock/Cargo.toml +++ b/lib/tick-tock-mock/Cargo.toml @@ -12,7 +12,7 @@ harness = false [dependencies] [dev-dependencies] -divan = "0.1.15" +divan = "0.1.16" [lints] workspace = true diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml new file mode 100644 index 000000000..359192ead --- /dev/null +++ b/pnpm-workspace.yaml @@ -0,0 +1,3 @@ +packages: + - kitsune-fe/ + - website/ diff --git a/website/.npmrc b/website/.npmrc deleted file mode 100644 index e9ad23c6d..000000000 --- a/website/.npmrc +++ /dev/null @@ -1,2 +0,0 @@ -engine-strict=true -lockfile-include-tarball-url=true