Merge branch 'master' into next

sokra · sokra · commit f55547ca6a95 · 2017-11-23T09:14:58.000+01:00
# Conflicts:
#	lib/Compiler.js
diff --git a/lib/optimize/ConcatenatedModule.js b/lib/optimize/ConcatenatedModule.js
@@ -7,6 +7,7 @@
 const Module = require("../Module");
 const Template = require("../Template");
 const Parser = require("../Parser");
+const crypto = require("crypto");
 const acorn = require("acorn");
 const escope = require("escope");
 const ReplaceSource = require("webpack-sources").ReplaceSource;
@@ -221,6 +222,7 @@ class ConcatenatedModule extends Module {
 				}
 			}
 		}
+		this._identifier = this._createIdentifier();
 	}
 
 	get modules() {
@@ -230,12 +232,7 @@ class ConcatenatedModule extends Module {
 	}
 
 	identifier() {
-		return this._orderedConcatenationList.map(info => {
-			switch(info.type) {
-				case "concatenated":
-					return info.module.identifier();
-			}
-		}).filter(Boolean).join(" ");
+		return this._identifier;
 	}
 
 	readableIdentifier(requestShortener) {
@@ -311,6 +308,18 @@ class ConcatenatedModule extends Module {
 		return list;
 	}
 
+	_createIdentifier() {
+		const orderedConcatenationListIdentifiers = this._orderedConcatenationList.map(info => {
+			switch(info.type) {
+				case "concatenated":
+					return info.module.identifier();
+			}
+		}).filter(Boolean).join(" ");
+		const hash = crypto.createHash("md5");
+		hash.update(orderedConcatenationListIdentifiers);
+		return this.rootModule.identifier() + " " + hash.digest("hex");
+	}
+
 	source(dependencyTemplates, outputOptions, requestShortener) {
 		// Metainfo for each module
 		const modulesWithInfo = this._orderedConcatenationList.map((info, idx) => {
diff --git a/test/Compiler.test.js b/test/Compiler.test.js
@@ -178,6 +178,14 @@ describe("Compiler", () => {
 			});
 		});
 		describe("parser", () => {
+			describe("plugin", () => {
+				it("invokes sets a 'compilation' plugin", (done) => {
+					compiler.plugin = sinon.spy();
+					compiler.parser.plugin();
+					compiler.plugin.callCount.should.be.exactly(1);
+					done();
+				});
+			});
 			describe("apply", () => {
 				it("invokes sets a 'compilation' plugin", (done) => {
 					compiler.plugin = sinon.spy();
