Skip to content
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.

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

Fix/kleros app resolution #1833

Merged
merged 6 commits into from
Jan 14, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 16 additions & 7 deletions .github/workflows/contracts-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,23 @@ jobs:
registry.yarnpkg.com:443
registry.npmjs.org:443
54.185.253.63:443

- name: Setup Node.js environment
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
with:
node-version: 18.x

- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
submodules: recursive


- name: Set up corepack (for yarn)
run: |
corepack enable
corepack prepare [email protected] --activate
yarn set version 4.5.1

- name: Setup Node.js environment
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
with:
node-version: 20.x
cache: yarn

- name: Cache node modules
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
env:
Expand All @@ -61,7 +68,9 @@ jobs:
${{ runner.os }}-build-${{ secrets.CACHE_VERSION }}-${{ env.cache-name }}-

- name: Install contracts dependencies
run: yarn workspace @kleros/kleros-v2-contracts install
run: |
# TODO: re-enable hardened mode once the kleros-app resolution is fixed
YARN_ENABLE_HARDENED_MODE=0 yarn workspace @kleros/kleros-v2-contracts install

- name: Install Foundry
uses: foundry-rs/foundry-toolchain@8f1998e9878d786675189ef566a2e4bf24869773 # v1.2.0
Expand Down
39 changes: 0 additions & 39 deletions .github/workflows/pr-labels.yml

This file was deleted.

