Use OpenZeppelin fork of resolver engine (#1066)

* Use OpenZeppelin fork of resolver engine Adds fix to handle Windows-like paths. Fixes #1049 * Use platform independent path separator
OpenZeppelin · Jul 2, 2019 · ed9ecab · ed9ecab
1 parent 4a3739b
commit ed9ecab
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 27 deletions.
diff --git a/packages/cli/package-lock.json b/packages/cli/package-lock.json
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -34,8 +34,8 @@
   },
   "homepage": "https://github.com/zeppelinos/zos/tree/master/packages/cli#readme",
   "dependencies": {
-    "@resolver-engine/core": "^0.3.0",
-    "@resolver-engine/imports-fs": "^0.3.2",
+    "@openzeppelin/resolver-engine-core": "^0.3.3",
+    "@openzeppelin/resolver-engine-imports-fs": "^0.3.3",
     "@types/fs-extra": "^7.0.0",
     "@types/npm": "^2.0.29",
     "@types/semver": "^5.5.0",

diff --git a/packages/cli/src/models/compiler/solidity/ResolverEngineGatherer.ts b/packages/cli/src/models/compiler/solidity/ResolverEngineGatherer.ts
@@ -1,4 +1,4 @@
-import { ResolverEngine } from '@resolver-engine/core';
+import { ResolverEngine } from '@openzeppelin/resolver-engine-core';
 import pathSys from 'path';
 import urlSys from 'url';
 import { getImports } from '../../../utils/solidity';
@@ -100,7 +100,7 @@ export async function gatherSources(
   const alreadyImported = new Set();
 
   if (workingDir !== '') {
-    workingDir += '/';
+    workingDir += pathSys.sep;
   }
 
   const absoluteRoots = roots.map(what => resolvePath(workingDir, what));

diff --git a/packages/cli/src/models/compiler/solidity/SolidityContractsCompiler.ts b/packages/cli/src/models/compiler/solidity/SolidityContractsCompiler.ts
@@ -1,3 +1,4 @@
+import path from 'path';
 import flatMap from 'lodash.flatmap';
 import { Loggy } from 'zos-lib';
 import solc, {
@@ -195,7 +196,7 @@ class SolidityContractsCompiler {
   ): CompiledContract {
     const output = solcOutput.contracts[fileName][contractName];
     const source = solcOutput.sources[fileName];
-    fileName = fileName.substring(fileName.lastIndexOf('/') + 1);
+    fileName = path.basename(fileName);
     const contract = this.contracts.find(
       aContract => aContract.fileName === fileName,
     );

diff --git a/packages/cli/src/models/compiler/solidity/SolidityProjectCompiler.ts b/packages/cli/src/models/compiler/solidity/SolidityProjectCompiler.ts
@@ -16,7 +16,7 @@ import {
   DEFAULT_OPTIMIZER,
   DEFAULT_EVM_VERSION,
 } from './SolidityContractsCompiler';
-import { ImportsFsEngine } from '@resolver-engine/imports-fs';
+import { ImportsFsEngine } from '@openzeppelin/resolver-engine-imports-fs';
 import { gatherSources } from './ResolverEngineGatherer';
 import { SolcBuild } from './CompilerProvider';
 import {