Commit 449ed018 authored by Ian Lapham's avatar Ian Lapham Committed by GitHub

Merge pull request #3 from Uniswap/prettier-upgrade

upgrade prettier
parents b05c4c11 adcecdee
...@@ -8,9 +8,7 @@ ...@@ -8,9 +8,7 @@
"jsx": true "jsx": true
} }
}, },
"ignorePatterns": [ "ignorePatterns": ["node_modules/**/*"],
"node_modules/**/*"
],
"settings": { "settings": {
"react": { "react": {
"version": "detect" "version": "detect"
...@@ -28,4 +26,4 @@ ...@@ -28,4 +26,4 @@
"prettier/prettier": "error", "prettier/prettier": "error",
"@typescript-eslint/no-explicit-any": "off" "@typescript-eslint/no-explicit-any": "off"
} }
} }
\ No newline at end of file
...@@ -10,9 +10,10 @@ assignees: '' ...@@ -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.
......
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: ...@@ -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: ...@@ -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
...@@ -10,7 +10,7 @@ module.exports = { ...@@ -10,7 +10,7 @@ module.exports = {
reactDocgen: 'react-docgen-typescript', reactDocgen: 'react-docgen-typescript',
reactDocgenTypescriptOptions: { reactDocgenTypescriptOptions: {
shouldExtractLiteralValuesFromEnum: true, shouldExtractLiteralValuesFromEnum: true,
propFilter: prop => (prop.parent ? !/node_modules/.test(prop.parent.fileName) : true) propFilter: (prop) => (prop.parent ? !/node_modules/.test(prop.parent.fileName) : true),
} },
} },
} }
...@@ -8,10 +8,10 @@ export const parameters = { ...@@ -8,10 +8,10 @@ export const parameters = {
actions: { argTypesRegex: '^on[A-Z].*' }, actions: { argTypesRegex: '^on[A-Z].*' },
dependencies: { dependencies: {
withStoriesOnly: true, withStoriesOnly: true,
hideEmpty: true hideEmpty: true,
}, },
docs: { docs: {
theme: storybookThemes.light theme: storybookThemes.light,
}, },
viewport: { viewport: {
viewports: { viewports: {
...@@ -19,32 +19,32 @@ export const parameters = { ...@@ -19,32 +19,32 @@ export const parameters = {
name: 'iPhone X', name: 'iPhone X',
styles: { styles: {
width: '375px', width: '375px',
height: '812px' height: '812px',
} },
}, },
tablet: { tablet: {
name: 'iPad', name: 'iPad',
styles: { styles: {
width: '768px', width: '768px',
height: '1024px' height: '1024px',
} },
}, },
laptop: { laptop: {
name: 'Laptop', name: 'Laptop',
styles: { styles: {
width: '1024px', width: '1024px',
height: '768px' height: '768px',
} },
}, },
desktop: { desktop: {
name: 'Desktop', name: 'Desktop',
styles: { styles: {
width: '1440px', width: '1440px',
height: '1024px' height: '1024px',
} },
} },
} },
} },
} }
export const globalTypes = { export const globalTypes = {
...@@ -54,9 +54,9 @@ export const globalTypes = { ...@@ -54,9 +54,9 @@ export const globalTypes = {
defaultValue: 'light', defaultValue: 'light',
toolbar: { toolbar: {
icon: 'circlehollow', icon: 'circlehollow',
items: ['light', 'dark'] items: ['light', 'dark'],
} },
} },
} }
const withProviders = (Component: Story, context: Record<string, any>) => { const withProviders = (Component: Story, context: Record<string, any>) => {
......
...@@ -4,11 +4,11 @@ import { create } from '@storybook/theming' ...@@ -4,11 +4,11 @@ import { create } from '@storybook/theming'
const uniswapBaseTheme = { const uniswapBaseTheme = {
brandTitle: 'Uniswap Design', brandTitle: 'Uniswap Design',
brandUrl: 'https://uniswap.org', brandUrl: 'https://uniswap.org',
brandImage: 'https://ipfs.io/ipfs/QmNa8mQkrNKp1WEEeGjFezDmDeodkWRevGFN8JCV7b4Xir' brandImage: 'https://ipfs.io/ipfs/QmNa8mQkrNKp1WEEeGjFezDmDeodkWRevGFN8JCV7b4Xir',
} }
export const light = create({ export const light = create({
base: 'light', base: 'light',
...uniswapBaseTheme ...uniswapBaseTheme,
}) })
// export const dark = create({ // export const dark = create({
......
...@@ -18,13 +18,13 @@ An open source interface for Uniswap -- a protocol for decentralized exchange of ...@@ -18,13 +18,13 @@ An open source interface for Uniswap -- a protocol for decentralized exchange of
## Accessing the Uniswap Interface ## Accessing the Uniswap Interface
To access the Uniswap Interface, use an IPFS gateway link from the To access the Uniswap Interface, use an IPFS gateway link from the
[latest release](https://github.com/Uniswap/uniswap-interface/releases/latest), [latest release](https://github.com/Uniswap/uniswap-interface/releases/latest),
or visit [app.uniswap.org](https://app.uniswap.org). or visit [app.uniswap.org](https://app.uniswap.org).
## Listing a token ## Listing a token
Please see the Please see the
[@uniswap/default-token-list](https://github.com/uniswap/default-token-list) [@uniswap/default-token-list](https://github.com/uniswap/default-token-list)
repository. repository.
## Development ## Development
...@@ -47,20 +47,20 @@ To have the interface default to a different network when a wallet is not connec ...@@ -47,20 +47,20 @@ To have the interface default to a different network when a wallet is not connec
1. Make a copy of `.env` named `.env.local` 1. Make a copy of `.env` named `.env.local`
2. Change `REACT_APP_NETWORK_ID` to `"{YOUR_NETWORK_ID}"` 2. Change `REACT_APP_NETWORK_ID` to `"{YOUR_NETWORK_ID}"`
3. Change `REACT_APP_NETWORK_URL` to e.g. `"https://{YOUR_NETWORK_ID}.infura.io/v3/{YOUR_INFURA_KEY}"` 3. Change `REACT_APP_NETWORK_URL` to e.g. `"https://{YOUR_NETWORK_ID}.infura.io/v3/{YOUR_INFURA_KEY}"`
Note that the interface only works on testnets where both Note that the interface only works on testnets where both
[Uniswap V2](https://uniswap.org/docs/v2/smart-contracts/factory/) and [Uniswap V2](https://uniswap.org/docs/v2/smart-contracts/factory/) and
[multicall](https://github.com/makerdao/multicall) are deployed. [multicall](https://github.com/makerdao/multicall) are deployed.
The interface will not work on other networks. The interface will not work on other networks.
## Contributions ## Contributions
**Please open all pull requests against the `master` branch.** **Please open all pull requests against the `master` branch.**
CI checks will run against all PRs. CI checks will run against all PRs.
## Accessing Uniswap Interface V1 ## Accessing Uniswap Interface V1
The Uniswap Interface supports swapping against, and migrating or removing liquidity from Uniswap V1. However, The Uniswap Interface supports swapping against, and migrating or removing liquidity from Uniswap V1. However,
if you would like to use Uniswap V1, the Uniswap V1 interface for mainnet and testnets is accessible via IPFS gateways if you would like to use Uniswap V1, 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).
...@@ -16017,11 +16017,6 @@ prettier-linter-helpers@^1.0.0: ...@@ -16017,11 +16017,6 @@ prettier-linter-helpers@^1.0.0:
dependencies: dependencies:
fast-diff "^1.1.2" fast-diff "^1.1.2"
prettier@^1.17.0:
version "1.19.1"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
prettier@~2.0.5: prettier@~2.0.5:
version "2.0.5" version "2.0.5"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.5.tgz#d6d56282455243f2f92cc1716692c08aa31522d4" resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.5.tgz#d6d56282455243f2f92cc1716692c08aa31522d4"
......
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