Merge pull request #615 from ethereum/npmsplit

.travis.yml

@@ -14,5 +14,6 @@ deploy:
   skip_cleanup: true
   on:
         branch: master
+        condition: $TEST_DIR = remix-debugger
 cache: false
 

remix-core/index.js

 var CodeManager = require('./src/code/codeManager')
+var BreakpointManager = require('./src/code/breakpointManager')
 var StorageViewer = require('./src/storage/storageViewer')
 var StorageResolver = require('./src/storage/storageResolver')
 var TraceManager = require('./src/trace/traceManager')
@@ -8,7 +9,8 @@ module.exports = {
     web3: null
   },
   code: {
-    CodeManager: CodeManager
+    CodeManager: CodeManager,
+    BreakpointManager: BreakpointManager
   },
   storage: {
     StorageViewer: StorageViewer,

remix-debugger/ci/deploy_from_travis.sh

@@ -11,6 +11,14 @@ git rm --cached -r .
 echo "# Automatic build" > README.md
 echo "Built website from {$SHA}. See https://github.com/ethereum/remix/ for details." >> README.md
 # -f is needed because "build" is part of .gitignore
+
+# copying file to the root folder
+cp remix-debugger/index.html index.html
+mkdir build
+cp remix-debugger/build/app.js build/app.js
+mkdir assets
+cp -R remix-debugger/assets/. assets/
+
 git add -f README.md index.html build/app.js assets
 git commit -m "Built website from {$SHA}."
 

remix-debugger/index.js

@@ -3,7 +3,6 @@ var VMDebugger = require('./src/ui/VmDebugger')
 var Debugger = require('./src/ui/Ethdebugger')
 var BasicPanel = require('./src/ui/BasicPanel')
 var TreeView = require('./src/ui/TreeView')
-var styleGuide = require('./src/ui/styles/style-guide')
 
 if (typeof (module) !== 'undefined' && typeof (module.exports) !== 'undefined') {
   module.exports = modules()
@@ -19,8 +18,7 @@ function modules () {
       Debugger: Debugger,
       VMdebugger: VMDebugger,
       BasicPanel: BasicPanel,
-      TreeView: TreeView,
-      styleGuide: styleGuide
+      TreeView: TreeView
     }
   }
 }

remix-debugger/src/ui/ButtonNavigator.js

@@ -4,7 +4,7 @@ var EventManager = remixLib.EventManager
 var yo = require('yo-yo')
 
 var csjs = require('csjs-inject')
-var styleGuide = require('./styles/style-guide')
+var styleGuide = remixLib.ui.styleGuide
 var styles = styleGuide()
 
 var css = csjs`

remix-debugger/src/ui/CodeListView.js

@@ -6,7 +6,7 @@ var ui = remixLib.helpers.ui
 var DropdownPanel = require('./DropdownPanel')
 var EventManager = remixLib.EventManager
 var csjs = require('csjs-inject')
-var styleGuide = require('./styles/style-guide')
+var styleGuide = remixLib.ui.styleGuide
 var styles = styleGuide()
 
 var css = csjs`

remix-debugger/src/ui/DropdownPanel.js

@@ -7,7 +7,7 @@ var TreeView = require('./TreeView')
 var EventManager = remixLib.EventManager
 
 var csjs = require('csjs-inject')
-var styleGuide = require('./styles/style-guide')
+var styleGuide = remixLib.ui.styleGuide
 var styles = styleGuide()
 
 var css = csjs`

remix-debugger/src/ui/TxBrowser.js

@@ -8,7 +8,7 @@ var init = remixLib.init
 var DropdownPanel = require('./DropdownPanel')
 var style = require('./styles/basicStyles')
 var csjs = require('csjs-inject')
-var styleGuide = require('./styles/style-guide')
+var styleGuide = remixLib.ui.styleGuide
 var styles = styleGuide()
 
 var css = csjs`

remix-lib/index.js

@@ -8,8 +8,10 @@ var init = require('./src/init')
 var util = require('./src/util')
 var Web3Providers = require('./src/web3Provider/web3Providers')
 var DummyProvider = require('./src/web3Provider/dummyProvider')
+var Web3VMProvider = require('./src/web3Provider/web3VmProvider')
 var AstWalker = require('./src/astWalker')
 var global = require('./src/global')
+var styleGuide = require('./src/ui/style-guide')
 
 if (typeof (module) !== 'undefined' && typeof (module.exports) !== 'undefined') {
   module.exports = modules()
@@ -28,13 +30,17 @@ function modules () {
     },
     vm: {
       Web3Providers: Web3Providers,
-      DummyProvider: DummyProvider
+      DummyProvider: DummyProvider,
+      Web3VMProvider: Web3VMProvider
     },
     SourceMappingDecoder: SourceMappingDecoder,
     SourceLocationTracker: SourceLocationTracker,
     init: init,
     util: util,
     AstWalker: AstWalker,
-    global: global
+    global: global,
+    ui: {
+      styleGuide: styleGuide
+    }
   }
 }

remix-lib/package.json

@@ -14,6 +14,11 @@
   ],
   "main": "./index.js",
   "dependencies": {
+    "babel-preset-es2015": "^6.24.0",
+    "babel-plugin-transform-object-assign": "^6.22.0",
+    "babel-eslint": "^7.1.1",
+    "babelify": "^7.3.0",
+    "fast-async": "^6.1.2",
     "ethereumjs-util": "^4.5.0",
     "web3": "^0.15.3",
     "solc": "^0.4.13",
@@ -39,5 +44,40 @@
       "build/*",
       "test/resources/*"
     ]
+  },
+  "browserify": {
+    "transform": [
+      [
+        "babelify",
+        {
+          "plugins": [
+            [
+              "fast-async",
+              {
+                "runtimePatten": null,
+                "compiler": {
+                  "promises": true,
+                  "es7": true,
+                  "noRuntime": true,
+                  "wrapAwait": true
+                }
+              }
+            ],
+            "transform-object-assign"
+          ]
+        }
+      ],
+      [
+        "yo-yoify"
+      ],
+      [
+        "babelify",
+        {
+          "presets": [
+            "es2015"
+          ]
+        }
+      ]
+    ]
   }
 }