From d047ba541f3211f692193b2974199cd528bdf894 Mon Sep 17 00:00:00 2001 From: kumavis Date: Wed, 26 Oct 2016 15:27:38 -0700 Subject: [PATCH 1/2] mascara - example dapp - log main account --- library/example/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/example/index.js b/library/example/index.js index b23c15307..4a107df6a 100644 --- a/library/example/index.js +++ b/library/example/index.js @@ -17,7 +17,7 @@ function startApp(){ console.log('getting main account...') web3.eth.getAccounts(function(err, addresses){ if (err) throw err - console.log('set address') + console.log('set address', addresses[0]) primaryAccount = addresses[0] }) From b790b0c256daac5cfb6c94a98fbbea692e3c102e Mon Sep 17 00:00:00 2001 From: kumavis Date: Wed, 26 Oct 2016 15:29:13 -0700 Subject: [PATCH 2/2] mascara - remove global transpile --- library/server.js | 9 --------- package.json | 1 - 2 files changed, 10 deletions(-) diff --git a/library/server.js b/library/server.js index bb0b24e50..797ad8a77 100644 --- a/library/server.js +++ b/library/server.js @@ -80,15 +80,6 @@ function createBundle(entryPoint){ plugin: [watchify], }) - // global transpile - var bablePreset = require.resolve('babel-preset-es2015') - - bundler.transform(babelify, { - global: true, - presets: [bablePreset], - babelrc: false, - }) - bundler.on('update', bundle) bundle() diff --git a/package.json b/package.json index 7c6b60a4f..2ed978cd5 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,6 @@ }, "devDependencies": { "babel-eslint": "^6.0.5", - "babel-preset-es2015": "^6.6.0", "babel-register": "^6.7.2", "babelify": "^7.2.0", "beefy": "^2.1.5",