small refactor over calls

Refactor back to resolve.request

Add installation if webpack-cli is not present

bin/webpack.js

@@ -1,13 +1,19 @@
-const {exec} = require('child_process');
+#!/usr/bin/env node
 
+const {
+	exec
+} = require("child_process");
+const inquirer = require("inquirer");
 
 function runCommand(command) {
-	exec(command, (err, data) => {
+	exec(command, (error, stdout, stderr) => {
-		if(data) {
+		if(!error) {
-			console.log(data);
+			console.log("webpack-cli installed successfully");
-		} else {
+			return true;
-			console.log(err);
 		}
+		console.log("failed to install webpack-cli");
+		console.error(stderr);
+		return false;
 	});
 }
 
@@ -15,43 +21,39 @@ let webpackCliInstalled = false;
 try {
 	require.resolve("webpack-cli");
 	webpackCliInstalled = true;
-} catch (e) {
+} catch(err) {
 	webpackCliInstalled = false;
 }
 
-if (webpackCliInstalled) {
+if(!webpackCliInstalled) {
-	require("webpack-cli"); // eslint-disable-line node/no-missing-require, node/no-extraneous-require, node/no-unpublished-require
+	const path = require("path");
-} else {
+	const fs = require("fs");
-	const path = require('path');
+	const isYarn = fs.existsSync(path.resolve(process.cwd(), "yarn.lock"));
-	const fs = require('fs');
+
-	const isYarn = fs.existsSync(path.resolve(process.cwd(), 'yarn.lock'));
-	const {prompt} = require('inquirer');
 	let command;
-	
+
-	
+	if(isYarn) {
-	const question = {
+		command = "yarn add -D webpack-cli";
-		type: 'confirm',
+	} else {
-		name: 'shouldInstall',
+		command = "npm install --save-dev webpack-cli";
-		message: 'Would you like to install webpack-cli?',
-		default: true
 	}
 
-	if(isYarn){
+	const question = {
-		command = 'yarn add webpack-cli -D';
+		type: "confirm",
-	}else{
+		name: "shouldInstall",
-		command = 'npm install --save-dev webpack-cli';
+		message: "Would you like to install webpack-cli?",
-	}
+		default: true
-	
+	};
-	console.error("The CLI moved into a separate package: webpack-cli.");
+
-	prompt(question).then((anwswer) => {
+	console.error("The CLI moved into a separate package: webpack-cli");
-		if(answer){
+	inquirer.prompt(question).then((answer) => {
-			console.error('Installing webpack-cli')
+		if(answer) {
-			runCommand(command);
+			console.error("Installing webpack-cli");
+			if(runCommand(command)) {
+				require("webpack-cli"); // eslint-disable-line node/no-missing-require, node/no-extraneous-require, node/no-unpublished-require
+			}
 		}
-	})
+	});
-	
+} else {
-	console.error("Please install 'webpack-cli' in addition to webpack itself to use the CLI.");
+	require("webpack-cli"); // eslint-disable-line node/no-missing-require, node/no-extraneous-require, node/no-unpublished-require
-	console.error("-> When using npm: npm install webpack-cli -D");
-	console.error("-> When using yarn: yarn add webpack-cli -D");
-	process.exitCode = 1;
 }

package.json

@@ -12,6 +12,7 @@
     "chrome-trace-event": "^0.1.1",
     "enhanced-resolve": "^4.0.0",
     "eslint-scope": "^3.7.1",
+    "inquirer": "5.1.0",
     "loader-runner": "^2.3.0",
     "loader-utils": "^1.1.0",
     "memory-fs": "~0.4.1",
@@ -41,7 +42,6 @@
     "file-loader": "^1.1.6",
     "glob": "^7.1.2",
     "i18n-webpack-plugin": "^1.0.0",
-    "inquire": "^0.4.8",
     "istanbul": "^0.4.5",
     "jade": "^1.11.0",
     "jade-loader": "~0.8.0",

yarn.lock

@@ -1438,7 +1438,7 @@ extend@~3.0.0, extend@~3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
 
-external-editor@^2.0.4:
+external-editor@^2.0.4, external-editor@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.1.0.tgz#3d026a21b7f95b5726387d4200ac160d372c3b48"
   dependencies:
@@ -2012,6 +2012,24 @@ ini@~1.3.0:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
 
+inquirer@5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-5.1.0.tgz#19da508931892328abbbdd4c477f1efc65abfd67"
+  dependencies:
+    ansi-escapes "^3.0.0"
+    chalk "^2.0.0"
+    cli-cursor "^2.1.0"
+    cli-width "^2.0.0"
+    external-editor "^2.1.0"
+    figures "^2.0.0"
+    lodash "^4.3.0"
+    mute-stream "0.0.7"
+    run-async "^2.2.0"
+    rxjs "^5.5.2"
+    string-width "^2.1.0"
+    strip-ansi "^4.0.0"
+    through "^2.3.6"
+
 inquirer@^3.0.6:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
@@ -3831,6 +3849,12 @@ rx-lite@*, rx-lite@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
 
+rxjs@^5.5.2:
+  version "5.5.6"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.6.tgz#e31fb96d6fd2ff1fd84bcea8ae9c02d007179c02"
+  dependencies:
+    symbol-observable "1.0.1"
+
 safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
@@ -4296,6 +4320,10 @@ svgo@^0.7.0:
     sax "~1.2.1"
     whet.extend "~0.9.9"
 
+symbol-observable@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4"
+
 table@^4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36"