finished conflicts in future merges after last components branch commit

This commit is contained in:
ashprit
2024-10-26 23:50:42 +01:00
37 changed files with 18779 additions and 570 deletions

View File

@@ -7,15 +7,21 @@
"build": "next build",
"start": "next start",
"lint": "next lint",
"test": "npx hardhat --tsconfig tsconfig.hardhat.json test",
"compile": "hardhat compile",
"prepare": "husky"
},
"dependencies": {
"@hookform/resolvers": "^3.9.0",
"@flarenetwork/flare-periphery-contracts": "^0.1.16",
"@metamask/sdk-react": "^0.30.0",
"@radix-ui/react-icons": "^1.3.0",
"@radix-ui/react-label": "^2.1.0",
"@radix-ui/react-popover": "^1.1.2",
"@radix-ui/react-select": "^2.1.2",
"@radix-ui/react-separator": "^1.1.0",
"@radix-ui/react-slot": "^1.1.0",
"@radix-ui/react-toast": "^1.2.2",
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.1",
"embla-carousel-react": "^8.3.0",
@@ -26,22 +32,34 @@
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-hook-form": "^7.53.1",
"tailwind-merge": "^2.5.2",
"tailwindcss-animate": "^1.0.7",
"zod": "^3.23.8"
"zod": "^3.23.8",
"tailwind-merge": "^2.5.4",
"tailwindcss-animate": "^1.0.7"
},
"devDependencies": {
"@flarenetwork/flare-periphery-contracts": "^0.1.16",
"@nomicfoundation/hardhat-toolbox": "^2.0.2",
"@nomiclabs/hardhat-ethers": "^2.2.3",
"@nomiclabs/hardhat-waffle": "^2.0.0",
"@typechain/hardhat": "^6.1.6",
"@types/ethereum-protocol": "^1.0.5",
"@types/mocha": "^10.0.9",
"@types/node": "^20",
"@types/react": "^18",
"@types/react-dom": "^18",
"@types/tailwindcss": "^3.0.11",
"chai": "^4.2.0",
"eslint": "^8",
"eslint-config-next": "14.2.13",
"ethereum-waffle": "^4.0.10",
"ethers": "^5.7.2",
"hardhat": "^2.22.15",
"husky": "^9.1.6",
"lint-staged": "^15.2.10",
"postcss": "^8",
"prettier": "^3.3.3",
"tailwindcss": "^3.4.1",
"ts-node": "^10.9.2",
"typescript": "^5"
},
"lint-staged": {