refactor!: move WalletConnect adapter to a standalone package (#149)

tien · Sep 9, 2024 · 21ec7d1 · 21ec7d1
1 parent 179402e
commit 21ec7d1
Show file tree

Hide file tree

Showing 15 changed files with 198 additions and 90 deletions.
diff --git a/.changeset/curly-walls-try.md b/.changeset/curly-walls-try.md
@@ -0,0 +1,6 @@
+---
+"@reactive-dot/wallet-walletconnect": minor
+"@reactive-dot/core": minor
+---
+
+BREAKING: Moved WalletConnect adapter to a standalone package.
diff --git a/apps/docs/docs/getting-started/connect-wallets.mdx b/apps/docs/docs/getting-started/connect-wallets.mdx
@@ -24,17 +24,17 @@ Additional dependencies are required if you use any of be bellow wallet type.
 <Tabs>
   <TabItem value="npm" label="npm" default>
     ```sh
-    npm add @walletconnect/modal @walletconnect/universal-provider
+    npm add @reactive-dot/wallet-walletconnect
     ```
   </TabItem>
   <TabItem value="yarn" label="yarn">
     ```sh
-    yarn add @walletconnect/modal @walletconnect/universal-provider
+    yarn add @reactive-dot/wallet-walletconnect
     ```
   </TabItem>
     <TabItem value="pnpm" label="pnpm">
     ```sh
-    pnpm add @walletconnect/modal @walletconnect/universal-provider
+    pnpm add @reactive-dot/wallet-walletconnect
     ```
   </TabItem>
 </Tabs>
@@ -46,7 +46,7 @@ Additional dependencies are required if you use any of be bellow wallet type.
 ```ts title="config.ts"
 import type { Config } from "@reactive-dot/core";
 import { InjectedWalletAggregator } from "@reactive-dot/core/wallets.js";
-import { WalletConnect } from "@reactive-dot/core/wallets/wallet-connect.js";
+import { WalletConnect } from "@reactive-dot/wallet-walletconnect";
 
 export const config = {
   // ...

diff --git a/apps/example/package.json b/apps/example/package.json
@@ -13,8 +13,7 @@
   "dependencies": {
     "@polkadot-api/descriptors": "portal:.papi/descriptors",
     "@reactive-dot/react": "workspace:^",
-    "@walletconnect/modal": "^2.6.2",
-    "@walletconnect/universal-provider": "^2.14.0",
+    "@reactive-dot/wallet-walletconnect": "workspace:^",
     "date-fns": "^3.6.0",
     "jotai-devtools": "^0.10.1",
     "polkadot-api": "^1.2.0",

diff --git a/apps/example/src/config.ts b/apps/example/src/config.ts
@@ -1,7 +1,7 @@
 import { kusama, polkadot, westend } from "@polkadot-api/descriptors";
 import type { Config } from "@reactive-dot/core";
 import { InjectedWalletAggregator } from "@reactive-dot/core/wallets.js";
-import { WalletConnect } from "@reactive-dot/core/wallets/wallet-connect.js";
+import { WalletConnect } from "@reactive-dot/wallet-walletconnect";
 import { getSmProvider } from "polkadot-api/sm-provider";
 import { startFromWorker } from "polkadot-api/smoldot/from-worker";
 

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -25,8 +25,7 @@
   ],
   "exports": {
     ".": "./build/index.js",
-    "./wallets.js": "./build/wallets/index.js",
-    "./wallets/wallet-connect.js": "./build/wallets/wallet-connect/index.js"
+    "./wallets.js": "./build/wallets/index.js"
   },
   "scripts": {
     "dev": "tsc --build --watch",
@@ -40,23 +39,11 @@
     "@reactive-dot/eslint-config": "workspace:^",
     "@tsconfig/recommended": "^1.0.7",
     "@tsconfig/strictest": "^2.0.5",
-    "@walletconnect/modal": "^2.6.2",
-    "@walletconnect/universal-provider": "^2.14.0",
     "eslint": "^9.10.0",
     "polkadot-api": "^1.2.0",
     "typescript": "^5.5.4"
   },
   "peerDependencies": {
-    "@walletconnect/modal": "2.x",
-    "@walletconnect/universal-provider": "2.x",
     "polkadot-api": "1.x"
-  },
-  "peerDependenciesMeta": {
-    "@walletconnect/modal": {
-      "optional": true
-    },
-    "@walletconnect/universal-provider": {
-      "optional": true
-    }
   }
 }
diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json
@@ -7,7 +7,6 @@
     "target": "ESNext",
     "module": "NodeNext",
     "moduleResolution": "NodeNext",
-    "jsx": "react-jsx",
     "declaration": true,
     "declarationMap": true,
     "sourceMap": true,

diff --git a/packages/wallet-walletconnect/.gitignore b/packages/wallet-walletconnect/.gitignore
@@ -0,0 +1 @@
+build
diff --git a/packages/wallet-walletconnect/eslint.config.js b/packages/wallet-walletconnect/eslint.config.js
@@ -0,0 +1,4 @@
+import recommended from "@reactive-dot/eslint-config";
+import tseslint from "typescript-eslint";
+
+export default tseslint.config(...recommended);
diff --git a/packages/wallet-walletconnect/package.json b/packages/wallet-walletconnect/package.json
@@ -0,0 +1,48 @@
+{
+  "name": "@reactive-dot/wallet-walletconnect",
+  "version": "0.0.0",
+  "description": "WalletConnect adapter for Reactive DOT",
+  "keywords": [
+    "substrate",
+    "polkadot",
+    "WalletConnect"
+  ],
+  "homepage": "https://reactivedot.dev/",
+  "bugs": {
+    "url": "https://github.com/tien/reactive-dot/issues",
+    "email": "[email protected]"
+  },
+  "license": "LGPL-3.0-or-later",
+  "author": "Tiến Nguyễn Khắc <[email protected]> (https://tien.zone/)",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/tien/reactive-dot.git",
+    "directory": "packages/wallet-walletconnect"
+  },
+  "type": "module",
+  "files": [
+    "src",
+    "build"
+  ],
+  "exports": "./build/index.js",
+  "scripts": {
+    "dev": "tsc --build --watch",
+    "build": "rm -rf build && tsc --build",
+    "lint": "eslint src"
+  },
+  "dependencies": {
+    "@walletconnect/modal": "^2.6.2",
+    "@walletconnect/universal-provider": "^2.16.1"
+  },
+  "devDependencies": {
+    "@reactive-dot/core": "workspace:^",
+    "@reactive-dot/eslint-config": "workspace:^",
+    "@tsconfig/recommended": "^1.0.7",
+    "@tsconfig/strictest": "^2.0.5",
+    "eslint": "^9.10.0",
+    "typescript": "^5.5.4"
+  },
+  "peerDependencies": {
+    "@reactive-dot/core": "workspace:^"
+  }
+}
diff --git a/...allets/wallet-connect/from-pjs-account.ts → ...let-walletconnect/src/from-pjs-account.ts b/...allets/wallet-connect/from-pjs-account.ts → ...let-walletconnect/src/from-pjs-account.ts
diff --git a/.../core/src/wallets/wallet-connect/index.ts → packages/wallet-walletconnect/src/index.ts b/.../core/src/wallets/wallet-connect/index.ts → packages/wallet-walletconnect/src/index.ts
@@ -1,6 +1,6 @@
-import { ReDotError } from "../../errors.js";
-import { DeepLinkWallet } from "../deep-link-wallet.js";
 import { getPolkadotSignerFromPjs } from "./from-pjs-account.js";
+import { ReDotError } from "@reactive-dot/core";
+import { DeepLinkWallet } from "@reactive-dot/core/wallets.js";
 import type {
   WalletConnectModal,
   WalletConnectModalConfig,

diff --git a/...-connect/pjs-signed-extensions-mappers.ts → ...nect/src/pjs-signed-extensions-mappers.ts b/...-connect/pjs-signed-extensions-mappers.ts → ...nect/src/pjs-signed-extensions-mappers.ts
diff --git a/.../core/src/wallets/wallet-connect/types.ts → packages/wallet-walletconnect/src/types.ts b/.../core/src/wallets/wallet-connect/types.ts → packages/wallet-walletconnect/src/types.ts
diff --git a/packages/wallet-walletconnect/tsconfig.json b/packages/wallet-walletconnect/tsconfig.json
@@ -0,0 +1,16 @@
+{
+  "extends": [
+    "@tsconfig/recommended/tsconfig.json",
+    "@tsconfig/strictest/tsconfig.json"
+  ],
+  "compilerOptions": {
+    "target": "ESNext",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "declaration": true,
+    "declarationMap": true,
+    "sourceMap": true,
+    "outDir": "build"
+  },
+  "include": ["src"]
+}