From 40148080df999bc06ad0430acd5e62e84846023f Mon Sep 17 00:00:00 2001 From: James George Date: Mon, 21 Sep 2020 18:08:32 +0530 Subject: [PATCH] refactor: migrate to async/await (#1813) --- packages/migrate/src/index.ts | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/packages/migrate/src/index.ts b/packages/migrate/src/index.ts index ad89cb78a1c..f6cbe5a4325 100644 --- a/packages/migrate/src/index.ts +++ b/packages/migrate/src/index.ts @@ -171,38 +171,37 @@ function runMigration(currentConfigPath: string, outputConfigPath: string): Prom * function. */ -export default function migrate(...args: string[]): void | Promise { +export default async function migrate(...args: string[]): Promise { const filePaths = args; if (!filePaths.length) { logger.error('\n ✖ Please specify a path to your webpack config\n'); return; } - const currentConfigPath = path.resolve(process.cwd(), filePaths[0]); + const currentConfigPath = path.resolve(filePaths[0]); let outputConfigPath: string; if (!filePaths[1]) { - return inquirer - .prompt([ + try { + const { confirmPath } = await inquirer.prompt([ { default: 'Y', - message: 'Migration output path not specified. ' + 'Do you want to use your existing webpack ' + 'configuration?', + message: 'Migration output path not specified. Do you want to use your existing webpack configuration?', name: 'confirmPath', type: 'confirm', }, - ]) - .then((ans: { confirmPath: boolean }): void | Promise => { - if (!ans.confirmPath) { - logger.error('✖ ︎Migration aborted due to no output path'); - return; - } - outputConfigPath = path.resolve(process.cwd(), filePaths[0]); - return runMigration(currentConfigPath, outputConfigPath); - }) - .catch((err: object): void => { - logger.error(err); - }); + ]); + if (!confirmPath) { + logger.error('✖ ︎Migration aborted due to no output path'); + return; + } + outputConfigPath = path.resolve(filePaths[0]); + return runMigration(currentConfigPath, outputConfigPath); + } catch (err) { + logger.error(err); + return; + } } - outputConfigPath = path.resolve(process.cwd(), filePaths[1]); + outputConfigPath = path.resolve(filePaths[1]); return runMigration(currentConfigPath, outputConfigPath); }