Skip to content

Commit a6de136

Browse files
committed
fix(deno_facade): do not include managed npm deps when graph does not have any npm pkgs
1 parent a68a422 commit a6de136

1 file changed

Lines changed: 26 additions & 18 deletions

File tree

  • crates/deno_facade/eszip

crates/deno_facade/eszip/mod.rs

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -788,19 +788,26 @@ 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-
791+
if graph.npm_packages.is_empty() {
803792
(
793+
VfsBuilder::new(root_path, &mut vfs_content_callback_fn)?,
794+
None,
795+
None,
796+
)
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+
(
804811
npm_vfs_builder,
805812
Some(NodeModules::Managed {
806813
node_modules_dir: resolver.root_node_modules_path().map(|it| {
@@ -816,12 +823,13 @@ pub async fn generate_binary_eszip(
816823
.serialized_valid_snapshot_for_system(&NpmSystemInfo::default()),
817824
),
818825
)
819-
} else {
820-
(
821-
VfsBuilder::new(root_path, &mut vfs_content_callback_fn)?,
822-
None,
823-
None,
824-
)
826+
} else {
827+
(
828+
VfsBuilder::new(root_path, &mut vfs_content_callback_fn)?,
829+
None,
830+
None,
831+
)
832+
}
825833
}
826834
}
827835
InnerCliNpmResolverRef::Byonm(_) => {

0 commit comments

Comments
 (0)