Skip to content

Commit 855e06e

Browse files
bardvacekj
andauthored
fix: fix build (gitcoinco#2219)
* fix: fix grant-explorer build * fix: update typescript eslint to remove deprecation error * fix: update pnpm version in workflows * fix: import latest allo-indexer-client commit in all frontends * fix: avoid multiple versions of webpack * fix: update node version for builds * fix: re-enable grant-explorer tests * Trigger Build * fix: remove lagunovsky redux router --------- Co-authored-by: Atris <vacekj@outlook.com>
1 parent b46e338 commit 855e06e

13 files changed

Lines changed: 2045 additions & 1245 deletions

File tree

.github/workflows/builder.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ jobs:
2020

2121
- uses: pnpm/action-setup@v2
2222
with:
23-
version: 7
23+
version: 8
2424

2525
- uses: actions/setup-node@v3
2626
with:
27-
node-version: '16'
27+
node-version: '18'
2828
cache: 'pnpm'
2929

3030
- name: Test and Build

.github/workflows/grant-explorer.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ jobs:
1919

2020
- uses: pnpm/action-setup@v2
2121
with:
22-
version: 7
22+
version: 8
2323

2424
- uses: actions/setup-node@v3
2525
with:
26-
node-version: '16'
26+
node-version: '18'
2727
cache: 'pnpm'
2828

2929
- name: Install Dependencies
@@ -35,6 +35,6 @@ jobs:
3535
run: |
3636
pnpm re-build
3737
38-
# - name: Test Grant Explorer
39-
# run: |
40-
# pnpm re-test
38+
- name: Test Grant Explorer
39+
run: |
40+
pnpm re-test

.github/workflows/round-manager.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ jobs:
1919

2020
- uses: pnpm/action-setup@v2
2121
with:
22-
version: 7
22+
version: 8
2323

2424
- uses: actions/setup-node@v3
2525
with:
26-
node-version: '16'
26+
node-version: '18'
2727
cache: 'pnpm'
2828

2929
- name: Install Dependencies

package.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,10 @@
3232
},
3333
"dependencies": {
3434
"turbo": "^1.10.9"
35+
},
36+
"pnpm": {
37+
"overrides": {
38+
"webpack": "^5"
39+
}
3540
}
3641
}

packages/builder/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"@babel/plugin-syntax-flow": "^7.14.5",
88
"@babel/plugin-transform-react-jsx": "^7.14.9",
99
"@chakra-ui/react": "^2.1.2",
10-
"@craco/craco": "6.4.3",
10+
"@craco/craco": "7.1.0",
1111
"@datadog/browser-logs": "^4.21.2",
1212
"@datadog/browser-rum": "^4.16.0",
1313
"@emotion/react": "^11",
@@ -37,7 +37,7 @@
3737
"@wagmi/core": "0.5.4",
3838
"@walletconnect/ethereum-provider": "^2.9.0",
3939
"@walletconnect/modal": "^2.5.9",
40-
"allo-indexer-client": "github:gitcoinco/allo-indexer-client#0487c02c9bb89307b12ffe75f5bfb578278994a1",
40+
"allo-indexer-client": "github:gitcoinco/allo-indexer-client",
4141
"assert": "^2.0.0",
4242
"autoprefixer": "^10.4.7",
4343
"axios": "^0.27.2",

packages/eslint-config-gitcoin/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
"main": "index.js",
55
"private": true,
66
"dependencies": {
7-
"eslint-config-turbo": "latest",
8-
"@typescript-eslint/eslint-plugin": "^5.36.2",
9-
"@typescript-eslint/parser": "^5.36.2",
7+
"@typescript-eslint/eslint-plugin": "^6.5.0",
8+
"@typescript-eslint/parser": "^6.5.0",
109
"eslint": "^8.22.0",
10+
"eslint-config-turbo": "latest",
1111
"eslint-plugin-react": "^7.31.7",
1212
"eslint-plugin-react-hooks": "^4.6.0"
1313
}

packages/grant-explorer/package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"lint:fix": "eslint ./src --fix",
1010
"typecheck": "tsc --noEmit",
1111
"start": "craco start",
12-
"test": "true",
12+
"test": "vitest run",
1313
"test:coverage": "vitest --coverage"
1414
},
1515
"browserslist": {
@@ -28,7 +28,7 @@
2828
},
2929
"dependencies": {
3030
"@chakra-ui/react": "^2.1.2",
31-
"@craco/craco": "^7.0.0",
31+
"@craco/craco": "^7.1.0",
3232
"@datadog/browser-logs": "^4.19.0",
3333
"@datadog/browser-rum": "^4.19.0",
3434
"@emotion/react": "^11",
@@ -53,10 +53,11 @@
5353
"@vitejs/plugin-react": "^4.0.4",
5454
"@wagmi/core": "1.3.8",
5555
"@walletconnect/modal": "^2.5.9",
56-
"allo-indexer-client": "github:gitcoinco/allo-indexer-client#0549b473941a916b38426b32f59250f87ec3274d",
56+
"allo-indexer-client": "github:gitcoinco/allo-indexer-client",
5757
"babel-loader": "^8.3.0",
5858
"buffer": "^6.0.3",
5959
"common": "workspace:*",
60+
"craco-esbuild": "^0.5.2",
6061
"crypto-browserify": "^3.12.0",
6162
"date-fns": "^2.29.3",
6263
"eslint": ">=8.1.0 <9.0.0",

packages/round-manager/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
},
2424
"dependencies": {
2525
"@babel/core": "^7.20.12",
26-
"@craco/craco": "^6.4.5",
26+
"@craco/craco": "^7.1.0",
2727
"@datadog/browser-logs": "^4.17.1",
2828
"@datadog/browser-rum": "^4.17.1",
2929
"@ethersproject/abi": "5.7.0",
@@ -33,7 +33,6 @@
3333
"@headlessui/react": "^1.6.6",
3434
"@heroicons/react": "^1.0.6",
3535
"@hookform/resolvers": "^2.9.2",
36-
"@lagunovsky/redux-react-router": "^3.1.0",
3736
"@openzeppelin/merkle-tree": "^1.0.2",
3837
"@rainbow-me/rainbowkit": "0.12.16",
3938
"@reduxjs/toolkit": "^1.8.1",
@@ -49,7 +48,7 @@
4948
"@testing-library/user-event": "^14.1.1",
5049
"@types/jest": "^27.4.1",
5150
"@types/node": "^17.0.25",
52-
"allo-indexer-client": "github:gitcoinco/allo-indexer-client#fab892947ad5566e2666b76520ff9dc308158e07",
51+
"allo-indexer-client": "github:gitcoinco/allo-indexer-client",
5352
"buffer": "^6.0.3",
5453
"common": "workspace:*",
5554
"crypto-browserify": "^3.12.0",
@@ -75,7 +74,8 @@
7574
"react-hook-form": "^7.31.3",
7675
"react-icons": "^4.7.1",
7776
"react-redux": "^8.0.1",
78-
"react-router-dom": "6",
77+
"react-router": "6.15.0",
78+
"react-router-dom": "6.15.0",
7979
"react-scripts": "5.0.1",
8080
"react-tooltip": "^4.4.2",
8181
"redux": "^4.2.0",

packages/round-manager/src/app/store.ts

Lines changed: 0 additions & 37 deletions
This file was deleted.

packages/round-manager/src/history.ts

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)