Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .vortex/cli/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"alexskrypnyk/str2name": "^1.7.0",
"composer/composer": "^2.10.3",
"czproject/git-php": "^4.6",
"drevops/phptui": "^0.2.1",
"drevops/phptui": "^0.3.0",
"guzzlehttp/guzzle": "^8.3.1",
"nelexa/zip": "^4.0.2",
"nikic/iter": "^2.4.1",
Expand Down
26 changes: 18 additions & 8 deletions .vortex/cli/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 11 additions & 11 deletions .vortex/cli/src/Form/TuiAdapter.php
Original file line number Diff line number Diff line change
Expand Up @@ -87,17 +87,17 @@ public static function field(PanelBuilder $p, HandlerInterface $handler, ?Condit
$label = $handler->label();

$field = match ($handler->type()) {
PromptType::Select => $p->select($id, $label),
PromptType::MultiSelect => $p->select($id, $label)->multiple(),
PromptType::Confirm => $p->confirm($id, $label),
PromptType::Suggest => $p->suggest($id, $label),
PromptType::Number => $p->number($id, $label),
PromptType::Textarea => $p->textarea($id, $label),
PromptType::Password => $p->password($id, $label),
PromptType::Search => $p->search($id, $label),
PromptType::MultiSearch => $p->search($id, $label)->multiple(),
PromptType::Pause => $p->pause($id, $label),
default => $p->text($id, $label),
PromptType::Select => $p->select($label, $id),
PromptType::MultiSelect => $p->select($label, $id)->multiple(),
PromptType::Confirm => $p->confirm($label, $id),
PromptType::Suggest => $p->suggest($label, $id),
PromptType::Number => $p->number($label, $id),
PromptType::Textarea => $p->textarea($label, $id),
PromptType::Password => $p->password($label, $id),
PromptType::Search => $p->search($label, $id),
PromptType::MultiSearch => $p->search($label, $id)->multiple(),
PromptType::Pause => $p->pause($label, $id),
default => $p->text($label, $id),
};

// The handler's three guidance texts map to the three field slots.
Expand Down
24 changes: 12 additions & 12 deletions .vortex/cli/src/Form/VortexForm.php
Original file line number Diff line number Diff line change
Expand Up @@ -213,15 +213,15 @@ public static function create(Config $config): Form {
return Form::create('Vortex')
->banner(self::BANNER)
->envPrefix('VORTEX_CLI_INSTALL_PROMPT_')
->panel('general', 'General information', function (PanelBuilder $p) use ($config): void {
->panel('General information', 'general', function (PanelBuilder $p) use ($config): void {
$p->description('Project name, organization and public domain.');
TuiAdapter::field($p, new Name($config));
TuiAdapter::field($p, new MachineName($config));
TuiAdapter::field($p, new Org($config));
TuiAdapter::field($p, new OrgMachineName($config));
TuiAdapter::field($p, new Domain($config));
})
->panel('drupal', 'Drupal', function (PanelBuilder $p) use ($config): void {
->panel('Drupal', 'drupal', function (PanelBuilder $p) use ($config): void {
$p->description('Install profile, modules, theme and front-end build.');
TuiAdapter::field($p, new Starter($config));
TuiAdapter::field($p, new Profile($config));
Expand All @@ -234,18 +234,18 @@ public static function create(Config $config): Form {
TuiAdapter::field($p, new FrontendBuild($config), when: new Condition('theme', eq: Theme::CUSTOM));
TuiAdapter::field($p, new Storybook($config), when: new Condition('theme', eq: Theme::CUSTOM));
})
->panel('code_repository', 'Code repository', function (PanelBuilder $p) use ($config): void {
->panel('Code repository', 'code_repository', function (PanelBuilder $p) use ($config): void {
$p->description('Where the code lives and how releases are versioned.');
TuiAdapter::field($p, new CodeProvider($config));
TuiAdapter::field($p, new VersionScheme($config));
})
->panel('environment', 'Environment', function (PanelBuilder $p) use ($config): void {
->panel('Environment', 'environment', function (PanelBuilder $p) use ($config): void {
$p->description('Timezone, Docker services and developer tooling.');
TuiAdapter::field($p, new Timezone($config));
TuiAdapter::field($p, new Services($config));
TuiAdapter::field($p, new Tools($config));
})
->panel('hosting', 'Hosting', function (PanelBuilder $p) use ($config): void {
->panel('Hosting', 'hosting', function (PanelBuilder $p) use ($config): void {
$p->description('Target hosting provider and project name.');
TuiAdapter::field($p, new HostingProvider($config));
TuiAdapter::field($p, new HostingProjectName($config), when: new Condition('hosting_provider', in: [
Expand All @@ -254,11 +254,11 @@ public static function create(Config $config): Form {
]));
TuiAdapter::field($p, new Webroot($config));
})
->panel('deployment', 'Deployment', function (PanelBuilder $p) use ($config): void {
->panel('Deployment', 'deployment', function (PanelBuilder $p) use ($config): void {
$p->description('How code is shipped to the hosting environment.');
TuiAdapter::field($p, new DeployTypes($config));
})
->panel('workflow', 'Workflow', function (PanelBuilder $p) use ($config): void {
->panel('Workflow', 'workflow', function (PanelBuilder $p) use ($config): void {
$p->description('Provisioning method and database source.');
TuiAdapter::field($p, new ProvisionType($config));
TuiAdapter::field($p, new DatabaseFetchSource($config), when: new Condition('provision_type', eq: ProvisionType::DATABASE));
Expand All @@ -267,29 +267,29 @@ public static function create(Config $config): Form {
TuiAdapter::field($p, new MigrationFetchSource($config), when: new Condition('migration', eq: TRUE));
TuiAdapter::field($p, new MigrationImage($config), when: new Condition('migration_fetch_source', eq: MigrationFetchSource::CONTAINER_REGISTRY));
})
->panel('notifications', 'Notifications', function (PanelBuilder $p) use ($config): void {
->panel('Notifications', 'notifications', function (PanelBuilder $p) use ($config): void {
$p->description('Where build and deployment notifications are sent.');
TuiAdapter::field($p, new NotificationChannels($config));
})
->panel('continuous_integration', 'Continuous Integration', function (PanelBuilder $p) use ($config): void {
->panel('Continuous Integration', 'continuous_integration', function (PanelBuilder $p) use ($config): void {
$p->description('CI provider, visual regression and secret scanning.');
TuiAdapter::field($p, new CiProvider($config));
TuiAdapter::field($p, new VisualRegression($config));
TuiAdapter::field($p, new Gitleaks($config));
})
->panel('automations', 'Automations', function (PanelBuilder $p) use ($config): void {
->panel('Automations', 'automations', function (PanelBuilder $p) use ($config): void {
$p->description('Dependency updates, coverage and PR automation.');
TuiAdapter::field($p, new DependencyUpdatesProvider($config));
TuiAdapter::field($p, new DependencyUpdatesAutomerge($config), when: new Condition('dependency_updates_provider', in: DependencyUpdatesAutomerge::PROVIDERS));
TuiAdapter::field($p, new CodeCoverageProvider($config));
TuiAdapter::field($p, new AssignAuthorPr($config));
TuiAdapter::field($p, new LabelMergeConflictsPr($config));
})
->panel('documentation', 'Documentation', function (PanelBuilder $p) use ($config): void {
->panel('Documentation', 'documentation', function (PanelBuilder $p) use ($config): void {
$p->description('Whether project documentation is kept.');
TuiAdapter::field($p, new PreserveDocsProject($config));
})
->panel('ai', 'AI', function (PanelBuilder $p) use ($config): void {
->panel('AI', 'ai', function (PanelBuilder $p) use ($config): void {
$p->description('Whether AI agent instructions are included.');
TuiAdapter::field($p, new AiCodeInstructions($config));
});
Expand Down
3 changes: 2 additions & 1 deletion .vortex/docs/eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ export default defineConfig(
},
},
settings: {
react: { version: 'detect' },
// 'detect' calls 'context.getFilename()', which ESLint 10 removed.
react: { version: '18.3' },
},
rules: {
'react/react-in-jsx-scope': 'off',
Expand Down
4 changes: 2 additions & 2 deletions .vortex/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@
"@babel/core": "^7.0.0",
"@babel/preset-env": "^7.27.2",
"@babel/preset-react": "^7.27.1",
"@eslint/js": "^9.39.4",
"@eslint/js": "^10.0.1",
"@testing-library/dom": "^10.4.2",
"@testing-library/jest-dom": "^7.0.1",
"@testing-library/react": "^16.3.3",
"@testing-library/user-event": "^14.0.0",
"@vvago/vale": "^3.22.0",
"babel-jest": "^30.5.2",
"cspell": "^9.8.0",
"eslint": "^9.39.4",
"eslint": "^10.13.0",
"eslint-plugin-react": "^7.37.5",
"eslint-plugin-react-hooks": "^7.1.1",
"globals": "^17.13.0",
Expand Down
2 changes: 1 addition & 1 deletion .vortex/docs/src/pages/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ function fallbackCopy(text) {
document.body.appendChild(ta);
ta.select();

let ok = false;
let ok;

try {
ok = document.execCommand('copy');
Expand Down
Loading
Loading