Skip to content

chore: update prompt for installing additional adders #150

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 4 commits into from
Oct 16, 2024
Merged

chore: update prompt for installing additional adders #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6c2fc47
chore: update prompt for installing additional adders
benmccann Oct 16, 2024
8206f3b
fix more places
manuel3108 Oct 16, 2024
04ea03f
fix tests
manuel3108 Oct 16, 2024
4437ab1
more spots to rename
AdrianGonz97 Oct 16, 2024
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
8 changes: 4 additions & 4 deletions packages/cli/commands/add/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>', 'path to working directory', defaultCwd)
.option('--no-install', 'skips installing dependencies')
.option('--no-preconditions', 'skips validating preconditions')
Expand Down Expand Up @@ -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.');
Expand Down Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions packages/cli/commands/create.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const templateOption = new Option('--template <type>', '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))
});
Expand All @@ -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) => {
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/create/templates/demo/src/routes/sverdle/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
<h1 class="visually-hidden">Sverdle</h1>

<form
method="POST"
method="post"
action="?/enter"
use:enhance={() => {
// prevent default callback from resetting the form
Expand Down