Merge pull request #925 from anshumanv/prettier/format

evenstensberg · web-flow · commit 4b08819659f3 · 2019-06-07T12:19:49.000+02:00
chore(format): fix formatting using prettier
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,5 +1,6 @@
 module.exports = {
-	extends: ["eslint:recommended"],
+	extends: ["eslint:recommended", "plugin:prettier/recommended"],
+	plugins: ["prettier"],
 	env: {
 		node: true,
 		es6: true,
diff --git a/bin/cli.js b/bin/cli.js
@@ -106,11 +106,7 @@ For more information, see https://webpack.js.org/api/cli/.`);
 		 * When --silent flag is present, an object with a no-op write method is
 		 * used in place of process.stout
 		 */
-		const stdout = argv.silent
-			? {
-				write: () => {}
-			  } // eslint-disable-line
-			: process.stdout;
+		const stdout = argv.silent ? { write: () => {} } : process.stdout;
 
 		function ifArg(name, fn, init) {
 			if (Array.isArray(argv[name])) {
@@ -127,7 +123,8 @@ For more information, see https://webpack.js.org/api/cli/.`);
 			if (typeof options.then === "function") {
 				options.then(processOptions).catch(function(err) {
 					console.error(err.stack || err);
-					process.exit(1); // eslint-disable-line
+					// eslint-disable-next-line no-process-exit
+					process.exit(1);
 				});
 				return;
 			}
diff --git a/bin/config/config-yargs.js b/bin/config/config-yargs.js
@@ -349,7 +349,8 @@ module.exports = function(yargs) {
 			},
 			p: {
 				type: "boolean",
-				describe: "shortcut for --optimize-minimize --define process.env.NODE_ENV=\"production\"",
+				// eslint-disable-next-line quotes
+				describe: 'shortcut for --optimize-minimize --define process.env.NODE_ENV="production"',
 				group: BASIC_GROUP
 			},
 			silent: {
diff --git a/bin/utils/convert-argv.js b/bin/utils/convert-argv.js
@@ -24,7 +24,8 @@ module.exports = function(...args) {
 	}
 	if (argv.p) {
 		argv["optimize-minimize"] = true;
-		argv["define"] = [].concat(argv["define"] || []).concat("process.env.NODE_ENV=\"production\"");
+		// eslint-disable-next-line quotes
+		argv["define"] = [].concat(argv["define"] || []).concat('process.env.NODE_ENV="production"');
 		if (!argv.mode) {
 			argv.mode = "production";
 		}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -167,8 +167,9 @@
     "conventional-changelog-cli": "^2.0.11",
     "cz-customizable": "^5.3.0",
     "eslint": "^5.9.0",
-    "eslint-config-prettier": "^4.1.0",
+    "eslint-config-prettier": "^4.3.0",
     "eslint-plugin-node": "^8.0.0",
+    "eslint-plugin-prettier": "^3.1.0",
     "esm": "^3.2.14",
     "execa": "^1.0.0",
     "husky": "^1.1.4",
diff --git a/test/binCases/config-location/find-recursively/packages/foo/find-recursively.test.js b/test/binCases/config-location/find-recursively/packages/foo/find-recursively.test.js
@@ -9,7 +9,7 @@ test("find-recursively", () => {
 		"--output-chunk-filename",
 		"[id].chunk.js",
 		"--target",
-		"async-node",
+		"async-node"
 	]);
 	expect(code).toBe(0);
 	expect(stdout).toEqual(expect.anything());
diff --git a/test/binCases/config-location/not-found/not-found.test.js b/test/binCases/config-location/not-found/not-found.test.js
@@ -11,7 +11,7 @@ test("not-found", () => {
 		"--target",
 		"async-node",
 		"--mode",
-		"production",
+		"production"
 	]);
 	expect(code).toBe(0);
 	expect(stdout).toContain("./src/index.js");
diff --git a/test/binCases/config-location/set-explicitly/set-explicitly.test.js b/test/binCases/config-location/set-explicitly/set-explicitly.test.js
@@ -13,7 +13,7 @@ test("set-explicitly", () => {
 		"--output-chunk-filename",
 		"[id].chunk.js",
 		"--target",
-		"async-node",
+		"async-node"
 	]);
 	expect(code).toBe(0);
 	expect(stdout).toEqual(expect.anything());
diff --git a/test/binCases/config-location/set-implicitly/set-implicitly.test.js b/test/binCases/config-location/set-implicitly/set-implicitly.test.js
@@ -9,7 +9,7 @@ test("set-implicitly", () => {
 		"--output-chunk-filename",
 		"[id].chunk.js",
 		"--target",
-		"async-node",
+		"async-node"
 	]);
 	expect(code).toBe(0);
 	expect(stdout).toEqual(expect.anything());
diff --git a/test/binCases/config-location/webpack-babel-config/webpack-babel-config.test.js b/test/binCases/config-location/webpack-babel-config/webpack-babel-config.test.js
@@ -3,13 +3,7 @@
 const { run } = require("../../../testUtils");
 
 test("webpack-babel-config", () => {
-	const { stdout, stderr } = run(__dirname, [
-		"--target",
-		"async-node",
-		"-r",
-		"esm",
-		"@babel/register"
-	]);
+	const { stdout, stderr } = run(__dirname, ["--target", "async-node", "-r", "esm", "@babel/register"]);
 	expect(stdout).toContain("es6.js");
 	expect(stderr).toHaveLength(0);
 });
diff --git a/test/binCases/config-location/webpackfile-config/packages/foo/webpackfile-config.test.js b/test/binCases/config-location/webpackfile-config/packages/foo/webpackfile-config.test.js
@@ -9,7 +9,7 @@ test("find-recursively", () => {
 		"--output-chunk-filename",
 		"[id].chunk.js",
 		"--target",
-		"async-node",
+		"async-node"
 	]);
 	expect(code).toBe(0);
 	expect(stdout).toEqual(expect.anything());
diff --git a/test/binCases/config-type/array/webpack.config.js b/test/binCases/config-type/array/webpack.config.js
@@ -12,4 +12,3 @@ module.exports = [
 		}
 	}
 ];
-
diff --git a/test/binCases/config-type/invalid-array/webpack.config.js b/test/binCases/config-type/invalid-array/webpack.config.js
@@ -13,4 +13,3 @@ module.exports = [
 		}
 	}
 ];
-
diff --git a/test/binCases/config-type/invalid-type/webpack.config.js b/test/binCases/config-type/invalid-type/webpack.config.js
@@ -1,2 +1 @@
 module.exports = 100;
-
diff --git a/test/binCases/configFile/plugins-precedence/plugins-precedence.test.js b/test/binCases/configFile/plugins-precedence/plugins-precedence.test.js
@@ -15,7 +15,8 @@ test("plugins-precedence", () => {
 		"--target",
 		"async-node",
 		"--define",
-		"TEST=\"ok\""
+		// eslint-disable-next-line quotes
+		'TEST="ok"'
 	]);
 
 	const summary = extractSummary(stdout);
diff --git a/test/binCases/entry/display-entrypoints/webpack.config.js b/test/binCases/entry/display-entrypoints/webpack.config.js
@@ -1,5 +1,5 @@
 var path = require("path");
 
 module.exports = {
-	entry: path.resolve(__dirname, "./index"),
+	entry: path.resolve(__dirname, "./index")
 };
diff --git a/test/binCases/errors/info-verbosity/info-verbosity.test.js b/test/binCases/errors/info-verbosity/info-verbosity.test.js
@@ -17,6 +17,7 @@ test("info-verbosity", () => {
 	]);
 
 	expect(stderr).toContain("Invalid values:");
-	expect(stderr).toContain("Argument: info-verbosity, Given: \"false\", Choices: \"none\", \"info\", \"verbose\"");
+	// eslint-disable-next-line quotes
+	expect(stderr).toContain('Argument: info-verbosity, Given: "false", Choices: "none", "info", "verbose"');
 	// snapshot not needed
 });
