diff --git a/packages/next-swc/Cargo.lock b/packages/next-swc/Cargo.lock index fd2eef02ced4c..45052e274e036 100644 --- a/packages/next-swc/Cargo.lock +++ b/packages/next-swc/Cargo.lock @@ -18,7 +18,7 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" dependencies = [ - "gimli 0.27.1", + "gimli 0.27.2", ] [[package]] @@ -123,7 +123,7 @@ dependencies = [ "proc-macro2 1.0.51", "quote 1.0.23", "swc_macros_common", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -243,7 +243,7 @@ checksum = "3b015a331cc64ebd1774ba119538573603427eaace0a1950c423ab971f903796" dependencies = [ "proc-macro2 1.0.51", "quote 1.0.23", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -292,7 +292,7 @@ checksum = "e4655ae1a7b0cdf149156f780c5bf3f1352bc53cbd9e0a361a7ef7b22947e965" dependencies = [ "proc-macro2 1.0.51", "quote 1.0.23", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -303,13 +303,13 @@ checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" [[package]] name = "async-trait" -version = "0.1.64" +version = "0.1.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd7fce9ba8c3c042128ce72d8b2ddbf3a05747efb67ea0313c635e10bda47a2" +checksum = "b84f9ebcc6c1f5b8cb160f6990096a5c127f423fcb6e1ccc46c370cbdfb75dfc" dependencies = [ "proc-macro2 1.0.51", "quote 1.0.23", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -346,7 +346,7 @@ dependencies = [ [[package]] name = "auto-hash-map" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=8a8038f94#8a8038f94253de9cba026520b68f52964d2d2400" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230315.2#faaf54edfcc0a4d1c613f427e8e4e991f83bfa8b" dependencies = [ "serde", ] @@ -360,7 +360,7 @@ dependencies = [ "proc-macro-error", "proc-macro2 1.0.51", "quote 1.0.23", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -476,9 +476,9 @@ dependencies = [ [[package]] name = "binding_macros" -version = "0.34.27" +version = "0.44.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa2b71d0395094251f5931ce4f6a28e914677107fcf7c9b976204cccdffdae4" +checksum = "eae33074ad17e2ccbc4f05ba97345ff513d9f70968bd2559c00733f294d5a4c6" dependencies = [ "anyhow", "console_error_panic_hook", @@ -601,7 +601,7 @@ checksum = "13e576ebe98e605500b3c8041bb888e966653577172df6dd97398714eb30b9bf" dependencies = [ "proc-macro2 1.0.51", "quote 1.0.23", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -790,7 +790,7 @@ checksum = "c3d7ae14b20b94cb02149ed21a86c423859cbe18dc7ed69845cace50e52b40a5" dependencies = [ "bitflags", "clap_derive", - "clap_lex 0.3.1", + "clap_lex 0.3.2", "is-terminal", "once_cell", "strsim", @@ -807,7 +807,7 @@ dependencies = [ "proc-macro-error", "proc-macro2 1.0.51", "quote 1.0.23", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -821,9 +821,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade" +checksum = "350b9cf31731f9957399229e9b2adc51eeabdfbe9d71d9a0552275fd12710d09" dependencies = [ "os_str_bytes", ] @@ -1100,9 +1100,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c" dependencies = [ "cfg-if 1.0.0", "crossbeam-utils", @@ -1110,9 +1110,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ "cfg-if 1.0.0", "crossbeam-epoch", @@ -1121,22 +1121,22 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.13" +version = "0.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" +checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" dependencies = [ "autocfg", "cfg-if 1.0.0", "crossbeam-utils", - "memoffset 0.7.1", + "memoffset 0.8.0", "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.14" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" +checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" dependencies = [ "cfg-if 1.0.0", ] @@ -1189,7 +1189,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" dependencies = [ "quote 1.0.23", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -1231,9 +1231,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.90" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90d59d9acd2a682b4e40605a242f6670eaa58c5957471cbf85e8aa6a0b97a5e8" +checksum = "9a140f260e6f3f79013b8bfc65e7ce630c9ab4388c6a89c71e07226f49487b72" dependencies = [ "cc", "cxxbridge-flags", @@ -1243,9 +1243,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.90" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebfa40bda659dd5c864e65f4c9a2b0aff19bea56b017b9b77c73d3766a453a38" +checksum = "da6383f459341ea689374bf0a42979739dc421874f112ff26f829b8040b8e613" dependencies = [ "cc", "codespan-reporting", @@ -1253,24 +1253,24 @@ dependencies = [ "proc-macro2 1.0.51", "quote 1.0.23", "scratch", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "cxxbridge-flags" -version = "1.0.90" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "457ce6757c5c70dc6ecdbda6925b958aae7f959bda7d8fb9bde889e34a09dc03" +checksum = "90201c1a650e95ccff1c8c0bb5a343213bdd317c6e600a93075bca2eff54ec97" [[package]] name = "cxxbridge-macro" -version = "1.0.90" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebf883b7aacd7b2aeb2a7b338648ee19f57c140d4ee8e52c68979c6b2f7f2263" +checksum = "0b75aed41bb2e6367cae39e6326ef817a851db13c13e4f3263714ca3cfb8de56" dependencies = [ "proc-macro2 1.0.51", "quote 1.0.23", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -1304,7 +1304,7 @@ dependencies = [ "proc-macro2 1.0.51", "quote 1.0.23", "strsim", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -1317,7 +1317,7 @@ dependencies = [ "ident_case", "proc-macro2 1.0.51", "quote 1.0.23", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -1328,7 +1328,7 @@ checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ "darling_core 0.13.4", "quote 1.0.23", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -1339,7 +1339,7 @@ checksum = "b36230598a2d5de7ec1c6f51f72d8a99a9208daff41de2084d06e3fd3ea56685" dependencies = [ "darling_core 0.14.3", "quote 1.0.23", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -1355,6 +1355,12 @@ dependencies = [ "parking_lot_core 0.9.7", ] +[[package]] +name = "data-encoding" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" + [[package]] name = "debugid" version = "0.8.0" @@ -1488,11 +1494,11 @@ dependencies = [ [[package]] name = "enum-iterator" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea166b3f7dc1032f7866d13f8d8e02c8d87507b61750176b86554964dc6a7bf" +checksum = "706d9e7cf1c7664859d79cd524e4e53ea2b67ea03c98cc2870c5e539695d597e" dependencies = [ - "enum-iterator-derive 1.1.0", + "enum-iterator-derive 1.2.0", ] [[package]] @@ -1503,18 +1509,18 @@ checksum = "c134c37760b27a871ba422106eedbb8247da973a09e82558bf26d619c882b159" dependencies = [ "proc-macro2 1.0.51", "quote 1.0.23", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "enum-iterator-derive" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "828de45d0ca18782232dfb8f3ea9cc428e8ced380eb26a520baaacfc70de39ce" +checksum = "355f93763ef7b0ae1c43c4d8eccc9d5848d84ad1a1d8ce61c421d1ac85a19d05" dependencies = [ "proc-macro2 1.0.51", "quote 1.0.23", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -1526,7 +1532,7 @@ dependencies = [ "pmutil", "proc-macro2 1.0.51", "swc_macros_common", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -1547,7 +1553,7 @@ dependencies = [ "darling 0.14.3", "proc-macro2 1.0.51", "quote 1.0.23", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -1565,9 +1571,9 @@ dependencies = [ [[package]] name = "erased-serde" -version = "0.3.24" +version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4ca605381c017ec7a5fef5e548f1cfaa419ed0f6df6367339300db74c92aa7d" +checksum = "4f2b0c2380453a92ea8b6c8e5f64ecaafccddde8ceab55ff7a8ac1029f894569" dependencies = [ "serde", ] @@ -1681,7 +1687,7 @@ dependencies = [ "pmutil", "proc-macro2 1.0.51", "swc_macros_common", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -1796,7 +1802,7 @@ checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70" dependencies = [ "proc-macro2 1.0.51", "quote 1.0.23", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -1896,7 +1902,7 @@ dependencies = [ "proc-macro-error", "proc-macro2 1.0.51", "quote 1.0.23", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -1912,9 +1918,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.1" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "221996f774192f0f718773def8201c4ae31f02616a54ccfc2d358bb0e5cefdec" +checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" [[package]] name = "glob" @@ -1936,9 +1942,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" +checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d" dependencies = [ "bytes", "fnv", @@ -2053,9 +2059,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes", "fnv", @@ -2317,9 +2323,9 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3" +checksum = "cfa919a82ea574332e2de6e74b4c36e74d41982b335080fa59d4ef31be20fdf3" dependencies = [ "libc", "windows-sys 0.45.0", @@ -2342,22 +2348,22 @@ checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" [[package]] name = "is-macro" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c068d4c6b922cd6284c609cfa6dec0e41615c9c5a1a4ba729a970d8daba05fb" +checksum = "8a7d079e129b77477a49c5c4f1cfe9ce6c2c909ef52520693e8e811a714c7b20" dependencies = [ "Inflector", "pmutil", "proc-macro2 1.0.51", "quote 1.0.23", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "is-terminal" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e18b0a45d56fe973d6db23972bf5bc46f988a4a2385deac9cc29572f09daef" +checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857" dependencies = [ "hermit-abi 0.3.1", "io-lifetimes", @@ -2409,9 +2415,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "jni" @@ -2706,7 +2712,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0fbfc88337168279f2e9ae06e157cfed4efd3316e14dc96ed074d4f2e6c5952" dependencies = [ "quote 1.0.23", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -2777,9 +2783,9 @@ dependencies = [ [[package]] name = "mdxjs" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "020b441035e59cf0bfd9de33e7ad5c7550bfc0447bea3b03cb50fde429ef4904" +checksum = "fe25a3b6ba9aad427fa5ef59c99506bb6954748dd82211223dfd8a40dd75ae80" dependencies = [ "markdown", "serde", @@ -2819,6 +2825,15 @@ dependencies = [ "autocfg", ] +[[package]] +name = "memoffset" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +dependencies = [ + "autocfg", +] + [[package]] name = "miette" version = "4.7.1" @@ -2847,7 +2862,7 @@ checksum = "6b5bc45b761bcf1b5e6e6c4128cd93b84c218721a8d9b894aa0aff4ed180174c" dependencies = [ "proc-macro2 1.0.51", "quote 1.0.23", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -2967,9 +2982,9 @@ dependencies = [ [[package]] name = "modularize_imports" -version = "0.26.5" +version = "0.26.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55be1dcd4c2fbc772547907920f80d4223693d7e338f906693999e4736ea72ec" +checksum = "9a0afe8dd51536ab2038f14324245d53effcc3934ba646479f28834744209a7c" dependencies = [ "convert_case 0.5.0", "handlebars", @@ -3024,7 +3039,7 @@ dependencies = [ "napi-derive-backend", "proc-macro2 1.0.51", "quote 1.0.23", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -3038,7 +3053,7 @@ dependencies = [ "proc-macro2 1.0.51", "quote 1.0.23", "regex", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -3115,6 +3130,9 @@ dependencies = [ "indexmap", "indoc", "mime", + "next-font", + "next-transform-dynamic", + "next-transform-strip-page-exports", "once_cell", "qstring", "regex", @@ -3217,7 +3235,6 @@ dependencies = [ [[package]] name = "next-font" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=8a8038f94#8a8038f94253de9cba026520b68f52964d2d2400" dependencies = [ "rustc-hash", "serde", @@ -3274,19 +3291,19 @@ dependencies = [ [[package]] name = "next-transform-dynamic" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=8a8038f94#8a8038f94253de9cba026520b68f52964d2d2400" dependencies = [ "pathdiff", "swc_core", + "testing", ] [[package]] name = "next-transform-strip-page-exports" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=8a8038f94#8a8038f94253de9cba026520b68f52964d2d2400" dependencies = [ "rustc-hash", "swc_core", + "testing", "tracing", ] @@ -3307,7 +3324,7 @@ dependencies = [ [[package]] name = "node-file-trace" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=8a8038f94#8a8038f94253de9cba026520b68f52964d2d2400" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230315.2#faaf54edfcc0a4d1c613f427e8e4e991f83bfa8b" dependencies = [ "anyhow", "clap 4.1.8", @@ -3483,7 +3500,7 @@ checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" dependencies = [ "proc-macro2 1.0.51", "quote 1.0.23", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -3633,7 +3650,7 @@ dependencies = [ "pest_meta", "proc-macro2 1.0.51", "quote 1.0.23", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -3689,7 +3706,7 @@ dependencies = [ "proc-macro-hack", "proc-macro2 1.0.51", "quote 1.0.23", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -3724,7 +3741,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ "proc-macro2 1.0.51", "quote 1.0.23", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -3781,7 +3798,7 @@ checksum = "3894e5d549cccbe44afecf72922f277f603cd4bb0219c8342631ef18fffbe004" dependencies = [ "proc-macro2 1.0.51", "quote 1.0.23", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -3870,7 +3887,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2 1.0.51", "quote 1.0.23", - "syn 1.0.107", + "syn 1.0.109", "version_check", ] @@ -3929,7 +3946,7 @@ dependencies = [ "itertools", "proc-macro2 1.0.51", "quote 1.0.23", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -3967,7 +3984,7 @@ checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" dependencies = [ "proc-macro2 1.0.51", "quote 1.0.23", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -4035,18 +4052,15 @@ dependencies = [ [[package]] name = "raw-window-handle" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed7e3d950b66e19e0c372f3fa3fbbcf85b1746b571f74e0c2af6042a5c93420a" -dependencies = [ - "cty", -] +checksum = "4f851a03551ceefd30132e447f07f96cb7011d6b658374f3aed847333adb5559" [[package]] name = "rayon" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" dependencies = [ "either", "rayon-core", @@ -4054,9 +4068,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.10.2" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "356a0625f1954f730c0201cdab48611198dc6ce21f4acff55089b5a78e6e835b" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" dependencies = [ "crossbeam-channel", "crossbeam-deque", @@ -4141,18 +4155,9 @@ dependencies = [ [[package]] name = "relative-path" -version = "1.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3bf6b372449361333ac1f498b7edae4dd5e70dccd7c0c2a7c7bce8f05ede648" - -[[package]] -name = "remove_dir_all" -version = "0.5.3" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi 0.3.9", -] +checksum = "4bf2521270932c3c7bed1a59151222bd7643c79310f2916f01925e1e16255698" [[package]] name = "rend" @@ -4242,7 +4247,7 @@ checksum = "e289706df51226e84814bf6ba1a9e1013112ae29bc7a9878f73fce360520c403" dependencies = [ "proc-macro2 1.0.51", "quote 1.0.23", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -4277,9 +4282,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.8" +version = "0.36.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644" +checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc" dependencies = [ "bitflags", "errno", @@ -4312,15 +4317,21 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70" +checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" [[package]] name = "ryu" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" + +[[package]] +name = "ryu-js" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6518fc26bced4d53678a22d6e423e9d8716377def84545fe328236e3af070e7f" [[package]] name = "same-file" @@ -4354,9 +4365,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "scratch" -version = "1.0.3" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" +checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" [[package]] name = "sct" @@ -4496,16 +4507,16 @@ dependencies = [ "serde", "serde_json", "thiserror", - "time 0.3.17", + "time 0.3.20", "url", "uuid", ] [[package]] name = "serde" -version = "1.0.152" +version = "1.0.156" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +checksum = "314b5b092c0ade17c00142951e50ced110ec27cea304b1037c6969246c2469a4" dependencies = [ "serde_derive", ] @@ -4532,20 +4543,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.152" +version = "1.0.156" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +checksum = "d7e29c4601e36bcec74a223228dce795f4cd3616341a4af93520ca1a837c087d" dependencies = [ "proc-macro2 1.0.51", "quote 1.0.23", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "serde_json" -version = "1.0.93" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76" +checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" dependencies = [ "indexmap", "itoa", @@ -4555,9 +4566,9 @@ dependencies = [ [[package]] name = "serde_path_to_error" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b04f22b563c91331a10074bda3dd5492e3cc39d56bd557e91c0af42b6c7341" +checksum = "db0969fff533976baadd92e08b1d102c5a3d8a8049eadfd69d4d1e3c5b2ed189" dependencies = [ "serde", ] @@ -4709,9 +4720,9 @@ checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" [[package]] name = "slab" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" dependencies = [ "autocfg", ] @@ -4733,6 +4744,17 @@ version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +[[package]] +name = "smartstring" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" +dependencies = [ + "autocfg", + "static_assertions", + "version_check", +] + [[package]] name = "smawk" version = "0.3.1" @@ -4741,9 +4763,9 @@ checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043" [[package]] name = "socket2" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi 0.3.9", @@ -4751,11 +4773,11 @@ dependencies = [ [[package]] name = "sourcemap" -version = "6.2.1" +version = "6.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aebe057d110ddba043708da3fb010bf562ff6e9d4d60c9ee92860527bcbeccd6" +checksum = "eed16231c92d0a6f0388f56e0ab2be24ecff1173f8e22f0ea5e074d0525631cb" dependencies = [ - "base64 0.13.1", + "data-encoding", "if_chain", "rustc_version 0.2.3", "serde", @@ -4817,7 +4839,7 @@ dependencies = [ "pmutil", "proc-macro2 1.0.51", "quote 1.0.23", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -4850,7 +4872,7 @@ dependencies = [ "quote 1.0.23", "serde", "serde_derive", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -4866,7 +4888,7 @@ dependencies = [ "serde_derive", "serde_json", "sha1 0.6.1", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -4877,9 +4899,9 @@ checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" [[package]] name = "string_cache" -version = "0.8.4" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08" +checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" dependencies = [ "new_debug_unreachable", "once_cell", @@ -4903,15 +4925,15 @@ dependencies = [ [[package]] name = "string_enum" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "994453cd270ad0265796eb24abf5540091ed03e681c5f3c12bc33e4db33253e1" +checksum = "41491e23e7db79343236a6ced96325ff132eb09e29ac4c5b8132b9c55aaaae89" dependencies = [ "pmutil", "proc-macro2 1.0.51", "quote 1.0.23", "swc_macros_common", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -4922,9 +4944,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "styled_components" -version = "0.53.5" +version = "0.53.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b7efbc9348e11cd925b98e7dd95eec9dfecc4617a6732d7053aeb331ba09453" +checksum = "d5e4d3762e21cd415d838b60b9007e2de112203f096f1c68aef32eb3465ef5d8" dependencies = [ "Inflector", "once_cell", @@ -4936,9 +4958,9 @@ dependencies = [ [[package]] name = "styled_jsx" -version = "0.30.5" +version = "0.30.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdce2f34b7e8d65aeee155d4656f4c5e955a195ff0d3655c40077ec1f46d5269" +checksum = "a95db8d0df1301fa85243cbd0fbe3328a12d1e0d48eac0638d3dc295d4d7811c" dependencies = [ "easy-error", "swc_core", @@ -4981,9 +5003,9 @@ dependencies = [ [[package]] name = "swc" -version = "0.245.27" +version = "0.255.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9d2f031b4789c58ba260ea1c5fc86fdcf849000490fd32158b9ae60cacbe57b" +checksum = "b1e71658e15d689c1eb1a8706b0bb102b5e7c857cf90c2e4def40d5185b6bf5c" dependencies = [ "ahash", "anyhow", @@ -5033,9 +5055,9 @@ dependencies = [ [[package]] name = "swc_atoms" -version = "0.4.36" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10ad195f903dd49e76fd93bc02c4d5fdb34287f9847f73d26c2097090db7cac3" +checksum = "2ebef84c2948cd0d1ba25acbf1b4bd9d80ab6f057efdbe35d8449b8d54699401" dependencies = [ "once_cell", "rkyv", @@ -5048,9 +5070,9 @@ dependencies = [ [[package]] name = "swc_bundler" -version = "0.199.22" +version = "0.208.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8ef5324a3dc498d22e4c7f7d504a14dc488dd876a10569acbdbeb064f37a08f" +checksum = "5adaebcfcb3ebc1b4d6418838250bb12f257bab9277fa2b2c61bb3324152c78f" dependencies = [ "ahash", "anyhow", @@ -5095,9 +5117,9 @@ dependencies = [ [[package]] name = "swc_common" -version = "0.29.31" +version = "0.29.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66c967c1c2f17fac8969831752560289e377712091003bdd1af6f025f2d70dc2" +checksum = "5005cd73617e18592faa31298225b26f1c407b84a681d67efb735c3d3458e101" dependencies = [ "ahash", "anyhow", @@ -5148,14 +5170,14 @@ dependencies = [ "proc-macro2 1.0.51", "quote 1.0.23", "swc_macros_common", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "swc_core" -version = "0.59.29" +version = "0.69.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92129c987aad8dad654fb536a202430a3b8e3a2ab1bd3c54066a2e17857d81a1" +checksum = "7636640b21db7639b4bb485f9c6e0420fc340dea8ee7e4b43aa653980b8fe4be" dependencies = [ "binding_macros", "swc", @@ -5199,9 +5221,9 @@ dependencies = [ [[package]] name = "swc_css_ast" -version = "0.134.4" +version = "0.134.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9ab4363b6b8b26ff4f5f6c1aecd8def7b603a0f71d8e819dff1d2b894c13c8" +checksum = "b00eeb01472c11945107c881525e6ce89c2596cf7965e51f847a8029916ce7e9" dependencies = [ "is-macro", "serde", @@ -5212,9 +5234,9 @@ dependencies = [ [[package]] name = "swc_css_codegen" -version = "0.144.4" +version = "0.144.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f50bd37223d618de0886e8784bfae56408945a409ee0f41eed92e75dc02cbc98" +checksum = "6b065170be02e897c6432eb0d434a91bf45c9c22e72e2fc0bb8982238fd777a0" dependencies = [ "auto_impl", "bitflags", @@ -5237,14 +5259,14 @@ dependencies = [ "proc-macro2 1.0.51", "quote 1.0.23", "swc_macros_common", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "swc_css_compat" -version = "0.20.4" +version = "0.20.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46ae8a1ae72baf664797736662416f9d468a9bf74e3fe67fe59c7caab00c3cb8" +checksum = "dd067de48dc56a831e4d2c4f6af85911e6e433bfe4ec58851add31a15efc48e1" dependencies = [ "bitflags", "once_cell", @@ -5259,9 +5281,9 @@ dependencies = [ [[package]] name = "swc_css_modules" -version = "0.21.5" +version = "0.21.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeb444c980ee7fb17a9602b35d54f26b4fd9fc08e4404941ec6d291e8f699344" +checksum = "f7dc9e75708f5b156513996634a27f4e50cf87bd526fac6c0814ca754b991ca7" dependencies = [ "rustc-hash", "serde", @@ -5275,9 +5297,9 @@ dependencies = [ [[package]] name = "swc_css_parser" -version = "0.143.4" +version = "0.143.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c469ae61eff63f44551ad00b083a0c7321d1ea38b0840e59f2f5fb1aab8b8301" +checksum = "9e77940eb1bd7ecde34e4a82edb6d083b8bc231a034452e87c408422da3403fa" dependencies = [ "bitflags", "lexical", @@ -5289,9 +5311,9 @@ dependencies = [ [[package]] name = "swc_css_prefixer" -version = "0.146.4" +version = "0.146.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f3a31861304a2b87610508888637d11c40bd21860344e9c039414f6fbb99472" +checksum = "cb87426f777b6039936b67973cc1eddcf6907a3f650619f74fcf794bd9697c95" dependencies = [ "once_cell", "preset_env_base", @@ -5306,9 +5328,9 @@ dependencies = [ [[package]] name = "swc_css_utils" -version = "0.131.4" +version = "0.131.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "623450d1be558756f768eabd203b1dbdace96bb9b9e5e90b83aa3e097513f94e" +checksum = "7a18df9c717eec8ff9760a27c7337c507a10b23ec301dbc23249dadf7ba78524" dependencies = [ "once_cell", "serde", @@ -5321,9 +5343,9 @@ dependencies = [ [[package]] name = "swc_css_visit" -version = "0.133.4" +version = "0.133.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a287fac7313fd6fc67d7fca15d9778d62ea642664bdce022432a3390da024e8" +checksum = "bc2080e5a67f015365661e5bd26cd7d8cf766395eaa9c4dc95ef58054af624e3" dependencies = [ "serde", "swc_atoms", @@ -5334,9 +5356,9 @@ dependencies = [ [[package]] name = "swc_ecma_ast" -version = "0.96.5" +version = "0.100.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84192270c26fc125494ee8895baabf480a95ef8ef83fefb79a94d9fe90c5eb1b" +checksum = "7dbfdbe05dde274473a6030dcf5e52e579516aea761d25d7a8d128f2ab597f09" dependencies = [ "bitflags", "is-macro", @@ -5352,9 +5374,9 @@ dependencies = [ [[package]] name = "swc_ecma_codegen" -version = "0.129.12" +version = "0.135.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e212d95f6f7d99c8f983e6978a740ef5ffdc16312f5ce931dd587b455fa126b0" +checksum = "78d196e6979af0cbb91084361ca006db292a6374f75ec04cbb55306051cc4f50" dependencies = [ "memchr", "num-bigint", @@ -5379,14 +5401,14 @@ dependencies = [ "proc-macro2 1.0.51", "quote 1.0.23", "swc_macros_common", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "swc_ecma_ext_transforms" -version = "0.93.9" +version = "0.99.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f42ee0de612c77b1df9b206f1b9955acadbf2e4f1ea715cb2fc438c1ae8c49" +checksum = "b7a44571524cc41f43f95327b5a1fce6a13b8559211f206c7c8094dbd4ec601f" dependencies = [ "phf", "swc_atoms", @@ -5398,9 +5420,9 @@ dependencies = [ [[package]] name = "swc_ecma_lints" -version = "0.71.9" +version = "0.77.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbf4b84b4caf7b08f90da1ecd19d99401f3339a56a24b1f79402bf98600672a1" +checksum = "1ccf829a21404d67a6319b43d2e28e2396fa19a926d0250699dcda815d17fb80" dependencies = [ "ahash", "auto_impl", @@ -5419,9 +5441,9 @@ dependencies = [ [[package]] name = "swc_ecma_loader" -version = "0.41.33" +version = "0.41.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05a87fb2eabb07f68065496d9d1187a5f0f290e99807e5e24835b38770eb03b9" +checksum = "681c1fbb762c82700a5bd23dc39bad892a287ea9fb2121cf56e77f1ddc89afeb" dependencies = [ "ahash", "anyhow", @@ -5441,9 +5463,9 @@ dependencies = [ [[package]] name = "swc_ecma_minifier" -version = "0.166.22" +version = "0.175.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b3e2383a974cc51e82969be1615bfdf8cb954767fdc884d6b8b43a590f67a5" +checksum = "988c3b9ff43c2dd1647afb5224a63e7fe2f70bb1b5a596caff5754a5cf0acd42" dependencies = [ "ahash", "arrayvec", @@ -5456,6 +5478,7 @@ dependencies = [ "rayon", "regex", "rustc-hash", + "ryu-js", "serde", "serde_json", "swc_atoms", @@ -5476,9 +5499,9 @@ dependencies = [ [[package]] name = "swc_ecma_parser" -version = "0.124.9" +version = "0.130.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd431de25e6c311ffa7dd4d01907d602e5e32311dc5d9bd73cc0993b15a4c069" +checksum = "042435aaeb71c4416cde440323ac9fa2c24121c2ec150f0cb79999c2e6ceffaa" dependencies = [ "either", "enum_kind", @@ -5486,6 +5509,7 @@ dependencies = [ "num-bigint", "serde", "smallvec", + "smartstring", "stacker", "swc_atoms", "swc_common", @@ -5496,9 +5520,9 @@ dependencies = [ [[package]] name = "swc_ecma_preset_env" -version = "0.180.21" +version = "0.189.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ace89e7708e03e98fe2c6402ee94438f6ef71f94bc6df6440f40e09c469ada63" +checksum = "99c29560d4b7d011936068a34f62e06f9882f10bc0ca21f59f23295f7ffc4592" dependencies = [ "ahash", "anyhow", @@ -5521,9 +5545,9 @@ dependencies = [ [[package]] name = "swc_ecma_quote_macros" -version = "0.35.9" +version = "0.41.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f861c0631c00f1062c3035d8d0b58ebbeee0b53622ae597b394b2524ed2162f" +checksum = "9c9be9e04f5baca8b0c8f837eb944844c3f1f54f76918c098dfc6ff007b3c58a" dependencies = [ "anyhow", "pmutil", @@ -5534,7 +5558,7 @@ dependencies = [ "swc_ecma_ast", "swc_ecma_parser", "swc_macros_common", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -5551,9 +5575,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms" -version = "0.203.19" +version = "0.212.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4bbd354506a8e6def12f8ba70daf543e2e4ad318ec36009e2568d4e2a4d06a8" +checksum = "23ff3c3edd36cbffd22afb1523589cf479c1336468ff68e66a0c5845f0824136" dependencies = [ "swc_atoms", "swc_common", @@ -5571,9 +5595,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_base" -version = "0.116.9" +version = "0.122.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a27e0d34b6fcf88b71772810c7bc1e1542a0eb5c665c9531bd76797ea1fcdba" +checksum = "fd4141092b17cd85eefc224b035b717e03c910b9fd58e4e637ffd05236d7e13b" dependencies = [ "better_scoped_tls", "bitflags", @@ -5594,9 +5618,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_classes" -version = "0.105.9" +version = "0.111.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fa609a3fb7777affe70f34978b6714c6db949129f1df13fb2cae992fa3825c" +checksum = "b5022c592f0ae17f4dc42031e1c4c60b7e6d2d8d1c2428b986759a92ea853801" dependencies = [ "swc_atoms", "swc_common", @@ -5608,9 +5632,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_compat" -version = "0.141.11" +version = "0.148.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3d5c1f058481b9f2c36e04c579feab09ea05ad38ba5734c9bf019b90615a8c" +checksum = "55fa22cc1600ae6c543b1a259e479f424d7925ad93bd2d5dd10e5ac8cbf8c3c3" dependencies = [ "ahash", "arrayvec", @@ -5643,14 +5667,14 @@ dependencies = [ "proc-macro2 1.0.51", "quote 1.0.23", "swc_macros_common", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "swc_ecma_transforms_module" -version = "0.158.14" +version = "0.165.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb8c1afcc5f82f1bc2416edfb7b36b53b15a8cf36b54c04f76dd28e5636092c5" +checksum = "ebd383aeb03aed8e5f5530bef9c47e9ef2bd11d20ef5c4095f015e3b97c7c64c" dependencies = [ "Inflector", "ahash", @@ -5676,9 +5700,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_optimization" -version = "0.172.19" +version = "0.181.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca7cf32f454ffa34334056f46255d8063b68696377eb15d1c75c8d3ca8b76e20" +checksum = "584b8d5b1ea8d174453eeff6abb66ed2e58cbd67b6e83a4d4b8154b463ef4dd3" dependencies = [ "ahash", "dashmap", @@ -5702,9 +5726,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_proposal" -version = "0.149.12" +version = "0.156.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbb6e441289c0eeb660bb5ab26ba809424ab6a6a33d4aafd3895826dd7416d40" +checksum = "f4015c3ab090f27eee0834d45bdcf9666dc6329ed06845d1882cdfe6f4826fca" dependencies = [ "either", "serde", @@ -5721,9 +5745,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_react" -version = "0.160.15" +version = "0.167.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba449585fb13b9c09f0930d7dc6dd86ddba0a4bde28f35fd8bf10da3ced55ae1" +checksum = "db1c7801b1d7741ab335441dd301ddcc4183fb250d5e6efaab33b03def268c06" dependencies = [ "ahash", "base64 0.13.1", @@ -5748,9 +5772,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_testing" -version = "0.119.9" +version = "0.125.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be51347a017ba17f6d53c3ac2053e7ecfbebdd9a8b0f199d181375a517a0fa0" +checksum = "6e91bd2d3ab3607e92f3e9d3a2b923073914665c964ff5e3ec5d61430ce2a82e" dependencies = [ "ansi_term", "anyhow", @@ -5774,9 +5798,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_typescript" -version = "0.164.18" +version = "0.171.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bbcdb1754023814ab9f442a7b66c4147b351afa1d4dcce85c9e292aa6265983" +checksum = "142e8fb5ebe870bc51b3a95c0214af9112d3475b7cd5be4f13b87f3be664841a" dependencies = [ "serde", "swc_atoms", @@ -5790,9 +5814,9 @@ dependencies = [ [[package]] name = "swc_ecma_usage_analyzer" -version = "0.3.7" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bf4df64386936969b4867c29a6ffbebcaec6407b6d92cea783467d520a733d" +checksum = "8f50c51a53b5be1892cc07e79a060bd8fdaed46fbdd4406bd9c2a6630c187094" dependencies = [ "ahash", "indexmap", @@ -5808,9 +5832,9 @@ dependencies = [ [[package]] name = "swc_ecma_utils" -version = "0.107.9" +version = "0.113.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7893e70f71921df77bc5aac7b9c4637de2ee3f4f578e2f06fa64cc19c92f3b1c" +checksum = "4c44885603c09926118708f4352e04242c2482bc16eb51ad7beb8ad4cf5f7bb6" dependencies = [ "indexmap", "num_cpus", @@ -5827,9 +5851,9 @@ dependencies = [ [[package]] name = "swc_ecma_visit" -version = "0.82.5" +version = "0.86.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4519c4c16025f17aaa23251dd7f1e464dbecb33b5adbbfe0318ec9554d5324ec" +checksum = "147cf9137da6fe2704a5defd29a1cde849961978f8c92911e6790d50df475fef" dependencies = [ "num-bigint", "swc_atoms", @@ -5841,9 +5865,9 @@ dependencies = [ [[package]] name = "swc_emotion" -version = "0.29.5" +version = "0.29.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dc1cd067f6a411f26090e54d6a8d967c075a1b1e46e23cdabcecf65df388de6" +checksum = "4b32d130dc10d63b2f6ccf8d59c693748f0b41ed80ae79df56476f69ac687c9b" dependencies = [ "base64 0.13.1", "byteorder", @@ -5866,14 +5890,14 @@ dependencies = [ "pmutil", "proc-macro2 1.0.51", "quote 1.0.23", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "swc_error_reporters" -version = "0.13.32" +version = "0.13.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da4d20e5079a9c29de7b959a42aae34e14985499273dc248b868bae2dd3fa633" +checksum = "e5652942f29f76b08bc2a23228e87c8dff1f037de17d18166753e90f4baacf61" dependencies = [ "anyhow", "miette", @@ -5884,9 +5908,9 @@ dependencies = [ [[package]] name = "swc_fast_graph" -version = "0.17.32" +version = "0.17.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc30b5e4509d3ed9e43ba84f04e6faff335c33f1591b1f0c2634fc4ebc7e7f5d" +checksum = "e3a720ad8028d6c6e992039c862ed7318d143dee3994929793f59067fd69600b" dependencies = [ "ahash", "indexmap", @@ -5896,9 +5920,9 @@ dependencies = [ [[package]] name = "swc_graph_analyzer" -version = "0.18.34" +version = "0.18.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66e212bbbaafdd6cfbb70736af56a77144f5697e57226af5c6345439d31da875" +checksum = "a8669bea09e5f7795ab2262087e548a1496672d10327d532f26a142e8e5fe9c0" dependencies = [ "ahash", "auto_impl", @@ -5916,7 +5940,7 @@ dependencies = [ "pmutil", "proc-macro2 1.0.51", "quote 1.0.23", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -5931,9 +5955,9 @@ dependencies = [ [[package]] name = "swc_node_comments" -version = "0.16.31" +version = "0.16.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00ab278f56cf436c33c3bd71557d2b576149602ebb14b388b630c883ef3929da" +checksum = "c762f79bc1f940df95655603298b3ea382765185e091360d7f895475a5437a92" dependencies = [ "ahash", "dashmap", @@ -5957,9 +5981,9 @@ dependencies = [ [[package]] name = "swc_plugin_proxy" -version = "0.25.3" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c87d6af1ac8e2d3dc1f00b4e15650a2725f782454ad2b4dc374cee77ab7607" +checksum = "44e93c0ad5ec20f6d9d275fc26bd4236511727a569c638a31381a37c58934d54" dependencies = [ "better_scoped_tls", "rkyv", @@ -5971,9 +5995,9 @@ dependencies = [ [[package]] name = "swc_plugin_runner" -version = "0.85.10" +version = "0.91.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab84becbc9c2ee93997a4c42392736817363a0ff56b15cce914e00ffa42f5a14" +checksum = "ce0dc5a3847776e684ac334884932e38bd885890f8975dd5f2e316ed7d7a6af3" dependencies = [ "anyhow", "enumset", @@ -5994,9 +6018,9 @@ dependencies = [ [[package]] name = "swc_timer" -version = "0.17.33" +version = "0.17.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13ffc2a454f3df82f19268984953b2e37be9a40166bccd3d53611ef78cea793a" +checksum = "a9499135206c03f84a565beb2bf50214ba125bf531ff0d2e45b830d58bbf370b" dependencies = [ "tracing", ] @@ -6009,7 +6033,7 @@ checksum = "a4795c8d23e0de62eef9cac0a20ae52429ee2ffc719768e838490f195b7d7267" dependencies = [ "proc-macro2 1.0.51", "quote 1.0.23", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -6033,7 +6057,7 @@ dependencies = [ "proc-macro2 1.0.51", "quote 1.0.23", "swc_macros_common", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -6049,9 +6073,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.107" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2 1.0.51", "quote 1.0.23", @@ -6072,16 +6096,15 @@ checksum = "8ae9980cab1db3fceee2f6c6f643d5d8de2997c58ee8d25fb0cc8a9e9e7348e5" [[package]] name = "tempfile" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" dependencies = [ "cfg-if 1.0.0", "fastrand", - "libc", "redox_syscall 0.2.16", - "remove_dir_all", - "winapi 0.3.9", + "rustix", + "windows-sys 0.42.0", ] [[package]] @@ -6128,9 +6151,9 @@ dependencies = [ [[package]] name = "testing" -version = "0.31.33" +version = "0.31.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39474317ceaad57c5d26b830f9573317967ff0b2d10273a5060b7d7fb7ba27cd" +checksum = "35fe40c981fab28b566fe4f346ded8d507043b7003ddcf29a612e117a51ba5ae" dependencies = [ "ansi_term", "difference", @@ -6159,7 +6182,7 @@ dependencies = [ "quote 1.0.23", "regex", "relative-path", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -6181,22 +6204,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.38" +version = "1.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +checksum = "a5ab016db510546d856297882807df8da66a16fb8c4101cb8b30054b0d5b2d9c" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.38" +version = "1.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e" dependencies = [ "proc-macro2 1.0.51", "quote 1.0.23", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -6258,14 +6281,14 @@ dependencies = [ [[package]] name = "time" -version = "0.3.17" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" +checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" dependencies = [ "itoa", "serde", "time-core", - "time-macros 0.2.6", + "time-macros 0.2.8", ] [[package]] @@ -6286,9 +6309,9 @@ dependencies = [ [[package]] name = "time-macros" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" dependencies = [ "time-core", ] @@ -6303,7 +6326,7 @@ dependencies = [ "proc-macro2 1.0.51", "quote 1.0.23", "standback", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -6342,9 +6365,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.25.0" +version = "1.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af" +checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64" dependencies = [ "autocfg", "bytes", @@ -6358,7 +6381,7 @@ dependencies = [ "socket2", "tokio-macros", "tracing", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -6379,7 +6402,7 @@ checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" dependencies = [ "proc-macro2 1.0.51", "quote 1.0.23", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -6405,9 +6428,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce" +checksum = "8fb52b74f05dbf495a8fba459fdc331812b96aa086d9eb78101fa0d4569c3313" dependencies = [ "futures-core", "pin-project-lite", @@ -6553,7 +6576,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2 1.0.51", "quote 1.0.23", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] @@ -6673,7 +6696,7 @@ dependencies = [ [[package]] name = "turbo-malloc" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=8a8038f94#8a8038f94253de9cba026520b68f52964d2d2400" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230315.2#faaf54edfcc0a4d1c613f427e8e4e991f83bfa8b" dependencies = [ "mimalloc", ] @@ -6681,7 +6704,7 @@ dependencies = [ [[package]] name = "turbo-tasks" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=8a8038f94#8a8038f94253de9cba026520b68f52964d2d2400" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230315.2#faaf54edfcc0a4d1c613f427e8e4e991f83bfa8b" dependencies = [ "anyhow", "auto-hash-map", @@ -6711,19 +6734,19 @@ dependencies = [ [[package]] name = "turbo-tasks-build" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=8a8038f94#8a8038f94253de9cba026520b68f52964d2d2400" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230315.2#faaf54edfcc0a4d1c613f427e8e4e991f83bfa8b" dependencies = [ "anyhow", "cargo-lock", "glob", - "syn 1.0.107", + "syn 1.0.109", "turbo-tasks-macros-shared", ] [[package]] name = "turbo-tasks-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=8a8038f94#8a8038f94253de9cba026520b68f52964d2d2400" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230315.2#faaf54edfcc0a4d1c613f427e8e4e991f83bfa8b" dependencies = [ "anyhow", "dotenvy", @@ -6737,7 +6760,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fetch" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=8a8038f94#8a8038f94253de9cba026520b68f52964d2d2400" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230315.2#faaf54edfcc0a4d1c613f427e8e4e991f83bfa8b" dependencies = [ "anyhow", "indexmap", @@ -6754,7 +6777,7 @@ dependencies = [ [[package]] name = "turbo-tasks-fs" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=8a8038f94#8a8038f94253de9cba026520b68f52964d2d2400" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230315.2#faaf54edfcc0a4d1c613f427e8e4e991f83bfa8b" dependencies = [ "anyhow", "auto-hash-map", @@ -6782,7 +6805,7 @@ dependencies = [ [[package]] name = "turbo-tasks-hash" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=8a8038f94#8a8038f94253de9cba026520b68f52964d2d2400" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230315.2#faaf54edfcc0a4d1c613f427e8e4e991f83bfa8b" dependencies = [ "base16", "hex", @@ -6794,31 +6817,31 @@ dependencies = [ [[package]] name = "turbo-tasks-macros" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=8a8038f94#8a8038f94253de9cba026520b68f52964d2d2400" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230315.2#faaf54edfcc0a4d1c613f427e8e4e991f83bfa8b" dependencies = [ "anyhow", "convert_case 0.6.0", "proc-macro-error", "proc-macro2 1.0.51", "quote 1.0.23", - "syn 1.0.107", + "syn 1.0.109", "turbo-tasks-macros-shared", ] [[package]] name = "turbo-tasks-macros-shared" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=8a8038f94#8a8038f94253de9cba026520b68f52964d2d2400" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230315.2#faaf54edfcc0a4d1c613f427e8e4e991f83bfa8b" dependencies = [ "proc-macro2 1.0.51", "quote 1.0.23", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] name = "turbo-tasks-memory" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=8a8038f94#8a8038f94253de9cba026520b68f52964d2d2400" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230315.2#faaf54edfcc0a4d1c613f427e8e4e991f83bfa8b" dependencies = [ "anyhow", "auto-hash-map", @@ -6840,7 +6863,7 @@ dependencies = [ [[package]] name = "turbo-tasks-testing" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=8a8038f94#8a8038f94253de9cba026520b68f52964d2d2400" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230315.2#faaf54edfcc0a4d1c613f427e8e4e991f83bfa8b" dependencies = [ "anyhow", "auto-hash-map", @@ -6852,7 +6875,7 @@ dependencies = [ [[package]] name = "turbopack" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=8a8038f94#8a8038f94253de9cba026520b68f52964d2d2400" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230315.2#faaf54edfcc0a4d1c613f427e8e4e991f83bfa8b" dependencies = [ "anyhow", "async-recursion", @@ -6878,7 +6901,7 @@ dependencies = [ [[package]] name = "turbopack-cli-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=8a8038f94#8a8038f94253de9cba026520b68f52964d2d2400" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230315.2#faaf54edfcc0a4d1c613f427e8e4e991f83bfa8b" dependencies = [ "anyhow", "clap 4.1.8", @@ -6894,7 +6917,7 @@ dependencies = [ [[package]] name = "turbopack-core" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=8a8038f94#8a8038f94253de9cba026520b68f52964d2d2400" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230315.2#faaf54edfcc0a4d1c613f427e8e4e991f83bfa8b" dependencies = [ "anyhow", "async-trait", @@ -6921,7 +6944,7 @@ dependencies = [ [[package]] name = "turbopack-create-test-app" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=8a8038f94#8a8038f94253de9cba026520b68f52964d2d2400" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230315.2#faaf54edfcc0a4d1c613f427e8e4e991f83bfa8b" dependencies = [ "anyhow", "clap 4.1.8", @@ -6934,7 +6957,7 @@ dependencies = [ [[package]] name = "turbopack-css" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=8a8038f94#8a8038f94253de9cba026520b68f52964d2d2400" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230315.2#faaf54edfcc0a4d1c613f427e8e4e991f83bfa8b" dependencies = [ "anyhow", "async-trait", @@ -6956,7 +6979,7 @@ dependencies = [ [[package]] name = "turbopack-dev-server" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=8a8038f94#8a8038f94253de9cba026520b68f52964d2d2400" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230315.2#faaf54edfcc0a4d1c613f427e8e4e991f83bfa8b" dependencies = [ "anyhow", "async-compression", @@ -6988,16 +7011,13 @@ dependencies = [ [[package]] name = "turbopack-ecmascript" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=8a8038f94#8a8038f94253de9cba026520b68f52964d2d2400" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230315.2#faaf54edfcc0a4d1c613f427e8e4e991f83bfa8b" dependencies = [ "anyhow", "async-trait", "indexmap", "indoc", "lazy_static", - "next-font", - "next-transform-dynamic", - "next-transform-strip-page-exports", "num-bigint", "num-traits", "once_cell", @@ -7026,7 +7046,7 @@ dependencies = [ [[package]] name = "turbopack-env" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=8a8038f94#8a8038f94253de9cba026520b68f52964d2d2400" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230315.2#faaf54edfcc0a4d1c613f427e8e4e991f83bfa8b" dependencies = [ "anyhow", "serde", @@ -7041,7 +7061,7 @@ dependencies = [ [[package]] name = "turbopack-json" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=8a8038f94#8a8038f94253de9cba026520b68f52964d2d2400" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230315.2#faaf54edfcc0a4d1c613f427e8e4e991f83bfa8b" dependencies = [ "anyhow", "serde", @@ -7056,7 +7076,7 @@ dependencies = [ [[package]] name = "turbopack-mdx" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=8a8038f94#8a8038f94253de9cba026520b68f52964d2d2400" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230315.2#faaf54edfcc0a4d1c613f427e8e4e991f83bfa8b" dependencies = [ "anyhow", "mdxjs", @@ -7071,7 +7091,7 @@ dependencies = [ [[package]] name = "turbopack-node" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=8a8038f94#8a8038f94253de9cba026520b68f52964d2d2400" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230315.2#faaf54edfcc0a4d1c613f427e8e4e991f83bfa8b" dependencies = [ "anyhow", "futures", @@ -7097,7 +7117,7 @@ dependencies = [ [[package]] name = "turbopack-static" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=8a8038f94#8a8038f94253de9cba026520b68f52964d2d2400" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230315.2#faaf54edfcc0a4d1c613f427e8e4e991f83bfa8b" dependencies = [ "anyhow", "serde", @@ -7113,7 +7133,7 @@ dependencies = [ [[package]] name = "turbopack-swc-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=8a8038f94#8a8038f94253de9cba026520b68f52964d2d2400" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230315.2#faaf54edfcc0a4d1c613f427e8e4e991f83bfa8b" dependencies = [ "swc_core", "turbo-tasks", @@ -7124,7 +7144,7 @@ dependencies = [ [[package]] name = "turbopack-test-utils" version = "0.1.0" -source = "git+https://github.com/vercel/turbo.git?rev=8a8038f94#8a8038f94253de9cba026520b68f52964d2d2400" +source = "git+https://github.com/vercel/turbo.git?tag=turbopack-230315.2#faaf54edfcc0a4d1c613f427e8e4e991f83bfa8b" dependencies = [ "anyhow", "once_cell", @@ -7142,7 +7162,7 @@ version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 0.1.10", "rand", "static_assertions", ] @@ -7197,9 +7217,9 @@ checksum = "d70b6494226b36008c8366c288d77190b3fad2eb4c10533139c1c1f461127f1a" [[package]] name = "unicode-ident" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" [[package]] name = "unicode-linebreak" @@ -7320,11 +7340,11 @@ checksum = "f21b881cd6636ece9735721cf03c1fe1e774fe258683d084bb2812ab67435749" dependencies = [ "anyhow", "cfg-if 1.0.0", - "enum-iterator 1.3.0", + "enum-iterator 1.4.0", "getset", "rustversion", "thiserror", - "time 0.3.17", + "time 0.3.20", ] [[package]] @@ -7414,7 +7434,7 @@ dependencies = [ "once_cell", "proc-macro2 1.0.51", "quote 1.0.23", - "syn 1.0.107", + "syn 1.0.109", "wasm-bindgen-shared", ] @@ -7448,7 +7468,7 @@ checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2 1.0.51", "quote 1.0.23", - "syn 1.0.107", + "syn 1.0.109", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -7568,7 +7588,7 @@ dependencies = [ "proc-macro-error", "proc-macro2 1.0.51", "quote 1.0.23", - "syn 1.0.107", + "syn 1.0.109", ] [[package]] diff --git a/packages/next-swc/Cargo.toml b/packages/next-swc/Cargo.toml index eb7f8f452be41..d77df6823513b 100644 --- a/packages/next-swc/Cargo.toml +++ b/packages/next-swc/Cargo.toml @@ -8,9 +8,9 @@ members = [ "crates/next-core", "crates/next-dev", "crates/next-dev-tests", - # "crates/next-font", - # "crates/next-transform-dynamic", - # "crates/next-transform-strip-page-exports", + "crates/next-font", + "crates/next-transform-dynamic", + "crates/next-transform-strip-page-exports", ] [profile.dev.package.swc_css_prefixer] @@ -26,55 +26,55 @@ lto = true [workspace.dependencies] # Workspace crates next-binding = { path = "crates/next-binding" } -next-core = { path = "crates/next-core" } +next-core = { path = "crates/next-core", default-features = false } next-dev = { path = "crates/next-dev" } next-dev-tests = { path = "crates/next-dev-tests" } -# next-font = { path = "crates/next-font" } -# next-transform-dynamic = { path = "crates/next-transform-dynamic" } -# next-transform-strip-page-exports = { path = "crates/next-transform-strip-page-exports" } +next-font = { path = "crates/next-font" } +next-transform-dynamic = { path = "crates/next-transform-dynamic" } +next-transform-strip-page-exports = { path = "crates/next-transform-strip-page-exports" } # SWC crates # Keep consistent with preset_env_base through swc_core browserslist-rs = { version = "0.12.2" } -mdxjs = { version = "0.1.6" } -modularize_imports = { version = "0.26.4" } -styled_components = { version = "0.53.4" } -styled_jsx = { version = "0.30.4" } -swc_core = { version = "0.59.26" } -swc_emotion = { version = "0.29.4" } +mdxjs = { version = "0.1.8" } +modularize_imports = { version = "0.26.10" } +styled_components = { version = "0.53.10" } +styled_jsx = { version = "0.30.10" } +swc_core = { version = "0.69.6" } +swc_emotion = { version = "0.29.10" } testing = { version = "0.31.31" } # Turbo crates -auto-hash-map = { git = "https://github.com/vercel/turbo.git", rev = "8a8038f94" } -node-file-trace = { git = "https://github.com/vercel/turbo.git", rev = "8a8038f94" } -swc-ast-explorer = { git = "https://github.com/vercel/turbo.git", rev = "8a8038f94" } -turbo-malloc = { git = "https://github.com/vercel/turbo.git", rev = "8a8038f94", default-features = false } -turbo-tasks = { git = "https://github.com/vercel/turbo.git", rev = "8a8038f94" } -turbo-tasks-build = { git = "https://github.com/vercel/turbo.git", rev = "8a8038f94" } -turbo-tasks-env = { git = "https://github.com/vercel/turbo.git", rev = "8a8038f94" } -turbo-tasks-fetch = { git = "https://github.com/vercel/turbo.git", rev = "8a8038f94" } -turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", rev = "8a8038f94" } -turbo-tasks-hash = { git = "https://github.com/vercel/turbo.git", rev = "8a8038f94" } -turbo-tasks-macros = { git = "https://github.com/vercel/turbo.git", rev = "8a8038f94" } -turbo-tasks-macros-shared = { git = "https://github.com/vercel/turbo.git", rev = "8a8038f94" } -turbo-tasks-memory = { git = "https://github.com/vercel/turbo.git", rev = "8a8038f94" } -turbo-tasks-testing = { git = "https://github.com/vercel/turbo.git", rev = "8a8038f94" } -turbo-updater = { git = "https://github.com/vercel/turbo.git", rev = "8a8038f94" } -turbopack = { git = "https://github.com/vercel/turbo.git", rev = "8a8038f94" } -turbopack-cli-utils = { git = "https://github.com/vercel/turbo.git", rev = "8a8038f94" } -turbopack-core = { git = "https://github.com/vercel/turbo.git", rev = "8a8038f94" } -turbopack-create-test-app = { git = "https://github.com/vercel/turbo.git", rev = "8a8038f94" } -turbopack-css = { git = "https://github.com/vercel/turbo.git", rev = "8a8038f94" } -turbopack-dev-server = { git = "https://github.com/vercel/turbo.git", rev = "8a8038f94" } -turbopack-ecmascript = { git = "https://github.com/vercel/turbo.git", rev = "8a8038f94" } -turbopack-env = { git = "https://github.com/vercel/turbo.git", rev = "8a8038f94" } -turbopack-json = { git = "https://github.com/vercel/turbo.git", rev = "8a8038f94" } -turbopack-mdx = { git = "https://github.com/vercel/turbo.git", rev = "8a8038f94" } -turbopack-node = { git = "https://github.com/vercel/turbo.git", rev = "8a8038f94" } -turbopack-static = { git = "https://github.com/vercel/turbo.git", rev = "8a8038f94" } -turbopack-swc-utils = { git = "https://github.com/vercel/turbo.git", rev = "8a8038f94" } -turbopack-test-utils = { git = "https://github.com/vercel/turbo.git", rev = "8a8038f94" } -turbopack-tests = { git = "https://github.com/vercel/turbo.git", rev = "8a8038f94" } +auto-hash-map = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230315.2" } +node-file-trace = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230315.2" } +swc-ast-explorer = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230315.2" } +turbo-malloc = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230315.2", default-features = false } +turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230315.2" } +turbo-tasks-build = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230315.2" } +turbo-tasks-env = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230315.2" } +turbo-tasks-fetch = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230315.2", default-features = false } +turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230315.2" } +turbo-tasks-hash = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230315.2" } +turbo-tasks-macros = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230315.2" } +turbo-tasks-macros-shared = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230315.2" } +turbo-tasks-memory = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230315.2" } +turbo-tasks-testing = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230315.2" } +turbo-updater = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230315.2" } +turbopack = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230315.2" } +turbopack-cli-utils = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230315.2" } +turbopack-core = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230315.2" } +turbopack-create-test-app = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230315.2" } +turbopack-css = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230315.2" } +turbopack-dev-server = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230315.2" } +turbopack-ecmascript = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230315.2" } +turbopack-env = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230315.2" } +turbopack-json = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230315.2" } +turbopack-mdx = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230315.2" } +turbopack-node = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230315.2" } +turbopack-static = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230315.2" } +turbopack-swc-utils = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230315.2" } +turbopack-test-utils = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230315.2" } +turbopack-tests = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230315.2" } # General Deps diff --git a/packages/next-swc/crates/core/src/next_dynamic.rs b/packages/next-swc/crates/core/src/next_dynamic.rs index 78444171bf2e7..5de2205f57137 100644 --- a/packages/next-swc/crates/core/src/next_dynamic.rs +++ b/packages/next-swc/crates/core/src/next_dynamic.rs @@ -179,44 +179,46 @@ impl Fold for NextDynamicPatcher { key: PropName::Ident(Ident::new("webpack".into(), DUMMY_SP)), value: Box::new(Expr::Arrow(ArrowExpr { params: vec![], - body: BlockStmtOrExpr::Expr(Box::new(Expr::Array(ArrayLit { - elems: vec![Some(ExprOrSpread { - expr: Box::new(Expr::Call(CallExpr { - callee: Callee::Expr(Box::new(Expr::Member( - MemberExpr { - obj: Box::new(Expr::Ident(Ident { - sym: js_word!("require"), + body: Box::new(BlockStmtOrExpr::Expr(Box::new(Expr::Array( + ArrayLit { + elems: vec![Some(ExprOrSpread { + expr: Box::new(Expr::Call(CallExpr { + callee: Callee::Expr(Box::new(Expr::Member( + MemberExpr { + obj: Box::new(Expr::Ident(Ident { + sym: js_word!("require"), + span: DUMMY_SP, + optional: false, + })), + prop: MemberProp::Ident(Ident { + sym: "resolveWeak".into(), + span: DUMMY_SP, + optional: false, + }), span: DUMMY_SP, - optional: false, - })), - prop: MemberProp::Ident(Ident { - sym: "resolveWeak".into(), + }, + ))), + args: vec![ExprOrSpread { + expr: Box::new(Expr::Lit(Lit::Str(Str { + value: self + .dynamically_imported_specifier + .as_ref() + .unwrap() + .clone() + .into(), span: DUMMY_SP, - optional: false, - }), - span: DUMMY_SP, - }, - ))), - args: vec![ExprOrSpread { - expr: Box::new(Expr::Lit(Lit::Str(Str { - value: self - .dynamically_imported_specifier - .as_ref() - .unwrap() - .clone() - .into(), - span: DUMMY_SP, - raw: None, - }))), - spread: None, - }], - span: DUMMY_SP, - type_args: None, - })), - spread: None, - })], - span: DUMMY_SP, - }))), + raw: None, + }))), + spread: None, + }], + span: DUMMY_SP, + type_args: None, + })), + spread: None, + })], + span: DUMMY_SP, + }, + )))), is_async: false, is_generator: false, span: DUMMY_SP, diff --git a/packages/next-swc/crates/core/src/server_actions.rs b/packages/next-swc/crates/core/src/server_actions.rs index 0d3458849b0bf..33f3b6a7c4296 100644 --- a/packages/next-swc/crates/core/src/server_actions.rs +++ b/packages/next-swc/crates/core/src/server_actions.rs @@ -191,7 +191,7 @@ impl ServerActions { ); if let Some(a) = arrow { - if let BlockStmtOrExpr::BlockStmt(block) = &mut a.body { + if let BlockStmtOrExpr::BlockStmt(block) = &mut *a.body { block.visit_mut_with(&mut ClosureReplacer { closure_arg: &closure_arg, used_ids: &ids_from_closure, @@ -201,7 +201,7 @@ impl ServerActions { let new_arrow = ArrowExpr { span: DUMMY_SP, params: a.params.clone(), - body: BlockStmtOrExpr::Expr(Box::new(Expr::Call(call))), + body: Box::new(BlockStmtOrExpr::Expr(Box::new(Expr::Call(call)))), is_async: a.is_async, is_generator: a.is_generator, type_params: Default::default(), @@ -402,7 +402,7 @@ impl VisitMut for ServerActions { // Arrow expressions need to be visited in prepass to determine if it's // an action function or not. let is_action_fn = self.get_action_info( - if let BlockStmtOrExpr::BlockStmt(block) = &mut a.body { + if let BlockStmtOrExpr::BlockStmt(block) = &mut *a.body { Some(block) } else { None @@ -503,7 +503,7 @@ impl VisitMut for ServerActions { if !self.in_action_file { if let Expr::Arrow(a) = n { let is_action_fn = self.get_action_info( - if let BlockStmtOrExpr::BlockStmt(block) = &mut a.body { + if let BlockStmtOrExpr::BlockStmt(block) = &mut *a.body { Some(block) } else { None @@ -1194,7 +1194,7 @@ impl TryFrom<&'_ OptChainExpr> for Name { type Error = (); fn try_from(value: &OptChainExpr) -> Result { - match &value.base { + match &*value.base { OptChainBase::Member(value) => match &value.prop { MemberProp::Ident(prop) => { let mut obj: Name = value.obj.as_ref().try_into()?; @@ -1223,11 +1223,11 @@ impl From for Expr { expr = Expr::OptChain(OptChainExpr { span: DUMMY_SP, question_dot_token: DUMMY_SP, - base: OptChainBase::Member(MemberExpr { + base: Box::new(OptChainBase::Member(MemberExpr { span: DUMMY_SP, obj: expr.into(), prop: MemberProp::Ident(Ident::new(prop, DUMMY_SP)), - }), + })), }); } } diff --git a/packages/next-swc/crates/next-core/Cargo.toml b/packages/next-swc/crates/next-core/Cargo.toml index 1414e17cc956f..4c361d6fdc984 100644 --- a/packages/next-swc/crates/next-core/Cargo.toml +++ b/packages/next-swc/crates/next-core/Cargo.toml @@ -30,6 +30,9 @@ turbopack-dev-server = { workspace = true } turbopack-ecmascript = { workspace = true } turbopack-env = { workspace = true } turbopack-node = { workspace = true } +next-transform-strip-page-exports = { workspace = true } +next-font = { workspace = true } +next-transform-dynamic = { workspace = true } swc_core = { workspace = true, features = ["ecma_ast", "common"] } diff --git a/packages/next-swc/crates/next-core/src/lib.rs b/packages/next-swc/crates/next-core/src/lib.rs index 0df4f07480590..e3e7a2f54fb37 100644 --- a/packages/next-swc/crates/next-core/src/lib.rs +++ b/packages/next-swc/crates/next-core/src/lib.rs @@ -1,5 +1,6 @@ #![feature(async_closure)] #![feature(min_specialization)] +#![feature(box_syntax)] mod app_render; mod app_source; diff --git a/packages/next-swc/crates/next-core/src/next_client/transforms.rs b/packages/next-swc/crates/next-core/src/next_client/transforms.rs index b2bac110c1fba..1dc24931a9ca4 100644 --- a/packages/next-swc/crates/next-core/src/next_client/transforms.rs +++ b/packages/next-swc/crates/next-core/src/next_client/transforms.rs @@ -1,6 +1,6 @@ use anyhow::Result; +use next_transform_strip_page_exports::ExportFilter; use turbopack::module_options::ModuleRule; -use turbopack_ecmascript::NextJsPageExportFilter; use crate::{ next_client::context::ClientContextType, @@ -22,8 +22,7 @@ pub async fn get_next_client_transforms_rules( let pages_dir = match context_ty { ClientContextType::Pages { pages_dir } => { rules.push( - get_next_pages_transforms_rule(pages_dir, NextJsPageExportFilter::StripDataExports) - .await?, + get_next_pages_transforms_rule(pages_dir, ExportFilter::StripDataExports).await?, ); Some(pages_dir) } @@ -32,9 +31,7 @@ pub async fn get_next_client_transforms_rules( } }; - rules.push(get_next_dynamic_transform_rule( - true, false, false, pages_dir, - )); + rules.push(get_next_dynamic_transform_rule(true, false, false, pages_dir).await?); Ok(rules) } diff --git a/packages/next-swc/crates/next-core/src/next_server/transforms.rs b/packages/next-swc/crates/next-core/src/next_server/transforms.rs index 6b43528201d68..8a37a4028dd9a 100644 --- a/packages/next-swc/crates/next-core/src/next_server/transforms.rs +++ b/packages/next-swc/crates/next-core/src/next_server/transforms.rs @@ -1,6 +1,6 @@ use anyhow::Result; +use next_transform_strip_page_exports::ExportFilter; use turbopack::module_options::ModuleRule; -use turbopack_ecmascript::NextJsPageExportFilter; use crate::{ next_server::context::ServerContextType, @@ -21,11 +21,7 @@ pub async fn get_next_server_transforms_rules( ServerContextType::Pages { pages_dir } => (false, Some(pages_dir)), ServerContextType::PagesData { pages_dir } => { rules.push( - get_next_pages_transforms_rule( - pages_dir, - NextJsPageExportFilter::StripDefaultExport, - ) - .await?, + get_next_pages_transforms_rule(pages_dir, ExportFilter::StripDefaultExport).await?, ); (false, Some(pages_dir)) } @@ -35,12 +31,7 @@ pub async fn get_next_server_transforms_rules( ServerContextType::Middleware { .. } => (false, None), }; - rules.push(get_next_dynamic_transform_rule( - true, - true, - is_server_components, - pages_dir, - )); + rules.push(get_next_dynamic_transform_rule(true, true, is_server_components, pages_dir).await?); Ok(rules) } diff --git a/packages/next-swc/crates/next-core/src/next_shared/transforms.rs b/packages/next-swc/crates/next-core/src/next_shared/transforms.rs index 917bcb64d2f32..d21000a60778f 100644 --- a/packages/next-swc/crates/next-core/src/next_shared/transforms.rs +++ b/packages/next-swc/crates/next-core/src/next_shared/transforms.rs @@ -1,19 +1,34 @@ +use std::path::PathBuf; + use anyhow::Result; -use turbo_tasks::primitives::StringsVc; +use next_transform_dynamic::{next_dynamic, NextDynamicMode}; +use next_transform_strip_page_exports::{next_transform_strip_page_exports, ExportFilter}; +use swc_core::{ + common::{util::take::Take, FileName}, + ecma::{ + ast::{Module, ModuleItem, Program}, + atoms::JsWord, + visit::{FoldWith, VisitMutWith}, + }, +}; use turbo_tasks_fs::FileSystemPathVc; use turbopack::module_options::{ModuleRule, ModuleRuleCondition, ModuleRuleEffect}; use turbopack_core::reference_type::{ReferenceType, UrlReferenceSubType}; use turbopack_ecmascript::{ - EcmascriptInputTransform, EcmascriptInputTransformsVc, NextJsPageExportFilter, + CustomTransformVc, CustomTransformer, EcmascriptInputTransform, EcmascriptInputTransformsVc, + TransformContext, }; /// Returns a rule which applies the Next.js page export stripping transform. pub async fn get_next_pages_transforms_rule( pages_dir: FileSystemPathVc, - export_filter: NextJsPageExportFilter, + export_filter: ExportFilter, ) -> Result { // Apply the Next SSG transform to all pages. - let strip_transform = EcmascriptInputTransform::NextJsStripPageExports(export_filter); + let strip_transform = + EcmascriptInputTransform::Custom(CustomTransformVc::cell(box NextJsStripPageExports { + export_filter, + })); Ok(ModuleRule::new( ModuleRuleCondition::all(vec![ ModuleRuleCondition::all(vec![ @@ -37,51 +52,111 @@ pub async fn get_next_pages_transforms_rule( )) } +#[derive(Debug)] +struct NextJsStripPageExports { + export_filter: ExportFilter, +} + +impl CustomTransformer for NextJsStripPageExports { + fn transform(&self, program: &mut Program, _ctx: &TransformContext<'_>) -> Option { + // TODO(alexkirsz) Connect the eliminated_packages to telemetry. + let eliminated_packages = Default::default(); + + let module_program = unwrap_module_program(program); + Some( + module_program.fold_with(&mut next_transform_strip_page_exports( + self.export_filter, + eliminated_packages, + )), + ) + } +} + /// Returns a rule which applies the Next.js dynamic transform. -pub fn get_next_dynamic_transform_rule( +pub async fn get_next_dynamic_transform_rule( is_development: bool, is_server: bool, is_server_components: bool, pages_dir: Option, -) -> ModuleRule { - let dynamic_transform = EcmascriptInputTransform::NextJsDynamic { - is_development, - is_server, - is_server_components, - pages_dir, - }; - ModuleRule::new( +) -> Result { + let dynamic_transform = + EcmascriptInputTransform::Custom(CustomTransformVc::cell(box NextJsDynamic { + is_development, + is_server, + is_server_components, + pages_dir: match pages_dir { + None => None, + Some(path) => Some(path.await?.path.clone().into()), + }, + })); + Ok(ModuleRule::new( module_rule_match_js_no_url(), vec![ModuleRuleEffect::AddEcmascriptTransforms( EcmascriptInputTransformsVc::cell(vec![dynamic_transform]), )], - ) + )) +} + +#[derive(Debug)] +struct NextJsDynamic { + is_development: bool, + is_server: bool, + is_server_components: bool, + pages_dir: Option, +} + +impl CustomTransformer for NextJsDynamic { + fn transform(&self, program: &mut Program, ctx: &TransformContext<'_>) -> Option { + let module_program = unwrap_module_program(program); + Some(module_program.fold_with(&mut next_dynamic( + self.is_development, + self.is_server, + self.is_server_components, + NextDynamicMode::Turbo, + FileName::Real(ctx.file_path_str.into()), + self.pages_dir.clone(), + ))) + } } /// Returns a rule which applies the Next.js font transform. pub fn get_next_font_transform_rule() -> ModuleRule { #[allow(unused_mut)] // This is mutated when next-font-local is enabled - let mut font_loaders = vec![ - "next/font/google".to_owned(), - "@next/font/google".to_owned(), - ]; + let mut font_loaders = vec!["next/font/google".into(), "@next/font/google".into()]; #[cfg(feature = "next-font-local")] { - font_loaders.push("next/font/local".to_owned()); - font_loaders.push("@next/font/local".to_owned()); + font_loaders.push("next/font/local".into()); + font_loaders.push("@next/font/local".into()); } + let transformer = + EcmascriptInputTransform::Custom(CustomTransformVc::cell(box NextJsFont { font_loaders })); ModuleRule::new( // TODO: Only match in pages (not pages/api), app/, etc. module_rule_match_js_no_url(), vec![ModuleRuleEffect::AddEcmascriptTransforms( - EcmascriptInputTransformsVc::cell(vec![EcmascriptInputTransform::NextJsFont( - StringsVc::cell(font_loaders), - )]), + EcmascriptInputTransformsVc::cell(vec![transformer]), )], ) } +#[derive(Debug)] +struct NextJsFont { + font_loaders: Vec, +} + +impl CustomTransformer for NextJsFont { + fn transform(&self, program: &mut Program, ctx: &TransformContext<'_>) -> Option { + let mut next_font = next_font::next_font_loaders(next_font::Config { + font_loaders: self.font_loaders.clone(), + relative_file_path_from_root: ctx.file_name_str.into(), + }); + + program.visit_mut_with(&mut next_font); + None + } +} + fn module_rule_match_js_no_url() -> ModuleRuleCondition { ModuleRuleCondition::all(vec![ ModuleRuleCondition::not(ModuleRuleCondition::ReferenceType(ReferenceType::Url( @@ -95,3 +170,18 @@ fn module_rule_match_js_no_url() -> ModuleRuleCondition { ]), ]) } + +fn unwrap_module_program(program: &mut Program) -> Program { + match program { + Program::Module(module) => Program::Module(module.take()), + Program::Script(s) => Program::Module(Module { + span: s.span, + body: s + .body + .iter() + .map(|stmt| ModuleItem::Stmt(stmt.clone())) + .collect(), + shebang: s.shebang.clone(), + }), + } +} diff --git a/packages/next-swc/crates/next-core/src/router.rs b/packages/next-swc/crates/next-core/src/router.rs index 19a49fc7c8b2a..420d053cf8a47 100644 --- a/packages/next-swc/crates/next-core/src/router.rs +++ b/packages/next-swc/crates/next-core/src/router.rs @@ -60,7 +60,11 @@ async fn middleware_files(page_extensions: StringsVc) -> Result { let extensions = page_extensions.await?; let files = ["middleware.", "src/middleware."] .into_iter() - .flat_map(|f| extensions.iter().map(move |ext| String::from(f) + ext)) + .flat_map(|f| { + extensions + .iter() + .map(move |ext| String::from(f) + ext.as_str()) + }) .collect(); Ok(StringsVc::cell(files)) } diff --git a/packages/next-swc/crates/next-transform-dynamic/src/lib.rs b/packages/next-swc/crates/next-transform-dynamic/src/lib.rs index 92bce47934600..d4b86528f3e20 100644 --- a/packages/next-swc/crates/next-transform-dynamic/src/lib.rs +++ b/packages/next-swc/crates/next-transform-dynamic/src/lib.rs @@ -47,9 +47,7 @@ pub enum NextDynamicMode { /// 2. The relative imported module id. /// /// This key is of the form: - /// ``` /// {currentModulePath} -> {relativeImportedModulePath} - /// ``` /// /// It corresponds to an entry in the React Loadable Manifest generated by /// the React Loadable Webpack plugin. @@ -262,40 +260,42 @@ impl Fold for NextDynamicPatcher { key: PropName::Ident(Ident::new("webpack".into(), DUMMY_SP)), value: Box::new(Expr::Arrow(ArrowExpr { params: vec![], - body: BlockStmtOrExpr::Expr(Box::new(Expr::Array(ArrayLit { - elems: vec![Some(ExprOrSpread { - expr: Box::new(Expr::Call(CallExpr { - callee: Callee::Expr(Box::new(Expr::Member( - MemberExpr { - obj: Box::new(Expr::Ident(Ident { - sym: js_word!("require"), + body: Box::new(BlockStmtOrExpr::Expr(Box::new(Expr::Array( + ArrayLit { + elems: vec![Some(ExprOrSpread { + expr: Box::new(Expr::Call(CallExpr { + callee: Callee::Expr(Box::new(Expr::Member( + MemberExpr { + obj: Box::new(Expr::Ident(Ident { + sym: js_word!("require"), + span: DUMMY_SP, + optional: false, + })), + prop: MemberProp::Ident(Ident { + sym: "resolveWeak".into(), + span: DUMMY_SP, + optional: false, + }), span: DUMMY_SP, - optional: false, - })), - prop: MemberProp::Ident(Ident { - sym: "resolveWeak".into(), + }, + ))), + args: vec![ExprOrSpread { + expr: Box::new(Expr::Lit(Lit::Str(Str { + value: dynamically_imported_specifier + .into(), span: DUMMY_SP, - optional: false, - }), - span: DUMMY_SP, - }, - ))), - args: vec![ExprOrSpread { - expr: Box::new(Expr::Lit(Lit::Str(Str { - value: dynamically_imported_specifier - .into(), - span: DUMMY_SP, - raw: None, - }))), - spread: None, - }], - span: DUMMY_SP, - type_args: None, - })), - spread: None, - })], - span: DUMMY_SP, - }))), + raw: None, + }))), + spread: None, + }], + span: DUMMY_SP, + type_args: None, + })), + spread: None, + })], + span: DUMMY_SP, + }, + )))), is_async: false, is_generator: false, span: DUMMY_SP,