Merge remote-tracking branch 'maraoz/feature/bundle-name'
Conflicts: browser/bitcore-0.1.24.js
This commit is contained in:
commit
4e3b258f07
File diff suppressed because one or more lines are too long
|
@ -0,0 +1 @@
|
||||||
|
bitcore-0.1.24.js
|
|
@ -181,7 +181,10 @@ if (require.main === module) {
|
||||||
testBundle.pipe(fs.createWriteStream('browser/testdata.js'));
|
testBundle.pipe(fs.createWriteStream('browser/testdata.js'));
|
||||||
}
|
}
|
||||||
var bitcoreBundle = createBitcore(program);
|
var bitcoreBundle = createBitcore(program);
|
||||||
bitcoreBundle.pipe(program.stdout ? process.stdout : fs.createWriteStream('browser/bundle.js'));
|
var pjson = require('../package.json');
|
||||||
|
bitcoreBundle.pipe(
|
||||||
|
program.stdout ? process.stdout :
|
||||||
|
fs.createWriteStream('browser/bitcore-'+pjson.version+'.js'));
|
||||||
}
|
}
|
||||||
|
|
||||||
module.exports.createBitcore = createBitcore;
|
module.exports.createBitcore = createBitcore;
|
||||||
|
|
|
@ -1174,6 +1174,7 @@ var lookup = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
|
||||||
? Uint8Array
|
? Uint8Array
|
||||||
: Array
|
: Array
|
||||||
|
|
||||||
|
var ZERO = '0'.charCodeAt(0)
|
||||||
var PLUS = '+'.charCodeAt(0)
|
var PLUS = '+'.charCodeAt(0)
|
||||||
var SLASH = '/'.charCodeAt(0)
|
var SLASH = '/'.charCodeAt(0)
|
||||||
var NUMBER = '0'.charCodeAt(0)
|
var NUMBER = '0'.charCodeAt(0)
|
||||||
|
@ -1282,9 +1283,9 @@ var lookup = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
|
||||||
return output
|
return output
|
||||||
}
|
}
|
||||||
|
|
||||||
exports.toByteArray = b64ToByteArray
|
module.exports.toByteArray = b64ToByteArray
|
||||||
exports.fromByteArray = uint8ToBase64
|
module.exports.fromByteArray = uint8ToBase64
|
||||||
}(typeof exports === 'undefined' ? (this.base64js = {}) : exports))
|
}())
|
||||||
|
|
||||||
},{}],4:[function(require,module,exports){
|
},{}],4:[function(require,module,exports){
|
||||||
exports.read = function(buffer, offset, isLE, mLen, nBytes) {
|
exports.read = function(buffer, offset, isLE, mLen, nBytes) {
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
<script src="../node_modules/mocha/mocha.js"></script>
|
<script src="../node_modules/mocha/mocha.js"></script>
|
||||||
<script src="../node_modules/chai/chai.js"></script>
|
<script src="../node_modules/chai/chai.js"></script>
|
||||||
<script>mocha.setup('bdd')</script>
|
<script>mocha.setup('bdd')</script>
|
||||||
<script src="../browser/bundle.js"></script>
|
<script src="../browser/bitcore-latest.js"></script>
|
||||||
<script src="../browser/testdata.js"></script>
|
<script src="../browser/testdata.js"></script>
|
||||||
<script src="adapter.js"></script>
|
<script src="adapter.js"></script>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue