From f24e08e6df53186e7a5a6700c4becc05bc45acd8 Mon Sep 17 00:00:00 2001
From: aniket-engg <aniketengg.225@gmail.com>
Date: Wed, 15 Jul 2020 15:05:49 +0530
Subject: [PATCH] bin files included in build & minor fix

---
 libs/remix-solidity/src/compiler/compiler.ts |  2 +-
 libs/remix-tests/bin/remix-tests             |  2 +-
 libs/remix-tests/src/compiler.ts             |  2 +-
 workspace.json                               | 15 ++++++++++++---
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/libs/remix-solidity/src/compiler/compiler.ts b/libs/remix-solidity/src/compiler/compiler.ts
index 54744c9f28..e20a3e40ff 100644
--- a/libs/remix-solidity/src/compiler/compiler.ts
+++ b/libs/remix-solidity/src/compiler/compiler.ts
@@ -16,7 +16,7 @@ export class Compiler {
   event
   state: CompilerState
 
-  constructor (public handleImportCall: (fileurl: string, cb) => void) {
+  constructor (public handleImportCall?: (fileurl: string, cb) => void) {
     this.event = new EventManager()
     this.state = {
       compileJSON: null,
diff --git a/libs/remix-tests/bin/remix-tests b/libs/remix-tests/bin/remix-tests
index ea2e0358b5..3c14572035 100755
--- a/libs/remix-tests/bin/remix-tests
+++ b/libs/remix-tests/bin/remix-tests
@@ -1,4 +1,4 @@
 #!/usr/bin/env node
 
-require('../dist/run.js');
+require('../src/run.js');
 
diff --git a/libs/remix-tests/src/compiler.ts b/libs/remix-tests/src/compiler.ts
index 9fc5270fb8..c14ba4080b 100644
--- a/libs/remix-tests/src/compiler.ts
+++ b/libs/remix-tests/src/compiler.ts
@@ -1,7 +1,7 @@
 import fs from './fileSystem'
 import async from 'async'
 import path from 'path'
-const RemixCompiler = require('@remix-project/remix-solidity').Compiler
+import { Compiler as RemixCompiler } from '@remix-project/remix-solidity'
 import { SrcIfc, CompilerConfiguration, CompilationErrors } from './types'
 
 function regexIndexOf (inputString: string, regex: RegExp, startpos = 0) {
diff --git a/workspace.json b/workspace.json
index 70d13d1dec..6f98dc3c79 100644
--- a/workspace.json
+++ b/workspace.json
@@ -200,7 +200,10 @@
             "tsConfig": "libs/remix-debug/tsconfig.lib.json",
             "packageJson": "libs/remix-debug/package.json",
             "main": "libs/remix-debug/index.js",
-            "assets": ["libs/remix-debug/*.md"]
+            "assets": [
+              { "glob": "rdb", "input": "libs/remix-debug/bin/", "output": "bin/" },
+              { "glob": "*.md", "input": "libs/remix-debug/", "output": "/" }
+            ]
           }
         }
       }
@@ -278,7 +281,10 @@
             "tsConfig": "libs/remix-simulator/tsconfig.lib.json",
             "packageJson": "libs/remix-simulator/package.json",
             "main": "libs/remix-simulator/index.js",
-            "assets": ["libs/remix-simulator/*.md"]
+            "assets": [
+              { "glob": "ethsim", "input": "libs/remix-simulator/bin/", "output": "bin/" },
+              { "glob": "*.md", "input": "libs/remix-simulator/", "output": "/" }
+            ]
           }
         }
       }
@@ -358,7 +364,10 @@
             "tsConfig": "libs/remix-tests/tsconfig.lib.json",
             "packageJson": "libs/remix-tests/package.json",
             "main": "libs/remix-tests/src/index.ts",
-            "assets": ["libs/remix-tests/*.md"]
+            "assets": [
+              { "glob": "remix-tests", "input": "libs/remix-tests/bin/", "output": "bin/" },
+              { "glob": "*.md", "input": "libs/remix-tests/", "output": "/" }
+            ]
           }
         }
       }