Skip to content

Commit 023fa29

Browse files
authored
Merge branch 'main' into yash/cleanup-obsolete-contracts
2 parents cd5402d + 8b4b873 commit 023fa29

File tree

897 files changed

+5103
-3494
lines changed

Some content is hidden

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

897 files changed

+5103
-3494
lines changed

.changeset/legal-pots-boil.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"thirdweb": patch
3+
---
4+
5+
expose setServiceKey

apps/dashboard/package.json

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -29,26 +29,26 @@
2929
"@emotion/styled": "11.14.0",
3030
"@hookform/resolvers": "^3.9.1",
3131
"@marsidev/react-turnstile": "^1.1.0",
32-
"@radix-ui/react-accordion": "^1.2.4",
33-
"@radix-ui/react-alert-dialog": "^1.1.7",
34-
"@radix-ui/react-avatar": "^1.1.4",
35-
"@radix-ui/react-checkbox": "^1.1.5",
36-
"@radix-ui/react-dialog": "1.1.7",
37-
"@radix-ui/react-dropdown-menu": "^2.1.7",
38-
"@radix-ui/react-hover-card": "^1.1.7",
39-
"@radix-ui/react-label": "^2.1.3",
40-
"@radix-ui/react-popover": "^1.1.7",
41-
"@radix-ui/react-progress": "^1.1.3",
42-
"@radix-ui/react-radio-group": "^1.2.4",
43-
"@radix-ui/react-select": "^2.1.7",
44-
"@radix-ui/react-separator": "^1.1.3",
32+
"@radix-ui/react-accordion": "^1.2.7",
33+
"@radix-ui/react-alert-dialog": "^1.1.10",
34+
"@radix-ui/react-avatar": "^1.1.6",
35+
"@radix-ui/react-checkbox": "^1.2.2",
36+
"@radix-ui/react-dialog": "1.1.10",
37+
"@radix-ui/react-dropdown-menu": "^2.1.11",
38+
"@radix-ui/react-hover-card": "^1.1.10",
39+
"@radix-ui/react-label": "^2.1.4",
40+
"@radix-ui/react-popover": "^1.1.10",
41+
"@radix-ui/react-progress": "^1.1.4",
42+
"@radix-ui/react-radio-group": "^1.3.3",
43+
"@radix-ui/react-select": "^2.2.2",
44+
"@radix-ui/react-separator": "^1.1.4",
4545
"@radix-ui/react-slot": "^1.2.0",
46-
"@radix-ui/react-switch": "^1.1.4",
47-
"@radix-ui/react-tooltip": "1.2.0",
48-
"@sentry/nextjs": "9.12.0",
46+
"@radix-ui/react-switch": "^1.2.2",
47+
"@radix-ui/react-tooltip": "1.2.3",
48+
"@sentry/nextjs": "9.13.0",
4949
"@shazow/whatsabi": "0.21.0",
50-
"@tanstack/react-query": "5.72.1",
51-
"@tanstack/react-table": "^8.21.2",
50+
"@tanstack/react-query": "5.74.4",
51+
"@tanstack/react-table": "^8.21.3",
5252
"@thirdweb-dev/service-utils": "workspace:*",
5353
"@vercel/functions": "2.0.0",
5454
"@vercel/og": "^0.6.8",
@@ -66,14 +66,14 @@
6666
"fuse.js": "7.1.0",
6767
"idb-keyval": "^6.2.1",
6868
"input-otp": "^1.4.1",
69-
"ioredis": "^5.6.0",
69+
"ioredis": "^5.6.1",
7070
"ipaddr.js": "^2.2.0",
71-
"lucide-react": "0.487.0",
72-
"next": "15.2.4",
71+
"lucide-react": "0.503.0",
72+
"next": "15.3.1",
7373
"next-plausible": "^3.12.4",
7474
"next-themes": "^0.4.6",
7575
"nextjs-toploader": "^1.6.12",
76-
"nuqs": "^2.4.1",
76+
"nuqs": "^2.4.3",
7777
"p-limit": "^6.2.0",
7878
"papaparse": "^5.5.2",
7979
"pluralize": "^8.0.0",
@@ -89,28 +89,28 @@
8989
"react-hook-form": "7.55.0",
9090
"react-markdown": "^9.0.1",
9191
"react-table": "^7.8.0",
92-
"recharts": "2.15.2",
92+
"recharts": "2.15.3",
9393
"remark-gfm": "4.0.1",
9494
"responsive-rsc": "0.0.7",
9595
"server-only": "^0.0.1",
9696
"shiki": "1.27.0",
9797
"sonner": "2.0.3",
9898
"spdx-correct": "^3.2.0",
9999
"stripe": "17.7.0",
100-
"swagger-ui-react": "^5.20.7",
100+
"swagger-ui-react": "^5.21.0",
101101
"tailwind-merge": "^2.6.0",
102102
"tailwindcss-animate": "^1.0.7",
103103
"thirdweb": "workspace:*",
104104
"tiny-invariant": "^1.3.3",
105105
"use-debounce": "^10.0.4",
106-
"zod": "3.24.2"
106+
"zod": "3.24.3"
107107
},
108108
"devDependencies": {
109109
"@chakra-ui/cli": "^2.4.1",
110110
"@chromatic-com/storybook": "3.2.6",
111-
"@next/bundle-analyzer": "15.2.4",
112-
"@next/eslint-plugin-next": "15.2.4",
113-
"@playwright/test": "1.51.1",
111+
"@next/bundle-analyzer": "15.3.1",
112+
"@next/eslint-plugin-next": "15.3.1",
113+
"@playwright/test": "1.52.0",
114114
"@storybook/addon-essentials": "8.6.12",
115115
"@storybook/addon-interactions": "8.6.12",
116116
"@storybook/addon-links": "8.6.12",
@@ -121,11 +121,11 @@
121121
"@storybook/react": "8.6.12",
122122
"@storybook/test": "8.6.12",
123123
"@types/color": "4.2.0",
124-
"@types/node": "22.14.0",
124+
"@types/node": "22.14.1",
125125
"@types/papaparse": "^5.3.15",
126126
"@types/pluralize": "^0.0.33",
127127
"@types/qrcode": "^1.5.5",
128-
"@types/react": "19.1.0",
128+
"@types/react": "19.1.2",
129129
"@types/react-dom": "19.1.2",
130130
"@types/react-table": "^7.7.20",
131131
"@types/spdx-correct": "^3.1.3",
@@ -138,7 +138,7 @@
138138
"eslint-config-biome": "1.9.4",
139139
"eslint-plugin-react-compiler": "19.0.0-beta-e993439-20250405",
140140
"eslint-plugin-storybook": "0.12.0",
141-
"knip": "5.47.0",
141+
"knip": "5.50.5",
142142
"next-sitemap": "^4.2.3",
143143
"postcss": "8.5.3",
144144
"storybook": "8.6.12",

apps/dashboard/src/@/actions/acceptInvite.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use server";
22

3-
import { getAuthToken } from "../../app/api/lib/getAuthToken";
3+
import { getAuthToken } from "../../app/(app)/api/lib/getAuthToken";
44
import { API_SERVER_URL } from "../constants/env";
55

66
export async function acceptInvite(options: {

apps/dashboard/src/@/actions/billing.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import "server-only";
33

44
import { API_SERVER_URL } from "@/constants/env";
5-
import { getAuthToken } from "../../app/api/lib/getAuthToken";
5+
import { getAuthToken } from "../../app/(app)/api/lib/getAuthToken";
66
import type { ProductSKU } from "../lib/billing";
77

88
export type GetBillingCheckoutUrlOptions = {

apps/dashboard/src/@/actions/confirmEmail.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use server";
22

3-
import { getAuthToken } from "../../app/api/lib/getAuthToken";
3+
import { getAuthToken } from "../../app/(app)/api/lib/getAuthToken";
44
import { API_SERVER_URL } from "../constants/env";
55

66
export async function confirmEmailWithOTP(otp: string) {

apps/dashboard/src/@/actions/getAccount.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use server";
22

3-
import { getRawAccount } from "../../app/account/settings/getAccount";
3+
import { getRawAccount } from "../../app/(app)/account/settings/getAccount";
44

55
export async function getRawAccountAction() {
66
return getRawAccount();

apps/dashboard/src/@/actions/getBalancesFromMoralis.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import { defineDashboardChain } from "lib/defineDashboardChain";
33
import { ZERO_ADDRESS, isAddress, toTokens } from "thirdweb";
44
import { getWalletBalance } from "thirdweb/wallets";
5-
import { getUserThirdwebClient } from "../../app/api/lib/getAuthToken";
5+
import { getUserThirdwebClient } from "../../app/(app)/api/lib/getAuthToken";
66

77
type BalanceQueryResponse = Array<{
88
balance: string;

apps/dashboard/src/@/actions/proxies.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use server";
22

3-
import { getAuthToken } from "../../app/api/lib/getAuthToken";
3+
import { getAuthToken } from "../../app/(app)/api/lib/getAuthToken";
44
import { API_SERVER_URL } from "../constants/env";
55

66
type ProxyActionParams = {

apps/dashboard/src/@/actions/sendTeamInvite.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use server";
22

3-
import { getAuthToken } from "../../app/api/lib/getAuthToken";
3+
import { getAuthToken } from "../../app/(app)/api/lib/getAuthToken";
44
import { API_SERVER_URL } from "../constants/env";
55

66
export async function sendTeamInvites(options: {

apps/dashboard/src/@/actions/updateAccount.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"use server";
2-
import { getAuthToken } from "../../app/api/lib/getAuthToken";
2+
import { getAuthToken } from "../../app/(app)/api/lib/getAuthToken";
33
import { API_SERVER_URL } from "../constants/env";
44

55
export async function updateAccount(values: {

0 commit comments

Comments
 (0)