Skip to content

Chore/eslint and more version bump #1757

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Nov 22, 2024
Merged

Chore/eslint and more version bump #1757

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0071290
chore: eslint and other version bumps
jaybuidl Nov 21, 2024
944de42
chore(web-devtools): upgraded Next to 15, React to 19, removed unused…
jaybuidl Nov 21, 2024
f054afb
chore: update-dependencies
tractorss Nov 22, 2024
fda1f81
fix(web-devtools): field-type
tractorss Nov 22, 2024
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
2 changes: 1 addition & 1 deletion bot-pinner/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
"node": ">=16.13.0"
},
"devDependencies": {
"@dappnode/dappnodesdk": "^0.3.11"
"@dappnode/dappnodesdk": "^0.3.35"
}
}
25 changes: 14 additions & 11 deletions contracts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"build:types": "tsc --project tsconfig.json --module esnext --declarationDir ./dist/types --emitDeclarationOnly --declaration --declarationMap"
},
"devDependencies": {
"@defi-wonderland/natspec-smells": "^1.0.3",
"@defi-wonderland/natspec-smells": "^1.1.5",
"@kleros/kleros-v2-eslint-config": "workspace:^",
"@kleros/kleros-v2-prettier-config": "workspace:^",
"@kleros/kleros-v2-tsconfig": "workspace:^",
Expand All @@ -71,18 +71,19 @@
"@openzeppelin/contracts": "^5.1.0",
"@typechain/ethers-v6": "^0.5.1",
"@typechain/hardhat": "^9.1.0",
"@types/chai": "^4.3.11",
"@types/mocha": "^10.0.6",
"@types/node": "^20.17.1",
"@wagmi/cli": "^2.1.16",
"@types/chai": "^4.3.20",
"@types/mocha": "^10.0.10",
"@types/node": "^20.17.6",
"@wagmi/cli": "^2.1.18",
"abitype": "^0.10.3",
"chai": "^4.4.1",
"dotenv": "^16.3.1",
"chai": "^4.5.0",
"dotenv": "^16.4.5",
"eslint": "^9.15.0",
"ethereumjs-util": "^7.1.5",
"ethers": "^6.13.4",
"graphql": "^16.9.0",
"graphql-request": "^6.1.0",
"hardhat": "2.22.15",
"graphql-request": "^7.1.2",
"hardhat": "2.22.16",
"hardhat-contract-sizer": "^2.10.0",
"hardhat-deploy": "^0.14.0",
"hardhat-deploy-ethers": "^0.4.2",
Expand All @@ -94,15 +95,17 @@
"node-fetch": "^3.3.2",
"pino": "^8.21.0",
"pino-pretty": "^10.3.1",
"prettier": "^3.3.3",
"prettier-plugin-solidity": "^1.4.1",
"shelljs": "^0.8.5",
"solhint-plugin-prettier": "^0.1.0",
"solidity-coverage": "^0.8.13",
"ts-node": "^10.9.2",
"typechain": "^8.3.2",
"typescript": "^5.3.3"
"typescript": "^5.6.3"
},
"dependencies": {
"@kleros/vea-contracts": "^0.4.0",
"viem": "^2.21.35"
"viem": "^2.21.48"
}
}
23 changes: 12 additions & 11 deletions eslint-config/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,26 @@
"main": ".eslintrc.js",
"license": "MIT",
"dependencies": {
"@typescript-eslint/eslint-plugin": "^8.8.1",
"@typescript-eslint/parser": "^8.8.1",
"@typescript-eslint/utils": "^8.8.1",
"@typescript-eslint/eslint-plugin": "^8.15.0",
"@typescript-eslint/parser": "^8.15.0",
"@typescript-eslint/utils": "^8.15.0",
"eslint": "^9.15.0",
"eslint-config-prettier": "^9.1.0",
"eslint-config-standard": "^17.1.0",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-promise": "^6.0.0",
"eslint-plugin-promise": "^6.6.0",
"eslint-plugin-security": "^3.0.1",
"eslint-utils": "^3.0.0"
"eslint-utils": "^3.0.0",
"prettier": "^3.3.3"
},
"devDependencies": {
"@eslint/eslintrc": "^3.1.0",
"@eslint/js": "^9.12.0",
"globals": "^15.11.0",
"typescript": "^5.3.3"
"@eslint/eslintrc": "^3.2.0",
"@eslint/js": "^9.15.0",
"globals": "^15.12.0",
"typescript": "^5.6.3"
},
"peerDependencies": {
"eslint": "8.x"
"eslint": "^8.0.0 || ^9.0.0"
}
}
8 changes: 4 additions & 4 deletions kleros-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,16 @@
],
"prettier": "@kleros/kleros-v2-prettier-config",
"devDependencies": {
"@eslint/compat": "^1.2.2",
"@eslint/eslintrc": "^3.1.0",
"@eslint/js": "^9.14.0",
"@eslint/compat": "^1.2.3",
"@eslint/eslintrc": "^3.2.0",
"@eslint/js": "^9.15.0",
"@kleros/kleros-v2-eslint-config": "workspace:^",
"@kleros/kleros-v2-prettier-config": "workspace:^",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"@typescript-eslint/eslint-plugin": "^8.15.0",
"@typescript-eslint/parser": "^8.15.0",
"eslint": "^9.14.0",
"eslint": "^9.15.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-import": "^2.31.0",
"globals": "^15.12.0",
Expand Down
13 changes: 7 additions & 6 deletions kleros-sdk/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,19 @@
},
"devDependencies": {
"@types/mustache": "^4.2.5",
"@vitest/ui": "^1.1.3",
"mocha": "^10.2.0",
"@types/node": "^20.17.6",
"@vitest/ui": "^1.6.0",
"mocha": "^10.8.2",
"rimraf": "^6.0.1",
"ts-node": "^10.9.2",
"typescript": "^5.3.3",
"vitest": "^1.1.3"
"typescript": "^5.6.3",
"vitest": "^1.6.0"
},
"dependencies": {
"@reality.eth/reality-eth-lib": "^3.2.44",
"@urql/core": "^5.0.8",
"mustache": "^4.2.0",
"viem": "^2.21.35",
"zod": "^3.22.4"
"viem": "^2.21.48",
"zod": "^3.23.8"
}
}
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@
"devDependencies": {
"@commitlint/cli": "^17.8.1",
"@commitlint/config-conventional": "^17.8.1",
"assert": "^2.0.0",
"assert": "^2.1.0",
"buffer": "^5.7.1",
"conventional-changelog-cli": "^2.2.2",
"crypto-browserify": "^3.12.0",
"crypto-browserify": "^3.12.1",
"husky": "^8.0.3",
"lint-staged": "^13.3.0",
"os-browserify": "^0.3.0",
"path-browserify": "^1.0.0",
"path-browserify": "^1.0.1",
"process": "^0.11.10",
"string_decoder": "^1.3.0"
},
Expand Down
4 changes: 2 additions & 2 deletions prettier-config/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"main": "index.js",
"license": "MIT",
"dependencies": {
"eslint": "^8.57.1",
"eslint": "^9.15.0",
"prettier": "^3.3.3",
"prettier-plugin-solidity": "^1.3.1"
"prettier-plugin-solidity": "^1.4.1"
},
"scripts": {
"lint:w": "eslint --fix '**/*.{gql,graphql,js,jsx,ts,tsx,json,md}'",
Expand Down
1 change: 1 addition & 0 deletions subgraph/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
"@graphprotocol/graph-cli": "0.64.1",
"@kleros/kleros-v2-eslint-config": "workspace:^",
"@kleros/kleros-v2-prettier-config": "workspace:^",
"eslint": "^9.15.0",
"gluegun": "^5.2.0",
"matchstick-as": "0.6.0"
},
Expand Down
3 changes: 2 additions & 1 deletion tsconfig/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"devDependencies": {
"@kleros/kleros-v2-eslint-config": "*",
"@tsconfig/node18": "^18.2.4",
"@tsconfig/node20": "^20.1.4"
"@tsconfig/node20": "^20.1.4",
"eslint": "^9.15.0"
}
}
51 changes: 29 additions & 22 deletions web-devtools/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,40 +25,47 @@
},
"prettier": "@kleros/kleros-v2-prettier-config",
"devDependencies": {
"@graphql-codegen/cli": "^5.0.2",
"@graphql-codegen/client-preset": "^4.3.2",
"@graphql-codegen/cli": "^5.0.3",
"@graphql-codegen/client-preset": "^4.5.0",
"@svgr/webpack": "^8.1.0",
"@types/node": "^20.17.1",
"@types/react": "18.2.0",
"@types/react-dom": "^18.2.18",
"@typescript-eslint/eslint-plugin": "^8.8.1",
"@typescript-eslint/parser": "^8.8.1",
"@typescript-eslint/utils": "^8.8.1",
"@wagmi/cli": "^2.1.16",
"eslint": "^8.57.1",
"eslint-config-next": "^14.2.15",
"@types/node": "^20.17.6",
"@types/react": "npm:types-react@19.0.0-rc.1",
"@types/react-dom": "npm:types-react-dom@19.0.0-rc.1",
"@types/react-is": "^18.3.0",
"@types/styled-components": "^5.1.34",
"@typescript-eslint/eslint-plugin": "^8.15.0",
"@typescript-eslint/parser": "^8.15.0",
"@typescript-eslint/utils": "^8.15.0",
"@wagmi/cli": "^2.1.18",
"eslint": "^9.15.0",
"eslint-config-next": "15.0.3",
"eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-typescript": "^3.6.3",
"eslint-plugin-react": "^7.37.1",
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-react": "^7.37.2",
"eslint-plugin-react-hooks": "^5.0.0",
"rimraf": "^6.0.1",
"ts-node": "^10.9.2",
"typescript": "^5.5.3"
"typescript": "^5.6.3"
},
"dependencies": {
"@kleros/kleros-sdk": "workspace:^",
"@kleros/ui-components-library": "^2.15.0",
"@tanstack/react-query": "^5.61.0",
"@wagmi/connectors": "^5.5.0",
"@wagmi/core": "^2.15.0",
"@web3modal/wagmi": "^5.1.11",
"graphql": "^16.9.0",
"graphql-request": "^7.1.0",
"next": "14.2.14",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"graphql-request": "^7.1.2",
"next": "15.0.3",
"react": "19.0.0-rc-66855b96-20241106",
"react-dom": "19.0.0-rc-66855b96-20241106",
"react-is": "^18.3.1",
"react-markdown": "^8.0.7",
"react-toastify": "^10.0.5",
"react-toastify": "^10.0.6",
"styled-components": "^5.3.11",
"typewriter-effect": "^2.21.0",
"vanilla-jsoneditor": "^0.21.4",
"viem": "^2.21.35",
"wagmi": "^2.12.25"
"vanilla-jsoneditor": "^0.21.6",
"viem": "^2.21.48",
"wagmi": "^2.13.0"
}
}
4 changes: 2 additions & 2 deletions web-devtools/src/app/(main)/dispute-template/FetchDisputeRequestInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const InputContainer = styled.div`
flex-wrap: wrap;
gap: 8px;
`;
const StyledChainInput = styled(Field)`
const StyledChainInput = styled(Field as any)`
width: 120px;
`;
const StyledHeader = styled.h2`
Expand Down Expand Up @@ -115,7 +115,7 @@ const FetchDisputeRequestInput: React.FC<IFetchDisputeRequestInput> = ({ setPara
value={chainId}
placeholder="Enter chain Id"
type="number"
onChange={(e) => setChainId(Number(e.target.value))}
onChange={(e: React.ChangeEvent<HTMLInputElement>) => setChainId(Number(e.target.value))}
/>
</InputContainer>
<StyledH3>Presets</StyledH3>
Expand Down
4 changes: 2 additions & 2 deletions web-devtools/src/app/(main)/dispute-template/FetchFromIdInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const Container = styled.div`
margin-left: 24px;
`;

const StyledInput = styled(Field)``;
const StyledInput = styled(Field as any)``;
const StyledHeader = styled.h2`
margin-top: 24px;
`;
Expand Down Expand Up @@ -60,7 +60,7 @@ const FetchFromIDInput: React.FC<IFetchFromID> = ({
value={templateId}
placeholder="Enter template Id"
message={isLoading ? "fetching ..." : ""}
onChange={(e) => setTemplateId(e.target.value)}
onChange={(e: React.ChangeEvent<HTMLInputElement>) => setTemplateId(e.target.value)}
/>
</Container>
);
Expand Down
2 changes: 1 addition & 1 deletion web-devtools/src/app/(main)/ruler/SelectArbitrable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const SelectContainer = styled.div`
position: relative;
`;

const StyledField = styled(Field)`
const StyledField = styled(Field as any)`
width: auto;
${landscapeStyle(
() => css`
Expand Down
2 changes: 1 addition & 1 deletion web-devtools/src/components/LabeledInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ const InputContainer = styled.div<{ isField?: boolean }>`
`}
`;

const StyledField = styled(Field)<{ paddingLeft?: number }>`
const StyledField = styled(Field as any)<{ paddingLeft?: number }>`
width: 100%;
> input {
border: none;
Expand Down
6 changes: 3 additions & 3 deletions web-devtools/src/layout/Header/navbar/Explore.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ const Title = styled.h1`
)};
`;

const StyledLink = styled(Link)<{ isActive: boolean }>`
const StyledLink = styled(Link)<{ $isActive: boolean }>`
color: ${({ theme }) => theme.klerosUIComponentsPrimaryText};
text-decoration: none;
font-size: 16px;

font-weight: ${({ isActive }) => (isActive ? "600" : "normal")};
font-weight: ${({ $isActive }) => ($isActive ? "600" : "normal")};

${landscapeStyle(
() => css`
Expand All @@ -70,7 +70,7 @@ const Explore: React.FC = () => {
<StyledLink
href={to}
onClick={toggleIsOpen}
isActive={to === "/" ? pathname === "/" : pathname.startsWith(to)}
$isActive={to === "/" ? pathname === "/" : pathname.startsWith(to)}
>
{text}
</StyledLink>
Expand Down
1 change: 1 addition & 0 deletions web-devtools/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"compilerOptions": {
"target": "ES2022",
"lib": [
"dom",
"dom.iterable",
Expand Down
4 changes: 2 additions & 2 deletions web-devtools/wagmi.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import { react, actions } from "@wagmi/cli/plugins";
import dotenv from "dotenv";
import { Abi, Chain } from "viem";

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

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