Skip to content
This repository has been archived by the owner on Jan 24, 2022. It is now read-only.

Store relative paths in project file #1384

Merged
merged 3 commits into from
Jan 20, 2020
Merged

Conversation

spalladino
Copy link
Contributor

@spalladino spalladino commented Jan 13, 2020

Fixes #1372

@spalladino spalladino changed the title WIP Store relative paths in project file Jan 13, 2020
Copy link
Contributor

@frangio frangio left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

I have one doubt.

@@ -84,7 +84,8 @@ export default class ProjectFile {
}

public get root(): string {
return path.dirname(this.filePath);
// We go to the parent of the containing directory (.openzeppelin) to get the root
return path.dirname(path.dirname(this.filePath));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this is correct as long as we support the old zos.json. Or is migration mandatory?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch! Just force pushed a fix. By the way, only after I pushed it I noted I shouldn't have amended, so you could see the new diff. Apologies for that! Still, being a small change, I hope you won't mind!

@spalladino spalladino force-pushed the fix/relative-project-paths-#1372 branch from 073ac1c to 0bb4650 Compare January 13, 2020 22:56
@spalladino spalladino added the status:to-review Awaiting review label Jan 14, 2020
Copy link
Contributor

@frangio frangio left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM except for the comment below. 👌

packages/cli/src/models/files/ProjectFile.ts Outdated Show resolved Hide resolved
@spalladino spalladino added status:ready-to-merge Order mergify to merge and removed status:to-review Awaiting review labels Jan 20, 2020
@mergify mergify bot merged commit dc8484e into master Jan 20, 2020
@mergify mergify bot deleted the fix/relative-project-paths-#1372 branch January 20, 2020 21:37
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
status:ready-to-merge Order mergify to merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Absolute path to artifacts and sources in project file
2 participants