From c6aff4beb48a2f630de7c65973d7e1ac5b22de4a Mon Sep 17 00:00:00 2001 From: aniket-engg Date: Fri, 4 Jun 2021 13:14:08 +0530 Subject: [PATCH 1/5] remixd modal content updated --- apps/remix-ide/src/app/files/remixd-handle.js | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/apps/remix-ide/src/app/files/remixd-handle.js b/apps/remix-ide/src/app/files/remixd-handle.js index f1eb717db6..0bcc9bc3ca 100644 --- a/apps/remix-ide/src/app/files/remixd-handle.js +++ b/apps/remix-ide/src/app/files/remixd-handle.js @@ -130,21 +130,23 @@ export class RemixdHandle extends WebsocketPlugin { } function remixdDialog () { - const commandText = 'remixd -s absolute-path-to-the-shared-folder --remix-ide your-remix-ide-URL-instance' + const commandText = 'remixd -s path-to-the-shared-folder --remix-ide remix-ide-instance-URL' return yo`
- Access your file system from Remix IDE. Remixd the NPM module needs to be running in the background to use the Remixd plugin. For more info please check the Remixd tutorial. + Access your local file system from Remix IDE using Remixd NPM package.

+ Remixd needs to be running in the background to load the files in localhost workspace. For more info, please check the Remixd tutorial.
-
If you are just looking for the remixd command here it is: -

remixd -s absolute-path-to-the-shared-folder --remix-ide your-remix-ide-URL-instance +
If you are just looking for the remixd command, here it is: +

${commandText} ${copyToClipboard(() => commandText)}
-
A connection will start a session between ${window.location.origin} and your local file system ws://127.0.0.1:65520 -
To see that a connection has been made, check that there is a localhost section in the Files Explorer +
On successful connection, a session will be started between ${window.location.origin} and your local file system at ws://127.0.0.1:65520 + and files will be loaded under localhost workspace in the File Explorers. +
Please note, if shared folder is a hardhat project, an additional hardhat websocket plugin will be listening at ws://127.0.0.1:65522
-
Please make sure your system is secured enough (port 65520 should not be opened nor forwarded). - This feature is still in Alpha, so we recommend you to keep a copy of the shared folder. +
Please make sure your system is secured enough and ports 65520, 65522 are not opened nor forwarded. + This feature is still in Alpha, so we recommend to keep a copy of the shared folder.
From a3f6e7124e484556c5104c1fb7b6d9dc1767fb15 Mon Sep 17 00:00:00 2001 From: aniket-engg Date: Fri, 4 Jun 2021 13:28:46 +0530 Subject: [PATCH 2/5] show remixd latest version --- apps/remix-ide/src/app/files/remixd-handle.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/remix-ide/src/app/files/remixd-handle.js b/apps/remix-ide/src/app/files/remixd-handle.js index 0bcc9bc3ca..da595d1969 100644 --- a/apps/remix-ide/src/app/files/remixd-handle.js +++ b/apps/remix-ide/src/app/files/remixd-handle.js @@ -1,6 +1,7 @@ import isElectron from 'is-electron' import { WebsocketPlugin } from '@remixproject/engine-web' import * as packageJson from '../../../../../package.json' +import { version as remixdVersion} from '../../../../../libs/remixd/package.json' var yo = require('yo-yo') var modalDialog = require('../ui/modaldialog') var modalDialogCustom = require('../ui/modal-dialog-custom') @@ -150,7 +151,8 @@ function remixdDialog () {
- Before using, make sure you have the latest remixd version.
Read here how to update it + Before using, make sure remixd version is latest i.e. ${remixdVersion} +
Read here how to update it
From 4bbe867521fe0908e48304cba9b294e25ca9206d Mon Sep 17 00:00:00 2001 From: aniket-engg Date: Fri, 4 Jun 2021 13:38:54 +0530 Subject: [PATCH 3/5] linting --- apps/remix-ide/src/app/files/remixd-handle.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/remix-ide/src/app/files/remixd-handle.js b/apps/remix-ide/src/app/files/remixd-handle.js index da595d1969..dbf20511d3 100644 --- a/apps/remix-ide/src/app/files/remixd-handle.js +++ b/apps/remix-ide/src/app/files/remixd-handle.js @@ -1,7 +1,7 @@ import isElectron from 'is-electron' import { WebsocketPlugin } from '@remixproject/engine-web' import * as packageJson from '../../../../../package.json' -import { version as remixdVersion} from '../../../../../libs/remixd/package.json' +import { version as remixdVersion } from '../../../../../libs/remixd/package.json' var yo = require('yo-yo') var modalDialog = require('../ui/modaldialog') var modalDialogCustom = require('../ui/modal-dialog-custom') From a631cddcac54ac349df760d1201e8dd56b98025c Mon Sep 17 00:00:00 2001 From: aniket-engg Date: Mon, 7 Jun 2021 10:46:58 +0530 Subject: [PATCH 4/5] suggested text changes --- apps/remix-ide/src/app/files/remixd-handle.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/remix-ide/src/app/files/remixd-handle.js b/apps/remix-ide/src/app/files/remixd-handle.js index dbf20511d3..e9995cbfd2 100644 --- a/apps/remix-ide/src/app/files/remixd-handle.js +++ b/apps/remix-ide/src/app/files/remixd-handle.js @@ -142,9 +142,9 @@ function remixdDialog () {

${commandText} ${copyToClipboard(() => commandText)}
-
On successful connection, a session will be started between ${window.location.origin} and your local file system at ws://127.0.0.1:65520 - and files will be loaded under localhost workspace in the File Explorers. -
Please note, if shared folder is a hardhat project, an additional hardhat websocket plugin will be listening at ws://127.0.0.1:65522 +
When connected, a session will be started between ${window.location.origin} and your local file system at ws://127.0.0.1:65520 + and the shared folder will be in the File Explorers workspace named "localhost". +
Note, if the shared folder is a Hardhat project, an additional Hardhat websocket plugin will be listening at ws://127.0.0.1:65522
Please make sure your system is secured enough and ports 65520, 65522 are not opened nor forwarded. This feature is still in Alpha, so we recommend to keep a copy of the shared folder. From e511e68aa235e0492aadf81dfa38049afee30cc8 Mon Sep 17 00:00:00 2001 From: yann300 Date: Tue, 8 Jun 2021 10:21:23 +0200 Subject: [PATCH 5/5] fix import during e2e tests --- apps/remix-ide-e2e/src/tests/debugger.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/remix-ide-e2e/src/tests/debugger.spec.ts b/apps/remix-ide-e2e/src/tests/debugger.spec.ts index d6b1cb2743..8a16f18066 100644 --- a/apps/remix-ide-e2e/src/tests/debugger.spec.ts +++ b/apps/remix-ide-e2e/src/tests/debugger.spec.ts @@ -265,7 +265,7 @@ const sources = [ } }, { - 'externalImport.sol': { content: 'import "https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/token/ERC20/ERC20.sol"; contract test7 {}' } + 'externalImport.sol': { content: 'import "https://github.com/OpenZeppelin/openzeppelin-contracts/blob/release-v4.1/contracts/token/ERC20/ERC20.sol"; contract test7 {}' } }, { 'withABIEncoderV2.sol': {