From d3419f7d147b8c362a3795c8284d55ff6f4f3492 Mon Sep 17 00:00:00 2001 From: David Sherret Date: Wed, 31 Jul 2024 18:31:03 -0400 Subject: [PATCH] perf: update deno_ast to 0.41 (#24819) Some perf gains in swc (I measured formatting and it was slightly faster). Includes: * https://github.com/denoland/deno_graph/pull/508 * https://github.com/denoland/eszip/pull/193 --- .dprint.json | 6 +- Cargo.lock | 198 +++++++++++++++++++--------------- Cargo.toml | 2 +- cli/Cargo.toml | 14 +-- cli/args/mod.rs | 1 + cli/lsp/code_lens.rs | 2 +- cli/lsp/testing/collectors.rs | 8 +- cli/tools/compile.rs | 1 + cli/tools/repl/session.rs | 1 + 9 files changed, 131 insertions(+), 102 deletions(-) diff --git a/.dprint.json b/.dprint.json index beebc4d874..0f1f7226cc 100644 --- a/.dprint.json +++ b/.dprint.json @@ -65,11 +65,11 @@ "third_party" ], "plugins": [ - "https://plugins.dprint.dev/typescript-0.91.4.wasm", + "https://plugins.dprint.dev/typescript-0.91.5.wasm", "https://plugins.dprint.dev/json-0.19.3.wasm", - "https://plugins.dprint.dev/markdown-0.17.1.wasm", + "https://plugins.dprint.dev/markdown-0.17.2.wasm", "https://plugins.dprint.dev/toml-0.6.2.wasm", "https://plugins.dprint.dev/exec-0.5.0.json@8d9972eee71fa1590e04873540421f3eda7674d0f1aae3d7c788615e7b7413d0", - "https://plugins.dprint.dev/g-plane/pretty_yaml-v0.3.0.wasm" + "https://plugins.dprint.dev/g-plane/pretty_yaml-v0.4.0.wasm" ] } diff --git a/Cargo.lock b/Cargo.lock index 497255f4ee..7ab9d8da32 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -124,9 +124,9 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.16" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "ammonia" @@ -1211,9 +1211,9 @@ dependencies = [ [[package]] name = "deno_ast" -version = "0.40.0" +version = "0.41.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d08372522975cce97fe0efbe42fea508c76eea4421619de6d63baae32792f7d" +checksum = "2a8207814a257d99164dbf780a73b9dee17af4db983f4b23ffbf20c7340d52f5" dependencies = [ "anyhow", "base64 0.21.7", @@ -1355,7 +1355,7 @@ dependencies = [ "cooked-waker", "deno_core_icudata", "deno_ops", - "deno_unsync 0.4.0", + "deno_unsync", "futures", "libc", "memoffset 0.9.1", @@ -1426,9 +1426,9 @@ dependencies = [ [[package]] name = "deno_doc" -version = "0.144.0" +version = "0.145.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12e151a1f29dcea4fe698123fa9693bc77574abf51a6add54d5d39cda99dd7f5" +checksum = "72a2bfbecd93b9bd62971905c6db227f53f828ccd65ccee60310d58621936072" dependencies = [ "ammonia", "anyhow", @@ -1452,9 +1452,9 @@ dependencies = [ [[package]] name = "deno_emit" -version = "0.43.1" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c60394020be62d8c0d7fa0808ece5d9607f822f4bd27453d248d528d11ae762" +checksum = "43a22b37181789a1b04ef823c168a194e821f8f3145d9d9d6b4da4207eba807d" dependencies = [ "anyhow", "base64 0.21.7", @@ -1536,16 +1536,16 @@ dependencies = [ [[package]] name = "deno_graph" -version = "0.80.1" +version = "0.81.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a71a3f1575d0309ac18ca2e7af88d64c15acd2c55d06fef0fbdfd7c69cecb09d" +checksum = "31f1f965754dcdbaa5c9433a8c8da4a3cb7d93f29b58aa84b5617fe887f57415" dependencies = [ "anyhow", "async-trait", "data-url", "deno_ast", "deno_semver", - "deno_unsync 0.3.10", + "deno_unsync", "encoding_rs", "futures", "import_map", @@ -1651,9 +1651,9 @@ dependencies = [ [[package]] name = "deno_lint" -version = "0.61.0" +version = "0.62.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d127c05c87cb0fa2a59ad9bc70084f06731a5117c14888253269b6e921cfaef1" +checksum = "69bb0887acec1830cac1a325ebe5cec96fdc41f61ee50e7b25447741007757b6" dependencies = [ "anyhow", "deno_ast", @@ -1998,16 +1998,6 @@ dependencies = [ "webpki-roots", ] -[[package]] -name = "deno_unsync" -version = "0.3.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c8b95582c2023dbb66fccc37421b374026f5915fa507d437cb566904db9a3a" -dependencies = [ - "parking_lot 0.12.3", - "tokio", -] - [[package]] name = "deno_unsync" version = "0.4.0" @@ -2408,9 +2398,9 @@ dependencies = [ [[package]] name = "dprint-plugin-markdown" -version = "0.17.1" +version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da8df52eef864c2577ad3fb28c596935e2c0161eb09f6d5e239b10fecda2ec1c" +checksum = "a38c16d6d22fb0eb3c2ec94c35d074334d0a0d1da8e4c62e182c9679bdb8ac31" dependencies = [ "anyhow", "dprint-core", @@ -2423,15 +2413,14 @@ dependencies = [ [[package]] name = "dprint-plugin-typescript" -version = "0.91.4" +version = "0.91.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23c6adeee0b91badb654e52efe670fa1f0c6dcacbabdd519e48c8c749e8ce5cd" +checksum = "9d4a48d899392c00c7b310e2b6f88deb75cd64b860fff85008af667aecb6e78a" dependencies = [ "anyhow", "deno_ast", "dprint-core", "dprint-core-macros", - "dprint-swc-ext", "percent-encoding", "rustc-hash", "serde", @@ -2439,9 +2428,9 @@ dependencies = [ [[package]] name = "dprint-swc-ext" -version = "0.17.1" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b909f9f9b22a6265839887544dce97b0b8e2b2635abf622f45613deb3de63e0" +checksum = "f385cdad3065151fae39262ad43003099234689856a0dc476e8804c5ba8f475b" dependencies = [ "allocator-api2", "bumpalo", @@ -2661,11 +2650,12 @@ dependencies = [ [[package]] name = "eszip" -version = "0.72.2" +version = "0.73.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "671e5931ba2ba3415b8c410a70b767ca80e1b5b721b428aca2f234f9776cf848" +checksum = "e1de63c5d16c099e1164154ba0c6fd1f54e1147ef635aaccc47702f8a442392a" dependencies = [ "anyhow", + "async-trait", "base64 0.21.7", "deno_ast", "deno_graph", @@ -2673,6 +2663,7 @@ dependencies = [ "deno_semver", "futures", "hashlink", + "indexmap", "serde", "serde_json", "sha2", @@ -3253,9 +3244,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", "allocator-api2", @@ -5177,6 +5168,26 @@ dependencies = [ "cc", ] +[[package]] +name = "ptr_meta" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" +dependencies = [ + "ptr_meta_derive", +] + +[[package]] +name = "ptr_meta_derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "pulldown-cmark" version = "0.9.6" @@ -6338,6 +6349,19 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +[[package]] +name = "swc_allocator" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adc8bd3075d1c6964010333fae9ddcd91ad422a4f8eb8b3206a9b2b6afb4209e" +dependencies = [ + "bumpalo", + "hashbrown", + "ptr_meta", + "rustc-hash", + "triomphe", +] + [[package]] name = "swc_atoms" version = "0.6.7" @@ -6352,9 +6376,9 @@ dependencies = [ [[package]] name = "swc_bundler" -version = "0.230.2" +version = "0.233.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c506ddddebb846f8e68780464e2fe1fdc0add4bc265659f713a71015ffcdb13" +checksum = "e9e0a88398e80a77bd6e1b523698a0f1ab3b12fbddd03c8a69a73963c02d3bbc" dependencies = [ "anyhow", "crc", @@ -6396,9 +6420,9 @@ dependencies = [ [[package]] name = "swc_common" -version = "0.34.4" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9087befec6b63911f9d2f239e4f91c9b21589c169b86ed2d616944d23cf4a243" +checksum = "1802b1642488aec58597dc55ea88992c165660d6e44e9838d4d93f7b78ab95f3" dependencies = [ "ast_node", "better_scoped_tls", @@ -6412,6 +6436,7 @@ dependencies = [ "serde", "siphasher", "sourcemap", + "swc_allocator", "swc_atoms", "swc_eq_ignore_macros", "swc_visit", @@ -6448,9 +6473,9 @@ dependencies = [ [[package]] name = "swc_ecma_ast" -version = "0.115.1" +version = "0.117.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7be1306930c235435a892104c00c2b5e16231043c085d5a10bd3e7537b15659b" +checksum = "a5da2f0310e8cd84b8c803095e75b2cbca872c71fc7f7404d4c9c8117d894960" dependencies = [ "bitflags 2.5.0", "is-macro", @@ -6466,16 +6491,16 @@ dependencies = [ [[package]] name = "swc_ecma_codegen" -version = "0.151.1" +version = "0.154.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5141a8cb4eb69e090e6aea5d49061b46919be5210f3d084f9d9ad63d30f5cff" +checksum = "7badcda2c45056495ed94b957884099cb000470ae7901ba68db2e7fd48414a4b" dependencies = [ "memchr", "num-bigint", "once_cell", - "rustc-hash", "serde", "sourcemap", + "swc_allocator", "swc_atoms", "swc_common", "swc_ecma_ast", @@ -6485,9 +6510,9 @@ dependencies = [ [[package]] name = "swc_ecma_codegen_macros" -version = "0.7.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090e409af49c8d1a3c13b3aab1ed09dd4eda982207eb3e63c2ad342f072b49c8" +checksum = "859fabde36db38634f3fad548dd5e3410c1aebba1b67a3c63e67018fa57a0bca" dependencies = [ "proc-macro2", "quote", @@ -6497,9 +6522,9 @@ dependencies = [ [[package]] name = "swc_ecma_loader" -version = "0.46.1" +version = "0.48.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9febebf047d1286e7b723fa2758f3229da2c103834f3eaee69833f46692612" +checksum = "a201c65ccbaa0c80fbcfd5c90dcc0bfc7ae62ac596f2233651ac715caf5d2c12" dependencies = [ "anyhow", "pathdiff", @@ -6511,9 +6536,9 @@ dependencies = [ [[package]] name = "swc_ecma_parser" -version = "0.146.12" +version = "0.148.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4e0c2e85f12c63b85c805e923079b04d1fb3e25edd069d638eed5f2098de74" +checksum = "a8204235f635274dba4adc30c47ac896fd126ddfc53b27210676722423cbb2e7" dependencies = [ "either", "new_debug_unreachable", @@ -6533,9 +6558,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_base" -version = "0.140.3" +version = "0.143.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d37dc505c92af56d0f77cf6f31a6ccd37ac40cad1e01ff77277e0b1c70e8f8ff" +checksum = "6df81c1cbb920d9c47abe6fb105363b0f78df2c8f6b0910c4fdd2ad7cbdfb23d" dependencies = [ "better_scoped_tls", "bitflags 2.5.0", @@ -6556,9 +6581,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_classes" -version = "0.129.0" +version = "0.132.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3eab5f8179e5b0aedf385eacc2c033691c6d211a7babd1bbbff12cf794a824e" +checksum = "53291bcdfca4bd4c2546c3170d7f0ea1d4f22f6fce2a531265ead010a9a2ebdf" dependencies = [ "swc_atoms", "swc_common", @@ -6582,9 +6607,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_optimization" -version = "0.201.2" +version = "0.204.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "724a8306e98c1b1f9640fc44c1acc0c971f6daa17651919e06b64f905d4a4564" +checksum = "3d7f9a903d6774d3f9005775badc25817296791ffed560f1b7e38aab62ca37ff" dependencies = [ "dashmap", "indexmap", @@ -6606,9 +6631,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_proposal" -version = "0.174.3" +version = "0.177.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6df8aa6752cc2fcf3d78ac67827542fb666e52283f2b26802aa058906bb750d3" +checksum = "a2d84d062b05ae89982a76ff47881a5e15bbd02e9b3c68dc14a3f5eacf48abca" dependencies = [ "either", "rustc-hash", @@ -6626,9 +6651,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_react" -version = "0.186.2" +version = "0.189.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "446da32cac8299973aaf1d37496562bfd0c1e4f3c3ab5d0af6f07f42e8184102" +checksum = "d411add563dd86d50b3db6e74e38def06587fa2fd370b430f71226688bfa6ded" dependencies = [ "base64 0.21.7", "dashmap", @@ -6637,6 +6662,7 @@ dependencies = [ "serde", "sha1", "string_enum", + "swc_allocator", "swc_atoms", "swc_common", "swc_config", @@ -6650,9 +6676,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_typescript" -version = "0.191.2" +version = "0.194.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1ce8af2865449e714ae56dacb6b54b3f6dc4cc25074da4e39b878bd93c5e39c" +checksum = "4f73c4ae3eb15adc5865dc729c4e111040529cec5a349d56ed0b4a0de1a86242" dependencies = [ "ryu-js", "serde", @@ -6667,9 +6693,9 @@ dependencies = [ [[package]] name = "swc_ecma_utils" -version = "0.130.3" +version = "0.133.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e62b199454a576c5fdbd7e1bef8ab88a395427456d8a713d994b7d469833aa" +checksum = "b6148af60d25da893aef037621e4869e9b580eb280e12f5a8d4f87fa5e4cd5da" dependencies = [ "indexmap", "num_cpus", @@ -6686,10 +6712,11 @@ dependencies = [ [[package]] name = "swc_ecma_visit" -version = "0.101.0" +version = "0.103.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce0d997f0c9b4e181225f603d161f6757c2a97022258170982cfe005ec69ec92" +checksum = "ed8026e4d9abcb75d511bf7623d49e8e135f02f4f9a6bb7c115df8239cfe3d4f" dependencies = [ + "new_debug_unreachable", "num-bigint", "swc_atoms", "swc_common", @@ -6700,9 +6727,9 @@ dependencies = [ [[package]] name = "swc_eq_ignore_macros" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "695a1d8b461033d32429b5befbf0ad4d7a2c4d6ba9cd5ba4e0645c615839e8e4" +checksum = "63db0adcff29d220c3d151c5b25c0eabe7e32dd936212b84cdaa1392e3130497" dependencies = [ "proc-macro2", "quote", @@ -6711,9 +6738,9 @@ dependencies = [ [[package]] name = "swc_fast_graph" -version = "0.22.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00cf5c1687e9858fb9de1ffa90a3e21369095406e97ace870a389320d105b0a" +checksum = "f3f854cf8efc290aa927d31dab98b42011ff2341fecb2b27fdc817ef7b30ef3b" dependencies = [ "indexmap", "petgraph", @@ -6723,9 +6750,9 @@ dependencies = [ [[package]] name = "swc_graph_analyzer" -version = "0.23.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a928a2ad8897fb78c38898ba342960863e9937b7a3de2d010d3204d85ce1b72a" +checksum = "d97d4b3b186f842f6def323db73f1bc90d7086bd5fa1fb4cca527e20c70f856e" dependencies = [ "auto_impl", "petgraph", @@ -6736,9 +6763,9 @@ dependencies = [ [[package]] name = "swc_macros_common" -version = "0.3.11" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91745f3561057493d2da768437c427c0e979dff7396507ae02f16c981c4a8466" +checksum = "f486687bfb7b5c560868f69ed2d458b880cebc9babebcb67e49f31b55c5bf847" dependencies = [ "proc-macro2", "quote", @@ -6747,19 +6774,18 @@ dependencies = [ [[package]] name = "swc_visit" -version = "0.5.14" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043d11fe683dcb934583ead49405c0896a5af5face522e4682c16971ef7871b9" +checksum = "2e194d14f94121fd08b823d3379eedb3ce455785d9e0c3d2742c59377e283207" dependencies = [ "either", - "swc_visit_macros", ] [[package]] name = "swc_visit_macros" -version = "0.5.12" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae9ef18ff8daffa999f729db056d2821cd2f790f3a11e46422d19f46bb193e7" +checksum = "92807d840959f39c60ce8a774a3f83e8193c658068e6d270dbe0a05e40e90b41" dependencies = [ "Inflector", "proc-macro2", @@ -6903,7 +6929,7 @@ dependencies = [ "base64 0.21.7", "bytes", "console_static_text", - "deno_unsync 0.4.0", + "deno_unsync", "denokv_proto", "fastwebsockets", "flate2", @@ -7285,9 +7311,9 @@ dependencies = [ [[package]] name = "triomphe" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859eb650cfee7434994602c3a68b25d77ad9e68c8a6cd491616ef86661382eb3" +checksum = "e6631e42e10b40c0690bf92f404ebcfe6e1fdb480391d15f17cc8e96eeed5369" dependencies = [ "serde", "stable_deref_trait", @@ -7481,9 +7507,9 @@ checksum = "b1b6def86329695390197b82c1e244a54a131ceb66c996f2088a3876e2ae083f" [[package]] name = "unicode-id-start" -version = "1.0.4" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02aebfa694eccbbbffdd92922c7de136b9fe764396d2f10e21bce1681477cfc1" +checksum = "bc3882f69607a2ac8cc4de3ee7993d8f68bb06f2974271195065b3bd07f2edea" [[package]] name = "unicode-ident" @@ -7508,9 +7534,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unicode-xid" diff --git a/Cargo.toml b/Cargo.toml index 6b6ef8080c..3001363449 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,7 +44,7 @@ license = "MIT" repository = "https://github.com/denoland/deno" [workspace.dependencies] -deno_ast = { version = "=0.40.0", features = ["transpiling"] } +deno_ast = { version = "=0.41.2", features = ["transpiling"] } deno_core = { version = "0.299.0" } deno_bench_util = { version = "0.158.0", path = "./bench_util" } diff --git a/cli/Cargo.toml b/cli/Cargo.toml index c8b76bf9f0..a2d63ff328 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -67,10 +67,10 @@ deno_ast = { workspace = true, features = ["bundler", "cjs", "codegen", "proposa deno_cache_dir = { workspace = true } deno_config = { version = "=0.26.1", features = ["workspace", "sync"] } deno_core = { workspace = true, features = ["include_js_files_for_snapshotting"] } -deno_doc = { version = "0.144.0", features = ["html", "syntect"] } -deno_emit = "=0.43.1" -deno_graph = { version = "=0.80.1", features = ["tokio_executor"] } -deno_lint = { version = "=0.61.0", features = ["docs"] } +deno_doc = { version = "0.145.0", features = ["html", "syntect"] } +deno_emit = "=0.44.0" +deno_graph = { version = "=0.81.0" } +deno_lint = { version = "=0.62.0", features = ["docs"] } deno_lockfile.workspace = true deno_npm = "=0.21.4" deno_package_json.workspace = true @@ -78,7 +78,7 @@ deno_runtime = { workspace = true, features = ["include_js_files_for_snapshottin deno_semver = "=0.5.7" deno_task_shell = "=0.17.0" deno_terminal.workspace = true -eszip = "=0.72.2" +eszip = "=0.73.0" napi_sym.workspace = true node_resolver.workspace = true @@ -100,8 +100,8 @@ dissimilar = "=1.0.4" dotenvy = "0.15.7" dprint-plugin-json = "=0.19.3" dprint-plugin-jupyter = "=0.1.3" -dprint-plugin-markdown = "=0.17.1" -dprint-plugin-typescript = "=0.91.4" +dprint-plugin-markdown = "=0.17.2" +dprint-plugin-typescript = "=0.91.5" env_logger = "=0.10.0" fancy-regex = "=0.10.0" faster-hex.workspace = true diff --git a/cli/args/mod.rs b/cli/args/mod.rs index 76644028c6..7ae003111f 100644 --- a/cli/args/mod.rs +++ b/cli/args/mod.rs @@ -202,6 +202,7 @@ pub fn ts_config_to_transpile_and_emit_options( inline_sources: options.inline_sources, remove_comments: false, source_map, + source_map_base: None, source_map_file: None, }, )) diff --git a/cli/lsp/code_lens.rs b/cli/lsp/code_lens.rs index 2996103be1..e117888fba 100644 --- a/cli/lsp/code_lens.rs +++ b/cli/lsp/code_lens.rs @@ -107,7 +107,7 @@ impl DenoTestCollector { for prop in &obj_lit.props { if let ast::PropOrSpread::Prop(prop) = prop { if let ast::Prop::KeyValue(key_value_prop) = prop.as_ref() { - if let ast::PropName::Ident(ast::Ident { sym, .. }) = + if let ast::PropName::Ident(ast::IdentName { sym, .. }) = &key_value_prop.key { if sym == "name" { diff --git a/cli/lsp/testing/collectors.rs b/cli/lsp/testing/collectors.rs index 7b00228dfd..2f2ddb8773 100644 --- a/cli/lsp/testing/collectors.rs +++ b/cli/lsp/testing/collectors.rs @@ -147,7 +147,7 @@ fn visit_call_expr( let ast::Prop::KeyValue(key_value_prop) = prop.as_ref() else { continue; }; - let ast::PropName::Ident(ast::Ident { sym, .. }) = + let ast::PropName::Ident(ast::IdentName { sym, .. }) = &key_value_prop.key else { continue; @@ -187,7 +187,7 @@ fn visit_call_expr( }; match prop.as_ref() { ast::Prop::KeyValue(key_value_prop) => { - let ast::PropName::Ident(ast::Ident { sym, .. }) = + let ast::PropName::Ident(ast::IdentName { sym, .. }) = &key_value_prop.key else { continue; @@ -206,7 +206,7 @@ fn visit_call_expr( } } ast::Prop::Method(method_prop) => { - let ast::PropName::Ident(ast::Ident { sym, .. }) = + let ast::PropName::Ident(ast::IdentName { sym, .. }) = &method_prop.key else { continue; @@ -472,7 +472,7 @@ impl Visit for TestCollector { collector: &mut TestCollector, node: &ast::CallExpr, range: &deno_ast::SourceRange, - ns_prop_ident: &ast::Ident, + ns_prop_ident: &ast::IdentName, member_expr: &ast::MemberExpr, ) { if ns_prop_ident.sym == "test" { diff --git a/cli/tools/compile.rs b/cli/tools/compile.rs index 4df8e772bb..bb03f03d2e 100644 --- a/cli/tools/compile.rs +++ b/cli/tools/compile.rs @@ -102,6 +102,7 @@ pub async fn compile( emit_options, // make all the modules relative to the root folder relative_file_base: Some(root_dir_url), + npm_packages: None, })?; log::info!( diff --git a/cli/tools/repl/session.rs b/cli/tools/repl/session.rs index ee67bb0147..3e43ea3ab2 100644 --- a/cli/tools/repl/session.rs +++ b/cli/tools/repl/session.rs @@ -642,6 +642,7 @@ impl ReplSession { }, &deno_ast::EmitOptions { source_map: deno_ast::SourceMapOption::None, + source_map_base: None, source_map_file: None, inline_sources: false, remove_comments: false,