Merge pull request #105 from nightly-labs/move_apps_to_packages

add: move connect folders from apps to packages
nightly-labs · Feb 29, 2024 · 147e75c · 147e75c
2 parents 1d79304 + 05a5b22
commit 147e75c
Show file tree

Hide file tree

Showing 53 changed files with 266 additions and 263 deletions.
diff --git a/.github/workflows/connect-test-local.yml b/.github/workflows/connect-test-local.yml
@@ -62,11 +62,11 @@ jobs:
       - name: test solana local
         run: |
           pnpm test:ci
-        working-directory: ./sdk/apps/solana
+        working-directory: ./sdk/packages/solana
       - name: test sui local
         run: |
           pnpm test:ci
-        working-directory: ./sdk/apps/sui
+        working-directory: ./sdk/packages/sui
       - name: Clean target
         working-directory: ./infra
         run: |

diff --git a/.github/workflows/connect-test-production.yml b/.github/workflows/connect-test-production.yml
@@ -39,8 +39,8 @@ jobs:
       - name: test solana production
         run: |
           pnpm test:production
-        working-directory: ./sdk/apps/solana
+        working-directory: ./sdk/packages/solana
       - name: test sui production
         run: |
           pnpm test:production
-        working-directory: ./sdk/apps/sui
+        working-directory: ./sdk/packages/sui
diff --git a/sdk/apps/modal-example/package.json b/sdk/apps/modal-example/package.json
@@ -21,8 +21,8 @@
     "@nightlylabs/nightly-connect-solana": "0.0.29",
     "@nightlylabs/nightly-connect-sui": "0.0.29",
     "@nightlylabs/wallet-selector-sui": "0.3.0",
-    "@nightlylabs/nightly-connect-polkadot": "0.0.14",
-    "@nightlylabs/wallet-selector-polkadot": "0.2.2",
+    "@nightlylabs/nightly-connect-polkadot": "0.0.15",
+    "@nightlylabs/wallet-selector-polkadot": "0.2.3",
     "@nightlylabs/wallet-selector-base": "^0.4.0",
     "@polkadot/extension-inject": "^0.46.5",
     "@polkadot/api": "^10.10.1",

diff --git a/sdk/apps/modal-example/src/routes/externalModal.tsx b/sdk/apps/modal-example/src/routes/externalModal.tsx
@@ -47,7 +47,7 @@ export default function SolanaExternalModal() {
       setPublicKey(pk)
     })
     adapter.on('change', (a) => {
-      if (a.accounts) {
+      if (!!a.accounts?.length && a.accounts[0].publicKey) {
         setPublicKey(new PublicKey(a.accounts[0].publicKey))
       }
     })

diff --git a/sdk/apps/modal-example/src/routes/solana.tsx b/sdk/apps/modal-example/src/routes/solana.tsx
@@ -31,7 +31,7 @@ export default function Solana() {
         setPublicKey(undefined)
       })
       adapter.on('change', (a) => {
-        if (a.accounts) {
+        if (!!a.accounts?.length && a.accounts[0].publicKey) {
           setPublicKey(new PublicKey(a.accounts[0].publicKey))
         }
       })

diff --git a/sdk/apps/modal-example/src/routes/sui.tsx b/sdk/apps/modal-example/src/routes/sui.tsx
@@ -35,7 +35,7 @@ export default function Sui() {
       })
 
       adapter.on('change', (a) => {
-        if (a.accounts) {
+        if (!!a.accounts?.length && a.accounts[0].address) {
           setPublicKey(a.accounts[0].address)
         }
       })

diff --git a/sdk/apps/modal-example/src/routes/suiInitOnConnect.tsx b/sdk/apps/modal-example/src/routes/suiInitOnConnect.tsx
@@ -31,7 +31,7 @@ export default function Sui() {
     })
 
     adapter.on('change', (a) => {
-      if (a.accounts) {
+      if (!!a.accounts?.length && a.accounts[0].address) {
         setPublicKey(a.accounts[0].address)
       }
     })

diff --git a/sdk/build-only-packages.sh b/sdk/build-only-packages.sh
@@ -3,14 +3,14 @@ cd ./apps/base
 pnpm build
 
 # connect networks
-cd ../solana
+cd ../../packages/solana
 pnpm build
 cd ../sui
 pnpm build
 cd ../polkadot
 pnpm build
 # ui packages
-cd ../../packages/qr-codes
+cd ../qr-codes
 pnpm build
 cd ../modal
 pnpm build

diff --git a/sdk/apps/polkadot/.gitignore → sdk/packages/polkadot/.gitignore b/sdk/apps/polkadot/.gitignore → sdk/packages/polkadot/.gitignore
diff --git a/sdk/apps/polkadot/package.json → sdk/packages/polkadot/package.json b/sdk/apps/polkadot/package.json → sdk/packages/polkadot/package.json
@@ -55,4 +55,4 @@
     "eventemitter3": "^5.0.1",
     "uuid": "^9.0.0"
   }
