fix: lint-staged

jaybuidl · jaybuidl · commit 00ac5c3e6814 · 2025-03-25T15:55:48.000Z
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-yarn lint-staged
+yarn lint-staged -c .lintstagedrc.mjs
diff --git a/.lintstagedrc.json b/.lintstagedrc.json
diff --git a/.lintstagedrc.mjs b/.lintstagedrc.mjs
@@ -0,0 +1,23 @@
+const yarnContracts = "yarn workspace @kleros/cross-chain-realitio-contracts";
+const yarnEvidenceScript =
+  "yarn workspace @kleros/cross-chain-realitio-evidence-display";
+const yarnDynamicScript =
+  "yarn workspace @kleros/cross-chain-realitio-dynamic-script";
+
+const defaultExtensions =
+  "{js,ts,cjs,mjs,d.cts,d.mts,jsx,tsx,json,jsonc,md,html,css,yaml,yml}";
+
+const biomeCheckCommand = "biome check --write --no-errors-on-unmatched";
+
+export default {
+  [`contracts/**/*.${defaultExtensions}`]: (files) =>
+    `${yarnContracts} ${biomeCheckCommand} ${files.join(" ")}`,
+  [`contracts/**/*.sol`]: (files) => [
+    `${yarnContracts} prettier --write ${files.join(" ")}`,
+    `${yarnContracts} solhint --fix ${files.join(" ")}`,
+  ],
+  [`evidence-display/**/*.${defaultExtensions}`]: (files) =>
+    `${yarnEvidenceScript} ${biomeCheckCommand} ${files.join(" ")}`,
+  [`dynamic-script/**/*.${defaultExtensions}`]: (files) =>
+    `${yarnDynamicScript} ${biomeCheckCommand} ${files.join(" ")}`,
+};
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -5,7 +5,7 @@
   "editor.defaultFormatter": "biomejs.biome",
   "editor.formatOnSave": true,
   "editor.codeActionsOnSave": {
-    "source.organizeImports.biome": true,
-    "quickfix.biome": true
+    "source.organizeImports.biome": "always",
+    "quickfix.biome": "always"
   }
 }
diff --git a/biome/biome.base.json b/biome/biome.base.json
@@ -29,7 +29,7 @@
     "javascript": {
         "formatter": {
             "quoteStyle": "double",
-            "trailingComma": "es5",
+            "trailingCommas": "es5",
             "semicolons": "always"
         }
     }
diff --git a/contracts/.solhint.json b/contracts/.solhint.json
@@ -1,13 +1,9 @@
 {
   "extends": "solhint:recommended",
-  "plugins": [
-    "prettier"
-  ],
+  "plugins": ["prettier"],
   "rules": {
-    "compiler-version": [
-      "error",
-      "^0.7.0 || ^0.8.0"
-    ],
+    "compiler-version": ["error", "^0.7.0 || ^0.8.0"],
+    "custom-errors": "warn",
     "prettier/prettier": "error",
     "max-line-length": "off",
     "check-send-result": "off",
@@ -21,4 +17,4 @@
       }
     ]
   }
-}
+}
diff --git a/contracts/biome.json b/contracts/biome.json
@@ -1,16 +1,14 @@
 {
-    "extends": [
-        "../biome/biome.base.json"
-    ],
-    "files": {
-        "ignore": [
-            "src/**/*",
-            "test/**",
-            "typechain/**/*",
-            "node_modules/**",
-            "artifacts/**",
-            "cache/**",
-            "coverage/**"
-        ]
-    }
-}
+  "extends": ["../biome/biome.base.json"],
+  "files": {
+    "ignore": [
+      "src/**/*",
+      "test/**",
+      "typechain/**/*",
+      "node_modules/**",
+      "artifacts/**",
+      "cache/**",
+      "coverage/**"
+    ]
+  }
+}
diff --git a/contracts/package.json b/contracts/package.json
@@ -16,7 +16,7 @@
     "zksync:proof:production": "yarn hardhat-zksync run ./scripts/execute_proof.js --network zkSyncMainnet",
     "etherscan-verify": "hardhat etherscan-verify",
     "format:js": "biome format --write scripts deploy tasks",
-    "check:js": "biome check --apply scripts deploy tasks",
+    "check:js": "biome check --write scripts deploy tasks",
     "lint:js": "biome lint scripts deploy tasks",
     "lint:sol": "solhint 'src/**/*.sol'",
     "fix:sol": "prettier --write 'src/**/*.sol'",
