Merge pull request webpack#6146 from EugeneHlushko/feature-xxhashjs

sokra · web-flow · commit 84a3b2cd1747 · 2017-12-21T08:48:52.000+01:00
Feature: Non-crypto hashing algorithm and opt-in through config
diff --git a/lib/util/createHash.js b/lib/util/createHash.js
@@ -33,11 +33,15 @@ class BulkUpdateDecorator {
 		if(this.buffer.length > 0) {
 			this.hash.update(this.buffer);
 		}
-		return this.hash.digest(encoding);
+		var digestResult = this.hash.digest(encoding);
+		return typeof digestResult === "string" ? digestResult : digestResult.toString();
 	}
 }
 
 module.exports = algorithm => {
+	if(typeof algorithm === "function") {
+		return new BulkUpdateDecorator(new algorithm());
+	}
 	switch(algorithm) {
 		// TODO add non-cryptographic algorithm here
 		default: return new BulkUpdateDecorator(require("crypto").createHash(algorithm));
diff --git a/package.json b/package.json
@@ -65,7 +65,8 @@
     "vm-browserify": "~0.0.0",
     "webpack-cli": "^1.5.2",
     "webpack-dev-middleware": "^1.9.0",
-    "worker-loader": "^0.8.0"
+    "worker-loader": "^0.8.0",
+    "xxhashjs": "^0.2.1"
   },
   "engines": {
     "node": ">=6.11.5"
diff --git a/schemas/WebpackOptions.json b/schemas/WebpackOptions.json
@@ -403,8 +403,15 @@
         },
         "hashFunction": {
           "description": "Algorithm used for generation the hash (see node.js crypto package)",
-          "minLength": 1,
-          "type": "string"
+          "anyOf": [
+            {
+              "type": "string",
+              "minLength": 1
+            },
+            {
+              "instanceof": "Function"
+            }
+          ]
         },
         "hashSalt": {
           "description": "Any string which is added to the hash to salt it",
diff --git a/test/configCases/custom-hash-function/xxhash/files/file1.js b/test/configCases/custom-hash-function/xxhash/files/file1.js
@@ -0,0 +1 @@
+module.exports = module.id;
diff --git a/test/configCases/custom-hash-function/xxhash/files/file10.js b/test/configCases/custom-hash-function/xxhash/files/file10.js
@@ -0,0 +1 @@
+module.exports = module.id;
diff --git a/test/configCases/custom-hash-function/xxhash/files/file11.js b/test/configCases/custom-hash-function/xxhash/files/file11.js
@@ -0,0 +1 @@
+module.exports = module.id;
diff --git a/test/configCases/custom-hash-function/xxhash/files/file12.js b/test/configCases/custom-hash-function/xxhash/files/file12.js
@@ -0,0 +1 @@
+module.exports = module.id;
diff --git a/test/configCases/custom-hash-function/xxhash/files/file13.js b/test/configCases/custom-hash-function/xxhash/files/file13.js
@@ -0,0 +1 @@
+module.exports = module.id;
diff --git a/test/configCases/custom-hash-function/xxhash/files/file14.js b/test/configCases/custom-hash-function/xxhash/files/file14.js
@@ -0,0 +1 @@
+module.exports = module.id;
diff --git a/test/configCases/custom-hash-function/xxhash/files/file15.js b/test/configCases/custom-hash-function/xxhash/files/file15.js
@@ -0,0 +1 @@
+module.exports = module.id;
diff --git a/test/configCases/custom-hash-function/xxhash/files/file2.js b/test/configCases/custom-hash-function/xxhash/files/file2.js
@@ -0,0 +1 @@
+module.exports = module.id;
diff --git a/test/configCases/custom-hash-function/xxhash/files/file3.js b/test/configCases/custom-hash-function/xxhash/files/file3.js
@@ -0,0 +1 @@
+module.exports = module.id;
diff --git a/test/configCases/custom-hash-function/xxhash/files/file4.js b/test/configCases/custom-hash-function/xxhash/files/file4.js
@@ -0,0 +1 @@
+module.exports = module.id;
diff --git a/test/configCases/custom-hash-function/xxhash/files/file5.js b/test/configCases/custom-hash-function/xxhash/files/file5.js
@@ -0,0 +1 @@
+module.exports = module.id;
diff --git a/test/configCases/custom-hash-function/xxhash/files/file6.js b/test/configCases/custom-hash-function/xxhash/files/file6.js
@@ -0,0 +1 @@
+module.exports = module.id;
diff --git a/test/configCases/custom-hash-function/xxhash/files/file7.js b/test/configCases/custom-hash-function/xxhash/files/file7.js
@@ -0,0 +1 @@
+module.exports = module.id;
diff --git a/test/configCases/custom-hash-function/xxhash/files/file8.js b/test/configCases/custom-hash-function/xxhash/files/file8.js
@@ -0,0 +1 @@
+module.exports = module.id;
diff --git a/test/configCases/custom-hash-function/xxhash/files/file9.js b/test/configCases/custom-hash-function/xxhash/files/file9.js
@@ -0,0 +1 @@
+module.exports = module.id;
diff --git a/test/configCases/custom-hash-function/xxhash/index.js b/test/configCases/custom-hash-function/xxhash/index.js
@@ -0,0 +1,8 @@
+it("should have unique ids", function () {
+	var ids = [];
+	for(var i = 1; i <= 15; i++) {
+		var id = require("./files/file" + i + ".js");
+		ids.indexOf(id).should.be.eql(-1);
+		ids.push(id);
+	}
+});
diff --git a/test/configCases/custom-hash-function/xxhash/webpack.config.js b/test/configCases/custom-hash-function/xxhash/webpack.config.js
@@ -0,0 +1,5 @@
+module.exports = [{
+	output: {
+		hashFunction: require("xxhashjs").h32
+	}
+}];
diff --git a/yarn.lock b/yarn.lock
@@ -1630,6 +1630,10 @@ csso@~2.3.1:
     clap "^1.0.9"
     source-map "^0.5.3"
 
+cuint@latest:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/cuint/-/cuint-0.2.2.tgz#408086d409550c2631155619e9fa7bcadc3b991b"
+
 cvss@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/cvss/-/cvss-1.0.2.tgz#df67e92bf12a796f49e928799c8db3ba74b9fcd6"
@@ -6036,6 +6040,12 @@ xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
 
+xxhashjs@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/xxhashjs/-/xxhashjs-0.2.1.tgz#9bbe9be896142976dfa34c061b2d068c43d30de0"
+  dependencies:
+    cuint latest
+
 y18n@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"

Original file line number	Diff line number	Diff line change
`@@ -33,11 +33,15 @@ class BulkUpdateDecorator {`
`33`	`33`	`if(this.buffer.length > 0) {`
`34`	`34`	`this.hash.update(this.buffer);`
`35`	`35`	`}`
`36`		`- return this.hash.digest(encoding);`
	`36`	`+ var digestResult = this.hash.digest(encoding);`
	`37`	`+ return typeof digestResult === "string" ? digestResult : digestResult.toString();`
`37`	`38`	`}`
`38`	`39`	`}`
`39`	`40`
`40`	`41`	`module.exports = algorithm => {`
	`42`	`+ if(typeof algorithm === "function") {`
	`43`	`+ return new BulkUpdateDecorator(new algorithm());`
	`44`	`+ }`
`41`	`45`	`switch(algorithm) {`
`42`	`46`	`// TODO add non-cryptographic algorithm here`
`43`	`47`	`default: return new BulkUpdateDecorator(require("crypto").createHash(algorithm));`