Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
0064a96
web build remix-ide
ioedeveloper Jul 1, 2020
0356ab8
Undo webpack config
ioedeveloper Jul 1, 2020
67b4dd8
remix-ide webpack build succeeded
ioedeveloper Jul 2, 2020
5b8de54
webpack build successful with changes for remix-ide-js
ioedeveloper Jul 3, 2020
9d79070
Implement webpack working webpack setup for remix-ide
ioedeveloper Jul 4, 2020
46aa460
remove sample remix-ide-js app
ioedeveloper Jul 4, 2020
dc8d1a2
Change e2e tests to point to new localhost port 4200
ioedeveloper Jul 4, 2020
678e948
Bump circleci node version
ioedeveloper Jul 4, 2020
d822faa
Bump circleci node version
ioedeveloper Jul 4, 2020
a016942
Set maxWorker for remix-ide workspace config
ioedeveloper Jul 4, 2020
64171fa
Fixed remix-ide linting error
ioedeveloper Jul 4, 2020
96bff4b
Set correect eslintrc path for remix-ide
ioedeveloper Jul 4, 2020
19f0503
Fixed linting error
ioedeveloper Jul 6, 2020
df2cddb
Set test command
ioedeveloper Jul 6, 2020
19c8c5c
Bump circle ci node version
ioedeveloper Jul 6, 2020
b2ac9d3
Revert "Bump circle ci node version"
ioedeveloper Jul 6, 2020
435c5b7
Debug ci
ioedeveloper Jul 6, 2020
5e7acbc
Debug ci
ioedeveloper Jul 6, 2020
90bf694
Install compactible version of JAVA for selenium in ci
ioedeveloper Jul 6, 2020
3b6f5a9
Debug ci
ioedeveloper Jul 6, 2020
dd2f3c1
Debug ci
ioedeveloper Jul 6, 2020
919aed4
Add permissions
ioedeveloper Jul 6, 2020
e31a1ea
Debug ci
ioedeveloper Jul 6, 2020
0114a67
Change java install command
ioedeveloper Jul 6, 2020
4109848
Added babel loader
ioedeveloper Jul 6, 2020
18cbded
Linked remix-solidity lib to local lib
ioedeveloper Jul 9, 2020
1154b8e
webworker with webpack worked
Aniket-Engg Jul 9, 2020
e37a1a3
Modified changes to work with typescript at runtime
ioedeveloper Jul 9, 2020
9397e2f
Remove unnecessary build step
ioedeveloper Jul 9, 2020
768204d
Remove unnecessary build step
ioedeveloper Jul 9, 2020
f8701a5
Remove unnecessary build step
ioedeveloper Jul 9, 2020
cf7d86f
Use remix-solidity build for remix-ide
ioedeveloper Jul 10, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 18 additions & 10 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -24,7 +24,15 @@ jobs:
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-project/apps/remix-ide/seleniumConfig.js
Expand All @@ -41,7 +49,7 @@ jobs:
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
Expand All @@ -58,7 +66,7 @@ jobs:
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-project/apps/remix-ide/seleniumConfig.js
Expand All @@ -81,7 +89,7 @@ jobs:
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
Expand All @@ -97,7 +105,7 @@ jobs:
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-project/apps/remix-ide/seleniumConfig.js
Expand All @@ -113,7 +121,7 @@ jobs:
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
Expand All @@ -129,7 +137,7 @@ jobs:
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: |
Expand All @@ -142,7 +150,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
Expand All @@ -158,7 +166,7 @@ jobs:
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: |
Expand Down
3 changes: 0 additions & 3 deletions apps/remix-ide/.babelrc

This file was deleted.

10 changes: 5 additions & 5 deletions apps/remix-ide/.circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -41,7 +41,7 @@ jobs:
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
Expand Down Expand Up @@ -81,7 +81,7 @@ jobs:
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
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
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
Expand Down Expand Up @@ -142,7 +142,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
Expand Down
2 changes: 1 addition & 1 deletion apps/remix-ide/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ npm start

## DEVELOPING:

Run `npm start` and open `http://127.0.0.1:8080` in your browser.
Run `npm start` and open `http://127.0.0.1:4200` in your browser.

Then open your `text editor` and start developing.
The browser will automatically refresh when files are saved.
Expand Down
2 changes: 1 addition & 1 deletion apps/remix-ide/ci/browser_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ setupRemixd () {
cd apps/remix-ide/contracts
echo 'sharing folder: '
echo $PWD
../../../node_modules/.bin/remixd -s $PWD --remix-ide http://127.0.0.1:8080 &
../../../node_modules/.bin/remixd -s $PWD --remix-ide http://127.0.0.1:4200 &
cd ../../..
}

