Merge pull request #1982 from gnosis/uniswap-merge

[:unicorn:  Uniswap Merge] v4.20.1

.eslintrc.json

@@ -35,12 +35,33 @@
       "error",
       {
         "paths": [
+          {
+            "name": "lodash",
+            "message": "Please import from 'lodash/module' directly to support tree-shaking."
+          },
+          {
+            "name": "ethers",
+            "message": "Please import from '@ethersproject/module' directly to support tree-shaking."
+          },
           {
             "name": "styled-components",
             "message": "Please import from styled-components/macro."
+          },
+          {
+            "name": "@lingui/macro",
+            "importNames": ["t"],
+            "message": "Please use <Trans> instead of t."
           }
         ],
-        "patterns": ["!styled-components/macro"]
+        "patterns": [
+          {
+            "group": ["**/dist"],
+            "message": "Do not import from dist/ - this is an implementation detail, and breaks tree-shaking."
+          },
+          {
+            "group": ["!styled-components/macro"]
+          }
+        ]
       }
     ]
   }

.github/uniswap-original/workflows/lint.yml

@@ -11,6 +11,7 @@ on:
 jobs:
   run-linters:
     name: Run linters
+    if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.owner.login == github.repository_owner }}
     runs-on: ubuntu-latest
 
     steps:

.gitignore

@@ -18,6 +18,9 @@
 # production
 /build
 
+# bundle
+/dist
+
 # misc
 .DS_Store
 .env.local

README.md

@@ -72,6 +72,14 @@ yarn start:default
 yarn cypress
 ```
 
+### Run cosmos
+
+This will start a server on the `http://localhost:5000/`
+
+```bash
+yarn run cosmos
+```
+
 ## Configuring the environment (optional)
 
 The app has some default configuration, but it's highly encouraged to define your own.

cosmos.config.json

@@ -0,0 +1,7 @@
+{
+  "staticPath": "public",
+  "watchDirs": ["src"],
+  "webpack": {
+    "configPath": "./cosmos.webpack.config"
+  }
+}

cosmos.webpack.config.js

@@ -0,0 +1,6 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
+const { createWebpackDevConfig } = require('@craco/craco')
+const cracoConfig = require('./craco.config.js')
+const webpackConfig = createWebpackDevConfig(cracoConfig)
+
+module.exports = webpackConfig

craco.config.js

@@ -26,32 +26,30 @@ if (SENTRY_AUTH_TOKEN) {
   )
 }
 
