Skip to content

Commit 9f5289b

Browse files
committed
Merge remote-tracking branch 'origin/main' into crosschain-ui
2 parents d08b33c + 33c23e7 commit 9f5289b

File tree

203 files changed

+8822
-4645
lines changed

Some content is hidden

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

203 files changed

+8822
-4645
lines changed

.changeset/clever-carrots-march.md

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

.changeset/curly-ligers-exist.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+
update `type` in `getUser` `Profiles` to match tyepscript types

.changeset/pink-ducks-flash.md

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

.changeset/tidy-zoos-know.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+
Fix: Removed the auth prop from useConnectModal as it is currently not supported

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ apps/ @jnsdls @joaquim-verges
2020
apps/dashboard/ @jnsdls @MananTank @joaquim-verges
2121
apps/playground-web/ @joaquim-verges @gregfromstl @jnsdls @joaquim-verges
2222
apps/wallet-ui/ @gregfromstl @jnsdls @joaquim-verges @MananTank
23-
apps/portal/ @gregfromstl @jnsdls @joaquim-verges @MananTank
23+
apps/portal/ @thirdweb-dev/product @thirdweb-dev/platform @thirdweb-dev/infra
2424

2525
# .github folder + .changeset + turbo config is owned by jonas for now
2626
scripts/ @jnsdls @joaquim-verges

.github/workflows/CI.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787

8888
- run: pnpm test
8989

90-
- name: Upload coverage reports to Codecov
90+
- name: Code Coverage
9191
uses: codecov/codecov-action@v5
9292
with:
9393
directory: packages/

