From cf7d86fa57a9578e84ee5b6a28449c5dc321ec54 Mon Sep 17 00:00:00 2001
From: ioedeveloper <daviddisu8@gmail.com>
Date: Fri, 10 Jul 2020 07:33:26 +0100
Subject: [PATCH] Use remix-solidity build for remix-ide

---
 libs/remix-solidity/src/compiler/compiler-worker.ts | 2 +-
 libs/remix-solidity/src/compiler/compiler.ts        | 2 +-
 tsconfig.json                                       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libs/remix-solidity/src/compiler/compiler-worker.ts b/libs/remix-solidity/src/compiler/compiler-worker.ts
index b3a04c5179..d8c95b3cbe 100644
--- a/libs/remix-solidity/src/compiler/compiler-worker.ts
+++ b/libs/remix-solidity/src/compiler/compiler-worker.ts
@@ -1,6 +1,6 @@
 'use strict'
 
-import solc from 'solc/wrapper'
+import * as solc from 'solc/wrapper'
 import { CompilerInput, MessageToWorker } from './types'
 let compileJSON: ((input: CompilerInput) => string) | null = (input) => { return '' }
 const missingInputs: string[] = []
diff --git a/libs/remix-solidity/src/compiler/compiler.ts b/libs/remix-solidity/src/compiler/compiler.ts
index f929e701de..54744c9f28 100644
--- a/libs/remix-solidity/src/compiler/compiler.ts
+++ b/libs/remix-solidity/src/compiler/compiler.ts
@@ -1,7 +1,7 @@
 'use strict'
 
 import { update } from 'solc/abi'
-import webworkify from 'webworkify-webpack'
+import * as webworkify from 'webworkify-webpack'
 import compilerInput from './compiler-input'
 import { EventManager } from '@remix-project/remix-lib'
 import { default as txHelper } from './txHelper';
diff --git a/tsconfig.json b/tsconfig.json
index 58b44b5c7a..654d950ed9 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -21,7 +21,7 @@
       "@remix-project/remix-debug": ["libs/remix-debug/index.js"],
       "@remix-project/remix-lib": ["libs/remix-lib/index.js"],
       "@remix-project/remix-simulator": ["libs/remix-simulator/index.js"],
-      "@remix-project/remix-solidity": ["libs/remix-solidity/src/index.ts"],
+      "@remix-project/remix-solidity": ["dist/libs/remix-solidity/index.js"],
       "@remix-project/remix-tests": ["libs/remix-tests/src/index.ts"],
       "@remix-project/remix-url-resolver": ["libs/remix-url-resolver/src/index.ts"]
     }