Resolved merge conflict

.editorconfig

+# Editor configuration, see http://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+max_line_length = off
+trim_trailing_whitespace = false

.prettierignore

+# Add files here to ignore them from prettier formatting
+
+/dist
+/coverage

.prettierrc

+{
+  "singleQuote": true
+}

.vscode/extensions.json

+{
+  "recommendations": [
+    "ms-vscode.vscode-typescript-tslint-plugin",
+    "esbenp.prettier-vscode"
+  ]
+}

apps/.gitkeep

+

apps/remix-ide/.eslintrc.json

+{
+    "env": {
+        "browser": true,
+        "es6": true
+    },
+    "extends": "eslint:recommended",
+    "globals": {
+        "Atomics": "readonly",
+        "SharedArrayBuffer": "readonly"
+    },
+    "parserOptions": {
+        "ecmaVersion": 11,
+        "sourceType": "module"
+    },
+    "rules": {
+        "accessor-pairs": "error",
+        "array-bracket-newline": "off",
+        "array-bracket-spacing": [
+            "off",
+            "never"
+        ],
+        "array-callback-return": "off",
+        "array-element-newline": "off",
+        "arrow-body-style": "off",
+        "arrow-parens": [
+            "off",
+            "always"
+        ],
+        "arrow-spacing": [
+            "error",
+            {
+                "after": true,
+                "before": true
+            }
+        ],
+        "block-scoped-var": "off",
+        "block-spacing": "error",
+        "brace-style": [
+            "off",
+            "1tbs"
+        ],
+        "callback-return": "off",
+        "camelcase": "off",
+        "capitalized-comments": "off",
+        "class-methods-use-this": "off",
+        "comma-dangle": "off",
+        "comma-spacing": [
+            "error",
+            {
+                "after": true,
+                "before": false
+            }
+        ],
+        "comma-style": [
+            "error",
+            "last"
+        ],
+        "complexity": "off",
+        "computed-property-spacing": [
+            "off",
+            "never"
+        ],
+        "consistent-return": "off",
+        "consistent-this": "off",
+        "curly": "off",
+        "default-case": "error",
+        "default-case-last": "off",
+        "default-param-last": "off",
+        "dot-location": "off",
+        "dot-notation": "off",
+        "eol-last": "error",
+        "eqeqeq": "off",
+        "func-call-spacing": "error",
+        "func-name-matching": "error",
+        "func-names": "off",
+        "func-style": [
+            "off",
+            "declaration"
+        ],
+        "function-call-argument-newline": [
+            "off",
+            "consistent"
+        ],
+        "function-paren-newline": "off",
+        "generator-star-spacing": "error",
+        "global-require": "off",
+        "grouped-accessor-pairs": "error",
+        "guard-for-in": "off",
+        "handle-callback-err": "error",
+        "id-blacklist": "error",
+        "id-length": "off",
+        "id-match": "error",
+        "implicit-arrow-linebreak": [
+            "off",
+            "beside"
+        ],
+        "indent": "off",
+        "indent-legacy": "off",
+        "init-declarations": "off",
+        "jsx-quotes": "error",
+        "key-spacing": "error",
+        "keyword-spacing": [
+            "error",
+            {
+                "after": true,
+                "before": true
+            }
+        ],
+        "line-comment-position": "off",
+        "linebreak-style": [
+            "error",
+            "unix"
+        ],
+        "lines-around-comment": "off",
+        "lines-around-directive": "off",
+        "lines-between-class-members": [
+            "off",
+            "always"
+        ],
+        "max-classes-per-file": "off",
+        "max-depth": "off",
+        "max-len": "off",
+        "max-lines": "off",
+        "max-lines-per-function": "off",
+        "max-nested-callbacks": "error",
+        "max-params": "off",
+        "max-statements": "off",
+        "max-statements-per-line": "off",
+        "multiline-comment-style": [
+            "off",
+            "separate-lines"
+        ],
+        "new-cap": "off",
+        "new-parens": "error",
+        "newline-after-var": "off",
+        "newline-before-return": "off",
+        "newline-per-chained-call": "off",
+        "no-alert": "error",
+        "no-array-constructor": "error",
+        "no-await-in-loop": "off",
+        "no-bitwise": "off",
+        "no-buffer-constructor": "error",
+        "no-caller": "error",
+        "no-catch-shadow": "error",
+        "no-confusing-arrow": "off",
+        "no-console": "off",
+        "no-constructor-return": "error",
+        "no-continue": "error",
+        "no-div-regex": "error",
+        "no-duplicate-imports": "error",
+        "no-else-return": "off",
+        "no-empty-function": "off",
+        "no-eq-null": "off",
+        "no-eval": "error",
+        "no-extend-native": "error",
+        "no-extra-bind": "error",
+        "no-extra-label": "error",
+        "no-extra-parens": "off",
+        "no-floating-decimal": "error",
+        "no-implicit-coercion": "off",
+        "no-implicit-globals": "error",
+        "no-implied-eval": "error",
+        "no-inline-comments": "off",
+        "no-invalid-this": "off",
+        "no-iterator": "error",
+        "no-label-var": "error",
+        "no-labels": "error",
+        "no-lone-blocks": "off",
+        "no-lonely-if": "off",
+        "no-loop-func": "off",
+        "no-magic-numbers": "off",
+        "no-mixed-operators": "off",
+        "no-mixed-requires": "error",
+        "no-multi-assign": "off",
+        "no-multi-spaces": "off",
+        "no-multi-str": "error",
+        "no-multiple-empty-lines": "error",
+        "no-native-reassign": "error",
+        "no-negated-condition": "off",
+        "no-negated-in-lhs": "error",
+        "no-nested-ternary": "off",
+        "no-new": "error",
+        "no-new-func": "error",
+        "no-new-object": "error",
+        "no-new-require": "error",
+        "no-new-wrappers": "error",
+        "no-octal-escape": "error",
+        "no-param-reassign": "off",
+        "no-path-concat": "error",
+        "no-plusplus": "off",
+        "no-process-env": "off",
+        "no-process-exit": "off",
+        "no-proto": "error",
+        "no-restricted-exports": "off",
+        "no-restricted-globals": "error",
+        "no-restricted-imports": "error",
+        "no-restricted-modules": "error",
+        "no-restricted-properties": "error",
+        "no-restricted-syntax": "error",
+        "no-return-assign": "error",
+        "no-return-await": "off",
+        "no-script-url": "error",
+        "no-self-compare": "error",
+        "no-sequences": "error",
+        "no-shadow": "off",
+        "no-spaced-func": "error",
+        "no-sync": "off",
+        "no-tabs": "error",
+        "no-template-curly-in-string": "error",
+        "no-ternary": "off",
+        "no-throw-literal": "error",
+        "no-trailing-spaces": "error",
+        "no-undef-init": "error",
+        "no-undefined": "off",
+        "no-underscore-dangle": "off",
+        "no-unmodified-loop-condition": "error",
+        "no-unneeded-ternary": "error",
+        "no-unused-expressions": "off",
+        "no-use-before-define": "off",
+        "no-useless-backreference": "off",
+        "no-useless-call": "error",
+        "no-useless-computed-key": "error",
+        "no-useless-concat": "off",
+        "no-useless-constructor": "error",
+        "no-useless-rename": "error",
+        "no-useless-return": "off",
+        "no-var": "off",
+        "no-void": "off",
+        "no-warning-comments": "off",
+        "no-whitespace-before-property": "error",
+        "nonblock-statement-body-position": "error",
+        "object-curly-newline": "off",
+        "object-curly-spacing": "off",
+        "object-shorthand": "off",
+        "one-var": "off",
+        "one-var-declaration-per-line": "error",
+        "operator-assignment": "off",
+        "operator-linebreak": "error",
+        "padded-blocks": "off",
+        "padding-line-between-statements": "error",
+        "prefer-arrow-callback": "off",
+        "prefer-const": "off",
+        "prefer-destructuring": "off",
+        "prefer-exponentiation-operator": "error",
+        "prefer-named-capture-group": "off",
+        "prefer-numeric-literals": "error",
+        "prefer-object-spread": "error",
+        "prefer-promise-reject-errors": "off",
+        "prefer-reflect": "off",
+        "prefer-regex-literals": "error",
+        "prefer-rest-params": "off",
+        "prefer-spread": "off",
+        "prefer-template": "off",
+        "quote-props": "off",
+        "quotes": "off",
+        "radix": "off",
+        "require-atomic-updates": "off",
+        "require-await": "off",
+        "require-jsdoc": "off",
+        "require-unicode-regexp": "off",
+        "rest-spread-spacing": "error",
+        "semi": "off",
+        "semi-spacing": "error",
+        "semi-style": "off",
+        "sort-keys": [
+            "off",
+            "asc"
+        ],
+        "sort-vars": "off",
+        "space-before-blocks": "error",
+        "space-before-function-paren": "error",
+        "space-in-parens": [
+            "error",
+            "never"
+        ],
+        "space-infix-ops": "error",
+        "space-unary-ops": "error",
+        "spaced-comment": [
+            "off",
+            "always"
+        ],
+        "strict": "off",
+        "switch-colon-spacing": "off",
+        "symbol-description": "error",
+        "template-curly-spacing": [
+            "error",
+            "never"
+        ],
+        "template-tag-spacing": [
+            "off",
+            "never"
+        ],
+        "unicode-bom": [
+            "error",
+            "never"
+        ],
+        "valid-jsdoc": "off",
+        "vars-on-top": "off",
+        "wrap-iife": "error",
+        "wrap-regex": "off",
+        "yield-star-spacing": "error",
+        "yoda": [
+            "error",
+            "never"
+        ],
+        "no-unused-vars": "off",
+        "no-redeclare": "off",
+        "no-empty": "off",
+        "no-constant-condition": "off",
+        "no-async-promise-executor": "off",
+        "no-useless-catch": "off",
+        "no-extra-semi": "off",
+        "no-undef": "off"
+    }
+}

