Merge pull request #480 from ethereum/revert-215-master

Revert "REFACTOR npm scripts & minor code corrections"

.babelrc

@@ -0,0 +1,29 @@
+{
+  "plugins": [["fast-async", {
+                  "runtimePatten": null,
+                  "compiler": {
+                    "promises": true,
+                    "es7": true,
+                    "noRuntime": true,
+                    "wrapAwait": true
+                  }
+                  }],
+              "check-es2015-constants",
+              "transform-es2015-arrow-functions",
+              "transform-es2015-block-scoped-functions",
+              "transform-es2015-block-scoping",
+              "transform-es2015-classes",
+              "transform-es2015-computed-properties",
+              "transform-es2015-destructuring",
+              "transform-es2015-duplicate-keys",
+              "transform-es2015-for-of",
+              "transform-es2015-function-name",
+              "transform-es2015-literals",
+              "transform-es2015-object-super",
+              "transform-es2015-parameters",
+              "transform-es2015-shorthand-properties",
+              "transform-es2015-spread",
+              "transform-es2015-sticky-regex",
+              "transform-es2015-unicode-regex",
+            ]
+}

README.md

@@ -32,26 +32,11 @@ Brief instructions to build for linux(Todo add other platforms) we will add deta
 
 Install eth or geth, npm and node.js (see https://docs.npmjs.com/getting-started/installing-node), then do:
 
-    * `git clone https://github.com/ethereum/remix`
-    * `cd remix`
-    * `npm install`
-    * `npm start`
+    git clone https://github.com/ethereum/remix
+    cd remix
+    npm install && npm run build && npm run start_node
 
-open `remix/index.html` in your browser.
-
-## TEST:
-
-* For unit tests run `npm test`
-
-* For local headless browser tests
-  * run once to install selenium: `npm run selenium-install`
-  * every time you want to run local browser tests, run: `npm run test-browser`
-
-## DEVELOPING:
-
-Run `npm run start_dev` and open `http://127.0.0.1:8080` in your browser.
-
-Start developing and see your browser live reload when you save files
+open remix/index.html in your browser.
 
 ## REMIX First Step:
 

package.json

@@ -17,50 +17,59 @@
     "which": "^1.2.10"
   },
   "devDependencies": {
+    "babel-cli": "^6.16.0",
     "babel-eslint": "^7.1.1",
-    "babel-preset-es2015": "^6.24.0",
+    "babel-plugin-check-es2015-constants": "^6.8.0",
+    "babel-plugin-transform-es2015-arrow-functions": "^6.8.0",
+    "babel-plugin-transform-es2015-block-scoped-functions": "^6.8.0",
+    "babel-plugin-transform-es2015-block-scoping": "^6.18.0",
+    "babel-plugin-transform-es2015-classes": "^6.18.0",
+    "babel-plugin-transform-es2015-computed-properties": "^6.8.0",
+    "babel-plugin-transform-es2015-destructuring": "^6.18.0",
+    "babel-plugin-transform-es2015-duplicate-keys": "^6.8.0",
+    "babel-plugin-transform-es2015-for-of": "^6.18.0",
+    "babel-plugin-transform-es2015-function-name": "^6.9.0",
+    "babel-plugin-transform-es2015-literals": "^6.8.0",
+    "babel-plugin-transform-es2015-object-super": "^6.8.0",
+    "babel-plugin-transform-es2015-parameters": "^6.18.0",
+    "babel-plugin-transform-es2015-shorthand-properties": "^6.18.0",
+    "babel-plugin-transform-es2015-spread": "^6.8.0",
+    "babel-plugin-transform-es2015-sticky-regex": "^6.8.0",
+    "babel-plugin-transform-es2015-template-literals": "^6.8.0",
+    "babel-plugin-transform-es2015-unicode-regex": "^6.11.0",
+    "babel-plugin-transform-regenerator": "^6.16.1",
     "babelify": "^7.3.0",
     "browserify": "^13.0.1",
     "ethereum-common": "0.0.18",
-    "ethereumjs-block": "^1.2.2",
-    "ethereumjs-tx": "^1.1.1",
     "ethereumjs-util": "^4.5.0",
-    "ethereumjs-vm": "^2.0.1",
     "fast-async": "^6.1.2",
     "http-server": "^0.9.0",
     "nightwatch": "^0.9.5",
-    "selenium-standalone": "^6.0.1",
     "solc": "^0.4.3",
     "standard": "^7.0.1",
     "standard-reporter": "^1.0.5",
     "tape": "^4.6.0",
     "web3": "^0.15.3",
     "yo-yo": "^1.2.1",
-    "yo-yoify": "^3.1.0"
+    "yo-yoify": "^3.1.0",
+    "ethereumjs-block": "^1.2.2",
+    "ethereumjs-tx": "^1.1.1",
+    "ethereumjs-vm": "^2.0.1"
   },
   "scripts": {
-    "build": "mkdirp build; browserify src/index.js > build/app.js",
-    "lint": "standard | notify-error",
+    "start_node": "./runNode.sh",
+    "start_eth": "npm run warning_message; eth -j --rpccorsdomain '*'",
+    "start_geth": "npm run warning_message; geth --rpc --rpcapi 'web3,eth,debug' --rpcport 8545 --rpccorsdomain '*'",
+    "build": "mkdir build; browserify src/index.js -g yo-yoify -o build/app.js -t [ babelify ]; babel --plugins=transform-es2015-template-literals build/app.js --out-file build/app.js",
+    "test": "standard; babel src --out-dir babelify-src; tape ./test/tests.js",
+    "serve": "http-server .",
     "nightwatch_local": "nightwatch --config nightwatch.js --env local",
-    "nightwatch_remote_chrome": "nightwatch --config nightwatch.js --env chrome",
     "nightwatch_remote_firefox": "nightwatch --config nightwatch.js --env default",
+    "nightwatch_remote_chrome": "nightwatch --config nightwatch.js --env chrome",
+    "nightwatch_remote_safari": "nightwatch --config nightwatch.js --env safari",
     "nightwatch_remote_ie": "nightwatch --config nightwatch.js --env ie",
     "nightwatch_remote_parallel": "nightwatch --config nightwatch.js --env ie,safari,chrome,default",
-    "nightwatch_remote_safari": "nightwatch --config nightwatch.js --env safari",
-    "onchange": "onchange build/app.js -- npm run lint",
-    "prepublish": "npm run build",
-    "selenium": "selenium-standalone start",
-    "selenium-install": "selenium-standalone install",
-    "serve": "http-server .",
-    "start": "./runNode.sh",
-    "start_dev": "npm-run-all -lpr serve watch onchange",
-    "start_eth": "npm run warning_message; eth -j --rpccorsdomain '*'",
-    "start_geth": "npm run warning_message; geth --rpc --rpcapi 'web3,eth,debug' --rpcport 8545 --rpccorsdomain '*'",
-    "test": "standard; tape ./test/tests.js",
-    "test-browser": "npm-run-all -lpr selenium serve waittest",
-    "waittest": "sleep 5 && npm run nightwatch_local",
-    "warning_message": "echo 'DO NOT DO THIS IF eth/geth STORES PRIVATE KEYS!! External system might be able to access your node through the RPC server.\n\n';",
-    "watch": "mkdirp build; watchify src/index.js -p [ browserify-livereload --host 127.0.0.1 --port 1337 ] -dv -o build/app.js"
+    "warning_message": "echo 'DO NOT DO THIS IF eth/geth STORES PRIVATE KEYS!! External system might be able to access your node through the RPC server.\n\n';"
   },
   "repository": {
     "type": "git",
@@ -82,21 +91,8 @@
   },
   "browserify": {
     "transform": [
-      ["babelify", {
-        "plugins": [
-          ["fast-async", {
-            "runtimePatten": null,
-            "compiler": {
-              "promises": true,
-              "es7": true,
-              "noRuntime": true,
-              "wrapAwait": true
-            }
-          }]
-        ]
-      }],
-      ["yo-yoify"],
-      ["babelify", { "presets": ["es2015"] }]
+      ["babelify"],
+      ["yo-yoify"]
     ]
   }
 }

