Merge pull request webpack#5098 from KTruong888/4099_es6_refactor_dep_depblockhelpers

sokra · web-flow · commit 42cdfedb4ca1 · 2017-07-01T17:11:24.000+02:00
Issue webpack#4099: ES6 Refactor for depdendencies/DepBlockHelpers.js
diff --git a/lib/dependencies/DepBlockHelpers.js b/lib/dependencies/DepBlockHelpers.js
@@ -2,41 +2,38 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var DepBlockHelpers = exports;
+"use strict";
 
-DepBlockHelpers.getLoadDepBlockWrapper = function(depBlock, outputOptions, requestShortener, name) {
-	var promiseCode = DepBlockHelpers.getDepBlockPromise(depBlock, outputOptions, requestShortener, name);
+const DepBlockHelpers = exports;
+
+DepBlockHelpers.getLoadDepBlockWrapper = (depBlock, outputOptions, requestShortener, name) => {
+	const promiseCode = DepBlockHelpers.getDepBlockPromise(depBlock, outputOptions, requestShortener, name);
 	return [
 		promiseCode + ".then(",
 		").catch(",
 		")"
 	];
 };
 
-DepBlockHelpers.getDepBlockPromise = function(depBlock, outputOptions, requestShortener, name) {
+DepBlockHelpers.getDepBlockPromise = (depBlock, outputOptions, requestShortener, name) => {
 	if(depBlock.chunks) {
-		var chunks = depBlock.chunks.filter(function(chunk) {
-			return !chunk.hasRuntime() && chunk.id !== null;
-		});
+		const chunks = depBlock.chunks.filter(chunk => !chunk.hasRuntime() && chunk.id !== null);
+		const pathChunkCheck = outputOptions.pathinfo && depBlock.chunkName;
+		const shortChunkName = requestShortener.shorten(depBlock.chunkName);
+		const chunkReason = asComment(depBlock.chunkReason);
+		const requireChunkId = chunk => "__webpack_require__.e(" + JSON.stringify(chunk.id) + ")";
+		name = asComment(name);
 		if(chunks.length === 1) {
-			var chunk = chunks[0];
-			return "__webpack_require__.e" + asComment(name) + "(" + JSON.stringify(chunk.id) + "" +
-				(outputOptions.pathinfo && depBlock.chunkName ? "/*! " + requestShortener.shorten(depBlock.chunkName) + " */" : "") +
-				asComment(depBlock.chunkReason) + ")";
+			const chunkId = JSON.stringify(chunks[0].id);
+			return `__webpack_require__.e${name}(${chunkId}${pathChunkCheck ? "/*! " + shortChunkName + " */" : ""}${chunkReason})`;
 		} else if(chunks.length > 0) {
-			return "Promise.all" + asComment(name) + "(" +
-				(outputOptions.pathinfo && depBlock.chunkName ? "/*! " + requestShortener.shorten(depBlock.chunkName) + " */" : "") +
-				"[" +
-				chunks.map(function(chunk) {
-					return "__webpack_require__.e(" + JSON.stringify(chunk.id) + ")";
-				}).join(", ") +
-				"])";
+			return `Promise.all${name}(${pathChunkCheck ? "/*! " + shortChunkName + " */" : ""}[${chunks.map(requireChunkId).join(", ")}])`;
 		}
 	}
 	return "new Promise(function(resolve) { resolve(); })";
 };
 
 function asComment(str) {
 	if(!str) return "";
-	return "/* " + str + " */";
+	return `/* ${str} */`;
 }
