Merge pull request webpack#3212 from webpack/fix-version-cli

sokra · web-flow · commit 37aa9a64a39d · 2016-10-31T13:43:10.000+01:00
Fix using --version and -v
diff --git a/bin/config-yargs.js b/bin/config-yargs.js
@@ -10,6 +10,8 @@ module.exports = function(yargs) {
 	yargs
 		.help("help")
 		.alias("help", "h", "?")
+		.version()
+		.alias("version", "v")
 		.options({
 			"config": {
 				type: "string",
@@ -22,12 +24,6 @@ module.exports = function(yargs) {
 				describe: "Enviroment passed to the config, when it is a function",
 				group: CONFIG_GROUP
 			},
-			"version": {
-				type: "string",
-				describe: "Webpack version",
-				alias: "v",
-				group: BASIC_GROUP,
-			},
 			"context": {
 				type: "string",
 				describe: "The root directory for resolving entry point and stats",
diff --git a/bin/convert-argv.js b/bin/convert-argv.js
@@ -6,22 +6,10 @@ var interpret = require("interpret");
 var WebpackOptionsDefaulter = require("../lib/WebpackOptionsDefaulter");
 var validateWebpackOptions = require("../lib/validateWebpackOptions");
 
-module.exports = function(optimist, argv, convertOptions) {
+module.exports = function(yargs, argv, convertOptions) {
 
 	var options = [];
 
-	// Help
-	if(argv.help) {
-		optimist.showHelp();
-		process.exit(0); // eslint-disable-line
-	}
-
-	// Version
-	if(argv.v || argv.version) {
-		console.log(require("../package.json").version);
-		process.exit(0); // eslint-disable-line
-	}
-
 	// Shortcuts
 	if(argv.d) {
 		argv.debug = true;
