Prettify source code

benchmark/benchmark.js

@@ -206,8 +206,8 @@ const tests = {
 const suite = new Benchmark.Suite();
 
 Object.keys(tests)
-	.filter(
+	.filter(name =>
-		name => (process.argv.length > 2 ? name.includes(process.argv[2]) : true)
+		process.argv.length > 2 ? name.includes(process.argv[2]) : true
 	)
 	.forEach(name => {
 		const test = tests[name];

declarations.d.ts

@@ -234,8 +234,8 @@ interface RuleSetConditionsRecursive
 	extends Array<import("./declarations/WebpackOptions").RuleSetCondition> {}
 interface RuleSetConditionsAbsoluteRecursive
 	extends Array<
-			import("./declarations/WebpackOptions").RuleSetConditionAbsolute
+		import("./declarations/WebpackOptions").RuleSetConditionAbsolute
-		> {}
+	> {}
 
 /**
  * Global variable declarations

declarations/WebpackOptions.d.ts

@@ -15,7 +15,7 @@ export type Entry = EntryDynamic | EntryStatic;
  * This interface was referenced by `WebpackOptions`'s JSON-Schema
  * via the `definition` "EntryDynamic".
  */
-export type EntryDynamic = (() => EntryStatic | Promise<EntryStatic>);
+export type EntryDynamic = () => EntryStatic | Promise<EntryStatic>;
 /**
  * This interface was referenced by `WebpackOptions`'s JSON-Schema
  * via the `definition` "EntryStatic".

declarations/plugins/BannerPlugin.d.ts

@@ -11,15 +11,13 @@ export type BannerPluginArgument =
 /**
  * The banner as function, it will be wrapped in a comment
  */
-export type BannerFunction = (
+export type BannerFunction = (data: {
-	data: {
+	hash: string;
-		hash: string;
+	chunk: import("../../lib/Chunk");
-		chunk: import("../../lib/Chunk");
+	filename: string;
-		filename: string;
+	basename: string;
-		basename: string;
+	query: string;
-		query: string;
+}) => string;
-	}
-) => string;
 export type Rules = Rule[] | Rule;
 export type Rule = RegExp | string;
 

declarations/plugins/IgnorePlugin.d.ts

@@ -19,9 +19,9 @@ export type IgnorePluginOptions =
 			/**
 			 * A filter function for context
 			 */
-			checkContext?: ((context: string) => boolean);
+			checkContext?: (context: string) => boolean;
 			/**
 			 * A filter function for resource and context
 			 */
-			checkResource?: ((resource: string, context: string) => boolean);
+			checkResource?: (resource: string, context: string) => boolean;
 	  };

declarations/plugins/ProgressPlugin.d.ts

@@ -8,11 +8,11 @@ export type ProgressPluginArgument = ProgressPluginOptions | HandlerFunction;
 /**
  * Function that executes for every progress step
  */
-export type HandlerFunction = ((
+export type HandlerFunction = (
 	percentage: number,
 	msg: string,
 	...args: string[]
-) => void);
+) => void;
 
 export interface ProgressPluginOptions {
 	/**

lib/AmdMainTemplatePlugin.js

@@ -40,8 +40,8 @@ class AmdMainTemplatePlugin {
 		const onRenderWithEntry = (source, chunk, hash) => {
 			const externals = chunk.getModules().filter(m => m.external);
 			const externalsDepsArray = JSON.stringify(
-				externals.map(
+				externals.map(m =>
-					m => (typeof m.request === "object" ? m.request.amd : m.request)
+					typeof m.request === "object" ? m.request.amd : m.request
 				)
 			);
 			const externalsArguments = externals

lib/JsonGenerator.js

@@ -12,9 +12,8 @@ const stringifySafe = data => {
 		return undefined; // Invalid JSON
 	}
 
-	return stringified.replace(
+	return stringified.replace(/\u2028|\u2029/g, str =>
-		/\u2028|\u2029/g,
+		str === "\u2029" ? "\\u2029" : "\\u2028"
-		str => (str === "\u2029" ? "\\u2029" : "\\u2028")
 	); // invalid in JavaScript but valid JSON
 };
 

lib/Parser.js

@@ -1335,8 +1335,8 @@ class Parser extends Tapable {
 			statement.kind === "const"
 				? this.hooks.varDeclarationConst
 				: statement.kind === "let"
-					? this.hooks.varDeclarationLet
+				? this.hooks.varDeclarationLet
-					: this.hooks.varDeclarationVar;
+				: this.hooks.varDeclarationVar;
 		for (const declarator of statement.declarations) {
 			switch (declarator.type) {
 				case "VariableDeclarator": {

lib/Stats.js

@@ -288,8 +288,8 @@ class Stats {
 					e.chunk.hasRuntime()
 						? " [entry]"
 						: e.chunk.canBeInitial()
-							? " [initial]"
+						? " [initial]"
-							: ""
+						: ""
 				}\n`;
 			}
 			if (e.file) {

lib/UmdMainTemplatePlugin.js

@@ -236,12 +236,12 @@ class UmdMainTemplatePlugin {
 								  amdFactory +
 								  ");\n"
 							: this.names.amd && this.namedDefine === true
-								? "		define(" +
+							? "		define(" +
-								  libraryName(this.names.amd) +
+							  libraryName(this.names.amd) +
-								  ", [], " +
+							  ", [], " +
-								  amdFactory +
+							  amdFactory +
-								  ");\n"
+							  ");\n"
-								: "		define([], " + amdFactory + ");\n") +
+							: "		define([], " + amdFactory + ");\n") +
 						(this.names.root || this.names.commonjs
 							? getAuxilaryComment("commonjs") +
 							  "	else if(typeof exports === 'object')\n" +

lib/WatchIgnorePlugin.js

@@ -17,8 +17,8 @@ class IgnoringWatchFileSystem {
 
 	watch(files, dirs, missing, startTime, options, callback, callbackUndelayed) {
 		const ignored = path =>
-			this.paths.some(
+			this.paths.some(p =>
-				p => (p instanceof RegExp ? p.test(path) : path.indexOf(p) === 0)
+				p instanceof RegExp ? p.test(path) : path.indexOf(p) === 0
 			);
 
 		const notIgnored = path => !ignored(path);

lib/WebpackOptionsApply.js

@@ -260,10 +260,10 @@ class WebpackOptionsApply extends OptionsApply {
 					  "MappingURL=[url]\n//# source" +
 					  "MappingURL=[url]\n*/"
 					: legacy
-						? "\n/*\n//@ source" + "MappingURL=[url]\n*/"
+					? "\n/*\n//@ source" + "MappingURL=[url]\n*/"
-						: modern
+					: modern
-							? "\n//# source" + "MappingURL=[url]"
+					? "\n//# source" + "MappingURL=[url]"
-							: null;
+					: null;
 			const Plugin = evalWrapped
 				? EvalSourceMapDevToolPlugin
 				: SourceMapDevToolPlugin;
@@ -286,10 +286,10 @@ class WebpackOptionsApply extends OptionsApply {
 				legacy && modern
 					? "\n//@ sourceURL=[url]\n//# sourceURL=[url]"
 					: legacy
-						? "\n//@ sourceURL=[url]"
+					? "\n//@ sourceURL=[url]"
-						: modern
+					: modern
-							? "\n//# sourceURL=[url]"
+					? "\n//# sourceURL=[url]"
-							: null;
+					: null;
 			new EvalDevToolModulePlugin({
 				sourceUrlComment: comment,
 				moduleFilenameTemplate: options.output.devtoolModuleFilenameTemplate,

lib/WebpackOptionsDefaulter.js

@@ -33,10 +33,8 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 
 		this.set("entry", "./src");
 
-		this.set(
+		this.set("devtool", "make", options =>
-			"devtool",
+			options.mode === "development" ? "eval" : false
-			"make",
-			options => (options.mode === "development" ? "eval" : false)
 		);
 		this.set("cache", "make", options => options.mode === "development");
 
@@ -193,10 +191,8 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 		});
 		this.set("performance.maxAssetSize", 250000);
 		this.set("performance.maxEntrypointSize", 250000);
-		this.set(
+		this.set("performance.hints", "make", options =>
-			"performance.hints",
+			isProductionLikeMode(options) ? "warning" : false
-			"make",
-			options => (isProductionLikeMode(options) ? "warning" : false)
 		);
 
 		this.set("optimization", "call", value => Object.assign({}, value));

lib/optimize/SideEffectsFlagPlugin.js

@@ -123,7 +123,7 @@ class SideEffectsFlagPlugin {
 										dep,
 										reason.explanation
 											? reason.explanation +
-											  " (skipped side-effect-free modules)"
+													" (skipped side-effect-free modules)"
 											: "(skipped side-effect-free modules)"
 									);
 									// removing the currect reason, by not adding it to the newReasons array

lib/optimize/SplitChunksPlugin.js

@@ -534,8 +534,8 @@ module.exports = class SplitChunksPlugin {
 									cacheGroupSource.minSize !== undefined
 										? cacheGroupSource.minSize
 										: cacheGroupSource.enforce
-											? 0
+										? 0
-											: this.options.minSize,
+										: this.options.minSize,
 								minSizeForMaxSize:
 									cacheGroupSource.minSize !== undefined
 										? cacheGroupSource.minSize
@@ -544,26 +544,26 @@ module.exports = class SplitChunksPlugin {
 									cacheGroupSource.maxSize !== undefined
 										? cacheGroupSource.maxSize
 										: cacheGroupSource.enforce
-											? 0
+										? 0
-											: this.options.maxSize,
+										: this.options.maxSize,
 								minChunks:
 									cacheGroupSource.minChunks !== undefined
 										? cacheGroupSource.minChunks
 										: cacheGroupSource.enforce
-											? 1
+										? 1
-											: this.options.minChunks,
+										: this.options.minChunks,
 								maxAsyncRequests:
 									cacheGroupSource.maxAsyncRequests !== undefined
 										? cacheGroupSource.maxAsyncRequests
 										: cacheGroupSource.enforce
-											? Infinity
+										? Infinity
-											: this.options.maxAsyncRequests,
+										: this.options.maxAsyncRequests,
 								maxInitialRequests:
 									cacheGroupSource.maxInitialRequests !== undefined
 										? cacheGroupSource.maxInitialRequests
 										: cacheGroupSource.enforce
-											? Infinity
+										? Infinity
-											: this.options.maxInitialRequests,
+										: this.options.maxInitialRequests,
 								getName:
 									cacheGroupSource.getName !== undefined
 										? cacheGroupSource.getName
@@ -683,11 +683,11 @@ module.exports = class SplitChunksPlugin {
 								const maxRequests = chunk.isOnlyInitial()
 									? item.cacheGroup.maxInitialRequests
 									: chunk.canBeInitial()
-										? Math.min(
+									? Math.min(
-												item.cacheGroup.maxInitialRequests,
+											item.cacheGroup.maxInitialRequests,
-												item.cacheGroup.maxAsyncRequests
+											item.cacheGroup.maxAsyncRequests
-										  )
+									  )
-										: item.cacheGroup.maxAsyncRequests;
+									: item.cacheGroup.maxAsyncRequests;
 								return (
 									!isFinite(maxRequests) || getRequests(chunk) < maxRequests
 								);

lib/util/StackedSetMap.js

@@ -96,12 +96,10 @@ class StackedSetMap {
 
 	asPairArray() {
 		this._compress();
-		return Array.from(
+		return Array.from(this.map.entries(), pair =>
-			this.map.entries(),
+			/** @type {[TODO, TODO]} */ (pair[1] === UNDEFINED_MARKER
-			pair =>
+				? [pair[0], undefined]
-				/** @type {[TODO, TODO]} */ (pair[1] === UNDEFINED_MARKER
+				: pair)
-					? [pair[0], undefined]
-					: pair)
 		);
 	}
 

lib/util/deterministicGrouping.js

@@ -156,8 +156,8 @@ module.exports = ({ maxSize, minSize, items, getSize, getKey }) => {
 			// We hit an edgecase where the working set is already smaller than minSize
 			// We merge it with the smallest result node to keep minSize intact
 			if (result.length > 0) {
-				const smallestGroup = result.reduce(
+				const smallestGroup = result.reduce((min, group) =>
-					(min, group) => (min.size > group.size ? group : min)
+					min.size > group.size ? group : min
 				);
 				for (const node of initialGroup.nodes) smallestGroup.nodes.push(node);
 				smallestGroup.nodes.sort((a, b) => {

lib/util/identifier.js

@@ -36,11 +36,10 @@ const normalizePathSeparator = p => p.replace(/\\/g, "/");
 const _makePathsRelative = (context, identifier) => {
 	return identifier
 		.split(/([|! ])/)
-		.map(
+		.map(str =>
-			str =>
+			looksLikeAbsolutePath(str)
-				looksLikeAbsolutePath(str)
+				? normalizePathSeparator(path.relative(context, str))
-					? normalizePathSeparator(path.relative(context, str))
+				: str
-					: str
 		)
 		.join("");
 };