diff --git a/apps/remix-ide/package.json b/apps/remix-ide/package.json deleted file mode 100644 index f04505ae39c..00000000000 --- a/apps/remix-ide/package.json +++ /dev/null @@ -1,207 +0,0 @@ -{ - "name": "remix-ide", - "version": "v0.10.3", - "description": "Extendable Web IDE for Ethereum", - "devDependencies": { - "@babel/core": "^7.4.5", - "@babel/plugin-transform-object-assign": "^7.2.0", - "@babel/polyfill": "^7.4.4", - "@babel/preset-env": "^7.4.5", - "@babel/preset-es2015": "latest", - "@babel/preset-es2017": "latest", - "@babel/preset-stage-0": "^7.0.0", - "@babel/register": "^7.4.4", - "@fortawesome/fontawesome-free": "^5.8.1", - "@resolver-engine/imports": "^0.3.0", - "ace-mode-move": "0.0.1", - "ace-mode-solidity": "^0.1.0", - "ace-mode-zokrates": "^1.0.0", - "async": "^2.1.2", - "babel-eslint": "^10.0.0", - "babel-plugin-fast-async": "^6.1.2", - "babel-plugin-transform-object-rest-spread": "^6.26.0", - "babel-plugin-yo-yoify": "^2.0.0", - "babelify": "^10.0.0", - "brace": "^0.8.0", - "browserify": "^16.2.3", - "browserify-reload": "^1.0.3", - "component-type": "^1.2.1", - "copy-text-to-clipboard": "^1.0.4", - "csjs-inject": "^1.0.1", - "csslint": "^1.0.2", - "deep-equal": "^1.0.1", - "dotenv": "^8.2.0", - "ethereumjs-util": "^6.2.0", - "ethers": "^4.0.27", - "events": "^3.0.0", - "execr": "^1.0.1", - "exorcist": "^0.4.0", - "fast-async": "^7.0.6", - "fast-levenshtein": "^2.0.6", - "ganache-cli": "^6.8.1", - "gists": "^1.0.1", - "ipfs-mini": "^1.1.5", - "is-electron": "^2.2.0", - "javascript-serialize": "^1.6.1", - "jquery": "^3.3.1", - "js-base64": "^2.1.9", - "js-beautify": "1.6.14", - "minixhr": "^3.2.2", - "mkdirp": "^0.5.1", - "nanohtml": "^1.6.3", - "nightwatch": "^0.9.20", - "notify-error": "^1.2.0", - "npm-link-local": "^1.1.0", - "npm-merge-driver": "^2.3.5", - "npm-run-all": "^4.0.2", - "onchange": "^3.2.1", - "remix-analyzer": "0.5.3", - "remix-astwalker": "0.0.25", - "remix-debug": "0.4.5", - "remix-lib": "0.4.30", - "remix-simulator": "0.1.9-beta.6", - "remix-solidity": "0.3.31", - "remix-tabs": "1.0.48", - "remix-tests": "0.1.34", - "remixd": "0.2.3-alpha.4", - "request": "^2.83.0", - "rimraf": "^2.6.1", - "selenium-standalone": "^6.17.0", - "semver": "^6.1.2", - "solc": "^0.6.0", - "swarmgw": "^0.3.1", - "tape": "^4.5.1", - "uglify-js": "^2.8.16", - "vm-browserify": "0.0.4", - "watchify": "^3.9.0", - "web3": "1.2.4", - "webworkify": "^1.2.1", - "yo-yo": "^1.2.2", - "yo-yoify": "^3.7.3" - }, - "dependencies": { - "@remixproject/engine": "^0.2.5", - "http-server": "^0.11.1", - "standard": "^8.5.0" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/ethereum/remix-ide.git" - }, - "keywords": [ - "ethereum", - "solidity", - "compiler" - ], - "author": "chriseth", - "license": "MIT", - "bugs": { - "url": "https://github.com/ethereum/remix-ide/issues" - }, - "homepage": "https://github.com/ethereum/remix-ide#readme", - "standard": { - "ignore": [ - "build/", - "src/app/editor/mode-solidity.js", - "soljson.js", - "assets/js/0.7.7/app.js" - ], - "parser": "babel-eslint" - }, - "browserify": { - "transform": [ - [ - "babelify", - { - "sourceMapsAbsolute": false, - "sourceMaps": true, - "plugins": [ - [ - "module:fast-async", - { - "runtimePattern": null, - "compiler": { - "es7": true, - "noRuntime": true, - "promises": true, - "wrapAwait": true - } - } - ], - [ - "module:babel-plugin-yo-yoify" - ], - [ - "module:@babel/plugin-transform-object-assign" - ] - ], - "presets": [ - "@babel/preset-env" - ] - } - ] - ] - }, - "bin": { - "remix-ide": "./bin/remix-ide" - }, - "scripts": { - "setupremix": "npm run linkremixdebug && npm run linkremixlib && npm run linkremixsolidity && npm run linkremixanalyzer && npm run linkremixtests && npm run linkremixsimulator", - "pullremix": "git clone https://github.com/ethereum/remix", - "linkremixlib": "cd node_modules && rm -rf remix-lib && ln -s ../../remix/remix-lib remix-lib && cd ..", - "linkremixsolidity": "cd node_modules && rm -rf remix-solidity && ln -s ../../remix/remix-solidity remix-solidity && cd ..", - "linkremixtests": "cd node_modules && rm -rf remix-tests && ln -s ../../remix/remix-tests remix-tests && cd ..", - "linkremixdebug": "cd node_modules && rm -rf remix-debug && ln -s ../../remix/remix-debug remix-debug && cd ..", - "linkremixanalyzer": "cd node_modules && rm -rf remix-analyzer && ln -s ../../remix/remix-analyzer remix-analyzer && cd ..", - "linkremixsimulator": "cd node_modules && rm -rf remix-simulator && ln -s ../../remix/remix-simulator remix-simulator && cd ..", - "build": "browserify src/index.js -o build/app.js --exclude solc", - "build_debugger": "browserify src/app/debugger/remix-debugger/index.js -o src/app/debugger/remix-debugger/build/app.js", - "browsertest": "sleep 5 && npm run nightwatch_local", - "csslint": "csslint --ignore=order-alphabetical --errors='errors,duplicate-properties,empty-rules' --exclude-list='assets/css/font-awesome.min.css' assets/css/", - "downloadsolc_root": "wget --no-check-certificate https://solc-bin.ethereum.org/bin/soljson-v0.6.6+commit.6c089d02.js -O soljson.js", - "lint": "standard | notify-error", - "make-mock-compiler": "node ci/makeMockCompiler.js", - "minify": "uglifyjs --in-source-map inline --source-map-inline -c warnings=false", - "nightwatch_parallel": "nightwatch -e chrome,firefox --config nightwatch.js", - "nightwatch_local_firefox": "nightwatch --config nightwatch.js --env firefox", - "nightwatch_local_chrome": "nightwatch --config nightwatch.js --env chrome", - "nightwatch_local_ballot": "nightwatch ./test-browser/tests/ballot.test.js --config nightwatch.js --env chrome ", - "nightwatch_local_usingWorker": "nightwatch ./test-browser/tests/usingWebWorker.test.js --config nightwatch.js --env chrome ", - "nightwatch_local_libraryDeployment": "nightwatch ./test-browser/tests/libraryDeployment.test.js --config nightwatch.js --env chrome ", - "nightwatch_local_solidityImport": "nightwatch ./test-browser/tests/solidityImport.test.js --config nightwatch.js --env chrome ", - "nightwatch_local_recorder": "nightwatch ./test-browser/tests/recorder.test.js --config nightwatch.js --env chrome ", - "nightwatch_local_transactionExecution": "nightwatch ./test-browser/tests/transactionExecution.test.js --config nightwatch.js --env chrome ", - "nightwatch_local_staticAnalysis": "nightwatch ./test-browser/tests/staticAnalysis.test.js --config nightwatch.js --env chrome ", - "nightwatch_local_signingMessage": "nightwatch ./test-browser/tests/signingMessage.test.js --config nightwatch.js --env chrome ", - "nightwatch_local_specialFunctions": "nightwatch ./test-browser/tests/specialFunctions.test.js --config nightwatch.js --env chrome ", - "nightwatch_local_solidityUnitTests": "nightwatch ./test-browser/tests/solidityUnittests.test.js --config nightwatch.js --env chrome ", - "nightwatch_local_remixd": "nightwatch ./test-browser/tests/remixd.test.js --config nightwatch.js --env chrome ", - "nightwatch_local_terminal": "nightwatch ./test-browser/tests/terminal.test.js --config nightwatch.js --env chrome ", - "nightwatch_local_gist": "nightwatch ./test-browser/tests/gist.test.js --config nightwatch.js --env chrome ", - "nightwatch_local_workspace": "nightwatch ./test-browser/tests/workspace.test.js --config nightwatch.js --env chrome ", - "nightwatch_local_defaultLayout": "nightwatch ./test-browser/tests/defaultLayout.test.js --config nightwatch.js --env chrome ", - "nightwatch_local_pluginManager": "nightwatch ./test-browser/tests/pluginManager.test.js --config nightwatch.js --env chrome ", - "nightwatch_local_publishContract": "nightwatch ./test-browser/tests/publishContract.test.js --config nightwatch.js --env chrome ", - "nightwatch_local_generalSettings": "nightwatch ./test-browser/tests/generalSettings.test.js --config nightwatch.js --env chrome ", - "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_compiler": "nightwatch ./test-browser/tests/compiler_api.test.js --config nightwatch.js --env chrome ", - "nightwatch_local_txListener": "nightwatch ./test-browser/tests/txListener.test.js --config nightwatch.js --env chrome ", - "nightwatch_local_fileManager": "nightwatch ./test-browser/tests/fileManager_api.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", - "remixd": "remixd -s ./contracts --remix-ide http://127.0.0.1:8080", - "selenium": "selenium-standalone start", - "selenium-install": "selenium-standalone install", - "serve": "npx http-server .", - "sourcemap": "exorcist --root ../ build/app.js.map > build/app.js", - "start": "npm-run-all -lpr serve watch onchange remixd", - "test": "csslint && standard && node test/index.js", - "test-browser": "npm-run-all -lpr selenium downloadsolc_root make-mock-compiler serve browsertest", - "watch": "watchify src/index.js -dv -p browserify-reload -o build/app.js --exclude solc", - "reinstall": "rm ./node-modules/ -rf; rm package-lock.json; rm ./build/ -rf; npm install; npm run build", - "ganache-cli": "npx ganache-cli" - } -} diff --git a/apps/remix-ide/src/app.js b/apps/remix-ide/src/app.js index 926ef0f880a..04c75033e98 100644 --- a/apps/remix-ide/src/app.js +++ b/apps/remix-ide/src/app.js @@ -231,14 +231,14 @@ Please make a backup of your contracts and start using http://remix.ethereum.org const appManager = self.appManager const pluginLoader = appManager.pluginLoader const workspace = pluginLoader.get() - const engine = new Engine(appManager) + const engine = new Engine() engine.setPluginOption = ({ name, kind }) => { if (kind === 'provider') return {queueTimeout: 60000 * 2} if (name === 'LearnEth') return {queueTimeout: 60000} return {queueTimeout: 10000} } - await engine.onload() - + engine.register(appManager) + // SERVICES // ----------------- import content servive ------------------------ const contentImport = new CompilerImport() @@ -397,7 +397,7 @@ Please make a backup of your contracts and start using http://remix.ethereum.org await appManager.activatePlugin(['contentImport', 'theme', 'editor', 'fileManager', 'compilerMetadata', 'compilerArtefacts', 'network', 'web3Provider', 'offsetToLineColumnConverter']) await appManager.activatePlugin(['mainPanel', 'menuicons']) await appManager.activatePlugin(['sidePanel']) // activating host plugin separately - await appManager.activatePlugin(['home', 'hiddenPanel', 'pluginManager', 'fileExplorers', 'settings', 'contextualListener', 'scriptRunner', 'terminal', 'fetchAndCompile']) + await appManager.activatePlugin(['home', 'hiddenPanel', 'pluginManager', 'fileExplorers', 'settings', 'contextualListener', 'terminal', 'fetchAndCompile']) const queryParams = new QueryParams() const params = queryParams.get() diff --git a/apps/remix-ide/src/app/files/remixd-handle.js b/apps/remix-ide/src/app/files/remixd-handle.js index bcf112779c6..be2087b753b 100644 --- a/apps/remix-ide/src/app/files/remixd-handle.js +++ b/apps/remix-ide/src/app/files/remixd-handle.js @@ -1,5 +1,5 @@ import isElectron from 'is-electron' -import { WebsocketPlugin } from '@remixproject/engine' +import { WebsocketPlugin } from '@remixproject/engine-web' import * as packageJson from '../../../../../package.json' var yo = require('yo-yo') var modalDialog = require('../ui/modaldialog') diff --git a/apps/remix-ide/src/remixAppManager.js b/apps/remix-ide/src/remixAppManager.js index 6dbd09aac8f..f73d9cad412 100644 --- a/apps/remix-ide/src/remixAppManager.js +++ b/apps/remix-ide/src/remixAppManager.js @@ -1,5 +1,6 @@ /* global localStorage, fetch */ -import { PluginManager, IframePlugin } from '@remixproject/engine' +import { PluginManager } from '@remixproject/engine' +import { IframePlugin } from '@remixproject/engine-web' import { EventEmitter } from 'events' import QueryParams from './lib/query-params' import { PermissionHandler } from './app/ui/persmission-handler' @@ -28,11 +29,11 @@ export class RemixAppManager extends PluginManager { this.permissionHandler = new PermissionHandler() } - async canActivate (from, to) { - return canActivate(from.name) + async canActivatePlugin (from, to) { + return true // canActivate(from.name) } - async canDeactivate (from, to) { + async canDeactivatePlugin (from, to) { return from.name === 'manager' } @@ -69,8 +70,8 @@ export class RemixAppManager extends PluginManager { this.event.emit('deactivate', plugin) } - onRegistration (plugin) { - this.event.emit('added', plugin.name) + onRegistration () { + console.log('manager has been registered') } async ensureActivated (apiName) { @@ -105,8 +106,12 @@ export class RemixAppManager extends PluginManager { 'description': 'Use an external wallet for transacting', 'icon': 'data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9IjUxMiIgdmlld0JveD0iMCAwIDUxMiA1MTIiIHdpZHRoPSI1MTIiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPjxyYWRpYWxHcmFkaWVudCBpZD0iYSIgY3g9IjAlIiBjeT0iNTAlIiByPSIxMDAlIj48c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiM1ZDlkZjYiLz48c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiMwMDZmZmYiLz48L3JhZGlhbEdyYWRpZW50PjxnIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+PHBhdGggZD0ibTI1NiAwYzE0MS4zODQ4OTYgMCAyNTYgMTE0LjYxNTEwNCAyNTYgMjU2cy0xMTQuNjE1MTA0IDI1Ni0yNTYgMjU2LTI1Ni0xMTQuNjE1MTA0LTI1Ni0yNTYgMTE0LjYxNTEwNC0yNTYgMjU2LTI1NnoiIGZpbGw9InVybCgjYSkiLz48cGF0aCBkPSJtNjQuNjkxNzU1OCAzNy43MDg4Mjk4YzUxLjUzMjgwNzItNTAuMjc4NDM5NyAxMzUuMDgzOTk0Mi01MC4yNzg0Mzk3IDE4Ni42MTY3OTkyIDBsNi4yMDIwNTcgNi4wNTEwOTA2YzIuNTc2NjQgMi41MTM5MjE4IDIuNTc2NjQgNi41ODk3OTQ4IDAgOS4xMDM3MTc3bC0yMS4yMTU5OTggMjAuNjk5NTc1OWMtMS4yODgzMjEgMS4yNTY5NjE5LTMuMzc3MSAxLjI1Njk2MTktNC42NjU0MjEgMGwtOC41MzQ3NjYtOC4zMjcwMjA1Yy0zNS45NTA1NzMtMzUuMDc1NDk2Mi05NC4yMzc5NjktMzUuMDc1NDk2Mi0xMzAuMTg4NTQ0IDBsLTkuMTQwMDI4MiA4LjkxNzU1MTljLTEuMjg4MzIxNyAxLjI1Njk2MDktMy4zNzcxMDE2IDEuMjU2OTYwOS00LjY2NTQyMDggMGwtMjEuMjE1OTk3My0yMC42OTk1NzU5Yy0yLjU3NjY0MDMtMi41MTM5MjI5LTIuNTc2NjQwMy02LjU4OTc5NTggMC05LjEwMzcxNzd6bTIzMC40OTM0ODUyIDQyLjgwODkxMTcgMTguODgyMjc5IDE4LjQyMjcyNjJjMi41NzY2MjcgMi41MTM5MTAzIDIuNTc2NjQyIDYuNTg5NzU5My4wMDAwMzIgOS4xMDM2ODYzbC04NS4xNDE0OTggODMuMDcwMzU4Yy0yLjU3NjYyMyAyLjUxMzk0MS02Ljc1NDE4MiAyLjUxMzk2OS05LjMzMDg0LjAwMDA2Ni0uMDAwMDEtLjAwMDAxLS4wMDAwMjMtLjAwMDAyMy0uMDAwMDMzLS4wMDAwMzRsLTYwLjQyODI1Ni01OC45NTc0NTFjLS42NDQxNi0uNjI4NDgxLTEuNjg4NTUtLjYyODQ4MS0yLjMzMjcxIDAtLjAwMDAwNC4wMDAwMDQtLjAwMDAwOC4wMDAwMDctLjAwMDAxMi4wMDAwMTFsLTYwLjQyNjk2ODMgNTguOTU3NDA4Yy0yLjU3NjYxNDEgMi41MTM5NDctNi43NTQxNzQ2IDIuNTEzOTktOS4zMzA4NDA4LjAwMDA5Mi0uMDAwMDE1MS0uMDAwMDE0LS4wMDAwMzA5LS4wMDAwMjktLjAwMDA0NjctLjAwMDA0NmwtODUuMTQzODY3NzQtODMuMDcxNDYzYy0yLjU3NjYzOTI4LTIuNTEzOTIxLTIuNTc2NjM5MjgtNi41ODk3OTUgMC05LjEwMzcxNjNsMTguODgyMzEyNjQtMTguNDIyNjk1NWMyLjU3NjYzOTMtMi41MTM5MjIyIDYuNzU0MTk5My0yLjUxMzkyMjIgOS4zMzA4Mzk3IDBsNjAuNDI5MTM0NyA1OC45NTgyNzU4Yy42NDQxNjA4LjYyODQ4IDEuNjg4NTQ5NS42Mjg0OCAyLjMzMjcxMDMgMCAuMDAwMDA5NS0uMDAwMDA5LjAwMDAxODItLjAwMDAxOC4wMDAwMjc3LS4wMDAwMjVsNjAuNDI2MTA2NS01OC45NTgyNTA4YzIuNTc2NTgxLTIuNTEzOTggNi43NTQxNDItMi41MTQwNzQzIDkuMzMwODQtLjAwMDIxMDMuMDAwMDM3LjAwMDAzNTQuMDAwMDcyLjAwMDA3MDkuMDAwMTA3LjAwMDEwNjNsNjAuNDI5MDU2IDU4Ljk1ODM1NDhjLjY0NDE1OS42Mjg0NzkgMS42ODg1NDkuNjI4NDc5IDIuMzMyNzA5IDBsNjAuNDI4MDc5LTU4Ljk1NzE5MjVjMi41NzY2NC0yLjUxMzkyMzEgNi43NTQxOTktMi41MTM5MjMxIDkuMzMwODM5IDB6IiBmaWxsPSIjZmZmIiBmaWxsLXJ1bGU9Im5vbnplcm8iIHRyYW5zZm9ybT0idHJhbnNsYXRlKDk4IDE2MCkiLz48L2c+PC9zdmc+', 'location': 'mainPanel' - }) - return plugins.map(plugin => new IframePlugin(plugin)) + }) + return plugins.map(plugin => { + if (plugin.name === 'scriptRunner') { + plugin.url = 'ipfs://QmbzZFuLHSeLcJ4RUZzNvP3LQ3Yr5Rv4uougPquAVQ2kv1' + } + return new IframePlugin(plugin) }) } } diff --git a/package-lock.json b/package-lock.json index 9a29f282421..5a410613e7a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6876,66 +6876,103 @@ } }, "@remixproject/engine": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/@remixproject/engine/-/engine-0.2.4.tgz", - "integrity": "sha512-rCekA2QZq5wbT7h9wqU+TDkRexUqhnMqcggmP+eG6ilowyZ4RhMsrrSl3fsZzd0rnp4w1LSmX0vCbuXfja3RqQ==" - }, - "@remixproject/plugin": { - "version": "0.3.0-beta.5", - "resolved": "https://registry.npmjs.org/@remixproject/plugin/-/plugin-0.3.0-beta.5.tgz", - "integrity": "sha512-mQgXUhGNc+tQGIIFw7OaBaH7sZTBvDk8Gf4fS1NXhO5ilvykw9TXv5LXWoWkJCWQlKGuUTWd+U1XNpm5dPD3ag==" - }, - "@remixproject/plugin-api": { - "version": "0.3.0-beta.5", - "resolved": "https://registry.npmjs.org/@remixproject/plugin-api/-/plugin-api-0.3.0-beta.5.tgz", - "integrity": "sha512-C1fuISsne3sfA61k1rx6qU9ZgubyP8SdNKinzeYvXg4XAm1DwoHQlzjq/WYmjOFx1NZhyMGK8ySBp0VcjAMc/Q==" - }, - "@remixproject/plugin-utils": { - "version": "0.3.0-beta.5", - "resolved": "https://registry.npmjs.org/@remixproject/plugin-utils/-/plugin-utils-0.3.0-beta.5.tgz", - "integrity": "sha512-+gnfuSUimCxUTRxfTGu+mwI5U6EPUx2A2ANObaZzX8f17nhSW5NWw2vWKauZPSv2PWQoIukYzrmG/kogEe3Cyw==" - }, - "@remixproject/plugin-ws": { - "version": "0.3.0-beta.11", - "resolved": "https://registry.npmjs.org/@remixproject/plugin-ws/-/plugin-ws-0.3.0-beta.11.tgz", - "integrity": "sha512-wQueX0k99S96G4/jDbCmAn7V4RxDQpaCjaHBkpdr6Oc1ErfUnkplzJLfGs1EgnxCrONnHxDz6YEdKEs/zaHkqw==", + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@remixproject/engine/-/engine-0.3.1.tgz", + "integrity": "sha512-8ZV/F1UdSMfaIo8zVIJne0Psg7jL+SV97SjwXaFkUhKDvDJvmvMtjWQL0M+ROYd5VreV1Q5q4YgPag7tpUFZWQ==", "requires": { - "@remixproject/plugin": "0.3.0-beta.11", - "@remixproject/plugin-api": "0.3.0-beta.11", - "@remixproject/plugin-utils": "0.3.0-beta.11" + "@remixproject/plugin-api": "0.3.1", + "@remixproject/plugin-utils": "0.3.1" }, "dependencies": { - "@remixproject/plugin": { - "version": "0.3.0-beta.11", - "resolved": "https://registry.npmjs.org/@remixproject/plugin/-/plugin-0.3.0-beta.11.tgz", - "integrity": "sha512-/K7EJUXjSf5AqoPJAQ7VKQi7UTmPysHyV9hDLGPoe8tjl4s5ghjopiYLu6uM1WrR4Bz1DvU4hsRObe/PUAmprA==", + "@remixproject/plugin-api": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@remixproject/plugin-api/-/plugin-api-0.3.1.tgz", + "integrity": "sha512-USGoNN5eUklVlVMog9Qx3d1SudVnGRiHOOnKU9ZPus3fee/SY+yNnijYq616CcxRhfN6gcWbR3f4TI0Cv+yxvA==", "requires": { - "@remixproject/plugin-api": "0.3.0-beta.11", - "@remixproject/plugin-utils": "0.3.0-beta.11", - "events": "3.2.0" + "@remixproject/plugin-utils": "0.3.1" } }, + "@remixproject/plugin-utils": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@remixproject/plugin-utils/-/plugin-utils-0.3.1.tgz", + "integrity": "sha512-5g3BAcYLZU73tXAJBbsxJxZJEImEG0dJVMdgfsEL27PZeQo2g19hUHU52EhM5TihEjrUPw0fJke2ByTsIwZfxQ==", + "requires": { + "tslib": "2.0.1" + } + }, + "tslib": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz", + "integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==" + } + } + }, + "@remixproject/engine-web": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@remixproject/engine-web/-/engine-web-0.3.1.tgz", + "integrity": "sha512-uk3Hlufg2uUB2O1h6YtrtohGGo6Yjd+FrFjLlaY9qgyGaXLDRdJ9M5y+9TiKz6OxkD5hSXZTUgugdC+oie24OQ==", + "requires": { + "@remixproject/engine": "0.3.1", + "@remixproject/plugin-api": "0.3.1", + "@remixproject/plugin-utils": "0.3.1" + }, + "dependencies": { "@remixproject/plugin-api": { - "version": "0.3.0-beta.11", - "resolved": "https://registry.npmjs.org/@remixproject/plugin-api/-/plugin-api-0.3.0-beta.11.tgz", - "integrity": "sha512-qmIxfoFivQ6Dtz4RUEGSpSVW6TgcT5pwGuSOFBNm0LcYapqsoY4uWIfNpnP4odH4nVCBaFmARlveOf5magFxAw==", + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@remixproject/plugin-api/-/plugin-api-0.3.1.tgz", + "integrity": "sha512-USGoNN5eUklVlVMog9Qx3d1SudVnGRiHOOnKU9ZPus3fee/SY+yNnijYq616CcxRhfN6gcWbR3f4TI0Cv+yxvA==", "requires": { - "@remixproject/plugin-utils": "0.3.0-beta.11" + "@remixproject/plugin-utils": "0.3.1" } }, "@remixproject/plugin-utils": { - "version": "0.3.0-beta.11", - "resolved": "https://registry.npmjs.org/@remixproject/plugin-utils/-/plugin-utils-0.3.0-beta.11.tgz", - "integrity": "sha512-M/ghKF75lLQX6sp993E+3DGtezgY5oCL8659pH2cRpK8MMFX5cJggBfK5Fil29FIdwNOSzXM+W0/JnxnRyQAZA==", + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@remixproject/plugin-utils/-/plugin-utils-0.3.1.tgz", + "integrity": "sha512-5g3BAcYLZU73tXAJBbsxJxZJEImEG0dJVMdgfsEL27PZeQo2g19hUHU52EhM5TihEjrUPw0fJke2ByTsIwZfxQ==", "requires": { "tslib": "2.0.1" } }, + "tslib": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz", + "integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==" + } + } + }, + "@remixproject/plugin": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@remixproject/plugin/-/plugin-0.3.0.tgz", + "integrity": "sha512-/ueI8GaPE5sFT94pkrrLmATfjRfvg4R3jqJMIDaO5dU6PGE5PlogplKeC52RcSArDORHzbT9FhKGRCY+VNLRmw==", + "requires": { + "@remixproject/plugin-api": "0.3.0", + "@remixproject/plugin-utils": "0.3.0", + "events": "3.2.0" + }, + "dependencies": { "events": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/events/-/events-3.2.0.tgz", "integrity": "sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==" - }, + } + } + }, + "@remixproject/plugin-api": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@remixproject/plugin-api/-/plugin-api-0.3.0.tgz", + "integrity": "sha512-s5Iprj9P+ihuWF7BJVcVoA/wYB4zUNgfveliqSktNsfOk8yDR9wBi+j0JMDMbbzPHhuYc8gyuZmY1Xk8zU5uuQ==", + "requires": { + "@remixproject/plugin-utils": "0.3.0" + } + }, + "@remixproject/plugin-utils": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@remixproject/plugin-utils/-/plugin-utils-0.3.0.tgz", + "integrity": "sha512-4NSazwu7fU31ITazP05nSkk6rBVBmSmk5gXQLHY0uO9NjthX8ttpb5CwTI8MP6j5JPxM+MZL0R7teJXrYvEfYA==", + "requires": { + "tslib": "2.0.1" + }, + "dependencies": { "tslib": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz", @@ -6943,6 +6980,16 @@ } } }, + "@remixproject/plugin-ws": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@remixproject/plugin-ws/-/plugin-ws-0.3.0.tgz", + "integrity": "sha512-Hbq0q8nNonzUDwhYMjlPpMWKBa2rMOlfMFX3J7AiKlxd81kSR+I0FBr7QXWMGDLGNkgK0Y36z1UWePIe4dkY3Q==", + "requires": { + "@remixproject/plugin": "0.3.0", + "@remixproject/plugin-api": "0.3.0", + "@remixproject/plugin-utils": "0.3.0" + } + }, "@resolver-engine/core": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/@resolver-engine/core/-/core-0.3.3.tgz", @@ -35735,251 +35782,6 @@ } } }, - "remixd": { - "version": "0.2.3-alpha.4", - "resolved": "https://registry.npmjs.org/remixd/-/remixd-0.2.3-alpha.4.tgz", - "integrity": "sha512-AmIHg3W7uu5K0BKeRUOaMRGzElomvZWbzYGtztFZhdcAJ4RGEpWnsZEJHNVeGhiZD5JDAvL4Sd3k9La/5qaPXQ==", - "dev": true, - "requires": { - "@remixproject/plugin": "^0.3.0-alpha.8", - "@remixproject/plugin-ws": "^0.3.0-alpha.4", - "chokidar": "^2.1.8", - "commander": "^2.20.3", - "fs-extra": "^3.0.1", - "isbinaryfile": "^3.0.2", - "ws": "^7.3.0" - }, - "dependencies": { - "anymatch": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", - "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", - "dev": true, - "requires": { - "micromatch": "^3.1.4", - "normalize-path": "^2.1.1" - }, - "dependencies": { - "normalize-path": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", - "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", - "dev": true, - "requires": { - "remove-trailing-separator": "^1.0.1" - } - } - } - }, - "binary-extensions": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", - "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==", - "dev": true - }, - "braces": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "dev": true, - "requires": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" - } - }, - "chokidar": { - "version": "2.1.8", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz", - "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==", - "dev": true, - "requires": { - "anymatch": "^2.0.0", - "async-each": "^1.0.1", - "braces": "^2.3.2", - "fsevents": "^1.2.7", - "glob-parent": "^3.1.0", - "inherits": "^2.0.3", - "is-binary-path": "^1.0.0", - "is-glob": "^4.0.0", - "normalize-path": "^3.0.0", - "path-is-absolute": "^1.0.0", - "readdirp": "^2.2.1", - "upath": "^1.1.1" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - }, - "fill-range": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" - } - }, - "fs-extra": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz", - "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^3.0.0", - "universalify": "^0.1.0" - } - }, - "fsevents": { - "version": "1.2.13", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", - "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", - "dev": true, - "optional": true, - "requires": { - "bindings": "^1.5.0", - "nan": "^2.12.1" - } - }, - "glob-parent": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", - "dev": true, - "requires": { - "is-glob": "^3.1.0", - "path-dirname": "^1.0.0" - }, - "dependencies": { - "is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "dev": true, - "requires": { - "is-extglob": "^2.1.0" - } - } - } - }, - "is-binary-path": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", - "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", - "dev": true, - "requires": { - "binary-extensions": "^1.0.0" - } - }, - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - } - }, - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true - }, - "jsonfile": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz", - "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.6" - } - }, - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - }, - "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "readdirp": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz", - "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.11", - "micromatch": "^3.1.10", - "readable-stream": "^2.0.2" - } - }, - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } - }, - "to-regex-range": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", - "dev": true, - "requires": { - "is-number": "^3.0.0", - "repeat-string": "^1.6.1" - } - }, - "ws": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.1.tgz", - "integrity": "sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==", - "dev": true - } - } - }, "remove-bom-buffer": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz", diff --git a/package.json b/package.json index 7b2b5a1eba5..a26ede4b149 100644 --- a/package.json +++ b/package.json @@ -127,30 +127,27 @@ ] }, "dependencies": { - "@remixproject/engine": "^0.2.3", + "@remixproject/engine-web": "^0.3.1", + "@remixproject/plugin-ws": "^0.3.0", "@types/jest": "^26.0.5", "@types/tape": "^4.2.33", "ansi-gray": "^0.1.1", + "axios": "^0.20.0", "change-case": "^4.1.1", + "chokidar": "^2.1.8", "color-support": "^1.1.3", + "commander": "^2.20.3", "ethereumjs-block": "^2.2.2", "ethereumjs-tx": "^2.1.2", "ethereumjs-vm": "4.1.3", + "fs-extra": "^3.0.1", "http-server": "^0.11.1", + "isbinaryfile": "^3.0.2", "merge": "^1.2.0", "npm-install-version": "^6.0.2", "signale": "^1.4.0", "time-stamp": "^2.2.0", "winston": "^3.3.3", - "@remixproject/plugin": "0.3.0-beta.5", - "@remixproject/plugin-api": "0.3.0-beta.5", - "@remixproject/plugin-utils": "0.3.0-beta.5", - "@remixproject/plugin-ws": "^0.3.0-beta.8", - "axios": "^0.20.0", - "chokidar": "^2.1.8", - "commander": "^2.20.3", - "fs-extra": "^3.0.1", - "isbinaryfile": "^3.0.2", "ws": "^7.3.0" }, "devDependencies": {