Skip to content

Commit 0d3b316

Browse files
committed
fix(resolver,config): filter out overrides dependencies that are the package currently being built
1 parent 22c974f commit 0d3b316

2 files changed

Lines changed: 12 additions & 0 deletions

File tree

‎crates/wasm-pkg-client/src/oci/mod.rs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,13 @@ impl OciBackend {
101101
Ok(auth)
102102
})
103103
.await
104+
.map_err(|e| {
105+
if let Error::RegistryError(anyhow_err) = e {
106+
Error::RegistryError(anyhow_err.context(reference.repository().to_owned()))
107+
} else {
108+
e
109+
}
110+
})
104111
.cloned()
105112
}
106113

‎crates/wasm-pkg-core/src/resolver.rs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -730,6 +730,11 @@ impl DependencyResolutionMap {
730730
package,
731731
} => {
732732
source_files.extend(package.source_map.source_files().map(Path::to_path_buf));
733+
// handle cases for a workspace level `wkg.toml` where overrides may reference
734+
// the package being built
735+
if package.main.name == root.main.name {
736+
continue;
737+
}
733738
merged.push_group(package).with_context(|| {
734739
format!(
735740
"failed to merge dependency `{name}`",

0 commit comments

Comments
 (0)