diff --git a/Cargo.lock b/Cargo.lock index 265427ce0..f742ccf50 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -52,9 +52,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -1121,9 +1121,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.6.2" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" +checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" dependencies = [ "memchr", "serde", @@ -1653,9 +1653,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.66+curl-8.3.0" +version = "0.4.68+curl-8.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70c44a72e830f0e40ad90dda8a6ab6ed6314d39776599a58a2e5e37fbc6db5b9" +checksum = "b4a0d18d88360e374b16b2273c832b5e57258ffc1d4aa4f96b108e0738d5752f" dependencies = [ "cc", "libc", @@ -2146,25 +2146,14 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add4f07d43996f76ef320709726a556a9d4f965d9410d8d0271132d2f8293480" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" dependencies = [ - "errno-dragonfly", "libc", "windows-sys 0.48.0", ] -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "error-chain" version = "0.12.4" @@ -2861,9 +2850,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.33.0" +version = "1.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aa511b2e298cd49b1856746f6bb73e17036bcd66b25f5e92cdcdbec9bd75686" +checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc" dependencies = [ "console", "globset", @@ -2985,9 +2974,9 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ "libc", ] @@ -3309,7 +3298,7 @@ dependencies = [ "pem", "pkcs8", "rayon", - "ring 0.17.2", + "ring 0.17.3", "thiserror", "time", "tokio", @@ -3590,18 +3579,18 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linkme" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad5707f9d2423042c4321155b22d5257c2f140e3f30d0a42dce882a6010010d" +checksum = "91ed2ee9464ff9707af8e9ad834cffa4802f072caad90639c583dd3c62e6e608" dependencies = [ "linkme-impl", ] [[package]] name = "linkme-impl" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b43a5344be08996a47cb02b1ddc737119578a1cd01ae60d91541864df5926db9" +checksum = "ba125974b109d512fccbc6c0244e7580143e460895dfd6ea7f8bbb692fd94396" dependencies = [ "proc-macro2", "quote", @@ -3610,9 +3599,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45786cec4d5e54a224b15cb9f06751883103a27c19c93eda09b0b4f5f08fefac" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "lock_api" @@ -3848,7 +3837,7 @@ dependencies = [ "indexmap 1.9.3", "metrics", "num_cpus", - "ordered-float 3.9.1", + "ordered-float 3.9.2", "quanta", "radix_trie", "sketches-ddsketch", @@ -4222,18 +4211,18 @@ dependencies = [ [[package]] name = "ordered-float" -version = "2.10.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87" +checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" dependencies = [ "num-traits 0.2.17", ] [[package]] name = "ordered-float" -version = "3.9.1" +version = "3.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a54938017eacd63036332b4ae5c8a49fc8c0c1d6d629893057e4f13609edd06" +checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc" dependencies = [ "num-traits 0.2.17", ] @@ -4718,9 +4707,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.68" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b1106fec09662ec6dd98ccac0f81cef56984d0b49f75c92d8cbad76e20c005c" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -4900,25 +4889,25 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.6" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff" +checksum = "d119d7c7ca818f8a53c300863d4f87566aac09943aef5b355bb83969dae75d87" dependencies = [ "aho-corasick", "memchr", "regex-automata", - "regex-syntax 0.7.5", + "regex-syntax 0.8.1", ] [[package]] name = "regex-automata" -version = "0.3.9" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9" +checksum = "465c6fc0621e4abc4187a2bda0937bfd4f722c2730b29562e19689ea796c9a4b" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.5", + "regex-syntax 0.8.1", ] [[package]] @@ -4929,9 +4918,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "56d84fdd47036b038fc80dd333d10b6aab10d5d31f4a366e20014def75328d33" [[package]] name = "retain_mut" @@ -4941,9 +4930,9 @@ checksum = "4389f1d5789befaf6029ebd9f7dac4af7f7e3d61b69d4f30e2ac02b57e7712b0" [[package]] name = "retry-policies" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a715dc4d0e8aea3085a9a94d76e79c79c7df7c9f6be609da841a6d2489ca3687" +checksum = "17dd00bff1d737c40dbcd47d4375281bf4c17933f9eef0a185fc7bacca23ecbd" dependencies = [ "anyhow", "chrono", @@ -4977,9 +4966,9 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.2" +version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "911b295d2d302948838c8ac142da1ee09fa7863163b44e6715bc9357905878b8" +checksum = "9babe80d5c16becf6594aa32ad2be8fe08498e7ae60b77de8df700e67f191d7e" dependencies = [ "cc", "getrandom", @@ -5103,9 +5092,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.17" +version = "0.38.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f25469e9ae0f3d0047ca8b93fc56843f38e6774f0914a107ff8b41be8be8e0b7" +checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed" dependencies = [ "bitflags 2.4.0", "errno", @@ -5297,9 +5286,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" dependencies = [ "serde", ] @@ -5319,7 +5308,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c" dependencies = [ - "ordered-float 2.10.0", + "ordered-float 2.10.1", "serde", ] @@ -5939,9 +5928,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" dependencies = [ "backtrace", "bytes", @@ -6895,12 +6884,11 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.8+zstd.1.5.5" +version = "2.0.9+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" +checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" dependencies = [ "cc", - "libc", "pkg-config", ] diff --git a/crates/kitsune-cache/Cargo.toml b/crates/kitsune-cache/Cargo.toml index b6cccf79b..b79c3a903 100644 --- a/crates/kitsune-cache/Cargo.toml +++ b/crates/kitsune-cache/Cargo.toml @@ -16,4 +16,4 @@ thiserror = "1.0.49" tracing = "0.1.37" [dev-dependencies] -tokio = { version = "1.32.0", features = ["macros", "rt"] } +tokio = { version = "1.33.0", features = ["macros", "rt"] } diff --git a/crates/kitsune-core/Cargo.toml b/crates/kitsune-core/Cargo.toml index d7b2d9cd8..65ca00e15 100644 --- a/crates/kitsune-core/Cargo.toml +++ b/crates/kitsune-core/Cargo.toml @@ -68,7 +68,7 @@ speedy-uuid = { path = "../../lib/speedy-uuid", features = ["diesel"] } strum = { version = "0.25.0", features = ["derive", "phf"] } thiserror = "1.0.49" time = "0.3.29" -tokio = { version = "1.32.0", features = ["macros", "rt"] } +tokio = { version = "1.33.0", features = ["macros", "rt"] } toml = { version = "0.8.2", default-features = false, features = ["parse"] } tracing = "0.1.37" typed-builder = "0.16.2" diff --git a/crates/kitsune-db/Cargo.toml b/crates/kitsune-db/Cargo.toml index 873e3986a..840aa0714 100644 --- a/crates/kitsune-db/Cargo.toml +++ b/crates/kitsune-db/Cargo.toml @@ -23,6 +23,6 @@ serde = { version = "1.0.188", features = ["derive"] } simd-json = "0.11.1" speedy-uuid = { path = "../../lib/speedy-uuid", features = ["diesel"] } thiserror = "1.0.49" -tokio = { version = "1.32.0", features = ["rt"] } +tokio = { version = "1.33.0", features = ["rt"] } tracing-log = "0.1.3" typed-builder = "0.16.2" diff --git a/crates/kitsune-http-client/Cargo.toml b/crates/kitsune-http-client/Cargo.toml index 333100f19..a653a6743 100644 --- a/crates/kitsune-http-client/Cargo.toml +++ b/crates/kitsune-http-client/Cargo.toml @@ -31,4 +31,4 @@ tower-http = { version = "0.4.4", features = [ ] } [dev-dependencies] -tokio = { version = "1.32.0", features = ["macros", "rt"] } +tokio = { version = "1.33.0", features = ["macros", "rt"] } diff --git a/crates/kitsune-http-signatures/Cargo.toml b/crates/kitsune-http-signatures/Cargo.toml index c1534727f..f31863fd5 100644 --- a/crates/kitsune-http-signatures/Cargo.toml +++ b/crates/kitsune-http-signatures/Cargo.toml @@ -8,12 +8,12 @@ base64-simd = "0.8.0" derive_builder = "0.12.0" http = "0.2.9" rayon = "1.8.0" -ring = { version = "0.17.2", features = ["std"] } +ring = { version = "0.17.3", features = ["std"] } time = { version = "0.3.29", features = ["formatting", "parsing"] } thiserror = "1.0.49" -tokio = { version = "1.32.0", features = ["sync"] } +tokio = { version = "1.33.0", features = ["sync"] } [dev-dependencies] pem = "3.0.2" pkcs8 = { version = "0.10.2", features = ["alloc"] } -tokio = { version = "1.32.0", features = ["macros", "rt"] } +tokio = { version = "1.33.0", features = ["macros", "rt"] } diff --git a/crates/kitsune-messaging/Cargo.toml b/crates/kitsune-messaging/Cargo.toml index 05b1a797e..86ac83754 100644 --- a/crates/kitsune-messaging/Cargo.toml +++ b/crates/kitsune-messaging/Cargo.toml @@ -16,6 +16,6 @@ redis = { version = "0.23.3", features = [ ] } serde = "1.0.188" simd-json = "0.11.1" -tokio = { version = "1.32.0", features = ["macros", "rt", "sync"] } +tokio = { version = "1.33.0", features = ["macros", "rt", "sync"] } tokio-stream = { version = "0.1.14", features = ["sync"] } tracing = "0.1.37" diff --git a/crates/kitsune-retry-policies/Cargo.toml b/crates/kitsune-retry-policies/Cargo.toml index ebd31ba7d..58f46306c 100644 --- a/crates/kitsune-retry-policies/Cargo.toml +++ b/crates/kitsune-retry-policies/Cargo.toml @@ -9,4 +9,4 @@ futures-retry-policies = { version = "0.3.1", features = [ "tokio", "tracing", ] } -retry-policies = "0.2.0" +retry-policies = "0.2.1" diff --git a/crates/kitsune-storage/Cargo.toml b/crates/kitsune-storage/Cargo.toml index 9b4d4f5bb..2418c4db3 100644 --- a/crates/kitsune-storage/Cargo.toml +++ b/crates/kitsune-storage/Cargo.toml @@ -14,7 +14,7 @@ http = "0.2.9" http-body = "0.4.5" pin-project-lite = "0.2.13" sync_wrapper = "0.1.2" -tokio = { version = "1.32.0", features = ["fs", "io-util"] } +tokio = { version = "1.33.0", features = ["fs", "io-util"] } tokio-util = { version = "0.7.9", features = ["io"] } [dev-dependencies] @@ -22,4 +22,4 @@ aws-credential-types = { version = "0.56.1", features = [ "hardcoded-credentials", ] } tempfile = "3.8.0" -tokio = { version = "1.32.0", features = ["macros", "rt"] } +tokio = { version = "1.33.0", features = ["macros", "rt"] } diff --git a/kitsune-cli/Cargo.toml b/kitsune-cli/Cargo.toml index 0ac322d27..f7dfecdd4 100644 --- a/kitsune-cli/Cargo.toml +++ b/kitsune-cli/Cargo.toml @@ -15,7 +15,7 @@ kitsune-db = { path = "../crates/kitsune-db" } serde = { version = "1.0.188", features = ["derive"] } speedy-uuid = { path = "../lib/speedy-uuid" } time = "0.3.29" -tokio = { version = "1.32.0", features = ["full"] } +tokio = { version = "1.33.0", features = ["full"] } tracing-subscriber = "0.3.17" [build-dependencies] diff --git a/kitsune-fe/.prettierrc b/kitsune-fe/.prettierrc index b35ebd27a..2eb0f18c4 100644 --- a/kitsune-fe/.prettierrc +++ b/kitsune-fe/.prettierrc @@ -3,7 +3,10 @@ "importOrder": ["^\\w", "^[./|~/]"], "importOrderSeparation": true, "importOrderParserPlugins": ["typescript"], - "plugins": ["@trivago/prettier-plugin-sort-imports"], + "plugins": [ + "@trivago/prettier-plugin-sort-imports", + "prettier-plugin-css-order" + ], "semi": true, "singleQuote": true, "vueIndentScriptAndStyle": true diff --git a/kitsune-fe/package.json b/kitsune-fe/package.json index 69a07f68c..d5ff8186c 100644 --- a/kitsune-fe/package.json +++ b/kitsune-fe/package.json @@ -19,9 +19,9 @@ "@fortawesome/vue-fontawesome": "^3.0.2", "@hcaptcha/vue3-hcaptcha": "^1.3.0", "@mcaptcha/vanilla-glue": "^0.1.0-alpha-3", - "@tiptap/pm": "^2.1.11", - "@tiptap/starter-kit": "^2.1.11", - "@tiptap/vue-3": "^2.1.11", + "@tiptap/pm": "^2.1.12", + "@tiptap/starter-kit": "^2.1.12", + "@tiptap/vue-3": "^2.1.12", "@urql/exchange-graphcache": "^6.3.3", "@urql/vue": "^1.1.2", "@vueuse/core": "^10.5.0", @@ -47,19 +47,20 @@ "@parcel/watcher": "^2.3.0", "@trivago/prettier-plugin-sort-imports": "^4.2.0", "@types/lodash": "^4.14.199", - "@typescript-eslint/eslint-plugin": "^6.7.4", - "@typescript-eslint/parser": "^6.7.4", + "@typescript-eslint/eslint-plugin": "^6.7.5", + "@typescript-eslint/parser": "^6.7.5", "@vitejs/plugin-vue": "^4.4.0", "@vue/eslint-config-prettier": "^8.0.0", "@vue/eslint-config-typescript": "^12.0.0", "eslint": "^8.51.0", "eslint-config-prettier": "^9.0.0", - "eslint-plugin-prettier": "^5.0.0", + "eslint-plugin-prettier": "^5.0.1", "eslint-plugin-vue": "^9.17.0", "prettier": "^3.0.3", - "sass": "^1.69.0", + "prettier-plugin-css-order": "^2.0.1", + "sass": "^1.69.3", "typescript": "^5.2.2", "vite": "^4.4.11", - "vue-tsc": "^1.8.16" + "vue-tsc": "^1.8.19" } } diff --git a/kitsune-fe/src/components/AuthForms.vue b/kitsune-fe/src/components/AuthForms.vue index f75f7dc67..33f20de3b 100644 --- a/kitsune-fe/src/components/AuthForms.vue +++ b/kitsune-fe/src/components/AuthForms.vue @@ -161,15 +161,15 @@ } .formkit-form { - background-color: $dark2; display: flex; flex-direction: column; justify-content: space-between; - width: 90%; margin: 0 auto; - padding: 3vh; - border-radius: 5px; border: 0.2px solid $shade1dark; + border-radius: 5px; + background-color: $dark2; + padding: 3vh; + width: 90%; } .formkit-wrapper { @@ -177,14 +177,14 @@ } .formkit-input[type='submit'] { + transition: 0.5s; + cursor: pointer; border: 0; - background-color: $shade1dark; border-radius: 5px; + background-color: $shade1dark; padding: 10px; - font-size: 16px; width: 100px; - cursor: pointer; - transition: 0.5s; + font-size: 16px; &:hover { background-color: $shade2dark; @@ -192,13 +192,13 @@ } .formkit-input:not([type='submit']) { - width: 100%; border: 0.5px solid $shade1dark; - background-color: $dark1; border-radius: 2px; - font-size: 20px; - color: white; + background-color: $dark1; padding: 5px; + width: 100%; + color: white; + font-size: 20px; } .forms { @@ -206,9 +206,9 @@ flex-direction: column; justify-content: center; align-items: flex-end; - width: 40%; - padding: 1vw; gap: 20px; + padding: 1vw; + width: 40%; @media only screen and (max-width: 1367px) { align-items: center; @@ -221,13 +221,13 @@ } .formkit-messages { + padding-left: 0; color: red; list-style: none; - padding-left: 0; } .formkit-label { - text-transform: uppercase; margin-bottom: 5px; + text-transform: uppercase; } diff --git a/kitsune-fe/src/components/BaseTimeline.vue b/kitsune-fe/src/components/BaseTimeline.vue index bd1e96e15..611c2c83e 100644 --- a/kitsune-fe/src/components/BaseTimeline.vue +++ b/kitsune-fe/src/components/BaseTimeline.vue @@ -1,11 +1,11 @@