Merge branch 'master' into webpack-cleanup/remove-webpack-deps

.eslintrc.js

@@ -54,7 +54,7 @@ module.exports = {
 		}],
 		"no-console": "off",
 		"valid-jsdoc": "error",
-		"node/no-unsupported-features": ["error", { "version": 4 }],
+		"node/no-unsupported-features": ["error", { "version": 6 }],
 		"node/no-deprecated-api": "error",
 		"node/no-missing-import": "error",
 		"node/no-missing-require": [

.gitignore

@@ -1,5 +1,6 @@
 # IDE folders
 .idea
+.vscode
 
 # Mac OS X Finder
 .DS_Store

bin/convert-argv.js

@@ -3,7 +3,8 @@ var fs = require("fs");
 fs.existsSync = fs.existsSync || path.existsSync;
 var interpret = require("interpret");
 var prepareOptions = require("./prepareOptions");
-module.exports = function(yargs, argv, convertOptions) {
+module.exports = function(...args) {
+	var argv = args[1] || args[0];
 	var options = [];
 	// Shortcuts
 	if (argv.d) {

bin/process-options.js

@@ -9,7 +9,7 @@ module.exports = function processOptions(yargs, argv) {
 			fn(argv[name], -1);
 		}
 	}
-	var options = require("./convert-argv")(yargs, argv);
+	var options = require("./convert-argv")(argv);
 
 	if (typeof options.then === "function") {
 		options.then(processOptions).catch(function(err) {

bin/webpack.js

@@ -221,7 +221,7 @@
 		}
 
 		try {
-			var options = require("./convert-argv")(yargs, argv);
+			var options = require("./convert-argv")(argv);
 		} catch (err) {
 			if (err.name !== "ValidationError") {
 				throw err;