From a46edbb10e443a0e256038212d4f44042c8e1dc2 Mon Sep 17 00:00:00 2001 From: Andrey Okonetchnikov Date: Wed, 22 Feb 2017 20:32:54 +0100 Subject: [PATCH] fix: Use real paths from argvs instead of dummy hard-coded file (#65) --- bin/webpack.js | 10 +++++++--- lib/migrate.js | 8 ++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/bin/webpack.js b/bin/webpack.js index e20aa9a9e9c..eddebcb3998 100755 --- a/bin/webpack.js +++ b/bin/webpack.js @@ -162,9 +162,13 @@ var initInquirer = require('../lib/initialize'); if(argv.init) { initInquirer(argv._); } else if(argv.migrate) { - const dummyConfigLoc = require.resolve(path.join(process.cwd(), 'example/webpack.config.js')); - const outputConfigLoc = path.join(process.cwd(), 'example/neo-webpack.config.js'); - require('../lib/migrate.js')(dummyConfigLoc, outputConfigLoc); + const filePaths = argv._; + if (!filePaths.length) { + throw new Error('Please specify a path to your webpack config'); + } + const inputConfigPath = path.resolve(process.cwd(), filePaths[0]); + + require('../lib/migrate.js')(inputConfigPath, inputConfigPath); } else { processOptions(yargs,argv); } diff --git a/lib/migrate.js b/lib/migrate.js index 953ece40967..1fefff503a8 100644 --- a/lib/migrate.js +++ b/lib/migrate.js @@ -4,8 +4,8 @@ const chalk = require('chalk'); const transform = require('./transformations').transform; const inquirer = require('inquirer'); -module.exports = (currentConfigLoc, outputConfigLoc) => { - let currentConfig = fs.readFileSync(currentConfigLoc, 'utf8'); +module.exports = (currentConfigPath, outputConfigPath) => { + let currentConfig = fs.readFileSync(currentConfigPath, 'utf8'); const outputConfig = transform(currentConfig); const diffOutput = diff.diffLines(currentConfig, outputConfig); diffOutput.map(diffLine => { @@ -27,8 +27,8 @@ module.exports = (currentConfigLoc, outputConfigLoc) => { .then(answers => { if (answers['confirmMigration']) { // TODO validate the config - fs.writeFileSync(outputConfigLoc, outputConfig, 'utf8'); - process.stdout.write(chalk.green(`Congratulations! Your new webpack v2 config file is at ${outputConfigLoc}`)); + fs.writeFileSync(outputConfigPath, outputConfig, 'utf8'); + process.stdout.write(chalk.green(`Congratulations! Your new webpack v2 config file is at ${outputConfigPath}`)); } else { process.stdout.write(chalk.yellow('Migration aborted')); }