2 changes: 1 addition & 1 deletion kleros-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,6 @@
"react": "^18.3.1",
"react-dom": "^18.3.1",
"viem": "^2.21.42",
"wagmi": "^2.13.0"
"wagmi": "^2.13.5"
}
}
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,9 @@
"local-stack": "scripts/tmux-local-stack.sh",
"changelog": "conventional-changelog --infile CHANGELOG.md --same-file --release-count 0 && prettier --write CHANGELOG.md",
"postinstall": "yarn check-prerequisites; husky install",
"reinstall": "YARN_CHECKSUM_BEHAVIOR=update yarn install --no-immutable"
"reinstall": "YARN_CHECKSUM_BEHAVIOR=update yarn install --no-immutable",
"build:web:ci": "yarn workspaces focus @kleros/kleros-v2-web && yarn workspaces foreach -Ap --include kleros-app --include contracts run build && yarn workspace @kleros/kleros-v2-web build-netlify",
"build:web-devtools:ci": "yarn workspaces focus @kleros/kleros-v2-web-devtools && yarn workspaces foreach -Ap --include contracts run build && yarn workspace @kleros/kleros-v2-web-devtools build-netlify"
},
"alias": {
"process": "process/browser.js",
Expand Down
3 changes: 2 additions & 1 deletion web-devtools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
},
"dependencies": {
"@kleros/kleros-sdk": "workspace:^",
"@kleros/kleros-v2-contracts": "workspace:^",
"@kleros/ui-components-library": "^2.20.0",
"@tanstack/react-query": "^5.61.0",
"@wagmi/connectors": "^5.5.0",
Expand All @@ -65,6 +66,6 @@
"typewriter-effect": "^2.21.0",
"vanilla-jsoneditor": "^0.21.6",
"viem": "^2.21.50",
"wagmi": "^2.13.0"
"wagmi": "^2.13.5"
}
}
2 changes: 1 addition & 1 deletion web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
},
"dependencies": {
"@cyntler/react-doc-viewer": "^1.17.0",
"@kleros/kleros-app": "^2.0.2",
"@kleros/kleros-app": "workspace:^",
"@kleros/kleros-sdk": "workspace:^",
"@kleros/kleros-v2-contracts": "workspace:^",
"@kleros/ui-components-library": "^2.20.0",
Expand Down
85 changes: 25 additions & 60 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5370,24 +5370,7 @@ __metadata:
languageName: node
linkType: hard

"@kleros/kleros-app@npm:^2.0.2":
version: 2.0.2
resolution: "@kleros/kleros-app@npm:2.0.2"
dependencies:
jose: "npm:^5.9.6"
peerDependencies:
"@tanstack/react-query": ^5.59.20
graphql: ^16.9.0
graphql-request: ^7.1.2
react: ^18.3.1
react-dom: ^18.3.1
viem: ^2.21.42
wagmi: ^2.13.0
checksum: 10/89cf0536fed4bbb887772daa529d7cad209cea0e5105bcd366fe5e4bc7c5c14fca21aa201ba4d848c7e8addd3fc4921ac54e237afe2a5b7224c9cd219f72e08b
languageName: node
linkType: hard

"@kleros/kleros-app@workspace:kleros-app":
"@kleros/kleros-app@workspace:^, @kleros/kleros-app@workspace:kleros-app":
version: 0.0.0-use.local
resolution: "@kleros/kleros-app@workspace:kleros-app"
dependencies:
Expand Down Expand Up @@ -5417,7 +5400,7 @@ __metadata:
react: ^18.3.1
react-dom: ^18.3.1
viem: ^2.21.42
wagmi: ^2.13.0
wagmi: ^2.13.5
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -5571,6 +5554,7 @@ __metadata:
"@graphql-codegen/cli": "npm:^5.0.3"
"@graphql-codegen/client-preset": "npm:^4.5.1"
"@kleros/kleros-sdk": "workspace:^"
"@kleros/kleros-v2-contracts": "workspace:^"
"@kleros/ui-components-library": "npm:^2.20.0"
"@svgr/webpack": "npm:^8.1.0"
"@tanstack/react-query": "npm:^5.61.0"
Expand Down Expand Up @@ -5607,7 +5591,7 @@ __metadata:
typewriter-effect: "npm:^2.21.0"
vanilla-jsoneditor: "npm:^0.21.6"
viem: "npm:^2.21.50"
wagmi: "npm:^2.13.0"
wagmi: "npm:^2.13.5"
languageName: unknown
linkType: soft

Expand All @@ -5621,7 +5605,7 @@ __metadata:
"@eslint/js": "npm:^9.15.0"
"@graphql-codegen/cli": "npm:^5.0.3"
"@graphql-codegen/client-preset": "npm:^4.5.1"
"@kleros/kleros-app": "npm:^2.0.2"
"@kleros/kleros-app": "workspace:^"
"@kleros/kleros-sdk": "workspace:^"
"@kleros/kleros-v2-contracts": "workspace:^"
"@kleros/kleros-v2-eslint-config": "workspace:^"
Expand Down Expand Up @@ -10967,51 +10951,51 @@ __metadata:
languageName: node
linkType: hard

"@wagmi/connectors@npm:5.5.0, @wagmi/connectors@npm:^5.5.0":
version: 5.5.0
resolution: "@wagmi/connectors@npm:5.5.0"
"@wagmi/connectors@npm:5.5.3":
version: 5.5.3
resolution: "@wagmi/connectors@npm:5.5.3"
dependencies:
"@coinbase/wallet-sdk": "npm:4.2.3"
"@metamask/sdk": "npm:0.30.1"
"@metamask/sdk": "npm:0.31.1"
"@safe-global/safe-apps-provider": "npm:0.18.4"
"@safe-global/safe-apps-sdk": "npm:9.1.0"
"@walletconnect/ethereum-provider": "npm:2.17.0"
cbw-sdk: "npm:@coinbase/[email protected]"
peerDependencies:
"@wagmi/core": 2.15.0
"@wagmi/core": 2.15.2
typescript: ">=5.0.4"
viem: 2.x
peerDependenciesMeta:
typescript:
optional: true
checksum: 10/fe8898bee0b3abb9f6b2aaa99a0f892c9e431ab99e3189bae028edc0f4edc799dfc326a82b5fd4e7893e900bc5af912ff8e648e7e18890d790713631719da906
checksum: 10/bf2c58bb62be16387e3084f1bd2d7a9197e413626728b3bfc864c11de0eb0dfecd4637b23b1adc36a05b6570d81b31ef53a3ac107d2e2ded237db8fb17c1d8d2
languageName: node
linkType: hard

"@wagmi/connectors@npm:5.5.3":
version: 5.5.3
resolution: "@wagmi/connectors@npm:5.5.3"
"@wagmi/connectors@npm:^5.5.0":
version: 5.5.0
resolution: "@wagmi/connectors@npm:5.5.0"
dependencies:
"@coinbase/wallet-sdk": "npm:4.2.3"
"@metamask/sdk": "npm:0.31.1"
"@metamask/sdk": "npm:0.30.1"
"@safe-global/safe-apps-provider": "npm:0.18.4"
"@safe-global/safe-apps-sdk": "npm:9.1.0"
"@walletconnect/ethereum-provider": "npm:2.17.0"
cbw-sdk: "npm:@coinbase/[email protected]"
peerDependencies:
"@wagmi/core": 2.15.2
"@wagmi/core": 2.15.0
typescript: ">=5.0.4"
viem: 2.x
peerDependenciesMeta:
typescript:
optional: true
checksum: 10/bf2c58bb62be16387e3084f1bd2d7a9197e413626728b3bfc864c11de0eb0dfecd4637b23b1adc36a05b6570d81b31ef53a3ac107d2e2ded237db8fb17c1d8d2
checksum: 10/fe8898bee0b3abb9f6b2aaa99a0f892c9e431ab99e3189bae028edc0f4edc799dfc326a82b5fd4e7893e900bc5af912ff8e648e7e18890d790713631719da906
languageName: node
linkType: hard

"@wagmi/core@npm:2.15.0, @wagmi/core@npm:^2.15.0":
version: 2.15.0
resolution: "@wagmi/core@npm:2.15.0"
"@wagmi/core@npm:2.15.2, @wagmi/core@npm:^2.15.2":
version: 2.15.2
resolution: "@wagmi/core@npm:2.15.2"
dependencies:
eventemitter3: "npm:5.0.1"
mipd: "npm:0.0.7"
Expand All @@ -11025,13 +11009,13 @@ __metadata:
optional: true
typescript:
optional: true
checksum: 10/b40ed089ddb23f7573e682105e41fe510f375e88612591dd841eefba06e2ffd0d2b2fdd8b1603d2c7e6aa4f70aa2bd94d12b6b578b3fe2c7abcb545ef24ff822
checksum: 10/ed11530d329831c7e1f957ca17bc5633c5d2816ea24722b0ba6a7beb220d309f0264f54c0839dbc7f2f9c1683883435b8ead789ffcc388ffb61c41e2c72a6129
languageName: node
linkType: hard

"@wagmi/core@npm:2.15.2, @wagmi/core@npm:^2.15.2":
version: 2.15.2
resolution: "@wagmi/core@npm:2.15.2"
"@wagmi/core@npm:^2.15.0":
version: 2.15.0
resolution: "@wagmi/core@npm:2.15.0"
dependencies:
eventemitter3: "npm:5.0.1"
mipd: "npm:0.0.7"
Expand All @@ -11045,7 +11029,7 @@ __metadata:
optional: true
typescript:
optional: true
checksum: 10/ed11530d329831c7e1f957ca17bc5633c5d2816ea24722b0ba6a7beb220d309f0264f54c0839dbc7f2f9c1683883435b8ead789ffcc388ffb61c41e2c72a6129
checksum: 10/b40ed089ddb23f7573e682105e41fe510f375e88612591dd841eefba06e2ffd0d2b2fdd8b1603d2c7e6aa4f70aa2bd94d12b6b578b3fe2c7abcb545ef24ff822
languageName: node
linkType: hard

Expand Down Expand Up @@ -36018,25 +36002,6 @@ __metadata:
languageName: node
linkType: hard

"wagmi@npm:^2.13.0":
version: 2.13.0
resolution: "wagmi@npm:2.13.0"
dependencies:
"@wagmi/connectors": "npm:5.5.0"
"@wagmi/core": "npm:2.15.0"
use-sync-external-store: "npm:1.2.0"
peerDependencies:
"@tanstack/react-query": ">=5.0.0"
react: ">=18"
typescript: ">=5.0.4"
viem: 2.x
peerDependenciesMeta:
typescript:
optional: true
checksum: 10/68770f64d57be3c6367271a73a79a3c108e27ef5b106e47583c3dcd83e4746ee614e7006861574263dabafda233c43e876fcaeaf7260e4df75b5fe53ae41d8ec
languageName: node
linkType: hard

"wagmi@npm:^2.13.3, wagmi@npm:^2.13.5":
version: 2.13.5
resolution: "wagmi@npm:2.13.5"
Expand Down
Loading