mirror
/
remix-project
mirror of https://github.com/ethereum/remix-project.git
2
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/ethereum/remix-project into remixdmethodsfix

Browse Source
pull/1066/head
filip mertens 4 years ago
parent 4d952a3d97 10fada9cfd
commit 6b05f8e3fc
5 changed files with 58 additions and 96 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 15
      apps/remix-ide/src/app/files/remixd-handle.js
  2. 1
      apps/remix-ide/src/index.html
  3. 8
      libs/remixd/package.json
  4. 116
      package-lock.json
  5. 14
      package.json

15
apps/remix-ide/src/app/files/remixd-handle.js
Unescape View File

@ -130,21 +130,20 @@ export class RemixdHandle extends WebsocketPlugin {
function remixdDialog () { function remixdDialog () {
return yo` return yo`
<div class=${css.dialog}> <div class=${css.dialog}>
<div class=${css.dialogParagraph}>Interact with your file system from Remix. Click connect and find shared folder in the Remix file explorer (under localhost). <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.
Before you get started, check out the <a target="_blank" href="https://remix-ide.readthedocs.io/en/latest/remixd.html">Remixd tutorial</a>.
to find out how to run Remixd.
</div> </div>
<div class=${css.dialogParagraph}>If you have looked at that tutorial and are just looking for the remixd command, <br> here it is: <div class=${css.dialogParagraph}>If you have looked at the Remixd docs and just need remixd command, <br> here it is:
<br><b>remixd -s absolute-path-to-the-shared-folder --remix-ide your-remix-ide-URL-instance</b> <br><b>remixd -s absolute-path-to-the-shared-folder --remix-ide your-remix-ide-URL-instance</b>
</div> </div>
<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> <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>
so please make sure your system is secured enough (port 65520 neither opened nor forwarded). so please make sure your system is secured enough (port 65520 neither opened nor forwarded).
<i class="fas fa-link"></i> will show you current connection status. </div>
<div class=${css.dialogParagraph}>
<h6 class="text-danger">
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>
</h6>
</div> </div>
<div class=${css.dialogParagraph}>This feature is still in Alpha, so we recommend you to keep a copy of the shared folder.</div> <div class=${css.dialogParagraph}>This feature is still in Alpha, so we recommend you to keep a copy of the shared folder.</div>
<span class="text-danger">
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>
</span>
</div> </div>
` `
} }

1
apps/remix-ide/src/index.html
Unescape View File

@ -44,6 +44,7 @@
/* tracker methods like "setCustomDimension" should be called before "trackPageView" */ /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
_paq.push(['disableCookies']); _paq.push(['disableCookies']);
_paq.push(['enableLinkTracking']); _paq.push(['enableLinkTracking']);
_paq.push(['enableJSErrorTracking']);
_paq.push(['trackPageView']); _paq.push(['trackPageView']);
(function() { (function() {
var u="https://matomo.ethereum.org/"; var u="https://matomo.ethereum.org/";

8
libs/remixd/package.json
Unescape View File

@ -35,10 +35,10 @@
}, },
"homepage": "https://github.com/ethereum/remix-project#readme", "homepage": "https://github.com/ethereum/remix-project#readme",
"dependencies": { "dependencies": {
"@remixproject/plugin": "^0.3.3", "@remixproject/plugin": "^0.3.11",
"@remixproject/plugin-api": "^0.3.3", "@remixproject/plugin-api": "^0.3.11",
"@remixproject/plugin-utils": "^0.3.3", "@remixproject/plugin-utils": "^0.3.11",
"@remixproject/plugin-ws": "^0.3.3", "@remixproject/plugin-ws": "^0.3.11",
"axios": ">=0.21.1", "axios": ">=0.21.1",
"chokidar": "^2.1.8", "chokidar": "^2.1.8",
"commander": "^2.20.3", "commander": "^2.20.3",

116
package-lock.json generated
Unescape View File

@ -6934,53 +6934,53 @@
"integrity": "sha512-tVkIU9JQw5fYPxLQgok/a7I6J1eEZ79svwQGpe2mb3jlVsPADOleefOnQBiS/takK7jQuNeswCUicMH1VWVziA==" "integrity": "sha512-tVkIU9JQw5fYPxLQgok/a7I6J1eEZ79svwQGpe2mb3jlVsPADOleefOnQBiS/takK7jQuNeswCUicMH1VWVziA=="
}, },
"@remixproject/engine": { "@remixproject/engine": {
"version": "0.3.3", "version": "0.3.11-alpha.5",
"resolved": "https://registry.npmjs.org/@remixproject/engine/-/engine-0.3.3.tgz", "resolved": "https://registry.npmjs.org/@remixproject/engine/-/engine-0.3.11-alpha.5.tgz",
"integrity": "sha1-jEde0zAFQBj8C0s49f1FqbK9gIY=", "integrity": "sha512-3i8dLZ1Tl7C499hPU0DOsm6BSQzlvqz77AdTOzG8f9Rl0Vh8O+TYdXW8+d4esfNZS6MPhsk8t3MYk5KVcmmD5A==",
"requires": { "requires": {
"@remixproject/plugin-api": "0.3.3", "@remixproject/plugin-api": "0.3.11-alpha.5",
"@remixproject/plugin-utils": "0.3.3" "@remixproject/plugin-utils": "0.3.11-alpha.5"
} }
}, },
"@remixproject/engine-web": { "@remixproject/engine-web": {
"version": "0.3.3", "version": "0.3.11-alpha.5",
"resolved": "https://registry.npmjs.org/@remixproject/engine-web/-/engine-web-0.3.3.tgz", "resolved": "https://registry.npmjs.org/@remixproject/engine-web/-/engine-web-0.3.11-alpha.5.tgz",
"integrity": "sha1-ZQZD7museqljZNPHpuOwG7dgiZU=", "integrity": "sha512-2OvXJzS4Phcl/GC2ubQWDU3/6be9F5mFiyg5eFM8e6bjRVWUmmeO/RnyXM08ZvOz0zFZ+n2j4U8HYhJZnYGXtg==",
"requires": { "requires": {
"@remixproject/engine": "0.3.3", "@remixproject/engine": "0.3.11-alpha.5",
"@remixproject/plugin-api": "0.3.3", "@remixproject/plugin-api": "0.3.11-alpha.5",
"@remixproject/plugin-utils": "0.3.3" "@remixproject/plugin-utils": "0.3.11-alpha.5"
} }
}, },
"@remixproject/plugin": { "@remixproject/plugin": {
"version": "0.3.3", "version": "0.3.11-alpha.5",
"resolved": "https://registry.npmjs.org/@remixproject/plugin/-/plugin-0.3.3.tgz", "resolved": "https://registry.npmjs.org/@remixproject/plugin/-/plugin-0.3.11-alpha.5.tgz",
"integrity": "sha1-yy+ifasg+IQ5CDJ2jmXRaRc8sAE=", "integrity": "sha512-e8hgn6rF21EjphbPks0Lhqgo9eItpy/VUPuoaV4h18qf0rrvc6P76LoHY2G/fSSVcSd8n0t+ozD92q1F5aJ8Sg==",
"requires": { "requires": {
"@remixproject/plugin-api": "0.3.3", "@remixproject/plugin-api": "0.3.11-alpha.5",
"@remixproject/plugin-utils": "0.3.3", "@remixproject/plugin-utils": "0.3.11-alpha.5",
"events": "3.2.0" "events": "3.2.0"
}, },
"dependencies": { "dependencies": {
"events": { "events": {
"version": "3.2.0", "version": "3.2.0",
"resolved": "https://registry.npmjs.org/events/-/events-3.2.0.tgz", "resolved": "https://registry.npmjs.org/events/-/events-3.2.0.tgz",
"integrity": "sha1-k7h8GPjvzUICpGGuxN/AVWtjk3k=" "integrity": "sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg=="
} }
} }
}, },
"@remixproject/plugin-api": { "@remixproject/plugin-api": {
"version": "0.3.3", "version": "0.3.11-alpha.5",
"resolved": "https://registry.npmjs.org/@remixproject/plugin-api/-/plugin-api-0.3.3.tgz", "resolved": "https://registry.npmjs.org/@remixproject/plugin-api/-/plugin-api-0.3.11-alpha.5.tgz",
"integrity": "sha1-jjutHY0IsBQ1g9F3Ko8XfrnfMHw=", "integrity": "sha512-bwdKy2tWIub8I9Ofu42fSlfrLhDEag3k6wTafAE7X3xFQDD1Tp1UuaOtwNqz6UWUarKqyFdR5LnEFx+zZX1O8Q==",
"requires": { "requires": {
"@remixproject/plugin-utils": "0.3.3" "@remixproject/plugin-utils": "0.3.11-alpha.5"
} }
}, },
"@remixproject/plugin-utils": { "@remixproject/plugin-utils": {
"version": "0.3.3", "version": "0.3.11-alpha.5",
"resolved": "https://registry.npmjs.org/@remixproject/plugin-utils/-/plugin-utils-0.3.3.tgz", "resolved": "https://registry.npmjs.org/@remixproject/plugin-utils/-/plugin-utils-0.3.11-alpha.5.tgz",
"integrity": "sha1-SBJncwtNIf9+xAQPogI53WChr5M=", "integrity": "sha512-VIlxBVnwHnxtR85quK3YEWiKS3I0wHO9iy9hnqfgoRjHdQQWggjEat0ZkO8xhrlDhOO+u+xF9QqgP4VmZ+VZGw==",
"requires": { "requires": {
"tslib": "2.0.1" "tslib": "2.0.1"
}, },
@ -6988,66 +6988,28 @@
"tslib": { "tslib": {
"version": "2.0.1", "version": "2.0.1",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz",
"integrity": "sha1-QQ6w0RPltjVkkO7HSWA3JbAhtD4=" "integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ=="
} }
} }
}, },
"@remixproject/plugin-webview": { "@remixproject/plugin-webview": {
"version": "0.3.3", "version": "0.3.11-alpha.5",
"resolved": "https://registry.npmjs.org/@remixproject/plugin-webview/-/plugin-webview-0.3.3.tgz", "resolved": "https://registry.npmjs.org/@remixproject/plugin-webview/-/plugin-webview-0.3.11-alpha.5.tgz",
"integrity": "sha1-3x7RgdkD1ya0JTjfWsIp8cpQOqI=", "integrity": "sha512-vIL1RN7O/bGKg8wEaygQKatjZrvL/tWl1jNDfC7k34ojC8qvgjUxRJ/dyTfAXAqAaY9cRu2x8vpyEhH28NGAaQ==",
"requires": { "requires": {
"@remixproject/plugin": "0.3.3", "@remixproject/plugin": "0.3.11-alpha.5",
"@remixproject/plugin-api": "0.3.3", "@remixproject/plugin-api": "0.3.11-alpha.5",
"@remixproject/plugin-utils": "0.3.3" "@remixproject/plugin-utils": "0.3.11-alpha.5"
} }
}, },
"@remixproject/plugin-ws": { "@remixproject/plugin-ws": {
"version": "0.3.3", "version": "0.3.11-alpha.5",
"resolved": "https://registry.npmjs.org/@remixproject/plugin-ws/-/plugin-ws-0.3.3.tgz", "resolved": "https://registry.npmjs.org/@remixproject/plugin-ws/-/plugin-ws-0.3.11-alpha.5.tgz",
"integrity": "sha1-qxGVX9ut7uRG0FE+8gOnbyodNr8=", "integrity": "sha512-CLV0Xjjua4/gVRTeS4Ce6lqFhsPCF+Kr67oVshoeD09ljfsMUg0ggbJfbYlYLN+9Hq+Q4TpW7BdP4YuIEmEidw==",
"requires": { "requires": {
"@remixproject/plugin": "0.3.3", "@remixproject/plugin": "0.3.11-alpha.5",
"@remixproject/plugin-api": "0.3.3", "@remixproject/plugin-api": "0.3.11-alpha.5",
"@remixproject/plugin-utils": "0.3.3" "@remixproject/plugin-utils": "0.3.11-alpha.5"
},
"dependencies": {
"@remixproject/plugin": {
"version": "0.3.3",
"resolved": "https://registry.npmjs.org/@remixproject/plugin/-/plugin-0.3.3.tgz",
"integrity": "sha512-gSZdgBjb4y2N2+5kMfbJYjO2zH8b1pFd3xdY4ViL5vtt8l4lup+iOVidrGTv1lPPl7Snk+E8NQhRk8Snr6//mg==",
"requires": {
"@remixproject/plugin-api": "0.3.3",
"@remixproject/plugin-utils": "0.3.3",
"events": "3.2.0"
}
},
"@remixproject/plugin-api": {
"version": "0.3.3",
"resolved": "https://registry.npmjs.org/@remixproject/plugin-api/-/plugin-api-0.3.3.tgz",
"integrity": "sha512-Wsic9cnTj/9B7dGKQEq+VTAwit2o7rtdVwJ+lcI68SbavhNHGo0IUexOZkxwGFL2THchWz2hjfrs80W10yle0A==",
"requires": {
"@remixproject/plugin-utils": "0.3.3"
}
},
"@remixproject/plugin-utils": {
"version": "0.3.3",
"resolved": "https://registry.npmjs.org/@remixproject/plugin-utils/-/plugin-utils-0.3.3.tgz",
"integrity": "sha512-w1WCdS7bDmbaY83ybIjHzFW9TlQUV2Rt6Fw8hXGnT29ontD6mKoBWhoEPYzasMEHG47lmNzDjRToVPhQh54Q+w==",
"requires": {
"tslib": "2.0.1"
}
},
"events": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/events/-/events-3.2.0.tgz",
"integrity": "sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg=="
},
"tslib": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz",
"integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ=="
}
} }
}, },
"@restart/context": { "@restart/context": {
@ -16992,7 +16954,7 @@
"express-ws": { "express-ws": {
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/express-ws/-/express-ws-4.0.0.tgz", "resolved": "https://registry.npmjs.org/express-ws/-/express-ws-4.0.0.tgz",
"integrity": "sha1-2r2NyXRRZBiQKkH+bjDtlJtNNsQ=", "integrity": "sha512-KEyUw8AwRET2iFjFsI1EJQrJ/fHeGiJtgpYgEWG3yDv4l/To/m3a2GaYfeGyB3lsWdvbesjF5XCMx+SVBgAAYw==",
"requires": { "requires": {
"ws": "^5.2.0" "ws": "^5.2.0"
}, },
@ -17000,7 +16962,7 @@
"ws": { "ws": {
"version": "5.2.2", "version": "5.2.2",
"resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz", "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz",
"integrity": "sha1-3/7xSGa46NyRM1glFNG++vlumA8=", "integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==",
"requires": { "requires": {
"async-limiter": "~1.0.0" "async-limiter": "~1.0.0"
} }

14
package.json
Unescape View File

@ -130,13 +130,13 @@
}, },
"dependencies": { "dependencies": {
"@erebos/bzz-node": "^0.13.0", "@erebos/bzz-node": "^0.13.0",
"@remixproject/engine": "^0.3.3", "@remixproject/engine": "^0.3.11",
"@remixproject/engine-web": "^0.3.3", "@remixproject/engine-web": "^0.3.11",
"@remixproject/plugin": "^0.3.3", "@remixproject/plugin": "^0.3.11",
"@remixproject/plugin-api": "^0.3.2", "@remixproject/plugin-api": "^0.3.11",
"@remixproject/plugin-utils": "^0.3.2", "@remixproject/plugin-utils": "^0.3.11",
"@remixproject/plugin-webview": "^0.3.3", "@remixproject/plugin-webview": "^0.3.11",
"@remixproject/plugin-ws": "^0.3.3", "@remixproject/plugin-ws": "^0.3.11",
"@types/jest": "^26.0.5", "@types/jest": "^26.0.5",
"@types/tape": "^4.2.33", "@types/tape": "^4.2.33",
"ansi-gray": "^0.1.1", "ansi-gray": "^0.1.1",

Write Preview
Loading…
Cancel
Save