-}
+}
diff --git a/sdk/apps/polkadot/rollup.config.js → sdk/packages/polkadot/rollup.config.js b/sdk/apps/polkadot/rollup.config.js → sdk/packages/polkadot/rollup.config.js
@@ -69,7 +69,7 @@ export default [
     ]
   },
   {
-    input: 'dist/types/apps/polkadot/src/index.d.ts',
+    input: 'dist/types/packages/polkadot/src/index.d.ts',
     output: [{ file: 'dist/index.d.ts', format: 'esm' }],
     plugins: [dts()]
   }

diff --git a/sdk/apps/polkadot/src/Accounts.ts → sdk/packages/polkadot/src/Accounts.ts b/sdk/apps/polkadot/src/Accounts.ts → sdk/packages/polkadot/src/Accounts.ts
diff --git a/sdk/apps/polkadot/src/Signer.ts → sdk/packages/polkadot/src/Signer.ts b/sdk/apps/polkadot/src/Signer.ts → sdk/packages/polkadot/src/Signer.ts
diff --git a/sdk/apps/polkadot/src/app.ts → sdk/packages/polkadot/src/app.ts b/sdk/apps/polkadot/src/app.ts → sdk/packages/polkadot/src/app.ts
diff --git a/sdk/apps/polkadot/src/client.ts → sdk/packages/polkadot/src/client.ts b/sdk/apps/polkadot/src/client.ts → sdk/packages/polkadot/src/client.ts
diff --git a/sdk/apps/polkadot/src/e2e.test.ts → sdk/packages/polkadot/src/e2e.test.ts b/sdk/apps/polkadot/src/e2e.test.ts → sdk/packages/polkadot/src/e2e.test.ts
diff --git a/sdk/apps/polkadot/src/http-client.ts → sdk/packages/polkadot/src/http-client.ts b/sdk/apps/polkadot/src/http-client.ts → sdk/packages/polkadot/src/http-client.ts
diff --git a/sdk/apps/polkadot/src/http-e2e.test.ts → sdk/packages/polkadot/src/http-e2e.test.ts b/sdk/apps/polkadot/src/http-e2e.test.ts → sdk/packages/polkadot/src/http-e2e.test.ts
diff --git a/sdk/apps/polkadot/src/index.ts → sdk/packages/polkadot/src/index.ts b/sdk/apps/polkadot/src/index.ts → sdk/packages/polkadot/src/index.ts
diff --git a/sdk/apps/polkadot/src/requestTypes.ts → sdk/packages/polkadot/src/requestTypes.ts b/sdk/apps/polkadot/src/requestTypes.ts → sdk/packages/polkadot/src/requestTypes.ts
diff --git a/sdk/apps/polkadot/src/testUtils.ts → sdk/packages/polkadot/src/testUtils.ts b/sdk/apps/polkadot/src/testUtils.ts → sdk/packages/polkadot/src/testUtils.ts
diff --git a/sdk/apps/polkadot/src/utils.ts → sdk/packages/polkadot/src/utils.ts b/sdk/apps/polkadot/src/utils.ts → sdk/packages/polkadot/src/utils.ts
diff --git a/sdk/apps/polkadot/tsconfig.json → sdk/packages/polkadot/tsconfig.json b/sdk/apps/polkadot/tsconfig.json → sdk/packages/polkadot/tsconfig.json
diff --git a/sdk/apps/polkadot/vitest.config.ts → sdk/packages/polkadot/vitest.config.ts b/sdk/apps/polkadot/vitest.config.ts → sdk/packages/polkadot/vitest.config.ts
diff --git a/sdk/packages/selector-polkadot/package.json b/sdk/packages/selector-polkadot/package.json
@@ -41,4 +41,4 @@
     "tslib": "^2.5.3",
     "typescript": "^5.1.3"
   }
-}
+}
diff --git a/sdk/apps/solana/.gitignore → sdk/packages/solana/.gitignore b/sdk/apps/solana/.gitignore → sdk/packages/solana/.gitignore
diff --git a/sdk/apps/solana/package.json → sdk/packages/solana/package.json b/sdk/apps/solana/package.json → sdk/packages/solana/package.json
@@ -50,4 +50,4 @@
     "eventemitter3": "^5.0.1",
     "uuid": "^9.0.0"
   }
-}
+}
diff --git a/sdk/apps/solana/rollup.config.js → sdk/packages/solana/rollup.config.js b/sdk/apps/solana/rollup.config.js → sdk/packages/solana/rollup.config.js
@@ -61,7 +61,7 @@ export default [
     ]
   },
   {
-    input: 'dist/types/apps/solana/src/index.d.ts',
+    input: 'dist/types/packages/solana/src/index.d.ts',
     output: [{ file: 'dist/index.d.ts', format: 'esm' }],
     plugins: [dts()]
   }

