From c0fd61627d716386ba0df5aad5061a282a17491b Mon Sep 17 00:00:00 2001 From: David Sherret Date: Fri, 30 Aug 2024 11:27:32 -0400 Subject: [PATCH] fix: deno_ast 0.42 --- Cargo.lock | 95 +++++++++++++++++++++++----------------------- Cargo.toml | 4 +- rs-lib/src/emit.rs | 2 +- 3 files changed, 51 insertions(+), 50 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 052f2d4..e504322 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -281,11 +281,10 @@ dependencies = [ [[package]] name = "deno_ast" -version = "0.41.2" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a8207814a257d99164dbf780a73b9dee17af4db983f4b23ffbf20c7340d52f5" +checksum = "3b08d11d9e4086b00d3428650e31153cf5896586411763cb88a6423ce5b18791" dependencies = [ - "anyhow", "base64", "deno_media_type", "deno_terminal", @@ -293,6 +292,7 @@ dependencies = [ "once_cell", "percent-encoding", "serde", + "sourcemap", "swc_atoms", "swc_bundler", "swc_common", @@ -360,9 +360,9 @@ dependencies = [ [[package]] name = "deno_graph" -version = "0.81.0" +version = "0.82.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f1f965754dcdbaa5c9433a8c8da4a3cb7d93f29b58aa84b5617fe887f57415" +checksum = "646757b109993751f618d20de9bafc17f8f886fa910fb82c2c89b9e1df220ac6" dependencies = [ "anyhow", "async-trait", @@ -399,9 +399,9 @@ dependencies = [ [[package]] name = "deno_semver" -version = "0.5.7" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e23ce551a58eeefc05a48042a9c76d3409c96a1a6a522a82c4ced26930ece201" +checksum = "6657fecb9ac6a7a71f552c95e8cc492466a75f5660224577e2226bcf30db9768" dependencies = [ "monch", "once_cell", @@ -448,9 +448,9 @@ dependencies = [ [[package]] name = "dprint-swc-ext" -version = "0.18.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f385cdad3065151fae39262ad43003099234689856a0dc476e8804c5ba8f475b" +checksum = "0ba28c12892aadb751c2ba7001d8460faee4748a04b4edc51c7121cc67ee03db" dependencies = [ "num-bigint", "rustc-hash", @@ -1321,9 +1321,9 @@ dependencies = [ [[package]] name = "sourcemap" -version = "8.0.1" +version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "208d40b9e8cad9f93613778ea295ed8f3c2b1824217c6cfc7219d3f6f45b96d4" +checksum = "dab08a862c70980b8e23698b507e272317ae52a608a164a844111f5372374f1f" dependencies = [ "base64-simd", "bitvec", @@ -1402,9 +1402,9 @@ dependencies = [ [[package]] name = "swc_bundler" -version = "0.233.3" +version = "0.237.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9e0a88398e80a77bd6e1b523698a0f1ab3b12fbddd03c8a69a73963c02d3bbc" +checksum = "c77c112c218a09635d99a45802a81b4f341d6c28c81076aa2c29ba3bcd9151a9" dependencies = [ "anyhow", "crc", @@ -1446,9 +1446,9 @@ dependencies = [ [[package]] name = "swc_common" -version = "0.36.2" +version = "0.37.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1802b1642488aec58597dc55ea88992c165660d6e44e9838d4d93f7b78ab95f3" +checksum = "12d0a8eaaf1606c9207077d75828008cb2dfb51b095a766bd2b72ef893576e31" dependencies = [ "ast_node", "better_scoped_tls", @@ -1473,9 +1473,9 @@ dependencies = [ [[package]] name = "swc_config" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84b67e115ab136fe0eb03558bb0508ca7782eeb446a96d165508c48617e3fd94" +checksum = "4740e53eaf68b101203c1df0937d5161a29f3c13bceed0836ddfe245b72dd000" dependencies = [ "anyhow", "indexmap", @@ -1499,9 +1499,9 @@ dependencies = [ [[package]] name = "swc_ecma_ast" -version = "0.117.4" +version = "0.118.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5da2f0310e8cd84b8c803095e75b2cbca872c71fc7f7404d4c9c8117d894960" +checksum = "a6f866d12e4d519052b92a0a86d1ac7ff17570da1272ca0c89b3d6f802cd79df" dependencies = [ "bitflags 2.6.0", "is-macro", @@ -1517,9 +1517,9 @@ dependencies = [ [[package]] name = "swc_ecma_codegen" -version = "0.154.4" +version = "0.155.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7badcda2c45056495ed94b957884099cb000470ae7901ba68db2e7fd48414a4b" +checksum = "cc7641608ef117cfbef9581a99d02059b522fcca75e5244fa0cbbd8606689c6f" dependencies = [ "memchr", "num-bigint", @@ -1548,9 +1548,9 @@ dependencies = [ [[package]] name = "swc_ecma_loader" -version = "0.48.1" +version = "0.49.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a201c65ccbaa0c80fbcfd5c90dcc0bfc7ae62ac596f2233651ac715caf5d2c12" +checksum = "55fa3d55045b97894bfb04d38aff6d6302ac8a6a38e3bb3dfb0d20475c4974a9" dependencies = [ "anyhow", "pathdiff", @@ -1562,9 +1562,9 @@ dependencies = [ [[package]] name = "swc_ecma_parser" -version = "0.148.1" +version = "0.149.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8204235f635274dba4adc30c47ac896fd126ddfc53b27210676722423cbb2e7" +checksum = "683dada14722714588b56481399c699378b35b2ba4deb5c4db2fb627a97fb54b" dependencies = [ "either", "new_debug_unreachable", @@ -1584,9 +1584,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_base" -version = "0.143.3" +version = "0.145.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6df81c1cbb920d9c47abe6fb105363b0f78df2c8f6b0910c4fdd2ad7cbdfb23d" +checksum = "65f21494e75d0bd8ef42010b47cabab9caaed8f2207570e809f6f4eb51a710d1" dependencies = [ "better_scoped_tls", "bitflags 2.6.0", @@ -1607,9 +1607,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_classes" -version = "0.132.1" +version = "0.134.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53291bcdfca4bd4c2546c3170d7f0ea1d4f22f6fce2a531265ead010a9a2ebdf" +checksum = "3c3d884594385bea9405a2e1721151470d9a14d3ceec5dd773c0ca6894791601" dependencies = [ "swc_atoms", "swc_common", @@ -1633,9 +1633,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_optimization" -version = "0.204.2" +version = "0.208.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7f9a903d6774d3f9005775badc25817296791ffed560f1b7e38aab62ca37ff" +checksum = "98d8447ea20ef76958a8240feef95743702485a84331e6df5bdbe7e383c87838" dependencies = [ "dashmap", "indexmap", @@ -1657,9 +1657,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_proposal" -version = "0.177.1" +version = "0.179.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2d84d062b05ae89982a76ff47881a5e15bbd02e9b3c68dc14a3f5eacf48abca" +checksum = "79938ff510fc647febd8c6c3ef4143d099fdad87a223680e632623d056dae2dd" dependencies = [ "either", "rustc-hash", @@ -1677,9 +1677,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_react" -version = "0.189.2" +version = "0.191.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d411add563dd86d50b3db6e74e38def06587fa2fd370b430f71226688bfa6ded" +checksum = "76c76d8b9792ce51401d38da0fa62158d61f6d80d16d68fe5b03ce4bf5fba383" dependencies = [ "base64", "dashmap", @@ -1702,9 +1702,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_typescript" -version = "0.194.3" +version = "0.198.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f73c4ae3eb15adc5865dc729c4e111040529cec5a349d56ed0b4a0de1a86242" +checksum = "15455da4768f97186c40523e83600495210c11825d3a44db43383fd81eace88d" dependencies = [ "ryu-js", "serde", @@ -1719,9 +1719,9 @@ dependencies = [ [[package]] name = "swc_ecma_utils" -version = "0.133.4" +version = "0.134.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6148af60d25da893aef037621e4869e9b580eb280e12f5a8d4f87fa5e4cd5da" +checksum = "029eec7dd485923a75b5a45befd04510288870250270292fc2c1b3a9e7547408" dependencies = [ "indexmap", "num_cpus", @@ -1738,9 +1738,9 @@ dependencies = [ [[package]] name = "swc_ecma_visit" -version = "0.103.3" +version = "0.104.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed8026e4d9abcb75d511bf7623d49e8e135f02f4f9a6bb7c115df8239cfe3d4f" +checksum = "5b1c6802e68e51f336e8bc9644e9ff9da75d7da9c1a6247d532f2e908aa33e81" dependencies = [ "new_debug_unreachable", "num-bigint", @@ -1764,9 +1764,9 @@ dependencies = [ [[package]] name = "swc_fast_graph" -version = "0.24.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3f854cf8efc290aa927d31dab98b42011ff2341fecb2b27fdc817ef7b30ef3b" +checksum = "357e2c97bb51431d65080f25b436bc4e2fc1a7f64a643bc21a8353e478dc799f" dependencies = [ "indexmap", "petgraph", @@ -1776,9 +1776,9 @@ dependencies = [ [[package]] name = "swc_graph_analyzer" -version = "0.25.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97d4b3b186f842f6def323db73f1bc90d7086bd5fa1fb4cca527e20c70f856e" +checksum = "f84e1d24a0d6e4066b42cfc00ab9b3109e314465aa199dd3e16849ed9566dce7" dependencies = [ "auto_impl", "petgraph", @@ -1800,11 +1800,12 @@ dependencies = [ [[package]] name = "swc_visit" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e194d14f94121fd08b823d3379eedb3ce455785d9e0c3d2742c59377e283207" +checksum = "1ceb044142ba2719ef9eb3b6b454fce61ab849eb696c34d190f04651955c613d" dependencies = [ "either", + "new_debug_unreachable", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 2e863ee..f430834 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,8 +8,8 @@ members = [ [workspace.dependencies] anyhow = "1.0.44" base64 = "0.21.5" -deno_graph = { version = "0.81.0", default-features = false } -deno_ast = { version = "0.41.2", features = ["bundler", "codegen", "proposal", "react", "sourcemap", "transforms", "typescript", "visit", "transpiling"] } +deno_graph = { version = "0.82.0", default-features = false } +deno_ast = { version = "0.42.0", features = ["bundler", "codegen", "proposal", "react", "sourcemap", "transforms", "typescript", "visit", "transpiling"] } url = { version = "2.3.1" } [profile.release] diff --git a/rs-lib/src/emit.rs b/rs-lib/src/emit.rs index 28193eb..558892f 100644 --- a/rs-lib/src/emit.rs +++ b/rs-lib/src/emit.rs @@ -137,7 +137,7 @@ impl swc::bundler::Resolve for BundleResolver<'_> { self.0.resolve_dependency(specifier, referrer, false) { Ok(swc::loader::resolve::Resolution { - filename: deno_ast::swc::common::FileName::Url(specifier), + filename: deno_ast::swc::common::FileName::Url(specifier.clone()), slug: None, }) } else {