From 43818e20dc1c62cd01a4e18908c3134954d67b5e Mon Sep 17 00:00:00 2001 From: Timofei Iatsenko Date: Mon, 5 Feb 2024 17:47:35 +0100 Subject: [PATCH] chore: bump swc-core to 0.87.28 --- Cargo.lock | 465 +++++++++--------------------------- Cargo.toml | 2 +- README.md | 18 +- src/ast_utils.rs | 2 +- src/tests/common/mod.rs | 33 +-- src/tests/runtime_config.rs | 7 +- 6 files changed, 132 insertions(+), 395 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3181b08..b1f1e8c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -38,18 +38,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "ahash" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" -dependencies = [ - "cfg-if", - "getrandom", - "once_cell", - "version_check", -] - [[package]] name = "aho-corasick" version = "1.0.1" @@ -76,11 +64,10 @@ checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" [[package]] name = "ast_node" -version = "0.9.5" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c09c69dffe06d222d072c878c3afe86eee2179806f20503faec97250268b4c24" +checksum = "c3e3e06ec6ac7d893a0db7127d91063ad7d9da8988f8a1a256f03729e6eec026" dependencies = [ - "pmutil", "proc-macro2", "quote", "swc_macros_common", @@ -125,6 +112,12 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + [[package]] name = "better_scoped_tls" version = "0.1.1" @@ -282,9 +275,9 @@ checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" [[package]] name = "digest" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", "crypto-common", @@ -297,24 +290,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" [[package]] -name = "enum-iterator" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a0ac4aeb3a18f92eaf09c6bb9b3ac30ff61ca95514fc58cbead1c9a6bf5401" -dependencies = [ - "enum-iterator-derive", -] - -[[package]] -name = "enum-iterator-derive" -version = "1.1.0" +name = "equivalent" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "828de45d0ca18782232dfb8f3ea9cc428e8ced380eb26a520baaacfc70de39ce" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.105", -] +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" @@ -357,11 +336,10 @@ dependencies = [ [[package]] name = "from_variant" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03ec5dc38ee19078d84a692b1c41181ff9f94331c76cee66ff0208c770b5e54f" +checksum = "3a0b11eeb173ce52f84ebd943d42e58813a2ebb78a6a3ff0a243b71c5199cd7b" dependencies = [ - "pmutil", "proc-macro2", "swc_macros_common", "syn 2.0.23", @@ -394,18 +372,6 @@ dependencies = [ "wasi", ] -[[package]] -name = "getset" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e45727250e75cc04ff2846a66397da8ef2b3db8e40e0cef4df67950a07621eb9" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.105", -] - [[package]] name = "gimli" version = "0.26.2" @@ -424,9 +390,15 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash 0.7.6", + "ahash", ] +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -448,6 +420,19 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "hstr" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17fafeca18cf0927e23ea44d7a5189c10536279dfe9094e0dfa953053fbb5377" +dependencies = [ + "new_debug_unreachable", + "once_cell", + "phf", + "rustc-hash", + "smallvec", +] + [[package]] name = "idna" version = "0.4.0" @@ -466,12 +451,12 @@ checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" [[package]] name = "indexmap" -version = "1.9.3" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520" dependencies = [ - "autocfg", - "hashbrown", + "equivalent", + "hashbrown 0.14.3", ] [[package]] @@ -525,79 +510,6 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -[[package]] -name = "lexical" -version = "6.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7aefb36fd43fef7003334742cbf77b243fcd36418a1d1bdd480d613a67968f6" -dependencies = [ - "lexical-core", -] - -[[package]] -name = "lexical-core" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46" -dependencies = [ - "lexical-parse-float", - "lexical-parse-integer", - "lexical-util", - "lexical-write-float", - "lexical-write-integer", -] - -[[package]] -name = "lexical-parse-float" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f" -dependencies = [ - "lexical-parse-integer", - "lexical-util", - "static_assertions", -] - -[[package]] -name = "lexical-parse-integer" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9" -dependencies = [ - "lexical-util", - "static_assertions", -] - -[[package]] -name = "lexical-util" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc" -dependencies = [ - "static_assertions", -] - -[[package]] -name = "lexical-write-float" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862" -dependencies = [ - "lexical-util", - "lexical-write-integer", - "static_assertions", -] - -[[package]] -name = "lexical-write-integer" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446" -dependencies = [ - "lexical-util", - "static_assertions", -] - [[package]] name = "libc" version = "0.2.142" @@ -653,9 +565,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "miette" @@ -821,20 +733,19 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "phf" -version = "0.10.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ "phf_macros", "phf_shared", - "proc-macro-hack", ] [[package]] name = "phf_generator" -version = "0.10.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" dependencies = [ "phf_shared", "rand", @@ -842,23 +753,22 @@ dependencies = [ [[package]] name = "phf_macros" -version = "0.10.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" dependencies = [ "phf_generator", "phf_shared", - "proc-macro-hack", "proc-macro2", "quote", - "syn 1.0.105", + "syn 2.0.23", ] [[package]] name = "phf_shared" -version = "0.10.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ "siphasher", ] @@ -880,18 +790,6 @@ dependencies = [ "syn 2.0.23", ] -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "precomputed-hash" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - [[package]] name = "pretty_assertions" version = "1.3.0" @@ -904,36 +802,6 @@ dependencies = [ "yansi", ] -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.105", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - [[package]] name = "proc-macro2" version = "1.0.63" @@ -993,18 +861,6 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", "rand_core", ] @@ -1013,9 +869,6 @@ name = "rand_core" version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] [[package]] name = "redox_syscall" @@ -1090,7 +943,7 @@ checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58" dependencies = [ "bitvec", "bytecheck", - "hashbrown", + "hashbrown 0.12.3", "ptr_meta", "rend", "rkyv_derive", @@ -1147,9 +1000,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.9" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" @@ -1230,22 +1083,11 @@ dependencies = [ "serde", ] -[[package]] -name = "sha-1" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -1275,9 +1117,9 @@ checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" [[package]] name = "smallvec" -version = "1.10.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "smartstring" @@ -1302,7 +1144,7 @@ version = "6.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c46fdc1838ff49cf692226f5c2b0f5b7538f556863d0eca602984714667ac6e7" dependencies = [ - "base64", + "base64 0.13.1", "if_chain", "lazy_static", "regex", @@ -1312,12 +1154,6 @@ dependencies = [ "url", ] -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - [[package]] name = "stacker" version = "0.1.15" @@ -1337,39 +1173,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "string_cache" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" -dependencies = [ - "new_debug_unreachable", - "once_cell", - "parking_lot", - "phf_shared", - "precomputed-hash", - "serde", -] - -[[package]] -name = "string_cache_codegen" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" -dependencies = [ - "phf_generator", - "phf_shared", - "proc-macro2", - "quote", -] - [[package]] name = "string_enum" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fa4d4f81d7c05b9161f8de839975d3326328b8ba2831164b465524cc2f55252" +checksum = "1b650ea2087d32854a0f20b837fc56ec987a1cb4f758c9757e1171ee9812da63" dependencies = [ - "pmutil", "proc-macro2", "quote", "swc_macros_common", @@ -1406,27 +1215,24 @@ dependencies = [ [[package]] name = "swc_atoms" -version = "0.5.8" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8066e17abb484602da673e2d35138ab32ce53f26368d9c92113510e1659220b" +checksum = "7d538eaaa6f085161d088a04cf0a3a5a52c5a7f2b3bd9b83f73f058b0ed357c0" dependencies = [ "bytecheck", + "hstr", "once_cell", "rkyv", "rustc-hash", "serde", - "string_cache", - "string_cache_codegen", - "triomphe", ] [[package]] name = "swc_common" -version = "0.31.18" +version = "0.33.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e30cd01afa791b15263fcfe8f77ecbbd020ddef659f0f58d3c7b794ad65c1738" +checksum = "0a15b8a5ec7b3c87b5c602dec00caf3dbb07fe2daaaa1d144d0c00a612e0890c" dependencies = [ - "ahash 0.8.3", "anyhow", "ast_node", "atty", @@ -1444,7 +1250,6 @@ dependencies = [ "serde", "siphasher", "sourcemap", - "string_cache", "swc_atoms", "swc_eq_ignore_macros", "swc_visit", @@ -1456,9 +1261,9 @@ dependencies = [ [[package]] name = "swc_core" -version = "0.79.28" +version = "0.87.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32128eff23f09f048975b112d936cdb56b1e8262f76150b214067ae8fe734ace" +checksum = "8b3e389aed344d9d738f7e0901a1778a8402f10e459556c6d3a7a5b4501bf4cf" dependencies = [ "once_cell", "swc_atoms", @@ -1477,14 +1282,15 @@ dependencies = [ [[package]] name = "swc_ecma_ast" -version = "0.107.2" +version = "0.110.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcdf8c70c95a3e33093c1c2768ce6c7c2c1c87d7b955e8787bd3732f2d1bfca" +checksum = "79401a45da704f4fb2552c5bf86ee2198e8636b121cb81f8036848a300edd53b" dependencies = [ "bitflags 2.3.3", "bytecheck", "is-macro", "num-bigint", + "phf", "rkyv", "scoped-tls", "string_enum", @@ -1495,9 +1301,9 @@ dependencies = [ [[package]] name = "swc_ecma_codegen" -version = "0.142.4" +version = "0.146.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d81f4bdd4ec561c0f725143c4aed218968227850de8f9b57a7b8b920f33ba9f" +checksum = "aa20d5c61563c5ec9ba469a7701512f4d6bc29790718cd198f43e61148e8aff2" dependencies = [ "memchr", "num-bigint", @@ -1514,11 +1320,10 @@ dependencies = [ [[package]] name = "swc_ecma_codegen_macros" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcdff076dccca6cc6a0e0b2a2c8acfb066014382bc6df98ec99e755484814384" +checksum = "394b8239424b339a12012ceb18726ed0244fce6bf6345053cb9320b2791dcaa5" dependencies = [ - "pmutil", "proc-macro2", "quote", "swc_macros_common", @@ -1527,13 +1332,15 @@ dependencies = [ [[package]] name = "swc_ecma_parser" -version = "0.137.4" +version = "0.141.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23bb0964a8fe9d6ba226fcd761b4454eb2938ac2317196911ac405a15569c5b3" +checksum = "c4d17401dd95048a6a62b777d533c0999dabdd531ef9d667e22f8ae2a2a0d294" dependencies = [ "either", - "lexical", + "new_debug_unreachable", "num-bigint", + "num-traits", + "phf", "serde", "smallvec", "smartstring", @@ -1547,22 +1354,22 @@ dependencies = [ [[package]] name = "swc_ecma_testing" -version = "0.20.15" +version = "0.22.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35902aefa048253d193d7b0a4500f2bc98ed24f6607597ef967f612a2c4e45a2" +checksum = "9bfc1ad4ecd99954ab9304eaaeccce7ba5d1e2d27102eea78e6817d1d21bea58" dependencies = [ "anyhow", "hex", - "sha-1", + "sha2", "testing", "tracing", ] [[package]] name = "swc_ecma_transforms_base" -version = "0.130.6" +version = "0.135.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cae4d6e3250f61aa71ed1c172cfeb5eee042146417ef17c6b78887fc113bf35d" +checksum = "f6f0efec63cc56f3f2b93d1367d16e684d1c6f4a6cb85436db2c91448867df2b" dependencies = [ "better_scoped_tls", "bitflags 2.3.3", @@ -1583,17 +1390,17 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_testing" -version = "0.133.6" +version = "0.138.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19d7c5afc588527c6ce06429095471e5dd5fdb4ebff0ff734e2f432c5e9d321a" +checksum = "ecfd5d3bdcb529c4db2ac27fac59a9e1ce66975543d34f9ce60e7ee2cbc73f78" dependencies = [ "ansi_term", "anyhow", - "base64", + "base64 0.21.7", "hex", "serde", "serde_json", - "sha-1", + "sha2", "sourcemap", "swc_common", "swc_ecma_ast", @@ -1609,9 +1416,9 @@ dependencies = [ [[package]] name = "swc_ecma_utils" -version = "0.120.5" +version = "0.125.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93562e5b67676f5a60df97725722cc846a48f3cc5ce35a4f7e6c53e064abf76c" +checksum = "7cead1083e46b0f072a82938f16d366014468f7510350957765bb4d013496890" dependencies = [ "indexmap", "num_cpus", @@ -1627,9 +1434,9 @@ dependencies = [ [[package]] name = "swc_ecma_visit" -version = "0.93.2" +version = "0.96.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2821bb59f507727ebb36d4f64d8428e97dbbe62347a9c6fff096ccae6ccfafc2" +checksum = "a1d0100c383fb08b6f34911ab6f925950416a5d14404c1cd520d59fb8dfbb3bf" dependencies = [ "num-bigint", "swc_atoms", @@ -1641,11 +1448,10 @@ dependencies = [ [[package]] name = "swc_eq_ignore_macros" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05a95d367e228d52484c53336991fdcf47b6b553ef835d9159db4ba40efb0ee8" +checksum = "695a1d8b461033d32429b5befbf0ad4d7a2c4d6ba9cd5ba4e0645c615839e8e4" dependencies = [ - "pmutil", "proc-macro2", "quote", "syn 2.0.23", @@ -1653,9 +1459,9 @@ dependencies = [ [[package]] name = "swc_error_reporters" -version = "0.15.18" +version = "0.17.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b190cdaf440a894db49d50bc497fcc14fdf0f013fdaf7be2e69874cd1b5d0" +checksum = "5aed28e3bcc05839332abfbdeeb49686083f5542452aed7662d76cf062f1cbbc" dependencies = [ "anyhow", "miette", @@ -1666,11 +1472,10 @@ dependencies = [ [[package]] name = "swc_macros_common" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a273205ccb09b51fabe88c49f3b34c5a4631c4c00a16ae20e03111d6a42e832" +checksum = "50176cfc1cbc8bb22f41c6fe9d1ec53fbe057001219b5954961b8ad0f336fce9" dependencies = [ - "pmutil", "proc-macro2", "quote", "syn 2.0.23", @@ -1687,9 +1492,9 @@ dependencies = [ [[package]] name = "swc_plugin_macro" -version = "0.9.15" +version = "0.9.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "785309d342a69df4c929ee59e14e36889ca832f1d2a3c1d03c47c93126c72dbc" +checksum = "3232db481484070637b20a155c064096c0ea1ba04fa2247b89b618661b3574f4" dependencies = [ "proc-macro2", "quote", @@ -1698,9 +1503,9 @@ dependencies = [ [[package]] name = "swc_plugin_proxy" -version = "0.36.2" +version = "0.39.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c107c548e383728abe131abfc30f88e7a5a367c409e797933f4ad4cbc2512c1" +checksum = "9f00d9e79d36925854ce4de73acf397a6882a0dccb5b248d1ec48202ac3f72ad" dependencies = [ "better_scoped_tls", "rkyv", @@ -1723,9 +1528,9 @@ dependencies = [ [[package]] name = "swc_visit" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e87c337fbb2d191bf371173dea6a957f01899adb8f189c6c31b122a6cfc98fc3" +checksum = "b27078d8571abe23aa52ef608dd1df89096a37d867cf691cbb4f4c392322b7c9" dependencies = [ "either", "swc_visit_macros", @@ -1733,9 +1538,9 @@ dependencies = [ [[package]] name = "swc_visit_macros" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f322730fb82f3930a450ac24de8c98523af7d34ab8cb2f46bcb405839891a99" +checksum = "fa8bb05975506741555ea4d10c3a3bdb0e2357cd58e1a4a4332b8ebb4b44c34d" dependencies = [ "Inflector", "pmutil", @@ -1808,9 +1613,9 @@ dependencies = [ [[package]] name = "testing" -version = "0.33.21" +version = "0.35.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df186694fbd668f4c7c8071c5e442b0c8781c5282202724ac44dad6092f74802" +checksum = "4c090eccb0eab8cc5ef0667d76f0d8b6dfaf264ed76f94d24f72d54421604a8d" dependencies = [ "ansi_term", "cargo_metadata", @@ -1818,6 +1623,7 @@ dependencies = [ "once_cell", "pretty_assertions", "regex", + "serde", "serde_json", "swc_common", "swc_error_reporters", @@ -1828,14 +1634,13 @@ dependencies = [ [[package]] name = "testing_macros" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1c15b796025051a07f1ac695ee0cac0883f05a0d510c9d171ef8d31a992e6a5" +checksum = "f9d3864d4184569c1428645a51a304b3b6e8d3094cd61fb3cce8dfdd9f6d0f72" dependencies = [ "anyhow", "glob", "once_cell", - "pmutil", "proc-macro2", "quote", "regex", @@ -1883,33 +1688,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "time" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" -dependencies = [ - "itoa", - "serde", - "time-core", - "time-macros", -] - -[[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.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" -dependencies = [ - "time-core", -] - [[package]] name = "tinyvec" version = "1.6.0" @@ -1987,16 +1765,6 @@ dependencies = [ "tracing-log", ] -[[package]] -name = "triomphe" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1ee9bd9239c339d714d657fac840c6d2a4f9c45f4f9ec7b0975113458be78db" -dependencies = [ - "serde", - "stable_deref_trait", -] - [[package]] name = "typed-arena" version = "2.0.1" @@ -2033,7 +1801,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137" dependencies = [ - "hashbrown", + "hashbrown 0.12.3", "regex", ] @@ -2077,17 +1845,12 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "vergen" -version = "7.4.3" +version = "8.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447f9238a4553957277b3ee09d80babeae0811f1b3baefb093de1c0448437a37" +checksum = "bbc5ad0d9d26b2c49a5ab7da76c3e79d3ee37e7821799f8223fcb8f2f391a2e7" dependencies = [ "anyhow", - "cfg-if", - "enum-iterator", - "getset", "rustversion", - "thiserror", - "time", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index df856ac..3cd0c00 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ serde = "1" serde_json = "1.0.95" regex = "1.7.3" once_cell = "1.17.1" -swc_core = { version = "0.79.28", features = [ +swc_core = { version = "0.87.28", features = [ "ecma_plugin_transform", "ecma_utils", "ecma_visit", diff --git a/README.md b/README.md index 20e2af7..b2aa20d 100644 --- a/README.md +++ b/README.md @@ -86,15 +86,15 @@ SWC Plugin support is still experimental. They do not guarantee a semver backwar So you need to select an appropriate version of the plugin to match compatible `swc_core`. | Plugin Version | used `swc_core` | Compatibility | -|------------------------------------------|---------------|------------------------------------------------------------------------------------------------------| -| `0.1.0`, `4.0.0-next.0` | `0.52.8` | `next@13.0.0` ~ `next@13.2.3` | -| `0.2.*`, `4.0.0-next.1` ~ `4.0.0-next.3` | `0.56.1` | `@swc/core@1.3.29` ~ `@swc/core@1.3.37`
`next@13.2.4-canary.0` ~ `next@13.2.5-canary.5` | -| `4.0.0` | `0.75.33` | `@swc/core@1.3.49` ~ `@swc/core@1.3.57`
`next@v13.3.1-canary.12` ~ `next@v13.4.3-canary.1` | -| `4.0.1` | `0.76.0` | broken due to [`lto = true`](https://github.com/swc-project/swc/issues/7470#issuecomment-1571585905) | -| `4.0.2` | `0.76.41` | `@swc/core@1.3.58` ~ `@swc/core@1.3.62`
`next@v13.4.3-canary.2` ~ | -| `4.0.3` | `0.78.28` | `@swc/core@1.3.63` ~ `@swc/core@1.3.67`
`next@v13.4.8 ~ next@v13.4.10-canary.0` | -| `4.0.4` | `0.79.x` | `@swc/core@1.3.68` ~ `@swc/core@1.3.80`
`next@v13.4.10-canary.1` ~ | -| n/a | `0.82.x` | `@swc/core@1.3.81` ~ | +|------------------------------------------|-----------------|------------------------------------------------------------------------------------------------------| +| `0.1.0`, `4.0.0-next.0` | `0.52.8` | `next@13.0.0` ~ `next@13.2.3` | +| `0.2.*`, `4.0.0-next.1` ~ `4.0.0-next.3` | `0.56.1` | `@swc/core@1.3.29` ~ `@swc/core@1.3.37`
`next@13.2.4-canary.0` ~ `next@13.2.5-canary.5` | +| `4.0.0` | `0.75.33` | `@swc/core@1.3.49` ~ `@swc/core@1.3.57`
`next@v13.3.1-canary.12` ~ `next@v13.4.3-canary.1` | +| `4.0.1` | `0.76.0` | broken due to [`lto = true`](https://github.com/swc-project/swc/issues/7470#issuecomment-1571585905) | +| `4.0.2` | `0.76.41` | `@swc/core@1.3.58` ~ `@swc/core@1.3.62`
`next@v13.4.3-canary.2` ~ | +| `4.0.3` | `0.78.28` | `@swc/core@1.3.63` ~ `@swc/core@1.3.67`
`next@v13.4.8 ~ next@v13.4.10-canary.0` | +| `4.0.4` | `0.79.x` | `@swc/core@1.3.68` ~ `@swc/core@1.3.80`
`next@v13.4.10-canary.1` ~ | +| `4.0.5` | `0.87.x` | `@swc/core@1.3.81 ~ @swc/core@1.3.105`
`~ next@v14.1.0` | This table may become outdated. If you don't see a particular version of `@swc/core` or `next` check the compatibility by referring to the upstream's [Selecting the version](https://swc.rs/docs/plugin/selecting-swc-core) article. This will help you select the appropriate plugin version for your project. diff --git a/src/ast_utils.rs b/src/ast_utils.rs index abe0bd6..a90cfdc 100644 --- a/src/ast_utils.rs +++ b/src/ast_utils.rs @@ -162,7 +162,7 @@ pub fn create_import(source: JsWord, specifier: Ident) -> ModuleItem { value: source, raw: None, }), - asserts: None, + with: None, type_only: false, })) } diff --git a/src/tests/common/mod.rs b/src/tests/common/mod.rs index 69a55ca..b342575 100644 --- a/src/tests/common/mod.rs +++ b/src/tests/common/mod.rs @@ -1,23 +1,12 @@ #[macro_export] macro_rules! to { ($name:ident, $from:expr, $to:expr) => { - swc_core::ecma::transforms::testing::test!( + swc_core::ecma::transforms::testing::test_inline!( swc_core::ecma::parser::Syntax::Typescript(swc_core::ecma::parser::TsConfig { tsx: true, ..Default::default() }), |_| { - if let Err(_) = swc_core::plugin::errors::HANDLER.inner.set( - swc_core::common::errors::Handler::with_tty_emitter( - swc_core::common::errors::ColorConfig::Auto, - true, - false, - None, - ) - ) { - // set on a previous run - } - swc_core::common::chain!( swc_core::ecma::transforms::base::resolver(swc_core::common::Mark::new(), swc_core::common::Mark::new(), true), $crate::LinguiMacroFolder::default() @@ -25,29 +14,17 @@ macro_rules! to { }, $name, $from, - $to, - ok_if_code_eq + $to ); }; (production, $name:ident, $from:expr, $to:expr) => { - swc_core::ecma::transforms::testing::test!( + swc_core::ecma::transforms::testing::test_inline!( swc_core::ecma::parser::Syntax::Typescript(swc_core::ecma::parser::TsConfig { tsx: true, ..Default::default() }), |_| { - if let Err(_) = swc_core::plugin::errors::HANDLER.inner.set( - swc_core::common::errors::Handler::with_tty_emitter( - swc_core::common::errors::ColorConfig::Auto, - true, - false, - None, - ) - ) { - // set on a previous run - } - swc_core::common::chain!( swc_core::ecma::transforms::base::resolver(swc_core::common::Mark::new(), swc_core::common::Mark::new(), true), $crate::LinguiMacroFolder::new( @@ -59,8 +36,8 @@ macro_rules! to { }, $name, $from, - $to, - ok_if_code_eq + $to ); } } + diff --git a/src/tests/runtime_config.rs b/src/tests/runtime_config.rs index 851e07a..d79c079 100644 --- a/src/tests/runtime_config.rs +++ b/src/tests/runtime_config.rs @@ -3,7 +3,7 @@ use crate::{LinguiOptions, RuntimeModulesConfigMapNormalized}; macro_rules! to { ($name:ident, $options:expr, $from:expr, $to:expr) => { - swc_core::ecma::transforms::testing::test!( + swc_core::ecma::transforms::testing::test_inline!( swc_core::ecma::parser::Syntax::Typescript(swc_core::ecma::parser::TsConfig { tsx: true, ..Default::default() @@ -13,14 +13,11 @@ macro_rules! to { }, $name, $from, - $to, - ok_if_code_eq + $to ); }; } - - to!( should_use_provided_runtime_modules, LinguiOptions {