Skip to content

Commit 1abef28

Browse files
matheus1lvasokra
matheus1lva
authored and
sokra
committed
Replace requirer with node readline
Removing inquirer and updating package.json
1 parent f7af10a commit 1abef28

File tree

3 files changed

+42
-82
lines changed

3 files changed

+42
-82
lines changed

‎bin/webpack.js‎

Lines changed: 41 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
#!/usr/bin/env node
2-
const { exec, execSync } = require("child_process");
3-
const inquirer = require("inquirer");
4-
52
function runCommand(command, options) {
3+
const cp = require("child_process");
64
return new Promise((resolve, reject) => {
75
const executedCommand = cp.spawn(command, options, {
86
stdio: "inherit"
97
});
108

11-
executedCommand.on("error", (error) => {
9+
executedCommand.on("error", error => {
1210
reject(error);
1311
});
1412

15-
executedCommand.on("exit", (code) => {
16-
if(code === 0) {
13+
executedCommand.on("exit", code => {
14+
if (code === 0) {
1715
resolve(true);
1816
} else {
1917
reject();
@@ -23,69 +21,60 @@ function runCommand(command, options) {
2321
}
2422

2523
let webpackCliInstalled = false;
26-
// try {
27-
// const blah = require("webpack-cli"); // eslint-disable-line node/no-missing-require, node/no-extraneous-require, node/no-unpublished-require
28-
// webpackCliInstalled = true;
29-
// } catch(e) {
30-
// console.log("error", e);
31-
// webpackCliInstalled = false;
32-
// }
33-
3424
try {
35-
execSync("node -e require.resolve('webpack-cli')", { stdio: "ignore" });
25+
require.resolve("webpack-cli");
3626
webpackCliInstalled = true;
3727
} catch (err) {
3828
webpackCliInstalled = false;
3929
}
4030

41-
42-
if(webpackCliInstalled) {
43-
require("webpack-cli"); // eslint-disable-line node/no-missing-require, node/no-extraneous-require, node/no-unpublished-require
44-
} else {
31+
if (!webpackCliInstalled) {
4532
const path = require("path");
4633
const fs = require("fs");
34+
const readLine = require("readline");
4735
const isYarn = fs.existsSync(path.resolve(process.cwd(), "yarn.lock"));
48-
let command;
4936

50-
let packageManager;
51-
let options = [];
52-
if(isYarn) {
53-
packageManager = "yarn";
54-
options = ["add", "-D", "webpack-cli"];
55-
} else {
56-
packageManager = "npm";
57-
options = ["install", "--save-dev", "webpack-cli"];
37+
const packageManager = isYarn ? "yarn" : "npm";
38+
const options = ["install", "-D", "webpack-cli"];
39+
40+
if (isYarn) {
41+
options[0] = "add";
5842
}
5943

6044
const commandToBeRun = `${packageManager} ${options.join(" ")}`;
6145

62-
const question = {
63-
type: "confirm",
64-
name: "shouldInstall",
65-
message: `Would you like to install webpack-cli? (That will run ${commandToBeRun})`,
66-
default: true
67-
};
46+
const question = `Would you like to install webpack-cli? (That will run ${commandToBeRun}) `;
6847

69-
if(isYarn) {
70-
command = "yarn add webpack-cli -D";
71-
} else {
72-
command = "npm install --save-dev webpack-cli";
73-
}
74-
75-
console.error("The CLI moved into a separate package: webpack-cli.\n");
76-
inquirer.prompt(question).then((answer) => {
77-
if(answer) {
78-
console.error("Installing webpack-cli");
79-
runCommand(packageManager, options).then((result) => {
80-
require("webpack-cli"); // eslint-disable-line
81-
}).catch((error) => {
82-
console.error(error);
83-
});
84-
} else {
85-
process.exitCode(1);
48+
console.error("The CLI moved into a separate package: webpack-cli");
49+
const questionInterface = readLine.createInterface({
50+
input: process.stdin,
51+
output: process.stdout
52+
});
53+
questionInterface.question(question, answer => {
54+
switch (answer.toLowerCase()) {
55+
case "y":
56+
case "yes":
57+
case "1": {
58+
runCommand(packageManager, options)
59+
.then(result => {
60+
questionInterface.close();
61+
return require("webpack-cli"); //eslint-disable-line
62+
})
63+
.catch(error => {
64+
questionInterface.close();
65+
console.error(error);
66+
});
67+
break;
68+
}
69+
default: {
70+
console.error("The CLI moved into a separate package: webpack-cli");
71+
console.error("It needs to be installed alongside webpack to use the CLI");
72+
process.exitCode = 1;
73+
questionInterface.close();
74+
break;
75+
}
8676
}
8777
});
8878
} else {
8979
require("webpack-cli"); // eslint-disable-line
9080
}
91-

‎package.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
"chrome-trace-event": "^0.1.1",
1313
"enhanced-resolve": "^4.0.0",
1414
"eslint-scope": "^3.7.1",
15-
"inquirer": "5.1.0",
1615
"loader-runner": "^2.3.0",
1716
"loader-utils": "^1.1.0",
1817
"memory-fs": "~0.4.1",

‎yarn.lock‎

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1438,7 +1438,7 @@ extend@~3.0.0, extend@~3.0.1:
14381438
version "3.0.1"
14391439
resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
14401440

1441-
external-editor@^2.0.4, external-editor@^2.1.0:
1441+
external-editor@^2.0.4:
14421442
version "2.1.0"
14431443
resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.1.0.tgz#3d026a21b7f95b5726387d4200ac160d372c3b48"
14441444
dependencies:
@@ -2012,24 +2012,6 @@ ini@~1.3.0:
20122012
version "1.3.4"
20132013
resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
20142014

2015-
inquirer@5.1.0:
2016-
version "5.1.0"
2017-
resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-5.1.0.tgz#19da508931892328abbbdd4c477f1efc65abfd67"
2018-
dependencies:
2019-
ansi-escapes "^3.0.0"
2020-
chalk "^2.0.0"
2021-
cli-cursor "^2.1.0"
2022-
cli-width "^2.0.0"
2023-
external-editor "^2.1.0"
2024-
figures "^2.0.0"
2025-
lodash "^4.3.0"
2026-
mute-stream "0.0.7"
2027-
run-async "^2.2.0"
2028-
rxjs "^5.5.2"
2029-
string-width "^2.1.0"
2030-
strip-ansi "^4.0.0"
2031-
through "^2.3.6"
2032-
20332015
inquirer@^3.0.6:
20342016
version "3.3.0"
20352017
resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
@@ -3849,12 +3831,6 @@ rx-lite@*, rx-lite@^4.0.8:
38493831
version "4.0.8"
38503832
resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
38513833

3852-
rxjs@^5.5.2:
3853-
version "5.5.6"
3854-
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.6.tgz#e31fb96d6fd2ff1fd84bcea8ae9c02d007179c02"
3855-
dependencies:
3856-
symbol-observable "1.0.1"
3857-
38583834
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:
38593835
version "5.1.1"
38603836
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
@@ -4320,10 +4296,6 @@ svgo@^0.7.0:
43204296
sax "~1.2.1"
43214297
whet.extend "~0.9.9"
43224298

4323-
symbol-observable@1.0.1:
4324-
version "1.0.1"
4325-
resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4"
4326-
43274299
table@^4.0.1:
43284300
version "4.0.2"
43294301
resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36"

0 commit comments

Comments
 (0)