From 463570ca2fd1ca5af658940401f44434270a3093 Mon Sep 17 00:00:00 2001 From: Niklas Mischkulnig <4586894+mischnic@users.noreply.github.com> Date: Thu, 11 Aug 2022 10:32:36 +0200 Subject: [PATCH] Bump swc --- Cargo.lock | 97 +++++++++++----------- packages/transformers/js/core/Cargo.toml | 6 +- packages/transformers/js/core/src/utils.rs | 2 +- 3 files changed, 53 insertions(+), 52 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c882275b73c..56457dc0130 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", @@ -1690,9 +1690,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "swc_atoms" -version = "0.2.13" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d99c0ac33707dd1162a3665d6ca1a28b2f6594e9c37c4703e417fc5e1ce532e" +checksum = "48195a9ae467bf6bd47f84ef949d1debfcad41b9f3e34387bc80586953132cb7" dependencies = [ "once_cell", "rustc-hash", @@ -1703,9 +1703,9 @@ dependencies = [ [[package]] name = "swc_cached" -version = "0.1.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84fed4a980e12c737171a7b17c5e0a2f4272899266fa0632ea4e31264ebdfdb5" +checksum = "8173f1b6a1336be836bcfae0f4c2a29daae97fdcea536e5ecf51cd411a2dc688" dependencies = [ "ahash", "anyhow", @@ -1718,9 +1718,9 @@ dependencies = [ [[package]] name = "swc_common" -version = "0.23.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68e76a324fa0d7240e790c78914f39fdecfa9d87ef4efed591124b58607a4a4a" +checksum = "fb3a8e10619952fb1b60b2f039eb1954419cc611f6efd639d200dfd15fa078d3" dependencies = [ "ahash", "ast_node", @@ -1774,9 +1774,9 @@ dependencies = [ [[package]] name = "swc_ecma_ast" -version = "0.84.0" +version = "0.90.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cce1fb31e3a100feb31f94647fe27e457bc13b17a8931204fdc9bc58a15c936a" +checksum = "195cc62d3256844148ac4096e3a8901a758fe50c6237c647ebfc1e6605b67f27" dependencies = [ "bitflags", "is-macro", @@ -1791,14 +1791,15 @@ dependencies = [ [[package]] name = "swc_ecma_codegen" -version = "0.115.0" +version = "0.121.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d09abf1639f76d3d174225fdb608805f9c21d4c455f4dd2ef6ab156701f1f82a" +checksum = "c6cdcb6cfd8270895aa3e26e5a89ff3eda0e947a5855e735e00bd0c02bb1d84c" 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.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "710c86eb2b253160d4a02fa77057f1c493b3932d1b83430cbbc1e7823eb47e8c" +checksum = "5c8e4dc0ae0a930f534dc3e713db4da1e08f060da19663dab5b794b8e75ccac1" dependencies = [ "ahash", "anyhow", @@ -1841,9 +1842,9 @@ dependencies = [ [[package]] name = "swc_ecma_parser" -version = "0.111.0" +version = "0.117.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc1766e5b969c59e51a5dfe9337755d7380a891e579dd6b0eb7816587c7ea7aa" +checksum = "8487764045bbc8bee67dea5deffde74ca3c2d67178f63bb6658cbccf08e2d225" dependencies = [ "either", "enum_kind", @@ -1860,9 +1861,9 @@ dependencies = [ [[package]] name = "swc_ecma_preset_env" -version = "0.149.0" +version = "0.157.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d27c37e693b1deda42bc2f70254234d79d2c10797701f261cbb7797b8f37bb2d" +checksum = "40429794e6564ab344a43c27e5aef1b35aec70982dcdd820d1d61d1fe6e3585f" dependencies = [ "ahash", "anyhow", @@ -1885,9 +1886,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms" -version = "0.174.0" +version = "0.182.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a30f3386dbaa8490ac3ed65240c057ea3a3b20d37c4dba50c876adce5201f673" +checksum = "f5c12c102ed323a37075049d4bb18ac1b142197b146c4af4a45befa5422c3bd4" dependencies = [ "swc_atoms", "swc_common", @@ -1905,9 +1906,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_base" -version = "0.97.0" +version = "0.103.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66b316a99dde0ef85f1878aaa9f4bf9b15f16e999c56ed31a1433928c754ae4e" +checksum = "f6c4c6c0079e1843c78565bc9d849c9a7c6c2e216f4133b4bda4dc34c1164b6d" dependencies = [ "better_scoped_tls", "bitflags", @@ -1928,9 +1929,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_classes" -version = "0.85.0" +version = "0.91.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c853c4366e81092d38b746e71adffc1150c694f02c1068c9fa24abbdc373a65f" +checksum = "115fcc1bf508e4fb5a2fa49225ee4080a70ce98dd29ca6d4b343884abc4ac520" dependencies = [ "swc_atoms", "swc_common", @@ -1942,9 +1943,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_compat" -version = "0.114.0" +version = "0.121.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ace2890c492568b47abb6eecbbb2dcb8f2218adcf0d8a3b73d84b88fddc7d87f" +checksum = "7cda74bca75bf5297e0610fcedc58e0eb2352eb8411600439e07bad7dbf0dcb4" dependencies = [ "ahash", "arrayvec", @@ -1982,9 +1983,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_module" -version = "0.130.0" +version = "0.138.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66810e70c1386e75a86a5ecdcfeb2150ec9f7b32a9213beedff60c33a46c7947" +checksum = "119ff9b078b16b6a3e9db262cbe58feed98106da19c7e8c317cd3f0ef691b01b" dependencies = [ "Inflector", "ahash", @@ -2010,9 +2011,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_optimization" -version = "0.143.0" +version = "0.151.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9def3dc7a6afe6b44cacd61c200181507396ee3c21a3751299718fecebce51d" +checksum = "ea896b058e2b8f2684e46b493403925d819e84fd27e6eb8c3e3da753a2732e1a" dependencies = [ "ahash", "dashmap", @@ -2033,9 +2034,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_proposal" -version = "0.122.0" +version = "0.129.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ebc6e03a51f9adcbc40ec144c9bbe78de872bf6f8f581f3abd51187ec6e648" +checksum = "a5a6db293d2f15787061bb63ec725d2bcf7a8cef729369933ac81db07059e051" dependencies = [ "either", "serde", @@ -2052,9 +2053,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_react" -version = "0.132.0" +version = "0.140.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "438ffd11b17c3c6565e44a9a0d596687459de9f13b9ea302f5baf8e20c07a860" +checksum = "2cedd302c8f6265695dedf3a0cfe3b0d45ff59d6c06dc00e4e5ddbb87bbce27a" dependencies = [ "ahash", "base64 0.13.0", @@ -2078,9 +2079,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_typescript" -version = "0.136.0" +version = "0.144.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d8c061e8ad8a3f47e9d49f85cea3ab1edca0a6585354ea23923d18e75368eb4" +checksum = "b37fd10653f232b2f593fe2a815865d1499077c3f3e2dca4b99d409a46106dd3" dependencies = [ "serde", "swc_atoms", @@ -2094,9 +2095,9 @@ dependencies = [ [[package]] name = "swc_ecma_utils" -version = "0.93.0" +version = "0.99.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70981d5ef10c0ff0a002e21decbca9dde5b40c2fc0d0bc6eaebb219a8e0a5f7d" +checksum = "dc55275a960eede19b7555a677331d2a621302a9b0705f26a0879ec648d0cc90" dependencies = [ "indexmap", "once_cell", @@ -2110,9 +2111,9 @@ dependencies = [ [[package]] name = "swc_ecma_visit" -version = "0.70.0" +version = "0.76.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcd081250d664808fcd23110202728811236c87f527656ffc1db7f00ac1a06dd" +checksum = "d98a58a923368e824bb9025cf751a93255641aef603a9b19fbb94e863c4786da" dependencies = [ "num-bigint", "swc_atoms", @@ -2124,9 +2125,9 @@ dependencies = [ [[package]] name = "swc_ecmascript" -version = "0.179.0" +version = "0.188.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44e4fa994e933838459cfbfce2913f34b054ff3ecc4988e6f1eb993d7bb1a7ef" +checksum = "9d93988de5ad431e29bc17b990adbc7e659ee0d8aec97923399e3985713e3ec7" dependencies = [ "swc_ecma_ast", "swc_ecma_codegen", @@ -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", @@ -2174,9 +2175,9 @@ dependencies = [ [[package]] name = "swc_visit" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fafa6c946bdbe601f5511140776d59e82a03f52a5e5039192b4b96f3ca639d88" +checksum = "ce1b826c9d4c0416bbed55d245c853bc1a60da55bf92f8b00dd22b37baf72080" dependencies = [ "either", "swc_visit_macros", @@ -2184,9 +2185,9 @@ dependencies = [ [[package]] name = "swc_visit_macros" -version = "0.4.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cad1b8e0b2d48660bc454f70495e9bb583f9bf501f28165568569946e62f44a2" +checksum = "9fda2daf67d99e8bc63d61b12818994863f65b7bcf52d4faab338154c7058546" dependencies = [ "Inflector", "pmutil", diff --git a/packages/transformers/js/core/Cargo.toml b/packages/transformers/js/core/Cargo.toml index d3b7d21d688..2629c45f34e 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.188.0", features = ["parser", "transforms", "module", "optimization", "react", "typescript", "utils", "visit", "codegen", "utils", "preset_env"] } +swc_common = { version = "0.27.0", features = ["tty-emitter", "sourcemap"] } +swc_atoms = "0.4.0" 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 4827a2db502..ade03fa5a3f 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, }