Merge pull request #630 from manu-chroma/init_fix

feat: install init as global dep
webpack · Nov 4, 2018 · d8a121a · d8a121a
2 parents 4b9df8d + 1261e67
commit d8a121a
Show file tree

Hide file tree

Showing 3 changed files with 2,700 additions and 1,581 deletions.
diff --git a/bin/prompt-command.js b/bin/prompt-command.js
@@ -34,8 +34,20 @@ module.exports = function promptForInstallation(packages, ...args) {
 	let pathForCmd;
 	try {
 		const path = require("path");
-		pathForCmd = path.resolve(process.cwd(), "node_modules", "@webpack-cli", packages);
-		require.resolve(pathForCmd);
+		const fs = require("fs");
+		pathForCmd = path.resolve(
+			process.cwd(),
+			"node_modules",
+			"@webpack-cli",
+			packages
+		);
+		if (!fs.existsSync(pathForCmd)) {
+			const globalModules = require("global-modules");
+			pathForCmd = globalModules + "/@webpack-cli/" + packages;
+			require.resolve(pathForCmd);
+		} else {
+			require.resolve(pathForCmd);
+		}
 		packageIsInstalled = true;
 	} catch (err) {
 		packageIsInstalled = false;
@@ -53,6 +65,15 @@ module.exports = function promptForInstallation(packages, ...args) {
 			options[0] = "add";
 		}
 
+		if (packages === "init") {
+			if (isYarn) {
+				options.splice(1, 1); // remove '-D'
+				options.splice(0, 0, "global");
+			} else {
+				options[1] = "-g";
+			}
+		}
+
 		const commandToBeRun = `${packageManager} ${options.join(" ")}`;
 
 		const question = `Would you like to install ${packages}? (That will run ${commandToBeRun}) (yes/NO)`;