WIP17

sokra · sokra · commit eb81e9b83887 · 2018-01-19T16:00:06.000+01:00
diff --git a/examples/source-map/webpack.config.js b/examples/source-map/webpack.config.js
@@ -1,5 +1,4 @@
 var path = require("path");
-var webpack = require("../../");
 
 module.exports = [
 	"cheap-eval-source-map",
diff --git a/lib/Stats.js b/lib/Stats.js
@@ -147,7 +147,8 @@ class Stats {
 					if(excluded)
 						return false;
 				}
-				return i++ < maxModules;
+				const result = i++ < maxModules;
+				return result;
 			};
 		};
 
diff --git a/lib/optimize/AggressiveMergingPlugin.js b/lib/optimize/AggressiveMergingPlugin.js
@@ -16,14 +16,6 @@ class AggressiveMergingPlugin {
 		const options = this.options;
 		const minSizeReduce = options.minSizeReduce || 1.5;
 
-		const getParentsWeight = chunk => {
-			return chunk.mapParents((p) => {
-				return p.isInitial() ? options.entryChunkMultiplicator || 10 : 1;
-			}).reduce((a, b) => {
-				return a + b;
-			}, 0);
-		};
-
 		compiler.hooks.thisCompilation.tap("AggressiveMergingPlugin", (compilation) => {
 			compilation.hooks.optimizeChunksAdvanced.tap("AggressiveMergingPlugin", (chunks) => {
 				let combinations = [];
diff --git a/lib/optimize/AutomaticCommonsChunksPlugin.js b/lib/optimize/AutomaticCommonsChunksPlugin.js
@@ -33,7 +33,7 @@ const isOverlap = (a, b) => {
 		if(b.has(item)) return true;
 	}
 	return false;
-}
+};
 
 const compareEntries = (a, b) => {
 	// 1. by total modules size
@@ -79,17 +79,20 @@ module.exports = class AutomaticCommonsChunksPlugin {
 
 	static normalizeName(option) {
 		if(option === true) {
-			return (module, chunks, cacheGroup) => {
+			const fn = (module, chunks, cacheGroup) => {
 				const names = chunks.map(c => c.name);
 				if(!names.every(Boolean)) return;
 				names.sort();
-				return (cacheGroup ? cacheGroup + "~" : "") + names.join("~");
+				const name = (cacheGroup ? cacheGroup + "~" : "") + names.join("~");
+				return name;
 			};
+			return fn;
 		}
 		if(typeof option === "string") {
-			return () => {
+			const fn = () => {
 				return option;
 			};
+			return fn;
 		}
 		if(typeof option === "function")
 			return option;
@@ -105,7 +108,7 @@ module.exports = class AutomaticCommonsChunksPlugin {
 			};
 		}
 		if(cacheGroups && typeof cacheGroups === "object") {
-			return (module, chunks) => {
+			const fn = (module, chunks) => {
 				let results;
 				for(const key of Object.keys(cacheGroups)) {
 					let option = cacheGroups[key];
@@ -143,8 +146,10 @@ module.exports = class AutomaticCommonsChunksPlugin {
 				}
 				return results;
 			};
+			return fn;
 		}
-		return () => {};
+		const fn = () => {};
+		return fn;
 	}
 
 	static checkTest(test, module, chunks) {
diff --git a/lib/optimize/RuntimeChunkPlugin.js b/lib/optimize/RuntimeChunkPlugin.js
@@ -22,4 +22,4 @@ module.exports = class RuntimeChunkPlugin {
 			});
 		});
 	}
-}
+};
diff --git a/lib/util/createHash.js b/lib/util/createHash.js
@@ -59,8 +59,10 @@ module.exports = algorithm => {
 		return new BulkUpdateDecorator(new algorithm());
 	}
 	switch(algorithm) {
-		case "debug": return new DebugHash();
 		// TODO add non-cryptographic algorithm here
-		default: return new BulkUpdateDecorator(require("crypto").createHash(algorithm));
+		case "debug":
+			return new DebugHash();
+		default:
+			return new BulkUpdateDecorator(require("crypto").createHash(algorithm));
 	}
 };
diff --git a/test/configCases/async-commons-chunk/existing-name/index.js b/test/configCases/async-commons-chunk/existing-name/index.js
@@ -28,6 +28,6 @@ it("should not have duplicate chunks in blocks", function(done) {
     // - a, a+b
     // - a, a+b, a+b+c
 	chunkLoadingSpy.callCount.should.be.eql(6);
-	chunkLoadingSpy.args.should.be.eql([["a"], ["a+b~a+b+c" /* == b */], ["a"], ["a+b~a+b+c" /* == b */], ["a"], ["a+b+c"]]);
+	chunkLoadingSpy.args.should.be.eql([["a"], ["a"], ["a+b~a+b+c" /* == b */], ["a"], ["a+b~a+b+c" /* == b */], ["a+b+c"]]);
 	done();
 });

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`var path = require("path");`
`2`		`-var webpack = require("../../");`
`3`	`2`
`4`	`3`	`module.exports = [`
`5`	`4`	`"cheap-eval-source-map",`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,8 @@ class Stats {`
`147`	`147`	`if(excluded)`
`148`	`148`	`return false;`
`149`	`149`	`}`
`150`		`- return i++ < maxModules;`
	`150`	`+ const result = i++ < maxModules;`
	`151`	`+ return result;`
`151`	`152`	`};`
`152`	`153`	`};`
`153`	`154`
Original file line number	Diff line number	Diff line change
`@@ -22,4 +22,4 @@ module.exports = class RuntimeChunkPlugin {`
`22`	`22`	`});`
`23`	`23`	`});`
`24`	`24`	`}`
`25`		`-}`
	`25`	`+};`
Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,10 @@ module.exports = algorithm => {`
`59`	`59`	`return new BulkUpdateDecorator(new algorithm());`
`60`	`60`	`}`
`61`	`61`	`switch(algorithm) {`
`62`		`- case "debug": return new DebugHash();`
`63`	`62`	`// TODO add non-cryptographic algorithm here`
`64`		`- default: return new BulkUpdateDecorator(require("crypto").createHash(algorithm));`
	`63`	`+ case "debug":`
	`64`	`+ return new DebugHash();`
	`65`	`+ default:`
	`66`	`+ return new BulkUpdateDecorator(require("crypto").createHash(algorithm));`
`65`	`67`	`}`
`66`	`68`	`};`