From 034863b9e779803c801acfe915a06a459ef5b1c5 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Wed, 8 Sep 2021 10:50:21 +0200
Subject: [PATCH] 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"],