apps/remix-ide/ci/browser_tests.sh

@@ -4,11 +4,11 @@ set -e
 
 setupRemixd () {
   mkdir remixdSharedfolder
-  cd contracts
+  cd apps/remix-ide/contracts
   echo 'sharing folder: '
   echo $PWD
-  ./../node_modules/remixd/bin/remixd -s $PWD --remix-ide http://127.0.0.1:8080 &
-  cd ..
+  ../../../node_modules/.bin/remixd -s $PWD --remix-ide http://127.0.0.1:8080 &
+  cd ../../..
 }
 
 BUILD_ID=${CIRCLE_BUILD_NUM:-${TRAVIS_JOB_NUMBER}}

apps/remix-ide/ci/browser_tests_chrome.sh

@@ -4,11 +4,11 @@ set -e
 
 setupRemixd () {
   mkdir remixdSharedfolder
-  cd contracts
+  cd apps/remix-ide/contracts
   echo 'sharing folder: '
   echo $PWD
-  ./../node_modules/remixd/bin/remixd -s $PWD --remix-ide http://127.0.0.1:8080 &
-  cd ..
+  ../../../node_modules/.bin/remixd -s $PWD --remix-ide http://127.0.0.1:8080 &
+  cd ../../..
 }
 
 BUILD_ID=${CIRCLE_BUILD_NUM:-${TRAVIS_JOB_NUMBER}}
@@ -21,7 +21,7 @@ setupRemixd
 
 sleep 5
 
-TESTFILES=$(circleci tests glob "./test-browser/tests/**/*.test.js" | circleci tests split --split-by=timings)
+TESTFILES=$(circleci tests glob "./apps/remix-ide/test-browser/tests/**/*.test.js" | circleci tests split --split-by=timings)
 npm run nightwatch_local_chrome $TESTFILES
 
 echo "$TEST_EXITCODE"

apps/remix-ide/ci/browser_tests_firefox.sh

