Upgrade to Prettier 2

.prettierrc.js

@@ -2,6 +2,8 @@ module.exports = {
 	printWidth: 80,
 	useTabs: true,
 	tabWidth: 2,
+	trailingComma: "none",
+	arrowParens: "avoid",
 	overrides: [
 		{
 			files: "*.json",

benchmark/benchmark.js

@@ -7,7 +7,7 @@ const outputPath = path.join(__dirname, "js");
 
 const benchmarkOptions = {
 	defer: true,
-	onCycle: function() {
+	onCycle: function () {
 		process.stderr.write(".");
 	},
 	minSamples: 10

hot/dev-server.js

@@ -12,7 +12,7 @@ if (module.hot) {
 	var check = function check() {
 		module.hot
 			.check(true)
-			.then(function(updatedModules) {
+			.then(function (updatedModules) {
 				if (!updatedModules) {
 					log("warning", "[HMR] Cannot find update. Need to do a full reload!");
 					log(
@@ -33,7 +33,7 @@ if (module.hot) {
 					log("info", "[HMR] App is up to date.");
 				}
 			})
-			.catch(function(err) {
+			.catch(function (err) {
 				var status = module.hot.status();
 				if (["abort", "fail"].indexOf(status) >= 0) {
 					log(
@@ -48,7 +48,7 @@ if (module.hot) {
 			});
 	};
 	var hotEmitter = require("./emitter");
-	hotEmitter.on("webpackHotUpdate", function(currentHash) {
+	hotEmitter.on("webpackHotUpdate", function (currentHash) {
 		lastHash = currentHash;
 		if (!upToDate() && module.hot.status() === "idle") {
 			log("info", "[HMR] Checking for updates on the server...");

hot/log-apply-result.js

@@ -2,8 +2,8 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-module.exports = function(updatedModules, renewedModules) {
-	var unacceptedModules = updatedModules.filter(function(moduleId) {
+module.exports = function (updatedModules, renewedModules) {
+	var unacceptedModules = updatedModules.filter(function (moduleId) {
 		return renewedModules && renewedModules.indexOf(moduleId) < 0;
 	});
 	var log = require("./log");
@@ -13,7 +13,7 @@ module.exports = function(updatedModules, renewedModules) {
 			"warning",
 			"[HMR] The following modules couldn't be hot updated: (They would need a full reload!)"
 		);
-		unacceptedModules.forEach(function(moduleId) {
+		unacceptedModules.forEach(function (moduleId) {
 			log("warning", "[HMR]  - " + moduleId);
 		});
 	}
@@ -22,7 +22,7 @@ module.exports = function(updatedModules, renewedModules) {
 		log("info", "[HMR] Nothing hot updated.");
 	} else {
 		log("info", "[HMR] Updated modules:");
-		renewedModules.forEach(function(moduleId) {
+		renewedModules.forEach(function (moduleId) {
 			if (typeof moduleId === "string" && moduleId.indexOf("!") !== -1) {
 				var parts = moduleId.split("!");
 				log.groupCollapsed("info", "[HMR]  - " + parts.pop());
@@ -32,7 +32,7 @@ module.exports = function(updatedModules, renewedModules) {
 				log("info", "[HMR]  - " + moduleId);
 			}
 		});
-		var numberIds = renewedModules.every(function(moduleId) {
+		var numberIds = renewedModules.every(function (moduleId) {
 			return typeof moduleId === "number";
 		});
 		if (numberIds)

hot/log.js

@@ -11,14 +11,14 @@ function shouldLog(level) {
 }
 
 function logGroup(logFn) {
-	return function(level, msg) {
+	return function (level, msg) {
 		if (shouldLog(level)) {
 			logFn(msg);
 		}
 	};
 }
 
-module.exports = function(level, msg) {
+module.exports = function (level, msg) {
 	if (shouldLog(level)) {
 		if (level === "info") {
 			console.log(msg);
@@ -42,11 +42,11 @@ module.exports.groupCollapsed = logGroup(groupCollapsed);
 
 module.exports.groupEnd = logGroup(groupEnd);
 
-module.exports.setLogLevel = function(level) {
+module.exports.setLogLevel = function (level) {
 	logLevel = level;
 };
 
-module.exports.formatError = function(err) {
+module.exports.formatError = function (err) {
 	var message = err.message;
 	var stack = err.stack;
 	if (!stack) {

hot/only-dev-server.js

@@ -12,7 +12,7 @@ if (module.hot) {
 	var check = function check() {
 		module.hot
 			.check()
-			.then(function(updatedModules) {
+			.then(function (updatedModules) {
 				if (!updatedModules) {
 					log("warning", "[HMR] Cannot find update. Need to do a full reload!");
 					log(
@@ -27,21 +27,21 @@ if (module.hot) {
 						ignoreUnaccepted: true,
 						ignoreDeclined: true,
 						ignoreErrored: true,
-						onUnaccepted: function(data) {
+						onUnaccepted: function (data) {
 							log(
 								"warning",
 								"Ignored an update to unaccepted module " +
 									data.chain.join(" -> ")
 							);
 						},
-						onDeclined: function(data) {
+						onDeclined: function (data) {
 							log(
 								"warning",
 								"Ignored an update to declined module " +
 									data.chain.join(" -> ")
 							);
 						},
-						onErrored: function(data) {
+						onErrored: function (data) {
 							log("error", data.error);
 							log(
 								"warning",
@@ -53,7 +53,7 @@ if (module.hot) {
 							);
 						}
 					})
-					.then(function(renewedModules) {
+					.then(function (renewedModules) {
 						if (!upToDate()) {
 							check();
 						}
@@ -65,7 +65,7 @@ if (module.hot) {
 						}
 					});
 			})
-			.catch(function(err) {
+			.catch(function (err) {
 				var status = module.hot.status();
 				if (["abort", "fail"].indexOf(status) >= 0) {
 					log(
@@ -79,7 +79,7 @@ if (module.hot) {
 			});
 	};
 	var hotEmitter = require("./emitter");
-	hotEmitter.on("webpackHotUpdate", function(currentHash) {
+	hotEmitter.on("webpackHotUpdate", function (currentHash) {
 		lastHash = currentHash;
 		if (!upToDate()) {
 			var status = module.hot.status();

hot/poll.js

@@ -11,15 +11,15 @@ if (module.hot) {
 		if (module.hot.status() === "idle") {
 			module.hot
 				.check(true)
-				.then(function(updatedModules) {
+				.then(function (updatedModules) {
 					if (!updatedModules) {
 						if (fromUpdate) log("info", "[HMR] Update applied.");
 						return;
 					}
 					require("./log-apply-result")(updatedModules, updatedModules);
 					checkForUpdate(true);
 				})
-				.catch(function(err) {
+				.catch(function (err) {
 					var status = module.hot.status();
 					if (["abort", "fail"].indexOf(status) >= 0) {
 						log("warning", "[HMR] Cannot apply update.");

hot/signal.js

@@ -8,7 +8,7 @@ if (module.hot) {
 	var checkForUpdate = function checkForUpdate(fromUpdate) {
 		module.hot
 			.check()
-			.then(function(updatedModules) {
+			.then(function (updatedModules) {
 				if (!updatedModules) {
 					if (fromUpdate) log("info", "[HMR] Update applied.");
 					else log("warning", "[HMR] Cannot find update.");
@@ -18,22 +18,22 @@ if (module.hot) {
 				return module.hot
 					.apply({
 						ignoreUnaccepted: true,
-						onUnaccepted: function(data) {
+						onUnaccepted: function (data) {
 							log(
 								"warning",
 								"Ignored an update to unaccepted module " +
 									data.chain.join(" -> ")
 							);
 						}
 					})
-					.then(function(renewedModules) {
+					.then(function (renewedModules) {
 						require("./log-apply-result")(updatedModules, renewedModules);
 
 						checkForUpdate(true);
 						return null;
 					});
 			})
-			.catch(function(err) {
+			.catch(function (err) {
 				var status = module.hot.status();
 				if (["abort", "fail"].indexOf(status) >= 0) {
 					log("warning", "[HMR] Cannot apply update.");
@@ -45,7 +45,7 @@ if (module.hot) {
 			});
 	};
 
-	process.on(__resourceQuery.substr(1) || "SIGUSR2", function() {
+	process.on(__resourceQuery.substr(1) || "SIGUSR2", function () {
 		if (module.hot.status() !== "idle") {
 			log(
 				"warning",

lib/ChunkTemplate.js

@@ -126,7 +126,7 @@ Object.defineProperty(ChunkTemplate.prototype, "outputOptions", {
 		 * @this {ChunkTemplate}
 		 * @returns {TODO} output options
 		 */
-		function() {
+		function () {
 			return this._outputOptions;
 		},
 		"ChunkTemplate.outputOptions is deprecated (use Compilation.outputOptions instead)",

lib/ContextModule.js

@@ -104,7 +104,7 @@ class ContextModule extends Module {
 		// Info from Factory
 		this.resolveDependencies = resolveDependencies;
 		/** @type {ContextModuleOptions} */
-		this.options = ({
+		this.options = {
 			resource: resource,
 			resourceQuery: resourceQuery,
 			mode: options.mode,
@@ -116,7 +116,7 @@ class ContextModule extends Module {
 			chunkName: options.chunkName,
 			groupOptions: options.groupOptions,
 			namespaceObject: options.namespaceObject
-		});
+		};
 		if (options.resolveOptions !== undefined) {
 			this.resolveOptions = options.resolveOptions;
 		}

lib/EvalSourceMapDevToolPlugin.js

@@ -79,8 +79,7 @@ class EvalSourceMapDevToolPlugin {
 						} else if (m instanceof ConcatenatedModule) {
 							const concatModule = /** @type {ConcatenatedModule} */ (m);
 							if (concatModule.rootModule instanceof NormalModule) {
-								const module =
-									/** @type {NormalModule} */ (concatModule.rootModule);
+								const module = /** @type {NormalModule} */ (concatModule.rootModule);
 								if (!matchModule(module.resource)) {
 									return source;
 								}

lib/MainTemplate.js

@@ -298,7 +298,7 @@ Object.defineProperty(MainTemplate.prototype, "outputOptions", {
 		 * @this {MainTemplate}
 		 * @returns {TODO} output options
 		 */
-		function() {
+		function () {
 			return this._outputOptions;
 		},
 		"MainTemplate.outputOptions is deprecated (use Compilation.outputOptions instead)",

lib/Module.js

@@ -703,11 +703,7 @@ class Module extends DependenciesBlock {
 		const sources = this.codeGeneration(sourceContext).sources;
 		return sourceContext.type
 			? sources.get(sourceContext.type)
-			: sources.get(
-					this.getSourceTypes()
-						.values()
-						.next().value
-			  );
+			: sources.get(this.getSourceTypes().values().next().value);
 	}
 
 	/**
@@ -868,7 +864,7 @@ Object.defineProperty(Module.prototype, "errors", {
 		 * @this {Module}
 		 * @returns {WebpackError[]} array
 		 */
-		function() {
+		function () {
 			if (this._errors === undefined) {
 				this._errors = [];
 			}
@@ -886,7 +882,7 @@ Object.defineProperty(Module.prototype, "warnings", {
 		 * @this {Module}
 		 * @returns {WebpackError[]} array
 		 */
-		function() {
+		function () {
 			if (this._warnings === undefined) {
 				this._warnings = [];
 			}

lib/ModuleDependencyError.js

@@ -20,10 +20,7 @@ class ModuleDependencyError extends WebpackError {
 		super(err.message);
 
 		this.name = "ModuleDependencyError";
-		this.details = err.stack
-			.split("\n")
-			.slice(1)
-			.join("\n");
+		this.details = err.stack.split("\n").slice(1).join("\n");
 		this.module = module;
 		this.loc = loc;
 		this.error = err;

lib/ModuleDependencyWarning.js

@@ -19,10 +19,7 @@ module.exports = class ModuleDependencyWarning extends WebpackError {
 		super(err.message);
 
 		this.name = "ModuleDependencyWarning";
-		this.details = err.stack
-			.split("\n")
-			.slice(1)
-			.join("\n");
+		this.details = err.stack.split("\n").slice(1).join("\n");
 		this.module = module;
 		this.loc = loc;
 		this.error = err;

lib/ModuleFilenameHelpers.js

@@ -88,10 +88,7 @@ ModuleFilenameHelpers.createFilename = (
 		shortIdentifier = module.readableIdentifier(requestShortener);
 		identifier = requestShortener.shorten(module.identifier());
 		moduleId = chunkGraph.getModuleId(module);
-		absoluteResourcePath = module
-			.identifier()
-			.split("!")
-			.pop();
+		absoluteResourcePath = module.identifier().split("!").pop();
 		hash = getHash(identifier);
 	}
 	const resource = shortIdentifier.split("!").pop();

lib/ModuleTemplate.js

@@ -140,7 +140,7 @@ Object.defineProperty(ModuleTemplate.prototype, "runtimeTemplate", {
 		 * @this {ModuleTemplate}
 		 * @returns {TODO} output options
 		 */
-		function() {
+		function () {
 			return this._runtimeTemplate;
 		},
 		"ModuleTemplate.runtimeTemplate is deprecated (use Compilation.runtimeTemplate instead)",

lib/config/normalization.js

@@ -117,9 +117,7 @@ const getNormalizedWebpackOptions = config => {
 		entry: nestedConfig(config.entry, entry => {
 			if (typeof entry === "function") {
 				return () =>
-					Promise.resolve()
-						.then(entry)
-						.then(getNormalizedEntryStatic);
+					Promise.resolve().then(entry).then(getNormalizedEntryStatic);
 			}
 			return getNormalizedEntryStatic(entry);
 		}),