Merge branch 'development' of https://github.com/0xProject/0x-monorepo into feature/website/instant-configurator

1 files changed, 8 insertions, 1 deletions

diff --git a/packages/sol-compiler/src/compiler.ts b/packages/sol-compiler/src/compiler.ts
index 8ee7fa4a9..cba67f292 100644
--- a/packages/sol-compiler/src/compiler.ts
+++ b/packages/sol-compiler/src/compiler.ts
@@ -394,7 +394,14 @@ export class Compiler {
             //
             const lastPathSeparatorPos = contractPath.lastIndexOf('/');
             const contractFolder = lastPathSeparatorPos === -1 ? '' : contractPath.slice(0, lastPathSeparatorPos + 1);
-            importPath = path.resolve('/' + contractFolder, importPath).replace('/', '');
+            if (importPath.startsWith('.')) {
+                /**
+                 * Some imports path are relative ("../Token.sol", "./Wallet.sol")
+                 * while others are absolute ("Token.sol", "@0x/contracts/Wallet.sol")
+                 * And we need to append the base path for relative imports.
+                 */
+                importPath = path.resolve('/' + contractFolder, importPath).replace('/', '');
+            }
 
             if (_.isUndefined(sourcesToAppendTo[importPath])) {
                 sourcesToAppendTo[importPath] = { id: fullSources[importPath].id };