Merge pull request web3#120 from dchambers/make-browserify-compatibile

Make browserify compatibile
Dpk28 · Mar 16, 2015 · 517eff9 · 517eff9
2 parents cb7c209 + 768d4bf
commit 517eff9
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 31 deletions.
diff --git a/gulpfile.js b/gulpfile.js
@@ -25,7 +25,7 @@ var browserifyOptions = {
     debug: true,
     insert_global_vars: false, // jshint ignore:line
     detectGlobals: false,
-    bundleExternal: false
+    bundleExternal: true
 };
 
 gulp.task('versionReplace', function(){
@@ -58,6 +58,7 @@ gulp.task('build', ['clean'], function () {
     return browserify(browserifyOptions)
         .require('./' + src + '.js', {expose: 'web3'})
         .add('./' + src + '.js')
+        .ignore('crypto')
         .bundle()
         .pipe(exorcist(path.join( DEST, dst + '.js.map')))
         .pipe(source(dst + '.js'))

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

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

diff --git a/lib/utils/browser-xhr.js b/lib/utils/browser-xhr.js
@@ -0,0 +1,3 @@
+'use strict';
+
+exports.XMLHttpRequest = window.XMLHttpRequest;
diff --git a/lib/utils/config.js b/lib/utils/config.js
@@ -34,9 +34,7 @@
  */
 
 /// required to define ETH_BIGNUMBER_ROUNDING_MODE
-if (process.env.NODE_ENV !== 'build') {
-    var BigNumber = require('bignumber.js'); // jshint ignore:line
-}
+var BigNumber = require('bignumber.js');
 
 var ETH_UNITS = [ 
     'wei', 

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

diff --git a/lib/web3/httpprovider.js b/lib/web3/httpprovider.js
@@ -22,9 +22,7 @@
  * @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) {
     this.name  = 'HTTP';

diff --git a/package.json b/package.json
@@ -9,10 +9,11 @@
   },
   "dependencies": {
     "bignumber.js": ">=2.0.0",
-    "envify": "^3.0.0",
-    "unreachable-branch-transform": "^0.1.0",
     "xmlhttprequest": "*"
   },
+  "browser": {
+    "xmlhttprequest": "./lib/utils/browser-xhr.js"
+  },
   "devDependencies": {
     "bower": ">=1.3.0",
     "browserify": ">=6.0",
@@ -53,19 +54,6 @@
   "bugs": {
     "url": "https://github.com/ethereum/ethereum.js/issues"
   },
-  "browserify": {
-    "transform": [
-      [
-        "envify",
-        {
-          "NODE_ENV": "build"
-        }
-      ],
-      [
-        "unreachable-branch-transform"
-      ]
-    ]
-  },
   "keywords": [
     "ethereum",
     "javascript",
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		'use strict';

		exports.XMLHttpRequest = window.XMLHttpRequest;