From 0cbf0417c194f83f7f27642c6b2fe4727b513240 Mon Sep 17 00:00:00 2001
From: LianaHus <liana@ethdev.com>
Date: Wed, 12 Feb 2020 09:53:26 +0100
Subject: [PATCH] using new engine

---
 package-lock.json          | 28 +++++++++++++++++++++-------
 src/app.js                 |  1 +
 src/app/panels/terminal.js |  3 +++
 src/remixAppManager.js     |  7 +++++++
 4 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a5bf161a0b..7e0c19eff0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6755,11 +6755,13 @@
         },
         "balanced-match": {
           "version": "1.0.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -6772,15 +6774,18 @@
         },
         "code-point-at": {
           "version": "1.1.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -6883,7 +6888,8 @@
         },
         "inherits": {
           "version": "2.0.4",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -6893,6 +6899,7 @@
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "bundled": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -6905,17 +6912,20 @@
         "minimatch": {
           "version": "3.0.4",
           "bundled": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
         },
         "minimist": {
           "version": "0.0.8",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.9.0",
           "bundled": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -6932,6 +6942,7 @@
         "mkdirp": {
           "version": "0.5.1",
           "bundled": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -7012,7 +7023,8 @@
         },
         "number-is-nan": {
           "version": "1.0.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -7022,6 +7034,7 @@
         "once": {
           "version": "1.4.0",
           "bundled": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -7127,6 +7140,7 @@
         "string-width": {
           "version": "1.0.2",
           "bundled": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
diff --git a/src/app.js b/src/app.js
index 45d0ac806b..fffdd7aefc 100644
--- a/src/app.js
+++ b/src/app.js
@@ -247,6 +247,7 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
       self._view.el.style.visibility = 'visible'
     }, 1500)
   })
+  
   // ----------------- editor servive ----------------------------
   const editor = new Editor({}, themeModule) // wrapper around ace editor
   registry.put({api: editor, name: 'editor'})
diff --git a/src/app/panels/terminal.js b/src/app/panels/terminal.js
index 624f0a268b..538e6bef60 100644
--- a/src/app/panels/terminal.js
+++ b/src/app/panels/terminal.js
@@ -98,6 +98,9 @@ class Terminal extends Plugin {
     if (opts.shell) self._shell = opts.shell // ???
     register(self)
   }
+  setTxListener(txListener) {
+    this._opts.txListener = txListener
+  }
   logHtml (html) {
     var command = this.commands['html']
     if (typeof command === 'function') command(html)
diff --git a/src/remixAppManager.js b/src/remixAppManager.js
index ad45ef2c75..31160f84ec 100644
--- a/src/remixAppManager.js
+++ b/src/remixAppManager.js
@@ -35,7 +35,11 @@ export class RemixAppManager extends PluginManager {
     return true
   }
 
+<<<<<<< HEAD
   onPluginActivated (plugin) {
+=======
+  onActivated (plugin) {
+>>>>>>> ac82ba81... using new engine
     this.pluginLoader.set(plugin, this.actives)
     this.event.emit('activate', plugin)
   }
@@ -59,6 +63,7 @@ export class RemixAppManager extends PluginManager {
     this.event.emit('added', plugin.name)
   }
 
+<<<<<<< HEAD
   async ensureActivated (apiName) {
     await this.activatePlugin(apiName)
     this.event.emit('ensureActivated', apiName)
@@ -69,6 +74,8 @@ export class RemixAppManager extends PluginManager {
     this.event.emit('ensureDeactivated', apiName)
   }
 
+=======
+>>>>>>> ac82ba81... using new engine
   deactivatePlugin (name) {
     if (requiredModules.includes(name)) return
     super.deactivatePlugin(name)