Skip to content

Commit 42f7783

Browse files
committed
fix(ci): dompurify override and a listing-order-dependent walk test
The dompurify override now follows the direct dependency ("$dompurify"); npm refuses an override whose spec differs from a direct dependency's, which broke `npm ci`. The follow_root cycle test sorted nothing and assumed APFS's sorted listing order; on ext4 the children come back hashed.
1 parent bb5df76 commit 42f7783

2 files changed

Lines changed: 4 additions & 1 deletion

File tree

‎libs/newt-common/src/vfs/walk.rs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -942,6 +942,9 @@ mod tests {
942942
walk(&vfs, std::slice::from_ref(&root), &options, &mut log)
943943
.await
944944
.unwrap();
945+
// Children come in the filesystem's listing order (hashed on ext4).
946+
let children = log.lines.len() - 1;
947+
log.lines[1..children].sort();
945948
let root = root.as_wire_str();
946949
assert_eq!(
947950
log.lines,

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,6 @@
7878
]
7979
},
8080
"overrides": {
81-
"dompurify": "^3.4.12"
81+
"dompurify": "$dompurify"
8282
}
8383
}

0 commit comments

Comments
 (0)