Merge pull request webpack#6249 from ooflorent/optimize_rpmp

sokra · web-flow · commit 2fab927306b7 · 2018-01-06T10:37:14.000+01:00
Optimize chunk traversal in RemoveParentModulesPlugin
diff --git a/lib/optimize/RemoveParentModulesPlugin.js b/lib/optimize/RemoveParentModulesPlugin.js
@@ -6,28 +6,20 @@
 
 const Queue = require("../util/Queue");
 
-const hasModule = (chunk, module, checkedChunks) => {
-	if(chunk.containsModule(module)) return [chunk];
-	if(chunk.getNumberOfParents() === 0) return false;
-	return allHaveModule(chunk.getParents().filter((c) => {
-		return !checkedChunks.has(c);
-	}), module, checkedChunks);
-};
-
-const allHaveModule = (someChunks, module, checkedChunks) => {
-	if(!checkedChunks) checkedChunks = new Set();
-	var chunks = new Set();
-	for(var i = 0; i < someChunks.length; i++) {
-		checkedChunks.add(someChunks[i]);
-		var subChunks = hasModule(someChunks[i], module, checkedChunks);
-		if(!subChunks) return false;
+const getParentChunksWithModule = (currentChunk, module) => {
+	const chunks = [];
+	const stack = new Set(currentChunk.parentsIterable);
 
-		for(var index = 0; index < subChunks.length; index++) {
-			var item = subChunks[index];
-
-			chunks.add(item);
+	for(const chunk of stack) {
+		if(chunk.containsModule(module)) {
+			chunks.push(chunk);
+		} else {
+			for(const parent of chunk.parentsIterable) {
+				stack.add(parent);
+			}
 		}
 	}
+
 	return chunks;
 };
 
@@ -93,8 +85,7 @@ class RemoveParentModulesPlugin {
 								toRemove.add(m);
 					}
 					for(const module of toRemove) {
-						const parentChunksWithModule = allHaveModule(chunk.getParents(), module);
-						module.rewriteChunkInReasons(chunk, Array.from(parentChunksWithModule));
+						module.rewriteChunkInReasons(chunk, getParentChunksWithModule(chunk, module));
 						chunk.removeModule(module);
 					}
 				}
