optimize optimization plugins

sokra · sokra · commit b08762b729fd · 2017-06-01T16:35:07.000+02:00
diff --git a/lib/Chunk.js b/lib/Chunk.js
@@ -195,6 +195,15 @@ class Chunk {
 		return Array.from(this._modules);
 	}
 
+	getModulesIdent() {
+		this._ensureModulesSorted();
+		let str = "";
+		this._modules.forEach(m => {
+			str += m.identifier() + "#";
+		});
+		return str;
+	}
+
 	remove(reason) {
 		// cleanup modules
 		// Array.from is used here to create a clone, because removeChunk modifies this._modules
diff --git a/lib/optimize/EnsureChunkConditionsPlugin.js b/lib/optimize/EnsureChunkConditionsPlugin.js
@@ -8,16 +8,19 @@ class EnsureChunkConditionsPlugin {
 
 	apply(compiler) {
 		compiler.plugin("compilation", (compilation) => {
+			const triesMap = new Map();
 			compilation.plugin(["optimize-chunks-basic", "optimize-extracted-chunks-basic"], (chunks) => {
 				let changed = false;
 				chunks.forEach((chunk) => {
 					chunk.forEachModule((module) => {
 						if(!module.chunkCondition) return;
 						if(!module.chunkCondition(chunk)) {
-							const usedChunks = module._EnsureChunkConditionsPlugin_usedChunks = (module._EnsureChunkConditionsPlugin_usedChunks || []).concat(chunk);
+							let usedChunks = triesMap.get(module);
+							if(!usedChunks) triesMap.set(module, usedChunks = new Set());
+							usedChunks.add(chunk);
 							const newChunks = [];
 							chunk.parents.forEach((parent) => {
-								if(usedChunks.indexOf(parent) < 0) {
+								if(!usedChunks.has(parent)) {
 									parent.addModule(module);
 									newChunks.push(parent);
 								}
diff --git a/lib/optimize/MergeDuplicateChunksPlugin.js b/lib/optimize/MergeDuplicateChunksPlugin.js
@@ -4,23 +4,18 @@
 */
 "use strict";
 
-function getChunkIdentifier(chunk) {
-	return chunk.mapModules((m) => {
-		return m.identifier();
-	}).sort().join(", ");
-}
-
 class MergeDuplicateChunksPlugin {
 
 	apply(compiler) {
 		compiler.plugin("compilation", (compilation) => {
 			compilation.plugin("optimize-chunks-basic", (chunks) => {
-				const map = {};
+				const map = Object.create(null);
 				chunks.slice().forEach((chunk) => {
 					if(chunk.hasRuntime() || chunk.hasEntryModule()) return;
-					const ident = getChunkIdentifier(chunk);
-					if(map[ident]) {
-						if(map[ident].integrate(chunk, "duplicate"))
+					const ident = chunk.getModulesIdent();
+					const otherChunk = map[ident];
+					if(otherChunk) {
+						if(otherChunk.integrate(chunk, "duplicate"))
 							chunks.splice(chunks.indexOf(chunk), 1);
 						return;
 					}
