Skip to content

Commit dae4d95

Browse files
committed
fix: when resolving dep versions, it should respect versions in deno.lock
1 parent 223c9c9 commit dae4d95

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

crates/deno_facade/emitter.rs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,15 @@ impl EmitterFactory {
356356
} else {
357357
CliNpmResolverCreateOptions::Managed(
358358
CliManagedNpmResolverCreateOptions {
359-
snapshot: CliNpmResolverManagedSnapshotOption::Specified(None),
359+
snapshot: if let Some(lockfile) =
360+
options.maybe_lockfile().cloned()
361+
{
362+
CliNpmResolverManagedSnapshotOption::ResolveFromLockfile(
363+
lockfile,
364+
)
365+
} else {
366+
CliNpmResolverManagedSnapshotOption::Specified(None)
367+
},
360368
maybe_lockfile: options.maybe_lockfile().cloned(),
361369
fs,
362370
http_client_provider: self.http_client_provider().clone(),

deno/npm/managed/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ async fn resolve_snapshot(
179179
let guard = lockfile.lock();
180180
(guard.overwrite, guard.filename.clone())
181181
};
182-
if overwrite {
182+
if !overwrite {
183183
let snapshot = snapshot_from_lockfile(
184184
lockfile.clone(),
185185
&registry_info_provider.as_npm_registry_api(),

0 commit comments

Comments
 (0)