Skip to content

Commit 88c1537

Browse files
Harman-singh-waraichHarman-singh-waraich
authored
Merge pull request #1757 from kleros/chore/eslint-and-more-version-bump
Chore/eslint and more version bump
2 parents 5fcf106 + fda1f81 commit 88c1537

File tree

20 files changed

+2773
-2535
lines changed

20 files changed

+2773
-2535
lines changed

‎bot-pinner/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@
1919
"node": ">=16.13.0"
2020
},
2121
"devDependencies": {
22-
"@dappnode/dappnodesdk": "^0.3.11"
22+
"@dappnode/dappnodesdk": "^0.3.35"
2323
}
2424
}

‎contracts/package.json

+14-11
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"build:types": "tsc --project tsconfig.json --module esnext --declarationDir ./dist/types --emitDeclarationOnly --declaration --declarationMap"
6161
},
6262
"devDependencies": {
63-
"@defi-wonderland/natspec-smells": "^1.0.3",
63+
"@defi-wonderland/natspec-smells": "^1.1.5",
6464
"@kleros/kleros-v2-eslint-config": "workspace:^",
6565
"@kleros/kleros-v2-prettier-config": "workspace:^",
6666
"@kleros/kleros-v2-tsconfig": "workspace:^",
@@ -71,18 +71,19 @@
7171
"@openzeppelin/contracts": "^5.1.0",
7272
"@typechain/ethers-v6": "^0.5.1",
7373
"@typechain/hardhat": "^9.1.0",
74-
"@types/chai": "^4.3.11",
75-
"@types/mocha": "^10.0.6",
76-
"@types/node": "^20.17.1",
77-
"@wagmi/cli": "^2.1.16",
74+
"@types/chai": "^4.3.20",
75+
"@types/mocha": "^10.0.10",
76+
"@types/node": "^20.17.6",
77+
"@wagmi/cli": "^2.1.18",
7878
"abitype": "^0.10.3",
79-
"chai": "^4.4.1",
80-
"dotenv": "^16.3.1",
79+
"chai": "^4.5.0",
80+
"dotenv": "^16.4.5",
81+
"eslint": "^9.15.0",
8182
"ethereumjs-util": "^7.1.5",
8283
"ethers": "^6.13.4",
8384
"graphql": "^16.9.0",
84-
"graphql-request": "^6.1.0",
85-
"hardhat": "2.22.15",
85+
"graphql-request": "^7.1.2",
86+
"hardhat": "2.22.16",
8687
"hardhat-contract-sizer": "^2.10.0",
8788
"hardhat-deploy": "^0.14.0",
8889
"hardhat-deploy-ethers": "^0.4.2",
@@ -94,15 +95,17 @@
9495
"node-fetch": "^3.3.2",
9596
"pino": "^8.21.0",
9697
"pino-pretty": "^10.3.1",
98+
"prettier": "^3.3.3",
99+
"prettier-plugin-solidity": "^1.4.1",
97100
"shelljs": "^0.8.5",
98101
"solhint-plugin-prettier": "^0.1.0",
99102
"solidity-coverage": "^0.8.13",
100103
"ts-node": "^10.9.2",
101104
"typechain": "^8.3.2",
102-
"typescript": "^5.3.3"
105+
"typescript": "^5.6.3"
103106
},
104107
"dependencies": {
105108
"@kleros/vea-contracts": "^0.4.0",
106-
"viem": "^2.21.35"
109+
"viem": "^2.21.48"
107110
}
108111
}

‎eslint-config/package.json

