Skip to content

Commit 6295cf7

Browse files
authored
Merge branch 'main' into nkrishang/update-eip1271-auth
2 parents f8c8d4d + ab2dfd4 commit 6295cf7

File tree

340 files changed

+9060
-2275
lines changed

Some content is hidden

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

340 files changed

+9060
-2275
lines changed

.changeset/config.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,17 @@
1515
"access": "public",
1616
"baseBranch": "main",
1717
"updateInternalDependencies": "patch",
18-
"ignore": ["e2e-cra-5", "e2e-next-13", "e2e-vite-3"],
18+
"ignore": [
19+
"e2e-cra-5",
20+
"e2e-next-13",
21+
"e2e-vite-3",
22+
"bundlers-esbuild",
23+
"bundlers-vite",
24+
"bundlers-webpack",
25+
"bundlers-swc",
26+
"runtimes-node-commonjs",
27+
"runtimes-node-module"
28+
],
1929
"___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
2030
"updateInternalDependents": "always",
2131
"onlyUpdatePeerDependentsWhenOutOfRange": true

.changeset/dull-ghosts-agree.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@thirdweb-dev/crypto": minor
3+
---
4+
5+
initial release

.changeset/plenty-flies-boil.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@thirdweb-dev/sdk": patch
3+
---
4+
5+
remove `crypto-js` dependency

.changeset/rare-apes-switch.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@thirdweb-dev/wallets": patch
3+
---
4+
5+
remove `crypto-js` dependency

.changeset/sour-taxis-invite.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@thirdweb-dev/merkletree": minor
3+
---
4+
5+
initial release

.changeset/twenty-eyes-run.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
"@thirdweb-dev/react": patch
3+
---
4+
5+
- Fix Minor Safari / iOS UI issues
6+
7+
- Adjust Magic Link's social icons UI to match EmbeddedWallet's social icons UI
8+
9+
- expose hook `useEmbeddedWalletUserEmail` for fetching email from connected embeddedWallet. The hook returns the `react-query` query object. See example below:
10+
11+
```tsx
12+
const emailQuery = useEmbeddedWalletUserEmail();
13+
14+
const email = emailQuery.data;
15+
const isFetchingEmail = emailQuery.isFetching;
16+
```

.github/workflows/build-test-lint.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ jobs:
3131
with:
3232
fetch-depth: 25
3333

34+
- name: Setup bun
35+
uses: oven-sh/setup-bun@v1
36+
with:
37+
bun-version: latest
38+
3439
- name: Install
3540
uses: ./.github/composite-actions/install
3641

@@ -59,6 +64,11 @@ jobs:
5964
node-version: 20
6065
check-latest: true
6166

67+
- name: Setup bun
68+
uses: oven-sh/setup-bun@v1
69+
with:
70+
bun-version: latest
71+
6272
- uses: pnpm/action-setup@v2
6373
with:
6474
version: 8
@@ -84,6 +94,12 @@ jobs:
8494
node-version: 20
8595
check-latest: true
8696

97+
# we use bun for some test suites
98+
- name: Setup bun
99+
uses: oven-sh/setup-bun@v1
100+
with:
101+
bun-version: latest
102+
87103
- uses: pnpm/action-setup@v2
88104
with:
89105
version: 8
@@ -114,6 +130,12 @@ jobs:
114130
node-version: 20
115131
check-latest: true
116132

133+
# we use bun for some test suites
134+
- name: Setup bun
135+
uses: oven-sh/setup-bun@v1
136+
with:
137+
bun-version: latest
138+
117139
- uses: pnpm/action-setup@v2
118140
with:
119141
version: 8

.github/workflows/release-next.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ jobs:
2626
with:
2727
fetch-depth: 0
2828

29+
- name: Setup bun
30+
uses: oven-sh/setup-bun@v1
31+
with:
32+
bun-version: latest
33+
2934
- name: Install
3035
uses: ./.github/composite-actions/install
3136

.github/workflows/release-pr.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,11 @@ jobs:
6767
repository: ${{ fromJson(steps.get_pull_request_ref.outputs.data).head.repo.full_name }}
6868
ref: ${{ fromJson(steps.get_pull_request_ref.outputs.data).head.ref }}
6969

