From 4be7550dcb2685f42fadad7949cd52698b9e400d Mon Sep 17 00:00:00 2001
From: lianahus <liana@ethereum.org>
Date: Fri, 3 Sep 2021 12:38:43 +0200
Subject: [PATCH 01/30] do not show undefined property in details

---
 libs/remix-ui/solidity-compiler/src/lib/contract-selection.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/remix-ui/solidity-compiler/src/lib/contract-selection.tsx b/libs/remix-ui/solidity-compiler/src/lib/contract-selection.tsx
index 7b85038aa6..efac0765ec 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/contract-selection.tsx
+++ b/libs/remix-ui/solidity-compiler/src/lib/contract-selection.tsx
@@ -115,7 +115,7 @@ export const ContractSelection = (props: ContractSelectionProps) => {
     let node
     if (propertyName === 'web3Deploy' || propertyName === 'name' || propertyName === 'Assembly') {
       node = <pre>{ details[propertyName] }</pre>
-    } else if (propertyName === 'abi' || propertyName === 'metadata') {
+    } else if (details[propertyName] && (propertyName === 'abi' || propertyName === 'metadata')) {
       if (details[propertyName] !== '') {
         try {
           node = <div>

From e3324c9ddf5e7f618b05b8d30935d7dc63fc5740 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Fri, 10 Sep 2021 19:33:29 +0200
Subject: [PATCH 02/30] fix gasUsed in the receipt (#1542)

Make sure the receipt `gasUsed` is the actual amount of gas used, not the `gasLimit`.
---
 libs/remix-lib/src/web3Provider/web3VmProvider.ts | 5 +++--
 libs/remix-simulator/src/methods/transactions.ts  | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/libs/remix-lib/src/web3Provider/web3VmProvider.ts b/libs/remix-lib/src/web3Provider/web3VmProvider.ts
index ff2c5ac9e8..f29e225e5a 100644
--- a/libs/remix-lib/src/web3Provider/web3VmProvider.ts
+++ b/libs/remix-lib/src/web3Provider/web3VmProvider.ts
@@ -144,8 +144,9 @@ export class Web3VmProvider {
     if (lastOp) {
       lastOp.error = lastOp.op !== 'RETURN' && lastOp.op !== 'STOP' && lastOp.op !== 'DESTRUCT'
     }
-    this.vmTraces[this.processingHash].gas = '0x' + data.gasUsed.toString(16)
-
+    const gasUsed = '0x' + data.gasUsed.toString(16)
+    this.vmTraces[this.processingHash].gas = gasUsed
+    this.txsReceipt[this.processingHash].gasUsed = gasUsed
     const logs = []
     for (const l in data.execResult.logs) {
       const log = data.execResult.logs[l]
diff --git a/libs/remix-simulator/src/methods/transactions.ts b/libs/remix-simulator/src/methods/transactions.ts
index 90e3df270f..44786c6f62 100644
--- a/libs/remix-simulator/src/methods/transactions.ts
+++ b/libs/remix-simulator/src/methods/transactions.ts
@@ -102,8 +102,8 @@ export class Transactions {
         transactionIndex: '0x00',
         blockHash: '0x' + txBlock.hash().toString('hex'),
         blockNumber: '0x' + txBlock.header.number.toString('hex'),
-        gasUsed: Web3.utils.toHex(receipt.gas),
-        cumulativeGasUsed: Web3.utils.toHex(receipt.gas),
+        gasUsed: receipt.gasUsed,
+        cumulativeGasUsed: receipt.gasUsed, // only 1 tx per block
         contractAddress: receipt.contractAddress,
         logs: receipt.logs,
         status: receipt.status,

From f7e97c88fd2c451d493bf61fb0367cc557462529 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Wed, 18 Aug 2021 17:50:51 +0200
Subject: [PATCH 03/30] create solidity web app

---
 apps/remix-ide/src/app.js                     |   8 +-
 apps/remix-ide/src/app/tabs/compile-tab.js    | 210 +++------------
 .../src/app/tabs/styles/compile-tab-styles.js | 238 +----------------
 apps/solidity-compiler/.babelrc               |   4 +
 apps/solidity-compiler/.browserslistrc        |  16 ++
 apps/solidity-compiler/src/app/app.tsx        |  17 ++
 .../solidity-compiler/src/app/compiler-api.ts | 248 ++++++++++++++++++
 apps/solidity-compiler/src/app/compiler.ts    |  40 +++
 apps/solidity-compiler/src/assets/.gitkeep    |   0
 .../src/environments/environment.prod.ts      |   3 +
 .../src/environments/environment.ts           |   6 +
 apps/solidity-compiler/src/favicon.ico        | Bin 0 -> 15086 bytes
 apps/solidity-compiler/src/index.html         |  14 +
 apps/solidity-compiler/src/index.ts           |   1 +
 apps/solidity-compiler/src/main.tsx           |  11 +
 apps/solidity-compiler/src/polyfills.ts       |   7 +
 apps/solidity-compiler/src/styles.css         |   1 +
 apps/solidity-compiler/tsconfig.app.json      |   9 +
 apps/solidity-compiler/tsconfig.json          |  16 ++
 apps/solidity-compiler/tsconfig.spec.json     |  15 ++
 apps/solidity-compiler/webpack.config.js      |  17 ++
 libs/remix-ui/debugger-ui/src/index.ts        |   1 -
 libs/remix-ui/solidity-compiler/src/index.ts  |   1 +
 .../src/lib/icompiler-api.ts                  |  28 ++
 .../src/lib/logic/compileTabLogic.ts          |  10 +-
 .../src/lib/solidity-compiler.tsx             |  40 ++-
 .../solidity-compiler/src/lib/types/index.ts  |  11 +-
 nx.json                                       |   5 +-
 tsconfig.base.json                            |   1 +
 workspace.json                                |  70 +++++
 30 files changed, 621 insertions(+), 427 deletions(-)
 create mode 100644 apps/solidity-compiler/.babelrc
 create mode 100644 apps/solidity-compiler/.browserslistrc
 create mode 100644 apps/solidity-compiler/src/app/app.tsx
 create mode 100644 apps/solidity-compiler/src/app/compiler-api.ts
 create mode 100644 apps/solidity-compiler/src/app/compiler.ts
 create mode 100644 apps/solidity-compiler/src/assets/.gitkeep
 create mode 100644 apps/solidity-compiler/src/environments/environment.prod.ts
 create mode 100644 apps/solidity-compiler/src/environments/environment.ts
 create mode 100644 apps/solidity-compiler/src/favicon.ico
 create mode 100644 apps/solidity-compiler/src/index.html
 create mode 100644 apps/solidity-compiler/src/index.ts
 create mode 100644 apps/solidity-compiler/src/main.tsx
 create mode 100644 apps/solidity-compiler/src/polyfills.ts
 create mode 100644 apps/solidity-compiler/src/styles.css
 create mode 100644 apps/solidity-compiler/tsconfig.app.json
 create mode 100644 apps/solidity-compiler/tsconfig.json
 create mode 100644 apps/solidity-compiler/tsconfig.spec.json
 create mode 100644 apps/solidity-compiler/webpack.config.js
 create mode 100644 libs/remix-ui/solidity-compiler/src/lib/icompiler-api.ts

diff --git a/apps/remix-ide/src/app.js b/apps/remix-ide/src/app.js
index da6aaaf976..76087eb176 100644
--- a/apps/remix-ide/src/app.js
+++ b/apps/remix-ide/src/app.js
@@ -425,13 +425,7 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
   }
 
   // CONTENT VIEWS & DEFAULT PLUGINS
-  const compileTab = new CompileTab(
-    editor,
-    registry.get('config').api,
-    registry.get('fileproviders/browser').api,
-    registry.get('filemanager').api,
-    contentImport
-  )
+  const compileTab = new CompileTab()
   const run = new RunTab(
     blockchain,
     registry.get('config').api,
diff --git a/apps/remix-ide/src/app/tabs/compile-tab.js b/apps/remix-ide/src/app/tabs/compile-tab.js
index 2276d759e1..a77ccb4737 100644
--- a/apps/remix-ide/src/app/tabs/compile-tab.js
+++ b/apps/remix-ide/src/app/tabs/compile-tab.js
@@ -2,7 +2,7 @@
 import React from 'react' // eslint-disable-line
 import ReactDOM from 'react-dom'
 import { SolidityCompiler, CompileTab as CompileTabLogic, parseContracts } from '@remix-ui/solidity-compiler' // eslint-disable-line
-import { compile } from '@remix-project/remix-solidity'
+import { CompilerApiMixin } from '@remixproject/solidity-compiler-plugin'
 import { ViewPlugin } from '@remixproject/engine-web'
 import * as packageJson from '../../../../../package.json'
 
@@ -13,6 +13,8 @@ var QueryParams = require('../../lib/query-params')
 const addTooltip = require('../ui/tooltip')
 const globalRegistry = require('../../global/registry')
 
+const css = require('./styles/compile-tab-styles')
+
 const profile = {
   name: 'solidity',
   displayName: 'Solidity compiler',
@@ -30,51 +32,19 @@ const profile = {
 // - events: ['compilationFinished'],
 // - methods: ['getCompilationResult']
 
-class CompileTab extends ViewPlugin {
-  constructor (editor, config, fileProvider, fileManager, contentImport) {
+class CompileTab extends CompilerApiMixin(ViewPlugin) {
+  constructor () {
     super(profile)
-    this.events = new EventEmitter()
-    this._view = {
-      el: null,
-      warnCompilationSlow: null,
-      errorContainer: null,
-      contractEl: null
-    }
-    this.contentImport = contentImport
-    this.queryParams = new QueryParams()
-    this.fileProvider = fileProvider
-    // dependencies
-    this.editor = editor
-    this.config = config
-    this.fileManager = fileManager
-    this.contractsDetails = {}
-    this.data = {
-      eventHandlers: {},
-      loading: false
-    }
-    this.compileTabLogic = new CompileTabLogic(this, this.contentImport)
-    this.compiler = this.compileTabLogic.compiler
-    this.compileTabLogic.init()
-    this.contractMap = {}
-    this.isHardHatProject = false
-    this.compileErrors = {}
-    this.compiledFileName = ''
-    this.selectedVersion = ''
-    this.configurationSettings = null
-
-    this.el = document.createElement('div')
-    this.el.setAttribute('id', 'compileTabView')
+    this.initCompilerApi()
   }
 
-  resetResults () {
-    this.currentFile = ''
-    this.contractsDetails = {}
-    this.emit('statusChanged', { key: 'none' })
-    this.renderComponent()
+  renderComponent () {
+    ReactDOM.render(
+      <SolidityCompiler plugin={this}/>
+      , this.el)
   }
 
-  setCompileErrors (data) {
-    this.compileErrors = data
+  onCurrentFileChanged () {
     this.renderComponent()
   }
 
@@ -191,6 +161,10 @@ class CompileTab extends ViewPlugin {
     })
   }
 
+  onResetResults () {
+    this.renderComponent()
+  }
+
   setHardHatCompilation (value) {
     this.hhCompilation = value
   }
@@ -199,46 +173,27 @@ class CompileTab extends ViewPlugin {
     this.selectedVersion = version
   }
 
-  getCompilationResult () {
-    return this.compileTabLogic.compiler.state.lastCompilationResult
+  onSetWorkspace () {
+    this.renderComponent()
   }
 
-  addExternalFile (fileName, content) {
-    this.fileProvider.addExternal(fileName, content)
+  onNoFileSelected () {
+    this.renderComponent()
   }
 
-  /**
-   * compile using @arg fileName.
-   * The module UI will be updated accordingly to the new compilation result.
-   * This function is used by remix-plugin compiler API.
-   * @param {string} fileName to compile
-   */
-  compile (fileName) {
-    addTooltip(yo`<div><b>${this.currentRequest.from}</b> is requiring to compile <b>${fileName}</b></div>`)
-    return this.compileTabLogic.compileFile(fileName)
+  onCompilationFinished () {
+    this.renderComponent()
   }
 
-  /**
-   * compile using @arg compilationTargets and @arg settings
-   * The module UI will *not* be updated, the compilation result is returned
-   * This function is used by remix-plugin compiler API.
-   * @param {object} map of source files.
-   * @param {object} settings {evmVersion, optimize, runs, version, language}
-   */
-  async compileWithParameters (compilationTargets, settings) {
-    settings.version = settings.version || this.selectedVersion
-    const res = await compile(compilationTargets, settings)
-    return res
-  }
+  render () {
+    if (this.el) return this.el
+    this.el = yo`
+      <div class="${css.debuggerTabView}" id="compileTabView">
+        <div id="compiler" class="${css.compiler}"></div>
+      </div>`
+    this.renderComponent()
 
-  // This function is used for passing the compiler configuration to 'remix-tests'
-  getCurrentCompilerConfig () {
-    return {
-      currentVersion: this.selectedVersion,
-      evmVersion: this.compileTabLogic.evmVersion,
-      optimize: this.compileTabLogic.optimize,
-      runs: this.compileTabLogic.runs
-    }
+    return this.el
   }
 
   /**
@@ -246,89 +201,20 @@ class CompileTab extends ViewPlugin {
    * This function is used by remix-plugin compiler API.
    * @param {object} settings {evmVersion, optimize, runs, version, language}
    */
-  setCompilerConfig (settings) {
-    this.configurationSettings = settings
+   setCompilerConfig (settings) {
+    super.setCompilerConfig(settings)
     this.renderComponent()
     // @todo(#2875) should use loading compiler return value to check whether the compiler is loaded instead of "setInterval"
     addTooltip(yo`<div><b>${this.currentRequest.from}</b> is updating the <b>Solidity compiler configuration</b>.<pre class="text-left">${JSON.stringify(settings, null, '\t')}</pre></div>`)
   }
 
-  // TODO : Add success alert when compilation succeed
-  contractCompiledSuccess () {
-    return yo`<div></div>`
-  }
-
-  // TODO : Add error alert when compilation failed
-  contractCompiledError () {
-    return yo`<div></div>`
-  }
-
-  /************
-   * METHODS
-   */
-
-  selectContract (contractName) {
-    this.selectedContract = contractName
-  }
-
-  render () {
-    this.renderComponent()
-    return this.el
-  }
-
-  renderComponent () {
-    ReactDOM.render(
-      <SolidityCompiler plugin={this}/>
-      , this.el)
-  }
-
-  getParameters () {
-    return this.queryParams.get()
-  }
-
-  setParameters (params) {
-    this.queryParams.update(params)
-  }
-
-  getConfiguration (name) {
-    return this.config.get(name)
-  }
-
-  setConfiguration (name, value) {
-    this.config.set(name, value)
-  }
-
-  fileProviderOf (fileName) {
-    return this.fileManager.fileProviderOf(fileName)
-  }
-
-  getFileManagerMode () {
-    return this.fileManager.mode
-  }
-
-  fileExists (fileName) {
-    return this.call('fileManager', 'exists', fileName)
-  }
-
-  writeFile (fileName, content) {
-    return this.call('fileManager', 'writeFile', fileName, content)
-  }
-
-  readFile (fileName) {
-    return this.call('fileManager', 'readFile', fileName)
-  }
-
-  saveCurrentFile () {
-    return this.fileManager.saveCurrentFile()
-  }
-
-  open (fileName) {
-    return this.call('fileManager', 'open', fileName)
+  compile (fileName) {
+    addTooltip(yo`<div><b>${this.currentRequest.from}</b> is requiring to compile <b>${fileName}</b></div>`)
+    super.compile(fileName)
   }
 
   onActivation () {
-    this.call('manager', 'activatePlugin', 'solidity-logic')
-    this.listenToEvents()
+    super.onActivation()
     this.call('filePanel', 'registerContextMenuItem', {
       id: 'solidity',
       name: 'compileFile',
@@ -339,32 +225,6 @@ class CompileTab extends ViewPlugin {
       pattern: []
     })
   }
-
-  // Returns if the compilation was successfull
-  async compileFile (event) {
-    if (event.path.length > 0) {
-      try {
-        return await this.compileTabLogic.compileFile(event.path[0])
-      } catch (error) {
-        return false
-      }
-    }
-    return false
-  }
-
-  onDeactivation () {
-    this.editor.event.unregister('contentChanged')
-    this.editor.event.unregister('sessionSwitched')
-    this.editor.event.unregister('contentChanged', this.data.eventHandlers.onContentChanged)
-    this.compiler.event.unregister('loadingCompiler', this.data.eventHandlers.onLoadingCompiler)
-    this.compiler.event.unregister('compilerLoaded', this.data.eventHandlers.onCompilerLoaded)
-    this.compileTabLogic.event.removeListener('startingCompilation', this.data.eventHandlers.onStartingCompilation)
-    this.fileManager.events.removeListener('currentFileChanged', this.data.eventHandlers.onCurrentFileChanged)
-    this.fileManager.events.removeListener('noFileSelected', this.data.eventHandlers.onNoFileSelected)
-    this.compiler.event.unregister('compilationFinished', this.data.eventHandlers.onCompilationFinished)
-    globalRegistry.get('themeModule').api.events.removeListener('themeChanged', this.data.eventHandlers.onThemeChanged)
-    this.call('manager', 'deactivatePlugin', 'solidity-logic')
-  }
 }
 
 module.exports = CompileTab
diff --git a/apps/remix-ide/src/app/tabs/styles/compile-tab-styles.js b/apps/remix-ide/src/app/tabs/styles/compile-tab-styles.js
index b80f46bdec..6ab95aed8c 100644
--- a/apps/remix-ide/src/app/tabs/styles/compile-tab-styles.js
+++ b/apps/remix-ide/src/app/tabs/styles/compile-tab-styles.js
@@ -1,239 +1,11 @@
-const csjs = require('csjs-inject')
+var csjs = require('csjs-inject')
 
 const css = csjs`
-  .title {
-    font-size: 1.1em;
-    font-weight: bold;
-    margin-bottom: 1em;
+  .compilerTabView {
+    padding: 2%;
   }
-  .panicError {
-    color: red;
-    font-size: 20px;
-  }
-  .crow {
-    display: flex;
-    overflow: auto;
-    clear: both;
-    padding: .2em;
-  }
-  .checkboxText {
-    font-weight: normal;
-  }
-  .crow label {
-    cursor:pointer;
-  }
-  .crowNoFlex {
-    overflow: auto;
-    clear: both;
-  }
-  .info {
-    padding: 10px;
-    word-break: break-word;
-  }
-  .contract {
-    display: block;
-    margin: 3% 0;
-  }
-  .nightlyBuilds {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-  }
-  .autocompileContainer {
-    display: flex;
-    align-items: center;
-  }
-  .runs {
-    width: 40%;
-  }
-  .hideWarningsContainer {
-    display: flex;
-    align-items: center;
-  }
-  .autocompile {}
-  .autocompileTitle {
-    font-weight: bold;
-    margin: 1% 0;
-  }
-  .autocompileText {
-    margin: 1% 0;
-    font-size: 12px;
-    overflow: hidden;
-    word-break: normal;
-    line-height: initial;
-  }
-  .warnCompilationSlow {
-    margin-left: 1%;
-  }
-  .compilerConfig {
-    display: flex;
-    align-items: center;
-  }
-  .compilerConfig label {
-    margin: 0;
-  }
-  .compilerSection {
-    padding: 12px 24px 16px;
-  }
-  .compilerLabel {
-    margin-bottom: 2px;
-    font-size: 11px;
-    line-height: 12px;
-    text-transform: uppercase;
-  }
-  .copyButton {
-    padding: 6px;
-    font-weight: bold;
-    font-size: 11px;
-    line-height: 15px;
-  }
-  .name {
-    display: flex;
-  }
-  .size {
-    display: flex;
-  }
-  .checkboxes {
-    display: flex;
-    width: 100%;
-    justify-content: space-between;
-    flex-wrap: wrap;
-  }
-  .compileButton {
-    width: 100%;
-    margin: 15px 0 10px 0;
-    font-size: 12px;
-  }
-  .container {
-    margin: 0;
-    margin-bottom: 2%;
-  }
-  .optimizeContainer {
-    display: flex;
-  }
-  .noContractAlert {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-  }
-  .contractHelperButtons {
-    margin-top: 6px;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    float: right;
-  }
-  .copyToClipboard {
-    font-size: 1rem;
-  }
-  .copyIcon {
-    margin-right: 5px;
-  }
-  .log {
-    display: flex;
-    flex-direction: column;
-    margin-bottom: 5%;
-    overflow: visible;
-  }
-  .key {
-    margin-right: 5px;
-    text-transform: uppercase;
-    width: 100%;
-  }
-  .value {
-    display: flex;
-    width: 100%;
-    margin-top: 1.5%;
-  }
-  .questionMark {
-    margin-left: 2%;
-    cursor: pointer;
-  }
-  .questionMark:hover {
-  }
-  .detailsJSON {
-    padding: 8px 0;
-    border: none;
-  }
-  .icon {
-    margin-right: 0.3em;
-  }
-  .errorBlobs {
-    padding-left: 5px;
-    padding-right: 5px;
-    word-break: break-word;
-  }
-  .storageLogo {
-    width: 20px;
-    height: 20px;
-  }
-  .spinningIcon {
-    display: inline-block;
-    position: relative;
-    animation: spin 2s infinite linear;
-    -moz-animation: spin 2s infinite linear;
-    -o-animation: spin 2s infinite linear;
-    -webkit-animation: spin 2s infinite linear;
-  }
-  @keyframes spin {
-    0% { transform: rotate(0deg); }
-    100% { transform: rotate(360deg); }
-  }
-  @-webkit-keyframes spin {
-    0% { transform: rotate(0deg); }
-    100% { transform: rotate(360deg); }
-  }
-  @-moz-keyframes spin {
-    0% { transform: rotate(0deg); }
-    100% { transform: rotate(360deg); }
-  }
-  @-o-keyframes spin {
-     0% { transform: rotate(0deg); }
-    100% { transform: rotate(360deg); }
-  }
-  @-ms-keyframes spin {
-    0% { transform: rotate(0deg); }
-    100% { transform: rotate(360deg); }
-  }
-
-  .bouncingIcon {
-    display: inline-block;
-    position: relative;
-    -moz-animation: bounce 2s infinite linear;
-    -o-animation: bounce 2s infinite linear;
-    -webkit-animation: bounce 2s infinite linear;
-    animation: bounce 2s infinite linear;
-  } 
-
-  @-webkit-keyframes bounce {
-      0% { top: 0; }
-      50% { top: -0.2em; }
-      70% { top: -0.3em; }
-      100% { top: 0; }
-  }
-  @-moz-keyframes bounce {
-      0% { top: 0; }
-      50% { top: -0.2em; }
-      70% { top: -0.3em; }
-      100% { top: 0; }
-  }
-  @-o-keyframes bounce {
-      0% { top: 0; }
-      50% { top: -0.2em; }
-      70% { top: -0.3em; }
-      100% { top: 0; }
-  }
-  @-ms-keyframes bounce {
-      0% { top: 0; }
-      50% { top: -0.2em; }
-      70% { top: -0.3em; }
-      100% { top: 0; }
-  }
-  @keyframes bounce {
-      0% { top: 0; }
-      50% { top: -0.2em; }
-      70% { top: -0.3em; }
-      100% { top: 0; }
+  .compiler {
+    margin-bottom: 1%;
   }
 `
 
diff --git a/apps/solidity-compiler/.babelrc b/apps/solidity-compiler/.babelrc
new file mode 100644
index 0000000000..09d67939cc
--- /dev/null
+++ b/apps/solidity-compiler/.babelrc
@@ -0,0 +1,4 @@
+{
+  "presets": ["@nrwl/react/babel"],
+  "plugins": []
+}
diff --git a/apps/solidity-compiler/.browserslistrc b/apps/solidity-compiler/.browserslistrc
new file mode 100644
index 0000000000..f1d12df4fa
--- /dev/null
+++ b/apps/solidity-compiler/.browserslistrc
@@ -0,0 +1,16 @@
+# This file is used by:
+# 1. autoprefixer to adjust CSS to support the below specified browsers
+# 2. babel preset-env to adjust included polyfills
+#
+# For additional information regarding the format and rule options, please see:
+# https://github.com/browserslist/browserslist#queries
+#
+# If you need to support different browsers in production, you may tweak the list below.
+
+last 1 Chrome version
+last 1 Firefox version
+last 2 Edge major versions
+last 2 Safari major version
+last 2 iOS major versions
+Firefox ESR
+not IE 9-11 # For IE 9-11 support, remove 'not'.
\ No newline at end of file
diff --git a/apps/solidity-compiler/src/app/app.tsx b/apps/solidity-compiler/src/app/app.tsx
new file mode 100644
index 0000000000..3f3e32eb11
--- /dev/null
+++ b/apps/solidity-compiler/src/app/app.tsx
@@ -0,0 +1,17 @@
+import React, { useState, useEffect } from 'react';
+
+import { SolidityCompiler } from '@remix-ui/solidity-compiler' // eslint-disable-line
+
+import { CompilerClientApi } from './compiler'
+
+const remix = new CompilerClientApi()
+
+export const App = () => {  
+  return (
+    <div className="debugger">
+      <SolidityCompiler plugin={remix} />
+    </div>
+  );
+};
+
+export default App;
diff --git a/apps/solidity-compiler/src/app/compiler-api.ts b/apps/solidity-compiler/src/app/compiler-api.ts
new file mode 100644
index 0000000000..d85d05da66
--- /dev/null
+++ b/apps/solidity-compiler/src/app/compiler-api.ts
@@ -0,0 +1,248 @@
+import { compile } from '@remix-project/remix-solidity'
+import { CompileTab as CompileTabLogic, parseContracts } from '@remix-ui/solidity-compiler' // eslint-disable-line
+
+export const CompilerApiMixin = (Base) => class extends Base {
+  initCompilerApi () {
+    this.configurationSettings = null
+
+    this._view = {
+      warnCompilationSlow: null,
+      errorContainer: null,
+      contractEl: null
+    }
+    
+    this.contractsDetails = {}
+    this.data = {
+      eventHandlers: {},
+      loading: false
+    }
+    this.compileTabLogic = new CompileTabLogic(this, this.contentImport)
+    this.compiler = this.compileTabLogic.compiler
+    this.compileTabLogic.init()
+
+    this.contractMap = {}
+    this.contractsDetails = {}
+
+    this.compileErrors = {}
+    this.compiledFileName = ''
+    this.selectedVersion = ''
+    this.currentFile = ''
+  }
+
+  onActivation () {
+    this.call('manager', 'activatePlugin', 'solidity-logic')
+    this.listenToEvents()    
+  }
+
+  onDeactivation () {
+    this.call('manager', 'deactivatePlugin', 'solidity-logic')
+  }
+
+  setHardHatCompilation (value) {
+    this.hhCompilation = value
+  }
+
+  setSelectedVersion (version) {
+    this.selectedVersion = version
+  }
+
+  getCompilationResult () {
+    return this.compileTabLogic.compiler.state.lastCompilationResult
+  }
+
+  addExternalFile (fileName, content) {
+    this.fileProvider.addExternal(fileName, content)
+  }
+
+  /**
+   * compile using @arg fileName.
+   * The module UI will be updated accordingly to the new compilation result.
+   * This function is used by remix-plugin compiler API.
+   * @param {string} fileName to compile
+   */
+  compile (fileName) {
+    return this.compileTabLogic.compileFile(fileName)
+  }
+
+  compileFile (event) {
+    if (event.path.length > 0) {
+      this.compileTabLogic.compileFile(event.path[0])
+    }
+  }
+
+  /**
+   * compile using @arg compilationTargets and @arg settings
+   * The module UI will *not* be updated, the compilation result is returned
+   * This function is used by remix-plugin compiler API.
+   * @param {object} map of source files.
+   * @param {object} settings {evmVersion, optimize, runs, version, language}
+   */
+  async compileWithParameters (compilationTargets, settings) {
+    settings.version = settings.version || this.selectedVersion
+    const res = await compile(compilationTargets, settings, (url, cb) => this.call('contentImport', 'resolveAndSave', url).then((result) => cb(null, result)).catch((error) => cb(error.message)))
+    return res
+  }
+
+  // This function is used for passing the compiler configuration to 'remix-tests'
+  getCurrentCompilerConfig () {
+    return {
+      currentVersion: this.selectedVersion,
+      evmVersion: this.compileTabLogic.evmVersion,
+      optimize: this.compileTabLogic.optimize,
+      runs: this.compileTabLogic.runs
+    }
+  }
+
+
+  /**
+   * set the compiler configuration
+   * This function is used by remix-plugin compiler API.
+   * @param {object} settings {evmVersion, optimize, runs, version, language}
+   */
+  setCompilerConfig (settings) {
+    this.configurationSettings = settings    
+  }
+
+  getParameters () {
+    return {}
+  }
+
+  setParameters (params) {}
+
+  getConfiguration (name) {
+    const conf = {
+      'currentFile': () => this.currentFile,
+      'hideWarnings': () => false,
+      'autoCompile': () => false,
+      'includeNightlies': () => false,
+      'optimise': () => false
+    }
+    return conf[name]()
+  }
+
+  setConfiguration (name, value) {}
+
+  getFileManagerMode () {
+    return 'browser'
+  }
+
+  fileExists (fileName) {
+    return this.call('fileManager', 'exists', fileName)
+  }
+
+  writeFile (fileName, content) {
+    return this.call('fileManager', 'writeFile', fileName, content)
+  }
+
+  readFile (fileName) {
+    return this.call('fileManager', 'readFile', fileName)
+  }
+
+  open (fileName) {
+    return this.call('fileManager', 'open', fileName)
+  }
+
+  resetResults () {
+    this.currentFile = ''
+    this.contractsDetails = {}
+    this.emit('statusChanged', { key: 'none' })
+    if (this.onResetResults()) this.onResetResults()
+  }
+
+  listenToEvents () {
+    this.data.eventHandlers.onContentChanged = () => {
+      this.emit('statusChanged', { key: 'edited', title: 'the content has changed, needs recompilation', type: 'info' })
+    }
+    this.on('editor', 'contentChanged', this.data.eventHandlers.onContentChanged)
+    
+    this.data.eventHandlers.onLoadingCompiler = () => {
+      this.data.loading = true
+      this.emit('statusChanged', { key: 'loading', title: 'loading compiler...', type: 'info' })
+    }
+    this.compiler.event.register('loadingCompiler', this.data.eventHandlers.onLoadingCompiler)
+
+    this.data.eventHandlers.onCompilerLoaded = () => {
+      this.data.loading = false
+      this.emit('statusChanged', { key: 'none' })
+    }
+    this.compiler.event.register('compilerLoaded', this.data.eventHandlers.onCompilerLoaded)
+
+    this.data.eventHandlers.onStartingCompilation = () => {
+      this.emit('statusChanged', { key: 'loading', title: 'compiling...', type: 'info' })
+    }
+
+    this.data.eventHandlers.onRemoveAnnotations = () => {
+      this.call('editor', 'clearAnnotations')
+    }
+
+    this.on('filePanel', 'setWorkspace', (workspace) => {
+      this.resetResults()
+      if (this.onSetWorkspace) this.onSetWorkspace(workspace)
+    })
+
+    this.compileTabLogic.event.on('startingCompilation', this.data.eventHandlers.onStartingCompilation)
+    this.compileTabLogic.event.on('removeAnnotations', this.data.eventHandlers.onRemoveAnnotations)
+
+    this.data.eventHandlers.onCurrentFileChanged = (name) => {
+      this.currentFile = name
+      if (this.onCurrentFileChanged) this.onCurrentFileChanged(name)
+    }
+    this.on('fileManager', 'currentFileChanged', this.data.eventHandlers.onCurrentFileChanged)
+    
+    this.data.eventHandlers.onNoFileSelected = () => {
+      this.currentFile = ''
+      if (this.onNoFileSelected) this.onNoFileSelected()
+    }
+    this.on('fileManager', 'noFileSelected', this.data.eventHandlers.onNoFileSelected)
+    
+    this.data.eventHandlers.onCompilationFinished = (success, data, source) => {
+      this.compileErrors = data
+      if (success) {
+        // forwarding the event to the appManager infra
+        this.emit('compilationFinished', source.target, source, 'soljson', data)
+        if (data.errors && data.errors.length > 0) {
+          this.emit('statusChanged', {
+            key: data.errors.length,
+            title: `compilation finished successful with warning${data.errors.length > 1 ? 's' : ''}`,
+            type: 'warning'
+          })
+        } else this.emit('statusChanged', { key: 'succeed', title: 'compilation successful', type: 'success' })
+        // Store the contracts
+        this.contractsDetails = {}
+        this.compiler.visitContracts((contract) => {
+          this.contractsDetails[contract.name] = parseContracts(
+            contract.name,
+            contract.object,
+            this.compiler.getSource(contract.file)
+          )
+        })
+      } else {
+        const count = (data.errors ? data.errors.filter(error => error.severity === 'error').length : 0 + data.error ? 1 : 0)
+        this.emit('statusChanged', { key: count, title: `compilation failed with ${count} error${count.length > 1 ? 's' : ''}`, type: 'error' })
+      }
+      // Update contract Selection
+      this.contractMap = {}
+      if (success) this.compiler.visitContracts((contract) => { this.contractMap[contract.name] = contract })
+      if (this.onCompilationFinished) this.onCompilationFinished(this.contractsDetails, this.contractMap)
+    }
+    this.compiler.event.register('compilationFinished', this.data.eventHandlers.onCompilationFinished)
+
+    this.data.eventHandlers.onThemeChanged = (theme) => {
+      const invert = theme.quality === 'dark' ? 1 : 0
+      const img = document.getElementById('swarmLogo')
+      if (img) {
+        img.style.filter = `invert(${invert})`
+      }
+    }
+    this.on('themeModule', 'themeChanged', this.data.eventHandlers.onThemeChanged)
+    
+    // Run the compiler instead of trying to save the website
+    window.document.addEventListener('keydown', (e) => {
+      // ctrl+s or command+s
+      if ((e.metaKey || e.ctrlKey) && e.keyCode === 83) {
+        e.preventDefault()
+        this.compileTabLogic.runCompiler(this.hhCompilation)
+      }
+    })
+  }
+}
diff --git a/apps/solidity-compiler/src/app/compiler.ts b/apps/solidity-compiler/src/app/compiler.ts
new file mode 100644
index 0000000000..d16c6a5740
--- /dev/null
+++ b/apps/solidity-compiler/src/app/compiler.ts
@@ -0,0 +1,40 @@
+import { PluginClient } from "@remixproject/plugin";
+import { createClient } from "@remixproject/plugin-webview";
+import { CompilerApiMixin } from './compiler-api'
+
+export interface ConfigurationSettings {
+  version: string,
+  evmVersion: string,
+  language: string,
+  optimize: boolean,
+  runs: string
+}
+
+export class CompilerClientApi extends CompilerApiMixin(PluginClient) {
+  contractMap: {
+    file: string
+  } | Record<string, any>
+  compileErrors: any
+  compileTabLogic: any
+  contractsDetails: Record<string, any>
+  contentImport: any
+  call: (...args) => void
+  on: (...args) => void
+  setSelectedVersion: (value: string) => void
+  configurationSettings: ConfigurationSettings
+  getConfiguration: (value: string) => string
+  setConfiguration: (name: string, value: string) => void
+  currentFile: string
+
+  onCurrentFileChanged: (fileName: string) => void
+  onResetResults: () => void
+  onSetWorkspace: (workspace: any) => void
+  onNoFileSelected: () => void
+  onCompilationFinished: (contractsDetails: any, contractMap: any) => void
+
+  constructor () {
+    super()
+    createClient(this as any)
+    this.initCompilerApi()
+  }  
+}
diff --git a/apps/solidity-compiler/src/assets/.gitkeep b/apps/solidity-compiler/src/assets/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/apps/solidity-compiler/src/environments/environment.prod.ts b/apps/solidity-compiler/src/environments/environment.prod.ts
new file mode 100644
index 0000000000..3612073bc3
--- /dev/null
+++ b/apps/solidity-compiler/src/environments/environment.prod.ts
@@ -0,0 +1,3 @@
+export const environment = {
+  production: true
+};
diff --git a/apps/solidity-compiler/src/environments/environment.ts b/apps/solidity-compiler/src/environments/environment.ts
new file mode 100644
index 0000000000..d9370e924b
--- /dev/null
+++ b/apps/solidity-compiler/src/environments/environment.ts
@@ -0,0 +1,6 @@
+// This file can be replaced during build by using the `fileReplacements` array.
+// When building for production, this file is replaced with `environment.prod.ts`.
+
+export const environment = {
+  production: false
+};
diff --git a/apps/solidity-compiler/src/favicon.ico b/apps/solidity-compiler/src/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..317ebcb2336e0833a22dddf0ab287849f26fda57
GIT binary patch
literal 15086
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
X*GBfq^a!*Sks)$E_17kl@BRM)`^nwN

literal 0
HcmV?d00001

diff --git a/apps/solidity-compiler/src/index.html b/apps/solidity-compiler/src/index.html
new file mode 100644
index 0000000000..20d2fdd17f
--- /dev/null
+++ b/apps/solidity-compiler/src/index.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <title>SolidityCompiler</title>
+    <base href="/" />
+
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <link rel="icon" type="image/x-icon" href="favicon.ico" />
+  </head>
+  <body>
+    <div id="root"></div>
+  </body>
+</html>
diff --git a/apps/solidity-compiler/src/index.ts b/apps/solidity-compiler/src/index.ts
new file mode 100644
index 0000000000..776e9a33df
--- /dev/null
+++ b/apps/solidity-compiler/src/index.ts
@@ -0,0 +1 @@
+export * from './app/compiler-api';
diff --git a/apps/solidity-compiler/src/main.tsx b/apps/solidity-compiler/src/main.tsx
new file mode 100644
index 0000000000..89c91fbb14
--- /dev/null
+++ b/apps/solidity-compiler/src/main.tsx
@@ -0,0 +1,11 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+
+import App from './app/app';
+
+ReactDOM.render(
+  <React.StrictMode>
+    <App />
+  </React.StrictMode>,
+  document.getElementById('root')
+);
diff --git a/apps/solidity-compiler/src/polyfills.ts b/apps/solidity-compiler/src/polyfills.ts
new file mode 100644
index 0000000000..2adf3d05b6
--- /dev/null
+++ b/apps/solidity-compiler/src/polyfills.ts
@@ -0,0 +1,7 @@
+/**
+ * Polyfill stable language features. These imports will be optimized by `@babel/preset-env`.
+ *
+ * See: https://github.com/zloirock/core-js#babel
+ */
+import 'core-js/stable';
+import 'regenerator-runtime/runtime';
diff --git a/apps/solidity-compiler/src/styles.css b/apps/solidity-compiler/src/styles.css
new file mode 100644
index 0000000000..90d4ee0072
--- /dev/null
+++ b/apps/solidity-compiler/src/styles.css
@@ -0,0 +1 @@
+/* You can add global styles to this file, and also import other style files */
diff --git a/apps/solidity-compiler/tsconfig.app.json b/apps/solidity-compiler/tsconfig.app.json
new file mode 100644
index 0000000000..2151bb6497
--- /dev/null
+++ b/apps/solidity-compiler/tsconfig.app.json
@@ -0,0 +1,9 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "types": ["node"]
+  },
+  "exclude": ["**/*.spec.ts", "**/*.spec.tsx"],
+  "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
+}
diff --git a/apps/solidity-compiler/tsconfig.json b/apps/solidity-compiler/tsconfig.json
new file mode 100644
index 0000000000..7c6fcde8f2
--- /dev/null
+++ b/apps/solidity-compiler/tsconfig.json
@@ -0,0 +1,16 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "jsx": "react",
+    "allowJs": true,
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
+    "types": ["node", "jest"],
+    "resolveJsonModule": true
+  },
+  "files": [
+    "../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
+    "../../node_modules/@nrwl/react/typings/image.d.ts"
+  ],
+  "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
+}
diff --git a/apps/solidity-compiler/tsconfig.spec.json b/apps/solidity-compiler/tsconfig.spec.json
new file mode 100644
index 0000000000..559410b96a
--- /dev/null
+++ b/apps/solidity-compiler/tsconfig.spec.json
@@ -0,0 +1,15 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../../dist/out-tsc",
+    "module": "commonjs",
+    "types": ["jest", "node"]
+  },
+  "include": [
+    "**/*.spec.ts",
+    "**/*.spec.tsx",
+    "**/*.spec.js",
+    "**/*.spec.jsx",
+    "**/*.d.ts"
+  ]
+}
diff --git a/apps/solidity-compiler/webpack.config.js b/apps/solidity-compiler/webpack.config.js
new file mode 100644
index 0000000000..bacc6e251e
--- /dev/null
+++ b/apps/solidity-compiler/webpack.config.js
@@ -0,0 +1,17 @@
+const nxWebpack = require('@nrwl/react/plugins/webpack')
+
+module.exports = config => {
+    const nxWebpackConfig = nxWebpack(config)
+
+    return {
+        ...nxWebpackConfig,
+        node: {
+            fs: 'empty',
+            tls: 'empty',
+            readline: 'empty',
+            net: 'empty',
+            module: 'empty',
+            child_process: 'empty'
+        }
+    }
+}
diff --git a/libs/remix-ui/debugger-ui/src/index.ts b/libs/remix-ui/debugger-ui/src/index.ts
index bc404baa76..840763d2ef 100644
--- a/libs/remix-ui/debugger-ui/src/index.ts
+++ b/libs/remix-ui/debugger-ui/src/index.ts
@@ -1,3 +1,2 @@
 export * from './lib/debugger-ui'
 export * from './lib/idebugger-api'
-export * from './lib/idebugger-api'
diff --git a/libs/remix-ui/solidity-compiler/src/index.ts b/libs/remix-ui/solidity-compiler/src/index.ts
index 317c79cefa..073b7eeacc 100644
--- a/libs/remix-ui/solidity-compiler/src/index.ts
+++ b/libs/remix-ui/solidity-compiler/src/index.ts
@@ -1,2 +1,3 @@
 export * from './lib/solidity-compiler'
 export * from './lib/logic'
+export * from './lib/icompiler-api'
diff --git a/libs/remix-ui/solidity-compiler/src/lib/icompiler-api.ts b/libs/remix-ui/solidity-compiler/src/lib/icompiler-api.ts
new file mode 100644
index 0000000000..8ff1df432e
--- /dev/null
+++ b/libs/remix-ui/solidity-compiler/src/lib/icompiler-api.ts
@@ -0,0 +1,28 @@
+export type onCurrentFileChanged = (fileName: string) => void
+
+export interface ICompilerApi {
+    contractMap: {
+        file: string
+      } | Record<string, any>
+    
+    compileErrors:any
+    
+    currentFile: string
+    configurationSettings: any
+    setHardHatCompilation(value: boolean): void
+    setSelectedVersion(version: string): void
+    getCompilationResult(): any
+    setCompilerConfig: (settings: any) => void
+    getParameters: () => any
+    setParameters: (params) => void
+    getConfiguration: (name: string) => string
+    setConfiguration: (name: string, value: string) => void
+    fileProviderOf: (file: string) => string
+    getFileManagerMode: () => string
+    fileExists: (file: string) => Promise<boolean>
+    writeFile: (file: string, content: string) => Promise<void>
+    readFile: (file: string) => Promise<string>
+    open: (file: string) => void
+    addExternalFile: (file: string, content: string) => void
+    onCurrentFileChanged: (listener: onCurrentFileChanged) => void
+}
diff --git a/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts b/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts
index eaba281abe..09aa9ad66f 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts
+++ b/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts
@@ -87,15 +87,14 @@ export class CompileTab extends Plugin {
    */
   compileFile (target) {
     if (!target) throw new Error('No target provided for compiliation')
-    const provider = this.api.fileProviderOf(target)
-    if (!provider) throw new Error(`cannot compile ${target}. Does not belong to any explorer`)
     return new Promise((resolve, reject) => {
-      provider.get(target, (error, content) => {
-        if (error) return reject(error)
+      this.api.readFile(target).then((content) => {
         const sources = { [target]: { content } }
         this.event.emit('startingCompilation')
         // setTimeout fix the animation on chrome... (animation triggered by 'staringCompilation')
         setTimeout(() => { this.compiler.compile(sources, target); resolve(true) }, 100)
+      }).catch((error) => {
+        reject(error)
       })
     })
   }
@@ -131,7 +130,8 @@ export class CompileTab extends Plugin {
           })
         }
       }
-      this.api.saveCurrentFile()
+      // TODO readd saving current file
+      // this.api.saveCurrentFile()
       this.event.emit('removeAnnotations')
       var currentFile = this.api.getConfiguration('currentFile')
       return this.compileFile(currentFile)
diff --git a/libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx b/libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx
index 46c032d582..57acbbd18b 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx
+++ b/libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx
@@ -9,10 +9,12 @@ import { Renderer } from '@remix-ui/renderer' // eslint-disable-line
 import './css/style.css'
 
 export const SolidityCompiler = (props: SolidityCompilerProps) => {
-  const { plugin, plugin: { compileTabLogic, contractsDetails, contractMap, compileErrors, configurationSettings } } = props
+  const { plugin, plugin: { currentFile, compileTabLogic, contractsDetails, contractMap, compileErrors, configurationSettings } } = props
   const [state, setState] = useState({
+    isHardhatProject: false,
+    currentFile,
     contractsDetails: {},
-    eventHandlers: {},
+    contractMap: {},
     loading: false,
     compileTabLogic: null,
     compiler: null,
@@ -30,6 +32,37 @@ export const SolidityCompiler = (props: SolidityCompilerProps) => {
   })
   const [currentVersion, setCurrentVersion] = useState('')
 
+  plugin.onCurrentFileChanged = (currentFile: string) => {
+    setState(prevState => {
+      return { ...prevState, currentFile }
+    })
+  }
+
+  plugin.onResetResults = () => {
+    setState(prevState => {
+      return { ...prevState, currentFile: '', contractsDetails: {}, contractMap: {} }
+    })
+  }
+
+  plugin.onSetWorkspace = async (workspace: any) => {
+    const isHardhat = workspace.isLocalhost && await compileTabLogic.isHardhatProject()
+    setState(prevState => {
+      return { ...prevState, currentFile, isHardhatProject: isHardhat }
+    })
+  }
+
+  plugin.onNoFileSelected = () => {
+    setState(prevState => {
+      return { ...prevState, currentFile: '' }
+    })
+  }
+
+  plugin.onCompilationFinished = (contractsDetails: any, contractMap: any) => {
+    setState(prevState => {
+      return { ...prevState, contractsDetails, contractMap }
+    })
+  }
+
   const toast = (message: string) => {
     setState(prevState => {
       return { ...prevState, toasterMsg: message }
@@ -75,11 +108,10 @@ export const SolidityCompiler = (props: SolidityCompilerProps) => {
     </div>
   )
 
-  const currentFile = plugin.getConfiguration('currentFile')
   return (
     <>
       <div id="compileTabView">
-        <CompilerContainer api={plugin} compileTabLogic={compileTabLogic} tooltip={toast} modal={modal} compiledFileName={currentFile} updateCurrentVersion={updateCurrentVersion} configurationSettings={configurationSettings} />
+        <CompilerContainer api={plugin} isHardhatProject={state.isHardhatProject} compileTabLogic={compileTabLogic} tooltip={toast} modal={modal} compiledFileName={currentFile} updateCurrentVersion={updateCurrentVersion} configurationSettings={configurationSettings} />
         <ContractSelection api={plugin} contractMap={contractMap} contractsDetails={contractsDetails} modal={modal} />
         <div className="remixui_errorBlobs p-4" data-id="compiledErrors">
           <span data-id={`compilationFinishedWith_${currentVersion}`}></span>
diff --git a/libs/remix-ui/solidity-compiler/src/lib/types/index.ts b/libs/remix-ui/solidity-compiler/src/lib/types/index.ts
index a2106e2205..5aae51ab93 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/types/index.ts
+++ b/libs/remix-ui/solidity-compiler/src/lib/types/index.ts
@@ -1,5 +1,8 @@
+export type onCurrentFileChanged = (fileName: string) => void
+
 export interface SolidityCompilerProps {
   plugin: {
+    currentFile: string
     contractMap: {
       file: string
     } | Record<string, any>
@@ -12,13 +15,19 @@ export interface SolidityCompilerProps {
     setSelectedVersion: (value: string) => void,
     configurationSettings: ConfigurationSettings,
     getConfiguration: (value: string) => string,
-    setConfiguration: (name: string, value: string) => void
+    setConfiguration: (name: string, value: string) => void,
+    onCurrentFileChanged: (fileName: string) => void,
+    onResetResults: () => void,
+    onSetWorkspace: (workspace: any) => void,
+    onNoFileSelected: () => void,
+    onCompilationFinished: (contractsDetails: any, contractMap: any) => void
   },
 }
 
 export interface CompilerContainerProps {
   api: any,
   compileTabLogic: any,
+  isHardhatProject: boolean,
   tooltip: (message: string | JSX.Element) => void,
   modal: (title: string, message: string | JSX.Element, okLabel: string, okFn: () => void, cancelLabel?: string, cancelFn?: () => void) => void,
   compiledFileName: string,
diff --git a/nx.json b/nx.json
index 62fadd942e..b1c4b6de08 100644
--- a/nx.json
+++ b/nx.json
@@ -98,7 +98,7 @@
       "tags": []
     },
     "remix-ui-settings": {
-       "tags": []
+      "tags": []
     },
     "remix-ui-static-analyser": {
       "tags": []
@@ -120,6 +120,9 @@
     },
     "remix-ui-renderer": {
       "tags": []
+    },
+    "solidity-compiler": {
+      "tags": []
     }
 }
 }
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 3efbbce238..541c18c889 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -25,6 +25,7 @@
       "@remix-project/remix-tests": ["dist/libs/remix-tests/src/index.js"],
       "@remix-project/remix-url-resolver": ["dist/libs/remix-url-resolver/index.js"],
       "@remixproject/debugger-plugin": ["apps/debugger/src/index.ts"],
+      "@remixproject/solidity-compiler-plugin": ["apps/solidity-compiler/src/index.ts"],
       "@remix-project/remixd": ["dist/libs/remixd/index.js"],
       "@remix-ui/tree-view": ["libs/remix-ui/tree-view/src/index.ts"],
       "@remix-ui/debugger-ui": ["libs/remix-ui/debugger-ui/src/index.ts"],
diff --git a/workspace.json b/workspace.json
index 54bf6be2c5..5a885656d1 100644
--- a/workspace.json
+++ b/workspace.json
@@ -875,6 +875,76 @@
           }
         }
       }
+    },
+    "solidity-compiler": {
+      "root": "apps/solidity-compiler",
+      "sourceRoot": "apps/solidity-compiler/src",
+      "projectType": "application",
+      "schematics": {},
+      "architect": {
+        "build": {
+          "builder": "@nrwl/web:build",
+          "options": {
+            "outputPath": "dist/apps/solidity-compiler",
+            "index": "apps/solidity-compiler/src/index.html",
+            "main": "apps/solidity-compiler/src/main.tsx",
+            "polyfills": "apps/solidity-compiler/src/polyfills.ts",
+            "tsConfig": "apps/solidity-compiler/tsconfig.app.json",
+            "assets": [
+              "apps/solidity-compiler/src/favicon.ico",
+              "apps/solidity-compiler/src/assets",
+              "apps/solidity-compiler/src/index.html"
+            ],
+            "styles": ["apps/solidity-compiler/src/styles.css"],
+            "scripts": [],
+            "webpackConfig": "apps/solidity-compiler/webpack.config.js",
+            "maxWorkers": 2
+          },
+          "configurations": {
+            "production": {
+              "fileReplacements": [
+                {
+                  "replace": "apps/solidity-compiler/src/environments/environment.ts",
+                  "with": "apps/solidity-compiler/src/environments/environment.prod.ts"
+                }
+              ],
+              "optimization": true,
+              "outputHashing": "all",
+              "sourceMap": false,
+              "extractCss": true,
+              "namedChunks": false,
+              "extractLicenses": true,
+              "vendorChunk": false,
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "2mb",
+                  "maximumError": "5mb"
+                }
+              ]
+            }
+          }
+        },
+        "serve": {
+          "builder": "@nrwl/web:dev-server",
+          "options": {
+            "buildTarget": "solidity-compiler:build"
+          },
+          "configurations": {
+            "production": {
+              "buildTarget": "solidity-compiler:build:production"
+            }
+          }
+        },
+        "lint": {
+          "builder": "@nrwl/linter:lint",
+          "options": {
+            "linter": "eslint",
+            "tsConfig": ["apps/solidity-compiler/tsconfig.app.json"],
+            "exclude": ["**/node_modules/**", "!apps/solidity-compiler/**/*"]
+          }
+        }
+      }
     }
   },
   "cli": {

From eb38865e42decdc66c70c2d715ea70f9e419c44d Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Thu, 19 Aug 2021 15:25:54 +0200
Subject: [PATCH 04/30] make sure compile-logic do not use call directly

---
 apps/solidity-compiler/src/app/compiler-api.ts       | 12 ++++++++++++
 .../src/lib/logic/compileTabLogic.ts                 |  8 ++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/apps/solidity-compiler/src/app/compiler-api.ts b/apps/solidity-compiler/src/app/compiler-api.ts
index d85d05da66..3f1c13779f 100644
--- a/apps/solidity-compiler/src/app/compiler-api.ts
+++ b/apps/solidity-compiler/src/app/compiler-api.ts
@@ -38,6 +38,18 @@ export const CompilerApiMixin = (Base) => class extends Base {
     this.call('manager', 'deactivatePlugin', 'solidity-logic')
   }
 
+  resolveContentAndSave (url) {
+    return this.call('contentImport', 'resolveAndSave', url)
+  }
+
+  compileWithHardhat (configFile) {
+    return this.call('hardhat', 'compile', configFile)
+  }
+
+  logToTerminal (content) {
+    return this.call('terminal', 'log', content)
+  }
+
   setHardHatCompilation (value) {
     this.hhCompilation = value
   }
diff --git a/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts b/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts
index 09aa9ad66f..f28a1b8988 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts
+++ b/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts
@@ -29,7 +29,7 @@ export class CompileTab extends Plugin {
   constructor (public api, public contentImport) {
     super(profile)
     this.event = new EventEmitter()
-    this.compiler = new Compiler((url, cb) => this.call('contentImport', 'resolveAndSave', url).then((result) => cb(null, result)).catch((error) => cb(error.message)))
+    this.compiler = new Compiler((url, cb) => api.resolveContentAndSave(url).then((result) => cb(null, result)).catch((error) => cb(error.message)))
   }
 
   init () {
@@ -123,10 +123,10 @@ export class CompileTab extends Plugin {
           const configFilePath = 'remix-compiler.config.js'
           this.api.writeFile(configFilePath, fileContent)
           _paq.push(['trackEvent', 'compiler', 'compileWithHardhat'])
-          this.call('hardhat', 'compile', configFilePath).then((result) => {
-            this.call('terminal', 'log', { type: 'info', value: result })
+          this.api.compileWithHardhat(configFilePath).then((result) => {
+            this.api.logToTerminal({ type: 'info', value: result })
           }).catch((error) => {
-            this.call('terminal', 'log', { type: 'error', value: error })
+            this.api.logToTerminal({ type: 'error', value: error })
           })
         }
       }

From 42220cfda02a2998a10f2adc220903792ed72adc Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Thu, 19 Aug 2021 15:34:43 +0200
Subject: [PATCH 05/30] ensure API is public

---
 apps/remix-ide/src/app/tabs/compile-tab.js | 14 +++++++++++++-
 apps/solidity-compiler/src/app/compiler.ts | 13 +++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/apps/remix-ide/src/app/tabs/compile-tab.js b/apps/remix-ide/src/app/tabs/compile-tab.js
index a77ccb4737..037a14492f 100644
--- a/apps/remix-ide/src/app/tabs/compile-tab.js
+++ b/apps/remix-ide/src/app/tabs/compile-tab.js
@@ -196,12 +196,20 @@ class CompileTab extends CompilerApiMixin(ViewPlugin) {
     return this.el
   }
 
+  async compileWithParameters (compilationTargets, settings) {
+    return await super.compileWithParameters(compilationTargets, settings)
+  }
+
+  getCompilationResult () {
+    return super.getCompilationResult()
+  }
+
   /**
    * set the compiler configuration
    * This function is used by remix-plugin compiler API.
    * @param {object} settings {evmVersion, optimize, runs, version, language}
    */
-   setCompilerConfig (settings) {
+  setCompilerConfig (settings) {
     super.setCompilerConfig(settings)
     this.renderComponent()
     // @todo(#2875) should use loading compiler return value to check whether the compiler is loaded instead of "setInterval"
@@ -213,6 +221,10 @@ class CompileTab extends CompilerApiMixin(ViewPlugin) {
     super.compile(fileName)
   }
 
+  compileFile (event) {
+    return super.compileFile(event)
+  }
+
   onActivation () {
     super.onActivation()
     this.call('filePanel', 'registerContextMenuItem', {
diff --git a/apps/solidity-compiler/src/app/compiler.ts b/apps/solidity-compiler/src/app/compiler.ts
index d16c6a5740..f42d2f88bd 100644
--- a/apps/solidity-compiler/src/app/compiler.ts
+++ b/apps/solidity-compiler/src/app/compiler.ts
@@ -2,6 +2,19 @@ import { PluginClient } from "@remixproject/plugin";
 import { createClient } from "@remixproject/plugin-webview";
 import { CompilerApiMixin } from './compiler-api'
 
+const profile = {
+  name: 'solidity',
+  displayName: 'Solidity compiler',
+  icon: 'assets/img/solidity.webp',
+  description: 'Compile solidity contracts',
+  kind: 'compiler',
+  permission: true,
+  location: 'sidePanel',
+  documentation: 'https://remix-ide.readthedocs.io/en/latest/solidity_editor.html',
+  version: '0.0.1',
+  methods: ['getCompilationResult', 'compile', 'compileWithParameters', 'setCompilerConfig', 'compileFile']
+}
+
 export interface ConfigurationSettings {
   version: string,
   evmVersion: string,

From ab12707703d2f1c22861640a4933a56f0bfe8d91 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Thu, 19 Aug 2021 15:56:34 +0200
Subject: [PATCH 06/30] fix usage of solidity logic

---
 apps/remix-ide/src/app.js                           |  1 -
 apps/remix-ide/src/app/tabs/compile-tab.js          |  2 +-
 apps/solidity-compiler/src/app/compiler-api.ts      |  9 +++------
 apps/solidity-compiler/src/app/compiler.ts          |  2 +-
 .../src/lib/publish-to-storage.tsx                  |  4 ++--
 .../solidity-compiler/src/lib/icompiler-api.ts      |  1 -
 .../src/lib/logic/compileTabLogic.ts                | 13 +------------
 .../src/lib/remix-ui-static-analyser.tsx            |  2 +-
 8 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/apps/remix-ide/src/app.js b/apps/remix-ide/src/app.js
index 76087eb176..2668dff15c 100644
--- a/apps/remix-ide/src/app.js
+++ b/apps/remix-ide/src/app.js
@@ -450,7 +450,6 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
 
   engine.register([
     compileTab,
-    compileTab.compileTabLogic,
     run,
     debug,
     analysis,
diff --git a/apps/remix-ide/src/app/tabs/compile-tab.js b/apps/remix-ide/src/app/tabs/compile-tab.js
index 037a14492f..6a69f99ad9 100644
--- a/apps/remix-ide/src/app/tabs/compile-tab.js
+++ b/apps/remix-ide/src/app/tabs/compile-tab.js
@@ -25,7 +25,7 @@ const profile = {
   location: 'sidePanel',
   documentation: 'https://remix-ide.readthedocs.io/en/latest/solidity_editor.html',
   version: packageJson.version,
-  methods: ['getCompilationResult', 'compile', 'compileWithParameters', 'setCompilerConfig', 'compileFile']
+  methods: ['getCompilationResult', 'compile', 'compileWithParameters', 'setCompilerConfig', 'compileFile', 'getCompilerState']
 }
 
 // EditorApi:
diff --git a/apps/solidity-compiler/src/app/compiler-api.ts b/apps/solidity-compiler/src/app/compiler-api.ts
index 3f1c13779f..e29981c14e 100644
--- a/apps/solidity-compiler/src/app/compiler-api.ts
+++ b/apps/solidity-compiler/src/app/compiler-api.ts
@@ -30,13 +30,10 @@ export const CompilerApiMixin = (Base) => class extends Base {
   }
 
   onActivation () {
-    this.call('manager', 'activatePlugin', 'solidity-logic')
     this.listenToEvents()    
   }
 
-  onDeactivation () {
-    this.call('manager', 'deactivatePlugin', 'solidity-logic')
-  }
+  onDeactivation () {}
 
   resolveContentAndSave (url) {
     return this.call('contentImport', 'resolveAndSave', url)
@@ -62,8 +59,8 @@ export const CompilerApiMixin = (Base) => class extends Base {
     return this.compileTabLogic.compiler.state.lastCompilationResult
   }
 
-  addExternalFile (fileName, content) {
-    this.fileProvider.addExternal(fileName, content)
+  getCompilerState () {
+    return this.compileTabLogic.getCompilerState()
   }
 
   /**
diff --git a/apps/solidity-compiler/src/app/compiler.ts b/apps/solidity-compiler/src/app/compiler.ts
index f42d2f88bd..201a680085 100644
--- a/apps/solidity-compiler/src/app/compiler.ts
+++ b/apps/solidity-compiler/src/app/compiler.ts
@@ -12,7 +12,7 @@ const profile = {
   location: 'sidePanel',
   documentation: 'https://remix-ide.readthedocs.io/en/latest/solidity_editor.html',
   version: '0.0.1',
-  methods: ['getCompilationResult', 'compile', 'compileWithParameters', 'setCompilerConfig', 'compileFile']
+  methods: ['getCompilationResult', 'compile', 'compileWithParameters', 'setCompilerConfig', 'compileFile' ,'getCompilerState']
 }
 
 export interface ConfigurationSettings {
diff --git a/libs/remix-ui/publish-to-storage/src/lib/publish-to-storage.tsx b/libs/remix-ui/publish-to-storage/src/lib/publish-to-storage.tsx
index f8f5878aa0..ed8ca6a65f 100644
--- a/libs/remix-ui/publish-to-storage/src/lib/publish-to-storage.tsx
+++ b/libs/remix-ui/publish-to-storage/src/lib/publish-to-storage.tsx
@@ -29,7 +29,7 @@ export const PublishToStorage = (props: RemixUiPublishToStorageProps) => {
 
             modal(`Published ${contract.name}'s Metadata`, publishMessage(result.uploaded))
             // triggered each time there's a new verified publish (means hash correspond)
-            api.addExternalFile('swarm/' + result.item.hash, result.item.content)
+            api.writeFile('swarm/' + result.item.hash, result.item.content)
           } catch (err) {
             let parseError = err
             try {
@@ -43,7 +43,7 @@ export const PublishToStorage = (props: RemixUiPublishToStorageProps) => {
 
             modal(`Published ${contract.name}'s Metadata`, publishMessage(result.uploaded))
             // triggered each time there's a new verified publish (means hash correspond)
-            api.addExternalFile('ipfs/' + result.item.hash, result.item.content)
+            api.writeFile('ipfs/' + result.item.hash, result.item.content)
           } catch (err) {
             modal('IPFS Publish Failed', publishMessageFailed(storage, err))
           }
diff --git a/libs/remix-ui/solidity-compiler/src/lib/icompiler-api.ts b/libs/remix-ui/solidity-compiler/src/lib/icompiler-api.ts
index 8ff1df432e..7bac190abe 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/icompiler-api.ts
+++ b/libs/remix-ui/solidity-compiler/src/lib/icompiler-api.ts
@@ -23,6 +23,5 @@ export interface ICompilerApi {
     writeFile: (file: string, content: string) => Promise<void>
     readFile: (file: string) => Promise<string>
     open: (file: string) => void
-    addExternalFile: (file: string, content: string) => void
     onCurrentFileChanged: (listener: onCurrentFileChanged) => void
 }
diff --git a/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts b/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts
index f28a1b8988..ea0f5c5425 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts
+++ b/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts
@@ -1,15 +1,5 @@
-import { Plugin } from '@remixproject/engine'
-
-const packageJson = require('../../../../../../package.json')
 const Compiler = require('@remix-project/remix-solidity').Compiler
 const EventEmitter = require('events')
-const profile = {
-  name: 'solidity-logic',
-  displayName: 'Solidity compiler logic',
-  description: 'Compile solidity contracts - Logic',
-  methods: ['getCompilerState'],
-  version: packageJson.version
-}
 
 declare global {
   interface Window {
@@ -18,7 +8,7 @@ declare global {
 }
 const _paq = window._paq = window._paq || []  //eslint-disable-line
 
-export class CompileTab extends Plugin {
+export class CompileTab {
   public compiler
   public optimize
   public runs
@@ -27,7 +17,6 @@ export class CompileTab extends Plugin {
   public event
 
   constructor (public api, public contentImport) {
-    super(profile)
     this.event = new EventEmitter()
     this.compiler = new Compiler((url, cb) => api.resolveContentAndSave(url).then((result) => cb(null, result)).catch((error) => cb(error.message)))
   }
diff --git a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
index 2f45e44830..bd88dad856 100644
--- a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
+++ b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
@@ -217,7 +217,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
           })
           // Slither Analysis
           if (slitherEnabled) {
-            props.analysisModule.call('solidity-logic', 'getCompilerState').then(async (compilerState) => {
+            props.analysisModule.call('solidity', 'getCompilerState').then((compilerState) => {
               const { currentVersion, optimize, evmVersion } = compilerState
               props.analysisModule.call('terminal', 'log', { type: 'info', value: '[Slither Analysis]: Running...' })
               _paq.push(['trackEvent', 'solidityStaticAnalyzer', 'analyzeWithSlither'])

From 0e7f088fc39ad32782f4a499d378cee0e5b6c09f Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Thu, 19 Aug 2021 16:33:07 +0200
Subject: [PATCH 07/30] fix index.html

---
 apps/solidity-compiler/src/index.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/solidity-compiler/src/index.html b/apps/solidity-compiler/src/index.html
index 20d2fdd17f..45be468da6 100644
--- a/apps/solidity-compiler/src/index.html
+++ b/apps/solidity-compiler/src/index.html
@@ -2,11 +2,12 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <title>SolidityCompiler</title>
-    <base href="/" />
+    <title>Solidity Compiler</title>
+    <base href="./" />
 
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <link rel="icon" type="image/x-icon" href="favicon.ico" />
+    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css" integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous"/>
   </head>
   <body>
     <div id="root"></div>

From 1aff58dbfbfb4ed6e15b8a778611aa258b34d862 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Mon, 23 Aug 2021 18:36:19 +0200
Subject: [PATCH 08/30] fix iframe plugin api

---
 apps/remix-ide/src/app/tabs/compile-tab.js    | 113 ------------------
 .../solidity-compiler/src/app/compiler-api.ts |  22 +++-
 apps/solidity-compiler/src/app/compiler.ts    |  26 +++-
 libs/remix-ui/solidity-compiler/src/index.ts  |   3 +-
 .../src/lib/actions/compiler.ts               |  10 +-
 .../src/lib/compiler-container.tsx            |   2 +-
 .../src/lib/icompiler-api.ts                  |  27 -----
 .../src/lib/solidity-compiler.tsx             |   6 +-
 .../solidity-compiler/src/lib/types/index.ts  |  56 +++++----
 9 files changed, 82 insertions(+), 183 deletions(-)
 delete mode 100644 libs/remix-ui/solidity-compiler/src/lib/icompiler-api.ts

diff --git a/apps/remix-ide/src/app/tabs/compile-tab.js b/apps/remix-ide/src/app/tabs/compile-tab.js
index 6a69f99ad9..39c66d3ec6 100644
--- a/apps/remix-ide/src/app/tabs/compile-tab.js
+++ b/apps/remix-ide/src/app/tabs/compile-tab.js
@@ -48,119 +48,6 @@ class CompileTab extends CompilerApiMixin(ViewPlugin) {
     this.renderComponent()
   }
 
-  /************
-   * EVENTS
-   */
-
-  listenToEvents () {
-    this.data.eventHandlers.onContentChanged = () => {
-      this.emit('statusChanged', { key: 'edited', title: 'the content has changed, needs recompilation', type: 'info' })
-    }
-    this.editor.event.register('contentChanged', this.data.eventHandlers.onContentChanged)
-
-    this.data.eventHandlers.onLoadingCompiler = () => {
-      this.data.loading = true
-      this.emit('statusChanged', { key: 'loading', title: 'loading compiler...', type: 'info' })
-    }
-    this.compiler.event.register('loadingCompiler', this.data.eventHandlers.onLoadingCompiler)
-
-    this.data.eventHandlers.onCompilerLoaded = () => {
-      this.data.loading = false
-      this.emit('statusChanged', { key: 'none' })
-    }
-    this.compiler.event.register('compilerLoaded', this.data.eventHandlers.onCompilerLoaded)
-
-    this.data.eventHandlers.onStartingCompilation = () => {
-      this.emit('statusChanged', { key: 'loading', title: 'compiling...', type: 'info' })
-    }
-
-    this.data.eventHandlers.onRemoveAnnotations = () => {
-      this.call('editor', 'clearAnnotations')
-    }
-
-    const resetView = (isLocalhost) => {
-      this.compileTabLogic.isHardhatProject().then((result) => {
-        if (result && isLocalhost) this.isHardHatProject = true
-        else this.isHardHatProject = false
-        this.renderComponent()
-      })
-      this.resetResults()
-    }
-
-    this.on('filePanel', 'setWorkspace', (workspace) => {
-      resetView(workspace.isLocalhost)
-    })
-
-    this.on('remixd', 'rootFolderChanged', () => {
-      resetView(true)
-    })
-
-    this.compileTabLogic.event.on('startingCompilation', this.data.eventHandlers.onStartingCompilation)
-    this.compileTabLogic.event.on('removeAnnotations', this.data.eventHandlers.onRemoveAnnotations)
-
-    this.data.eventHandlers.onCurrentFileChanged = (name) => {
-      this.currentFile = name
-      this.renderComponent()
-    }
-    this.fileManager.events.on('currentFileChanged', this.data.eventHandlers.onCurrentFileChanged)
-
-    this.data.eventHandlers.onNoFileSelected = () => {
-      this.currentFile = ''
-      this.renderComponent()
-    }
-    this.fileManager.events.on('noFileSelected', this.data.eventHandlers.onNoFileSelected)
-
-    this.data.eventHandlers.onCompilationFinished = (success, data, source) => {
-      this.setCompileErrors(data)
-      if (success) {
-        // forwarding the event to the appManager infra
-        this.emit('compilationFinished', source.target, source, 'soljson', data)
-        if (data.errors && data.errors.length > 0) {
-          this.emit('statusChanged', {
-            key: data.errors.length,
-            title: `compilation finished successful with warning${data.errors.length > 1 ? 's' : ''}`,
-            type: 'warning'
-          })
-        } else this.emit('statusChanged', { key: 'succeed', title: 'compilation successful', type: 'success' })
-        // Store the contracts
-        this.contractsDetails = {}
-        this.compiler.visitContracts((contract) => {
-          this.contractsDetails[contract.name] = parseContracts(
-            contract.name,
-            contract.object,
-            this.compiler.getSource(contract.file)
-          )
-        })
-      } else {
-        const count = (data.errors ? data.errors.filter(error => error.severity === 'error').length : 0) + data.error ? 1 : 0
-        this.emit('statusChanged', { key: count, title: `compilation failed with ${count} error${count.length > 1 ? 's' : ''}`, type: 'error' })
-      }
-      // Update contract Selection
-      this.contractMap = {}
-      if (success) this.compiler.visitContracts((contract) => { this.contractMap[contract.name] = contract })
-      this.renderComponent()
-    }
-    this.compiler.event.register('compilationFinished', this.data.eventHandlers.onCompilationFinished)
-
-    this.data.eventHandlers.onThemeChanged = (theme) => {
-      const invert = theme.quality === 'dark' ? 1 : 0
-      const img = document.getElementById('swarmLogo')
-      if (img) {
-        img.style.filter = `invert(${invert})`
-      }
-    }
-    globalRegistry.get('themeModule').api.events.on('themeChanged', this.data.eventHandlers.onThemeChanged)
-
-    // Run the compiler instead of trying to save the website
-    $(window).keydown((e) => {
-      // ctrl+s or command+s
-      if ((e.metaKey || e.ctrlKey) && e.keyCode === 83) {
-        e.preventDefault()
-        this.compileTabLogic.runCompiler(this.hhCompilation)
-      }
-    })
-  }
-
   onResetResults () {
     this.renderComponent()
   }
diff --git a/apps/solidity-compiler/src/app/compiler-api.ts b/apps/solidity-compiler/src/app/compiler-api.ts
index e29981c14e..edc69528cd 100644
--- a/apps/solidity-compiler/src/app/compiler-api.ts
+++ b/apps/solidity-compiler/src/app/compiler-api.ts
@@ -123,8 +123,7 @@ export const CompilerApiMixin = (Base) => class extends Base {
       'currentFile': () => this.currentFile,
       'hideWarnings': () => false,
       'autoCompile': () => false,
-      'includeNightlies': () => false,
-      'optimise': () => false
+      'includeNightlies': () => false
     }
     return conf[name]()
   }
@@ -186,7 +185,20 @@ export const CompilerApiMixin = (Base) => class extends Base {
 
     this.on('filePanel', 'setWorkspace', (workspace) => {
       this.resetResults()
-      if (this.onSetWorkspace) this.onSetWorkspace(workspace)
+      if (this.onSetWorkspace) this.onSetWorkspace(workspace.isLocalhost)
+    })
+
+    this.on('remixd', 'rootFolderChanged', () => {
+      this.resetResults()
+      if (this.onSetWorkspace) this.onSetWorkspace(true)
+    })
+
+    this.on('editor', 'sessionSwitched', () => {
+      if (this.onSessionSwitched) this.onSessionSwitched()
+    })
+
+    this.on('editor', 'contentChanged', () => {
+      if (this.onContentChanged) this.onContentChanged()
     })
 
     this.compileTabLogic.event.on('startingCompilation', this.data.eventHandlers.onStartingCompilation)
@@ -226,8 +238,8 @@ export const CompilerApiMixin = (Base) => class extends Base {
           )
         })
       } else {
-        const count = (data.errors ? data.errors.filter(error => error.severity === 'error').length : 0 + data.error ? 1 : 0)
-        this.emit('statusChanged', { key: count, title: `compilation failed with ${count} error${count.length > 1 ? 's' : ''}`, type: 'error' })
+        const count = (data.errors ? data.errors.filter(error => error.severity === 'error').length : 0) + data.error ? 1 : 0
+        this.emit('statusChanged', { key: count, title: `compilation failed with ${count} error${count > 1 ? 's' : ''}`, type: 'error' })
       }
       // Update contract Selection
       this.contractMap = {}
diff --git a/apps/solidity-compiler/src/app/compiler.ts b/apps/solidity-compiler/src/app/compiler.ts
index 201a680085..7e6deb8c98 100644
--- a/apps/solidity-compiler/src/app/compiler.ts
+++ b/apps/solidity-compiler/src/app/compiler.ts
@@ -24,26 +24,40 @@ export interface ConfigurationSettings {
 }
 
 export class CompilerClientApi extends CompilerApiMixin(PluginClient) {
+  // interface matches libs/remix-ui/solidity-compiler/types/index.ts : ICompilerApi
+  currentFile: string
   contractMap: {
     file: string
   } | Record<string, any>
   compileErrors: any
   compileTabLogic: any
   contractsDetails: Record<string, any>
-  contentImport: any
-  call: (...args) => void
-  on: (...args) => void
-  setSelectedVersion: (value: string) => void
   configurationSettings: ConfigurationSettings
+
+  setHardHatCompilation: (value: boolean) => void
+  getParameters: () => ConfigurationSettings
+  setParameters: (params: Partial<ConfigurationSettings>) => void
+  setCompilerConfig: (settings: ConfigurationSettings) => void
+  
   getConfiguration: (value: string) => string
   setConfiguration: (name: string, value: string) => void
-  currentFile: string
+  getFileManagerMode: () => string
+  
+
+  getCompilationResult: () => any
 
   onCurrentFileChanged: (fileName: string) => void
   onResetResults: () => void
-  onSetWorkspace: (workspace: any) => void
+  onSetWorkspace: (isLocalhost: boolean) => void
   onNoFileSelected: () => void
   onCompilationFinished: (contractsDetails: any, contractMap: any) => void
+  onSessionSwitched: () => void
+  onContentChanged: () => void
+
+  fileExists: (file: string) => Promise<boolean>
+  writeFile: (file: string, content: string) => Promise<void>
+  readFile: (file: string) => Promise<string>
+  open: (file: string) => void
 
   constructor () {
     super()
diff --git a/libs/remix-ui/solidity-compiler/src/index.ts b/libs/remix-ui/solidity-compiler/src/index.ts
index 073b7eeacc..30a13c42f4 100644
--- a/libs/remix-ui/solidity-compiler/src/index.ts
+++ b/libs/remix-ui/solidity-compiler/src/index.ts
@@ -1,3 +1,2 @@
 export * from './lib/solidity-compiler'
-export * from './lib/logic'
-export * from './lib/icompiler-api'
+export * from './lib/logic'
\ No newline at end of file
diff --git a/libs/remix-ui/solidity-compiler/src/lib/actions/compiler.ts b/libs/remix-ui/solidity-compiler/src/lib/actions/compiler.ts
index e0e2a46498..96316c8bd5 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/actions/compiler.ts
+++ b/libs/remix-ui/solidity-compiler/src/lib/actions/compiler.ts
@@ -27,9 +27,9 @@ export const resetCompilerMode = () => (dispatch: React.Dispatch<any>) => {
 }
 
 export const listenToEvents = (compileTabLogic, api) => (dispatch: React.Dispatch<any>) => {
-  api.on('editor', 'sessionSwitched', () => {
+  api.onSessionSwitched = () => {
     dispatch(setEditorMode('sessionSwitched'))
-  })
+  }
 
   compileTabLogic.event.on('startingCompilation', () => {
     dispatch(setCompilerMode('startingCompilation'))
@@ -39,10 +39,10 @@ export const listenToEvents = (compileTabLogic, api) => (dispatch: React.Dispatc
     dispatch(setCompilerMode('compilationDuration', speed))
   })
 
-  api.on('editor', 'contentChanged', () => {
+  api.onContentChanged = () => {
     dispatch(setEditorMode('contentChanged'))
-  })
-
+  }
+ 
   compileTabLogic.compiler.event.register('loadingCompiler', () => {
     dispatch(setCompilerMode('loadingCompiler'))
   })
diff --git a/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx b/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx
index 80b1004ab6..3bd1032c76 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx
+++ b/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx
@@ -76,7 +76,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
           hideWarnings: api.getConfiguration('hideWarnings') || false,
           autoCompile: typeof autoCompile === 'boolean' ? autoCompile : api.getConfiguration('autoCompile') || false,
           includeNightlies: api.getConfiguration('includeNightlies') || false,
-          optimise: typeof optimize === 'boolean' ? optimize : api.getConfiguration('optimise') || false,
+          optimize: (optimize !== null) && (optimize !== undefined) ? optimize : false,
           runs: (runs !== null) && (runs !== 'null') && (runs !== undefined) && (runs !== 'undefined') ? runs : 200,
           evmVersion: (evmVersion !== null) && (evmVersion !== 'null') && (evmVersion !== undefined) && (evmVersion !== 'undefined') ? evmVersion : 'default'
         }
diff --git a/libs/remix-ui/solidity-compiler/src/lib/icompiler-api.ts b/libs/remix-ui/solidity-compiler/src/lib/icompiler-api.ts
deleted file mode 100644
index 7bac190abe..0000000000
--- a/libs/remix-ui/solidity-compiler/src/lib/icompiler-api.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-export type onCurrentFileChanged = (fileName: string) => void
-
-export interface ICompilerApi {
-    contractMap: {
-        file: string
-      } | Record<string, any>
-    
-    compileErrors:any
-    
-    currentFile: string
-    configurationSettings: any
-    setHardHatCompilation(value: boolean): void
-    setSelectedVersion(version: string): void
-    getCompilationResult(): any
-    setCompilerConfig: (settings: any) => void
-    getParameters: () => any
-    setParameters: (params) => void
-    getConfiguration: (name: string) => string
-    setConfiguration: (name: string, value: string) => void
-    fileProviderOf: (file: string) => string
-    getFileManagerMode: () => string
-    fileExists: (file: string) => Promise<boolean>
-    writeFile: (file: string, content: string) => Promise<void>
-    readFile: (file: string) => Promise<string>
-    open: (file: string) => void
-    onCurrentFileChanged: (listener: onCurrentFileChanged) => void
-}
diff --git a/libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx b/libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx
index 57acbbd18b..792beb8829 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx
+++ b/libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx
@@ -44,8 +44,8 @@ export const SolidityCompiler = (props: SolidityCompilerProps) => {
     })
   }
 
-  plugin.onSetWorkspace = async (workspace: any) => {
-    const isHardhat = workspace.isLocalhost && await compileTabLogic.isHardhatProject()
+  plugin.onSetWorkspace = async (isLocalhost: boolean) => {
+    const isHardhat = isLocalhost && await compileTabLogic.isHardhatProject()
     setState(prevState => {
       return { ...prevState, currentFile, isHardhatProject: isHardhat }
     })
@@ -71,7 +71,7 @@ export const SolidityCompiler = (props: SolidityCompilerProps) => {
 
   const updateCurrentVersion = (value) => {
     setCurrentVersion(value)
-    plugin.setSelectedVersion(value)
+    plugin.setParameters({ version: value })
   }
 
   const modal = async (title: string, message: string | JSX.Element, okLabel: string, okFn: () => void, cancelLabel?: string, cancelFn?: () => void) => {
diff --git a/libs/remix-ui/solidity-compiler/src/lib/types/index.ts b/libs/remix-ui/solidity-compiler/src/lib/types/index.ts
index 5aae51ab93..b477a8df85 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/types/index.ts
+++ b/libs/remix-ui/solidity-compiler/src/lib/types/index.ts
@@ -1,27 +1,41 @@
 export type onCurrentFileChanged = (fileName: string) => void
 
 export interface SolidityCompilerProps {
-  plugin: {
-    currentFile: string
-    contractMap: {
-      file: string
-    } | Record<string, any>
-    compileErrors: any,
-    compileTabLogic: any,
-    contractsDetails: Record<string, any>,
-    contentImport: any,
-    call: (...args) => void
-    on: (...args) => void,
-    setSelectedVersion: (value: string) => void,
-    configurationSettings: ConfigurationSettings,
-    getConfiguration: (value: string) => string,
-    setConfiguration: (name: string, value: string) => void,
-    onCurrentFileChanged: (fileName: string) => void,
-    onResetResults: () => void,
-    onSetWorkspace: (workspace: any) => void,
-    onNoFileSelected: () => void,
-    onCompilationFinished: (contractsDetails: any, contractMap: any) => void
-  },
+  plugin: ICompilerApi
+}
+
+export interface ICompilerApi {
+  currentFile: string
+  contractMap: {
+    file: string
+  } | Record<string, any>
+  compileErrors: any
+  compileTabLogic: any
+  contractsDetails: Record<string, any>
+  configurationSettings: ConfigurationSettings
+
+  setHardHatCompilation: (value: boolean) => void
+  getParameters: () => any
+  setParameters: (params) => void
+  getConfiguration: (value: string) => string
+  setConfiguration: (name: string, value: string) => void
+  getFileManagerMode: () => string
+  setCompilerConfig: (settings: any) => void
+
+  getCompilationResult: () => any
+
+  onCurrentFileChanged: (fileName: string) => void
+  onResetResults: () => void,
+  onSetWorkspace: (isLocalhost: boolean) => void
+  onNoFileSelected: () => void
+  onCompilationFinished: (contractsDetails: any, contractMap: any) => void
+  onSessionSwitched: () => void
+  onContentChanged: () => void
+
+  fileExists: (file: string) => Promise<boolean>
+  writeFile: (file: string, content: string) => Promise<void>
+  readFile: (file: string) => Promise<string>
+  open: (file: string) => void
 }
 
 export interface CompilerContainerProps {

From 25fc94e2d2d3bebccaad422215a5892beadfb2ad Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Thu, 26 Aug 2021 12:13:28 +0200
Subject: [PATCH 09/30] better org of types

---
 apps/remix-ide/src/app/tabs/compile-tab.js    |  3 +-
 apps/solidity-compiler/src/app/compiler.ts    |  3 +-
 libs/remix-lib/src/index.ts                   | 55 ++++++++-----------
 libs/remix-lib/src/types/ICompilerApi.ts      | 41 ++++++++++++++
 .../src/lib/compiler-container.tsx            |  3 +-
 .../solidity-compiler/src/lib/types/index.ts  | 45 +--------------
 6 files changed, 73 insertions(+), 77 deletions(-)
 create mode 100644 libs/remix-lib/src/types/ICompilerApi.ts

diff --git a/apps/remix-ide/src/app/tabs/compile-tab.js b/apps/remix-ide/src/app/tabs/compile-tab.js
index 39c66d3ec6..61dc9200b4 100644
--- a/apps/remix-ide/src/app/tabs/compile-tab.js
+++ b/apps/remix-ide/src/app/tabs/compile-tab.js
@@ -4,6 +4,7 @@ import ReactDOM from 'react-dom'
 import { SolidityCompiler, CompileTab as CompileTabLogic, parseContracts } from '@remix-ui/solidity-compiler' // eslint-disable-line
 import { CompilerApiMixin } from '@remixproject/solidity-compiler-plugin'
 import { ViewPlugin } from '@remixproject/engine-web'
+import { ICompilerApi } from '@remix-project/remix-lib-ts'
 import * as packageJson from '../../../../../package.json'
 
 const EventEmitter = require('events')
@@ -32,7 +33,7 @@ const profile = {
 // - events: ['compilationFinished'],
 // - methods: ['getCompilationResult']
 
-class CompileTab extends CompilerApiMixin(ViewPlugin) {
+class CompileTab extends CompilerApiMixin(ViewPlugin) { // implements ICompilerApi
   constructor () {
     super(profile)
     this.initCompilerApi()
diff --git a/apps/solidity-compiler/src/app/compiler.ts b/apps/solidity-compiler/src/app/compiler.ts
index 7e6deb8c98..0d1cd1e620 100644
--- a/apps/solidity-compiler/src/app/compiler.ts
+++ b/apps/solidity-compiler/src/app/compiler.ts
@@ -1,6 +1,7 @@
 import { PluginClient } from "@remixproject/plugin";
 import { createClient } from "@remixproject/plugin-webview";
 import { CompilerApiMixin } from './compiler-api'
+import { ICompilerApi } from '@remix-project/remix-lib-ts'
 
 const profile = {
   name: 'solidity',
@@ -23,7 +24,7 @@ export interface ConfigurationSettings {
   runs: string
 }
 
-export class CompilerClientApi extends CompilerApiMixin(PluginClient) {
+export class CompilerClientApi extends CompilerApiMixin(PluginClient) implements ICompilerApi  {
   // interface matches libs/remix-ui/solidity-compiler/types/index.ts : ICompilerApi
   currentFile: string
   contractMap: {
diff --git a/libs/remix-lib/src/index.ts b/libs/remix-lib/src/index.ts
index d3d37231f1..20e192bf9b 100644
--- a/libs/remix-lib/src/index.ts
+++ b/libs/remix-lib/src/index.ts
@@ -18,36 +18,29 @@ import * as typeConversion from './execution/typeConversion'
 import { TxRunnerVM } from './execution/txRunnerVM'
 import { TxRunnerWeb3 } from './execution/txRunnerWeb3'
 import * as txResultHelper from './helpers/txResultHelper'
+export { ICompilerApi, ConfigurationSettings} from './types/ICompilerApi' 
 
-export = modules()
-
-function modules () {
-  return {
-    EventManager: EventManager,
-    helpers: {
-      ui: uiHelper,
-      compiler: compilerHelper,
-      txResultHelper
-    },
-    vm: {
-      Web3Providers: Web3Providers,
-      DummyProvider: DummyProvider,
-      Web3VMProvider: Web3VmProvider
-    },
-    Storage: Storage,
-    util: util,
-    execution: {
-      EventsDecoder: EventsDecoder,
-      txExecution: txExecution,
-      txHelper: txHelper,
-      txFormat: txFormat,
-      txListener: TxListener,
-      TxRunner: TxRunner,
-      TxRunnerWeb3: TxRunnerWeb3,
-      TxRunnerVM: TxRunnerVM,
-      typeConversion: typeConversion,
-      LogsManager,
-      forkAt
-    }
-  }
+const helpers = {
+  ui: uiHelper,
+  compiler: compilerHelper,
+  txResultHelper
+}
+const vm = {
+  Web3Providers: Web3Providers,
+  DummyProvider: DummyProvider,
+  Web3VMProvider: Web3VmProvider
+}
+const execution = {
+  EventsDecoder: EventsDecoder,
+  txExecution: txExecution,
+  txHelper: txHelper,
+  txFormat: txFormat,
+  txListener: TxListener,
+  TxRunner: TxRunner,
+  TxRunnerWeb3: TxRunnerWeb3,
+  TxRunnerVM: TxRunnerVM,
+  typeConversion: typeConversion,
+  LogsManager,
+  forkAt
 }
+export { EventManager, helpers, vm, Storage, util, execution }
diff --git a/libs/remix-lib/src/types/ICompilerApi.ts b/libs/remix-lib/src/types/ICompilerApi.ts
new file mode 100644
index 0000000000..89dd12c6e6
--- /dev/null
+++ b/libs/remix-lib/src/types/ICompilerApi.ts
@@ -0,0 +1,41 @@
+export interface ICompilerApi {
+    currentFile: string
+    contractMap: {
+      file: string
+    } | Record<string, any>
+    compileErrors: any
+    compileTabLogic: any
+    contractsDetails: Record<string, any>
+    configurationSettings: ConfigurationSettings
+  
+    setHardHatCompilation: (value: boolean) => void
+    getParameters: () => any
+    setParameters: (params) => void
+    getConfiguration: (value: string) => string
+    setConfiguration: (name: string, value: string) => void
+    getFileManagerMode: () => string
+    setCompilerConfig: (settings: any) => void
+  
+    getCompilationResult: () => any
+  
+    onCurrentFileChanged: (fileName: string) => void
+    onResetResults: () => void,
+    onSetWorkspace: (workspace: any) => void
+    onNoFileSelected: () => void
+    onCompilationFinished: (contractsDetails: any, contractMap: any) => void
+    onSessionSwitched: () => void
+    onContentChanged: () => void
+  
+    fileExists: (file: string) => Promise<boolean>
+    writeFile: (file: string, content: string) => Promise<void>
+    readFile: (file: string) => Promise<string>
+    open: (file: string) => void
+  }
+
+export interface ConfigurationSettings {
+    version: string,
+    evmVersion: string,
+    language: string,
+    optimize: boolean,
+    runs: string
+}
\ No newline at end of file
diff --git a/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx b/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx
index 3bd1032c76..b62525dc1f 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx
+++ b/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx
@@ -1,6 +1,7 @@
 import React, { useEffect, useState, useRef, useReducer } from 'react' // eslint-disable-line
 import semver from 'semver'
-import { CompilerContainerProps, ConfigurationSettings } from './types'
+import { CompilerContainerProps } from './types'
+import { ConfigurationSettings } from '@remix-project/remix-lib-ts'
 import * as helper from '../../../../../apps/remix-ide/src/lib/helper'
 import { canUseWorker, baseURLBin, baseURLWasm, urlFromVersion, pathToURL, promisedMiniXhr } from '@remix-project/remix-solidity'
 import { compilerReducer, compilerInitialState } from './reducers/compiler'
diff --git a/libs/remix-ui/solidity-compiler/src/lib/types/index.ts b/libs/remix-ui/solidity-compiler/src/lib/types/index.ts
index b477a8df85..fdb291b66d 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/types/index.ts
+++ b/libs/remix-ui/solidity-compiler/src/lib/types/index.ts
@@ -1,43 +1,10 @@
+import { ICompilerApi, ConfigurationSettings } from '@remix-project/remix-lib-ts'
 export type onCurrentFileChanged = (fileName: string) => void
 
 export interface SolidityCompilerProps {
   plugin: ICompilerApi
 }
 
-export interface ICompilerApi {
-  currentFile: string
-  contractMap: {
-    file: string
-  } | Record<string, any>
-  compileErrors: any
-  compileTabLogic: any
-  contractsDetails: Record<string, any>
-  configurationSettings: ConfigurationSettings
-
-  setHardHatCompilation: (value: boolean) => void
-  getParameters: () => any
-  setParameters: (params) => void
-  getConfiguration: (value: string) => string
-  setConfiguration: (name: string, value: string) => void
-  getFileManagerMode: () => string
-  setCompilerConfig: (settings: any) => void
-
-  getCompilationResult: () => any
-
-  onCurrentFileChanged: (fileName: string) => void
-  onResetResults: () => void,
-  onSetWorkspace: (isLocalhost: boolean) => void
-  onNoFileSelected: () => void
-  onCompilationFinished: (contractsDetails: any, contractMap: any) => void
-  onSessionSwitched: () => void
-  onContentChanged: () => void
-
-  fileExists: (file: string) => Promise<boolean>
-  writeFile: (file: string, content: string) => Promise<void>
-  readFile: (file: string) => Promise<string>
-  open: (file: string) => void
-}
-
 export interface CompilerContainerProps {
   api: any,
   compileTabLogic: any,
@@ -55,12 +22,4 @@ export interface ContractSelectionProps {
   } | Record<string, any>,
   modal: (title: string, message: string | JSX.Element, okLabel: string, okFn: () => void, cancelLabel?: string, cancelFn?: () => void) => void,
   contractsDetails: Record<string, any>
-}
-
-export interface ConfigurationSettings {
-  version: string,
-  evmVersion: string,
-  language: string,
-  optimize: boolean,
-  runs: string
-}
+}
\ No newline at end of file

From b109eafbc02d610d2a386b30e24c815dcabb0178 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Tue, 31 Aug 2021 10:47:06 +0200
Subject: [PATCH 10/30] linting

---
 apps/remix-ide/src/app/tabs/compile-tab.js             |  6 +-----
 libs/remix-lib/src/index.ts                            |  2 +-
 libs/remix-lib/src/types/ICompilerApi.ts               | 10 +++++-----
 libs/remix-ui/solidity-compiler/src/index.ts           |  2 +-
 .../solidity-compiler/src/lib/actions/compiler.ts      |  2 +-
 libs/remix-ui/solidity-compiler/src/lib/types/index.ts |  2 +-
 6 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/apps/remix-ide/src/app/tabs/compile-tab.js b/apps/remix-ide/src/app/tabs/compile-tab.js
index 61dc9200b4..b1d4709cd0 100644
--- a/apps/remix-ide/src/app/tabs/compile-tab.js
+++ b/apps/remix-ide/src/app/tabs/compile-tab.js
@@ -4,15 +4,11 @@ import ReactDOM from 'react-dom'
 import { SolidityCompiler, CompileTab as CompileTabLogic, parseContracts } from '@remix-ui/solidity-compiler' // eslint-disable-line
 import { CompilerApiMixin } from '@remixproject/solidity-compiler-plugin'
 import { ViewPlugin } from '@remixproject/engine-web'
-import { ICompilerApi } from '@remix-project/remix-lib-ts'
+// import { ICompilerApi } from '@remix-project/remix-lib-ts'
 import * as packageJson from '../../../../../package.json'
 
-const EventEmitter = require('events')
-const $ = require('jquery')
 const yo = require('yo-yo')
-var QueryParams = require('../../lib/query-params')
 const addTooltip = require('../ui/tooltip')
-const globalRegistry = require('../../global/registry')
 
 const css = require('./styles/compile-tab-styles')
 
diff --git a/libs/remix-lib/src/index.ts b/libs/remix-lib/src/index.ts
index 20e192bf9b..1ba94fdd21 100644
--- a/libs/remix-lib/src/index.ts
+++ b/libs/remix-lib/src/index.ts
@@ -18,7 +18,7 @@ import * as typeConversion from './execution/typeConversion'
 import { TxRunnerVM } from './execution/txRunnerVM'
 import { TxRunnerWeb3 } from './execution/txRunnerWeb3'
 import * as txResultHelper from './helpers/txResultHelper'
-export { ICompilerApi, ConfigurationSettings} from './types/ICompilerApi' 
+export { ICompilerApi, ConfigurationSettings } from './types/ICompilerApi'
 
 const helpers = {
   ui: uiHelper,
diff --git a/libs/remix-lib/src/types/ICompilerApi.ts b/libs/remix-lib/src/types/ICompilerApi.ts
index 89dd12c6e6..6e97840101 100644
--- a/libs/remix-lib/src/types/ICompilerApi.ts
+++ b/libs/remix-lib/src/types/ICompilerApi.ts
@@ -7,7 +7,7 @@ export interface ICompilerApi {
     compileTabLogic: any
     contractsDetails: Record<string, any>
     configurationSettings: ConfigurationSettings
-  
+
     setHardHatCompilation: (value: boolean) => void
     getParameters: () => any
     setParameters: (params) => void
@@ -15,9 +15,9 @@ export interface ICompilerApi {
     setConfiguration: (name: string, value: string) => void
     getFileManagerMode: () => string
     setCompilerConfig: (settings: any) => void
-  
+
     getCompilationResult: () => any
-  
+
     onCurrentFileChanged: (fileName: string) => void
     onResetResults: () => void,
     onSetWorkspace: (workspace: any) => void
@@ -25,7 +25,7 @@ export interface ICompilerApi {
     onCompilationFinished: (contractsDetails: any, contractMap: any) => void
     onSessionSwitched: () => void
     onContentChanged: () => void
-  
+
     fileExists: (file: string) => Promise<boolean>
     writeFile: (file: string, content: string) => Promise<void>
     readFile: (file: string) => Promise<string>
@@ -38,4 +38,4 @@ export interface ConfigurationSettings {
     language: string,
     optimize: boolean,
     runs: string
-}
\ No newline at end of file
+}
diff --git a/libs/remix-ui/solidity-compiler/src/index.ts b/libs/remix-ui/solidity-compiler/src/index.ts
index 30a13c42f4..317c79cefa 100644
--- a/libs/remix-ui/solidity-compiler/src/index.ts
+++ b/libs/remix-ui/solidity-compiler/src/index.ts
@@ -1,2 +1,2 @@
 export * from './lib/solidity-compiler'
-export * from './lib/logic'
\ No newline at end of file
+export * from './lib/logic'
diff --git a/libs/remix-ui/solidity-compiler/src/lib/actions/compiler.ts b/libs/remix-ui/solidity-compiler/src/lib/actions/compiler.ts
index 96316c8bd5..17f2886625 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/actions/compiler.ts
+++ b/libs/remix-ui/solidity-compiler/src/lib/actions/compiler.ts
@@ -42,7 +42,7 @@ export const listenToEvents = (compileTabLogic, api) => (dispatch: React.Dispatc
   api.onContentChanged = () => {
     dispatch(setEditorMode('contentChanged'))
   }
- 
+
   compileTabLogic.compiler.event.register('loadingCompiler', () => {
     dispatch(setCompilerMode('loadingCompiler'))
   })
diff --git a/libs/remix-ui/solidity-compiler/src/lib/types/index.ts b/libs/remix-ui/solidity-compiler/src/lib/types/index.ts
index fdb291b66d..ac1b4e60ac 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/types/index.ts
+++ b/libs/remix-ui/solidity-compiler/src/lib/types/index.ts
@@ -22,4 +22,4 @@ export interface ContractSelectionProps {
   } | Record<string, any>,
   modal: (title: string, message: string | JSX.Element, okLabel: string, okFn: () => void, cancelLabel?: string, cancelFn?: () => void) => void,
   contractsDetails: Record<string, any>
-}
\ No newline at end of file
+}

From 57407ab25f39ba980478b4f66d59f0bd88beb237 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Tue, 31 Aug 2021 12:26:46 +0200
Subject: [PATCH 11/30] fix remix-lib reference

---
 .../solidity-compiler/src/lib/logic/contract-parser.ts       | 4 ++--
 .../static-analyser/src/lib/remix-ui-static-analyser.tsx     | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/libs/remix-ui/solidity-compiler/src/lib/logic/contract-parser.ts b/libs/remix-ui/solidity-compiler/src/lib/logic/contract-parser.ts
index 3894b01a9d..2b6a23fa5a 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/logic/contract-parser.ts
+++ b/libs/remix-ui/solidity-compiler/src/lib/logic/contract-parser.ts
@@ -1,8 +1,8 @@
 'use strict'
 import * as solcTranslate from 'solc/translate'
-import * as remixLib from '@remix-project/remix-lib'
+import { execution } from '@remix-project/remix-lib'
 
-const txHelper = remixLib.execution.txHelper
+const txHelper = execution.txHelper
 
 export function parseContracts (contractName, contract, source) {
   const detail: Record<string, any> = {}
diff --git a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
index bd88dad856..88b7925b5c 100644
--- a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
+++ b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useState, useReducer } from 'react'
 import Button from './Button/StaticAnalyserButton' // eslint-disable-line
-import remixLib from '@remix-project/remix-lib'
+import { util } from '@remix-project/remix-lib'
 import _ from 'lodash'
 import { TreeView, TreeViewItem } from '@remix-ui/tree-view' // eslint-disable-line
 import { RemixUiCheckbox } from '@remix-ui/checkbox' // eslint-disable-line
@@ -9,7 +9,6 @@ import { compilation } from './actions/staticAnalysisActions'
 import { initialState, analysisReducer } from './reducers/staticAnalysisReducer'
 import { OverlayTrigger, Tooltip } from 'react-bootstrap'// eslint-disable-line
 const StaticAnalysisRunner = require('@remix-project/remix-analyzer').CodeAnalysis
-const utils = remixLib.util
 
 declare global {
   interface Window {
@@ -38,7 +37,7 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => {
     })
   }
 
-  const groupedModules = utils.groupBy(
+  const groupedModules = util.groupBy(
     preProcessModules(runner.modules()),
     'categoryId'
   )

From 63ee352ec42cc8b059eba3755a6460a8a2a6c22c Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Tue, 31 Aug 2021 12:51:52 +0200
Subject: [PATCH 12/30] fix registering 'contentChanged' event

---
 apps/solidity-compiler/src/app/compiler-api.ts | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/apps/solidity-compiler/src/app/compiler-api.ts b/apps/solidity-compiler/src/app/compiler-api.ts
index edc69528cd..aacd16cb2a 100644
--- a/apps/solidity-compiler/src/app/compiler-api.ts
+++ b/apps/solidity-compiler/src/app/compiler-api.ts
@@ -158,11 +158,11 @@ export const CompilerApiMixin = (Base) => class extends Base {
   }
 
   listenToEvents () {
-    this.data.eventHandlers.onContentChanged = () => {
+    this.on('editor', 'contentChanged', () => {
       this.emit('statusChanged', { key: 'edited', title: 'the content has changed, needs recompilation', type: 'info' })
-    }
-    this.on('editor', 'contentChanged', this.data.eventHandlers.onContentChanged)
-    
+      if (this.onContentChanged) this.onContentChanged()
+    })
+
     this.data.eventHandlers.onLoadingCompiler = () => {
       this.data.loading = true
       this.emit('statusChanged', { key: 'loading', title: 'loading compiler...', type: 'info' })
@@ -195,11 +195,7 @@ export const CompilerApiMixin = (Base) => class extends Base {
 
     this.on('editor', 'sessionSwitched', () => {
       if (this.onSessionSwitched) this.onSessionSwitched()
-    })
-
-    this.on('editor', 'contentChanged', () => {
-      if (this.onContentChanged) this.onContentChanged()
-    })
+    })    
 
     this.compileTabLogic.event.on('startingCompilation', this.data.eventHandlers.onStartingCompilation)
     this.compileTabLogic.event.on('removeAnnotations', this.data.eventHandlers.onRemoveAnnotations)

From c1bdf45d2782b5cc1e3cac722f6726157bc223bc Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Tue, 7 Sep 2021 14:45:54 +0200
Subject: [PATCH 13/30] refactor ICompilerAPI

---
 apps/remix-ide/src/app.js                     |  2 +-
 apps/remix-ide/src/app/files/fileManager.js   |  2 +-
 apps/remix-ide/src/app/tabs/compile-tab.js    | 39 ++++++++--
 apps/solidity-compiler/src/app/app.tsx        |  2 +-
 .../solidity-compiler/src/app/compiler-api.ts | 55 +++++++-------
 apps/solidity-compiler/src/app/compiler.ts    | 71 ++++++++-----------
 libs/remix-lib/src/types/ICompilerApi.ts      | 23 ++++--
 libs/remix-ui/renderer/src/lib/renderer.tsx   |  4 +-
 .../src/lib/actions/compiler.ts               |  4 +-
 .../src/lib/compiler-container.tsx            | 52 +++++++-------
 .../src/lib/logic/compileTabLogic.ts          | 27 +++----
 .../src/lib/solidity-compiler.tsx             | 26 +++----
 .../solidity-compiler/src/lib/types/index.ts  |  9 +--
 13 files changed, 166 insertions(+), 150 deletions(-)

diff --git a/apps/remix-ide/src/app.js b/apps/remix-ide/src/app.js
index 2668dff15c..c6020f4bae 100644
--- a/apps/remix-ide/src/app.js
+++ b/apps/remix-ide/src/app.js
@@ -425,7 +425,7 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
   }
 
   // CONTENT VIEWS & DEFAULT PLUGINS
-  const compileTab = new CompileTab()
+  const compileTab = new CompileTab(registry.get('config').api)
   const run = new RunTab(
     blockchain,
     registry.get('config').api,
diff --git a/apps/remix-ide/src/app/files/fileManager.js b/apps/remix-ide/src/app/files/fileManager.js
index a378c46cb6..99eeb03380 100644
--- a/apps/remix-ide/src/app/files/fileManager.js
+++ b/apps/remix-ide/src/app/files/fileManager.js
@@ -398,7 +398,7 @@ class FileManager extends Plugin {
   }
 
   fileChangedEvent (path) {
-    this.emit('currentFileChanged', path)
+    this.emit('fileChanged', path)
   }
 
   fileRenamedEvent (oldName, newName, isFolder) {
diff --git a/apps/remix-ide/src/app/tabs/compile-tab.js b/apps/remix-ide/src/app/tabs/compile-tab.js
index b1d4709cd0..159709c3cd 100644
--- a/apps/remix-ide/src/app/tabs/compile-tab.js
+++ b/apps/remix-ide/src/app/tabs/compile-tab.js
@@ -1,9 +1,11 @@
 /* global */
 import React from 'react' // eslint-disable-line
 import ReactDOM from 'react-dom'
-import { SolidityCompiler, CompileTab as CompileTabLogic, parseContracts } from '@remix-ui/solidity-compiler' // eslint-disable-line
+import { SolidityCompiler } from '@remix-ui/solidity-compiler' // eslint-disable-line
+import { CompileTabLogic } from '@remix-ui/solidity-compiler' // eslint-disable-line
 import { CompilerApiMixin } from '@remixproject/solidity-compiler-plugin'
 import { ViewPlugin } from '@remixproject/engine-web'
+import QueryParams from '../../lib/query-params'
 // import { ICompilerApi } from '@remix-project/remix-lib-ts'
 import * as packageJson from '../../../../../package.json'
 
@@ -30,14 +32,19 @@ const profile = {
 // - methods: ['getCompilationResult']
 
 class CompileTab extends CompilerApiMixin(ViewPlugin) { // implements ICompilerApi
-  constructor () {
+  constructor (config) {
     super(profile)
+    this.config = config
+    this.queryParams = new QueryParams()
+    this.compileTabLogic = new CompileTabLogic(this, this.contentImport)
+    this.compiler = this.compileTabLogic.compiler
+    this.compileTabLogic.init()
     this.initCompilerApi()
   }
 
   renderComponent () {
     ReactDOM.render(
-      <SolidityCompiler plugin={this}/>
+      <SolidityCompiler api={this}/>
       , this.el)
   }
 
@@ -49,10 +56,6 @@ class CompileTab extends CompilerApiMixin(ViewPlugin) { // implements ICompilerA
     this.renderComponent()
   }
 
-  setHardHatCompilation (value) {
-    this.hhCompilation = value
-  }
-
   setSelectedVersion (version) {
     this.selectedVersion = version
   }
@@ -121,6 +124,28 @@ class CompileTab extends CompilerApiMixin(ViewPlugin) { // implements ICompilerA
       pattern: []
     })
   }
+
+  getCompilerParameters () {
+    const params = this.queryParams.get()
+    params.optimize = (params.optimize === 'false' || params.optimize === null || params.optimize === undefined) ? false : params.optimize
+    params.optimize = params.optimize === 'true' ? true : params.optimize
+    return params
+  }
+
+  setCompilerParameters (params) {
+    this.queryParams.update(params)
+  }
+
+  getAppParameter (name) {
+    const param = this.config.get(name)
+    if (param === 'true') return true
+    if (param === 'false') return false
+    return param
+  }
+
+  setAppParameter (name, value) {
+    this.config.set(name, value)
+  }
 }
 
 module.exports = CompileTab
diff --git a/apps/solidity-compiler/src/app/app.tsx b/apps/solidity-compiler/src/app/app.tsx
index 3f3e32eb11..e5ace4d4c8 100644
--- a/apps/solidity-compiler/src/app/app.tsx
+++ b/apps/solidity-compiler/src/app/app.tsx
@@ -9,7 +9,7 @@ const remix = new CompilerClientApi()
 export const App = () => {  
   return (
     <div className="debugger">
-      <SolidityCompiler plugin={remix} />
+      <SolidityCompiler api={remix} />
     </div>
   );
 };
diff --git a/apps/solidity-compiler/src/app/compiler-api.ts b/apps/solidity-compiler/src/app/compiler-api.ts
index aacd16cb2a..c001df228e 100644
--- a/apps/solidity-compiler/src/app/compiler-api.ts
+++ b/apps/solidity-compiler/src/app/compiler-api.ts
@@ -1,7 +1,26 @@
 import { compile } from '@remix-project/remix-solidity'
-import { CompileTab as CompileTabLogic, parseContracts } from '@remix-ui/solidity-compiler' // eslint-disable-line
+import { CompileTabLogic, parseContracts } from '@remix-ui/solidity-compiler' // eslint-disable-line
+import { ConfigurationSettings } from '@remix-project/remix-lib-ts'
 
 export const CompilerApiMixin = (Base) => class extends Base {
+  currentFile: string
+  contractMap: {
+    file: string
+  } | Record<string, any>
+  compileErrors: any
+  compileTabLogic: CompileTabLogic
+  contractsDetails: Record<string, any>
+
+  configurationSettings: ConfigurationSettings
+
+  onCurrentFileChanged: (fileName: string) => void
+  onResetResults: () => void
+  onSetWorkspace: (workspace: any) => void
+  onNoFileSelected: () => void
+  onCompilationFinished: (contractsDetails: any, contractMap: any) => void
+  onSessionSwitched: () => void
+  onContentChanged: () => void
+
   initCompilerApi () {
     this.configurationSettings = null
 
@@ -16,9 +35,6 @@ export const CompilerApiMixin = (Base) => class extends Base {
       eventHandlers: {},
       loading: false
     }
-    this.compileTabLogic = new CompileTabLogic(this, this.contentImport)
-    this.compiler = this.compileTabLogic.compiler
-    this.compileTabLogic.init()
 
     this.contractMap = {}
     this.contractsDetails = {}
@@ -46,11 +62,7 @@ export const CompilerApiMixin = (Base) => class extends Base {
   logToTerminal (content) {
     return this.call('terminal', 'log', content)
   }
-
-  setHardHatCompilation (value) {
-    this.hhCompilation = value
-  }
-
+  
   setSelectedVersion (version) {
     this.selectedVersion = version
   }
@@ -102,7 +114,6 @@ export const CompilerApiMixin = (Base) => class extends Base {
     }
   }
 
-
   /**
    * set the compiler configuration
    * This function is used by remix-plugin compiler API.
@@ -110,25 +121,7 @@ export const CompilerApiMixin = (Base) => class extends Base {
    */
   setCompilerConfig (settings) {
     this.configurationSettings = settings    
-  }
-
-  getParameters () {
-    return {}
-  }
-
-  setParameters (params) {}
-
-  getConfiguration (name) {
-    const conf = {
-      'currentFile': () => this.currentFile,
-      'hideWarnings': () => false,
-      'autoCompile': () => false,
-      'includeNightlies': () => false
-    }
-    return conf[name]()
-  }
-
-  setConfiguration (name, value) {}
+  }  
 
   getFileManagerMode () {
     return 'browser'
@@ -154,7 +147,7 @@ export const CompilerApiMixin = (Base) => class extends Base {
     this.currentFile = ''
     this.contractsDetails = {}
     this.emit('statusChanged', { key: 'none' })
-    if (this.onResetResults()) this.onResetResults()
+    if (this.onResetResults) this.onResetResults()
   }
 
   listenToEvents () {
@@ -258,7 +251,7 @@ export const CompilerApiMixin = (Base) => class extends Base {
       // ctrl+s or command+s
       if ((e.metaKey || e.ctrlKey) && e.keyCode === 83) {
         e.preventDefault()
-        this.compileTabLogic.runCompiler(this.hhCompilation)
+        this.compileTabLogic.runCompiler(this.getAppParameter('hardhat-compilation'))
       }
     })
   }
diff --git a/apps/solidity-compiler/src/app/compiler.ts b/apps/solidity-compiler/src/app/compiler.ts
index 0d1cd1e620..924e358a30 100644
--- a/apps/solidity-compiler/src/app/compiler.ts
+++ b/apps/solidity-compiler/src/app/compiler.ts
@@ -16,53 +16,38 @@ const profile = {
   methods: ['getCompilationResult', 'compile', 'compileWithParameters', 'setCompilerConfig', 'compileFile' ,'getCompilerState']
 }
 
-export interface ConfigurationSettings {
-  version: string,
-  evmVersion: string,
-  language: string,
-  optimize: boolean,
-  runs: string
-}
 
 export class CompilerClientApi extends CompilerApiMixin(PluginClient) implements ICompilerApi  {
-  // interface matches libs/remix-ui/solidity-compiler/types/index.ts : ICompilerApi
-  currentFile: string
-  contractMap: {
-    file: string
-  } | Record<string, any>
-  compileErrors: any
-  compileTabLogic: any
-  contractsDetails: Record<string, any>
-  configurationSettings: ConfigurationSettings
-
-  setHardHatCompilation: (value: boolean) => void
-  getParameters: () => ConfigurationSettings
-  setParameters: (params: Partial<ConfigurationSettings>) => void
-  setCompilerConfig: (settings: ConfigurationSettings) => void
-  
-  getConfiguration: (value: string) => string
-  setConfiguration: (name: string, value: string) => void
-  getFileManagerMode: () => string
-  
-
-  getCompilationResult: () => any
-
-  onCurrentFileChanged: (fileName: string) => void
-  onResetResults: () => void
-  onSetWorkspace: (isLocalhost: boolean) => void
-  onNoFileSelected: () => void
-  onCompilationFinished: (contractsDetails: any, contractMap: any) => void
-  onSessionSwitched: () => void
-  onContentChanged: () => void
-
-  fileExists: (file: string) => Promise<boolean>
-  writeFile: (file: string, content: string) => Promise<void>
-  readFile: (file: string) => Promise<string>
-  open: (file: string) => void
-
   constructor () {
     super()
     createClient(this as any)
+    this.compileTabLogic = new CompileTabLogic(this, this.contentImport)
+    this.compiler = this.compileTabLogic.compiler
+    this.compileTabLogic.init()
     this.initCompilerApi()
-  }  
+  }
+
+  getCompilerParameters () {
+    return {
+      runs: '200',
+      optimize: false,
+      version: '0.8.7+commit.e28d00a7',
+      evmVersion: null, // default
+      language: 'Solidity'
+    }
+  }
+
+  setCompilerParameters (params) {}
+
+  getAppParameter (name) {
+    const conf = {
+      'currentFile': () => this.currentFile,
+      'hideWarnings': () => false,
+      'autoCompile': () => false,
+      'includeNightlies': () => false
+    }
+    return conf[name]()
+  }
+
+  setAppParameter (name, value) {}  
 }
diff --git a/libs/remix-lib/src/types/ICompilerApi.ts b/libs/remix-lib/src/types/ICompilerApi.ts
index 6e97840101..5f709c435e 100644
--- a/libs/remix-lib/src/types/ICompilerApi.ts
+++ b/libs/remix-lib/src/types/ICompilerApi.ts
@@ -8,11 +8,12 @@ export interface ICompilerApi {
     contractsDetails: Record<string, any>
     configurationSettings: ConfigurationSettings
 
-    setHardHatCompilation: (value: boolean) => void
-    getParameters: () => any
-    setParameters: (params) => void
-    getConfiguration: (value: string) => string
-    setConfiguration: (name: string, value: string) => void
+    getCompilerParameters: () => ConfigurationSettings
+    setCompilerParameters: (ConfigurationSettings?) => void
+
+    getAppParameter: (value: string) => string | boolean
+    setAppParameter: (name: string, value: string | boolean) => void
+
     getFileManagerMode: () => string
     setCompilerConfig: (settings: any) => void
 
@@ -26,11 +27,21 @@ export interface ICompilerApi {
     onSessionSwitched: () => void
     onContentChanged: () => void
 
+    resolveContentAndSave: (url: string) => Promise<string>
     fileExists: (file: string) => Promise<boolean>
     writeFile: (file: string, content: string) => Promise<void>
     readFile: (file: string) => Promise<string>
     open: (file: string) => void
-  }
+
+    logToTerminal: (log: terminalLog) => {}
+
+    compileWithHardhat: (configPath: string) => Promise<string>
+}
+
+export type terminalLog = {
+    type: 'info' | 'error' | 'warning'
+    value: string
+}
 
 export interface ConfigurationSettings {
     version: string,
diff --git a/libs/remix-ui/renderer/src/lib/renderer.tsx b/libs/remix-ui/renderer/src/lib/renderer.tsx
index 815a4c85ee..8850c1e5b1 100644
--- a/libs/remix-ui/renderer/src/lib/renderer.tsx
+++ b/libs/remix-ui/renderer/src/lib/renderer.tsx
@@ -69,7 +69,7 @@ export const Renderer = ({ message, opt = {}, plugin }: RendererProps) => {
   }
 
   const addAnnotation = (file, error) => {
-    if (file === plugin.getConfiguration('currentFile')) {
+    if (file === plugin.getAppParameter('currentFile')) {
       plugin.call('editor', 'addAnnotation', error, file)
     }
   }
@@ -87,7 +87,7 @@ export const Renderer = ({ message, opt = {}, plugin }: RendererProps) => {
   }
 
   const _errorClick = (errFile, errLine, errCol) => {
-    if (errFile !== plugin.getConfiguration('currentFile')) {
+    if (errFile !== plugin.getAppParameter('currentFile')) {
       // TODO: refactor with this._components.contextView.jumpTo
       const provider = plugin.fileProviderOf(errFile)
       if (provider) {
diff --git a/libs/remix-ui/solidity-compiler/src/lib/actions/compiler.ts b/libs/remix-ui/solidity-compiler/src/lib/actions/compiler.ts
index 17f2886625..17e58a0052 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/actions/compiler.ts
+++ b/libs/remix-ui/solidity-compiler/src/lib/actions/compiler.ts
@@ -1,5 +1,5 @@
 import React from 'react'
-
+import { CompileTabLogic } from '../logic/compileTabLogic'
 export const setEditorMode = (mode: string) => {
   return {
     type: 'SET_EDITOR_MODE',
@@ -26,7 +26,7 @@ export const resetCompilerMode = () => (dispatch: React.Dispatch<any>) => {
   })
 }
 
-export const listenToEvents = (compileTabLogic, api) => (dispatch: React.Dispatch<any>) => {
+export const listenToEvents = (compileTabLogic: CompileTabLogic, api) => (dispatch: React.Dispatch<any>) => {
   api.onSessionSwitched = () => {
     dispatch(setEditorMode('sessionSwitched'))
   }
diff --git a/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx b/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx
index b62525dc1f..09168923cd 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx
+++ b/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx
@@ -19,11 +19,11 @@ declare global {
 const _paq = window._paq = window._paq || [] //eslint-disable-line
 
 export const CompilerContainer = (props: CompilerContainerProps) => {
-  const { api, compileTabLogic, tooltip, modal, compiledFileName, updateCurrentVersion, configurationSettings  } = props // eslint-disable-line
+  const { api, compileTabLogic, tooltip, modal, compiledFileName, updateCurrentVersion, configurationSettings, isHardhatProject } = props // eslint-disable-line
   const [state, setState] = useState({
     hideWarnings: false,
     autoCompile: false,
-    optimise: false,
+    optimize: false,
     compileTimeout: null,
     timeout: 300,
     allversions: [],
@@ -57,7 +57,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
         _updateVersionSelector(selectedVersion)
       }
     })
-    const currentFileName = api.getConfiguration('currentFile')
+    const currentFileName = api.getAppParameter('currentFile') as string
 
     currentFile(currentFileName)
     listenToEvents(compileTabLogic, api)(dispatch)
@@ -66,19 +66,19 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
   useEffect(() => {
     if (compileTabLogic && compileTabLogic.compiler) {
       setState(prevState => {
-        const params = api.getParameters()
-        const optimize = params.optimize === 'false' ? false : params.optimize === 'true' ? true : null
-        const runs = params.runs
+        const params = api.getCompilerParameters()
+        const optimize = params.optimize
+        const runs = params.runs as string
         const evmVersion = params.evmVersion
         const autoCompile = params.autoCompile === 'false' ? false : params.autoCompile === 'true' ? true : null
 
         return {
           ...prevState,
-          hideWarnings: api.getConfiguration('hideWarnings') || false,
-          autoCompile: typeof autoCompile === 'boolean' ? autoCompile : api.getConfiguration('autoCompile') || false,
-          includeNightlies: api.getConfiguration('includeNightlies') || false,
-          optimize: (optimize !== null) && (optimize !== undefined) ? optimize : false,
-          runs: (runs !== null) && (runs !== 'null') && (runs !== undefined) && (runs !== 'undefined') ? runs : 200,
+          hideWarnings: api.getAppParameter('hideWarnings') as boolean || false,
+          autoCompile: api.getAppParameter('autoCompile') as boolean || false,
+          includeNightlies: api.getAppParameter('includeNightlies') as boolean || false,
+          optimize: optimize,
+          runs: runs,
           evmVersion: (evmVersion !== null) && (evmVersion !== 'null') && (evmVersion !== undefined) && (evmVersion !== 'undefined') ? evmVersion : 'default'
         }
       })
@@ -154,7 +154,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
 
       allVersions = [...allVersions, ...versions]
       selectedVersion = state.defaultVersion
-      if (api.getParameters().version) selectedVersion = api.getParameters().version
+      if (api.getCompilerParameters().version) selectedVersion = api.getCompilerParameters().version
       // Check if version is a URL and corresponding filename starts with 'soljson'
       if (selectedVersion.startsWith('https://')) {
         const urlArr = selectedVersion.split('/')
@@ -229,8 +229,8 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
     })
   }
 
-  const isSolFileSelected = (currentFile = '') => {
-    if (!currentFile) currentFile = api.getConfiguration('currentFile')
+  const isSolFileSelected = (currentFile: string = '') => {
+    if (!currentFile) currentFile = api.getAppParameter('currentFile') as string
     if (!currentFile) return false
     const extention = currentFile.substr(currentFile.length - 3, currentFile.length)
     return extention.toLowerCase() === 'sol' || extention.toLowerCase() === 'yul'
@@ -299,7 +299,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
   }
 
   const compile = () => {
-    const currentFile = api.getConfiguration('currentFile')
+    const currentFile = api.getAppParameter('currentFile') as string
 
     if (!isSolFileSelected()) return
 
@@ -323,7 +323,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
       })
     }
     updateCurrentVersion(selectedVersion)
-    api.setParameters({ version: selectedVersion })
+    api.setCompilerParameters({ version: selectedVersion })
     let url
 
     if (customUrl !== '') {
@@ -333,7 +333,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
       })
       updateCurrentVersion(selectedVersion)
       url = customUrl
-      api.setParameters({ version: selectedVersion })
+      api.setCompilerParameters({ version: selectedVersion })
     } else {
       if (helper.checkSpecialChars(selectedVersion)) {
         return console.log('loading ' + selectedVersion + ' not allowed, special chars not allowed.')
@@ -404,7 +404,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
   const handleAutoCompile = (e) => {
     const checked = e.target.checked
 
-    api.setConfiguration('autoCompile', checked)
+    api.setAppParameter('autoCompile', checked)
     checked && compile()
     setState(prevState => {
       return { ...prevState, autoCompile: checked }
@@ -414,7 +414,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
   const handleOptimizeChange = (value) => {
     const checked = !!value
 
-    api.setConfiguration('optimise', checked)
+    api.setAppParameter('optimize', checked)
     compileTabLogic.setOptimize(checked)
     if (compileTabLogic.optimize) {
       compileTabLogic.setRuns(parseInt(state.runs))
@@ -423,7 +423,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
     }
     state.autoCompile && compile()
     setState(prevState => {
-      return { ...prevState, optimise: checked }
+      return { ...prevState, optimize: checked }
     })
   }
 
@@ -440,7 +440,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
   const handleHideWarningsChange = (e) => {
     const checked = e.target.checked
 
-    api.setConfiguration('hideWarnings', checked)
+    api.setAppParameter('hideWarnings', checked)
     state.autoCompile && compile()
     setState(prevState => {
       return { ...prevState, hideWarnings: checked }
@@ -451,7 +451,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
     const checked = e.target.checked
 
     if (!checked) handleLoadVersion(state.defaultVersion)
-    api.setConfiguration('includeNightlies', checked)
+    api.setAppParameter('includeNightlies', checked)
     setState(prevState => {
       return { ...prevState, includeNightlies: checked }
     })
@@ -482,7 +482,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
     const checked = event.target.checked
 
     sethhCompilation(checked)
-    api.setHardHatCompilation(checked)
+    api.setAppParameter('hardhat-compilation', checked)
   }
 
   /*
@@ -553,7 +553,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
             </div>
             <div className="mt-2 remixui_compilerConfig custom-control custom-checkbox">
               <div className="justify-content-between align-items-center d-flex">
-                <input onChange={(e) => { handleOptimizeChange(e.target.checked) }} className="custom-control-input" id="optimize" type="checkbox" checked={state.optimise} />
+                <input onChange={(e) => { handleOptimizeChange(e.target.checked) }} className="custom-control-input" id="optimize" type="checkbox" checked={state.optimize} />
                 <label className="form-check-label custom-control-label" htmlFor="optimize">Enable optimization</label>
                 <input
                   min="1"
@@ -564,7 +564,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
                   type="number"
                   title="Estimated number of times each opcode of the deployed code will be executed across the life-time of the contract."
                   onChange={(e) => onChangeRuns(e.target.value)}
-                  disabled={!state.optimise}
+                  disabled={!state.optimize}
                 />
               </div>
             </div>
@@ -574,7 +574,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
             </div>
           </div>
           {
-            api.isHardHatProject &&
+            isHardhatProject &&
             <div className="mt-3 remixui_compilerConfig custom-control custom-checkbox">
               <input className="remixui_autocompile custom-control-input" onChange={updatehhCompilation} id="enableHardhat" type="checkbox" title="Enable Hardhat Compilation" checked={hhCompilation} />
               <label className="form-check-label custom-control-label" htmlFor="enableHardhat">Enable Hardhat Compilation</label>
diff --git a/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts b/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts
index ea0f5c5425..66caaf550f 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts
+++ b/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts
@@ -1,3 +1,5 @@
+import { ICompilerApi } from '@remix-project/remix-lib-ts'
+
 const Compiler = require('@remix-project/remix-solidity').Compiler
 const EventEmitter = require('events')
 
@@ -8,7 +10,7 @@ declare global {
 }
 const _paq = window._paq = window._paq || []  //eslint-disable-line
 
-export class CompileTab {
+export class CompileTabLogic {
   public compiler
   public optimize
   public runs
@@ -16,45 +18,44 @@ export class CompileTab {
   public compilerImport
   public event
 
-  constructor (public api, public contentImport) {
+  constructor (public api: ICompilerApi, public contentImport) {
     this.event = new EventEmitter()
     this.compiler = new Compiler((url, cb) => api.resolveContentAndSave(url).then((result) => cb(null, result)).catch((error) => cb(error.message)))
   }
 
   init () {
-    this.optimize = this.api.getParameters().optimize
-    this.optimize = this.optimize === 'true'
-    this.api.setParameters({ optimize: this.optimize })
+    this.optimize = this.api.getCompilerParameters().optimize
+    this.api.setCompilerParameters({ optimize: this.optimize })
     this.compiler.set('optimize', this.optimize)
 
-    this.runs = this.api.getParameters().runs
+    this.runs = this.api.getCompilerParameters().runs
     this.runs = this.runs && this.runs !== 'undefined' ? this.runs : 200
-    this.api.setParameters({ runs: this.runs })
+    this.api.setCompilerParameters({ runs: this.runs })
     this.compiler.set('runs', this.runs)
 
-    this.evmVersion = this.api.getParameters().evmVersion
+    this.evmVersion = this.api.getCompilerParameters().evmVersion
     if (this.evmVersion === 'undefined' || this.evmVersion === 'null' || !this.evmVersion) {
       this.evmVersion = null
     }
-    this.api.setParameters({ evmVersion: this.evmVersion })
+    this.api.setCompilerParameters({ evmVersion: this.evmVersion })
     this.compiler.set('evmVersion', this.evmVersion)
   }
 
   setOptimize (newOptimizeValue) {
     this.optimize = newOptimizeValue
-    this.api.setParameters({ optimize: this.optimize })
+    this.api.setCompilerParameters({ optimize: this.optimize })
     this.compiler.set('optimize', this.optimize)
   }
 
   setRuns (runs) {
     this.runs = runs
-    this.api.setParameters({ runs: this.runs })
+    this.api.setCompilerParameters({ runs: this.runs })
     this.compiler.set('runs', this.runs)
   }
 
   setEvmVersion (newEvmVersion) {
     this.evmVersion = newEvmVersion
-    this.api.setParameters({ evmVersion: this.evmVersion })
+    this.api.setCompilerParameters({ evmVersion: this.evmVersion })
     this.compiler.set('evmVersion', this.evmVersion)
   }
 
@@ -122,7 +123,7 @@ export class CompileTab {
       // TODO readd saving current file
       // this.api.saveCurrentFile()
       this.event.emit('removeAnnotations')
-      var currentFile = this.api.getConfiguration('currentFile')
+      var currentFile = this.api.getAppParameter('currentFile')
       return this.compileFile(currentFile)
     } catch (err) {
       console.error(err)
diff --git a/libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx b/libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx
index 792beb8829..3a1a59cad6 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx
+++ b/libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx
@@ -9,7 +9,7 @@ import { Renderer } from '@remix-ui/renderer' // eslint-disable-line
 import './css/style.css'
 
 export const SolidityCompiler = (props: SolidityCompilerProps) => {
-  const { plugin, plugin: { currentFile, compileTabLogic, contractsDetails, contractMap, compileErrors, configurationSettings } } = props
+  const { api, api: { currentFile, compileTabLogic, contractsDetails, contractMap, compileErrors, configurationSettings } } = props
   const [state, setState] = useState({
     isHardhatProject: false,
     currentFile,
@@ -32,32 +32,32 @@ export const SolidityCompiler = (props: SolidityCompilerProps) => {
   })
   const [currentVersion, setCurrentVersion] = useState('')
 
-  plugin.onCurrentFileChanged = (currentFile: string) => {
+  api.onCurrentFileChanged = (currentFile: string) => {
     setState(prevState => {
       return { ...prevState, currentFile }
     })
   }
 
-  plugin.onResetResults = () => {
+  api.onResetResults = () => {
     setState(prevState => {
       return { ...prevState, currentFile: '', contractsDetails: {}, contractMap: {} }
     })
   }
 
-  plugin.onSetWorkspace = async (isLocalhost: boolean) => {
+  api.onSetWorkspace = async (isLocalhost: boolean) => {
     const isHardhat = isLocalhost && await compileTabLogic.isHardhatProject()
     setState(prevState => {
       return { ...prevState, currentFile, isHardhatProject: isHardhat }
     })
   }
 
-  plugin.onNoFileSelected = () => {
+  api.onNoFileSelected = () => {
     setState(prevState => {
       return { ...prevState, currentFile: '' }
     })
   }
 
-  plugin.onCompilationFinished = (contractsDetails: any, contractMap: any) => {
+  api.onCompilationFinished = (contractsDetails: any, contractMap: any) => {
     setState(prevState => {
       return { ...prevState, contractsDetails, contractMap }
     })
@@ -71,7 +71,7 @@ export const SolidityCompiler = (props: SolidityCompilerProps) => {
 
   const updateCurrentVersion = (value) => {
     setCurrentVersion(value)
-    plugin.setParameters({ version: value })
+    api.setCompilerParameters({ version: value })
   }
 
   const modal = async (title: string, message: string | JSX.Element, okLabel: string, okFn: () => void, cancelLabel?: string, cancelFn?: () => void) => {
@@ -111,19 +111,19 @@ export const SolidityCompiler = (props: SolidityCompilerProps) => {
   return (
     <>
       <div id="compileTabView">
-        <CompilerContainer api={plugin} isHardhatProject={state.isHardhatProject} compileTabLogic={compileTabLogic} tooltip={toast} modal={modal} compiledFileName={currentFile} updateCurrentVersion={updateCurrentVersion} configurationSettings={configurationSettings} />
-        <ContractSelection api={plugin} contractMap={contractMap} contractsDetails={contractsDetails} modal={modal} />
+        <CompilerContainer api={api} isHardhatProject={state.isHardhatProject} compileTabLogic={compileTabLogic} tooltip={toast} modal={modal} compiledFileName={currentFile} updateCurrentVersion={updateCurrentVersion} configurationSettings={configurationSettings} />
+        <ContractSelection api={api} contractMap={contractMap} contractsDetails={contractsDetails} modal={modal} />
         <div className="remixui_errorBlobs p-4" data-id="compiledErrors">
           <span data-id={`compilationFinishedWith_${currentVersion}`}></span>
-          { compileErrors.error && <Renderer message={compileErrors.error.formattedMessage || compileErrors.error} plugin={plugin} opt={{ type: compileErrors.error.severity || 'error', errorType: compileErrors.error.type }} /> }
+          { compileErrors.error && <Renderer message={compileErrors.error.formattedMessage || compileErrors.error} plugin={api} opt={{ type: compileErrors.error.severity || 'error', errorType: compileErrors.error.type }} /> }
           { compileErrors.error && (compileErrors.error.mode === 'panic') && modal('Error', panicMessage(compileErrors.error.formattedMessage), 'Close', null) }
           { compileErrors.errors && compileErrors.errors.length && compileErrors.errors.map((err, index) => {
-            if (plugin.getConfiguration('hideWarnings')) {
+            if (api.getAppParameter('hideWarnings')) {
               if (err.severity !== 'warning') {
-                return <Renderer key={index} message={err.formattedMessage} plugin={plugin} opt={{ type: err.severity, errorType: err.type }} />
+                return <Renderer key={index} message={err.formattedMessage} plugin={api} opt={{ type: err.severity, errorType: err.type }} />
               }
             } else {
-              return <Renderer key={index} message={err.formattedMessage} plugin={plugin} opt={{ type: err.severity, errorType: err.type }} />
+              return <Renderer key={index} message={err.formattedMessage} plugin={api} opt={{ type: err.severity, errorType: err.type }} />
             }
           }) }
         </div>
diff --git a/libs/remix-ui/solidity-compiler/src/lib/types/index.ts b/libs/remix-ui/solidity-compiler/src/lib/types/index.ts
index ac1b4e60ac..4932b1456c 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/types/index.ts
+++ b/libs/remix-ui/solidity-compiler/src/lib/types/index.ts
@@ -1,13 +1,14 @@
 import { ICompilerApi, ConfigurationSettings } from '@remix-project/remix-lib-ts'
+import { CompileTabLogic } from '../logic/compileTabLogic'
 export type onCurrentFileChanged = (fileName: string) => void
 
 export interface SolidityCompilerProps {
-  plugin: ICompilerApi
+  api: ICompilerApi
 }
 
 export interface CompilerContainerProps {
-  api: any,
-  compileTabLogic: any,
+  api: ICompilerApi,
+  compileTabLogic: CompileTabLogic,
   isHardhatProject: boolean,
   tooltip: (message: string | JSX.Element) => void,
   modal: (title: string, message: string | JSX.Element, okLabel: string, okFn: () => void, cancelLabel?: string, cancelFn?: () => void) => void,
@@ -16,7 +17,7 @@ export interface CompilerContainerProps {
   configurationSettings: ConfigurationSettings
 }
 export interface ContractSelectionProps {
-  api: any,
+  api: ICompilerApi,
   contractMap: {
     file: string
   } | Record<string, any>,

From 0d53c00fc7a20a688fff42b6c00c6b59a3643c00 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Tue, 7 Sep 2021 15:59:52 +0200
Subject: [PATCH 14/30] fix compileWithParameters

---
 apps/remix-ide/src/app/tabs/compile-tab.js      |  4 ----
 apps/solidity-compiler/src/app/compiler-api.ts  | 17 +++++++----------
 .../src/compiler/compiler-utils.ts              |  3 ++-
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/apps/remix-ide/src/app/tabs/compile-tab.js b/apps/remix-ide/src/app/tabs/compile-tab.js
index 159709c3cd..4441993d34 100644
--- a/apps/remix-ide/src/app/tabs/compile-tab.js
+++ b/apps/remix-ide/src/app/tabs/compile-tab.js
@@ -56,10 +56,6 @@ class CompileTab extends CompilerApiMixin(ViewPlugin) { // implements ICompilerA
     this.renderComponent()
   }
 
-  setSelectedVersion (version) {
-    this.selectedVersion = version
-  }
-
   onSetWorkspace () {
     this.renderComponent()
   }
diff --git a/apps/solidity-compiler/src/app/compiler-api.ts b/apps/solidity-compiler/src/app/compiler-api.ts
index c001df228e..502ec33ac4 100644
--- a/apps/solidity-compiler/src/app/compiler-api.ts
+++ b/apps/solidity-compiler/src/app/compiler-api.ts
@@ -41,7 +41,6 @@ export const CompilerApiMixin = (Base) => class extends Base {
 
     this.compileErrors = {}
     this.compiledFileName = ''
-    this.selectedVersion = ''
     this.currentFile = ''
   }
 
@@ -63,10 +62,6 @@ export const CompilerApiMixin = (Base) => class extends Base {
     return this.call('terminal', 'log', content)
   }
   
-  setSelectedVersion (version) {
-    this.selectedVersion = version
-  }
-
   getCompilationResult () {
     return this.compileTabLogic.compiler.state.lastCompilationResult
   }
@@ -99,18 +94,20 @@ export const CompilerApiMixin = (Base) => class extends Base {
    * @param {object} settings {evmVersion, optimize, runs, version, language}
    */
   async compileWithParameters (compilationTargets, settings) {
-    settings.version = settings.version || this.selectedVersion
+    const compilerState = this.getCompilerState()
+    settings.version = settings.version || compilerState.currentVersion
     const res = await compile(compilationTargets, settings, (url, cb) => this.call('contentImport', 'resolveAndSave', url).then((result) => cb(null, result)).catch((error) => cb(error.message)))
     return res
   }
 
   // This function is used for passing the compiler configuration to 'remix-tests'
   getCurrentCompilerConfig () {
+    const compilerState = this.getCompilerState()
     return {
-      currentVersion: this.selectedVersion,
-      evmVersion: this.compileTabLogic.evmVersion,
-      optimize: this.compileTabLogic.optimize,
-      runs: this.compileTabLogic.runs
+      currentVersion: compilerState.currentVersion,
+      evmVersion: compilerState.evmVersion,
+      optimize: compilerState.optimize,
+      runs: compilerState.runs
     }
   }
 
diff --git a/libs/remix-solidity/src/compiler/compiler-utils.ts b/libs/remix-solidity/src/compiler/compiler-utils.ts
index 7e19ae7d8a..ef205c3ca8 100644
--- a/libs/remix-solidity/src/compiler/compiler-utils.ts
+++ b/libs/remix-solidity/src/compiler/compiler-utils.ts
@@ -12,7 +12,7 @@ export const pathToURL = {}
  * @param version is the version of compiler with or without 'soljson-v' prefix and .js postfix
  */
 export function urlFromVersion (version) {
-  let url
+  let url  
   if (version === 'builtin') {
     let location: string | Location = window.document.location
     let path = location.pathname
@@ -22,6 +22,7 @@ export function urlFromVersion (version) {
     if (!location.endsWith('/')) location += '/'
     url = `${location}soljson.js`
   } else {
+    version = version.replace('.Emscripten.clang', '')
     if (!version.startsWith('soljson-v')) version = 'soljson-v' + version
     if (!version.endsWith('.js')) version = version + '.js'
     url = `${pathToURL[version]}/${version}`

From b4d0b5eb2110f57e29c30aac814174a9b4c68faf Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Tue, 7 Sep 2021 16:23:09 +0200
Subject: [PATCH 15/30] remove use of fileProviderOf in compiler UI

---
 libs/remix-ui/renderer/src/lib/renderer.tsx | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/libs/remix-ui/renderer/src/lib/renderer.tsx b/libs/remix-ui/renderer/src/lib/renderer.tsx
index 8850c1e5b1..f61695abd5 100644
--- a/libs/remix-ui/renderer/src/lib/renderer.tsx
+++ b/libs/remix-ui/renderer/src/lib/renderer.tsx
@@ -86,17 +86,12 @@ export const Renderer = ({ message, opt = {}, plugin }: RendererProps) => {
     setClose(true)
   }
 
-  const _errorClick = (errFile, errLine, errCol) => {
+  const _errorClick = async (errFile, errLine, errCol) => {
     if (errFile !== plugin.getAppParameter('currentFile')) {
       // TODO: refactor with this._components.contextView.jumpTo
-      const provider = plugin.fileProviderOf(errFile)
-      if (provider) {
-        provider.exists(errFile).then(() => {
-          plugin.open(errFile)
-          plugin.call('editor', 'gotoLine', errLine, errCol)
-        }).catch(error => {
-          if (error) return console.log(error)
-        })
+      if (await plugin.fileExists(errFile)) {
+        plugin.open(errFile)
+        plugin.call('editor', 'gotoLine', errLine, errCol)
       }
     } else {
       plugin.call('editor', 'gotoLine', errLine, errCol)

From ae97092466fbc20f6487d2ed3501433dee59bf31 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Wed, 8 Sep 2021 10:50:21 +0200
Subject: [PATCH 16/30] fix references & wrong rebasing

---
 apps/solidity-compiler/src/app/compiler.ts                     | 1 +
 apps/solidity-compiler/tsconfig.json                           | 2 +-
 libs/remix-solidity/src/compiler/compiler-utils.ts             | 2 +-
 libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx | 1 -
 tsconfig.base.json                                             | 1 +
 5 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/solidity-compiler/src/app/compiler.ts b/apps/solidity-compiler/src/app/compiler.ts
index 924e358a30..dd111d9a70 100644
--- a/apps/solidity-compiler/src/app/compiler.ts
+++ b/apps/solidity-compiler/src/app/compiler.ts
@@ -2,6 +2,7 @@ import { PluginClient } from "@remixproject/plugin";
 import { createClient } from "@remixproject/plugin-webview";
 import { CompilerApiMixin } from './compiler-api'
 import { ICompilerApi } from '@remix-project/remix-lib-ts'
+import { CompileTabLogic } from '@remix-ui/solidity-compiler'
 
 const profile = {
   name: 'solidity',
diff --git a/apps/solidity-compiler/tsconfig.json b/apps/solidity-compiler/tsconfig.json
index 7c6fcde8f2..b2a6956c94 100644
--- a/apps/solidity-compiler/tsconfig.json
+++ b/apps/solidity-compiler/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "jsx": "react",
     "allowJs": true,
diff --git a/libs/remix-solidity/src/compiler/compiler-utils.ts b/libs/remix-solidity/src/compiler/compiler-utils.ts
index ef205c3ca8..0a90e69adf 100644
--- a/libs/remix-solidity/src/compiler/compiler-utils.ts
+++ b/libs/remix-solidity/src/compiler/compiler-utils.ts
@@ -12,7 +12,7 @@ export const pathToURL = {}
  * @param version is the version of compiler with or without 'soljson-v' prefix and .js postfix
  */
 export function urlFromVersion (version) {
-  let url  
+  let url
   if (version === 'builtin') {
     let location: string | Location = window.document.location
     let path = location.pathname
diff --git a/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx b/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx
index 09168923cd..72c997b39f 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx
+++ b/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx
@@ -70,7 +70,6 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
         const optimize = params.optimize
         const runs = params.runs as string
         const evmVersion = params.evmVersion
-        const autoCompile = params.autoCompile === 'false' ? false : params.autoCompile === 'true' ? true : null
 
         return {
           ...prevState,
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 541c18c889..73709ef68c 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -32,6 +32,7 @@
       "@remix-ui/utils": ["libs/remix-ui/utils/src/index.ts"],
       "@remix-ui/clipboard": ["libs/remix-ui/clipboard/src/index.ts"],
       "@remix-project/remix-solidity-ts": ["libs/remix-solidity/src/index.ts"],
+      "@remix-project/remix-lib-ts": ["libs/remix-lib/src/index.ts"],
       "@remix-ui/modal-dialog": ["libs/remix-ui/modal-dialog/src/index.ts"],
       "@remix-ui/toaster": ["libs/remix-ui/toaster/src/index.ts"],
       "@remix-ui/file-explorer": ["libs/remix-ui/file-explorer/src/index.ts"],

From 1c866004bc60c03c43fcb9955be850ee0d8535a8 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Wed, 8 Sep 2021 12:07:43 +0200
Subject: [PATCH 17/30] readd saveCurrentFile

---
 apps/remix-ide/src/app/files/fileManager.js                   | 2 +-
 apps/solidity-compiler/src/app/compiler-api.ts                | 4 ++++
 libs/remix-lib/src/types/ICompilerApi.ts                      | 1 +
 .../solidity-compiler/src/lib/logic/compileTabLogic.ts        | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/apps/remix-ide/src/app/files/fileManager.js b/apps/remix-ide/src/app/files/fileManager.js
index 99eeb03380..3d57afcab3 100644
--- a/apps/remix-ide/src/app/files/fileManager.js
+++ b/apps/remix-ide/src/app/files/fileManager.js
@@ -22,7 +22,7 @@ const profile = {
   icon: 'assets/img/fileManager.webp',
   permission: true,
   version: packageJson.version,
-  methods: ['file', 'exists', 'open', 'writeFile', 'readFile', 'copyFile', 'copyDir', 'rename', 'mkdir', 'readdir', 'remove', 'getCurrentFile', 'getFile', 'getFolder', 'setFile', 'switchFile', 'refresh', 'getProviderOf', 'getProviderByName', 'getPathFromUrl', 'getUrlFromPath'],
+  methods: ['file', 'exists', 'open', 'writeFile', 'readFile', 'copyFile', 'copyDir', 'rename', 'mkdir', 'readdir', 'remove', 'getCurrentFile', 'getFile', 'getFolder', 'setFile', 'switchFile', 'refresh', 'getProviderOf', 'getProviderByName', 'getPathFromUrl', 'getUrlFromPath', 'saveCurrentFile'],
   kind: 'file-system'
 }
 const errorMsg = {
diff --git a/apps/solidity-compiler/src/app/compiler-api.ts b/apps/solidity-compiler/src/app/compiler-api.ts
index 502ec33ac4..297a78b726 100644
--- a/apps/solidity-compiler/src/app/compiler-api.ts
+++ b/apps/solidity-compiler/src/app/compiler-api.ts
@@ -140,6 +140,10 @@ export const CompilerApiMixin = (Base) => class extends Base {
     return this.call('fileManager', 'open', fileName)
   }
 
+  saveCurrentFile () {
+    return this.call('fileManager', 'saveCurrentFile')
+  }
+
   resetResults () {
     this.currentFile = ''
     this.contractsDetails = {}
diff --git a/libs/remix-lib/src/types/ICompilerApi.ts b/libs/remix-lib/src/types/ICompilerApi.ts
index 5f709c435e..de765327ad 100644
--- a/libs/remix-lib/src/types/ICompilerApi.ts
+++ b/libs/remix-lib/src/types/ICompilerApi.ts
@@ -32,6 +32,7 @@ export interface ICompilerApi {
     writeFile: (file: string, content: string) => Promise<void>
     readFile: (file: string) => Promise<string>
     open: (file: string) => void
+    saveCurrentFile: () => void
 
     logToTerminal: (log: terminalLog) => {}
 
diff --git a/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts b/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts
index 66caaf550f..69861c12a1 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts
+++ b/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts
@@ -121,7 +121,7 @@ export class CompileTabLogic {
         }
       }
       // TODO readd saving current file
-      // this.api.saveCurrentFile()
+      this.api.saveCurrentFile()
       this.event.emit('removeAnnotations')
       var currentFile = this.api.getAppParameter('currentFile')
       return this.compileFile(currentFile)

From 3f9f4cd73be4cdc71b7b5bc7682b15e3a46220d1 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Wed, 8 Sep 2021 21:36:06 +0200
Subject: [PATCH 18/30] use currentFile

---
 .../solidity-compiler/src/lib/compiler-container.tsx        | 6 +++---
 .../solidity-compiler/src/lib/logic/compileTabLogic.ts      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx b/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx
index 72c997b39f..21d2d7d5cf 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx
+++ b/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx
@@ -57,7 +57,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
         _updateVersionSelector(selectedVersion)
       }
     })
-    const currentFileName = api.getAppParameter('currentFile') as string
+    const currentFileName = api.currentFile
 
     currentFile(currentFileName)
     listenToEvents(compileTabLogic, api)(dispatch)
@@ -229,7 +229,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
   }
 
   const isSolFileSelected = (currentFile: string = '') => {
-    if (!currentFile) currentFile = api.getAppParameter('currentFile') as string
+    if (!currentFile) currentFile = api.currentFile
     if (!currentFile) return false
     const extention = currentFile.substr(currentFile.length - 3, currentFile.length)
     return extention.toLowerCase() === 'sol' || extention.toLowerCase() === 'yul'
@@ -298,7 +298,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
   }
 
   const compile = () => {
-    const currentFile = api.getAppParameter('currentFile') as string
+    const currentFile = api.currentFile
 
     if (!isSolFileSelected()) return
 
diff --git a/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts b/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts
index 69861c12a1..7d036edf12 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts
+++ b/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts
@@ -123,7 +123,7 @@ export class CompileTabLogic {
       // TODO readd saving current file
       this.api.saveCurrentFile()
       this.event.emit('removeAnnotations')
-      var currentFile = this.api.getAppParameter('currentFile')
+      var currentFile = this.api.currentFile
       return this.compileFile(currentFile)
     } catch (err) {
       console.error(err)

From 160eb44bea6e7b01cd6ffba1e229c5753d82cc0f Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Wed, 8 Sep 2021 21:36:29 +0200
Subject: [PATCH 19/30] compiler iframe, load default parameters

---
 apps/solidity-compiler/src/app/compiler.ts | 53 ++++++++++++++++------
 1 file changed, 38 insertions(+), 15 deletions(-)

diff --git a/apps/solidity-compiler/src/app/compiler.ts b/apps/solidity-compiler/src/app/compiler.ts
index dd111d9a70..03d54f23f5 100644
--- a/apps/solidity-compiler/src/app/compiler.ts
+++ b/apps/solidity-compiler/src/app/compiler.ts
@@ -17,6 +17,25 @@ const profile = {
   methods: ['getCompilationResult', 'compile', 'compileWithParameters', 'setCompilerConfig', 'compileFile' ,'getCompilerState']
 }
 
+const defaultAppParameters = {
+  'hideWarnings': () => false,
+  'autoCompile': () => false,
+  'includeNightlies': () => false
+}
+
+const defaultCompilerParameters = {
+  runs: '200',
+  optimize: false,
+  version: 'soljson-v0.8.7+commit.e28d00a7',
+  evmVersion: null, // default
+  language: 'Solidity'
+}
+
+const getOptimize = () => {
+  let value = localStorage.getItem('optimize') || defaultCompilerParameters['optimize']
+  value = (value === 'false' || value === null || value === undefined) ? false : value
+  value = value === 'true' ? true : false
+}
 
 export class CompilerClientApi extends CompilerApiMixin(PluginClient) implements ICompilerApi  {
   constructor () {
@@ -29,26 +48,30 @@ export class CompilerClientApi extends CompilerApiMixin(PluginClient) implements
   }
 
   getCompilerParameters () {
-    return {
-      runs: '200',
-      optimize: false,
-      version: '0.8.7+commit.e28d00a7',
-      evmVersion: null, // default
-      language: 'Solidity'
+    const params = {
+      runs: localStorage.getItem('runs') || defaultCompilerParameters['runs'],
+      optimize: localStorage.getItem('optimize') === 'true' ? true : false,
+      version: localStorage.getItem('version') || defaultCompilerParameters['version'],
+      evmVersion: localStorage.getItem('evmVersion') || defaultCompilerParameters['evmVersion'], // default
+      language: localStorage.getItem('language') || defaultCompilerParameters['language']
     }
+    return params
   }
 
-  setCompilerParameters (params) {}
+  setCompilerParameters (params) {
+    for (const key in Object.keys(params)) {
+      localStorage.setItem(key, params[key])
+    }
+  }
 
   getAppParameter (name) {
-    const conf = {
-      'currentFile': () => this.currentFile,
-      'hideWarnings': () => false,
-      'autoCompile': () => false,
-      'includeNightlies': () => false
-    }
-    return conf[name]()
+    const param = localStorage.getItem(name) || defaultAppParameters[name]
+    if (param === 'true') return true
+    if (param === 'false') return false
+    return param
   }
 
-  setAppParameter (name, value) {}  
+  setAppParameter (name, value) {
+    localStorage.setItem(name, value)
+  }
 }

From d5aaf548bd788fa38fc1f66c27242c7545946228 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Wed, 8 Sep 2021 21:36:43 +0200
Subject: [PATCH 20/30] compiler iframe load assets

---
 apps/solidity-compiler/src/assets/img/ipfs.webp | Bin 0 -> 22016 bytes
 apps/solidity-compiler/src/assets/js/.gitignore |   4 ++++
 package.json                                    |   2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 apps/solidity-compiler/src/assets/img/ipfs.webp
 create mode 100644 apps/solidity-compiler/src/assets/js/.gitignore

diff --git a/apps/solidity-compiler/src/assets/img/ipfs.webp b/apps/solidity-compiler/src/assets/img/ipfs.webp
new file mode 100644
index 0000000000000000000000000000000000000000..9cdfa7380c503f4ccfed36563f44cef6c5f1b082
GIT binary patch
literal 22016
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

literal 0
HcmV?d00001

diff --git a/apps/solidity-compiler/src/assets/js/.gitignore b/apps/solidity-compiler/src/assets/js/.gitignore
new file mode 100644
index 0000000000..5e7d2734cf
--- /dev/null
+++ b/apps/solidity-compiler/src/assets/js/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
diff --git a/package.json b/package.json
index 2bcbcd0b49..5014ef5842 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
     "bumpVersion:libs": "gulp & gulp syncLibVersions;",
     "browsertest": "sleep 5 && npm run nightwatch_local",
     "csslint": "csslint --ignore=order-alphabetical --errors='errors,duplicate-properties,empty-rules' --exclude-list='apps/remix-ide/src/assets/css/font-awesome.min.css' apps/remix-ide/src/assets/css/",
-    "downloadsolc_assets": "wget --no-check-certificate https://binaries.soliditylang.org/wasm/soljson-v0.8.7+commit.e28d00a7.js -O ./apps/remix-ide/src/assets/js/soljson.js",
+    "downloadsolc_assets": "wget --no-check-certificate https://binaries.soliditylang.org/wasm/soljson-v0.8.7+commit.e28d00a7.js -O ./apps/remix-ide/src/assets/js/soljson.js && wget --no-check-certificate https://binaries.soliditylang.org/wasm/soljson-v0.8.7+commit.e28d00a7.js -O ./apps/solidity-compiler/src/assets/js/soljson.js",
     "make-mock-compiler": "node apps/remix-ide/ci/makeMockCompiler.js",
     "minify": "uglifyjs --in-source-map inline --source-map-inline -c warnings=false",
     "build:production": "NODE_ENV=production npx nx build remix-ide --with-deps --skip-nx-cache",

From c8018b66488545ae627c30c4305e8703bfd61bc2 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Thu, 9 Sep 2021 09:26:11 +0200
Subject: [PATCH 21/30] uneeded classname

---
 apps/solidity-compiler/src/app/app.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/solidity-compiler/src/app/app.tsx b/apps/solidity-compiler/src/app/app.tsx
index e5ace4d4c8..00ce99f3d7 100644
--- a/apps/solidity-compiler/src/app/app.tsx
+++ b/apps/solidity-compiler/src/app/app.tsx
@@ -8,7 +8,7 @@ const remix = new CompilerClientApi()
 
 export const App = () => {  
   return (
-    <div className="debugger">
+    <div>
       <SolidityCompiler api={remix} />
     </div>
   );

From b090cee19d6f0e1749b023180951ff15cb70db03 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Thu, 9 Sep 2021 09:26:33 +0200
Subject: [PATCH 22/30] fix linting & remove uneeded classname

---
 apps/remix-ide/src/app/tabs/styles/compile-tab-styles.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/apps/remix-ide/src/app/tabs/styles/compile-tab-styles.js b/apps/remix-ide/src/app/tabs/styles/compile-tab-styles.js
index 6ab95aed8c..35286b2f80 100644
--- a/apps/remix-ide/src/app/tabs/styles/compile-tab-styles.js
+++ b/apps/remix-ide/src/app/tabs/styles/compile-tab-styles.js
@@ -1,12 +1,9 @@
-var csjs = require('csjs-inject')
+const csjs = require('csjs-inject')
 
 const css = csjs`
   .compilerTabView {
     padding: 2%;
   }
-  .compiler {
-    margin-bottom: 1%;
-  }
 `
 
 module.exports = css

From 4040818c513c3b18028ba7ad6980ccb61cb23d1b Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Thu, 9 Sep 2021 09:51:53 +0200
Subject: [PATCH 23/30] fix unregistering events

---
 .../solidity-compiler/src/app/compiler-api.ts | 47 +++++++++++++++++--
 1 file changed, 43 insertions(+), 4 deletions(-)

diff --git a/apps/solidity-compiler/src/app/compiler-api.ts b/apps/solidity-compiler/src/app/compiler-api.ts
index 297a78b726..d0b30cec64 100644
--- a/apps/solidity-compiler/src/app/compiler-api.ts
+++ b/apps/solidity-compiler/src/app/compiler-api.ts
@@ -45,10 +45,48 @@ export const CompilerApiMixin = (Base) => class extends Base {
   }
 
   onActivation () {
-    this.listenToEvents()    
+    this.listenToEvents()
   }
 
-  onDeactivation () {}
+  onDeactivation () {
+    this.off('editor', 'contentChanged')
+
+    if (this.data.eventHandlers.onLoadingCompiler) {
+      this.compiler.event.unregister('loadingCompiler', this.data.eventHandlers.onLoadingCompiler)
+    }
+    
+    if (this.data.eventHandlers.onCompilerLoaded) {
+      this.compiler.event.unregister('compilerLoaded', this.data.eventHandlers.onCompilerLoaded)
+    }
+
+    if (this.data.eventHandlers.onCompilationFinished) {
+      this.compiler.event.unregister('compilationFinished', this.data.eventHandlers.onCompilationFinished)
+    }
+    
+    this.off('filePanel', 'setWorkspace')
+
+    this.off('remixd', 'rootFolderChanged')
+
+    this.off('editor', 'sessionSwitched')
+
+    if (this.data.eventHandlers.onStartingCompilation) {
+      this.compileTabLogic.event.off('startingCompilation', this.data.eventHandlers.onStartingCompilation)
+    }
+    
+    if (this.data.eventHandlers.onRemoveAnnotations) {
+      this.compileTabLogic.event.off('removeAnnotations', this.data.eventHandlers.onRemoveAnnotations)
+    }    
+
+    this.off('fileManager', 'currentFileChanged')
+    
+    this.off('fileManager', 'noFileSelected')    
+    
+    this.off('themeModule', 'themeChanged')
+    
+    if (this.data.eventHandlers.onKeyDown) {
+      window.document.removeEventListener('keydown', this.data.eventHandlers.onKeyDown)  
+    }
+  }
 
   resolveContentAndSave (url) {
     return this.call('contentImport', 'resolveAndSave', url)
@@ -248,12 +286,13 @@ export const CompilerApiMixin = (Base) => class extends Base {
     this.on('themeModule', 'themeChanged', this.data.eventHandlers.onThemeChanged)
     
     // Run the compiler instead of trying to save the website
-    window.document.addEventListener('keydown', (e) => {
+    this.data.eventHandlers.onKeyDown = (e) => {
       // ctrl+s or command+s
       if ((e.metaKey || e.ctrlKey) && e.keyCode === 83) {
         e.preventDefault()
         this.compileTabLogic.runCompiler(this.getAppParameter('hardhat-compilation'))
       }
-    })
+    }
+    window.document.addEventListener('keydown', this.data.eventHandlers.onKeyDown)
   }
 }

From 427b885cc64702f305aaf83e3e1156c8ba264fd2 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Thu, 9 Sep 2021 09:52:15 +0200
Subject: [PATCH 24/30] remove unused code

---
 apps/solidity-compiler/src/app/compiler.ts | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/apps/solidity-compiler/src/app/compiler.ts b/apps/solidity-compiler/src/app/compiler.ts
index 03d54f23f5..f003f33c76 100644
--- a/apps/solidity-compiler/src/app/compiler.ts
+++ b/apps/solidity-compiler/src/app/compiler.ts
@@ -31,12 +31,6 @@ const defaultCompilerParameters = {
   language: 'Solidity'
 }
 
-const getOptimize = () => {
-  let value = localStorage.getItem('optimize') || defaultCompilerParameters['optimize']
-  value = (value === 'false' || value === null || value === undefined) ? false : value
-  value = value === 'true' ? true : false
-}
-
 export class CompilerClientApi extends CompilerApiMixin(PluginClient) implements ICompilerApi  {
   constructor () {
     super()

From a938a02b475592478789ee345e343a74c5d70711 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Thu, 9 Sep 2021 09:53:21 +0200
Subject: [PATCH 25/30] fix fileManager mode

---
 apps/remix-ide/src/app.js                      | 2 +-
 apps/remix-ide/src/app/tabs/compile-tab.js     | 7 ++++++-
 apps/solidity-compiler/src/app/compiler-api.ts | 6 +-----
 apps/solidity-compiler/src/app/compiler.ts     | 4 ++++
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/apps/remix-ide/src/app.js b/apps/remix-ide/src/app.js
index c6020f4bae..03ecc61b55 100644
--- a/apps/remix-ide/src/app.js
+++ b/apps/remix-ide/src/app.js
@@ -425,7 +425,7 @@ Please make a backup of your contracts and start using http://remix.ethereum.org
   }
 
   // CONTENT VIEWS & DEFAULT PLUGINS
-  const compileTab = new CompileTab(registry.get('config').api)
+  const compileTab = new CompileTab(registry.get('config').api, registry.get('filemanager').api)
   const run = new RunTab(
     blockchain,
     registry.get('config').api,
diff --git a/apps/remix-ide/src/app/tabs/compile-tab.js b/apps/remix-ide/src/app/tabs/compile-tab.js
index 4441993d34..8066128218 100644
--- a/apps/remix-ide/src/app/tabs/compile-tab.js
+++ b/apps/remix-ide/src/app/tabs/compile-tab.js
@@ -32,8 +32,9 @@ const profile = {
 // - methods: ['getCompilationResult']
 
 class CompileTab extends CompilerApiMixin(ViewPlugin) { // implements ICompilerApi
-  constructor (config) {
+  constructor (config, fileManager) {
     super(profile)
+    this.fileManager
     this.config = config
     this.queryParams = new QueryParams()
     this.compileTabLogic = new CompileTabLogic(this, this.contentImport)
@@ -87,6 +88,10 @@ class CompileTab extends CompilerApiMixin(ViewPlugin) { // implements ICompilerA
     return super.getCompilationResult()
   }
 
+  getFileManagerMode () {
+    return this.fileManager.mode
+  }
+
   /**
    * set the compiler configuration
    * This function is used by remix-plugin compiler API.
diff --git a/apps/solidity-compiler/src/app/compiler-api.ts b/apps/solidity-compiler/src/app/compiler-api.ts
index d0b30cec64..9a96319e9a 100644
--- a/apps/solidity-compiler/src/app/compiler-api.ts
+++ b/apps/solidity-compiler/src/app/compiler-api.ts
@@ -1,6 +1,6 @@
 import { compile } from '@remix-project/remix-solidity'
 import { CompileTabLogic, parseContracts } from '@remix-ui/solidity-compiler' // eslint-disable-line
-import { ConfigurationSettings } from '@remix-project/remix-lib-ts'
+import type { ConfigurationSettings } from '@remix-project/remix-lib-ts'
 
 export const CompilerApiMixin = (Base) => class extends Base {
   currentFile: string
@@ -158,10 +158,6 @@ export const CompilerApiMixin = (Base) => class extends Base {
     this.configurationSettings = settings    
   }  
 
-  getFileManagerMode () {
-    return 'browser'
-  }
-
   fileExists (fileName) {
     return this.call('fileManager', 'exists', fileName)
   }
diff --git a/apps/solidity-compiler/src/app/compiler.ts b/apps/solidity-compiler/src/app/compiler.ts
index f003f33c76..1080bf6ff3 100644
--- a/apps/solidity-compiler/src/app/compiler.ts
+++ b/apps/solidity-compiler/src/app/compiler.ts
@@ -68,4 +68,8 @@ export class CompilerClientApi extends CompilerApiMixin(PluginClient) implements
   setAppParameter (name, value) {
     localStorage.setItem(name, value)
   }
+
+  getFileManagerMode () {
+    return 'browser'
+  }
 }

From df78375f4ee9da9340960870f5a413851d28e356 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Thu, 9 Sep 2021 09:54:19 +0200
Subject: [PATCH 26/30] change comment

---
 apps/solidity-compiler/src/app/compiler.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/solidity-compiler/src/app/compiler.ts b/apps/solidity-compiler/src/app/compiler.ts
index 1080bf6ff3..223b5e2bc7 100644
--- a/apps/solidity-compiler/src/app/compiler.ts
+++ b/apps/solidity-compiler/src/app/compiler.ts
@@ -27,7 +27,7 @@ const defaultCompilerParameters = {
   runs: '200',
   optimize: false,
   version: 'soljson-v0.8.7+commit.e28d00a7',
-  evmVersion: null, // default
+  evmVersion: null, // compiler default
   language: 'Solidity'
 }
 

From e56f0ca40a7b333eac370d33e357bd08dea24d8b Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Thu, 9 Sep 2021 10:02:10 +0200
Subject: [PATCH 27/30] fix assignments

---
 apps/remix-ide/src/app/tabs/compile-tab.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/remix-ide/src/app/tabs/compile-tab.js b/apps/remix-ide/src/app/tabs/compile-tab.js
index 8066128218..17f10a504b 100644
--- a/apps/remix-ide/src/app/tabs/compile-tab.js
+++ b/apps/remix-ide/src/app/tabs/compile-tab.js
@@ -34,7 +34,7 @@ const profile = {
 class CompileTab extends CompilerApiMixin(ViewPlugin) { // implements ICompilerApi
   constructor (config, fileManager) {
     super(profile)
-    this.fileManager
+    this.fileManager = fileManager
     this.config = config
     this.queryParams = new QueryParams()
     this.compileTabLogic = new CompileTabLogic(this, this.contentImport)

From 4dc1a4947dcc24e368ee8ece81a8f52faa50a551 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Thu, 9 Sep 2021 10:53:59 +0200
Subject: [PATCH 28/30] set default language

---
 libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx b/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx
index 21d2d7d5cf..f7390446eb 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx
+++ b/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx
@@ -30,11 +30,10 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
     customVersions: [],
     selectedVersion: null,
     defaultVersion: 'soljson-v0.8.7+commit.e28d00a7.js', // this default version is defined: in makeMockCompiler (for browser test)
-    selectedLanguage: '',
     runs: '',
     compiledFileName: '',
     includeNightlies: false,
-    language: '',
+    language: 'Solidity',
     evmVersion: ''
   })
   const [disableCompileButton, setDisableCompileButton] = useState<boolean>(false)

From f5479a2cc5fb16efd2ee9bd6d14b1207b6f1bc9e Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Thu, 9 Sep 2021 10:54:09 +0200
Subject: [PATCH 29/30] fix default parameters

---
 apps/solidity-compiler/src/app/compiler.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/solidity-compiler/src/app/compiler.ts b/apps/solidity-compiler/src/app/compiler.ts
index 223b5e2bc7..6f499103b9 100644
--- a/apps/solidity-compiler/src/app/compiler.ts
+++ b/apps/solidity-compiler/src/app/compiler.ts
@@ -18,9 +18,9 @@ const profile = {
 }
 
 const defaultAppParameters = {
-  'hideWarnings': () => false,
-  'autoCompile': () => false,
-  'includeNightlies': () => false
+  hideWarnings: false,
+  autoCompile: false,
+  includeNightlies: false
 }
 
 const defaultCompilerParameters = {

From 96dbfb9d8ba7e0d0d29f626186bbf2aaf12cc728 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Thu, 9 Sep 2021 11:24:23 +0200
Subject: [PATCH 30/30] fix saving compiler parameters

---
 apps/solidity-compiler/src/app/compiler.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/solidity-compiler/src/app/compiler.ts b/apps/solidity-compiler/src/app/compiler.ts
index 6f499103b9..5a6e8eafaa 100644
--- a/apps/solidity-compiler/src/app/compiler.ts
+++ b/apps/solidity-compiler/src/app/compiler.ts
@@ -53,7 +53,7 @@ export class CompilerClientApi extends CompilerApiMixin(PluginClient) implements
   }
 
   setCompilerParameters (params) {
-    for (const key in Object.keys(params)) {
+    for (const key of Object.keys(params)) {
       localStorage.setItem(key, params[key])
     }
   }