Skip to content

Commit 51c487a

Browse files
authored
Merge branch 'main' into tool-3691
2 parents b74c79f + 7ed8fc2 commit 51c487a

File tree

36 files changed

+3532
-3053
lines changed

36 files changed

+3532
-3053
lines changed

.changeset/thin-lines-cover.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@thirdweb-dev/service-utils": patch
3+
"thirdweb": patch
4+
---
5+
6+
update dependencies

apps/dashboard/.storybook/main.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,8 @@ const config: StorybookConfig = {
2727
},
2828
},
2929
staticDirs: ["../public"],
30+
features: {
31+
experimentalRSC: true,
32+
},
3033
};
3134
export default config;

apps/dashboard/package.json

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@
4545
"@radix-ui/react-slot": "^1.1.2",
4646
"@radix-ui/react-switch": "^1.1.3",
4747
"@radix-ui/react-tooltip": "1.1.8",
48-
"@sentry/nextjs": "9.3.0",
48+
"@sentry/nextjs": "9.5.0",
4949
"@shazow/whatsabi": "0.20.0",
50-
"@tanstack/react-query": "5.67.1",
50+
"@tanstack/react-query": "5.67.3",
5151
"@tanstack/react-table": "^8.21.2",
5252
"@thirdweb-dev/service-utils": "workspace:*",
5353
"@vercel/functions": "2.0.0",
@@ -61,18 +61,18 @@
6161
"date-fns": "4.1.0",
6262
"fetch-event-stream": "0.1.5",
6363
"flat": "^6.0.1",
64-
"framer-motion": "12.4.10",
64+
"framer-motion": "12.5.0",
6565
"fuse.js": "7.1.0",
6666
"idb-keyval": "^6.2.1",
6767
"input-otp": "^1.4.1",
68-
"ioredis": "^5.5.0",
68+
"ioredis": "^5.6.0",
6969
"ipaddr.js": "^2.2.0",
70-
"lucide-react": "0.477.0",
71-
"next": "15.2.0",
70+
"lucide-react": "0.479.0",
71+
"next": "15.2.2",
7272
"next-plausible": "^3.12.4",
73-
"next-themes": "^0.4.4",
73+
"next-themes": "^0.4.6",
7474
"nextjs-toploader": "^1.6.12",
75-
"nuqs": "^2.4.0",
75+
"nuqs": "^2.4.1",
7676
"p-limit": "^6.2.0",
7777
"papaparse": "^5.5.2",
7878
"pluralize": "^8.0.0",
@@ -94,7 +94,7 @@
9494
"shiki": "1.27.0",
9595
"sonner": "2.0.1",
9696
"spdx-correct": "^3.2.0",
97-
"swagger-ui-react": "^5.20.0",
97+
"swagger-ui-react": "^5.20.1",
9898
"tailwind-merge": "^2.6.0",
9999
"tailwindcss-animate": "^1.0.7",
100100
"thirdweb": "workspace:*",
@@ -105,20 +105,20 @@
105105
"devDependencies": {
106106
"@chakra-ui/cli": "^2.4.1",
107107
"@chromatic-com/storybook": "3.2.5",
108-
"@next/bundle-analyzer": "15.2.0",
109-
"@next/eslint-plugin-next": "15.2.0",
110-
"@playwright/test": "1.50.1",
111-
"@storybook/addon-essentials": "8.6.3",
112-
"@storybook/addon-interactions": "8.6.3",
113-
"@storybook/addon-links": "8.6.3",
114-
"@storybook/addon-onboarding": "8.6.3",
115-
"@storybook/addon-viewport": "8.6.3",
116-
"@storybook/blocks": "8.6.3",
117-
"@storybook/nextjs": "8.6.3",
118-
"@storybook/react": "8.6.3",
119-
"@storybook/test": "8.6.3",
108+
"@next/bundle-analyzer": "15.2.2",
109+
"@next/eslint-plugin-next": "15.2.2",
110+
"@playwright/test": "1.51.0",
111+
"@storybook/addon-essentials": "8.6.4",
112+
"@storybook/addon-interactions": "8.6.4",
113+
"@storybook/addon-links": "8.6.4",
114+
"@storybook/addon-onboarding": "8.6.4",
115+
"@storybook/addon-viewport": "8.6.4",
116+
"@storybook/blocks": "8.6.4",
117+
"@storybook/nextjs": "8.6.4",
118+
"@storybook/react": "8.6.4",
119+
"@storybook/test": "8.6.4",
120120
"@types/color": "4.2.0",
121-
"@types/node": "22.13.9",
121+
"@types/node": "22.13.10",
122122
"@types/papaparse": "^5.3.15",
123123
"@types/pluralize": "^0.0.33",
124124
"@types/qrcode": "^1.5.5",
@@ -129,16 +129,16 @@
129129
"@types/swagger-ui-react": "^4.19.0",
130130
"@typescript-eslint/eslint-plugin": "7.14.1",
131131
"@typescript-eslint/parser": "7.14.1",
132-
"autoprefixer": "^10.4.19",
132+
"autoprefixer": "^10.4.21",
133133
"checkly": "5.0.1",
134134
"eslint": "8.57.0",
135135
"eslint-config-biome": "1.9.4",
136136
"eslint-plugin-react-compiler": "19.0.0-beta-40c6c23-20250301",
137-
"eslint-plugin-storybook": "0.11.3",
138-
"knip": "5.45.0",
137+
"eslint-plugin-storybook": "0.11.4",
138+
"knip": "5.46.0",
139139
"next-sitemap": "^4.2.3",
140140
"postcss": "8.5.3",
141-
"storybook": "8.6.3",
141+
"storybook": "8.6.4",
142142
"tailwindcss": "3.4.17",
143143
"typescript": "5.8.2"
144144
}

