solving conflicts before merge

tkey · Oct 29, 2021 · 813ef6e · 813ef6e
2 parents f69a78a + f01c95b
commit 813ef6e
Show file tree

Hide file tree

Showing 11 changed files with 168 additions and 235 deletions.
diff --git a/FAQ.md b/FAQ.md
@@ -14,7 +14,7 @@ After reading this FAQ, if you've found a bug or you'd like to request a feature
 ## Can I use this with ___?
 
 ### React
-Yes, see the [react-ui-starter](https://github.com/solana-labs/wallet-adapter/tree/master/packages/starter/react-ui-starter) package
+Yes, see the [react-ui-starter](https://github.com/solana-labs/wallet-adapter/tree/master/packages/starter/react-ui-starter) package.
 
 ### Anchor
 Yes, use the [`useAnchorWallet()`](https://github.com/solana-labs/wallet-adapter/blob/master/packages/core/react/src/useAnchorWallet.ts) hook in the React package to easily get an [Anchor-compatible Wallet interface](https://github.com/project-serum/anchor/blob/0faed886002a9b01ad0513c860e19d7570cb0221/ts/src/provider.ts#L220-L224).

diff --git a/README.md b/README.md
@@ -181,9 +181,7 @@ These packages provide components for common UI frameworks.
 | [material-ui](https://github.com/solana-labs/wallet-adapter/tree/master/packages/ui/material-ui) | Components for [Material UI](https://material-ui.com) | [`@solana/wallet-adapter-material-ui`](https://npmjs.com/package/@solana/wallet-adapter-material-ui) |
 | [ant-design](https://github.com/solana-labs/wallet-adapter/tree/master/packages/ui/ant-design)   | Components for [Ant Design](https://ant.design)       | [`@solana/wallet-adapter-ant-design`](https://npmjs.com/package/@solana/wallet-adapter-ant-design)   |
 | [react-ui](https://github.com/solana-labs/wallet-adapter/tree/master/packages/ui/react-ui)       | Components for React (no UI framework, just CSS)      | [`@solana/wallet-adapter-react-ui`](https://npmjs.com/package/@solana/wallet-adapter-react-ui)       |
-| [vue-ui](https://github.com/solana-labs/wallet-adapter/tree/master/packages/ui/vue-ui) \*        | Components for Vue (no UI framework, just CSS)        | [`@solana/wallet-adapter-vue-ui`](https://npmjs.com/package/@solana/wallet-adapter-vue-ui)           |
-
-\* Package has not been published to NPM yet.
+| [vue-ui](https://github.com/solana-labs/wallet-adapter/tree/master/packages/ui/vue-ui)           | Components for Vue (no UI framework, just CSS)        | [`@solana/wallet-adapter-vue-ui`](https://npmjs.com/package/@solana/wallet-adapter-vue-ui)           |
 
 ### Starter Projects
 These packages provide projects that you can use to start building a dApp with built-in wallet support.

diff --git a/packages/core/vue/package.json b/packages/core/vue/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@solana/wallet-adapter-vue",
-    "version": "0.3.0",
+    "version": "0.3.1",
     "author": "Solana Maintainers <[email protected]>",
     "repository": "https://github.com/solana-labs/wallet-adapter",
     "license": "Apache-2.0",

diff --git a/packages/starter/nextjs-starter/pages/_app.tsx b/packages/starter/nextjs-starter/pages/_app.tsx
@@ -1,9 +1,11 @@
+import { WalletModalProvider } from '@solana/wallet-adapter-react-ui';
 import { AppProps } from 'next/app';
 import dynamic from 'next/dynamic';
 import { FC, ReactNode } from 'react';
 
 // Use require instead of import, and order matters
 require('../styles/globals.css');
+require('@solana/wallet-adapter-react-ui/styles.css');
 
 const WalletConnectionProvider = dynamic<{ children: ReactNode }>(
     () =>
@@ -18,7 +20,9 @@ const WalletConnectionProvider = dynamic<{ children: ReactNode }>(
 const App: FC<AppProps> = ({ Component, pageProps }) => {
     return (
         <WalletConnectionProvider>
-            <Component {...pageProps} />
+            <WalletModalProvider>
+                <Component {...pageProps} />
+            </WalletModalProvider>
         </WalletConnectionProvider>
     );
 };

diff --git a/packages/starter/nextjs-starter/pages/index.tsx b/packages/starter/nextjs-starter/pages/index.tsx
@@ -1,3 +1,4 @@
+import { WalletDisconnectButton, WalletMultiButton } from '@solana/wallet-adapter-react-ui';
 import { NextPage } from 'next';
 import Head from 'next/head';
 import Image from 'next/image';
@@ -17,6 +18,11 @@ const Index: NextPage = () => {
                     Welcome to <a href="https://nextjs.org">Next.js!</a>
                 </h1>
 
+                <div className={styles.walletButtons}>
+                    <WalletMultiButton />
+                    <WalletDisconnectButton />
+                </div>
+
                 <p className={styles.description}>
                     Get started by editing <code className={styles.code}>pages/index.js</code>
                 </p>

diff --git a/packages/starter/nextjs-starter/styles/Home.module.css b/packages/starter/nextjs-starter/styles/Home.module.css
@@ -1,121 +1,123 @@
 .container {
-  min-height: 100vh;
-  padding: 0 0.5rem;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  height: 100vh;
+    padding: 0 2rem;
 }
 
 .main {
-  padding: 5rem 0;
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
+    min-height: 100vh;
+    padding: 4rem 0;
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
 }
 
 .footer {
-  width: 100%;
-  height: 100px;
-  border-top: 1px solid #eaeaea;
-  display: flex;
-  justify-content: center;
-  align-items: center;
+    display: flex;
+    flex: 1;
+    padding: 2rem 0;
+    border-top: 1px solid #eaeaea;
+    justify-content: center;
+    align-items: center;
 }
 
 .footer a {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  flex-grow: 1;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex-grow: 1;
 }
 
 .title a {
-  color: #0070f3;
-  text-decoration: none;
+    color: #0070f3;
+    text-decoration: none;
 }
 
 .title a:hover,
 .title a:focus,
 .title a:active {
-  text-decoration: underline;
+    text-decoration: underline;
 }
 
 .title {
-  margin: 0;
-  line-height: 1.15;
-  font-size: 4rem;
+    margin: 0;
+    line-height: 1.15;
+    font-size: 4rem;
 }
 
 .title,
 .description {
-  text-align: center;
+    text-align: center;
 }
 
 .description {
-  line-height: 1.5;
-  font-size: 1.5rem;
+    margin: 4rem 0;
+    line-height: 1.5;
+    font-size: 1.5rem;
 }
 
 .code {
-  background: #fafafa;
-  border-radius: 5px;
-  padding: 0.75rem;
-  font-size: 1.1rem;
-  font-family: Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono,
-    Bitstream Vera Sans Mono, Courier New, monospace;
+    background: #fafafa;
+    border-radius: 5px;
+    padding: 0.75rem;
+    font-size: 1.1rem;
+    font-family: Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New,
+        monospace;
 }
 
 .grid {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  flex-wrap: wrap;
-  max-width: 800px;
-  margin-top: 3rem;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-wrap: wrap;
+    max-width: 800px;
 }
 
 .card {
-  margin: 1rem;
-  padding: 1.5rem;
-  text-align: left;
-  color: inherit;
-  text-decoration: none;
-  border: 1px solid #eaeaea;
-  border-radius: 10px;
-  transition: color 0.15s ease, border-color 0.15s ease;
-  width: 45%;
+    margin: 1rem;
+    padding: 1.5rem;
+    text-align: left;
+    color: inherit;
+    text-decoration: none;
+    border: 1px solid #eaeaea;
+    border-radius: 10px;
+    transition: color 0.15s ease, border-color 0.15s ease;
+    max-width: 300px;
 }
 
 .card:hover,
 .card:focus,
 .card:active {
-  color: #0070f3;
-  border-color: #0070f3;
+    color: #0070f3;
+    border-color: #0070f3;
 }
 
 .card h2 {
-  margin: 0 0 1rem 0;
-  font-size: 1.5rem;
+    margin: 0 0 1rem 0;
+    font-size: 1.5rem;
 }
 
 .card p {
-  margin: 0;
-  font-size: 1.25rem;
-  line-height: 1.5;
+    margin: 0;
+    font-size: 1.25rem;
+    line-height: 1.5;
 }
 
 .logo {
-  height: 1em;
-  margin-left: 0.5rem;
+    height: 1em;
+    margin-left: 0.5rem;
 }
 
 @media (max-width: 600px) {
-  .grid {
-    width: 100%;
+    .grid {
+        width: 100%;
+        flex-direction: column;
+    }
+}
+
+.walletButtons {
+    padding-top: 2rem;
+    display: flex;
     flex-direction: column;
-  }
+    gap: 2rem;
 }
diff --git a/packages/ui/vue-ui/package.json b/packages/ui/vue-ui/package.json
@@ -1,10 +1,12 @@
 {
-    "private": true,
     "name": "@solana/wallet-adapter-vue-ui",
     "version": "0.1.0",
     "author": "Solana Maintainers <[email protected]>",
     "repository": "https://github.com/solana-labs/wallet-adapter",
     "license": "Apache-2.0",
+    "main": "lib/index.js",
+    "esnext": "lib/index.js",
+    "types": "lib/src/index.d.ts",
     "files": [
         "lib",
         "src",

diff --git a/packages/ui/vue-ui/vite.config.ts b/packages/ui/vue-ui/vite.config.ts
@@ -26,6 +26,7 @@ export default defineConfig({
                 },
             },
         },
+        sourcemap: true,
     },
-    plugins: [vue(), dts({ insertTypesEntry: true })],
+    plugins: [vue(), dts()],
 });
diff --git a/packages/wallets/torus/package.json b/packages/wallets/torus/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@solana/wallet-adapter-torus",
-    "version": "0.8.0",
+    "version": "0.8.1",
     "author": "Solana Maintainers <[email protected]>",
     "repository": "https://github.com/solana-labs/wallet-adapter",
     "license": "Apache-2.0",
@@ -26,9 +26,10 @@
         "@solana/web3.js": "^1.20.0"
     },
     "dependencies": {
-        "@toruslabs/openlogin": "^0.10.2",
-        "@toruslabs/openlogin-ed25519": "^0.10.2",
-        "@types/keccak": "^3.0.1"
+        "@toruslabs/openlogin": "^1.0.0",
+        "@toruslabs/openlogin-ed25519": "^1.0.0",
+        "@types/keccak": "^3.0.1",
+        "@types/readable-stream": "^2.3.11"
     },
     "devDependencies": {
         "@solana/wallet-adapter-base": "^0.7.0",

diff --git a/tsconfig.json b/tsconfig.json
@@ -18,7 +18,31 @@
     "include": ["packages/*/*/src"],
     "exclude": ["node_modules", "packages/*/*/node_modules"],
     "typedocOptions": {
-        "entryPoints": ".",
+        "entryPoints": [
+            "packages/core/angular",
+            "packages/core/vue",
+            "packages/core/wallets",
+            "packages/core/base",
+            "packages/core/react",
+            "packages/ui/ant-design",
+            "packages/ui/material-ui",
+            "packages/ui/react-ui",
+            "packages/wallets/bitkeep",
+            "packages/wallets/bitpie",
+            "packages/wallets/blocto",
+            "packages/wallets/clover",
+            "packages/wallets/coin98",
+            "packages/wallets/ledger",
+            "packages/wallets/mathwallet",
+            "packages/wallets/phantom",
+            "packages/wallets/safepal",
+            "packages/wallets/slope",
+            "packages/wallets/solflare",
+            "packages/wallets/sollet",
+            "packages/wallets/solong",
+            "packages/wallets/tokenpocket",
+            "packages/wallets/torus"
+        ],
         "entryPointStrategy": "packages",
         "out": "docs",
         "readme": "README.md"