Skip to content

fix(base): should handle the entrypoint passed from js land correctly #511

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

Merged
merged 1 commit into from
Mar 10, 2025
Merged

fix(base): should handle the entrypoint passed from js land correctly #511

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
43 changes: 24 additions & 19 deletions crates/base/src/runtime/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,14 +632,10 @@ where
base_url,
} = rt_provider;

let entrypoint = metadata
.entrypoint
.as_ref()
.with_context(|| "could not find entrypoint from metadata")?;

let entrypoint = metadata.entrypoint.as_ref();
let main_module_url = match entrypoint {
Entrypoint::Key(key) => base_url.join(key)?,
Entrypoint::ModuleCode(_) => Url::parse(
Some(Entrypoint::Key(key)) => base_url.join(key)?,
Some(Entrypoint::ModuleCode(_)) | None => Url::parse(
maybe_entrypoint
.as_ref()
.with_context(|| "could not find entrypoint key")?,
Expand Down Expand Up @@ -668,16 +664,25 @@ where
let (fs, maybe_s3_fs) = build_file_system_fn(if is_user_worker {
Arc::new(StaticFs::new(
static_files,
main_module_url
.to_file_path()
.map_err(|_| {
anyhow!("failed to resolve base dir using main module url")
})
.and_then(|it| {
it.parent()
.map(Path::to_path_buf)
.with_context(|| "failed to determine parent directory")
})?,
if matches!(entrypoint, Some(Entrypoint::ModuleCode(_)) | None)
&& maybe_entrypoint.is_some()
{
// it is eszip from before v2
base_url
.to_file_path()
.map_err(|_| anyhow!("failed to resolve base url"))?
} else {
main_module_url
.to_file_path()
.map_err(|_| {
anyhow!("failed to resolve base dir using main module url")
})
.and_then(|it| {
it.parent()
.map(Path::to_path_buf)
.with_context(|| "failed to determine parent directory")
})?
},
vfs_path,
vfs,
npm_snapshot,
Expand Down Expand Up @@ -993,10 +998,10 @@ where

let main_module_id = {
match entrypoint {
Entrypoint::Key(_) => {
Some(Entrypoint::Key(_)) | None => {
js_runtime.load_main_es_module(&main_module_url).await?
}
Entrypoint::ModuleCode(module_code) => {
Some(Entrypoint::ModuleCode(module_code)) => {
js_runtime
.load_main_es_module_from_code(
&main_module_url,
Expand Down