Merge pull request #7 from Uniswap/prettier-upgrade

upgrade prettier
This commit is contained in:
Jordan Frankfurt 2021-02-16 03:44:49 -05:00 committed by GitHub
commit 37b0e2fa28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 16830 additions and 16 deletions

@ -25,6 +25,7 @@
"@typescript-eslint/explicit-function-return-type": "off", "@typescript-eslint/explicit-function-return-type": "off",
"prettier/prettier": "error", "prettier/prettier": "error",
"@typescript-eslint/no-explicit-any": "off", "@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/ban-ts-comment": "off" "@typescript-eslint/ban-ts-comment": "off",
"@typescript-eslint/ban-ts-ignore": "off"
} }
} }

@ -10,9 +10,10 @@ assignees: ''
A clear and concise description of the bug. A clear and concise description of the bug.
**Steps to Reproduce** **Steps to Reproduce**
1. Go to ... 1. Go to ...
2. Click on ... 2. Click on ...
... ...
**Expected Behavior** **Expected Behavior**
A clear and concise description of what you expected to happen. A clear and concise description of what you expected to happen.

@ -1,7 +1,7 @@
name: Release name: Release
on: on:
# schedule: # schedule:
# - cron: '0 12 * * 1-4' # every day 12:00 UTC Monday-Thursday # - cron: '0 12 * * 1-4' # every day 12:00 UTC Monday-Thursday
# manual trigger # manual trigger
workflow_dispatch: workflow_dispatch:

@ -35,7 +35,7 @@ jobs:
- run: yarn build - run: yarn build
env: env:
CI: false CI: false
REACT_APP_NETWORK_URL: "https://mainnet.infura.io/v3/4bf032f2d38a4ed6bb975b80d6340847" REACT_APP_NETWORK_URL: 'https://mainnet.infura.io/v3/4bf032f2d38a4ed6bb975b80d6340847'
- run: yarn integration-test - run: yarn integration-test
unit-tests: unit-tests:
@ -62,4 +62,3 @@ jobs:
${{ runner.os }}-yarn- ${{ runner.os }}-yarn-
- run: yarn install --frozen-lockfile - run: yarn install --frozen-lockfile
- run: yarn test - run: yarn test

@ -51,6 +51,7 @@
"eslint-plugin-react": "^7.19.0", "eslint-plugin-react": "^7.19.0",
"eslint-plugin-react-hooks": "^4.0.0", "eslint-plugin-react-hooks": "^4.0.0",
"ethers": "^5.0.7", "ethers": "^5.0.7",
"husky": "^5.0.9",
"i18next": "^15.0.9", "i18next": "^15.0.9",
"i18next-browser-languagedetector": "^3.0.1", "i18next-browser-languagedetector": "^3.0.1",
"i18next-xhr-backend": "^2.0.1", "i18next-xhr-backend": "^2.0.1",
@ -62,7 +63,8 @@
"multihashes": "^3.0.1", "multihashes": "^3.0.1",
"node-vibrant": "^3.1.5", "node-vibrant": "^3.1.5",
"polished": "^3.3.2", "polished": "^3.3.2",
"prettier": "^1.17.0", "prettier": "^2.2.1",
"pretty-quick": "^3.1.0",
"qs": "^6.9.4", "qs": "^6.9.4",
"react": "^17.0.1", "react": "^17.0.1",
"react-confetti": "^6.0.0", "react-confetti": "^6.0.0",
@ -121,5 +123,10 @@
"dependencies": { "dependencies": {
"@uniswap/default-token-list": "^2.0.0", "@uniswap/default-token-list": "^2.0.0",
"lightweight-charts": "^3.3.0" "lightweight-charts": "^3.3.0"
},
"husky": {
"hooks": {
"pre-commit": "pretty-quick --staged"
}
} }
} }

@ -88,7 +88,6 @@ const Container = styled.div<{ hideInput: boolean }>`
const StyledTokenName = styled.span<{ active?: boolean }>` const StyledTokenName = styled.span<{ active?: boolean }>`
${({ active }) => (active ? ' margin: 0 0.25rem 0 0.75rem;' : ' margin: 0 0.25rem 0 0.25rem;')} ${({ active }) => (active ? ' margin: 0 0.25rem 0 0.75rem;' : ' margin: 0 0.25rem 0 0.25rem;')}
font-size: ${({ active }) => (active ? '20px' : '16px')}; font-size: ${({ active }) => (active ? '20px' : '16px')};
` `
const StyledBalanceMax = styled.button` const StyledBalanceMax = styled.button`

@ -19,7 +19,6 @@ export default function useAddTokenToMetamask(
.request({ .request({
method: 'wallet_watchAsset', method: 'wallet_watchAsset',
params: { params: {
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
//@ts-ignore // need this for incorrect ethers provider type //@ts-ignore // need this for incorrect ethers provider type
type: 'ERC20', type: 'ERC20',
options: { options: {

16808
yarn.lock Normal file

File diff suppressed because it is too large Load Diff