Skip to content

Commit 6b05f8e

Browse files
author
filip mertens
committed
Merge branch 'master' of https://github.com/ethereum/remix-project into remixdmethodsfix
2 parents 4d952a3 + 10fada9 commit 6b05f8e

File tree

5 files changed

+58
-96
lines changed

5 files changed

+58
-96
lines changed

apps/remix-ide/src/app/files/remixd-handle.js

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -130,21 +130,20 @@ export class RemixdHandle extends WebsocketPlugin {
130130
function remixdDialog () {
131131
return yo`
132132
<div class=${css.dialog}>
133-
<div class=${css.dialogParagraph}>Interact with your file system from Remix. Click connect and find shared folder in the Remix file explorer (under localhost).
134-
Before you get started, check out the <a target="_blank" href="https://remix-ide.readthedocs.io/en/latest/remixd.html">Remixd tutorial</a>.
135-
to find out how to run Remixd.
133+
<div class=${css.dialogParagraph}>Interact with your file system from Remix. <br>See the <a target="_blank" href="https://remix-ide.readthedocs.io/en/latest/remixd.html">Remixd tutorial</a> for more info.
136134
</div>
137-
<div class=${css.dialogParagraph}>If you have looked at that tutorial and are just looking for the remixd command, <br> here it is:
135+
<div class=${css.dialogParagraph}>If you have looked at the Remixd docs and just need remixd command, <br> here it is:
138136
<br><b>remixd -s absolute-path-to-the-shared-folder --remix-ide your-remix-ide-URL-instance</b>
139137
</div>
140138
<div class=${css.dialogParagraph}>Connection will start a session between <em>${window.location.href}</em> and your local file system <i>ws://127.0.0.1:65520</i>
141139
so please make sure your system is secured enough (port 65520 neither opened nor forwarded).
142-
<i class="fas fa-link"></i> will show you current connection status.
140+
</div>
141+
<div class=${css.dialogParagraph}>
142+
<h6 class="text-danger">
143+
Before using, make sure you have the <b>latest remixd version</b>.<br><a target="_blank" href="https://remix-ide.readthedocs.io/en/latest/remixd.html#update-to-the-latest-remixd">Read here how to update it</a>
144+
</h6>
143145
</div>
144146
<div class=${css.dialogParagraph}>This feature is still in Alpha, so we recommend you to keep a copy of the shared folder.</div>
145-
<span class="text-danger">
146-
Please make sure you have the <b>latest remixd version</b>. <a target="_blank" href="https://remix-ide.readthedocs.io/en/latest/remixd.html#update-to-the-latest-remixd">Read here how to update it</a>
147-
</span>
148147
</div>
149148
`
150149
}

apps/remix-ide/src/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
4545
_paq.push(['disableCookies']);
4646
_paq.push(['enableLinkTracking']);
47+
_paq.push(['enableJSErrorTracking']);
4748
_paq.push(['trackPageView']);
4849
(function() {
4950
var u="https://matomo.ethereum.org/";

libs/remixd/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
},
3636
"homepage": "https://github.com/ethereum/remix-project#readme",
3737
"dependencies": {
38-
"@remixproject/plugin": "^0.3.3",
39-
"@remixproject/plugin-api": "^0.3.3",
40-
"@remixproject/plugin-utils": "^0.3.3",
41-
"@remixproject/plugin-ws": "^0.3.3",
38+
"@remixproject/plugin": "^0.3.11",
39+
"@remixproject/plugin-api": "^0.3.11",
40+
"@remixproject/plugin-utils": "^0.3.11",
41+
"@remixproject/plugin-ws": "^0.3.11",
4242
"axios": ">=0.21.1",
4343
"chokidar": "^2.1.8",
4444
"commander": "^2.20.3",

package-lock.json

Lines changed: 39 additions & 77 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -130,13 +130,13 @@
130130
},
131131
"dependencies": {
132132
"@erebos/bzz-node": "^0.13.0",
133-
"@remixproject/engine": "^0.3.3",
134-
"@remixproject/engine-web": "^0.3.3",
135-
"@remixproject/plugin": "^0.3.3",
136-
"@remixproject/plugin-api": "^0.3.2",
137-
"@remixproject/plugin-utils": "^0.3.2",
138-
"@remixproject/plugin-webview": "^0.3.3",
139-
"@remixproject/plugin-ws": "^0.3.3",
133+
"@remixproject/engine": "^0.3.11",
134+
"@remixproject/engine-web": "^0.3.11",
135+
"@remixproject/plugin": "^0.3.11",
136+
"@remixproject/plugin-api": "^0.3.11",
137+
"@remixproject/plugin-utils": "^0.3.11",
138+
"@remixproject/plugin-webview": "^0.3.11",
139+
"@remixproject/plugin-ws": "^0.3.11",
140140
"@types/jest": "^26.0.5",
141141
"@types/tape": "^4.2.33",
142142
"ansi-gray": "^0.1.1",

0 commit comments

Comments
 (0)