Skip to content

Commit 3b194d6

Browse files
arcoravenarcoraven
authored
Merge branch 'main' into ph/addSmartWalletTypes
2 parents ed55465 + 6b04d75 commit 3b194d6

File tree

239 files changed

+3767
-6927
lines changed

Some content is hidden

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

239 files changed

+3767
-6927
lines changed

‎.changeset/fuzzy-lobsters-deliver.md‎

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

‎.changeset/olive-trees-play.md‎

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

‎apps/dashboard/next.config.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ const moduleExports = {
158158
serverSourceMaps: false,
159159
},
160160
cacheMaxMemorySize: 0,
161-
swcMinify: true,
162161
compiler: {
163162
emotion: true,
164163
},

‎apps/dashboard/package.json‎

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"private": true,
55
"scripts": {
66
"preinstall": "npx only-allow pnpm",
7-
"dev": "next dev --turbo",
7+
"dev": "next dev --turbopack",
88
"build": "next build",
99
"start": "next start",
1010
"format": "biome format ./src --write",
@@ -27,7 +27,7 @@
2727
"@chakra-ui/theme-tools": "^2.1.2",
2828
"@emotion/react": "11.13.3",
2929
"@emotion/styled": "11.13.0",
30-
"@hookform/resolvers": "^3.9.0",
30+
"@hookform/resolvers": "^3.9.1",
3131
"@marsidev/react-turnstile": "^1.0.2",
3232
"@n8tb1t/use-scroll-position": "^2.0.3",
3333
"@radix-ui/react-alert-dialog": "^1.1.2",
@@ -45,13 +45,14 @@
4545
"@radix-ui/react-slot": "^1.1.0",
4646
"@radix-ui/react-switch": "^1.1.1",
4747
"@radix-ui/react-tooltip": "1.1.3",
48-
"@sentry/nextjs": "8.35.0",
49-
"@shazow/whatsabi": "^0.15.4",
48+
"@sentry/nextjs": "8.36.0",
49+
"@shazow/whatsabi": "^0.16.0",
5050
"@stripe/react-stripe-js": "^2.8.1",
5151
"@stripe/stripe-js": "^3.5.0",
52-
"@tanstack/react-query": "5.59.16",
52+
"@tanstack/react-query": "5.59.19",
5353
"@tanstack/react-table": "^8.17.3",
5454
"@thirdweb-dev/service-utils": "workspace:*",
55+
"@vercel/functions": "^1.4.2",
5556
"@vercel/og": "^0.6.2",
5657
"abitype": "1.0.6",
5758
"chakra-react-select": "^4.7.6",
@@ -61,38 +62,38 @@
6162
"compare-versions": "^6.1.0",
6263
"date-fns": "4.1.0",
6364
"flat": "^6.0.1",
64-
"framer-motion": "11.11.10",
65+
"framer-motion": "11.11.11",
6566
"fuse.js": "7.0.0",
66-
"input-otp": "^1.2.4",
67+
"input-otp": "^1.4.1",
6768
"ioredis": "^5.4.1",
6869
"ipaddr.js": "^2.2.0",
6970
"lottie-react": "^2.4.0",
7071
"lucide-react": "0.454.0",
71-
"next": "14.2.15",
72-
"next-plausible": "^3.12.0",
72+
"next": "15.0.2",
73+
"next-plausible": "^3.12.3",
7374
"next-seo": "^6.5.0",
74-
"next-themes": "^0.3.0",
75+
"next-themes": "^0.4.3",
7576
"nextjs-toploader": "^1.6.12",
7677
"papaparse": "^5.4.1",
7778
"pluralize": "^8.0.0",
7879
"posthog-js": "1.67.1",
7980
"prism-react-renderer": "^2.3.1",
8081
"prismjs": "^1.29.0",
8182
"qrcode": "^1.5.3",
82-
"react": "18.3.1",
83+
"react": "19.0.0-rc-69d4b800-20241021",
8384
"react-children-utilities": "^2.10.0",
8485
"react-day-picker": "^8.10.1",
85-
"react-dom": "18.3.1",
86-
"react-dropzone": "^14.2.9",
86+
"react-dom": "19.0.0-rc-69d4b800-20241021",
87+
"react-dropzone": "^14.3.5",
8788
"react-error-boundary": "^4.1.2",
8889
"react-hook-form": "7.52.0",
8990
"react-markdown": "^9.0.1",
9091
"react-responsive-carousel": "^3.2.23",
9192
"react-table": "^7.8.0",
92-
"recharts": "^2.13.0",
93+
"recharts": "^2.13.3",
9394
"remark-gfm": "^4.0.0",
9495
"server-only": "^0.0.1",
95-
"sonner": "^1.5.0",
96+
"sonner": "^1.7.0",
9697
"spdx-correct": "^3.2.0",
9798
"swagger-ui-react": "^5.17.14",
9899
"tailwind-merge": "^2.5.4",
@@ -104,26 +105,26 @@
104105
},
105106
"devDependencies": {
106107
"@chakra-ui/cli": "^2.4.1",
107-
"@chromatic-com/storybook": "2.0.2",
108-
"@next/bundle-analyzer": "14.2.15",
109-
"@next/eslint-plugin-next": "14.2.15",
108+
"@chromatic-com/storybook": "3.2.2",
109+
"@next/bundle-analyzer": "15.0.2",
110+
"@next/eslint-plugin-next": "15.0.2",
110111
"@playwright/test": "1.48.2",
111-
"@storybook/addon-essentials": "8.3.6",
112-
"@storybook/addon-interactions": "8.3.6",
113-
"@storybook/addon-links": "8.3.6",
114-
"@storybook/addon-onboarding": "8.3.6",
115-
"@storybook/addon-viewport": "8.3.6",
116-
"@storybook/blocks": "8.3.6",
117-
"@storybook/nextjs": "8.3.6",
118-
"@storybook/react": "8.3.6",
119-
"@storybook/test": "8.3.6",
112+
"@storybook/addon-essentials": "8.4.2",
113+
"@storybook/addon-interactions": "8.4.2",
114+
"@storybook/addon-links": "8.4.2",
115+
"@storybook/addon-onboarding": "8.4.2",
116+
"@storybook/addon-viewport": "8.4.2",
117+
"@storybook/blocks": "8.4.2",
118+
"@storybook/nextjs": "8.4.2",
119+
"@storybook/react": "8.4.2",
120+
"@storybook/test": "8.4.2",
120121
"@types/color": "4.2.0",
121122
"@types/node": "20.14.9",
122123
"@types/papaparse": "^5.3.15",
123124
"@types/pluralize": "^0.0.33",
124125
"@types/qrcode": "^1.5.5",
125-
"@types/react": "^18.3.11",
126-
"@types/react-dom": "^18.3.1",
126+
"@types/react": "npm:[email protected]",
127+
"@types/react-dom": "npm:[email protected].1",
127128
"@types/react-table": "^7.7.20",
128129
"@types/spdx-correct": "^3.1.3",
129130
"@types/swagger-ui-react": "^4.18.3",
@@ -133,12 +134,12 @@
133134
"checkly": "^4.8.1",
134135
"eslint": "8.57.0",
135136
"eslint-config-biome": "1.9.3",
136-
"eslint-plugin-react-compiler": "0.0.0-experimental-fa06e2c-20241014",
137+
"eslint-plugin-react-compiler": "19.0.0-beta-8a03594-20241020",
137138
"eslint-plugin-storybook": "^0.9.0",
138-
"knip": "5.34.2",
139+
"knip": "5.36.2",
139140
"next-sitemap": "^4.2.3",
140141
"postcss": "8.4.47",
141-
"storybook": "8.3.6",
142+
"storybook": "8.4.2",
142143
"tailwindcss": "3.4.14",
143144
"typescript": "5.6.3"
144145
}

