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
66 changes: 37 additions & 29 deletions crates/deno_facade/eszip/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -788,40 +788,48 @@ pub async fn generate_binary_eszip(
let (mut vfs, node_modules, npm_snapshot) = match resolver.clone().as_inner()
{
InnerCliNpmResolverRef::Managed(managed) => {
let snapshot =
managed.serialized_valid_snapshot_for_system(&NpmSystemInfo::default());
if !snapshot.as_serialized().packages.is_empty() {
let npm_vfs_builder = build_npm_vfs(
VfsOpts {
root_path,
npm_resolver: resolver.clone(),
},
emitter_factory.deno_options()?.clone(),
&mut vfs_content_callback_fn,
)?;

(
npm_vfs_builder,
Some(NodeModules::Managed {
node_modules_dir: resolver.root_node_modules_path().map(|it| {
root_dir_url
.specifier_key(
&ModuleSpecifier::from_directory_path(it).unwrap(),
)
.into_owned()
}),
}),
Some(
managed
.serialized_valid_snapshot_for_system(&NpmSystemInfo::default()),
),
)
} else {
if graph.npm_packages.is_empty() {
(
VfsBuilder::new(root_path, &mut vfs_content_callback_fn)?,
None,
None,
)
} else {
let snapshot = managed
.serialized_valid_snapshot_for_system(&NpmSystemInfo::default());
if !snapshot.as_serialized().packages.is_empty() {
let npm_vfs_builder = build_npm_vfs(
VfsOpts {
root_path,
npm_resolver: resolver.clone(),
},
emitter_factory.deno_options()?.clone(),
&mut vfs_content_callback_fn,
)?;

(
npm_vfs_builder,
Some(NodeModules::Managed {
node_modules_dir: resolver.root_node_modules_path().map(|it| {
root_dir_url
.specifier_key(
&ModuleSpecifier::from_directory_path(it).unwrap(),
)
.into_owned()
}),
}),
Some(
managed
.serialized_valid_snapshot_for_system(&NpmSystemInfo::default()),
),
)
} else {
(
VfsBuilder::new(root_path, &mut vfs_content_callback_fn)?,
None,
None,
)
}
}
}
InnerCliNpmResolverRef::Byonm(_) => {
Expand Down
2 changes: 1 addition & 1 deletion types/global.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ declare namespace Supabase {
}

export class Session {
init: Promise<void>
init: Promise<void>;
/**
* Create a new model session using given model
*/
Expand Down
Loading