Commit 29fdcb80 authored by Vignesh Mohankumar's avatar Vignesh Mohankumar Committed by GitHub

build: upgrade prettier to v2.7.1 (#4109)

* style: prettier based on v2.2

* 2.7.1 instead?

* npx

* ^
parent 817ea44e
...@@ -2,9 +2,9 @@ version: 2 ...@@ -2,9 +2,9 @@ version: 2
updates: updates:
- package-ecosystem: npm - package-ecosystem: npm
# Files stored in repository root # Files stored in repository root
directory: "/" directory: '/'
schedule: schedule:
interval: "daily" interval: 'daily'
allow: allow:
- dependency-name: "@uniswap/token-lists" - dependency-name: '@uniswap/token-lists'
- dependency-name: "@uniswap/default-token-list" - dependency-name: '@uniswap/default-token-list'
...@@ -28,6 +28,6 @@ jobs: ...@@ -28,6 +28,6 @@ jobs:
create_pull_request: true create_pull_request: true
pull_request_title: 'chore(i18n): new Crowdin translations' pull_request_title: 'chore(i18n): new Crowdin translations'
localization_branch_name: l10n_crowdin localization_branch_name: l10n_crowdin
commit_message: "chore(i18n): synchronize translations from crowdin [skip ci]" commit_message: 'chore(i18n): synchronize translations from crowdin [skip ci]'
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
...@@ -17,7 +17,7 @@ jobs: ...@@ -17,7 +17,7 @@ jobs:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: ./.github/actions/setup - uses: ./.github/actions/setup
- run: yarn lint - run: yarn lint
deps-tests: deps-tests:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
...@@ -58,7 +58,7 @@ jobs: ...@@ -58,7 +58,7 @@ jobs:
key: ${{ runner.os }}-cypress-${{ hashFiles('node_modules/cypress') }} key: ${{ runner.os }}-cypress-${{ hashFiles('node_modules/cypress') }}
- if: steps.cypress-cache.outputs.cache-hit != 'true' - if: steps.cypress-cache.outputs.cache-hit != 'true'
run: yarn cypress install run: yarn cypress install
cypress-test-matrix: cypress-test-matrix:
needs: cypress-build needs: cypress-build
runs-on: ubuntu-latest runs-on: ubuntu-latest
......
...@@ -48,4 +48,4 @@ The Uniswap Interface supports swapping, adding liquidity, removing liquidity an ...@@ -48,4 +48,4 @@ The Uniswap Interface supports swapping, adding liquidity, removing liquidity an
## Accessing Uniswap V1 ## Accessing Uniswap V1
The Uniswap V1 interface for mainnet and testnets is accessible via IPFS gateways The Uniswap V1 interface for mainnet and testnets is accessible via IPFS gateways
linked from the [v1.0.0 release](https://github.com/Uniswap/uniswap-interface/releases/tag/v1.0.0). linked from the [v1.0.0 release](https://github.com/Uniswap/uniswap-interface/releases/tag/v1.0.0).
\ No newline at end of file
...@@ -24,83 +24,83 @@ ...@@ -24,83 +24,83 @@
--> -->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" /> <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<link rel="preconnect" href="https://www.google-analytics.com/"> <link rel="preconnect" href="https://www.google-analytics.com/" />
<link rel="preload" href="%PUBLIC_URL%/fonts/Inter-roman.var.woff2" as="font" type="font/woff2" crossorigin> <link rel="preload" href="%PUBLIC_URL%/fonts/Inter-roman.var.woff2" as="font" type="font/woff2" crossorigin />
<style> <style>
* { * {
font-family: 'Inter', sans-serif; font-family: 'Inter', sans-serif;
box-sizing: border-box; box-sizing: border-box;
} }
/** /**
Explicitly load Inter var from public/ so it does not block LCP's critical path. Explicitly load Inter var from public/ so it does not block LCP's critical path.
*/ */
@font-face { @font-face {
font-family: 'Inter custom'; font-family: 'Inter custom';
font-weight: 100 900; font-weight: 100 900;
font-style: normal; font-style: normal;
font-display: block; font-display: block;
font-named-instance: 'Regular'; font-named-instance: 'Regular';
src: url(%PUBLIC_URL%/fonts/Inter-roman.var.woff2) format("woff2 supports variations(gvar)"), src: url(%PUBLIC_URL%/fonts/Inter-roman.var.woff2) format('woff2 supports variations(gvar)'),
url(%PUBLIC_URL%/fonts/Inter-roman.var.woff2) format("woff2-variations"), url(%PUBLIC_URL%/fonts/Inter-roman.var.woff2) format('woff2-variations'),
url(%PUBLIC_URL%/fonts/Inter-roman.var.woff2) format("woff2"); url(%PUBLIC_URL%/fonts/Inter-roman.var.woff2) format('woff2');
} }
@supports (font-variation-settings: normal) { @supports (font-variation-settings: normal) {
* { * {
font-family: 'Inter custom', sans-serif; font-family: 'Inter custom', sans-serif;
}
}
html,
body {
margin: 0;
padding: 0;
}
button {
user-select: none;
} }
}
html,
body {
margin: 0;
padding: 0;
}
button {
user-select: none;
}
html {
font-size: 16px;
font-variant: none;
font-smooth: always;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
font-feature-settings: 'ss01' on, 'ss02' on, 'cv01' on, 'cv03' on;
}
#background-radial-gradient {
position: fixed;
top: 0;
left: 0;
right: 0;
pointer-events: none;
width: 200vw;
height: 200vh;
background: radial-gradient(50% 50% at 50% 50%, #fc077d10 0%, rgba(255, 255, 255, 0) 100%);
transform: translate(-50vw, -100vh);
z-index: -1;
}
html {
min-height: 100%;
}
@media (prefers-color-scheme: dark) {
html { html {
font-size: 16px; background-color: #212429;
font-variant: none;
font-smooth: always;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
font-feature-settings: 'ss01' on, 'ss02' on, 'cv01' on, 'cv03' on;
}
#background-radial-gradient {
position: fixed;
top: 0;
left: 0;
right: 0;
pointer-events: none;
width: 200vw;
height: 200vh;
background: radial-gradient(50% 50% at 50% 50%, #fc077d10 0%, rgba(255, 255, 255, 0) 100%);
transform: translate(-50vw, -100vh);
z-index: -1;
} }
}
@media (prefers-color-scheme: light) {
html { html {
min-height: 100%; background-color: #f7f8fa;
}
@media (prefers-color-scheme: dark) {
html {
background-color: #212429;
}
}
@media (prefers-color-scheme: light) {
html {
background-color: #F7F8FA;
}
} }
}
</style> </style>
</head> </head>
<body> <body>
......
...@@ -44,8 +44,7 @@ export interface L2ChainInfo extends BaseChainInfo { ...@@ -44,8 +44,7 @@ export interface L2ChainInfo extends BaseChainInfo {
export type ChainInfoMap = { readonly [chainId: number]: L1ChainInfo | L2ChainInfo } & { export type ChainInfoMap = { readonly [chainId: number]: L1ChainInfo | L2ChainInfo } & {
readonly [chainId in SupportedL2ChainId]: L2ChainInfo readonly [chainId in SupportedL2ChainId]: L2ChainInfo
} & } & { readonly [chainId in SupportedL1ChainId]: L1ChainInfo }
{ readonly [chainId in SupportedL1ChainId]: L1ChainInfo }
export const CHAIN_INFO: ChainInfoMap = { export const CHAIN_INFO: ChainInfoMap = {
[SupportedChainId.MAINNET]: { [SupportedChainId.MAINNET]: {
......
...@@ -33,7 +33,13 @@ export function useSwapCallback( ...@@ -33,7 +33,13 @@ export function useSwapCallback(
state, state,
callback: libCallback, callback: libCallback,
error, error,
} = useLibSwapCallBack({ trade, allowedSlippage, recipientAddressOrName: recipient, signatureData, deadline }) } = useLibSwapCallBack({
trade,
allowedSlippage,
recipientAddressOrName: recipient,
signatureData,
deadline,
})
const callback = useMemo(() => { const callback = useMemo(() => {
if (!libCallback || !trade) { if (!libCallback || !trade) {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
## Contributing ## Contributing
Translation files in this folder are automatically generated from our [Crowdin project](https://crowdin.com/project/uniswap-interface). Translation files in this folder are automatically generated from our [Crowdin project](https://crowdin.com/project/uniswap-interface).
See [CONTRIBUTING](https://github.com/Uniswap/uniswap-interface/blob/main/CONTRIBUTING.md#translations) on how to get started. See [CONTRIBUTING](https://github.com/Uniswap/uniswap-interface/blob/main/CONTRIBUTING.md#translations) on how to get started.
...@@ -10,8 +10,9 @@ export enum Bound { ...@@ -10,8 +10,9 @@ export enum Bound {
UPPER = 'UPPER', UPPER = 'UPPER',
} }
export const typeInput = export const typeInput = createAction<{ field: Field; typedValue: string; noLiquidity: boolean }>(
createAction<{ field: Field; typedValue: string; noLiquidity: boolean }>('mintV3/typeInputMint') 'mintV3/typeInputMint'
)
export const typeStartPriceInput = createAction<{ typedValue: string }>('mintV3/typeStartPriceInput') export const typeStartPriceInput = createAction<{ typedValue: string }>('mintV3/typeStartPriceInput')
export const typeLeftRangeInput = createAction<{ typedValue: string }>('mintV3/typeLeftRangeInput') export const typeLeftRangeInput = createAction<{ typedValue: string }>('mintV3/typeLeftRangeInput')
export const typeRightRangeInput = createAction<{ typedValue: string }>('mintV3/typeRightRangeInput') export const typeRightRangeInput = createAction<{ typedValue: string }>('mintV3/typeRightRangeInput')
......
...@@ -1201,14 +1201,21 @@ ...@@ -1201,14 +1201,21 @@
resolved "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz" resolved "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz"
integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow== integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==
"@emotion/is-prop-valid@0.8.8": "@emotion/is-prop-valid@0.8.8", "@emotion/is-prop-valid@^0.8.1":
version "0.8.8" version "0.8.8"
resolved "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz" resolved "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz"
integrity sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA== integrity sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==
dependencies: dependencies:
"@emotion/memoize" "0.7.4" "@emotion/memoize" "0.7.4"
"@emotion/memoize@0.7.4": "@emotion/is-prop-valid@^1.1.0":
version "1.1.3"
resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.1.3.tgz#f0907a416368cf8df9e410117068e20fe87c0a3a"
integrity sha512-RFg04p6C+1uO19uG8N+vqanzKqiM9eeV1LDOG3bmkYmuOj7NbKNlFC/4EZq5gnwAIlcC/jOT24f8Td0iax2SXA==
dependencies:
"@emotion/memoize" "^0.7.4"
"@emotion/memoize@0.7.4", "@emotion/memoize@^0.7.1", "@emotion/memoize@^0.7.4":
version "0.7.4" version "0.7.4"
resolved "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz" resolved "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.4.tgz"
integrity sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw== integrity sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==
...@@ -3198,8 +3205,8 @@ ...@@ -3198,8 +3205,8 @@
resolved "https://registry.npmjs.org/@styled-system/should-forward-prop/-/should-forward-prop-5.1.5.tgz" resolved "https://registry.npmjs.org/@styled-system/should-forward-prop/-/should-forward-prop-5.1.5.tgz"
integrity sha512-+rPRomgCGYnUIaFabDoOgpSDc4UUJ1KsmlnzcEp0tu5lFrBQKgZclSo18Z1URhaZm7a6agGtS5Xif7tuC2s52Q== integrity sha512-+rPRomgCGYnUIaFabDoOgpSDc4UUJ1KsmlnzcEp0tu5lFrBQKgZclSo18Z1URhaZm7a6agGtS5Xif7tuC2s52Q==
dependencies: dependencies:
"@emotion/is-prop-valid" "^0.8.8" "@emotion/is-prop-valid" "^0.8.1"
"@emotion/memoize" "^0.7.4" "@emotion/memoize" "^0.7.1"
styled-system "^5.1.5" styled-system "^5.1.5"
"@styled-system/space@^5.1.2": "@styled-system/space@^5.1.2":
...@@ -14617,10 +14624,10 @@ prettier-linter-helpers@^1.0.0: ...@@ -14617,10 +14624,10 @@ prettier-linter-helpers@^1.0.0:
dependencies: dependencies:
fast-diff "^1.1.2" fast-diff "^1.1.2"
prettier@^2.1.2, prettier@^2.2.1: prettier@^2.1.2, prettier@^2.7.1:
version "2.3.2" version "2.7.1"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.3.2.tgz#ef280a05ec253712e486233db5c6f23441e7342d" resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64"
integrity sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ== integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==
pretty-bytes@^5.3.0, pretty-bytes@^5.6.0: pretty-bytes@^5.3.0, pretty-bytes@^5.6.0:
version "5.6.0" version "5.6.0"
...@@ -16839,7 +16846,7 @@ styled-components@^5.3.5: ...@@ -16839,7 +16846,7 @@ styled-components@^5.3.5:
dependencies: dependencies:
"@babel/helper-module-imports" "^7.0.0" "@babel/helper-module-imports" "^7.0.0"
"@babel/traverse" "^7.4.5" "@babel/traverse" "^7.4.5"
"@emotion/is-prop-valid" "^0.8.8" "@emotion/is-prop-valid" "^1.1.0"
"@emotion/stylis" "^0.8.4" "@emotion/stylis" "^0.8.4"
"@emotion/unitless" "^0.7.4" "@emotion/unitless" "^0.7.4"
babel-plugin-styled-components ">= 1.12.0" babel-plugin-styled-components ">= 1.12.0"
...@@ -17782,7 +17789,7 @@ use-sidecar@^1.0.1: ...@@ -17782,7 +17789,7 @@ use-sidecar@^1.0.1:
detect-node-es "^1.1.0" detect-node-es "^1.1.0"
tslib "^1.9.3" tslib "^1.9.3"
use-sync-external-store@1.1.0, use-sync-external-store@^1.1.0: use-sync-external-store@1.1.0, use-sync-external-store@^1.0.0:
version "1.1.0" version "1.1.0"
resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.1.0.tgz#3343c3fe7f7e404db70f8c687adf5c1652d34e82" resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.1.0.tgz#3343c3fe7f7e404db70f8c687adf5c1652d34e82"
integrity sha512-SEnieB2FPKEVne66NpXPd1Np4R1lTNKfjuy3XdIoPQKYBAFdzbzSZlSn1KJZUiihQLQC5Znot4SBz1EOTBwQAQ== integrity sha512-SEnieB2FPKEVne66NpXPd1Np4R1lTNKfjuy3XdIoPQKYBAFdzbzSZlSn1KJZUiihQLQC5Znot4SBz1EOTBwQAQ==
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment