Skip to content

Commit 8406b5a

Browse files
jordaaashjordaaash
committed
WIP
1 parent e5e1507 commit 8406b5a

File tree

106 files changed

+8582
-13925
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+8582
-13925
lines changed

Diff for: ‎PACKAGES.md

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ These packages provide components for common UI frameworks.
2828
|-----------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------|
2929
| [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) |
3030
| [material-ui](https://github.com/solana-labs/wallet-adapter/tree/master/packages/ui/material-ui) | Components for [Material UI](https://material-ui.com) with React | [`@solana/wallet-adapter-material-ui`](https://npmjs.com/package/@solana/wallet-adapter-material-ui) |
31-
| [ant-design](https://github.com/solana-labs/wallet-adapter/tree/master/packages/ui/ant-design) | Components for [Ant Design](https://ant.design) with React | [`@solana/wallet-adapter-ant-design`](https://npmjs.com/package/@solana/wallet-adapter-ant-design) |
3231
| [angular-material-ui](https://github.com/heavy-duty/platform/tree/master/libs/wallet-adapter/ui/material) | Components for [Angular Material UI](https://material.angular.io/) | [`@heavy-duty/wallet-adapter-material`](https://www.npmjs.com/package/@heavy-duty/wallet-adapter-material) |
3332

3433
### Wallets

Diff for: ‎package.json

+16-13
Original file line numberDiff line numberDiff line change
@@ -33,32 +33,35 @@
3333
"devDependencies": {
3434
"@changesets/cli": "^2.26.1",
3535
"@parcel/resolver-default": "2.14.4",
36-
"@types/node": "^20",
36+
"@types/node": "^22.14.1",
3737
"@typescript-eslint/eslint-plugin": "^5.60.0",
3838
"@typescript-eslint/parser": "^5.60.0",
3939
"eslint": "8.22.0",
40-
"eslint-config-prettier": "^8.8.0",
41-
"eslint-plugin-prettier": "^4.2.1",
42-
"eslint-plugin-react": "^7.32.2",
43-
"eslint-plugin-react-hooks": "^4.6.0",
40+
"eslint-config-prettier": "^10.1.2",
41+
"eslint-plugin-prettier": "^5.2.6",
42+
"eslint-plugin-react": "^7.37.5",
43+
"eslint-plugin-react-hooks": "^5.2.0",
4444
"eslint-plugin-require-extensions": "^0.1.3",
45-
"gh-pages": "^4.0.0",
45+
"gh-pages": "^6.3.0",
4646
"pnpm": "10.8.1",
47-
"prettier": "^2.8.8",
48-
"shx": "^0.3.4",
49-
"turbo": "^1.13.3",
50-
"typedoc": "^0.23.28",
51-
"typescript": "~5"
47+
"prettier": "^3.5.3",
48+
"shx": "^0.4.0",
49+
"turbo": "^2.5.0",
50+
"typedoc": "^0.28.2",
51+
"typescript": "^5.8.3",
52+
"vm-browserify": "^1.1.2"
5253
},
5354
"overrides": {
5455
"@solana/wallet-adapter-base": "workspace:^",
5556
"eslint": "8.22.0",
56-
"@ngraveio/bc-ur": "1.1.12"
57+
"@ngraveio/bc-ur": "1.1.12",
58+
"@types/web": "npm:typescript@^5.8.3"
5759
},
5860
"resolutions": {
5961
"@solana/wallet-adapter-base": "workspace:^",
6062
"eslint": "8.22.0",
61-
"@ngraveio/bc-ur": "1.1.12"
63+
"@ngraveio/bc-ur": "1.1.12",
64+
"@types/web": "npm:typescript@^5.8.3"
6265
},
6366
"@parcel/resolver-default": {
6467
"packageExports": true

Diff for: ‎packages/core/base/package.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,17 @@
3232
"package": "shx mkdir -p lib/cjs && shx echo '{ \"type\": \"commonjs\" }' > lib/cjs/package.json"
3333
},
3434
"peerDependencies": {
35-
"@solana/web3.js": "^1.77.3"
35+
"@solana/web3.js": "^1.98.0"
3636
},
3737
"dependencies": {
38-
"@solana/wallet-standard-features": "^1.1.0",
39-
"@wallet-standard/base": "^1.0.1",
40-
"@wallet-standard/features": "^1.0.3",
41-
"eventemitter3": "^4.0.7"
38+
"@solana/wallet-standard-features": "^1.3.0",
39+
"@wallet-standard/base": "^1.1.0",
40+
"@wallet-standard/features": "^1.1.0",
41+
"eventemitter3": "^5.0.1"
4242
},
4343
"devDependencies": {
44-
"@solana/web3.js": "^1.77.3",
45-
"@types/node-fetch": "^2.6.4",
46-
"shx": "^0.3.4"
44+
"@solana/web3.js": "^1.98.0",
45+
"@types/node-fetch": "^2.6.12",
46+
"shx": "^0.4.0"
4747
}
4848
}

Diff for: ‎packages/core/react/package.json

+13-13
Original file line numberDiff line numberDiff line change
@@ -33,25 +33,25 @@
3333
"test": "jest"
3434
},
3535
"peerDependencies": {
36-
"@solana/web3.js": "^1.77.3",
36+
"@solana/web3.js": "^1.98.0",
3737
"react": "*"
3838
},
3939
"dependencies": {
40-
"@solana-mobile/wallet-adapter-mobile": "^2.0.0",
40+
"@solana-mobile/wallet-adapter-mobile": "^2.1.5",
4141
"@solana/wallet-adapter-base": "workspace:^",
42-
"@solana/wallet-standard-wallet-adapter-react": "^1.1.0"
42+
"@solana/wallet-standard-wallet-adapter-react": "^1.1.4"
4343
},
4444
"devDependencies": {
45-
"@solana/web3.js": "^1.77.3",
46-
"@types/jest": "^28.1.8",
47-
"@types/react": "^18.2.13",
48-
"@types/react-dom": "^18.2.6",
49-
"jest": "^28.1.3",
50-
"jest-environment-jsdom": "^28.1.3",
45+
"@solana/web3.js": "^1.98.0",
46+
"@types/jest": "^29.5.14",
47+
"@types/react": "^18.3.19",
48+
"@types/react-dom": "^18.3.6",
49+
"jest": "^29.7.0",
50+
"jest-environment-jsdom": "^29.7.0",
5151
"jest-localstorage-mock": "^2.4.26",
52-
"react": "^18.2.0",
53-
"react-dom": "^18.2.0",
54-
"shx": "^0.3.4",
55-
"ts-jest": "^28.0.8"
52+
"react": "^18.3.1",
53+
"react-dom": "^18.3.1",
54+
"shx": "^0.4.0",
55+
"ts-jest": "^29.3.2"
5656
}
5757
}

Diff for: ‎packages/core/react/src/__tests__/WalletProviderBase-test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ const TestComponent = forwardRef(function TestComponentImpl(_props, ref) {
3838
});
3939

4040
describe('WalletProviderBase', () => {
41-
let ref: React.RefObject<TestRefType>;
41+
let ref: React.RefObject<TestRefType | null>;
4242
let root: ReturnType<typeof createRoot>;
4343
let container: HTMLElement;
4444
let fooWalletAdapter: MockWalletAdapter;

Diff for: ‎packages/core/react/src/__tests__/WalletProviderDesktop-test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ const WALLET_NAME_CACHE_KEY = 'cachedWallet';
5454
* a solution, please do send a PR.
5555
*/
5656
describe('WalletProvider when the environment is `DESKTOP_WEB`', () => {
57-
let ref: React.RefObject<TestRefType>;
57+
let ref: React.RefObject<TestRefType | null>;
5858
let root: ReturnType<typeof createRoot>;
5959
let container: HTMLElement;
6060
let fooWalletAdapter: MockWalletAdapter;

Diff for: ‎packages/core/react/src/__tests__/WalletProviderMobile-test.tsx

+4-9
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,16 @@ import {
1010
SolanaMobileWalletAdapter,
1111
SolanaMobileWalletAdapterWalletName,
1212
} from '@solana-mobile/wallet-adapter-mobile';
13-
import {
14-
type Adapter,
15-
WalletError,
16-
type WalletName,
17-
WalletReadyState,
18-
} from '@solana/wallet-adapter-base';
13+
import { type Adapter, WalletError, type WalletName, WalletReadyState } from '@solana/wallet-adapter-base';
1914
import { type Connection, PublicKey } from '@solana/web3.js';
2015
import 'jest-localstorage-mock';
2116
import React, { createRef, forwardRef, useImperativeHandle } from 'react';
2217
import { createRoot } from 'react-dom/client';
2318
import { act } from 'react-dom/test-utils';
19+
import { MockWalletAdapter } from '../__mocks__/MockWalletAdapter.js';
2420
import { useConnection } from '../useConnection.js';
2521
import { useWallet, type WalletContextState } from '../useWallet.js';
2622
import { WalletProvider, type WalletProviderProps } from '../WalletProvider.js';
27-
import { MockWalletAdapter } from '../__mocks__/MockWalletAdapter.js';
2823

2924
jest.mock('../getEnvironment.js', () => ({
3025
...jest.requireActual('../getEnvironment.js'),
@@ -74,7 +69,7 @@ const WALLET_NAME_CACHE_KEY = 'cachedWallet';
7469
* a solution, please do send a PR.
7570
*/
7671
describe('WalletProvider when the environment is `MOBILE_WEB`', () => {
77-
let ref: React.RefObject<TestRefType>;
72+
let ref: React.RefObject<TestRefType | null>;
7873
let root: ReturnType<typeof createRoot>;
7974
let container: HTMLElement;
8075
let fooWalletAdapter: MockWalletAdapter;
@@ -168,7 +163,7 @@ describe('WalletProvider when the environment is `MOBILE_WEB`', () => {
168163
it('creates a new mobile wallet adapter with the appropriate cluster for the given endpoint', () => {
169164
renderTest({});
170165
expect(jest.mocked(SolanaMobileWalletAdapter).mock.instances).toHaveLength(1);
171-
expect(jest.mocked(SolanaMobileWalletAdapter).mock.calls[0][0].cluster).toBe('fake-cluster-for-test');
166+
expect(jest.mocked(SolanaMobileWalletAdapter).mock.calls[0][0].chain).toBe('fake-cluster-for-test');
172167
});
173168
});
174169
describe('when a custom mobile wallet adapter is supplied in the adapters array', () => {

Diff for: ‎packages/core/react/src/__tests__/useLocalStorage-test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ const TestComponent = forwardRef(function TestComponentImpl(_props, ref) {
5959
describe('useLocalStorage', () => {
6060
let container: HTMLDivElement | null;
6161
let root: ReturnType<typeof createRoot>;
62-
let ref: React.RefObject<TestRefType>;
62+
let ref: React.RefObject<TestRefType | null>;
6363
function renderTest() {
6464
act(() => {
6565
root.render(<TestComponent ref={ref} />);

Diff for: ‎packages/core/react/src/defineProperty.ts

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
type InferValue<Prop extends PropertyKey, Desc> = Desc extends { get(): any; value: any }
22
? never
33
: Desc extends { value: infer T }
4-
? Record<Prop, T>
5-
: Desc extends { get(): infer T }
6-
? Record<Prop, T>
7-
: never;
4+
? Record<Prop, T>
5+
: Desc extends { get(): infer T }
6+
? Record<Prop, T>
7+
: never;
88

99
type DefineProperty<Prop extends PropertyKey, Desc extends PropertyDescriptor> = Desc extends {
1010
writable: any;
1111
set(val: any): any;
1212
}
1313
? never
1414
: Desc extends { writable: any; get(): any }
15-
? never
16-
: Desc extends { writable: false }
17-
? Readonly<InferValue<Prop, Desc>>
18-
: Desc extends { writable: true }
19-
? InferValue<Prop, Desc>
20-
: Readonly<InferValue<Prop, Desc>>;
15+
? never
16+
: Desc extends { writable: false }
17+
? Readonly<InferValue<Prop, Desc>>
18+
: Desc extends { writable: true }
19+
? InferValue<Prop, Desc>
20+
: Readonly<InferValue<Prop, Desc>>;
2121

2222
export default function defineProperty<Obj extends object, Key extends PropertyKey, PDesc extends PropertyDescriptor>(
2323
obj: Obj,

Diff for: ‎packages/starter/create-react-app-starter/README.md

-5
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@ Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
1414
The page will reload if you make edits.\
1515
You will also see any lint errors in the console.
1616

17-
### `npm test`
18-
19-
Launches the test runner in the interactive watch mode.\
20-
See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
21-
2217
### `npm run build`
2318

2419
Builds the app for production to the `build` folder.\

Diff for: ‎packages/starter/create-react-app-starter/package.json

+12-20
Original file line numberDiff line numberDiff line change
@@ -22,41 +22,33 @@
2222
"clean": "shx mkdir -p build lib && shx rm -rf build lib",
2323
"lint": "prettier --check 'src/{*,**/*}.{ts,tsx,js,jsx,json}' && eslint",
2424
"start": "react-app-rewired start",
25-
"test": "CI=true react-app-rewired test --passWithNoTests",
26-
"test:watch": "react-app-rewired test --passWithNoTests",
2725
"eject": "react-scripts eject"
2826
},
2927
"dependencies": {
3028
"@solana/wallet-adapter-base": "workspace:^",
3129
"@solana/wallet-adapter-react": "workspace:^",
3230
"@solana/wallet-adapter-react-ui": "workspace:^",
3331
"@solana/wallet-adapter-wallets": "workspace:^",
34-
"@solana/web3.js": "^1.77.3",
35-
"react": "^18.2.0",
32+
"@solana/web3.js": "^1.98.0",
33+
"react": "^18.3.1",
3634
"react-app-rewired": "^2.2.1",
37-
"react-dom": "^18.2.0",
38-
"react-scripts": "5.0.1",
39-
"web-vitals": "^2.1.4"
35+
"react-dom": "^18.3.1",
36+
"react-scripts": "^5.0.1"
4037
},
4138
"devDependencies": {
42-
"@testing-library/jest-dom": "^5.16.5",
43-
"@testing-library/react": "^13.4.0",
44-
"@testing-library/user-event": "^14.4.3",
45-
"@types/jest": "^28.1.8",
46-
"@types/react": "^18.2.13",
47-
"@types/react-dom": "^18.2.6",
48-
"@types/testing-library__jest-dom": "^5.14.6",
39+
"@types/react": "^18.3.19",
40+
"@types/react-dom": "^18.3.6",
4941
"browserify-zlib": "^0.2.0",
50-
"crypto-browserify": "^3.12.0",
42+
"crypto-browserify": "^3.12.1",
5143
"https-browserify": "^1.0.0",
5244
"process": "^0.11.10",
53-
"shx": "^0.3.4",
54-
"source-map-loader": "^4.0.1",
45+
"shx": "^0.4.0",
46+
"source-map-loader": "^5.0.0",
5547
"stream-browserify": "^3.0.0",
5648
"stream-http": "^3.2.0",
57-
"typescript": "~5",
58-
"url": "^0.11.1",
59-
"webpack": "^5.88.0"
49+
"typescript": "^5.8.3",
50+
"url": "^0.11.4",
51+
"webpack": "^5.99.5"
6052
},
6153
"eslintConfig": {
6254
"extends": [

Diff for: ‎packages/starter/create-react-app-starter/src/App.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { ConnectionProvider, WalletProvider } from '@solana/wallet-adapter-react
33
import { WalletModalProvider, WalletMultiButton } from '@solana/wallet-adapter-react-ui';
44
import { UnsafeBurnerWalletAdapter } from '@solana/wallet-adapter-wallets';
55
import { clusterApiUrl } from '@solana/web3.js';
6-
import React, { FC, ReactNode, useMemo } from 'react';
6+
import { FC, ReactNode, useMemo } from 'react';
77

88
require('./App.css');
99
require('@solana/wallet-adapter-react-ui/styles.css');

Diff for: ‎packages/starter/create-react-app-starter/src/index.tsx

+6-12
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
1-
import React from 'react';
2-
import ReactDOM from 'react-dom';
1+
import { StrictMode } from 'react';
2+
import { createRoot } from 'react-dom/client';
33
import App from './App';
44
import './index.css';
5-
import reportWebVitals from './reportWebVitals';
65

7-
ReactDOM.render(
8-
<React.StrictMode>
6+
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
7+
createRoot(document.getElementById('root')!).render(
8+
<StrictMode>
99
<App />
10-
</React.StrictMode>,
11-
document.getElementById('root')
10+
</StrictMode>
1211
);
13-
14-
// If you want to start measuring performance in your app, pass a function
15-
// to log results (for example: reportWebVitals(console.log))
16-
// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
17-
reportWebVitals();

Diff for: ‎packages/starter/create-react-app-starter/src/reportWebVitals.ts

-15
This file was deleted.

Diff for: ‎packages/starter/create-react-app-starter/src/setupTests.ts

-5
This file was deleted.

Diff for: ‎packages/starter/example/next-env.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
/// <reference types="next/image-types/global" />
33

44
// NOTE: This file should not be edited
5-
// see https://nextjs.org/docs/basic-features/typescript for more information.
5+
// see https://nextjs.org/docs/pages/api-reference/config/typescript for more information.

Diff for: ‎packages/starter/example/next.config.js

-24
This file was deleted.

0 commit comments

Comments
 (0)