Merge pull request #14 from ethereum/remixide-update

.gitignore

-
 # See http://help.github.com/ignore-files/ for more about ignoring files.
 
 # compiled output

apps/remix-ide/.circleci/config.yml

@@ -7,7 +7,7 @@ jobs:
   remix-ide-chrome:
     docker:
       # specify the version you desire here
-      - image: circleci/node:9.11.2-browsers
+      - image: circleci/node:10.18.0-browsers
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
@@ -17,31 +17,39 @@ jobs:
     environment:
       - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
       - COMMIT_AUTHOR: "Circle CI"
-      - FILES_TO_PACKAGE: "assets background.js build icon.png index.html manifest.json README.md soljson.js package.json"
-    working_directory: ~/remix-ide
+      - FILES_TO_PACKAGE: "apps/remix-ide/assets apps/remix-ide/background.js apps/remix-ide/build apps/remix-ide/icon.png apps/remix-ide/index.html apps/remix-ide/manifest.json apps/remix-ide/README.md apps/remix-ide/soljson.js apps/remix-ide/package.json"
+    working_directory: ~/remix-project
 
     parallelism: 20
     steps:
       - checkout
       - run: npm install
-      - run: npm run lint && npm run test && npm run make-mock-compiler
+      - run: npm run lint
+      - run:
+          name: Download Compatible JAVA Version for Selenium
+          command: |
+            java -version
+            sudo apt-get purge --auto-remove java-common
+            sudo apt-get update
+            sudo apt-get install openjdk-8-jdk
+            java -version
       - run:
           name: Download Selenium
-          command: ./node_modules/.bin/selenium-standalone install --config=../remix-ide/seleniumConfig.js
+          command: ./node_modules/.bin/selenium-standalone install --config=../remix-project/apps/remix-ide/seleniumConfig.js
       - run:
           name: Start Selenium
-          command: ./node_modules/.bin/selenium-standalone start --config=../remix-ide/seleniumConfig.js
+          command: ./node_modules/.bin/selenium-standalone start --config=../remix-project/apps/remix-ide/seleniumConfig.js
           background: true
-      - run: ./ci/browser_tests_chrome.sh
+      - run: ./apps/remix-ide/ci/browser_tests_chrome.sh
       - store_test_results:
-          path: ./reports/tests
+          path: ./apps/remix-ide/reports/tests
       - store_artifacts:
-          path: ./reports/screenshots
+          path: ./apps/remix-ide/reports/screenshots
 
   remix-ide-firefox:
     docker:
       # specify the version you desire here
-      - image: circleci/node:9.11.2-browsers
+      - image: circleci/node:10.18.0-browsers
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
@@ -51,20 +59,20 @@ jobs:
     environment:
       - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
       - COMMIT_AUTHOR: "Circle CI"
-      - FILES_TO_PACKAGE: "assets background.js build icon.png index.html manifest.json README.md soljson.js package.json"
-    working_directory: ~/remix-ide
+      - FILES_TO_PACKAGE: "apps/remix-ide/assets apps/remix-ide/background.js apps/remix-ide/build apps/remix-ide/icon.png apps/remix-ide/index.html apps/remix-ide/manifest.json apps/remix-ide/README.md apps/remix-ide/soljson.js apps/remix-ide/package.json"
+    working_directory: ~/remix-project
 
     parallelism: 20
     steps:
       - checkout
       - run: npm install
-      - run: npm run lint && npm run test && npm run make-mock-compiler
+      - run: npm run lint
       - run:
           name: Download Selenium
-          command: ./node_modules/.bin/selenium-standalone install --config=../remix-ide/seleniumConfig.js
+          command: ./node_modules/.bin/selenium-standalone install --config=../remix-project/apps/remix-ide/seleniumConfig.js
       - run:
           name: Start Selenium