.github/workflows/issue.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,18 @@ jobs:
2121
repo: context.repo.repo,
2222
pull_number: context.issue.number
2323
});
24-
24+
2525
const body = pr.data.body || '';
26+
const branchName = pr.data.head.ref;
2627
const issueRegex = new RegExp(`(${process.env.VALID_ISSUE_PREFIXES})-\\d+`, 'i');
27-
28-
if (!issueRegex.test(body)) {
28+
const branchIssueRegex = new RegExp(`(${process.env.VALID_ISSUE_PREFIXES.toLowerCase()})-\\d+`, 'i');
29+
30+
if (!issueRegex.test(body) && !branchIssueRegex.test(branchName)) {
2931
core.setFailed(
30-
`No valid issue reference found. PR body must contain an issue ID with one of these prefixes: ${process.env.VALID_ISSUE_PREFIXES}`
32+
`No valid issue reference found. PR body or branch name must contain an issue ID with one of these prefixes: ${process.env.VALID_ISSUE_PREFIXES}`
3133
);
3234
return;
3335
}
34-
35-
const matches = body.match(issueRegex);
36+
37+
const matches = body.match(issueRegex) || branchName.match(branchIssueRegex);
3638
console.log(`Found issue reference: ${matches[0]}`);

apps/dashboard/framer-rewrites.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,12 @@ module.exports = [
66
// -- product landing pages --
77
// -- connect
88
"/connect/sign-in",
9+
// -- nebula
910
"/nebula",
11+
// --insight
12+
"/insight",
1013
// -- contracts
14+
"/contracts",
1115
"/contracts/modular-contracts",
1216
"/contracts/explore",
1317
"/contracts/deployment-tool",
@@ -20,4 +24,7 @@ module.exports = [
2024
"/solutions/ecosystem",
2125
// -- campaigns --
2226
"/unlimited-wallets",
27+
// -- TPP --
28+
"/trusted-partner-program",
29+
"/trusted-partner-program/:partner_slug",
2330
];

apps/dashboard/next-sitemap.config.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,14 @@ module.exports = {
4848
policies: [
4949
{
5050
userAgent: "*",
51-
[process.env.VERCEL_ENV !== "preview" &&
52-
process.env.VERCEL_ENV !== "development"
53-
? "allow"
54-
: "disallow"]: "/",
51+
// allow all if production
52+
allow: process.env.VERCEL_ENV === "production" ? ["/"] : [],
53+
// disallow all if not production
54+
disallow:
55+
process.env.VERCEL_ENV !== "production"
56+
? ["/"]
57+
: // disallow `/team` and `/team/*` if production
58+
["/team", "/team/*"],
5559
},
5660
],
5761
},

apps/dashboard/package.json

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@
4646
"@radix-ui/react-slot": "^1.1.0",
4747
"@radix-ui/react-switch": "^1.1.1",
4848
"@radix-ui/react-tooltip": "1.1.4",
49-
"@sentry/nextjs": "8.40.0",
49+
"@sentry/nextjs": "8.42.0",
5050
"@shazow/whatsabi": "^0.17.0",
51-
"@tanstack/react-query": "5.61.4",
51+
"@tanstack/react-query": "5.62.1",
5252
"@tanstack/react-table": "^8.17.3",
5353
"@thirdweb-dev/service-utils": "workspace:*",
54-
"@vercel/functions": "^1.4.2",
54+
"@vercel/functions": "^1.5.1",
5555
"@vercel/og": "^0.6.4",
5656
"abitype": "1.0.6",
5757
"chakra-react-select": "^4.7.6",
@@ -61,12 +61,12 @@
6161
"compare-versions": "^6.1.0",
6262
"date-fns": "4.1.0",
6363
"flat": "^6.0.1",
64-
"framer-motion": "11.11.17",
64+
"framer-motion": "11.12.0",
6565
"fuse.js": "7.0.0",
6666
"input-otp": "^1.4.1",
6767
"ioredis": "^5.4.1",
6868
"ipaddr.js": "^2.2.0",
69-
"lucide-react": "0.461.0",
69+
"lucide-react": "0.462.0",
7070
"next": "15.0.3",
7171
"next-plausible": "^3.12.4",
7272
"next-seo": "^6.5.0",
@@ -106,17 +106,17 @@
106106
"@next/bundle-analyzer": "15.0.3",
107107
"@next/eslint-plugin-next": "15.0.3",
108108
"@playwright/test": "1.49.0",
109-
"@storybook/addon-essentials": "8.4.5",
110-
"@storybook/addon-interactions": "8.4.5",
111-
"@storybook/addon-links": "8.4.5",
112-
"@storybook/addon-onboarding": "8.4.5",
113-
"@storybook/addon-viewport": "8.4.5",
114-
"@storybook/blocks": "8.4.5",
115-
"@storybook/nextjs": "8.4.5",
116-
"@storybook/react": "8.4.5",
117-
"@storybook/test": "8.4.5",
109+
"@storybook/addon-essentials": "8.4.6",
110+
"@storybook/addon-interactions": "8.4.6",
111+
"@storybook/addon-links": "8.4.6",
112+
"@storybook/addon-onboarding": "8.4.6",
113+
"@storybook/addon-viewport": "8.4.6",
114+
"@storybook/blocks": "8.4.6",
115+
"@storybook/nextjs": "8.4.6",
116+
"@storybook/react": "8.4.6",
117+
"@storybook/test": "8.4.6",
118118
"@types/color": "4.2.0",
119-
"@types/node": "22.10.0",
119+
"@types/node": "22.10.1",
120120
"@types/papaparse": "^5.3.15",
121121
"@types/pluralize": "^0.0.33",
122122
"@types/qrcode": "^1.5.5",
@@ -128,15 +128,15 @@
128128
"@typescript-eslint/eslint-plugin": "7.14.1",
129129
"@typescript-eslint/parser": "7.14.1",
130130
"autoprefixer": "^10.4.19",
131-
"checkly": "^4.11.0",
131+
"checkly": "^4.14.0",
132132
"eslint": "8.57.0",
133-
"eslint-config-biome": "1.9.3",
133+
"eslint-config-biome": "1.9.4",
134134
"eslint-plugin-react-compiler": "19.0.0-beta-df7b47d-20241124",
135135
"eslint-plugin-storybook": "^0.11.1",
136-
"knip": "5.38.0",
136+
"knip": "5.39.0",
137137
"next-sitemap": "^4.2.3",
138138
"postcss": "8.4.49",
139-
"storybook": "8.4.5",
139+
"storybook": "8.4.6",
140140
"tailwindcss": "3.4.15",
141141
"typescript": "5.7.2"
142142
}

0 commit comments

Comments
 (0)