diff --git a/.gitignore b/.gitignore index 0094778..3d3a7e6 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,11 @@ yarn-error.log* # typescript *.tsbuildinfo +dist # turbo -.turbo \ No newline at end of file +.turbo + +# coverage +coverage +coverage.json diff --git a/.vscode/ethathon.code-workspace b/.vscode/ethathon.code-workspace index 96306b2..8474123 100644 --- a/.vscode/ethathon.code-workspace +++ b/.vscode/ethathon.code-workspace @@ -9,8 +9,8 @@ "path": "../packages/frontend" }, { - "name": "Hardhat", - "path": "../packages/hardhat" + "name": "Contracts", + "path": "../packages/contracts" } ], "settings": { @@ -23,9 +23,11 @@ "**/.yarn": true, "**/.turbo": true, "**/.next": true, - "packages/hardhat/cache/": true, - "packages/hardhat/deployments/": true + "**/packages/contracts/deployments": true }, + "search.useIgnoreFiles": true, + "search.useGlobalIgnoreFiles": true, + "search.useParentIgnoreFiles": true, "editor.defaultFormatter": "esbenp.prettier-vscode", "editor.formatOnSave": true, "editor.codeActionsOnSave": { diff --git a/README.md b/README.md index d201e97..15f2ffc 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ pnpm install # Copy & fill environments cp packages/frontend/.env.local.example packages/frontend/.env.local -cp packages/hardhat/.env.example packages/hardhat/.env +cp packages/contracts/.env.example packages/contracts/.env ``` ## Development diff --git a/packages/hardhat/.env.example b/packages/contracts/.env.example similarity index 100% rename from packages/hardhat/.env.example rename to packages/contracts/.env.example diff --git a/packages/hardhat/.eslintignore b/packages/contracts/.eslintignore similarity index 100% rename from packages/hardhat/.eslintignore rename to packages/contracts/.eslintignore diff --git a/packages/hardhat/.eslintrc.json b/packages/contracts/.eslintrc.json similarity index 100% rename from packages/hardhat/.eslintrc.json rename to packages/contracts/.eslintrc.json diff --git a/packages/hardhat/.gitignore b/packages/contracts/.gitignore similarity index 57% rename from packages/hardhat/.gitignore rename to packages/contracts/.gitignore index efef108..d532973 100644 --- a/packages/hardhat/.gitignore +++ b/packages/contracts/.gitignore @@ -2,8 +2,6 @@ cache artifacts node_modules -coverage -coverage.json typechain typechain-types -deployments/localhost +deployments/localhost \ No newline at end of file diff --git a/packages/hardhat/.lintstagedrc.json b/packages/contracts/.lintstagedrc.json similarity index 100% rename from packages/hardhat/.lintstagedrc.json rename to packages/contracts/.lintstagedrc.json diff --git a/packages/hardhat/.prettierignore b/packages/contracts/.prettierignore similarity index 100% rename from packages/hardhat/.prettierignore rename to packages/contracts/.prettierignore diff --git a/packages/hardhat/.solhint.json b/packages/contracts/.solhint.json similarity index 100% rename from packages/hardhat/.solhint.json rename to packages/contracts/.solhint.json diff --git a/packages/contracts/.vscode/settings.json b/packages/contracts/.vscode/settings.json new file mode 100644 index 0000000..384c639 --- /dev/null +++ b/packages/contracts/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "files.exclude": { + "**/deployments": true + } +} diff --git a/packages/hardhat/contracts/Auction.vy b/packages/contracts/contracts/Auction.vy similarity index 100% rename from packages/hardhat/contracts/Auction.vy rename to packages/contracts/contracts/Auction.vy diff --git a/packages/hardhat/contracts/Lock.sol b/packages/contracts/contracts/Lock.sol similarity index 100% rename from packages/hardhat/contracts/Lock.sol rename to packages/contracts/contracts/Lock.sol diff --git a/packages/hardhat/deploy/001_deploy_lock.ts b/packages/contracts/deploy/001_deploy_lock.ts similarity index 100% rename from packages/hardhat/deploy/001_deploy_lock.ts rename to packages/contracts/deploy/001_deploy_lock.ts diff --git a/packages/hardhat/deployments/goerli/.chainId b/packages/contracts/deployments/goerli/.chainId similarity index 100% rename from packages/hardhat/deployments/goerli/.chainId rename to packages/contracts/deployments/goerli/.chainId diff --git a/packages/hardhat/deployments/goerli/Lock.json b/packages/contracts/deployments/goerli/Lock.json similarity index 100% rename from packages/hardhat/deployments/goerli/Lock.json rename to packages/contracts/deployments/goerli/Lock.json diff --git a/packages/hardhat/deployments/goerli/solcInputs/e7da82d46eec8cf29d30989d701e5e28.json b/packages/contracts/deployments/goerli/solcInputs/e7da82d46eec8cf29d30989d701e5e28.json similarity index 100% rename from packages/hardhat/deployments/goerli/solcInputs/e7da82d46eec8cf29d30989d701e5e28.json rename to packages/contracts/deployments/goerli/solcInputs/e7da82d46eec8cf29d30989d701e5e28.json diff --git a/packages/hardhat/deployments/mumbai/.chainId b/packages/contracts/deployments/mumbai/.chainId similarity index 100% rename from packages/hardhat/deployments/mumbai/.chainId rename to packages/contracts/deployments/mumbai/.chainId diff --git a/packages/hardhat/deployments/mumbai/Lock.json b/packages/contracts/deployments/mumbai/Lock.json similarity index 100% rename from packages/hardhat/deployments/mumbai/Lock.json rename to packages/contracts/deployments/mumbai/Lock.json diff --git a/packages/hardhat/deployments/mumbai/solcInputs/e7da82d46eec8cf29d30989d701e5e28.json b/packages/contracts/deployments/mumbai/solcInputs/e7da82d46eec8cf29d30989d701e5e28.json similarity index 100% rename from packages/hardhat/deployments/mumbai/solcInputs/e7da82d46eec8cf29d30989d701e5e28.json rename to packages/contracts/deployments/mumbai/solcInputs/e7da82d46eec8cf29d30989d701e5e28.json diff --git a/packages/hardhat/hardhat.config.ts b/packages/contracts/hardhat.config.ts similarity index 86% rename from packages/hardhat/hardhat.config.ts rename to packages/contracts/hardhat.config.ts index e4b1184..f4930e0 100644 --- a/packages/hardhat/hardhat.config.ts +++ b/packages/contracts/hardhat.config.ts @@ -18,9 +18,8 @@ const config: HardhatUserConfig = { networks: { hardhat: { chainId: 1337, - // chainId: 80001, - // allowUnlimitedContractSize: false, - // blockGasLimit: 20000000, // 20 million + // allowUnlimitedContractSize: false, + // blockGasLimit: 20000000, // forking: { // url: "https://polygon-mumbai.g.alchemy.com/v2/${process.env.ALCHEMY_API_MUMBAI}", // url: "https://eth-rinkeby.alchemyapi.io/v2/${process.env.ALCHEMY_API_RINKEBY}", @@ -43,8 +42,10 @@ const config: HardhatUserConfig = { default: 0, }, }, - etherscan: { - apiKey: `${process.env.ETHERSCAN_API_KEY}`, + verify: { + etherscan: { + apiKey: `${process.env.ETHERSCAN_API_KEY}`, + }, }, } diff --git a/packages/hardhat/package.json b/packages/contracts/package.json similarity index 85% rename from packages/hardhat/package.json rename to packages/contracts/package.json index b3b0bc1..f9b164d 100644 --- a/packages/hardhat/package.json +++ b/packages/contracts/package.json @@ -1,5 +1,5 @@ { - "name": "@ethathon/hardhat", + "name": "@ethathon/contracts", "license": "MIT", "version": "0.0.1", "scripts": { @@ -7,14 +7,16 @@ "compile": "pnpm hardhat compile --no-typechain", "build": "pnpm clean && pnpm compile && pnpm types", "dev": "pnpm run build && pnpm run deploy", - "types": "pnpm typechain --target=ethers-v5 './artifacts/contracts/**/+([a-zA-Z0-9_]).json' --out-dir '../frontend/src/types/typechain/'", - "deploy": "pnpm hardhat node --export '../frontend/src/deployments/1337.json' --write true", - "deploy:mumbai": "pnpm hardhat deploy --network mumbai --export '../frontend/src/deployments/80001.json' --write true", - "deploy:goerli": "pnpm hardhat deploy --network goerli --export '../frontend/src/deployments/5.json' --write true", + "types": "pnpm typechain --target=ethers-v5 './artifacts/contracts/**/+([a-zA-Z0-9_]).json' --out-dir './typechain-types'", "lint": "prettier . --check && pnpm eslint", "lint:fix": "prettier . --write && pnpm eslint --fix", "eslint": "eslint . --ext .js,.ts", - "solhint": "solhint 'contracts/**/*.sol'" + "solhint": "solhint 'contracts/**/*.sol'", + "deploy": "pnpm hardhat node --export '../frontend/src/deployments/1337.json' --write true", + "deploy:mumbai": "pnpm hardhat deploy --network mumbai --export '../frontend/src/deployments/80001.json' --write true", + "deploy:goerli": "pnpm hardhat deploy --network goerli --export '../frontend/src/deployments/5.json' --write true", + "verify:mumbai": "source .env && pnpm hardhat etherscan-verify --network mumbai --api-key $POLYGONSCAN_API_KEY", + "verify:goerli": "pnpm hardhat etherscan-verify --network goerli" }, "devDependencies": { "@ethersproject/abi": "^5.7.0", diff --git a/packages/hardhat/test/Lock.ts b/packages/contracts/test/Lock.ts similarity index 100% rename from packages/hardhat/test/Lock.ts rename to packages/contracts/test/Lock.ts diff --git a/packages/hardhat/tsconfig.json b/packages/contracts/tsconfig.json similarity index 51% rename from packages/hardhat/tsconfig.json rename to packages/contracts/tsconfig.json index 2441945..07bd73d 100644 --- a/packages/hardhat/tsconfig.json +++ b/packages/contracts/tsconfig.json @@ -4,10 +4,20 @@ "module": "commonjs", "strict": true, "esModuleInterop": true, + "outDir": "dist", + "declaration": true, + "declarationMap": true, "resolveJsonModule": true, - "baseUrl": "." + "baseUrl": ".", + "composite": true }, "exclude": ["dist", "node_modules", "cache", "artifacts", "deployments"], - "include": ["./scripts/**/*.ts", "./deploy/**/*.ts", "./shared/**/*.ts", "./test/**/*.ts"], + "include": [ + "./scripts/**/*.ts", + "./deploy/**/*.ts", + "./shared/**/*.ts", + "./test/**/*.ts", + "./typechain-types" + ], "files": ["./hardhat.config.ts"] } diff --git a/packages/frontend/.gitignore b/packages/frontend/.gitignore index 5209ab3..4b935ef 100644 --- a/packages/frontend/.gitignore +++ b/packages/frontend/.gitignore @@ -1,41 +1,4 @@ -# dependencies -/node_modules -/.pnp -.pnp.js - -# testing -/coverage - -# next.js -/.next/ -/out/ - -# production -/build - -# misc -.DS_Store -*.pem - -# debug -npm-debug.log* -yarn-debug.log* -yarn-error.log* -.pnpm-debug.log* - -# local env files -.env.local -.env.development.local -.env.test.local -.env.production.local - -# vercel -.vercel - -# typescript -*.tsbuildinfo - -# Hardhat & Typechain -src/artifacts -src/types/typechain/** +.next/ +out/ +build src/deployments/1337.json \ No newline at end of file diff --git a/packages/frontend/next.config.js b/packages/frontend/next.config.js index 44a45e6..70e180b 100644 --- a/packages/frontend/next.config.js +++ b/packages/frontend/next.config.js @@ -8,4 +8,7 @@ const nextConfig = { /* config options here */ } -module.exports = nextConfig +// eslint-disable-next-line +const withTM = require('next-transpile-modules')(['@yieldgate/contracts']) + +module.exports = withTM(nextConfig) diff --git a/packages/frontend/package.json b/packages/frontend/package.json index 3d5cd01..68522b6 100644 --- a/packages/frontend/package.json +++ b/packages/frontend/package.json @@ -18,6 +18,7 @@ "test": "jest --passWithNoTests" }, "dependencies": { + "@ethathon/contracts": "workspace:*", "@apollo/client": "^3.6.9", "@chakra-ui/react": "^2.3.1", "@emotion/css": "^11.10.0", @@ -35,6 +36,7 @@ "graphql": "^16.6.0", "graphql-request": "^5.0.0", "next": "^12.2.5", + "next-transpile-modules": "^9.0.0", "next-seo": "^5.5.0", "next-themes": "^0.2.0", "nprogress": "^0.2.0", diff --git a/packages/frontend/tsconfig.json b/packages/frontend/tsconfig.json index 776760f..0640fdd 100644 --- a/packages/frontend/tsconfig.json +++ b/packages/frontend/tsconfig.json @@ -20,10 +20,10 @@ "@shared/*": ["./src/shared/*"], "@models/*": ["./src/models/*"], "@styles/*": ["./src/styles/*"], - "@artifacts/*": ["./src/artifacts/*"], "@deployments/*": ["./src/deployments/*"] } }, + "references": [{ "path": "../contracts" }], "include": ["next-env.d.ts", "**/*.js", "**/*.ts", "**/*.tsx", "**/*.json"], "exclude": ["node_modules", ".next", "out"], "types": ["src/types"] diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5667a37..2b280bc 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -16,6 +16,66 @@ importers: turbo: 1.4.3 typescript: 4.8.2 + packages/contracts: + specifiers: + '@ethersproject/abi': ^5.7.0 + '@ethersproject/providers': ^5.7.0 + '@nomicfoundation/hardhat-chai-matchers': ^1.0.3 + '@nomicfoundation/hardhat-network-helpers': ^1.0.4 + '@nomicfoundation/hardhat-toolbox': ^1.0.2 + '@nomiclabs/hardhat-ethers': npm:hardhat-deploy-ethers@0.3.0-beta.13 + '@nomiclabs/hardhat-etherscan': ^3.1.0 + '@nomiclabs/hardhat-vyper': ^3.0.0 + '@openzeppelin/contracts': ^4.7.3 + '@typechain/ethers-v5': ^10.1.0 + '@types/chai': ^4.3.3 + '@types/mocha': ^9.1.1 + '@types/node': ^16.11.56 + '@typescript-eslint/eslint-plugin': ^5.36.1 + '@typescript-eslint/parser': ^5.36.1 + chai: ^4.3.6 + dotenv: ^16.0.2 + eslint: ^8.23.0 + eslint-config-prettier: ^8.5.0 + ethers: ^5.7.0 + hardhat: ^2.10.2 + hardhat-deploy: ^0.11.12 + hardhat-gas-reporter: ^1.0.8 + solhint: ^3.3.7 + solidity-coverage: ^0.7.21 + ts-node: ^10.9.1 + typechain: ^8.1.0 + typescript: ^4.8.2 + devDependencies: + '@ethersproject/abi': 5.7.0 + '@ethersproject/providers': 5.7.0 + '@nomicfoundation/hardhat-chai-matchers': 1.0.3_2xu332kg42vzobgaxtmbrawzci + '@nomicfoundation/hardhat-network-helpers': 1.0.4_hardhat@2.10.2 + '@nomicfoundation/hardhat-toolbox': 1.0.2_nrcue57xyrx7s5fieszbzgazyi + '@nomiclabs/hardhat-ethers': /hardhat-deploy-ethers/0.3.0-beta.13_lc7o4ykyrnccnzpoyzs6m3zzsq + '@nomiclabs/hardhat-etherscan': 3.1.0_hardhat@2.10.2 + '@nomiclabs/hardhat-vyper': 3.0.0_hardhat@2.10.2 + '@openzeppelin/contracts': 4.7.3 + '@typechain/ethers-v5': 10.1.0_oics2lra7dfizs2e266hlek3em + '@types/chai': 4.3.3 + '@types/mocha': 9.1.1 + '@types/node': 16.11.56 + '@typescript-eslint/eslint-plugin': 5.36.1_lbwfnm54o3pmr3ypeqp3btnera + '@typescript-eslint/parser': 5.36.1_yqf6kl63nyoq5megxukfnom5rm + chai: 4.3.6 + dotenv: 16.0.2 + eslint: 8.23.0 + eslint-config-prettier: 8.5.0_eslint@8.23.0 + ethers: 5.7.0 + hardhat: 2.10.2_s5ojjbx2isjkawqptqpitvy25q + hardhat-deploy: 0.11.12 + hardhat-gas-reporter: 1.0.8_hardhat@2.10.2 + solhint: 3.3.7 + solidity-coverage: 0.7.21 + ts-node: 10.9.1_o7liyg2j45tnaks7f56gkfbn7y + typechain: 8.1.0_typescript@4.8.2 + typescript: 4.8.2 + packages/frontend: specifiers: '@apollo/client': ^3.6.9 @@ -28,6 +88,7 @@ importers: '@emotion/react': ^11.10.4 '@emotion/server': ^11.10.0 '@emotion/styled': ^11.10.4 + '@ethathon/contracts': workspace:* '@ethersproject/abi': ^5.7.0 '@ethersproject/providers': ^5.7.0 '@headlessui/react': ^1.6.6 @@ -62,6 +123,7 @@ importers: next-seo: ^5.5.0 next-sitemap: ^3.1.21 next-themes: ^0.2.0 + next-transpile-modules: ^9.0.0 nprogress: ^0.2.0 prettier: ^2.7.1 react: ^18.2.0 @@ -83,6 +145,7 @@ importers: '@emotion/react': 11.10.4_v3lqmnp7jnla5x5eji467wk4ae '@emotion/server': 11.10.0_@emotion+css@11.10.0 '@emotion/styled': 11.10.4_qzbwge7tbhs2ordiiw7o6wknfm + '@ethathon/contracts': link:../contracts '@headlessui/react': 1.6.6_biqbaboplfbrettd7655fr4n2y '@rainbow-me/rainbowkit': 0.5.0_hdtjyyvadrest7bfvjy3ijrzx4 axios: 0.27.2 @@ -96,6 +159,7 @@ importers: next: 12.2.5_5f5c5te2jv7jbhcllvc5kfwvli next-seo: 5.5.0_3xcjr4wz26biff45sz3jtokgje next-themes: 0.2.0_3xcjr4wz26biff45sz3jtokgje + next-transpile-modules: 9.0.0 nprogress: 0.2.0 react: 18.2.0 react-dom: 18.2.0_react@18.2.0 @@ -137,66 +201,6 @@ importers: twin.macro: 3.0.0-rc.3 typescript: 4.8.2 - packages/hardhat: - specifiers: - '@ethersproject/abi': ^5.7.0 - '@ethersproject/providers': ^5.7.0 - '@nomicfoundation/hardhat-chai-matchers': ^1.0.3 - '@nomicfoundation/hardhat-network-helpers': ^1.0.4 - '@nomicfoundation/hardhat-toolbox': ^1.0.2 - '@nomiclabs/hardhat-ethers': npm:hardhat-deploy-ethers@0.3.0-beta.13 - '@nomiclabs/hardhat-etherscan': ^3.1.0 - '@nomiclabs/hardhat-vyper': ^3.0.0 - '@openzeppelin/contracts': ^4.7.3 - '@typechain/ethers-v5': ^10.1.0 - '@types/chai': ^4.3.3 - '@types/mocha': ^9.1.1 - '@types/node': ^16.11.56 - '@typescript-eslint/eslint-plugin': ^5.36.1 - '@typescript-eslint/parser': ^5.36.1 - chai: ^4.3.6 - dotenv: ^16.0.2 - eslint: ^8.23.0 - eslint-config-prettier: ^8.5.0 - ethers: ^5.7.0 - hardhat: ^2.10.2 - hardhat-deploy: ^0.11.12 - hardhat-gas-reporter: ^1.0.8 - solhint: ^3.3.7 - solidity-coverage: ^0.7.21 - ts-node: ^10.9.1 - typechain: ^8.1.0 - typescript: ^4.8.2 - devDependencies: - '@ethersproject/abi': 5.7.0 - '@ethersproject/providers': 5.7.0 - '@nomicfoundation/hardhat-chai-matchers': 1.0.3_2xu332kg42vzobgaxtmbrawzci - '@nomicfoundation/hardhat-network-helpers': 1.0.4_hardhat@2.10.2 - '@nomicfoundation/hardhat-toolbox': 1.0.2_nrcue57xyrx7s5fieszbzgazyi - '@nomiclabs/hardhat-ethers': /hardhat-deploy-ethers/0.3.0-beta.13_lc7o4ykyrnccnzpoyzs6m3zzsq - '@nomiclabs/hardhat-etherscan': 3.1.0_hardhat@2.10.2 - '@nomiclabs/hardhat-vyper': 3.0.0_hardhat@2.10.2 - '@openzeppelin/contracts': 4.7.3 - '@typechain/ethers-v5': 10.1.0_oics2lra7dfizs2e266hlek3em - '@types/chai': 4.3.3 - '@types/mocha': 9.1.1 - '@types/node': 16.11.56 - '@typescript-eslint/eslint-plugin': 5.36.1_lbwfnm54o3pmr3ypeqp3btnera - '@typescript-eslint/parser': 5.36.1_yqf6kl63nyoq5megxukfnom5rm - chai: 4.3.6 - dotenv: 16.0.2 - eslint: 8.23.0 - eslint-config-prettier: 8.5.0_eslint@8.23.0 - ethers: 5.7.0 - hardhat: 2.10.2_s5ojjbx2isjkawqptqpitvy25q - hardhat-deploy: 0.11.12 - hardhat-gas-reporter: 1.0.8_hardhat@2.10.2 - solhint: 3.3.7 - solidity-coverage: 0.7.21 - ts-node: 10.9.1_o7liyg2j45tnaks7f56gkfbn7y - typechain: 8.1.0_typescript@4.8.2 - typescript: 4.8.2 - packages: /@ampproject/remapping/2.2.0: @@ -5289,7 +5293,7 @@ packages: engines: {node: '>=6'} dependencies: buffer: 5.7.1 - immediate: 3.2.3 + immediate: 3.3.0 level-concat-iterator: 2.0.1 level-supports: 1.0.1 xtend: 4.0.2 @@ -5810,7 +5814,7 @@ packages: /axios/0.27.2: resolution: {integrity: sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==} dependencies: - follow-redirects: 1.15.1_debug@4.3.4 + follow-redirects: 1.15.1 form-data: 4.0.0 transitivePeerDependencies: - debug @@ -7092,7 +7096,7 @@ packages: supports-color: optional: true dependencies: - ms: 2.1.1 + ms: 2.1.3 supports-color: 6.0.0 dev: true @@ -7490,7 +7494,6 @@ packages: dependencies: graceful-fs: 4.2.10 tapable: 2.2.1 - dev: true /enquirer/2.3.6: resolution: {integrity: sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==} @@ -8752,7 +8755,6 @@ packages: peerDependenciesMeta: debug: optional: true - dev: false /follow-redirects/1.15.1_debug@4.3.4: resolution: {integrity: sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==} @@ -8764,6 +8766,7 @@ packages: optional: true dependencies: debug: 4.3.4 + dev: true /for-each/0.3.3: resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==} @@ -9103,7 +9106,7 @@ packages: fs.realpath: 1.0.0 inflight: 1.0.6 inherits: 2.0.4 - minimatch: 3.0.4 + minimatch: 3.1.2 once: 1.4.0 path-is-absolute: 1.0.1 dev: true @@ -9128,6 +9131,7 @@ packages: minimatch: 3.1.2 once: 1.4.0 path-is-absolute: 1.0.1 + dev: true /glob/7.2.3: resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==} @@ -12103,6 +12107,13 @@ packages: resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==} dev: true + /next-transpile-modules/9.0.0: + resolution: {integrity: sha512-VCNFOazIAnXn1hvgYYSTYMnoWgKgwlYh4lm1pKbSfiB3kj5ZYLcKVhfh3jkPOg1cnd9DP+pte9yCUocdPEUBTQ==} + dependencies: + enhanced-resolve: 5.10.0 + escalade: 3.1.1 + dev: false + /next/12.2.5_5f5c5te2jv7jbhcllvc5kfwvli: resolution: {integrity: sha512-tBdjqX5XC/oFs/6gxrZhjmiq90YWizUYU6qOWAfat7zJwrwapJ+BYgX2PmiacunXMaRpeVT4vz5MSPSLgNkrpA==} engines: {node: '>=12.22.0'} @@ -13791,7 +13802,7 @@ packages: resolution: {integrity: sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==} hasBin: true dependencies: - glob: 7.2.0 + glob: 7.2.3 /rimraf/3.0.2: resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==} @@ -14238,7 +14249,7 @@ packages: dependencies: command-exists: 1.2.9 commander: 3.0.2 - follow-redirects: 1.15.1_debug@4.3.4 + follow-redirects: 1.15.1 fs-extra: 0.30.0 js-sha3: 0.8.0 memorystream: 0.3.1 @@ -14814,7 +14825,6 @@ packages: /tapable/2.2.1: resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==} engines: {node: '>=6'} - dev: true /tar-fs/2.1.1: resolution: {integrity: sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==} diff --git a/turbo.json b/turbo.json index c840ca3..0076fac 100644 --- a/turbo.json +++ b/turbo.json @@ -3,34 +3,16 @@ "baseBranch": "origin/main", "pipeline": { "build": { - "dependsOn": [ - "^build" - ], - "outputs": [ - ".next/**", - "src/types/typechain/**" - ] + "dependsOn": ["^build"], + "outputs": [".next/**", "deployments/**", "artifacts/**", "typechain-types/**"] }, "@ethathon/frontend#build": { - "dependsOn": [ - "@ethathon/hardhat#build" - ], - "outputs": [ - ".next/**", - "src/types/typechain/**" - ] + "dependsOn": ["@ethathon/contracts#build"], + "outputs": [".next/**", "deployments/**", "artifacts/**", "typechain-types/**"] }, - "dev": { - "dependsOn": [ - "@ethathon/hardhat#build", - "^dev" - ], - "outputs": [ - ".next/**", - "src/types/typechain/**", - "artifacts/**", - "src/deployments/1337.json" - ] + "@ethathon/frontend#dev": { + "dependsOn": ["@ethathon/contracts#build"], + "outputs": [".next/**", "deployments/**", "artifacts/**", "typechain-types/**"] }, "lint": { "outputs": [] @@ -45,4 +27,4 @@ ".prettierrc.json", ".solhint.json" ] -} \ No newline at end of file +}