Browse Source

Merge branch 'master' into salmon

Jordan Sexton 3 years ago
parent
commit
71a964d2f4

+ 5 - 5
package.json

@@ -13,19 +13,19 @@
     "scripts": {
         "nuke": "shx rm -rf packages/*/*/node_modules node_modules pnpm-lock.yaml || true",
         "reinstall": "pnpm run nuke && pnpm install",
-        "clean": "pnpm --recursive run clean && shx rm -rf **/*.tsbuildinfo",
+        "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:ts": "tsc --build --verbose tsconfig.all.json",
-        "build:other": "pnpm --recursive run build",
-        "package": "pnpm --recursive run package",
+        "build:other": "pnpm --recursive --workspace-concurrency=0 run build",
+        "package": "pnpm --recursive --workspace-concurrency=0 run package",
         "release": "pnpm run clean && pnpm run build:ts && pnpm run package && pnpm run build:other",
         "watch": "pnpm run watch:ts",
         "watch:ts": "tsc --build --verbose --watch tsconfig.all.json",
         "fmt": "prettier --write '{*,**/*}.{ts,tsx,js,jsx,json}'",
         "lint": "prettier --check '{*,**/*}.{ts,tsx,js,jsx,json}' && eslint .",
         "lint:fix": "pnpm run fmt && eslint --fix .",
-        "test": "pnpm --recursive run test",
+        "test": "pnpm --recursive --workspace-concurrency=0 run test",
         "deploy": "pnpm run deploy:docs && pnpm run deploy:example",
         "docs": "shx rm -rf docs && NODE_OPTIONS=--max_old_space_size=16000 typedoc && shx cp ./{.nojekyll,wallets.png} docs/",
         "deploy:docs": "pnpm run docs && gh-pages --dist docs --dotfiles",
@@ -43,7 +43,7 @@
         "eslint-plugin-react-hooks": "^4.6.0",
         "eslint-plugin-require-extensions": "^0.1.1",
         "gh-pages": "^4.0.0",
-        "pnpm": "^7.8.0",
+        "pnpm": "^7.13.0",
         "prettier": "^2.7.1",
         "shx": "^0.3.4",
         "typedoc": "^0.23.10",

+ 1 - 1
packages/wallets/alpha/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@solana/wallet-adapter-alpha",
-    "version": "0.1.3",
+    "version": "0.1.4",
     "author": "Solana Maintainers <maintainers@solana.foundation>",
     "repository": "https://github.com/solana-labs/wallet-adapter",
     "license": "Apache-2.0",

File diff suppressed because it is too large
+ 1 - 1
packages/wallets/alpha/src/adapter.ts


+ 1 - 1
packages/wallets/backpack/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@solana/wallet-adapter-backpack",
-    "version": "0.1.7",
+    "version": "0.1.8",
     "author": "Solana Maintainers <maintainers@solana.foundation>",
     "repository": "https://github.com/solana-labs/wallet-adapter",
     "license": "Apache-2.0",

File diff suppressed because it is too large
+ 0 - 0
packages/wallets/backpack/src/adapter.ts


+ 1 - 1
packages/wallets/strike/src/adapter.ts

@@ -185,5 +185,5 @@ export class StrikeWalletAdapter extends BaseSignerWalletAdapter {
             this.emit('error', new WalletDisconnectedError());
             this.emit('disconnect');
         }
-    }
+    };
 }

+ 4 - 4
pnpm-lock.yaml

@@ -19,7 +19,7 @@ importers:
       eslint-plugin-react-hooks: ^4.6.0
       eslint-plugin-require-extensions: ^0.1.1
       gh-pages: ^4.0.0
-      pnpm: ^7.8.0
+      pnpm: ^7.13.0
       prettier: ^2.7.1
       shx: ^0.3.4
       typedoc: ^0.23.10
@@ -35,7 +35,7 @@ importers:
       eslint-plugin-react-hooks: 4.6.0_eslint@8.22.0
       eslint-plugin-require-extensions: 0.1.1_eslint@8.22.0
       gh-pages: 4.0.0
-      pnpm: 7.9.5
+      pnpm: 7.13.0
       prettier: 2.7.1
       shx: 0.3.4
       typedoc: 0.23.10_typescript@4.7.4
@@ -12509,8 +12509,8 @@ packages:
     engines: {node: '>=4.0.0'}
     dev: false
 
-  /pnpm/7.9.5:
-    resolution: {integrity: sha512-+r7+PlBIsblqia8eUOUsBp/R+lHmGAm55jyQRt3DWMUI0srVR1aNJhQECfx24L53Ckz9g48mVxQXEniQMWQPmw==}
+  /pnpm/7.13.0:
+    resolution: {integrity: sha512-n1oG3HAOIXuOpzQAMqaPTTKlP1lJBpj9p9EIom63WYiZmCl2GaTvrcDQ085MZRcb5buQxt5lYgfqXppkluB97A==}
     engines: {node: '>=14.6'}
     hasBin: true
     dev: true

Some files were not shown because too many files changed in this diff