diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f080b0ce..ede043fb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,5 +17,4 @@ jobs: - run: | pnpm install pnpm run fmt:global-check - # -i is to ignore packages that are expected to have multiple versions across the workspace - npx sherif@0.9.0 -i @openzeppelin/contracts + pnpm run lint:monorepo diff --git a/package.json b/package.json index 333ec605..c3eee63f 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,8 @@ ], "scripts": { "fmt:global": "prettier --write .", - "fmt:global-check": "prettier --check ." + "fmt:global-check": "prettier --check .", + "lint:monorepo": "sherif -i @openzeppelin/contracts -i @safe-global/safe-contracts" }, "repository": { "type": "git", @@ -41,6 +42,7 @@ "eslint-plugin-react-refresh": "^0.4.7", "prettier": "^3.3.0", "prettier-plugin-solidity": "^1.3.1", - "rimraf": "^5.0.7" + "rimraf": "^5.0.7", + "sherif": "0.9.0" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 402047f9..64f2e73d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -44,6 +44,9 @@ importers: rimraf: specifier: ^5.0.7 version: 5.0.7 + sherif: + specifier: 0.9.0 + version: 0.9.0 examples/4337-gas-metering: dependencies: @@ -4392,6 +4395,40 @@ packages: engines: {node: '>=4'} hasBin: true + sherif-darwin-arm64@0.9.0: + resolution: {integrity: sha512-nP+tn4PzEiVwXgA4t5ZenAIqoZIzJt28DOaR9QI5tKHEOzosgf/RglYtFEU0O+xjbexrE9BOwdlvJ8vKloZ3Mg==} + cpu: [arm64] + os: [darwin] + + sherif-darwin-x64@0.9.0: + resolution: {integrity: sha512-n2PpWLwUJbJaq5lW8Jyll0RCWCNezsP3idAijFHMawUgThUNNMCSzFdLFWbT0ZuResgyDBu2vspMPEtJgwSvvg==} + cpu: [x64] + os: [darwin] + + sherif-linux-arm64@0.9.0: + resolution: {integrity: sha512-S5NPMfWfYIN0JoQfJxDrXZZteRXHv9/r84RsOLZckoLvzTGc33VITg0Gqk2Yrm7j0cBRaFj6EyPxkasJ4iB4SQ==} + cpu: [arm64] + os: [linux] + + sherif-linux-x64@0.9.0: + resolution: {integrity: sha512-4RGatcQFcrK/IW6ZgdGyhjlVA/mS90ZCiNcXewwIzPVafTfyx56QzpWFANtZoUr7fg6o1xUZQ6QqXWk5k/x+pA==} + cpu: [x64] + os: [linux] + + sherif-windows-arm64@0.9.0: + resolution: {integrity: sha512-/Gf4RLkcG/g+kjYR9JYn9338uGt/nbaIs9IWvNGmCODKEf4Xy87rFDr8ZYERArLpSmx+kgLZhi3UvGExy8oCPQ==} + cpu: [arm64] + os: [win32] + + sherif-windows-x64@0.9.0: + resolution: {integrity: sha512-hJpCq/t1IUWu58LktbEsiBdGThtj/gvc9iqjHjSCGdzH8Oz/ALVfqTYibBX0akpnGiVOJd7JFHLv1WuUX6GjpA==} + cpu: [x64] + os: [win32] + + sherif@0.9.0: + resolution: {integrity: sha512-n81vLJac110M1IN4rCl956PVIMGejucg+vZHKfOznU4vSwutc1FxmgQzrVV/bmN9uXdx4Khkl7/nhz82x+SESA==} + hasBin: true + side-channel@1.0.6: resolution: {integrity: sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==} engines: {node: '>= 0.4'} @@ -10017,6 +10054,33 @@ snapshots: interpret: 1.4.0 rechoir: 0.6.2 + sherif-darwin-arm64@0.9.0: + optional: true + + sherif-darwin-x64@0.9.0: + optional: true + + sherif-linux-arm64@0.9.0: + optional: true + + sherif-linux-x64@0.9.0: + optional: true + + sherif-windows-arm64@0.9.0: + optional: true + + sherif-windows-x64@0.9.0: + optional: true + + sherif@0.9.0: + optionalDependencies: + sherif-darwin-arm64: 0.9.0 + sherif-darwin-x64: 0.9.0 + sherif-linux-arm64: 0.9.0 + sherif-linux-x64: 0.9.0 + sherif-windows-arm64: 0.9.0 + sherif-windows-x64: 0.9.0 + side-channel@1.0.6: dependencies: call-bind: 1.0.7