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
1 change: 1 addition & 0 deletions src/module_loader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ mod test {
async fn test_import_provider() {
let loader = RustyLoader::new(LoaderOptions {
import_provider: Some(Box::new(TestImportProvider::new())),
cwd: std::env::current_dir().unwrap(),
..LoaderOptions::default()
});
let expected_responses = [
Expand Down
14 changes: 14 additions & 0 deletions src/module_loader/inner_loader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,11 @@ impl InnerRustyLoader {
referrer: &str,
kind: deno_core::ResolutionKind,
) -> Result<ModuleSpecifier, ModuleLoaderError> {
#[cfg(feature = "node_experimental")]
let referrer_specifier = referrer
.to_module_specifier(&self.cwd)
.map_err(|e| JsErrorBox::from_err(to_io_err(e)))?;

//
// Handle import aliasing for node imports
#[cfg(feature = "node_experimental")]
Expand All @@ -178,6 +183,15 @@ impl InnerRustyLoader {
return self.load_npm(specifier, referrer);
}

//
// Use node resolution if we're in an npm package
#[cfg(feature = "node_experimental")]
if referrer_specifier.scheme() == "file"
&& self.node.rusty_resolver.in_npm_package(&referrer_specifier)
{
return self.load_npm(specifier, referrer);
}

// Resolve the module specifier to an absolute URL
let url = deno_core::resolve_import(specifier, referrer)?;

Expand Down