tests: add tests for version, improve conventions (#1026)

* tests: add tests for version

* tests: clean up tests

Author: evenstensberg

.cz-config.js

@@ -26,6 +26,6 @@ module.exports = {
 		{ value: "feat", name: "feat:		A new feature" },
 		{ value: "fix", name: "fix:		Bugs, typos, etc" },
 		{ value: "misc", name: "misc:		Other formats like tweaks and such" },
-		{ value: "tests", name: "tests:	Tests, jest, binTestCases, etc" },
+		{ value: "tests", name: "tests:	Tests, jest, etc" },
 	]
 };

lib/bootstrap.js

@@ -4,8 +4,7 @@ const cmdArgs = require('command-line-args');
 
 require('./utils/process-log');
 
-const isHelpFlagPresent = args => args.find(arg => ['help', '--help'].indexOf(arg) !== -1);
-
+const isFlagPresent = (args, flag) => args.find(arg => [flag, `--${flag}`].includes(arg));
 const normalizeFlags = (args, command) => args.slice(2).filter(arg => arg.indexOf('--') < 0 && arg !== command.name && arg !== command.alias);
 
 const isCommandUsed = commands =>
@@ -15,9 +14,16 @@ const isCommandUsed = commands =>
 
 async function runCLI(cli, commandIsUsed) {
     let args;
-    const helpFlagExists = isHelpFlagPresent(process.argv);
+    const helpFlagExists = isFlagPresent(process.argv, 'help');
+    const versionFlagExists = isFlagPresent(process.argv, 'version');
+
     if (helpFlagExists) {
-        await cli.runHelp();
+        cli.runHelp();
+        return;
+    }
+
+    else if(versionFlagExists) {
+        cli.runVersion();
         return;
     }
 

lib/groups/help.js

@@ -13,6 +13,13 @@ class HelpGroup {
         process.stdout.write('\n                  Made with ♥️  by the webpack team \n');
     }
 
+    outputVersion() {
+        const pkgLock = require('../../package.json');
+        const webpack = require('webpack');
+        process.stdout.write(`\nwebpack-cli ${pkgLock.version}`);
+        process.stdout.write(`\nwebpack ${webpack.version}\n`);
+    }
+
     run() {
         const b = s => chalk.blue(s);
         const l = s => chalk.white(s);

lib/utils/compiler.js

@@ -12,10 +12,6 @@ function showEmojiConditionally(emoji) {
 }
 
 function generateOutput(outputOptions, stats, statsErrors) {
-    if (outputOptions.version) {
-        console.log(`  🌏 webpack v.${webpack.version}`);
-        process.exit(0);
-    }
     const statsObj = stats.toJson(outputOptions);
     const { assets, entrypoints, time, builtAt, warnings, outputPath } = statsObj;
 

lib/webpack-cli.js

@@ -107,10 +107,17 @@ class webpackCLI extends GroupHelper {
         }
         return require('./commands/external').run(command.name, ...args);
     }
-    async runHelp() {
+
+    runHelp() {
         const HelpGroup = require('./groups/help');
         return new HelpGroup().outputHelp();
     }
+
+    runVersion() {
+        const HelpGroup = require('./groups/help');
+        return new HelpGroup().outputVersion();
+    }
+
 }
 
 module.exports = webpackCLI;