Skip to content

Commit f591a7a

Browse files
authored
Merge pull request #215 from argentlabs/develop
release ready
2 parents 6981ea2 + c531ebd commit f591a7a

File tree

95 files changed

+12929
-5431
lines changed

Some content is hidden

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

95 files changed

+12929
-5431
lines changed

.eslintrc.json

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,23 @@
44
"es2021": true,
55
"node": true
66
},
7-
"extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
7+
"overrides": [
8+
{
9+
"files": ["*.svelte"],
10+
"parser": "svelte-eslint-parser",
11+
"parserOptions": {
12+
"parser": "@typescript-eslint/parser"
13+
}
14+
}
15+
],
16+
"extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "plugin:svelte/recommended"],
817
"parser": "@typescript-eslint/parser",
918
"parserOptions": {
1019
"ecmaVersion": "latest",
11-
"sourceType": "module"
20+
"sourceType": "module",
21+
"extraFileExtensions": [".svelte"]
1222
},
13-
"plugins": ["@typescript-eslint"],
23+
"plugins": ["@typescript-eslint", "prettier"],
1424
"rules": {
1525
"@typescript-eslint/consistent-type-imports": "error",
1626
"@typescript-eslint/no-explicit-any": "off",

.github/workflows/release.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@ on:
44
branches:
55
- develop
66
- main
7-
- beta-braavos-mobile
8-
- beta-argent-ww-iframe
9-
- beta-wallet-account
7+
- beta
108
- hotfix\/v[0-9]+.[0-9]+.[0-9]+
119

1210
jobs:

.prettierrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"useTabs": false,
3+
"tabWidth": 2,
34
"trailingComma": "all",
45
"singleQuote": false,
56
"semi": false,

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ const wallet = await connect()
4949

5050
By default, the list of connectors is:
5151

52-
- Argent X
52+
- Ready Wallet
5353
- Braavos
54-
- Argent mobile
55-
- Argent webwallet
54+
- Ready (formerly Argent)
55+
- Web Wallet
5656

5757
## Connect with specific connectors
5858

package.json

Lines changed: 46 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "starknetkit",
3-
"version": "2.10.4",
3+
"version": "2.12.0",
44
"repository": "github:argentlabs/starknetkit",
55
"private": false,
66
"browser": {
@@ -27,6 +27,11 @@
2727
"import": "./dist/starknetkit.js",
2828
"require": "./dist/starknetkit.cjs"
2929
},
30+
"./injected": {
31+
"types": "./dist/injectedConnector.d.ts",
32+
"import": "./dist/injectedConnector.js",
33+
"require": "./dist/injectedConnector.cjs"
34+
},
3035
"./webwallet": {
3136
"types": "./dist/webwalletConnector.d.ts",
3237
"import": "./dist/webwalletConnector.js",
@@ -37,16 +42,36 @@
3742
"import": "./dist/argentMobile.js",
3843
"require": "./dist/argentMobile.cjs"
3944
},
45+
"./argentX": {
46+
"types": "./dist/argentX.d.ts",
47+
"import": "./dist/argentX.js",
48+
"require": "./dist/argentX.cjs"
49+
},
50+
"./braavos": {
51+
"types": "./dist/braavos.d.ts",
52+
"import": "./dist/braavos.js",
53+
"require": "./dist/braavos.cjs"
54+
},
55+
"./metamask": {
56+
"types": "./dist/metamask.d.ts",
57+
"import": "./dist/metamask.js",
58+
"require": "./dist/metamask.cjs"
59+
},
60+
"./keplr": {
61+
"types": "./dist/keplr.d.ts",
62+
"import": "./dist/keplr.js",
63+
"require": "./dist/keplr.cjs"
64+
},
65+
"./fordefi": {
66+
"types": "./dist/fordefi.d.ts",
67+
"import": "./dist/fordefi.js",
68+
"require": "./dist/fordefi.cjs"
69+
},
4070
"./braavosMobile": {
4171
"types": "./dist/braavosMobile.d.ts",
4272
"import": "./dist/braavosMobile.js",
4373
"require": "./dist/braavosMobile.cjs"
4474
},
45-
"./injected": {
46-
"types": "./dist/injectedConnector.d.ts",
47-
"import": "./dist/injectedConnector.js",
48-
"require": "./dist/injectedConnector.cjs"
49-
},
5075
"./window": {
5176
"types": "./dist/window.d.ts",
5277
"import": "./dist/window.js",
@@ -56,15 +81,16 @@
5681
"main": "./dist/starknetkit.cjs",
5782
"module": "./dist/starknetkit.js",
5883
"types": "./dist/starknetkit.d.ts",
59-
"files": [
60-
"dist"
61-
],
6284
"scripts": {
6385
"build": "vite build",
6486
"check": "svelte-check --tsconfig ./tsconfig.json",
6587
"dev": "vite build --watch"
6688
},
89+
"files": [
90+
"dist"
91+
],
6792
"dependencies": {
93+
"@argent/x-ui": "^1.70.1",
6894
"@starknet-io/get-starknet": "^4.0.6",
6995
"@starknet-io/get-starknet-core": "^4.0.6",
7096
"@starknet-io/types-js": "^0.7.10",
@@ -76,6 +102,8 @@
76102
"eventemitter3": "^5.0.1",
77103
"events": "^3.3.0",
78104
"lodash-es": "^4.17.21",
105+
"react": "^18.2.0",
106+
"react-dom": "^18.2.0",
79107
"svelte-forms": "^2.3.1",
80108
"trpc-browser": "^1.3.2"
81109
},
@@ -88,7 +116,11 @@
88116
"@types/async-retry": "^1.4.5",
89117
"@types/lodash-es": "^4.17.8",
90118
"@types/node": "^20.5.7",
119+
"@types/react": "^18.2.0",
120+
"@types/react-dom": "^18.2.0",
91121
"@typescript-eslint/eslint-plugin": "^8.0.0",
122+
"@typescript-eslint/parser": "^8.8.1",
123+
"@vitejs/plugin-react": "^4.3.4",
92124
"@walletconnect/ethereum-provider": "^2.11.0",
93125
"@walletconnect/jsonrpc-provider": "^1.0.13",
94126
"@walletconnect/signer-connection": "^2.11.0",
@@ -97,15 +129,19 @@
97129
"autoprefixer": "^10.4.7",
98130
"eslint": "^8.48.0",
99131
"eslint-config-next": "^13.4.19",
132+
"eslint-plugin-prettier": "^5.2.1",
133+
"eslint-plugin-svelte": "^2.44.1",
100134
"husky": "^9.0.0",
101135
"lint-staged": "^15.0.0",
102136
"postcss": "^8.4.21",
103137
"postcss-load-config": "^6.0.0",
104138
"prettier": "^3.0.3",
105139
"prettier-plugin-import-sort": "^0.0.7",
106140
"semantic-release": "^24.0.0",
141+
"starknet": "^6.24.1",
107142
"svelte": "^4.0.0",
108143
"svelte-check": "^3.5.1",
144+
"svelte-eslint-parser": "^0.41.1",
109145
"svelte-preprocess": "^6.0.0",
110146
"tailwindcss": "^3.1.6",
111147
"tslib": "^2.4.0",
@@ -117,7 +153,7 @@
117153
"zod": "^3.20.6"
118154
},
119155
"peerDependencies": {
120-
"starknet": "^6.21.1"
156+
"starknet": "^6.24.1"
121157
},
122158
"gitHead": "b16688a8638cc138938e74e1a39d004760165d75"
123159
}

0 commit comments

Comments
 (0)