diff --git a/.dependency-cruiser.js b/.dependency-cruiser.js
new file mode 100644
index 000000000..d2a6094ea
--- /dev/null
+++ b/.dependency-cruiser.js
@@ -0,0 +1,440 @@
+/** @type {import('dependency-cruiser').IConfiguration} */
+module.exports = {
+ forbidden: [
+ /* rules from the 'recommended' preset: */
+ {
+ name: 'no-circular',
+ severity: 'warn',
+ comment:
+ 'This dependency is part of a circular relationship. You might want to revise ' +
+ 'your solution (i.e. use dependency inversion, make sure the modules have a single responsibility) ',
+ from: {},
+ to: {
+ circular: true
+ }
+ },
+ {
+ name: 'no-orphans',
+ comment:
+ "This is an orphan module - it's likely not used (anymore?). Either use it or " +
+ "remove it. If it's logical this module is an orphan (i.e. it's a config file), " +
+ "add an exception for it in your dependency-cruiser configuration. By default " +
+ "this rule does not scrutinize dot-files (e.g. .eslintrc.js), TypeScript declaration " +
+ "files (.d.ts), tsconfig.json and some of the babel and webpack configs.",
+ severity: 'warn',
+ from: {
+ orphan: true,
+ pathNot: [
+ '(^|/)\\.[^/]+\\.(js|cjs|mjs|ts|json)$', // dot files
+ '\\.d\\.ts$', // TypeScript declaration files
+ '(^|/)tsconfig\\.json$', // TypeScript config
+ '(^|/)(babel|webpack)\\.config\\.(js|cjs|mjs|ts|json)$' // other configs
+ ]
+ },
+ to: {},
+ },
+ {
+ name: 'no-deprecated-core',
+ comment:
+ 'A module depends on a node core module that has been deprecated. Find an alternative - these are ' +
+ "bound to exist - node doesn't deprecate lightly.",
+ severity: 'warn',
+ from: {},
+ to: {
+ dependencyTypes: [
+ 'core'
+ ],
+ path: [
+ '^(v8\/tools\/codemap)$',
+ '^(v8\/tools\/consarray)$',
+ '^(v8\/tools\/csvparser)$',
+ '^(v8\/tools\/logreader)$',
+ '^(v8\/tools\/profile_view)$',
+ '^(v8\/tools\/profile)$',
+ '^(v8\/tools\/SourceMap)$',
+ '^(v8\/tools\/splaytree)$',
+ '^(v8\/tools\/tickprocessor-driver)$',
+ '^(v8\/tools\/tickprocessor)$',
+ '^(node-inspect\/lib\/_inspect)$',
+ '^(node-inspect\/lib\/internal\/inspect_client)$',
+ '^(node-inspect\/lib\/internal\/inspect_repl)$',
+ '^(async_hooks)$',
+ '^(punycode)$',
+ '^(domain)$',
+ '^(constants)$',
+ '^(sys)$',
+ '^(_linklist)$',
+ '^(_stream_wrap)$'
+ ],
+ }
+ },
+ {
+ name: 'not-to-deprecated',
+ comment:
+ 'This module uses a (version of an) npm module that has been deprecated. Either upgrade to a later ' +
+ 'version of that module, or find an alternative. Deprecated modules are a security risk.',
+ severity: 'warn',
+ from: {},
+ to: {
+ dependencyTypes: [
+ 'deprecated'
+ ]
+ }
+ },
+ {
+ name: 'no-non-package-json',
+ severity: 'error',
+ comment:
+ "This module depends on an npm package that isn't in the 'dependencies' section of your package.json. " +
+ "That's problematic as the package either (1) won't be available on live (2 - worse) will be " +
+ "available on live with an non-guaranteed version. Fix it by adding the package to the dependencies " +
+ "in your package.json.",
+ from: {},
+ to: {
+ dependencyTypes: [
+ 'npm-no-pkg',
+ 'npm-unknown'
+ ]
+ }
+ },
+ {
+ name: 'not-to-unresolvable',
+ comment:
+ "This module depends on a module that cannot be found ('resolved to disk'). If it's an npm " +
+ 'module: add it to your package.json. In all other cases you likely already know what to do.',
+ severity: 'error',
+ from: {},
+ to: {
+ couldNotResolve: true
+ }
+ },
+ {
+ name: 'no-duplicate-dep-types',
+ comment:
+ "Likely this module depends on an external ('npm') package that occurs more than once " +
+ "in your package.json i.e. bot as a devDependencies and in dependencies. This will cause " +
+ "maintenance problems later on.",
+ severity: 'warn',
+ from: {},
+ to: {
+ moreThanOneDependencyType: true,
+ // as it's pretty common to have a type import be a type only import
+ // _and_ (e.g.) a devDependency - don't consider type-only dependency
+ // types for this rule
+ dependencyTypesNot: ["type-only"]
+ }
+ },
+
+ /* rules you might want to tweak for your specific situation: */
+ {
+ name: 'not-to-spec',
+ comment:
+ 'This module depends on a spec (test) file. The sole responsibility of a spec file is to test code. ' +
+ "If there's something in a spec that's of use to other modules, it doesn't have that single " +
+ 'responsibility anymore. Factor it out into (e.g.) a separate utility/ helper or a mock.',
+ severity: 'error',
+ from: {},
+ to: {
+ path: '\\.(spec|test)\\.(js|mjs|cjs|ts|ls|coffee|litcoffee|coffee\\.md)$'
+ }
+ },
+ {
+ name: 'not-to-dev-dep',
+ severity: 'error',
+ comment:
+ "This module depends on an npm package from the 'devDependencies' section of your " +
+ 'package.json. It looks like something that ships to production, though. To prevent problems ' +
+ "with npm packages that aren't there on production declare it (only!) in the 'dependencies'" +
+ 'section of your package.json. If this module is development only - add it to the ' +
+ 'from.pathNot re of the not-to-dev-dep rule in the dependency-cruiser configuration',
+ from: {
+ path: '^(src)',
+ pathNot: '\\.(spec|test)\\.(js|mjs|cjs|ts|ls|coffee|litcoffee|coffee\\.md)$'
+ },
+ to: {
+ dependencyTypes: [
+ 'npm-dev'
+ ]
+ }
+ },
+ {
+ name: 'optional-deps-used',
+ severity: 'info',
+ comment:
+ "This module depends on an npm package that is declared as an optional dependency " +
+ "in your package.json. As this makes sense in limited situations only, it's flagged here. " +
+ "If you're using an optional dependency here by design - add an exception to your" +
+ "dependency-cruiser configuration.",
+ from: {},
+ to: {
+ dependencyTypes: [
+ 'npm-optional'
+ ]
+ }
+ },
+ {
+ name: 'peer-deps-used',
+ comment:
+ "This module depends on an npm package that is declared as a peer dependency " +
+ "in your package.json. This makes sense if your package is e.g. a plugin, but in " +
+ "other cases - maybe not so much. If the use of a peer dependency is intentional " +
+ "add an exception to your dependency-cruiser configuration.",
+ severity: 'warn',
+ from: {},
+ to: {
+ dependencyTypes: [
+ 'npm-peer'
+ ]
+ }
+ }
+ ],
+ options: {
+
+ /* conditions specifying which files not to follow further when encountered:
+ - path: a regular expression to match
+ - dependencyTypes: see https://github.com/sverweij/dependency-cruiser/blob/master/doc/rules-reference.md#dependencytypes-and-dependencytypesnot
+ for a complete list
+ */
+ doNotFollow: {
+ path: "^(src/__generated__|src/abis/types/factories|src/abis/types|src/abis|src/assets|node_modules|src/locales)",
+ // path: 'node_modules'
+ },
+
+ /* conditions specifying which dependencies to exclude
+ - path: a regular expression to match
+ - dynamic: a boolean indicating whether to ignore dynamic (true) or static (false) dependencies.
+ leave out if you want to exclude neither (recommended!)
+ */
+ exclude : {
+ path: "^(src/__generated__|src/types|src/abis|src/assets|node_modules|src/locales|src/utils)",
+ },
+
+ /* pattern specifying which files to include (regular expression)
+ dependency-cruiser will skip everything not matching this pattern
+ */
+ // includeOnly : '',
+
+ /* dependency-cruiser will include modules matching against the focus
+ regular expression in its output, as well as their neighbours (direct
+ dependencies and dependents)
+ */
+ // focus : '',
+
+ /* list of module systems to cruise */
+ // moduleSystems: ['amd', 'cjs', 'es6', 'tsd'],
+
+ /* prefix for links in html and svg output (e.g. 'https://github.com/you/yourrepo/blob/develop/'
+ to open it on your online repo or `vscode://file/${process.cwd()}/` to
+ open it in visual studio code),
+ */
+ // prefix: '',
+
+ /* false (the default): ignore dependencies that only exist before typescript-to-javascript compilation
+ true: also detect dependencies that only exist before typescript-to-javascript compilation
+ "specify": for each dependency identify whether it only exists before compilation or also after
+ */
+ tsPreCompilationDeps: true,
+
+ /*
+ list of extensions to scan that aren't javascript or compile-to-javascript.
+ Empty by default. Only put extensions in here that you want to take into
+ account that are _not_ parsable.
+ */
+ // extraExtensionsToScan: [".json", ".jpg", ".png", ".svg", ".webp"],
+
+ /* if true combines the package.jsons found from the module up to the base
+ folder the cruise is initiated from. Useful for how (some) mono-repos
+ manage dependencies & dependency definitions.
+ */
+ // combinedDependencies: false,
+
+ /* if true leave symlinks untouched, otherwise use the realpath */
+ // preserveSymlinks: false,
+
+ /* TypeScript project file ('tsconfig.json') to use for
+ (1) compilation and
+ (2) resolution (e.g. with the paths property)
+
+ The (optional) fileName attribute specifies which file to take (relative to
+ dependency-cruiser's current working directory). When not provided
+ defaults to './tsconfig.json'.
+ */
+ tsConfig: {
+ fileName: 'tsconfig.json'
+ },
+
+ /* Webpack configuration to use to get resolve options from.
+
+ The (optional) fileName attribute specifies which file to take (relative
+ to dependency-cruiser's current working directory. When not provided defaults
+ to './webpack.conf.js'.
+
+ The (optional) `env` and `args` attributes contain the parameters to be passed if
+ your webpack config is a function and takes them (see webpack documentation
+ for details)
+ */
+ // webpackConfig: {
+ // fileName: './webpack.config.js',
+ // env: {},
+ // args: {},
+ // },
+
+ /* Babel config ('.babelrc', '.babelrc.json', '.babelrc.json5', ...) to use
+ for compilation (and whatever other naughty things babel plugins do to
+ source code). This feature is well tested and usable, but might change
+ behavior a bit over time (e.g. more precise results for used module
+ systems) without dependency-cruiser getting a major version bump.
+ */
+ // babelConfig: {
+ // fileName: '.babel-plugin-macrosrc.json'
+ // },
+
+ /* List of strings you have in use in addition to cjs/ es6 requires
+ & imports to declare module dependencies. Use this e.g. if you've
+ re-declared require, use a require-wrapper or use window.require as
+ a hack.
+ */
+ // exoticRequireStrings: [],
+ /* options to pass on to enhanced-resolve, the package dependency-cruiser
+ uses to resolve module references to disk. You can set most of these
+ options in a webpack.conf.js - this section is here for those
+ projects that don't have a separate webpack config file.
+
+ Note: settings in webpack.conf.js override the ones specified here.
+ */
+ enhancedResolveOptions: {
+ /* List of strings to consider as 'exports' fields in package.json. Use
+ ['exports'] when you use packages that use such a field and your environment
+ supports it (e.g. node ^12.19 || >=14.7 or recent versions of webpack).
+
+ If you have an `exportsFields` attribute in your webpack config, that one
+ will have precedence over the one specified here.
+ */
+ exportsFields: ["exports"],
+ /* List of conditions to check for in the exports field. e.g. use ['imports']
+ if you're only interested in exposed es6 modules, ['require'] for commonjs,
+ or all conditions at once `(['import', 'require', 'node', 'default']`)
+ if anything goes for you. Only works when the 'exportsFields' array is
+ non-empty.
+
+ If you have a 'conditionNames' attribute in your webpack config, that one will
+ have precedence over the one specified here.
+ */
+ conditionNames: ["import", "require", "node", "default"],
+ /*
+ The extensions, by default are the same as the ones dependency-cruiser
+ can access (run `npx depcruise --info` to see which ones that are in
+ _your_ environment. If that list is larger than what you need (e.g.
+ it contains .js, .jsx, .ts, .tsx, .cts, .mts - but you don't use
+ TypeScript you can pass just the extensions you actually use (e.g.
+ [".js", ".jsx"]). This can speed up the most expensive step in
+ dependency cruising (module resolution) quite a bit.
+ */
+ // extensions: [".js", ".jsx", ".ts", ".tsx", ".d.ts"]
+ },
+ reporterOptions: {
+ dot: {
+ /* pattern of modules that can be consolidated in the detailed
+ graphical dependency graph. The default pattern in this configuration
+ collapses everything in node_modules to one folder deep so you see
+ the external modules, but not the innards your app depends upon.
+ */
+ collapsePattern: 'node_modules/[^/]+',
+
+ /* Options to tweak the appearance of your graph.See
+ https://github.com/sverweij/dependency-cruiser/blob/master/doc/options-reference.md#reporteroptions
+ for details and some examples. If you don't specify a theme
+ don't worry - dependency-cruiser will fall back to the default one.
+ */
+ // theme: {
+ // graph: {
+ // /* use splines: "ortho" for straight lines. Be aware though
+ // graphviz might take a long time calculating ortho(gonal)
+ // routings.
+ // */
+ // splines: "true"
+ // },
+ // modules: [
+ // {
+ // criteria: { matchesFocus: true },
+ // attributes: {
+ // fillcolor: "lime",
+ // penwidth: 2,
+ // },
+ // },
+ // {
+ // criteria: { matchesFocus: false },
+ // attributes: {
+ // fillcolor: "lightgrey",
+ // },
+ // },
+ // {
+ // criteria: { matchesReaches: true },
+ // attributes: {
+ // fillcolor: "lime",
+ // penwidth: 2,
+ // },
+ // },
+ // {
+ // criteria: { matchesReaches: false },
+ // attributes: {
+ // fillcolor: "lightgrey",
+ // },
+ // },
+ // {
+ // criteria: { source: "^src/model" },
+ // attributes: { fillcolor: "#ccccff" }
+ // },
+ // {
+ // criteria: { source: "^src/view" },
+ // attributes: { fillcolor: "#ccffcc" }
+ // },
+ // ],
+ // dependencies: [
+ // {
+ // criteria: { "rules[0].severity": "error" },
+ // attributes: { fontcolor: "red", color: "red" }
+ // },
+ // {
+ // criteria: { "rules[0].severity": "warn" },
+ // attributes: { fontcolor: "orange", color: "orange" }
+ // },
+ // {
+ // criteria: { "rules[0].severity": "info" },
+ // attributes: { fontcolor: "blue", color: "blue" }
+ // },
+ // {
+ // criteria: { resolved: "^src/model" },
+ // attributes: { color: "#0000ff77" }
+ // },
+ // {
+ // criteria: { resolved: "^src/view" },
+ // attributes: { color: "#00770077" }
+ // }
+ // ]
+ // }
+ },
+ archi: {
+ /* pattern of modules that can be consolidated in the high level
+ graphical dependency graph. If you use the high level graphical
+ dependency graph reporter (`archi`) you probably want to tweak
+ this collapsePattern to your situation.
+ */
+ collapsePattern: '^(packages|src|lib|app|bin|test(s?)|spec(s?))/[^/]+|node_modules/[^/]+',
+
+ /* Options to tweak the appearance of your graph.See
+ https://github.com/sverweij/dependency-cruiser/blob/master/doc/options-reference.md#reporteroptions
+ for details and some examples. If you don't specify a theme
+ for 'archi' dependency-cruiser will use the one specified in the
+ dot section (see above), if any, and otherwise use the default one.
+ */
+ // theme: {
+ // },
+ },
+ "text": {
+ "highlightFocused": true
+ },
+ }
+ }
+};
+// generated: dependency-cruiser@12.7.0 on 2023-02-03T13:10:16.703Z
diff --git a/.eslintrc.json b/.eslintrc.json
index da9f08521..16ce7df29 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -58,10 +58,6 @@
{
"group": ["**/dist"],
"message": "Do not import from dist/ - this is an implementation detail, and breaks tree-shaking."
- },
- {
- "group": ["*clientSideSmartOrderRouter"],
- "message": "Forbidden import; smart-order-router is lazy-loaded."
}
]
}
diff --git a/.github/workflows/test.yaml b/.github/disabled-workflows/test.yaml
similarity index 100%
rename from .github/workflows/test.yaml
rename to .github/disabled-workflows/test.yaml
diff --git a/.github/workflows/conventional-commit.yaml b/.github/workflows/conventional-commit.yaml
deleted file mode 100644
index 972358f04..000000000
--- a/.github/workflows/conventional-commit.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: Conventional commit
-
-on:
- pull_request_target:
- types:
- - opened
- - edited
- - synchronize
-
-jobs:
- check-pr-title:
- runs-on: ubuntu-latest
- steps:
- - uses: amannn/action-semantic-pull-request@v3.4.0
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index c0e74f2d0..9ddf3c6d0 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -15,27 +15,6 @@ jobs:
- uses: ./.github/actions/setup
- run: yarn prepare
- - run: yarn i18n:extract
- - uses: crowdin/github-action@1.4.8
- with:
- upload_sources: true
- download_translations: true
- create_pull_request: false
- push_translations: false
- localization_branch_name: main
- source: 'src/locales/en-US.po'
- translation: 'src/locales/%locale%.po'
- crowdin_branch_name: widgets
- token: ${{ secrets.CROWDIN_TOKEN }}
- project_id: 458284
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
- - run: yarn test
- if: success()
- env:
- JSON_RPC_PROVIDER: ${{ secrets.JSON_RPC_PROVIDER }}
-
- run: yarn release
if: success()
env:
diff --git a/.gitignore b/.gitignore
index 24c6834a9..5471ed954 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,4 +37,6 @@ notes.txt
# generated ajv schema
/src/__generated__/*
-!/src/__generated__/.gitkeep
\ No newline at end of file
+!/src/__generated__/.gitkeep
+
+docs
diff --git a/.releaserc.json b/.releaserc.json
index 912ce2584..a2987da70 100644
--- a/.releaserc.json
+++ b/.releaserc.json
@@ -3,13 +3,15 @@
"plugins": [
"@semantic-release/commit-analyzer",
"@semantic-release/release-notes-generator",
+ "@semantic-release/github",
+ "@semantic-release/npm",
[
"@semantic-release/git",
{
+ "assets": ["package.json"],
"message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
}
- ],
- "@semantic-release/github",
- "@semantic-release/npm"
+ ]
]
}
+
diff --git a/README.md b/README.md
index bd365ea47..142070ae4 100644
--- a/README.md
+++ b/README.md
@@ -1,50 +1,71 @@
-# Uniswap Labs Widgets
+# 🕹 Wido Widget
-[](https://www.npmjs.com/package/@uniswap/widgets)
-[](https://github.com/Uniswap/interface/actions/workflows/test.yaml)
-[](https://github.com/Uniswap/interface/actions/workflows/e2e.yaml)
-[](https://github.com/Uniswap/interface/actions/workflows/lint.yml)
-[](https://crowdin.com/project/uniswap-interface)
+[](https://www.npmjs.com/package/wido-widget)
+
+
+
+
-The `@uniswap/widgets` package is an [npm package](https://www.npmjs.com/package/@uniswap/widgets) of React components used to provide subsets of the Uniswap Protocol functionality in a small and configurable user interface element.
+Wido Widget combines ease of use with great UX. Protocols integrate Wido Widget to accept deposits in any token, from any chain, in a single transaction.
-# Uniswap Labs Swap Widget
+Example use cases supported by Wido Widget:
-The Swap Widget bundles the whole swapping experience into a single React component that developers can easily embed in their app with one line of code.
+* Single token deposits into LP pools, with any token, from any chain (Zaps)
+* Deposit any token into any farm or vault (works cross-chain)
+* Deposit any token from Ethereum into Starknet, including pools, farms or vaults on Starknet (bridge + deposit)
+* Deposit any token from Ethereum into ZK Sync, including pools, farms or vaults on Starknet (bridge + deposit)
-
+
Wido Widget: Deposit ETH from Ethereum into a JediSwap LP pool on Starknet. All in a single transaction.
-You can customize the theme (colors, fonts, border radius, and more) to match the style of your application. You can also configure your own default token list and optionally set a convenience fee on swaps executed through the widget on your site.
+## Getting started
-## Installation
+Integrating Wido Widget only takes few lines of code.
-Install the widgets library via `npm` or `yarn`.
+First install the `wido-widget` [npm package](https://www.npmjs.com/package/wido-widget) which contains React components used to integrate Wido's zap functionality in a small and configurable user interface element.
+You can customize the theme (colors, fonts, border radius, and more) to match the style of your application.
+
+Install the widget via `npm` or `yarn`.
```js
-yarn add @uniswap/widgets
+yarn add wido-widget react-redux
```
+
```js
-npm i --save @uniswap/widgets
+npm i --save wido-widget react-redux
```
-## Documentation
-
-- [overview](https://docs.uniswap.org/sdk/widgets/swap-widget)
-- [api reference](https://docs.uniswap.org/sdk/widgets/swap-widget/api)
-
-## Example Apps
-
-Uniswap Labs maintains two demo apps in branches of the [widgets-demo](https://github.com/Uniswap/widgets-demo) repo:
-
-- [NextJS](https://github.com/Uniswap/widgets-demo/tree/nextjs)
-- [Create React App](https://github.com/Uniswap/widgets-demo/tree/cra)
-
-Others have also also released the widget in production to their userbase:
+After installing, embed the React component in your application.
+
+```jsx
+import React from "react";
+import ReactDOM from "react-dom";
+import { SwapWidget } from 'wido-widget'
+
+function App() {
+ return (
+
+ )
+}
+
+ReactDOM.render(
+ ,
+ document.getElementById("my-app")
+)
+```
-- [OpenSea](https://opensea.io/)
-- [Friends With Benefits](https://www.fwb.help/)
-- [Oasis](https://oasis.app/)
+You are expected to handle the `onConnectWalletClick` callback by integrating with `@web3-react/core`, `@web3-onboard/core` or any other way of managing the wallet connection and then pass a `Web3Provider` instance that comes from the `ethers.js`.
+When integrating the Starknet network, you are also expected to pass in the `Account` instance that you created with `starknet.js`.
-## Legal notice
+## Documentation
-Uniswap Labs encourages integrators to evaluate their own regulatory obligations when integrating this widget into their products, including, but not limited to, those related to economic or trade sanctions compliance.
+* [Guide](https://docs.joinwido.com/integrate-wido/widget)
+* [API Reference](https://unpkg.com/wido-widget@latest/docs/index.html)
diff --git a/dependency-graph.svg b/dependency-graph.svg
new file mode 100644
index 000000000..75892df86
--- /dev/null
+++ b/dependency-graph.svg
@@ -0,0 +1,6392 @@
+
+
+
+
+
diff --git a/e2e/connect.test.tsx b/e2e/connect.test.tsx
index 2ceae32db..02590ff40 100644
--- a/e2e/connect.test.tsx
+++ b/e2e/connect.test.tsx
@@ -5,7 +5,7 @@
import '@ethersproject/providers'
import 'jest-environment-hardhat'
-import { SwapWidget } from 'index'
+import { WidoWidget } from 'index'
import React, { ReactElement } from 'react'
import { cleanup, render, waitFor } from './test'
@@ -39,20 +39,20 @@ describe('connect', () => {
}
describe('with no params', () => {
- const ui =
+ const ui =
itPromptsForWalletConnection(ui)
itExpectsWidgetToBeEnabled(ui)
})
describe('with jsonRpcUrlMap', () => {
describe('with an array', () => {
- const ui =
+ const ui =
itPromptsForWalletConnection(ui)
itExpectsWidgetToBeEnabled(ui)
})
describe('with a singleton', () => {
- const ui =
+ const ui =
itPromptsForWalletConnection(ui)
itExpectsWidgetToBeEnabled(ui)
})
@@ -62,7 +62,7 @@ describe('connect', () => {
// The real hardhat.provider relies on real timeouts when providing data.
jest.useRealTimers()
- const ui =
+ const ui =
itExpectsWidgetToBeEnabled(ui)
it('displays connected account chip', async () => {
diff --git a/package.json b/package.json
index 83f3f87eb..1fba863f0 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,12 @@
{
- "name": "@uniswap/widgets",
- "description": "Uniswap Interface",
- "homepage": "https://github.com/Uniswap/widgets#readme",
- "repository": "https://github.com/Uniswap/widgets",
+ "name": "wido-widget",
+ "description": "Wido widget",
+ "homepage": "https://github.com/widolabs/wido-widget#readme",
+ "repository": "https://github.com/widolabs/wido-widget",
"files": [
- "dist"
+ "dist",
+ "src",
+ "docs"
],
"types": "dist/index.d.ts",
"main": "dist/cjs/index.cjs",
@@ -24,6 +26,7 @@
"require": "./dist/fonts.css"
}
},
+ "version": "1.3.1",
"scripts": {
"contracts:compile:abi": "typechain --target ethers-v5 --out-dir src/abis/types \"./src/abis/**/*.json\"",
"contracts:compile:v3": "typechain --target ethers-v5 --out-dir src/types/v3 \"./node_modules/@uniswap/**/artifacts/contracts/**/*.json\"",
@@ -37,13 +40,15 @@
"prepublishOnly": "yarn build",
"start": "cosmos",
"typecheck": "tsc -p tsconfig.json",
- "prebuild": "tsc -p tsconfig.build.json",
- "build": "rollup --config --failAfterWarnings",
- "release": "semantic-release",
+ "prebuild": "tsc -p tsconfig.build.json && yarn docs",
+ "build": "rollup --config",
"deduplicate": "yarn-deduplicate --strategy=highest",
+ "release": "semantic-release",
"lint": "eslint .",
"test": "jest src",
- "test:e2e": "jest e2e"
+ "test:e2e": "jest e2e",
+ "docs": "typedoc --out docs src/index.tsx --excludePrivate --excludeInternal --readme none --sort source-order",
+ "docs:watch": "yarn docs --watch"
},
"browserslist": {
"production": [
@@ -59,6 +64,7 @@
},
"license": "GPL-3.0-or-later",
"dependencies": {
+ "@argent/get-starknet": "^5.2.0",
"@babel/runtime": ">=7.17.0",
"@fontsource/ibm-plex-mono": "^4.5.1",
"@fontsource/inter": "^4.5.1",
@@ -74,20 +80,15 @@
"@uniswap/universal-router-sdk": "^1.3.4",
"@uniswap/v2-sdk": "^3.0.1",
"@uniswap/v3-sdk": "^3.8.2",
- "@web3-react/core": "8.0.35-beta.0",
- "@web3-react/eip1193": "8.0.26-beta.0",
- "@web3-react/empty": "8.0.20-beta.0",
- "@web3-react/metamask": "8.0.28-beta.0",
- "@web3-react/network": "8.0.27-beta.0",
- "@web3-react/types": "8.0.20-beta.0",
- "@web3-react/url": "8.0.25-beta.0",
- "@web3-react/walletconnect": "8.0.36-beta.0",
+ "@web3-react/core": "^6.1.9",
+ "@web3-react/injected-connector": "^6.0.7",
"ajv": "^8.11.0",
"ajv-formats": "^2.1.1",
"cids": "^1.0.0",
"ethers": "^5.6.1",
"immer": "^9.0.6",
- "jotai": "^1.3.7",
+ "jotai": "1.4.0",
+ "jotai-immer": "0.1.0",
"jsbi": "^3.1.4",
"make-plural": "^7.0.0",
"ms.macro": "^2.0.0",
@@ -100,18 +101,23 @@
"react": ">=17.0.1",
"react-dom": ">=17.0.1",
"react-feather": "^2.0.8",
+ "react-outside-click-handler": "^1.3.0",
"react-popper": "^2.2.3",
- "react-redux": ">=7.2.2",
+ "react-redux": "^8.0.5",
"react-virtualized-auto-sizer": "^1.0.2",
"react-window": "^1.8.5",
"rebass": "^4.0.7",
"redux": ">=4.1.2",
"resize-observer-polyfill": "^1.5.1",
"setimmediate": "^1.0.5",
+ "starknet": "^4.17.1",
"styled-components": ">=5",
"tiny-invariant": "^1.2.0",
+ "typedoc": "^0.23.25",
"wcag-contrast": "^3.0.0",
- "wicg-inert": "^3.1.1"
+ "web3": "^1.8.2",
+ "wicg-inert": "^3.1.1",
+ "wido": "^0.2.6"
},
"peerDependencies": {
"@babel/runtime": ">=7.17.0",
@@ -137,6 +143,7 @@
"@lingui/macro": "^3.15.0",
"@lingui/react": "^3.15.0",
"@nomiclabs/hardhat-ethers": "^2.0.6",
+ "@rollup/plugin-alias": "^4.0.3",
"@rollup/plugin-babel": "^5.3.0",
"@rollup/plugin-commonjs": "^21.0.1",
"@rollup/plugin-inject": "^4.0.4",
@@ -160,6 +167,7 @@
"@types/qs": "^6.9.2",
"@types/react": "^18",
"@types/react-dom": "^18",
+ "@types/react-outside-click-handler": "^1.3.1",
"@types/react-redux": "^7.1.16",
"@types/react-virtualized-auto-sizer": "^1.0.0",
"@types/react-window": "^1.8.2",
@@ -178,6 +186,7 @@
"babel-plugin-macros": "^3.1.0",
"babel-plugin-module-resolver": "^4.1.0",
"babel-runtime": "^6.26.0",
+ "dependency-cruiser": "^12.7.0",
"dotenv": "^16.0.1",
"eslint": "^7.11.0",
"eslint-config-prettier": "^6.11.0",
diff --git a/rollup.config.js b/rollup.config.js
index 1f1aee89f..20970f3c6 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -15,15 +15,15 @@ const svgr = require('@svgr/rollup')
const { default: multi } = require('rollup-plugin-multi-input')
const externals = require('rollup-plugin-node-externals')
const sass = require('rollup-plugin-scss')
-
+const alias = require('@rollup/plugin-alias')
const EXTENSIONS = ['.js', '.jsx', '.ts', '.tsx']
/**
* This exports scheme works for nextjs and for CRA5.
*
* It will also work for CRA4 if you use direct imports:
- * instead of `import { SwapWidget } from '@uniswap/widgets'`,
- * `import { SwapWidget } from '@uniswap/widgets/dist/index.js'`.
+ * instead of `import { SwapWidget } from 'wido-widget'`,
+ * `import { SwapWidget } from 'wido-widget/dist/index.js'`.
* I do not know why CRA4 does not seem to use exports for resolution.
*
* Note that chunks are enabled. This is so the tokenlist spec can be loaded async,
@@ -40,10 +40,14 @@ const transpile = {
return source.startsWith('@ethersproject/')
},
plugins: [
+ alias({
+ entries: [{ find: '@uniswap/conedison/format', replacement: '@uniswap/conedison/format.js' }],
+ }),
// Dependency resolution
externals({
exclude: [
'constants',
+ '@uniswap/conedison/format.js',
/@lingui\/(core|react)/, // @lingui incorrectly exports esm, so it must be bundled in
/\.json$/, // esm does not support JSON loading, so it must be bundled in
], // marks dependencies as external so they are not bundled inline
diff --git a/src/assets/svg/aurora-logo.svg b/src/assets/svg/aurora-logo.svg
new file mode 100644
index 000000000..a9171ca57
--- /dev/null
+++ b/src/assets/svg/aurora-logo.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/svg/avalanche-logo.svg b/src/assets/svg/avalanche-logo.svg
new file mode 100644
index 000000000..ac87f2758
--- /dev/null
+++ b/src/assets/svg/avalanche-logo.svg
@@ -0,0 +1,4 @@
+
\ No newline at end of file
diff --git a/src/assets/svg/bsc-logo.svg b/src/assets/svg/bsc-logo.svg
new file mode 100644
index 000000000..75c89417e
--- /dev/null
+++ b/src/assets/svg/bsc-logo.svg
@@ -0,0 +1,11 @@
+
+
+
\ No newline at end of file
diff --git a/src/assets/svg/fantom-logo.svg b/src/assets/svg/fantom-logo.svg
new file mode 100644
index 000000000..ee75a7a3e
--- /dev/null
+++ b/src/assets/svg/fantom-logo.svg
@@ -0,0 +1,33 @@
+
diff --git a/src/assets/svg/logo.svg b/src/assets/svg/logo.svg
index 3bd07e1b1..7158de5d6 100644
--- a/src/assets/svg/logo.svg
+++ b/src/assets/svg/logo.svg
@@ -1,13 +1,6 @@
-
