Skip to content

Commit e253c87

Browse files
Merge branch 'master' into feat/next
2 parents 01b24a0 + f1b5aaa commit e253c87

File tree

97 files changed

+37309
-14312
lines changed

Some content is hidden

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

97 files changed

+37309
-14312
lines changed

.eslintrc.json

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,28 @@
11
{
22
"root": true,
3-
"extends": [
4-
"@toruslabs/eslint-config-typescript"
5-
],
3+
"extends": ["@toruslabs/eslint-config-typescript"],
64
"parser": "@typescript-eslint/parser",
75
"parserOptions": {
86
"sourceType": "module",
97
"ecmaVersion": 11,
108
"project": "./tsconfig.json"
119
},
1210
"rules": {
13-
"@typescript-eslint/no-throw-literal": 0
11+
"@typescript-eslint/no-throw-literal": 0,
12+
"import/extensions": [
13+
"error",
14+
"ignorePackages",
15+
{
16+
"js": "never",
17+
"jsx": "never",
18+
"ts": "never",
19+
"tsx": "never"
20+
}
21+
]
1422
},
1523
"env": {
1624
"es2020": true,
1725
"browser": true,
18-
"node": true,
19-
"serviceworker": true
26+
"node": true
2027
}
2128
}

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,16 @@ jobs:
4242
- name: Bootstrap dependencies
4343
run: yarn run bootstrap
4444

45-
- name: Build and publish locally
46-
run: yarn run local-publish
45+
- name: Build
46+
run: yarn run build
4747

4848
- name: Build example
4949
if: github.ref == 'refs/heads/master'
5050
run: |
5151
cd examples/vue-app
52-
yarn run link-local
53-
yarn
54-
yarn run build
52+
npm run install:local
53+
npm install
54+
npm run build
5555
5656
# Set the credentials from repository settings/secrets
5757
- name: Configure AWS credentials

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,4 +107,5 @@ dist
107107

108108
.rollup*
109109
.yalc
110-
yalc.lock
110+
yalc.lock
111+
types

examples/getting-started/solana/index.html

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ <h1>Web3Auth Integration Example</h1>
1818
<script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js"></script>
1919
<script
2020
src="https://unpkg.com/@solana/web3.js@latest/lib/index.iife.min.js"></script>
21-
<script src="https://cdn.jsdelivr.net/npm/@web3auth/web3auth@0.2.2/dist/web3auth.umd.min.js"></script>
21+
<script src="https://cdn.jsdelivr.net/npm/@web3auth/web3auth@0.2.4/dist/web3auth.umd.min.js"></script>
2222
<script src="https://cdn.jsdelivr.net/npm/@web3auth/solana-provider@0.2.2/dist/solanaProvider.umd.min.js"></script>
2323
<script>
2424
const web3authSdk = window.Web3auth;
@@ -31,7 +31,15 @@ <h1>Web3Auth Integration Example</h1>
3131
$("#logout").hide();
3232

3333
web3AuthInstance = new web3authSdk.Web3Auth({
34-
chainConfig: { chainNamespace: "solana" },
34+
chainConfig: {
35+
chainNamespace: "solana",
36+
rpcTarget: "https://ssc-dao.genesysgo.net",
37+
blockExplorer: "https://explorer.solana.com?cluster=mainnet",
38+
chainId: "0x1",
39+
displayName: "solana mainnet",
40+
ticker: "SOL",
41+
tickerName: "solana"
42+
},
3543
clientId: "BEExcOSoQPOv159WU4H_DZ1A5yh9Gv68yHFp3t861W5niPawEPlXekYYOafDZke05_cTvGE1qC-oUNaqkDJQpbw",
3644
});
3745

examples/react-app/package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)