Skip to content

fix(add): allow passing add-on as argument that dependsOn another #691

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 6, 2025
Merged

fix(add): allow passing add-on as argument that dependsOn another #691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b37746f
fix(add): allow passing add-on as argument that depends on another ad…
jycouet Sep 5, 2025
593f696
fix: setupAddons later on only once
jycouet Sep 5, 2025
3127ae0
tweak ordering
AdrianGonz97 Sep 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/light-taxis-share.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'sv': patch
---

fix(add): allow passing add-on as argument that depends on another add-on
14 changes: 9 additions & 5 deletions packages/cli/commands/add/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,14 +380,13 @@ export async function runAddCommand(

// prepare official addons
let workspace = await createWorkspace({ cwd: options.cwd });
const setups = selectedAddons.length ? selectedAddons.map(({ addon }) => addon) : officialAddons;
const addonSetupResults = setupAddons(setups, workspace);

// prompt which addons to apply
if (selectedAddons.length === 0) {
const allSetupResults = setupAddons(officialAddons, workspace);
const addonOptions = officialAddons
// only display supported addons relative to the current environment
.filter(({ id }) => addonSetupResults[id].unsupported.length === 0)
.filter(({ id }) => allSetupResults[id].unsupported.length === 0)
.map(({ id, homepage, shortDescription }) => ({
label: id,
value: id,
Expand All @@ -414,7 +413,9 @@ export async function runAddCommand(
for (const { addon } of selectedAddons) {
workspace = await createWorkspace(workspace);

const setupResult = addonSetupResults[addon.id];
const setups = selectedAddons.map(({ addon }) => addon);
const setupResult = setupAddons(setups, workspace)[addon.id];

const missingDependencies = setupResult.dependsOn.filter(
(depId) => !selectedAddons.some((a) => a.addon.id === depId)
);
Expand All @@ -436,8 +437,11 @@ export async function runAddCommand(
}
}

// run verifications
// run all setups after inter-addon deps have been added
const addons = selectedAddons.map(({ addon }) => addon);
const addonSetupResults = setupAddons(addons, workspace);

// run verifications
const verifications = [
...verifyCleanWorkingDirectory(options.cwd, options.gitCheck),
...verifyUnsupportedAddons(addons, addonSetupResults)
Expand Down
Loading