-          command: ./node_modules/.bin/selenium-standalone start --config=../remix-ide/seleniumConfig.js
+          command: ./node_modules/.bin/selenium-standalone start --config=../remix-project/apps/remix-ide/seleniumConfig.js
           background: true
       - run:
           name: Download Latest Firefox
@@ -72,16 +80,16 @@ jobs:
       - run:
           name: Install Firefox
           command: sudo dpkg -i firefox-mozilla-build_73.0.1-0ubuntu1_amd64.deb
-      - run: ./ci/browser_tests_firefox.sh
+      - run: ./apps/remix-ide/ci/browser_tests_firefox.sh
       - store_test_results:
-          path: ./reports/tests
+          path: ./apps/remix-ide/reports/tests
       - store_artifacts:
-          path: ./reports/screenshots
+          path: ./apps/remix-ide/reports/screenshots
 
   remix-ide-run-deploy:
     docker:
       # specify the version you desire here
-      - image: circleci/node:9.11.2-browsers
+      - image: circleci/node:10.18.0-browsers
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
@@ -91,29 +99,29 @@ jobs:
     environment:
       - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
       - COMMIT_AUTHOR: "Circle CI"
-      - FILES_TO_PACKAGE: "assets background.js build icon.png index.html manifest.json README.md soljson.js package.json"
-    working_directory: ~/remix-ide
+      - FILES_TO_PACKAGE: "apps/remix-ide/assets apps/remix-ide/background.js apps/remix-ide/build apps/remix-ide/icon.png apps/remix-ide/index.html apps/remix-ide/manifest.json apps/remix-ide/README.md apps/remix-ide/soljson.js apps/remix-ide/package.json"
+    working_directory: ~/remix-project
 
     steps:
       - checkout
       - run: npm install
-      - run: npm run lint && npm run test && npm run make-mock-compiler
+      - run: npm run lint
       - run:
           name: Download Selenium
-          command: ./node_modules/.bin/selenium-standalone install --config=../remix-ide/seleniumConfig.js
+          command: ./node_modules/.bin/selenium-standalone install --config=../remix-project/apps/remix-ide/seleniumConfig.js
       - run:
           name: Start Selenium
-          command: ./node_modules/.bin/selenium-standalone start --config=../remix-ide/seleniumConfig.js
+          command: ./node_modules/.bin/selenium-standalone start --config=../remix-project/apps/remix-ide/seleniumConfig.js
           background: true
-      - run: ./ci/browser_tests_run_deploy.sh
+      - run: ./apps/remix-ide/ci/browser_tests_run_deploy.sh
       - store_artifacts:
-          path: ./reports/screenshots
+          path: ./apps/remix-ide/reports/screenshots
 
 
   deploy-remix-live:
     docker:
       # specify the version you desire here
-      - image: circleci/node:9.11.2-browsers
+      - image: circleci/node:10.18.0-browsers
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
@@ -123,21 +131,21 @@ jobs:
     environment:
       - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
       - COMMIT_AUTHOR: "Circle CI"
-      - FILES_TO_PACKAGE: "assets background.js build icon.png index.html manifest.json README.md soljson.js package.json"
-    working_directory: ~/remix-ide
+      - FILES_TO_PACKAGE: "apps/remix-ide/assets apps/remix-ide/background.js apps/remix-ide/build apps/remix-ide/icon.png apps/remix-ide/index.html apps/remix-ide/manifest.json apps/remix-ide/README.md apps/remix-ide/soljson.js apps/remix-ide/package.json"
+    working_directory: ~/remix-project
 
     steps:
       - checkout
       - run: npm install
-      - run: npm run lint && npm run test && npm run make-mock-compiler
+      - run: npm run lint
       - run: 
           name: Deploy
           command: |
             if [ "${CIRCLE_BRANCH}" == "remix_live" ]; then
-              ./ci/deploy_from_travis_remix-live.sh;
+              ./apps/remix-ide/ci/deploy_from_travis_remix-live.sh;
             fi
       - store_artifacts:
-          path: ./reports/screenshots
+          path: ./apps/remix-ide/reports/screenshots
 
   publish-docker:
     docker:
@@ -165,7 +173,7 @@ jobs:
   deploy-remix-alpha:
     docker:
       # specify the version you desire here
-      - image: circleci/node:9.11.2-browsers
+      - image: circleci/node:10.18.0-browsers
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
@@ -175,21 +183,21 @@ jobs:
     environment:
       - COMMIT_AUTHOR_EMAIL: "yann@ethereum.org"
       - COMMIT_AUTHOR: "Circle CI"
-      - FILES_TO_PACKAGE: "assets background.js build icon.png index.html manifest.json README.md soljson.js package.json"
-    working_directory: ~/remix-ide
+      - FILES_TO_PACKAGE: "apps/remix-ide/assets apps/remix-ide/background.js apps/remix-ide/build apps/remix-ide/icon.png apps/remix-ide/index.html apps/remix-ide/manifest.json apps/remix-ide/README.md apps/remix-ide/soljson.js apps/remix-ide/package.json"
+    working_directory: ~/remix-project
 
     steps:
       - checkout
       - run: npm install
-      - run: npm run lint && npm run test && npm run make-mock-compiler
+      - run: npm run lint
       - run: 
           name: Deploy
           command: |
             if [ "${CIRCLE_BRANCH}" == "master" ]; then
-              ./ci/deploy_from_travis_remix-alpha.sh;
+              ./apps/remix-ide/ci/deploy_from_travis_remix-alpha.sh;
             fi
       - store_artifacts:
-          path: ./reports/screenshots
+          path: ./apps/remix-ide/reports/screenshots
 
 workflows:
   version: 2
@@ -218,4 +226,4 @@ workflows:
             - remix-ide-run-deploy
           filters:
             branches:
-              only: master
+              only: master
\ No newline at end of file

apps/remix-ide/.gitignore

-
-# See http://help.github.com/ignore-files/ for more about ignoring files.
-
 .idea
 .vscode
 build
@@ -15,4 +12,4 @@ remix
 contracts
 TODO
 .tern-port
-temp_publish_docker
+temp_publish_docker
\ No newline at end of file

apps/remix-ide/ci/browser_tests.sh

@@ -21,7 +21,8 @@ setupRemixd
 
 sleep 5
 
-TESTFILES=$(circleci tests glob "./test-browser/tests/**/*.test.js" | circleci tests split --split-by=timings)
+npm run nightwatch_parallel || TEST_EXITCODE=1
+TESTFILES=$(circleci tests glob "./apps/remix-ide/test-browser/tests/**/*.test.js" | circleci tests split --split-by=timings)
 for TESTFILE in $TESTFILES; do
     ./node_modules/.bin/nightwatch --config nightwatch.js --env chrome $TESTFILE || TEST_EXITCODE=1
 done

apps/remix-ide/ci/browser_tests_chrome.sh

@@ -23,7 +23,7 @@ sleep 5
 
 TESTFILES=$(circleci tests glob "./apps/remix-ide/test-browser/tests/**/*.test.js" | circleci tests split --split-by=timings)
 for TESTFILE in $TESTFILES; do
-    ./node_modules/.bin/nightwatch --config nightwatch.js --env chrome $TESTFILE || TEST_EXITCODE=1
+    ./node_modules/.bin/nightwatch --config ./apps/remix-ide/nightwatch.js --env chrome $TESTFILE || TEST_EXITCODE=1
 done
 
 echo "$TEST_EXITCODE"

apps/remix-ide/ci/browser_tests_firefox.sh

@@ -23,7 +23,7 @@ sleep 5
 
 TESTFILES=$(circleci tests glob "./apps/remix-ide/test-browser/tests/**/*.test.js" | circleci tests split --split-by=timings)
 for TESTFILE in $TESTFILES; do