-module.exports = function () {
-  return {
-    babel: {
-      plugins: [
-        '@babel/plugin-proposal-nullish-coalescing-operator',
-        [
-          '@simbathesailor/babel-plugin-use-what-changed',
-          {
-            active: process.env.NODE_ENV === 'development', // boolean
-          },
-        ],
+module.exports = {
+  babel: {
+    plugins: [
+      '@babel/plugin-proposal-nullish-coalescing-operator',
+      [
+        '@simbathesailor/babel-plugin-use-what-changed',
+        {
+          active: process.env.NODE_ENV === 'development', // boolean
+        },
       ],
+    ],
+  },
+  webpack: {
+    plugins,
+    alias: {
+      '@src': path.resolve(__dirname, 'src'),
     },
-    webpack: {
-      plugins,
-      alias: {
-        '@src': path.resolve(__dirname, 'src'),
+    // https://webpack.js.org/configuration
+    configure: (webpackConfig) => ({
+      ...webpackConfig,
+      resolve: {
+        ...webpackConfig.resolve,
+        modules: [path.resolve(__dirname, 'src/custom'), ...webpackConfig.resolve.modules],
       },
-      // https://webpack.js.org/configuration
-      configure: (webpackConfig) => ({
-        ...webpackConfig,
-        resolve: {
-          ...webpackConfig.resolve,
-          modules: [path.resolve(__dirname, 'src/custom'), ...webpackConfig.resolve.modules],
-        },
-      }),
-    },
-  }
+    }),
+  },
 }

cypress.json

@@ -1,4 +1,5 @@
 {
+  "projectId": "yp82ef",
   "baseUrl": "http://localhost:3000",
   "defaultCommandTimeout": 20000,
   "pageLoadTimeout": 120000,

cypress/support/commands.js

@@ -4,9 +4,9 @@
 // https://on.cypress.io/custom-commands
 // ***********************************************
 
+import { Eip1193Bridge } from '@ethersproject/experimental/lib/eip1193-bridge'
 import { JsonRpcProvider } from '@ethersproject/providers'
 import { Wallet } from '@ethersproject/wallet'
-import { Eip1193Bridge } from '@ethersproject/experimental/lib/eip1193-bridge'
 
 // todo: figure out how env vars actually work in CI
 // const TEST_PRIVATE_KEY = Cypress.env('INTEGRATION_TEST_PRIVATE_KEY')

package.json

@@ -2,6 +2,13 @@
   "name": "@gnosis/cowswap",
   "description": "CowSwap - Gnosis Protocol",
   "homepage": ".",
+  "main": "dist/interface.js",
+  "module": "dist/interface.esm.js",
+  "types": "dist/index.d.ts",
+  "files": [
+    "lib",
+    "dist"
+  ],
   "private": true,
   "version": "1.8.0-rc.1",
   "engines": {
@@ -10,6 +17,7 @@
   "devDependencies": {
     "@babel/plugin-proposal-nullish-coalescing-operator": "^7.13.8",
     "@craco/craco": "^5.7.0",
+    "@davatar/react": "1.8.1",
     "@ethersproject/experimental": "^5.4.0",
     "@gnosis.pm/safe-apps-web3-react": "^0.6.0",
     "@graphql-codegen/cli": "1.21.5",
@@ -20,7 +28,6 @@
     "@lingui/loader": "^3.9.0",
     "@lingui/macro": "^3.9.0",
     "@lingui/react": "^3.9.0",
-    "@metamask/jazzicon": "^2.0.0",
     "@popperjs/core": "^2.4.4",
     "@reach/dialog": "^0.10.3",
     "@reach/portal": "^0.10.3",
@@ -31,7 +38,10 @@
     "@simbathesailor/use-what-changed": "^2.0.0",
     "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react": "^12.0.0",
+    "@testing-library/react-hooks": "^7.0.2",
     "@typechain/ethers-v5": "^7.0.0",
+    "@types/array.prototype.flat": "^1.2.1",
+    "@types/array.prototype.flatmap": "^1.2.2",
     "@types/d3": "^7.0.0",
     "@types/jest": "^25.2.1",
     "@types/lingui__core": "^2.7.1",
@@ -63,20 +73,22 @@
     "@uniswap/merkle-distributor": "1.0.1",
     "@uniswap/sdk": "npm:@anxolin/uniswap-sdk#3.0.3-rc.3",
     "@uniswap/sdk-core": "^3.0.1",
-    "@uniswap/token-lists": "^1.0.0-beta.25",
+    "@uniswap/token-lists": "^1.0.0-beta.27",
     "@uniswap/v2-core": "1.0.0",
     "@uniswap/v2-periphery": "^1.1.0-beta.0",
     "@uniswap/v2-sdk": "^3.0.0-alpha.2",
     "@uniswap/v3-core": "1.0.0",
     "@uniswap/v3-periphery": "^1.1.1",
-    "@uniswap/v3-sdk": "^3.3.0",
+    "@uniswap/v3-sdk": "^3.4.1",
     "@web3-react/core": "^6.1.9",
     "@web3-react/fortmatic-connector": "^6.1.6",
     "@web3-react/injected-connector": "^6.0.7",
     "@web3-react/portis-connector": "^6.1.9",
     "@web3-react/walletconnect-connector": "6.2.4",
     "@web3-react/walletlink-connector": "^6.2.5",
     "ajv": "^6.12.3",
+    "array.prototype.flat": "^1.2.4",
+    "array.prototype.flatmap": "^1.2.4",
     "cids": "^1.0.0",
     "copy-to-clipboard": "^3.2.0",
     "cross-env": "^7.0.3",
@@ -87,6 +99,7 @@
     "eslint-plugin-prettier": "^3.1.3",
     "eslint-plugin-react": "^7.19.0",
     "eslint-plugin-react-hooks": "^4.0.0",
+    "eslint-plugin-simple-import-sort": "^7.0.0",
     "ethers": "^5.4.6",
     "graphql": "^15.5.0",
     "graphql-request": "^3.4.0",
@@ -97,16 +110,18 @@
     "lightweight-charts": "^3.3.0",
     "lodash.flatmap": "^4.5.0",
     "luxon": "^1.25.0",
+    "microbundle": "^0.13.3",
     "ms.macro": "^2.0.0",
     "multicodec": "^3.0.1",
     "multihashes": "^4.0.2",
-    "node-vibrant": "^3.1.5",
+    "node-vibrant": "^3.2.1-alpha.1",
     "polished": "^3.3.2",
     "polyfill-object.fromentries": "^1.0.1",
     "prettier": "^2.2.1",
     "qs": "^6.9.4",
     "react": "^17.0.1",
     "react-confetti": "^6.0.0",
+    "react-cosmos": "^5.6.3",
     "react-device-detect": "^1.6.2",
     "react-dom": "^17.0.1",
     "react-feather": "^2.0.8",
@@ -134,6 +149,7 @@
     "ua-parser-js": "^0.7.28",
     "use-count-up": "^2.2.5",
     "wcag-contrast": "^3.0.0",
+    "web-vitals": "^2.1.0",
     "workbox-core": "^6.1.0",
     "workbox-precaching": "^6.1.0",
     "workbox-routing": "^6.1.0"
@@ -164,6 +180,8 @@
     "i18n:extract": "lingui extract --locale en-US",
     "i18n:compile": "yarn i18n:extract && lingui compile",
     "prei18n:extract": "touch src/locales/en-US.po",
+    "bundle": "microbundle --tsconfig tsconfig.lib.json src/lib/index.tsx --format esm,cjs",
+    "cosmos": "cross-env FAST_REFRESH=false cosmos",
     "sitemap": "node src/custom/sitemap",
     "writeVersion": "node src/custom/writeVersion"
   },
@@ -203,6 +221,8 @@
     "@walletconnect/web3-provider": "^1.6.6",
     "bnc-sdk": "^3.5.0",
     "fast-safe-stringify": "^2.0.8",
+    "firebase": "^9.1.3",
+    "ipfs-http-client": "^52.0.3",
     "paraswap": "^5.0.1",
     "react-appzi": "^1.0.4",
     "react-inlinesvg": "^2.3.0",