fix(channels): preserve external catalog overrides (#52988)

* fix(channels): preserve external catalog overrides

* fix(channels): clarify catalog precedence

* fix(channels): respect overridden install specs
This commit is contained in:
Nimrod Gutman
2026-03-23 18:08:17 +02:00
committed by GitHub
parent 29ad211e76
commit 041c47419f
5 changed files with 260 additions and 16 deletions

View File

@@ -23,14 +23,6 @@ export function resolveBundledInstallPlanForCatalogEntry(params: {
return null;
}
const bundledById = params.findBundledSource({
kind: "pluginId",
value: pluginId,
});
if (bundledById?.pluginId === pluginId) {
return { bundledSource: bundledById };
}
const bundledBySpec = params.findBundledSource({
kind: "npmSpec",
value: npmSpec,
@@ -39,7 +31,18 @@ export function resolveBundledInstallPlanForCatalogEntry(params: {
return { bundledSource: bundledBySpec };
}
return null;
const bundledById = params.findBundledSource({
kind: "pluginId",
value: pluginId,
});
if (bundledById?.pluginId !== pluginId) {
return null;
}
if (bundledById.npmSpec && bundledById.npmSpec !== npmSpec) {
return null;
}
return { bundledSource: bundledById };
}
export function resolveBundledInstallPlanBeforeNpm(params: {