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

Revert "REFACTOR npm scripts & minor code corrections"
8 years ago · 9b4db6ca44
parent beeb9e2ef1 3e4dceb317
commit 9b4db6ca44
21 changed files with 125 additions and 111 deletions
--- a/.babelrc
+++ b/.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",
+            ]
+}
--- a/README.md
+++ b/README.md
@ -5,9 +5,9 @@ Ethereum IDE and tools for the web

 ## REMIX WEBSITE:

-Remix is avalaible at http://ethereum.github.io/remix.
+Remix is avalaible at http://ethereum.github.io/remix. 
 You can use it either inside Mist or by connecting to geth or eth.
-Note that connecting to Geth does not work through https.
+Note that connecting to Geth does not work through https. 

 You'll have to run your own node using the following parameters:

@ -16,7 +16,7 @@ You'll have to run your own node using the following parameters:
 Using Geth:

    geth --rpc --rpcapi 'web3,eth,debug' --rpcport 8545 --rpccorsdomain '*'
-
+    
 Using Eth:

    eth -j --rpccorsdomain '*'
@ -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`
-
-open `remix/index.html` in your browser.
-
-## TEST:
-
-* For unit tests run `npm test`
+    git clone https://github.com/ethereum/remix
+    cd remix
+    npm install && npm run build && npm run start_node

-* 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:

@ -60,7 +45,7 @@ There's two way of doing that:
 - using a block number and a transaction index.
 - using a transaction hash.

-When loading the transaction succeed, the hash, from and to field will show up.
+When loading the transaction succeed, the hash, from and to field will show up. 
 Then the vm trace is loaded.

 The debugger itself contains several controls that allow stepping over the trace and seing the current state of a selected step.
@ -76,7 +61,7 @@ Stepping actions are:
 - Jump Next Call (this will select the next state that refers to a context changes - CALL, CALLCODE, DELEGATECALL, CREATE)

 #### State Viewer:
-
+ 
 The upper right panel contains basic informations about the current step:
 - VMTraceStep: the index in the trace of the current step.
 - Step
--- a/package.json
+++ b/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"]
    ]
  }
 }
--- a/src/ui/TreeView.js
+++ b/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
--- a/test/astwalker.js
+++ b/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) {
--- a/test/codeManager.js
+++ b/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
--- a/test/disassembler.js
+++ b/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) {
--- a/test/eventManager.js
+++ b/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()
--- a/test/index.js
+++ b/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()
--- a/test/solidity/decodeInfo.js
+++ b/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')

--- a/test/solidity/localDecoder.js
+++ b/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')
--- a/test/solidity/localsTests/helper.js
+++ b/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
--- a/test/solidity/localsTests/int.js
+++ b/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) {
--- a/test/solidity/localsTests/misc.js
+++ b/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) {
--- a/test/solidity/localsTests/misc2.js
+++ b/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) {
--- a/test/solidity/localsTests/structArray.js
+++ b/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) {
--- a/test/solidity/storageDecoder.js
+++ b/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) {
--- a/test/solidity/storageLocation.js
+++ b/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) {
--- a/test/sourceMappingDecoder.js
+++ b/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) {
--- a/test/traceManager.js
+++ b/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) {
--- a/test/util.js
+++ b/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) {