Added CommonJS detection.

emn178 · Sep 12, 2016 · bb08d1f · bb08d1f
1 parent f0ff77c
commit bb08d1f
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v0.5.4 / 2016-09-12
+
+* Added CommonJS detection.
+
 # v0.5.3 / 2016-09-08
 
 * Added some files to npm package.

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "js-sha3",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "main": ["src/sha3.js"],
   "ignore": [
     "samples",

diff --git a/build/sha3.min.js b/build/sha3.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "js-sha3",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "description": "A simple SHA-3 / Keccak / Shake hash function for JavaScript supports UTF-8 encoding.",
   "main": "src/sha3.js",
   "devDependencies": {

diff --git a/src/sha3.js b/src/sha3.js
@@ -1,7 +1,7 @@
 /**
  * [js-sha3]{@link https://github.com/emn178/js-sha3}
  *
- * @version 0.5.3
+ * @version 0.5.4
  * @author Chen, Yi-Cyuan [emn178@gmail.com]
  * @copyright Chen, Yi-Cyuan 2015-2016
  * @license MIT
@@ -13,6 +13,7 @@
   if (NODE_JS) {
     root = global;
   }
+  var COMMON_JS = !root.JS_SHA3_TEST && typeof module == 'object' && module.exports;
   var HEX_CHARS = '0123456789abcdef'.split('');
   var SHAKE_PADDING = [31, 7936, 2031616, 520093696];
   var KECCAK_PADDING = [1, 256, 65536, 16777216];
@@ -460,7 +461,7 @@
     }
   }
 
-  if (!root.JS_SHA3_TEST && NODE_JS) {
+  if (COMMON_JS) {
     module.exports = methods;
   } else if (root) {
     for (var key in methods) {