Skip to content

fix: load import map from eszip #218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

fix: load import map from eszip #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions crates/base/src/deno_runtime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,11 +147,11 @@ impl DenoRuntime {
allow_remote_modules = user_conf.allow_remote_modules;
}

let import_map = load_import_map(import_map_path)?;

let eszip = if let Some(eszip_payload) = maybe_eszip {
eszip_payload
} else {
let import_map = load_import_map(import_map_path.clone())?;

let cache_strategy = if no_module_cache {
CacheSetting::ReloadAll
} else {
Expand Down Expand Up @@ -222,7 +222,7 @@ impl DenoRuntime {
let fs = Arc::new(deno_fs::RealFs);

let rt_provider =
create_module_loader_for_standalone_from_eszip_kind(eszip, import_map).await;
create_module_loader_for_standalone_from_eszip_kind(eszip, import_map_path).await;

let RuntimeProviders {
npm_resolver,
Expand Down
37 changes: 30 additions & 7 deletions crates/sb_module_loader/standalone/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ use crate::standalone::standalone_module_loader::{EmbeddedModuleLoader, SharedMo
use crate::RuntimeProviders;
use anyhow::Context;
use deno_core::error::AnyError;
use deno_core::url::Url;
use deno_core::{FastString, ModuleSpecifier};
use deno_npm::NpmSystemInfo;
use deno_tls::rustls::RootCertStore;
use deno_tls::RootCertStoreProvider;
use import_map::ImportMap;
use import_map::parse_from_json;
use log::warn;
use module_fetcher::args::package_json::PackageJsonDepsProvider;
use module_fetcher::cache::{Caches, DenoDirProvider, NodeAnalysisCache};
use module_fetcher::file_fetcher::CacheSetting;
Expand Down Expand Up @@ -51,7 +53,7 @@ impl RootCertStoreProvider for StandaloneRootCertStoreProvider {
pub async fn create_module_loader_for_eszip(
mut eszip: eszip::EszipV2,
metadata: Metadata,
maybe_import_map: Option<ImportMap>,
maybe_import_map_path: Option<String>,
) -> Result<RuntimeProviders, AnyError> {
// let main_module = &metadata.entrypoint;
let current_exe_path = std::env::current_exe().unwrap();
Expand Down Expand Up @@ -159,9 +161,30 @@ pub async fn create_module_loader_for_eszip(
.package_json_deps
.map(|serialized| serialized.into_deps()),
));
let maybe_import_map = maybe_import_map
.map(|import_map| Some(Arc::new(import_map)))
.unwrap_or_else(|| None);

let mut maybe_import_map = None;
if let Some(import_map_path) = maybe_import_map_path {
let import_map_url = Url::parse(import_map_path.as_str())?;

if let Some(import_map_module) = eszip.get_import_map(import_map_url.as_str()) {
if let Some(source) = import_map_module.source().await {
let source = std::str::from_utf8(&source)?.to_string();
let result = parse_from_json(&import_map_url, &source)?;
if !result.diagnostics.is_empty() {
warn!(
"Import map diagnostics:\n{}",
result
.diagnostics
.iter()
.map(|d| format!(" - {d}"))
.collect::<Vec<_>>()
.join("\n")
);
}
maybe_import_map = Some(Arc::new(result.import_map));
}
}
}

let module_loader_factory = StandaloneModuleLoaderFactory {
shared: Arc::new(SharedModuleLoaderState {
Expand Down Expand Up @@ -191,7 +214,7 @@ pub async fn create_module_loader_for_eszip(

pub async fn create_module_loader_for_standalone_from_eszip_kind(
eszip_payload_kind: EszipPayloadKind,
maybe_import_map: Option<ImportMap>,
maybe_import_map_path: Option<String>,
) -> RuntimeProviders {
use deno_core::futures::io::{AllowStdIo, BufReader};

Expand Down Expand Up @@ -221,7 +244,7 @@ pub async fn create_module_loader_for_standalone_from_eszip_kind(
unsafely_ignore_certificate_errors: None,
package_json_deps: None,
},
maybe_import_map,
maybe_import_map_path,
)
.await
.unwrap()
Expand Down