diff --git a/test/binCases/stats/single-config/single-config.test.js b/test/binCases/stats/single-config/single-config.test.js
@@ -1,6 +1,6 @@
 "use strict";
 
-jest.setTimeout(10E6);
+jest.setTimeout(10e6);
 /* eslint-disable node/no-unsupported-features  */
 /* eslint-disable node/no-unsupported-features/es-syntax  */
 
diff --git a/test/binCases/watch/info-verbosity-off/info-verbosity-off.test.js b/test/binCases/watch/info-verbosity-off/info-verbosity-off.test.js
diff --git a/test/binCases/watch/info-verbosity-verbose/info-verbosity-verbose.test.js b/test/binCases/watch/info-verbosity-verbose/info-verbosity-verbose.test.js
diff --git a/test/binCases/watch/multi-config-watch-opt/multi-config-watch-opt.test.js b/test/binCases/watch/multi-config-watch-opt/multi-config-watch-opt.test.js
diff --git a/test/binCases/watch/multi-config/multi-config.test.js b/test/binCases/watch/multi-config/multi-config.test.js
diff --git a/test/binCases/watch/single-config-watch-opt/single-config-watch-opt.test.js b/test/binCases/watch/single-config-watch-opt/single-config-watch-opt.test.js
diff --git a/test/binCases/watch/single-config/single-config.test.js b/test/binCases/watch/single-config/single-config.test.js

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,8 @@ module.exports = function(...args) {`
`24`	`24`	`}`
`25`	`25`	`if (argv.p) {`
`26`	`26`	`argv["optimize-minimize"] = true;`
`27`		`- argv["define"] = [].concat(argv["define"] \|\| []).concat("process.env.NODE_ENV=\"production\"");`
	`27`	`+ // eslint-disable-next-line quotes`
	`28`	`+ argv["define"] = [].concat(argv["define"] \|\| []).concat('process.env.NODE_ENV="production"');`
`28`	`29`	`if (!argv.mode) {`
`29`	`30`	`argv.mode = "production";`
`30`	`31`	`}`