Merge branch 'docs/contributing-formatting' of https://github.com/mis…

…terdev/webpack-cli into docs/contributing-formatting

.travis.yml

@@ -31,12 +31,11 @@ before_install:
     - "[[ $(node -v) =~ ^v9.*$ ]] || npm install -g npm@latest" # skipped when using node 9
 
 install:
-  - travis_wait npm ci
-  - lerna bootstrap
-  - npm install -g codecov
-  - npm install -g eslint
+    - travis_wait npm ci
+    - lerna bootstrap
+    - npm install -g codecov
+    - npm install -g eslint
+script:
+    - npm run travis:lint
+    - npm run test:ci
 
-jobs:
-    include:
-        - stage: commit lint
-          script: commitlint-travis

README.md

@@ -3,6 +3,9 @@
 		<img width="200" height="200" src="https://webpack.js.org/assets/icon-square-big.svg">
 	</a>
 </div>
+
+<h1 align="center">webpack CLI</h1>
+
 <p align="center">
   The official CLI of webpack
 </p>
@@ -15,8 +18,8 @@
 [![Code Climate](https://codeclimate.com/github/webpack/webpack-cli/badges/gpa.svg)](https://codeclimate.com/github/webpack/webpack-cli)
 [![chat on gitter](https://badges.gitter.im/webpack/webpack.svg)](https://gitter.im/webpack/webpack)
 [![Install Size](https://packagephobia.now.sh/badge?p=webpack-cli)](https://packagephobia.now.sh/result?p=webpack-cli)
+[![npm](https://img.shields.io/npm/dw/webpack-cli.svg)](https://www.npmjs.com/package/webpack-cli)
 
-# webpack CLI
 
 * [About](#about)
   - [How to install](#how-to-install)
@@ -68,7 +71,7 @@ You can read more about [Scaffolding](./SCAFFOLDING.md) or check out the example
 
 ## Contributing and Internal Documentation
 
-The webpack family welcomes any contributor, small or big. We are happy to elaborate, guide you through the source code and find issues you might want to work on! To get started have a look at our [documentation on contributing](CONTRIBUTING.md).
+The webpack family welcomes any contributor, small or big. We are happy to elaborate, guide you through the source code and find issues you might want to work on! To get started have a look at our [documentation on contributing](./.github/CONTRIBUTING.md).
 
 [deps]: https://img.shields.io/david/webpack/webpack.svg
-[deps-url]: https://david-dm.org/webpack/webpack-cli
+[deps-url]: https://david-dm.org/webpack/webpack-cli

bin/cli.js

@@ -251,7 +251,7 @@ For more information, see https://webpack.js.org/api/cli/.`);
 		const stdout = argv.silent
 			? {
 				write: () => {}
-			  } // eslint-disable-line
+				} // eslint-disable-line
 			: process.stdout;
 
 		function ifArg(name, fn, init) {
@@ -488,13 +488,18 @@ For more information, see https://webpack.js.org/api/cli/.`);
 				}
 				compiler.watch(watchOptions, compilerCallback);
 				if (outputOptions.infoVerbosity !== "none") console.error("\nwebpack is watching the files…\n");
-				if (compiler.close) compiler.close(compilerCallback);
 			} else {
-				compiler.run(compilerCallback);
-				if (compiler.close) compiler.close(compilerCallback);
+				compiler.run((err, stats) => {
+					if (compiler.close) {
+						compiler.close(err2 => {
+							compilerCallback(err || err2, stats);
+						});
+					} else {
+						compilerCallback(err, stats);
+					}
+				});
 			}
 		}
-
 		processOptions(options);
 	});
 })();