Use browserify's 'browser' field instead of 'envify' & 'unreachable-branch-transform to', plus always include 'bignumber.js' since it is needed in the browser.

This commit is contained in:
dchambers 2015-03-16 08:08:29 +00:00
parent eceeda7d08
commit 0267e85d41
7 changed files with 11 additions and 30 deletions

View File

@ -22,8 +22,7 @@ module.exports = function (config) {
// list of files / patterns to load in the browser // list of files / patterns to load in the browser
files: [ files: [
'node_modules/bignumber.js/bignumber.js', 'test/*.js'
'test/*.js',
], ],

View File

@ -20,10 +20,7 @@
* @date 2015 * @date 2015
*/ */
if (process.env.NODE_ENV !== 'build') { var BigNumber = require('bignumber.js');
var BigNumber = require('bignumber.js'); // jshint ignore:line
}
var utils = require('../utils/utils'); var utils = require('../utils/utils');
var c = require('../utils/config'); var c = require('../utils/config');

3
lib/utils/browser-xhr.js Normal file
View File

@ -0,0 +1,3 @@
'use strict';
exports.XMLHttpRequest = window.XMLHttpRequest;

View File

@ -34,9 +34,7 @@
*/ */
/// required to define ETH_BIGNUMBER_ROUNDING_MODE /// required to define ETH_BIGNUMBER_ROUNDING_MODE
if (process.env.NODE_ENV !== 'build') { var BigNumber = require('bignumber.js');
var BigNumber = require('bignumber.js'); // jshint ignore:line
}
var ETH_UNITS = [ var ETH_UNITS = [
'wei', 'wei',

View File

@ -33,9 +33,7 @@
* @constructor * @constructor
*/ */
if (process.env.NODE_ENV !== 'build') { var BigNumber = require('bignumber.js');
var BigNumber = require('bignumber.js'); // jshint ignore:line
}
var unitMap = { var unitMap = {
'wei': '1', 'wei': '1',

View File

@ -22,9 +22,7 @@
* @date 2014 * @date 2014
*/ */
if (process.env.NODE_ENV !== 'build') { var XMLHttpRequest = require('xmlhttprequest').XMLHttpRequest; // jshint ignore:line
var XMLHttpRequest = require('xmlhttprequest').XMLHttpRequest; // jshint ignore:line
}
var HttpProvider = function (host) { var HttpProvider = function (host) {
this.name = 'HTTP'; this.name = 'HTTP';

View File

@ -9,10 +9,11 @@
}, },
"dependencies": { "dependencies": {
"bignumber.js": ">=2.0.0", "bignumber.js": ">=2.0.0",
"envify": "^3.0.0",
"unreachable-branch-transform": "^0.1.0",
"xmlhttprequest": "*" "xmlhttprequest": "*"
}, },
"browser": {
"xmlhttprequest": "./lib/utils/browser-xhr.js"
},
"devDependencies": { "devDependencies": {
"bower": ">=1.3.0", "bower": ">=1.3.0",
"browserify": ">=6.0", "browserify": ">=6.0",
@ -53,19 +54,6 @@
"bugs": { "bugs": {
"url": "https://github.com/ethereum/ethereum.js/issues" "url": "https://github.com/ethereum/ethereum.js/issues"
}, },
"browserify": {
"transform": [
[
"envify",
{
"NODE_ENV": "build"
}
],
[
"unreachable-branch-transform"
]
]
},
"keywords": [ "keywords": [
"ethereum", "ethereum",
"javascript", "javascript",