Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/format contracts prettier plugin solidity #840

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"lint-staged": "^13.0.3",
"nodemon": "^2.0.19",
"prettier": "2.8.8",
"prettier-plugin-solidity": "1.1.3",
"prettier-plugin-solidity": "^1.2.0",
"rimraf": "3.0.2",
"yarn-audit-fix": "^9.3.7"
},
Expand All @@ -34,7 +34,7 @@
"dev:dapp": "yarn workspace @ubiquity/dapp run start",
"test:all": "yarn workspace @ubiquity/contracts run test:unit",
"coverage": "yarn workspace @ubiquity/contracts run test:coverage",
"format:all": "prettier packages/ --write",
"format:all": "yarn workspaces foreach run format",
"clean:all": "yarn workspaces foreach run clean && rimraf node_modules",
"lint:all": "yarn workspaces foreach run lint",
"build:ci:netlify": "yarn build:all",
Expand All @@ -52,7 +52,7 @@
"cspell --no-must-find-files"
],
"*.sol": [
"prettier --write",
"prettier --plugin=prettier-plugin-solidity --write",
"cspell --no-must-find-files"
]
},
Expand Down
4 changes: 3 additions & 1 deletion packages/contracts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"clean:forge": "forge clean",
"build": "forge build",
"forge:install": "forge install",
"format": "prettier --plugin=prettier-plugin-solidity src/**/*.sol test/**/*.sol --write",
"docs": "FOUNDRY_PROFILE=docs forge doc --build",
"_hardhat-task": "tsx ./scripts/task/task.ts"
},
Expand Down Expand Up @@ -67,7 +68,8 @@
"@types/react-transition-group": "^4",
"cspell": "latest",
"glob": "^10.3.0",
"prettier-plugin-solidity": "^1.1.2",
"prettier": "^3.1.0",
"prettier-plugin-solidity": "^1.2.0",
"typescript": "^4.9.4"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,4 @@ import "./IERC20Ubiquity.sol";
/**
* @notice Ubiquity Governance token interface
*/
interface IUbiquityGovernanceToken is IERC20Ubiquity {

}
interface IUbiquityGovernanceToken is IERC20Ubiquity {}
47 changes: 34 additions & 13 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2899,12 +2899,12 @@ __metadata:
languageName: node
linkType: hard

"@solidity-parser/parser@npm:^0.16.0":
version: 0.16.0
resolution: "@solidity-parser/parser@npm:0.16.0"
"@solidity-parser/parser@npm:^0.16.2":
version: 0.16.2
resolution: "@solidity-parser/parser@npm:0.16.2"
dependencies:
antlr4ts: ^0.5.0-alpha.4
checksum: 6ccbdab334331a58fde2a739cff76d5a99d836186b7899e8e027266f2af2a4bddc77c9c2abd01307cea6c470345d48edc470049e9672143b73f4aff3c8976183
checksum: 109f7bec5de943c63e444fdde179d9bba6a592c18c836f585753798f428424cfcca72c715e7a345e4b79b83d6548543c9e56cb4b263e9b1e8352af2efcfd224a
languageName: node
linkType: hard

Expand Down Expand Up @@ -3757,7 +3757,8 @@ __metadata:
dotenv: ^16.0.3
ethers: ^6.6.0
glob: ^10.3.0
prettier-plugin-solidity: ^1.1.2
prettier: ^3.1.0
prettier-plugin-solidity: ^1.2.0
react-transition-group: ^4.4.5
tsx: ^3.12.2
typescript: ^4.9.4
Expand Down Expand Up @@ -3829,7 +3830,7 @@ __metadata:
lint-staged: ^13.0.3
nodemon: ^2.0.19
prettier: 2.8.8
prettier-plugin-solidity: 1.1.3
prettier-plugin-solidity: ^1.2.0
rimraf: 3.0.2
yarn-audit-fix: ^9.3.7
languageName: unknown
Expand Down Expand Up @@ -12154,16 +12155,16 @@ __metadata:
languageName: node
linkType: hard

"prettier-plugin-solidity@npm:1.1.3, prettier-plugin-solidity@npm:^1.1.2":
version: 1.1.3
resolution: "prettier-plugin-solidity@npm:1.1.3"
"prettier-plugin-solidity@npm:^1.2.0":
version: 1.2.0
resolution: "prettier-plugin-solidity@npm:1.2.0"
dependencies:
"@solidity-parser/parser": ^0.16.0
semver: ^7.3.8
"@solidity-parser/parser": ^0.16.2
semver: ^7.5.4
solidity-comments-extractor: ^0.0.7
peerDependencies:
prettier: ">=2.3.0 || >=3.0.0-alpha.0"
checksum: d5aadfa411a4d983a2bd204048726fd91fbcaffbfa26d818ef0d6001fb65f82d0eae082e935e96c79e65e09ed979b186311ddb8c38be2f0ce5dd5f5265df77fe
prettier: ">=2.3.0"
checksum: 96dc9751a7393dfbfb1fcc08d662fd8e69df9ddf51ad70172e6915e86a61491f93f3051ea716deb50ae6023f50b64aa064ffef81224405fba92566124250edb2
languageName: node
linkType: hard

Expand Down Expand Up @@ -12194,6 +12195,15 @@ __metadata:
languageName: node
linkType: hard

"prettier@npm:^3.1.0":
version: 3.1.0
resolution: "prettier@npm:3.1.0"
bin:
prettier: bin/prettier.cjs
checksum: 44b556bd56f74d7410974fbb2418bb4e53a894d3e7b42f6f87779f69f27a6c272fa7fc27cec0118cd11730ef3246478052e002cbd87e9a253f9cd04a56aa7d9b
languageName: node
linkType: hard

"process-nextick-args@npm:~2.0.0":
version: 2.0.1
resolution: "process-nextick-args@npm:2.0.1"
Expand Down Expand Up @@ -13217,6 +13227,17 @@ __metadata:
languageName: node
linkType: hard

"semver@npm:^7.5.4":
version: 7.5.4
resolution: "semver@npm:7.5.4"
dependencies:
lru-cache: ^6.0.0
bin:
semver: bin/semver.js
checksum: 12d8ad952fa353b0995bf180cdac205a4068b759a140e5d3c608317098b3575ac2f1e09182206bf2eb26120e1c0ed8fb92c48c592f6099680de56bb071423ca3
languageName: node
linkType: hard

"semver@npm:~7.0.0":
version: 7.0.0
resolution: "semver@npm:7.0.0"
Expand Down
Loading