@form8ion/project 22.0.0-beta.1 → 22.0.0-beta.11

package/package.json

@@ -2,10 +2,10 @@
   "name": "@form8ion/project",
   "description": "opinionated scaffolder for new projects",
   "license": "MIT",
-  "version": "22.0.0-beta.1",
+  "version": "22.0.0-beta.11",
   "type": "module",
   "engines": {
-    "node": "^18.19.0 || ^20.9.0 || >=22.11.0"
+    "node": "^20.19.0 || >=22.14.0"
   },
   "author": "Matt Travi <npm@travi.org> (https://matt.travi.org/)",
   "contributors": [
@@ -55,7 +55,7 @@
     "access": "public",
     "provenance": true
   },
-  "packageManager": "npm@11.4.1+sha512.fcee43884166b6f9c5d04535fb95650e9708b6948a1f797eddf40e9778646778a518dfa32651b1c62ff36f4ac42becf177ca46ca27d53f24b539190c8d91802b",
+  "packageManager": "npm@11.11.0+sha512.f36811c4aae1fde639527368ae44c571d050006a608d67a191f195a801a52637a312d259186254aa3a3799b05335b7390539cf28656d18f0591a1125ba35f973",
   "config": {
     "commitizen": {
       "path": "./node_modules/cz-conventional-changelog"
@@ -64,55 +64,53 @@
   "dependencies": {
     "@form8ion/core": "^4.6.0",
     "@form8ion/git": "^2.1.1",
-    "@form8ion/overridable-prompts": "^1.1.0",
     "@form8ion/readme": "3.1.0",
-    "@form8ion/results-reporter": "^1.1.0",
     "@hapi/hoek": "^11.0.2",
-    "@travi/cli-messages": "1.1.1",
     "deepmerge": "^4.2.2",
     "execa": "^9.5.1",
     "filedirname": "^3.0.0",
-    "hosted-git-info": "^8.0.0",
+    "git-url-parse": "^16.1.0",
     "joi": "^17.1.1",
     "mustache": "4.2.0",
     "simple-git": "^3.16.0",
-    "spdx-license-list": "6.10.0",
+    "spdx-license-list": "6.11.0",
     "word-wrap": "^1.2.3",
     "write-yaml": "1.0.0"
   },
   "devDependencies": {
-    "@cucumber/cucumber": "11.3.0",
-    "@form8ion/commitlint-config": "2.0.6",
-    "@form8ion/eslint-config": "7.0.12",
+    "@cucumber/cucumber": "12.7.0",
+    "@form8ion/commitlint-config": "2.0.8",
+    "@form8ion/eslint-config": "7.0.13",
     "@form8ion/eslint-config-cucumber": "1.4.1",
-    "@form8ion/eslint-config-vitest": "1.0.0",
+    "@form8ion/eslint-config-vitest": "1.1.0",
     "@form8ion/remark-lint-preset": "6.0.7",
-    "@rollup/plugin-node-resolve": "16.0.1",
-    "@travi/any": "3.1.2",
-    "c8": "10.1.3",
-    "chai": "5.2.0",
-    "cross-env": "7.0.3",
+    "@rollup/plugin-node-resolve": "16.0.3",
+    "@travi/any": "3.1.3",
+    "c8": "11.0.0",
+    "chai": "6.2.2",
+    "cross-env": "10.1.0",
     "cz-conventional-changelog": "3.3.0",
+    "debug": "4.4.3",
     "gherkin-lint": "4.2.4",
     "husky": "9.1.7",
-    "lockfile-lint": "4.14.1",
-    "ls-engines": "0.9.3",
-    "mdast-util-from-markdown": "2.0.2",
+    "lockfile-lint": "5.0.0",
+    "ls-engines": "0.9.4",
+    "mdast-util-from-markdown": "2.0.3",
     "mdast-util-heading-range": "4.0.0",
     "mdast-zone": "6.1.0",
     "mock-fs": "5.5.0",
     "npm-run-all2": "8.0.4",
-    "publint": "0.3.12",
+    "publint": "0.3.18",
     "remark-cli": "12.0.1",
     "remark-toc": "9.0.0",
     "remark-usage": "11.0.1",
-    "rimraf": "6.0.1",
-    "rollup": "4.42.0",
+    "rimraf": "6.1.3",
+    "rollup": "4.59.0",
     "rollup-plugin-auto-external": "2.0.0",
-    "sinon": "20.0.0",
+    "sinon": "21.0.2",
     "testdouble": "3.20.2",
     "unist-util-find": "3.0.0",
-    "vitest": "3.2.3",
-    "vitest-when": "0.6.1"
+    "vitest": "4.0.18",
+    "vitest-when": "0.10.0"
   }
 }

package/src/dependency-updater/prompt.js

@@ -1,11 +1,15 @@
-import {prompt} from '@form8ion/overridable-prompts';
 import {questionNames} from '../prompts/question-names.js';
 
-export async function promptForDependencyUpdaterChoice(updaters, decisions) {
-  return prompt([{
-    name: questionNames.DEPENDENCY_UPDATER,
-    type: 'list',
-    message: 'Which dependency-update service do you want to manage this project?',
-    choices: [...Object.keys(updaters), 'Other']
-  }], decisions);
+export const DEPENDENCY_UPDATER_PROMPT_ID = 'DEPENDENCY_UPDATER';
+
+export async function promptForDependencyUpdaterChoice(updaters, {prompt}) {
+  return prompt({
+    id: DEPENDENCY_UPDATER_PROMPT_ID,
+    questions: [{
+      name: questionNames.DEPENDENCY_UPDATER,
+      type: 'list',
+      message: 'Which dependency-update service do you want to manage this project?',
+      choices: [...Object.keys(updaters), 'Other']
+    }]
+  });
 }

package/src/dependency-updater/prompt.test.js

@@ -1,30 +1,27 @@
-import * as prompts from '@form8ion/overridable-prompts';
-
-import {afterEach, describe, expect, it, vi} from 'vitest';
+import {describe, expect, it, vi} from 'vitest';
 import any from '@travi/any';
 import {when} from 'vitest-when';
 
-import {promptForDependencyUpdaterChoice} from './prompt.js';
+import {DEPENDENCY_UPDATER_PROMPT_ID, promptForDependencyUpdaterChoice} from './prompt.js';
 import {questionNames} from '../index.js';
 
 vi.mock('@form8ion/overridable-prompts');
 
 describe('dependency updater prompt', () => {
-  afterEach(() => {
-    vi.clearAllMocks();
-  });
-
   it('should enable choosing the preferred updater', async () => {
+    const prompt = vi.fn();
     const answers = any.simpleObject();
     const updaters = any.simpleObject();
-    const decisions = any.simpleObject();
-    when(prompts.prompt).calledWith([{
-      name: questionNames.DEPENDENCY_UPDATER,
-      type: 'list',
-      message: 'Which dependency-update service do you want to manage this project?',
-      choices: [...Object.keys(updaters), 'Other']
-    }], decisions).thenResolve(answers);
+    when(prompt).calledWith({
+      id: DEPENDENCY_UPDATER_PROMPT_ID,
+      questions: [{
+        name: questionNames.DEPENDENCY_UPDATER,
+        type: 'list',
+        message: 'Which dependency-update service do you want to manage this project?',
+        choices: [...Object.keys(updaters), 'Other']
+      }]
+    }).thenResolve(answers);
 
-    expect(await promptForDependencyUpdaterChoice(updaters, decisions)).toEqual(answers);
+    expect(await promptForDependencyUpdaterChoice(updaters, {prompt})).toEqual(answers);
   });
 });

package/src/dependency-updater/scaffolder.js

@@ -1,11 +1,11 @@
 import {questionNames} from '../prompts/question-names.js';
 import {promptForDependencyUpdaterChoice} from './prompt.js';
 
-export default async function (plugins, decisions, options) {
+export default async function (plugins, options, {prompt}) {
   if (!Object.keys(plugins).length) return undefined;
 
   const plugin = plugins[
-    (await promptForDependencyUpdaterChoice(plugins, decisions))[questionNames.DEPENDENCY_UPDATER]
+    (await promptForDependencyUpdaterChoice(plugins, {prompt}))[questionNames.DEPENDENCY_UPDATER]
   ];
 
   if (plugin) return plugin.scaffold(options);

package/src/dependency-updater/scaffolder.test.js

@@ -1,32 +1,28 @@
-import {afterEach, describe, expect, it, vi} from 'vitest';
+import {describe, expect, it, vi} from 'vitest';
 import any from '@travi/any';
 import {when} from 'vitest-when';
 
-import * as prompt from './prompt.js';
+import {promptForDependencyUpdaterChoice} from './prompt.js';
 import scaffoldUpdater from './scaffolder.js';
 import {questionNames} from '../index.js';
-import {promptForDependencyUpdaterChoice} from './prompt.js';
 
-vi.mock('./prompt');
+vi.mock('./prompt.js');
 
 describe('dependency-updater scaffolder', () => {
-  afterEach(() => {
-    vi.clearAllMocks();
-  });
+  const prompt = () => undefined;
 
   it('should execute the chosen scaffolder with the appropriate options', async () => {
-    const decisions = any.simpleObject();
     const options = any.simpleObject();
     const chosenUpdater = any.word();
     const chosenUpdaterScaffolder = vi.fn();
     const plugins = {...any.simpleObject(), [chosenUpdater]: {scaffold: chosenUpdaterScaffolder}};
     const scaffolderResult = any.simpleObject();
-    when(prompt.promptForDependencyUpdaterChoice)
-      .calledWith(plugins, decisions)
+    when(promptForDependencyUpdaterChoice)
+      .calledWith(plugins, {prompt})
       .thenResolve({[questionNames.DEPENDENCY_UPDATER]: chosenUpdater});
     when(chosenUpdaterScaffolder).calledWith(options).thenResolve(scaffolderResult);
 
-    expect(await scaffoldUpdater(plugins, decisions, options)).toEqual(scaffolderResult);
+    expect(await scaffoldUpdater(plugins, options, {prompt})).toEqual(scaffolderResult);
   });
 
   it('should not present a prompt if no updaters are registered', async () => {

package/src/index.js

@@ -1,9 +1,7 @@
-import {questionNames as coreQuestionNames} from '@form8ion/core';
-import {questionNames as projectScaffolderQuestionNames} from './prompts/question-names.js';
+import {ids} from './prompts/index.js';
 
 export * from './scaffolder.js';
 export {default as lift} from './lift.js';
-export const questionNames = {
-  ...coreQuestionNames,
-  ...projectScaffolderQuestionNames
-};
+export const promptConstants = {ids};
+
+export {questionNames} from './prompts/index.js';

package/src/language/prompt.js

@@ -1,12 +1,15 @@
-import {prompt} from '@form8ion/overridable-prompts';
-
 import {questionNames} from '../prompts/question-names.js';
 
-export default function (languages, decisions) {
-  return prompt([{
-    name: questionNames.PROJECT_LANGUAGE,
-    type: 'list',
-    message: 'What type of project is this?',
-    choices: [...Object.keys(languages), 'Other']
-  }], decisions);
+export const PROJECT_LANGUAGE_PROMPT_ID = 'PROJECT_LANGUAGE';
+
+export default function promptForProjectLanguage(languages, {prompt}) {
+  return prompt({
+    id: PROJECT_LANGUAGE_PROMPT_ID,
+    questions: [{
+      name: questionNames.PROJECT_LANGUAGE,
+      type: 'list',
+      message: 'What type of project is this?',
+      choices: [...Object.keys(languages), 'Other']
+    }]
+  });
 }

package/src/language/prompt.test.js

@@ -1,30 +1,27 @@
-import {prompt} from '@form8ion/overridable-prompts';
-
-import {afterEach, describe, expect, it, vi} from 'vitest';
+import {describe, expect, it, vi} from 'vitest';
 import any from '@travi/any';
 import {when} from 'vitest-when';
 
 import {questionNames} from '../prompts/question-names.js';
-import promptForLanguageDetails from './prompt.js';
+import promptForLanguageDetails, {PROJECT_LANGUAGE_PROMPT_ID} from './prompt.js';
 
 vi.mock('@form8ion/overridable-prompts');
 
 describe('language prompt', () => {
-  afterEach(() => {
-    vi.clearAllMocks();
-  });
-
   it('should prompt for the language details', async () => {
+    const prompt = vi.fn();
     const answers = any.simpleObject();
-    const decisions = any.simpleObject();
     const languages = any.simpleObject();
-    when(prompt).calledWith([{
-      name: questionNames.PROJECT_LANGUAGE,
-      type: 'list',
-      message: 'What type of project is this?',
-      choices: [...Object.keys(languages), 'Other']
-    }], decisions).thenResolve(answers);
+    when(prompt).calledWith({
+      id: PROJECT_LANGUAGE_PROMPT_ID,
+      questions: [{
+        name: questionNames.PROJECT_LANGUAGE,
+        type: 'list',
+        message: 'What type of project is this?',
+        choices: [...Object.keys(languages), 'Other']
+      }]
+    }).thenResolve(answers);
 
-    expect(await promptForLanguageDetails(languages, decisions)).toEqual(answers);
+    expect(await promptForLanguageDetails(languages, {prompt})).toEqual(answers);
   });
 });

package/src/language/scaffolder.js

@@ -1,8 +1,8 @@
 import {questionNames} from '../prompts/question-names.js';
 import promptForLanguageDetails from './prompt.js';
 
-export default async function (languagePlugins, decisions, options) {
-  const {[questionNames.PROJECT_LANGUAGE]: chosenLanguage} = await promptForLanguageDetails(languagePlugins, decisions);
+export default async function (languagePlugins, options, {prompt}) {
+  const {[questionNames.PROJECT_LANGUAGE]: chosenLanguage} = await promptForLanguageDetails(languagePlugins, {prompt});
 
   const plugin = languagePlugins[chosenLanguage];
 

package/src/language/scaffolder.test.js

@@ -13,15 +13,15 @@ describe('language scaffolder', () => {
     const options = any.simpleObject();
     const chosenLanguage = any.word();
     const scaffolderResult = any.simpleObject();
-    const decisions = any.simpleObject();
+    const prompt = () => undefined;
     const chosenLanguageScaffolder = vi.fn();
     const plugins = {...any.simpleObject(), [chosenLanguage]: {scaffold: chosenLanguageScaffolder}};
     when(languagePrompt.default)
-      .calledWith(plugins, decisions)
+      .calledWith(plugins, {prompt})
       .thenResolve({[questionNames.PROJECT_LANGUAGE]: chosenLanguage});
     when(chosenLanguageScaffolder).calledWith(options).thenResolve(scaffolderResult);
 
-    expect(await scaffold(plugins, decisions, options)).toEqual(scaffolderResult);
+    expect(await scaffold(plugins, options, {prompt})).toEqual(scaffolderResult);
   });
 
   it('should not result in an error when choosing a language without a defined scaffolder', async () => {

package/src/license/scaffolder.js

@@ -3,11 +3,10 @@ import wrap from 'word-wrap';
 import mustache from 'mustache';
 // eslint-disable-next-line import/extensions
 import spdxLicenseList from 'spdx-license-list/full.js';
-import {info} from '@travi/cli-messages';
 
-export default async function ({projectRoot, license, copyright}) {
+export default async function scaffoldLicense({projectRoot, license, copyright}, {logger}) {
   if (license) {
-    info('Generating License');
+    logger.info('Generating License');
 
     const licenseContent = spdxLicenseList[license].licenseText;
 

package/src/license/scaffolder.test.js

@@ -3,7 +3,7 @@ import wrap from 'word-wrap';
 import spdxLicenseListWithContent from 'spdx-license-list/full';
 import spdxLicenseList from 'spdx-license-list/simple';
 
-import {afterEach, describe, expect, it, vi} from 'vitest';
+import {describe, expect, it, vi} from 'vitest';
 import any from '@travi/any';
 
 import scaffoldLicense from './scaffolder.js';
@@ -16,19 +16,16 @@ describe('license', () => {
   const copyrightHolders = any.sentence();
   const copyright = {year, holder: copyrightHolders};
   const projectRoot = any.string();
-
-  afterEach(() => {
-    vi.clearAllMocks();
-  });
+  const logger = {info: () => {}};
 
   it('should not generate a license file when no license was chosen', async () => {
-    await scaffoldLicense({});
+    await scaffoldLicense({}, {logger});
 
     expect(fs.writeFile).not.toHaveBeenCalled();
   });
 
   it('should write the contents for the chosen license to LICENSE', async () => {
-    expect(await scaffoldLicense({projectRoot, license, copyright, vcs: {}})).toEqual({});
+    expect(await scaffoldLicense({projectRoot, license, copyright, vcs: {}}, {logger})).toEqual({});
 
     expect(fs.writeFile).toHaveBeenCalledWith(
       `${projectRoot}/LICENSE`,
@@ -43,7 +40,7 @@ describe('license', () => {
   });
 
   it('should write the common version of the MIT license to LICENSE, when chosen', async () => {
-    expect(await scaffoldLicense({projectRoot, license: 'MIT', copyright, vcs: {}})).toEqual({});
+    expect(await scaffoldLicense({projectRoot, license: 'MIT', copyright, vcs: {}}, {logger})).toEqual({});
 
     expect(fs.writeFile).toHaveBeenCalledWith(
       `${projectRoot}/LICENSE`,

package/src/lift.js

@@ -4,7 +4,7 @@ import * as gitPlugin from '@form8ion/git';
 
 import * as licensePlugin from './license/index.js';
 
-export default async function ({projectRoot, results, enhancers, vcs, dependencies}) {
+export default async function lift({projectRoot, results, enhancers, vcs, dependencies}) {
   const enhancerResults = await applyEnhancers({
     results,
     enhancers: {...enhancers, gitPlugin, licensePlugin},

package/src/options-validator.js

@@ -4,11 +4,9 @@ import joi from 'joi';
 import languagePluginsSchema from './language/schema.js';
 import vcsHostPluginsSchema from './vcs/host/schema.js';
 import dependencyUpdaterPluginsSchema from './dependency-updater/schema.js';
-import {decisionsSchema} from './options-schemas.js';
 
 export function validate(options) {
   return validateOptions(joi.object({
-    decisions: decisionsSchema,
     plugins: joi.object({
       dependencyUpdaters: dependencyUpdaterPluginsSchema,
       languages: languagePluginsSchema,

package/src/options-validator.test.js

@@ -6,7 +6,6 @@ import any from '@travi/any';
 import {when} from 'vitest-when';
 
 import languagePluginsSchema from './language/schema.js';
-import {decisionsSchema} from './options-schemas.js';
 import vcsHostPluginsSchema from './vcs/host/schema.js';
 import dependencyUpdaterPluginsSchema from './dependency-updater/schema.js';
 import {validate} from './options-validator.js';
@@ -39,10 +38,7 @@ describe('options validator', () => {
         vcsHosts: vcsHostPluginsSchema
       })
       .thenReturn(pluginsSchema);
-    when(joi.object).calledWith({
-      decisions: decisionsSchema,
-      plugins: pluginsSchema
-    }).thenReturn(fullSchema);
+    when(joi.object).calledWith({plugins: pluginsSchema}).thenReturn(fullSchema);
     when(core.validateOptions).calledWith(fullSchema, options).thenReturn(validatedOptions);
 
     expect(validate(options)).toEqual(validatedOptions);

package/src/prompts/index.js

@@ -0,0 +1,21 @@
+import {questionNames as coreQuestionNames} from '@form8ion/core';
+
+import {BASE_DETAILS_PROMPT_ID} from './questions.js';
+import {GIT_REPOSITORY_PROMPT_ID} from '../vcs/prompt.js';
+import {PROJECT_LANGUAGE_PROMPT_ID} from '../language/prompt.js';
+import {REPOSITORY_HOST_PROMPT_ID} from '../vcs/host/prompt.js';
+import {DEPENDENCY_UPDATER_PROMPT_ID} from '../dependency-updater/prompt.js';
+import {questionNames as projectScaffolderQuestionNames} from './question-names.js';
+
+export const ids = {
+  BASE_DETAILS: BASE_DETAILS_PROMPT_ID,
+  GIT_REPOSITORY: GIT_REPOSITORY_PROMPT_ID,
+  REPOSITORY_HOST: REPOSITORY_HOST_PROMPT_ID,
+  PROJECT_LANGUAGE: PROJECT_LANGUAGE_PROMPT_ID,
+  DEPENDENCY_UPDATER: DEPENDENCY_UPDATER_PROMPT_ID
+};
+
+export const questionNames = {
+  ...coreQuestionNames,
+  ...projectScaffolderQuestionNames
+};

package/src/prompts/questions.js

@@ -1,6 +1,10 @@
 import {questionsForBaseDetails} from '@form8ion/core';
-import {prompt} from '@form8ion/overridable-prompts';
 
-export function promptForBaseDetails(projectRoot, decisions) {
-  return prompt(questionsForBaseDetails(decisions, projectRoot), decisions);
+export const BASE_DETAILS_PROMPT_ID = 'BASE_DETAILS';
+
+export function promptForBaseDetails(projectRoot, {prompt}) {
+  return prompt({
+    id: BASE_DETAILS_PROMPT_ID,
+    questions: questionsForBaseDetails(projectRoot)
+  });
 }

package/src/prompts/questions.test.js

@@ -1,11 +1,10 @@
 import * as core from '@form8ion/core';
-import * as prompts from '@form8ion/overridable-prompts';
 
 import {describe, expect, it, vi} from 'vitest';
 import any from '@travi/any';
 import {when} from 'vitest-when';
 
-import {promptForBaseDetails} from './questions.js';
+import {promptForBaseDetails, BASE_DETAILS_PROMPT_ID} from './questions.js';
 
 vi.mock('@form8ion/core');
 vi.mock('@form8ion/overridable-prompts');
@@ -13,13 +12,13 @@ vi.mock('@form8ion/overridable-prompts');
 describe('base details prompt', () => {
   const projectPath = any.string();
   const answers = any.simpleObject();
-  const decisions = any.simpleObject();
   const questions = any.listOf(any.simpleObject);
+  const prompt = vi.fn();
 
   it('should prompt for the necessary details', async () => {
-    when(core.questionsForBaseDetails).calledWith(decisions, projectPath).thenReturn(questions);
-    when(prompts.prompt).calledWith(questions, decisions).thenResolve(answers);
+    when(core.questionsForBaseDetails).calledWith(projectPath).thenReturn(questions);
+    when(prompt).calledWith({id: BASE_DETAILS_PROMPT_ID, questions}).thenResolve(answers);
 
-    expect(await promptForBaseDetails(projectPath, decisions)).toEqual(answers);
+    expect(await promptForBaseDetails(projectPath, {prompt})).toEqual(answers);
   });
 });

package/src/scaffolder.js

@@ -1,9 +1,7 @@
 import deepmerge from 'deepmerge';
 import {execa} from 'execa';
 import {questionNames as coreQuestionNames} from '@form8ion/core';
-import {reportResults} from '@form8ion/results-reporter';
 import {scaffold as scaffoldReadme} from '@form8ion/readme';
-import {info} from '@travi/cli-messages';
 
 import {scaffold as scaffoldLanguage} from './language/index.js';
 import {scaffold as scaffoldVcs} from './vcs/index.js';
@@ -15,9 +13,9 @@ import {scaffold as scaffoldEditorConfig} from './editorconfig/index.js';
 import {scaffold as scaffoldContributing} from './contributing/index.js';
 import lift from './lift.js';
 
-export async function scaffold(options) {
+export async function scaffold(options, {prompt, logger}) {
   const projectRoot = process.cwd();
-  const {decisions, plugins: {dependencyUpdaters, languages, vcsHosts = {}}} = validate(options);
+  const {plugins: {dependencyUpdaters, languages, vcsHosts = {}}} = validate(options);
 
   const {
     [coreQuestionNames.PROJECT_NAME]: projectName,
@@ -26,27 +24,27 @@ export async function scaffold(options) {
     [coreQuestionNames.DESCRIPTION]: description,
     [coreQuestionNames.COPYRIGHT_YEAR]: copyrightYear,
     [coreQuestionNames.COPYRIGHT_HOLDER]: copyHolder
-  } = await promptForBaseDetails(projectRoot, decisions);
+  } = await promptForBaseDetails(projectRoot, {prompt});
   const copyright = {year: copyrightYear, holder: copyHolder};
 
   const [vcsResults, contributing, license] = await Promise.all([
-    scaffoldVcs({projectRoot, projectName, decisions, vcsHosts, visibility, description}),
+    scaffoldVcs({projectRoot, projectName, vcsHosts, visibility, description}, {prompt, logger}),
     scaffoldContributing({visibility}),
-    scaffoldLicense({projectRoot, license: chosenLicense, copyright}),
+    scaffoldLicense({projectRoot, license: chosenLicense, copyright}, {logger}),
     scaffoldReadme({projectName, projectRoot, description}),
     scaffoldEditorConfig({projectRoot})
   ]);
 
   const dependencyUpdaterResults = vcsResults.vcs && await scaffoldDependencyUpdater(
     dependencyUpdaters,
-    decisions,
-    {projectRoot, vcs: vcsResults.vcs}
+    {projectRoot},
+    {prompt}
   );
 
   const language = await scaffoldLanguage(
     languages,
-    decisions,
-    {projectRoot, projectName, vcs: vcsResults.vcs, visibility, license: chosenLicense || 'UNLICENSED', description}
+    {projectRoot, projectName, vcs: vcsResults.vcs, visibility, license: chosenLicense || 'UNLICENSED', description},
+    {prompt}
   );
 
   const mergedResults = deepmerge.all([
@@ -65,12 +63,12 @@ export async function scaffold(options) {
   });
 
   if (language && language.verificationCommand) {
-    info('Verifying the generated project');
+    logger.info('Verifying the generated project');
 
     const subprocess = execa(language.verificationCommand, {shell: true});
     subprocess.stdout.pipe(process.stdout);
     await subprocess;
   }
 
-  reportResults(mergedResults);
+  return mergedResults;
 }