-    ./node_modules/.bin/nightwatch --config nightwatch.js --env firefox $TESTFILE || TEST_EXITCODE=1
+    ./node_modules/.bin/nightwatch --config ./apps/remix-ide/nightwatch.js --env firefox $TESTFILE || TEST_EXITCODE=1
 done
 
 echo "$TEST_EXITCODE"

apps/remix-ide/package.json

 {
   "name": "remix-ide",
-  "version": "v0.10.2",
+  "version": "v0.10.3",
   "description": "Extendable Web IDE for Ethereum",
   "devDependencies": {
     "@babel/core": "^7.4.5",
@@ -62,7 +62,7 @@
     "remix-solidity": "0.3.31",
     "remix-tabs": "1.0.48",
     "remix-tests": "0.1.34",
-    "remixd": "0.2.3-alpha.1",
+    "remixd": "0.2.3-alpha.4",
     "request": "^2.83.0",
     "rimraf": "^2.6.1",
     "selenium-standalone": "^6.17.0",
@@ -203,4 +203,4 @@
     "reinstall": "rm ./node-modules/ -rf; rm package-lock.json; rm ./build/ -rf; npm install; npm run build",
     "ganache-cli": "npx ganache-cli"
   }
-}
+}
\ No newline at end of file

apps/remix-ide/src/assets/js/editor/darkTheme.js