@@ -4,11 +4,11 @@ set -e
 
 setupRemixd () {
   mkdir remixdSharedfolder
-  cd contracts
+  cd apps/remix-ide/contracts
   echo 'sharing folder: '
   echo $PWD
-  ./../node_modules/remixd/bin/remixd -s $PWD --remix-ide http://127.0.0.1:8080 &
-  cd ..
+  ../../../node_modules/.bin/remixd -s $PWD --remix-ide http://127.0.0.1:8080 &
+  cd ../../..
 }
 
 BUILD_ID=${CIRCLE_BUILD_NUM:-${TRAVIS_JOB_NUMBER}}
@@ -21,7 +21,7 @@ setupRemixd
 
 sleep 5
 
-TESTFILES=$(circleci tests glob "./test-browser/tests/**/*.test.js" | circleci tests split --split-by=timings)
+TESTFILES=$(circleci tests glob "./apps/remix-ide/test-browser/tests/**/*.test.js" | circleci tests split --split-by=timings)
 npm run nightwatch_local_firefox $TESTFILES
 
 echo "$TEST_EXITCODE"

apps/remix-ide/ci/browser_tests_run_deploy.sh

@@ -4,11 +4,11 @@ set -e
 
 setupRemixd () {
   mkdir remixdSharedfolder
-  cd contracts
+  cd apps/remix-ide/contracts
   echo 'sharing folder: '
   echo $PWD
-  ./../node_modules/remixd/bin/remixd -s $PWD --remix-ide http://127.0.0.1:8080 &
-  cd ..
+  ../../../node_modules/.bin/remixd -s $PWD --remix-ide http://127.0.0.1:8080 &
+  cd ../../..
 }
 
 BUILD_ID=${CIRCLE_BUILD_NUM:-${TRAVIS_JOB_NUMBER}}

apps/remix-ide/ci/makeMockCompiler.js

@@ -4,11 +4,15 @@ var fs = require('fs')
 var compiler = require('solc')
 var compilerInput = require('remix-solidity').CompilerInput
 var defaultVersion = 'v0.6.6+commit.6c089d02'
+const path = require('path')
 
 compiler.loadRemoteVersion(defaultVersion, (error, solcSnapshot) => {
+  console.log('solcSnapshot: ', solcSnapshot)
   if (error) console.log(error)
   var compilationResult = {}
-  gatherCompilationResults('./test-browser/tests/', compilationResult, solcSnapshot)
+  const testsFolder = path.resolve(__dirname + '/../test-browser/tests/') + '/' // eslint-disable-line
+
+  gatherCompilationResults(testsFolder, compilationResult, solcSnapshot)
   replaceSolCompiler(compilationResult, solcSnapshot)
 })
 
