Merge branch 'master' into next

sokra · sokra · commit aa212a61d0a7 · 2017-11-24T22:07:20.000+01:00
# Conflicts:
#	lib/optimize/ConcatenatedModule.js
diff --git a/lib/optimize/ConcatenatedModule.js b/lib/optimize/ConcatenatedModule.js
@@ -321,12 +321,13 @@ class ConcatenatedModule extends Module {
 	}
 
 	_createIdentifier() {
-		const orderedConcatenationListIdentifiers = this._orderedConcatenationList.map(info => {
-			switch(info.type) {
-				case "concatenated":
-					return info.module.identifier();
+		let orderedConcatenationListIdentifiers = "";
+		for(let i = 0; i < this._orderedConcatenationList.length; i++) {
+			if(this._orderedConcatenationList[i].type === "concatenated") {
+				orderedConcatenationListIdentifiers += this._orderedConcatenationList[i].module.identifier();
+				orderedConcatenationListIdentifiers += " ";
 			}
-		}).filter(Boolean).join(" ");
+		}
 		const hash = createHash("md5");
 		hash.update(orderedConcatenationListIdentifiers);
 		return this.rootModule.identifier() + " " + hash.digest("hex");
