diff --git a/packages/scripts/src/bin/init.ts b/packages/scripts/src/bin/bootstrap.ts similarity index 94% rename from packages/scripts/src/bin/init.ts rename to packages/scripts/src/bin/bootstrap.ts index 9093d368b..d94b8bc86 100644 --- a/packages/scripts/src/bin/init.ts +++ b/packages/scripts/src/bin/bootstrap.ts @@ -5,10 +5,10 @@ import path from 'path'; import PrettyError from 'pretty-error'; import { ProgramOptions } from '.'; -import { Init } from '../scripts/Init'; +import { Bootstrap } from '../scripts/Bootstrap'; import { bulletSymbol, endBootstrapInfo, isYarn, resolveCWD } from './utils'; -export async function init( +export async function bootstrap( options: ProgramOptions | undefined, version: string ): Promise { @@ -22,7 +22,7 @@ export async function init( )}` ); try { - const initiator = new Init(cwd, version); + const initiator = new Bootstrap(cwd, version); try { const done = await initiator.bootstrap(); @@ -79,7 +79,6 @@ export async function init( ); } } catch (e) { - console.log(pe.render(e)); console.log( `${logSymbols.error} configuration files are already present.` ); diff --git a/packages/scripts/src/bin/index.ts b/packages/scripts/src/bin/index.ts index abc72a017..43489aa14 100644 --- a/packages/scripts/src/bin/index.ts +++ b/packages/scripts/src/bin/index.ts @@ -4,8 +4,8 @@ import program from 'commander'; import path from 'path'; import clearConsole from 'react-dev-utils/clearConsole'; import updateNotifier from 'update-notifier'; +import { bootstrap } from './bootstrap'; import { build } from './build'; -import { init } from './init'; import { serve } from './serve'; import { bulletSymbol, contextHelp, printIntro } from './utils'; @@ -45,7 +45,7 @@ program.on('--help', () => { console.log(chalk.cyan.bold('Bootstrap/Onboarding:')); console.log(`If you are just starting out with wpackio-scripts, then run - ${bulletSymbol} ${chalk.yellow('npx @wpack/scripts wpackio-scripts init')} + ${bulletSymbol} ${chalk.yellow('npx @wpackio/scripts bootstrap')} If you already have the project config file and would like to configure local server for this machine, then run @@ -104,7 +104,7 @@ program .option('-c, --context', contextHelp) .action((options: ProgramOptions | undefined) => { isValidCommand = true; - init(options, pkg.version); + bootstrap(options, pkg.version); }); // Output our fancy stuff first diff --git a/packages/scripts/src/scripts/Init.ts b/packages/scripts/src/scripts/Bootstrap.ts similarity index 98% rename from packages/scripts/src/scripts/Init.ts rename to packages/scripts/src/scripts/Bootstrap.ts index 6eb206f67..36063209d 100644 --- a/packages/scripts/src/scripts/Init.ts +++ b/packages/scripts/src/scripts/Bootstrap.ts @@ -56,7 +56,7 @@ class InitResolve { } } -export class Init { +export class Bootstrap { private cwd: string; private projectConfigPath: string; private serverConfigPath: string; @@ -89,7 +89,9 @@ export class Init { // If project config is present, then just configure the server if (this.isConfigPresent('server')) { // Server is also present, so just bail - return Promise.reject(); + return Promise.reject( + new Error('project is already bootstrapped.') + ); } else { // Configure the server const serverContext = await this.initServerConfig(); @@ -259,7 +261,7 @@ export class Init { const scripts: { [x: string]: string } = { build: 'wpackio-scripts build', start: 'wpackio-scripts start', - bootstrap: 'wpackio-scripts init', + bootstrap: 'wpackio-scripts bootstrap', }; if (!packageFileData.scripts) { packageFileData.scripts = {};