Expand Down
2 changes: 1 addition & 1 deletion apps/remix-ide/ci/browser_tests_chrome.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ setupRemixd () {
cd apps/remix-ide/contracts
echo 'sharing folder: '
echo $PWD
../../../node_modules/.bin/remixd -s $PWD --remix-ide http://127.0.0.1:8080 &
../../../node_modules/.bin/remixd -s $PWD --remix-ide http://127.0.0.1:4200 &
cd ../../..
}

Expand Down
2 changes: 1 addition & 1 deletion apps/remix-ide/ci/browser_tests_firefox.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ setupRemixd () {
cd apps/remix-ide/contracts
echo 'sharing folder: '
echo $PWD
../../../node_modules/.bin/remixd -s $PWD --remix-ide http://127.0.0.1:8080 &
../../../node_modules/.bin/remixd -s $PWD --remix-ide http://127.0.0.1:4200 &
cd ../../..
}

Expand Down
2 changes: 1 addition & 1 deletion apps/remix-ide/ci/browser_tests_run_deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ setupRemixd () {
cd apps/remix-ide/contracts
echo 'sharing folder: '
echo $PWD
../../../node_modules/.bin/remixd -s $PWD --remix-ide http://127.0.0.1:8080 &
../../../node_modules/.bin/remixd -s $PWD --remix-ide http://127.0.0.1:4200 &
cd ../../..
}

Expand Down
2 changes: 1 addition & 1 deletion apps/remix-ide/ci/makeMockCompiler.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

var fs = require('fs')
var compiler = require('solc')
var compilerInput = require('remix-solidity').CompilerInput
var compilerInput = require('@remix-project/remix-solidity').CompilerInput
var defaultVersion = 'v0.6.6+commit.6c089d02'
const path = require('path')

Expand Down
2 changes: 1 addition & 1 deletion apps/remix-ide/docs/locations.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ So if you've found the documentation to Remix but don't know where to find Remix

- An online version is available at [https://remix.ethereum.org](https://remix.ethereum.org). This version is stable and is updated at almost every release.
- An alpha online version is available at [https://remix-alpha.ethereum.org](https://remix-alpha.ethereum.org). This is not a stable version.
- npm `remix-ide` package `npm install remix-ide -g`. `remix-ide` create a new instance of `Remix IDE` available at [http://127.0.0.1:8080](http://127.0.0.1:8080) and make the current folder available to Remix IDE by automatically starting `remixd`.
- npm `remix-ide` package `npm install remix-ide -g`. `remix-ide` create a new instance of `Remix IDE` available at [http://127.0.0.1:4200](http://127.0.0.1:4200) and make the current folder available to Remix IDE by automatically starting `remixd`.
see [Connection to `remixd`](https://remix-ide.readthedocs.io/en/latest/remixd.html) for more information about sharing local file with `Remix IDE`.
- Github release: [https://github.com/ethereum/remix-ide/releases](https://github.com/ethereum/remix-ide/releases) . The source code is packaged at every release but still need to be built using `npm run build`.
2 changes: 1 addition & 1 deletion apps/remix-ide/src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
toolTip('You are using an `https` connection. Please switch to `http` if you are using Remix against an `http Web3 provider` or allow Mixed Content in your browser.')
}

const hosts = ['127.0.0.1:8080', '192.168.0.101:8080', 'localhost:8080']
const hosts = ['127.0.0.1:4200', '192.168.0.101:4200', 'localhost:4200']
// workaround for Electron support
if (!isElectron() && !hosts.includes(window.location.host)) {
// Oops! Accidentally trigger refresh or bookmark.
Expand Down
2 changes: 1 addition & 1 deletion apps/remix-ide/src/app/compiler/compiler-helpers.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict'
import { canUseWorker } from './compiler-utils'
import { Compiler } from 'remix-solidity'
import { Compiler } from '@remix-project/remix-solidity'
import CompilerAbstract from './compiler-abstract'

export const compile = async (compilationTargets, settings) => {
Expand Down
2 changes: 1 addition & 1 deletion apps/remix-ide/src/app/tabs/compileTab/compileTab.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const async = require('async')
const EventEmitter = require('events')
var remixTests = require('remix-tests')
var Compiler = require('remix-solidity').Compiler
var Compiler = require('@remix-project/remix-solidity').Compiler
var CompilerImport = require('../../compiler/compiler-imports')

// TODO: move this to the UI
Expand Down
4 changes: 4 additions & 0 deletions apps/remix-ide/src/assets/css/font-awesome.min.css

Large diffs are not rendered by default.

69 changes: 69 additions & 0 deletions apps/remix-ide/src/assets/css/pygment_trac.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
.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 }
Binary file added apps/remix-ide/src/assets/fonts/FontAwesome.otf
Binary file not shown.
Binary file not shown.
Loading