Skip to content

Commit

Permalink
only append addon to main.js if not already added
Browse files Browse the repository at this point in the history
  • Loading branch information
yannbf committed Sep 5, 2024
1 parent bd0942c commit 8170e25
Showing 1 changed file with 15 additions and 10 deletions.
25 changes: 15 additions & 10 deletions code/lib/cli-storybook/src/add.ts
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ export async function add(
return;
}

let shouldAddToMain = true;
if (checkInstalled(addonName, requireMain(configDir))) {
const { shouldForceInstall } = await prompts({
type: 'confirm',
Expand All @@ -117,6 +118,8 @@ export async function add(
if (!shouldForceInstall) {
return;
}

shouldAddToMain = false;
}

const main = await readConfig(mainConfig);
Expand Down Expand Up @@ -146,18 +149,20 @@ export async function add(
logger.log(`Installing ${addonWithVersion}`);
await packageManager.addDependencies({ installAsDevDependencies: true }, [addonWithVersion]);

logger.log(`Adding '${addon}' to the "addons" field in ${mainConfig}`);
if(shouldAddToMain) {
logger.log(`Adding '${addon}' to the "addons" field in ${mainConfig}`);

const mainConfigAddons = main.getFieldNode(['addons']);
if (mainConfigAddons && getRequireWrapperName(main) !== null) {
const addonNode = main.valueToNode(addonName);
main.appendNodeToArray(['addons'], addonNode as any);
wrapValueWithRequireWrapper(main, addonNode as any);
} else {
main.appendValueToArray(['addons'], addonName);
}
const mainConfigAddons = main.getFieldNode(['addons']);
if (mainConfigAddons && getRequireWrapperName(main) !== null) {
const addonNode = main.valueToNode(addonName);
main.appendNodeToArray(['addons'], addonNode as any);
wrapValueWithRequireWrapper(main, addonNode as any);
} else {
main.appendValueToArray(['addons'], addonName);
}

await writeConfig(main);
await writeConfig(main);
}

if (!skipPostinstall && isCoreAddon(addonName)) {
await postinstallAddon(addonName, { packageManager: packageManager.type, configDir });
Expand Down

0 comments on commit 8170e25

Please sign in to comment.