diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2016-10-27 06:34:23 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-27 06:34:23 +0800 |
| commit | 48220cff0e57ea56d3b3e2c2711ca83a4db96c01 (patch) | |
| tree | 90c8c967db3996f16caad353bc6d19c4d5123403 | |
| parent | 014c971b89f12f18a142eec4c8d9f356fcbb3633 (diff) | |
| parent | b790b0c256daac5cfb6c94a98fbbea692e3c102e (diff) | |
| download | tangerine-wallet-browser-48220cff0e57ea56d3b3e2c2711ca83a4db96c01.tar tangerine-wallet-browser-48220cff0e57ea56d3b3e2c2711ca83a4db96c01.tar.gz tangerine-wallet-browser-48220cff0e57ea56d3b3e2c2711ca83a4db96c01.tar.bz2 tangerine-wallet-browser-48220cff0e57ea56d3b3e2c2711ca83a4db96c01.tar.lz tangerine-wallet-browser-48220cff0e57ea56d3b3e2c2711ca83a4db96c01.tar.xz tangerine-wallet-browser-48220cff0e57ea56d3b3e2c2711ca83a4db96c01.tar.zst tangerine-wallet-browser-48220cff0e57ea56d3b3e2c2711ca83a4db96c01.zip | |
Merge pull request #778 from MetaMask/mascara-build
Mascara build
| -rw-r--r-- | library/example/index.js | 2 | ||||
| -rw-r--r-- | library/server.js | 9 | ||||
| -rw-r--r-- | package.json | 1 |
3 files changed, 1 insertions, 11 deletions
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] }) 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", |