Merge branch 'master' into mwa-and-standard-rc

.changeset/config.json

@@ -1,11 +1,11 @@
 {
-  "$schema": "https://unpkg.com/@changesets/config@2.2.0/schema.json",
-  "changelog": "@changesets/cli/changelog",
-  "commit": false,
-  "fixed": [],
-  "linked": [],
-  "access": "restricted",
-  "baseBranch": "master",
-  "updateInternalDependencies": "patch",
-  "ignore": []
+    "$schema": "https://unpkg.com/@changesets/config@2.2.0/schema.json",
+    "changelog": "@changesets/cli/changelog",
+    "commit": false,
+    "fixed": [],
+    "linked": [],
+    "access": "restricted",
+    "baseBranch": "master",
+    "updateInternalDependencies": "patch",
+    "ignore": []
 }

.github/workflows/main.yml

@@ -39,7 +39,7 @@ jobs:
         run: pnpm install
 
       - name: Build packages
-        run: pnpm build:release
+        run: pnpm build:clean
 
       - name: Run tests
         run: pnpm test

WALLET.md

@@ -1,17 +1,13 @@
 # Wallet Adapter for Solana Wallets
 
-Support for [Mobile Wallet Adapter](https://github.com/solana-mobile/mobile-wallet-adapter) and the [Wallet Standard](https://github.com/wallet-standard/wallet-standard) has been added directly into Wallet Adapter.
+Support for [Mobile Wallet Adapter](https://github.com/solana-mobile/mobile-wallet-adapter) (MWA) and the [Wallet Standard](https://github.com/wallet-standard/wallet-standard) has been added directly into Wallet Adapter.  Please review the MWA docs and [this guide for wallets](https://github.com/solana-labs/wallet-standard/blob/master/WALLET.md) to implement the Wallet Standard.
 
-For any wallet embedded in a browser, browser extension, or mobile app, you no longer need to publish an adapter at all.
+You can implement these protocols directly in your wallet, and your wallet will work across Solana apps. As wallets continue to add support for these protocols, the adapters for these wallets will be deprecated.
 
-Instead, check out the [reference implementations of Standard wallets](https://github.com/wallet-standard/wallet-standard/tree/master/packages/wallets).
+For any wallet injected into the window in a browser, browser extension, or mobile app, you no longer need to publish an adapter at all. You don't need to open a PR to MWA or the Wallet Standard.
 
-These are just reference implementations — you don't need to open a PR to Mobile Wallet Adapter or the Wallet Standard.
+We are no longer accepting contributions for new adapters of this type. Bug fixes to existing adapters are welcome, but new features should be implemented using the MWA and Wallet Standard interfaces.
 
-You can implement these protocols in your wallet, and your wallet will work across Solana apps.
+Contributions are still welcome for new adapters that are not injected into the window but instead rely on loading an SDK to interact with an external wallet.
 
-As wallets continue to add support for these protocols, the adapters for these wallets will be deprecated.
 
-Bug fixes to existing adapters are welcome, but new features should be implemented using Mobile Wallet Adapter and Wallet Standard interfaces.
-
-We are no longer accepting contributions for new adapters of this type, and all existing adapters of this type will eventually be deprecated.

package.json

@@ -15,12 +15,12 @@
         "reinstall": "pnpm run nuke && pnpm install",
         "clean": "pnpm --recursive --workspace-concurrency=0 run clean && shx rm -rf **/*.tsbuildinfo",
         "ts": "pnpm run build:ts",
-        "build": "pnpm run build:ts && pnpm run build:other",
+        "build": "pnpm run build:ts && pnpm run build:package && pnpm run build:other",
         "build:ts": "tsc --build --verbose tsconfig.all.json",
+        "build:package": "pnpm --recursive --workspace-concurrency=0 run package",
         "build:other": "pnpm --recursive --workspace-concurrency=0 run build",
-        "package": "pnpm --recursive --workspace-concurrency=0 run package",
-        "build:release": "pnpm run clean && pnpm run build:ts && pnpm run package && pnpm run build:other",
-        "release": "pnpm run build:release && changeset publish && git push --follow-tags && git status",
+        "build:clean": "pnpm run clean && pnpm run build",
+        "release": "pnpm run build:clean && changeset publish && git push --follow-tags && git status",
         "watch": "pnpm run watch:ts",
         "watch:ts": "tsc --build --verbose --watch tsconfig.all.json",
         "fmt": "prettier --write '{*,**/*}.{ts,tsx,js,jsx,json}'",

packages/starter/create-react-app-starter/package.json

@@ -31,7 +31,7 @@
         "@solana/wallet-adapter-base": "^0.9.18",
         "@solana/wallet-adapter-react": "^0.15.21-rc.3",
         "@solana/wallet-adapter-react-ui": "^0.9.19-rc.3",
-        "@solana/wallet-adapter-wallets": "^0.19.2",
+        "@solana/wallet-adapter-wallets": "^0.19.3",
         "@solana/web3.js": "^1.58.0",
         "react": "^18.0.0",
         "react-app-rewired": "^2.2.1",

packages/starter/example/package.json

@@ -44,12 +44,12 @@
         "@solana/wallet-adapter-material-ui": "^0.16.17-rc.2",
         "@solana/wallet-adapter-react": "^0.15.21-rc.3",
         "@solana/wallet-adapter-react-ui": "^0.9.19-rc.3",
-        "@solana/wallet-adapter-wallets": "^0.19.2",
+        "@solana/wallet-adapter-wallets": "^0.19.3",
         "@solana/web3.js": "^1.58.0",
         "antd": "^4.22.6",
         "bs58": "^4.0.1",
         "next": "^12.3.1",
-        "notistack": "2.0.5",
+        "notistack": "^2.0.8",
         "react": "^18.0.0",
         "react-dom": "^18.0.0",
         "tweetnacl": "^1.0.3"

packages/starter/material-ui-starter/package.json

@@ -31,9 +31,9 @@
         "@solana/wallet-adapter-base": "^0.9.18",
         "@solana/wallet-adapter-material-ui": "^0.16.17-rc.2",
         "@solana/wallet-adapter-react": "^0.15.21-rc.3",
-        "@solana/wallet-adapter-wallets": "^0.19.2",
+        "@solana/wallet-adapter-wallets": "^0.19.3",
         "@solana/web3.js": "^1.58.0",
-        "notistack": "2.0.5",
+        "notistack": "^2.0.8",
         "react": "^18.0.0",
         "react-dom": "^18.0.0"
     },

packages/starter/nextjs-starter/package.json

@@ -36,7 +36,7 @@
         "@solana/wallet-adapter-base": "^0.9.18",
         "@solana/wallet-adapter-react": "^0.15.21-rc.3",
         "@solana/wallet-adapter-react-ui": "^0.9.19-rc.3",
-        "@solana/wallet-adapter-wallets": "^0.19.2",
+        "@solana/wallet-adapter-wallets": "^0.19.3",
         "next": "^12.2.5",
         "react": "^18.0.0",
         "react-dom": "^18.0.0"

packages/starter/react-ui-starter/package.json

@@ -27,7 +27,7 @@
         "@solana/wallet-adapter-base": "^0.9.18",
         "@solana/wallet-adapter-react": "^0.15.21-rc.3",
         "@solana/wallet-adapter-react-ui": "^0.9.19-rc.3",
-        "@solana/wallet-adapter-wallets": "^0.19.2",
+        "@solana/wallet-adapter-wallets": "^0.19.3",
         "@solana/web3.js": "^1.58.0",
         "react": "^18.0.0",
         "react-dom": "^18.0.0"

packages/wallets/fractal/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@solana/wallet-adapter-fractal",
-    "version": "0.1.1",
+    "version": "0.1.2",
     "author": "Solana Maintainers <maintainers@solana.foundation>",
     "repository": "https://github.com/solana-labs/wallet-adapter",
     "license": "Apache-2.0",
@@ -33,7 +33,7 @@
         "@solana/web3.js": "^1.58.0"
     },
     "dependencies": {
-        "@fractalwagmi/solana-wallet-adapter": "^0.0.3",
+        "@fractalwagmi/solana-wallet-adapter": "^0.0.8",
         "@solana/wallet-adapter-base": "workspace:^"
     },
     "devDependencies": {
@@ -41,3 +41,4 @@
         "shx": "^0.3.4"
     }
 }
+