70+
- name: Setup bun
71+
uses: oven-sh/setup-bun@v1
72+
with:
73+
bun-version: latest
74+
7075
- name: Install
7176
uses: ./.github/composite-actions/install
7277

.github/workflows/release.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ jobs:
2626
with:
2727
fetch-depth: 0
2828

29+
- name: Setup bun
30+
uses: oven-sh/setup-bun@v1
31+
with:
32+
bun-version: latest
33+
2934
- name: Install
3035
uses: ./.github/composite-actions/install
3136

packages/auth/CHANGELOG.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,26 @@
11
# @thirdweb-dev/auth
22

3+
## 4.1.8
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [[`69d68f5a`](https://github.com/thirdweb-dev/js/commit/69d68f5a25877bf5ea694719d2cf4ca8388f3091)]:
8+
- @thirdweb-dev/wallets@2.1.5
9+
10+
## 4.1.7
11+
12+
### Patch Changes
13+
14+
- Updated dependencies [[`9f993dcc`](https://github.com/thirdweb-dev/js/commit/9f993dcc1e60cc087850b8fb9ce09524073ce0b5)]:
15+
- @thirdweb-dev/wallets@2.1.4
16+
17+
## 4.1.6
18+
19+
### Patch Changes
20+
21+
- Updated dependencies [[`6fcdec7c`](https://github.com/thirdweb-dev/js/commit/6fcdec7c12e4a3c0d10f3a67771e19cfad5c8ab5), [`42c74368`](https://github.com/thirdweb-dev/js/commit/42c743682739de77c264c11cc1692ed752f929a6), [`480ed721`](https://github.com/thirdweb-dev/js/commit/480ed721d1c736049fa8b6ee4cbdbdf3cce18abd), [`16e9e8b6`](https://github.com/thirdweb-dev/js/commit/16e9e8b64d7d1a97a5b32fc855479e992b7ed3a8), [`b1190914`](https://github.com/thirdweb-dev/js/commit/b1190914a97a9c4d9019c4ce8ee49ad345aed18c)]:
22+
- @thirdweb-dev/wallets@2.1.3
23+
324
## 4.1.5
425

526
### Patch Changes

packages/auth/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@thirdweb-dev/auth",
3-
"version": "4.1.5",
3+
"version": "4.1.8",
44
"main": "dist/thirdweb-dev-auth.cjs.js",
55
"module": "dist/thirdweb-dev-auth.esm.js",
66
"browser": {
@@ -58,7 +58,7 @@
5858
"scripts": {
5959
"build": "preconstruct build",
6060
"format": "prettier --write 'src/**/*'",
61-
"lint": "eslint src/",
61+
"lint": "eslint src/ && bunx publint --strict --level warning",
6262
"fix": "eslint src/ --fix",
6363
"clean": "rm -rf dist/ && rm -rf node_modules/",
6464
"test": "mocha --config './test/.mocharc.json' --timeout 30000 --parallel './test/**/*.test.ts'",

packages/chains/package.json

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,13 @@
33
"version": "0.1.58",
44
"main": "dist/thirdweb-dev-chains.cjs.js",
55
"module": "dist/thirdweb-dev-chains.esm.js",
6-
"browser": {
7-
"./dist/thirdweb-dev-chains.esm.js": "./dist/thirdweb-dev-chains.browser.esm.js"
8-
},
96
"exports": {
107
".": {
11-
"module": {
12-
"browser": "./dist/thirdweb-dev-chains.browser.esm.js",
13-
"default": "./dist/thirdweb-dev-chains.esm.js"
14-
},
8+
"module": "./dist/thirdweb-dev-chains.esm.js",
159
"default": "./dist/thirdweb-dev-chains.cjs.js"
1610
},
1711
"./package.json": "./package.json"
1812
},
19-
"repository": "https://github.com/thirdweb-dev/js/tree/main/packages/chains",
20-
"license": "Apache-2.0",
21-
"bugs": {
22-
"url": "https://github.com/thirdweb-dev/js/issues"
23-
},
2413
"author": "thirdweb eng <[email protected]>",
2514
"devDependencies": {
2615
"@babel/core": "^7.22.9",
@@ -29,23 +18,17 @@
2918
"@babel/runtime": "^7.22.6",
3019
"@preconstruct/cli": "2.7.0",
3120
"@thirdweb-dev/tsconfig": "workspace:*",
32-
"@types/jest": "^29.5.3",
3321
"axios": "^1.4.0",
3422
"deepmerge": "^4.3.1",
3523
"eslint-config-thirdweb": "workspace:*",
36-
"jest": "^29.6.2",
3724
"plop": "^3.1.2",
3825
"typescript": "^5.1.6"
3926
},
4027
"preconstruct": {
4128
"entrypoints": [
4229
"index.ts"
4330
],
44-
"exports": {
45-
"envConditions": [
46-
"browser"
47-
]
48-
}
31+
"exports": true
4932
},
5033
"sideEffects": false,
5134
"scripts": {
@@ -56,7 +39,7 @@
5639
"plop": "plop",
5740
"add-chain": "plop add-chain",
5841
"override-chain": "plop override-chain",
59-
"test": "jest"
42+
"test": "bun test"
6043
},
6144
"engines": {
6245
"node": ">=18"

packages/cli/CHANGELOG.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,31 @@
11
# thirdweb
22

3+
## 0.13.16
4+
5+
### Patch Changes
6+
7+
- Updated dependencies [[`69d68f5a`](https://github.com/thirdweb-dev/js/commit/69d68f5a25877bf5ea694719d2cf4ca8388f3091)]:
8+
- @thirdweb-dev/wallets@2.1.5
9+
- @thirdweb-dev/auth@4.1.8
10+
11+
## 0.13.15
12+
13+
### Patch Changes
14+
15+
- Updated dependencies [[`9f993dcc`](https://github.com/thirdweb-dev/js/commit/9f993dcc1e60cc087850b8fb9ce09524073ce0b5)]:
16+
- @thirdweb-dev/wallets@2.1.4
17+
- @thirdweb-dev/auth@4.1.7
18+
19+
## 0.13.14
20+
21+
### Patch Changes
22+
23+
- Updated dependencies [[`23ab897e`](https://github.com/thirdweb-dev/js/commit/23ab897e329cdd5b316fbe554ea0f64add91f2b4), [`a3f3e160`](https://github.com/thirdweb-dev/js/commit/a3f3e160e07328655a4f0332f41f4edd210a1a8a), [`6fcdec7c`](https://github.com/thirdweb-dev/js/commit/6fcdec7c12e4a3c0d10f3a67771e19cfad5c8ab5), [`42c74368`](https://github.com/thirdweb-dev/js/commit/42c743682739de77c264c11cc1692ed752f929a6), [`6fcdec7c`](https://github.com/thirdweb-dev/js/commit/6fcdec7c12e4a3c0d10f3a67771e19cfad5c8ab5), [`480ed721`](https://github.com/thirdweb-dev/js/commit/480ed721d1c736049fa8b6ee4cbdbdf3cce18abd), [`16e9e8b6`](https://github.com/thirdweb-dev/js/commit/16e9e8b64d7d1a97a5b32fc855479e992b7ed3a8), [`b1190914`](https://github.com/thirdweb-dev/js/commit/b1190914a97a9c4d9019c4ce8ee49ad345aed18c)]:
24+
- @thirdweb-dev/sdk@4.0.13
25+
- @thirdweb-dev/storage@2.0.4
26+
- @thirdweb-dev/wallets@2.1.3
27+
- @thirdweb-dev/auth@4.1.6
28+
329
## 0.13.13
430

531
### Patch Changes

packages/cli/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "thirdweb",
33
"main": "dist/cli/index.js",
4-
"version": "0.13.13",
4+
"version": "0.13.16",
55
"repository": "https://github.com/thirdweb-dev/js/tree/main/packages/cli",
66
"author": "thirdweb eng <[email protected]>",
77
"license": "Apache-2.0",

0 commit comments

Comments
 (0)