+12-11
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,26 @@
55
"main": ".eslintrc.js",
66
"license": "MIT",
77
"dependencies": {
8-
"@typescript-eslint/eslint-plugin": "^8.8.1",
9-
"@typescript-eslint/parser": "^8.8.1",
10-
"@typescript-eslint/utils": "^8.8.1",
8+
"@typescript-eslint/eslint-plugin": "^8.15.0",
9+
"@typescript-eslint/parser": "^8.15.0",
10+
"@typescript-eslint/utils": "^8.15.0",
11+
"eslint": "^9.15.0",
1112
"eslint-config-prettier": "^9.1.0",
12-
"eslint-config-standard": "^17.1.0",
1313
"eslint-plugin-import": "^2.31.0",
1414
"eslint-plugin-node": "^11.1.0",
1515
"eslint-plugin-prettier": "^5.2.1",
16-
"eslint-plugin-promise": "^6.0.0",
16+
"eslint-plugin-promise": "^6.6.0",
1717
"eslint-plugin-security": "^3.0.1",
18-
"eslint-utils": "^3.0.0"
18+
"eslint-utils": "^3.0.0",
19+
"prettier": "^3.3.3"
1920
},
2021
"devDependencies": {
21-
"@eslint/eslintrc": "^3.1.0",
22-
"@eslint/js": "^9.12.0",
23-
"globals": "^15.11.0",
24-
"typescript": "^5.3.3"
22+
"@eslint/eslintrc": "^3.2.0",
23+
"@eslint/js": "^9.15.0",
24+
"globals": "^15.12.0",
25+
"typescript": "^5.6.3"
2526
},
2627
"peerDependencies": {
27-
"eslint": "8.x"
28+
"eslint": "^8.0.0 || ^9.0.0"
2829
}
2930
}

‎kleros-app/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@
3333
],
3434
"prettier": "@kleros/kleros-v2-prettier-config",
3535
"devDependencies": {
36-
"@eslint/compat": "^1.2.2",
37-
"@eslint/eslintrc": "^3.1.0",
38-
"@eslint/js": "^9.14.0",
36+
"@eslint/compat": "^1.2.3",
37+
"@eslint/eslintrc": "^3.2.0",
38+
"@eslint/js": "^9.15.0",
3939
"@kleros/kleros-v2-eslint-config": "workspace:^",
4040
"@kleros/kleros-v2-prettier-config": "workspace:^",
4141
"@types/react": "^18.3.12",
4242
"@types/react-dom": "^18.3.1",
4343
"@typescript-eslint/eslint-plugin": "^8.15.0",
4444
"@typescript-eslint/parser": "^8.15.0",
45-
"eslint": "^9.14.0",
45+
"eslint": "^9.15.0",
4646
"eslint-config-prettier": "^9.1.0",
4747
"eslint-plugin-import": "^2.31.0",
4848
"globals": "^15.12.0",

‎kleros-sdk/package.json

+7-6
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,19 @@
3636
},
3737
"devDependencies": {
3838
"@types/mustache": "^4.2.5",
39-
"@vitest/ui": "^1.1.3",
40-
"mocha": "^10.2.0",
39+
"@types/node": "^20.17.6",
40+
"@vitest/ui": "^1.6.0",
41+
"mocha": "^10.8.2",
4142
"rimraf": "^6.0.1",
4243
"ts-node": "^10.9.2",
43-
"typescript": "^5.3.3",
44-
"vitest": "^1.1.3"
44+
"typescript": "^5.6.3",
45+
"vitest": "^1.6.0"
4546
},
4647
"dependencies": {
4748
"@reality.eth/reality-eth-lib": "^3.2.44",
4849
"@urql/core": "^5.0.8",
4950
"mustache": "^4.2.0",
50-
"viem": "^2.21.35",
51-
"zod": "^3.22.4"
51+
"viem": "^2.21.48",
52+
"zod": "^3.23.8"
5253
}
5354
}

‎package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@
3636
"devDependencies": {
3737
"@commitlint/cli": "^17.8.1",
3838
"@commitlint/config-conventional": "^17.8.1",
39-
"assert": "^2.0.0",
39+
"assert": "^2.1.0",
4040
"buffer": "^5.7.1",
4141
"conventional-changelog-cli": "^2.2.2",
42-
"crypto-browserify": "^3.12.0",
42+
"crypto-browserify": "^3.12.1",
4343
"husky": "^8.0.3",
4444
"lint-staged": "^13.3.0",
4545
"os-browserify": "^0.3.0",
46-
"path-browserify": "^1.0.0",
46+
"path-browserify": "^1.0.1",
4747
"process": "^0.11.10",
4848
"string_decoder": "^1.3.0"
4949
},

