From 8829a1d3620cab23f7ac724feeae60c9de6ebad2 Mon Sep 17 00:00:00 2001 From: David Sherret Date: Mon, 5 Jun 2023 19:03:39 -0400 Subject: [PATCH] fix: upgrade to deno_ast 0.27 (#19375) Closes #19148 --- .dprint.json | 6 +- .github/workflows/ci.generate.ts | 2 +- .github/workflows/ci.yml | 6 +- Cargo.lock | 198 +++++++++--------- Cargo.toml | 2 +- cli/Cargo.toml | 18 +- cli/standalone/mod.rs | 3 + .../testdata/coverage/complex_expected.lcov | 7 +- .../testdata/coverage/complex_expected.out | 4 +- third_party | 2 +- 10 files changed, 127 insertions(+), 121 deletions(-) diff --git a/.dprint.json b/.dprint.json index 0e10e067a4..1decc7863e 100644 --- a/.dprint.json +++ b/.dprint.json @@ -56,9 +56,9 @@ "ext/websocket/autobahn/reports" ], "plugins": [ - "https://plugins.dprint.dev/typescript-0.84.4.wasm", - "https://plugins.dprint.dev/json-0.17.2.wasm", - "https://plugins.dprint.dev/markdown-0.15.2.wasm", + "https://plugins.dprint.dev/typescript-0.85.0.wasm", + "https://plugins.dprint.dev/json-0.17.3.wasm", + "https://plugins.dprint.dev/markdown-0.15.3.wasm", "https://plugins.dprint.dev/toml-0.5.4.wasm", "https://plugins.dprint.dev/exec-0.3.5.json@d687dda57be0fe9a0088ccdaefa5147649ff24127d8b3ea227536c68ee7abeab" ] diff --git a/.github/workflows/ci.generate.ts b/.github/workflows/ci.generate.ts index ef37374c4d..cb32e6415d 100755 --- a/.github/workflows/ci.generate.ts +++ b/.github/workflows/ci.generate.ts @@ -5,7 +5,7 @@ import * as yaml from "https://deno.land/std@0.173.0/encoding/yaml.ts"; // Bump this number when you want to purge the cache. // Note: the tools/release/01_bump_crate_versions.ts script will update this version // automatically via regex, so ensure that this line maintains this format. -const cacheVersion = 32; +const cacheVersion = 33; const Runners = (() => { const ubuntuRunner = "ubuntu-22.04"; diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 80d20f1725..4bb3ee964d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -293,7 +293,7 @@ jobs: ~/.cargo/registry/index ~/.cargo/registry/cache ~/.cargo/git/db - key: '32-cargo-home-${{ matrix.os }}-${{ hashFiles(''Cargo.lock'') }}' + key: '33-cargo-home-${{ matrix.os }}-${{ hashFiles(''Cargo.lock'') }}' if: '!(github.event_name == ''pull_request'' && matrix.skip_pr)' - name: Restore cache build output (PR) uses: actions/cache/restore@v3 @@ -305,7 +305,7 @@ jobs: !./target/*/*.zip !./target/*/*.tar.gz key: never_saved - restore-keys: '32-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ matrix.job }}-' + restore-keys: '33-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ matrix.job }}-' - name: Apply and update mtime cache if: '!(github.event_name == ''pull_request'' && matrix.skip_pr) && (!startsWith(github.ref, ''refs/tags/''))' uses: ./.github/mtime_cache @@ -589,7 +589,7 @@ jobs: !./target/*/gn_out !./target/*/*.zip !./target/*/*.tar.gz - key: '32-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}' + key: '33-cargo-target-${{ matrix.os }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}' publish-canary: name: publish canary runs-on: ubuntu-22.04 diff --git a/Cargo.lock b/Cargo.lock index 6b2c8a9065..4bab387ffc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -73,6 +73,17 @@ 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", + "once_cell", + "version_check", +] + [[package]] name = "aho-corasick" version = "0.7.20" @@ -150,9 +161,9 @@ dependencies = [ [[package]] name = "ast_node" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52f7fd7740c5752c16281a1c1f9442b1e69ba41738acde85dc604aaf3ce41890" +checksum = "c704e2f6ee1a98223f5a7629a6ef0f3decb3b552ed282889dc957edff98ce1e6" dependencies = [ "pmutil", "proc-macro2 1.0.56", @@ -395,9 +406,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "byteorder" @@ -690,7 +701,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc" dependencies = [ "cfg-if", - "hashbrown", + "hashbrown 0.12.3", "lock_api", "once_cell", "parking_lot_core 0.9.7", @@ -753,7 +764,7 @@ dependencies = [ "glob", "http", "hyper 0.14.26", - "import_map 0.15.0", + "import_map", "indexmap", "jsonc-parser", "junction", @@ -801,9 +812,9 @@ dependencies = [ [[package]] name = "deno_ast" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84b4db18773938f4613617d384b6579983c46fbe9962da7390a9fc7525ccbe9c" +checksum = "db178e9f423fe41ff3580e32c43bc13726a5730360ef04e50b84de683a24f7d9" dependencies = [ "anyhow", "base64 0.13.1", @@ -932,15 +943,15 @@ dependencies = [ [[package]] name = "deno_doc" -version = "0.62.0" +version = "0.63.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a6e4c826679e4b0dd4f00b23e6c45343ce14903c3df2c210d094ee969312b8a" +checksum = "499936300106c3c67caae87e29def3df5ea9385db6ed7428f154972f70ed39fa" dependencies = [ "cfg-if", "deno_ast", "deno_graph", "futures", - "import_map 0.13.0", + "import_map", "lazy_static", "regex", "serde", @@ -950,9 +961,9 @@ dependencies = [ [[package]] name = "deno_emit" -version = "0.20.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e00ae58a811d155fc8c256ce54f35c752ee8c7dc777f0675971735d2783bd5e6" +checksum = "6bdc024d2c1e5ec56ef6f923be2c2fea4662d596b0a68074ccf89991b38a05e7" dependencies = [ "anyhow", "base64 0.13.1", @@ -960,7 +971,9 @@ dependencies = [ "deno_graph", "escape8259", "futures", + "import_map", "parking_lot 0.11.2", + "url", ] [[package]] @@ -1015,9 +1028,9 @@ dependencies = [ [[package]] name = "deno_graph" -version = "0.48.1" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcdbc17bfe49a41dd596ba2a96106b3eae3bd0812e1b63a6fe5883166c1b6fef" +checksum = "a7e07fdff6c7dc1a9a7c03ce69435fda4b53641d2d6d3d3ed6d29cf67fefd3ea" dependencies = [ "anyhow", "data-url", @@ -1101,9 +1114,9 @@ dependencies = [ [[package]] name = "deno_lint" -version = "0.46.0" +version = "0.47.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc515e82ae97f2cc562ec482251700e96570c8fde997579629f4666e70066d7" +checksum = "044678646b9b5b01a8f6bcb19d106de8ed465e98eed1a49488ac86f807fc37b0" dependencies = [ "anyhow", "deno_ast", @@ -1546,9 +1559,9 @@ checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" [[package]] name = "dprint-core" -version = "0.60.0" +version = "0.62.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c762da282ebc7635f7918898e26d50e2b282378977dc7b3786364ac12065a71" +checksum = "d966e6047321db5f011567c1819b89972a457ab49c2f4b56f074e67a59214112" dependencies = [ "anyhow", "bumpalo", @@ -1560,9 +1573,9 @@ dependencies = [ [[package]] name = "dprint-plugin-json" -version = "0.17.2" +version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "602d5b9cc4657bdf06d27fa6c22dfcfdb85a19ab555f2834cf7b01ba8001a1f6" +checksum = "00905c12671f1be023a8e12915b97a701a6561bacf39221ad314884c99f55c74" dependencies = [ "anyhow", "dprint-core", @@ -1573,9 +1586,9 @@ dependencies = [ [[package]] name = "dprint-plugin-markdown" -version = "0.15.2" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5095e6471bc71892fd4fe3f74205a6d2e22bd3be9b09758fd23bff67b5ec15fd" +checksum = "f20e5763efd89925412ac0f525a25bbba9066b2ba924eae87ab8a7120df0744c" dependencies = [ "anyhow", "dprint-core", @@ -1587,9 +1600,9 @@ dependencies = [ [[package]] name = "dprint-plugin-typescript" -version = "0.84.4" +version = "0.85.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9945b1fae98529bd905d66b3c5efd45408b928cd10b7a3e0764049cf9aaf2167" +checksum = "e49896ccb3ca2bfe03d96316b7acb0ce83dcfce69adc5b228f16fa6b30fb674b" dependencies = [ "anyhow", "deno_ast", @@ -1600,9 +1613,9 @@ dependencies = [ [[package]] name = "dprint-swc-ext" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3359a644cca781aece7d7c16bfa80fb35ac83da4e1014a28600debd1ef2a7e" +checksum = "dd4dda8a1b920e8be367aeaad035753d21bb69b3c50515afb41ab1eefbb886b5" dependencies = [ "bumpalo", "num-bigint", @@ -1827,15 +1840,16 @@ dependencies = [ [[package]] name = "eszip" -version = "0.41.0" +version = "0.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a808622e30489ade8c36b6e706bc819c4c75420b5aca4d1a6b996bea0d995aef" +checksum = "9034d1749b91ac4fab0ed7b1d849f9f933099d1c1d021d42d6f54dd265b27d83" dependencies = [ "anyhow", "base64 0.21.0", "deno_ast", "deno_graph", "futures", + "hashlink", "serde", "serde_json", "sha2", @@ -2241,17 +2255,23 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash", + "ahash 0.8.3", ] [[package]] name = "hashlink" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69fe1fcf8b4278d860ad0548329f892a3631fb63f82574df68275f34cdbe0ffa" +checksum = "0761a1b9491c4f2e3d66aa0f62d0fba0af9a0e2852e4d48ea506632a4b56e6aa" dependencies = [ - "hashbrown", + "hashbrown 0.13.2", ] [[package]] @@ -2455,20 +2475,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" -[[package]] -name = "import_map" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64dbcf9b111359e69cf9a0004e9d1c9f6697ea620d378006e9452f5e54267e45" -dependencies = [ - "cfg-if", - "indexmap", - "log", - "serde", - "serde_json", - "url", -] - [[package]] name = "import_map" version = "0.15.0" @@ -2490,7 +2496,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", "serde", ] @@ -3670,9 +3676,9 @@ dependencies = [ [[package]] name = "pulldown-cmark" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d9cc634bc78768157b5cbfe988ffcd1dcba95cd2b2f03a88316c08c6d00ed63" +checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998" dependencies = [ "bitflags 1.3.2", "memchr", @@ -4551,9 +4557,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "swc_atoms" -version = "0.5.3" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "593c2f3e4cea60ddc4179ed731cabebe7eacec209d9e76a3bbcff4b2b020e3f5" +checksum = "93d0307dc4bfd107d49c7528350c372758cfca94fb503629b9a056e6a1572860" dependencies = [ "once_cell", "rustc-hash", @@ -4565,11 +4571,11 @@ dependencies = [ [[package]] name = "swc_bundler" -version = "0.213.23" +version = "0.214.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6153a93eeb264274dfdf6aff3d73fdd098a5b9ef85f85241bdbd8e4149afdcb7" +checksum = "503d03f4eb44ae6a57154e4459d9a7050c56e0aa9ec798a93d21ca07a8dd0409" dependencies = [ - "ahash", + "ahash 0.7.6", "anyhow", "crc", "indexmap", @@ -4596,11 +4602,11 @@ dependencies = [ [[package]] name = "swc_common" -version = "0.31.4" +version = "0.31.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b557014d62318e08070c2a3d5eb0278ff73749dd69db53c39a4de4bcd301d6a" +checksum = "19c774005489d2907fb67909cf42af926e72edee1366512777c605ba2ef19c94" dependencies = [ - "ahash", + "ahash 0.7.6", "ast_node", "better_scoped_tls", "cfg-if", @@ -4649,9 +4655,9 @@ dependencies = [ [[package]] name = "swc_ecma_ast" -version = "0.103.4" +version = "0.104.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5206233430a6763e2759da76cfc596a64250793f70cd94cace1f82fdcc4d702c" +checksum = "b5cf9dd351d0c285dcd36535267953a18995d4dda0cbe34ac9d1df61aa415b26" dependencies = [ "bitflags 2.1.0", "is-macro", @@ -4666,9 +4672,9 @@ dependencies = [ [[package]] name = "swc_ecma_codegen" -version = "0.138.11" +version = "0.139.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf45c899625d5132f2993a464a79f2ec7c79854b74fd3c55d1408b76d7d7750c" +checksum = "11c6af8e6d6714ecd7ef5cfba322aa1b436f78d9a82b0c3ff16aeaf97b65cd6d" dependencies = [ "memchr", "num-bigint", @@ -4698,9 +4704,9 @@ dependencies = [ [[package]] name = "swc_ecma_dep_graph" -version = "0.105.10" +version = "0.106.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92813e2f77cdf4ad870f0474eee6574f4aba10504dd3730e694d03684a7a68ab" +checksum = "f3130754aba396ad8d849f3fd1a9949d71a33c0943dfd86b23ac595e81fabd0c" dependencies = [ "swc_atoms", "swc_common", @@ -4710,11 +4716,11 @@ dependencies = [ [[package]] name = "swc_ecma_loader" -version = "0.43.6" +version = "0.43.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1d985c6e7111fef3c0103b0414db0d792cb04b492601c94ccae2d494ffdf764" +checksum = "fe45f1e5dcc1b005544ff78253b787dea5dfd5e2f712b133964cdc3545c954a4" dependencies = [ - "ahash", + "ahash 0.7.6", "anyhow", "pathdiff", "serde", @@ -4724,9 +4730,9 @@ dependencies = [ [[package]] name = "swc_ecma_parser" -version = "0.133.10" +version = "0.134.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce724a8fdc90548d882dec3b0288c0698059ce12a59bbfdeea0384f3d52f009" +checksum = "f0a3fcfe3d83dd445cbd9321882e47b467594433d9a21c4d6c37a27f534bb89e" dependencies = [ "either", "lexical", @@ -4744,9 +4750,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_base" -version = "0.126.13" +version = "0.127.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c4236f8b9bea9d3d43cacab34b6e3c925c3f12585382b8f661cb994b987b688" +checksum = "6232e641bef05c462bc7da34a3771f9b3f1f3352349ae0cd72b8eee8b0f5d5e0" dependencies = [ "better_scoped_tls", "bitflags 2.1.0", @@ -4767,9 +4773,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_classes" -version = "0.115.13" +version = "0.116.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd5b13763feba98586887a92801603c413897805c70ed82e49e4acc1f90683c2" +checksum = "f086829a3e645382f5609c9c6dce1d29e5204b3c81f82fe8d65d3bf17bcca68b" dependencies = [ "swc_atoms", "swc_common", @@ -4794,11 +4800,11 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_optimization" -version = "0.186.20" +version = "0.187.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456966f04224d2125551e0e35c164abe45183cbdd5238753294343814be102d3" +checksum = "8d27c12926427f235d149e60f9a9e67a2181fe1eb418c12b53b8e0778c5052a2" dependencies = [ - "ahash", + "ahash 0.7.6", "dashmap", "indexmap", "once_cell", @@ -4819,9 +4825,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_proposal" -version = "0.160.16" +version = "0.161.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d21de731e3ff1ea451ac8c377a7130ebf6dbf6ffd18e744c15f86e685e0abd9a" +checksum = "416fbb84f84644ef0e81df80bf44fd575bbb297a78887e359e16a61f6dc5af86" dependencies = [ "either", "rustc-hash", @@ -4839,11 +4845,11 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_react" -version = "0.172.19" +version = "0.173.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0df18263e6c0804a1a08abd29e87af763dce1bec4b500497a0b62c22df07b2d" +checksum = "d39a0de45fa34ee797a1c80497c8b9dcb6cf6e56b455c163453399894c58a812" dependencies = [ - "ahash", + "ahash 0.7.6", "base64 0.13.1", "dashmap", "indexmap", @@ -4864,9 +4870,9 @@ dependencies = [ [[package]] name = "swc_ecma_transforms_typescript" -version = "0.176.19" +version = "0.177.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1a3f356bc2b902c13fc1e39bb66c10f350c46bfe93bae5c05402863d94bd307" +checksum = "340cc027a6e87966715005b94e3a7ac95baf76c80b8aedad8afdd1c134740c80" dependencies = [ "serde", "swc_atoms", @@ -4880,9 +4886,9 @@ dependencies = [ [[package]] name = "swc_ecma_utils" -version = "0.116.10" +version = "0.117.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b462a1b6fc788ee956479adcbb05c282cb142a66a3b016b571fff0538a381196" +checksum = "ad791bbfdafcebd878584021e050964c8ab68aba7eeac9d0ee4afba4c284a629" dependencies = [ "indexmap", "num_cpus", @@ -4898,9 +4904,9 @@ dependencies = [ [[package]] name = "swc_ecma_visit" -version = "0.89.4" +version = "0.90.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecb23a4a1d77997f54e9b3a4e68d1441e5e8a25ad1a476bbb3b5a620d6562a86" +checksum = "6ce3ac941ae1d6c7e683aa375fc71fbf58df58b441f614d757fbb10554936ca2" dependencies = [ "num-bigint", "swc_atoms", @@ -4924,9 +4930,9 @@ dependencies = [ [[package]] name = "swc_fast_graph" -version = "0.19.4" +version = "0.19.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "992a92e087f7b2dc9aa626a6bee26530abbffba3572adf3894ccb55d2480f596" +checksum = "6291149aec4ba55076fd54a12ceb84cac1f703b2f571c3b2f19aa66ab9ec3009" dependencies = [ "indexmap", "petgraph", @@ -4936,11 +4942,11 @@ dependencies = [ [[package]] name = "swc_graph_analyzer" -version = "0.20.5" +version = "0.20.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9e02ee852ffd7eb1ee42c081b615c2fb40a2876c4631637486207f493d806c6" +checksum = "6575adec8b200801d429ffa79166224a6e298292a1b307750f4763aec5aa16c3" dependencies = [ - "ahash", + "ahash 0.7.6", "auto_impl", "petgraph", "swc_fast_graph", @@ -4961,9 +4967,9 @@ dependencies = [ [[package]] name = "swc_visit" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1d5999f23421c8e21a0f2bc53a0b9e8244f3b421de89471561af2fbe40b9cca" +checksum = "5f412dd4fbc58f509a04e64f5c8038333142fc139e8232f01b883db0094b3b51" dependencies = [ "either", "swc_visit_macros", @@ -4971,9 +4977,9 @@ dependencies = [ [[package]] name = "swc_visit_macros" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebeed7eb0f545f48ad30f5aab314e5208b735bcea1d1464f26e20f06db904989" +checksum = "4cfc226380ba54a5feed2c12f3ccd33f1ae8e959160290e5d2d9b4e918b6472a" dependencies = [ "Inflector", "pmutil", diff --git a/Cargo.toml b/Cargo.toml index a2a0f73a1b..e235697569 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -42,7 +42,7 @@ repository = "https://github.com/denoland/deno" [workspace.dependencies] v8 = { version = "0.73.0", default-features = false } -deno_ast = { version = "0.26.0", features = ["transpiling"] } +deno_ast = { version = "0.27.0", features = ["transpiling"] } deno_core = { version = "0.189.0", path = "./core" } deno_ops = { version = "0.67.0", path = "./ops" } diff --git a/cli/Cargo.toml b/cli/Cargo.toml index df045a754a..c5a5ee677d 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -42,15 +42,16 @@ winres.workspace = true [dependencies] deno_ast = { workspace = true, features = ["bundler", "cjs", "codegen", "dep_graph", "module_specifier", "proposal", "react", "sourcemap", "transforms", "typescript", "view", "visit"] } deno_core = { workspace = true, features = ["include_js_files_for_snapshotting"] } -deno_doc = "0.62.0" -deno_emit = "0.20.0" -deno_graph = "=0.48.1" -deno_lint = { version = "0.46.0", features = ["docs"] } +deno_doc = "=0.63.1" +deno_emit = "=0.24.0" +deno_graph = "=0.49.0" +deno_lint = { version = "=0.47.0", features = ["docs"] } deno_lockfile.workspace = true deno_npm.workspace = true deno_runtime = { workspace = true, features = ["dont_create_runtime_snapshot", "include_js_files_for_snapshotting"] } deno_semver.workspace = true -deno_task_shell = "0.12.0" +deno_task_shell = "=0.12.0" +eszip = "=0.43.0" napi_sym.workspace = true async-trait.workspace = true @@ -65,12 +66,11 @@ clap_complete_fig = "=4.1.2" console_static_text.workspace = true data-url.workspace = true dissimilar = "=1.0.4" -dprint-plugin-json = "=0.17.2" -dprint-plugin-markdown = "=0.15.2" -dprint-plugin-typescript = "=0.84.4" +dprint-plugin-json = "=0.17.3" +dprint-plugin-markdown = "=0.15.3" +dprint-plugin-typescript = "=0.85.0" encoding_rs.workspace = true env_logger = "=0.9.0" -eszip = "=0.41.0" fancy-regex = "=0.10.0" fastwebsockets.workspace = true flate2.workspace = true diff --git a/cli/standalone/mod.rs b/cli/standalone/mod.rs index 1ecb48cd7c..5536f32fca 100644 --- a/cli/standalone/mod.rs +++ b/cli/standalone/mod.rs @@ -201,6 +201,9 @@ impl ModuleLoader for EmbeddedModuleLoader { match module.kind { eszip::ModuleKind::JavaScript => ModuleType::JavaScript, eszip::ModuleKind::Json => ModuleType::Json, + eszip::ModuleKind::Jsonc => { + return Err(type_error("jsonc modules not supported")) + } }, code, &module_specifier, diff --git a/cli/tests/testdata/coverage/complex_expected.lcov b/cli/tests/testdata/coverage/complex_expected.lcov index cfa40b2323..94b86465ae 100644 --- a/cli/tests/testdata/coverage/complex_expected.lcov +++ b/cli/tests/testdata/coverage/complex_expected.lcov @@ -20,7 +20,6 @@ DA:17,2 DA:18,2 DA:19,2 DA:20,2 -DA:21,2 DA:22,2 DA:23,2 DA:24,2 @@ -34,7 +33,6 @@ DA:32,1 DA:33,1 DA:34,1 DA:35,1 -DA:36,1 DA:37,2 DA:38,2 DA:39,2 @@ -46,7 +44,6 @@ DA:46,0 DA:47,0 DA:48,0 DA:49,0 -DA:50,0 DA:51,0 DA:52,0 DA:53,0 @@ -65,6 +62,6 @@ DA:70,1 DA:71,0 DA:73,1 DA:74,1 -LH:39 -LF:54 +LH:37 +LF:51 end_of_record diff --git a/cli/tests/testdata/coverage/complex_expected.out b/cli/tests/testdata/coverage/complex_expected.out index b1910af607..3d5f6a0ab6 100644 --- a/cli/tests/testdata/coverage/complex_expected.out +++ b/cli/tests/testdata/coverage/complex_expected.out @@ -1,9 +1,9 @@ -cover [WILDCARD]/coverage/complex.ts ... 72.222% (39/54) +cover [WILDCARD]/coverage/complex.ts ... 72.549% (37/51) 46 | export function unused( 47 | foo: string, 48 | bar: string, 49 | baz: string, - 50 | ): Complex { +-----|----- 51 | return complex( 52 | foo, 53 | bar, diff --git a/third_party b/third_party index 7882a6c776..fd270b7927 160000 --- a/third_party +++ b/third_party @@ -1 +1 @@ -Subproject commit 7882a6c7763efbda55318e019b239bec7704765f +Subproject commit fd270b79276bb2bed365f3fb2e4ba6acaff3234b