diff --git a/.github/workflows/pr_checks.yml b/.github/workflows/pr_checks.yml index e3cd059..b72747d 100644 --- a/.github/workflows/pr_checks.yml +++ b/.github/workflows/pr_checks.yml @@ -3,7 +3,7 @@ name: Pull request checks on: pull_request: branches: - - V2 + - main jobs: build: diff --git a/README.md b/README.md index 4d3baf7..927f140 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ #### ๐Ÿ”Ž [Examples](https://github.com/WalletConnect/web3modal-examples) -#### ๐Ÿงช [Laboratory](lab-walletconnect-modal.pages.dev) +#### ๐Ÿงช [Laboratory](https://lab-walletconnect-modal.pages.dev) # WalletConnect Modal diff --git a/laboratory/package.json b/laboratory/package.json index 0700d02..1075ae6 100644 --- a/laboratory/package.json +++ b/laboratory/package.json @@ -1,6 +1,6 @@ { "name": "laboratory", - "version": "2.4.8-4560daf-2", + "version": "2.5.0-f0d3ee1", "private": true, "scripts": { "dev": "rm -rf .next; next dev", @@ -8,12 +8,12 @@ }, "dependencies": { "@nextui-org/react": "1.0.0-beta.13", - "@walletconnect/modal-auth-html": "2.4.8-4560daf-2", - "@walletconnect/modal-auth-react": "2.4.8-4560daf-2", - "@walletconnect/modal-sign-html": "2.4.8-4560daf-2", - "@walletconnect/modal-sign-react": "2.4.8-4560daf-2", - "@walletconnect/modal": "2.4.8-4560daf-2", "@walletconnect/ethereum-provider": "2.8.1", + "@walletconnect/modal": "2.5.0-f0d3ee1", + "@walletconnect/modal-auth-html": "2.5.0-f0d3ee1", + "@walletconnect/modal-auth-react": "2.5.0-f0d3ee1", + "@walletconnect/modal-sign-html": "2.5.0-f0d3ee1", + "@walletconnect/modal-sign-react": "2.5.0-f0d3ee1", "next": "13.4.6", "react": "18.2.0", "react-code-blocks": "0.0.9-0", diff --git a/lerna.json b/lerna.json index 2b7b7a6..d74e237 100644 --- a/lerna.json +++ b/lerna.json @@ -1,14 +1,15 @@ { "npmClient": "npm", "packages": [ - "packages/core", - "packages/ui", + "packages/modal-core", + "packages/modal-ui", "projects/modal", "projects/modal-auth-html", "projects/modal-auth-react", "projects/modal-sign-html", - "projects/modal-sign-react" + "projects/modal-sign-react", + "laboratory" ], - "version": "2.4.8-4560daf-2", + "version": "2.5.0-f0d3ee1", "$schema": "node_modules/lerna/schemas/lerna-schema.json" } diff --git a/package-lock.json b/package-lock.json index b8a4ec0..be14142 100644 --- a/package-lock.json +++ b/package-lock.json @@ -43,15 +43,15 @@ } }, "laboratory": { - "version": "2.4.8-4560daf-2", + "version": "2.5.0-f0d3ee1", "dependencies": { "@nextui-org/react": "1.0.0-beta.13", "@walletconnect/ethereum-provider": "2.8.1", - "@walletconnect/modal": "2.4.8-4560daf-2", - "@walletconnect/modal-auth-html": "2.4.8-4560daf-2", - "@walletconnect/modal-auth-react": "2.4.8-4560daf-2", - "@walletconnect/modal-sign-html": "2.4.8-4560daf-2", - "@walletconnect/modal-sign-react": "2.4.8-4560daf-2", + "@walletconnect/modal": "2.5.0-f0d3ee1", + "@walletconnect/modal-auth-html": "2.5.0-f0d3ee1", + "@walletconnect/modal-auth-react": "2.5.0-f0d3ee1", + "@walletconnect/modal-sign-html": "2.5.0-f0d3ee1", + "@walletconnect/modal-sign-react": "2.5.0-f0d3ee1", "next": "13.4.6", "react": "18.2.0", "react-code-blocks": "0.0.9-0", @@ -14301,7 +14301,7 @@ }, "packages/modal-core": { "name": "@walletconnect/modal-core", - "version": "2.4.8-4560daf-2", + "version": "2.5.0-f0d3ee1", "license": "Apache-2.0", "dependencies": { "buffer": "6.0.3", @@ -14333,10 +14333,10 @@ }, "packages/modal-ui": { "name": "@walletconnect/modal-ui", - "version": "2.4.8-4560daf-2", + "version": "2.5.0-f0d3ee1", "license": "Apache-2.0", "dependencies": { - "@walletconnect/modal-core": "2.4.8-4560daf-2", + "@walletconnect/modal-core": "2.5.0-f0d3ee1", "lit": "2.7.5", "motion": "10.16.2", "qrcode": "1.5.3" @@ -14349,28 +14349,28 @@ }, "projects/modal": { "name": "@walletconnect/modal", - "version": "2.4.8-4560daf-2", + "version": "2.5.0-f0d3ee1", "license": "Apache-2.0", "dependencies": { - "@walletconnect/modal-core": "2.4.8-4560daf-2", - "@walletconnect/modal-ui": "2.4.8-4560daf-2" + "@walletconnect/modal-core": "2.5.0-f0d3ee1", + "@walletconnect/modal-ui": "2.5.0-f0d3ee1" } }, "projects/modal-auth-html": { "name": "@walletconnect/modal-auth-html", - "version": "2.4.8-4560daf-2", + "version": "2.5.0-f0d3ee1", "license": "Apache-2.0", "dependencies": { "@walletconnect/auth-client": "2.1.0", - "@walletconnect/modal": "2.4.8-4560daf-2" + "@walletconnect/modal": "2.5.0-f0d3ee1" } }, "projects/modal-auth-react": { "name": "@walletconnect/modal-auth-react", - "version": "2.4.8-4560daf-2", + "version": "2.5.0-f0d3ee1", "license": "Apache-2.0", "dependencies": { - "@walletconnect/modal-auth-html": "2.4.8-4560daf-2" + "@walletconnect/modal-auth-html": "2.5.0-f0d3ee1" }, "peerDependencies": { "react": ">=17", @@ -14379,19 +14379,19 @@ }, "projects/modal-sign-html": { "name": "@walletconnect/modal-sign-html", - "version": "2.4.8-4560daf-2", + "version": "2.5.0-f0d3ee1", "license": "Apache-2.0", "dependencies": { - "@walletconnect/modal": "2.4.8-4560daf-2", + "@walletconnect/modal": "2.5.0-f0d3ee1", "@walletconnect/sign-client": "2.8.1" } }, "projects/modal-sign-react": { "name": "@walletconnect/modal-sign-react", - "version": "2.4.8-4560daf-2", + "version": "2.5.0-f0d3ee1", "license": "Apache-2.0", "dependencies": { - "@walletconnect/modal-sign-html": "2.4.8-4560daf-2", + "@walletconnect/modal-sign-html": "2.5.0-f0d3ee1", "mitt": "3.0.0" }, "peerDependencies": { diff --git a/packages/modal-core/package.json b/packages/modal-core/package.json index 77319d1..108ae63 100644 --- a/packages/modal-core/package.json +++ b/packages/modal-core/package.json @@ -1,6 +1,6 @@ { "name": "@walletconnect/modal-core", - "version": "2.4.8-4560daf-2", + "version": "2.5.0-f0d3ee1", "main": "dist/index.js", "type": "module", "types": "dist/_types/index.d.ts", diff --git a/packages/modal-core/readme.md b/packages/modal-core/readme.md index 4d3baf7..927f140 100644 --- a/packages/modal-core/readme.md +++ b/packages/modal-core/readme.md @@ -2,7 +2,7 @@ #### ๐Ÿ”Ž [Examples](https://github.com/WalletConnect/web3modal-examples) -#### ๐Ÿงช [Laboratory](lab-walletconnect-modal.pages.dev) +#### ๐Ÿงช [Laboratory](https://lab-walletconnect-modal.pages.dev) # WalletConnect Modal diff --git a/packages/modal-ui/package.json b/packages/modal-ui/package.json index ec5c612..a5185fb 100644 --- a/packages/modal-ui/package.json +++ b/packages/modal-ui/package.json @@ -1,6 +1,6 @@ { "name": "@walletconnect/modal-ui", - "version": "2.4.8-4560daf-2", + "version": "2.5.0-f0d3ee1", "main": "dist/index.js", "type": "module", "types": "dist/_types/index.d.ts", @@ -16,7 +16,7 @@ "typecheck": "tsc --noEmit" }, "dependencies": { - "@walletconnect/modal-core": "2.4.8-4560daf-2", + "@walletconnect/modal-core": "2.5.0-f0d3ee1", "lit": "2.7.5", "motion": "10.16.2", "qrcode": "1.5.3" diff --git a/packages/modal-ui/readme.md b/packages/modal-ui/readme.md index 4d3baf7..927f140 100644 --- a/packages/modal-ui/readme.md +++ b/packages/modal-ui/readme.md @@ -2,7 +2,7 @@ #### ๐Ÿ”Ž [Examples](https://github.com/WalletConnect/web3modal-examples) -#### ๐Ÿงช [Laboratory](lab-walletconnect-modal.pages.dev) +#### ๐Ÿงช [Laboratory](https://lab-walletconnect-modal.pages.dev) # WalletConnect Modal diff --git a/packages/modal-ui/src/components/wcm-modal-backcard/index.ts b/packages/modal-ui/src/components/wcm-modal-backcard/index.ts index bc79c17..2433f1c 100644 --- a/packages/modal-ui/src/components/wcm-modal-backcard/index.ts +++ b/packages/modal-ui/src/components/wcm-modal-backcard/index.ts @@ -1,6 +1,6 @@ +import { ModalCtrl } from '@walletconnect/modal-core' import { LitElement, html } from 'lit' import { customElement } from 'lit/decorators.js' -import { ModalCtrl } from 'packages/modal-core' import { SvgUtil } from '../../utils/SvgUtil' import { ThemeUtil } from '../../utils/ThemeUtil' import styles from './styles.css' diff --git a/projects/modal-auth-html/bundle.ts b/projects/modal-auth-html/bundle.ts index fe0c07f..b1e8403 100644 --- a/projects/modal-auth-html/bundle.ts +++ b/projects/modal-auth-html/bundle.ts @@ -1,2 +1 @@ -export { WalletConnectModalAuth } from './src/client'; - +export { WalletConnectModalAuth } from './src/client' diff --git a/projects/modal-auth-html/index.ts b/projects/modal-auth-html/index.ts index 5541679..f0ceb85 100644 --- a/projects/modal-auth-html/index.ts +++ b/projects/modal-auth-html/index.ts @@ -1,3 +1,5 @@ export { WalletConnectModalAuth } from './src/client' -export type { WalletConnectModalAuthOptions, WalletConnectModalAuthSignInArguments } from './src/client' - +export type { + WalletConnectModalAuthOptions, + WalletConnectModalAuthSignInArguments +} from './src/client' diff --git a/projects/modal-auth-html/package.json b/projects/modal-auth-html/package.json index c807b07..7e961a6 100644 --- a/projects/modal-auth-html/package.json +++ b/projects/modal-auth-html/package.json @@ -1,6 +1,6 @@ { "name": "@walletconnect/modal-auth-html", - "version": "2.4.8-4560daf-2", + "version": "2.5.0-f0d3ee1", "main": "dist/index.js", "unpkg": "dist/cdn/bundle.js", "type": "module", @@ -19,7 +19,7 @@ }, "dependencies": { "@walletconnect/auth-client": "2.1.0", - "@walletconnect/modal": "2.4.8-4560daf-2" + "@walletconnect/modal": "2.5.0-f0d3ee1" }, "keywords": [ "web3", diff --git a/projects/modal-auth-html/readme.md b/projects/modal-auth-html/readme.md index 8356703..2c00bc2 100644 --- a/projects/modal-auth-html/readme.md +++ b/projects/modal-auth-html/readme.md @@ -2,7 +2,7 @@ #### ๐Ÿ”Ž [Examples](https://github.com/WalletConnect/web3modal-examples) -#### ๐Ÿงช [Laboratory](lab-walletconnect-modal.pages.dev) +#### ๐Ÿงช [Laboratory](https://lab-walletconnect-modal.pages.dev) # WalletConnect Modal diff --git a/projects/modal-auth-html/src/client.ts b/projects/modal-auth-html/src/client.ts index b6823db..f5de7e9 100644 --- a/projects/modal-auth-html/src/client.ts +++ b/projects/modal-auth-html/src/client.ts @@ -9,7 +9,10 @@ import { WalletConnectModal } from '@walletconnect/modal' export interface WalletConnectModalAuthOptions { projectId: string metadata: AuthClientTypes.Metadata - modalOptions?: Omit + modalOptions?: Omit< + WalletConnectModalConfig, + 'chains' | 'enableAuthMode' | 'projectId' | 'walletConnectVersion' + > } export interface WalletConnectModalAuthSignInArguments { diff --git a/projects/modal-auth-react/index.ts b/projects/modal-auth-react/index.ts index cdb9c23..22b8eeb 100644 --- a/projects/modal-auth-react/index.ts +++ b/projects/modal-auth-react/index.ts @@ -1,4 +1,3 @@ export { WalletConnectModalAuth } from './src/components/WalletConnectModalAuth' export type { WalletConnectModalAuthProps } from './src/components/WalletConnectModalAuth' export { useSignIn } from './src/hooks/useSignIn' - diff --git a/projects/modal-auth-react/package.json b/projects/modal-auth-react/package.json index 011644e..326c055 100644 --- a/projects/modal-auth-react/package.json +++ b/projects/modal-auth-react/package.json @@ -1,6 +1,6 @@ { "name": "@walletconnect/modal-auth-react", - "version": "2.4.8-4560daf-2", + "version": "2.5.0-f0d3ee1", "main": "dist/index.js", "type": "module", "types": "dist/_types/index.d.ts", @@ -17,7 +17,7 @@ "typecheck": "tsc --noEmit" }, "dependencies": { - "@walletconnect/modal-auth-html": "2.4.8-4560daf-2" + "@walletconnect/modal-auth-html": "2.5.0-f0d3ee1" }, "peerDependencies": { "react": ">=17", diff --git a/projects/modal-auth-react/readme.md b/projects/modal-auth-react/readme.md index 8356703..2c00bc2 100644 --- a/projects/modal-auth-react/readme.md +++ b/projects/modal-auth-react/readme.md @@ -2,7 +2,7 @@ #### ๐Ÿ”Ž [Examples](https://github.com/WalletConnect/web3modal-examples) -#### ๐Ÿงช [Laboratory](lab-walletconnect-modal.pages.dev) +#### ๐Ÿงช [Laboratory](https://lab-walletconnect-modal.pages.dev) # WalletConnect Modal diff --git a/projects/modal-auth-react/src/client.ts b/projects/modal-auth-react/src/client.ts index ad8fd46..b808d58 100644 --- a/projects/modal-auth-react/src/client.ts +++ b/projects/modal-auth-react/src/client.ts @@ -1,5 +1,5 @@ -import type { WalletConnectModalAuthOptions } from 'projects/modal-auth-html' -import { WalletConnectModalAuth } from 'projects/modal-auth-html' +import type { WalletConnectModalAuthOptions } from '@walletconnect/modal-auth-html' +import { WalletConnectModalAuth } from '@walletconnect/modal-auth-html' let walletConnectModalAuthClient: WalletConnectModalAuth | undefined = undefined diff --git a/projects/modal-auth-react/src/components/WalletConnectModalAuth.tsx b/projects/modal-auth-react/src/components/WalletConnectModalAuth.tsx index 196a1d5..e54d2f6 100644 --- a/projects/modal-auth-react/src/components/WalletConnectModalAuth.tsx +++ b/projects/modal-auth-react/src/components/WalletConnectModalAuth.tsx @@ -1,4 +1,4 @@ -import type { WalletConnectModalAuthOptions } from 'projects/modal-auth-html' +import type { WalletConnectModalAuthOptions } from '@walletconnect/modal-auth-html' import { memo, useEffect } from 'react' import { setWalletConnectModalAuthClient } from '../client' diff --git a/projects/modal-auth-react/src/hooks/useSignIn.ts b/projects/modal-auth-react/src/hooks/useSignIn.ts index 95cef7a..7dd494d 100644 --- a/projects/modal-auth-react/src/hooks/useSignIn.ts +++ b/projects/modal-auth-react/src/hooks/useSignIn.ts @@ -1,4 +1,4 @@ -import type { WalletConnectModalAuthSignInArguments } from 'projects/modal-auth-html' +import type { WalletConnectModalAuthSignInArguments } from '@walletconnect/modal-auth-html' import type { WalletConnectModalAuthInstance } from '../client' import { getWalletConnectModalAuthClient } from '../client' import { useAsyncAction } from './_useAsyncAction' diff --git a/projects/modal-sign-html/package.json b/projects/modal-sign-html/package.json index 4ff4778..06b8a06 100644 --- a/projects/modal-sign-html/package.json +++ b/projects/modal-sign-html/package.json @@ -1,6 +1,6 @@ { "name": "@walletconnect/modal-sign-html", - "version": "2.4.8-4560daf-2", + "version": "2.5.0-f0d3ee1", "main": "dist/index.js", "unpkg": "dist/cdn/bundle.js", "type": "module", @@ -18,7 +18,7 @@ "typecheck": "tsc --noEmit" }, "dependencies": { - "@walletconnect/modal": "2.4.8-4560daf-2", + "@walletconnect/modal": "2.5.0-f0d3ee1", "@walletconnect/sign-client": "2.8.1" }, "keywords": [ diff --git a/projects/modal-sign-html/readme.md b/projects/modal-sign-html/readme.md index 4d3baf7..927f140 100644 --- a/projects/modal-sign-html/readme.md +++ b/projects/modal-sign-html/readme.md @@ -2,7 +2,7 @@ #### ๐Ÿ”Ž [Examples](https://github.com/WalletConnect/web3modal-examples) -#### ๐Ÿงช [Laboratory](lab-walletconnect-modal.pages.dev) +#### ๐Ÿงช [Laboratory](https://lab-walletconnect-modal.pages.dev) # WalletConnect Modal diff --git a/projects/modal-sign-react/package.json b/projects/modal-sign-react/package.json index 00a96a3..d978cc9 100644 --- a/projects/modal-sign-react/package.json +++ b/projects/modal-sign-react/package.json @@ -1,6 +1,6 @@ { "name": "@walletconnect/modal-sign-react", - "version": "2.4.8-4560daf-2", + "version": "2.5.0-f0d3ee1", "main": "dist/index.js", "type": "module", "types": "dist/_types/index.d.ts", @@ -17,7 +17,7 @@ "typecheck": "tsc --noEmit" }, "dependencies": { - "@walletconnect/modal-sign-html": "2.4.8-4560daf-2", + "@walletconnect/modal-sign-html": "2.5.0-f0d3ee1", "mitt": "3.0.0" }, "peerDependencies": { diff --git a/projects/modal-sign-react/readme.md b/projects/modal-sign-react/readme.md index 4d3baf7..927f140 100644 --- a/projects/modal-sign-react/readme.md +++ b/projects/modal-sign-react/readme.md @@ -2,7 +2,7 @@ #### ๐Ÿ”Ž [Examples](https://github.com/WalletConnect/web3modal-examples) -#### ๐Ÿงช [Laboratory](lab-walletconnect-modal.pages.dev) +#### ๐Ÿงช [Laboratory](https://lab-walletconnect-modal.pages.dev) # WalletConnect Modal diff --git a/projects/modal/package.json b/projects/modal/package.json index 898a947..a911013 100644 --- a/projects/modal/package.json +++ b/projects/modal/package.json @@ -1,6 +1,6 @@ { "name": "@walletconnect/modal", - "version": "2.4.8-4560daf-2", + "version": "2.5.0-f0d3ee1", "main": "dist/index.js", "unpkg": "dist/cdn/bundle.js", "type": "module", @@ -18,8 +18,8 @@ "typecheck": "tsc --noEmit" }, "dependencies": { - "@walletconnect/modal-core": "2.4.8-4560daf-2", - "@walletconnect/modal-ui": "2.4.8-4560daf-2" + "@walletconnect/modal-core": "2.5.0-f0d3ee1", + "@walletconnect/modal-ui": "2.5.0-f0d3ee1" }, "keywords": [ "web3", diff --git a/projects/modal/readme.md b/projects/modal/readme.md index 553e87a..730ee1d 100644 --- a/projects/modal/readme.md +++ b/projects/modal/readme.md @@ -2,7 +2,7 @@ #### ๐Ÿ”Ž [Examples](https://github.com/WalletConnect/web3modal-examples) -#### ๐Ÿงช [Laboratory](lab-walletconnect-modal.pages.dev) +#### ๐Ÿงช [Laboratory](https://lab-walletconnect-modal.pages.dev) # WalletConnect Modal