diff --git a/backend/Cargo.lock b/backend/Cargo.lock index 9ad4c0daa..3a6a98ea9 100644 --- a/backend/Cargo.lock +++ b/backend/Cargo.lock @@ -60,15 +60,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - [[package]] name = "ansi_term" version = "0.12.1" @@ -80,9 +71,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.63" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26fa4d7e3f2eebadf743988fc8aec9fa9a9e82611acafd77c1462ed6262440a" +checksum = "c91f1f46651137be86f3a2b9a8359f9ab421d04d941c62b5982e1ca21113adf9" [[package]] name = "arrayref" @@ -119,10 +110,10 @@ checksum = "bc4c00309ed1c8104732df4a5fa9acc3b796b6f8531dfbd5ce0078c86f997244" dependencies = [ "darling 0.10.2", "pmutil", - "proc-macro2 1.0.43", - "quote 1.0.21", + "proc-macro2 1.0.42", + "quote 1.0.20", "swc_macros_common", - "syn 1.0.99", + "syn 1.0.98", ] [[package]] @@ -141,9 +132,9 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27" dependencies = [ - "proc-macro2 1.0.43", - "quote 1.0.21", - "syn 1.0.99", + "proc-macro2 1.0.42", + "quote 1.0.20", + "syn 1.0.98", ] [[package]] @@ -152,9 +143,9 @@ version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76464446b8bc32758d7e88ee1a804d9914cd9b1cb264c029899680b0be29826f" dependencies = [ - "proc-macro2 1.0.43", - "quote 1.0.21", - "syn 1.0.99", + "proc-macro2 1.0.42", + "quote 1.0.20", + "syn 1.0.98", ] [[package]] @@ -238,9 +229,9 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "base64ct" -version = "1.5.2" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea2b2456fd614d856680dcd9fcc660a51a820fa09daef2e49772b56a193c8474" +checksum = "3bdca834647821e0b13d9539a8634eb62d3501b6b6c2cec1722786ee6671b851" [[package]] name = "basic-cookies" @@ -278,8 +269,8 @@ dependencies = [ "lazycell", "log", "peeking_take_while", - "proc-macro2 1.0.43", - "quote 1.0.21", + "proc-macro2 1.0.42", + "quote 1.0.20", "regex", "rustc-hash", "shlex", @@ -433,9 +424,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.11.0" +version = "3.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d" +checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3" [[package]] name = "byteorder" @@ -484,17 +475,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.22" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" +checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" dependencies = [ - "iana-time-zone", - "js-sys", + "libc", "num-integer", "num-traits", "serde", "time 0.1.44", - "wasm-bindgen", "winapi", ] @@ -562,9 +551,9 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.19" +version = "3.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68d43934757334b5c0519ff882e1ab9647ac0258b47c24c4f490d78e42697fd5" +checksum = "a3dbbb6653e7c55cc8595ad3e1f7be8f32aba4eb7ff7f0fd1163d4f3d137c0a9" dependencies = [ "atty", "bitflags", @@ -645,7 +634,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94d4706de1b0fa5b132270cddffa8585166037822e260a944fe161acd137ca05" dependencies = [ "percent-encoding", - "time 0.3.14", + "time 0.3.12", "version_check", ] @@ -661,7 +650,7 @@ dependencies = [ "publicsuffix", "serde", "serde_json", - "time 0.3.14", + "time 0.3.12", "url", ] @@ -683,9 +672,9 @@ checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" [[package]] name = "cpufeatures" -version = "0.2.4" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc948ebb96241bb40ab73effeb80d9f93afaad49359d159a5e61be51619fe813" +checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b" dependencies = [ "libc", ] @@ -838,10 +827,10 @@ checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.43", - "quote 1.0.21", + "proc-macro2 1.0.42", + "quote 1.0.20", "strsim 0.9.3", - "syn 1.0.99", + "syn 1.0.98", ] [[package]] @@ -852,10 +841,10 @@ checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.43", - "quote 1.0.21", + "proc-macro2 1.0.42", + "quote 1.0.20", "strsim 0.10.0", - "syn 1.0.99", + "syn 1.0.98", ] [[package]] @@ -865,8 +854,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" dependencies = [ "darling_core 0.10.2", - "quote 1.0.21", - "syn 1.0.99", + "quote 1.0.20", + "syn 1.0.98", ] [[package]] @@ -876,20 +865,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ "darling_core 0.13.4", - "quote 1.0.21", - "syn 1.0.99", + "quote 1.0.20", + "syn 1.0.98", ] [[package]] name = "dashmap" -version = "5.4.0" +version = "5.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" +checksum = "3495912c9c1ccf2e18976439f4443f3fee0fd61f424ff99fde6a66b15ecb448f" dependencies = [ "cfg-if 1.0.0", - "hashbrown", + "hashbrown 0.12.3", "lock_api", - "once_cell", "parking_lot_core 0.9.3", ] @@ -963,9 +951,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05520711837dd592d2861319ea3cf2dfd81e39bb92e41758ee9172f3623daebd" dependencies = [ "proc-macro-crate", - "proc-macro2 1.0.43", - "quote 1.0.21", - "syn 1.0.99", + "proc-macro2 1.0.42", + "quote 1.0.20", + "syn 1.0.98", ] [[package]] @@ -986,10 +974,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case", - "proc-macro2 1.0.43", - "quote 1.0.21", + "proc-macro2 1.0.42", + "quote 1.0.20", "rustc_version 0.4.0", - "syn 1.0.99", + "syn 1.0.98", ] [[package]] @@ -1077,13 +1065,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69dde51e8fef5e12c1d65e0929b03d66e4c0c18282bc30ed2ca050ad6f44dd82" [[package]] -name = "dotenvy" -version = "0.15.3" +name = "dotenv" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da3db6fcad7c1fc4abdd99bf5276a4db30d6a819127903a709ed41e5ff016e84" -dependencies = [ - "dirs 4.0.0", -] +checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" [[package]] name = "dprint-swc-ext" @@ -1128,9 +1113,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be" dependencies = [ "serde", ] @@ -1150,7 +1135,7 @@ dependencies = [ "bollard", "chrono", "ciborium", - "clap 3.2.19", + "clap 3.2.16", "color-eyre", "cookie_store", "current_platform", @@ -1206,7 +1191,7 @@ dependencies = [ "serde_json", "serde_with", "serde_yaml", - "sha2 0.10.3", + "sha2 0.10.2", "sha2 0.9.9", "simple-logging", "sqlx", @@ -1279,9 +1264,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" dependencies = [ "heck 0.4.0", - "proc-macro2 1.0.43", - "quote 1.0.21", - "syn 1.0.99", + "proc-macro2 1.0.42", + "quote 1.0.20", + "syn 1.0.98", ] [[package]] @@ -1291,9 +1276,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78b940da354ae81ef0926c5eaa428207b8f4f091d3956c891dfbd124162bed99" dependencies = [ "pmutil", - "proc-macro2 1.0.43", + "proc-macro2 1.0.42", "swc_macros_common", - "syn 1.0.99", + "syn 1.0.98", ] [[package]] @@ -1426,14 +1411,14 @@ dependencies = [ [[package]] name = "from_variant" -version = "0.1.4" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0981e470d2ab9f643df3921d54f1952ea100c39fdb6a3fdc820e20d2291df6c" +checksum = "0951635027ca477be98f8774abd6f0345233439d63f307e47101acb40c7cc63d" dependencies = [ "pmutil", - "proc-macro2 1.0.43", + "proc-macro2 1.0.42", "swc_macros_common", - "syn 1.0.99", + "syn 1.0.98", ] [[package]] @@ -1454,9 +1439,9 @@ checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" [[package]] name = "futures" -version = "0.3.24" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f21eda599937fba36daeb58a22e8f5cee2d14c4a17b5b7739c7c8e5e3b8230c" +checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" dependencies = [ "futures-channel", "futures-core", @@ -1469,9 +1454,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.24" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050" +checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" dependencies = [ "futures-core", "futures-sink", @@ -1479,15 +1464,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.24" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf" +checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" [[package]] name = "futures-executor" -version = "0.3.24" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab" +checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" dependencies = [ "futures-core", "futures-task", @@ -1507,38 +1492,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.24" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68" +checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" [[package]] name = "futures-macro" -version = "0.3.24" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17" +checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" dependencies = [ - "proc-macro2 1.0.43", - "quote 1.0.21", - "syn 1.0.99", + "proc-macro2 1.0.42", + "quote 1.0.20", + "syn 1.0.98", ] [[package]] name = "futures-sink" -version = "0.3.24" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56" +checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" [[package]] name = "futures-task" -version = "0.3.24" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1" +checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" [[package]] name = "futures-util" -version = "0.3.24" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90" +checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" dependencies = [ "futures-channel", "futures-core", @@ -1554,9 +1539,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.6" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803" dependencies = [ "typenum", "version_check", @@ -1607,9 +1592,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe69f1cbdb6e28af2bac214e943b99ce8a0a06b447d15d3e61161b0423139f3f" dependencies = [ "proc-macro-hack", - "proc-macro2 1.0.43", - "quote 1.0.21", - "syn 1.0.99", + "proc-macro2 1.0.42", + "quote 1.0.20", + "syn 1.0.98", ] [[package]] @@ -1620,9 +1605,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] name = "h2" -version = "0.3.14" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca32592cf21ac7ccab1825cd87f6c9b3d9022c44d086172ed0966bec8af30be" +checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57" dependencies = [ "bytes", "fnv", @@ -1643,6 +1628,12 @@ version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" +[[package]] +name = "hashbrown" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" + [[package]] name = "hashbrown" version = "0.12.3" @@ -1658,7 +1649,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d452c155cb93fecdfb02a73dd57b5d8e442c2063bd7aac72f1bc5e4263a43086" dependencies = [ - "hashbrown", + "hashbrown 0.12.3", ] [[package]] @@ -1741,7 +1732,7 @@ checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" dependencies = [ "bytes", "fnv", - "itoa 1.0.3", + "itoa 1.0.2", ] [[package]] @@ -1757,9 +1748,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.8.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c" [[package]] name = "httpdate" @@ -1797,7 +1788,7 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa 1.0.3", + "itoa 1.0.2", "pin-project-lite", "socket2", "tokio", @@ -1849,20 +1840,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "iana-time-zone" -version = "0.1.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c495f162af0bf17656d0014a0eded5f3cd2f365fdd204548c2869db89359dc7" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "js-sys", - "once_cell", - "wasm-bindgen", - "winapi", -] - [[package]] name = "ident_case" version = "1.0.1" @@ -1935,7 +1912,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", "serde", ] @@ -1962,9 +1939,9 @@ checksum = "1c068d4c6b922cd6284c609cfa6dec0e41615c9c5a1a4ba729a970d8daba05fb" dependencies = [ "Inflector", "pmutil", - "proc-macro2 1.0.43", - "quote 1.0.21", - "syn 1.0.99", + "proc-macro2 1.0.42", + "quote 1.0.20", + "syn 1.0.98", ] [[package]] @@ -2003,9 +1980,9 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[package]] name = "itoa" -version = "1.0.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" +checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" [[package]] name = "josekit" @@ -2022,7 +1999,7 @@ dependencies = [ "serde", "serde_json", "thiserror", - "time 0.3.14", + "time 0.3.12", ] [[package]] @@ -2047,7 +2024,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "sha2 0.10.3", + "sha2 0.10.2", "swc_atoms", "swc_common", "swc_config", @@ -2242,9 +2219,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.132" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5" +checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" [[package]] name = "libloading" @@ -2264,9 +2241,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "lock_api" -version = "0.4.8" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f80bf5aacaf25cbfc8210d1cfb718f2bf3b11c4c54e5afe36c236853a8ec390" +checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" dependencies = [ "autocfg", "scopeguard", @@ -2309,9 +2286,9 @@ dependencies = [ [[package]] name = "md-5" -version = "0.10.2" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "274fd6bd98a3c75c9515d9393b063099f60f9b47f09ee20a34fd76287fd017f4" +checksum = "658646b21e0b72f7866c7038ab086d3d5e1cd6271f060fd37defb241949d0582" dependencies = [ "digest 0.10.3", ] @@ -2569,9 +2546,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" dependencies = [ "proc-macro-crate", - "proc-macro2 1.0.43", - "quote 1.0.21", - "syn 1.0.99", + "proc-macro2 1.0.42", + "quote 1.0.20", + "syn 1.0.98", ] [[package]] @@ -2594,9 +2571,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.13.1" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e" +checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" [[package]] name = "opaque-debug" @@ -2638,9 +2615,9 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" dependencies = [ - "proc-macro2 1.0.43", - "quote 1.0.21", - "syn 1.0.99", + "proc-macro2 1.0.42", + "quote 1.0.20", + "syn 1.0.98", ] [[package]] @@ -2674,15 +2651,15 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.3.0" +version = "6.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" +checksum = "648001efe5d5c0102d8cea768e348da85d90af8ba91f0bea908f157951493cd4" [[package]] name = "owo-colors" -version = "3.5.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" +checksum = "decf7381921fea4dcb2549c5667eda59b3ec297ab7e2b5fc33eac69d2e7da87b" [[package]] name = "parking_lot" @@ -2745,9 +2722,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.9" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" +checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc" [[package]] name = "patch-db" @@ -2777,8 +2754,8 @@ name = "patch-db-macro" version = "0.1.0" dependencies = [ "patch-db-macro-internals", - "proc-macro2 1.0.43", - "syn 1.0.99", + "proc-macro2 1.0.42", + "syn 1.0.98", ] [[package]] @@ -2786,9 +2763,9 @@ name = "patch-db-macro-internals" version = "0.1.0" dependencies = [ "heck 0.3.3", - "proc-macro2 1.0.43", - "quote 1.0.21", - "syn 1.0.99", + "proc-macro2 1.0.42", + "quote 1.0.20", + "syn 1.0.98", ] [[package]] @@ -2800,7 +2777,7 @@ dependencies = [ "digest 0.10.3", "hmac 0.12.1", "password-hash", - "sha2 0.10.3", + "sha2 0.10.2", ] [[package]] @@ -2864,9 +2841,9 @@ dependencies = [ "phf_generator", "phf_shared", "proc-macro-hack", - "proc-macro2 1.0.43", - "quote 1.0.21", - "syn 1.0.99", + "proc-macro2 1.0.42", + "quote 1.0.20", + "syn 1.0.98", ] [[package]] @@ -2886,22 +2863,22 @@ checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468" [[package]] name = "pin-project" -version = "1.0.12" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +checksum = "78203e83c48cffbe01e4a2d35d566ca4de445d79a85372fc64e378bfc812a260" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.12" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +checksum = "710faf75e1b33345361201d36d04e98ac1ed8909151a017ed384700836104c74" dependencies = [ - "proc-macro2 1.0.43", - "quote 1.0.21", - "syn 1.0.99", + "proc-macro2 1.0.42", + "quote 1.0.20", + "syn 1.0.98", ] [[package]] @@ -2938,9 +2915,9 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3894e5d549cccbe44afecf72922f277f603cd4bb0219c8342631ef18fffbe004" dependencies = [ - "proc-macro2 1.0.43", - "quote 1.0.21", - "syn 1.0.99", + "proc-macro2 1.0.42", + "quote 1.0.20", + "syn 1.0.98", ] [[package]] @@ -2971,11 +2948,10 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "1.2.1" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" +checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a" dependencies = [ - "once_cell", "thiserror", "toml", ] @@ -2997,9 +2973,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.43" +version = "1.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" +checksum = "c278e965f1d8cf32d6e0e96de3d3e79712178ae67986d9cf9151f51e95aac89b" dependencies = [ "unicode-ident", ] @@ -3037,16 +3013,18 @@ dependencies = [ [[package]] name = "psl-types" -version = "2.0.11" +version = "2.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac" +checksum = "e8eda7c62d9ecaafdf8b62374c006de0adf61666ae96a96ba74a37134aa4e470" [[package]] name = "publicsuffix" -version = "2.2.2" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeeedb0b429dc462f30ad27ef3de97058b060016f47790c066757be38ef792b4" +checksum = "292972edad6bbecc137ab84c5e36421a4a6c979ea31d3cc73540dd04315b33e1" dependencies = [ + "byteorder", + "hashbrown 0.11.2", "idna", "psl-types", ] @@ -3074,11 +3052,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.21" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" dependencies = [ - "proc-macro2 1.0.43", + "proc-macro2 1.0.42", ] [[package]] @@ -3346,7 +3324,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d5bfeb75c188f3af65774d5fe92f97dac2cede5e313c643c7a1b82a8e53b0e6" dependencies = [ - "clap 3.2.19", + "clap 3.2.16", "futures", "hyper", "lazy_static", @@ -3368,9 +3346,9 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ecb48bdaace41cfbb514b3e541ae0fc1ac0fb8283498215ad8a3d22ca2ea5ae5" dependencies = [ - "proc-macro2 1.0.43", + "proc-macro2 1.0.42", "rpc-toolkit-macro-internals", - "syn 1.0.99", + "syn 1.0.98", ] [[package]] @@ -3379,9 +3357,9 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2a9e2bae02a2beecad48d87255e51cab941d0c89a2bcee05a03a77803a0a282" dependencies = [ - "proc-macro2 1.0.43", - "quote 1.0.21", - "syn 1.0.99", + "proc-macro2 1.0.42", + "quote 1.0.20", + "syn 1.0.98", ] [[package]] @@ -3435,7 +3413,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.13", + "semver 1.0.12", ] [[package]] @@ -3452,18 +3430,18 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.1" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55" +checksum = "e7522c9de787ff061458fe9a829dc790a3f5b22dc571694fc5883f448b94d9a9" dependencies = [ "base64 0.13.0", ] [[package]] name = "rustversion" -version = "1.0.9" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" +checksum = "24c8ad4f0c00e1eb5bc7614d236a7f1300e3dbd76b68cac8e06fb00b015ad8d8" [[package]] name = "rusty-fork" @@ -3479,9 +3457,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.11" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" +checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695" [[package]] name = "schannel" @@ -3517,9 +3495,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.7.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" +checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc" dependencies = [ "bitflags", "core-foundation", @@ -3549,9 +3527,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.13" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f6841e709003d68bb2deee8c343572bf446003ec20a583e76f7b15cebf3711" +checksum = "a2333e6df6d6598f2b1974829f853c2b4c5f4a6e503c10af918081aa6f8564e1" [[package]] name = "semver-parser" @@ -3561,18 +3539,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.144" +version = "1.0.141" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f747710de3dcd43b88c9168773254e809d8ddbdf9653b84e2554ab219f17860" +checksum = "7af873f2c95b99fcb0bd0fe622a43e29514658873c8ceba88c4cb88833a22500" dependencies = [ "serde_derive", ] [[package]] name = "serde_bytes" -version = "0.11.7" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfc50e8183eeeb6178dcb167ae34a8051d63535023ae38b5d8d12beae193d37b" +checksum = "212e73464ebcde48d723aa02eb270ba62eff38a9b732df31f33f1b4e145f3a54" dependencies = [ "serde", ] @@ -3597,23 +3575,23 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.144" +version = "1.0.141" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94ed3a816fb1d101812f83e789f888322c34e291f894f19590dc310963e87a00" +checksum = "75743a150d003dd863b51dc809bcad0d73f2102c53632f1e954e738192a3413f" dependencies = [ - "proc-macro2 1.0.43", - "quote 1.0.21", - "syn 1.0.99", + "proc-macro2 1.0.42", + "quote 1.0.20", + "syn 1.0.98", ] [[package]] name = "serde_json" -version = "1.0.85" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44" +checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7" dependencies = [ "indexmap", - "itoa 1.0.3", + "itoa 1.0.2", "ryu", "serde", ] @@ -3625,7 +3603,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 1.0.3", + "itoa 1.0.2", "ryu", "serde", ] @@ -3660,9 +3638,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" dependencies = [ "darling 0.13.4", - "proc-macro2 1.0.43", - "quote 1.0.21", - "syn 1.0.99", + "proc-macro2 1.0.42", + "quote 1.0.20", + "syn 1.0.98", ] [[package]] @@ -3703,9 +3681,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.3" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "899bf02746a2c92bf1053d9327dadb252b01af1f81f90cdb902411f518bc7215" +checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" dependencies = [ "cfg-if 1.0.0", "cpufeatures", @@ -3750,9 +3728,9 @@ dependencies = [ [[package]] name = "signature" -version = "1.6.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ea32af43239f0d353a7dd75a22d94c329c8cdaafdcb4c1c1335aa10c298a4a" +checksum = "f054c6c1a6e95179d6f23ed974060dcefb2d9388bb7256900badad682c499de4" [[package]] name = "simple-logging" @@ -3798,9 +3776,9 @@ checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" [[package]] name = "socket2" -version = "0.4.7" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" dependencies = [ "libc", "winapi", @@ -3857,9 +3835,9 @@ dependencies = [ [[package]] name = "sqlx" -version = "0.6.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "788841def501aabde58d3666fcea11351ec3962e6ea75dbcd05c84a71d68bcd1" +checksum = "1f82cbe94f41641d6c410ded25bbf5097c240cefdf8e3b06d04198d0a96af6a4" dependencies = [ "sqlx-core", "sqlx-macros", @@ -3867,9 +3845,9 @@ dependencies = [ [[package]] name = "sqlx-core" -version = "0.6.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c21d3b5e7cadfe9ba7cdc1295f72cc556c750b4419c27c219c0693198901f8e" +checksum = "6b69bf218860335ddda60d6ce85ee39f6cf6e5630e300e19757d1de15886a093" dependencies = [ "ahash", "atoi", @@ -3881,7 +3859,6 @@ dependencies = [ "crc", "crossbeam-queue", "dirs 4.0.0", - "dotenvy", "either", "event-listener", "futures-channel", @@ -3893,10 +3870,10 @@ dependencies = [ "hkdf", "hmac 0.12.1", "indexmap", - "itoa 1.0.3", + "itoa 1.0.2", "libc", "log", - "md-5 0.10.2", + "md-5 0.10.1", "memchr", "once_cell", "paste", @@ -3907,7 +3884,7 @@ dependencies = [ "serde", "serde_json", "sha-1", - "sha2 0.10.3", + "sha2 0.10.2", "smallvec", "sqlformat", "sqlx-rt", @@ -3921,31 +3898,31 @@ dependencies = [ [[package]] name = "sqlx-macros" -version = "0.6.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4adfd2df3557bddd3b91377fc7893e8fa899e9b4061737cbade4e1bb85f1b45c" +checksum = "f40c63177cf23d356b159b60acd27c54af7423f1736988502e36bae9a712118f" dependencies = [ - "dotenvy", + "dotenv", "either", "heck 0.4.0", "hex", "once_cell", - "proc-macro2 1.0.43", - "quote 1.0.21", + "proc-macro2 1.0.42", + "quote 1.0.20", "serde", "serde_json", - "sha2 0.10.3", + "sha2 0.10.2", "sqlx-core", "sqlx-rt", - "syn 1.0.99", + "syn 1.0.98", "url", ] [[package]] name = "sqlx-rt" -version = "0.6.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7be52fc7c96c136cedea840ed54f7d446ff31ad670c9dea95ebcb998530971a3" +checksum = "874e93a365a598dc3dadb197565952cb143ae4aa716f7bcc933a8d836f6bf89f" dependencies = [ "once_cell", "tokio", @@ -3993,8 +3970,8 @@ checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" dependencies = [ "phf_generator", "phf_shared", - "proc-macro2 1.0.43", - "quote 1.0.21", + "proc-macro2 1.0.42", + "quote 1.0.20", ] [[package]] @@ -4004,10 +3981,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f584cc881e9e5f1fd6bf827b0444aa94c30d8fe6378cf241071b5f5700b2871f" dependencies = [ "pmutil", - "proc-macro2 1.0.43", - "quote 1.0.21", + "proc-macro2 1.0.42", + "quote 1.0.20", "swc_macros_common", - "syn 1.0.99", + "syn 1.0.98", ] [[package]] @@ -4101,10 +4078,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb64bc03d90fd5c90d6ab917bb2b1d7fbd31957df39e31ea24a3f554b4372251" dependencies = [ "pmutil", - "proc-macro2 1.0.43", - "quote 1.0.21", + "proc-macro2 1.0.42", + "quote 1.0.20", "swc_macros_common", - "syn 1.0.99", + "syn 1.0.98", ] [[package]] @@ -4149,10 +4126,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59949619b2ef45eedb6c399d05f2c3c7bc678b5074b3103bb670f9e05bb99042" dependencies = [ "pmutil", - "proc-macro2 1.0.43", - "quote 1.0.21", + "proc-macro2 1.0.42", + "quote 1.0.20", "swc_macros_common", - "syn 1.0.99", + "syn 1.0.98", ] [[package]] @@ -4233,10 +4210,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "18712e4aab969c6508dff3540ade6358f1e013464aa58b3d30da2ab2d9fcbbed" dependencies = [ "pmutil", - "proc-macro2 1.0.43", - "quote 1.0.21", + "proc-macro2 1.0.42", + "quote 1.0.20", "swc_macros_common", - "syn 1.0.99", + "syn 1.0.98", ] [[package]] @@ -4350,9 +4327,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c8f200a2eaed938e7c1a685faaa66e6d42fa9e17da5f62572d3cbc335898f5e" dependencies = [ "pmutil", - "proc-macro2 1.0.43", - "quote 1.0.21", - "syn 1.0.99", + "proc-macro2 1.0.42", + "quote 1.0.20", + "syn 1.0.98", ] [[package]] @@ -4362,9 +4339,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5dca3f08d02da4684c3373150f7c045128f81ea00f0c434b1b012bc65a6cce3" dependencies = [ "pmutil", - "proc-macro2 1.0.43", - "quote 1.0.21", - "syn 1.0.99", + "proc-macro2 1.0.42", + "quote 1.0.20", + "syn 1.0.98", ] [[package]] @@ -4385,10 +4362,10 @@ checksum = "c3b9b72892df873972549838bf84d6c56234c7502148a7e23b5a3da6e0fedfb8" dependencies = [ "Inflector", "pmutil", - "proc-macro2 1.0.43", - "quote 1.0.21", + "proc-macro2 1.0.42", + "quote 1.0.20", "swc_macros_common", - "syn 1.0.99", + "syn 1.0.98", ] [[package]] @@ -4404,12 +4381,12 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.99" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" +checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" dependencies = [ - "proc-macro2 1.0.43", - "quote 1.0.21", + "proc-macro2 1.0.42", + "quote 1.0.20", "unicode-ident", ] @@ -4419,9 +4396,9 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ - "proc-macro2 1.0.43", - "quote 1.0.21", - "syn 1.0.99", + "proc-macro2 1.0.42", + "quote 1.0.20", + "syn 1.0.98", "unicode-xid 0.2.3", ] @@ -4513,22 +4490,22 @@ checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" [[package]] name = "thiserror" -version = "1.0.33" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d0a539a918745651435ac7db7a18761589a94cd7e94cd56999f828bf73c8a57" +checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.33" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c251e90f708e16c49a16f4917dc2131e75222b72edfa9cb7f7c58ae56aae0c09" +checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" dependencies = [ - "proc-macro2 1.0.43", - "quote 1.0.21", - "syn 1.0.99", + "proc-macro2 1.0.42", + "quote 1.0.20", + "syn 1.0.98", ] [[package]] @@ -4564,11 +4541,12 @@ dependencies = [ [[package]] name = "time" -version = "0.3.14" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3f9a28b618c3a6b9251b6908e9c99e04b9e5c02e6581ccbb67d59c34ef7f9b" +checksum = "74b7cc93fc23ba97fde84f7eea56c55d1ba183f495c6715defdfc7b9cb8c870f" dependencies = [ - "itoa 1.0.3", + "itoa 1.0.2", + "js-sys", "libc", "num_threads", "time-macros", @@ -4631,9 +4609,9 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" dependencies = [ - "proc-macro2 1.0.43", - "quote 1.0.21", - "syn 1.0.99", + "proc-macro2 1.0.42", + "quote 1.0.20", + "syn 1.0.98", ] [[package]] @@ -4776,9 +4754,9 @@ version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2" dependencies = [ - "proc-macro2 1.0.43", - "quote 1.0.21", - "syn 1.0.99", + "proc-macro2 1.0.42", + "quote 1.0.20", + "syn 1.0.98", ] [[package]] @@ -4885,7 +4863,7 @@ dependencies = [ "radix_trie", "rand 0.8.5", "thiserror", - "time 0.3.14", + "time 0.3.12", "tokio", "trust-dns-proto", ] @@ -4931,7 +4909,7 @@ dependencies = [ "log", "serde", "thiserror", - "time 0.3.14", + "time 0.3.12", "tokio", "toml", "trust-dns-client", @@ -4976,9 +4954,9 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89851716b67b937e393b3daa8423e67ddfc4bbbf1654bcf05488e95e0828db0c" dependencies = [ - "proc-macro2 1.0.43", - "quote 1.0.21", - "syn 1.0.99", + "proc-macro2 1.0.42", + "quote 1.0.20", + "syn 1.0.98", ] [[package]] @@ -5001,9 +4979,9 @@ checksum = "69fe8d9274f490a36442acb4edfd0c4e473fdfc6a8b5cd32f28a0235761aedbe" [[package]] name = "unicode-ident" -version = "1.0.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf" +checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7" [[package]] name = "unicode-normalization" @@ -5097,7 +5075,7 @@ dependencies = [ "fslock", "lazy_static", "libc", - "which 4.3.0", + "which 4.2.5", ] [[package]] @@ -5186,9 +5164,9 @@ dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.43", - "quote 1.0.21", - "syn 1.0.99", + "proc-macro2 1.0.42", + "quote 1.0.20", + "syn 1.0.98", "wasm-bindgen-shared", ] @@ -5210,7 +5188,7 @@ version = "0.2.82" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602" dependencies = [ - "quote 1.0.21", + "quote 1.0.20", "wasm-bindgen-macro-support", ] @@ -5220,9 +5198,9 @@ version = "0.2.82" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" dependencies = [ - "proc-macro2 1.0.43", - "quote 1.0.21", - "syn 1.0.99", + "proc-macro2 1.0.42", + "quote 1.0.20", + "syn 1.0.98", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5273,13 +5251,13 @@ dependencies = [ [[package]] name = "which" -version = "4.3.0" +version = "4.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b" +checksum = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae" dependencies = [ "either", + "lazy_static", "libc", - "once_cell", ] [[package]] @@ -5426,8 +5404,8 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f8f187641dad4f680d25c4bfc4225b418165984179f26ca76ec4fb6441d3a17" dependencies = [ - "proc-macro2 1.0.43", - "quote 1.0.21", - "syn 1.0.99", + "proc-macro2 1.0.42", + "quote 1.0.20", + "syn 1.0.98", "synstructure", ] diff --git a/backend/src/procedure/js_scripts.rs b/backend/src/procedure/js_scripts.rs index 8bd9cb360..800e181b1 100644 --- a/backend/src/procedure/js_scripts.rs +++ b/backend/src/procedure/js_scripts.rs @@ -374,3 +374,47 @@ async fn js_action_test_rename() { .unwrap() .unwrap(); } + +#[tokio::test] +async fn js_action_test_deep_dir() { + let js_action = JsProcedure { args: vec![] }; + let path: PathBuf = "test/js_action_execute/" + .parse::() + .unwrap() + .canonicalize() + .unwrap(); + let package_id = "test-package".parse().unwrap(); + let package_version: Version = "0.3.0.3".parse().unwrap(); + let name = ProcedureName::Action("test-deep-dir".parse().unwrap()); + let volumes: Volumes = serde_json::from_value(serde_json::json!({ + "main": { + "type": "data" + }, + "compat": { + "type": "assets" + }, + "filebrowser" :{ + "package-id": "filebrowser", + "path": "data", + "readonly": true, + "type": "pointer", + "volume-id": "main", + } + })) + .unwrap(); + let input: Option = None; + let timeout = Some(Duration::from_secs(10)); + js_action + .execute::( + &path, + &package_id, + &package_version, + name, + &volumes, + input, + timeout, + ) + .await + .unwrap() + .unwrap(); +} diff --git a/backend/test/js_action_execute/package-data/scripts/test-package/0.3.0.3/embassy.js b/backend/test/js_action_execute/package-data/scripts/test-package/0.3.0.3/embassy.js index cb847f796..cfcfddac7 100644 --- a/backend/test/js_action_execute/package-data/scripts/test-package/0.3.0.3/embassy.js +++ b/backend/test/js_action_execute/package-data/scripts/test-package/0.3.0.3/embassy.js @@ -94,45 +94,45 @@ export async function getConfig(effects) { const metadata = await effects.metadata({ path: "./test.log", volumeId: "main", - }) + }); - if (typeof metadata.fileType !== 'string') { - throw new TypeError("File type is not a string") + if (typeof metadata.fileType !== "string") { + throw new TypeError("File type is not a string"); } - if (typeof metadata.isDir !== 'boolean' ) { - throw new TypeError("isDir is not a boolean") + if (typeof metadata.isDir !== "boolean") { + throw new TypeError("isDir is not a boolean"); } - if (typeof metadata.isFile !== 'boolean' ) { - throw new TypeError("isFile is not a boolean") + if (typeof metadata.isFile !== "boolean") { + throw new TypeError("isFile is not a boolean"); } - if (typeof metadata.isSymlink !== 'boolean' ) { - throw new TypeError("isSymlink is not a boolean") + if (typeof metadata.isSymlink !== "boolean") { + throw new TypeError("isSymlink is not a boolean"); } - if (typeof metadata.len !== 'number' ) { - throw new TypeError("len is not a number") + if (typeof metadata.len !== "number") { + throw new TypeError("len is not a number"); } - if (typeof metadata.gid !== 'number' ) { - throw new TypeError("gid is not a number") + if (typeof metadata.gid !== "number") { + throw new TypeError("gid is not a number"); } - if (typeof metadata.uid !== 'number' ) { - throw new TypeError("uid is not a number") + if (typeof metadata.uid !== "number") { + throw new TypeError("uid is not a number"); } - if (typeof metadata.mode !== 'number' ) { - throw new TypeError("mode is not a number") + if (typeof metadata.mode !== "number") { + throw new TypeError("mode is not a number"); } - if (!(metadata.modified instanceof Date )) { - throw new TypeError("modified is not a Date") + if (!(metadata.modified instanceof Date)) { + throw new TypeError("modified is not a Date"); } - if (!(metadata.accessed instanceof Date )) { - throw new TypeError("accessed is not a Date") + if (!(metadata.accessed instanceof Date)) { + throw new TypeError("accessed is not a Date"); } - if (!(metadata.created instanceof Date )) { - throw new TypeError("created is not a Date") + if (!(metadata.created instanceof Date)) { + throw new TypeError("created is not a Date"); } - if (typeof metadata.readonly !== 'boolean' ) { - throw new TypeError("readonly is not a boolean") + if (typeof metadata.readonly !== "boolean") { + throw new TypeError("readonly is not a boolean"); } - effects.error(JSON.stringify(metadata)) + effects.error(JSON.stringify(metadata)); } return { result: { @@ -724,97 +724,145 @@ export async function getConfig(effects) { export async function setConfig(effects) { return { - error: "Not setup" + error: "Not setup", }; } const assert = (condition, message) => { if (!condition) { - throw new Error(message) + throw new Error(message); } -} +}; export const action = { async fetch(effects, _input) { - const example = await effects.fetch("https://postman-echo.com/get?foo1=bar1&foo2=bar2"); - assert(Number(example.headers['content-length']) > 0 && Number(example.headers['content-length']) <= 1000000,"Should have content length"); - assert((example.text() instanceof Promise), "example.text() should be a promise"); - assert((example.body === undefined), "example.body should not be defined"); - assert((JSON.parse(await example.text()).args.foo1 === 'bar1'), "Body should be parsed"); + const example = await effects.fetch( + "https://postman-echo.com/get?foo1=bar1&foo2=bar2" + ); + assert( + Number(example.headers["content-length"]) > 0 && + Number(example.headers["content-length"]) <= 1000000, + "Should have content length" + ); + assert( + example.text() instanceof Promise, + "example.text() should be a promise" + ); + assert(example.body === undefined, "example.body should not be defined"); + assert( + JSON.parse(await example.text()).args.foo1 === "bar1", + "Body should be parsed" + ); const message = `This worked @ ${new Date().toISOString()}`; - const secondResponse = await effects.fetch("https://postman-echo.com/post", { - method: "POST", - body:JSON.stringify({message }), - headers:{ - test: "1234", - } - }) - assert(((await secondResponse.json()).json.message === message), "Body should be parsed from response"); - return { - result: { - copyable: false, - message: "Done", - version: "0", - qr: false, - } + const secondResponse = await effects.fetch( + "https://postman-echo.com/post", + { + method: "POST", + body: JSON.stringify({ message }), + headers: { + test: "1234", + }, } + ); + assert( + (await secondResponse.json()).json.message === message, + "Body should be parsed from response" + ); + return { + result: { + copyable: false, + message: "Done", + version: "0", + qr: false, + }, + }; }, - async 'js-action-var-arg'(_effects, _input, testInput) { - + async "js-action-var-arg"(_effects, _input, testInput) { assert(testInput == 42, "Input should be passed in"); - return { - result: { - copyable: false, - message: "Done", - version: "0", - qr: false, - } - } + return { + result: { + copyable: false, + message: "Done", + version: "0", + qr: false, + }, + }; }, - async 'test-rename'(effects, _input) { - + async "test-rename"(effects, _input) { await effects.writeFile({ - volumeId: 'main', - path: 'test-rename.txt', - toWrite: 'Hello World', + volumeId: "main", + path: "test-rename.txt", + toWrite: "Hello World", }); await effects.rename({ - srcVolume: 'main', - srcPath: 'test-rename.txt', - dstVolume: 'main', - dstPath: 'test-rename-2.txt', + srcVolume: "main", + srcPath: "test-rename.txt", + dstVolume: "main", + dstPath: "test-rename-2.txt", }); const readIn = await effects.readFile({ - volumeId: 'main', - path: 'test-rename-2.txt', + volumeId: "main", + path: "test-rename-2.txt", }); - assert(readIn === 'Hello World', "Contents should be the same"); + assert(readIn === "Hello World", "Contents should be the same"); await effects.removeFile({ path: "test-rename-2.txt", volumeId: "main", }); - try{ - + try { await effects.removeFile({ path: "test-rename.txt", volumeId: "main", }); assert(false, "Should not be able to remove file that doesn't exist"); - } - catch (_){} + } catch (_) {} + return { + result: { + copyable: false, + message: "Done", + version: "0", + qr: false, + }, + }; + }, + /** + * Created this test because of issue + * https://github.com/Start9Labs/embassy-os/issues/1737 + * which that we couldn't create a dir that was deeply nested, and the parents where + * not created yet. Found this out during the migrations, where the parent would die. + * @param {*} effects + * @param {*} _input + * @returns + */ + async "test-deep-dir"(effects, _input) { + effects.error("Test"); + await effects + .removeDir({ + volumeId: "main", + path: "test-deep-dir", + }) + .catch(() => {}); + await effects.createDir({ + volumeId: "main", + path: "test-deep-dir/deep/123", + }); + await effects.removeDir({ + volumeId: "main", + path: "test-deep-dir", + }); - return { - result: { - copyable: false, - message: "Done", - version: "0", - qr: false, - } - } - } -} \ No newline at end of file + return { + result: { + copyable: false, + message: "Done", + version: "0", + qr: false, + }, + }; + }, +}; diff --git a/libs/js_engine/src/lib.rs b/libs/js_engine/src/lib.rs index 3f9e765d8..2d6b4f2f6 100644 --- a/libs/js_engine/src/lib.rs +++ b/libs/js_engine/src/lib.rs @@ -772,7 +772,22 @@ mod fns { parent: impl AsRef, child: impl AsRef, ) -> Result { - let child = tokio::fs::canonicalize(child).await?; + let child = { + let mut child = child.as_ref(); + loop { + let meta = tokio::fs::metadata(child).await; + if meta.is_ok() { + break; + } + child = match child.parent() { + Some(child) => child, + None => { + return Ok(false); + } + }; + } + tokio::fs::canonicalize(child).await? + }; let parent = tokio::fs::canonicalize(parent).await?; Ok(child.starts_with(parent)) }