fix: preserve forced plugin activation context

This commit is contained in:
Peter Steinberger
2026-04-06 23:30:33 +01:00
parent 4603f231c3
commit 1722bfab93
2 changed files with 7 additions and 1 deletions

View File

@@ -69,10 +69,12 @@ export function withActivatedPluginIds(params: {
enabled: true,
};
}
const forcePluginsEnabled = params.config?.plugins?.enabled === false;
return {
...params.config,
plugins: {
...params.config?.plugins,
...(forcePluginsEnabled ? { enabled: true } : {}),
...(allow.size > 0 ? { allow: [...allow] } : {}),
entries,
},

View File

@@ -38,6 +38,7 @@ export function withBundledPluginEnablementCompat(params: {
pluginIds: readonly string[];
}): PluginLoadOptions["config"] {
const existingEntries = params.config?.plugins?.entries ?? {};
const forcePluginsEnabled = params.config?.plugins?.enabled === false;
let changed = false;
const nextEntries: Record<string, PluginEntryConfig> = { ...existingEntries };
@@ -50,13 +51,16 @@ export function withBundledPluginEnablementCompat(params: {
}
if (!changed) {
return params.config;
if (!forcePluginsEnabled) {
return params.config;
}
}
return {
...params.config,
plugins: {
...params.config?.plugins,
...(forcePluginsEnabled ? { enabled: true } : {}),
entries: {
...existingEntries,
...nextEntries,