crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix an issue when we tried to append base contracts path to absolute imports (NPM) in sol-compiler

Browse Source
This commit is contained in:
Leonid Logvinov 2018-11-23 14:16:58 +01:00
parent 5b0746a8ef
commit eefb1cfe5d
No known key found for this signature in database
GPG Key ID: 0DD294BFDE8C95D4
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/sol-compiler/CHANGELOG.json
View File

@ -1,4 +1,13 @@
[ [
{
"version": "1.1.15",
"changes": [
{
"note": "Fix an issue when we tried to append base contracts path to absolute imports (NPM)",
"pr": 1311
}
]
},
{ {
"timestamp": 1543401373, "timestamp": 1543401373,
"version": "1.1.14", "version": "1.1.14",

9
packages/sol-compiler/src/compiler.ts
View File

@ -394,7 +394,14 @@ export class Compiler {
// //
const lastPathSeparatorPos = contractPath.lastIndexOf('/'); const lastPathSeparatorPos = contractPath.lastIndexOf('/');
const contractFolder = lastPathSeparatorPos === -1 ? '' : contractPath.slice(0, lastPathSeparatorPos + 1); 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 do the hack mentooned above only for relative imports.
*/
importPath = path.resolve('/' + contractFolder, importPath).replace('/', '');
}
if (_.isUndefined(sourcesToAppendTo[importPath])) { if (_.isUndefined(sourcesToAppendTo[importPath])) {
sourcesToAppendTo[importPath] = { id: fullSources[importPath].id }; sourcesToAppendTo[importPath] = { id: fullSources[importPath].id };