diff options
| -rw-r--r-- | Cargo.lock | 34 | ||||
| -rw-r--r-- | Cargo.toml | 2 | ||||
| -rw-r--r-- | cli/module_loader.rs | 3 | ||||
| -rw-r--r-- | cli/standalone/mod.rs | 7 | ||||
| -rw-r--r-- | cli/tests/testdata/import_attributes/dynamic_error.out | 2 |
5 files changed, 31 insertions, 17 deletions
diff --git a/Cargo.lock b/Cargo.lock index 017f92f36..780fc5624 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1136,18 +1136,21 @@ dependencies = [ [[package]] name = "deno_core" -version = "0.240.0" +version = "0.242.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea9bea00d7d4c7bef64e61421f227ee3114f510f6ad9826fbc5a29463c578c75" +checksum = "bce3947a74745927b2409b7d3533d7a9c06c7271c56a2e334cce9e431a7f6bfb" dependencies = [ "anyhow", + "bit-set", + "bit-vec", "bytes", "cooked-waker", "deno_ops", - "deno_unsync 0.3.0", + "deno_unsync 0.3.1", "futures", "libc", "log", + "memoffset 0.9.0", "parking_lot 0.12.1", "pin-project", "serde", @@ -1573,9 +1576,9 @@ dependencies = [ [[package]] name = "deno_ops" -version = "0.116.0" +version = "0.118.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd1cec75129fb26122c079a5644fa89b0c9c6a5078814c734113dac5e368120" +checksum = "a5a63b1ef458869727ad0c524fc1378a20038027fbb170a09730b5c763980f0b" dependencies = [ "proc-macro-rules", "proc-macro2", @@ -1702,9 +1705,9 @@ dependencies = [ [[package]] name = "deno_unsync" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8a8f3722afd50e566ecfc783cc8a3a046bc4dd5eb45007431dfb2776aeb8993" +checksum = "2e902f81b6d372427a99b65372379568e6350735562f3237c3daf61086e1d6e6" dependencies = [ "tokio", ] @@ -3661,6 +3664,15 @@ dependencies = [ ] [[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] name = "metal" version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3807,7 +3819,7 @@ dependencies = [ "bitflags 1.3.2", "cfg-if", "libc", - "memoffset", + "memoffset 0.7.1", "pin-utils", "static_assertions", ] @@ -5229,9 +5241,9 @@ dependencies = [ [[package]] name = "serde_v8" -version = "0.149.0" +version = "0.151.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3727a7a969fb85aa7f6a31071dcf8b574809871f8fc07ccd9abdf21152112496" +checksum = "3f491e71da04e4ae2b178ea3572d40fce81ab760253437ccd3bd4a57a19a39e8" dependencies = [ "bytes", "derive_more", @@ -6074,7 +6086,7 @@ dependencies = [ "base64 0.21.5", "bytes", "console_static_text", - "deno_unsync 0.3.0", + "deno_unsync 0.3.1", "denokv_proto", "fastwebsockets", "flate2", diff --git a/Cargo.toml b/Cargo.toml index 4fc7f3471..ed1f0642a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,7 +41,7 @@ repository = "https://github.com/denoland/deno" [workspace.dependencies] deno_ast = { version = "0.31.6", features = ["transpiling"] } -deno_core = { version = "0.240.0" } +deno_core = { version = "0.242.0" } deno_runtime = { version = "0.137.0", path = "./runtime" } napi_sym = { version = "0.59.0", path = "./cli/napi/sym" } diff --git a/cli/module_loader.rs b/cli/module_loader.rs index 76a564d0a..445cf4902 100644 --- a/cli/module_loader.rs +++ b/cli/module_loader.rs @@ -38,6 +38,7 @@ use deno_core::resolve_url_or_path; use deno_core::ModuleCode; use deno_core::ModuleLoader; use deno_core::ModuleSource; +use deno_core::ModuleSourceCode; use deno_core::ModuleSpecifier; use deno_core::ModuleType; use deno_core::ResolutionKind; @@ -471,7 +472,7 @@ impl CliModuleLoader { MediaType::Json => ModuleType::Json, _ => ModuleType::JavaScript, }, - code, + ModuleSourceCode::String(code), specifier, &code_source.found_url, )) diff --git a/cli/standalone/mod.rs b/cli/standalone/mod.rs index 87dfcc982..32ae771c1 100644 --- a/cli/standalone/mod.rs +++ b/cli/standalone/mod.rs @@ -38,6 +38,7 @@ use deno_core::futures::FutureExt; use deno_core::v8_set_flags; use deno_core::FeatureChecker; use deno_core::ModuleLoader; +use deno_core::ModuleSourceCode; use deno_core::ModuleSpecifier; use deno_core::ModuleType; use deno_core::ResolutionKind; @@ -153,7 +154,7 @@ impl ModuleLoader for EmbeddedModuleLoader { return Box::pin(deno_core::futures::future::ready(Ok( deno_core::ModuleSource::new( deno_core::ModuleType::JavaScript, - source.into(), + ModuleSourceCode::String(source.into()), original_specifier, ), ))); @@ -178,7 +179,7 @@ impl ModuleLoader for EmbeddedModuleLoader { MediaType::Json => ModuleType::Json, _ => ModuleType::JavaScript, }, - code_source.code, + ModuleSourceCode::String(code_source.code), original_specifier, &code_source.found_url, ), @@ -215,7 +216,7 @@ impl ModuleLoader for EmbeddedModuleLoader { unreachable!(); } }, - code.into(), + ModuleSourceCode::String(code.into()), &original_specifier, &found_specifier, )) diff --git a/cli/tests/testdata/import_attributes/dynamic_error.out b/cli/tests/testdata/import_attributes/dynamic_error.out index d6e0c9115..3dc79ba6b 100644 --- a/cli/tests/testdata/import_attributes/dynamic_error.out +++ b/cli/tests/testdata/import_attributes/dynamic_error.out @@ -1,4 +1,4 @@ -error: Uncaught (in promise) TypeError: Expected a "JavaScriptOrWasm" module but loaded a "JSON" module. +error: Uncaught (in promise) TypeError: Expected a "None" module but loaded a "JSON" module. const data = await import("./data.json"); ^ at async [WILDCARD]dynamic_error.ts:1:14 |