apps/dashboard/src/@/components/blocks/code-segment.client.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ export const CodeSegment: React.FC<CodeSegmentProps> = ({
9696
onClick: () => setEnvironment(env.environment),
9797
isActive: activeEnvironment === env.environment,
9898
name: env.title,
99-
isEnabled: true,
10099
}))}
101100
tabClassName="text-sm gap-2 !text-sm"
102101
tabIconClassName="size-4"

apps/dashboard/src/@/components/ui/DatePickerWithRange.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,11 @@ export function DatePickerWithRange(props: {
9191
name: "From",
9292
onClick: () => setScreen("from"),
9393
isActive: screen === "from",
94-
isEnabled: true,
9594
},
9695
{
9796
name: "To",
9897
onClick: () => setScreen("to"),
9998
isActive: screen === "to",
100-
isEnabled: true,
10199
},
102100
]}
103101
/>

apps/dashboard/src/@/components/ui/tabs.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ export function TabButtons(props: {
7979
name: React.ReactNode;
8080
onClick: () => void;
8181
isActive: boolean;
82-
isEnabled?: boolean;
82+
isDisabled?: boolean;
8383
icon?: React.FC<{ className?: string }>;
8484
}[];
8585
tabClassName?: string;
@@ -119,11 +119,11 @@ export function TabButtons(props: {
119119
"relative inline-flex h-auto items-center gap-1.5 rounded-lg px-2 font-medium text-sm hover:bg-accent lg:px-3 lg:text-base",
120120
!tab.isActive &&
121121
"text-muted-foreground hover:text-foreground",
122-
!tab.isEnabled && "cursor-not-allowed opacity-50",
122+
tab.isDisabled && "cursor-not-allowed opacity-50",
123123
props.tabClassName,
124124
tab.isActive && props.activeTabClassName,
125125
)}
126-
onClick={tab.isEnabled ? tab.onClick : undefined}
126+
onClick={!tab.isDisabled ? tab.onClick : undefined}
127127
>
128128
{tab.icon && (
129129
<tab.icon className={cn("size-6", props.tabIconClassName)} />

apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/(marketplace)/components/list-button.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ export const CreateListingButton: React.FC<CreateListingButtonProps> = ({
7171
name: mode,
7272
isActive: mode === listingMode,
7373
onClick: () => setListingMode(mode),
74-
isEnabled: true,
7574
}))}
7675
tabClassName="text-sm gap-2 !text-sm"
7776
tabContainerClassName="gap-0.5"

apps/dashboard/src/app/account/contracts/_components/GetStartedWithContractsDeploy.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ const DeployOptions = (props: {
100100
key,
101101
name: value.title,
102102
isActive: activeTab === key,
103-
isEnabled: true,
104103
onClick: () => setActiveTab(key as TabId),
105104
}))}
106105
tabClassName="font-medium"

apps/dashboard/src/app/login/onboarding/LoginOrSignup/LoginOrSignup.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,11 @@ export function LoginOrSignup(props: {
8989
name: "Create account",
9090
onClick: () => setTab("signup"),
9191
isActive: tab === "signup",
92-
isEnabled: true,
9392
},
9493
{
9594
name: "I already have an account",
9695
onClick: () => setTab("login"),
9796
isActive: tab === "login",
98-
isEnabled: true,
9997
},
10098
]}
10199
/>

apps/dashboard/src/app/login/onboarding/team-onboarding/InviteTeamMembers.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,13 +227,11 @@ function InviteModalContent(props: {
227227
name: "Starter",
228228
onClick: () => setPlanToShow("starter"),
229229
isActive: planToShow === "starter",
230-
isEnabled: true,
231230
},
232231
{
233232
name: "Growth",
234233
onClick: () => setPlanToShow("growth"),
235234
isActive: planToShow === "growth",
236-
isEnabled: true,
237235
},
238236
]}
239237
/>

0 commit comments

Comments
 (0)