more options for hashing

sokra · sokra · commit 44f8709fbd47 · 2013-05-21T11:08:08.000+02:00
diff --git a/lib/Compilation.js b/lib/Compilation.js
@@ -521,25 +521,30 @@ Compilation.prototype.createChunkAssets = function createChunkAssets() {
 	var filename = outputOptions.filename || "bundle.js";
 	var chunkFilename = outputOptions.chunkFilename || "[id]." + filename.replace(Template.REGEXP_NAME, "");
 	var namedChunkFilename = outputOptions.namedChunkFilename || null;
-	var hash = new (require("crypto").Hash)("md5");
+	var hashFunction = outputOptions.hashFunction;
+	var hashDigest = outputOptions.hashDigest;
+	var hashDigestLength = outputOptions.hashDigestLength;
+	var hash = new (require("crypto").Hash)(hashFunction);
 	this.mainTemplate.updateHash(hash);
 	this.chunkTemplate.updateHash(hash);
 	this.moduleTemplate.updateHash(hash);
 	var i, chunk;
 	for(i = 0; i < this.chunks.length; i++) {
 		var chunk = this.chunks[i];
-		var chunkHash = new (require("crypto").Hash)("md5");
+		var chunkHash = new (require("crypto").Hash)(hashFunction);
 		chunk.updateHash(chunkHash);
 		this.chunkTemplate.updateHash(chunkHash);
-		chunk.hash = chunkHash.digest("hex");
+		chunk.hash = chunkHash.digest(hashDigest);
 		hash.update(chunk.hash);
+		chunk.renderedHash = chunk.hash.substr(0, hashDigestLength);
 	}
-	this.hash = hash = hash.digest("hex");
+	hash = hash.digest(hashDigest);
+	this.hash = hash.substr(0, hashDigestLength);
 	for(i = 0; i < this.modules.length; i++) {
 		var module = this.modules[i];
 		if(module.assets) {
 			Object.keys(module.assets).forEach(function(name) {
-				var file = name.replace(Template.REGEXP_HASH, hash);
+				var file = name.replace(Template.REGEXP_HASH, this.hash);
 				this.assets[file] = module.assets[name];
 				this.applyPlugins("module-asset", module, file);
 			}, this);
@@ -565,8 +570,8 @@ Compilation.prototype.createChunkAssets = function createChunkAssets() {
 			}
 			this.assets[
 				file = filename
-					.replace(Template.REGEXP_HASH, hash)
-					.replace(Template.REGEXP_CHUNKHASH, chunkHash)
+					.replace(Template.REGEXP_HASH, this.hash)
+					.replace(Template.REGEXP_CHUNKHASH, chunk.renderedHash)
 					.replace(Template.REGEXP_ID, chunk.id)
 					.replace(Template.REGEXP_NAME, chunk.name || "")
 			] = source;
@@ -587,15 +592,15 @@ Compilation.prototype.createChunkAssets = function createChunkAssets() {
 			this.assets[
 				file = chunkFilename
 					.replace(Template.REGEXP_HASH, hash)
-					.replace(Template.REGEXP_CHUNKHASH, chunkHash)
+					.replace(Template.REGEXP_CHUNKHASH, chunk.renderedHash)
 					.replace(Template.REGEXP_ID, chunk.id)
 			] = source;
 			chunk.files.push(file);
 			this.applyPlugins("chunk-asset", chunk, file);
 			if(namedChunkFilename && chunk.name) {
 				this.assets[
 					file = namedChunkFilename
-						.replace(Template.REGEXP_CHUNKHASH, chunkHash)
+						.replace(Template.REGEXP_CHUNKHASH, chunk.renderedHash)
 						.replace(Template.REGEXP_HASH, hash)
 						.replace(Template.REGEXP_ID, chunk.id)
 						.replace(Template.REGEXP_NAME, chunk.name || "")
diff --git a/lib/JsonpMainTemplate.js b/lib/JsonpMainTemplate.js
@@ -33,7 +33,7 @@ JsonpMainTemplate.prototype.renderRequireEnsure = function(hash, chunk) {
 	(function addChunk(c) {
 		if(chunkHashMap[c.id]) return;
 		if(c.id > 0)
-			chunkHashMap[c.id] = c.hash;
+			chunkHashMap[c.id] = c.renderedHash;
 		c.chunks.forEach(addChunk);
 	}(chunk));
 	return [
diff --git a/lib/WebpackOptionsDefaulter.js b/lib/WebpackOptionsDefaulter.js
@@ -20,6 +20,9 @@ function WebpackOptionsDefaulter() {
 	this.set("output.libraryTarget", "var");
 	this.set("output.path", "");
 	this.set("output.sourceMapFilename", "[file].map");
+	this.set("output.hashFunction", "md5");
+	this.set("output.hashDigest", "hex");
+	this.set("output.hashDigestLength", 20);
 
 	this.set("node.console", false);
 	this.set("node.process", true);
diff --git a/test/browsertest/library2config.js b/test/browsertest/library2config.js
@@ -1,4 +1,7 @@
 module.exports = {
+	output: {
+		hashDigestLength: 5
+	},
 	module: {
 		postLoaders: [
 			{ test: /extra2?\.js/, loader: "raw!extra!val?cacheable" }
