From cedb1e66ce2cf3568350fd592f9cf7e5ce98befe Mon Sep 17 00:00:00 2001 From: Justin Ridgewell Date: Fri, 28 Oct 2022 21:18:01 -0400 Subject: [PATCH] Bump SWC This also removes the source map clone, which is no longer necessary after swc-project/swc#6276. --- Cargo.lock | 178 ++++++++++------------- Cargo.toml | 2 +- crates/turbopack-ecmascript/src/parse.rs | 3 +- 3 files changed, 76 insertions(+), 107 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4dd8de9c510c1..0d3c942a09fc7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -952,15 +952,6 @@ dependencies = [ "parking_lot_core 0.9.3", ] -[[package]] -name = "debug_unreachable" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a032eac705ca39214d169f83e3d3da290af06d8d1d344d1baad2fd002dca4b3" -dependencies = [ - "unreachable", -] - [[package]] name = "debugit" version = "0.1.2" @@ -1894,12 +1885,6 @@ dependencies = [ "wasm-bindgen", ] -[[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" @@ -3670,9 +3655,9 @@ dependencies = [ [[package]] name = "swc" -version = "0.232.53" +version = "0.232.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2fc0f4c38bafd2dcbc3337c651139d1baa49a5a316a96267b80060c276e5f2c" +checksum = "05a29efbc6288da29d8c9cf9897e1fb44842f76b79f7c3f26002d2c7a739386d" dependencies = [ "ahash", "anyhow", @@ -3680,7 +3665,7 @@ dependencies = [ "dashmap", "either", "indexmap", - "json_comments", + "jsonc-parser", "lru", "once_cell", "parking_lot 0.12.1", @@ -3728,9 +3713,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", "rustc-hash", @@ -3756,18 +3741,18 @@ 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", "ast_node", "atty", "better_scoped_tls", "cfg-if 1.0.0", - "debug_unreachable", "either", "from_variant", + "new_debug_unreachable", "num-bigint", "once_cell", "parking_lot 0.12.1", @@ -3812,9 +3797,9 @@ dependencies = [ [[package]] name = "swc_core" -version = "0.40.16" +version = "0.40.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ecc8e046802b9a499eabe39d512132d38d9e6efd1acee5f9f996525fbc6a218" +checksum = "f9efec2cf8ace16e4a2408639603b6d3ce8620566ed19c15003c1ac2cb5673cc" dependencies = [ "swc", "swc_atoms", @@ -3845,9 +3830,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", @@ -3858,9 +3843,9 @@ dependencies = [ [[package]] name = "swc_css_codegen" -version = "0.134.6" +version = "0.134.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc09c50cd950542daccb5d353f16583a032e1d6dadd4150a2efd9d39a679e292" +checksum = "fcc3f5a01d433fcfef7ec7ca29d0325200e972409b1fcda1f9265fab42f3e14e" dependencies = [ "auto_impl", "bitflags", @@ -3888,9 +3873,9 @@ dependencies = [ [[package]] name = "swc_css_compat" -version = "0.9.6" +version = "0.9.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48f4d7977675a49cf49eed67b36519b92087747c402122948ccc752f8ebd3be0" +checksum = "926ab7d21b4c2249c9e32faf95a690c558236e9709810ba81bbad210bb46c2f6" dependencies = [ "once_cell", "serde", @@ -3920,9 +3905,9 @@ dependencies = [ [[package]] name = "swc_css_parser" -version = "0.133.6" +version = "0.133.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd568b96d5de13b0ef84a1008dd8673a449fd0206404fe67f85ba3af2cc8446e" +checksum = "adcd8dd53e4034061ce39bf7225d6048fa4fb88a8de157d7e1c8f19ccbfa4d61" dependencies = [ "bitflags", "lexical", @@ -3934,9 +3919,9 @@ dependencies = [ [[package]] name = "swc_css_prefixer" -version = "0.135.6" +version = "0.135.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d643067d410c700551fc0258f87721b20dd098f7581d82ca0ceb797d718578f4" +checksum = "56c37c130455b1cd7775553c0637a6e1321c9fe4b51494d9a13e8094b9fc93b9" dependencies = [ "once_cell", "preset_env_base", @@ -3951,9 +3936,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", @@ -3966,9 +3951,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", @@ -3979,9 +3964,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", @@ -3996,9 +3981,9 @@ dependencies = [ [[package]] name = "swc_ecma_codegen" -version = "0.127.24" +version = "0.127.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7b3d1bf708c88a540d6dda9fc0e6086ec55fd3bd6c03a076edbee623533f0ad" +checksum = "72a5495203741e7e8445b23bbb330cec6200f764460bd8a9d8d30271018950da" dependencies = [ "memchr", "num-bigint", @@ -4028,9 +4013,9 @@ dependencies = [ [[package]] name = "swc_ecma_ext_transforms" -version = "0.91.25" +version = "0.91.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4799f6e76f157cd788f9253f287bf4827e648f50f773b71fd09e1f865ba3909d" +checksum = "dfb8bec3f8aa38ddf49aae4e59065cb54820e3e7754511604a36930b7321369c" dependencies = [ "phf", "swc_atoms", @@ -4042,9 +4027,9 @@ dependencies = [ [[package]] name = "swc_ecma_lints" -version = "0.66.33" +version = "0.66.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60773090d9145334d8c442f3f9a1deabf1567f19e17af6758098f4d3ea5ffe70" +checksum = "44f0ce2a1a20e2e1c6d83c169d74a135a09bc95bb610e5fbb657b3a7afe4528e" dependencies = [ "ahash", "auto_impl", @@ -4063,9 +4048,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", @@ -4085,9 +4070,9 @@ dependencies = [ [[package]] name = "swc_ecma_minifier" -version = "0.159.47" +version = "0.159.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66679b1d3a2c241851622f5d35108934fef3bc93b5361cdee69663978ee5a5a" +checksum = "f21ec9f9499d2e5b8c6b6f5617294f71493d48fc490bb413e0f8044bb3059dbb" dependencies = [ "ahash", "arrayvec 0.7.2", @@ -4118,9 +4103,9 @@ dependencies = [ [[package]] name = "swc_ecma_parser" -version = "0.122.20" +version = "0.122.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86e09f503e4e509cde4deb310950b645f7e3189328fa8a912bcb5497ea632bac" +checksum = "6472a516d3e7f30277650353f5bdce431c273e43ba25ee918e8d0a5a0a9868eb" dependencies = [ "either", "enum_kind", @@ -4137,9 +4122,9 @@ dependencies = [ [[package]] name = "swc_ecma_preset_env" -version = "0.174.27" +version = "0.174.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79a6987a9cbf28db3897c0e1c4f7c6ffd4876e6a4655fc3e9a3235665d62596c" +checksum = "007b81803ef23329552bdd4fa7845025a06c996d6b489961f42e352886c17742" dependencies = [ "ahash", "anyhow", @@ -4162,9 +4147,9 @@ dependencies = [ [[package]] name = "swc_ecma_quote_macros" -version = "0.33.21" +version = "0.33.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd1c46123c51bbccd2d6e6020b8f2f0078230a94681dd5fae540c1194403f475" +checksum = "fe694791cb5083117e5284b205f26f02338d3896770fcc3b6ffeb8c186934aea" dependencies = [ "anyhow", "pmutil", @@ -4180,9 +4165,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms" -version = "0.198.27" +version = "0.198.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "400fef08d46fc835ede0b625fbca363c2b1a4b8779384b3035619e13ccd77c82" +checksum = "7772374cc06f68c12ec1b8d78d35cbbe1bd859fe585b6a771f0afd1305e2cdd3" dependencies = [ "swc_atoms", "swc_common", @@ -4200,9 +4185,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_base" -version = "0.111.34" +version = "0.111.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1aa9c87d847b6bc0e8713db3893c01873542f090c7459cbf65aaf9e2d8b6cc2" +checksum = "966bbee55bdd5380216545166820b22813b1912a5558446898c9af2865d854e2" dependencies = [ "better_scoped_tls", "bitflags", @@ -4222,9 +4207,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_classes" -version = "0.100.33" +version = "0.100.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3326ba1f99432781bd178a6ebd7299f3e35a907fbbbefa1c0e4c2c807492f12" +checksum = "95273dc2b4aa678b2a28520c41d415835cd20b663a5635b56c5597b5dafef84f" dependencies = [ "swc_atoms", "swc_common", @@ -4236,9 +4221,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_compat" -version = "0.136.21" +version = "0.136.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce4560f76f908dcf216e26fcb51f35a9d8b3f3010e83e8cd85c930f38c56acb7" +checksum = "b10cec6359b7ac7ff6b9aee64ffe03f3dfc6d1fa8fc7fc25f9b8fd0a4a86f381" dependencies = [ "ahash", "arrayvec 0.7.2", @@ -4275,9 +4260,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_module" -version = "0.153.22" +version = "0.153.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8fda90e7dc601a394b7dd2dd2ba4f84f49bf83c4b3a0af84237dd2c61171583" +checksum = "b570fd871db98ef646dd6d8026c262f2e0fbb373af3d59010f39c7a110f23ca4" dependencies = [ "Inflector", "ahash", @@ -4303,9 +4288,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_optimization" -version = "0.167.27" +version = "0.167.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22cab1b9d00996744661d1fc21b19df8a1aaa19904c5e6bfaa90ca741eadace8" +checksum = "3b511a7566d9266f4967b1466961099bcea3d17b32bf5d290365d4f3eb6681a3" dependencies = [ "ahash", "dashmap", @@ -4328,9 +4313,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_proposal" -version = "0.144.21" +version = "0.144.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d3c0a63440353947fc0415450b88fc57b5f48a3e38b0e9e5cf437332baf34f" +checksum = "3d67090b8c75330a8414805d5755923aea17cc47b76a49628b0c3fb5aef84b57" dependencies = [ "either", "serde", @@ -4347,9 +4332,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_react" -version = "0.155.22" +version = "0.155.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8632b680840615bde60024b17f60177ca0e9c049c997a62197ee180dd03c8cb8" +checksum = "9480119190a92fe91ec7c9738b84e3206a693b7f2b9f8cc0040cf6adde1d382f" dependencies = [ "ahash", "base64 0.13.0", @@ -4373,9 +4358,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_typescript" -version = "0.159.23" +version = "0.159.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e95c2a616c35257584f0e65c17c6d9a4a59b29f390062ba37b20f220cf8e208b" +checksum = "f4ef43e4edff9a863052132132f84e06a61353453da5aa4c2fc349d634b96ebb" dependencies = [ "serde", "swc_atoms", @@ -4389,9 +4374,9 @@ dependencies = [ [[package]] name = "swc_ecma_utils" -version = "0.105.25" +version = "0.105.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c509c639188ed0e290aca1308efd7fac714ca6921ab98abd41734735bce2c70b" +checksum = "ffaaa56fd2d1f418b332740e618770e00adc2ceda3adf2bdbd3fb8dc1b0f89a7" dependencies = [ "indexmap", "num_cpus", @@ -4406,9 +4391,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", @@ -4450,9 +4435,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", @@ -4463,9 +4448,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", @@ -4487,9 +4472,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", @@ -4499,9 +4484,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", ] @@ -4638,9 +4623,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", @@ -5565,15 +5550,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" -[[package]] -name = "unreachable" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f2ae5ddb18e1c92664717616dd9549dde73f539f01bd7b77c2edb2446bdff91" -dependencies = [ - "void", -] - [[package]] name = "url" version = "2.3.0" @@ -5636,12 +5612,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 = "vte" version = "0.10.1" diff --git a/Cargo.toml b/Cargo.toml index 8af5df73da816..2d144da8dab3b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,4 +49,4 @@ opt-level = 3 [workspace.dependencies] # This version pin is workaround for https://github.com/tkaitchuck/aHash/issues/95 indexmap = "=1.6.2" -swc_core = "0.40.16" +swc_core = "0.40.33" diff --git a/crates/turbopack-ecmascript/src/parse.rs b/crates/turbopack-ecmascript/src/parse.rs index 4c7c67eac7ff3..e53de13e064fd 100644 --- a/crates/turbopack-ecmascript/src/parse.rs +++ b/crates/turbopack-ecmascript/src/parse.rs @@ -98,8 +98,7 @@ impl GenerateSourceMap for ParseResultSourceMap { #[turbo_tasks::function] fn generate_source_map(&self) -> SourceMapVc { let map = self.source_map.build_source_map_with_config( - // SWC expects a mutable vec, but it never modifies. Seems like an oversight. - &mut self.mappings.clone(), + &self.mappings, None, InlineSourcesContentConfig {}, );