@@ -16,7 +20,7 @@ function gatherCompilationResults (dir, compilationResult, solcSnapshot) {
   var filenames = fs.readdirSync(dir, 'utf8')
   filenames.map(function (item, i) {
     if (item.endsWith('.js')) {
-      var testDef = require('.' + dir + item)
+      var testDef = require(dir + item)
       if ('@sources' in testDef) {
         var sources = testDef['@sources']()
         for (var files in sources) {
@@ -61,7 +65,10 @@ function compile (solcSnapshot, source, optimization, addCompilationResult) {
 }
 
 function replaceSolCompiler (results, solcSnapshot) {
-  fs.readFile('./test-browser/mockcompiler/compiler.js', 'utf8', function (error, data) {
+  const compilerPath = path.resolve(__dirname + '/../test-browser/mockcompiler/compiler.js') // eslint-disable-line
+  const soljsonPath = path.resolve(__dirname + '/../soljson.js') // eslint-disable-line
+
+  fs.readFile(compilerPath, 'utf8', function (error, data) {
     if (error) {
       console.log(error)
       process.exit(1)
@@ -70,7 +77,7 @@ function replaceSolCompiler (results, solcSnapshot) {
     console.log(solcSnapshot.version())
     data = data + '\n\nvar mockCompilerVersion = \'' + solcSnapshot.version() + '\''
     data = data + '\n\nvar mockData = ' + JSON.stringify(results) + ';\n'
-    fs.writeFile('./soljson.js', data, 'utf8', function (error) {
+    fs.writeFile(soljsonPath, data, 'utf8', function (error) {
       if (error) {
         console.log(error)
         process.exit(1)

apps/remix-ide/css/pygment_trac.css~36bc4ab5a5b52c76327ec5b5f7a8896938b18525

+.highlight  { background: #ffffff; }
+.highlight .c { color: #999988; font-style: italic } /* Comment */
+.highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */
+.highlight .k { font-weight: bold } /* Keyword */
+.highlight .o { font-weight: bold } /* Operator */
+.highlight .cm { color: #999988; font-style: italic } /* Comment.Multiline */
+.highlight .cp { color: #999999; font-weight: bold } /* Comment.Preproc */
+.highlight .c1 { color: #999988; font-style: italic } /* Comment.Single */
+.highlight .cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */
+.highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
+.highlight .gd .x { color: #000000; background-color: #ffaaaa } /* Generic.Deleted.Specific */
+.highlight .ge { font-style: italic } /* Generic.Emph */
+.highlight .gr { color: #aa0000 } /* Generic.Error */
+.highlight .gh { color: #999999 } /* Generic.Heading */
+.highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
+.highlight .gi .x { color: #000000; background-color: #aaffaa } /* Generic.Inserted.Specific */
+.highlight .go { color: #888888 } /* Generic.Output */
+.highlight .gp { color: #555555 } /* Generic.Prompt */
+.highlight .gs { font-weight: bold } /* Generic.Strong */
+.highlight .gu { color: #800080; font-weight: bold; } /* Generic.Subheading */
+.highlight .gt { color: #aa0000 } /* Generic.Traceback */
+.highlight .kc { font-weight: bold } /* Keyword.Constant */
+.highlight .kd { font-weight: bold } /* Keyword.Declaration */
+.highlight .kn { font-weight: bold } /* Keyword.Namespace */
+.highlight .kp { font-weight: bold } /* Keyword.Pseudo */
+.highlight .kr { font-weight: bold } /* Keyword.Reserved */
+.highlight .kt { color: #445588; font-weight: bold } /* Keyword.Type */
+.highlight .m { color: #009999 } /* Literal.Number */
+.highlight .s { color: #d14 } /* Literal.String */
+.highlight .na { color: #008080 } /* Name.Attribute */
+.highlight .nb { color: #0086B3 } /* Name.Builtin */
+.highlight .nc { color: #445588; font-weight: bold } /* Name.Class */
+.highlight .no { color: #008080 } /* Name.Constant */
+.highlight .ni { color: #800080 } /* Name.Entity */
+.highlight .ne { color: #990000; font-weight: bold } /* Name.Exception */
+.highlight .nf { color: #990000; font-weight: bold } /* Name.Function */
+.highlight .nn { color: #555555 } /* Name.Namespace */
+.highlight .nt { color: #000080 } /* Name.Tag */
+.highlight .nv { color: #008080 } /* Name.Variable */
+.highlight .ow { font-weight: bold } /* Operator.Word */
+.highlight .w { color: #bbbbbb } /* Text.Whitespace */
+.highlight .mf { color: #009999 } /* Literal.Number.Float */
+.highlight .mh { color: #009999 } /* Literal.Number.Hex */
+.highlight .mi { color: #009999 } /* Literal.Number.Integer */
+.highlight .mo { color: #009999 } /* Literal.Number.Oct */
+.highlight .sb { color: #d14 } /* Literal.String.Backtick */
+.highlight .sc { color: #d14 } /* Literal.String.Char */
+.highlight .sd { color: #d14 } /* Literal.String.Doc */
+.highlight .s2 { color: #d14 } /* Literal.String.Double */
+.highlight .se { color: #d14 } /* Literal.String.Escape */
+.highlight .sh { color: #d14 } /* Literal.String.Heredoc */
+.highlight .si { color: #d14 } /* Literal.String.Interpol */
+.highlight .sx { color: #d14 } /* Literal.String.Other */
+.highlight .sr { color: #009926 } /* Literal.String.Regex */
+.highlight .s1 { color: #d14 } /* Literal.String.Single */
+.highlight .ss { color: #990073 } /* Literal.String.Symbol */
+.highlight .bp { color: #999999 } /* Name.Builtin.Pseudo */
+.highlight .vc { color: #008080 } /* Name.Variable.Class */
+.highlight .vg { color: #008080 } /* Name.Variable.Global */
+.highlight .vi { color: #008080 } /* Name.Variable.Instance */
+.highlight .il { color: #009999 } /* Literal.Number.Integer.Long */
+
+.type-csharp .highlight .k { color: #0000FF }
+.type-csharp .highlight .kt { color: #0000FF }
+.type-csharp .highlight .nf { color: #000000; font-weight: normal }
+.type-csharp .highlight .nc { color: #2B91AF }
+.type-csharp .highlight .nn { color: #000000 }
+.type-csharp .highlight .s { color: #A31515 }
+.type-csharp .highlight .sc { color: #A31515 }

apps/remix-ide/css/pygment_trac.css~HEAD

+.highlight  { background: #ffffff; }
+.highlight .c { color: #999988; font-style: italic } /* Comment */
+.highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */
+.highlight .k { font-weight: bold } /* Keyword */
+.highlight .o { font-weight: bold } /* Operator */
+.highlight .cm { color: #999988; font-style: italic } /* Comment.Multiline */
+.highlight .cp { color: #999999; font-weight: bold } /* Comment.Preproc */
+.highlight .c1 { color: #999988; font-style: italic } /* Comment.Single */
+.highlight .cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */
+.highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
+.highlight .gd .x { color: #000000; background-color: #ffaaaa } /* Generic.Deleted.Specific */
+.highlight .ge { font-style: italic } /* Generic.Emph */
+.highlight .gr { color: #aa0000 } /* Generic.Error */
+.highlight .gh { color: #999999 } /* Generic.Heading */
+.highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
+.highlight .gi .x { color: #000000; background-color: #aaffaa } /* Generic.Inserted.Specific */
+.highlight .go { color: #888888 } /* Generic.Output */
+.highlight .gp { color: #555555 } /* Generic.Prompt */
+.highlight .gs { font-weight: bold } /* Generic.Strong */
+.highlight .gu { color: #800080; font-weight: bold; } /* Generic.Subheading */
+.highlight .gt { color: #aa0000 } /* Generic.Traceback */
+.highlight .kc { font-weight: bold } /* Keyword.Constant */
+.highlight .kd { font-weight: bold } /* Keyword.Declaration */
+.highlight .kn { font-weight: bold } /* Keyword.Namespace */
+.highlight .kp { font-weight: bold } /* Keyword.Pseudo */
+.highlight .kr { font-weight: bold } /* Keyword.Reserved */
+.highlight .kt { color: #445588; font-weight: bold } /* Keyword.Type */
+.highlight .m { color: #009999 } /* Literal.Number */
+.highlight .s { color: #d14 } /* Literal.String */
+.highlight .na { color: #008080 } /* Name.Attribute */
+.highlight .nb { color: #0086B3 } /* Name.Builtin */
+.highlight .nc { color: #445588; font-weight: bold } /* Name.Class */
+.highlight .no { color: #008080 } /* Name.Constant */
+.highlight .ni { color: #800080 } /* Name.Entity */
+.highlight .ne { color: #990000; font-weight: bold } /* Name.Exception */
+.highlight .nf { color: #990000; font-weight: bold } /* Name.Function */
+.highlight .nn { color: #555555 } /* Name.Namespace */
+.highlight .nt { color: #000080 } /* Name.Tag */
+.highlight .nv { color: #008080 } /* Name.Variable */
+.highlight .ow { font-weight: bold } /* Operator.Word */
+.highlight .w { color: #bbbbbb } /* Text.Whitespace */
+.highlight .mf { color: #009999 } /* Literal.Number.Float */
+.highlight .mh { color: #009999 } /* Literal.Number.Hex */
+.highlight .mi { color: #009999 } /* Literal.Number.Integer */
+.highlight .mo { color: #009999 } /* Literal.Number.Oct */
+.highlight .sb { color: #d14 } /* Literal.String.Backtick */
+.highlight .sc { color: #d14 } /* Literal.String.Char */
+.highlight .sd { color: #d14 } /* Literal.String.Doc */
+.highlight .s2 { color: #d14 } /* Literal.String.Double */
+.highlight .se { color: #d14 } /* Literal.String.Escape */
+.highlight .sh { color: #d14 } /* Literal.String.Heredoc */
+.highlight .si { color: #d14 } /* Literal.String.Interpol */
+.highlight .sx { color: #d14 } /* Literal.String.Other */
+.highlight .sr { color: #009926 } /* Literal.String.Regex */
+.highlight .s1 { color: #d14 } /* Literal.String.Single */
+.highlight .ss { color: #990073 } /* Literal.String.Symbol */
+.highlight .bp { color: #999999 } /* Name.Builtin.Pseudo */
+.highlight .vc { color: #008080 } /* Name.Variable.Class */
+.highlight .vg { color: #008080 } /* Name.Variable.Global */
+.highlight .vi { color: #008080 } /* Name.Variable.Instance */
+.highlight .il { color: #009999 } /* Literal.Number.Integer.Long */
+
+.type-csharp .highlight .k { color: #0000FF }
+.type-csharp .highlight .kt { color: #0000FF }
+.type-csharp .highlight .nf { color: #000000; font-weight: normal }
+.type-csharp .highlight .nc { color: #2B91AF }
+.type-csharp .highlight .nn { color: #000000 }
+.type-csharp .highlight .s { color: #A31515 }
+.type-csharp .highlight .sc { color: #A31515 }

apps/remix-ide/nightwatch.js

 'use strict'
 require('@babel/register')()
 
-const crxFile = require('fs').readFileSync('./test-browser/extensions/chrome/metamask.crx')
+const crxFile = require('fs').readFileSync('apps/remix-ide/test-browser/extensions/chrome/metamask.crx')
 const metamaskExtension = new Buffer.from(crxFile).toString('base64') // eslint-disable-line
 
 module.exports = {
-  'src_folders': ['test-browser/tests'],
-  'output_folder': './reports/tests',
-  'custom_commands_path': ['test-browser/commands'],
+  'src_folders': ['apps/remix-ide/test-browser/tests'],
+  'output_folder': 'apps/remix-ide/reports/tests',
+  'custom_commands_path': ['apps/remix-ide/test-browser/commands'],
   'custom_assertions_path': '',
   'page_objects_path': '',
   'globals_path': '',
@@ -22,7 +22,7 @@ module.exports = {
       },
       'screenshots': {
         'enabled': true,
-        'path': './reports/screenshots',
+        'path': 'apps/remix-ide/reports/screenshots',
         'on_failure': true,
         'on_error': true
       },
@@ -31,7 +31,7 @@ module.exports = {
         'javascriptEnabled': true,
         'acceptSslCerts': true
       },
-      'exclude': ['./test-browser/tests/runAndDeploy.js']
+      'exclude': ['apps/remix-ide/test-browser/tests/runAndDeploy.js']
     },
 
     'chrome': {

apps/remix-ide/package.json

@@ -49,7 +49,7 @@
     "minixhr": "^3.2.2",
     "mkdirp": "^0.5.1",
     "nanohtml": "^1.6.3",
-    "nightwatch": "^0.9.20",
+    "nightwatch": "^1.3.5",
     "notify-error": "^1.2.0",
     "npm-link-local": "^1.1.0",
     "npm-merge-driver": "^2.3.5",
@@ -62,7 +62,7 @@
     "remix-solidity": "0.3.30",
     "remix-tabs": "1.0.48",
     "remix-tests": "0.1.33",
-    "remixd": "0.1.8-alpha.16",
+    "remixd": "0.1.8-alpha.10",
     "request": "^2.83.0",
     "rimraf": "^2.6.1",
     "selenium-standalone": "^6.17.0",
@@ -81,6 +81,7 @@
   "dependencies": {
     "@remixproject/engine": "^0.2.3",
     "http-server": "^0.11.1",
+    "remixd": "0.1.8-alpha.10",
     "standard": "^8.5.0"
   },
   "repository": {
@@ -184,6 +185,7 @@
     "nightwatch_local_fileExplorer": "nightwatch ./test-browser/tests/fileExplorer.test.js --config nightwatch.js --env chrome ",
     "nightwatch_local_debugger": "nightwatch ./test-browser/tests/debugger.test.js --config nightwatch.js --env chrome ",
     "nightwatch_local_editor": "nightwatch ./test-browser/tests/editor.test.js --config nightwatch.js --env chrome ",
+    
     "nightwatch_local_runAndDeploy": "nightwatch ./test-browser/tests/runAndDeploy.js --config nightwatch.js --env chrome-runAndDeploy ",
     "onchange": "onchange build/app.js -- npm-run-all lint",
     "prepublish": "mkdirp build; npm-run-all -ls downloadsolc_root build",

apps/remix-ide/src/app/ui/landing-page/landing-page.js

@@ -202,8 +202,8 @@ export class LandingPage extends ViewPlugin {
       `
     }
     // main
-    const solEnv = createEnvButton('/assets/img/solidityLogo.webp', 'solidityLogo', 'Solidity', startSolidity)
-    const vyperEnv = createEnvButton('/assets/img/vyperLogo.webp', 'vyperLogo', 'Vyper', startVyper)
+    const solEnv = createEnvButton('assets/img/solidityLogo.webp', 'solidityLogo', 'Solidity', startSolidity)
+    const vyperEnv = createEnvButton('assets/img/vyperLogo.webp', 'vyperLogo', 'Vyper', startVyper)
     // Featured
     const pipelineEnv = createEnvButton('assets/img/pipelineLogo.webp', 'pipelineLogo', 'Pipeline', startPipeline)
     const debuggerEnv = createEnvButton('assets/img/debuggerLogo.webp', 'debuggerLogo', 'Debugger', startDebugger)

apps/remix-ide/src/app/ui/multiParamManager.js

@@ -117,7 +117,7 @@ class MultiParamManager {
       title = this.funABI.type === 'receive' ? '(receive)' : '(fallback)'
     }
 
-    this.basicInputField = yo`<input class="form-control"></input>`
+    this.basicInputField = yo`<input class="form-control" data-id="multiParamManagerBasicInputField"></input>`
     this.basicInputField.setAttribute('placeholder', this.inputs)
     this.basicInputField.setAttribute('title', this.inputs)
     this.basicInputField.setAttribute('data-id', this.inputs)
@@ -126,7 +126,7 @@ class MultiParamManager {
       this.clickCallBack(this.funABI.inputs, this.basicInputField.value)
     }
     const width = this.isDeploy ? '' : 'w-50'
-    let funcButton = yo`<button onclick=${() => onClick()} class="${css.instanceButton} ${width} btn btn-sm">${title}</button>`
+    let funcButton = yo`<button onclick=${() => onClick()} class="${css.instanceButton} ${width} btn btn-sm" data-id="multiParamManagerFuncButton">${title}</button>`
     this.contractActionsContainerSingle = yo`
     <div class="${css.contractActionsContainerSingle} pt-2">
       ${funcButton}
@@ -145,7 +145,7 @@ class MultiParamManager {
       }
     }
 
-    var expandedButton = yo`<button onclick=${() => { multiOnClick() }} class="${css.instanceButton}"></button>`
+    var expandedButton = yo`<button onclick=${() => { multiOnClick() }} class="${css.instanceButton}" data-id="multiParamManagerExpandedButton"></button>`
 
     this.contractActionsContainerMulti = yo`<div class="${css.contractActionsContainerMulti}" >
       <div class="${css.contractActionsContainerMultiInner} text-dark" >

apps/remix-ide/test-browser/commands/clearEditableContent.js

+const EventEmitter = require('events')
+
+class clearEditablecontent extends EventEmitter {
+  command (cssSelector) {
+    this.api.perform((done) => {
+      clearContent(this.api, cssSelector, () => {
+        done()
+        this.emit('complete')
+      })
+    })
+    return this
+  }
+}
+
+function clearContent (browser, cssSelector, callback) {
+  browser.execute(function (cssSelector) {
+    const selection = window.getSelection()
+    const range = document.createRange()
+
+    range.selectNodeContents(document.querySelector(cssSelector))
+    selection.removeAllRanges()
+    selection.addRange(range)
+  }, [cssSelector], function () {
+    browser.sendKeys(cssSelector, browser.Keys.BACK_SPACE)
+    .pause(5000)
+    callback()
+  })
+}
+
+module.exports = clearEditablecontent

apps/remix-ide/test-browser/commands/createContract.js

@@ -13,10 +13,19 @@ class CreateContract extends EventEmitter {
 }
 
 function createContract (browser, inputParams, callback) {
-  browser.clickLaunchIcon('settings').clickLaunchIcon('udapp')
+  if (inputParams) {
+    browser.clickLaunchIcon('settings').clickLaunchIcon('udapp')
     .setValue('div[class^="contractActionsContainerSingle"] input', inputParams, function () {
       browser.click('#runTabView button[class^="instanceButton"]').pause(500).perform(function () { callback() })
     })
+  } else {
+    browser
+    .clickLaunchIcon('settings')
+    .clickLaunchIcon('udapp')
+    .click('#runTabView button[class^="instanceButton"]')
+    .pause(500)
+    .perform(function () { callback() })
+  }
 }
 
 module.exports = CreateContract

apps/remix-ide/test-browser/commands/executeScript.js

@@ -3,7 +3,7 @@ const EventEmitter = require('events')
 class ExecuteScript extends EventEmitter {
   command (script) {
     this.api
-      .clearValue('*[data-id="terminalCliInput"]')
+      .clearEditableContent('*[data-id="terminalCliInput"]')
       .click('*[data-id="terminalCli"]')
       .sendKeys('*[data-id="terminalCliInput"]', script)
       .sendKeys('*[data-id="terminalCliInput"]', this.api.Keys.ENTER)

apps/remix-ide/test-browser/commands/journalChildIncludes.js

@@ -10,7 +10,7 @@ class JournalChildIncludes extends EventEmitter {
 
     this.api.elements('css selector', '*[data-id="terminalJournal"]', (res) => {
       res.value.forEach(function (jsonWebElement) {
-        const jsonWebElementId = jsonWebElement.ELEMENT
+        const jsonWebElementId = jsonWebElement.ELEMENT || jsonWebElement[Object.keys(jsonWebElement)[0]]
 
         browser.elementIdText(jsonWebElementId, (jsonElement) => {
           const text = jsonElement.value

apps/remix-ide/test-browser/commands/signMessage.js

@@ -18,7 +18,7 @@ function signMsg (browser, msg, cb) {
   browser
       .waitForElementPresent('i[id="remixRunSignMsg"]')
       .click('i[id="remixRunSignMsg"]')
-      .waitForElementPresent('textarea[id="prompt_text"]')
+      .waitForElementVisible('textarea[id="prompt_text"]')
       .setValue('textarea[id="prompt_text"]', msg, () => {
         browser.modalFooterOKClick().perform(
           (client, done) => {

apps/remix-ide/test-browser/commands/switchBrowserTab.js

@@ -7,7 +7,7 @@ const EventEmitter = require('events')
 class SwitchBrowserTab extends EventEmitter {
   command (index) {
     this.api.perform((browser, done) => {
-      browser.window_handles((result) => {
+      browser.windowHandles((result) => {
         browser.switchWindow(result.value[index])
         done()
       })

apps/remix-ide/test-browser/commands/switchFile.js

+const EventEmitter = require('events')
+
+class SwitchFile extends EventEmitter {
+  command (name) {
+    this.api.perform((done) => {
+      switchFile(this.api, name, () => {
+        done()
+        this.emit('complete')
+      })
+    })
+    return this
+  }
+}
+
+// click on fileExplorer can toggle it. We go through settings to be sure FE is open
+function switchFile (browser, name, done) {
+  browser.clickLaunchIcon('settings').clickLaunchIcon('fileExplorers')
+      .waitForElementVisible('li[key="' + name + '"]')
+      .click('li[key="' + name + '"]')
+      .pause(2000)
+      .perform(() => {
+        done()
+      })
+}
+
+module.exports = SwitchFile

apps/remix-ide/test-browser/commands/testContracts.js

@@ -15,10 +15,10 @@ class TestContracts extends EventEmitter {
 function testContracts (browser, fileName, contractCode, compiledContractNames, callback) {
   browser
       .clickLaunchIcon('solidity')
-      .clearValue('#input textarea')
       .addFile(fileName, contractCode)
       .pause(1000)
       .verifyContracts(compiledContractNames)
+
       .perform(() => {
         callback()
       })

apps/remix-ide/test-browser/commands/testFunction.js

@@ -10,12 +10,11 @@ class TestFunction extends EventEmitter {
     browser.waitForElementVisible(`*[data-id="txLogger${txHash}"]`)
     .click(`*[data-id="txLogger${txHash}"]`)
     .waitForElementVisible(`*[data-id="txLoggerTable${txHash}"]`)
-    .click(`*[data-id="txLoggerTable${txHash}"]`)
 
     // fetch and format transaction logs as key => pair object
     .elements('css selector', `*[data-shared="key_${txHash}"]`, (res) => {
       res.value.forEach(function (jsonWebElement) {
-        const jsonWebElementId = jsonWebElement.ELEMENT
+        const jsonWebElementId = jsonWebElement.ELEMENT || jsonWebElement[Object.keys(jsonWebElement)[0]]
 
         browser.elementIdText(jsonWebElementId, (jsonElement) => {
           const key = jsonElement.value.trim()
@@ -26,7 +25,7 @@ class TestFunction extends EventEmitter {
     })
     .elements('css selector', `*[data-shared="pair_${txHash}"]`, (res) => {
       res.value.forEach(function (jsonWebElement, index) {
-        const jsonWebElementId = jsonWebElement.ELEMENT
+        const jsonWebElementId = jsonWebElement.ELEMENT || jsonWebElement[Object.keys(jsonWebElement)[0]]
 
         browser.elementIdText(jsonWebElementId, (jsonElement) => {
           let value = jsonElement.value

apps/remix-ide/test-browser/helpers/init.js

@@ -6,14 +6,12 @@ module.exports = function (browser, callback, url, preloadPlugins = true) {
     .pause(5000)
     .switchBrowserTab(0)
     .injectScript('test-browser/helpers/applytestmode.js', function () {
-      browser.resizeWindow(2560, 1440, () => {
+      browser.fullscreenWindow(() => {
         if (preloadPlugins) {
           initModules(browser, () => {
             browser.clickLaunchIcon('solidity')
             .pause(2000)
-            .execute(() => {
-              document.getElementById('autoCompile').click()
-            })
+            .click('*[for="autoCompile"]')
             .perform(function () {
               callback()
             })

apps/remix-ide/test-browser/tests/fileExplorer.test.js

@@ -29,11 +29,7 @@ module.exports = {
   'Should rename `5_New_contract.sol` to 5_Renamed_Contract.sol': function (browser) {
     browser
     .waitForElementVisible('*[data-id="treeViewLibrowser/5_New_contract.sol"]')
-    .rightClick('[data-path="browser/5_New_contract.sol"]')
-    .click('*[id="menuitemrename"]')
-    .sendKeys('[data-path="browser/5_New_contract.sol"]', '5_Renamed_Contract.sol')
-    .sendKeys('[data-path="browser/5_New_contract.sol"]', browser.Keys.ENTER)
-    .keys()
+    .renameFile('browser/5_New_contract.sol', '5_Renamed_Contract.sol', 'browser/5_Renamed_Contract.sol')
     .waitForElementVisible('*[data-id="treeViewLibrowser/5_Renamed_Contract.sol"]')
   },
 

apps/remix-ide/test-browser/tests/generalSettings.test.js

@@ -48,7 +48,6 @@ module.exports = {
     .click('*[data-id="settingsTabSaveGistToken"]')
     .waitForElementVisible('*[data-shared="tooltipPopup"]:nth-last-of-type(1)', 5000)
     .assert.containsText('*[data-shared="tooltipPopup"]:nth-last-of-type(1)', 'Access token saved')
-    .click('*[data-id="tooltipCloseButton"]')
   },
 
   'Should copy github access token to clipboard': function (browser) {
@@ -56,7 +55,6 @@ module.exports = {
     .click('*[data-id="copyToClipboardCopyIcon"]')
     .waitForElementVisible('*[data-shared="tooltipPopup"]:nth-last-of-type(1)', 5000)
     .assert.containsText('*[data-shared="tooltipPopup"]:nth-last-of-type(1)', 'Copied value to clipboard.')
-    .click('*[data-id="tooltipCloseButton"]')
   },
 
   'Should remove github access token': function (browser) {
@@ -65,7 +63,6 @@ module.exports = {
     .waitForElementVisible('*[data-shared="tooltipPopup"]:nth-last-of-type(1)', 5000)
     .assert.containsText('*[data-shared="tooltipPopup"]:nth-last-of-type(1)', 'Access token removed')
     .assert.containsText('*[data-id="settingsTabGistAccessToken"]', '')
-    .click('*[data-id="tooltipCloseButton"]')
   },
 
   'Should load dark theme': function (browser) {

apps/remix-ide/test-browser/tests/runAndDeploy.js

@@ -25,8 +25,8 @@ module.exports = {
   'Should sign message using account key': function (browser) {
     browser.waitForElementPresent('*[data-id="settingsRemixRunSignMsg"]')
     .click('*[data-id="settingsRemixRunSignMsg"]')
-    .waitForElementPresent('*[data-id="modalDialogContainer"]')
-    .click('*[data-id="modalDialogCustomPromptText"]')
+    .pause(2000)
+    .waitForElementPresent('*[data-id="modalDialogCustomPromptText"]')
     .setValue('*[data-id="modalDialogCustomPromptText"]', 'Remix is cool!')
     .assert.elementNotPresent('*[data-id="settingsRemixRunSignMsgHash"]')
     .assert.elementNotPresent('*[data-id="settingsRemixRunSignMsgSignature"]')
@@ -47,9 +47,9 @@ module.exports = {
     .waitForElementPresent('*[data-id="Deploy - transact (not payable)"]')
     .click('*[data-id="Deploy - transact (not payable)"]')
     .pause(5000)
-    .testFunction('0xe9b627a180f90a24feb6850f29e4121ea312f315f61756c31468ffbda2955a64', {
+    .testFunction('0xc39ee005c1e1368c84f02e458de4b41dbb966631a8714d15ef8362dada249ede', {
       status: '0x1 Transaction mined and execution succeed',
-      'transaction hash': '0xe9b627a180f90a24feb6850f29e4121ea312f315f61756c31468ffbda2955a64'
+      'transaction hash': '0xc39ee005c1e1368c84f02e458de4b41dbb966631a8714d15ef8362dada249ede'
     })
   },
 
@@ -192,7 +192,6 @@ var sources = [
       content:
       `
       pragma solidity ^0.6.0;
-
       contract helloWorld {
           string public message;
           

apps/remix-ide/test-browser/tests/sauce.js

@@ -2,7 +2,7 @@
 // const https = require('https')
 
 module.exports = function sauce (callback) {
-  return callback()
+  if (typeof callback === 'function') return callback()
   /*
   const currentTest = this.client.currentTest
   const username = this.client.options.username

nx.json

+{
+  "npmScope": "remix-project",
+  "implicitDependencies": {
+    "workspace.json": "*",
+    "package.json": {
+      "dependencies": "*",
+      "devDependencies": "*"
+    },
+    "tsconfig.json": "*",
+    "tslint.json": "*",
+    "nx.json": "*"
+  },
+  "tasksRunnerOptions": {
+    "default": {
+      "runner": "@nrwl/workspace/tasks-runners/default",
+      "options": {
+        "cacheableOperations": ["build", "lint", "test", "e2e"]
+      }
+    }
+  },
+  "projects": {
+    "remix-ide": {
+      "tags": []
+    }
+  }
+}

tools/tsconfig.tools.json

+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../dist/out-tsc/tools",
+    "rootDir": ".",
+    "module": "commonjs",
+    "target": "es5",
+    "types": ["node"]
+  },
+  "include": ["**/*.ts"]
+}

tsconfig.json

+{
+  "compileOnSave": false,
+  "compilerOptions": {
+    "rootDir": ".",
+    "sourceMap": true,
+    "declaration": false,
+    "moduleResolution": "node",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "importHelpers": true,
+    "target": "es2015",
+    "module": "esnext",
+    "typeRoots": ["node_modules/@types"],
+    "lib": ["es2017", "dom"],
+    "skipLibCheck": true,
+    "skipDefaultLibCheck": true,
+    "baseUrl": ".",
+    "paths": {}
+  },
+  "exclude": ["node_modules", "tmp"]
+}

workspace.json

+{
+  "version": 1,
+  "projects": {
+    "remix-ide": {
+      "root": "apps/remix-ide",
+      "sourceRoot": "apps/remix-ide/src",
+      "projectType": "application",
+      "schematics": {},
+      "architect": {
+        "build": {
+          "builder": "@nrwl/workspace:run-commands",
+          "options": {
+            "commands": [
+              {
+              "command": "browserify apps/remix-ide/src/index.js -o apps/remix-ide/build/app.js --exclude solc"
+              }
+            ]
+          }
+        },
+        "start": {
+          "builder": "@nrwl/workspace:run-commands",
+          "options": {
+            "commands": [
+              {
+                "command": "npm-run-all -lpr serve watch onchange remixd"
+              }
+            ]
+          }
+        },
+        "serve": {
+          "builder": "@nrwl/workspace:run-commands",
+          "options": {
+            "commands": [
+              {
+                "command": "npx http-server ./apps/remix-ide"
+              }
+            ]
+          }
+        },
+        "lint": {
+          "builder": "@nrwl/linter:lint",
+          "options": {
+            "linter": "eslint",
+            "config": "apps/remix-ide/.eslintrc.json",
+            "files": [
+              "apps/remix-ide/**/*.js"
+            ],
+            "exclude": ["**/node_modules/**",
+              "apps/remix-ide/build/**/*.js",
+              "apps/remix-ide/src/app/editor/mode-solidity.js",
+              "apps/remix-ide/soljson.js",
+              "apps/remix-ide/assets/js/**/*.js"
+            ]
+          }
+        },
+        "test": {
+          "builder": "@nrwl/workspace:run-commands",
+          "options": {
+            "commands": [
+              {
+                "command": "csslint && node apps/remix-ide/test/index.js"
+              }
+            ]
+          }
+       
+        }
+
+      }
+    }
+  },
+  "cli": {
+    "defaultCollection": "@nrwl/workspace"
+  },
+  "schematics": {
+    "@nrwl/workspace": {
+      "library": {
+        "linter": "eslint"
+      }
+    },
+    "@nrwl/cypress": {
+      "cypress-project": {
+        "linter": "eslint"
+      }
+    },
+    "@nrwl/react": {
+      "application": {
+        "linter": "eslint"
+      },
+      "library": {
+        "linter": "eslint"
+      },
+      "storybook-configuration": {
+        "linter": "eslint"
+      }
+    },
+    "@nrwl/next": {
+      "application": {
+        "linter": "eslint"
+      }
+    },
+    "@nrwl/web": {
+      "application": {
+        "linter": "eslint"
+      }
+    },
+    "@nrwl/node": {
+      "application": {
+        "linter": "eslint"
+      },
+      "library": {
+        "linter": "eslint"
+      }
+    },
+    "@nrwl/nx-plugin": {
+      "plugin": {
+        "linter": "eslint"
+      }
+    },
+    "@nrwl/nest": {
+      "application": {
+        "linter": "eslint"
+      }
+    },
+    "@nrwl/express": {
+      "application": {
+        "linter": "eslint"
+      },
+      "library": {
+        "linter": "eslint"
+      }
+    }
+  },
+  "defaultProject": "remix-ide"
+}