Skip to content

Commit de65f04

Browse files
ciaranightingaleciaranightingale
committed
merge main
2 parents 7524d7a + b4676e1 commit de65f04

File tree

185 files changed

+45454
-8881
lines changed

Some content is hidden

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

185 files changed

+45454
-8881
lines changed

‎.changeset/shy-rockets-look.md‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎.changeset/tall-moose-add.md‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎.changeset/twelve-hornets-sort.md‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,19 @@
3434
"packageManager": "[email protected]",
3535
"dependencies": {
3636
"@changesets/changelog-github": "^0.4.8",
37-
"@changesets/cli": "^2.26.1",
38-
"@changesets/get-dependents-graph": "^1.3.5",
39-
"@changesets/get-release-plan": "^3.0.16",
37+
"@changesets/cli": "^2.26.2",
38+
"@changesets/get-dependents-graph": "^1.3.6",
39+
"@changesets/get-release-plan": "^3.0.17",
4040
"@changesets/parse": "^0.3.16",
4141
"@manypkg/cli": "^0.20.0",
4242
"@manypkg/get-packages": "^1.1.3",
4343
"@playwright/test": "1.31.2",
4444
"@trivago/prettier-plugin-sort-imports": "^4.1.1",
45-
"@types/node": "^18.15.11",
46-
"eslint": "^8.42.0",
45+
"@types/node": "^18.16.18",
46+
"eslint": "^8.43.0",
4747
"mocha": "^10.2.0",
48-
"prettier": "^2.8.7",
49-
"turbo": "^1.9.8",
48+
"prettier": "^2.8.8",
49+
"turbo": "^1.10.6",
5050
"yalc": "1.0.0-pre.53"
5151
},
5252
"manypkg": {

‎packages/auth/CHANGELOG.md‎

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

3+
## 3.2.8
4+
5+
### Patch Changes
6+
7+
- [#1278](https://github.com/thirdweb-dev/js/pull/1278) [`8a389f12`](https://github.com/thirdweb-dev/js/commit/8a389f1295d2bf726059997ea0ca10cf0424f2a2) Thanks [@jnsdls](https://github.com/jnsdls)! - updated various dependencies
8+
9+
- Updated dependencies [[`8a389f12`](https://github.com/thirdweb-dev/js/commit/8a389f1295d2bf726059997ea0ca10cf0424f2a2)]:
10+
- @thirdweb-dev/wallets@1.0.4
11+
12+
## 3.2.7
13+
14+
### Patch Changes
15+
16+
- Updated dependencies [[`2b113539`](https://github.com/thirdweb-dev/js/commit/2b113539098384f910b3c4d54e1fde9d35a6f053), [`be606dd3`](https://github.com/thirdweb-dev/js/commit/be606dd3c93c1514834c1d970e864d7f949a07ab), [`998e5217`](https://github.com/thirdweb-dev/js/commit/998e521733efd6a67e42f9bf0beab5fbdccf08ae)]:
17+
- @thirdweb-dev/wallets@1.0.3
18+
19+
## 3.2.6
20+
21+
### Patch Changes
22+
23+
- Updated dependencies [[`ed711c8c`](https://github.com/thirdweb-dev/js/commit/ed711c8cb2ed6a0deb1b2a5eeec06df1d4edc5e8), [`05a7495a`](https://github.com/thirdweb-dev/js/commit/05a7495a132aabab5f48abbdb80a468ff6f65df8), [`e78da6b3`](https://github.com/thirdweb-dev/js/commit/e78da6b36cfa6d954234820563201bf760186ed1)]:
24+
- @thirdweb-dev/wallets@1.0.2
25+
26+
## 3.2.5
27+
28+
### Patch Changes
29+
30+
- Updated dependencies [[`efb3546e`](https://github.com/thirdweb-dev/js/commit/efb3546ec8268156be00301af28b9d83ecd5ab08)]:
31+
- @thirdweb-dev/wallets@1.0.1
32+
33+
## 3.2.4
34+
35+
### Patch Changes
36+
37+
- [#1250](https://github.com/thirdweb-dev/js/pull/1250) [`d43f6171`](https://github.com/thirdweb-dev/js/commit/d43f6171d910e31b748b171b012174390aac3fff) Thanks [@adam-maj](https://github.com/adam-maj)! - Allow setting login payload validity duration
38+
39+
- Updated dependencies [[`ac3e019c`](https://github.com/thirdweb-dev/js/commit/ac3e019cd1776dbdb0d06b213420ad17586f678e), [`3c5dc480`](https://github.com/thirdweb-dev/js/commit/3c5dc4804abc56b933ec45e9e1da11eb182296cc)]:
40+
- @thirdweb-dev/wallets@1.0.0
41+
42+
## 3.2.3
43+
44+
### Patch Changes
45+
46+
- Updated dependencies [[`536b0f12`](https://github.com/thirdweb-dev/js/commit/536b0f1240ab446aac22cf547a4e09e73ee6bf7b), [`b626782b`](https://github.com/thirdweb-dev/js/commit/b626782b0e8c6b76673472d3aee1c802dfb11b5f)]:
47+
- @thirdweb-dev/wallets@0.3.3
48+
349
## 3.2.2
450

551
### Patch Changes

‎packages/auth/package.json‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@thirdweb-dev/auth",
3-
"version": "3.2.2",
3+
"version": "3.2.8",
44
"main": "dist/thirdweb-dev-auth.cjs.js",
55
"module": "dist/thirdweb-dev-auth.esm.js",
66
"browser": {
@@ -80,29 +80,29 @@
8080
}
8181
},
8282
"devDependencies": {
83-
"@babel/core": "^7.19.3",
84-
"@babel/preset-env": "^7.18.10",
85-
"@babel/preset-typescript": "^7.18.6",
86-
"@microsoft/api-documenter": "^7.19.4",
87-
"@microsoft/api-extractor": "^7.29.2",
83+
"@babel/core": "^7.22.5",
84+
"@babel/preset-env": "^7.22.5",
85+
"@babel/preset-typescript": "^7.22.5",
86+
"@microsoft/api-documenter": "^7.22.21",
87+
"@microsoft/api-extractor": "^7.36.0",
8888
"@microsoft/tsdoc": "^0.14.1",
89-
"@preconstruct/cli": "^2.2.1",
89+
"@preconstruct/cli": "^2.7.0",
9090
"@solana/web3.js": "^1.62.0",
91-
"@swc-node/register": "^1.5.1",
92-
"@swc/core": "^1.3.23",
91+
"@swc-node/register": "^1.6.6",
92+
"@swc/core": "^1.3.67",
9393
"@thirdweb-dev/tsconfig": "workspace:*",
94-
"@types/chai": "^4.3.3",
94+
"@types/chai": "^4.3.5",
9595
"@types/cookie": "^0.5.1",
9696
"@types/cookie-parser": "^1.4.3",
9797
"@types/express": "^4.17.13",
9898
"@types/mocha": "^10.0.0",
99-
"@types/uuid": "^9.0.0",
100-
"@typescript-eslint/eslint-plugin": "^5.33.0",
101-
"@typescript-eslint/parser": "^5.33.0",
99+
"@types/uuid": "^9.0.2",
100+
"@typescript-eslint/eslint-plugin": "^5.60.1",
101+
"@typescript-eslint/parser": "^5.60.1",
102102
"chai": "^4.3.6",
103103
"cookie-parser": "^1.4.6",
104-
"eslint": "^8.42.0",
105-
"eslint-config-prettier": "^8.3.0",
104+
"eslint": "^8.43.0",
105+
"eslint-config-prettier": "^8.8.0",
106106
"eslint-config-thirdweb": "workspace:*",
107107
"eslint-plugin-import": "^2.26.0",
108108
"eslint-plugin-inclusive-language": "^2.2.0",
@@ -111,10 +111,10 @@
111111
"ethers": "^5.7.2",
112112
"express": "^4.18.1",
113113
"mocha": "^10.2.0",
114-
"next": "^12.2.0",
115-
"next-auth": "^4.20.1",
116-
"prettier": "^2.7.1",
117-
"typescript": "^4.7.4"
114+
"next": "^12.3.4",
115+
"next-auth": "^4.22.1",
116+
"prettier": "^2.8.8",
117+
"typescript": "^5.1.6"
118118
},
119119
"peerDependencies": {
120120
"@solana/web3.js": "^1.73.0",

‎packages/auth/src/express/routes/payload.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ export default async function handler(
2525
version: ctx.authOptions?.version,
2626
chainId: parsedPayload.data.chainId || ctx.authOptions?.chainId,
2727
resources: ctx.authOptions?.resources,
28+
expirationTime: ctx.authOptions?.loginPayloadDurationInSeconds
29+
? new Date(
30+
Date.now() + 1000 * ctx.authOptions.loginPayloadDurationInSeconds,
31+
)
32+
: undefined,
2833
});
2934

3035
return res.status(200).json({ payload });

‎packages/auth/src/express/types/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ export type ThirdwebAuthConfig<
4444
validateTokenId?:
4545
| ((tokenId: string) => void)
4646
| ((tokenId: string) => Promise<void>);
47+
loginPayloadDurationInSeconds?: number;
4748
tokenDurationInSeconds?: number;
4849
refreshIntervalInSeconds?: number;
4950
};

‎packages/auth/src/next/routes/payload.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ export default async function handler(
2525
version: ctx.authOptions?.version,
2626
chainId: parsedPayload.data.chainId || ctx.authOptions?.chainId,
2727
resources: ctx.authOptions?.resources,
28+
expirationTime: ctx.authOptions?.loginPayloadDurationInSeconds
29+
? new Date(
30+
Date.now() + 1000 * ctx.authOptions.loginPayloadDurationInSeconds,
31+
)
32+
: undefined,
2833
});
2934

3035
return res.status(200).json({ payload });

‎packages/auth/src/next/types/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ export type ThirdwebAuthConfig<
5555
validateTokenId?:
5656
| ((tokenId: string) => void)
5757
| ((tokenId: string) => Promise<void>);
58+
loginPayloadDurationInSeconds?: number;
5859
tokenDurationInSeconds?: number;
5960
refreshIntervalInSeconds?: number;
6061
};

0 commit comments

Comments
 (0)