diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6746ad3f..82087bab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,9 +57,6 @@ jobs: uses: dsherret/rust-toolchain-file@v1 - uses: Swatinem/rust-cache@v2 - with: - workspaces: | - api - name: Setup postgres for tests run: docker-compose up -d @@ -128,6 +125,9 @@ jobs: - name: Set up docker buildx uses: docker/setup-buildx-action@v3 + - name: Copy Cargo.lock + run: cp Cargo.lock api/Cargo.lock + - name: Build and push api docker image uses: docker/build-push-action@v5 id: api_push diff --git a/api/Cargo.lock b/Cargo.lock similarity index 85% rename from api/Cargo.lock rename to Cargo.lock index f3faf50f..3ffc92a0 100644 --- a/api/Cargo.lock +++ b/Cargo.lock @@ -29,9 +29,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.8.6" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "getrandom", @@ -42,9 +42,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -100,15 +100,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" [[package]] name = "asn1-rs" @@ -158,7 +158,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.51", + "syn 2.0.58", ] [[package]] @@ -174,22 +174,22 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" +checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" dependencies = [ "concurrent-queue", - "event-listener 4.0.0", - "event-listener-strategy", + "event-listener 5.3.0", + "event-listener-strategy 0.5.1", "futures-core", "pin-project-lite", ] [[package]] name = "async-compression" -version = "0.4.5" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc2d0cfb2a7388d34f590e76686704c494ed7aaceed62ee1ba35cbf363abc2a5" +checksum = "07dbbf24db18d609b1462965249abdf49129ccad073ec257da372adc83259c60" dependencies = [ "brotli", "flate2", @@ -201,30 +201,30 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" +checksum = "5f98c37cf288e302c16ef6c8472aad1e034c6c84ce5ea7b8101c98eb4a802fee" dependencies = [ - "async-lock 3.2.0", + "async-lock 3.3.0", "async-task", "concurrent-queue", - "fastrand 2.0.1", - "futures-lite 2.1.0", + "fastrand 2.0.2", + "futures-lite 2.3.0", "slab", ] [[package]] name = "async-global-executor" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b4353121d5644cdf2beb5726ab752e79a8db1ebb52031770ec47db31d245526" +checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" dependencies = [ - "async-channel 2.1.1", + "async-channel 2.2.0", "async-executor", - "async-io 2.2.1", - "async-lock 3.2.0", + "async-io 2.3.2", + "async-lock 3.3.0", "blocking", - "futures-lite 2.1.0", + "futures-lite 2.3.0", "once_cell", ] @@ -250,18 +250,18 @@ dependencies = [ [[package]] name = "async-io" -version = "2.2.1" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6d3b15875ba253d1110c740755e246537483f152fa334f91abd7fe84c88b3ff" +checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" dependencies = [ - "async-lock 3.2.0", + "async-lock 3.3.0", "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.1.0", + "futures-lite 2.3.0", "parking", - "polling 3.3.1", - "rustix 0.38.26", + "polling 3.6.0", + "rustix 0.38.32", "slab", "tracing", "windows-sys 0.52.0", @@ -278,12 +278,12 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" +checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" dependencies = [ - "event-listener 4.0.0", - "event-listener-strategy", + "event-listener 4.0.3", + "event-listener-strategy 0.4.0", "pin-project-lite", ] @@ -332,7 +332,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.58", ] [[package]] @@ -344,26 +344,26 @@ dependencies = [ "async-std", "filetime", "libc", - "pin-project 1.1.3", + "pin-project 1.1.5", "redox_syscall 0.2.16", "xattr 0.2.3", ] [[package]] name = "async-task" -version = "4.5.0" +version = "4.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" +checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.58", ] [[package]] @@ -381,21 +381,11 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" -[[package]] -name = "atomic-write-file" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edcdbedc2236483ab103a53415653d6b4442ea6141baf1ffa85df29635e88436" -dependencies = [ - "nix", - "rand", -] - [[package]] name = "autocfg" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "axum" @@ -444,9 +434,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", "cc", @@ -465,9 +455,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.6" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c79fed4cdb43e993fcdadc7e58a09fd0e3e649c4436fa11da71c9f1f3ee7feb9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64ct" @@ -492,9 +482,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" dependencies = [ "serde", ] @@ -514,21 +504,21 @@ version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" dependencies = [ - "async-channel 2.1.1", - "async-lock 3.2.0", + "async-channel 2.2.0", + "async-lock 3.3.0", "async-task", - "fastrand 2.0.1", + "fastrand 2.0.2", "futures-io", - "futures-lite 2.1.0", + "futures-lite 2.3.0", "piper", "tracing", ] [[package]] name = "brotli" -version = "3.4.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" +checksum = "125740193d7fee5cc63ab9e16c2fdc4e07c74ba755cc53b327d6ea029e9fc569" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -537,9 +527,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.5.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" +checksum = "65622a320492e09b5e0ac436b14c54ff68199bac392d0e89a6832c4518eea525" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -547,9 +537,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byteorder" @@ -559,18 +549,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "cc" -version = "1.0.83" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] +checksum = "2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41" [[package]] name = "cfb" @@ -591,9 +578,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.35" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" +checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" dependencies = [ "android-tzdata", "iana-time-zone", @@ -601,14 +588,14 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.52.0", + "windows-targets 0.52.4", ] [[package]] name = "clap" -version = "4.4.11" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" dependencies = [ "clap_builder", "clap_derive", @@ -616,32 +603,32 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.11" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstyle", "clap_lex", - "strsim", + "strsim 0.11.1", ] [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.58", ] [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "comrak" @@ -670,9 +657,9 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.9.5" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "const_format" @@ -712,18 +699,18 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] [[package]] name = "crc" -version = "3.0.1" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" dependencies = [ "crc-catalog", ] @@ -736,41 +723,36 @@ checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-queue" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crypto-common" @@ -802,7 +784,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim", + "strsim 0.10.0", "syn 1.0.109", ] @@ -854,12 +836,12 @@ dependencies = [ [[package]] name = "deno_ast" -version = "0.37.0" +version = "0.37.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67f9b18b22c707b59cf1ee9cb6f0afbfcf0d03a59b9244ddadacf6a4dc7cfeba" +checksum = "b2be70f80fee64edfbbc4a61c50f18b4a0fbff0b2657d26f6f0443e1db279af9" dependencies = [ "anyhow", - "base64 0.21.6", + "base64 0.21.7", "deno_media_type", "deno_terminal", "dprint-swc-ext", @@ -895,9 +877,9 @@ dependencies = [ [[package]] name = "deno_doc" -version = "0.124.0" +version = "0.128.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e1215167b2d2a7595cf32737ff9c7802d7faf58dfbe8c9e5d8f07d4c3af4987" +checksum = "0e8a0341720816b115258e7b0768ec9f37f13919144c0c3aa3ee0aed3c639e88" dependencies = [ "ammonia", "anyhow", @@ -909,7 +891,7 @@ dependencies = [ "handlebars", "html-escape", "import_map", - "indexmap 2.1.0", + "indexmap 2.2.6", "lazy_static", "regex", "serde", @@ -930,8 +912,9 @@ dependencies = [ [[package]] name = "deno_graph" -version = "0.72.0" -source = "git+https://github.com/denoland/deno_graph?rev=d179f32b6879770119a00e408d9452567f0bbee8#d179f32b6879770119a00e408d9452567f0bbee8" +version = "0.73.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "046123e4f8de81c7db363d0869d783a5dcd6ceb007b07c6ba4fdf3cc0a82314e" dependencies = [ "anyhow", "async-trait", @@ -942,7 +925,7 @@ dependencies = [ "encoding_rs", "futures", "import_map", - "indexmap 2.1.0", + "indexmap 2.2.6", "log", "monch", "once_cell", @@ -958,11 +941,11 @@ dependencies = [ [[package]] name = "deno_lockfile" -version = "0.18.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfe06eda519ed05b69da567bcba1d728c482fd553ddaa2ffe008468158da6de0" +checksum = "9f348633cc4425b2a9011436e256b1ae8f6c8026ec2705d852baee8643dc5562" dependencies = [ - "ring 0.17.7", + "ring 0.17.8", "serde", "serde_json", "thiserror", @@ -970,9 +953,9 @@ dependencies = [ [[package]] name = "deno_media_type" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a798670c20308e5770cc0775de821424ff9e85665b602928509c8c70430b3ee0" +checksum = "a8978229b82552bf8457a0125aa20863f023619cfc21ebb007b1e571d68fd85b" dependencies = [ "data-url", "serde", @@ -1030,9 +1013,9 @@ dependencies = [ [[package]] name = "der" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" dependencies = [ "const-oid", "pem-rfc7468", @@ -1055,9 +1038,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", ] @@ -1095,9 +1078,9 @@ dependencies = [ [[package]] name = "deunicode" -version = "1.4.1" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a1abaf4d861455be59f64fd2b55606cb151fce304ede7165f410243ce96bde6" +checksum = "b6e854126756c496b8c81dec88f9a706b15b875c5849d4097a3854476b9fdf94" [[package]] name = "digest" @@ -1119,7 +1102,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.58", ] [[package]] @@ -1145,18 +1128,18 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" dependencies = [ "serde", ] [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if", ] @@ -1202,9 +1185,20 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "4.0.0" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770d968249b5d99410d61f5bf89057f3199a077a04d087092f58e7d10692baae" +checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" dependencies = [ "concurrent-queue", "parking", @@ -1217,7 +1211,17 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" dependencies = [ - "event-listener 4.0.0", + "event-listener 4.0.3", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3" +dependencies = [ + "event-listener 5.3.0", "pin-project-lite", ] @@ -1232,9 +1236,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" [[package]] name = "filetime" @@ -1298,7 +1302,7 @@ checksum = "3a0b11eeb173ce52f84ebd943d42e58813a2ebb78a6a3ff0a243b71c5199cd7b" dependencies = [ "proc-macro2", "swc_macros_common", - "syn 2.0.51", + "syn 2.0.58", ] [[package]] @@ -1313,9 +1317,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -1328,9 +1332,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -1338,15 +1342,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -1366,9 +1370,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" @@ -1387,11 +1391,11 @@ dependencies = [ [[package]] name = "futures-lite" -version = "2.1.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.0.1", + "fastrand 2.0.2", "futures-core", "futures-io", "parking", @@ -1400,32 +1404,32 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.58", ] [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -1494,9 +1498,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" dependencies = [ "cfg-if", "js-sys", @@ -1525,9 +1529,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.22" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -1535,7 +1539,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 2.1.0", + "indexmap 2.2.6", "slab", "tokio", "tokio-util", @@ -1544,11 +1548,11 @@ dependencies = [ [[package]] name = "handlebars" -version = "5.0.0" +version = "5.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94eae21d01d20dabef65d8eda734d83df6e2dea8166788804be9bd6bc92448fa" +checksum = "d08485b96a0e6393e9e4d1b8d48cf74ad6c063cd905eb33f42c1ce3f0377539b" dependencies = [ - "heck", + "heck 0.5.0", "log", "pest", "pest_derive", @@ -1591,11 +1595,17 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -1605,9 +1615,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hkdf" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" dependencies = [ "hmac", ] @@ -1623,24 +1633,25 @@ dependencies = [ [[package]] name = "home" -version = "0.5.5" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "hstr" -version = "0.2.6" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de90d3db62411eb62eddabe402d706ac4970f7ac8d088c05f11069cad9be9857" +checksum = "5a9de2bdef6354361892492bab5e316b2d78a0ee9971db4d36da9b1eb0e11999" dependencies = [ + "hashbrown 0.14.3", "new_debug_unreachable", "once_cell", "phf 0.11.2", "rustc-hash", - "smallvec", + "triomphe", ] [[package]] @@ -1668,9 +1679,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ "bytes", "fnv", @@ -1679,9 +1690,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", "http", @@ -1702,9 +1713,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", @@ -1717,7 +1728,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.10", + "socket2 0.5.6", "tokio", "tower-service", "tracing", @@ -1752,9 +1763,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.58" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1797,11 +1808,11 @@ checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" [[package]] name = "import_map" -version = "0.19.0" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "696717335b077e26921a60be7b7bdc15d1246074f1ac79d9e8560792535f7d07" +checksum = "72395c7d41857a714b5ce1266685ef3c5ceb761ce601a99c44c072d72b41a1e3" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.6", "log", "percent-encoding", "serde", @@ -1821,9 +1832,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown 0.14.3", @@ -1876,15 +1887,14 @@ dependencies = [ [[package]] name = "is-macro" -version = "0.3.1" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc74b7abae208af9314a406bd7dcc65091230b6e749c09e07a645885fecf34f9" +checksum = "59a85abdc13717906baccb5a1e435556ce0df215f242892f721dff62bf25288f" dependencies = [ "Inflector", - "pmutil", "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.58", ] [[package]] @@ -1898,33 +1908,24 @@ dependencies = [ [[package]] name = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "js-sys" -version = "0.3.66" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -1962,7 +1963,7 @@ version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" dependencies = [ - "base64 0.21.6", + "base64 0.21.7", "pem", "ring 0.16.20", "serde", @@ -1990,9 +1991,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.150" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libm" @@ -2019,9 +2020,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" @@ -2035,9 +2036,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" dependencies = [ "value-bag", ] @@ -2095,9 +2096,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "mime" @@ -2123,18 +2124,18 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "wasi", @@ -2149,20 +2150,9 @@ checksum = "b52c1b33ff98142aecea13138bd399b68aa7ab5d9546c300988c345004001eea" [[package]] name = "new_debug_unreachable" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" - -[[package]] -name = "nix" -version = "0.27.1" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" -dependencies = [ - "bitflags 2.4.1", - "cfg-if", - "libc", -] +checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" [[package]] name = "nom" @@ -2213,21 +2203,26 @@ dependencies = [ "zeroize", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] [[package]] name = "num-iter" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" dependencies = [ "autocfg", "num-integer", @@ -2236,9 +2231,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", "libm", @@ -2276,9 +2271,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] @@ -2486,9 +2481,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.5" +version = "2.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5" +checksum = "311fb059dee1a7b802f036316d790138c613a4e8b180c822e3925a662e9f0c95" dependencies = [ "memchr", "thiserror", @@ -2497,9 +2492,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.5" +version = "2.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81d78524685f5ef2a3b3bd1cafbc9fcabb036253d9b1463e726a91cd16e2dfc2" +checksum = "f73541b156d32197eecda1a4014d7f868fd2bcb3c550d5386087cfba442bf69c" dependencies = [ "pest", "pest_generator", @@ -2507,22 +2502,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.5" +version = "2.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68bd1206e71118b5356dae5ddc61c8b11e28b09ef6a31acbd15ea48a28e0c227" +checksum = "c35eeed0a3fab112f75165fdc026b3913f4183133f19b49be773ac9ea966e8bd" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.58", ] [[package]] name = "pest_meta" -version = "2.7.5" +version = "2.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c747191d4ad9e4a4ab9c8798f1e82a39affe7ef9648390b7e5548d18e099de6" +checksum = "2adbf29bb9776f28caece835398781ab24435585fe0d4dc1374a61db5accedca" dependencies = [ "once_cell", "pest", @@ -2588,7 +2583,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.58", ] [[package]] @@ -2620,11 +2615,11 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ - "pin-project-internal 1.1.3", + "pin-project-internal 1.1.5", ] [[package]] @@ -2640,20 +2635,20 @@ dependencies = [ [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.58", ] [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -2668,7 +2663,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" dependencies = [ "atomic-waker", - "fastrand 2.0.1", + "fastrand 2.0.2", "futures-io", ] @@ -2695,9 +2690,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "pmutil" @@ -2707,7 +2702,7 @@ checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.58", ] [[package]] @@ -2728,14 +2723,15 @@ dependencies = [ [[package]] name = "polling" -version = "3.3.1" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf63fa624ab313c11656b4cda960bfc46c410187ad493c41f6ba2d8c1e991c9e" +checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6" dependencies = [ "cfg-if", "concurrent-queue", + "hermit-abi", "pin-project-lite", - "rustix 0.38.26", + "rustix 0.38.32", "tracing", "windows-sys 0.52.0", ] @@ -2777,9 +2773,9 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] @@ -2796,12 +2792,12 @@ dependencies = [ [[package]] name = "prost" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" +checksum = "d0f5d036824e4761737860779c906171497f6d55681139d8312388f8fe398922" dependencies = [ "bytes", - "prost-derive 0.12.3", + "prost-derive 0.12.4", ] [[package]] @@ -2819,15 +2815,15 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" +checksum = "19de2de2a00075bf566bee3bd4db014b11587e84184d3f7a791bc17f1a8e9e48" dependencies = [ "anyhow", - "itertools 0.11.0", + "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.58", ] [[package]] @@ -2841,11 +2837,11 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e" +checksum = "3235c33eb02c1f1e212abdbe34c78b264b038fb58ca612664343271e36e55ffe" dependencies = [ - "prost 0.12.3", + "prost 0.12.4", ] [[package]] @@ -2859,9 +2855,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -2916,14 +2912,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.2" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.3", - "regex-syntax 0.8.2", + "regex-automata 0.4.6", + "regex-syntax 0.8.3", ] [[package]] @@ -2937,13 +2933,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax 0.8.3", ] [[package]] @@ -2954,9 +2950,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "registry_api" @@ -2965,7 +2961,7 @@ dependencies = [ "anyhow", "async-tar", "async-trait", - "base64 0.21.6", + "base64 0.21.7", "bytes", "chrono", "clap", @@ -2982,7 +2978,7 @@ dependencies = [ "futures", "handlebars", "hyper", - "indexmap 2.1.0", + "indexmap 2.2.6", "infer", "jsonc-parser", "jsonwebkey", @@ -2993,7 +2989,7 @@ dependencies = [ "opentelemetry-gcloud-trace", "opentelemetry-otlp", "percent-encoding", - "pin-project 1.1.3", + "pin-project 1.1.5", "postmark", "rand", "regex", @@ -3022,12 +3018,12 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.22" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ "async-compression", - "base64 0.21.6", + "base64 0.21.7", "bytes", "encoding_rs", "futures-core", @@ -3050,6 +3046,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", "system-configuration", "tokio", "tokio-rustls", @@ -3081,16 +3078,17 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.7" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", + "cfg-if", "getrandom", "libc", "spin 0.9.8", "untrusted 0.9.0", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3194,25 +3192,25 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.26" +version = "0.38.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9470c4bf8246c8daf25f9598dca807fb6510347b1e1cfa55749113850c79d88a" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "errno", "libc", - "linux-raw-sys 0.4.12", + "linux-raw-sys 0.4.13", "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.21.9" +version = "0.21.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", - "ring 0.17.7", + "ring 0.17.8", "rustls-webpki", "sct", ] @@ -3235,7 +3233,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.21.6", + "base64 0.21.7", ] [[package]] @@ -3244,15 +3242,15 @@ version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.17.7", + "ring 0.17.8", "untrusted 0.9.0", ] [[package]] name = "rustversion" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" [[package]] name = "rvs_derive" @@ -3276,23 +3274,23 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "ryu-js" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4950d85bc52415f8432144c97c4791bd0c4f7954de32a7270ee9cccd3c22b12b" +checksum = "ad97d4ce1560a5e27cec89519dc8300d1aa6035b099821261c651486a19e44d5" [[package]] name = "schannel" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3313,7 +3311,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.17.7", + "ring 0.17.8", "untrusted 0.9.0", ] @@ -3323,8 +3321,8 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5f8cfb86d2019f64a4cfb49e499f401f406fbec946c1ffeea9d0504284347de" dependencies = [ - "prost 0.12.3", - "prost-types 0.12.3", + "prost 0.12.4", + "prost-types 0.12.4", "serde", "serde_json", "zeroize", @@ -3332,9 +3330,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.2" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -3345,9 +3343,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" dependencies = [ "core-foundation-sys", "libc", @@ -3385,16 +3383,16 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.58", ] [[package]] name = "serde_json" -version = "1.0.112" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d1bd37ce2324cf3bf85e5a25f96eb4baf0d5aa6eba43e7ae8958870c4ec48ed" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.6", "itoa", "ryu", "serde", @@ -3402,9 +3400,9 @@ dependencies = [ [[package]] name = "serde_path_to_error" -version = "0.1.14" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335" +checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6" dependencies = [ "itoa", "serde", @@ -3532,9 +3530,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smartstring" @@ -3559,12 +3557,12 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3614,16 +3612,16 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c" dependencies = [ - "itertools 0.12.0", + "itertools 0.12.1", "nom", "unicode_categories", ] [[package]] name = "sqlx" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dba03c279da73694ef99763320dea58b51095dfe87d001b1d4b5fe78ba8763cf" +checksum = "c9a2ccff1a000a5a59cd33da541d9f2fdcd9e6e8229cc200565942bff36d0aaa" dependencies = [ "sqlx-core", "sqlx-macros", @@ -3634,9 +3632,9 @@ dependencies = [ [[package]] name = "sqlx-core" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d84b0a3c3739e220d94b3239fd69fb1f74bc36e16643423bd99de3b43c21bfbd" +checksum = "24ba59a9342a3d9bab6c56c118be528b27c9b60e490080e9711a04dccac83ef6" dependencies = [ "ahash", "atoi", @@ -3645,7 +3643,6 @@ dependencies = [ "chrono", "crc", "crossbeam-queue", - "dotenvy", "either", "event-listener 2.5.3", "futures-channel", @@ -3655,7 +3652,7 @@ dependencies = [ "futures-util", "hashlink", "hex", - "indexmap 2.1.0", + "indexmap 2.2.6", "ipnetwork", "log", "memchr", @@ -3680,9 +3677,9 @@ dependencies = [ [[package]] name = "sqlx-macros" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89961c00dc4d7dffb7aee214964b065072bff69e36ddb9e2c107541f75e4f2a5" +checksum = "4ea40e2345eb2faa9e1e5e326db8c34711317d2b5e08d0d5741619048a803127" dependencies = [ "proc-macro2", "quote", @@ -3693,14 +3690,13 @@ dependencies = [ [[package]] name = "sqlx-macros-core" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0bd4519486723648186a08785143599760f7cc81c52334a55d6a83ea1e20841" +checksum = "5833ef53aaa16d860e92123292f1f6a3d53c34ba8b1969f152ef1a7bb803f3c8" dependencies = [ - "atomic-write-file", "dotenvy", "either", - "heck", + "heck 0.4.1", "hex", "once_cell", "proc-macro2", @@ -3720,13 +3716,13 @@ dependencies = [ [[package]] name = "sqlx-mysql" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e37195395df71fd068f6e2082247891bc11e3289624bbc776a0cdfa1ca7f1ea4" +checksum = "1ed31390216d20e538e447a7a9b959e06ed9fc51c37b514b46eb758016ecd418" dependencies = [ "atoi", - "base64 0.21.6", - "bitflags 2.4.1", + "base64 0.21.7", + "bitflags 2.5.0", "byteorder", "bytes", "chrono", @@ -3764,13 +3760,13 @@ dependencies = [ [[package]] name = "sqlx-postgres" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6ac0ac3b7ccd10cc96c7ab29791a7dd236bd94021f31eec7ba3d46a74aa1c24" +checksum = "7c824eb80b894f926f89a0b9da0c7f435d27cdd35b8c655b114e58223918577e" dependencies = [ "atoi", - "base64 0.21.6", - "bitflags 2.4.1", + "base64 0.21.7", + "bitflags 2.5.0", "byteorder", "chrono", "crc", @@ -3793,7 +3789,6 @@ dependencies = [ "rand", "serde", "serde_json", - "sha1", "sha2", "smallvec", "sqlx-core", @@ -3806,9 +3801,9 @@ dependencies = [ [[package]] name = "sqlx-sqlite" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "210976b7d948c7ba9fced8ca835b11cbb2d677c59c79de41ac0d397e14547490" +checksum = "b244ef0a8414da0bed4bb1910426e890b19e5e9bccc27ada6b797d05c55ae0aa" dependencies = [ "atoi", "chrono", @@ -3829,6 +3824,12 @@ dependencies = [ "uuid", ] +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + [[package]] name = "stacker" version = "0.1.15" @@ -3883,7 +3884,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.51", + "syn 2.0.58", ] [[package]] @@ -3903,6 +3904,12 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + [[package]] name = "subtle" version = "2.5.0" @@ -3923,9 +3930,9 @@ dependencies = [ [[package]] name = "swc_cached" -version = "0.3.19" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630c761c74ac8021490b78578cc2223aa4a568241e26505c27bf0e4fd4ad8ec2" +checksum = "83406221c501860fce9c27444f44125eafe9e598b8b81be7563d7036784cd05c" dependencies = [ "ahash", "anyhow", @@ -3968,7 +3975,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce837c5eae1cb200a310940de989fd9b3d12ed62d7752bc69b39ef8aa775ec04" dependencies = [ "anyhow", - "indexmap 2.1.0", + "indexmap 2.2.6", "serde", "serde_json", "swc_cached", @@ -3984,7 +3991,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.51", + "syn 2.0.58", ] [[package]] @@ -3993,7 +4000,7 @@ version = "0.112.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "36226eb87bfd2f5620bde04f149a4b869ab34e78496d60cb0d8eb9da765d0732" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.5.0", "is-macro", "num-bigint", "phf 0.11.2", @@ -4033,7 +4040,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.51", + "syn 2.0.58", ] [[package]] @@ -4079,8 +4086,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "66539401f619730b26d380a120b91b499f80cbdd9bb15d00aa73bc3a4d4cc394" dependencies = [ "better_scoped_tls", - "bitflags 2.4.1", - "indexmap 2.1.0", + "bitflags 2.5.0", + "indexmap 2.2.6", "once_cell", "phf 0.11.2", "rustc-hash", @@ -4118,7 +4125,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.51", + "syn 2.0.58", ] [[package]] @@ -4147,9 +4154,9 @@ version = "0.183.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0ec75c1194365abe4d44d94e58f918ec853469ecd39733b381a089cfdcdee1a" dependencies = [ - "base64 0.21.6", + "base64 0.21.7", "dashmap", - "indexmap 2.1.0", + "indexmap 2.2.6", "once_cell", "serde", "sha-1", @@ -4188,7 +4195,7 @@ version = "0.127.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14482e455df85486d68a51533a31645d511e56df93a35cadf0eabbe7abe96b98" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.6", "num_cpus", "once_cell", "rustc-hash", @@ -4222,7 +4229,7 @@ checksum = "695a1d8b461033d32429b5befbf0ad4d7a2c4d6ba9cd5ba4e0645c615839e8e4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.58", ] [[package]] @@ -4233,7 +4240,7 @@ checksum = "50176cfc1cbc8bb22f41c6fe9d1ec53fbe057001219b5954961b8ad0f336fce9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.58", ] [[package]] @@ -4257,7 +4264,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.51", + "syn 2.0.58", ] [[package]] @@ -4273,9 +4280,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.51" +version = "2.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ab617d94515e94ae53b8406c628598680aa0c9587474ecbe58188f7b345d66c" +checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" dependencies = [ "proc-macro2", "quote", @@ -4329,20 +4336,19 @@ checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" dependencies = [ "filetime", "libc", - "xattr 1.0.1", + "xattr 1.3.1", ] [[package]] name = "tempfile" -version = "3.8.1" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", - "fastrand 2.0.1", - "redox_syscall 0.4.1", - "rustix 0.38.26", - "windows-sys 0.48.0", + "fastrand 2.0.2", + "rustix 0.38.32", + "windows-sys 0.52.0", ] [[package]] @@ -4358,9 +4364,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] @@ -4391,14 +4397,14 @@ checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.58", ] [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ "cfg-if", "once_cell", @@ -4406,12 +4412,13 @@ dependencies = [ [[package]] name = "time" -version = "0.3.30" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", + "num-conv", "powerfmt", "serde", "time-core", @@ -4426,10 +4433,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] @@ -4450,9 +4458,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.34.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", @@ -4462,7 +4470,7 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.5", + "socket2 0.5.6", "tokio-macros", "windows-sys 0.48.0", ] @@ -4485,7 +4493,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.58", ] [[package]] @@ -4500,9 +4508,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", @@ -4542,7 +4550,7 @@ dependencies = [ "hyper", "hyper-timeout", "percent-encoding", - "pin-project 1.1.3", + "pin-project 1.1.5", "prost 0.11.9", "prost-derive 0.11.9", "tokio", @@ -4564,7 +4572,7 @@ dependencies = [ "async-stream", "async-trait", "axum", - "base64 0.21.6", + "base64 0.21.7", "bytes", "futures-core", "futures-util", @@ -4574,7 +4582,7 @@ dependencies = [ "hyper", "hyper-timeout", "percent-encoding", - "pin-project 1.1.3", + "pin-project 1.1.5", "prost 0.11.9", "rustls-native-certs", "rustls-pemfile", @@ -4596,7 +4604,7 @@ dependencies = [ "futures-core", "futures-util", "indexmap 1.9.3", - "pin-project 1.1.3", + "pin-project 1.1.5", "pin-project-lite", "rand", "slab", @@ -4651,7 +4659,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.58", ] [[package]] @@ -4670,7 +4678,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ - "pin-project 1.1.3", + "pin-project 1.1.5", "tracing", ] @@ -4794,9 +4802,9 @@ dependencies = [ [[package]] name = "tree-sitter-javascript" -version = "0.20.3" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d1463af5be7052171161db7cfe45c7621ed959ae533972ab47a09b1ed70ec0" +checksum = "d015c02ea98b62c806f7329ff71c383286dfc3a7a7da0cc484f6e42922f73c2c" dependencies = [ "cc", "tree-sitter", @@ -4862,11 +4870,21 @@ dependencies = [ "tree-sitter", ] +[[package]] +name = "triomphe" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "859eb650cfee7434994602c3a68b25d77ad9e68c8a6cd491616ef86661382eb3" +dependencies = [ + "serde", + "stable_deref_trait", +] + [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "twox-hash" @@ -4887,22 +4905,22 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" [[package]] name = "typed-builder" -version = "0.18.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e47c0496149861b7c95198088cbf36645016b1a0734cf350c50e2a38e070f38a" +checksum = "444d8748011b93cb168770e8092458cb0f8854f931ff82fdf6ddfbd72a9c933e" dependencies = [ "typed-builder-macro", ] [[package]] name = "typed-builder-macro" -version = "0.18.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982ee4197351b5c9782847ef5ec1fdcaf50503fb19d68f9771adae314e72b492" +checksum = "563b3b88238ec95680aef36bdece66896eaa7ce3c0f1b4f39d38fb2435261352" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.58", ] [[package]] @@ -4928,9 +4946,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-id" @@ -4946,18 +4964,18 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" @@ -5021,9 +5039,9 @@ checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" [[package]] name = "uuid" -version = "1.6.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ "getrandom", "serde", @@ -5037,9 +5055,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "value-bag" -version = "1.4.2" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a72e1902dde2bd6441347de2b70b7f5d59bf157c6c62f0c44572607a1d55bbe" +checksum = "74797339c3b98616c009c7c3eb53a0ce41e85c8ec66bd3db96ed132d20cfdee8" [[package]] name = "vcpkg" @@ -5074,11 +5092,17 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "wasite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" + [[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -5086,24 +5110,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.58", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.39" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -5113,9 +5137,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5123,28 +5147,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.58", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-streams" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" dependencies = [ "futures-util", "js-sys", @@ -5155,9 +5179,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.66" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -5165,15 +5189,19 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.3" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "whoami" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" +checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" +dependencies = [ + "redox_syscall 0.4.1", + "wasite", +] [[package]] name = "winapi" @@ -5208,11 +5236,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-core" -version = "0.51.1" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.48.5", + "windows-targets 0.52.4", ] [[package]] @@ -5230,7 +5258,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.4", ] [[package]] @@ -5250,17 +5278,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.4", + "windows_aarch64_msvc 0.52.4", + "windows_i686_gnu 0.52.4", + "windows_i686_msvc 0.52.4", + "windows_x86_64_gnu 0.52.4", + "windows_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", ] [[package]] @@ -5271,9 +5299,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" [[package]] name = "windows_aarch64_msvc" @@ -5283,9 +5311,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" [[package]] name = "windows_i686_gnu" @@ -5295,9 +5323,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" [[package]] name = "windows_i686_msvc" @@ -5307,9 +5335,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" [[package]] name = "windows_x86_64_gnu" @@ -5319,9 +5347,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" [[package]] name = "windows_x86_64_gnullvm" @@ -5331,9 +5359,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" [[package]] name = "windows_x86_64_msvc" @@ -5343,9 +5371,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" [[package]] name = "winreg" @@ -5386,11 +5414,13 @@ dependencies = [ [[package]] name = "xattr" -version = "1.0.1" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", + "linux-raw-sys 0.4.13", + "rustix 0.38.32", ] [[package]] @@ -5410,22 +5440,22 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.29" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d075cf85bbb114e933343e087b92f2146bac0d55b534cbb8188becf0039948e" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.29" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86cd5ca076997b97ef09d3ad65efe811fa68c9e874cb636ccb211223a813b0c2" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.58", ] [[package]] @@ -5445,5 +5475,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.51", + "syn 2.0.58", ] diff --git a/Cargo.toml b/Cargo.toml new file mode 100644 index 00000000..b3df016c --- /dev/null +++ b/Cargo.toml @@ -0,0 +1,3 @@ +[workspace] +members = ["api"] +resolver = "2" diff --git a/api/.sqlx/query-0e6dd3ede4bdfce988312da85903bff95d7aaa36df839fe59cbb12a2752f67b1.json b/api/.sqlx/query-5c2db2f89be685fa37d4ff432e2743ec7e72301f00cf20da8dcbdf0f6c1b5a7b.json similarity index 88% rename from api/.sqlx/query-0e6dd3ede4bdfce988312da85903bff95d7aaa36df839fe59cbb12a2752f67b1.json rename to api/.sqlx/query-5c2db2f89be685fa37d4ff432e2743ec7e72301f00cf20da8dcbdf0f6c1b5a7b.json index b4834878..0ac85d2d 100644 --- a/api/.sqlx/query-0e6dd3ede4bdfce988312da85903bff95d7aaa36df839fe59cbb12a2752f67b1.json +++ b/api/.sqlx/query-5c2db2f89be685fa37d4ff432e2743ec7e72301f00cf20da8dcbdf0f6c1b5a7b.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "SELECT scope as \"scope: ScopeName\", name as \"name: PackageName\", version as \"version: Version\", user_id, readme_path as \"readme_path: PackagePath\", exports as \"exports: ExportsMap\", is_yanked, uses_npm, meta as \"meta: PackageVersionMeta\", updated_at, created_at, rekor_log_id,\n (SELECT COUNT(*)\n FROM package_versions AS pv\n WHERE pv.scope = package_versions.scope\n AND pv.name = package_versions.name\n AND pv.version > package_versions.version\n AND pv.version NOT LIKE '%-%' \n AND pv.is_yanked = false) as \"newer_versions_count!\"\n FROM package_versions\n ORDER BY package_versions.created_at DESC\n LIMIT 10", + "query": "SELECT scope as \"scope: ScopeName\", name as \"name: PackageName\", version as \"version: Version\", user_id, readme_path as \"readme_path: PackagePath\", exports as \"exports: ExportsMap\", is_yanked, uses_npm, meta as \"meta: PackageVersionMeta\", updated_at, created_at, rekor_log_id,\n (SELECT COUNT(*)\n FROM package_versions AS pv\n WHERE pv.scope = package_versions.scope\n AND pv.name = package_versions.name\n AND pv.version > package_versions.version\n AND pv.version NOT LIKE '%-%'\n AND pv.is_yanked = false) as \"newer_versions_count!\"\n FROM package_versions\n ORDER BY package_versions.created_at DESC\n LIMIT 10", "describe": { "columns": [ { @@ -88,5 +88,5 @@ null ] }, - "hash": "0e6dd3ede4bdfce988312da85903bff95d7aaa36df839fe59cbb12a2752f67b1" + "hash": "5c2db2f89be685fa37d4ff432e2743ec7e72301f00cf20da8dcbdf0f6c1b5a7b" } diff --git a/api/.sqlx/query-550c1ad3db389ecf92d8ef177537afb949ca1a2fc78e7e1456db4582108585ca.json b/api/.sqlx/query-6a73440cf021ba8a89228bba025b4b2484d908ff259248819f0335e11df0d40d.json similarity index 86% rename from api/.sqlx/query-550c1ad3db389ecf92d8ef177537afb949ca1a2fc78e7e1456db4582108585ca.json rename to api/.sqlx/query-6a73440cf021ba8a89228bba025b4b2484d908ff259248819f0335e11df0d40d.json index 7e1cd80f..dd4b951e 100644 --- a/api/.sqlx/query-550c1ad3db389ecf92d8ef177537afb949ca1a2fc78e7e1456db4582108585ca.json +++ b/api/.sqlx/query-6a73440cf021ba8a89228bba025b4b2484d908ff259248819f0335e11df0d40d.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "SELECT scope as \"scope: ScopeName\", name as \"name: PackageName\", version as \"version: Version\", user_id, readme_path as \"readme_path: PackagePath\", exports as \"exports: ExportsMap\", is_yanked, uses_npm, meta as \"meta: PackageVersionMeta\", updated_at, created_at, rekor_log_id,\n (SELECT COUNT(*)\n FROM package_versions AS pv\n WHERE pv.scope = package_versions.scope\n AND pv.name = package_versions.name\n AND pv.version > package_versions.version\n AND pv.version NOT LIKE '%-%' \n AND pv.is_yanked = false) as \"newer_versions_count!\"\n FROM package_versions\n WHERE scope = $1 AND name = $2 AND version NOT LIKE '%-%' AND is_yanked = false\n ORDER BY version DESC\n LIMIT 1", + "query": "SELECT scope as \"scope: ScopeName\", name as \"name: PackageName\", version as \"version: Version\", user_id, readme_path as \"readme_path: PackagePath\", exports as \"exports: ExportsMap\", is_yanked, uses_npm, meta as \"meta: PackageVersionMeta\", updated_at, created_at, rekor_log_id,\n (SELECT COUNT(*)\n FROM package_versions AS pv\n WHERE pv.scope = package_versions.scope\n AND pv.name = package_versions.name\n AND pv.version > package_versions.version\n AND pv.version NOT LIKE '%-%'\n AND pv.is_yanked = false) as \"newer_versions_count!\"\n FROM package_versions\n WHERE scope = $1 AND name = $2 AND version NOT LIKE '%-%' AND is_yanked = false\n ORDER BY version DESC\n LIMIT 1", "describe": { "columns": [ { @@ -91,5 +91,5 @@ null ] }, - "hash": "550c1ad3db389ecf92d8ef177537afb949ca1a2fc78e7e1456db4582108585ca" + "hash": "6a73440cf021ba8a89228bba025b4b2484d908ff259248819f0335e11df0d40d" } diff --git a/api/.sqlx/query-ffae1c91f5fe90290d9ac7cd911011a8dcf923811cda3571e5e3405ab655cfaf.json b/api/.sqlx/query-a5487c56ddaf5cb082ef1676e76145995c4594a96cc563ba740f492cebc1ef2d.json similarity index 93% rename from api/.sqlx/query-ffae1c91f5fe90290d9ac7cd911011a8dcf923811cda3571e5e3405ab655cfaf.json rename to api/.sqlx/query-a5487c56ddaf5cb082ef1676e76145995c4594a96cc563ba740f492cebc1ef2d.json index 2b2fe96a..bb598db5 100644 --- a/api/.sqlx/query-ffae1c91f5fe90290d9ac7cd911011a8dcf923811cda3571e5e3405ab655cfaf.json +++ b/api/.sqlx/query-a5487c56ddaf5cb082ef1676e76145995c4594a96cc563ba740f492cebc1ef2d.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "UPDATE package_versions\n SET is_yanked = $4\n WHERE scope = $1 AND name = $2 AND version = $3\n RETURNING scope as \"scope: ScopeName\", name as \"name: PackageName\", version as \"version: Version\", user_id, readme_path as \"readme_path: PackagePath\", exports as \"exports: ExportsMap\", is_yanked, uses_npm, meta as \"meta: PackageVersionMeta\", updated_at, created_at, rekor_log_id,\n (SELECT COUNT(*)\n FROM package_versions AS pv\n WHERE pv.scope = package_versions.scope\n AND pv.name = package_versions.name\n AND pv.version > package_versions.version\n AND pv.version NOT LIKE '%-%' \n AND pv.is_yanked = false) as \"newer_versions_count!\"", + "query": "UPDATE package_versions\n SET is_yanked = $4\n WHERE scope = $1 AND name = $2 AND version = $3\n RETURNING scope as \"scope: ScopeName\", name as \"name: PackageName\", version as \"version: Version\", user_id, readme_path as \"readme_path: PackagePath\", exports as \"exports: ExportsMap\", is_yanked, uses_npm, meta as \"meta: PackageVersionMeta\", updated_at, created_at, rekor_log_id,\n (SELECT COUNT(*)\n FROM package_versions AS pv\n WHERE pv.scope = package_versions.scope\n AND pv.name = package_versions.name\n AND pv.version > package_versions.version\n AND pv.version NOT LIKE '%-%'\n AND pv.is_yanked = false) as \"newer_versions_count!\"", "describe": { "columns": [ { @@ -93,5 +93,5 @@ null ] }, - "hash": "ffae1c91f5fe90290d9ac7cd911011a8dcf923811cda3571e5e3405ab655cfaf" + "hash": "a5487c56ddaf5cb082ef1676e76145995c4594a96cc563ba740f492cebc1ef2d" } diff --git a/api/.sqlx/query-9c0ca21173e6b3ef3cb7d75177ffb67340c698556b534aec3ef63b0756b02684.json b/api/.sqlx/query-de9115d3a35b0a249ca92a1da52680f6d1a7f65f63d01a0aba4158e003d78277.json similarity index 85% rename from api/.sqlx/query-9c0ca21173e6b3ef3cb7d75177ffb67340c698556b534aec3ef63b0756b02684.json rename to api/.sqlx/query-de9115d3a35b0a249ca92a1da52680f6d1a7f65f63d01a0aba4158e003d78277.json index d6bcddb3..4b9aad7f 100644 --- a/api/.sqlx/query-9c0ca21173e6b3ef3cb7d75177ffb67340c698556b534aec3ef63b0756b02684.json +++ b/api/.sqlx/query-de9115d3a35b0a249ca92a1da52680f6d1a7f65f63d01a0aba4158e003d78277.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "SELECT package_versions.scope as \"package_version_scope: ScopeName\", package_versions.name as \"package_version_name: PackageName\", package_versions.version as \"package_version_version: Version\", package_versions.user_id as \"package_version_user_id\", package_versions.readme_path as \"package_version_readme_path: PackagePath\", package_versions.exports as \"package_version_exports: ExportsMap\", package_versions.is_yanked as \"package_version_is_yanked\", package_versions.uses_npm as \"package_version_uses_npm\", package_versions.meta as \"package_version_meta: PackageVersionMeta\", package_versions.updated_at as \"package_version_updated_at\", package_versions.created_at as \"package_version_created_at\", package_versions.rekor_log_id as \"package_version_rekor_log_id\",\n (SELECT COUNT(*)\n FROM package_versions AS pv\n WHERE pv.scope = package_versions.scope\n AND pv.name = package_versions.name\n AND pv.version > package_versions.version\n AND pv.version NOT LIKE '%-%' \n AND pv.is_yanked = false) as \"package_version_newer_versions_count!\",\n users.id as \"user_id?\", users.name as \"user_name?\", users.avatar_url as \"user_avatar_url?\", users.github_id as \"user_github_id\", users.updated_at as \"user_updated_at?\", users.created_at as \"user_created_at?\"\n FROM package_versions\n LEFT JOIN users ON package_versions.user_id = users.id\n WHERE package_versions.scope = $1 AND package_versions.name = $2\n ORDER BY package_versions.version DESC", + "query": "SELECT package_versions.scope as \"package_version_scope: ScopeName\", package_versions.name as \"package_version_name: PackageName\", package_versions.version as \"package_version_version: Version\", package_versions.user_id as \"package_version_user_id\", package_versions.readme_path as \"package_version_readme_path: PackagePath\", package_versions.exports as \"package_version_exports: ExportsMap\", package_versions.is_yanked as \"package_version_is_yanked\", package_versions.uses_npm as \"package_version_uses_npm\", package_versions.meta as \"package_version_meta: PackageVersionMeta\", package_versions.updated_at as \"package_version_updated_at\", package_versions.created_at as \"package_version_created_at\", package_versions.rekor_log_id as \"package_version_rekor_log_id\",\n (SELECT COUNT(*)\n FROM package_versions AS pv\n WHERE pv.scope = package_versions.scope\n AND pv.name = package_versions.name\n AND pv.version > package_versions.version\n AND pv.version NOT LIKE '%-%'\n AND pv.is_yanked = false) as \"package_version_newer_versions_count!\",\n users.id as \"user_id?\", users.name as \"user_name?\", users.avatar_url as \"user_avatar_url?\", users.github_id as \"user_github_id\", users.updated_at as \"user_updated_at?\", users.created_at as \"user_created_at?\"\n FROM package_versions\n LEFT JOIN users ON package_versions.user_id = users.id\n WHERE package_versions.scope = $1 AND package_versions.name = $2\n ORDER BY package_versions.version DESC", "describe": { "columns": [ { @@ -127,5 +127,5 @@ false ] }, - "hash": "9c0ca21173e6b3ef3cb7d75177ffb67340c698556b534aec3ef63b0756b02684" + "hash": "de9115d3a35b0a249ca92a1da52680f6d1a7f65f63d01a0aba4158e003d78277" } diff --git a/api/.sqlx/query-47e5a593181b18d95c8db1d4fdc79bf88965488b43f3b72becaefec2aea64ba2.json b/api/.sqlx/query-df36e0b2648c0861a60a7e7e303febaa5550a133fa10a6dc3f838bf38eb574a1.json similarity index 92% rename from api/.sqlx/query-47e5a593181b18d95c8db1d4fdc79bf88965488b43f3b72becaefec2aea64ba2.json rename to api/.sqlx/query-df36e0b2648c0861a60a7e7e303febaa5550a133fa10a6dc3f838bf38eb574a1.json index 1891409d..56f8bcf8 100644 --- a/api/.sqlx/query-47e5a593181b18d95c8db1d4fdc79bf88965488b43f3b72becaefec2aea64ba2.json +++ b/api/.sqlx/query-df36e0b2648c0861a60a7e7e303febaa5550a133fa10a6dc3f838bf38eb574a1.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "INSERT INTO package_versions (scope, name, version, user_id, readme_path, exports, uses_npm, meta)\n VALUES ($1, $2, $3, $4, $5, $6, $7, $8)\n RETURNING scope as \"scope: ScopeName\", name as \"name: PackageName\", version as \"version: Version\", user_id, readme_path as \"readme_path: PackagePath\", exports as \"exports: ExportsMap\", is_yanked, uses_npm, meta as \"meta: PackageVersionMeta\", updated_at, created_at, rekor_log_id,\n (SELECT COUNT(*)\n FROM package_versions AS pv\n WHERE pv.scope = package_versions.scope\n AND pv.name = package_versions.name\n AND pv.version > package_versions.version\n AND pv.version NOT LIKE '%-%' \n AND pv.is_yanked = false) as \"newer_versions_count!\"", + "query": "INSERT INTO package_versions (scope, name, version, user_id, readme_path, exports, uses_npm, meta)\n VALUES ($1, $2, $3, $4, $5, $6, $7, $8)\n RETURNING scope as \"scope: ScopeName\", name as \"name: PackageName\", version as \"version: Version\", user_id, readme_path as \"readme_path: PackagePath\", exports as \"exports: ExportsMap\", is_yanked, uses_npm, meta as \"meta: PackageVersionMeta\", updated_at, created_at, rekor_log_id,\n (SELECT COUNT(*)\n FROM package_versions AS pv\n WHERE pv.scope = package_versions.scope\n AND pv.name = package_versions.name\n AND pv.version > package_versions.version\n AND pv.version NOT LIKE '%-%'\n AND pv.is_yanked = false) as \"newer_versions_count!\"", "describe": { "columns": [ { @@ -97,5 +97,5 @@ null ] }, - "hash": "47e5a593181b18d95c8db1d4fdc79bf88965488b43f3b72becaefec2aea64ba2" + "hash": "df36e0b2648c0861a60a7e7e303febaa5550a133fa10a6dc3f838bf38eb574a1" } diff --git a/api/.sqlx/query-8ef29f5232895fb9ba149de2dade639b865d5f6208bc4d2d3838cc251d938ae8.json b/api/.sqlx/query-ee3af188f67594cc9d2c49bacea032576b34e13590d12ecb7ce6f92698eeb2a5.json similarity index 89% rename from api/.sqlx/query-8ef29f5232895fb9ba149de2dade639b865d5f6208bc4d2d3838cc251d938ae8.json rename to api/.sqlx/query-ee3af188f67594cc9d2c49bacea032576b34e13590d12ecb7ce6f92698eeb2a5.json index 80493c69..764ddbc0 100644 --- a/api/.sqlx/query-8ef29f5232895fb9ba149de2dade639b865d5f6208bc4d2d3838cc251d938ae8.json +++ b/api/.sqlx/query-ee3af188f67594cc9d2c49bacea032576b34e13590d12ecb7ce6f92698eeb2a5.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "SELECT scope as \"scope: ScopeName\", name as \"name: PackageName\", version as \"version: Version\", user_id, readme_path as \"readme_path: PackagePath\", exports as \"exports: ExportsMap\", is_yanked, uses_npm, meta as \"meta: PackageVersionMeta\", updated_at, created_at, rekor_log_id,\n (SELECT COUNT(*)\n FROM package_versions AS pv\n WHERE pv.scope = package_versions.scope\n AND pv.name = package_versions.name\n AND pv.version > package_versions.version\n AND pv.version NOT LIKE '%-%' \n AND pv.is_yanked = false) as \"newer_versions_count!\"\n FROM package_versions\n WHERE scope = $1 AND name = $2 AND version = $3", + "query": "SELECT scope as \"scope: ScopeName\", name as \"name: PackageName\", version as \"version: Version\", user_id, readme_path as \"readme_path: PackagePath\", exports as \"exports: ExportsMap\", is_yanked, uses_npm, meta as \"meta: PackageVersionMeta\", updated_at, created_at, rekor_log_id,\n (SELECT COUNT(*)\n FROM package_versions AS pv\n WHERE pv.scope = package_versions.scope\n AND pv.name = package_versions.name\n AND pv.version > package_versions.version\n AND pv.version NOT LIKE '%-%'\n AND pv.is_yanked = false) as \"newer_versions_count!\"\n FROM package_versions\n WHERE scope = $1 AND name = $2 AND version = $3", "describe": { "columns": [ { @@ -92,5 +92,5 @@ null ] }, - "hash": "8ef29f5232895fb9ba149de2dade639b865d5f6208bc4d2d3838cc251d938ae8" + "hash": "ee3af188f67594cc9d2c49bacea032576b34e13590d12ecb7ce6f92698eeb2a5" } diff --git a/api/Cargo.toml b/api/Cargo.toml index ec57554a..79b229a4 100644 --- a/api/Cargo.toml +++ b/api/Cargo.toml @@ -78,9 +78,9 @@ deno_semver = "0.5.2" flate2 = "1" thiserror = "1" async-tar = "0.4.2" -deno_graph = "0.72.0" -deno_ast = "0.37.0" -deno_doc = { version = "0.124.0", features = ["tree-sitter"] } +deno_graph = "0.73.1" +deno_ast = "0.37.1" +deno_doc = { version = "0.128.0", features = ["tree-sitter"] } comrak = { version = "0.20.0", default-features = false } async-trait = "0.1.73" jsonwebkey = { version = "0.3.5", features = ["jsonwebtoken", "jwt-convert"] } @@ -100,6 +100,3 @@ sitemap-rs = "0.2.1" [dev-dependencies] flate2 = "1" deno_semver = "0.5.1" - -[patch.crates-io] -deno_graph = { git = "https://github.com/denoland/deno_graph", rev = "d179f32b6879770119a00e408d9452567f0bbee8" } diff --git a/api/src/analysis.rs b/api/src/analysis.rs index 443eb84f..9f1dac4c 100644 --- a/api/src/analysis.rs +++ b/api/src/analysis.rs @@ -139,7 +139,7 @@ async fn analyze_package_inner( let diagnostics = graph .build( roots.clone(), - &mut SyncLoader { files: &files }, + &SyncLoader { files: &files }, BuildOptions { is_dynamic: false, module_analyzer: &module_analyzer, @@ -364,7 +364,7 @@ struct SyncLoader<'a> { impl<'a> SyncLoader<'a> { fn load_sync( - &mut self, + &self, specifier: &ModuleSpecifier, ) -> deno_graph::source::LoadResult { match specifier.scheme() { @@ -394,7 +394,7 @@ impl<'a> SyncLoader<'a> { impl<'a> deno_graph::source::Loader for SyncLoader<'a> { fn load( - &mut self, + &self, specifier: &ModuleSpecifier, _options: LoadOptions, ) -> deno_graph::source::LoadFuture { @@ -474,7 +474,7 @@ async fn rebuild_npm_tarball_inner( let diagnostics = graph .build( roots.clone(), - &mut GcsLoader { + &GcsLoader { files: &files, bucket: &modules_bucket, scope: &scope, @@ -538,7 +538,7 @@ struct GcsLoader<'a> { impl<'a> GcsLoader<'a> { fn load_inner( - &mut self, + &self, specifier: &ModuleSpecifier, ) -> deno_graph::source::LoadFuture { let specifier = specifier.clone(); @@ -579,7 +579,7 @@ impl<'a> GcsLoader<'a> { impl<'a> deno_graph::source::Loader for GcsLoader<'a> { fn load( - &mut self, + &self, specifier: &ModuleSpecifier, _options: LoadOptions, ) -> deno_graph::source::LoadFuture { diff --git a/api/src/api/package.rs b/api/src/api/package.rs index bf534ae5..b98019b6 100644 --- a/api/src/api/package.rs +++ b/api/src/api/package.rs @@ -1013,28 +1013,14 @@ pub async fn get_docs_handler( .ok_or(ApiError::EntrypointOrSymbolNotFound)?; match docs { - GeneratedDocsOutput::Docs(docs) => { - const FIXED_SCRIPT: &str = r#" -document.addEventListener("click", (e) => { - let el = e.target; - do { - if (el instanceof HTMLButtonElement && el.dataset["copy"]) { - navigator?.clipboard?.writeText(el.dataset["copy"]); - return; - } - } while (el = el.parentElement); -}); - "#; - - Ok(ApiPackageVersionDocs::Content { - css: Cow::Borrowed(deno_doc::html::STYLESHEET), - script: Cow::Borrowed(FIXED_SCRIPT), - breadcrumbs: docs.breadcrumbs, - sidepanel: docs.sidepanel, - main: docs.main, - version: ApiPackageVersion::from(version), - }) - } + GeneratedDocsOutput::Docs(docs) => Ok(ApiPackageVersionDocs::Content { + css: Cow::Borrowed(deno_doc::html::STYLESHEET), + script: Cow::Borrowed(deno_doc::html::SCRIPT_JS), + breadcrumbs: docs.breadcrumbs, + sidepanel: docs.sidepanel, + main: docs.main, + version: ApiPackageVersion::from(version), + }), GeneratedDocsOutput::Redirect(href) => { Ok(ApiPackageVersionDocs::Redirect { symbol: href }) } @@ -1094,7 +1080,7 @@ pub async fn get_docs_search_handler( let registry_url = req.data::().unwrap().0.to_string(); let ctx = crate::docs::get_generate_ctx( - &doc_nodes, + doc_nodes, docs_info.main_entrypoint, docs_info.rewrite_map, scope.clone(), @@ -1106,10 +1092,7 @@ pub async fn get_docs_search_handler( registry_url, ); - let search_index = deno_doc::html::generate_search_index( - &ctx, - &ctx.doc_nodes_by_url_add_context(doc_nodes), - ); + let search_index = deno_doc::html::generate_search_index(&ctx); Ok(search_index) } @@ -2507,7 +2490,7 @@ ggHohNAjhbzDaY2iBW/m3NC5dehGUP4T2GBo/cwGhg== let search: serde_json::Value = resp.expect_ok().await; assert_eq!( search, - json!({"nodes":[{"kind":["variable"],"name":"hello","file":".","location":{"filename":"","line":10,"col":13,"byteIndex":99},"declarationKind":"export","deprecated":false}]}), + json!({"nodes":[{"kind":["variable"],"name":"hello","file":".","location":{"filename":"default","line":10,"col":13,"byteIndex":99},"declarationKind":"export","deprecated":false}]}), ); // symbol doesn't exist diff --git a/api/src/db/database.rs b/api/src/db/database.rs index 30c29633..69354939 100644 --- a/api/src/db/database.rs +++ b/api/src/db/database.rs @@ -1161,7 +1161,7 @@ impl Database { WHERE pv.scope = package_versions.scope AND pv.name = package_versions.name AND pv.version > package_versions.version - AND pv.version NOT LIKE '%-%' + AND pv.version NOT LIKE '%-%' AND pv.is_yanked = false) as "newer_versions_count!" FROM package_versions ORDER BY package_versions.created_at DESC @@ -1304,7 +1304,7 @@ impl Database { WHERE pv.scope = package_versions.scope AND pv.name = package_versions.name AND pv.version > package_versions.version - AND pv.version NOT LIKE '%-%' + AND pv.version NOT LIKE '%-%' AND pv.is_yanked = false) as "package_version_newer_versions_count!", users.id as "user_id?", users.name as "user_name?", users.avatar_url as "user_avatar_url?", users.github_id as "user_github_id", users.updated_at as "user_updated_at?", users.created_at as "user_created_at?" FROM package_versions @@ -1370,7 +1370,7 @@ impl Database { WHERE pv.scope = package_versions.scope AND pv.name = package_versions.name AND pv.version > package_versions.version - AND pv.version NOT LIKE '%-%' + AND pv.version NOT LIKE '%-%' AND pv.is_yanked = false) as "newer_versions_count!" FROM package_versions WHERE scope = $1 AND name = $2 AND version NOT LIKE '%-%' AND is_yanked = false @@ -1398,7 +1398,7 @@ impl Database { WHERE pv.scope = package_versions.scope AND pv.name = package_versions.name AND pv.version > package_versions.version - AND pv.version NOT LIKE '%-%' + AND pv.version NOT LIKE '%-%' AND pv.is_yanked = false) as "newer_versions_count!" FROM package_versions WHERE scope = $1 AND name = $2 AND version = $3"#, @@ -1512,7 +1512,7 @@ impl Database { WHERE pv.scope = package_versions.scope AND pv.name = package_versions.name AND pv.version > package_versions.version - AND pv.version NOT LIKE '%-%' + AND pv.version NOT LIKE '%-%' AND pv.is_yanked = false) as "newer_versions_count!""#, new_package_version.scope as _, new_package_version.name as _, @@ -1546,7 +1546,7 @@ impl Database { WHERE pv.scope = package_versions.scope AND pv.name = package_versions.name AND pv.version > package_versions.version - AND pv.version NOT LIKE '%-%' + AND pv.version NOT LIKE '%-%' AND pv.is_yanked = false) as "newer_versions_count!""#, scope as _, name as _, diff --git a/api/src/docs.rs b/api/src/docs.rs index 23558e15..d1c8f1e3 100644 --- a/api/src/docs.rs +++ b/api/src/docs.rs @@ -14,6 +14,7 @@ use deno_doc::html::GenerateCtx; use deno_doc::html::HrefResolver; use deno_doc::html::ShortPath; use deno_doc::html::UrlResolveKind; +use deno_doc::html::UsageComposerEntry; use deno_doc::DocNode; use deno_doc::DocNodeKind; use deno_doc::Location; @@ -131,17 +132,18 @@ fn get_url_rewriter( base: String, is_readme: bool, ) -> deno_doc::html::comrak_adapters::URLRewriter { - Arc::new(move |current_specifier, url| { + Arc::new(move |current_file, url| { if url.starts_with('#') || url.starts_with('/') { return url.to_string(); } if !is_readme { - if let Some(current_specifier) = current_specifier { - let (path, _file) = current_specifier + if let Some(current_file) = current_file { + let (path, _file) = current_file + .specifier .path() .rsplit_once('/') - .unwrap_or((current_specifier.path(), "")); + .unwrap_or((current_file.specifier.path(), "")); return format!("{base}{path}/{url}"); } } @@ -167,7 +169,7 @@ fn get_url_rewriter( ) )] pub fn get_generate_ctx<'a, 'ctx>( - doc_nodes_by_url: &'a DocNodesByUrl, + doc_nodes_by_url: DocNodesByUrl, main_entrypoint: Option, rewrite_map: IndexMap, scope: ScopeName, @@ -178,83 +180,114 @@ pub fn get_generate_ctx<'a, 'ctx>( runtime_compat: RuntimeCompat, registry_url: String, ) -> GenerateCtx<'ctx> { - let url_rewriter_base = format!("/@{scope}/{package}/{version}"); + let package_name = format!("@{scope}/{package}"); + let url_rewriter_base = format!("/{package_name}/{version}"); + + let mut generate_ctx = GenerateCtx::new( + deno_doc::html::GenerateOptions { + package_name: Some(package_name), + main_entrypoint, + href_resolver: Rc::new(DocResolver { + scope: scope.clone(), + package: package.clone(), + version, + version_is_latest, + registry_url, + deno_types: DENO_TYPES + .get_or_init(|| { + serde_json::from_str(include_str!("./docs/deno_types.json")) + .unwrap() + }) + .clone(), + web_types: WEB_TYPES + .get_or_init(|| { + serde_json::from_str::>(include_str!( + "./docs/web_builtins.json" + )) + .unwrap() + .into_iter() + .map(|web_type| (web_type.id, web_type.docs)) + .collect() + }) + .clone(), + }), + usage_composer: Some(Rc::new(move |ctx, doc_nodes, url| { + let mut map = IndexMap::new(); + let scoped_name = format!("@{scope}/{package}"); + + if !runtime_compat.deno.is_some_and(|compat| !compat) { + let import = deno_doc::html::usage_to_md(ctx, doc_nodes, &url); + map.insert( + UsageComposerEntry { + name: "Deno".to_string(), + icon: Some( + r#"deno logo"#.into(), + ), + }, + format!("```\ndeno add {scoped_name}\n```\n{import}"), + ); + } - GenerateCtx { - package_name: None, - common_ancestor: None, - main_entrypoint, - specifiers: doc_nodes_by_url.keys().cloned().collect(), - hbs: deno_doc::html::setup_hbs().unwrap(), - highlight_adapter: deno_doc::html::setup_highlighter(false), - url_rewriter: Some(get_url_rewriter(url_rewriter_base, has_readme)), - href_resolver: Rc::new(DocResolver { - scope: scope.clone(), - package: package.clone(), - version, - version_is_latest, - registry_url, - deno_types: DENO_TYPES - .get_or_init(|| { - serde_json::from_str(include_str!("./docs/deno_types.json")).unwrap() - }) - .clone(), - web_types: WEB_TYPES - .get_or_init(|| { - serde_json::from_str::>(include_str!( - "./docs/web_builtins.json" - )) - .unwrap() - .into_iter() - .map(|web_type| (web_type.id, web_type.docs)) - .collect() - }) - .clone(), - }), - usage_composer: Some(Rc::new(move |ctx, doc_nodes, url| { - let mut map = IndexMap::new(); - let scoped_name = format!("@{scope}/{package}"); - - if !runtime_compat.deno.is_some_and(|compat| !compat) { - let import = deno_doc::html::usage_to_md(ctx, doc_nodes, &url); - map.insert( - "Deno".to_string(), - format!("```\ndeno add {scoped_name}\n```\n{import}"), - ); - } + if !runtime_compat.node.is_some_and(|compat| !compat) { + let import = deno_doc::html::usage_to_md(ctx, doc_nodes, &url); + map.insert( + UsageComposerEntry { + name: "npm".to_string(), + icon: Some( + r#"npm logo"#.into(), + ), + }, + format!("```\nnpx jsr add {scoped_name}\n```\n{import}"), + ); + map.insert( + UsageComposerEntry { + name: "Yarn".to_string(), + icon: Some( + r#"yarn logo"#.into(), + ), + }, + format!("```\nyarn dlx jsr add {scoped_name}\n```\n{import}"), + ); + map.insert( + UsageComposerEntry { + name: "pnpm".to_string(), + icon: Some( + r#"pnpm logo"#.into(), + ), + }, + format!("```\npnpm dlx jsr add {scoped_name}\n```\n{import}"), + ); + } - if !runtime_compat.node.is_some_and(|compat| !compat) { - let import = deno_doc::html::usage_to_md(ctx, doc_nodes, &url); - map.insert( - "npm".to_string(), - format!("```\nnpx jsr add {scoped_name}\n```\n{import}"), - ); - map.insert( - "Yarn".to_string(), - format!("```\nyarn dlx jsr add {scoped_name}\n```\n{import}"), - ); - map.insert( - "pnpm".to_string(), - format!("```\npnpm dlx jsr add {scoped_name}\n```\n{import}"), - ); - } + if !runtime_compat.bun.is_some_and(|compat| !compat) { + let import = deno_doc::html::usage_to_md(ctx, doc_nodes, &url); + map.insert( + UsageComposerEntry { + name: "Bun".to_string(), + icon: Some( + r#"bun logo"#.into(), + ), + }, + format!("```\nbunx jsr add {scoped_name}\n```\n{import}"), + ); + } - if !runtime_compat.bun.is_some_and(|compat| !compat) { - let import = deno_doc::html::usage_to_md(ctx, doc_nodes, &url); - map.insert( - "Bun".to_string(), - format!("```\nbunx jsr add {scoped_name}\n```\n{import}"), - ); - } + map + })), + rewrite_map: Some(rewrite_map), + composable_output: false, + }, + None, + deno_doc::html::FileMode::Normal, + doc_nodes_by_url, + ) + .unwrap(); - map - })), - rewrite_map: Some(rewrite_map), - hide_module_doc_title: true, - single_file_mode: false, - sidebar_hide_all_symbols: true, - sidebar_flatten_namespaces: false, - } + generate_ctx.url_rewriter = + Some(get_url_rewriter(url_rewriter_base, has_readme)); + generate_ctx.sidebar_hide_all_symbols = true; + + generate_ctx } #[allow(clippy::too_many_arguments)] @@ -277,7 +310,7 @@ pub fn generate_docs_html( registry_url: String, ) -> Result, anyhow::Error> { let ctx = get_generate_ctx( - &doc_nodes_by_url, + doc_nodes_by_url, main_entrypoint, rewrite_map, scope, @@ -289,32 +322,41 @@ pub fn generate_docs_html( registry_url, ); - let doc_nodes_by_url = ctx.doc_nodes_by_url_add_context(doc_nodes_by_url); - match req { DocsRequest::AllSymbols => { let render_ctx = deno_doc::html::RenderContext::new( &ctx, &[], UrlResolveKind::AllSymbols, - None, ); - let all_doc_nodes = doc_nodes_by_url + let all_doc_nodes = ctx + .doc_nodes .values() .flatten() .cloned() .collect::>(); let partitions_by_kind = - deno_doc::html::partition::partition_nodes_by_kind( + deno_doc::html::partition::partition_nodes_by_entrypoint( &all_doc_nodes, true, ); let sections = deno_doc::html::namespace::render_namespace( &render_ctx, - partitions_by_kind, + partitions_by_kind + .into_iter() + .map(|(path, nodes)| { + ( + deno_doc::html::SectionHeaderCtx::new_for_namespace( + &render_ctx, + &path, + ), + nodes, + ) + }) + .collect(), ); let breadcrumbs = ctx @@ -340,39 +382,40 @@ pub fn generate_docs_html( }))) } DocsRequest::Index => { - let doc_nodes = ctx - .main_entrypoint - .as_ref() - .and_then(|specifier| doc_nodes_by_url.get(specifier).map(|v| &**v)) - .unwrap_or(&[]); + let main_entrypoint = ctx + .doc_nodes + .iter() + .find(|(short_path, _)| short_path.is_main); + + let doc_nodes = main_entrypoint + .map(|(_, nodes)| nodes.as_slice()) + .unwrap_or_default(); let render_ctx = deno_doc::html::RenderContext::new( &ctx, doc_nodes, UrlResolveKind::Root, - ctx.main_entrypoint.as_ref(), ); - let mut index_module_doc = ctx - .main_entrypoint + let mut index_module_doc = main_entrypoint .as_ref() - .map(|main_entrypoint| { - deno_doc::html::jsdoc::ModuleDocCtx::new( - &render_ctx, - main_entrypoint, - &doc_nodes_by_url, - ) + .map(|(short_path, _)| { + deno_doc::html::jsdoc::ModuleDocCtx::new(&render_ctx, short_path) }) .unwrap_or_default(); + if index_module_doc.sections.docs.is_none() { let markdown = readme .as_ref() - .map(|readme| { + .and_then(|readme| { deno_doc::html::jsdoc::markdown_to_html( &render_ctx, readme, - false, - true, + deno_doc::html::jsdoc::MarkdownToHTMLOptions { + summary: false, + summary_prefer_title: false, + render_toc: true, + }, ) }) .unwrap_or(deno_doc::html::jsdoc::Markdown { @@ -385,16 +428,15 @@ pub fn generate_docs_html( } let partitions_for_main_entrypoint = - deno_doc::html::partition::get_partitions_for_main_entrypoint( - &ctx, - &doc_nodes_by_url, - ); + if let Some((_, doc_nodes)) = main_entrypoint { + deno_doc::html::partition::get_partitions_for_file(&ctx, doc_nodes) + } else { + Default::default() + }; let index_sidepanel = deno_doc::html::sidepanels::IndexSidepanelCtx::new( &ctx, - ctx.main_entrypoint.as_ref(), - &doc_nodes_by_url, - partitions_for_main_entrypoint, None, + partitions_for_main_entrypoint, ); let sidepanel = ctx .hbs @@ -413,27 +455,23 @@ pub fn generate_docs_html( }))) } DocsRequest::File(specifier) => { - let doc_nodes = doc_nodes_by_url - .get(&specifier) - .map(|v| &**v) + let (short_path, doc_nodes) = ctx + .doc_nodes + .iter() + .find(|(short_path, _)| short_path.specifier == specifier) .context("doc nodes missing for specifier")?; - let short_path = ctx.url_to_short_path(&specifier); let partitions_for_nodes = deno_doc::html::partition::get_partitions_for_file(&ctx, doc_nodes); let render_ctx = deno_doc::html::RenderContext::new( &ctx, doc_nodes, - UrlResolveKind::File(&short_path), - Some(&specifier), + UrlResolveKind::File(short_path), ); - let module_doc = deno_doc::html::jsdoc::ModuleDocCtx::new( - &render_ctx, - &specifier, - &doc_nodes_by_url, - ); + let module_doc = + deno_doc::html::jsdoc::ModuleDocCtx::new(&render_ctx, short_path); let breadcrumbs = ctx .hbs @@ -442,10 +480,8 @@ pub fn generate_docs_html( let sidepanel = deno_doc::html::sidepanels::IndexSidepanelCtx::new( &ctx, - Some(&specifier), - &doc_nodes_by_url, + Some(short_path.clone()), partitions_for_nodes, - Some(&short_path), ); let sidepanel = ctx .hbs @@ -464,18 +500,17 @@ pub fn generate_docs_html( }))) } DocsRequest::Symbol(specifier, symbol) => { - let doc_nodes = doc_nodes_by_url - .get(&specifier) - .map(|v| &**v) + let (short_path, doc_nodes) = ctx + .doc_nodes + .iter() + .find(|(short_path, _)| short_path.specifier == specifier) .context("doc nodes missing for specifier")?; - let short_path = ctx.url_to_short_path(&specifier); let partitions_for_nodes = deno_doc::html::partition::get_partitions_for_file(&ctx, doc_nodes); let Some(symbol_page) = generate_symbol_page( &ctx, - &specifier, - &short_path, + short_path, &partitions_for_nodes, doc_nodes, &symbol, @@ -520,7 +555,6 @@ pub fn generate_docs_html( fn generate_symbol_page( ctx: &GenerateCtx, - current_specifier: &ModuleSpecifier, short_path: &ShortPath, partitions_for_nodes: &deno_doc::html::partition::Partition, doc_nodes_for_module: &[DocNodeWithContext], @@ -700,7 +734,6 @@ fn generate_symbol_page( deno_doc::html::pages::render_symbol_page( ctx, doc_nodes_for_module, - current_specifier, short_path, &namespace_paths, name, @@ -748,20 +781,12 @@ impl HrefResolver for DocResolver { UrlResolveKind::Symbol { file, symbol } => { format!( "{doc_base}{}/~/{symbol}", - if file.as_str() == "." { - "" - } else { - file.as_str() - } + if file.path == "." { "" } else { &file.path } ) } UrlResolveKind::File(file) => format!( "{doc_base}{}/~/", - if file.as_str() == "." { - "" - } else { - file.as_str() - } + if file.path == "." { "" } else { &file.path } ), } } @@ -801,12 +826,11 @@ impl HrefResolver for DocResolver { )) } "http" | "https" if src.starts_with(&self.registry_url) => { - let symbol = symbol.join("."); let path_parts = url.path().splitn(4, '/').collect::>(); Some(format!( - "/{}/{}@{}/doc/{}/~/{symbol}", - path_parts[0], path_parts[1], path_parts[2], path_parts[3] + "/{}/{}@{}", + path_parts[1], path_parts[2], path_parts[3] )) } "jsr" => { @@ -824,24 +848,19 @@ impl HrefResolver for DocResolver { } } - fn resolve_usage( - &self, - _current_specifier: &ModuleSpecifier, - current_file: Option<&ShortPath>, - ) -> Option { + fn resolve_usage(&self, current_resolve: UrlResolveKind) -> Option { + dbg!(); + + let file = current_resolve + .get_file() + .map(|short_path| &*short_path.path) + .unwrap_or_default(); + Some(format!( "@{}/{}{}", self.scope, self.package, - if let Some(current_file) = current_file { - if current_file.as_str() == "." { - "" - } else { - current_file.as_str() - } - } else { - "" - } + if file == "." { "" } else { file } )) } @@ -876,6 +895,13 @@ mod tests { web_types: Default::default(), }; + let short_path = ShortPath::new( + ModuleSpecifier::parse("file:///mod.ts").unwrap(), + None, + None, + None, + ); + { assert_eq!( resolver.resolve_path(UrlResolveKind::Root, UrlResolveKind::Root), @@ -888,7 +914,7 @@ mod tests { assert_eq!( resolver.resolve_path( UrlResolveKind::Root, - UrlResolveKind::File(&ShortPath::from("/mod.ts".to_string())) + UrlResolveKind::File(&short_path) ), "/@foo/bar@0.0.1/doc/mod.ts/~/" ); @@ -896,7 +922,7 @@ mod tests { resolver.resolve_path( UrlResolveKind::Root, UrlResolveKind::Symbol { - file: &ShortPath::from("/mod.ts".to_string()), + file: &short_path, symbol: "bar", } ), @@ -917,7 +943,7 @@ mod tests { assert_eq!( resolver.resolve_path( UrlResolveKind::AllSymbols, - UrlResolveKind::File(&ShortPath::from("/mod.ts".to_string())) + UrlResolveKind::File(&short_path) ), "/@foo/bar@0.0.1/doc/mod.ts/~/" ); @@ -925,7 +951,7 @@ mod tests { resolver.resolve_path( UrlResolveKind::AllSymbols, UrlResolveKind::Symbol { - file: &ShortPath::from("/mod.ts".to_string()), + file: &short_path, symbol: "bar", } ), @@ -936,30 +962,30 @@ mod tests { { assert_eq!( resolver.resolve_path( - UrlResolveKind::File(&ShortPath::from("/mod.ts".to_string())), + UrlResolveKind::File(&short_path), UrlResolveKind::Root ), "/@foo/bar@0.0.1" ); assert_eq!( resolver.resolve_path( - UrlResolveKind::File(&ShortPath::from("/mod.ts".to_string())), + UrlResolveKind::File(&short_path), UrlResolveKind::AllSymbols ), "/@foo/bar@0.0.1/doc" ); assert_eq!( resolver.resolve_path( - UrlResolveKind::File(&ShortPath::from("/mod.ts".to_string())), - UrlResolveKind::File(&ShortPath::from("/mod.ts".to_string())) + UrlResolveKind::File(&short_path), + UrlResolveKind::File(&short_path) ), "/@foo/bar@0.0.1/doc/mod.ts/~/" ); assert_eq!( resolver.resolve_path( - UrlResolveKind::File(&ShortPath::from("/mod.ts".to_string())), + UrlResolveKind::File(&short_path), UrlResolveKind::Symbol { - file: &ShortPath::from("/mod.ts".to_string()), + file: &short_path, symbol: "bar", } ), @@ -971,7 +997,7 @@ mod tests { assert_eq!( resolver.resolve_path( UrlResolveKind::Symbol { - file: &ShortPath::from("/mod.ts".to_string()), + file: &short_path, symbol: "bar" }, UrlResolveKind::Root @@ -981,7 +1007,7 @@ mod tests { assert_eq!( resolver.resolve_path( UrlResolveKind::Symbol { - file: &ShortPath::from("/mod.ts".to_string()), + file: &short_path, symbol: "bar" }, UrlResolveKind::AllSymbols @@ -991,21 +1017,21 @@ mod tests { assert_eq!( resolver.resolve_path( UrlResolveKind::Symbol { - file: &ShortPath::from("/mod.ts".to_string()), + file: &short_path, symbol: "bar" }, - UrlResolveKind::File(&ShortPath::from("/mod.ts".to_string())) + UrlResolveKind::File(&short_path) ), "/@foo/bar@0.0.1/doc/mod.ts/~/" ); assert_eq!( resolver.resolve_path( UrlResolveKind::Symbol { - file: &ShortPath::from("/mod.ts".to_string()), + file: &short_path, symbol: "bar" }, UrlResolveKind::Symbol { - file: &ShortPath::from("/mod.ts".to_string()), + file: &short_path, symbol: "bar", } ), @@ -1028,7 +1054,12 @@ mod tests { assert_eq!( rewriter( - Some(&Url::parse("file:///src/mod.ts").unwrap()), + Some(&ShortPath::new( + ModuleSpecifier::parse("file:///src/mod.ts").unwrap(), + None, + None, + None, + )), "./logo.svg" ), "/@foo/bar/1.2.3/src/./logo.svg" @@ -1045,7 +1076,12 @@ mod tests { assert_eq!( rewriter( - Some(&Url::parse("file:///esm").unwrap()), + Some(&ShortPath::new( + ModuleSpecifier::parse("file:///esm").unwrap(), + None, + None, + None, + )), "./src/assets/logo.svg" ), "/@foo/bar/1.2.3/./src/assets/logo.svg" diff --git a/api/src/npm/tarball.rs b/api/src/npm/tarball.rs index 8cab74b1..78261acc 100644 --- a/api/src/npm/tarball.rs +++ b/api/src/npm/tarball.rs @@ -640,7 +640,7 @@ mod tests { } } - let mut loader = MemoryLoader::new(memory_files, vec![]); + let loader = MemoryLoader::new(memory_files, vec![]); let mut graph = ModuleGraph::new(GraphKind::All); let workspace_members = vec![WorkspaceMember { base: Url::parse("file:///").unwrap(), @@ -662,7 +662,7 @@ mod tests { graph .build( roots, - &mut loader, + &loader, BuildOptions { is_dynamic: false, module_analyzer: &module_analyzer, diff --git a/api/src/publish.rs b/api/src/publish.rs index e3a03ad1..edf4876e 100644 --- a/api/src/publish.rs +++ b/api/src/publish.rs @@ -811,7 +811,9 @@ pub mod tests { ModuleInfo { dependencies: vec![], ts_references: vec![], + self_types_specifier: None, jsx_import_source: None, + jsx_import_source_types: None, jsdoc_imports: vec![] } )]) diff --git a/frontend/fresh.gen.ts b/frontend/fresh.gen.ts index 19949e5d..7994d289 100644 --- a/frontend/fresh.gen.ts +++ b/frontend/fresh.gen.ts @@ -39,7 +39,7 @@ import * as $package_publish from "./routes/package/publish.tsx"; import * as $package_score from "./routes/package/score.tsx"; import * as $package_settings from "./routes/package/settings.tsx"; import * as $package_source from "./routes/package/source.tsx"; -import * as $package_symbols from "./routes/package/symbols.tsx"; +import * as $package_symbols from "./routes/package/all_symbols.tsx"; import * as $package_versions from "./routes/package/versions.tsx"; import * as $packages from "./routes/packages.tsx"; import * as $publishing_deny from "./routes/publishing/deny.tsx"; diff --git a/frontend/routes/package/(_components)/Docs.tsx b/frontend/routes/package/(_components)/Docs.tsx index 51b9db34..f3903c13 100644 --- a/frontend/routes/package/(_components)/Docs.tsx +++ b/frontend/routes/package/(_components)/Docs.tsx @@ -16,30 +16,39 @@ export function DocsView( { docs, params, selectedVersion, showProvenanceBadge }: DocsProps, ) { const content = ( -
+