From f3acfc5e1aad25b9facb7eea6951cbbd201e9888 Mon Sep 17 00:00:00 2001
From: Evgeniy Filatov <evgeniyfilatov@gmail.com>
Date: Thu, 29 Nov 2018 18:46:00 +0200
Subject: [PATCH] removed binary configuration from package.json, fixed
 combineSource function

---
 remix-resolve/package.json         | 3 ---
 remix-resolve/src/combineSource.js | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/remix-resolve/package.json b/remix-resolve/package.json
index 1e2a6544b..ac73279a3 100644
--- a/remix-resolve/package.json
+++ b/remix-resolve/package.json
@@ -3,9 +3,6 @@
   "version": "0.0.1",
   "description": "Solidity import resolver engine",
   "main": "./src/index.js",
-  "bin": {
-    "remix-resolve": "./bin/remix-resolve"
-  },
   "scripts": {
     "build": "tsc",
     "lint": "standard",
diff --git a/remix-resolve/src/combineSource.js b/remix-resolve/src/combineSource.js
index b8b451cb4..b63657fcc 100644
--- a/remix-resolve/src/combineSource.js
+++ b/remix-resolve/src/combineSource.js
@@ -30,7 +30,7 @@ const combineSource = async function (rootpath, sources) {
           // sources[fileName].content = sources[fileName].content.replace(importLine, 'import' + extra + ' \'' + response.filename + '\';')
           const regex = /(\.+\/)/g
           subSorce[fn.replace(regex, '')] = { content: response.content }
-          sources = Object.assign(await combineSource(response.rootpath, subSorce), sources)
+          sources = Object.assign(await combineSource(response.fileRoot, subSorce), sources)
         }
       } catch (e) {
         throw e