From 0265f1fdc5761f0d53e58f6aa6ffa36203283b22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Donny/=EA=B0=95=EB=8F=99=EC=9C=A4?= Date: Thu, 11 Apr 2024 08:45:46 +0900 Subject: [PATCH] build: Update `swc_core` to `v0.90.29` (#7856) ### Description Update SWC crates. 1. To keep in sync 2. Prepare usage of source map range mappings. https://github.com/getsentry/rust-sourcemap/pull/77 ### Testing Instructions See next.js counterpart. https://github.com/vercel/next.js/pull/63790 Closes PACK-2861 --- Cargo.lock | 428 ++++++++++-------- Cargo.toml | 14 +- crates/turbopack-core/src/source_map/mod.rs | 29 +- crates/turbopack-css/src/process.rs | 1 + ...turbopack-tests_tests_snapshot_b36339._.js | 2 +- 5 files changed, 259 insertions(+), 215 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index aa6d2a85f4c1c..f34cca7105feb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -172,9 +172,9 @@ checksum = "70033777eb8b5124a81a1889416543dddef2de240019b674c81285a2635a7e1e" [[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" dependencies = [ "backtrace", ] @@ -193,7 +193,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] @@ -251,7 +251,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] @@ -377,7 +377,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] @@ -443,7 +443,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] @@ -496,14 +496,13 @@ dependencies = [ [[package]] name = "auto_impl" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fee3da8ef1276b0bee5dd1c7258010d8fffd31801447323115a25560e1327b89" +checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ - "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.58", ] [[package]] @@ -738,15 +737,15 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.32", + "syn 2.0.58", "which", ] [[package]] name = "binding_macros" -version = "0.64.22" +version = "0.64.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfd8f34cab921542b9dcddd34d65e5ee3953d16d07a643509494ad2d7946cb1a" +checksum = "61a30675e0f0406190035d0acdf826e65eb8b91e3d27464d83ede9570ee4ea33" dependencies = [ "anyhow", "console_error_panic_hook", @@ -789,7 +788,7 @@ dependencies = [ "biome_json_parser", "biome_json_syntax", "biome_rowan", - "bitflags 2.4.0", + "bitflags 2.5.0", "indexmap 1.9.3", "serde", "serde_json", @@ -809,7 +808,7 @@ dependencies = [ "biome_rowan", "biome_text_edit", "biome_text_size", - "bitflags 2.4.0", + "bitflags 2.5.0", "bpaf", "serde", "termcolor", @@ -900,7 +899,7 @@ dependencies = [ "biome_console", "biome_diagnostics", "biome_rowan", - "bitflags 2.4.0", + "bitflags 2.5.0", "drop_bomb", ] @@ -947,9 +946,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "bitstream-io" @@ -1044,7 +1043,7 @@ checksum = "efeab2975f8102de445dcf898856a638332403c50216144653a89aec22fd79e0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] @@ -1504,7 +1503,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] @@ -2146,7 +2145,7 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", "crossterm_winapi", "libc", "mio 0.8.8", @@ -2190,7 +2189,7 @@ dependencies = [ "cssparser-macros", "dtoa-short", "itoa", - "phf 0.11.2", + "phf 0.10.1", "serde", "smallvec 1.13.1", ] @@ -2211,7 +2210,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] @@ -2221,7 +2220,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd4056f63fce3b82d852c3da92b08ea59959890813a7f4ce9c0ff85b10cf301b" dependencies = [ "quote", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] @@ -2315,7 +2314,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] @@ -2337,7 +2336,7 @@ checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a" dependencies = [ "darling_core 0.20.1", "quote", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] @@ -2705,7 +2704,7 @@ dependencies = [ "darling 0.20.1", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] @@ -2944,7 +2943,7 @@ checksum = "3a0b11eeb173ce52f84ebd943d42e58813a2ebb78a6a3ff0a243b71c5199cd7b" dependencies = [ "proc-macro2", "swc_macros_common", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] @@ -3073,7 +3072,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] @@ -3473,15 +3472,16 @@ dependencies = [ [[package]] name = "hstr" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de90d3db62411eb62eddabe402d706ac4970f7ac8d088c05f11069cad9be9857" +checksum = "b0f5356d62012374578cd3a5c013d6586de3efbca3b53379fc1edfbb95c9db14" dependencies = [ + "hashbrown 0.14.3", "new_debug_unreachable", "once_cell", "phf 0.11.2", "rustc-hash", - "smallvec 1.13.1", + "triomphe", ] [[package]] @@ -3916,7 +3916,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] @@ -3956,15 +3956,14 @@ checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" [[package]] name = "is-macro" -version = "0.3.0" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4467ed1321b310c2625c5aa6c1b1ffc5de4d9e42668cf697a08fb033ee8265e" +checksum = "59a85abdc13717906baccb5a1e435556ce0df215f242892f721dff62bf25288f" dependencies = [ "Inflector", - "pmutil", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] @@ -3992,7 +3991,7 @@ checksum = "334e04b4d781f436dc315cb1e7515bd96826426345d498149e4bde36b67f8ee9" dependencies = [ "async-channel", "castaway 0.1.2", - "crossbeam-utils 0.8.16", + "crossbeam-utils 0.7.2", "curl", "curl-sys", "encoding_rs", @@ -4387,7 +4386,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99d6ad516c08b24c246b339159dc2ee2144c012e8ebdf4db4bddefb8734b2b69" dependencies = [ "ahash 0.7.8", - "bitflags 2.4.0", + "bitflags 2.5.0", "const-str", "cssparser", "cssparser-color", @@ -4741,7 +4740,7 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] @@ -4868,9 +4867,9 @@ dependencies = [ [[package]] name = "modularize_imports" -version = "0.68.7" +version = "0.68.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca835b60f32cd43b7bcd21ba77563bee0c08f336700463e03eb086d15e46608a" +checksum = "4ef94a126a88f5ba86c3b2e366fef393d27992693df15d44ff56de2f4e7d1344" dependencies = [ "convert_case 0.5.0", "handlebars", @@ -4908,7 +4907,7 @@ version = "2.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "efbf98e1bcb85cc441bbf7cdfb11070d2537a100e2697d75397b2584c32492d1" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", "ctor", "napi-derive", "napi-sys", @@ -4935,7 +4934,7 @@ dependencies = [ "napi-derive-backend", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] @@ -4950,7 +4949,7 @@ dependencies = [ "quote", "regex", "semver 1.0.18", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] @@ -5120,7 +5119,7 @@ version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", "crossbeam-channel", "filetime", "fsevent-sys", @@ -5197,7 +5196,7 @@ checksum = "9e6a0fd4f737c707bd9086cc16c925f294943eb62eb71499e9fd4cf71f8b9f4e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] @@ -5432,7 +5431,7 @@ version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05d74befe2d076330d9a58bf9ca2da424568724ab278adf15fb5718253133887" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", "cssparser", "fxhash", "log 0.4.20", @@ -5619,7 +5618,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] @@ -5649,7 +5648,9 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" dependencies = [ + "phf_macros 0.10.0", "phf_shared 0.10.0", + "proc-macro-hack", ] [[package]] @@ -5658,7 +5659,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ - "phf_macros", + "phf_macros 0.11.2", "phf_shared 0.11.2", ] @@ -5692,6 +5693,20 @@ dependencies = [ "rand 0.8.5", ] +[[package]] +name = "phf_macros" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", + "proc-macro-hack", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "phf_macros" version = "0.11.2" @@ -5702,7 +5717,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] @@ -5752,7 +5767,7 @@ checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] @@ -5833,7 +5848,7 @@ checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] @@ -6042,7 +6057,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ceca8aaf45b5c46ec7ed39fff75f57290368c1846d33d24a122ca81416ab058" dependencies = [ "proc-macro2", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] @@ -6089,6 +6104,12 @@ dependencies = [ "version_check 0.9.4", ] +[[package]] +name = "proc-macro-hack" +version = "0.5.20+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" + [[package]] name = "proc-macro2" version = "1.0.79" @@ -6163,7 +6184,7 @@ dependencies = [ "itertools 0.11.0", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] @@ -6234,9 +6255,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -6408,7 +6429,7 @@ version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bcb12f8fbf6c62614b0d56eb352af54f6a22410c3b079eb53ee93c7b97dd31d8" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", "cassowary", "compact_str", "crossterm 0.27.0", @@ -6575,7 +6596,7 @@ checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] @@ -6933,7 +6954,7 @@ version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys 0.4.13", @@ -7163,9 +7184,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.190" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] @@ -7202,13 +7223,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.190" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] @@ -7224,9 +7245,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.106" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cc66a619ed80bf7a0f6b17dd063a84b88f6dea1813737cf469aef1d081142c2" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" dependencies = [ "indexmap 2.2.3", "itoa", @@ -7272,7 +7293,7 @@ checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] @@ -7670,17 +7691,20 @@ dependencies = [ [[package]] name = "sourcemap" -version = "6.4.1" +version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4cbf65ca7dc576cf50e21f8d0712d96d4fcfd797389744b7b222a85cdf5bd90" +checksum = "208d40b9e8cad9f93613778ea295ed8f3c2b1824217c6cfc7219d3f6f45b96d4" dependencies = [ + "base64-simd", + "bitvec", "data-encoding", "debugid", "if_chain", + "rustc-hash", "rustc_version 0.2.3", "serde", "serde_json", - "unicode-id", + "unicode-id-start", "url 2.4.1", ] @@ -7747,7 +7771,7 @@ dependencies = [ "pmutil", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] @@ -7830,7 +7854,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] @@ -7865,7 +7889,7 @@ dependencies = [ "proc-macro2", "quote", "struct_iterable_internal", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] @@ -7893,14 +7917,14 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] name = "styled_components" -version = "0.96.6" +version = "0.96.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b88be314a64500e2931dafab22e915dea4365fef357d04e26d6be4105b0a809c" +checksum = "27f13af1b2e9b55614b681c785ddcf96e059076be58393c1055b795c8283a956" dependencies = [ "Inflector", "once_cell", @@ -8019,9 +8043,9 @@ dependencies = [ [[package]] name = "swc" -version = "0.273.22" +version = "0.273.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48a68d147a2270bbe2164ee4060d0176590a1035f54d82f7252d16a15e4154a9" +checksum = "d6012330faebbde05f69bc4ca9b9104edeba68ba5475eef13172802859a601ab" dependencies = [ "anyhow", "base64 0.21.4", @@ -8083,9 +8107,9 @@ dependencies = [ [[package]] name = "swc_atoms" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d538eaaa6f085161d088a04cf0a3a5a52c5a7f2b3bd9b83f73f058b0ed357c0" +checksum = "04d9d1941a7d24fc503efa29c53f88dd61e6a15cc371947a75cca3b48d564b5b" dependencies = [ "bytecheck", "hstr", @@ -8097,9 +8121,9 @@ dependencies = [ [[package]] name = "swc_bundler" -version = "0.225.17" +version = "0.225.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f145a1a7293edce9efa80fe4f92a2cbd821c31d5c3123d04182fc1928613d978" +checksum = "0f158dd00ce1431cdc7a39f01c5e35bd5a10f1455768c97b59c314c43feecf76" dependencies = [ "anyhow", "crc", @@ -8129,9 +8153,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 0.8.9", "anyhow", @@ -8143,9 +8167,9 @@ dependencies = [ [[package]] name = "swc_common" -version = "0.33.20" +version = "0.33.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317d2fcdbb1bc9ecfd0bfc67468d675a5159a6fd1863abf41c8c5b7b7adcab03" +checksum = "89598a0dfe7311750e6fad8464cafcec8ee010c649c2e04531b25e32362fdec7" dependencies = [ "ahash 0.8.9", "anyhow", @@ -8176,9 +8200,9 @@ dependencies = [ [[package]] name = "swc_compiler_base" -version = "0.7.18" +version = "0.7.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14edecfac835e77c88017d016c48dba60e82632ee94eb9565f516ebc7072e6a" +checksum = "8d7a0a78d52886c01786246fad54aa614cc145154d18607ddda72a180d1cb56c" dependencies = [ "anyhow", "base64 0.21.4", @@ -8201,9 +8225,9 @@ dependencies = [ [[package]] name = "swc_config" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce837c5eae1cb200a310940de989fd9b3d12ed62d7752bc69b39ef8aa775ec04" +checksum = "ada712ac5e28a301683c8af957e8a56deca675cbc376473dd207a527b989efb5" dependencies = [ "anyhow", "indexmap 2.2.3", @@ -8223,14 +8247,14 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] name = "swc_core" -version = "0.90.24" +version = "0.90.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "354892a17af24956c9ae5479c2bd0a2f9c344aab79e6f2fbd01b7b8eb4e46c2e" +checksum = "fe7651ba172f4a82cd6f27b73e51d363e9b32aa97b9f6aab2e63e58f4df9ea62" dependencies = [ "binding_macros", "swc", @@ -8271,9 +8295,9 @@ dependencies = [ [[package]] name = "swc_css_ast" -version = "0.140.21" +version = "0.140.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a930397de06e2d10d5042d927993af9e09e7824ff84b7d4d7b4a663e7c63e55d" +checksum = "5eeb244560d41d5885c5d86623c0fb25d1e3783edcdf878f2572d1952010955e" dependencies = [ "is-macro", "string_enum", @@ -8283,12 +8307,12 @@ dependencies = [ [[package]] name = "swc_css_codegen" -version = "0.151.31" +version = "0.151.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dfdbd0d5eeb7b4cb4193d49aad0c1f1d8561b0533607992505a7c4a11dce4e8" +checksum = "7c9a4ae80f7103ad5672640bf2916c4614a9f59a57c0946040bfde7f52ac7836" dependencies = [ "auto_impl", - "bitflags 2.4.0", + "bitflags 2.5.0", "rustc-hash", "serde", "swc_atoms", @@ -8307,16 +8331,16 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] name = "swc_css_compat" -version = "0.27.32" +version = "0.27.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c8c4ffbda70abf13435778820470a804619bd1f33e6d11412a7de595ebcfbbb" +checksum = "1e14aef99a60b5e2f936fad0c59ffb0726eb6dbd00c4c7568ba5d1ef2463328f" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", "once_cell", "serde", "serde_json", @@ -8329,9 +8353,9 @@ dependencies = [ [[package]] name = "swc_css_minifier" -version = "0.116.32" +version = "0.116.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc7000b4de2dfbd04d8f2a1cc99046b8594fd9cd67fc9593f07df5425a508f75" +checksum = "ee993aeb2314bad3b1ac2449f142a230c204443749a96a3c807f34bf8d845ad6" dependencies = [ "serde", "swc_atoms", @@ -8359,9 +8383,9 @@ dependencies = [ [[package]] name = "swc_css_parser" -version = "0.150.30" +version = "0.150.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecf8cfbef4c0b847829ca1399d762e7e29da3c9fe6593670145fd222252eab6f" +checksum = "52413b0679fa888d6d106d9e825980f4dd797f2398f476eb6a4201eb482bede8" dependencies = [ "lexical", "serde", @@ -8372,9 +8396,9 @@ dependencies = [ [[package]] name = "swc_css_prefixer" -version = "0.153.35" +version = "0.153.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25c08c9394e9d314f4d7995653e7ef7bc9563aff1cb736457ed9009e278d72b9" +checksum = "4f202bf9b7eec1e87c74bf4be8677e1086d8bbf9832f57829f5d106c62a6e715" dependencies = [ "once_cell", "preset_env_base", @@ -8389,9 +8413,9 @@ dependencies = [ [[package]] name = "swc_css_utils" -version = "0.137.21" +version = "0.137.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ac61660cd182bbb0fc53ee86f470e8bba6f5b0f1d85e44bf4ff9dfa2c862a12" +checksum = "6fb7bc3fd90d4e0ad270b255d20e7172f26c26bd91d8b8c709b54690a2f209a3" dependencies = [ "once_cell", "serde", @@ -8417,11 +8441,11 @@ dependencies = [ [[package]] name = "swc_ecma_ast" -version = "0.112.6" +version = "0.112.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70656acd47c91918635f1e8589963428cb3170975b71d786c79fb7a25605f687" +checksum = "6bcd97ee367b48444f90416ea56e71d761600f816bcae9df4f99293d1fa36bd5" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.5.0", "bytecheck", "is-macro", "num-bigint", @@ -8432,14 +8456,14 @@ dependencies = [ "string_enum", "swc_atoms", "swc_common", - "unicode-id", + "unicode-id-start", ] [[package]] name = "swc_ecma_codegen" -version = "0.148.12" +version = "0.148.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2afcce205914b8451880fc5ef63dae9bac3dc7b71917921ede64f8e7fd8447a1" +checksum = "a1e318142ff1297c1d3d8f230b4f3eda8454d1420341fb098a9d9edbc373ef3c" dependencies = [ "memchr", "num-bigint", @@ -8463,14 +8487,14 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] name = "swc_ecma_compat_bugfixes" -version = "0.4.17" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8731bec087336f7ed1cd4d4c082a6f7b7b9072ac5fc6f6379b6f98520a0e8303" +checksum = "4f5396aca4707f5bb34bee83160864209a45b7117ea76932daedcb9109541f40" dependencies = [ "swc_atoms", "swc_common", @@ -8498,9 +8522,9 @@ dependencies = [ [[package]] name = "swc_ecma_compat_es2015" -version = "0.4.17" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7646243203205d2409a891b998d4d30b7a4563a57429da1cbeabd03f18e506b2" +checksum = "5e836affd437de66b1f20ed857308bb3c25d4e20631d05595790a963076a9c0a" dependencies = [ "arrayvec 0.7.4", "indexmap 2.2.3", @@ -8541,9 +8565,9 @@ dependencies = [ [[package]] name = "swc_ecma_compat_es2017" -version = "0.4.16" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9335b27e554e21db7cd541bcee1b5a58b5994439d1a2cb1c9188a3a557548d3" +checksum = "7a4b59b144c818b639e741b0538fb70cd08500e03b3f399e3aef7b774dac1cf1" dependencies = [ "serde", "swc_atoms", @@ -8559,9 +8583,9 @@ dependencies = [ [[package]] name = "swc_ecma_compat_es2018" -version = "0.4.16" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66be32a60872762335524766f0afca4900699e1fc7ab14d87567e0e9b3d95cc2" +checksum = "cced4ec764d3bda35ef5451a260dc747e5ce1f179372aa09ff77bb57c42cfb0c" dependencies = [ "serde", "swc_atoms", @@ -8594,9 +8618,9 @@ dependencies = [ [[package]] name = "swc_ecma_compat_es2020" -version = "0.4.16" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8b310227bbafd12dbe717c1969bf5095e9b6aff563cea3e9ff6e46371971293" +checksum = "7d4b23ada85bf580f4e1639e54ab237c566a7c319c6e2d1f8010ae5323d0d1ba" dependencies = [ "serde", "swc_atoms", @@ -8676,9 +8700,9 @@ dependencies = [ [[package]] name = "swc_ecma_lints" -version = "0.92.19" +version = "0.92.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12d3615603b9719f33180080ccada04d0cb6a077d90c958a71d746c7b015c040" +checksum = "2d38a464421a91150511530b93321fa3f888cade9ad05080bf228fd72421c747" dependencies = [ "auto_impl", "dashmap", @@ -8696,9 +8720,9 @@ dependencies = [ [[package]] name = "swc_ecma_loader" -version = "0.45.23" +version = "0.45.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6732100aba9bec438fcff857ab8db5e5d3b64b42a522aec7c388d8c98a36d22a" +checksum = "ea397a556585ffd78cda6ef420f6fd0ad54320778930eeb876f02041f58bb017" dependencies = [ "anyhow", "dashmap", @@ -8718,9 +8742,9 @@ dependencies = [ [[package]] name = "swc_ecma_minifier" -version = "0.192.18" +version = "0.192.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624b38cf23679ab41ca0e47c37f49617275cb15ad7bbaa66a307c42e67ebc1d5" +checksum = "c1b038d6effbed5103d38460e6b9f5006fd6ffa91e827efdf78953b0e97d3895" dependencies = [ "arrayvec 0.7.4", "indexmap 2.2.3", @@ -8752,9 +8776,9 @@ dependencies = [ [[package]] name = "swc_ecma_parser" -version = "0.143.10" +version = "0.143.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b919bb9ae5e1c8c54fb109f7e94b4a00185bd255c1238ba823e8102601e2133" +checksum = "192482230498a24c2e7c9c580ba334a80dc43b3899366e54aa548f8d7b0f12cd" dependencies = [ "either", "new_debug_unreachable", @@ -8811,7 +8835,7 @@ dependencies = [ "swc_ecma_ast", "swc_ecma_parser", "swc_macros_common", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] @@ -8829,9 +8853,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms" -version = "0.229.17" +version = "0.229.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52b22e7877d623332da5f2a93c204e808091ab2da1c060f794eaea66506fb530" +checksum = "8eb90c2d122976f3e32bf41a2bf710f01e51ef34ef50108992b185cc1cc53e28" dependencies = [ "swc_atoms", "swc_common", @@ -8849,12 +8873,12 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_base" -version = "0.137.16" +version = "0.137.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69e9a23d6af398b6efd17bbdad2cfa580102f6c560611f85c63b48f76ffe8f0c" +checksum = "66b5818db80d8d9fcbc1d3453f1d246a7f56ea708ba136717a84a8caf0977afd" dependencies = [ "better_scoped_tls", - "bitflags 2.4.0", + "bitflags 2.5.0", "indexmap 2.2.3", "once_cell", "phf 0.11.2", @@ -8887,9 +8911,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_compat" -version = "0.163.17" +version = "0.163.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "895101f18b39009b8d27f231222e6459a0e71151ba0b3ddf934373bf657602b2" +checksum = "27a864b81fc36e2933f60015fc6df62e244339acde78e06e4640ec5656584f82" dependencies = [ "arrayvec 0.7.4", "indexmap 2.2.3", @@ -8931,18 +8955,18 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] name = "swc_ecma_transforms_module" -version = "0.180.17" +version = "0.180.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82c53f9d5e7384e840f78d096f0ed2e8cfd38486adafb282ef8550420cd44890" +checksum = "914cbfb4d9e9aa4b0a5a63c01fb4c2edfa8d7486bec0b891a5e15a94615453a2" dependencies = [ "Inflector", "anyhow", - "bitflags 2.4.0", + "bitflags 2.5.0", "indexmap 2.2.3", "is-macro", "path-clean 0.1.0", @@ -8963,9 +8987,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_optimization" -version = "0.198.17" +version = "0.198.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86789174146707d78c086cee25868624bdfef924bb535ea3fc42f53fa426d4c0" +checksum = "aa1a53995a9199fa11343506646d0cdce69e612a5dad47897169cf4fdf8b7fcb" dependencies = [ "dashmap", "indexmap 2.2.3", @@ -9008,9 +9032,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_react" -version = "0.183.17" +version = "0.183.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "762dad12edcdca424213354518ce60bc3f03a026f8e1990b11459311cef04c91" +checksum = "1b7b7de90ff41560bf021acda3fb16fb0f4f5885aeb44b6b7e638b563124d087" dependencies = [ "base64 0.21.4", "dashmap", @@ -9033,9 +9057,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_testing" -version = "0.140.16" +version = "0.140.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9a51288aebf6894f8643c44ad08ed1d9c81b8bfce47195c13f9ff994b77a946" +checksum = "7c0ea6f85b7bf04391a172d7a369e49865effa77ec3a6cd0e969a274cfcb982d" dependencies = [ "ansi_term", "anyhow", @@ -9059,9 +9083,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_typescript" -version = "0.188.17" +version = "0.188.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d6824fcd8d32ab2e90745a408f71548bd081bf4522d32617745ac1ea243de9c" +checksum = "845c3ad4949c2317076e929e42c78dd43868f6c6f820911353731a5bb859e78c" dependencies = [ "ryu-js", "serde", @@ -9093,9 +9117,9 @@ dependencies = [ [[package]] name = "swc_ecma_utils" -version = "0.127.14" +version = "0.127.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc9c6ad70038b770d844fdfc20fd970d66ccebb1edc91804c8a9adaa689d4e39" +checksum = "624c19fdbe1807275b16560892cf7a12a9ac3f631fb10ad45aaa3eeac903e6e5" dependencies = [ "indexmap 2.2.3", "num_cpus", @@ -9127,9 +9151,9 @@ dependencies = [ [[package]] name = "swc_emotion" -version = "0.72.6" +version = "0.72.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976cfc9fbfcd2fdeb85b2b7ca10abc789ef17f352d25f9547668cad440319047" +checksum = "c43a5946f5e0ea03341b23786e43e3fa07eaa014f03fb39cf584b02c38e9c80c" dependencies = [ "base64 0.13.1", "byteorder", @@ -9157,7 +9181,7 @@ checksum = "695a1d8b461033d32429b5befbf0ad4d7a2c4d6ba9cd5ba4e0645c615839e8e4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] @@ -9206,7 +9230,7 @@ checksum = "50176cfc1cbc8bb22f41c6fe9d1ec53fbe057001219b5954961b8ad0f336fce9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] @@ -9252,7 +9276,7 @@ checksum = "3232db481484070637b20a155c064096c0ea1ba04fa2247b89b618661b3574f4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] @@ -9271,9 +9295,9 @@ dependencies = [ [[package]] name = "swc_plugin_runner" -version = "0.106.13" +version = "0.106.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3fe0f8743615139eed21376c94d8201be331040c8999e9a7c86a43d0ca2ff8b" +checksum = "3a62d1390c524b5afc151b7e7c5e3d76fcd4051d9aa1c4a3b5afcc8322083c28" dependencies = [ "anyhow", "enumset", @@ -9287,6 +9311,7 @@ dependencies = [ "swc_plugin_proxy", "tokio", "tracing", + "virtual-fs", "wasmer", "wasmer-cache", "wasmer-compiler-cranelift", @@ -9295,9 +9320,9 @@ dependencies = [ [[package]] name = "swc_relay" -version = "0.44.5" +version = "0.44.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a029c55b66fa6a0de9d1e7b5d18862542d2257a43406c0b0a6e5bece10219bd" +checksum = "68cd77d63c87626434782b9542e4a1335490200cee86e03e1cb6c61fccc71a30" dependencies = [ "once_cell", "regex", @@ -9328,7 +9353,7 @@ checksum = "ff9719b6085dd2824fd61938a881937be14b08f95e2d27c64c825a9f65e052ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] @@ -9351,7 +9376,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] @@ -9390,9 +9415,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.32" +version = "2.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" +checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" dependencies = [ "proc-macro2", "quote", @@ -9633,9 +9658,9 @@ dependencies = [ [[package]] name = "testing" -version = "0.35.21" +version = "0.35.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "761d1719907168f43b49b438bdb58c41608f4af5eac0995e2a8bb16c522656c5" +checksum = "ae76d28ca008df98f06a2a200458a31a5534e02934444e5e33c6cb184fd0adf2" dependencies = [ "ansi_term", "cargo_metadata", @@ -9654,9 +9679,9 @@ dependencies = [ [[package]] name = "testing_macros" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d3864d4184569c1428645a51a304b3b6e8d3094cd61fb3cce8dfdd9f6d0f72" +checksum = "32d8d51dafe71c966464b06d3b5c1eca715590e952d20a908d003fd34791a773" dependencies = [ "anyhow", "glob", @@ -9665,7 +9690,7 @@ dependencies = [ "quote", "regex", "relative-path", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] @@ -9708,7 +9733,7 @@ checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] @@ -9894,7 +9919,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] @@ -10228,7 +10253,7 @@ checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] @@ -10250,11 +10275,10 @@ dependencies = [ [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if 1.0.0", "log 0.4.20", "pin-project-lite", "tracing-attributes", @@ -10274,13 +10298,13 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] @@ -10296,9 +10320,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", "valuable", @@ -10395,6 +10419,16 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" +[[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" @@ -11838,8 +11872,8 @@ version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ - "cfg-if 1.0.0", - "rand 0.8.5", + "cfg-if 0.1.10", + "rand 0.4.6", "static_assertions", ] @@ -11963,6 +11997,12 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d70b6494226b36008c8366c288d77190b3fad2eb4c10533139c1c1f461127f1a" +[[package]] +name = "unicode-id-start" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8f73150333cb58412db36f2aca8f2875b013049705cc77b94ded70a1ab1f5da" + [[package]] name = "unicode-ident" version = "1.0.11" @@ -12170,9 +12210,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "virtual-fs" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a16a7893a16a31ef442ce86691e7060a19691fb7739387624f3dd07ec4c04b" +checksum = "6ce7b7674a3d0ddb5915b8f4feccdd6e8680c5980c296688e0f0e7378b8c69e1" dependencies = [ "anyhow", "async-trait", @@ -12442,7 +12482,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.58", "wasm-bindgen-shared", ] @@ -12476,7 +12516,7 @@ checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.58", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -13393,7 +13433,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.32", + "syn 2.0.58", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 0bcc41008b0a1..64d5f3db4c28f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -104,16 +104,16 @@ async-recursion = "1.0.2" browserslist-rs = { version = "0.15.0" } miette = { version = "5.10.0", features = ["fancy"] } mdxjs = "0.1.23" -modularize_imports = { version = "0.68.7" } -styled_components = { version = "0.96.6" } +modularize_imports = { version = "0.68.9" } +styled_components = { version = "0.96.8" } styled_jsx = { version = "0.73.10" } -swc_core = { version = "0.90.24", features = [ +swc_core = { version = "0.90.30", features = [ "ecma_loader_lru", "ecma_loader_parking_lot", ] } -swc_emotion = { version = "0.72.6" } -swc_relay = { version = "0.44.5" } -testing = { version = "0.35.21" } +swc_emotion = { version = "0.72.8" } +swc_relay = { version = "0.44.8" } +testing = { version = "0.35.22" } # Temporary: Reference the latest git minor version of pathfinder_simd until it's published. pathfinder_simd = "0.5.3" @@ -277,7 +277,7 @@ smallvec = { version = "1.13.1", features = [ "union", "const_new", ] } -sourcemap = "6.4.1" +sourcemap = "8.0.1" syn = "1.0.107" tempfile = "3.3.0" test-case = "3.0.0" diff --git a/crates/turbopack-core/src/source_map/mod.rs b/crates/turbopack-core/src/source_map/mod.rs index c58b8eb9bfa96..db41d7e920a02 100644 --- a/crates/turbopack-core/src/source_map/mod.rs +++ b/crates/turbopack-core/src/source_map/mod.rs @@ -159,6 +159,7 @@ impl TryInto for Token { src_col: t.original_column as u32, src_line: t.original_line as u32, src_id: t.original_file.parse()?, + is_range: false, }, Self::Synthetic(t) => sourcemap::RawToken { dst_col: t.generated_column as u32, @@ -167,6 +168,7 @@ impl TryInto for Token { src_col: SOURCEMAP_CRATE_NONE_U32, src_line: SOURCEMAP_CRATE_NONE_U32, src_id: SOURCEMAP_CRATE_NONE_U32, + is_range: false, }, }) } @@ -240,7 +242,7 @@ impl SourceMap { #[turbo_tasks::function] pub fn empty() -> Vc { let mut builder = SourceMapBuilder::new(None); - builder.add(0, 0, 0, 0, None, None); + builder.add(0, 0, 0, 0, None, None, false); SourceMap::new_regular(builder.into_sourcemap()).cell() } @@ -389,23 +391,23 @@ impl SourceMap { origin: Vc, ) -> Result> { async fn resolve_source( - source_request: String, - source_content: Option, + source_request: Arc, + source_content: Option>, origin: Vc, - ) -> Result<(String, String)> { + ) -> Result<(Arc, Arc)> { Ok( if let Some(path) = *origin.parent().try_join(source_request.to_string()).await? { let path_str = path.to_string().await?; let source = format!("/{SOURCE_MAP_ROOT_NAME}/{}", path_str); let source_content = if let Some(source_content) = source_content { - source_content.to_string() + source_content } else if let FileContent::Content(file) = &*path.read().await? { let text = file.content().to_str()?; - text.to_string() + text.to_string().into() } else { - format!("unable to read source {path_str}") + format!("unable to read source {path_str}").into() }; - (source, source_content) + (source.into(), source_content) } else { let origin_str = origin.to_string().await?; static INVALID_REGEX: Lazy = @@ -420,8 +422,9 @@ impl SourceMap { "unable to access {source_request} in {origin_str} (it's leaving the \ filesystem root)" ) + .into() }); - (source, source_content) + (source.into(), source_content) }, ) } @@ -430,14 +433,14 @@ impl SourceMap { origin: Vc, ) -> Result { let map = &map.0; - let file = map.get_file().map(ToString::to_string); + let file = map.get_file().map(Arc::::from); let tokens = map.tokens().map(|t| t.get_raw_token()).collect(); - let names = map.names().map(ToString::to_string).collect(); + let names = map.names().map(Arc::::from).collect(); let count = map.get_source_count() as usize; - let sources = map.sources().map(ToString::to_string).collect::>(); + let sources = map.sources().map(Arc::::from).collect::>(); let source_contents = map .source_contents() - .map(|s| s.map(ToString::to_string)) + .map(|s| s.map(Arc::::from)) .collect::>(); let mut new_sources = Vec::with_capacity(count); let mut new_source_contents = Vec::with_capacity(count); diff --git a/crates/turbopack-css/src/process.rs b/crates/turbopack-css/src/process.rs index 8c7c849d8ac0d..36ae1987ac699 100644 --- a/crates/turbopack-css/src/process.rs +++ b/crates/turbopack-css/src/process.rs @@ -991,6 +991,7 @@ impl GenerateSourceMap for ParseCssResultSourceMap { m.original.map(|v| v.original_column).unwrap_or_default(), Some(0), None, + false, ); } diff --git a/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_b36339._.js b/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_b36339._.js index 3a669289822d5..1bb656791d4e7 100644 --- a/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_b36339._.js +++ b/crates/turbopack-tests/tests/snapshot/emotion/emotion/output/crates_turbopack-tests_tests_snapshot_b36339._.js @@ -12,7 +12,7 @@ var __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests ; ; const StyledButton = /*#__PURE__*/ (0, __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$node_modules$2f40$emotion$2f$styled$2f$index$2e$js__$5b$test$5d$__$28$ecmascript$29$__["default"])("button", { - target: "ekkrg800" + target: "ekn3dmj0" })("background:blue;"); function ClassNameButton({ children }) { return /*#__PURE__*/ (0, __TURBOPACK__imported__module__$5b$project$5d2f$crates$2f$turbopack$2d$tests$2f$tests$2f$snapshot$2f$node_modules$2f40$emotion$2f$react$2f$jsx$2d$dev$2d$runtime$2e$js__$5b$test$5d$__$28$ecmascript$29$__["jsxDEV"])("button", {