From 6c2fc47b6307c4c3b1b1ceb686dba3c3db3e4ed1 Mon Sep 17 00:00:00 2001 From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Wed, 16 Oct 2024 08:18:35 -0700 Subject: [PATCH 1/4] chore: update prompt for installing additional adders --- packages/cli/commands/add/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cli/commands/add/index.ts b/packages/cli/commands/add/index.ts index 4516bfc2e..462b75d77 100644 --- a/packages/cli/commands/add/index.ts +++ b/packages/cli/commands/add/index.ts @@ -313,7 +313,7 @@ export async function runAddCommand(options: Options, selectedAdderIds: string[] // prompt to install the dependent const install = await p.confirm({ - message: `The ${pc.bold(pc.cyan(adder.id))} adder requires ${pc.bold(pc.cyan(depId))} to also be installed. ${pc.green('Install it?')}` + message: `The ${pc.bold(pc.cyan(adder.id))} integration requires ${pc.bold(pc.cyan(depId))} to also be setup. ${pc.green('Include it?')}` }); if (install !== true) { p.cancel('Operation cancelled.'); From 8206f3b6291a1a1f528a3d7a6251c75bb70df20b Mon Sep 17 00:00:00 2001 From: Manuel Serret Date: Wed, 16 Oct 2024 17:26:58 +0200 Subject: [PATCH 2/4] fix more places --- packages/cli/commands/add/index.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/cli/commands/add/index.ts b/packages/cli/commands/add/index.ts index 462b75d77..3e113601e 100644 --- a/packages/cli/commands/add/index.ts +++ b/packages/cli/commands/add/index.ts @@ -46,8 +46,8 @@ const defaultPkgPath = pkg.up(); const defaultCwd = defaultPkgPath ? path.dirname(defaultPkgPath) : undefined; export const add = new Command('add') - .description('applies specified adders into a project') - .argument('[adder...]', 'adders to install') + .description('applies specified integrations into a project') + .argument('[integration...]', 'integrations to install') .option('-C, --cwd ', 'path to working directory', defaultCwd) .option('--no-install', 'skips installing dependencies') .option('--no-preconditions', 'skips validating preconditions') @@ -577,7 +577,7 @@ function getAdderOptionFlags(): Option[] { const preset = defaults.join(', ') || 'none'; const option = new Option( `--${id} [options...]`, - `${id} adder options ${pc.dim(`(preset: ${preset})`)}\n${choices}` + `${id} integration options ${pc.dim(`(preset: ${preset})`)}\n${choices}` ) // presets are applied when `--adder` is specified with no options .preset(preset) From 04ea03fc7548c64f2d4937350b693cc134f6fa20 Mon Sep 17 00:00:00 2001 From: Manuel Serret Date: Wed, 16 Oct 2024 17:36:36 +0200 Subject: [PATCH 3/4] fix tests --- packages/create/templates/demo/src/routes/sverdle/+page.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create/templates/demo/src/routes/sverdle/+page.svelte b/packages/create/templates/demo/src/routes/sverdle/+page.svelte index 4605dbdd5..9eabcc9f6 100644 --- a/packages/create/templates/demo/src/routes/sverdle/+page.svelte +++ b/packages/create/templates/demo/src/routes/sverdle/+page.svelte @@ -110,7 +110,7 @@

Sverdle

{ // prevent default callback from resetting the form From 4437ab1fb22c20eef1ebe899eb113f98fcaf3c41 Mon Sep 17 00:00:00 2001 From: AdrianGonz97 <31664583+AdrianGonz97@users.noreply.github.com> Date: Wed, 16 Oct 2024 11:36:56 -0400 Subject: [PATCH 4/4] more spots to rename --- packages/cli/commands/create.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/cli/commands/create.ts b/packages/cli/commands/create.ts index 64e2e1ea7..ee992dc85 100644 --- a/packages/cli/commands/create.ts +++ b/packages/cli/commands/create.ts @@ -24,7 +24,7 @@ const templateOption = new Option('--template ', 'template to scaffold').c const ProjectPathSchema = v.string(); const OptionsSchema = v.strictObject({ checkTypes: v.optional(v.picklist(langs)), - adders: v.boolean(), + integrations: v.boolean(), install: v.boolean(), template: v.optional(v.picklist(templateChoices)) }); @@ -35,7 +35,7 @@ export const create = new Command('create') .argument('[path]', 'where the project will be created', process.cwd()) .addOption(langOption) .addOption(templateOption) - .option('--no-adders', 'skips interactive adder installer') + .option('--no-integrations', 'skips interactive integration installer') .option('--no-install', 'skips installing dependencies') .configureHelp(common.helpConfig) .action((projectPath, opts) => { @@ -139,13 +139,13 @@ async function createProject(cwd: string, options: Options) { initSpinner.stop('Project created'); - if (options.adders) { + if (options.integrations) { await runAddCommand( { cwd: projectPath, install: false, preconditions: true, community: [] }, [] ); } - // show install prompt even if no adders selected + // show install prompt even if no integrations are selected if (options.install) { // `runAddCommand` includes the installing dependencies prompt. if it's skipped, // then we'll prompt to install dependencies here