Skip to content

Commit ae728cb

Browse files
authored
fix(deno_facade): do not include managed npm deps when graph does not have any npm pkgs (#687)
* fix(deno_facade): do not include managed npm deps when graph does not have any npm pkgs * stamp: meow * stamp: fmt
1 parent ec961e5 commit ae728cb

2 files changed

Lines changed: 38 additions & 30 deletions

File tree

crates/deno_facade/eszip/mod.rs

Lines changed: 37 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -788,40 +788,48 @@ pub async fn generate_binary_eszip(
788788
let (mut vfs, node_modules, npm_snapshot) = match resolver.clone().as_inner()
789789
{
790790
InnerCliNpmResolverRef::Managed(managed) => {
791-
let snapshot =
792-
managed.serialized_valid_snapshot_for_system(&NpmSystemInfo::default());
793-
if !snapshot.as_serialized().packages.is_empty() {
794-
let npm_vfs_builder = build_npm_vfs(
795-
VfsOpts {
796-
root_path,
797-
npm_resolver: resolver.clone(),
798-
},
799-
emitter_factory.deno_options()?.clone(),
800-
&mut vfs_content_callback_fn,
801-
)?;
802-
803-
(
804-
npm_vfs_builder,
805-
Some(NodeModules::Managed {
806-
node_modules_dir: resolver.root_node_modules_path().map(|it| {
807-
root_dir_url
808-
.specifier_key(
809-
&ModuleSpecifier::from_directory_path(it).unwrap(),
810-
)
811-
.into_owned()
812-
}),
813-
}),
814-
Some(
815-
managed
816-
.serialized_valid_snapshot_for_system(&NpmSystemInfo::default()),
817-
),
818-
)
819-
} else {
791+
if graph.npm_packages.is_empty() {
820792
(
821793
VfsBuilder::new(root_path, &mut vfs_content_callback_fn)?,
822794
None,
823795
None,
824796
)
797+
} else {
798+
let snapshot = managed
799+
.serialized_valid_snapshot_for_system(&NpmSystemInfo::default());
800+
if !snapshot.as_serialized().packages.is_empty() {
801+
let npm_vfs_builder = build_npm_vfs(
802+
VfsOpts {
803+
root_path,
804+
npm_resolver: resolver.clone(),
805+
},
806+
emitter_factory.deno_options()?.clone(),
807+
&mut vfs_content_callback_fn,
808+
)?;
809+
810+
(
811+
npm_vfs_builder,
812+
Some(NodeModules::Managed {
813+
node_modules_dir: resolver.root_node_modules_path().map(|it| {
814+
root_dir_url
815+
.specifier_key(
816+
&ModuleSpecifier::from_directory_path(it).unwrap(),
817+
)
818+
.into_owned()
819+
}),
820+
}),
821+
Some(
822+
managed
823+
.serialized_valid_snapshot_for_system(&NpmSystemInfo::default()),
824+
),
825+
)
826+
} else {
827+
(
828+
VfsBuilder::new(root_path, &mut vfs_content_callback_fn)?,
829+
None,
830+
None,
831+
)
832+
}
825833
}
826834
}
827835
InnerCliNpmResolverRef::Byonm(_) => {

types/global.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ declare namespace Supabase {
231231
}
232232

233233
export class Session {
234-
init: Promise<void>
234+
init: Promise<void>;
235235
/**
236236
* Create a new model session using given model
237237
*/

0 commit comments

Comments
 (0)