Fixed ArrayBuffer dosen't work in Webpack.

pull/8/head v0.4.1
Chen, Yi-Cyuan 9 years ago
parent 80d540792b
commit c724643de0

@ -1,2 +1,2 @@
/node_modules/
/tests/ /tests/
node_modules/

6
.gitignore vendored

@ -1,3 +1,3 @@
node_modules/ /node_modules/
covreporter /covreporter/
my_test /my_test/

@ -1,5 +1,9 @@
# Change Log # Change Log
## v0.4.1 / 2016-12-30
### Fixed
- ArrayBuffer dosen't work in Webpack.
## v0.4.0 / 2016-12-05 ## v0.4.0 / 2016-12-05
### Added ### Added
- update method. - update method.

@ -1,6 +1,6 @@
{ {
"name": "js-sha1", "name": "js-sha1",
"version": "0.4.0", "version": "0.4.1",
"main": ["src/sha1.js"], "main": ["src/sha1.js"],
"ignore": [ "ignore": [
"samples", "samples",

4
build/sha1.min.js vendored

File diff suppressed because one or more lines are too long

@ -1,6 +1,6 @@
{ {
"name": "js-sha1", "name": "js-sha1",
"version": "0.4.0", "version": "0.4.1",
"description": "A simple SHA1 hash function for JavaScript supports UTF-8 encoding.", "description": "A simple SHA1 hash function for JavaScript supports UTF-8 encoding.",
"main": "src/sha1.js", "main": "src/sha1.js",
"devDependencies": { "devDependencies": {

@ -1,20 +1,22 @@
/* /*
* [js-sha1]{@link https://github.com/emn178/js-sha1} * [js-sha1]{@link https://github.com/emn178/js-sha1}
* *
* @version 0.4.0 * @version 0.4.1
* @author Chen, Yi-Cyuan [emn178@gmail.com] * @author Chen, Yi-Cyuan [emn178@gmail.com]
* @copyright Chen, Yi-Cyuan 2014-2016 * @copyright Chen, Yi-Cyuan 2014-2016
* @license MIT * @license MIT
*/ */
(function(root) { /*jslint bitwise: true */
(function() {
'use strict'; 'use strict';
var NODE_JS = typeof process == 'object' && process.versions && process.versions.node; var root = typeof window === 'object' ? window : {};
var NODE_JS = !root.JS_SHA1_NO_NODE_JS && typeof process === 'object' && process.versions && process.versions.node;
if (NODE_JS) { if (NODE_JS) {
root = global; root = global;
} }
var COMMON_JS = !root.JS_SHA1_TEST && typeof module == 'object' && module.exports; var COMMON_JS = !root.JS_SHA1_NO_COMMON_JS && typeof module === 'object' && module.exports;
var AMD = typeof define == 'function' && define.amd; var AMD = typeof define === 'function' && define.amd;
var HEX_CHARS = '0123456789abcdef'.split(''); var HEX_CHARS = '0123456789abcdef'.split('');
var EXTRA = [-2147483648, 8388608, 32768, 128]; var EXTRA = [-2147483648, 8388608, 32768, 128];
var SHIFT = [24, 16, 8, 0]; var SHIFT = [24, 16, 8, 0];
@ -47,21 +49,12 @@
}; };
var nodeWrap = function (method) { var nodeWrap = function (method) {
var crypto, Buffer; var crypto = require('crypto');
try { var Buffer = require('buffer').Buffer;
if (root.JS_SHA1_TEST) {
throw 'JS_SHA1_TEST';
}
crypto = require('crypto');
Buffer = require('buffer').Buffer;
} catch (e) {
console.log(e);
return method;
}
var nodeMethod = function (message) { var nodeMethod = function (message) {
if (typeof message == 'string') { if (typeof message === 'string') {
return crypto.createHash('sha1').update(message, 'utf8').digest('hex'); return crypto.createHash('sha1').update(message, 'utf8').digest('hex');
} else if (message.constructor == ArrayBuffer) { } else if (message.constructor === ArrayBuffer) {
message = new Uint8Array(message); message = new Uint8Array(message);
} else if (message.length === undefined) { } else if (message.length === undefined) {
return method(message); return method(message);
@ -97,8 +90,8 @@
if (this.finalized) { if (this.finalized) {
return; return;
} }
var notString = typeof(message) != 'string'; var notString = typeof(message) !== 'string';
if (notString && message.constructor == root.ArrayBuffer) { if (notString && message.constructor === root.ArrayBuffer) {
message = new Uint8Array(message); message = new Uint8Array(message);
} }
var code, index = 0, i, length = message.length || 0, blocks = this.blocks; var code, index = 0, i, length = message.length || 0, blocks = this.blocks;
@ -370,4 +363,4 @@
}); });
} }
} }
}(this)); })();

@ -1,12 +1,26 @@
sha1 = require('../src/sha1.js'); // Node.js env
expect = require('expect.js'); expect = require('expect.js');
sha1 = require('../src/sha1.js');
require('./test.js'); require('./test.js');
delete require.cache[require.resolve('../src/sha1.js')] delete require.cache[require.resolve('../src/sha1.js')];
delete require.cache[require.resolve('./test.js')] delete require.cache[require.resolve('./test.js')];
sha1 = null;
// Webpack browser env
JS_SHA1_NO_NODE_JS = true;
window = global;
sha1 = require('../src/sha1.js');
require('./test.js');
delete require.cache[require.resolve('../src/sha1.js')];
delete require.cache[require.resolve('./test.js')];
sha1 = null; sha1 = null;
JS_SHA1_TEST = true; // browser env
JS_SHA1_NO_NODE_JS = true;
JS_SHA1_NO_COMMON_JS = true;
window = global;
require('../src/sha1.js'); require('../src/sha1.js');
require('./test.js'); require('./test.js');
@ -14,6 +28,10 @@ delete require.cache[require.resolve('../src/sha1.js')];
delete require.cache[require.resolve('./test.js')]; delete require.cache[require.resolve('./test.js')];
sha1 = null; sha1 = null;
// browser AMD
JS_SHA1_NO_NODE_JS = true;
JS_SHA1_NO_COMMON_JS = true;
window = global;
define = function (func) { define = function (func) {
sha1 = func(); sha1 = func();
require('./test.js'); require('./test.js');

@ -49,7 +49,6 @@
'5ba93c9db0cff93f52b521d7420e43f6eda2784f': new ArrayBuffer(1) '5ba93c9db0cff93f52b521d7420e43f6eda2784f': new ArrayBuffer(1)
}, },
'Object': { 'Object': {
'da39a3ee5e6b4b0d3255bfef95601890afd80709': {},
'da39a3ee5e6b4b0d3255bfef95601890afd80709': {what: 'ever'} 'da39a3ee5e6b4b0d3255bfef95601890afd80709': {what: 'ever'}
} }
}; };
@ -58,7 +57,7 @@
testCases['Buffer'] = { testCases['Buffer'] = {
'da39a3ee5e6b4b0d3255bfef95601890afd80709': new Buffer(0), 'da39a3ee5e6b4b0d3255bfef95601890afd80709': new Buffer(0),
'2fd4e1c67a2d28fced849ee1bb76e7391b93eb12': new Buffer(new Uint8Array([84, 104, 101, 32, 113, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 32, 102, 111, 120, 32, 106, 117, 109, 112, 115, 32, 111, 118, 101, 114, 32, 116, 104, 101, 32, 108, 97, 122, 121, 32, 100, 111, 103])) '2fd4e1c67a2d28fced849ee1bb76e7391b93eb12': new Buffer(new Uint8Array([84, 104, 101, 32, 113, 117, 105, 99, 107, 32, 98, 114, 111, 119, 110, 32, 102, 111, 120, 32, 106, 117, 109, 112, 115, 32, 111, 118, 101, 114, 32, 116, 104, 101, 32, 108, 97, 122, 121, 32, 100, 111, 103]))
} };
} }
var methods = [ var methods = [

Loading…
Cancel
Save