Merge working canary (#4)

* remove help section, codebase cleanup * stash * tag canary * tag new canary * remove wagmi and valtio deps from lab * add ethereum provider dep * fix laboratory links * tag canary * publish canary * fix modal-core imports * tag canary * Update all examples * update auth modalOptions * fix github actions
WalletConnect · Jun 22, 2023 · 39e74a9 · 39e74a9
1 parent 78edead
commit 39e74a9
Show file tree

Hide file tree

Showing 27 changed files with 68 additions and 64 deletions.
diff --git 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
@@ -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
@@ -1,19 +1,19 @@
 {
   "name": "laboratory",
-  "version": "2.4.8-4560daf-2",
+  "version": "2.5.0-f0d3ee1",
   "private": true,
   "scripts": {
     "dev": "rm -rf .next; next dev",
     "build": "next build"
   },
   "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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -9,7 +9,10 @@ import { WalletConnectModal } from '@walletconnect/modal'
 export interface WalletConnectModalAuthOptions {
   projectId: string
   metadata: AuthClientTypes.Metadata
-  modalOptions?: Omit<WalletConnectModalConfig, 'projectId' | 'walletConnectVersion'>
+  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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ name: Pull request checks @@
     on:
       pull_request:
         branches:
-          - V2
+          - main
     jobs:
       build:
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		export { WalletConnectModalAuth } from './src/client';

		export { WalletConnectModalAuth } from './src/client'