extract the last step of reconnecting the chunks to own methods

timse · timse · commit bcc10e8aa669 · 2017-02-21T23:47:54.000+11:00
diff --git a/lib/optimize/CommonsChunkPlugin.js b/lib/optimize/CommonsChunkPlugin.js
@@ -205,6 +205,44 @@ The available options are:
 		}
 	}
 
+	connectUsedChunkAndCommonChunk(usedChunks, commonChunk) {
+		for(let chunk of usedChunks) {
+			// set commonChunk as new sole parent
+			chunk.parents = [commonChunk];
+			// add chunk to commonChunk
+			commonChunk.addChunk(chunk);
+
+			for(let entrypoint of chunk.entrypoints) {
+				entrypoint.insertChunk(commonChunk, chunk);
+			}
+		}
+	}
+
+	connectChunkBlocksWithCommonChunk(chunks, commonChunk) {
+		for(let chunk of chunks) {
+			// only for non initial chunks
+			// TODO: why?
+			if(!chunk.isInitial()) {
+				for(let block of chunk.blocks) {
+					block.chunks.unshift(commonChunk);
+					commonChunk.addBlock(block);
+				}
+			}
+		}
+	}
+
+	getAsyncChunkOrigin(chunks) {
+		const origins = [];
+		for(let chunk of chunks) {
+			for(let origin of chunk.origins) {
+				const newOrigin = Object.create(origin);
+				newOrigin.reasons = (origin.reasons || []).concat("async commons");
+				origins.push(newOrigin);
+			}
+		}
+		return origins;
+	}
+
 	apply(compiler) {
 		const filenameTemplate = this.filenameTemplate;
 		const asyncOption = this.async;
@@ -246,36 +284,17 @@ The available options are:
 
 					this.connectModulesWithCommonChunk(commonChunk, reallyUsedModules);
 
-					if(asyncOption) {
-						for(let chunk of reallyUsedChunks) {
-							if(chunk.isInitial()) continue;
-							chunk.blocks.forEach((block) => {
-								block.chunks.unshift(commonChunk);
-								commonChunk.addBlock(block);
-							});
-						}
-						asyncChunk.origins = Array.from(reallyUsedChunks).map((chunk) => {
-							return chunk.origins.map((origin) => {
-								const newOrigin = Object.create(origin);
-								newOrigin.reasons = (origin.reasons || []).slice();
-								newOrigin.reasons.push("async commons");
-								return newOrigin;
-							});
-						}).reduce((arr, a) => {
-							arr.push.apply(arr, a);
-							return arr;
-						}, []);
-					} else {
-						usedChunks.forEach((chunk) => {
-							chunk.parents = [commonChunk];
-							chunk.entrypoints.forEach((ep) => {
-								ep.insertChunk(commonChunk, chunk);
-							});
-							commonChunk.addChunk(chunk);
-						});
-					}
+					// set filenameTemplate for chunk
 					if(filenameTemplate)
 						commonChunk.filenameTemplate = filenameTemplate;
+
+					if(asyncOption) {
+						this.connectChunkBlocksWithCommonChunk(reallyUsedChunks, commonChunk);
+						asyncChunk.origins = this.getAsyncChunkOrigin(reallyUsedChunks);
+						return;
+					}
+
+					this.connectUsedChunkAndCommonChunk(usedChunks, commonChunk);
 				});
 				return true;
 			});