@@ -70,7 +70,7 @@
     "deploy:polygon": "yarn deploy:polygon:home && yarn deploy:polygon:foreign"
   },
   "devDependencies": {
-    "@biomejs/biome": "1.6.1",
+    "@biomejs/biome": "1.9.4",
     "@matterlabs/hardhat-zksync-deploy": "^1.6.0",
     "@matterlabs/hardhat-zksync-solc": "^1.2.5",
     "@matterlabs/hardhat-zksync-verify": "^1.7.1",
@@ -94,7 +94,7 @@
     "hardhat-gas-reporter": "^2.2.2",
     "prettier": "^3.5.3",
     "prettier-plugin-solidity": "^1.4.2",
-    "solhint": "^5.0.5",
+    "solhint-community": "^4.0.1",
     "solhint-plugin-prettier": "^0.1.0",
     "solidity-coverage": "^0.8.14",
     "zksync-ethers": "^6.15.4"
@@ -108,4 +108,4 @@
     "@matterlabs/zksync-contracts": "^0.6.1",
     "dotenv": "^16.4.7"
   }
-}
+}
diff --git a/dynamic-script/package.json b/dynamic-script/package.json
@@ -19,29 +19,24 @@
   },
   "typesVersions": {
     "*": {
-      "lib": [
-        "./dist/lib.d.ts"
-      ]
+      "lib": ["./dist/lib.d.ts"]
     }
   },
-  "files": [
-    "dist",
-    "src"
-  ],
+  "files": ["dist", "src"],
   "scripts": {
     "clean": "rm -rf dist",
     "build:types": "tsc --emitDeclarationOnly --project tsconfig.json",
     "build": "yarn clean && vite build && yarn build:types",
     "format": "biome format --write ./src",
     "lint": "biome lint ./src",
-    "check": "biome check --apply ./src"
+    "check": "biome check --write ./src"
   },
   "dependencies": {
     "@reality.eth/reality-eth-lib": "^3.3.2",
     "viem": "^2.23.13"
   },
   "devDependencies": {
-    "@biomejs/biome": "1.6.1",
+    "@biomejs/biome": "1.9.4",
     "@types/node": "^20.11.24",
     "typescript": "^5.8.2",
     "vite": "^5.4.14"
diff --git a/evidence-display/package.json b/evidence-display/package.json
@@ -14,15 +14,15 @@
     "clean": "rm -rf dist evidence-display-v${npm_package_version}",
     "format": "biome format --write ./src",
     "lint": "biome lint ./src",
-    "check": "biome check --apply ./src"
+    "check": "biome check --write ./src"
   },
   "dependencies": {
     "@kleros/cross-chain-realitio-dynamic-script": "workspace:*",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@biomejs/biome": "1.6.1",
+    "@biomejs/biome": "1.9.4",
     "@tailwindcss/postcss7-compat": "^2.2.17",
     "@types/react": "^18.2.56",
     "@types/react-dom": "^18.2.19",
diff --git a/package.json b/package.json
@@ -18,7 +18,7 @@
     "evidence-display"
   ],
   "devDependencies": {
-    "husky": "^7.0.1",
-    "lint-staged": "^11.0.0"
+    "husky": "^9.1.7",
+    "lint-staged": "^15.5.0"
   }
 }
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`"editor.defaultFormatter": "biomejs.biome",`
`6`	`6`	`"editor.formatOnSave": true,`
`7`	`7`	`"editor.codeActionsOnSave": {`
`8`		`- "source.organizeImports.biome": true,`
`9`		`- "quickfix.biome": true`
	`8`	`+ "source.organizeImports.biome": "always",`
	`9`	`+ "quickfix.biome": "always"`
`10`	`10`	`}`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`"javascript": {`
`30`	`30`	`"formatter": {`
`31`	`31`	`"quoteStyle": "double",`
`32`		`- "trailingComma": "es5",`
	`32`	`+ "trailingCommas": "es5",`
`33`	`33`	`"semicolons": "always"`
`34`	`34`	`}`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,9 @@`
`1`	`1`	`{`
`2`	`2`	`"extends": "solhint:recommended",`
`3`		`- "plugins": [`
`4`		`- "prettier"`
`5`		`- ],`
	`3`	`+ "plugins": ["prettier"],`
`6`	`4`	`"rules": {`
`7`		`- "compiler-version": [`
`8`		`- "error",`
`9`		`- "^0.7.0 \|\| ^0.8.0"`
`10`		`- ],`
	`5`	`+ "compiler-version": ["error", "^0.7.0 \|\| ^0.8.0"],`
	`6`	`+ "custom-errors": "warn",`
`11`	`7`	`"prettier/prettier": "error",`
`12`	`8`	`"max-line-length": "off",`
`13`	`9`	`"check-send-result": "off",`
`@@ -21,4 +17,4 @@`
`21`	`17`	`}`
`22`	`18`	`]`
`23`	`19`	`}`
`24`		`-}`
	`20`	`+}`