Merge pull request #1176 from ethereum/plugLocalDebebugger

Plug local remix debugger

package.json

@@ -37,7 +37,6 @@
     "npm-run-all": "^4.0.2",
     "onchange": "^3.2.1",
     "remix-core": "latest",
-    "remix-debugger": "latest",
     "remix-lib": "latest",
     "remix-solidity": "latest",
     "remixd": "git+https://github.com/ethereum/remixd.git",
@@ -52,7 +51,8 @@
     "watchify": "^3.9.0",
     "web3": "^0.18.0",
     "webworkify": "^1.2.1",
-    "yo-yo": "^1.2.2"
+    "yo-yo": "^1.2.2",
+    "yo-yoify": "^3.1.0"
   },
   "repository": {
     "type": "git",

src/app/debugger/debugger.js

@@ -1,6 +1,6 @@
 'use strict'
 
-var remixDebugger = require('remix-debugger')
+var Ethdebugger = require('./remix-debugger/src/ui/Ethdebugger')
 var remixLib = require('remix-lib')
 var remixCore = require('remix-core')
 var executionContext = require('../../execution-context')
@@ -10,7 +10,7 @@ var executionContext = require('../../execution-context')
  */
 function Debugger (id, appAPI, editorEvent) {
   this.el = document.querySelector(id)
-  this.debugger = new remixDebugger.ui.Debugger(
+  this.debugger = new Ethdebugger(
     {
       compilationResult: () => {
         var compilationResult = self.appAPI.lastCompilationResult()

src/app/debugger/remix-debugger/index.js

@@ -1,24 +0,0 @@
-'use strict'
-var VMDebugger = require('./src/ui/VmDebugger')
-var Debugger = require('./src/ui/Ethdebugger')
-var BasicPanel = require('./src/ui/BasicPanel')
-var TreeView = require('./src/ui/TreeView')
-
-if (typeof (module) !== 'undefined' && typeof (module.exports) !== 'undefined') {
-  module.exports = modules()
-}
-
-if (typeof (window) !== 'undefined') {
-  window.remix = modules()
-}
-
-function modules () {
-  return {
-    ui: {
-      Debugger: Debugger,
-      VMdebugger: VMDebugger,
-      BasicPanel: BasicPanel,
-      TreeView: TreeView
-    }
-  }
-}

src/app/debugger/remix-debugger/src/ui/BasicPanel.js

@@ -1,51 +0,0 @@
-'use strict'
-var style = require('./styles/basicStyles')
-var yo = require('yo-yo')
-var remixLib = require('remix-lib')
-var ui = remixLib.helpers.ui
-
-var csjs = require('csjs-inject')
-
-var css = csjs`
-  .container {
-    width: 70%;
-  }
-`
-
-function BasicPanel (_name, _width, _height) {
-  this.data
-  this.name = _name
-  this.width = _width
-  this.height = _height
-  this.view
-}
-
-BasicPanel.prototype.update = function () {
-  yo.update(this.view, this.render())
-}
-
-BasicPanel.prototype.hide = function () {
-  this.view.style.display = 'none'
-}
-
-BasicPanel.prototype.show = function () {
-  this.view.style.display = 'block'
-}
-
-BasicPanel.prototype.render = function () {
-  var view = yo`
-    <div css=${css.container} id='container' style=${ui.formatCss({'width': this.width})}>
-    <div style=${ui.formatCss(style.panel.title)}>
-      ${this.name}
-    </div>
-      <div style=${ui.formatCss({'height': this.height}, style.panel.tableContainer)}>
-      <pre style=${ui.formatCss({'width': this.width}, style.panel.table, style.font)} id='basicpanel' >${this.data}</pre>
-    </div>
-  </div>`
-  if (!this.view) {
-    this.view = view
-  }
-  return view
-}
-
-module.exports = BasicPanel

src/app/debugger/remix-debugger/src/ui/DropdownPanel.js

@@ -2,7 +2,7 @@
 var yo = require('yo-yo')
 const copy = require('clipboard-copy')
 var remixLib = require('remix-lib')
-var TreeView = require('./TreeView')
+var TreeView = require('../../../../ui/TreeView') // TODO setup a direct reference to the UI components
 var EventManager = remixLib.EventManager
 
 var csjs = require('csjs-inject')

src/app/files/file-explorer.js

@@ -1,5 +1,5 @@
 var yo = require('yo-yo')
-var Treeview = require('remix-debugger').ui.TreeView
+var Treeview = require('../ui/TreeView')
 var modalDialog = require('../ui/modaldialog')
 var modalDialogCustom = require('../ui/modal-dialog-custom')
 var remixLib = require('remix-lib')

src/app/tabs/compile-tab.js

@@ -6,7 +6,7 @@ var parseContracts = require('../contract/contractParser')
 var publishOnSwarm = require('../contract/publishOnSwarm')
 var modalDialog = require('../ui/modaldialog')
 var modalDialogCustom = require('../ui/modal-dialog-custom')
-var TreeView = require('remix-debugger').ui.TreeView
+var TreeView = require('../ui/TreeView')
 var copyToClipboard = require('../ui/copy-to-clipboard')
 
 var css = require('./styles/compile-tab-styles')

src/app/ui/util.js

@@ -1,4 +1,4 @@
-var TreeView = require('remix-debugger').ui.TreeView
+var TreeView = require('./TreeView')
 var ethJSUtil = require('ethereumjs-util')
 var BN = ethJSUtil.BN
 var remixLib = require('remix-lib')