diff --git a/.changeset/brown-peas-shop.md b/.changeset/brown-peas-shop.md new file mode 100644 index 00000000..268da463 --- /dev/null +++ b/.changeset/brown-peas-shop.md @@ -0,0 +1,5 @@ +--- +"sv": patch +--- + +chore: don't select `devtools-json` by default diff --git a/packages/addons/devtools-json/index.ts b/packages/addons/devtools-json/index.ts index fe8ba6fe..27f3c6e0 100644 --- a/packages/addons/devtools-json/index.ts +++ b/packages/addons/devtools-json/index.ts @@ -8,13 +8,6 @@ export default defineAddon({ homepage: 'https://github.com/ChromeDevTools/vite-plugin-devtools-json', options: {}, - setup: ({ defaultSelection }) => { - defaultSelection({ - create: true, - add: false - }); - }, - run: ({ sv, typescript }) => { const ext = typescript ? 'ts' : 'js'; diff --git a/packages/cli/commands/add/index.ts b/packages/cli/commands/add/index.ts index f8b46045..fedc6652 100644 --- a/packages/cli/commands/add/index.ts +++ b/packages/cli/commands/add/index.ts @@ -201,7 +201,7 @@ export const add = new Command('add') common.runCommand(async () => { const selectedAddonIds = selectedAddons.map(({ id }) => id); - const { nextSteps } = await runAddCommand(options, selectedAddonIds, 'add'); + const { nextSteps } = await runAddCommand(options, selectedAddonIds); if (nextSteps) p.note(nextSteps, 'Next steps', { format: (line: string) => line }); }); }); @@ -209,8 +209,7 @@ export const add = new Command('add') type SelectedAddon = { type: 'official' | 'community'; addon: AddonWithoutExplicitArgs }; export async function runAddCommand( options: Options, - selectedAddonIds: string[], - from: 'create' | 'add' + selectedAddonIds: string[] ): Promise<{ nextSteps?: string; packageManager?: AgentName | null }> { const selectedAddons: SelectedAddon[] = selectedAddonIds.map((id) => ({ type: 'official', @@ -391,11 +390,6 @@ export async function runAddCommand( const setups = selectedAddons.length ? selectedAddons.map(({ addon }) => addon) : officialAddons; const addonSetupResults = setupAddons(setups, workspace); - // get all addons that have been marked to be preselected - const initialValues = Object.entries(addonSetupResults) - .filter(([_, value]) => value.defaultSelection[from] === true) - .map(([key]) => key); - // prompt which addons to apply if (selectedAddons.length === 0) { const addonOptions = officialAddons @@ -410,8 +404,7 @@ export async function runAddCommand( const selected = await p.multiselect({ message: `What would you like to add to your project? ${pc.dim('(use arrow keys / space bar)')}`, options: addonOptions, - required: false, - initialValues + required: false }); if (p.isCancel(selected)) { p.cancel('Operation cancelled.'); diff --git a/packages/cli/commands/create.ts b/packages/cli/commands/create.ts index b7ffcaa6..5d259c31 100644 --- a/packages/cli/commands/create.ts +++ b/packages/cli/commands/create.ts @@ -184,8 +184,7 @@ async function createProject(cwd: ProjectPath, options: Options) { community: [], addons: {} }, - [], - 'create' + [] ); packageManager = pm; addOnNextSteps = nextSteps; diff --git a/packages/cli/lib/install.ts b/packages/cli/lib/install.ts index 1ae3d874..86bef827 100644 --- a/packages/cli/lib/install.ts +++ b/packages/cli/lib/install.ts @@ -90,8 +90,7 @@ export function setupAddons( const setupResult: AddonSetupResult = { unsupported: [], dependsOn: [], - runsAfter: [], - defaultSelection: { create: false, add: false } + runsAfter: [] }; addon.setup?.({ ...workspace, @@ -100,10 +99,7 @@ export function setupAddons( setupResult.runsAfter.push(name); }, unsupported: (reason) => setupResult.unsupported.push(reason), - runsAfter: (name) => setupResult.runsAfter.push(name), - defaultSelection: (defaultSelection) => { - setupResult.defaultSelection = defaultSelection; - } + runsAfter: (name) => setupResult.runsAfter.push(name) }); addonSetupResults[addon.id] = setupResult; } diff --git a/packages/core/addon/config.ts b/packages/core/addon/config.ts index dd9daf08..fbce3775 100644 --- a/packages/core/addon/config.ts +++ b/packages/core/addon/config.ts @@ -38,7 +38,6 @@ export type Addon = { dependsOn: (name: string) => void; unsupported: (reason: string) => void; runsAfter: (addonName: string) => void; - defaultSelection: (args: { create: boolean; add: boolean }) => void; } ) => MaybePromise; run: (workspace: Workspace & { sv: SvApi }) => MaybePromise; @@ -61,12 +60,7 @@ export function defineAddon(config: Addon): return config; } -export type AddonSetupResult = { - dependsOn: string[]; - unsupported: string[]; - runsAfter: string[]; - defaultSelection: { create: boolean; add: boolean }; -}; +export type AddonSetupResult = { dependsOn: string[]; unsupported: string[]; runsAfter: string[] }; export type AddonWithoutExplicitArgs = Addon>; export type AddonConfigWithoutExplicitArgs = Addon>;