From 0cc045de679b577a9b353023391eb82392b4f119 Mon Sep 17 00:00:00 2001 From: Niklas Mischkulnig <4586894+mischnic@users.noreply.github.com> Date: Sat, 3 Sep 2022 17:46:15 +0200 Subject: [PATCH] Bump swc (#8390) --- Cargo.lock | 109 +++++++++++---------- packages/transformers/js/core/Cargo.toml | 6 +- packages/transformers/js/core/src/utils.rs | 2 +- 3 files changed, 59 insertions(+), 58 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c882275b73c..c256302c5fc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -68,9 +68,9 @@ checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] name = "ast_node" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87549fcb780f81054407f313a1693d102396c223f5c49ccc5d90b46a6cbef34a" +checksum = "1a36288803cd1605bc4f0e3189970a0db8e602bb01a39f8133889f35ece7ddde" dependencies = [ "darling", "pmutil", @@ -1299,9 +1299,9 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "preset_env_base" -version = "0.2.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f68dc2366d2258e280ad44221403aa0af50868b3e6dc1cb9fb14a302cc01948" +checksum = "ec3fc6fae03023ee1badb75ccbefc36379c419754b30e3848b77a4327f4ec1e2" dependencies = [ "ahash", "anyhow", @@ -1690,9 +1690,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "swc_atoms" -version = "0.2.13" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d99c0ac33707dd1162a3665d6ca1a28b2f6594e9c37c4703e417fc5e1ce532e" +checksum = "454bf2d73485f6c4af9c91e70ce4fd4f17e9294d37b9f2037a3c4c2fe54b598d" dependencies = [ "once_cell", "rustc-hash", @@ -1703,9 +1703,9 @@ dependencies = [ [[package]] name = "swc_cached" -version = "0.1.1" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84fed4a980e12c737171a7b17c5e0a2f4272899266fa0632ea4e31264ebdfdb5" +checksum = "395389d54bea607246bb4a400b9b3df2e55adfe8fcce7965a5b99fed7816cf4d" dependencies = [ "ahash", "anyhow", @@ -1718,9 +1718,9 @@ dependencies = [ [[package]] name = "swc_common" -version = "0.23.0" +version = "0.27.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68e76a324fa0d7240e790c78914f39fdecfa9d87ef4efed591124b58607a4a4a" +checksum = "cba38a2f1291fcf3f78f357802b8cec72ecf5e95808e9d937783e60cd3570b93" dependencies = [ "ahash", "ast_node", @@ -1774,9 +1774,9 @@ dependencies = [ [[package]] name = "swc_ecma_ast" -version = "0.84.0" +version = "0.90.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cce1fb31e3a100feb31f94647fe27e457bc13b17a8931204fdc9bc58a15c936a" +checksum = "e6b4c117b34ccc510cf6245c2f9b1f24a933beb2ef858bbfba99fb195525ddde" dependencies = [ "bitflags", "is-macro", @@ -1791,14 +1791,15 @@ dependencies = [ [[package]] name = "swc_ecma_codegen" -version = "0.115.0" +version = "0.122.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d09abf1639f76d3d174225fdb608805f9c21d4c455f4dd2ef6ab156701f1f82a" +checksum = "0acc7d3ea2b74109e0d6803c9653711958aaa01889a226ee12c93f92d5de0fe4" dependencies = [ "memchr", "num-bigint", "once_cell", "rustc-hash", + "serde", "sourcemap", "swc_atoms", "swc_common", @@ -1822,9 +1823,9 @@ dependencies = [ [[package]] name = "swc_ecma_loader" -version = "0.35.0" +version = "0.39.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "710c86eb2b253160d4a02fa77057f1c493b3932d1b83430cbbc1e7823eb47e8c" +checksum = "ece6023a43222e3bd36e3d191fa5289c848245b97fbf0127d9c0923165648d18" dependencies = [ "ahash", "anyhow", @@ -1841,9 +1842,9 @@ dependencies = [ [[package]] name = "swc_ecma_parser" -version = "0.111.0" +version = "0.118.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc1766e5b969c59e51a5dfe9337755d7380a891e579dd6b0eb7816587c7ea7aa" +checksum = "99fe54d8da755f649c81337de073f393eb852d9194a19dfbeebaada772265730" dependencies = [ "either", "enum_kind", @@ -1860,9 +1861,9 @@ dependencies = [ [[package]] name = "swc_ecma_preset_env" -version = "0.149.0" +version = "0.161.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d27c37e693b1deda42bc2f70254234d79d2c10797701f261cbb7797b8f37bb2d" +checksum = "785793720219c467ef461003320cabee596d12d05dfdc5bd3d89ff38bd13c58c" dependencies = [ "ahash", "anyhow", @@ -1885,9 +1886,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms" -version = "0.174.0" +version = "0.185.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a30f3386dbaa8490ac3ed65240c057ea3a3b20d37c4dba50c876adce5201f673" +checksum = "6e307b4c2100104d10f5840f5cba0c7b2db00742acb88d65652bb86bc4463d5b" dependencies = [ "swc_atoms", "swc_common", @@ -1905,9 +1906,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_base" -version = "0.97.0" +version = "0.104.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66b316a99dde0ef85f1878aaa9f4bf9b15f16e999c56ed31a1433928c754ae4e" +checksum = "10d7aeb3338fbc35b2d8f881a6102588b6cd1a6d7d6edf333252ee358c6e9b2c" dependencies = [ "better_scoped_tls", "bitflags", @@ -1928,9 +1929,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_classes" -version = "0.85.0" +version = "0.93.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c853c4366e81092d38b746e71adffc1150c694f02c1068c9fa24abbdc373a65f" +checksum = "f5368a6459a31def42c29a8d0e5ebaafdbe9c731b244a2deb976151d12e37fe4" dependencies = [ "swc_atoms", "swc_common", @@ -1942,9 +1943,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_compat" -version = "0.114.0" +version = "0.124.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ace2890c492568b47abb6eecbbb2dcb8f2218adcf0d8a3b73d84b88fddc7d87f" +checksum = "8c376bfd35ce0fa4fcd90868b066191e10f6eb2426b12fe9b3d031a465f65a98" dependencies = [ "ahash", "arrayvec", @@ -1982,9 +1983,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_module" -version = "0.130.0" +version = "0.141.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66810e70c1386e75a86a5ecdcfeb2150ec9f7b32a9213beedff60c33a46c7947" +checksum = "fe8f03422562c4747c78a55f6ba41625eb1a6167ec8b152df5a28a5bb36ab345" dependencies = [ "Inflector", "ahash", @@ -2010,9 +2011,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_optimization" -version = "0.143.0" +version = "0.154.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9def3dc7a6afe6b44cacd61c200181507396ee3c21a3751299718fecebce51d" +checksum = "25ad6077e00037f2249df854b60359d6aa85ffbc83ce7e9aea59734016af941a" dependencies = [ "ahash", "dashmap", @@ -2033,9 +2034,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_proposal" -version = "0.122.0" +version = "0.132.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ebc6e03a51f9adcbc40ec144c9bbe78de872bf6f8f581f3abd51187ec6e648" +checksum = "46f6e9c5772404d7a07a2cda019717cbd294d47215a7a2101332d1d4b64fdc92" dependencies = [ "either", "serde", @@ -2052,9 +2053,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_react" -version = "0.132.0" +version = "0.143.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "438ffd11b17c3c6565e44a9a0d596687459de9f13b9ea302f5baf8e20c07a860" +checksum = "11cee549bb5166dd212e5e18f49ddd3e5db9698314aa1ffa6deea553f659978e" dependencies = [ "ahash", "base64 0.13.0", @@ -2078,9 +2079,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_typescript" -version = "0.136.0" +version = "0.147.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d8c061e8ad8a3f47e9d49f85cea3ab1edca0a6585354ea23923d18e75368eb4" +checksum = "020383a6e9aa3ab8225f50de42b2528f5d3130a7d92b436a8594d2af05e244aa" dependencies = [ "serde", "swc_atoms", @@ -2094,9 +2095,9 @@ dependencies = [ [[package]] name = "swc_ecma_utils" -version = "0.93.0" +version = "0.100.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70981d5ef10c0ff0a002e21decbca9dde5b40c2fc0d0bc6eaebb219a8e0a5f7d" +checksum = "671eb0ef731ab6e9357e0a1845f527b02ed319b813b0e274d87b8d942554a353" dependencies = [ "indexmap", "once_cell", @@ -2110,9 +2111,9 @@ dependencies = [ [[package]] name = "swc_ecma_visit" -version = "0.70.0" +version = "0.76.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcd081250d664808fcd23110202728811236c87f527656ffc1db7f00ac1a06dd" +checksum = "02cb4c2c4213d603543e7232db69e763a9292953db511b0ed5d1bf8c1b227b90" dependencies = [ "num-bigint", "swc_atoms", @@ -2124,9 +2125,9 @@ dependencies = [ [[package]] name = "swc_ecmascript" -version = "0.179.0" +version = "0.192.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44e4fa994e933838459cfbfce2913f34b054ff3ecc4988e6f1eb993d7bb1a7ef" +checksum = "c1b18f993b6f6e8a5e81230226af043063f28e83eec89cf93d3cb554d2c63bdb" dependencies = [ "swc_ecma_ast", "swc_ecma_codegen", @@ -2139,9 +2140,9 @@ dependencies = [ [[package]] name = "swc_eq_ignore_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c8f200a2eaed938e7c1a685faaa66e6d42fa9e17da5f62572d3cbc335898f5e" +checksum = "0c20468634668c2bbab581947bb8c75c97158d5a6959f4ba33df20983b20b4f6" dependencies = [ "pmutil", "proc-macro2", @@ -2151,9 +2152,9 @@ dependencies = [ [[package]] name = "swc_macros_common" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5dca3f08d02da4684c3373150f7c045128f81ea00f0c434b1b012bc65a6cce3" +checksum = "a4be988307882648d9bc7c71a6a73322b7520ef0211e920489a98f8391d8caa2" dependencies = [ "pmutil", "proc-macro2", @@ -2163,9 +2164,9 @@ dependencies = [ [[package]] name = "swc_trace_macro" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d1a05fdb40442d687cb2eff4e5c374886a66ced1436ad87515de7d72b3ec10b" +checksum = "a4795c8d23e0de62eef9cac0a20ae52429ee2ffc719768e838490f195b7d7267" dependencies = [ "proc-macro2", "quote", @@ -2174,9 +2175,9 @@ dependencies = [ [[package]] name = "swc_visit" -version = "0.4.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fafa6c946bdbe601f5511140776d59e82a03f52a5e5039192b4b96f3ca639d88" +checksum = "b754ef01f2614eb469fd5215789bfd319566a3bf1033056d7a7bfb5a3c9a69f5" dependencies = [ "either", "swc_visit_macros", @@ -2184,9 +2185,9 @@ dependencies = [ [[package]] name = "swc_visit_macros" -version = "0.4.0" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cad1b8e0b2d48660bc454f70495e9bb583f9bf501f28165568569946e62f44a2" +checksum = "c230bcd129d1fbcd1decd8b43cccd613fda11c895f7c04d6c966231dbc1959af" dependencies = [ "Inflector", "pmutil", diff --git a/packages/transformers/js/core/Cargo.toml b/packages/transformers/js/core/Cargo.toml index d3b7d21d688..a758e450a21 100644 --- a/packages/transformers/js/core/Cargo.toml +++ b/packages/transformers/js/core/Cargo.toml @@ -8,9 +8,9 @@ edition = "2018" crate-type = ["rlib"] [dependencies] -swc_ecmascript = { version = "0.179.0", features = ["parser", "transforms", "module", "optimization", "react", "typescript", "utils", "visit", "codegen", "utils", "preset_env"] } -swc_common = { version = "0.23.0", features = ["tty-emitter", "sourcemap"] } -swc_atoms = "0.2.13" +swc_ecmascript = { version = "0.192.0", features = ["parser", "transforms", "module", "optimization", "react", "typescript", "utils", "visit", "codegen", "utils", "preset_env"] } +swc_common = { version = "0.27.13", features = ["tty-emitter", "sourcemap"] } +swc_atoms = "0.4.8" indoc = "1.0.3" serde = "1.0.123" serde_bytes = "0.11.5" diff --git a/packages/transformers/js/core/src/utils.rs b/packages/transformers/js/core/src/utils.rs index a6f2a6d859d..667f036eba1 100644 --- a/packages/transformers/js/core/src/utils.rs +++ b/packages/transformers/js/core/src/utils.rs @@ -85,7 +85,7 @@ pub fn match_str(node: &ast::Expr) -> Option<(JsWord, Span)> { Expr::Lit(Lit::Str(s)) => Some((s.value.clone(), s.span)), // `string` Expr::Tpl(tpl) if tpl.quasis.len() == 1 && tpl.exprs.is_empty() => { - Some((tpl.quasis[0].raw.clone(), tpl.span)) + Some(((*tpl.quasis[0].raw).into(), tpl.span)) } _ => None, }