summaryrefslogtreecommitdiff
path: root/cli
diff options
context:
space:
mode:
authorBartek IwaƄczuk <biwanczuk@gmail.com>2024-01-03 02:34:41 +0100
committerGitHub <noreply@github.com>2024-01-03 01:34:41 +0000
commit1ee01d57d6cd207f0cc0bfa5c0b1ef884b8a5216 (patch)
tree44e18008ed61d8b1ac2f421a67f792905f4ec836 /cli
parent261f32ef651a6515fbac664302adcfbe34a04372 (diff)
chore: upgrade deno_core to 0.241.0 (#21765)
Diffstat (limited to 'cli')
-rw-r--r--cli/module_loader.rs3
-rw-r--r--cli/standalone/mod.rs7
-rw-r--r--cli/tests/testdata/import_attributes/dynamic_error.out2
3 files changed, 7 insertions, 5 deletions
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