src/ui/TreeView.js

@@ -6,6 +6,10 @@ var ui = require('../helpers/ui')
 class TreeView {
 
   constructor (opts) {
+    function noop (node) {
+    }
+    this.beforeJsonNodeRendered = opts.beforeJsonNodeRendered || noop
+    this.beforeJsonValueRendered = opts.beforeJsonValueRendered || noop
     this.extractData = opts.extractData || this.extractDataDefault
     this.formatSelf = opts.formatSelf || this.formatSelfDefault
     this.view = null

test/astwalker.js

@@ -1,6 +1,6 @@
 'use strict'
 var tape = require('tape')
-var AstWalker = require('../src/util/astWalker')
+var AstWalker = require('../babelify-src/util/astWalker')
 var node = require('./resources/ast')
 
 tape('ASTWalker', function (t) {

test/codeManager.js

@@ -1,10 +1,10 @@
 'use strict'
 var tape = require('tape')
-var Web3Providers = require('../src/web3Provider/web3Providers')
-var TraceManager = require('../src/trace/traceManager')
-var CodeManager = require('../src/code/codeManager')
+var Web3Providers = require('../babelify-src/web3Provider/web3Providers')
+var TraceManager = require('../babelify-src/trace/traceManager')
+var CodeManager = require('../babelify-src/code/codeManager')
 var web3Test = require('./resources/testWeb3')
-var util = require('../src/helpers/global')
+var util = require('../babelify-src/helpers/global')
 
 tape('CodeManager', function (t) {
   var codeManager

test/disassembler.js

@@ -1,7 +1,7 @@
 'use strict'
 
 var tape = require('tape')
-var disassemble = require('../src/code/disassembler').disassemble
+var disassemble = require('../babelify-src/code/disassembler').disassemble
 
 tape('Disassembler', function (t) {
   t.test('empty', function (st) {

test/eventManager.js

@@ -1,6 +1,6 @@
 'use strict'
 var tape = require('tape')
-var EventManager = require('../src/lib/eventManager')
+var EventManager = require('../babelify-src/lib/eventManager')
 tape('eventManager', function (t) {
   t.test('eventManager', function (st) {
     var events = new EventManager()

test/index.js

@@ -1,6 +1,6 @@
 'use strict'
 var tape = require('tape')
-var init = require('../src/helpers/init')
+var init = require('../babelify-src/helpers/init')
 tape('index', function (t) {
   t.test('loadContext - web3', function (st) {
     var web3 = init.loadWeb3()

test/solidity/decodeInfo.js

@@ -1,7 +1,7 @@
 'use strict'
 var tape = require('tape')
 var compiler = require('solc')
-var index = require('../../src/index')
+var index = require('../../babelify-src/index')
 var contracts = require('./contracts/miscContracts')
 var simplecontracts = require('./contracts/simpleContract')
 

test/solidity/localDecoder.js

@@ -6,8 +6,8 @@ var miscLocal = require('./contracts/miscLocal')
 var structArrayLocal = require('./contracts/structArrayLocal')
 var VM = require('ethereumjs-vm')
 var utileth = require('ethereumjs-util')
-var Web3Providers = require('../../src/web3Provider/web3Providers')
-var util = require('../../src/helpers/global')
+var Web3Providers = require('../../babelify-src/web3Provider/web3Providers')
+var util = require('../../babelify-src/helpers/global')
 var intLocalTest = require('./localsTests/int')
 var miscLocalTest = require('./localsTests/misc')
 var misc2LocalTest = require('./localsTests/misc2')

test/solidity/localsTests/helper.js

@@ -1,5 +1,5 @@
 'use strict'
-var localDecoder = require('../../../src/solidity/localDecoder')
+var localDecoder = require('../../../babelify-src/solidity/localDecoder')
 
 /*
   Decode local variable

test/solidity/localsTests/int.js

@@ -1,12 +1,12 @@
 'use strict'
-var TraceManager = require('../../../src/trace/traceManager')
-var CodeManager = require('../../../src/code/codeManager')
+var TraceManager = require('../../../babelify-src/trace/traceManager')
+var CodeManager = require('../../../babelify-src/code/codeManager')
 var vmSendTx = require('./vmCall')
-var traceHelper = require('../../../src/helpers/traceHelper')
-var util = require('../../../src/helpers/global')
-var SolidityProxy = require('../../../src/solidity/solidityProxy')
-var InternalCallTree = require('../../../src/util/internalCallTree')
-var EventManager = require('../../../src/lib/eventManager')
+var traceHelper = require('../../../babelify-src/helpers/traceHelper')
+var util = require('../../../babelify-src/helpers/global')
+var SolidityProxy = require('../../../babelify-src/solidity/solidityProxy')
+var InternalCallTree = require('../../../babelify-src/util/internalCallTree')
+var EventManager = require('../../../babelify-src/lib/eventManager')
 var helper = require('./helper')
 
 module.exports = function (st, vm, privateKey, contractBytecode, compilationResult, cb) {

test/solidity/localsTests/misc.js

@@ -1,12 +1,12 @@
 'use strict'
-var TraceManager = require('../../../src/trace/traceManager')
-var CodeManager = require('../../../src/code/codeManager')
+var TraceManager = require('../../../babelify-src/trace/traceManager')
+var CodeManager = require('../../../babelify-src/code/codeManager')
 var vmSendTx = require('./vmCall')
-var traceHelper = require('../../../src/helpers/traceHelper')
-var util = require('../../../src/helpers/global')
-var SolidityProxy = require('../../../src/solidity/solidityProxy')
-var InternalCallTree = require('../../../src/util/internalCallTree')
-var EventManager = require('../../../src/lib/eventManager')
+var traceHelper = require('../../../babelify-src/helpers/traceHelper')
+var util = require('../../../babelify-src/helpers/global')
+var SolidityProxy = require('../../../babelify-src/solidity/solidityProxy')
+var InternalCallTree = require('../../../babelify-src/util/internalCallTree')
+var EventManager = require('../../../babelify-src/lib/eventManager')
 var helper = require('./helper')
 
 module.exports = function (st, vm, privateKey, contractBytecode, compilationResult, cb) {

test/solidity/localsTests/misc2.js

@@ -1,12 +1,12 @@
 'use strict'
-var TraceManager = require('../../../src/trace/traceManager')
-var CodeManager = require('../../../src/code/codeManager')
+var TraceManager = require('../../../babelify-src/trace/traceManager')
+var CodeManager = require('../../../babelify-src/code/codeManager')
 var vmSendTx = require('./vmCall')
-var traceHelper = require('../../../src/helpers/traceHelper')
-var util = require('../../../src/helpers/global')
-var SolidityProxy = require('../../../src/solidity/solidityProxy')
-var InternalCallTree = require('../../../src/util/internalCallTree')
-var EventManager = require('../../../src/lib/eventManager')
+var traceHelper = require('../../../babelify-src/helpers/traceHelper')
+var util = require('../../../babelify-src/helpers/global')
+var SolidityProxy = require('../../../babelify-src/solidity/solidityProxy')
+var InternalCallTree = require('../../../babelify-src/util/internalCallTree')
+var EventManager = require('../../../babelify-src/lib/eventManager')
 var helper = require('./helper')
 
 module.exports = function (st, vm, privateKey, contractBytecode, compilationResult, cb) {

test/solidity/localsTests/structArray.js

@@ -1,12 +1,12 @@
 'use strict'
-var TraceManager = require('../../../src/trace/traceManager')
-var CodeManager = require('../../../src/code/codeManager')
+var TraceManager = require('../../../babelify-src/trace/traceManager')
+var CodeManager = require('../../../babelify-src/code/codeManager')
 var vmSendTx = require('./vmCall')
-var traceHelper = require('../../../src/helpers/traceHelper')
-var util = require('../../../src/helpers/global')
-var SolidityProxy = require('../../../src/solidity/solidityProxy')
-var InternalCallTree = require('../../../src/util/internalCallTree')
-var EventManager = require('../../../src/lib/eventManager')
+var traceHelper = require('../../../babelify-src/helpers/traceHelper')
+var util = require('../../../babelify-src/helpers/global')
+var SolidityProxy = require('../../../babelify-src/solidity/solidityProxy')
+var InternalCallTree = require('../../../babelify-src/util/internalCallTree')
+var EventManager = require('../../../babelify-src/lib/eventManager')
 var helper = require('./helper')
 
 module.exports = function (st, vm, privateKey, contractBytecode, compilationResult, cb) {

test/solidity/storageDecoder.js

@@ -1,7 +1,7 @@
 'use strict'
 var tape = require('tape')
 var compiler = require('solc')
-var stateDecoder = require('../../src/index').solidity.stateDecoder
+var stateDecoder = require('../../babelify-src/index').solidity.stateDecoder
 
 tape('solidity', function (t) {
   t.test('storage decoder', function (st) {

test/solidity/storageLocation.js

@@ -1,7 +1,7 @@
 'use strict'
 var tape = require('tape')
 var compiler = require('solc')
-var index = require('../../src/index')
+var index = require('../../babelify-src/index')
 var contracts = require('./contracts/miscContracts')
 
 tape('solidity', function (t) {

test/sourceMappingDecoder.js

@@ -1,6 +1,6 @@
 'use strict'
 var tape = require('tape')
-var SourceMappingDecoder = require('../src/util/sourceMappingDecoder')
+var SourceMappingDecoder = require('../babelify-src/util/sourceMappingDecoder')
 var compiler = require('solc')
 
 tape('SourceMappingDecoder', function (t) {

test/traceManager.js

@@ -1,8 +1,8 @@
 'use strict'
-var TraceManager = require('../src/trace/traceManager')
+var TraceManager = require('../babelify-src/trace/traceManager')
 var tape = require('tape')
-var Web3Providers = require('../src/web3Provider/web3Providers')
-var util = require('../src/helpers/global')
+var Web3Providers = require('../babelify-src/web3Provider/web3Providers')
+var util = require('../babelify-src/helpers/global')
 var web3Test = require('./resources/testWeb3')
 
 tape('TraceManager', function (t) {

test/util.js

@@ -1,8 +1,8 @@
 'use strict'
 var sourceMapping = require('./resources/sourceMapping')
-var index = require('../src/index')
+var index = require('../babelify-src/index')
 var tape = require('tape')
-var util = require('../src/helpers/util')
+var util = require('../babelify-src/helpers/util')
 
 tape('Util', function (t) {
   t.test('lowerbound', function (st) {