‎prettier-config/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
"main": "index.js",
55
"license": "MIT",
66
"dependencies": {
7-
"eslint": "^8.57.1",
7+
"eslint": "^9.15.0",
88
"prettier": "^3.3.3",
9-
"prettier-plugin-solidity": "^1.3.1"
9+
"prettier-plugin-solidity": "^1.4.1"
1010
},
1111
"scripts": {
1212
"lint:w": "eslint --fix '**/*.{gql,graphql,js,jsx,ts,tsx,json,md}'",

‎subgraph/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@
7878
"@graphprotocol/graph-cli": "0.64.1",
7979
"@kleros/kleros-v2-eslint-config": "workspace:^",
8080
"@kleros/kleros-v2-prettier-config": "workspace:^",
81+
"eslint": "^9.15.0",
8182
"gluegun": "^5.2.0",
8283
"matchstick-as": "0.6.0"
8384
},

‎tsconfig/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"devDependencies": {
1010
"@kleros/kleros-v2-eslint-config": "*",
1111
"@tsconfig/node18": "^18.2.4",
12-
"@tsconfig/node20": "^20.1.4"
12+
"@tsconfig/node20": "^20.1.4",
13+
"eslint": "^9.15.0"
1314
}
1415
}

‎web-devtools/eslint.config.mjs

-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ export default [
3030
"plugin:react-hooks/recommended",
3131
"plugin:import/recommended",
3232
"plugin:import/react",
33-
"plugin:security/recommended",
3433
"plugin:@typescript-eslint/recommended",
3534
"plugin:prettier/recommended",
3635
"prettier"
@@ -41,7 +40,6 @@ export default [
4140
react: fixupPluginRules(react),
4241
"react-hooks": fixupPluginRules(reactHooks),
4342
security: fixupPluginRules(security),
44-
import: fixupPluginRules(_import),
4543
},
4644

4745
languageOptions: {

‎web-devtools/package.json

+30-23
Original file line numberDiff line numberDiff line change
@@ -25,40 +25,47 @@
2525
},
2626
"prettier": "@kleros/kleros-v2-prettier-config",
2727
"devDependencies": {
28-
"@graphql-codegen/cli": "^5.0.2",
29-
"@graphql-codegen/client-preset": "^4.3.2",
28+
"@graphql-codegen/cli": "^5.0.3",
29+
"@graphql-codegen/client-preset": "^4.5.0",
3030
"@svgr/webpack": "^8.1.0",
31-
"@types/node": "^20.17.1",
32-
"@types/react": "18.2.0",
33-
"@types/react-dom": "^18.2.18",
34-
"@typescript-eslint/eslint-plugin": "^8.8.1",
35-
"@typescript-eslint/parser": "^8.8.1",
36-
"@typescript-eslint/utils": "^8.8.1",
37-
"@wagmi/cli": "^2.1.16",
38-
"eslint": "^8.57.1",
39-
"eslint-config-next": "^14.2.15",
31+
"@types/node": "^20.17.6",
32+
"@types/react": "^18.3.12",
33+
"@types/react-dom": "^18.3.1",
34+
"@types/react-is": "^18.3.0",
35+
"@types/styled-components": "^5.1.34",
36+
"@typescript-eslint/eslint-plugin": "^8.15.0",
37+
"@typescript-eslint/parser": "^8.15.0",
38+
"@typescript-eslint/utils": "^8.15.0",
39+
"@wagmi/cli": "^2.1.18",
40+
"eslint": "^9.15.0",
41+
"eslint-config-next": "^15.0.3",
4042
"eslint-config-prettier": "^9.1.0",
4143
"eslint-import-resolver-typescript": "^3.6.3",
42-
"eslint-plugin-react": "^7.37.1",
43-
"eslint-plugin-react-hooks": "^4.6.2",
44+
"eslint-plugin-react": "^7.37.2",
45+
"eslint-plugin-react-hooks": "^5.0.0",
4446
"rimraf": "^6.0.1",
4547
"ts-node": "^10.9.2",
46-
"typescript": "^5.5.3"
48+
"typescript": "^5.6.3"
4749
},
4850
"dependencies": {
4951
"@kleros/kleros-sdk": "workspace:^",
5052
"@kleros/ui-components-library": "^2.15.0",
53+
"@tanstack/react-query": "^5.61.0",
54+
"@wagmi/connectors": "^5.5.0",
55+
"@wagmi/core": "^2.15.0",
5156
"@web3modal/wagmi": "^5.1.11",
5257
"graphql": "^16.9.0",
53-
"graphql-request": "^7.1.0",
54-
"next": "14.2.14",
55-
"react": "^18.2.0",
56-
"react-dom": "^18.2.0",
57-
"react-markdown": "^8.0.7",
58-
"react-toastify": "^10.0.5",
58+
"graphql-request": "^7.1.2",
59+
"next": "15.0.3",
60+
"react": "^18.3.1",
61+
"react-dom": "^18.3.1",
62+
"react-is": "^18.3.1",
63+
"react-markdown": "^9.0.1",
64+
"react-toastify": "^10.0.6",
65+
"styled-components": "^6.1.13",
5966
"typewriter-effect": "^2.21.0",
60-
"vanilla-jsoneditor": "^0.21.4",
61-
"viem": "^2.21.35",
62-
"wagmi": "^2.12.25"
67+
"vanilla-jsoneditor": "^0.21.6",
68+
"viem": "^2.21.48",
69+
"wagmi": "^2.13.0"
6370
}
6471
}