‎apps/dashboard/src/@/api/projects.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export type Project = {
2121
};
2222

2323
export async function getProjects(teamSlug: string) {
24-
const cookiesManager = cookies();
24+
const cookiesManager = await cookies();
2525
const activeAccount = cookiesManager.get(COOKIE_ACTIVE_ACCOUNT)?.value;
2626
const token = activeAccount
2727
? cookiesManager.get(COOKIE_PREFIX_TOKEN + activeAccount)?.value
@@ -46,7 +46,7 @@ export async function getProjects(teamSlug: string) {
4646
}
4747

4848
export async function getProject(teamSlug: string, projectSlug: string) {
49-
const cookiesManager = cookies();
49+
const cookiesManager = await cookies();
5050
const activeAccount = cookiesManager.get(COOKIE_ACTIVE_ACCOUNT)?.value;
5151
const token = activeAccount
5252
? cookiesManager.get(COOKIE_PREFIX_TOKEN + activeAccount)?.value

‎apps/dashboard/src/@/api/team-members.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export type TeamMember = {
2525
};
2626

2727
export async function getMembers(teamSlug: string) {
28-
const token = getAuthToken();
28+
const token = await getAuthToken();
2929

3030
if (!token) {
3131
return undefined;

‎apps/dashboard/src/@/api/team.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export type Team = {
2323
};
2424

2525
export async function getTeamBySlug(slug: string) {
26-
const cookiesManager = cookies();
26+
const cookiesManager = await cookies();
2727
const activeAccount = cookiesManager.get(COOKIE_ACTIVE_ACCOUNT)?.value;
2828
const token = activeAccount
2929
? cookiesManager.get(COOKIE_PREFIX_TOKEN + activeAccount)?.value
@@ -45,7 +45,7 @@ export async function getTeamBySlug(slug: string) {
4545
}
4646

4747
export async function getTeams() {
48-
const cookiesManager = cookies();
48+
const cookiesManager = await cookies();
4949
const activeAccount = cookiesManager.get(COOKIE_ACTIVE_ACCOUNT)?.value;
5050
const token = activeAccount
5151
? cookiesManager.get(COOKIE_PREFIX_TOKEN + activeAccount)?.value

‎apps/dashboard/src/@/components/theme-provider.tsx‎

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

33
import { ThemeProvider as NextThemesProvider, useTheme } from "next-themes";
4-
import type { ThemeProviderProps } from "next-themes/dist/types";
4+
import type { ThemeProviderProps } from "next-themes";
55
import { useEffect } from "react";
66

77
export function ThemeProvider({ children, ...props }: ThemeProviderProps) {

‎apps/dashboard/src/@/constants/cookie.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import { cookies } from "next/headers";
33
export const COOKIE_ACTIVE_ACCOUNT = "tw_active_account";
44
export const COOKIE_PREFIX_TOKEN = "tw_token_";
55

6-
export function getActiveAccountCookie() {
7-
return cookies().get(COOKIE_ACTIVE_ACCOUNT)?.value;
6+
export async function getActiveAccountCookie() {
7+
return (await cookies()).get(COOKIE_ACTIVE_ACCOUNT)?.value;
88
}
99

10-
export function getJWTCookie(address: string) {
11-
return cookies().get(COOKIE_PREFIX_TOKEN + address)?.value;
10+
export async function getJWTCookie(address: string) {
11+
return (await cookies()).get(COOKIE_PREFIX_TOKEN + address)?.value;
1212
}

‎apps/dashboard/src/@3rdweb-sdk/react/components/roles/admin-only.tsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import {
55
import type { ThirdwebContract } from "thirdweb";
66
import type { ComponentWithChildren } from "types/component-with-children";
77

8+
import type { JSX } from "react";
9+
810
interface AdminOnlyProps {
911
contract: ThirdwebContract;
1012
failOpen?: boolean;

0 commit comments

Comments
 (0)