Merge pull request #511 from ethereum/remixplugin0.3

apps/remix-ide-e2e/src/tests/fileManager_api.test.ts

@@ -12,7 +12,7 @@ module.exports = {
     browser
     .addFile('file.js', { content: executeFile })
     .executeScript(`remix.exeCurrent()`)
-    .pause(2000)
+    .pause(5000)
     .journalLastChildIncludes('browser/file.js')
   },
 

apps/remix-ide-e2e/src/tests/pluginManager.test.ts

@@ -6,7 +6,7 @@ import sauce from './sauce'
 const testData = {
   pluginName: 'remixIde',
   pluginDisplayName: 'Remix IDE',
-  pluginUrl: 'https://remix-project.org/'
+  pluginUrl: 'https://zokrates-remix-plugin.netlify.app/'
 }
 
 module.exports = {
@@ -44,6 +44,7 @@ module.exports = {
     browser.waitForElementVisible('*[data-id="pluginManagerComponentPluginManager"]')
     .click('*[data-id="pluginManagerComponentPluginManager"]')
     .scrollAndClick('*[data-id="pluginManagerComponentActivateButtondebugger"]')
+    .pause(2000)
     .waitForElementVisible('*[data-id="pluginManagerComponentDeactivateButtondebugger"]')
     .scrollAndClick('*[data-id="pluginManagerComponentActivateButtonvyper"]')
     .waitForElementVisible('*[data-id="pluginManagerComponentDeactivateButtonvyper"]')
@@ -54,8 +55,11 @@ module.exports = {
   'Should deactivate plugins': function (browser: NightwatchBrowser) {
     browser.waitForElementVisible('*[data-id="pluginManagerComponentPluginManager"]')
     .click('*[data-id="pluginManagerComponentPluginManager"]')
+    .waitForElementVisible('*[data-id="pluginManagerComponentDeactivateButtondebugger"]')
+    .pause(2000)
     .scrollAndClick('*[data-id="pluginManagerComponentDeactivateButtondebugger"]')   
     .waitForElementVisible('*[data-id="pluginManagerComponentActivateButtondebugger"]')
+    .waitForElementVisible('*[data-id="pluginManagerComponentDeactivateButtonvyper"]')
     .scrollAndClick('*[data-id="pluginManagerComponentDeactivateButtonvyper"]')
     .waitForElementVisible('*[data-id="pluginManagerComponentActivateButtonvyper"]')
   },

apps/remix-ide/src/app.js

@@ -4,7 +4,7 @@ import { basicLogo } from './app/ui/svgLogo'
 import { RunTab, makeUdapp } from './app/udapp'
 
 import PanelsResize from './lib/panels-resize'
-import { Engine } from '@remixproject/engine'
+import { RemixEngine } from './remixEngine'
 import { RemixAppManager } from './remixAppManager'
 import { FramingService } from './framingService'
 import { MainView } from './app/panels/main-view'
@@ -231,13 +231,8 @@ 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)
-  engine.setPluginOption = ({ name, kind }) => {
-    if (kind === 'provider') return { queueTimeout: 60000 * 2 }
-    if (name === 'LearnEth') return { queueTimeout: 60000 }
-    return { queueTimeout: 10000 }
-  }
-  await engine.onload()
+  const engine = new RemixEngine()
+  engine.register(appManager)
 
   // SERVICES
   // ----------------- import content servive ------------------------
@@ -401,17 +396,17 @@ 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()
 
   // Set workspace after initial activation
   if (Array.isArray(workspace)) {
-    appManager.activatePlugin(workspace).then(() => {
+    appManager.activatePlugin(workspace).then(async () => {
       try {
         if (params.deactivate) {
-          appManager.deactivatePlugin(params.deactivate.split(','))
+          await appManager.deactivatePlugin(params.deactivate.split(','))
         }
       } catch (e) {
         console.log(e)
@@ -425,9 +420,7 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
         if (callDetails.length > 1) {
           toolTip(`initiating ${callDetails[0]} ...`)
           // @todo(remove the timeout when activatePlugin is on 0.3.0)
-          setTimeout(() => {
           appManager.call(...callDetails).catch(console.error)
-          }, 5000)
         }
       }
     }).catch(console.error)

apps/remix-ide/src/app/components/panel.js

 import { EventEmitter } from 'events'
-import { HostPlugin } from '@remixproject/engine'
+import { HostPlugin } from '@remixproject/engine-web'
 const csjs = require('csjs-inject')
 const yo = require('yo-yo')
 

apps/remix-ide/src/app/components/plugin-manager-component.js

-import { ViewPlugin, IframePlugin, WebsocketPlugin } from '@remixproject/engine'
+import { IframePlugin, ViewPlugin, WebsocketPlugin } from '@remixproject/engine-web'
 import { PluginManagerSettings } from './plugin-manager-settings'
 import * as packageJson from '../../../../../package.json'
 const yo = require('yo-yo')
@@ -83,8 +83,8 @@ class PluginManagerComponent extends ViewPlugin {
     this.filter = ''
     this.appManager.event.on('activate', () => { this.reRender() })
     this.appManager.event.on('deactivate', () => { this.reRender() })
-    this.appManager.event.on('added', () => { this.reRender() })
     this.engine = engine
+    this.engine.event.on('onRegistration', () => { this.reRender() })
   }
 
   isActive (name) {
@@ -151,7 +151,7 @@ class PluginManagerComponent extends ViewPlugin {
       }
       const plugin = profile.type === 'iframe' ? new IframePlugin(profile) : new WebsocketPlugin(profile)
       this.engine.register(plugin)
-      this.appManager.activatePlugin(plugin.name)
+      await this.appManager.activatePlugin(plugin.name)
     } catch (err) {
       // TODO : Use an alert to handle this error instead of a console.log
       console.log(`Cannot create Plugin : ${err.message}`)

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

 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')

apps/remix-ide/src/app/panels/file-panel.js

-import { ViewPlugin } from '@remixproject/engine'
+import { ViewPlugin } from '@remixproject/engine-web'
 
 import * as packageJson from '../../../../../package.json'
 var yo = require('yo-yo')

apps/remix-ide/src/app/tabs/analysis-tab.js

-import { ViewPlugin } from '@remixproject/engine'
+import { ViewPlugin } from '@remixproject/engine-web'
 import { EventEmitter } from 'events'
 import * as packageJson from '../../../../../package.json'
 

apps/remix-ide/src/app/tabs/compile-tab.js

 /* global */
-import { ViewPlugin } from '@remixproject/engine'
+import { ViewPlugin } from '@remixproject/engine-web'
 import * as packageJson from '../../../../../package.json'
 import publishToStorage from '../../publishToStorage'
 import { compile } from '../compiler/compiler-helpers'

apps/remix-ide/src/app/tabs/debugger-tab.js

 import toaster from '../ui/tooltip'
 import { DebuggerUI } from '@remix-ui/debugger-ui' // eslint-disable-line
-import { ViewPlugin } from '@remixproject/engine'
+import { ViewPlugin } from '@remixproject/engine-web'
 import remixDebug, { TransactionDebugger as Debugger } from '@remix-project/remix-debug'
 import * as packageJson from '../../../../../package.json'
 import React from 'react' // eslint-disable-line
@@ -63,7 +63,6 @@ class DebuggerTab extends ViewPlugin {
 
     this.renderComponent()
 
-    this.call('manager', 'activatePlugin', 'source-verification').catch(e => console.log(e.message))
     // this.call('manager', 'activatePlugin', 'udapp')
 
     return this.el

apps/remix-ide/src/app/tabs/settings-tab.js

-import { ViewPlugin } from '@remixproject/engine'
+import { ViewPlugin } from '@remixproject/engine-web'
 import * as packageJson from '../../../../../package.json'
 const yo = require('yo-yo')
 const globalRegistry = require('../../global/registry')

apps/remix-ide/src/app/tabs/test-tab.js

-import { ViewPlugin } from '@remixproject/engine'
+import { ViewPlugin } from '@remixproject/engine-web'
 import { canUseWorker, urlFromVersion } from '../compiler/compiler-utils'
 var yo = require('yo-yo')
 var async = require('async')

apps/remix-ide/src/app/ui/landing-page/landing-page.js

 import * as packageJson from '../../../../../../package.json'
-import { ViewPlugin } from '@remixproject/engine'
+import { ViewPlugin } from '@remixproject/engine-web'
 
 const yo = require('yo-yo')
 const csjs = require('csjs-inject')

apps/remix-ide/src/remixAppManager.js

 /* 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'
@@ -15,7 +16,7 @@ export function isNative (name) {
 }
 
 export function canActivate (name) {
-  return ['manager', 'debugger', 'ethdoc'].includes(name)
+  return ['ethdoc'].includes(name) || isNative(name)
 }
 
 export class RemixAppManager extends PluginManager {
@@ -27,11 +28,12 @@ export class RemixAppManager extends PluginManager {
     this.permissionHandler = new PermissionHandler()
   }
 
-  async canActivate (from, to) {
+  async canActivatePlugin (from, to) {
     return canActivate(from.name)
   }
 
-  async canDeactivate (from, to) {
+  async canDeactivatePlugin (from, to) {
+    if (requiredModules.includes(to.name)) return false
     return from.name === 'manager'
   }
 
@@ -68,9 +70,7 @@ export class RemixAppManager extends PluginManager {
     this.event.emit('deactivate', plugin)
   }
 
-  onRegistration (plugin) {
-    this.event.emit('added', plugin.name)
-  }
+  onRegistration () {}
 
   async ensureActivated (apiName) {
     await this.activatePlugin(apiName)
@@ -82,11 +82,6 @@ export class RemixAppManager extends PluginManager {
     this.event.emit('ensureDeactivated', apiName)
   }
 
-  deactivatePlugin (name) {
-    if (requiredModules.includes(name)) return
-    super.deactivatePlugin(name)
-  }
-
   isRequired (name) {
     return requiredModules.includes(name)
   }

apps/remix-ide/src/remixEngine.js

+import { Engine } from '@remixproject/engine'
+import { EventEmitter } from 'events'
+
+export class RemixEngine extends Engine {
+  constructor () {
+    super()
+    this.event = new EventEmitter()
+  }
+
+  setPluginOption ({ name, kind }) {
+    if (kind === 'provider') return { queueTimeout: 60000 * 2 }
+    if (name === 'LearnEth') return { queueTimeout: 60000 }
+    return { queueTimeout: 10000 }
+  }
+
+  onRegistration (plugin) {
+    this.event.emit('onRegistration', plugin)
+  }
+}

libs/remixd/package.json

@@ -35,10 +35,10 @@
   },
   "homepage": "https://github.com/ethereum/remix-project#readme",
   "dependencies": {
-    "@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",
+    "@remixproject/plugin": "^0.3.3",
+    "@remixproject/plugin-api": "^0.3.3",
+    "@remixproject/plugin-utils": "^0.3.3",
+    "@remixproject/plugin-ws": "^0.3.3",
     "axios": "^0.20.0",
     "chokidar": "^2.1.8",
     "commander": "^2.20.3",

package.json

@@ -127,16 +127,27 @@
     ]
   },
   "dependencies": {
-    "@remixproject/engine": "^0.2.3",
+    "@remixproject/engine": "^0.3.3",
+    "@remixproject/engine-web": "^0.3.3",
+    "@remixproject/plugin": "^0.3.3",
+    "@remixproject/plugin-api": "^0.3.2",
+    "@remixproject/plugin-utils": "^0.3.2",
+    "@remixproject/plugin-webview": "^0.3.3",
+    "@remixproject/plugin-ws": "^0.3.3",
     "@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",
     "react": "16.13.1",
@@ -145,15 +156,6 @@
     "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": {

workspace.json

@@ -104,7 +104,7 @@
           "builder": "@nrwl/workspace:run-commands",
           "options": {
             "commands": [
-              "node_modules/.bin/tsc -p apps/remix-ide-e2e/tsconfig.e2e.json"
+              "tsc -p apps/remix-ide-e2e/tsconfig.e2e.json"
             ]
           }
         },