Merge branch 'master' of github.com:ethers-io/ethers.js

This commit is contained in:
Richard Moore 2018-06-03 16:46:23 -04:00
commit 6737128b84
No known key found for this signature in database
GPG Key ID: 525F70A6FCABC295
3 changed files with 13 additions and 5 deletions

@ -40,7 +40,7 @@ var transforms = {
"brorand/index.js": brorand,
// Used by sha3 if it exists; (so make it no exist)
"process/.*": undef,
// "process/.*": undef,
};
var modified = {};

2
package-lock.json generated

@ -1,6 +1,6 @@
{
"name": "ethers",
"version": "3.0.3",
"version": "3.0.18",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

@ -19,10 +19,11 @@
<script src="./dist/es6-promise.auto.js"></script>
<!--
Shim for PhantomJS:
- ArrayBuffer.isView
Shims for PhantomJS
-->
<script type="text/javascript">
// ArrayBuffer.isView
if (!ArrayBuffer.isView) {
ArrayBuffer.isView = function(obj) {
// @TODO: This should probably check various instanceof aswell
@ -30,11 +31,17 @@
}
}
// nextTick
if (!window.nextTick) {
window.nextTick = function (callback) { setTimeout(callback, 0); }
}
// https://github.com/nathanboktae/mocha-phantomjs-core#usage
if (typeof(initMochaPhantomJS) === 'function') {
initMochaPhantomJS();
}
</script>
<!-- Inject the mocha describe and it functions -->
@ -48,7 +55,8 @@
<!-- Run the test cases! -->
<script type="text/javascript">
//mocha.grep(new RegExp('...')).run();
// Use this to focus on specific test cases
//mocha.grep(new RegExp('Test Brain Wallets')).run();
mocha.run();
</script>
</body>