diff --git a/Cargo.lock b/Cargo.lock index e0369acac97..ca15ff478af 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -157,12 +157,6 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" -[[package]] -name = "arrayvec" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" - [[package]] name = "ascii" version = "0.9.3" @@ -201,7 +195,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6" dependencies = [ "anstyle", - "bstr 1.3.0", + "bstr", "doc-comment", "predicates", "predicates-core", @@ -498,26 +492,6 @@ dependencies = [ "futures-lite", ] -[[package]] -name = "brownstone" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5839ee4f953e811bfdcf223f509cb2c6a3e1447959b0bff459405575bc17f22" -dependencies = [ - "arrayvec", -] - -[[package]] -name = "bstr" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" -dependencies = [ - "lazy_static", - "memchr", - "regex-automata 0.1.10", -] - [[package]] name = "bstr" version = "1.3.0" @@ -663,7 +637,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70a1f1117a8ff2f3547295da90f473c392d8d1107c90cea1ea82b1a544a97a4a" dependencies = [ "serde", - "toml 0.8.0", + "toml 0.8.2", ] [[package]] @@ -1858,9 +1832,9 @@ dependencies = [ [[package]] name = "fs4" -version = "0.6.6" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eeb4ed9e12f43b7fa0baae3f9cdda28352770132ef2e09a23760c29cae8bd47" +checksum = "29f9df8a11882c4e3335eb2d18a0137c505d9ca927470b0cac9c6f0ae07d28f7" dependencies = [ "rustix 0.38.3", "windows-sys 0.48.0", @@ -2077,7 +2051,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" dependencies = [ "aho-corasick 0.7.20", - "bstr 1.3.0", + "bstr", "fnv", "log", "regex", @@ -2435,12 +2409,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "indent_write" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cfe9645a18782869361d9c8732246be7b410ad4e919d3609ebabdac00ba12c3" - [[package]] name = "indenter" version = "0.3.3" @@ -2483,9 +2451,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.32.0" +version = "1.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e02c584f4595792d09509a94cdb92a3cef7592b1eb2d9877ee6f527062d0ea" +checksum = "1aa511b2e298cd49b1856746f6bb73e17036bcd66b25f5e92cdcdbec9bd75686" dependencies = [ "console", "lazy_static", @@ -2653,12 +2621,6 @@ dependencies = [ "libc", ] -[[package]] -name = "joinery" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72167d68f5fce3b8655487b8038691a3c9984ee769590f93f2a631f4ad64e4f5" - [[package]] name = "js-sys" version = "0.3.61" @@ -4185,19 +4147,6 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "nom-supreme" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd3ae6c901f1959588759ff51c95d24b491ecb9ff91aa9c2ef4acc5b1dcab27" -dependencies = [ - "brownstone", - "indent_write", - "joinery", - "memchr", - "nom", -] - [[package]] name = "normalize-line-endings" version = "0.3.0" @@ -5517,9 +5466,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "starbase" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "399c94c128150ef75e2ee780cc70d5aef92f5b44badc6005ac84bb8b9b6ed4a1" +checksum = "8dc2dc5364b3a7b113afd1f3d609edc1ae4c9f742f345949669c7ae5b9ac1944" dependencies = [ "async-trait", "chrono", @@ -5539,9 +5488,9 @@ dependencies = [ [[package]] name = "starbase_archive" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f85e565b134761413513c0091ed002ffb31ba448ca9542c4c41ca5968a29a9bb" +checksum = "67ad85bff80a5ec20265e65a69102eee54ae1e4dac9f977256fbf770c7153fa1" dependencies = [ "flate2", "miette", @@ -5570,9 +5519,9 @@ dependencies = [ [[package]] name = "starbase_macros" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63159597180d00c01353e4bf4d4401328a30eb618c0130adf7b9371db4df3d3a" +checksum = "52740dab6d63a2cd80f282741514655723b813b9c82717b5c39aa80a78684dfe" dependencies = [ "darling 0.20.3", "proc-macro2", @@ -5582,9 +5531,9 @@ dependencies = [ [[package]] name = "starbase_sandbox" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec8301c49429d3da1105475f4e32ce8fa7c8cf1028c4e4535b0c010be2952a" +checksum = "ed2c63f6daf91fb1cb95ac13ff5f5bf57d0657060519d137cfff6d1a0a690dbc" dependencies = [ "assert_cmd", "assert_fs", @@ -5598,9 +5547,9 @@ dependencies = [ [[package]] name = "starbase_styles" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "251a45da918b41577ab62fb764c9683a0f50fb2b8999a629dbd6c25476a9c411" +checksum = "d5d5d3e494c96659752fd79227acff36f375d6f113cb5460acdfdfe9a5b95a0d" dependencies = [ "dirs 5.0.1", "miette", @@ -5611,9 +5560,9 @@ dependencies = [ [[package]] name = "starbase_utils" -version = "0.3.2" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1665a9066fd0da6e608166a18dba7324734229b5554f6abff7b6a2761b5402" +checksum = "87b5dc77ea8ee6706f6485f931653277a4bfe04a2d127727e018b082fbfe52b3" dependencies = [ "dirs 5.0.1", "ec4rs", @@ -5629,7 +5578,7 @@ dependencies = [ "starbase_styles", "thiserror", "tokio", - "toml 0.8.0", + "toml 0.8.2", "tracing", "wax", ] @@ -5680,9 +5629,9 @@ dependencies = [ [[package]] name = "supports-color" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4950e7174bffabe99455511c39707310e7e9b440364a2fcb1cc21521be57b354" +checksum = "d6398cde53adc3c4557306a96ce67b302968513830a77a95b2b17305d9719a89" dependencies = [ "is-terminal", "is_ci", @@ -5766,6 +5715,16 @@ dependencies = [ "xattr", ] +[[package]] +name = "tardar" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900c942f83b6a8b9998cc8f74ad3ffa24b7ff3c4279ea1c1c52d95dced9f3516" +dependencies = [ + "miette", + "vec1", +] + [[package]] name = "target-lexicon" version = "0.12.8" @@ -6071,14 +6030,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c226a7bba6d859b63c92c4b4fe69c5b6b72d0cb897dbc8e6012298e6154cb56e" +checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.20.0", + "toml_edit 0.20.2", ] [[package]] @@ -6105,9 +6064,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.20.0" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff63e60a958cefbb518ae1fd6566af80d9d4be430a33f3723dfc47d1d411d95" +checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" dependencies = [ "indexmap 2.0.0", "serde", @@ -6438,6 +6397,12 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" +[[package]] +name = "vec1" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bda7c41ca331fe9a1c278a9e7ee055f4be7f5eb1c2b72f079b4ff8b5fce9d5c" + [[package]] name = "version_check" version = "0.9.4" @@ -6480,12 +6445,11 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" [[package]] name = "walkdir" -version = "2.3.2" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", - "winapi", "winapi-util", ] @@ -7035,18 +6999,17 @@ dependencies = [ [[package]] name = "wax" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06c7a3bac6110ac062b7b422a442b7ee23e07209e2784a036654cab1e71bbafc" +checksum = "8d12a78aa0bab22d2f26ed1a96df7ab58e8a93506a3e20adb47c51a93b4e1357" dependencies = [ - "bstr 0.2.17", "const_format", - "itertools 0.10.5", + "itertools 0.11.0", + "miette", "nom", - "nom-supreme", "pori", "regex", - "smallvec", + "tardar", "thiserror", "walkdir", ] diff --git a/Cargo.toml b/Cargo.toml index 1c3173f1881..bbe61df8608 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -60,14 +60,14 @@ semver = "1.0.19" serde = { version = "1.0.188", features = ["derive", "rc"] } serde_json = "1.0.107" serde_yaml = "0.9.25" -starbase = "0.2.6" -starbase_archive = { version = "0.2.2", default-features = false, features = [ +starbase = "0.2.7" +starbase_archive = { version = "0.2.3", default-features = false, features = [ "tar-gz", ] } starbase_events = { version = "0.2.1" } -starbase_sandbox = "0.1.10" -starbase_styles = { version = "0.1.15", features = ["relative-path"] } -starbase_utils = { version = "0.3.2", default-features = false, features = [ +starbase_sandbox = "0.1.11" +starbase_styles = { version = "0.1.16", features = ["relative-path"] } +starbase_utils = { version = "0.3.4", default-features = false, features = [ "editor-config", "glob", "json", diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index 935637f6936..b0986ad328f 100644 --- a/packages/cli/CHANGELOG.md +++ b/packages/cli/CHANGELOG.md @@ -16,6 +16,7 @@ - Temporarily fixed the "A dependency cycle has been detected for (unknown)" issue. - Fixed an issue where Git hooks were not created properly when using Git worktrees. +- Fixed a panic when attempting to clean/parse a JSON string. ## 1.14.4