diff options
author | Fred Carlsen <fred@sjelfull.no> | 2018-12-20 06:59:07 +0800 |
---|---|---|
committer | Fred Carlsen <fred@sjelfull.no> | 2018-12-20 06:59:07 +0800 |
commit | 5eb316f5d832d0e7ffc8a3a3858350cc13af3dcf (patch) | |
tree | aed059ac8540233b7fbd20aa32bc3a0f21734182 /packages/sol-resolver/src/resolvers/npm_resolver.ts | |
parent | aa5c2c249d43c980c06d3a5541233f2407a83371 (diff) | |
parent | 125a940560a01305781bfb6754f52fa64669a6f3 (diff) | |
download | dexon-0x-contracts-5eb316f5d832d0e7ffc8a3a3858350cc13af3dcf.tar dexon-0x-contracts-5eb316f5d832d0e7ffc8a3a3858350cc13af3dcf.tar.gz dexon-0x-contracts-5eb316f5d832d0e7ffc8a3a3858350cc13af3dcf.tar.bz2 dexon-0x-contracts-5eb316f5d832d0e7ffc8a3a3858350cc13af3dcf.tar.lz dexon-0x-contracts-5eb316f5d832d0e7ffc8a3a3858350cc13af3dcf.tar.xz dexon-0x-contracts-5eb316f5d832d0e7ffc8a3a3858350cc13af3dcf.tar.zst dexon-0x-contracts-5eb316f5d832d0e7ffc8a3a3858350cc13af3dcf.zip |
Merge remote-tracking branch 'upstream/feature/website/0x-org' into feature/website/0x-org
# Conflicts:
# packages/website/ts/@next/components/button.tsx
# packages/website/ts/@next/components/definition.tsx
# packages/website/ts/@next/components/hero.tsx
# packages/website/ts/@next/components/sections/landing/about.tsx
# packages/website/ts/@next/pages/market_maker.tsx
Diffstat (limited to 'packages/sol-resolver/src/resolvers/npm_resolver.ts')
-rw-r--r-- | packages/sol-resolver/src/resolvers/npm_resolver.ts | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/packages/sol-resolver/src/resolvers/npm_resolver.ts b/packages/sol-resolver/src/resolvers/npm_resolver.ts index eeb2b5493..3c1d09557 100644 --- a/packages/sol-resolver/src/resolvers/npm_resolver.ts +++ b/packages/sol-resolver/src/resolvers/npm_resolver.ts @@ -32,10 +32,7 @@ export class NPMResolver extends Resolver { const lookupPath = path.join(currentPath, 'node_modules', packagePath, pathWithinPackage); if (fs.existsSync(lookupPath) && fs.lstatSync(lookupPath).isFile()) { const fileContent = fs.readFileSync(lookupPath).toString(); - return { - source: fileContent, - path: lookupPath, - }; + return { source: fileContent, path: importPath, absolutePath: lookupPath }; } currentPath = path.dirname(currentPath); } |