‎web-devtools/src/app/(main)/dispute-template/FetchDisputeRequestInput.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ const FetchDisputeRequestInput: React.FC<IFetchDisputeRequestInput> = ({ setPara
115115
value={chainId}
116116
placeholder="Enter chain Id"
117117
type="number"
118-
onChange={(e) => setChainId(Number(e.target.value))}
118+
onChange={(e: React.ChangeEvent<HTMLInputElement>) => setChainId(Number(e.target.value))}
119119
/>
120120
</InputContainer>
121121
<StyledH3>Presets</StyledH3>

‎web-devtools/src/app/(main)/dispute-template/FetchFromIdInput.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ const FetchFromIDInput: React.FC<IFetchFromID> = ({
6060
value={templateId}
6161
placeholder="Enter template Id"
6262
message={isLoading ? "fetching ..." : ""}
63-
onChange={(e) => setTemplateId(e.target.value)}
63+
onChange={(e: React.ChangeEvent<HTMLInputElement>) => setTemplateId(e.target.value)}
6464
/>
6565
</Container>
6666
);

‎web-devtools/src/layout/Header/navbar/Explore.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ const Title = styled.h1`
3838
)};
3939
`;
4040

41-
const StyledLink = styled(Link)<{ isActive: boolean }>`
41+
const StyledLink = styled(Link)<{ $isActive: boolean }>`
4242
color: ${({ theme }) => theme.klerosUIComponentsPrimaryText};
4343
text-decoration: none;
4444
font-size: 16px;
4545
46-
font-weight: ${({ isActive }) => (isActive ? "600" : "normal")};
46+
font-weight: ${({ $isActive }) => ($isActive ? "600" : "normal")};
4747
4848
${landscapeStyle(
4949
() => css`
@@ -70,7 +70,7 @@ const Explore: React.FC = () => {
7070
<StyledLink
7171
href={to}
7272
onClick={toggleIsOpen}
73-
isActive={to === "/" ? pathname === "/" : pathname.startsWith(to)}
73+
$isActive={to === "/" ? pathname === "/" : pathname.startsWith(to)}
7474
>
7575
{text}
7676
</StyledLink>

‎web-devtools/src/layout/Header/navbar/index.tsx

+7-7
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ import { useOpenContext } from "../MobileHeader";
88

99
import Explore from "./Explore";
1010

11-
const Wrapper = styled.div<{ isOpen: boolean }>`
12-
visibility: ${({ isOpen }) => (isOpen ? "visible" : "hidden")};
11+
const Wrapper = styled.div<{ $isOpen: boolean }>`
12+
visibility: ${({ $isOpen }) => ($isOpen ? "visible" : "hidden")};
1313
position: absolute;
1414
top: 100%;
1515
left: 0;
1616
width: 100vw;
1717
z-index: 30;
1818
`;
1919

20-
const Container = styled.div<{ isOpen: boolean }>`
20+
const Container = styled.div<{ $isOpen: boolean }>`
2121
position: absolute;
2222
top: 0;
2323
left: 0;
@@ -29,8 +29,8 @@ const Container = styled.div<{ isOpen: boolean }>`
2929
border: 1px solid ${({ theme }) => theme.klerosUIComponentsStroke};
3030
box-shadow: 0px 2px 3px ${({ theme }) => theme.klerosUIComponentsDefaultShadow};
3131
transform-origin: top;
32-
transform: scaleY(${({ isOpen }) => (isOpen ? "1" : "0")});
33-
visibility: ${({ isOpen }) => (isOpen ? "visible" : "hidden")};
32+
transform: scaleY(${({ $isOpen }) => ($isOpen ? "1" : "0")});
33+
visibility: ${({ $isOpen }) => ($isOpen ? "visible" : "hidden")};
3434
transition-property: transform, visibility;
3535
transition-duration: ${({ theme }) => theme.klerosUIComponentsTransitionSpeed};
3636
transition-timing-function: ease;
@@ -47,8 +47,8 @@ const NavBar: React.FC = () => {
4747

4848
return (
4949
<>
50-
<Wrapper {...{ isOpen }}>
51-
<Container {...{ isOpen }}>
50+
<Wrapper {...{ $isOpen: isOpen }}>
51+
<Container {...{ $isOpen: isOpen }}>
5252
<Explore />
5353
</Container>
5454
</Wrapper>

‎web-devtools/src/styles/landscapeStyle.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { css, DefaultTheme, FlattenInterpolation, ThemeProps } from "styled-components";
1+
import { css, RuleSet } from "styled-components";
22

33
export const BREAKPOINT_LANDSCAPE = 900;
44

5-
export const landscapeStyle = (styleFn: () => FlattenInterpolation<ThemeProps<DefaultTheme>>) => css`
5+
export const landscapeStyle = (styleFn: () => RuleSet<object>) => css`
66
@media (min-width: ${BREAKPOINT_LANDSCAPE}px) {
77
${() => styleFn()}
88
}

‎web-devtools/tsconfig.json

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"compilerOptions": {
3+
"target": "ES2022",
34
"lib": [
45
"dom",
56
"dom.iterable",

‎web-devtools/wagmi.config.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import { react, actions } from "@wagmi/cli/plugins";
66
import dotenv from "dotenv";
77
import { Abi, Chain } from "viem";
88

9-
import IArbitrableV2 from "@kleros/kleros-v2-contracts/artifacts/src/arbitration/interfaces/IArbitrableV2.sol/IArbitrableV2.json" assert { type: "json" };
10-
import IHomeGateway from "@kleros/kleros-v2-contracts/artifacts/src/gateway/interfaces/IHomeGateway.sol/IHomeGateway.json" assert { type: "json" };
9+
import IArbitrableV2 from "@kleros/kleros-v2-contracts/artifacts/src/arbitration/interfaces/IArbitrableV2.sol/IArbitrableV2.json" with { type: "json" };
10+
import IHomeGateway from "@kleros/kleros-v2-contracts/artifacts/src/gateway/interfaces/IHomeGateway.sol/IHomeGateway.json" with { type: "json" };
1111

1212
import { ArbitratorTypes, getArbitratorType } from "./src/consts/arbitratorTypes";
1313
import { arbitrum, arbitrumSepolia, gnosis, gnosisChiado, mainnet, sepolia } from "viem/chains";

0 commit comments

Comments
 (0)