summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Sherret <dsherret@users.noreply.github.com>2022-10-25 11:55:57 -0400
committerGitHub <noreply@github.com>2022-10-25 11:55:57 -0400
commite203bd9c5a4eb1b338c94bdcd4b2e91e7e1c5168 (patch)
treea3dbebd1d701c7c84813e7eb2cf59d90fc4b6419
parent606db35ccbe8e3c1ce93ae943a2f9850558400af (diff)
fix: upgrade swc_ecma_parser to 0.122.19 - deno_ast 0.20 (#16406)
-rw-r--r--.dprint.json2
-rw-r--r--Cargo.lock153
-rw-r--r--cli/Cargo.toml18
-rw-r--r--cli/lockfile.rs7
-rw-r--r--cli/main.rs14
-rw-r--r--cli/proc_state.rs28
-rw-r--r--cli/tests/testdata/coverage/complex_expected.lcov7
-rw-r--r--cli/tests/testdata/coverage/complex_expected.out6
-rw-r--r--cli/tools/doc.rs14
-rw-r--r--cli/tools/vendor/test.rs14
-rw-r--r--cli/tsc.rs28
-rw-r--r--core/Cargo.toml2
-rw-r--r--ext/fetch/Cargo.toml2
-rw-r--r--tools/wpt/expectation.json8
14 files changed, 160 insertions, 143 deletions
diff --git a/.dprint.json b/.dprint.json
index e98a01747..565f61286 100644
--- a/.dprint.json
+++ b/.dprint.json
@@ -48,7 +48,7 @@
"tools/wpt/manifest.json"
],
"plugins": [
- "https://plugins.dprint.dev/typescript-0.73.1.wasm",
+ "https://plugins.dprint.dev/typescript-0.76.0.wasm",
"https://plugins.dprint.dev/json-0.15.6.wasm",
"https://plugins.dprint.dev/markdown-0.14.1.wasm",
"https://plugins.dprint.dev/toml-0.5.4.wasm",
diff --git a/Cargo.lock b/Cargo.lock
index 8de6a2fdb..571966dc1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -227,9 +227,9 @@ checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce"
[[package]]
name = "base64"
-version = "0.13.0"
+version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
+checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
[[package]]
name = "base64-simd"
@@ -354,9 +354,9 @@ dependencies = [
[[package]]
name = "bumpalo"
-version = "3.11.0"
+version = "3.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d"
+checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba"
[[package]]
name = "byteorder"
@@ -747,12 +747,9 @@ checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57"
[[package]]
name = "data-url"
-version = "0.1.1"
+version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a30bfce702bcfa94e906ef82421f2c0e61c076ad76030c16ee5d2e9a32fe193"
-dependencies = [
- "matches",
-]
+checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5"
[[package]]
name = "debug_unreachable"
@@ -858,9 +855,9 @@ dependencies = [
[[package]]
name = "deno_ast"
-version = "0.19.0"
+version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5cf170fd04887b88d88c9951c2c2cb0e1feb1681636987fb3202384db962950"
+checksum = "322f52615649f4f096eed78ec8e2a7eb68ff0bf5f330d59302c5479c7a8fa158"
dependencies = [
"anyhow",
"base64",
@@ -987,9 +984,9 @@ dependencies = [
[[package]]
name = "deno_doc"
-version = "0.46.0"
+version = "0.47.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "910f889d786d8b7ef40d50da4f2a4da01adf1c63c2f4a3b74324f6313eee8c59"
+checksum = "ac723296e702a7b7df0ad785148617bf79eb1e73b5bf124b5c789e7c10c58f8d"
dependencies = [
"cfg-if",
"deno_ast",
@@ -1005,9 +1002,9 @@ dependencies = [
[[package]]
name = "deno_emit"
-version = "0.9.0"
+version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66d4279eb4772b17283f0aea3ba108872ef07a0174530e87a1e642aaa97d5ccc"
+checksum = "8ce29673aec15b00c836e26d7770046a13abf5a7f1bf1c92562aa424454a2986"
dependencies = [
"anyhow",
"base64",
@@ -1068,9 +1065,9 @@ dependencies = [
[[package]]
name = "deno_graph"
-version = "0.34.0"
+version = "0.37.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65644f208cd3c64362bf298ccbb52cd606588d5d844f0a3ac8b8e187ea708b85"
+checksum = "349417e459d6ad06c8f502d49a6bef7288bc8c5cedde0d3bb1e60fcaf27ca5f8"
dependencies = [
"anyhow",
"cfg-if",
@@ -1114,9 +1111,9 @@ dependencies = [
[[package]]
name = "deno_lint"
-version = "0.33.0"
+version = "0.34.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf964de0df9998ff7cb42b8013f582b1b34f0d180a5092274f11a1443879e612"
+checksum = "09b635fe0fc58cda4049d41f2efd9fcc8315ded8d36ace739fdf62a155d27f45"
dependencies = [
"anyhow",
"deno_ast",
@@ -1462,9 +1459,9 @@ dependencies = [
[[package]]
name = "dprint-plugin-typescript"
-version = "0.74.0"
+version = "0.76.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "602b5d9913bcff254b60c3bc26f2b2056a6e343d735785d2760a369c71b8dcfe"
+checksum = "571de1f09a56b994f3dcc5a3886d16b0a387f34bdc3f74377d072205b13377a1"
dependencies = [
"anyhow",
"deno_ast",
@@ -1475,9 +1472,9 @@ dependencies = [
[[package]]
name = "dprint-swc-ext"
-version = "0.4.0"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c478ec192ebe45411ebe70aef5bd33d22ec54ff7a08885dff16d0bb352525325"
+checksum = "f8ac3ba92d2cf3b87b8f48551d1720ff63a134545c830476aaffd8cf9d80e84e"
dependencies = [
"bumpalo",
"num-bigint",
@@ -1663,9 +1660,9 @@ dependencies = [
[[package]]
name = "eszip"
-version = "0.28.0"
+version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f776d4d6858e4a43162cc6f261200a38e0a21f3b183e416e281e0fb71576e5f"
+checksum = "cfaee993e46d7494b0d6e7222ad8411d493813780ec370972af8891434720d88"
dependencies = [
"anyhow",
"base64",
@@ -4125,6 +4122,12 @@ dependencies = [
]
[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
+[[package]]
name = "static_assertions"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -4164,9 +4167,9 @@ dependencies = [
[[package]]
name = "string_enum"
-version = "0.3.1"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f584cc881e9e5f1fd6bf827b0444aa94c30d8fe6378cf241071b5f5700b2871f"
+checksum = "994453cd270ad0265796eb24abf5540091ed03e681c5f3c12bc33e4db33253e1"
dependencies = [
"pmutil",
"proc-macro2 1.0.43",
@@ -4189,22 +4192,23 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
[[package]]
name = "swc_atoms"
-version = "0.4.10"
+version = "0.4.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fb43a79c8affc20f5d52b7db093399585ce87674427adc60843dbc8ec242608"
+checksum = "01b878052680dcec3421ab50384279443dbf93651b05da38e5133e0894a18096"
dependencies = [
"once_cell",
"rustc-hash",
"serde",
"string_cache",
"string_cache_codegen",
+ "triomphe",
]
[[package]]
name = "swc_bundler"
-version = "0.185.5"
+version = "0.192.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e868bb01c4716209191ce829bd1dde41af84710302e17e3aba1272ae7cc464ee"
+checksum = "4b3b6d8aba63acb7baf2d2b5aed930322259ccd8fcdc5f4e3ddefb9cff62bb1d"
dependencies = [
"ahash",
"anyhow",
@@ -4234,9 +4238,9 @@ dependencies = [
[[package]]
name = "swc_common"
-version = "0.27.13"
+version = "0.29.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cba38a2f1291fcf3f78f357802b8cec72ecf5e95808e9d937783e60cd3570b93"
+checksum = "ebd844dfbd9969a9ef8430e954661de43edde353d65e987f935a328619698883"
dependencies = [
"ahash",
"ast_node",
@@ -4262,11 +4266,10 @@ dependencies = [
[[package]]
name = "swc_config"
-version = "0.1.2"
+version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc17721410f3f12aeb42dcb99528350adf122681ab4796e48c2cfc0bda0c752c"
+checksum = "b4de36224eb9498fccd4e68971f0b83326ccf8592c2d424f257f3a1c76b2b211"
dependencies = [
- "anyhow",
"indexmap",
"serde",
"serde_json",
@@ -4288,9 +4291,9 @@ dependencies = [
[[package]]
name = "swc_ecma_ast"
-version = "0.90.17"
+version = "0.94.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41e78ceea39b1dacef1e7cda29488131677224bf6111ed5e853791d81c8a36da"
+checksum = "2c3303de79adce1137e6514e5939686173e7d26c71d91c3067056caa45183547"
dependencies = [
"bitflags",
"is-macro",
@@ -4305,9 +4308,9 @@ dependencies = [
[[package]]
name = "swc_ecma_codegen"
-version = "0.123.2"
+version = "0.127.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a787c39a5b30c077744c564c533bd294db36d70edfb43d1073e249ca14316b87"
+checksum = "8cb696997765db4832aabc142cd0f95d38f3d746556d99ad0c7b06c68642d37a"
dependencies = [
"memchr",
"num-bigint",
@@ -4337,9 +4340,9 @@ dependencies = [
[[package]]
name = "swc_ecma_dep_graph"
-version = "0.90.1"
+version = "0.94.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cdd5d0018ab61eba3e0016f867f12f8d832d36ab93d64fa9d7119e188ac2c86"
+checksum = "0c1b4e4e7928d9d41fe951551edc19829c878c84df242b85320a4c950f3a7a24"
dependencies = [
"swc_atoms",
"swc_common",
@@ -4349,9 +4352,9 @@ dependencies = [
[[package]]
name = "swc_ecma_loader"
-version = "0.39.4"
+version = "0.41.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ece6023a43222e3bd36e3d191fa5289c848245b97fbf0127d9c0923165648d18"
+checksum = "0c0aac15ea4dfdceec8b04389f2d6ff27ea0f0d243aa89904e420a6d0a96e512"
dependencies = [
"ahash",
"anyhow",
@@ -4363,9 +4366,9 @@ dependencies = [
[[package]]
name = "swc_ecma_parser"
-version = "0.118.7"
+version = "0.122.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b993963c284a2cadf46213ba0f4faa8a5153cfb02437f07ef21ebd90e598cae7"
+checksum = "8cec064f10003ea47bd5e97d6456a683643da9f705670b97eb1c90bc434f58f3"
dependencies = [
"either",
"enum_kind",
@@ -4382,9 +4385,9 @@ dependencies = [
[[package]]
name = "swc_ecma_transforms_base"
-version = "0.106.4"
+version = "0.111.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecfcecd7aad760171c0c392a856bec5291365a33bc03da5a1f24e26eccdffb7e"
+checksum = "26e2a38941b0b8dee1ed90de0c7eb0d31e5370378d8747ee8d078c0d214ddcb8"
dependencies = [
"better_scoped_tls",
"bitflags",
@@ -4404,9 +4407,9 @@ dependencies = [
[[package]]
name = "swc_ecma_transforms_classes"
-version = "0.95.1"
+version = "0.100.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b748eddc9fe274648f7f6344f405a520a30f8574af76f8fb22c6a59508418382"
+checksum = "0120315ca713614946d146e241b63657f6e327b35517af8f48ffc495fcd41fe7"
dependencies = [
"swc_atoms",
"swc_common",
@@ -4431,9 +4434,9 @@ dependencies = [
[[package]]
name = "swc_ecma_transforms_optimization"
-version = "0.160.9"
+version = "0.167.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6deba435837e698ed8c26a0bf9ba24e08000874bb3ae92ddc59848800dfdc9e"
+checksum = "a70f693c2f33d606453c6e4d701be809c59e12ddb0ff6c0afd3a6dc6ee41c940"
dependencies = [
"ahash",
"dashmap",
@@ -4456,9 +4459,9 @@ dependencies = [
[[package]]
name = "swc_ecma_transforms_proposal"
-version = "0.137.1"
+version = "0.144.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2bfcb3be3cdf374b53f61a2efdddfccaf6c1261171d02b0eb5838fd44c51223"
+checksum = "2ef43c950a86d2b577a011a3b665d084780bd5cdb9b28fcc5b41ba3a1b1592b2"
dependencies = [
"either",
"serde",
@@ -4475,9 +4478,9 @@ dependencies = [
[[package]]
name = "swc_ecma_transforms_react"
-version = "0.148.1"
+version = "0.155.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb912b97e944a4bcf7088823efb068e037f5c64db9e75c94a3138bd8c202578f"
+checksum = "bad10f89e09579dfe89b088db9ce864764e834f7bbb2a8e729b3803dbcc813b1"
dependencies = [
"ahash",
"base64",
@@ -4501,9 +4504,9 @@ dependencies = [
[[package]]
name = "swc_ecma_transforms_typescript"
-version = "0.152.1"
+version = "0.159.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c919518f8b5f03df0e2c6a55ad44a0a3835125fbf569e5983bd2380b76e2e7c6"
+checksum = "a1f72f7070b8184b2c6d682ce3481797c0045cbccac0f1b271e66b95d773bdd1"
dependencies = [
"serde",
"swc_atoms",
@@ -4517,9 +4520,9 @@ dependencies = [
[[package]]
name = "swc_ecma_utils"
-version = "0.101.3"
+version = "0.105.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57a8a5b246246809b4cf526e838fd1284828ccaca56521d9af19b082862bc845"
+checksum = "8efe8af0ab5c899bacba887f86dea3e47e477df041782d11bce91a22cec2a1f5"
dependencies = [
"indexmap",
"num_cpus",
@@ -4534,9 +4537,9 @@ dependencies = [
[[package]]
name = "swc_ecma_visit"
-version = "0.76.7"
+version = "0.80.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c658568ed63dd13357bae4129999bacb9260d709f260fb49e14a56587ed5dab9"
+checksum = "47d7de36b60fb0f72b19417a988fe71c800d1a07071421720e469325990a5d7a"
dependencies = [
"num-bigint",
"swc_atoms",
@@ -4560,9 +4563,9 @@ dependencies = [
[[package]]
name = "swc_fast_graph"
-version = "0.15.6"
+version = "0.17.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f2eb48057452a960071c60e00e345b6fdd21b1ba62551b66ac7413cbae31501"
+checksum = "0ed0262f3338afdf976e85290653b9170f4f3272e05f35c2bac3f2cecc8544f2"
dependencies = [
"ahash",
"indexmap",
@@ -4572,9 +4575,9 @@ dependencies = [
[[package]]
name = "swc_graph_analyzer"
-version = "0.16.4"
+version = "0.18.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba02e0726abddde48fecef483fb0b067c88a6c0da736b91d3ef424be3cfcaa39"
+checksum = "085d076c5cf0d27e1b1fedc73d6c356357b8d56e8e1750913906090ffa398e7d"
dependencies = [
"ahash",
"auto_impl",
@@ -4597,9 +4600,9 @@ dependencies = [
[[package]]
name = "swc_visit"
-version = "0.5.2"
+version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b754ef01f2614eb469fd5215789bfd319566a3bf1033056d7a7bfb5a3c9a69f5"
+checksum = "82f2bcb7223e185c4c7cbf5e0c1207dec6d2bfd5e72e3fb7b3e8d179747e9130"
dependencies = [
"either",
"swc_visit_macros",
@@ -4607,9 +4610,9 @@ dependencies = [
[[package]]
name = "swc_visit_macros"
-version = "0.5.3"
+version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c230bcd129d1fbcd1decd8b43cccd613fda11c895f7c04d6c966231dbc1959af"
+checksum = "8fb1f3561674d84947694d41fb6d5737d19539222779baeac1b3a071a2b29428"
dependencies = [
"Inflector",
"pmutil",
@@ -5020,6 +5023,16 @@ dependencies = [
]
[[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 = "trust-dns-client"
version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index d1a7ab318..79f9b8876 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -50,31 +50,31 @@ winapi = "=0.3.9"
winres = "=0.1.12"
[dependencies]
-deno_ast = { version = "0.19.0", features = ["bundler", "cjs", "codegen", "dep_graph", "module_specifier", "proposal", "react", "sourcemap", "transforms", "transpiling", "typescript", "view", "visit"] }
+deno_ast = { version = "0.20.0", features = ["bundler", "cjs", "codegen", "dep_graph", "module_specifier", "proposal", "react", "sourcemap", "transforms", "transpiling", "typescript", "view", "visit"] }
deno_core = { version = "0.155.0", path = "../core" }
-deno_doc = "0.46.0"
-deno_emit = "0.9.0"
-deno_graph = "0.34.0"
-deno_lint = { version = "0.33.0", features = ["docs"] }
+deno_doc = "0.47.0"
+deno_emit = "0.10.0"
+deno_graph = "0.37.1"
+deno_lint = { version = "0.34.0", features = ["docs"] }
deno_runtime = { version = "0.81.0", path = "../runtime" }
deno_task_shell = "0.6.0"
napi_sym = { path = "./napi_sym", version = "0.3.0" }
atty = "=0.2.14"
-base64 = "=0.13.0"
+base64 = "=0.13.1"
cache_control = "=0.2.0"
chrono = { version = "=0.4.22", default-features = false, features = ["clock"] }
clap = "=3.1.12"
clap_complete = "=3.1.2"
clap_complete_fig = "=3.1.5"
-data-url = "=0.1.1"
+data-url = "=0.2.0"
dissimilar = "=1.0.4"
dprint-plugin-json = "=0.15.6"
dprint-plugin-markdown = "=0.14.1"
-dprint-plugin-typescript = "=0.74.0"
+dprint-plugin-typescript = "=0.76.0"
encoding_rs = "=0.8.31"
env_logger = "=0.9.0"
-eszip = "=0.28.0"
+eszip = "=0.29.0"
fancy-regex = "=0.10.0"
flate2 = "=1.0.24"
http = "=0.2.8"
diff --git a/cli/lockfile.rs b/cli/lockfile.rs
index 067a0adf9..b572b9d93 100644
--- a/cli/lockfile.rs
+++ b/cli/lockfile.rs
@@ -154,11 +154,10 @@ impl deno_graph::source::Locker for Locker {
pub fn as_maybe_locker(
lockfile: Option<Arc<Mutex<Lockfile>>>,
-) -> Option<Rc<RefCell<Box<dyn deno_graph::source::Locker>>>> {
+) -> Option<Rc<RefCell<dyn deno_graph::source::Locker>>> {
lockfile.as_ref().map(|lf| {
- Rc::new(RefCell::new(
- Box::new(Locker(Some(lf.clone()))) as Box<dyn deno_graph::source::Locker>
- ))
+ Rc::new(RefCell::new(Locker(Some(lf.clone()))))
+ as Rc<RefCell<dyn deno_graph::source::Locker>>
})
}
diff --git a/cli/main.rs b/cli/main.rs
index 3a4cc3c37..23f073a7d 100644
--- a/cli/main.rs
+++ b/cli/main.rs
@@ -492,13 +492,15 @@ async fn create_graph_and_maybe_check(
let graph = Arc::new(
deno_graph::create_graph(
vec![(root, deno_graph::ModuleKind::Esm)],
- false,
- maybe_imports,
&mut cache,
- maybe_resolver,
- maybe_locker,
- Some(&*analyzer),
- None,
+ deno_graph::GraphOptions {
+ is_dynamic: false,
+ imports: maybe_imports,
+ resolver: maybe_resolver,
+ locker: maybe_locker,
+ module_analyzer: Some(&*analyzer),
+ reporter: None,
+ },
)
.await,
);
diff --git a/cli/proc_state.rs b/cli/proc_state.rs
index 49ee5d8f4..ac83e9459 100644
--- a/cli/proc_state.rs
+++ b/cli/proc_state.rs
@@ -370,13 +370,15 @@ impl ProcState {
let analyzer = self.parsed_source_cache.as_analyzer();
let graph = create_graph(
roots.clone(),
- is_dynamic,
- maybe_imports,
&mut loader,
- maybe_resolver,
- maybe_locker,
- Some(&*analyzer),
- maybe_file_watcher_reporter,
+ deno_graph::GraphOptions {
+ is_dynamic,
+ imports: maybe_imports,
+ resolver: maybe_resolver,
+ locker: maybe_locker,
+ module_analyzer: Some(&*analyzer),
+ reporter: maybe_file_watcher_reporter,
+ },
)
.await;
@@ -639,13 +641,15 @@ impl ProcState {
let graph = create_graph(
roots,
- false,
- maybe_imports,
loader,
- maybe_resolver,
- maybe_locker,
- Some(&*analyzer),
- None,
+ deno_graph::GraphOptions {
+ is_dynamic: false,
+ imports: maybe_imports,
+ resolver: maybe_resolver,
+ locker: maybe_locker,
+ module_analyzer: Some(&*analyzer),
+ reporter: None,
+ },
)
.await;
diff --git a/cli/tests/testdata/coverage/complex_expected.lcov b/cli/tests/testdata/coverage/complex_expected.lcov
index 188ebe542..cfa40b232 100644
--- a/cli/tests/testdata/coverage/complex_expected.lcov
+++ b/cli/tests/testdata/coverage/complex_expected.lcov
@@ -39,7 +39,6 @@ DA:37,2
DA:38,2
DA:39,2
DA:40,2
-DA:41,2
DA:42,2
DA:44,1
DA:45,1
@@ -52,7 +51,6 @@ DA:51,0
DA:52,0
DA:53,0
DA:54,0
-DA:55,0
DA:56,0
DA:58,1
DA:59,1
@@ -62,12 +60,11 @@ DA:63,1
DA:64,0
DA:65,0
DA:66,0
-DA:67,0
DA:68,0
DA:70,1
DA:71,0
DA:73,1
DA:74,1
-LH:40
-LF:57
+LH:39
+LF:54
end_of_record
diff --git a/cli/tests/testdata/coverage/complex_expected.out b/cli/tests/testdata/coverage/complex_expected.out
index f2f9468f5..b1910af60 100644
--- a/cli/tests/testdata/coverage/complex_expected.out
+++ b/cli/tests/testdata/coverage/complex_expected.out
@@ -1,4 +1,4 @@
-cover [WILDCARD]/coverage/complex.ts ... 70.175% (40/57)
+cover [WILDCARD]/coverage/complex.ts ... 72.222% (39/54)
46 | export function unused(
47 | foo: string,
48 | bar: string,
@@ -8,13 +8,13 @@ cover [WILDCARD]/coverage/complex.ts ... 70.175% (40/57)
52 | foo,
53 | bar,
54 | baz,
- 55 | );
+-----|-----
56 | }
-----|-----
64 | export function ƒ(): number {
65 | return (
66 | 0
- 67 | );
+-----|-----
68 | }
-----|-----
71 | console.log("%s", () => 1);
diff --git a/cli/tools/doc.rs b/cli/tools/doc.rs
index 452425451..b02a188b0 100644
--- a/cli/tools/doc.rs
+++ b/cli/tools/doc.rs
@@ -44,13 +44,15 @@ pub async fn print_docs(
let analyzer = deno_graph::CapturingModuleAnalyzer::default();
let graph = deno_graph::create_graph(
vec![(source_file_specifier.clone(), ModuleKind::Esm)],
- false,
- None,
&mut loader,
- None,
- None,
- Some(&analyzer),
- None,
+ deno_graph::GraphOptions {
+ is_dynamic: false,
+ imports: None,
+ resolver: None,
+ locker: None,
+ module_analyzer: Some(&analyzer),
+ reporter: None,
+ },
)
.await;
let doc_parser = doc::DocParser::new(
diff --git a/cli/tools/vendor/test.rs b/cli/tools/vendor/test.rs
index 036dd6663..451b4b614 100644
--- a/cli/tools/vendor/test.rs
+++ b/cli/tools/vendor/test.rs
@@ -268,13 +268,15 @@ async fn build_test_graph(
original_import_map.map(|m| ImportMapResolver::new(Arc::new(m)));
deno_graph::create_graph(
roots,
- false,
- None,
&mut loader,
- resolver.as_ref().map(|im| im.as_resolver()),
- None,
- Some(analyzer),
- None,
+ deno_graph::GraphOptions {
+ is_dynamic: false,
+ imports: None,
+ resolver: resolver.as_ref().map(|im| im.as_resolver()),
+ locker: None,
+ module_analyzer: Some(analyzer),
+ reporter: None,
+ },
)
.await
}
diff --git a/cli/tsc.rs b/cli/tsc.rs
index 90ae7334c..c81ff9335 100644
--- a/cli/tsc.rs
+++ b/cli/tsc.rs
@@ -848,13 +848,15 @@ mod tests {
let mut loader = MockLoader { fixtures };
let graph = deno_graph::create_graph(
vec![(specifier, ModuleKind::Esm)],
- false,
- None,
&mut loader,
- None,
- None,
- None,
- None,
+ deno_graph::GraphOptions {
+ is_dynamic: false,
+ imports: None,
+ resolver: None,
+ locker: None,
+ module_analyzer: None,
+ reporter: None,
+ },
)
.await;
let state = State::new(
@@ -879,13 +881,15 @@ mod tests {
let mut loader = MockLoader { fixtures };
let graph = deno_graph::create_graph(
vec![(specifier.clone(), ModuleKind::Esm)],
- false,
- None,
&mut loader,
- None,
- None,
- None,
- None,
+ deno_graph::GraphOptions {
+ is_dynamic: false,
+ imports: None,
+ resolver: None,
+ locker: None,
+ module_analyzer: None,
+ reporter: None,
+ },
)
.await;
let config = TsConfig::new(json!({
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 9540157ac..d3b2e5272 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -42,5 +42,5 @@ path = "examples/http_bench_json_ops.rs"
# These dependencies are only used for the 'http_bench_*_ops' examples.
[dev-dependencies]
-deno_ast = { version = "0.19.0", features = ["transpiling"] }
+deno_ast = { version = "0.20.0", features = ["transpiling"] }
tokio = { version = "1.21", features = ["full"] }
diff --git a/ext/fetch/Cargo.toml b/ext/fetch/Cargo.toml
index 047817e42..a7134b6d3 100644
--- a/ext/fetch/Cargo.toml
+++ b/ext/fetch/Cargo.toml
@@ -15,7 +15,7 @@ path = "lib.rs"
[dependencies]
bytes = "1.1.0"
-data-url = "0.1.1"
+data-url = "0.2.0"
deno_core = { version = "0.155.0", path = "../../core" }
deno_tls = { version = "0.60.0", path = "../tls" }
dyn-clone = "1"
diff --git a/tools/wpt/expectation.json b/tools/wpt/expectation.json
index 7b878d7d4..a2db88c06 100644
--- a/tools/wpt/expectation.json
+++ b/tools/wpt/expectation.json
@@ -3245,13 +3245,7 @@
},
"data-urls": {
"base64.any.html": true,
- "base64.any.worker.html": true,
- "processing.any.html": [
- "\"data:text/plain;a=\\\",\\\",X\""
- ],
- "processing.any.worker.html": [
- "\"data:text/plain;a=\\\",\\\",X\""
- ]
+ "base64.any.worker.html": true
},
"h1-parsing": {
"lone-cr.window.html": [