diff --git a/packages/next-swc/Cargo.lock b/packages/next-swc/Cargo.lock index b2ee9e046d26642..f2f78dd9818057a 100644 --- a/packages/next-swc/Cargo.lock +++ b/packages/next-swc/Cargo.lock @@ -78,9 +78,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.65" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602" +checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" [[package]] name = "arrayref" @@ -188,9 +188,9 @@ checksum = "d27c3610c36aee21ce8ac510e6224498de4228ad772a171ed65643a24693a5a8" [[package]] name = "base64" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "better_scoped_tls" @@ -203,9 +203,9 @@ dependencies = [ [[package]] name = "binding_macros" -version = "0.20.53" +version = "0.20.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7888a7ee04aea6e0bb9a3a63bea48f3b978cd526bbb7cb9985e9c173f98993b" +checksum = "fe78639e8caeed371f2bf1f5ec809b8418cc72394368cf6f422aac14b9c2ed09" dependencies = [ "anyhow", "console_error_panic_hook", @@ -331,9 +331,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.73" +version = "1.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "581f5dba903aac52ea3feb5ec4810848460ee833876f1f9b0fdeab1f19091574" [[package]] name = "cesu8" @@ -646,7 +646,7 @@ dependencies = [ "bitflags", "crossterm_winapi", "libc", - "mio 0.8.4", + "mio 0.8.5", "parking_lot", "signal-hook", "signal-hook-mio", @@ -690,9 +690,9 @@ checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" [[package]] name = "cxx" -version = "1.0.79" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f83d0ebf42c6eafb8d7c52f7e5f2d3003b89c7aa4fd2b79229209459a849af8" +checksum = "6b7d4e43b25d3c994662706a1d4fcfc32aaa6afd287502c111b237093bb23f3a" dependencies = [ "cc", "cxxbridge-flags", @@ -702,9 +702,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.79" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07d050484b55975889284352b0ffc2ecbda25c0c55978017c132b29ba0818a86" +checksum = "84f8829ddc213e2c1368e51a2564c552b65a8cb6a28f31e576270ac81d5e5827" dependencies = [ "cc", "codespan-reporting", @@ -717,15 +717,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.79" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d2199b00553eda8012dfec8d3b1c75fce747cf27c169a270b3b99e3448ab78" +checksum = "e72537424b474af1460806647c41d4b6d35d09ef7fe031c5c2fa5766047cc56a" [[package]] name = "cxxbridge-macro" -version = "1.0.79" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb67a6de1f602736dd7eaead0080cf3435df806c61b24b13328db128c58868f" +checksum = "309e4fb93eed90e1e14bea0da16b209f81813ba9fc7830c20ed151dd7bc0a4d7" dependencies = [ "proc-macro2", "quote", @@ -744,12 +744,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4529658bdda7fd6769b8614be250cdcfc3aeb0ee72fe66f9e41e5e5eb73eac02" +checksum = "b0dd3cd20dc6b5a876612a6e5accfe7f3dd883db6d07acfbf14c128f61550dfa" dependencies = [ - "darling_core 0.14.1", - "darling_macro 0.14.1", + "darling_core 0.14.2", + "darling_macro 0.14.2", ] [[package]] @@ -768,9 +768,9 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "649c91bc01e8b1eac09fb91e8dbc7d517684ca6be8ebc75bb9cafc894f9fdb6f" +checksum = "a784d2ccaf7c98501746bf0be29b2022ba41fd62a2e622af997a03e9f972859f" dependencies = [ "fnv", "ident_case", @@ -792,11 +792,11 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.14.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfc69c5bfcbd2fc09a0f38451d2daf0e372e367986a83906d1b0dbc88134fb5" +checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e" dependencies = [ - "darling_core 0.14.1", + "darling_core 0.14.2", "quote", "syn", ] @@ -814,15 +814,6 @@ dependencies = [ "parking_lot_core 0.9.4", ] -[[package]] -name = "debug_unreachable" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a032eac705ca39214d169f83e3d3da290af06d8d1d344d1baad2fd002dca4b3" -dependencies = [ - "unreachable", -] - [[package]] name = "debugid" version = "0.8.0" @@ -965,7 +956,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03e7b551eba279bf0fa88b83a46330168c1560a52a94f5126f892f0b364ab3e0" dependencies = [ - "darling 0.14.1", + "darling 0.14.2", "proc-macro2", "quote", "syn", @@ -1244,9 +1235,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -1286,9 +1277,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] name = "h2" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca32592cf21ac7ccab1825cd87f6c9b3d9022c44d086172ed0966bec8af30be" +checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" dependencies = [ "bytes", "fnv", @@ -1409,9 +1400,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "hyper" -version = "0.14.20" +version = "0.14.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac" +checksum = "abfba89e19b959ca163c7752ba59d737c1ceea53a5d31a149c805446fc958064" dependencies = [ "bytes", "futures-channel", @@ -1472,9 +1463,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.51" +version = "0.1.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5a6ef98976b22b3b7f2f3a806f858cb862044cfa66805aa3ad84cb3d3b785ed" +checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1660,12 +1651,6 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd" -[[package]] -name = "json_comments" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ee439ee368ba4a77ac70d04f14015415af8600d6c894dc1f11bd79758c57d5" - [[package]] name = "jsonc-parser" version = "0.21.0" @@ -1778,9 +1763,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.135" +version = "0.2.137" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68783febc7782c6c5cb401fbda4de5a9898be1762314da0bb2c10ced61f18b0c" +checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" [[package]] name = "libloading" @@ -1946,7 +1931,7 @@ dependencies = [ "supports-hyperlinks", "supports-unicode", "terminal_size", - "textwrap 0.15.1", + "textwrap 0.15.2", "thiserror", "unicode-width", ] @@ -2034,14 +2019,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" +checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.36.1", + "windows-sys 0.42.0", ] [[package]] @@ -2070,9 +2055,9 @@ dependencies = [ [[package]] name = "modularize_imports" -version = "0.25.1" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b143d1b92b0d159428b62ca54f9dc86f0d93c6b36b259940f9a0a9b3118117" +checksum = "ff7bf620b01144c7d6fbc3a33293a11a13fab766c4bdb6a3b01c75dc5cc4b7c1" dependencies = [ "convert_case", "handlebars", @@ -2155,9 +2140,9 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" dependencies = [ "lazy_static", "libc", @@ -2515,9 +2500,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" +checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" [[package]] name = "openssl" @@ -2553,9 +2538,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.76" +version = "0.9.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5230151e44c0f05157effb743e8d517472843121cf9243e8b81393edb5acd9ce" +checksum = "b03b84c3b2d099b81f0953422b4d4ad58761589d0229b5506356afca05a3670a" dependencies = [ "autocfg", "cc", @@ -2566,9 +2551,9 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.3.0" +version = "6.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" +checksum = "3baf96e39c5359d2eb0dd6ccb42c62b91d9678aa68160d261b9e0ccbf9e9dea9" [[package]] name = "output_vt100" @@ -2788,9 +2773,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" [[package]] name = "pmutil" @@ -3253,9 +3238,9 @@ dependencies = [ [[package]] name = "scoped-tls" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" [[package]] name = "scopeguard" @@ -3417,16 +3402,16 @@ dependencies = [ "serde", "serde_json", "thiserror", - "time 0.3.15", + "time 0.3.16", "url", "uuid", ] [[package]] name = "serde" -version = "1.0.145" +version = "1.0.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b" +checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" dependencies = [ "serde_derive", ] @@ -3453,9 +3438,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.145" +version = "1.0.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c" +checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" dependencies = [ "proc-macro2", "quote", @@ -3570,7 +3555,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" dependencies = [ "libc", - "mio 0.8.4", + "mio 0.8.5", "signal-hook", ] @@ -3781,9 +3766,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "styled_components" -version = "0.52.1" +version = "0.52.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa9bb5dc721603ce35225910c0442b552369cf9e7322a6083e0ac101cef37da2" +checksum = "3f67e6c35d5c22db61364da26f9198c2c5eeea0bc876f94424028854f42492bc" dependencies = [ "Inflector", "once_cell", @@ -3795,9 +3780,9 @@ dependencies = [ [[package]] name = "styled_jsx" -version = "0.29.1" +version = "0.29.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9caea170c8166e302071b1261a4797048df244da30c00560636d70cd0557dd85" +checksum = "f2e38bf2841ece65aa2d4bbf60826647a2dbfe7ce1bbe406ab82af61d7f0997f" dependencies = [ "easy-error", "swc_core", @@ -3840,9 +3825,9 @@ dependencies = [ [[package]] name = "swc" -version = "0.232.53" +version = "0.232.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2fc0f4c38bafd2dcbc3337c651139d1baa49a5a316a96267b80060c276e5f2c" +checksum = "32d134ede134ca0260aada687ce656c90b5f53e56331de117eab19ccf79bcc3d" dependencies = [ "ahash", "anyhow", @@ -3850,7 +3835,7 @@ dependencies = [ "dashmap", "either", "indexmap", - "json_comments", + "jsonc-parser", "lru", "napi", "napi-derive", @@ -3891,9 +3876,9 @@ dependencies = [ [[package]] name = "swc_atoms" -version = "0.4.23" +version = "0.4.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01b878052680dcec3421ab50384279443dbf93651b05da38e5133e0894a18096" +checksum = "79642938ff437f2217718abf30a3450b014f600847c8f4bd60fa44f88a5210ea" dependencies = [ "once_cell", "rkyv", @@ -3906,9 +3891,9 @@ dependencies = [ [[package]] name = "swc_bundler" -version = "0.192.47" +version = "0.192.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b5d990a667712218196d43ba14215d82c6fc3bab9e320a284002ea45cc9990" +checksum = "5aea36a1cf5448d2875c6382331e57bd2743f02391143e7b9083bb3ceb34b1fe" dependencies = [ "ahash", "anyhow", @@ -3954,9 +3939,9 @@ dependencies = [ [[package]] name = "swc_common" -version = "0.29.10" +version = "0.29.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd844dfbd9969a9ef8430e954661de43edde353d65e987f935a328619698883" +checksum = "953e1f014688eadbbd3e9131a525e8922c552540bb02b0bb6d9fdcb1375bccc4" dependencies = [ "ahash", "anyhow", @@ -3964,9 +3949,9 @@ dependencies = [ "atty", "better_scoped_tls", "cfg-if 1.0.0", - "debug_unreachable", "either", "from_variant", + "new_debug_unreachable", "num-bigint", "once_cell", "parking_lot", @@ -4012,9 +3997,9 @@ dependencies = [ [[package]] name = "swc_core" -version = "0.40.16" +version = "0.40.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ecc8e046802b9a499eabe39d512132d38d9e6efd1acee5f9f996525fbc6a218" +checksum = "93371e7bd260242f2ca39ca8aa78df03089f155cf881ef19506c6ce0a1dbe443" dependencies = [ "binding_macros", "swc", @@ -4057,9 +4042,9 @@ dependencies = [ [[package]] name = "swc_css_ast" -version = "0.124.0" +version = "0.124.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f102c8fbf277a0cd1e262df04563307ded645e0cd9fd03eaa00e51e57555de2a" +checksum = "ec0a95e29f6b9e608560453c3ffe983d6c2a2a99d20dcc1a29b17e5fb8f74111" dependencies = [ "is-macro", "serde", @@ -4070,9 +4055,9 @@ dependencies = [ [[package]] name = "swc_css_codegen" -version = "0.134.6" +version = "0.134.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc09c50cd950542daccb5d353f16583a032e1d6dadd4150a2efd9d39a679e292" +checksum = "b1669ad895cbe0612c39c26e383552a3a58ebcfdbc4c1e07ebc7c3e9d9b03fda" dependencies = [ "auto_impl", "bitflags", @@ -4100,9 +4085,9 @@ dependencies = [ [[package]] name = "swc_css_compat" -version = "0.9.6" +version = "0.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48f4d7977675a49cf49eed67b36519b92087747c402122948ccc752f8ebd3be0" +checksum = "2cb91a8c4b398a68b3c2211ef4cf6ce80426202bde9b56e53c54451cc1b836d3" dependencies = [ "once_cell", "serde", @@ -4132,9 +4117,9 @@ dependencies = [ [[package]] name = "swc_css_parser" -version = "0.133.6" +version = "0.133.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd568b96d5de13b0ef84a1008dd8673a449fd0206404fe67f85ba3af2cc8446e" +checksum = "f28266f6b5b41dd73cf42782912f94e7da86882edc2beab3daf37981234cc27a" dependencies = [ "bitflags", "lexical", @@ -4146,9 +4131,9 @@ dependencies = [ [[package]] name = "swc_css_prefixer" -version = "0.135.6" +version = "0.135.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d643067d410c700551fc0258f87721b20dd098f7581d82ca0ceb797d718578f4" +checksum = "e34dfb45edac73e55a21684aa6d7f2991a9b26bbdecaeac8b4845fbdc822b9b8" dependencies = [ "once_cell", "preset_env_base", @@ -4163,9 +4148,9 @@ dependencies = [ [[package]] name = "swc_css_utils" -version = "0.121.0" +version = "0.121.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc534e16b225196edd011e179895bdf9ccbe4d13a7688f3e053ba8202a1fd6e9" +checksum = "2dffbfffbe89ee68b97dd9aa9d92f69536267f3e653ac4e9e9a8624b2c87cc2c" dependencies = [ "once_cell", "serde", @@ -4178,9 +4163,9 @@ dependencies = [ [[package]] name = "swc_css_visit" -version = "0.123.0" +version = "0.123.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1015c41b1a193baf396daa02195906f81e9169db18cb8c498e41c8729d3f0306" +checksum = "059e2eb4636c9d142b0e5c1c576324cb400e127c850c3b9bcfea0bbfe39af71e" dependencies = [ "serde", "swc_atoms", @@ -4191,9 +4176,9 @@ dependencies = [ [[package]] name = "swc_ecma_ast" -version = "0.94.14" +version = "0.94.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c3303de79adce1137e6514e5939686173e7d26c71d91c3067056caa45183547" +checksum = "bc39246540303a9058283e6ef691a276c34afd8331e6873fb3e6fb7803eb77eb" dependencies = [ "bitflags", "is-macro", @@ -4209,9 +4194,9 @@ dependencies = [ [[package]] name = "swc_ecma_codegen" -version = "0.127.24" +version = "0.127.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7b3d1bf708c88a540d6dda9fc0e6086ec55fd3bd6c03a076edbee623533f0ad" +checksum = "4f7dc7fbe2ad55c407766edd5b735e9cc693b20e37d3b5681d1660d6d5087348" dependencies = [ "memchr", "num-bigint", @@ -4241,9 +4226,9 @@ dependencies = [ [[package]] name = "swc_ecma_ext_transforms" -version = "0.91.25" +version = "0.91.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4799f6e76f157cd788f9253f287bf4827e648f50f773b71fd09e1f865ba3909d" +checksum = "2e43f5ae514c15aba12a0fde16c77e3f2c7fd13a29741d1ddee5044a7a03494e" dependencies = [ "phf", "swc_atoms", @@ -4255,9 +4240,9 @@ dependencies = [ [[package]] name = "swc_ecma_lints" -version = "0.66.33" +version = "0.66.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60773090d9145334d8c442f3f9a1deabf1567f19e17af6758098f4d3ea5ffe70" +checksum = "6c362f149ae1767eb53657809281492a4337259717b5411755a804d487415832" dependencies = [ "ahash", "auto_impl", @@ -4276,9 +4261,9 @@ dependencies = [ [[package]] name = "swc_ecma_loader" -version = "0.41.11" +version = "0.41.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c0aac15ea4dfdceec8b04389f2d6ff27ea0f0d243aa89904e420a6d0a96e512" +checksum = "4f6ac7ce0c7a4c9f5badfd603d6c1caa969a3ee519da22a2511ee8da96e542cd" dependencies = [ "ahash", "anyhow", @@ -4298,9 +4283,9 @@ dependencies = [ [[package]] name = "swc_ecma_minifier" -version = "0.159.47" +version = "0.159.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66679b1d3a2c241851622f5d35108934fef3bc93b5361cdee69663978ee5a5a" +checksum = "ab9256e71c0f60fe944d15ed995b9e951efada1e8ac806c35e7d84314d67776e" dependencies = [ "ahash", "arrayvec", @@ -4309,6 +4294,7 @@ dependencies = [ "num_cpus", "once_cell", "parking_lot", + "radix_fmt", "rayon", "regex", "retain_mut", @@ -4332,9 +4318,9 @@ dependencies = [ [[package]] name = "swc_ecma_parser" -version = "0.122.20" +version = "0.122.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86e09f503e4e509cde4deb310950b645f7e3189328fa8a912bcb5497ea632bac" +checksum = "8e08d44ac2eaff9a308cddfea82640a131682be76b132efee4d7b8ddbaeb26ac" dependencies = [ "either", "enum_kind", @@ -4351,9 +4337,9 @@ dependencies = [ [[package]] name = "swc_ecma_preset_env" -version = "0.174.27" +version = "0.174.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79a6987a9cbf28db3897c0e1c4f7c6ffd4876e6a4655fc3e9a3235665d62596c" +checksum = "0fc643944c9d444f0889d305dbcb6c2967a83fe525dd90ba959dcec6580890d8" dependencies = [ "ahash", "anyhow", @@ -4376,9 +4362,9 @@ dependencies = [ [[package]] name = "swc_ecma_quote_macros" -version = "0.33.21" +version = "0.33.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd1c46123c51bbccd2d6e6020b8f2f0078230a94681dd5fae540c1194403f475" +checksum = "a9dda597011092e5f313a87e8fb4115be72fa13dd1c20747285b83b073510e25" dependencies = [ "anyhow", "pmutil", @@ -4410,9 +4396,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms" -version = "0.198.27" +version = "0.198.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "400fef08d46fc835ede0b625fbca363c2b1a4b8779384b3035619e13ccd77c82" +checksum = "12a589dcab3ac722a5f6b33b1ec1d6aac7487e5cac89a0ab2c7f704581919333" dependencies = [ "swc_atoms", "swc_common", @@ -4430,9 +4416,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_base" -version = "0.111.34" +version = "0.111.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1aa9c87d847b6bc0e8713db3893c01873542f090c7459cbf65aaf9e2d8b6cc2" +checksum = "ec8531b478048047b06eae929cafc1f99bad41f7020081f6a72ba9afb4da8927" dependencies = [ "better_scoped_tls", "bitflags", @@ -4453,9 +4439,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_classes" -version = "0.100.33" +version = "0.100.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3326ba1f99432781bd178a6ebd7299f3e35a907fbbbefa1c0e4c2c807492f12" +checksum = "f0a76d37286968f6d03d04ef8d966f5421d1057801a5e2aa7763fc832d30a60f" dependencies = [ "swc_atoms", "swc_common", @@ -4467,9 +4453,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_compat" -version = "0.136.21" +version = "0.136.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce4560f76f908dcf216e26fcb51f35a9d8b3f3010e83e8cd85c930f38c56acb7" +checksum = "48f504bed66cb7f6c47f3c87794779bf41562d078face5d7e8aed2d793c26e23" dependencies = [ "ahash", "arrayvec", @@ -4507,9 +4493,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_module" -version = "0.153.22" +version = "0.153.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8fda90e7dc601a394b7dd2dd2ba4f84f49bf83c4b3a0af84237dd2c61171583" +checksum = "f25cc2cdca8072b7638ec50ca15a03bfc84a556056d82967e3048105704cd589" dependencies = [ "Inflector", "ahash", @@ -4535,9 +4521,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_optimization" -version = "0.167.27" +version = "0.167.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22cab1b9d00996744661d1fc21b19df8a1aaa19904c5e6bfaa90ca741eadace8" +checksum = "d3fb7f617332209dadf74024dcf8c7d2ddb7a1687f2ac96d4d832c139bb0cefa" dependencies = [ "ahash", "dashmap", @@ -4561,9 +4547,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_proposal" -version = "0.144.21" +version = "0.144.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d3c0a63440353947fc0415450b88fc57b5f48a3e38b0e9e5cf437332baf34f" +checksum = "f74ef94f68a91a4f20585f848dc6f8490459bd24238274f9a1daec39a3ccb637" dependencies = [ "either", "serde", @@ -4580,9 +4566,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_react" -version = "0.155.22" +version = "0.155.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8632b680840615bde60024b17f60177ca0e9c049c997a62197ee180dd03c8cb8" +checksum = "678fc0af1388f33fd88600332b84ac2aadbb786fb9b691f34ead92a8054ece19" dependencies = [ "ahash", "base64", @@ -4607,9 +4593,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_testing" -version = "0.114.20" +version = "0.114.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e95d118dd1fbbfb5d8d4c65b536f75c9abc5d532f5bfd5397639df78141fabb3" +checksum = "b779b37c21eeb835567b0b2839637d91ac1b83ac3afc882e2b5f9fef7c71df26" dependencies = [ "ansi_term", "anyhow", @@ -4633,9 +4619,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_typescript" -version = "0.159.23" +version = "0.159.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e95c2a616c35257584f0e65c17c6d9a4a59b29f390062ba37b20f220cf8e208b" +checksum = "d0f50b3e0837c43d50ebe94c030c40375343c848a31d68b56fbbe6b874905143" dependencies = [ "serde", "swc_atoms", @@ -4649,9 +4635,9 @@ dependencies = [ [[package]] name = "swc_ecma_utils" -version = "0.105.25" +version = "0.105.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c509c639188ed0e290aca1308efd7fac714ca6921ab98abd41734735bce2c70b" +checksum = "f31ea4ff3a66f97aacccfef3d3e0cc4b4c0d5c124123e6ea4a90f59ad51c3843" dependencies = [ "indexmap", "num_cpus", @@ -4667,9 +4653,9 @@ dependencies = [ [[package]] name = "swc_ecma_visit" -version = "0.80.14" +version = "0.80.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47d7de36b60fb0f72b19417a988fe71c800d1a07071421720e469325990a5d7a" +checksum = "fb35536ee61f90c73fd22500911ca2edd11b1ccaad79d01b296011545a339115" dependencies = [ "num-bigint", "swc_atoms", @@ -4681,9 +4667,9 @@ dependencies = [ [[package]] name = "swc_emotion" -version = "0.28.1" +version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "277695628e9adf28202bb6a5c0fb72f3cf0b695f3fc5bcec2fff059a5e56e45b" +checksum = "44abd3c2caae9042ddb83d8bda66fd692db0ff769152d5857c2fc7113312bbe4" dependencies = [ "base64", "byteorder", @@ -4711,9 +4697,9 @@ dependencies = [ [[package]] name = "swc_error_reporters" -version = "0.13.10" +version = "0.13.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1822db0dfb34c341df0a9ecb18bc8866fc0c6e8c0cf9d1e4cba5ced5b69f8800" +checksum = "b1996acb4fd0656d77769764e93ca486810d6baa724a8ed877a7ae3cc7f7c6b5" dependencies = [ "anyhow", "miette", @@ -4724,9 +4710,9 @@ dependencies = [ [[package]] name = "swc_fast_graph" -version = "0.17.11" +version = "0.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0262f3338afdf976e85290653b9170f4f3272e05f35c2bac3f2cecc8544f2" +checksum = "e5448dee060201d38e4019496d56bce897ef69cfa91cae294ac8d8b132c0cc2e" dependencies = [ "ahash", "indexmap", @@ -4736,9 +4722,9 @@ dependencies = [ [[package]] name = "swc_graph_analyzer" -version = "0.18.11" +version = "0.18.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "085d076c5cf0d27e1b1fedc73d6c356357b8d56e8e1750913906090ffa398e7d" +checksum = "d0119a84cdea45d07723497e657416d4db09bc34389e0ea0ed67558c4b5b85c3" dependencies = [ "ahash", "auto_impl", @@ -4771,9 +4757,9 @@ dependencies = [ [[package]] name = "swc_node_comments" -version = "0.16.10" +version = "0.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fec66d33ef26184e7305939347bfdf4a1e18dede5bfdc7d3364b3df614fccfd" +checksum = "1d0dba1a80d962b65b6df0cf07f6a242543ff536539021f6534b05a29ce36316" dependencies = [ "ahash", "dashmap", @@ -4798,9 +4784,9 @@ dependencies = [ [[package]] name = "swc_plugin_proxy" -version = "0.22.14" +version = "0.22.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "013eee790244c90dc81b14f1142e80d53dcc97f5bab621dd411765a208a24130" +checksum = "be2725ea87c315b1ccd980a296542442e57dc6700641f974e670df11ed338bae" dependencies = [ "better_scoped_tls", "rkyv", @@ -4812,9 +4798,9 @@ dependencies = [ [[package]] name = "swc_plugin_runner" -version = "0.77.25" +version = "0.77.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1caec159452cb6bba16ddd30798ed990338cecdadc27a1da8ff628140537a6f1" +checksum = "c2acab20494c99bb001985a8ce9de417616fe2fa1e3a3e4f21ec90d9726c0b35" dependencies = [ "anyhow", "enumset", @@ -4835,9 +4821,9 @@ dependencies = [ [[package]] name = "swc_timer" -version = "0.17.10" +version = "0.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "001a2ff86d52aa13f568b5648600e564268d746c7f052ffa77b2471d982af6e5" +checksum = "bb051167c8568445a1917104b55c2ec4db36f458b1864022a066a9b99f14f0dc" dependencies = [ "tracing", ] @@ -4879,9 +4865,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.102" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1" +checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" dependencies = [ "proc-macro2", "quote", @@ -4929,9 +4915,9 @@ dependencies = [ [[package]] name = "testing" -version = "0.31.10" +version = "0.31.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a445627f53435e1d58dce56c77bfcac9605109fec3837320e03e92dc615638" +checksum = "2a510616ec857597e5eaa33977e2aab5df08385cf7d69bd68bf55763fdf120b2" dependencies = [ "ansi_term", "difference", @@ -4965,9 +4951,9 @@ dependencies = [ [[package]] name = "textwrap" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16" +checksum = "b7b3e525a49ec206798b40326a44121291b530c963cfb01018f63e135bac543d" dependencies = [ "smawk", "unicode-linebreak", @@ -5051,22 +5037,31 @@ dependencies = [ "libc", "standback", "stdweb", - "time-macros", + "time-macros 0.1.1", "version_check 0.9.4", "winapi 0.3.9", ] [[package]] name = "time" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d634a985c4d4238ec39cacaed2e7ae552fbd3c476b552c1deac3021b7d7eaf0c" +checksum = "0fab5c8b9980850e06d92ddbe3ab839c062c801f3927c0fb8abd6fc8e918fbca" dependencies = [ "itoa", "libc", "num_threads", + "serde", + "time-core", + "time-macros 0.2.5", ] +[[package]] +name = "time-core" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" + [[package]] name = "time-macros" version = "0.1.1" @@ -5077,6 +5072,15 @@ dependencies = [ "time-macros-impl", ] +[[package]] +name = "time-macros" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65bb801831d812c562ae7d2bfb531f26e66e4e1f6b17307ba4149c5064710e5b" +dependencies = [ + "time-core", +] + [[package]] name = "time-macros-impl" version = "0.1.2" @@ -5115,7 +5119,7 @@ dependencies = [ "bytes", "libc", "memchr", - "mio 0.8.4", + "mio 0.8.5", "num_cpus", "parking_lot", "pin-project-lite", @@ -5788,15 +5792,6 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" -[[package]] -name = "unreachable" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f2ae5ddb18e1c92664717616dd9549dde73f539f01bd7b77c2edb2446bdff91" -dependencies = [ - "void", -] - [[package]] name = "untrusted" version = "0.7.1" @@ -5861,7 +5856,7 @@ dependencies = [ "getset", "rustversion", "thiserror", - "time 0.3.15", + "time 0.3.16", ] [[package]] @@ -5876,12 +5871,6 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -[[package]] -name = "void" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" - [[package]] name = "walkdir" version = "2.3.2" @@ -6007,9 +5996,9 @@ checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" [[package]] name = "wasm-encoder" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c64ac98d5d61192cc45c701b7e4bd0b9aff91e2edfc7a088406cfe2288581e2c" +checksum = "c5816e88e8ea7335016aa62eb0485747f786136d505a9b3890f8c400211d9b5f" dependencies = [ "leb128", ] @@ -6308,9 +6297,9 @@ checksum = "718ed7c55c2add6548cca3ddd6383d738cd73b892df400e96b9aa876f0141d7a" [[package]] name = "wast" -version = "47.0.1" +version = "48.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b98502f3978adea49551e801a6687678e6015317d7d9470a67fe813393f2a8" +checksum = "84825b5ac7164df8260c9e2b2e814075334edbe7ac426f2469b93a5eeac23cce" dependencies = [ "leb128", "memchr", @@ -6320,9 +6309,9 @@ dependencies = [ [[package]] name = "wat" -version = "1.0.49" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7aab4e20c60429fbba9670a6cae0fff9520046ba0aa3e6d0b1cd2653bea14898" +checksum = "129da4a03ec6d2a815f42c88f641824e789d5be0d86d2f90aa8a218c7068e0be" dependencies = [ "wast", ] diff --git a/packages/next-swc/crates/core/Cargo.toml b/packages/next-swc/crates/core/Cargo.toml index 349472fc291d9e7..0cdef020ecd4fca 100644 --- a/packages/next-swc/crates/core/Cargo.toml +++ b/packages/next-swc/crates/core/Cargo.toml @@ -19,11 +19,11 @@ pathdiff = "0.2.0" regex = "1.5" serde = "1" serde_json = "1" -swc_emotion = "0.28.1" -styled_components = "0.52.1" -styled_jsx = "0.29.1" -modularize_imports = "0.25.1" -tracing = { version = "0.1.32", features = ["release_max_level_info"] } +swc_emotion = "0.28.2" +styled_components = "0.52.2" +styled_jsx = "0.29.2" +modularize_imports = "0.25.2" +tracing = { version = "0.1.37", features = ["release_max_level_info"] } swc_core = { features = [ "common_concurrent", @@ -42,9 +42,9 @@ swc_core = { features = [ "ecma_parser_typescript", "cached", "base" -], version = "0.40.16" } +], version = "0.40.40" } [dev-dependencies] -swc_core = { features = ["testing_transform"], version = "0.40.16" } -testing = "0.31.10" +swc_core = { features = ["testing_transform"], version = "0.40.40" } +testing = "0.31.13" walkdir = "2.3.2" diff --git a/packages/next-swc/crates/core/tests/full.rs b/packages/next-swc/crates/core/tests/full.rs index d8a51a83dc4b81c..02e87ff6781cf11 100644 --- a/packages/next-swc/crates/core/tests/full.rs +++ b/packages/next-swc/crates/core/tests/full.rs @@ -3,6 +3,7 @@ use serde::de::DeserializeOwned; use std::path::{Path, PathBuf}; use swc_core::{ base::Compiler, + common::comments::SingleThreadedComments, ecma::parser::{Syntax, TsConfig}, ecma::transforms::base::pass::noop, }; @@ -71,12 +72,14 @@ fn test(input: &Path, minify: bool) { let options = options.patch(&fm); + let comments = SingleThreadedComments::default(); match c.process_js_with_custom_pass( fm.clone(), None, &handler, &options.swc, - |_, comments| { + comments.clone(), + |_| { custom_before_pass( cm.clone(), fm.clone(), @@ -85,7 +88,7 @@ fn test(input: &Path, minify: bool) { Default::default(), ) }, - |_, _| noop(), + |_| noop(), ) { Ok(v) => { NormalizedOutput::from(v.code) diff --git a/packages/next-swc/crates/core/tests/telemetry.rs b/packages/next-swc/crates/core/tests/telemetry.rs index fedb58dd7039c14..50bdb102ca4e7b6 100644 --- a/packages/next-swc/crates/core/tests/telemetry.rs +++ b/packages/next-swc/crates/core/tests/telemetry.rs @@ -8,7 +8,7 @@ use once_cell::sync::Lazy; use swc_core::{ base::{try_with_handler, Compiler}, - common::{FileName, FilePathMapping, SourceMap, GLOBALS}, + common::{comments::SingleThreadedComments, FileName, FilePathMapping, SourceMap, GLOBALS}, ecma::transforms::base::pass::noop, }; @@ -42,13 +42,15 @@ export function getServerSideProps() { assert!( try_with_handler(COMPILER.cm.clone(), Default::default(), |handler| { GLOBALS.set(&Default::default(), || { + let comments = SingleThreadedComments::default(); COMPILER.process_js_with_custom_pass( fm, None, handler, &Default::default(), - |_, _| next_ssg(eliminated_packages.clone()), - |_, _| noop(), + comments.clone(), + |_| next_ssg(eliminated_packages.clone()), + |_| noop(), ) }) }) diff --git a/packages/next-swc/crates/napi/Cargo.toml b/packages/next-swc/crates/napi/Cargo.toml index 5b7fdcfddfb2c25..d2ffaa0cea4cb14 100644 --- a/packages/next-swc/crates/napi/Cargo.toml +++ b/packages/next-swc/crates/napi/Cargo.toml @@ -21,7 +21,7 @@ sentry_native_tls = ["_sentry_native_tls"] sentry_rustls = ["_sentry_rustls"] [dependencies] -anyhow = "1.0" +anyhow = "1.0.66" backtrace = "0.3" fxhash = "0.2.1" napi = { version = "2", default-features = false, features = ["napi3", "serde-json", "tokio_rt", "error_anyhow"] } @@ -50,8 +50,8 @@ swc_core = { features = [ "ecma_transforms_typescript", "ecma_utils", "ecma_visit", -], version = "0.40.16" } -tracing = { version = "0.1.32", features = ["release_max_level_info"] } +], version = "0.40.40" } +tracing = { version = "0.1.37", features = ["release_max_level_info"] } tracing-futures = "0.2.5" tracing-subscriber = "0.3.9" tracing-chrome = "0.5.0" diff --git a/packages/next-swc/crates/napi/src/minify.rs b/packages/next-swc/crates/napi/src/minify.rs index 077d21ea1cafb11..8821b260d266177 100644 --- a/packages/next-swc/crates/napi/src/minify.rs +++ b/packages/next-swc/crates/napi/src/minify.rs @@ -31,8 +31,9 @@ use fxhash::FxHashMap; use napi::bindgen_prelude::*; use serde::Deserialize; use swc_core::{ - base::{config::JsMinifyOptions, try_with_handler, TransformOutput}, + base::{config::JsMinifyOptions, try_with_handler, BoolOrDataConfig, TransformOutput}, common::{errors::ColorConfig, sync::Lrc, FileName, SourceFile, SourceMap, GLOBALS}, + ecma::minifier::option::terser::TerserCompressorOptions, }; use crate::{get_compiler, util::MapErr}; @@ -92,6 +93,12 @@ impl Task for MinifyTask { fm, handler, &JsMinifyOptions { + compress: TerserCompressorOptions { + // inline: TerserInlineOption::Num(0).into(), + ..Default::default() + } + .into(), + mangle: BoolOrDataConfig::from_bool(false), ..self.opts.clone() }, ) diff --git a/packages/next-swc/crates/napi/src/transform.rs b/packages/next-swc/crates/napi/src/transform.rs index 8b16ed4622bfae6..f1104fb5f20e0da 100644 --- a/packages/next-swc/crates/napi/src/transform.rs +++ b/packages/next-swc/crates/napi/src/transform.rs @@ -38,6 +38,7 @@ use anyhow::{anyhow, bail, Context as _}; use fxhash::FxHashSet; use napi::bindgen_prelude::*; use next_swc::{custom_before_pass, TransformOptions}; +use swc_core::common::comments::SingleThreadedComments; use swc_core::{ base::{try_with_handler, Compiler, TransformOutput}, common::{errors::ColorConfig, FileName, GLOBALS}, @@ -107,12 +108,14 @@ impl Task for TransformTask { let cm = self.c.cm.clone(); let file = fm.clone(); + let comments = SingleThreadedComments::default(); self.c.process_js_with_custom_pass( fm, None, handler, &options.swc, - |_, comments| { + comments.clone(), + |_| { custom_before_pass( cm, file, @@ -121,7 +124,7 @@ impl Task for TransformTask { eliminated_packages.clone(), ) }, - |_, _| noop(), + |_| noop(), ) }) }, diff --git a/packages/next-swc/crates/wasm/Cargo.toml b/packages/next-swc/crates/wasm/Cargo.toml index 33af9900b528968..3bf0e72550425ae 100644 --- a/packages/next-swc/crates/wasm/Cargo.toml +++ b/packages/next-swc/crates/wasm/Cargo.toml @@ -17,7 +17,7 @@ plugin = [ ] [dependencies] -anyhow = "1.0.42" +anyhow = "1.0.66" console_error_panic_hook = "0.1.6" next-swc = {version = "0.0.0", path = "../core"} once_cell = "1.13.0" @@ -25,7 +25,7 @@ parking_lot_core = "=0.8.0" path-clean = "0.1" serde = {version = "1", features = ["derive"]} serde_json = "1" -tracing = { version = "0.1.32", features = ["release_max_level_off","max_level_off"] } +tracing = { version = "0.1.37", features = ["release_max_level_off","max_level_off"] } wasm-bindgen = {version = "0.2", features = ["enable-interning"]} wasm-bindgen-futures = "0.4.8" getrandom = { version = "0.2.5", optional = true, default-features = false } @@ -46,7 +46,7 @@ swc_core = { features = [ "ecma_parser_typescript", "ecma_utils", "ecma_visit" -], version = "0.40.16" } +], version = "0.40.40" } # Workaround a bug diff --git a/packages/next-swc/crates/wasm/src/lib.rs b/packages/next-swc/crates/wasm/src/lib.rs index e8427a1d4238cfd..1b16b6a79bd1f82 100644 --- a/packages/next-swc/crates/wasm/src/lib.rs +++ b/packages/next-swc/crates/wasm/src/lib.rs @@ -8,7 +8,9 @@ use wasm_bindgen_futures::future_to_promise; use swc_core::{ base::{config::JsMinifyOptions, config::ParseOptions, try_with_handler, Compiler}, common::{ - comments::Comments, errors::ColorConfig, FileName, FilePathMapping, SourceMap, GLOBALS, + comments::{Comments, SingleThreadedComments}, + errors::ColorConfig, + FileName, FilePathMapping, SourceMap, GLOBALS, }, ecma::transforms::base::pass::noop, }; @@ -84,12 +86,14 @@ pub fn transform_sync(s: JsValue, opts: JsValue) -> Result { ); let cm = c.cm.clone(); let file = fm.clone(); + let comments = SingleThreadedComments::default(); c.process_js_with_custom_pass( fm, None, handler, &opts.swc, - |_, comments| { + comments.clone(), + |_| { custom_before_pass( cm, file, @@ -98,7 +102,7 @@ pub fn transform_sync(s: JsValue, opts: JsValue) -> Result { Default::default(), ) }, - |_, _| noop(), + |_| noop(), ) .context("failed to process js file")? } diff --git a/test/unit/next-swc.test.ts b/test/unit/next-swc.test.ts index 6cc5903eb70a9f4..87ccb36af1c5c0d 100644 --- a/test/unit/next-swc.test.ts +++ b/test/unit/next-swc.test.ts @@ -82,7 +82,7 @@ var ref = _slicedToArray(useState(0), 2), count = ref[0], setCount = ref[1]; expect(output).toMatchInlineSnapshot(` "function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; - for(var i1 = 0, arr2 = new Array(len); i1 < len; i1++)arr2[i1] = arr[i1]; + for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i]; return arr2; } function _arrayWithHoles(arr) { @@ -95,7 +95,7 @@ function _nonIterableRest() { throw new TypeError(\\"Invalid attempt to destructure non-iterable instance.\\\\\\\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.\\"); } function _toArray(arr) { - return _arrayWithHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); + return _arrayWithHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableRest(); } function _unsupportedIterableToArray(o, minLen) { if (!o) return;