diff options
| author | Alex Browne <stephenalexbrowne@gmail.com> | 2018-08-14 05:17:05 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-14 05:17:05 +0800 |
| commit | 25a8554be1550e00fba023fd56a3a6e181888e81 (patch) | |
| tree | ba2a4a40fdc0f59983e314dfce600c5e1006ae7d | |
| parent | cd76c129da0026527a03707e54d90a63325a9fea (diff) | |
| download | dexon-sol-tools-25a8554be1550e00fba023fd56a3a6e181888e81.tar dexon-sol-tools-25a8554be1550e00fba023fd56a3a6e181888e81.tar.gz dexon-sol-tools-25a8554be1550e00fba023fd56a3a6e181888e81.tar.bz2 dexon-sol-tools-25a8554be1550e00fba023fd56a3a6e181888e81.tar.lz dexon-sol-tools-25a8554be1550e00fba023fd56a3a6e181888e81.tar.xz dexon-sol-tools-25a8554be1550e00fba023fd56a3a6e181888e81.tar.zst dexon-sol-tools-25a8554be1550e00fba023fd56a3a6e181888e81.zip | |
fix(sol-compiler, sol-resolver): Bug where sol-resolver tried to read a directory (#961)
fix(sol-compiler, sol-resolver): Fix bug where sol-resolver tried to read a directory
| -rw-r--r-- | packages/sol-compiler/package.json | 1 | ||||
| -rw-r--r-- | packages/sol-compiler/src/cli.ts | 1 | ||||
| -rw-r--r-- | packages/sol-resolver/CHANGELOG.json | 4 | ||||
| -rw-r--r-- | packages/sol-resolver/src/resolvers/npm_resolver.ts | 2 |
4 files changed, 7 insertions, 1 deletions
diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json index fcf9775c1..7eaff360f 100644 --- a/packages/sol-compiler/package.json +++ b/packages/sol-compiler/package.json @@ -92,6 +92,7 @@ "require-from-string": "^2.0.1", "semver": "5.5.0", "solc": "^0.4.23", + "source-map-support": "^0.5.0", "web3-eth-abi": "^1.0.0-beta.24", "yargs": "^10.0.3" }, diff --git a/packages/sol-compiler/src/cli.ts b/packages/sol-compiler/src/cli.ts index 8901c0a31..83dadc7ca 100644 --- a/packages/sol-compiler/src/cli.ts +++ b/packages/sol-compiler/src/cli.ts @@ -3,6 +3,7 @@ import { logUtils } from '@0xproject/utils'; import * as _ from 'lodash'; +import 'source-map-support/register'; import * as yargs from 'yargs'; import { Compiler } from './compiler'; diff --git a/packages/sol-resolver/CHANGELOG.json b/packages/sol-resolver/CHANGELOG.json index abce53d09..dd9cb3f5d 100644 --- a/packages/sol-resolver/CHANGELOG.json +++ b/packages/sol-resolver/CHANGELOG.json @@ -5,6 +5,10 @@ { "note": "Fix a bug where RelativeFSResolver would crash when trying to read a directory", "pr": 909 + }, + { + "note": "Fix a bug where NpmResolver would crash when trying to read a directory", + "pr": 961 } ] }, diff --git a/packages/sol-resolver/src/resolvers/npm_resolver.ts b/packages/sol-resolver/src/resolvers/npm_resolver.ts index 9f8617145..a2df0dcad 100644 --- a/packages/sol-resolver/src/resolvers/npm_resolver.ts +++ b/packages/sol-resolver/src/resolvers/npm_resolver.ts @@ -19,7 +19,7 @@ export class NPMResolver extends Resolver { const ROOT_PATH = '/'; while (currentPath !== ROOT_PATH) { const lookupPath = path.join(currentPath, 'node_modules', packageName, pathWithinPackage); - if (fs.existsSync(lookupPath)) { + if (fs.existsSync(lookupPath) && fs.lstatSync(lookupPath).isFile()) { const fileContent = fs.readFileSync(lookupPath).toString(); return { source: fileContent, |