Skip to content

Commit 0c4479a

Browse files
authored
fix: do not purge lockfile when linking and the linked package's reqs have not changed (#30877)
1 parent 1ab2268 commit 0c4479a

File tree

5 files changed

+37
-39
lines changed

5 files changed

+37
-39
lines changed

Cargo.lock

Lines changed: 13 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,17 +69,17 @@ deno_doc = "=0.184.0"
6969
deno_error = "=0.7.0"
7070
deno_graph = { version = "=0.101.0", default-features = false }
7171
deno_lint = "=0.80.0"
72-
deno_lockfile = "=0.31.2"
72+
deno_lockfile = "=0.32.0"
7373
deno_media_type = { version = "=0.2.9", features = ["module_specifier"] }
7474
deno_native_certs = "0.3.0"
75-
deno_npm = "=0.39.1"
75+
deno_npm = "=0.40.0"
7676
deno_path_util = "=0.6.1"
7777
deno_semver = "=0.9.0"
7878
deno_task_shell = "=0.26.0"
7979
deno_terminal = "=0.2.2"
8080
deno_unsync = { version = "0.4.4", default-features = false }
8181
deno_whoami = "0.1.0"
82-
eszip = "=0.100.0"
82+
eszip = "=0.101.0"
8383

8484
denokv_proto = "0.12.0"
8585
denokv_remote = "0.12.0"

libs/resolver/lockfile.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,9 @@ impl<TSys: LockfileSys> LockfileLock<TSys> {
427427
// the npm resolution when it changes
428428
let value = deno_lockfile::LockfileLinkContent {
429429
dependencies: collect_deps(pkg_json.dependencies.as_ref()),
430+
optional_dependencies: collect_deps(
431+
pkg_json.optional_dependencies.as_ref(),
432+
),
430433
peer_dependencies: collect_deps(
431434
pkg_json.peer_dependencies.as_ref(),
432435
),
@@ -451,6 +454,7 @@ impl<TSys: LockfileSys> LockfileLock<TSys> {
451454
.unwrap();
452455
let value = deno_lockfile::LockfileLinkContent {
453456
dependencies: deno_json.dependencies(),
457+
optional_dependencies: Default::default(),
454458
peer_dependencies: Default::default(),
455459
peer_dependencies_meta: Default::default(),
456460
};
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
{
22
"name": "@denotest/add",
3-
"exports": "./mod.ts"
3+
"exports": "./mod.ts",
4+
"imports": {
5+
"@denotest/subtract": "jsr:@denotest/subtract"
6+
}
47
}
Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,23 @@
11
{
22
"version": "5",
3+
"specifiers": {
4+
"jsr:@denotest/subtract@*": "1.0.0"
5+
},
6+
"jsr": {
7+
"@denotest/[email protected]": {
8+
"integrity": "e178a7101c073e93d9efa6833d5cbf83bc1bc8d509b7c2a5ecbf74265e917597"
9+
}
10+
},
311
"workspace": {
412
"dependencies": [
513
"jsr:@denotest/add@*"
614
],
715
"links": {
8-
"jsr:@denotest/add": {}
16+
"jsr:@denotest/add": {
17+
"dependencies": [
18+
"jsr:@denotest/subtract@*"
19+
]
20+
}
921
}
1022
}
1123
}

0 commit comments

Comments
 (0)