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
1 change: 1 addition & 0 deletions crates/base/test_cases/pin-package/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
!deno.lock
3 changes: 3 additions & 0 deletions crates/base/test_cases/pin-package/deno.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"workspace": []
}
17 changes: 17 additions & 0 deletions crates/base/test_cases/pin-package/deno.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions crates/base/test_cases/pin-package/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import isOdd from "npm:is-odd@^3";
import json from "npm:is-odd@^3/package.json" with { type: "json" };

console.log(isOdd);

Deno.serve(() => new Response(json["version"]));
21 changes: 21 additions & 0 deletions crates/base/tests/integration_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4224,6 +4224,27 @@ async fn test_user_worker_with_import_map() {
}
}

#[tokio::test]
#[serial]
async fn test_pin_package_version_correctly() {
integration_test!(
"./test_cases/pin-package",
NON_SECURE_PORT,
"",
None,
None,
None,
(|resp| async {
let res = resp.unwrap();
assert!(res.status().as_u16() == 200);

let body_bytes = res.bytes().await.unwrap();
assert_eq!(body_bytes, r#"3.0.0"#);
}),
TerminationToken::new()
);
}

#[derive(Deserialize)]
struct ErrorResponsePayload {
msg: String,
Expand Down
10 changes: 9 additions & 1 deletion crates/deno_facade/emitter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,15 @@ impl EmitterFactory {
} else {
CliNpmResolverCreateOptions::Managed(
CliManagedNpmResolverCreateOptions {
snapshot: CliNpmResolverManagedSnapshotOption::Specified(None),
snapshot: if let Some(lockfile) =
options.maybe_lockfile().cloned()
{
CliNpmResolverManagedSnapshotOption::ResolveFromLockfile(
lockfile,
)
} else {
CliNpmResolverManagedSnapshotOption::Specified(None)
},
maybe_lockfile: options.maybe_lockfile().cloned(),
fs,
http_client_provider: self.http_client_provider().clone(),
Expand Down
2 changes: 1 addition & 1 deletion deno/npm/managed/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ async fn resolve_snapshot(
let guard = lockfile.lock();
(guard.overwrite, guard.filename.clone())
};
if overwrite {
if !overwrite {
let snapshot = snapshot_from_lockfile(
lockfile.clone(),
&registry_info_provider.as_npm_registry_api(),
Expand Down
Loading