diff --git a/sdk/apps/solana/src/app.ts → sdk/packages/solana/src/app.ts b/sdk/apps/solana/src/app.ts → sdk/packages/solana/src/app.ts
diff --git a/sdk/apps/solana/src/client.ts → sdk/packages/solana/src/client.ts b/sdk/apps/solana/src/client.ts → sdk/packages/solana/src/client.ts
diff --git a/sdk/apps/solana/src/e2e.test.ts → sdk/packages/solana/src/e2e.test.ts b/sdk/apps/solana/src/e2e.test.ts → sdk/packages/solana/src/e2e.test.ts
diff --git a/sdk/apps/solana/src/http-client.ts → sdk/packages/solana/src/http-client.ts b/sdk/apps/solana/src/http-client.ts → sdk/packages/solana/src/http-client.ts
diff --git a/sdk/apps/solana/src/http-e2e.test.ts → sdk/packages/solana/src/http-e2e.test.ts b/sdk/apps/solana/src/http-e2e.test.ts → sdk/packages/solana/src/http-e2e.test.ts
diff --git a/sdk/apps/solana/src/index.ts → sdk/packages/solana/src/index.ts b/sdk/apps/solana/src/index.ts → sdk/packages/solana/src/index.ts
diff --git a/sdk/apps/solana/src/requestTypes.ts → sdk/packages/solana/src/requestTypes.ts b/sdk/apps/solana/src/requestTypes.ts → sdk/packages/solana/src/requestTypes.ts
diff --git a/sdk/apps/solana/src/testUtils.ts → sdk/packages/solana/src/testUtils.ts b/sdk/apps/solana/src/testUtils.ts → sdk/packages/solana/src/testUtils.ts
diff --git a/sdk/apps/solana/src/utils.ts → sdk/packages/solana/src/utils.ts b/sdk/apps/solana/src/utils.ts → sdk/packages/solana/src/utils.ts
diff --git a/sdk/apps/solana/tsconfig.json → sdk/packages/solana/tsconfig.json b/sdk/apps/solana/tsconfig.json → sdk/packages/solana/tsconfig.json
diff --git a/sdk/apps/solana/vitest.config.ts → sdk/packages/solana/vitest.config.ts b/sdk/apps/solana/vitest.config.ts → sdk/packages/solana/vitest.config.ts
diff --git a/sdk/apps/sui/.gitignore → sdk/packages/sui/.gitignore b/sdk/apps/sui/.gitignore → sdk/packages/sui/.gitignore
diff --git a/sdk/apps/sui/package.json → sdk/packages/sui/package.json b/sdk/apps/sui/package.json → sdk/packages/sui/package.json
@@ -53,4 +53,4 @@
     "eventemitter3": "^5.0.1",
     "uuid": "^9.0.0"
   }
-}
+}
diff --git a/sdk/apps/sui/rollup.config.js → sdk/packages/sui/rollup.config.js b/sdk/apps/sui/rollup.config.js → sdk/packages/sui/rollup.config.js
@@ -67,7 +67,7 @@ export default [
     ]
   },
   {
-    input: 'dist/types/apps/sui/src/index.d.ts',
+    input: 'dist/types/packages/sui/src/index.d.ts',
     output: [{ file: 'dist/index.d.ts', format: 'esm' }],
     plugins: [dts()]
   }

diff --git a/sdk/apps/sui/src/app.ts → sdk/packages/sui/src/app.ts b/sdk/apps/sui/src/app.ts → sdk/packages/sui/src/app.ts
diff --git a/sdk/apps/sui/src/client.ts → sdk/packages/sui/src/client.ts b/sdk/apps/sui/src/client.ts → sdk/packages/sui/src/client.ts
diff --git a/sdk/apps/sui/src/e2e.test.ts → sdk/packages/sui/src/e2e.test.ts b/sdk/apps/sui/src/e2e.test.ts → sdk/packages/sui/src/e2e.test.ts
diff --git a/sdk/apps/sui/src/http-client.test.ts → sdk/packages/sui/src/http-client.test.ts b/sdk/apps/sui/src/http-client.test.ts → sdk/packages/sui/src/http-client.test.ts
diff --git a/sdk/apps/sui/src/http-client.ts → sdk/packages/sui/src/http-client.ts b/sdk/apps/sui/src/http-client.ts → sdk/packages/sui/src/http-client.ts
diff --git a/sdk/apps/sui/src/index.ts → sdk/packages/sui/src/index.ts b/sdk/apps/sui/src/index.ts → sdk/packages/sui/src/index.ts
diff --git a/sdk/apps/sui/src/requestTypes.ts → sdk/packages/sui/src/requestTypes.ts b/sdk/apps/sui/src/requestTypes.ts → sdk/packages/sui/src/requestTypes.ts
diff --git a/sdk/apps/sui/src/testUtils.ts → sdk/packages/sui/src/testUtils.ts b/sdk/apps/sui/src/testUtils.ts → sdk/packages/sui/src/testUtils.ts
diff --git a/sdk/apps/sui/src/utils.ts → sdk/packages/sui/src/utils.ts b/sdk/apps/sui/src/utils.ts → sdk/packages/sui/src/utils.ts
diff --git a/sdk/apps/sui/tsconfig.json → sdk/packages/sui/tsconfig.json b/sdk/apps/sui/tsconfig.json → sdk/packages/sui/tsconfig.json
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,4 +55,4 @@ @@
         "eventemitter3": "^5.0.1",
         "uuid": "^9.0.0"
       }
-    }
+    }