Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deno.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@deno/loader",
"version": "0.0.7",
"version": "0.0.8",
"tasks": {
"wasmbuild": "deno run -A jsr:@deno/wasmbuild@0.19.2 --out ./src/lib"
},
Expand Down
36 changes: 26 additions & 10 deletions src/rs_lib/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use std::path::PathBuf;
use std::rc::Rc;
use std::sync::Arc;

use anyhow::bail;
use deno_cache_dir::file_fetcher::CacheSetting;
use deno_cache_dir::file_fetcher::NullBlobStore;
use deno_graph::MediaType;
Expand Down Expand Up @@ -366,22 +367,30 @@ impl DenoLoader {
resolution_mode: node_resolver::ResolutionMode,
) -> Result<String, anyhow::Error> {
let importer = importer.filter(|v| !v.is_empty());
let referrer = match importer {
let (specifier, referrer) = match importer {
Some(referrer)
if referrer.starts_with("http:")
|| referrer.starts_with("https:")
|| referrer.starts_with("file:") =>
{
Url::parse(&referrer)?
(specifier, Url::parse(&referrer)?)
}
Some(referrer) => deno_path_util::url_from_file_path(
&sys_traits::impls::wasm_string_to_path(referrer),
)?,
Some(referrer) => (
specifier,
deno_path_util::url_from_file_path(
&sys_traits::impls::wasm_string_to_path(referrer),
)?,
),
None => {
return Ok(
let entrypoint =
parse_entrypoint(specifier, self.workspace_factory.initial_cwd())?
.to_string(),
);
.to_string();
(
entrypoint,
deno_path_util::url_from_file_path(
self.workspace_factory.initial_cwd(),
)?,
)
}
};
let resolved = self.resolver.resolve_with_graph(
Expand Down Expand Up @@ -418,9 +427,15 @@ impl DenoLoader {
MediaType::Wasm,
&m.source,
)),
Some(Module::Node(node)) => Ok(create_external_repsonse(&node.specifier)),
Some(Module::Node(m)) => Ok(create_external_repsonse(&m.specifier)),
Some(Module::Npm(_)) => {
bail!(
"Failed resolving '{}'\n\nResolve the npm: specifier to a file: specifier before providing it to the loader.",
url
)
}
None if url.scheme() == "node" => Ok(create_external_repsonse(&url)),
Some(Module::Npm(_) | Module::External(_)) | None => {
Some(Module::External(_)) | None => {
let file = self.file_fetcher.fetch_bypass_permissions(&url).await?;
Ok(create_module_response(
&file.url,
Expand Down Expand Up @@ -482,6 +497,7 @@ fn parse_entrypoint(
if entrypoint.starts_with("jsr:")
|| entrypoint.starts_with("https:")
|| entrypoint.starts_with("file:")
|| entrypoint.starts_with("npm:")
{
Ok(Url::parse(&entrypoint)?)
} else {
Expand Down