Skip to content

Commit c195d8c

Browse files
committed
find prettier
1 parent 693a2a9 commit c195d8c

File tree

4 files changed

+177
-180
lines changed

4 files changed

+177
-180
lines changed

.github/workflows/tests.yml

+2-5
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/setup-node@v3
1717
with:
1818
node-version: 16
19-
19+
2020
- uses: pnpm/action-setup@v2.0.1
2121
name: Install pnpm
2222
id: pnpm-install
@@ -37,9 +37,6 @@ jobs:
3737
restore-keys: |
3838
${{ runner.os }}-pnpm-store-
3939
40-
- name: Install dependencies
41-
run: pnpm install
42-
4340
- name: Install dev dependencies
4441
run: pnpm i
4542

@@ -55,7 +52,7 @@ jobs:
5552
run: pnpm sync
5653

5754
- name: Run tests
58-
run: pnpm tun test
55+
run: pnpm run test
5956

6057
- name: Run lint
6158
run: pnpm run solhint

.prettierrc

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
2-
"overrides": [
3-
{
4-
"files": "*.sol",
5-
"options": {
6-
"printWidth": 80,
7-
"tabWidth": 4,
8-
"useTabs": false,
9-
"singleQuote": false,
10-
"bracketSpacing": false,
11-
"explicitTypes": "always"
12-
}
2+
"overrides": [
3+
{
4+
"files": "*.sol",
5+
"options": {
6+
"printWidth": 80,
7+
"tabWidth": 4,
8+
"useTabs": false,
9+
"singleQuote": false,
10+
"bracketSpacing": false,
11+
"explicitTypes": "always"
1312
}
14-
]
15-
}
13+
}
14+
]
15+
}

package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "Keep",
2+
"name": "keep",
33
"version": "1.0.0",
44
"description": "Tokenized multisig wallet",
55
"main": "index.js",
@@ -8,9 +8,9 @@
88
"license": "MIT",
99
"private": false,
1010
"scripts": {
11-
"format": "prettier --write src/**.sol src/utils/**.sol test/**.sol",
12-
"format:list": "prettier --list-different 'src/**/*.sol'",
13-
"format:check": "prettier --check 'src/**/*.sol'",
11+
"format": "prettier --write src/**.sol src/utils/**.sol test/**.sol --plugin-search-dir=.",
12+
"format:list": "prettier --list-different 'src/**/*.sol' --plugin-search-dir=.",
13+
"format:check": "prettier --check 'src/**/*.sol' --plugin-search-dir=.",
1414
"solhint": "solhint --config ./.solhint.json 'src/**/*.sol' --fix --ignore-path .solhintignore",
1515
"solhint:check": "solhint --config ./.solhint.json 'src/**/*.sol'",
1616
"clean": "forge clean",
@@ -19,9 +19,9 @@
1919
"test": "forge clean && forge test --optimize --optimizer-runs 9999999 -vvv",
2020
"snapshot": "forge clean && forge snapshot --optimize --optimizer-runs 9999999"
2121
},
22-
"dependencies": {
22+
"devDependencies": {
2323
"prettier": "^2.7.1",
24-
"prettier-plugin-solidity": "^1.0.0-beta.19",
25-
"solhint": "^3.3.6"
24+
"prettier-plugin-solidity": "1.0.0-beta.24",
25+
"solhint": "^3.3.7"
2626
}
2727
}

0 commit comments

Comments
 (0)