+/* eslint-disable */
+ace.define("ace/theme/remixDark",["require","exports","module","ace/lib/dom"], function(acequire, exports, module) {
+
+  exports.isDark = true;
+  exports.cssClass = "ace-remixDark";
+  exports.cssText = ".ace-remixDark .ace_gutter {\
+  background: #2a2c3f;\
+  color: #8789a1;\
+  border-right: 1px solid #282828;\
+  }\
+  .ace-remixDark .ace_gutter-cell.ace_warning {\
+  background-image: none;\
+  background: #FC0;\
+  border-left: none;\
+  padding-left: 0;\
+  color: #000;\
+  }\
+  .ace-remixDark .ace_gutter-cell.ace_error {\
+  background-position: -6px center;\
+  background-image: none;\
+  background: #F10;\
+  border-left: none;\
+  padding-left: 0;\
+  color: #000;\
+  }\
+  .ace-remixDark .ace_print-margin {\
+  border-left: 1px solid #555;\
+  right: 0;\
+  background: #1D1D1D;\
+  }\
+  .ace-remixDark {\
+  background-color: #222336;\
+  color: #a2a3bd;\
+  }\
+  .ace-remixDark .ace_cursor {\
+  border-left: 2px solid #FFFFFF;\
+  }\
+  .ace-remixDark .ace_cursor.ace_overwrite {\
+  border-left: 0px;\
+  border-bottom: 1px solid #FFFFFF;\
+  }\
+  .ace-remixDark .ace_marker-layer .ace_selection {\
+  background: #494836;\
+  }\
+  .ace-remixDark .ace_marker-layer .ace_step {\
+  background: rgb(198, 219, 174);\
+  }\
+  .ace-remixDark .ace_marker-layer .ace_bracket {\
+  margin: -1px 0 0 -1px;\
+  border: 1px solid #FCE94F;\
+  }\
+  .ace-remixDark .ace_marker-layer .ace_active-line {\
+  background: #363950;\
+  }\
+  .ace-remixDark .ace_gutter-active-line {\
+  background-color: #363950;\
+  }\
+  .ace-remixDark .ace_invisible {\
+  color: #404040;\
+  }\
+  .ace-remixDark .ace_rparen {\
+    color: #d4d7ed;\
+  }\
+  .ace-remixDark .ace_lparen {\
+    color: #d4d7ed;\
+  }\
+  .ace-remixDark .ace_keyword {\
+  color:#ffa76d;\
+  }\
+  .ace-remixDark .ace_keyword.ace_operator {\
+  color:#eceeff;\
+  }\
+  .ace-remixDark .ace_constant {\
+  color:#1EDAFB;\
+  }\
+  .ace-remixDark .ace_constant.ace_language {\
+  color:#FDC251;\
+  }\
+  .ace-remixDark .ace_constant.ace_library {\
+  color:#8DFF0A;\
+  }\
+  .ace-remixDark .ace_constant.ace_numeric {\
+  color:#eceeff;\
+  }\
+  .ace-remixDark .ace_invalid {\
+  color:#FFFFFF;\
+  background-color:#990000;\
+  }\
+  .ace-remixDark .ace_invalid.ace_deprecated {\
+  color:#FFFFFF;\
+  background-color:#990000;\
+  }\
+  .ace-remixDark .ace_support {\
+  color: #999;\
+  }\
+  .ace-remixDark .ace_support.ace_function {\
+  color:#3fe2a7;\
+  }\
+  .ace-remixDark .ace_function {\
+  color:#3fe2a7;\
+  }\
+  .ace-remixDark .ace_string {\
+  color:#eceeff;\
+  }\
+  .ace-remixDark .ace_comment {\
+  color:#a7a7a7;\
+  font-style:italic;\
+  padding-bottom: 0px;\
+  }\
+  .ace-remixDark .ace_type {\
+  color:#75ceef;\
+  }]\
+  .ace-remixDark .ace_visibility (\
+    color:#f7d777;\
+  )\
+  .ace-remixDark .ace_identifier {\
+    color:#bec1dd;\
+  }\
+  .ace-remixDark .ace_modifier {\
+    color:#efff2f;\
+  }\
+  .ace-remixDark .ace-boolean {\
+    color:#ff86ac;\
+  }\
+  .ace-remixDark .ace_statemutability {\
+    color:#FFCC00;\
+  }\
+  .ace-remixDark .ace_variable {\
+  color:#e0bb83;\
+  }\
+  .ace-remixDark .ace_meta.ace_tag {\
+  color:#BE53E6;\
+  }\
+  .ace-remixDark .ace_entity.ace_other.ace_attribute-name {\
+  color:#4aa8fd;\
+  }\
+  .ace-remixDark .ace_markup.ace_underline {\
+  text-decoration: underline;\
+  }\
+  .ace-remixDark .ace_fold-widget {\
+  text-align: center;\
+  }\
+  .ace-remixDark .ace_fold-widget:hover {\
+  color: #777;\
+  }\
+  .ace-remixDark .ace_fold-widget.ace_start,\
+  .ace-remixDark .ace_fold-widget.ace_end,\
+  .ace-remixDark .ace_fold-widget.ace_closed{\
+  background: none;\
+  border: none;\
+  box-shadow: none;\
+  }\
+  .ace-remixDark .ace_fold-widget.ace_start:after {\
+  content: '▾'\
+  }\
+  .ace-remixDark .ace_fold-widget.ace_end:after {\
+  content: '▴'\
+  }\
+  .ace-remixDark .ace_fold-widget.ace_closed:after {\
+  content: '‣'\
+  }\
+  .ace-remixDark .ace_indent-guide {\
+  border-right:1px dotted #333;\
+  margin-right:-1px;\
+  }\
+  .ace-remixDark .ace_fold { \
+  background: #222; \
+  border-radius: 3px; \
+  color: #7AF; \
+  border: none; \
+  }\
+  .ace-remixDark .ace_fold:hover {\
+  background: #CCC; \
+  color: #000;\
+  }\
+  ";
+  
+  var dom = acequire("../lib/dom");
+  dom.importCssString(exports.cssText, exports.cssClass);
+  
+  });
\ No newline at end of file

apps/remix-ide/src/remixAppManager.js

@@ -15,7 +15,7 @@ export function isNative (name) {
 }
 
 export function canActivate (name) {
-  return ['manager', 'debugger'].includes(name)
+  return ['manager', 'debugger', 'ethdoc'].includes(name)
 }
 
 export class RemixAppManager extends PluginManager {